Skip to content

Commit

Permalink
Merge pull request #678 from climsoft/v4_1_12
Browse files Browse the repository at this point in the history 
update_version_v4_1_12
  • Loading branch information
@mhabimana
mhabimana authored Jan 25, 2022
2 parents c113b10 + 30e2d86 commit c209f38
Show file tree
Hide file tree
Showing 15 changed files with 2,032 additions and 741 deletions.
958 changes: 479 additions & 479 deletions ClimsoftVer4/ClimsoftVer4/formAWSRealTime.Designer.vb
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions ClimsoftVer4/ClimsoftVer4/formAWSRealTime.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
ymbw3AdadRRREqQ8gLcxkcHyuo+tTabGs3ntIodt/wB5hk9KKKswq7I//9k=
</value>
</data>
<data name="cmdmssPrev.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="cmdPrevRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
Expand Down Expand Up @@ -351,7 +351,7 @@
SgR7yEPGeCfaiitUrrUmbcXoQyTRo2yaRYynyqDGWyBxniiiilYlH//Z
</value>
</data>
<data name="cmdmssfirst.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="cmdFirstRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
Expand Down Expand Up @@ -405,7 +405,7 @@
P79T1IGAT1AwaKK418R2y2RwfjbxDqejeK9Qs7G+ntrWMx7Io3IVcxITgfUk/jRRRXRHWKONpXP/2Q==
</value>
</data>
<data name="cmdmssLast.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="cmdLastRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
Expand Down Expand Up @@ -453,7 +453,7 @@
Z0jwbY3dvoOl2ejwSXrM0dlAsSk7VHRQOygfhXTr90+1FFRiXqaYJLUSiiitYfCiZ/Ez/9k=
</value>
</data>
<data name="cmdmssNext.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="cmdNextRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
Expand Down Expand Up @@ -496,7 +496,7 @@
ymbw3AdadRRREqQ8gLcxkcHyuo+tTabGs3ntIodt/wB5hk9KKKswq7I//9k=
</value>
</data>
<data name="cmdPrevRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="cmdmssPrev.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
Expand Down Expand Up @@ -540,7 +540,7 @@
SgR7yEPGeCfaiitUrrUmbcXoQyTRo2yaRYynyqDGWyBxniiiilYlH//Z
</value>
</data>
<data name="cmdFirstRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="cmdmssfirst.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
Expand Down Expand Up @@ -594,7 +594,7 @@
P79T1IGAT1AwaKK418R2y2RwfjbxDqejeK9Qs7G+ntrWMx7Io3IVcxITgfUk/jRRRXRHWKONpXP/2Q==
</value>
</data>
<data name="cmdLastRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="cmdmssLast.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
Expand Down Expand Up @@ -642,7 +642,7 @@
Z0jwbY3dvoOl2ejwSXrM0dlAsSk7VHRQOygfhXTr90+1FFRiXqaYJLUSiiitYfCiZ/Ez/9k=
</value>
</data>
<data name="cmdNextRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="cmdmssNext.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
Expand Down
1 change: 1 addition & 0 deletions ClimsoftVer4/ClimsoftVer4/formDaily1.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,7 @@ Public Class formDaily1
'If Len(cboDay.Text) > 0 Then formPopulate()
End Sub


Private Sub formDaily1_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
'If e.KeyCode = Keys.Enter Then My.Computer.Keyboard.SendKeys("{TAB}")

Expand Down
89 changes: 80 additions & 9 deletions ClimsoftVer4/ClimsoftVer4/frmDBUtilities.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,26 @@ Public Class frmDBUtilities
'End Sub

Private Sub NOAAGTSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NOAAGTSToolStripMenuItem.Click
frmGTSNOAA.Show()
'frmGTSNOAA.Show()

With frmImportDaily
.Text = "NOAA GTS Data Import"
.lblType.Visible = False
.lblType.Text = "NOAA_GTS"
.lblDefaultObsHour.Visible = False
.txtObsHour.Visible = False
.lblDefaultObsHour.Visible = True
'.lblStartRow.Visible = False
.chkScale.Enabled = False
.chkScale.Checked = True
'.txtStartRow.Visible = False
.txtObsHour.Visible = True
.lblStn.Visible = True
.lblElmCode.Visible = False
.cboElement.Visible = False
.grpSummary.Visible = False
.Show()
End With
End Sub

Private Sub CLIMSOFTV3ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CLIMSOFTV3ToolStripMenuItem.Click
Expand Down Expand Up @@ -259,10 +278,11 @@ Public Class frmDBUtilities
.chkScale.Checked = True
'.txtStartRow.Visible = False
.txtObsHour.Visible = False
.txtStn.Visible = True
'.txtStn.Visible = True
.lblStn.Visible = True
.lblElmCode.Visible = False
.txtElmCode.Visible = False
.cboElement.Visible = False
.grpSummary.Visible = False
.Show()
End With
Expand Down Expand Up @@ -328,6 +348,7 @@ Public Class frmDBUtilities
.lblElmCode.Visible = False
.txtElmCode.Visible = False
.grpUpperAir.Visible = True
.cboElement.Visible = False
'.chkObsHour.Visible = False
''.lblStartRow.Visible = False
'.chkScale.Visible = True
Expand Down Expand Up @@ -385,10 +406,11 @@ Public Class frmDBUtilities
.lblType.Text = "CLICOMdaily"
.txtStartRow.Text = 1
.chkScale.Checked = True
.txtStn.Enabled = False
.cboStns.Enabled = False
.grpSummary.Visible = False
.lblElmCode.Visible = False
.txtElmCode.Visible = False
.cboElement.Visible = False
.Show()
End With
End Sub
Expand All @@ -399,10 +421,11 @@ Public Class frmDBUtilities
.lblType.Text = "CLICOMsynop"
.txtStartRow.Text = 1
.chkScale.Checked = True
.txtStn.Enabled = False
.cboStns.Enabled = False
.grpSummary.Visible = False
.lblElmCode.Visible = False
.txtElmCode.Visible = False
.cboElement.Visible = False
.Show()
End With
End Sub
Expand All @@ -413,23 +436,71 @@ Public Class frmDBUtilities
.lblType.Text = "CLICOMhourly"
.txtStartRow.Text = 1
.chkScale.Checked = True
.txtStn.Enabled = False
.cboStns.Enabled = False
.grpSummary.Visible = False
.lblElmCode.Visible = False
.txtElmCode.Visible = False
.cboElement.Visible = False
.Show()
End With
End Sub

Private Sub MonthlyToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles MonthlyToolStripMenuItem2.Click
With frmImportDaily
.Text = "Monthly"
.lblType.Text = "3"
.txtStartRow.Text = 1
.Text = "Monthly Data"
.lblType.Text = "Monthly"
.txtStartRow.Text = 2
.chkScale.Checked = True
.txtStn.Enabled = True
.cboStns.Enabled = True
.grpSummary.Visible = False
.Show()
End With
End Sub

Private Sub ExternalDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExternalDataToolStripMenuItem.Click

End Sub

'Private Sub DailyToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles DailyToolStripMenuItem2.Click

' With frmImportDaily
' .Text = "NOAA GTS Daily Data Import"
' .lblType.Visible = False
' .lblType.Text = "DlyNOAA_GTS"
' .lblDefaultObsHour.Visible = False
' .txtObsHour.Visible = False
' '.lblStartRow.Visible = False
' .chkScale.Enabled = False
' .chkScale.Checked = True
' '.txtStartRow.Visible = False
' .txtObsHour.Visible = False
' .txtStn.Visible = True
' .lblStn.Visible = True
' .lblElmCode.Visible = False
' .txtElmCode.Visible = False
' .grpSummary.Visible = False
' .Show()
' End With
'End Sub

'Private Sub HourlyToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles HourlyToolStripMenuItem1.Click
' With frmImportDaily
' .Text = "NOAA GTS Hourly Daily Data Import"
' .lblType.Visible = False
' .lblType.Text = "HlyNOAA_GTS"
' .lblDefaultObsHour.Visible = False
' .txtObsHour.Visible = False
' '.lblStartRow.Visible = False
' .chkScale.Enabled = False
' .chkScale.Checked = True
' '.txtStartRow.Visible = False
' .txtObsHour.Visible = False
' .txtStn.Visible = True
' .lblStn.Visible = True
' .lblElmCode.Visible = False
' .txtElmCode.Visible = False
' .grpSummary.Visible = False
' .Show()
' End With
'End Sub
End Class
Loading

0 comments on commit c209f38

Please sign in to comment.