Skip to content

Commit

Permalink
全面实现云同步,历史记录战绩设置样样精通
Browse files Browse the repository at this point in the history
  • Loading branch information
njzjz committed Feb 7, 2017
1 parent d40b0ea commit f42510b
Show file tree
Hide file tree
Showing 13 changed files with 171 additions and 81 deletions.
13 changes: 7 additions & 6 deletions Chemistry.vbp
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,21 @@ Form=frmGas.frm
IconForm="frmMain"
Startup="Sub Main"
HelpFile=""
Title="Chemistry"
Title="��ѧe+"
ExeName32="Chemistry.exe"
Command32=""
Name="ChemicalTools"
HelpContextID="0"
Description="Chemical Tools"
Description="��ѧe+"
CompatibleMode="0"
MajorVer=2
MinorVer=1
RevisionVer=21
MajorVer=3
MinorVer=0
RevisionVer=2
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="����ʦ����ѧ�Ŷ�һ��"
VersionCompanyName="����ʦ����ѧ�ŶӶ���"
VersionFileDescription="Chemical Tools"
VersionLegalCopyright="������"
VersionProductName="��ѧe+"
CompilationType=0
OptimizationType=0
Expand Down
27 changes: 13 additions & 14 deletions Chemistry.vbw
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
frmMain = 148, 112, 676, 548, C, 94, 130, 686, 568, C
modCalculate = -19, 51, 1005, 475,
modData = 146, 96, 1009, 580,
frmElement = 34, 92, 920, 532, C, 69, 118, 565, 558, C
frmMass = -72, 226, 818, 668, C, 58, 90, 671, 584, C
frmMain = 414, 58, 942, 492, C, 186, 3, 859, 522, C
modCalculate = -66, 54, 958, 472, C
modData = 24, 0, 888, 481, C
frmElement = 103, 93, 989, 533, C, 69, 118, 565, 558, C
frmMass = 125, 79, 1015, 521, C, 58, 90, 671, 584, C
modUI = -322, 150, 564, 586, C
modMain = -347, 267, 539, 726, C
modExam = 40, 26, 926, 466,
frmExam = 145, 179, 1031, 527, C, -289, 192, 594, 663, C
frmAbout = 104, 104, 989, 544, C, -196, 205, 690, 603, C
frmOptions = 186, 137, 1072, 577, I, 108, 6, 994, 564, C
frmLogin = 92, 121, 922, 538, C, 74, 117, 600, 541, C
frmSignUp = 466, 23, 993, 447, , 186, 45, 713, 469, C
FrmChangePassword = 167, 159, 1051, 599, C, -150, 206, 735, 646, C
frmpH = -12, 79, 872, 519, C, 88, 105, 637, 557, C
modMain = 55, 60, 941, 519, C
modExam = 40, 26, 926, 466, C
frmExam = 145, 179, 1031, 527, C, 144, 56, 1027, 527, C
frmAbout = 12, 39, 897, 479, C, 59, 94, 945, 492, C
frmOptions = 291, 32, 1177, 472, , 108, 6, 994, 564, C
frmLogin = 203, 54, 1033, 470, C, 74, 117, 600, 541, C
frmSignUp = 466, 23, 993, 447, C, 186, 45, 713, 469, C
frmpH = 158, 73, 1042, 513, C, 88, 105, 637, 557, C
frmThermodynamics = -240, 126, 645, 566, C, 191, 102, 1075, 612, C
frmGas = 14, 159, 898, 598, C, 126, 141, 734, 721, C
2 changes: 1 addition & 1 deletion frmAbout.frm
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Begin VB.Form frmAbout
End
Begin VB.Label lblTitle
BackStyle = 0 'Transparent
Caption = "Chemical Tools"
Caption = "化学e+"
BeginProperty Font
Name = "微软雅黑"
Size = 14.25
Expand Down
Binary file modified frmAbout.frx
Binary file not shown.
23 changes: 18 additions & 5 deletions frmElement.frm
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Begin VB.Form frmElement
Left = 2400
Locked = -1 'True
MultiLine = -1 'True
ScrollBars = 2 'Vertical
TabIndex = 6
Text = "frmElement.frx":1B692
Top = 2880
Expand Down Expand Up @@ -178,7 +179,7 @@ Private Sub cmdCopy_Click()
End Sub

Private Sub cmdElement_Click()
Dim n As Integer
Dim n As Integer, ElementOutput As String, ElementOutputHtml As String
n = calElementChoose(texElementIn.texT)
If n > 0 Then
lblElementNumber = n
Expand All @@ -188,9 +189,18 @@ Private Sub cmdElement_Click()
HisElement = texElementIn.texT
Call dataBaseWrite(DataUsername, "Element", HisElement)
End If
texElementOut.texT = calElementStr(n)
If Not DataUsername = "访客" Then
Call dataHtmlChange("historyElement", CStr(HisElement))
ElementOutput = calElementStr(n)
texElementOut = CutHtml(ElementOutput)
If n > 0 Then
ElementOutputHtml = ElementOutput & Chr(10) & "<a href='https://en.wikipedia.org/wiki/" & ElementIUPAC(n) & "'>访问维基百科</a>"
HisElementOutput = texElementOut
Call dataBaseWrite(DataUsername, "ElementOutput", HisElementOutput)
If Not DataUsername = "访客" And n > 0 Then
Call dataHtmlChange("historyElementOutputHtml", CStr(ElementOutputHtml))
Call dataHtmlChange("historyElementOutput", CStr(ElementOutput))
Call dataHtmlChange("historyElementNumber", CStr(n))
Call dataHtmlChange("historyElement", CStr(HisElement))
End If
End If
End Sub

Expand All @@ -204,7 +214,9 @@ Private Sub Form_Load()
lblElementName = ElementName(n)
lblElementAbbr = ElementAbbr(n)
lblElementMass = ElementMass(n)
texElementOut.texT = calElementStr(n)
End If
If HisElementOutput <> "" Then
texElementOut = HisElementOutput
End If
End Sub

Expand Down Expand Up @@ -235,3 +247,4 @@ Private Sub texElementIn_KeyPress(KeyAscii As Integer)
texElementIn.ForeColor = RGB(0, 0, 0)
End If
End Sub

2 changes: 0 additions & 2 deletions frmExam.frm
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,6 @@ Private Sub imgTitle_MouseDown(Button As Integer, Shift As Integer, x As Single,
SendMessage hwnd, WM_NCLBUTTONDOWN, HTCAPTION, 0&
End Sub



Private Sub texExam_Click()
If texExam.texT = InTip Then
texExam.texT = ""
Expand Down
11 changes: 8 additions & 3 deletions frmMass.frm
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,24 @@ Private Sub cmdCopy_Click()
End Sub

Private Sub cmdMass_Click()
texMassOut = calMassPerStr(texMassIn.texT)
Dim MassOutHtml As String
MassOutHtml = calMassPerStr(texMassIn.texT)
texMassOut = CutHtml(MassOutHtml)
HisMass = texMassIn.texT
HisMassOutput = texMassOut
Call dataBaseWrite(DataUsername, "Mass", HisMass)
Call dataBaseWrite(DataUsername, "MassOutput", HisMassOutput)
If Not DataUsername = "访客" Then
Call dataHtmlChange("historyMassOutput", CStr(MassOutHtml))
Call dataHtmlChange("historyMass", CStr(HisMass))
End If
End Sub

Private Sub Form_Load()
InTip = "请在此处输入物质化学式,例如:K4[Fe(CN)6]"
texMassIn.texT = InTip
If HisMass <> "" Then texMassOut = calMassPerStr(HisMass)
'If HisMass <> "" Then texMassOut = calMassPerStr(HisMass)
If HisMassOutput <> "" Then texMassOut = HisMassOutput
End Sub

Private Sub Form_MouseDown(Button As Integer, Shift As Integer, x As Single, Y As Single)
Expand All @@ -124,7 +130,6 @@ Private Sub imgTitle_MouseDown(Button As Integer, Shift As Integer, x As Single,
SendMessage hwnd, WM_NCLBUTTONDOWN, HTCAPTION, 0&
End Sub


Private Sub texMassIn_Click()
If texMassIn.texT = InTip Then
texMassIn.texT = ""
Expand Down
3 changes: 3 additions & 0 deletions frmOptions.frm
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,9 @@ Private Function WriteOptions() As Boolean
ExamTimeMax = TimeMax
If chkTimeIf.Value = 1 Then ExamTimeIf = True Else ExamTimeIf = False
Call dataSettingSave(DataUsername)
If Not DataUsername = "访客" Then
Call dataHtmlChange("elementnumber_limit", CStr(ExamNumberMax))
End If
Else
MsgBox ErrorInfo
End If
Expand Down
13 changes: 9 additions & 4 deletions frmpH.frm
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,23 @@ Private Sub cmdCopy_Click()
End Sub

Private Sub cmdpH_Click()
Dim AorB As Boolean
Dim AorB As Boolean, pHOutHtml As String
If comboAB = "酸" Then AorB = True Else AorB = False
texpHOut = calpHOut(texpKa, texc, texpKw, AorB)
pHOutHtml = calpHOut(texpKa, texc, texpKw, AorB)
texpHOut = CutHtml(pHOutHtml)
Hisc = texc
HispKa = texpKa
HispKw = texpKw
HisAB = AorB
HisAcidOutput = CStr(texpHOut)
Call dataBaseWrite(DataUsername, "c", Hisc)
Call dataBaseWrite(DataUsername, "pKa", HispKa)
Call dataBaseWrite(DataUsername, "pKw", HispKw)
Call dataBaseWrite(DataUsername, "AcidOutput", texpHOut)
If HisAB Then Call dataBaseWrite(DataUsername, "AB", "A") Else Call dataBaseWrite(DataUsername, "AB", "B")
If Not DataUsername = "访客" Then
Call dataHtmlChange("pKw", CStr(HispKw))
Call dataHtmlChange("historyAcidOutput", CStr(pHOutHtml))
End If
End Sub

Expand All @@ -240,8 +244,9 @@ Private Sub Form_Load()
texpKa.texT = InTip
texc.texT = InTipb
comboAB.ListIndex = 0
If Hisc <> "" And HispKa <> "" Then
texpHOut = calpHOut(HispKa, Hisc, HispKw, HisAB)
texpKw = HispKw
If HisAcidOutput <> "" Then
texpHOut = HisAcidOutput
End If
End Sub

Expand Down
Binary file modified mdb/Data.mdb
Binary file not shown.
Binary file modified mdb/User.mdb
Binary file not shown.
Loading

0 comments on commit f42510b

Please sign in to comment.