Skip to content

Commit c209f38

Browse files
mhabimanamhabimana
authored
Merge pull request #678 from climsoft/v4_1_12
update_version_v4_1_12
2 parents c113b10 + 30e2d86 commit c209f38

15 files changed

Lines changed: 2032 additions & 741 deletions

‎ClimsoftVer4/ClimsoftVer4/formAWSRealTime.Designer.vb‎

Lines changed: 479 additions & 479 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ClimsoftVer4/ClimsoftVer4/formAWSRealTime.resx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
ymbw3AdadRRREqQ8gLcxkcHyuo+tTabGs3ntIodt/wB5hk9KKKswq7I//9k=
308308
</value>
309309
</data>
310-
<data name="cmdmssPrev.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
310+
<data name="cmdPrevRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
311311
<value>
312312
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
313313
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
@@ -351,7 +351,7 @@
351351
SgR7yEPGeCfaiitUrrUmbcXoQyTRo2yaRYynyqDGWyBxniiiilYlH//Z
352352
</value>
353353
</data>
354-
<data name="cmdmssfirst.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
354+
<data name="cmdFirstRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
355355
<value>
356356
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
357357
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
@@ -405,7 +405,7 @@
405405
P79T1IGAT1AwaKK418R2y2RwfjbxDqejeK9Qs7G+ntrWMx7Io3IVcxITgfUk/jRRRXRHWKONpXP/2Q==
406406
</value>
407407
</data>
408-
<data name="cmdmssLast.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
408+
<data name="cmdLastRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
409409
<value>
410410
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
411411
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
@@ -453,7 +453,7 @@
453453
Z0jwbY3dvoOl2ejwSXrM0dlAsSk7VHRQOygfhXTr90+1FFRiXqaYJLUSiiitYfCiZ/Ez/9k=
454454
</value>
455455
</data>
456-
<data name="cmdmssNext.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
456+
<data name="cmdNextRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
457457
<value>
458458
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
459459
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
@@ -496,7 +496,7 @@
496496
ymbw3AdadRRREqQ8gLcxkcHyuo+tTabGs3ntIodt/wB5hk9KKKswq7I//9k=
497497
</value>
498498
</data>
499-
<data name="cmdPrevRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
499+
<data name="cmdmssPrev.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
500500
<value>
501501
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
502502
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
@@ -540,7 +540,7 @@
540540
SgR7yEPGeCfaiitUrrUmbcXoQyTRo2yaRYynyqDGWyBxniiiilYlH//Z
541541
</value>
542542
</data>
543-
<data name="cmdFirstRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
543+
<data name="cmdmssfirst.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
544544
<value>
545545
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
546546
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
@@ -594,7 +594,7 @@
594594
P79T1IGAT1AwaKK418R2y2RwfjbxDqejeK9Qs7G+ntrWMx7Io3IVcxITgfUk/jRRRXRHWKONpXP/2Q==
595595
</value>
596596
</data>
597-
<data name="cmdLastRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
597+
<data name="cmdmssLast.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
598598
<value>
599599
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
600600
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA
@@ -642,7 +642,7 @@
642642
Z0jwbY3dvoOl2ejwSXrM0dlAsSk7VHRQOygfhXTr90+1FFRiXqaYJLUSiiitYfCiZ/Ez/9k=
643643
</value>
644644
</data>
645-
<data name="cmdNextRecord.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
645+
<data name="cmdmssNext.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
646646
<value>
647647
/9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG
648648
AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA

‎ClimsoftVer4/ClimsoftVer4/formDaily1.vb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ Public Class formDaily1
543543
'If Len(cboDay.Text) > 0 Then formPopulate()
544544
End Sub
545545

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

‎ClimsoftVer4/ClimsoftVer4/frmDBUtilities.vb‎

Lines changed: 80 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,26 @@ Public Class frmDBUtilities
195195
'End Sub
196196

197197
Private Sub NOAAGTSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NOAAGTSToolStripMenuItem.Click
198-
frmGTSNOAA.Show()
198+
'frmGTSNOAA.Show()
199+
200+
With frmImportDaily
201+
.Text = "NOAA GTS Data Import"
202+
.lblType.Visible = False
203+
.lblType.Text = "NOAA_GTS"
204+
.lblDefaultObsHour.Visible = False
205+
.txtObsHour.Visible = False
206+
.lblDefaultObsHour.Visible = True
207+
'.lblStartRow.Visible = False
208+
.chkScale.Enabled = False
209+
.chkScale.Checked = True
210+
'.txtStartRow.Visible = False
211+
.txtObsHour.Visible = True
212+
.lblStn.Visible = True
213+
.lblElmCode.Visible = False
214+
.cboElement.Visible = False
215+
.grpSummary.Visible = False
216+
.Show()
217+
End With
199218
End Sub
200219

201220
Private Sub CLIMSOFTV3ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CLIMSOFTV3ToolStripMenuItem.Click
@@ -259,10 +278,11 @@ Public Class frmDBUtilities
259278
.chkScale.Checked = True
260279
'.txtStartRow.Visible = False
261280
.txtObsHour.Visible = False
262-
.txtStn.Visible = True
281+
'.txtStn.Visible = True
263282
.lblStn.Visible = True
264283
.lblElmCode.Visible = False
265284
.txtElmCode.Visible = False
285+
.cboElement.Visible = False
266286
.grpSummary.Visible = False
267287
.Show()
268288
End With
@@ -328,6 +348,7 @@ Public Class frmDBUtilities
328348
.lblElmCode.Visible = False
329349
.txtElmCode.Visible = False
330350
.grpUpperAir.Visible = True
351+
.cboElement.Visible = False
331352
'.chkObsHour.Visible = False
332353
''.lblStartRow.Visible = False
333354
'.chkScale.Visible = True
@@ -385,10 +406,11 @@ Public Class frmDBUtilities
385406
.lblType.Text = "CLICOMdaily"
386407
.txtStartRow.Text = 1
387408
.chkScale.Checked = True
388-
.txtStn.Enabled = False
409+
.cboStns.Enabled = False
389410
.grpSummary.Visible = False
390411
.lblElmCode.Visible = False
391412
.txtElmCode.Visible = False
413+
.cboElement.Visible = False
392414
.Show()
393415
End With
394416
End Sub
@@ -399,10 +421,11 @@ Public Class frmDBUtilities
399421
.lblType.Text = "CLICOMsynop"
400422
.txtStartRow.Text = 1
401423
.chkScale.Checked = True
402-
.txtStn.Enabled = False
424+
.cboStns.Enabled = False
403425
.grpSummary.Visible = False
404426
.lblElmCode.Visible = False
405427
.txtElmCode.Visible = False
428+
.cboElement.Visible = False
406429
.Show()
407430
End With
408431
End Sub
@@ -413,23 +436,71 @@ Public Class frmDBUtilities
413436
.lblType.Text = "CLICOMhourly"
414437
.txtStartRow.Text = 1
415438
.chkScale.Checked = True
416-
.txtStn.Enabled = False
439+
.cboStns.Enabled = False
417440
.grpSummary.Visible = False
418441
.lblElmCode.Visible = False
419442
.txtElmCode.Visible = False
443+
.cboElement.Visible = False
420444
.Show()
421445
End With
422446
End Sub
423447

424448
Private Sub MonthlyToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles MonthlyToolStripMenuItem2.Click
425449
With frmImportDaily
426-
.Text = "Monthly"
427-
.lblType.Text = "3"
428-
.txtStartRow.Text = 1
450+
.Text = "Monthly Data"
451+
.lblType.Text = "Monthly"
452+
.txtStartRow.Text = 2
429453
.chkScale.Checked = True
430-
.txtStn.Enabled = True
454+
.cboStns.Enabled = True
431455
.grpSummary.Visible = False
432456
.Show()
433457
End With
434458
End Sub
459+
460+
Private Sub ExternalDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExternalDataToolStripMenuItem.Click
461+
462+
End Sub
463+
464+
'Private Sub DailyToolStripMenuItem2_Click(sender As Object, e As EventArgs) Handles DailyToolStripMenuItem2.Click
465+
466+
' With frmImportDaily
467+
' .Text = "NOAA GTS Daily Data Import"
468+
' .lblType.Visible = False
469+
' .lblType.Text = "DlyNOAA_GTS"
470+
' .lblDefaultObsHour.Visible = False
471+
' .txtObsHour.Visible = False
472+
' '.lblStartRow.Visible = False
473+
' .chkScale.Enabled = False
474+
' .chkScale.Checked = True
475+
' '.txtStartRow.Visible = False
476+
' .txtObsHour.Visible = False
477+
' .txtStn.Visible = True
478+
' .lblStn.Visible = True
479+
' .lblElmCode.Visible = False
480+
' .txtElmCode.Visible = False
481+
' .grpSummary.Visible = False
482+
' .Show()
483+
' End With
484+
'End Sub
485+
486+
'Private Sub HourlyToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles HourlyToolStripMenuItem1.Click
487+
' With frmImportDaily
488+
' .Text = "NOAA GTS Hourly Daily Data Import"
489+
' .lblType.Visible = False
490+
' .lblType.Text = "HlyNOAA_GTS"
491+
' .lblDefaultObsHour.Visible = False
492+
' .txtObsHour.Visible = False
493+
' '.lblStartRow.Visible = False
494+
' .chkScale.Enabled = False
495+
' .chkScale.Checked = True
496+
' '.txtStartRow.Visible = False
497+
' .txtObsHour.Visible = False
498+
' .txtStn.Visible = True
499+
' .lblStn.Visible = True
500+
' .lblElmCode.Visible = False
501+
' .txtElmCode.Visible = False
502+
' .grpSummary.Visible = False
503+
' .Show()
504+
' End With
505+
'End Sub
435506
End Class

0 commit comments

Comments
 (0)