diff --git a/ClimsoftVer4/ClimsoftVer4/formAWSRealTime.Designer.vb b/ClimsoftVer4/ClimsoftVer4/formAWSRealTime.Designer.vb index bc4a4fe3..728c3aef 100644 --- a/ClimsoftVer4/ClimsoftVer4/formAWSRealTime.Designer.vb +++ b/ClimsoftVer4/ClimsoftVer4/formAWSRealTime.Designer.vb @@ -135,33 +135,6 @@ Partial Class formAWSRealTime Me.txtSiteID = New System.Windows.Forms.ComboBox() Me.Label15 = New System.Windows.Forms.Label() Me.pnlServers = New System.Windows.Forms.Panel() - Me.pnlMSS = New System.Windows.Forms.Panel() - Me.lstFolders = New System.Windows.Forms.ListBox() - Me.cmdMssAddNew = New System.Windows.Forms.Button() - Me.cmdMssRefresh = New System.Windows.Forms.Button() - Me.cmdMssReset = New System.Windows.Forms.Button() - Me.txtmssFTPMode = New System.Windows.Forms.ComboBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.cmdmssPrev = New System.Windows.Forms.Button() - Me.cmdmssfirst = New System.Windows.Forms.Button() - Me.cmdmssLast = New System.Windows.Forms.Button() - Me.cmdmssNext = New System.Windows.Forms.Button() - Me.txtmssNavigator = New System.Windows.Forms.TextBox() - Me.lblFtpTransferMode = New System.Windows.Forms.Label() - Me.lblMsgSwitch = New System.Windows.Forms.Label() - Me.cmdMssDelete = New System.Windows.Forms.Button() - Me.cmdMssUpdate = New System.Windows.Forms.Button() - Me.cmdMssSave = New System.Windows.Forms.Button() - Me.txtMSSConfirm = New System.Windows.Forms.TextBox() - Me.txtMSSPW = New System.Windows.Forms.TextBox() - Me.txtmssUser = New System.Windows.Forms.TextBox() - Me.txtMSSFolder = New System.Windows.Forms.TextBox() - Me.txtMSSAddress = New System.Windows.Forms.TextBox() - Me.lblmssConfirmPassword = New System.Windows.Forms.Label() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label6 = New System.Windows.Forms.Label() - Me.Label7 = New System.Windows.Forms.Label() - Me.Label8 = New System.Windows.Forms.Label() Me.pnlBaseStation = New System.Windows.Forms.Panel() Me.cmdBstAddNew = New System.Windows.Forms.Button() Me.cmdRefresh = New System.Windows.Forms.Button() @@ -190,6 +163,33 @@ Partial Class formAWSRealTime Me.lblBaseStationFTP = New System.Windows.Forms.Label() Me.cmdMSS = New System.Windows.Forms.Button() Me.cmdBaseStation = New System.Windows.Forms.Button() + Me.pnlMSS = New System.Windows.Forms.Panel() + Me.lstFolders = New System.Windows.Forms.ListBox() + Me.cmdMssAddNew = New System.Windows.Forms.Button() + Me.cmdMssRefresh = New System.Windows.Forms.Button() + Me.cmdMssReset = New System.Windows.Forms.Button() + Me.txtmssFTPMode = New System.Windows.Forms.ComboBox() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.cmdmssPrev = New System.Windows.Forms.Button() + Me.cmdmssfirst = New System.Windows.Forms.Button() + Me.cmdmssLast = New System.Windows.Forms.Button() + Me.cmdmssNext = New System.Windows.Forms.Button() + Me.txtmssNavigator = New System.Windows.Forms.TextBox() + Me.lblFtpTransferMode = New System.Windows.Forms.Label() + Me.lblMsgSwitch = New System.Windows.Forms.Label() + Me.cmdMssDelete = New System.Windows.Forms.Button() + Me.cmdMssUpdate = New System.Windows.Forms.Button() + Me.cmdMssSave = New System.Windows.Forms.Button() + Me.txtMSSConfirm = New System.Windows.Forms.TextBox() + Me.txtMSSPW = New System.Windows.Forms.TextBox() + Me.txtmssUser = New System.Windows.Forms.TextBox() + Me.txtMSSFolder = New System.Windows.Forms.TextBox() + Me.txtMSSAddress = New System.Windows.Forms.TextBox() + Me.lblmssConfirmPassword = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.Label8 = New System.Windows.Forms.Label() Me.pnlMsgEncoding = New System.Windows.Forms.Panel() Me.GroupBox6 = New System.Windows.Forms.GroupBox() Me.dgrdCodeFlag = New System.Windows.Forms.DataGridView() @@ -239,10 +239,10 @@ Partial Class formAWSRealTime Me.grpSites.SuspendLayout() CType(Me.DataGridViewSites, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlServers.SuspendLayout() - Me.pnlMSS.SuspendLayout() - Me.GroupBox1.SuspendLayout() Me.pnlBaseStation.SuspendLayout() Me.GroupBox10.SuspendLayout() + Me.pnlMSS.SuspendLayout() + Me.GroupBox1.SuspendLayout() Me.pnlMsgEncoding.SuspendLayout() Me.GroupBox6.SuspendLayout() CType(Me.dgrdCodeFlag, System.ComponentModel.ISupportInitialize).BeginInit() @@ -881,9 +881,9 @@ Partial Class formAWSRealTime Me.pnlDataStructures.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnlDataStructures.Controls.Add(Me.DataGridViewStructures) Me.pnlDataStructures.Controls.Add(Me.grpStructures1) - Me.pnlDataStructures.Location = New System.Drawing.Point(203, 341) + Me.pnlDataStructures.Location = New System.Drawing.Point(203, 316) Me.pnlDataStructures.Name = "pnlDataStructures" - Me.pnlDataStructures.Size = New System.Drawing.Size(745, 57) + Me.pnlDataStructures.Size = New System.Drawing.Size(745, 99) Me.pnlDataStructures.TabIndex = 5 Me.pnlDataStructures.Visible = False ' @@ -952,28 +952,28 @@ Partial Class formAWSRealTime ' Me.txtDelimiter.FormattingEnabled = True Me.txtDelimiter.Items.AddRange(New Object() {"comma", "tab", "space"}) - Me.txtDelimiter.Location = New System.Drawing.Point(119, 31) + Me.txtDelimiter.Location = New System.Drawing.Point(125, 31) Me.txtDelimiter.Name = "txtDelimiter" Me.txtDelimiter.Size = New System.Drawing.Size(135, 21) Me.txtDelimiter.TabIndex = 18 ' 'txtQualifier ' - Me.txtQualifier.Location = New System.Drawing.Point(119, 72) + Me.txtQualifier.Location = New System.Drawing.Point(125, 72) Me.txtQualifier.Name = "txtQualifier" Me.txtQualifier.Size = New System.Drawing.Size(135, 20) Me.txtQualifier.TabIndex = 17 ' 'txtHeaders ' - Me.txtHeaders.Location = New System.Drawing.Point(119, 52) + Me.txtHeaders.Location = New System.Drawing.Point(125, 52) Me.txtHeaders.Name = "txtHeaders" Me.txtHeaders.Size = New System.Drawing.Size(135, 20) Me.txtHeaders.TabIndex = 16 ' 'txtStrName ' - Me.txtStrName.Location = New System.Drawing.Point(119, 11) + Me.txtStrName.Location = New System.Drawing.Point(125, 11) Me.txtStrName.Name = "txtStrName" Me.txtStrName.Size = New System.Drawing.Size(135, 20) Me.txtStrName.TabIndex = 14 @@ -1010,9 +1010,9 @@ Partial Class formAWSRealTime Me.Label21.AutoSize = True Me.Label21.Location = New System.Drawing.Point(7, 78) Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(112, 13) + Me.Label21.Size = New System.Drawing.Size(118, 13) Me.Label21.TabIndex = 10 - Me.Label21.Text = "Text Qulifier Character" + Me.Label21.Text = "Text Qualifier Character" Me.Label21.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'Label20 @@ -1056,7 +1056,7 @@ Partial Class formAWSRealTime Me.pnlSites.AutoSize = True Me.pnlSites.BackColor = System.Drawing.Color.Linen Me.pnlSites.Controls.Add(Me.grpSites) - Me.pnlSites.Location = New System.Drawing.Point(194, 530) + Me.pnlSites.Location = New System.Drawing.Point(199, 498) Me.pnlSites.Name = "pnlSites" Me.pnlSites.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.pnlSites.Size = New System.Drawing.Size(757, 468) @@ -1398,549 +1398,549 @@ Partial Class formAWSRealTime Me.pnlServers.TabIndex = 2 Me.pnlServers.Visible = False ' - 'pnlMSS - ' - Me.pnlMSS.BackColor = System.Drawing.Color.BlanchedAlmond - Me.pnlMSS.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnlMSS.Controls.Add(Me.lstFolders) - Me.pnlMSS.Controls.Add(Me.cmdMssAddNew) - Me.pnlMSS.Controls.Add(Me.cmdMssRefresh) - Me.pnlMSS.Controls.Add(Me.cmdMssReset) - Me.pnlMSS.Controls.Add(Me.txtmssFTPMode) - Me.pnlMSS.Controls.Add(Me.GroupBox1) - Me.pnlMSS.Controls.Add(Me.lblFtpTransferMode) - Me.pnlMSS.Controls.Add(Me.lblMsgSwitch) - Me.pnlMSS.Controls.Add(Me.cmdMssDelete) - Me.pnlMSS.Controls.Add(Me.cmdMssUpdate) - Me.pnlMSS.Controls.Add(Me.cmdMssSave) - Me.pnlMSS.Controls.Add(Me.txtMSSConfirm) - Me.pnlMSS.Controls.Add(Me.txtMSSPW) - Me.pnlMSS.Controls.Add(Me.txtmssUser) - Me.pnlMSS.Controls.Add(Me.txtMSSFolder) - Me.pnlMSS.Controls.Add(Me.txtMSSAddress) - Me.pnlMSS.Controls.Add(Me.lblmssConfirmPassword) - Me.pnlMSS.Controls.Add(Me.Label5) - Me.pnlMSS.Controls.Add(Me.Label6) - Me.pnlMSS.Controls.Add(Me.Label7) - Me.pnlMSS.Controls.Add(Me.Label8) - Me.pnlMSS.Enabled = False - Me.pnlMSS.Location = New System.Drawing.Point(105, 91) - Me.pnlMSS.Name = "pnlMSS" - Me.pnlMSS.Size = New System.Drawing.Size(474, 287) - Me.pnlMSS.TabIndex = 3 - ' - 'lstFolders + 'pnlBaseStation ' - Me.lstFolders.FormattingEnabled = True - Me.lstFolders.Items.AddRange(New Object() {"binary", "ASC"}) - Me.lstFolders.Location = New System.Drawing.Point(317, 66) - Me.lstFolders.Name = "lstFolders" - Me.lstFolders.Size = New System.Drawing.Size(90, 17) - Me.lstFolders.TabIndex = 78 + Me.pnlBaseStation.BackColor = System.Drawing.Color.PapayaWhip + Me.pnlBaseStation.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlBaseStation.Controls.Add(Me.cmdBstAddNew) + Me.pnlBaseStation.Controls.Add(Me.cmdRefresh) + Me.pnlBaseStation.Controls.Add(Me.cmdReset) + Me.pnlBaseStation.Controls.Add(Me.txtBasestationFTPMode) + Me.pnlBaseStation.Controls.Add(Me.GroupBox10) + Me.pnlBaseStation.Controls.Add(Me.Label40) + Me.pnlBaseStation.Controls.Add(Me.lblbaseStation) + Me.pnlBaseStation.Controls.Add(Me.cmdBstDelete) + Me.pnlBaseStation.Controls.Add(Me.cmdBsstUpdate) + Me.pnlBaseStation.Controls.Add(Me.cmdBstSave) + Me.pnlBaseStation.Controls.Add(Me.txtbaseStationPWConfirm) + Me.pnlBaseStation.Controls.Add(Me.txtbaseStationPW) + Me.pnlBaseStation.Controls.Add(Me.txtBaseStationUser) + Me.pnlBaseStation.Controls.Add(Me.txtBaseStationFolder) + Me.pnlBaseStation.Controls.Add(Me.txtBaseStationAddress) + Me.pnlBaseStation.Controls.Add(Me.lblConfirmInputPW) + Me.pnlBaseStation.Controls.Add(Me.lblInputPW) + Me.pnlBaseStation.Controls.Add(Me.lblInputUser) + Me.pnlBaseStation.Controls.Add(Me.lblFTPFolder) + Me.pnlBaseStation.Controls.Add(Me.lblBaseStationFTP) + Me.pnlBaseStation.Enabled = False + Me.pnlBaseStation.Location = New System.Drawing.Point(72, 91) + Me.pnlBaseStation.Name = "pnlBaseStation" + Me.pnlBaseStation.Size = New System.Drawing.Size(544, 296) + Me.pnlBaseStation.TabIndex = 4 ' - 'cmdMssAddNew + 'cmdBstAddNew ' - Me.cmdMssAddNew.Location = New System.Drawing.Point(22, 224) - Me.cmdMssAddNew.Name = "cmdMssAddNew" - Me.cmdMssAddNew.Size = New System.Drawing.Size(59, 21) - Me.cmdMssAddNew.TabIndex = 77 - Me.cmdMssAddNew.Text = "AddNew" - Me.cmdMssAddNew.UseVisualStyleBackColor = True + Me.cmdBstAddNew.Location = New System.Drawing.Point(28, 232) + Me.cmdBstAddNew.Name = "cmdBstAddNew" + Me.cmdBstAddNew.Size = New System.Drawing.Size(62, 21) + Me.cmdBstAddNew.TabIndex = 75 + Me.cmdBstAddNew.Text = "Add New" + Me.cmdBstAddNew.UseVisualStyleBackColor = True ' - 'cmdMssRefresh + 'cmdRefresh ' - Me.cmdMssRefresh.Location = New System.Drawing.Point(322, 226) - Me.cmdMssRefresh.Name = "cmdMssRefresh" - Me.cmdMssRefresh.Size = New System.Drawing.Size(59, 21) - Me.cmdMssRefresh.TabIndex = 76 - Me.cmdMssRefresh.Text = "Refresh" - Me.cmdMssRefresh.UseVisualStyleBackColor = True + Me.cmdRefresh.Location = New System.Drawing.Point(364, 232) + Me.cmdRefresh.Name = "cmdRefresh" + Me.cmdRefresh.Size = New System.Drawing.Size(62, 21) + Me.cmdRefresh.TabIndex = 74 + Me.cmdRefresh.Text = "Refresh" + Me.cmdRefresh.UseVisualStyleBackColor = True ' - 'cmdMssReset + 'cmdReset ' - Me.cmdMssReset.Location = New System.Drawing.Point(244, 226) - Me.cmdMssReset.Name = "cmdMssReset" - Me.cmdMssReset.Size = New System.Drawing.Size(59, 21) - Me.cmdMssReset.TabIndex = 75 - Me.cmdMssReset.Text = "Reset" - Me.cmdMssReset.UseVisualStyleBackColor = True + Me.cmdReset.Location = New System.Drawing.Point(280, 232) + Me.cmdReset.Name = "cmdReset" + Me.cmdReset.Size = New System.Drawing.Size(62, 21) + Me.cmdReset.TabIndex = 13 + Me.cmdReset.Text = "Reset" + Me.cmdReset.UseVisualStyleBackColor = True ' - 'txtmssFTPMode + 'txtBasestationFTPMode ' - Me.txtmssFTPMode.FormattingEnabled = True - Me.txtmssFTPMode.Items.AddRange(New Object() {"FTP", "SFTP"}) - Me.txtmssFTPMode.Location = New System.Drawing.Point(194, 94) - Me.txtmssFTPMode.Name = "txtmssFTPMode" - Me.txtmssFTPMode.Size = New System.Drawing.Size(116, 21) - Me.txtmssFTPMode.TabIndex = 74 - Me.txtmssFTPMode.Text = "FTP" + Me.txtBasestationFTPMode.FormattingEnabled = True + Me.txtBasestationFTPMode.Items.AddRange(New Object() {"FTP", "SFTP"}) + Me.txtBasestationFTPMode.Location = New System.Drawing.Point(206, 102) + Me.txtBasestationFTPMode.Name = "txtBasestationFTPMode" + Me.txtBasestationFTPMode.Size = New System.Drawing.Size(116, 21) + Me.txtBasestationFTPMode.TabIndex = 73 + Me.txtBasestationFTPMode.Text = "FTP" ' - 'GroupBox1 + 'GroupBox10 ' - Me.GroupBox1.Controls.Add(Me.cmdmssPrev) - Me.GroupBox1.Controls.Add(Me.cmdmssfirst) - Me.GroupBox1.Controls.Add(Me.cmdmssLast) - Me.GroupBox1.Controls.Add(Me.cmdmssNext) - Me.GroupBox1.Controls.Add(Me.txtmssNavigator) - Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.GroupBox1.Location = New System.Drawing.Point(0, 249) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(472, 36) - Me.GroupBox1.TabIndex = 71 - Me.GroupBox1.TabStop = False + Me.GroupBox10.Controls.Add(Me.cmdPrevRecord) + Me.GroupBox10.Controls.Add(Me.cmdFirstRecord) + Me.GroupBox10.Controls.Add(Me.cmdLastRecord) + Me.GroupBox10.Controls.Add(Me.cmdNextRecord) + Me.GroupBox10.Controls.Add(Me.txtbssNavigator) + Me.GroupBox10.Dock = System.Windows.Forms.DockStyle.Bottom + Me.GroupBox10.Location = New System.Drawing.Point(0, 263) + Me.GroupBox10.Name = "GroupBox10" + Me.GroupBox10.Size = New System.Drawing.Size(542, 31) + Me.GroupBox10.TabIndex = 72 + Me.GroupBox10.TabStop = False ' - 'cmdmssPrev + 'cmdPrevRecord ' - Me.cmdmssPrev.BackgroundImage = CType(resources.GetObject("cmdmssPrev.BackgroundImage"), System.Drawing.Image) - Me.cmdmssPrev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.cmdmssPrev.Location = New System.Drawing.Point(34, 6) - Me.cmdmssPrev.Name = "cmdmssPrev" - Me.cmdmssPrev.Size = New System.Drawing.Size(36, 24) - Me.cmdmssPrev.TabIndex = 4 - Me.cmdmssPrev.UseVisualStyleBackColor = True + Me.cmdPrevRecord.BackgroundImage = CType(resources.GetObject("cmdPrevRecord.BackgroundImage"), System.Drawing.Image) + Me.cmdPrevRecord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.cmdPrevRecord.Location = New System.Drawing.Point(34, 6) + Me.cmdPrevRecord.Name = "cmdPrevRecord" + Me.cmdPrevRecord.Size = New System.Drawing.Size(36, 24) + Me.cmdPrevRecord.TabIndex = 4 + Me.cmdPrevRecord.UseVisualStyleBackColor = True ' - 'cmdmssfirst + 'cmdFirstRecord ' - Me.cmdmssfirst.BackgroundImage = CType(resources.GetObject("cmdmssfirst.BackgroundImage"), System.Drawing.Image) - Me.cmdmssfirst.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.cmdmssfirst.Location = New System.Drawing.Point(0, 6) - Me.cmdmssfirst.Name = "cmdmssfirst" - Me.cmdmssfirst.Size = New System.Drawing.Size(35, 24) - Me.cmdmssfirst.TabIndex = 3 - Me.cmdmssfirst.UseVisualStyleBackColor = True + Me.cmdFirstRecord.BackgroundImage = CType(resources.GetObject("cmdFirstRecord.BackgroundImage"), System.Drawing.Image) + Me.cmdFirstRecord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.cmdFirstRecord.Location = New System.Drawing.Point(0, 6) + Me.cmdFirstRecord.Name = "cmdFirstRecord" + Me.cmdFirstRecord.Size = New System.Drawing.Size(35, 24) + Me.cmdFirstRecord.TabIndex = 3 + Me.cmdFirstRecord.UseVisualStyleBackColor = True ' - 'cmdmssLast + 'cmdLastRecord ' - Me.cmdmssLast.BackgroundImage = CType(resources.GetObject("cmdmssLast.BackgroundImage"), System.Drawing.Image) - Me.cmdmssLast.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.cmdmssLast.Location = New System.Drawing.Point(436, 6) - Me.cmdmssLast.Name = "cmdmssLast" - Me.cmdmssLast.Size = New System.Drawing.Size(36, 24) - Me.cmdmssLast.TabIndex = 2 - Me.cmdmssLast.UseVisualStyleBackColor = True + Me.cmdLastRecord.BackgroundImage = CType(resources.GetObject("cmdLastRecord.BackgroundImage"), System.Drawing.Image) + Me.cmdLastRecord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.cmdLastRecord.Location = New System.Drawing.Point(436, 6) + Me.cmdLastRecord.Name = "cmdLastRecord" + Me.cmdLastRecord.Size = New System.Drawing.Size(36, 24) + Me.cmdLastRecord.TabIndex = 2 + Me.cmdLastRecord.UseVisualStyleBackColor = True ' - 'cmdmssNext + 'cmdNextRecord ' - Me.cmdmssNext.BackgroundImage = CType(resources.GetObject("cmdmssNext.BackgroundImage"), System.Drawing.Image) - Me.cmdmssNext.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.cmdmssNext.Location = New System.Drawing.Point(401, 6) - Me.cmdmssNext.Name = "cmdmssNext" - Me.cmdmssNext.Size = New System.Drawing.Size(36, 24) - Me.cmdmssNext.TabIndex = 1 - Me.cmdmssNext.UseVisualStyleBackColor = True + Me.cmdNextRecord.BackgroundImage = CType(resources.GetObject("cmdNextRecord.BackgroundImage"), System.Drawing.Image) + Me.cmdNextRecord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.cmdNextRecord.Location = New System.Drawing.Point(401, 6) + Me.cmdNextRecord.Name = "cmdNextRecord" + Me.cmdNextRecord.Size = New System.Drawing.Size(36, 24) + Me.cmdNextRecord.TabIndex = 1 + Me.cmdNextRecord.UseVisualStyleBackColor = True ' - 'txtmssNavigator + 'txtbssNavigator ' - Me.txtmssNavigator.Location = New System.Drawing.Point(70, 8) - Me.txtmssNavigator.Name = "txtmssNavigator" - Me.txtmssNavigator.Size = New System.Drawing.Size(333, 20) - Me.txtmssNavigator.TabIndex = 0 - Me.txtmssNavigator.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + Me.txtbssNavigator.Location = New System.Drawing.Point(70, 8) + Me.txtbssNavigator.Name = "txtbssNavigator" + Me.txtbssNavigator.Size = New System.Drawing.Size(333, 20) + Me.txtbssNavigator.TabIndex = 0 + Me.txtbssNavigator.TextAlign = System.Windows.Forms.HorizontalAlignment.Center ' - 'lblFtpTransferMode + 'Label40 ' - Me.lblFtpTransferMode.AutoSize = True - Me.lblFtpTransferMode.Location = New System.Drawing.Point(92, 97) - Me.lblFtpTransferMode.Name = "lblFtpTransferMode" - Me.lblFtpTransferMode.Size = New System.Drawing.Size(99, 13) - Me.lblFtpTransferMode.TabIndex = 14 - Me.lblFtpTransferMode.Text = "FTP Transfer Mode" + Me.Label40.AutoSize = True + Me.Label40.Location = New System.Drawing.Point(105, 106) + Me.Label40.Name = "Label40" + Me.Label40.Size = New System.Drawing.Size(99, 13) + Me.Label40.TabIndex = 16 + Me.Label40.Text = "FTP Transfer Mode" ' - 'lblMsgSwitch + 'lblbaseStation ' - Me.lblMsgSwitch.AutoSize = True - Me.lblMsgSwitch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMsgSwitch.Location = New System.Drawing.Point(202, 10) - Me.lblMsgSwitch.Name = "lblMsgSwitch" - Me.lblMsgSwitch.Size = New System.Drawing.Size(99, 13) - Me.lblMsgSwitch.TabIndex = 13 - Me.lblMsgSwitch.Text = "Message Switch" + Me.lblbaseStation.AutoSize = True + Me.lblbaseStation.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblbaseStation.Location = New System.Drawing.Point(201, 13) + Me.lblbaseStation.Name = "lblbaseStation" + Me.lblbaseStation.Size = New System.Drawing.Size(79, 13) + Me.lblbaseStation.TabIndex = 30 + Me.lblbaseStation.Text = "Base Station" ' - 'cmdMssDelete + 'cmdBstDelete ' - Me.cmdMssDelete.Location = New System.Drawing.Point(400, 226) - Me.cmdMssDelete.Name = "cmdMssDelete" - Me.cmdMssDelete.Size = New System.Drawing.Size(59, 21) - Me.cmdMssDelete.TabIndex = 12 - Me.cmdMssDelete.Text = "Delete" - Me.cmdMssDelete.UseVisualStyleBackColor = True + Me.cmdBstDelete.Location = New System.Drawing.Point(448, 232) + Me.cmdBstDelete.Name = "cmdBstDelete" + Me.cmdBstDelete.Size = New System.Drawing.Size(62, 21) + Me.cmdBstDelete.TabIndex = 14 + Me.cmdBstDelete.Text = "Delete" + Me.cmdBstDelete.UseVisualStyleBackColor = True ' - 'cmdMssUpdate + 'cmdBsstUpdate ' - Me.cmdMssUpdate.Location = New System.Drawing.Point(166, 226) - Me.cmdMssUpdate.Name = "cmdMssUpdate" - Me.cmdMssUpdate.Size = New System.Drawing.Size(59, 21) - Me.cmdMssUpdate.TabIndex = 11 - Me.cmdMssUpdate.Text = "Update" - Me.cmdMssUpdate.UseVisualStyleBackColor = True + Me.cmdBsstUpdate.Location = New System.Drawing.Point(196, 232) + Me.cmdBsstUpdate.Name = "cmdBsstUpdate" + Me.cmdBsstUpdate.Size = New System.Drawing.Size(62, 21) + Me.cmdBsstUpdate.TabIndex = 12 + Me.cmdBsstUpdate.Text = "Update" + Me.cmdBsstUpdate.UseVisualStyleBackColor = True ' - 'cmdMssSave + 'cmdBstSave ' - Me.cmdMssSave.Location = New System.Drawing.Point(90, 224) - Me.cmdMssSave.Name = "cmdMssSave" - Me.cmdMssSave.Size = New System.Drawing.Size(59, 21) - Me.cmdMssSave.TabIndex = 10 - Me.cmdMssSave.Text = "Save" - Me.cmdMssSave.UseVisualStyleBackColor = True + Me.cmdBstSave.Location = New System.Drawing.Point(112, 232) + Me.cmdBstSave.Name = "cmdBstSave" + Me.cmdBstSave.Size = New System.Drawing.Size(62, 21) + Me.cmdBstSave.TabIndex = 11 + Me.cmdBstSave.Text = "Save" + Me.cmdBstSave.UseVisualStyleBackColor = True ' - 'txtMSSConfirm + 'txtbaseStationPWConfirm ' - Me.txtMSSConfirm.Location = New System.Drawing.Point(194, 180) - Me.txtMSSConfirm.Name = "txtMSSConfirm" - Me.txtMSSConfirm.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) - Me.txtMSSConfirm.Size = New System.Drawing.Size(81, 20) - Me.txtMSSConfirm.TabIndex = 10 + Me.txtbaseStationPWConfirm.Location = New System.Drawing.Point(205, 195) + Me.txtbaseStationPWConfirm.Name = "txtbaseStationPWConfirm" + Me.txtbaseStationPWConfirm.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) + Me.txtbaseStationPWConfirm.Size = New System.Drawing.Size(87, 20) + Me.txtbaseStationPWConfirm.TabIndex = 10 ' - 'txtMSSPW + 'txtbaseStationPW ' - Me.txtMSSPW.Location = New System.Drawing.Point(194, 151) - Me.txtMSSPW.Name = "txtMSSPW" - Me.txtMSSPW.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) - Me.txtMSSPW.Size = New System.Drawing.Size(81, 20) - Me.txtMSSPW.TabIndex = 9 + Me.txtbaseStationPW.Location = New System.Drawing.Point(205, 164) + Me.txtbaseStationPW.Name = "txtbaseStationPW" + Me.txtbaseStationPW.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) + Me.txtbaseStationPW.Size = New System.Drawing.Size(87, 20) + Me.txtbaseStationPW.TabIndex = 9 ' - 'txtmssUser + 'txtBaseStationUser ' - Me.txtmssUser.Location = New System.Drawing.Point(194, 122) - Me.txtmssUser.Name = "txtmssUser" - Me.txtmssUser.Size = New System.Drawing.Size(81, 20) - Me.txtmssUser.TabIndex = 8 + Me.txtBaseStationUser.Location = New System.Drawing.Point(205, 133) + Me.txtBaseStationUser.Name = "txtBaseStationUser" + Me.txtBaseStationUser.Size = New System.Drawing.Size(87, 20) + Me.txtBaseStationUser.TabIndex = 8 ' - 'txtMSSFolder + 'txtBaseStationFolder ' - Me.txtMSSFolder.Location = New System.Drawing.Point(194, 64) - Me.txtMSSFolder.Name = "txtMSSFolder" - Me.txtMSSFolder.Size = New System.Drawing.Size(121, 20) - Me.txtMSSFolder.TabIndex = 6 + Me.txtBaseStationFolder.Location = New System.Drawing.Point(205, 71) + Me.txtBaseStationFolder.Name = "txtBaseStationFolder" + Me.txtBaseStationFolder.Size = New System.Drawing.Size(117, 20) + Me.txtBaseStationFolder.TabIndex = 6 ' - 'txtMSSAddress + 'txtBaseStationAddress ' - Me.txtMSSAddress.Location = New System.Drawing.Point(194, 35) - Me.txtMSSAddress.Name = "txtMSSAddress" - Me.txtMSSAddress.Size = New System.Drawing.Size(214, 20) - Me.txtMSSAddress.TabIndex = 5 + Me.txtBaseStationAddress.Location = New System.Drawing.Point(205, 40) + Me.txtBaseStationAddress.Name = "txtBaseStationAddress" + Me.txtBaseStationAddress.Size = New System.Drawing.Size(187, 20) + Me.txtBaseStationAddress.TabIndex = 5 ' - 'lblmssConfirmPassword + 'lblConfirmInputPW ' - Me.lblmssConfirmPassword.AutoSize = True - Me.lblmssConfirmPassword.Location = New System.Drawing.Point(91, 184) - Me.lblmssConfirmPassword.Name = "lblmssConfirmPassword" - Me.lblmssConfirmPassword.Size = New System.Drawing.Size(91, 13) - Me.lblmssConfirmPassword.TabIndex = 4 - Me.lblmssConfirmPassword.Text = "Confirm Password" + Me.lblConfirmInputPW.AutoSize = True + Me.lblConfirmInputPW.Location = New System.Drawing.Point(105, 199) + Me.lblConfirmInputPW.Name = "lblConfirmInputPW" + Me.lblConfirmInputPW.Size = New System.Drawing.Size(91, 13) + Me.lblConfirmInputPW.TabIndex = 4 + Me.lblConfirmInputPW.Text = "Confirm Password" ' - 'Label5 + 'lblInputPW ' - Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(92, 155) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(53, 13) - Me.Label5.TabIndex = 3 - Me.Label5.Text = "Password" + Me.lblInputPW.AutoSize = True + Me.lblInputPW.Location = New System.Drawing.Point(105, 168) + Me.lblInputPW.Name = "lblInputPW" + Me.lblInputPW.Size = New System.Drawing.Size(56, 13) + Me.lblInputPW.TabIndex = 3 + Me.lblInputPW.Text = "PassWord" ' - 'Label6 + 'lblInputUser ' - Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(90, 126) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(60, 13) - Me.Label6.TabIndex = 2 - Me.Label6.Text = "User Name" + Me.lblInputUser.AutoSize = True + Me.lblInputUser.Location = New System.Drawing.Point(104, 137) + Me.lblInputUser.Name = "lblInputUser" + Me.lblInputUser.Size = New System.Drawing.Size(60, 13) + Me.lblInputUser.TabIndex = 2 + Me.lblInputUser.Text = "User Name" ' - 'Label7 + 'lblFTPFolder ' - Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(91, 68) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(63, 13) - Me.Label7.TabIndex = 1 - Me.Label7.Text = "Input Folder" + Me.lblFTPFolder.AutoSize = True + Me.lblFTPFolder.Location = New System.Drawing.Point(105, 75) + Me.lblFTPFolder.Name = "lblFTPFolder" + Me.lblFTPFolder.Size = New System.Drawing.Size(63, 13) + Me.lblFTPFolder.TabIndex = 1 + Me.lblFTPFolder.Text = "Input Folder" ' - 'Label8 + 'lblBaseStationFTP ' - Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(91, 39) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(68, 13) - Me.Label8.TabIndex = 0 - Me.Label8.Text = "FTP Address" + Me.lblBaseStationFTP.AutoSize = True + Me.lblBaseStationFTP.Location = New System.Drawing.Point(104, 44) + Me.lblBaseStationFTP.Name = "lblBaseStationFTP" + Me.lblBaseStationFTP.Size = New System.Drawing.Size(68, 13) + Me.lblBaseStationFTP.TabIndex = 0 + Me.lblBaseStationFTP.Text = "FTP Address" ' - 'pnlBaseStation + 'cmdMSS ' - Me.pnlBaseStation.BackColor = System.Drawing.Color.PapayaWhip - Me.pnlBaseStation.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnlBaseStation.Controls.Add(Me.cmdBstAddNew) - Me.pnlBaseStation.Controls.Add(Me.cmdRefresh) - Me.pnlBaseStation.Controls.Add(Me.cmdReset) - Me.pnlBaseStation.Controls.Add(Me.txtBasestationFTPMode) - Me.pnlBaseStation.Controls.Add(Me.GroupBox10) - Me.pnlBaseStation.Controls.Add(Me.Label40) - Me.pnlBaseStation.Controls.Add(Me.lblbaseStation) - Me.pnlBaseStation.Controls.Add(Me.cmdBstDelete) - Me.pnlBaseStation.Controls.Add(Me.cmdBsstUpdate) - Me.pnlBaseStation.Controls.Add(Me.cmdBstSave) - Me.pnlBaseStation.Controls.Add(Me.txtbaseStationPWConfirm) - Me.pnlBaseStation.Controls.Add(Me.txtbaseStationPW) - Me.pnlBaseStation.Controls.Add(Me.txtBaseStationUser) - Me.pnlBaseStation.Controls.Add(Me.txtBaseStationFolder) - Me.pnlBaseStation.Controls.Add(Me.txtBaseStationAddress) - Me.pnlBaseStation.Controls.Add(Me.lblConfirmInputPW) - Me.pnlBaseStation.Controls.Add(Me.lblInputPW) - Me.pnlBaseStation.Controls.Add(Me.lblInputUser) - Me.pnlBaseStation.Controls.Add(Me.lblFTPFolder) - Me.pnlBaseStation.Controls.Add(Me.lblBaseStationFTP) - Me.pnlBaseStation.Enabled = False - Me.pnlBaseStation.Location = New System.Drawing.Point(72, 91) - Me.pnlBaseStation.Name = "pnlBaseStation" - Me.pnlBaseStation.Size = New System.Drawing.Size(544, 296) - Me.pnlBaseStation.TabIndex = 4 + Me.cmdMSS.FlatStyle = System.Windows.Forms.FlatStyle.System + Me.cmdMSS.Location = New System.Drawing.Point(341, 44) + Me.cmdMSS.Name = "cmdMSS" + Me.cmdMSS.Size = New System.Drawing.Size(134, 28) + Me.cmdMSS.TabIndex = 1 + Me.cmdMSS.Text = "Message Switch" + Me.cmdMSS.UseVisualStyleBackColor = True ' - 'cmdBstAddNew + 'cmdBaseStation ' - Me.cmdBstAddNew.Location = New System.Drawing.Point(28, 232) - Me.cmdBstAddNew.Name = "cmdBstAddNew" - Me.cmdBstAddNew.Size = New System.Drawing.Size(62, 21) - Me.cmdBstAddNew.TabIndex = 75 - Me.cmdBstAddNew.Text = "Add New" - Me.cmdBstAddNew.UseVisualStyleBackColor = True + Me.cmdBaseStation.FlatStyle = System.Windows.Forms.FlatStyle.System + Me.cmdBaseStation.Location = New System.Drawing.Point(210, 44) + Me.cmdBaseStation.Name = "cmdBaseStation" + Me.cmdBaseStation.Size = New System.Drawing.Size(134, 28) + Me.cmdBaseStation.TabIndex = 0 + Me.cmdBaseStation.Text = "Base Station" + Me.cmdBaseStation.UseVisualStyleBackColor = True ' - 'cmdRefresh + 'pnlMSS ' - Me.cmdRefresh.Location = New System.Drawing.Point(364, 232) - Me.cmdRefresh.Name = "cmdRefresh" - Me.cmdRefresh.Size = New System.Drawing.Size(62, 21) - Me.cmdRefresh.TabIndex = 74 - Me.cmdRefresh.Text = "Refresh" - Me.cmdRefresh.UseVisualStyleBackColor = True + Me.pnlMSS.BackColor = System.Drawing.Color.BlanchedAlmond + Me.pnlMSS.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlMSS.Controls.Add(Me.lstFolders) + Me.pnlMSS.Controls.Add(Me.cmdMssAddNew) + Me.pnlMSS.Controls.Add(Me.cmdMssRefresh) + Me.pnlMSS.Controls.Add(Me.cmdMssReset) + Me.pnlMSS.Controls.Add(Me.txtmssFTPMode) + Me.pnlMSS.Controls.Add(Me.GroupBox1) + Me.pnlMSS.Controls.Add(Me.lblFtpTransferMode) + Me.pnlMSS.Controls.Add(Me.lblMsgSwitch) + Me.pnlMSS.Controls.Add(Me.cmdMssDelete) + Me.pnlMSS.Controls.Add(Me.cmdMssUpdate) + Me.pnlMSS.Controls.Add(Me.cmdMssSave) + Me.pnlMSS.Controls.Add(Me.txtMSSConfirm) + Me.pnlMSS.Controls.Add(Me.txtMSSPW) + Me.pnlMSS.Controls.Add(Me.txtmssUser) + Me.pnlMSS.Controls.Add(Me.txtMSSFolder) + Me.pnlMSS.Controls.Add(Me.txtMSSAddress) + Me.pnlMSS.Controls.Add(Me.lblmssConfirmPassword) + Me.pnlMSS.Controls.Add(Me.Label5) + Me.pnlMSS.Controls.Add(Me.Label6) + Me.pnlMSS.Controls.Add(Me.Label7) + Me.pnlMSS.Controls.Add(Me.Label8) + Me.pnlMSS.Enabled = False + Me.pnlMSS.Location = New System.Drawing.Point(105, 91) + Me.pnlMSS.Name = "pnlMSS" + Me.pnlMSS.Size = New System.Drawing.Size(474, 287) + Me.pnlMSS.TabIndex = 3 ' - 'cmdReset + 'lstFolders ' - Me.cmdReset.Location = New System.Drawing.Point(280, 232) - Me.cmdReset.Name = "cmdReset" - Me.cmdReset.Size = New System.Drawing.Size(62, 21) - Me.cmdReset.TabIndex = 13 - Me.cmdReset.Text = "Reset" - Me.cmdReset.UseVisualStyleBackColor = True + Me.lstFolders.FormattingEnabled = True + Me.lstFolders.Items.AddRange(New Object() {"binary", "ASC"}) + Me.lstFolders.Location = New System.Drawing.Point(317, 66) + Me.lstFolders.Name = "lstFolders" + Me.lstFolders.Size = New System.Drawing.Size(90, 17) + Me.lstFolders.TabIndex = 78 ' - 'txtBasestationFTPMode + 'cmdMssAddNew ' - Me.txtBasestationFTPMode.FormattingEnabled = True - Me.txtBasestationFTPMode.Items.AddRange(New Object() {"FTP", "SFTP"}) - Me.txtBasestationFTPMode.Location = New System.Drawing.Point(206, 102) - Me.txtBasestationFTPMode.Name = "txtBasestationFTPMode" - Me.txtBasestationFTPMode.Size = New System.Drawing.Size(116, 21) - Me.txtBasestationFTPMode.TabIndex = 73 - Me.txtBasestationFTPMode.Text = "FTP" + Me.cmdMssAddNew.Location = New System.Drawing.Point(22, 224) + Me.cmdMssAddNew.Name = "cmdMssAddNew" + Me.cmdMssAddNew.Size = New System.Drawing.Size(59, 21) + Me.cmdMssAddNew.TabIndex = 77 + Me.cmdMssAddNew.Text = "AddNew" + Me.cmdMssAddNew.UseVisualStyleBackColor = True ' - 'GroupBox10 + 'cmdMssRefresh ' - Me.GroupBox10.Controls.Add(Me.cmdPrevRecord) - Me.GroupBox10.Controls.Add(Me.cmdFirstRecord) - Me.GroupBox10.Controls.Add(Me.cmdLastRecord) - Me.GroupBox10.Controls.Add(Me.cmdNextRecord) - Me.GroupBox10.Controls.Add(Me.txtbssNavigator) - Me.GroupBox10.Dock = System.Windows.Forms.DockStyle.Bottom - Me.GroupBox10.Location = New System.Drawing.Point(0, 263) - Me.GroupBox10.Name = "GroupBox10" - Me.GroupBox10.Size = New System.Drawing.Size(542, 31) - Me.GroupBox10.TabIndex = 72 - Me.GroupBox10.TabStop = False + Me.cmdMssRefresh.Location = New System.Drawing.Point(322, 226) + Me.cmdMssRefresh.Name = "cmdMssRefresh" + Me.cmdMssRefresh.Size = New System.Drawing.Size(59, 21) + Me.cmdMssRefresh.TabIndex = 76 + Me.cmdMssRefresh.Text = "Refresh" + Me.cmdMssRefresh.UseVisualStyleBackColor = True ' - 'cmdPrevRecord + 'cmdMssReset ' - Me.cmdPrevRecord.BackgroundImage = CType(resources.GetObject("cmdPrevRecord.BackgroundImage"), System.Drawing.Image) - Me.cmdPrevRecord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.cmdPrevRecord.Location = New System.Drawing.Point(34, 6) - Me.cmdPrevRecord.Name = "cmdPrevRecord" - Me.cmdPrevRecord.Size = New System.Drawing.Size(36, 24) - Me.cmdPrevRecord.TabIndex = 4 - Me.cmdPrevRecord.UseVisualStyleBackColor = True + Me.cmdMssReset.Location = New System.Drawing.Point(244, 226) + Me.cmdMssReset.Name = "cmdMssReset" + Me.cmdMssReset.Size = New System.Drawing.Size(59, 21) + Me.cmdMssReset.TabIndex = 75 + Me.cmdMssReset.Text = "Reset" + Me.cmdMssReset.UseVisualStyleBackColor = True ' - 'cmdFirstRecord + 'txtmssFTPMode ' - Me.cmdFirstRecord.BackgroundImage = CType(resources.GetObject("cmdFirstRecord.BackgroundImage"), System.Drawing.Image) - Me.cmdFirstRecord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.cmdFirstRecord.Location = New System.Drawing.Point(0, 6) - Me.cmdFirstRecord.Name = "cmdFirstRecord" - Me.cmdFirstRecord.Size = New System.Drawing.Size(35, 24) - Me.cmdFirstRecord.TabIndex = 3 - Me.cmdFirstRecord.UseVisualStyleBackColor = True + Me.txtmssFTPMode.FormattingEnabled = True + Me.txtmssFTPMode.Items.AddRange(New Object() {"FTP", "SFTP"}) + Me.txtmssFTPMode.Location = New System.Drawing.Point(194, 94) + Me.txtmssFTPMode.Name = "txtmssFTPMode" + Me.txtmssFTPMode.Size = New System.Drawing.Size(116, 21) + Me.txtmssFTPMode.TabIndex = 74 + Me.txtmssFTPMode.Text = "FTP" ' - 'cmdLastRecord + 'GroupBox1 ' - Me.cmdLastRecord.BackgroundImage = CType(resources.GetObject("cmdLastRecord.BackgroundImage"), System.Drawing.Image) - Me.cmdLastRecord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.cmdLastRecord.Location = New System.Drawing.Point(436, 6) - Me.cmdLastRecord.Name = "cmdLastRecord" - Me.cmdLastRecord.Size = New System.Drawing.Size(36, 24) - Me.cmdLastRecord.TabIndex = 2 - Me.cmdLastRecord.UseVisualStyleBackColor = True + Me.GroupBox1.Controls.Add(Me.cmdmssPrev) + Me.GroupBox1.Controls.Add(Me.cmdmssfirst) + Me.GroupBox1.Controls.Add(Me.cmdmssLast) + Me.GroupBox1.Controls.Add(Me.cmdmssNext) + Me.GroupBox1.Controls.Add(Me.txtmssNavigator) + Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.GroupBox1.Location = New System.Drawing.Point(0, 249) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(472, 36) + Me.GroupBox1.TabIndex = 71 + Me.GroupBox1.TabStop = False ' - 'cmdNextRecord + 'cmdmssPrev ' - Me.cmdNextRecord.BackgroundImage = CType(resources.GetObject("cmdNextRecord.BackgroundImage"), System.Drawing.Image) - Me.cmdNextRecord.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch - Me.cmdNextRecord.Location = New System.Drawing.Point(401, 6) - Me.cmdNextRecord.Name = "cmdNextRecord" - Me.cmdNextRecord.Size = New System.Drawing.Size(36, 24) - Me.cmdNextRecord.TabIndex = 1 - Me.cmdNextRecord.UseVisualStyleBackColor = True + Me.cmdmssPrev.BackgroundImage = CType(resources.GetObject("cmdmssPrev.BackgroundImage"), System.Drawing.Image) + Me.cmdmssPrev.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.cmdmssPrev.Location = New System.Drawing.Point(34, 6) + Me.cmdmssPrev.Name = "cmdmssPrev" + Me.cmdmssPrev.Size = New System.Drawing.Size(36, 24) + Me.cmdmssPrev.TabIndex = 4 + Me.cmdmssPrev.UseVisualStyleBackColor = True + ' + 'cmdmssfirst ' - 'txtbssNavigator + Me.cmdmssfirst.BackgroundImage = CType(resources.GetObject("cmdmssfirst.BackgroundImage"), System.Drawing.Image) + Me.cmdmssfirst.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.cmdmssfirst.Location = New System.Drawing.Point(0, 6) + Me.cmdmssfirst.Name = "cmdmssfirst" + Me.cmdmssfirst.Size = New System.Drawing.Size(35, 24) + Me.cmdmssfirst.TabIndex = 3 + Me.cmdmssfirst.UseVisualStyleBackColor = True ' - Me.txtbssNavigator.Location = New System.Drawing.Point(70, 8) - Me.txtbssNavigator.Name = "txtbssNavigator" - Me.txtbssNavigator.Size = New System.Drawing.Size(333, 20) - Me.txtbssNavigator.TabIndex = 0 - Me.txtbssNavigator.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + 'cmdmssLast ' - 'Label40 + Me.cmdmssLast.BackgroundImage = CType(resources.GetObject("cmdmssLast.BackgroundImage"), System.Drawing.Image) + Me.cmdmssLast.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.cmdmssLast.Location = New System.Drawing.Point(436, 6) + Me.cmdmssLast.Name = "cmdmssLast" + Me.cmdmssLast.Size = New System.Drawing.Size(36, 24) + Me.cmdmssLast.TabIndex = 2 + Me.cmdmssLast.UseVisualStyleBackColor = True ' - Me.Label40.AutoSize = True - Me.Label40.Location = New System.Drawing.Point(105, 106) - Me.Label40.Name = "Label40" - Me.Label40.Size = New System.Drawing.Size(99, 13) - Me.Label40.TabIndex = 16 - Me.Label40.Text = "FTP Transfer Mode" + 'cmdmssNext ' - 'lblbaseStation + Me.cmdmssNext.BackgroundImage = CType(resources.GetObject("cmdmssNext.BackgroundImage"), System.Drawing.Image) + Me.cmdmssNext.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.cmdmssNext.Location = New System.Drawing.Point(401, 6) + Me.cmdmssNext.Name = "cmdmssNext" + Me.cmdmssNext.Size = New System.Drawing.Size(36, 24) + Me.cmdmssNext.TabIndex = 1 + Me.cmdmssNext.UseVisualStyleBackColor = True ' - Me.lblbaseStation.AutoSize = True - Me.lblbaseStation.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblbaseStation.Location = New System.Drawing.Point(201, 13) - Me.lblbaseStation.Name = "lblbaseStation" - Me.lblbaseStation.Size = New System.Drawing.Size(79, 13) - Me.lblbaseStation.TabIndex = 30 - Me.lblbaseStation.Text = "Base Station" + 'txtmssNavigator ' - 'cmdBstDelete + Me.txtmssNavigator.Location = New System.Drawing.Point(70, 8) + Me.txtmssNavigator.Name = "txtmssNavigator" + Me.txtmssNavigator.Size = New System.Drawing.Size(333, 20) + Me.txtmssNavigator.TabIndex = 0 + Me.txtmssNavigator.TextAlign = System.Windows.Forms.HorizontalAlignment.Center ' - Me.cmdBstDelete.Location = New System.Drawing.Point(448, 232) - Me.cmdBstDelete.Name = "cmdBstDelete" - Me.cmdBstDelete.Size = New System.Drawing.Size(62, 21) - Me.cmdBstDelete.TabIndex = 14 - Me.cmdBstDelete.Text = "Delete" - Me.cmdBstDelete.UseVisualStyleBackColor = True + 'lblFtpTransferMode ' - 'cmdBsstUpdate + Me.lblFtpTransferMode.AutoSize = True + Me.lblFtpTransferMode.Location = New System.Drawing.Point(92, 97) + Me.lblFtpTransferMode.Name = "lblFtpTransferMode" + Me.lblFtpTransferMode.Size = New System.Drawing.Size(99, 13) + Me.lblFtpTransferMode.TabIndex = 14 + Me.lblFtpTransferMode.Text = "FTP Transfer Mode" ' - Me.cmdBsstUpdate.Location = New System.Drawing.Point(196, 232) - Me.cmdBsstUpdate.Name = "cmdBsstUpdate" - Me.cmdBsstUpdate.Size = New System.Drawing.Size(62, 21) - Me.cmdBsstUpdate.TabIndex = 12 - Me.cmdBsstUpdate.Text = "Update" - Me.cmdBsstUpdate.UseVisualStyleBackColor = True + 'lblMsgSwitch ' - 'cmdBstSave + Me.lblMsgSwitch.AutoSize = True + Me.lblMsgSwitch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblMsgSwitch.Location = New System.Drawing.Point(202, 10) + Me.lblMsgSwitch.Name = "lblMsgSwitch" + Me.lblMsgSwitch.Size = New System.Drawing.Size(99, 13) + Me.lblMsgSwitch.TabIndex = 13 + Me.lblMsgSwitch.Text = "Message Switch" ' - Me.cmdBstSave.Location = New System.Drawing.Point(112, 232) - Me.cmdBstSave.Name = "cmdBstSave" - Me.cmdBstSave.Size = New System.Drawing.Size(62, 21) - Me.cmdBstSave.TabIndex = 11 - Me.cmdBstSave.Text = "Save" - Me.cmdBstSave.UseVisualStyleBackColor = True + 'cmdMssDelete ' - 'txtbaseStationPWConfirm + Me.cmdMssDelete.Location = New System.Drawing.Point(400, 226) + Me.cmdMssDelete.Name = "cmdMssDelete" + Me.cmdMssDelete.Size = New System.Drawing.Size(59, 21) + Me.cmdMssDelete.TabIndex = 12 + Me.cmdMssDelete.Text = "Delete" + Me.cmdMssDelete.UseVisualStyleBackColor = True ' - Me.txtbaseStationPWConfirm.Location = New System.Drawing.Point(205, 195) - Me.txtbaseStationPWConfirm.Name = "txtbaseStationPWConfirm" - Me.txtbaseStationPWConfirm.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) - Me.txtbaseStationPWConfirm.Size = New System.Drawing.Size(87, 20) - Me.txtbaseStationPWConfirm.TabIndex = 10 + 'cmdMssUpdate ' - 'txtbaseStationPW + Me.cmdMssUpdate.Location = New System.Drawing.Point(166, 226) + Me.cmdMssUpdate.Name = "cmdMssUpdate" + Me.cmdMssUpdate.Size = New System.Drawing.Size(59, 21) + Me.cmdMssUpdate.TabIndex = 11 + Me.cmdMssUpdate.Text = "Update" + Me.cmdMssUpdate.UseVisualStyleBackColor = True ' - Me.txtbaseStationPW.Location = New System.Drawing.Point(205, 164) - Me.txtbaseStationPW.Name = "txtbaseStationPW" - Me.txtbaseStationPW.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) - Me.txtbaseStationPW.Size = New System.Drawing.Size(87, 20) - Me.txtbaseStationPW.TabIndex = 9 + 'cmdMssSave ' - 'txtBaseStationUser + Me.cmdMssSave.Location = New System.Drawing.Point(90, 224) + Me.cmdMssSave.Name = "cmdMssSave" + Me.cmdMssSave.Size = New System.Drawing.Size(59, 21) + Me.cmdMssSave.TabIndex = 10 + Me.cmdMssSave.Text = "Save" + Me.cmdMssSave.UseVisualStyleBackColor = True ' - Me.txtBaseStationUser.Location = New System.Drawing.Point(205, 133) - Me.txtBaseStationUser.Name = "txtBaseStationUser" - Me.txtBaseStationUser.Size = New System.Drawing.Size(87, 20) - Me.txtBaseStationUser.TabIndex = 8 + 'txtMSSConfirm ' - 'txtBaseStationFolder + Me.txtMSSConfirm.Location = New System.Drawing.Point(194, 180) + Me.txtMSSConfirm.Name = "txtMSSConfirm" + Me.txtMSSConfirm.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) + Me.txtMSSConfirm.Size = New System.Drawing.Size(81, 20) + Me.txtMSSConfirm.TabIndex = 10 ' - Me.txtBaseStationFolder.Location = New System.Drawing.Point(205, 71) - Me.txtBaseStationFolder.Name = "txtBaseStationFolder" - Me.txtBaseStationFolder.Size = New System.Drawing.Size(117, 20) - Me.txtBaseStationFolder.TabIndex = 6 + 'txtMSSPW ' - 'txtBaseStationAddress + Me.txtMSSPW.Location = New System.Drawing.Point(194, 151) + Me.txtMSSPW.Name = "txtMSSPW" + Me.txtMSSPW.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) + Me.txtMSSPW.Size = New System.Drawing.Size(81, 20) + Me.txtMSSPW.TabIndex = 9 ' - Me.txtBaseStationAddress.Location = New System.Drawing.Point(205, 40) - Me.txtBaseStationAddress.Name = "txtBaseStationAddress" - Me.txtBaseStationAddress.Size = New System.Drawing.Size(187, 20) - Me.txtBaseStationAddress.TabIndex = 5 + 'txtmssUser ' - 'lblConfirmInputPW + Me.txtmssUser.Location = New System.Drawing.Point(194, 122) + Me.txtmssUser.Name = "txtmssUser" + Me.txtmssUser.Size = New System.Drawing.Size(81, 20) + Me.txtmssUser.TabIndex = 8 ' - Me.lblConfirmInputPW.AutoSize = True - Me.lblConfirmInputPW.Location = New System.Drawing.Point(105, 199) - Me.lblConfirmInputPW.Name = "lblConfirmInputPW" - Me.lblConfirmInputPW.Size = New System.Drawing.Size(91, 13) - Me.lblConfirmInputPW.TabIndex = 4 - Me.lblConfirmInputPW.Text = "Confirm Password" + 'txtMSSFolder ' - 'lblInputPW + Me.txtMSSFolder.Location = New System.Drawing.Point(194, 64) + Me.txtMSSFolder.Name = "txtMSSFolder" + Me.txtMSSFolder.Size = New System.Drawing.Size(121, 20) + Me.txtMSSFolder.TabIndex = 6 ' - Me.lblInputPW.AutoSize = True - Me.lblInputPW.Location = New System.Drawing.Point(105, 168) - Me.lblInputPW.Name = "lblInputPW" - Me.lblInputPW.Size = New System.Drawing.Size(56, 13) - Me.lblInputPW.TabIndex = 3 - Me.lblInputPW.Text = "PassWord" + 'txtMSSAddress ' - 'lblInputUser + Me.txtMSSAddress.Location = New System.Drawing.Point(194, 35) + Me.txtMSSAddress.Name = "txtMSSAddress" + Me.txtMSSAddress.Size = New System.Drawing.Size(214, 20) + Me.txtMSSAddress.TabIndex = 5 ' - Me.lblInputUser.AutoSize = True - Me.lblInputUser.Location = New System.Drawing.Point(104, 137) - Me.lblInputUser.Name = "lblInputUser" - Me.lblInputUser.Size = New System.Drawing.Size(60, 13) - Me.lblInputUser.TabIndex = 2 - Me.lblInputUser.Text = "User Name" + 'lblmssConfirmPassword ' - 'lblFTPFolder + Me.lblmssConfirmPassword.AutoSize = True + Me.lblmssConfirmPassword.Location = New System.Drawing.Point(91, 184) + Me.lblmssConfirmPassword.Name = "lblmssConfirmPassword" + Me.lblmssConfirmPassword.Size = New System.Drawing.Size(91, 13) + Me.lblmssConfirmPassword.TabIndex = 4 + Me.lblmssConfirmPassword.Text = "Confirm Password" ' - Me.lblFTPFolder.AutoSize = True - Me.lblFTPFolder.Location = New System.Drawing.Point(105, 75) - Me.lblFTPFolder.Name = "lblFTPFolder" - Me.lblFTPFolder.Size = New System.Drawing.Size(63, 13) - Me.lblFTPFolder.TabIndex = 1 - Me.lblFTPFolder.Text = "Input Folder" + 'Label5 ' - 'lblBaseStationFTP + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(92, 155) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(53, 13) + Me.Label5.TabIndex = 3 + Me.Label5.Text = "Password" ' - Me.lblBaseStationFTP.AutoSize = True - Me.lblBaseStationFTP.Location = New System.Drawing.Point(104, 44) - Me.lblBaseStationFTP.Name = "lblBaseStationFTP" - Me.lblBaseStationFTP.Size = New System.Drawing.Size(68, 13) - Me.lblBaseStationFTP.TabIndex = 0 - Me.lblBaseStationFTP.Text = "FTP Address" + 'Label6 ' - 'cmdMSS + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(90, 126) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(60, 13) + Me.Label6.TabIndex = 2 + Me.Label6.Text = "User Name" ' - Me.cmdMSS.FlatStyle = System.Windows.Forms.FlatStyle.System - Me.cmdMSS.Location = New System.Drawing.Point(341, 44) - Me.cmdMSS.Name = "cmdMSS" - Me.cmdMSS.Size = New System.Drawing.Size(134, 28) - Me.cmdMSS.TabIndex = 1 - Me.cmdMSS.Text = "Message Switch" - Me.cmdMSS.UseVisualStyleBackColor = True + 'Label7 ' - 'cmdBaseStation + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(91, 68) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(63, 13) + Me.Label7.TabIndex = 1 + Me.Label7.Text = "Input Folder" ' - Me.cmdBaseStation.FlatStyle = System.Windows.Forms.FlatStyle.System - Me.cmdBaseStation.Location = New System.Drawing.Point(210, 44) - Me.cmdBaseStation.Name = "cmdBaseStation" - Me.cmdBaseStation.Size = New System.Drawing.Size(134, 28) - Me.cmdBaseStation.TabIndex = 0 - Me.cmdBaseStation.Text = "Base Station" - Me.cmdBaseStation.UseVisualStyleBackColor = True + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Location = New System.Drawing.Point(91, 39) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(68, 13) + Me.Label8.TabIndex = 0 + Me.Label8.Text = "FTP Address" ' 'pnlMsgEncoding ' @@ -1949,7 +1949,7 @@ Partial Class formAWSRealTime Me.pnlMsgEncoding.Controls.Add(Me.GroupBox6) Me.pnlMsgEncoding.Controls.Add(Me.grpIndicators) Me.pnlMsgEncoding.Controls.Add(Me.GroupBox5) - Me.pnlMsgEncoding.Location = New System.Drawing.Point(199, 473) + Me.pnlMsgEncoding.Location = New System.Drawing.Point(203, 435) Me.pnlMsgEncoding.Name = "pnlMsgEncoding" Me.pnlMsgEncoding.Size = New System.Drawing.Size(726, 51) Me.pnlMsgEncoding.TabIndex = 4 @@ -2292,14 +2292,14 @@ Partial Class formAWSRealTime Me.grpSites.PerformLayout() CType(Me.DataGridViewSites, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlServers.ResumeLayout(False) - Me.pnlMSS.ResumeLayout(False) - Me.pnlMSS.PerformLayout() - Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() Me.pnlBaseStation.ResumeLayout(False) Me.pnlBaseStation.PerformLayout() Me.GroupBox10.ResumeLayout(False) Me.GroupBox10.PerformLayout() + Me.pnlMSS.ResumeLayout(False) + Me.pnlMSS.PerformLayout() + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() Me.pnlMsgEncoding.ResumeLayout(False) Me.GroupBox6.ResumeLayout(False) CType(Me.dgrdCodeFlag, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/ClimsoftVer4/ClimsoftVer4/formAWSRealTime.resx b/ClimsoftVer4/ClimsoftVer4/formAWSRealTime.resx index 42281597..61706e5c 100644 --- a/ClimsoftVer4/ClimsoftVer4/formAWSRealTime.resx +++ b/ClimsoftVer4/ClimsoftVer4/formAWSRealTime.resx @@ -307,7 +307,7 @@ ymbw3AdadRRREqQ8gLcxkcHyuo+tTabGs3ntIodt/wB5hk9KKKswq7I//9k= - + /9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA @@ -351,7 +351,7 @@ SgR7yEPGeCfaiitUrrUmbcXoQyTRo2yaRYynyqDGWyBxniiiilYlH//Z - + /9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA @@ -405,7 +405,7 @@ P79T1IGAT1AwaKK418R2y2RwfjbxDqejeK9Qs7G+ntrWMx7Io3IVcxITgfUk/jRRRXRHWKONpXP/2Q== - + /9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA @@ -453,7 +453,7 @@ Z0jwbY3dvoOl2ejwSXrM0dlAsSk7VHRQOygfhXTr90+1FFRiXqaYJLUSiiitYfCiZ/Ez/9k= - + /9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA @@ -496,7 +496,7 @@ ymbw3AdadRRREqQ8gLcxkcHyuo+tTabGs3ntIodt/wB5hk9KKKswq7I//9k= - + /9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA @@ -540,7 +540,7 @@ SgR7yEPGeCfaiitUrrUmbcXoQyTRo2yaRYynyqDGWyBxniiiilYlH//Z - + /9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA @@ -594,7 +594,7 @@ P79T1IGAT1AwaKK418R2y2RwfjbxDqejeK9Qs7G+ntrWMx7Io3IVcxITgfUk/jRRRXRHWKONpXP/2Q== - + /9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA @@ -642,7 +642,7 @@ Z0jwbY3dvoOl2ejwSXrM0dlAsSk7VHRQOygfhXTr90+1FFRiXqaYJLUSiiitYfCiZ/Ez/9k= - + /9j/4AAQSkZJRgABAQEAYABgAAD/4QCqRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAZKG AAcAAAB0AAAALAAAAABDAFIARQBBAFQATwBSADoAIABnAGQALQBqAHAAZQBnACAAdgAxAC4AMAAgACgA diff --git a/ClimsoftVer4/ClimsoftVer4/formDaily1.vb b/ClimsoftVer4/ClimsoftVer4/formDaily1.vb index aa6a71ed..ebd86532 100644 --- a/ClimsoftVer4/ClimsoftVer4/formDaily1.vb +++ b/ClimsoftVer4/ClimsoftVer4/formDaily1.vb @@ -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}") diff --git a/ClimsoftVer4/ClimsoftVer4/frmDBUtilities.vb b/ClimsoftVer4/ClimsoftVer4/frmDBUtilities.vb index 75bd650b..8b601dfa 100644 --- a/ClimsoftVer4/ClimsoftVer4/frmDBUtilities.vb +++ b/ClimsoftVer4/ClimsoftVer4/frmDBUtilities.vb @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/ClimsoftVer4/ClimsoftVer4/frmGTSNOAA.vb b/ClimsoftVer4/ClimsoftVer4/frmGTSNOAA.vb index 0987ae34..052c364b 100644 --- a/ClimsoftVer4/ClimsoftVer4/frmGTSNOAA.vb +++ b/ClimsoftVer4/ClimsoftVer4/frmGTSNOAA.vb @@ -35,7 +35,9 @@ Public Class frmGTSNOAA strDataFile = strGTSDataFolder & "\noaa_gts.txt" + 'strDataFile = "C:\ProgramData\Climsoft4\gts_noaa_gsod" + MsgBox(txtDataFile.Text) 'Copy Data file to CLICOM folder and rename the files to [clicom_daily.csv] and [schema.ini] and overwrite existing file My.Computer.FileSystem.CopyFile(txtDataFile.Text, strDataFile, True) @@ -48,188 +50,193 @@ Public Class frmGTSNOAA conn.ConnectionString = connStr conn.Open() + Try - Using Reader As New _ + Using Reader As New _ Microsoft.VisualBasic.FileIO.TextFieldParser(strGTSDataFolder & "\noaa_gts.txt") - Reader.TextFieldType = _ - Microsoft.VisualBasic.FileIO.FieldType.FixedWidth - Reader.SetFieldWidths(7, 7, 8, 12, 10, 11, 11, 10, 10, 8, 8, 7, 8, 7, 8, 6) - Dim currentRow As String() - - '------------- - Dim lines As String() = IO.File.ReadAllLines(strGTSDataFolder & "\noaa_gts.txt") - - 'MessageBox.Show("The file had " & lines.Length & " lines.") - maxRows = lines.Length - 'MsgBox("Number of rows= " & maxRows) - '-------------- - - frmDataTransferProgress.Show() - - While Not Reader.EndOfData - Try - currentRow = Reader.ReadFields() - i = i + 1 - 'Display progress of data transfer - frmDataTransferProgress.txtDataTransferProgress1.Text = " Transferring record: " & i & " of " & maxRows - frmDataTransferProgress.txtDataTransferProgress1.Refresh() - 'MsgBox("Row :" & i) - j = 0 - stnId = "" - elemCode = 0 - obsDate = "" - obsLevel = "surface" - obsVal = "" - obsFlag = "" - qcStatus = 1 - acquisitionType = 4 - sql = "" - Dim currentField As String - For Each currentField In currentRow - j = j + 1 - ' MsgBox("Row " & i & "field " & j & "Value: " & currentField) - If j = 1 And IsNumeric(currentField) Then - - station = currentField - stnId = Strings.Left(station, 5) - ElseIf j = 3 Then - yyyymmdd = currentField - yyyy = Strings.Left(yyyymmdd, 4) - mm = Strings.Mid(yyyymmdd, 5, 2) - dd = Strings.Mid(yyyymmdd, 7, 2) - - - obsDate = yyyy & "-" & mm & "-" & dd & " 06:00:00" - - ' MsgBox("Date=" & obsDate) - - ElseIf j = 4 And IsDate(obsDate) Then - TmeanAndCount = currentField - Tmean = Val(Strings.Mid(TmeanAndCount, 1, 5)) - TmeanFlag = Strings.Mid(TmeanAndCount, 6, 2) - elemCode = 4 - obsVal = 5 / 9 * (Val(Tmean) - 32) - obsFlag = TmeanFlag - - 'Generate SQL string for inserting data into observationinitial table - sql = "INSERT IGNORE INTO observationFinal(recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,Flag,qcStatus,acquisitionType) " & _ - "VALUES ('" & stnId & "'," & elemCode & ",'" & obsDate & "','" & obsLevel & "'," & obsVal & ",'" & obsFlag & "'," & _ + Reader.TextFieldType = + Microsoft.VisualBasic.FileIO.FieldType.FixedWidth + Reader.SetFieldWidths(7, 7, 8, 12, 10, 11, 11, 10, 10, 8, 8, 7, 8, 7, 8, 6) + Dim currentRow As String() + + '------------- + Dim lines As String() = IO.File.ReadAllLines(strGTSDataFolder & "\noaa_gts.txt") + + 'MessageBox.Show("The file had " & lines.Length & " lines.") + maxRows = lines.Length + 'MsgBox("Number of rows= " & maxRows) + '-------------- + + frmDataTransferProgress.Show() + + While Not Reader.EndOfData + Try + currentRow = Reader.ReadFields() + i = i + 1 + 'Display progress of data transfer + frmDataTransferProgress.txtDataTransferProgress1.Text = " Transferring record: " & i & " of " & maxRows + frmDataTransferProgress.txtDataTransferProgress1.Refresh() + 'MsgBox("Row :" & i) + j = 0 + stnId = "" + elemCode = 0 + obsDate = "" + obsLevel = "surface" + obsVal = "" + obsFlag = "" + 'qcStatus = 1 + acquisitionType = 4 + sql = "" + Dim currentField As String + For Each currentField In currentRow + + j = j + 1 + ' MsgBox("Row " & i & "field " & j & "Value: " & currentField) + If j = 1 And IsNumeric(currentField) Then + + station = currentField + stnId = Strings.Left(station, 5) + ElseIf j = 3 Then + yyyymmdd = currentField + yyyy = Strings.Left(yyyymmdd, 4) + mm = Strings.Mid(yyyymmdd, 5, 2) + dd = Strings.Mid(yyyymmdd, 7, 2) + + + obsDate = yyyy & "-" & mm & "-" & dd & " 06:00:00" + + ' MsgBox("Date=" & obsDate) + + ElseIf j = 4 And IsDate(obsDate) Then + TmeanAndCount = currentField + Tmean = Val(Strings.Mid(TmeanAndCount, 1, 5)) + TmeanFlag = Strings.Mid(TmeanAndCount, 6, 2) + elemCode = 4 + obsVal = 5 / 9 * (Val(Tmean) - 32) + obsFlag = TmeanFlag + + 'Generate SQL string for inserting data into observationinitial table + sql = "INSERT IGNORE INTO observationFinal(recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,Flag,qcStatus,acquisitionType) " & + "VALUES ('" & stnId & "'," & elemCode & ",'" & obsDate & "','" & obsLevel & "'," & obsVal & ",'" & obsFlag & "'," & qcStatus & "," & acquisitionType & ")" - ' MsgBox(sql) - - ' Create the Command for executing query and set its properties - objCmd = New MySql.Data.MySqlClient.MySqlCommand(sql, conn) - Try - 'Execute query - objCmd.ExecuteNonQuery() - ' Catch ex As MySql.Data.MySqlClient.MySqlException - 'Ignore expected error i.e. error of Duplicates in MySqlException - Catch ex As Exception - 'Dispaly error message if it is different from the one trapped in 'Catch' execption above - MsgBox(ex.Message) - End Try - - - ElseIf j = 12 And IsDate(obsDate) Then - TmaxAndFlag = currentField - Tmax = Val(Strings.Mid(TmaxAndFlag, 1, 6)) - TmaxFlag = Strings.Mid(TmaxAndFlag, 5, 1) - elemCode = 2 - obsVal = 5 / 9 * (Val(Tmax) - 32) - obsFlag = TmaxFlag - - 'Generate SQL string for inserting data into observationinitial table - sql = "INSERT IGNORE INTO observationFinal(recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,Flag,qcStatus,acquisitionType) " & _ - "VALUES ('" & stnId & "'," & elemCode & ",'" & obsDate & "','" & obsLevel & "'," & obsVal & ",'" & obsFlag & "'," & _ + ' MsgBox(sql) + + ' Create the Command for executing query and set its properties + objCmd = New MySql.Data.MySqlClient.MySqlCommand(sql, conn) + Try + 'Execute query + objCmd.ExecuteNonQuery() + ' Catch ex As MySql.Data.MySqlClient.MySqlException + 'Ignore expected error i.e. error of Duplicates in MySqlException + Catch ex As Exception + 'Dispaly error message if it is different from the one trapped in 'Catch' execption above + MsgBox(ex.Message) + End Try + + + ElseIf j = 12 And IsDate(obsDate) Then + TmaxAndFlag = currentField + Tmax = Val(Strings.Mid(TmaxAndFlag, 1, 6)) + TmaxFlag = Strings.Mid(TmaxAndFlag, 5, 1) + elemCode = 2 + obsVal = 5 / 9 * (Val(Tmax) - 32) + obsFlag = TmaxFlag + + 'Generate SQL string for inserting data into observationinitial table + sql = "INSERT IGNORE INTO observationFinal(recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,Flag,qcStatus,acquisitionType) " & + "VALUES ('" & stnId & "'," & elemCode & ",'" & obsDate & "','" & obsLevel & "'," & obsVal & ",'" & obsFlag & "'," & qcStatus & "," & acquisitionType & ")" - ' Create the Command for executing query and set its properties - objCmd = New MySql.Data.MySqlClient.MySqlCommand(sql, conn) - Try - 'Execute query - objCmd.ExecuteNonQuery() - ' Catch ex As MySql.Data.MySqlClient.MySqlException - 'Ignore expected error i.e. error of Duplicates in MySqlException - Catch ex As Exception - 'Dispaly error message if it is different from the one trapped in 'Catch' execption above - MsgBox(ex.Message) - End Try - - ' MsgBox(sql) - - ElseIf j = 13 And IsDate(obsDate) Then - TminAndFlag = currentField - Tmin = Val(Strings.Mid(TminAndFlag, 1, 6)) - TminFlag = Strings.Mid(TminAndFlag, 5, 1) - elemCode = 3 - obsVal = 5 / 9 * (Val(Tmin) - 32) - obsFlag = TminFlag - - 'Generate SQL string for inserting data into observationinitial table - sql = "INSERT IGNORE INTO observationFinal(recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,Flag,qcStatus,acquisitionType) " & _ - "VALUES ('" & stnId & "'," & elemCode & ",'" & obsDate & "','" & obsLevel & "'," & obsVal & ",'" & obsFlag & "'," & _ + ' Create the Command for executing query and set its properties + objCmd = New MySql.Data.MySqlClient.MySqlCommand(sql, conn) + Try + 'Execute query + objCmd.ExecuteNonQuery() + ' Catch ex As MySql.Data.MySqlClient.MySqlException + 'Ignore expected error i.e. error of Duplicates in MySqlException + Catch ex As Exception + 'Dispaly error message if it is different from the one trapped in 'Catch' execption above + MsgBox(ex.Message) + End Try + + ' MsgBox(sql) + + ElseIf j = 13 And IsDate(obsDate) Then + TminAndFlag = currentField + Tmin = Val(Strings.Mid(TminAndFlag, 1, 6)) + TminFlag = Strings.Mid(TminAndFlag, 5, 1) + elemCode = 3 + obsVal = 5 / 9 * (Val(Tmin) - 32) + obsFlag = TminFlag + + 'Generate SQL string for inserting data into observationinitial table + sql = "INSERT IGNORE INTO observationFinal(recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,Flag,qcStatus,acquisitionType) " & + "VALUES ('" & stnId & "'," & elemCode & ",'" & obsDate & "','" & obsLevel & "'," & obsVal & ",'" & obsFlag & "'," & qcStatus & "," & acquisitionType & ")" - ' Create the Command for executing query and set its properties - objCmd = New MySql.Data.MySqlClient.MySqlCommand(sql, conn) - Try - 'Execute query - objCmd.ExecuteNonQuery() - ' Catch ex As MySql.Data.MySqlClient.MySqlException - 'Ignore expected error i.e. error of Duplicates in MySqlException - Catch ex As Exception - 'Dispaly error message if it is different from the one trapped in 'Catch' execption above - MsgBox(ex.Message) - End Try - - ' MsgBox(sql) - - ElseIf j = 14 And IsDate(obsDate) Then - PrecipAndFlag = currentField - Precip = Val(Strings.Mid(PrecipAndFlag, 1, 5)) - PrecipFlag = Strings.Mid(PrecipAndFlag, 5, 1) - elemCode = 5 - obsVal = 25.4 * Val(Precip) - obsFlag = PrecipFlag - 'Generate SQL string for inserting data into observationinitial table - sql = "INSERT IGNORE INTO observationFinal(recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,Flag,qcStatus,acquisitionType) " & _ - "VALUES ('" & stnId & "'," & elemCode & ",'" & obsDate & "','" & obsLevel & "'," & obsVal & ",'" & obsFlag & "'," & _ + ' Create the Command for executing query and set its properties + objCmd = New MySql.Data.MySqlClient.MySqlCommand(sql, conn) + Try + 'Execute query + objCmd.ExecuteNonQuery() + ' Catch ex As MySql.Data.MySqlClient.MySqlException + 'Ignore expected error i.e. error of Duplicates in MySqlException + Catch ex As Exception + 'Dispaly error message if it is different from the one trapped in 'Catch' execption above + MsgBox(ex.Message) + End Try + + ' MsgBox(sql) + + ElseIf j = 14 And IsDate(obsDate) Then + PrecipAndFlag = currentField + Precip = Val(Strings.Mid(PrecipAndFlag, 1, 5)) + PrecipFlag = Strings.Mid(PrecipAndFlag, 5, 1) + elemCode = 5 + obsVal = 25.4 * Val(Precip) + obsFlag = PrecipFlag + 'Generate SQL string for inserting data into observationinitial table + sql = "INSERT IGNORE INTO observationFinal(recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,Flag,qcStatus,acquisitionType) " & + "VALUES ('" & stnId & "'," & elemCode & ",'" & obsDate & "','" & obsLevel & "'," & obsVal & ",'" & obsFlag & "'," & qcStatus & "," & acquisitionType & ")" - ' Create the Command for executing query and set its properties - objCmd = New MySql.Data.MySqlClient.MySqlCommand(sql, conn) - Try - 'Execute query - objCmd.ExecuteNonQuery() - ' Catch ex As MySql.Data.MySqlClient.MySqlException - 'Ignore expected error i.e. error of Duplicates in MySqlException - Catch ex As Exception - 'Dispaly error message if it is different from the one trapped in 'Catch' execption above - MsgBox(ex.Message) - End Try + ' Create the Command for executing query and set its properties + objCmd = New MySql.Data.MySqlClient.MySqlCommand(sql, conn) + Try + 'Execute query + objCmd.ExecuteNonQuery() + ' Catch ex As MySql.Data.MySqlClient.MySqlException + 'Ignore expected error i.e. error of Duplicates in MySqlException + Catch ex As Exception + 'Dispaly error message if it is different from the one trapped in 'Catch' execption above + MsgBox(ex.Message) + End Try - ' MsgBox(sql) + ' MsgBox(sql) - End If - '------------------------ + End If + '------------------------ - ' MsgBox("Valid data record") + ' MsgBox("Valid data record") - '-------------------------- - 'MsgBox(currentField) - Next - Catch ex As Microsoft.VisualBasic.FileIO.MalformedLineException - MsgBox("Line " & ex.Message & _ + '-------------------------- + 'MsgBox(currentField) + Next + Catch ex As Microsoft.VisualBasic.FileIO.MalformedLineException + MsgBox("Line " & ex.Message & "is not valid and will be skipped.") - End Try - End While - End Using - frmDataTransferProgress.lblDataTransferProgress.ForeColor = Color.Red - frmDataTransferProgress.lblDataTransferProgress.Text = "Data transfer complete !" - - conn.Close() + End Try + End While + End Using + frmDataTransferProgress.lblDataTransferProgress.ForeColor = Color.Red + frmDataTransferProgress.lblDataTransferProgress.Text = "Data transfer complete !" + + conn.Close() + Catch ex As Exception + MsgBox(ex.Message) + End Try End Sub Private Sub btnBrowseDataFile_Click(sender As Object, e As EventArgs) Handles btnBrowseDataFile.Click @@ -237,9 +244,9 @@ Public Class frmGTSNOAA fd.Title = "Open File Dialog" fd.InitialDirectory = "C\*.*" 'fd.InitialDirectory = dsReg.Tables("regData").Rows(7).Item("keyValue") - fd.Filter = "Text files (*.txt)|*.txt|Text files (*.txt)|*.txt" + fd.Filter = "Text files (*.*)|*.*|Text files (*.*)|*.*" fd.FilterIndex = 2 - fd.RestoreDirectory = True + 'fd.RestoreDirectory = True ' If fd.ShowDialog() = DialogResult.OK Then txtDataFile.Text = fd.FileName @@ -248,7 +255,8 @@ Public Class frmGTSNOAA End Sub Private Sub frmGTSNOAA_Load(sender As Object, e As EventArgs) Handles Me.Load - strGTSDataFolder = dsReg.Tables("regData").Rows(11).Item("keyValue") + 'strGTSDataFolder = dsReg.Tables("regData").Rows(11).Item("keyValue") + strGTSDataFolder = "C:\ProgramData\Climsoft4\data" End Sub Private Sub txtDataFile_TextChanged(sender As Object, e As EventArgs) Handles txtDataFile.TextChanged diff --git a/ClimsoftVer4/ClimsoftVer4/frmGeneralSettings.vb b/ClimsoftVer4/ClimsoftVer4/frmGeneralSettings.vb index b260386d..305a35dd 100644 --- a/ClimsoftVer4/ClimsoftVer4/frmGeneralSettings.vb +++ b/ClimsoftVer4/ClimsoftVer4/frmGeneralSettings.vb @@ -348,8 +348,8 @@ Public Class frmGeneralSettings Else MsgBox("You don't have permission to view the information!", MsgBoxStyle.Exclamation) End If - MsgBox("When updating folder locations, Please keep forward slash'/' for QC output folder locations " & - "and backslash for other folder locations '\'. ", MsgBoxStyle.Information, "Folder Locations") + 'MsgBox("When updating folder locations, Please keep forward slash'/' for QC output folder locations " & + ' "and backslash for other folder locations '\'. ", MsgBoxStyle.Information, "Folder Locations") End Sub Sub UpdateRegistry() diff --git a/ClimsoftVer4/ClimsoftVer4/frmImportDaily.Designer.vb b/ClimsoftVer4/ClimsoftVer4/frmImportDaily.Designer.vb index 84ebe12a..0dea3c5a 100644 --- a/ClimsoftVer4/ClimsoftVer4/frmImportDaily.Designer.vb +++ b/ClimsoftVer4/ClimsoftVer4/frmImportDaily.Designer.vb @@ -79,6 +79,8 @@ Partial Class frmImportDaily Me.grpLaunched = New System.Windows.Forms.GroupBox() Me.lblLaunched = New System.Windows.Forms.Label() Me.txtDatetime = New System.Windows.Forms.TextBox() + Me.cboStns = New System.Windows.Forms.ComboBox() + Me.cboElement = New System.Windows.Forms.ComboBox() CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlHeaders.SuspendLayout() Me.grpSummary.SuspendLayout() @@ -91,9 +93,9 @@ Partial Class frmImportDaily ' Me.DataGridView1.AllowUserToOrderColumns = True Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.DataGridView1.Location = New System.Drawing.Point(15, 192) + Me.DataGridView1.Location = New System.Drawing.Point(12, 225) Me.DataGridView1.Name = "DataGridView1" - Me.DataGridView1.Size = New System.Drawing.Size(948, 405) + Me.DataGridView1.Size = New System.Drawing.Size(986, 388) Me.DataGridView1.TabIndex = 0 ' 'cmdOpenFile @@ -119,7 +121,7 @@ Partial Class frmImportDaily 'cmdView ' Me.cmdView.Enabled = False - Me.cmdView.Location = New System.Drawing.Point(14, 159) + Me.cmdView.Location = New System.Drawing.Point(14, 190) Me.cmdView.Name = "cmdView" Me.cmdView.Size = New System.Drawing.Size(69, 27) Me.cmdView.TabIndex = 3 @@ -130,7 +132,7 @@ Partial Class frmImportDaily ' Me.optComma.AutoSize = True Me.optComma.Checked = True - Me.optComma.Location = New System.Drawing.Point(82, 41) + Me.optComma.Location = New System.Drawing.Point(80, 41) Me.optComma.Name = "optComma" Me.optComma.Size = New System.Drawing.Size(60, 17) Me.optComma.TabIndex = 4 @@ -167,7 +169,7 @@ Partial Class frmImportDaily ' 'cmdClear ' - Me.cmdClear.Location = New System.Drawing.Point(217, 159) + Me.cmdClear.Location = New System.Drawing.Point(217, 190) Me.cmdClear.Name = "cmdClear" Me.cmdClear.Size = New System.Drawing.Size(62, 29) Me.cmdClear.TabIndex = 8 @@ -177,7 +179,7 @@ Partial Class frmImportDaily 'lstColumn ' Me.lstColumn.FormattingEnabled = True - Me.lstColumn.Location = New System.Drawing.Point(32, 53) + Me.lstColumn.Location = New System.Drawing.Point(20, 53) Me.lstColumn.Name = "lstColumn" Me.lstColumn.Size = New System.Drawing.Size(86, 30) Me.lstColumn.TabIndex = 9 @@ -186,14 +188,14 @@ Partial Class frmImportDaily ' Me.cmbFields.FormattingEnabled = True Me.cmbFields.Items.AddRange(New Object() {"station_id", "element_code", "date_time", "time", "yyyy", "mm", "dd", "hh", "level", "value", "NA", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31"}) - Me.cmbFields.Location = New System.Drawing.Point(124, 55) + Me.cmbFields.Location = New System.Drawing.Point(112, 55) Me.cmbFields.Name = "cmbFields" Me.cmbFields.Size = New System.Drawing.Size(147, 21) Me.cmbFields.TabIndex = 10 ' 'cmdRename ' - Me.cmdRename.Location = New System.Drawing.Point(164, 74) + Me.cmdRename.Location = New System.Drawing.Point(152, 74) Me.cmdRename.Name = "cmdRename" Me.cmdRename.Size = New System.Drawing.Size(56, 20) Me.cmdRename.TabIndex = 11 @@ -204,7 +206,7 @@ Partial Class frmImportDaily 'lblColumns ' Me.lblColumns.AutoSize = True - Me.lblColumns.Location = New System.Drawing.Point(29, 37) + Me.lblColumns.Location = New System.Drawing.Point(17, 37) Me.lblColumns.Name = "lblColumns" Me.lblColumns.Size = New System.Drawing.Size(92, 13) Me.lblColumns.TabIndex = 12 @@ -213,7 +215,7 @@ Partial Class frmImportDaily 'lblFieldName ' Me.lblFieldName.AutoSize = True - Me.lblFieldName.Location = New System.Drawing.Point(144, 37) + Me.lblFieldName.Location = New System.Drawing.Point(132, 37) Me.lblFieldName.Name = "lblFieldName" Me.lblFieldName.Size = New System.Drawing.Size(93, 13) Me.lblFieldName.TabIndex = 13 @@ -222,7 +224,7 @@ Partial Class frmImportDaily 'lblDelimiters ' Me.lblDelimiters.AutoSize = True - Me.lblDelimiters.Location = New System.Drawing.Point(24, 43) + Me.lblDelimiters.Location = New System.Drawing.Point(19, 43) Me.lblDelimiters.Name = "lblDelimiters" Me.lblDelimiters.Size = New System.Drawing.Size(52, 13) Me.lblDelimiters.TabIndex = 15 @@ -231,7 +233,7 @@ Partial Class frmImportDaily 'cmdLoadData ' Me.cmdLoadData.Enabled = False - Me.cmdLoadData.Location = New System.Drawing.Point(117, 159) + Me.cmdLoadData.Location = New System.Drawing.Point(117, 190) Me.cmdLoadData.Name = "cmdLoadData" Me.cmdLoadData.Size = New System.Drawing.Size(69, 29) Me.cmdLoadData.TabIndex = 16 @@ -249,7 +251,7 @@ Partial Class frmImportDaily 'lblStartRow ' Me.lblStartRow.AutoSize = True - Me.lblStartRow.Location = New System.Drawing.Point(24, 74) + Me.lblStartRow.Location = New System.Drawing.Point(19, 74) Me.lblStartRow.Name = "lblStartRow" Me.lblStartRow.Size = New System.Drawing.Size(54, 13) Me.lblStartRow.TabIndex = 20 @@ -257,7 +259,7 @@ Partial Class frmImportDaily ' 'txtStartRow ' - Me.txtStartRow.Location = New System.Drawing.Point(87, 70) + Me.txtStartRow.Location = New System.Drawing.Point(81, 70) Me.txtStartRow.Name = "txtStartRow" Me.txtStartRow.Size = New System.Drawing.Size(30, 20) Me.txtStartRow.TabIndex = 21 @@ -278,7 +280,7 @@ Partial Class frmImportDaily Me.chkScale.AutoSize = True Me.chkScale.Checked = True Me.chkScale.CheckState = System.Windows.Forms.CheckState.Checked - Me.chkScale.Location = New System.Drawing.Point(27, 105) + Me.chkScale.Location = New System.Drawing.Point(19, 105) Me.chkScale.Name = "chkScale" Me.chkScale.Size = New System.Drawing.Size(104, 17) Me.chkScale.TabIndex = 23 @@ -287,7 +289,7 @@ Partial Class frmImportDaily ' 'cmdSaveSpecs ' - Me.cmdSaveSpecs.Location = New System.Drawing.Point(22, 103) + Me.cmdSaveSpecs.Location = New System.Drawing.Point(10, 103) Me.cmdSaveSpecs.Name = "cmdSaveSpecs" Me.cmdSaveSpecs.Size = New System.Drawing.Size(111, 25) Me.cmdSaveSpecs.TabIndex = 24 @@ -296,7 +298,7 @@ Partial Class frmImportDaily ' 'cmdLoadSpecs ' - Me.cmdLoadSpecs.Location = New System.Drawing.Point(149, 103) + Me.cmdLoadSpecs.Location = New System.Drawing.Point(137, 103) Me.cmdLoadSpecs.Name = "cmdLoadSpecs" Me.cmdLoadSpecs.Size = New System.Drawing.Size(111, 25) Me.cmdLoadSpecs.TabIndex = 25 @@ -315,17 +317,17 @@ Partial Class frmImportDaily Me.pnlHeaders.Controls.Add(Me.lblColumns) Me.pnlHeaders.Controls.Add(Me.lblFieldName) Me.pnlHeaders.Enabled = False - Me.pnlHeaders.Location = New System.Drawing.Point(649, 36) + Me.pnlHeaders.Location = New System.Drawing.Point(681, 36) Me.pnlHeaders.Name = "pnlHeaders" Me.pnlHeaders.Padding = New System.Windows.Forms.Padding(1, 0, 1, 1) - Me.pnlHeaders.Size = New System.Drawing.Size(306, 134) + Me.pnlHeaders.Size = New System.Drawing.Size(275, 134) Me.pnlHeaders.TabIndex = 26 ' 'lblColumnHeaders ' Me.lblColumnHeaders.AutoSize = True Me.lblColumnHeaders.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblColumnHeaders.Location = New System.Drawing.Point(70, 1) + Me.lblColumnHeaders.Location = New System.Drawing.Point(58, 1) Me.lblColumnHeaders.Name = "lblColumnHeaders" Me.lblColumnHeaders.Size = New System.Drawing.Size(149, 13) Me.lblColumnHeaders.TabIndex = 26 @@ -340,7 +342,7 @@ Partial Class frmImportDaily ' 'cmdClose ' - Me.cmdClose.Location = New System.Drawing.Point(310, 159) + Me.cmdClose.Location = New System.Drawing.Point(310, 190) Me.cmdClose.Name = "cmdClose" Me.cmdClose.Size = New System.Drawing.Size(57, 29) Me.cmdClose.TabIndex = 27 @@ -349,7 +351,7 @@ Partial Class frmImportDaily ' 'cmdHelp ' - Me.cmdHelp.Location = New System.Drawing.Point(398, 159) + Me.cmdHelp.Location = New System.Drawing.Point(398, 190) Me.cmdHelp.Name = "cmdHelp" Me.cmdHelp.Size = New System.Drawing.Size(62, 29) Me.cmdHelp.TabIndex = 28 @@ -361,7 +363,7 @@ Partial Class frmImportDaily Me.lblRecords.AutoSize = True Me.lblRecords.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblRecords.ForeColor = System.Drawing.Color.Red - Me.lblRecords.Location = New System.Drawing.Point(339, 589) + Me.lblRecords.Location = New System.Drawing.Point(345, 612) Me.lblRecords.Name = "lblRecords" Me.lblRecords.Size = New System.Drawing.Size(0, 13) Me.lblRecords.TabIndex = 29 @@ -377,19 +379,20 @@ Partial Class frmImportDaily ' 'txtStn ' - Me.txtStn.Location = New System.Drawing.Point(207, 103) + Me.txtStn.Location = New System.Drawing.Point(486, 199) Me.txtStn.Name = "txtStn" Me.txtStn.Size = New System.Drawing.Size(140, 20) Me.txtStn.TabIndex = 31 + Me.txtStn.Visible = False ' 'lblStn ' Me.lblStn.AutoSize = True - Me.lblStn.Location = New System.Drawing.Point(147, 107) + Me.lblStn.Location = New System.Drawing.Point(19, 134) Me.lblStn.Name = "lblStn" - Me.lblStn.Size = New System.Drawing.Size(54, 13) + Me.lblStn.Size = New System.Drawing.Size(40, 13) Me.lblStn.TabIndex = 32 - Me.lblStn.Text = "Station ID" + Me.lblStn.Text = "Station" ' 'lblDefaultObsHour ' @@ -403,7 +406,7 @@ Partial Class frmImportDaily 'lblTRecords ' Me.lblTRecords.AutoSize = True - Me.lblTRecords.Location = New System.Drawing.Point(881, 589) + Me.lblTRecords.Location = New System.Drawing.Point(884, 654) Me.lblTRecords.Name = "lblTRecords" Me.lblTRecords.Size = New System.Drawing.Size(74, 13) Me.lblTRecords.TabIndex = 34 @@ -413,18 +416,19 @@ Partial Class frmImportDaily 'lblElmCode ' Me.lblElmCode.AutoSize = True - Me.lblElmCode.Location = New System.Drawing.Point(361, 107) + Me.lblElmCode.Location = New System.Drawing.Point(437, 134) Me.lblElmCode.Name = "lblElmCode" - Me.lblElmCode.Size = New System.Drawing.Size(73, 13) + Me.lblElmCode.Size = New System.Drawing.Size(45, 13) Me.lblElmCode.TabIndex = 40 - Me.lblElmCode.Text = "Element Code" + Me.lblElmCode.Text = "Element" ' 'txtElmCode ' - Me.txtElmCode.Location = New System.Drawing.Point(436, 103) + Me.txtElmCode.Location = New System.Drawing.Point(632, 199) Me.txtElmCode.Name = "txtElmCode" - Me.txtElmCode.Size = New System.Drawing.Size(79, 20) + Me.txtElmCode.Size = New System.Drawing.Size(124, 20) Me.txtElmCode.TabIndex = 39 + Me.txtElmCode.Visible = False ' 'grpSummary ' @@ -467,9 +471,9 @@ Partial Class frmImportDaily Me.pnlErrors.Controls.Add(Me.lstStations) Me.pnlErrors.Controls.Add(Me.lblElmeror) Me.pnlErrors.Controls.Add(Me.lblStnEror) - Me.pnlErrors.Location = New System.Drawing.Point(15, 610) + Me.pnlErrors.Location = New System.Drawing.Point(15, 625) Me.pnlErrors.Name = "pnlErrors" - Me.pnlErrors.Size = New System.Drawing.Size(587, 45) + Me.pnlErrors.Size = New System.Drawing.Size(587, 57) Me.pnlErrors.TabIndex = 44 Me.pnlErrors.Visible = False ' @@ -522,7 +526,7 @@ Partial Class frmImportDaily ' 'txtMissingFlag ' - Me.txtMissingFlag.Location = New System.Drawing.Point(128, 132) + Me.txtMissingFlag.Location = New System.Drawing.Point(118, 158) Me.txtMissingFlag.Name = "txtMissingFlag" Me.txtMissingFlag.Size = New System.Drawing.Size(58, 20) Me.txtMissingFlag.TabIndex = 45 @@ -530,7 +534,7 @@ Partial Class frmImportDaily 'lblMissingFlag ' Me.lblMissingFlag.AutoSize = True - Me.lblMissingFlag.Location = New System.Drawing.Point(29, 136) + Me.lblMissingFlag.Location = New System.Drawing.Point(19, 162) Me.lblMissingFlag.Name = "lblMissingFlag" Me.lblMissingFlag.Size = New System.Drawing.Size(91, 13) Me.lblMissingFlag.TabIndex = 46 @@ -619,11 +623,29 @@ Partial Class frmImportDaily Me.txtDatetime.Size = New System.Drawing.Size(114, 20) Me.txtDatetime.TabIndex = 0 ' + 'cboStns + ' + Me.cboStns.FormattingEnabled = True + Me.cboStns.Location = New System.Drawing.Point(66, 130) + Me.cboStns.Name = "cboStns" + Me.cboStns.Size = New System.Drawing.Size(348, 21) + Me.cboStns.TabIndex = 52 + ' + 'cboElement + ' + Me.cboElement.FormattingEnabled = True + Me.cboElement.Location = New System.Drawing.Point(486, 130) + Me.cboElement.Name = "cboElement" + Me.cboElement.Size = New System.Drawing.Size(191, 21) + Me.cboElement.TabIndex = 53 + ' 'frmImportDaily ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(970, 663) + Me.ClientSize = New System.Drawing.Size(970, 686) + Me.Controls.Add(Me.cboElement) + Me.Controls.Add(Me.cboStns) Me.Controls.Add(Me.grpLaunched) Me.Controls.Add(Me.lblDiff) Me.Controls.Add(Me.txtTdiff) @@ -734,4 +756,6 @@ Partial Class frmImportDaily Friend WithEvents grpLaunched As GroupBox Friend WithEvents txtDatetime As TextBox Friend WithEvents lblLaunched As Label + Friend WithEvents cboStns As ComboBox + Friend WithEvents cboElement As ComboBox End Class diff --git a/ClimsoftVer4/ClimsoftVer4/frmImportDaily.Designer1.vb b/ClimsoftVer4/ClimsoftVer4/frmImportDaily.Designer1.vb new file mode 100644 index 00000000..84ebe12a --- /dev/null +++ b/ClimsoftVer4/ClimsoftVer4/frmImportDaily.Designer1.vb @@ -0,0 +1,737 @@ + +Partial Class frmImportDaily + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + + Private Sub InitializeComponent() + Me.DataGridView1 = New System.Windows.Forms.DataGridView() + Me.cmdOpenFile = New System.Windows.Forms.Button() + Me.dlgOpenImportFile = New System.Windows.Forms.OpenFileDialog() + Me.txtImportFile = New System.Windows.Forms.TextBox() + Me.cmdView = New System.Windows.Forms.Button() + Me.optComma = New System.Windows.Forms.RadioButton() + Me.OptTAB = New System.Windows.Forms.RadioButton() + Me.OptOthers = New System.Windows.Forms.RadioButton() + Me.txtOther = New System.Windows.Forms.TextBox() + Me.cmdClear = New System.Windows.Forms.Button() + Me.lstColumn = New System.Windows.Forms.ListBox() + Me.cmbFields = New System.Windows.Forms.ComboBox() + Me.cmdRename = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.lblFieldName = New System.Windows.Forms.Label() + Me.lblDelimiters = New System.Windows.Forms.Label() + Me.cmdLoadData = New System.Windows.Forms.Button() + Me.txtObsHour = New System.Windows.Forms.TextBox() + Me.lblStartRow = New System.Windows.Forms.Label() + Me.txtStartRow = New System.Windows.Forms.TextBox() + Me.cmdtest = New System.Windows.Forms.Button() + Me.chkScale = New System.Windows.Forms.CheckBox() + Me.cmdSaveSpecs = New System.Windows.Forms.Button() + Me.cmdLoadSpecs = New System.Windows.Forms.Button() + Me.dlgSaveSchema = New System.Windows.Forms.SaveFileDialog() + Me.pnlHeaders = New System.Windows.Forms.Panel() + Me.lblColumnHeaders = New System.Windows.Forms.Label() + Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel() + Me.cmdClose = New System.Windows.Forms.Button() + Me.cmdHelp = New System.Windows.Forms.Button() + Me.lblRecords = New System.Windows.Forms.Label() + Me.lblType = New System.Windows.Forms.Label() + Me.txtStn = New System.Windows.Forms.TextBox() + Me.lblStn = New System.Windows.Forms.Label() + Me.lblDefaultObsHour = New System.Windows.Forms.Label() + Me.lblTRecords = New System.Windows.Forms.Label() + Me.lblElmCode = New System.Windows.Forms.Label() + Me.txtElmCode = New System.Windows.Forms.TextBox() + Me.grpSummary = New System.Windows.Forms.GroupBox() + Me.optMonthly = New System.Windows.Forms.RadioButton() + Me.optDekadal = New System.Windows.Forms.RadioButton() + Me.pnlErrors = New System.Windows.Forms.Panel() + Me.cmdSaveErrors = New System.Windows.Forms.Button() + Me.lstElements = New System.Windows.Forms.ListBox() + Me.lstStations = New System.Windows.Forms.ListBox() + Me.lblElmeror = New System.Windows.Forms.Label() + Me.lblStnEror = New System.Windows.Forms.Label() + Me.txtMissingFlag = New System.Windows.Forms.TextBox() + Me.lblMissingFlag = New System.Windows.Forms.Label() + Me.grpUpperAir = New System.Windows.Forms.GroupBox() + Me.chkUpperAir = New System.Windows.Forms.CheckBox() + Me.lblDiff = New System.Windows.Forms.Label() + Me.txtTdiff = New System.Windows.Forms.TextBox() + Me.chkUTC = New System.Windows.Forms.CheckBox() + Me.grpLaunched = New System.Windows.Forms.GroupBox() + Me.lblLaunched = New System.Windows.Forms.Label() + Me.txtDatetime = New System.Windows.Forms.TextBox() + CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlHeaders.SuspendLayout() + Me.grpSummary.SuspendLayout() + Me.pnlErrors.SuspendLayout() + Me.grpUpperAir.SuspendLayout() + Me.grpLaunched.SuspendLayout() + Me.SuspendLayout() + ' + 'DataGridView1 + ' + Me.DataGridView1.AllowUserToOrderColumns = True + Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.DataGridView1.Location = New System.Drawing.Point(15, 192) + Me.DataGridView1.Name = "DataGridView1" + Me.DataGridView1.Size = New System.Drawing.Size(948, 405) + Me.DataGridView1.TabIndex = 0 + ' + 'cmdOpenFile + ' + Me.cmdOpenFile.Location = New System.Drawing.Point(468, 0) + Me.cmdOpenFile.Name = "cmdOpenFile" + Me.cmdOpenFile.Size = New System.Drawing.Size(69, 23) + Me.cmdOpenFile.TabIndex = 1 + Me.cmdOpenFile.Text = "Open File" + Me.cmdOpenFile.UseVisualStyleBackColor = True + ' + 'dlgOpenImportFile + ' + Me.dlgOpenImportFile.FileName = "txtImport" + ' + 'txtImportFile + ' + Me.txtImportFile.Location = New System.Drawing.Point(4, 3) + Me.txtImportFile.Name = "txtImportFile" + Me.txtImportFile.Size = New System.Drawing.Size(464, 20) + Me.txtImportFile.TabIndex = 2 + ' + 'cmdView + ' + Me.cmdView.Enabled = False + Me.cmdView.Location = New System.Drawing.Point(14, 159) + Me.cmdView.Name = "cmdView" + Me.cmdView.Size = New System.Drawing.Size(69, 27) + Me.cmdView.TabIndex = 3 + Me.cmdView.Text = "View Data" + Me.cmdView.UseVisualStyleBackColor = True + ' + 'optComma + ' + Me.optComma.AutoSize = True + Me.optComma.Checked = True + Me.optComma.Location = New System.Drawing.Point(82, 41) + Me.optComma.Name = "optComma" + Me.optComma.Size = New System.Drawing.Size(60, 17) + Me.optComma.TabIndex = 4 + Me.optComma.TabStop = True + Me.optComma.Text = "Comma" + Me.optComma.UseVisualStyleBackColor = True + ' + 'OptTAB + ' + Me.OptTAB.AutoSize = True + Me.OptTAB.Location = New System.Drawing.Point(158, 41) + Me.OptTAB.Name = "OptTAB" + Me.OptTAB.Size = New System.Drawing.Size(46, 17) + Me.OptTAB.TabIndex = 5 + Me.OptTAB.Text = "TAB" + Me.OptTAB.UseVisualStyleBackColor = True + ' + 'OptOthers + ' + Me.OptOthers.AutoSize = True + Me.OptOthers.Location = New System.Drawing.Point(240, 41) + Me.OptOthers.Name = "OptOthers" + Me.OptOthers.Size = New System.Drawing.Size(54, 17) + Me.OptOthers.TabIndex = 6 + Me.OptOthers.Text = "Other:" + Me.OptOthers.UseVisualStyleBackColor = True + ' + 'txtOther + ' + Me.txtOther.Location = New System.Drawing.Point(293, 39) + Me.txtOther.Name = "txtOther" + Me.txtOther.Size = New System.Drawing.Size(24, 20) + Me.txtOther.TabIndex = 7 + ' + 'cmdClear + ' + Me.cmdClear.Location = New System.Drawing.Point(217, 159) + Me.cmdClear.Name = "cmdClear" + Me.cmdClear.Size = New System.Drawing.Size(62, 29) + Me.cmdClear.TabIndex = 8 + Me.cmdClear.Text = "Clear" + Me.cmdClear.UseVisualStyleBackColor = True + ' + 'lstColumn + ' + Me.lstColumn.FormattingEnabled = True + Me.lstColumn.Location = New System.Drawing.Point(32, 53) + Me.lstColumn.Name = "lstColumn" + Me.lstColumn.Size = New System.Drawing.Size(86, 30) + Me.lstColumn.TabIndex = 9 + ' + 'cmbFields + ' + Me.cmbFields.FormattingEnabled = True + Me.cmbFields.Items.AddRange(New Object() {"station_id", "element_code", "date_time", "time", "yyyy", "mm", "dd", "hh", "level", "value", "NA", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31"}) + Me.cmbFields.Location = New System.Drawing.Point(124, 55) + Me.cmbFields.Name = "cmbFields" + Me.cmbFields.Size = New System.Drawing.Size(147, 21) + Me.cmbFields.TabIndex = 10 + ' + 'cmdRename + ' + Me.cmdRename.Location = New System.Drawing.Point(164, 74) + Me.cmdRename.Name = "cmdRename" + Me.cmdRename.Size = New System.Drawing.Size(56, 20) + Me.cmdRename.TabIndex = 11 + Me.cmdRename.Text = "Rename" + Me.cmdRename.UseVisualStyleBackColor = True + Me.cmdRename.Visible = False + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.Location = New System.Drawing.Point(29, 37) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(92, 13) + Me.lblColumns.TabIndex = 12 + Me.lblColumns.Text = "Select Column No" + ' + 'lblFieldName + ' + Me.lblFieldName.AutoSize = True + Me.lblFieldName.Location = New System.Drawing.Point(144, 37) + Me.lblFieldName.Name = "lblFieldName" + Me.lblFieldName.Size = New System.Drawing.Size(93, 13) + Me.lblFieldName.TabIndex = 13 + Me.lblFieldName.Text = "Select Field Name" + ' + 'lblDelimiters + ' + Me.lblDelimiters.AutoSize = True + Me.lblDelimiters.Location = New System.Drawing.Point(24, 43) + Me.lblDelimiters.Name = "lblDelimiters" + Me.lblDelimiters.Size = New System.Drawing.Size(52, 13) + Me.lblDelimiters.TabIndex = 15 + Me.lblDelimiters.Text = "Delimiters" + ' + 'cmdLoadData + ' + Me.cmdLoadData.Enabled = False + Me.cmdLoadData.Location = New System.Drawing.Point(117, 159) + Me.cmdLoadData.Name = "cmdLoadData" + Me.cmdLoadData.Size = New System.Drawing.Size(69, 29) + Me.cmdLoadData.TabIndex = 16 + Me.cmdLoadData.Text = "Load Data" + Me.cmdLoadData.UseVisualStyleBackColor = True + ' + 'txtObsHour + ' + Me.txtObsHour.Location = New System.Drawing.Point(264, 70) + Me.txtObsHour.Name = "txtObsHour" + Me.txtObsHour.Size = New System.Drawing.Size(23, 20) + Me.txtObsHour.TabIndex = 18 + Me.txtObsHour.Text = "06" + ' + 'lblStartRow + ' + Me.lblStartRow.AutoSize = True + Me.lblStartRow.Location = New System.Drawing.Point(24, 74) + Me.lblStartRow.Name = "lblStartRow" + Me.lblStartRow.Size = New System.Drawing.Size(54, 13) + Me.lblStartRow.TabIndex = 20 + Me.lblStartRow.Text = "Start Row" + ' + 'txtStartRow + ' + Me.txtStartRow.Location = New System.Drawing.Point(87, 70) + Me.txtStartRow.Name = "txtStartRow" + Me.txtStartRow.Size = New System.Drawing.Size(30, 20) + Me.txtStartRow.TabIndex = 21 + Me.txtStartRow.Text = "2" + ' + 'cmdtest + ' + Me.cmdtest.Location = New System.Drawing.Point(680, -1) + Me.cmdtest.Name = "cmdtest" + Me.cmdtest.Size = New System.Drawing.Size(48, 26) + Me.cmdtest.TabIndex = 22 + Me.cmdtest.Text = "Test" + Me.cmdtest.UseVisualStyleBackColor = True + Me.cmdtest.Visible = False + ' + 'chkScale + ' + Me.chkScale.AutoSize = True + Me.chkScale.Checked = True + Me.chkScale.CheckState = System.Windows.Forms.CheckState.Checked + Me.chkScale.Location = New System.Drawing.Point(27, 105) + Me.chkScale.Name = "chkScale" + Me.chkScale.Size = New System.Drawing.Size(104, 17) + Me.chkScale.TabIndex = 23 + Me.chkScale.Text = "Remove Scaling" + Me.chkScale.UseVisualStyleBackColor = True + ' + 'cmdSaveSpecs + ' + Me.cmdSaveSpecs.Location = New System.Drawing.Point(22, 103) + Me.cmdSaveSpecs.Name = "cmdSaveSpecs" + Me.cmdSaveSpecs.Size = New System.Drawing.Size(111, 25) + Me.cmdSaveSpecs.TabIndex = 24 + Me.cmdSaveSpecs.Text = "Save Header Specs" + Me.cmdSaveSpecs.UseVisualStyleBackColor = True + ' + 'cmdLoadSpecs + ' + Me.cmdLoadSpecs.Location = New System.Drawing.Point(149, 103) + Me.cmdLoadSpecs.Name = "cmdLoadSpecs" + Me.cmdLoadSpecs.Size = New System.Drawing.Size(111, 25) + Me.cmdLoadSpecs.TabIndex = 25 + Me.cmdLoadSpecs.Text = "Load Header Specs" + Me.cmdLoadSpecs.UseVisualStyleBackColor = True + ' + 'pnlHeaders + ' + Me.pnlHeaders.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlHeaders.Controls.Add(Me.lblColumnHeaders) + Me.pnlHeaders.Controls.Add(Me.lstColumn) + Me.pnlHeaders.Controls.Add(Me.cmdLoadSpecs) + Me.pnlHeaders.Controls.Add(Me.cmdSaveSpecs) + Me.pnlHeaders.Controls.Add(Me.cmbFields) + Me.pnlHeaders.Controls.Add(Me.cmdRename) + Me.pnlHeaders.Controls.Add(Me.lblColumns) + Me.pnlHeaders.Controls.Add(Me.lblFieldName) + Me.pnlHeaders.Enabled = False + Me.pnlHeaders.Location = New System.Drawing.Point(649, 36) + Me.pnlHeaders.Name = "pnlHeaders" + Me.pnlHeaders.Padding = New System.Windows.Forms.Padding(1, 0, 1, 1) + Me.pnlHeaders.Size = New System.Drawing.Size(306, 134) + Me.pnlHeaders.TabIndex = 26 + ' + 'lblColumnHeaders + ' + Me.lblColumnHeaders.AutoSize = True + Me.lblColumnHeaders.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblColumnHeaders.Location = New System.Drawing.Point(70, 1) + Me.lblColumnHeaders.Name = "lblColumnHeaders" + Me.lblColumnHeaders.Size = New System.Drawing.Size(149, 13) + Me.lblColumnHeaders.TabIndex = 26 + Me.lblColumnHeaders.Text = "Columns Header Settings" + ' + 'ToolStripLabel1 + ' + Me.ToolStripLabel1.BackColor = System.Drawing.SystemColors.AppWorkspace + Me.ToolStripLabel1.Name = "ToolStripLabel1" + Me.ToolStripLabel1.Size = New System.Drawing.Size(148, 22) + Me.ToolStripLabel1.Text = "Save Header Specifications" + ' + 'cmdClose + ' + Me.cmdClose.Location = New System.Drawing.Point(310, 159) + Me.cmdClose.Name = "cmdClose" + Me.cmdClose.Size = New System.Drawing.Size(57, 29) + Me.cmdClose.TabIndex = 27 + Me.cmdClose.Text = "Close" + Me.cmdClose.UseVisualStyleBackColor = True + ' + 'cmdHelp + ' + Me.cmdHelp.Location = New System.Drawing.Point(398, 159) + Me.cmdHelp.Name = "cmdHelp" + Me.cmdHelp.Size = New System.Drawing.Size(62, 29) + Me.cmdHelp.TabIndex = 28 + Me.cmdHelp.Text = "Help" + Me.cmdHelp.UseVisualStyleBackColor = True + ' + 'lblRecords + ' + Me.lblRecords.AutoSize = True + Me.lblRecords.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblRecords.ForeColor = System.Drawing.Color.Red + Me.lblRecords.Location = New System.Drawing.Point(339, 589) + Me.lblRecords.Name = "lblRecords" + Me.lblRecords.Size = New System.Drawing.Size(0, 13) + Me.lblRecords.TabIndex = 29 + ' + 'lblType + ' + Me.lblType.AutoSize = True + Me.lblType.Location = New System.Drawing.Point(753, 6) + Me.lblType.Name = "lblType" + Me.lblType.Size = New System.Drawing.Size(0, 13) + Me.lblType.TabIndex = 30 + Me.lblType.Visible = False + ' + 'txtStn + ' + Me.txtStn.Location = New System.Drawing.Point(207, 103) + Me.txtStn.Name = "txtStn" + Me.txtStn.Size = New System.Drawing.Size(140, 20) + Me.txtStn.TabIndex = 31 + ' + 'lblStn + ' + Me.lblStn.AutoSize = True + Me.lblStn.Location = New System.Drawing.Point(147, 107) + Me.lblStn.Name = "lblStn" + Me.lblStn.Size = New System.Drawing.Size(54, 13) + Me.lblStn.TabIndex = 32 + Me.lblStn.Text = "Station ID" + ' + 'lblDefaultObsHour + ' + Me.lblDefaultObsHour.AutoSize = True + Me.lblDefaultObsHour.Location = New System.Drawing.Point(136, 74) + Me.lblDefaultObsHour.Name = "lblDefaultObsHour" + Me.lblDefaultObsHour.Size = New System.Drawing.Size(127, 13) + Me.lblDefaultObsHour.TabIndex = 33 + Me.lblDefaultObsHour.Text = "Default Observation Hour" + ' + 'lblTRecords + ' + Me.lblTRecords.AutoSize = True + Me.lblTRecords.Location = New System.Drawing.Point(881, 589) + Me.lblTRecords.Name = "lblTRecords" + Me.lblTRecords.Size = New System.Drawing.Size(74, 13) + Me.lblTRecords.TabIndex = 34 + Me.lblTRecords.Text = "Total Records" + Me.lblTRecords.Visible = False + ' + 'lblElmCode + ' + Me.lblElmCode.AutoSize = True + Me.lblElmCode.Location = New System.Drawing.Point(361, 107) + Me.lblElmCode.Name = "lblElmCode" + Me.lblElmCode.Size = New System.Drawing.Size(73, 13) + Me.lblElmCode.TabIndex = 40 + Me.lblElmCode.Text = "Element Code" + ' + 'txtElmCode + ' + Me.txtElmCode.Location = New System.Drawing.Point(436, 103) + Me.txtElmCode.Name = "txtElmCode" + Me.txtElmCode.Size = New System.Drawing.Size(79, 20) + Me.txtElmCode.TabIndex = 39 + ' + 'grpSummary + ' + Me.grpSummary.BackColor = System.Drawing.SystemColors.ControlLight + Me.grpSummary.Controls.Add(Me.optMonthly) + Me.grpSummary.Controls.Add(Me.optDekadal) + Me.grpSummary.Location = New System.Drawing.Point(331, 36) + Me.grpSummary.Name = "grpSummary" + Me.grpSummary.Padding = New System.Windows.Forms.Padding(1) + Me.grpSummary.Size = New System.Drawing.Size(183, 41) + Me.grpSummary.TabIndex = 42 + Me.grpSummary.TabStop = False + Me.grpSummary.Text = "Summarized Data Import" + ' + 'optMonthly + ' + Me.optMonthly.AutoSize = True + Me.optMonthly.Enabled = False + Me.optMonthly.Location = New System.Drawing.Point(114, 18) + Me.optMonthly.Name = "optMonthly" + Me.optMonthly.Size = New System.Drawing.Size(62, 17) + Me.optMonthly.TabIndex = 2 + Me.optMonthly.Text = "Monthly" + Me.optMonthly.UseVisualStyleBackColor = True + ' + 'optDekadal + ' + Me.optDekadal.AutoSize = True + Me.optDekadal.Location = New System.Drawing.Point(9, 18) + Me.optDekadal.Name = "optDekadal" + Me.optDekadal.Size = New System.Drawing.Size(65, 17) + Me.optDekadal.TabIndex = 1 + Me.optDekadal.Text = "Dekadal" + Me.optDekadal.UseVisualStyleBackColor = True + ' + 'pnlErrors + ' + Me.pnlErrors.Controls.Add(Me.cmdSaveErrors) + Me.pnlErrors.Controls.Add(Me.lstElements) + Me.pnlErrors.Controls.Add(Me.lstStations) + Me.pnlErrors.Controls.Add(Me.lblElmeror) + Me.pnlErrors.Controls.Add(Me.lblStnEror) + Me.pnlErrors.Location = New System.Drawing.Point(15, 610) + Me.pnlErrors.Name = "pnlErrors" + Me.pnlErrors.Size = New System.Drawing.Size(587, 45) + Me.pnlErrors.TabIndex = 44 + Me.pnlErrors.Visible = False + ' + 'cmdSaveErrors + ' + Me.cmdSaveErrors.Location = New System.Drawing.Point(466, 17) + Me.cmdSaveErrors.Name = "cmdSaveErrors" + Me.cmdSaveErrors.Size = New System.Drawing.Size(105, 25) + Me.cmdSaveErrors.TabIndex = 48 + Me.cmdSaveErrors.Text = "Save Errors to File" + Me.cmdSaveErrors.UseVisualStyleBackColor = True + ' + 'lstElements + ' + Me.lstElements.FormattingEnabled = True + Me.lstElements.Location = New System.Drawing.Point(352, 14) + Me.lstElements.Name = "lstElements" + Me.lstElements.Size = New System.Drawing.Size(106, 30) + Me.lstElements.TabIndex = 47 + Me.lstElements.Visible = False + ' + 'lstStations + ' + Me.lstStations.FormattingEnabled = True + Me.lstStations.Location = New System.Drawing.Point(81, 14) + Me.lstStations.Name = "lstStations" + Me.lstStations.Size = New System.Drawing.Size(119, 30) + Me.lstStations.TabIndex = 46 + Me.lstStations.Visible = False + ' + 'lblElmeror + ' + Me.lblElmeror.AutoSize = True + Me.lblElmeror.Location = New System.Drawing.Point(273, 18) + Me.lblElmeror.Name = "lblElmeror" + Me.lblElmeror.Size = New System.Drawing.Size(75, 13) + Me.lblElmeror.TabIndex = 45 + Me.lblElmeror.Text = "Element Errors" + Me.lblElmeror.Visible = False + ' + 'lblStnEror + ' + Me.lblStnEror.AutoSize = True + Me.lblStnEror.Location = New System.Drawing.Point(9, 16) + Me.lblStnEror.Name = "lblStnEror" + Me.lblStnEror.Size = New System.Drawing.Size(70, 13) + Me.lblStnEror.TabIndex = 44 + Me.lblStnEror.Text = "Station Errors" + Me.lblStnEror.Visible = False + ' + 'txtMissingFlag + ' + Me.txtMissingFlag.Location = New System.Drawing.Point(128, 132) + Me.txtMissingFlag.Name = "txtMissingFlag" + Me.txtMissingFlag.Size = New System.Drawing.Size(58, 20) + Me.txtMissingFlag.TabIndex = 45 + ' + 'lblMissingFlag + ' + Me.lblMissingFlag.AutoSize = True + Me.lblMissingFlag.Location = New System.Drawing.Point(29, 136) + Me.lblMissingFlag.Name = "lblMissingFlag" + Me.lblMissingFlag.Size = New System.Drawing.Size(91, 13) + Me.lblMissingFlag.TabIndex = 46 + Me.lblMissingFlag.Text = "Missing Data Flag" + ' + 'grpUpperAir + ' + Me.grpUpperAir.BackColor = System.Drawing.SystemColors.ControlLight + Me.grpUpperAir.Controls.Add(Me.chkUpperAir) + Me.grpUpperAir.Location = New System.Drawing.Point(526, 36) + Me.grpUpperAir.Name = "grpUpperAir" + Me.grpUpperAir.Size = New System.Drawing.Size(117, 35) + Me.grpUpperAir.TabIndex = 47 + Me.grpUpperAir.TabStop = False + Me.grpUpperAir.Visible = False + ' + 'chkUpperAir + ' + Me.chkUpperAir.AutoSize = True + Me.chkUpperAir.Location = New System.Drawing.Point(9, 9) + Me.chkUpperAir.Name = "chkUpperAir" + Me.chkUpperAir.Size = New System.Drawing.Size(96, 17) + Me.chkUpperAir.TabIndex = 3 + Me.chkUpperAir.Text = "Upper Air Data" + Me.chkUpperAir.UseVisualStyleBackColor = True + ' + 'lblDiff + ' + Me.lblDiff.AutoSize = True + Me.lblDiff.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblDiff.Location = New System.Drawing.Point(834, 7) + Me.lblDiff.Name = "lblDiff" + Me.lblDiff.Size = New System.Drawing.Size(117, 13) + Me.lblDiff.TabIndex = 50 + Me.lblDiff.Text = "Time difference (Hours)" + Me.lblDiff.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.lblDiff.Visible = False + ' + 'txtTdiff + ' + Me.txtTdiff.Location = New System.Drawing.Point(805, 3) + Me.txtTdiff.Name = "txtTdiff" + Me.txtTdiff.Size = New System.Drawing.Size(26, 20) + Me.txtTdiff.TabIndex = 49 + Me.txtTdiff.Text = "0" + Me.txtTdiff.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + Me.txtTdiff.Visible = False + ' + 'chkUTC + ' + Me.chkUTC.AutoSize = True + Me.chkUTC.Location = New System.Drawing.Point(700, 6) + Me.chkUTC.Name = "chkUTC" + Me.chkUTC.Size = New System.Drawing.Size(100, 17) + Me.chkUTC.TabIndex = 48 + Me.chkUTC.Text = "Convert to UTC" + Me.chkUTC.UseVisualStyleBackColor = True + Me.chkUTC.Visible = False + ' + 'grpLaunched + ' + Me.grpLaunched.BackColor = System.Drawing.SystemColors.ControlLight + Me.grpLaunched.Controls.Add(Me.lblLaunched) + Me.grpLaunched.Controls.Add(Me.txtDatetime) + Me.grpLaunched.Location = New System.Drawing.Point(445, 79) + Me.grpLaunched.Name = "grpLaunched" + Me.grpLaunched.Size = New System.Drawing.Size(201, 44) + Me.grpLaunched.TabIndex = 51 + Me.grpLaunched.TabStop = False + Me.grpLaunched.Text = "DateAndTime (dd/mm/yyyy hh:nn:ss)" + Me.grpLaunched.Visible = False + ' + 'lblLaunched + ' + Me.lblLaunched.AutoSize = True + Me.lblLaunched.Location = New System.Drawing.Point(8, 21) + Me.lblLaunched.Name = "lblLaunched" + Me.lblLaunched.Size = New System.Drawing.Size(55, 13) + Me.lblLaunched.TabIndex = 1 + Me.lblLaunched.Text = "Launched" + ' + 'txtDatetime + ' + Me.txtDatetime.Location = New System.Drawing.Point(67, 16) + Me.txtDatetime.Name = "txtDatetime" + Me.txtDatetime.Size = New System.Drawing.Size(114, 20) + Me.txtDatetime.TabIndex = 0 + ' + 'frmImportDaily + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(970, 663) + Me.Controls.Add(Me.grpLaunched) + Me.Controls.Add(Me.lblDiff) + Me.Controls.Add(Me.txtTdiff) + Me.Controls.Add(Me.chkUTC) + Me.Controls.Add(Me.grpUpperAir) + Me.Controls.Add(Me.lblMissingFlag) + Me.Controls.Add(Me.txtMissingFlag) + Me.Controls.Add(Me.pnlErrors) + Me.Controls.Add(Me.grpSummary) + Me.Controls.Add(Me.lblElmCode) + Me.Controls.Add(Me.txtElmCode) + Me.Controls.Add(Me.lblTRecords) + Me.Controls.Add(Me.lblDefaultObsHour) + Me.Controls.Add(Me.lblStn) + Me.Controls.Add(Me.txtStn) + Me.Controls.Add(Me.lblType) + Me.Controls.Add(Me.lblRecords) + Me.Controls.Add(Me.cmdHelp) + Me.Controls.Add(Me.cmdClose) + Me.Controls.Add(Me.pnlHeaders) + Me.Controls.Add(Me.cmdtest) + Me.Controls.Add(Me.chkScale) + Me.Controls.Add(Me.txtStartRow) + Me.Controls.Add(Me.lblStartRow) + Me.Controls.Add(Me.txtObsHour) + Me.Controls.Add(Me.cmdLoadData) + Me.Controls.Add(Me.lblDelimiters) + Me.Controls.Add(Me.cmdClear) + Me.Controls.Add(Me.txtOther) + Me.Controls.Add(Me.OptOthers) + Me.Controls.Add(Me.OptTAB) + Me.Controls.Add(Me.optComma) + Me.Controls.Add(Me.cmdView) + Me.Controls.Add(Me.txtImportFile) + Me.Controls.Add(Me.cmdOpenFile) + Me.Controls.Add(Me.DataGridView1) + Me.Name = "frmImportDaily" + Me.Text = "Daily/Hourly Data" + CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlHeaders.ResumeLayout(False) + Me.pnlHeaders.PerformLayout() + Me.grpSummary.ResumeLayout(False) + Me.grpSummary.PerformLayout() + Me.pnlErrors.ResumeLayout(False) + Me.pnlErrors.PerformLayout() + Me.grpUpperAir.ResumeLayout(False) + Me.grpUpperAir.PerformLayout() + Me.grpLaunched.ResumeLayout(False) + Me.grpLaunched.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents DataGridView1 As System.Windows.Forms.DataGridView + Friend WithEvents cmdOpenFile As System.Windows.Forms.Button + Friend WithEvents dlgOpenImportFile As System.Windows.Forms.OpenFileDialog + Friend WithEvents txtImportFile As System.Windows.Forms.TextBox + Friend WithEvents cmdView As System.Windows.Forms.Button + Friend WithEvents optComma As System.Windows.Forms.RadioButton + Friend WithEvents OptTAB As System.Windows.Forms.RadioButton + Friend WithEvents OptOthers As System.Windows.Forms.RadioButton + Friend WithEvents txtOther As System.Windows.Forms.TextBox + Friend WithEvents cmdClear As System.Windows.Forms.Button + Friend WithEvents lstColumn As System.Windows.Forms.ListBox + Friend WithEvents cmbFields As System.Windows.Forms.ComboBox + Friend WithEvents cmdRename As System.Windows.Forms.Button + Friend WithEvents lblColumns As System.Windows.Forms.Label + Friend WithEvents lblFieldName As System.Windows.Forms.Label + Friend WithEvents lblDelimiters As System.Windows.Forms.Label + Friend WithEvents cmdLoadData As System.Windows.Forms.Button + Friend WithEvents txtObsHour As System.Windows.Forms.TextBox + Friend WithEvents lblStartRow As System.Windows.Forms.Label + Friend WithEvents txtStartRow As System.Windows.Forms.TextBox + Friend WithEvents cmdtest As System.Windows.Forms.Button + Friend WithEvents chkScale As System.Windows.Forms.CheckBox + Friend WithEvents cmdSaveSpecs As System.Windows.Forms.Button + Friend WithEvents cmdLoadSpecs As System.Windows.Forms.Button + Friend WithEvents dlgSaveSchema As System.Windows.Forms.SaveFileDialog + Friend WithEvents pnlHeaders As System.Windows.Forms.Panel + Friend WithEvents lblColumnHeaders As System.Windows.Forms.Label + Friend WithEvents ToolStripLabel1 As System.Windows.Forms.ToolStripLabel + Friend WithEvents cmdClose As System.Windows.Forms.Button + Friend WithEvents cmdHelp As System.Windows.Forms.Button + Friend WithEvents lblRecords As System.Windows.Forms.Label + Friend WithEvents lblType As System.Windows.Forms.Label + Friend WithEvents txtStn As System.Windows.Forms.TextBox + Friend WithEvents lblStn As System.Windows.Forms.Label + Friend WithEvents lblDefaultObsHour As System.Windows.Forms.Label + Friend WithEvents lblTRecords As System.Windows.Forms.Label + Friend WithEvents lblElmCode As Label + Friend WithEvents txtElmCode As TextBox + Friend WithEvents grpSummary As GroupBox + Friend WithEvents optMonthly As RadioButton + Friend WithEvents optDekadal As RadioButton + Friend WithEvents pnlErrors As Panel + Friend WithEvents cmdSaveErrors As Button + Friend WithEvents lstElements As ListBox + Friend WithEvents lstStations As ListBox + Friend WithEvents lblElmeror As Label + Friend WithEvents lblStnEror As Label + Friend WithEvents txtMissingFlag As TextBox + Friend WithEvents lblMissingFlag As Label + Friend WithEvents grpUpperAir As GroupBox + Friend WithEvents chkUpperAir As CheckBox + Friend WithEvents lblDiff As Label + Friend WithEvents txtTdiff As TextBox + Friend WithEvents chkUTC As CheckBox + Friend WithEvents grpLaunched As GroupBox + Friend WithEvents txtDatetime As TextBox + Friend WithEvents lblLaunched As Label +End Class diff --git a/ClimsoftVer4/ClimsoftVer4/frmImportDaily.vb b/ClimsoftVer4/ClimsoftVer4/frmImportDaily.vb index 273bedb8..ad2cbc90 100644 --- a/ClimsoftVer4/ClimsoftVer4/frmImportDaily.vb +++ b/ClimsoftVer4/ClimsoftVer4/frmImportDaily.vb @@ -87,8 +87,10 @@ End Using - ' In case of AWS files + ' Special file structures If Text = "AWS Data Import" Then List_AWSFields() + If Text = "NOAA GTS Data Import" Then List_NOAAGTSFields() + If Text = "Monthly Data" Then List_Monthly() If Text = "Multiple Columns Data Import" Then If chkUpperAir.Checked Then List_UpperAirFields() @@ -96,6 +98,7 @@ List_ObsFields() End If End If + ''Populate the datagridview with data from the file 'For Each THisLine In My.Computer.FileSystem.ReadAllText(txtImportFile.Text).Split(Environment.NewLine) ' DataGridView1.Rows.Add(THisLine.Split(delimit)) @@ -247,7 +250,47 @@ End Try dbcon.Close() End Sub + Sub List_Monthly() + + Try + cmbFields.Items.Clear() + ' Add station, date and time headers whichever exist + cmbFields.Items.Add("station_id") + cmbFields.Items.Add("element_code") + cmbFields.Items.Add("yyyy") + 'cmbFields.Items.Add("value") + cmbFields.Items.Add("NA") + ' Add the AWS element codes existing in obselement table + + dbConnectionString = frmLogin.txtusrpwd.Text + dbcon.ConnectionString = dbConnectionString + dbcon.Open() + + For i = 1 To 12 + cmbFields.Items.Add(i) + Next + + 'sql = "select elementId, abbreviation from obselement where elementId > 880 ;" + + 'da1 = New MySql.Data.MySqlClient.MySqlDataAdapter(sql, dbcon) + 'ds1.Clear() + 'da1.Fill(ds1, "obselement") + + 'kount = ds1.Tables("obselement").Rows.Count + + 'If kount = 0 Then Exit Sub + + 'For i = 0 To kount - 1 + ' cmbFields.Items.Add(ds1.Tables("obselement").Rows(i).Item("elementId") & "-" & ds1.Tables("obselement").Rows(i).Item("abbreviation")) + 'Next + + Catch ex As Exception + MsgBox(ex.Message) + dbcon.Close() + End Try + dbcon.Close() + End Sub Private Sub cmdClear_Click(sender As Object, e As EventArgs) Handles cmdClear.Click 'DataGridView1.Rows.Clear() DataGridView1.Columns.Clear() @@ -316,6 +359,8 @@ DataCat = "CLICOMHLY" ElseIf lblType.Text = "Monthly" Then DataCat = "Monthly" + ElseIf lblType.Text = "NOAA_GTS" Then + DataCat = "NOAAGTS" Else ' Other future data categories 'DataCat = Get_DataCat() @@ -348,9 +393,7 @@ End If Next - lblRecords.Text = "" - 'MsgBox(DataCat) Select Case DataCat Case "Daily1" Load_Daily1() @@ -376,6 +419,8 @@ Load_CLICOM("hourly") Case "Monthly" Load_Monthly() + Case "NOAAGTS" + Load_NOAAGTS() End Select FileClose(101) @@ -383,6 +428,8 @@ ' Create sql query sql0 = "LOAD DATA local INFILE '" & fl2 & "' IGNORE INTO TABLE observationinitial FIELDS TERMINATED BY ',' (recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,flag,period,acquisitionType);" + If DataCat = "NOAAGTS" Then sql0 = "LOAD DATA local INFILE '" & fl2 & "' IGNORE INTO TABLE observationfinal FIELDS TERMINATED BY ',' (recordedFrom,describedBy,obsDatetime,obsLevel,obsValue,flag,period,acquisitionType);" + objCmd = New MySql.Data.MySqlClient.MySqlCommand(sql0, dbcon) 'Execute query @@ -463,10 +510,12 @@ If MyReader.LineNumber > Val(txtStartRow.Text) Then ' Get the record index col = 0 - st = txtStn.Text + 'st = txtStn.Text + st = cboStns.SelectedValue acquisitiontype = 6 h = txtObsHour.Text - cod = txtElmCode.Text + 'cod = txtElmCode.Text + cod = cboElement.SelectedValue lvl = "surface" For Each currentField In currentRow @@ -566,9 +615,12 @@ If MyReader.LineNumber > Val(txtStartRow.Text) Then ' Initialize values col = 0 - st = txtStn.Text + 'st = txtStn.Text + st = cboStns.SelectedValue + h = txtObsHour.Text cod = txtElmCode.Text + cod = cboElement.SelectedValue lvl = "surface" acquisitiontype = 6 dttime = "" @@ -669,8 +721,10 @@ If MyReader.LineNumber > Val(txtStartRow.Text) Then col = 0 - st = txtStn.Text - cod = txtElmCode.Text + 'st = txtStn.Text + st = cboStns.SelectedValue + 'cod = txtElmCode.Text + cod = cboElement.SelectedValue acquisitiontype = 6 lvl = "surface" For Each currentField In currentRow @@ -781,7 +835,9 @@ ' Initialize values col = 0 - st = txtStn.Text + 'st = txtStn.Text + st = cboStns.SelectedValue + 'MsgBox(st) acquisitiontype = 3 dt_tm = False @@ -872,8 +928,10 @@ ' Initialize values col = 0 - st = txtStn.Text - cod = txtElmCode.Text + 'st = txtStn.Text + st = cboStns.SelectedValue + 'cod = txtElmCode.Text + cod = cboElement.SelectedValue acquisitiontype = 3 dt_tm = False @@ -964,9 +1022,11 @@ If MyReader.LineNumber > Val(txtStartRow.Text) Then - st = txtStn.Text + 'st = txtStn.Text + st = cboStns.SelectedValue h = Val(txtObsHour.Text) - cod = txtElmCode.Text + 'cod = txtElmCode.Text + cod = cboElement.SelectedValue acquisitiontype = 6 dttcom = 0 col = 0 @@ -1134,7 +1194,8 @@ If MyReader.LineNumber > Val(txtStartRow.Text) Then ' Get the record index col = 0 - st = txtStn.Text + 'st = txtStn.Text + st = cboStns.SelectedValue tm = txtObsHour.Text 'flg = "" acquisitiontype = 2 @@ -1201,7 +1262,8 @@ End Sub Sub Load_Monthly() - + 'MsgBox(1) + 'MsgBox(cboElement.SelectedValue) Dim dt, st, cod, y, m, d, h, dttime, hd, dat, flg As String Dim acquisitiontype As Integer @@ -1220,10 +1282,13 @@ If MyReader.LineNumber > Val(txtStartRow.Text) Then ' Get the record index col = 0 - st = txtStn.Text + 'st = txtStn.Text + st = cboStns.SelectedValue acquisitiontype = 6 h = txtObsHour.Text - cod = txtElmCode.Text + 'cod = txtElmCode.Text + cod = cboElement.SelectedValue + For Each currentField In currentRow hd = DataGridView1.Columns(col).Name @@ -1242,6 +1307,7 @@ Else ' Data column encountered flg = "" + If IsNumeric(hd) Then d = DateTime.DaysInMonth(y, hd) dttime = y & "-" & hd & "-" & d & " " & h & ":00" @@ -1270,7 +1336,9 @@ If Station_Element(st, cod) Then If IsDate(dttime) Then If Not Add_Record(st, cod, dttime, dat, flg, acquisitiontype) Then Exit For 'Sub End If + End If + End If ' Show upload progress lblRecords.Text = "Loading: " & MyReader.LineNumber - 1 & " of " & lblTRecords.Text ' & " " & '.RowCount - Val(txtStartRow.Text) '1 @@ -1286,7 +1354,7 @@ End Using Catch ex As Exception - If MsgBox(ex.HResult & " " & ex.Message, MsgBoxStyle.OkCancel) = vbCancel Then Exit Sub + If MsgBox(ex.HResult & " " & ex.Message, MsgBoxStyle.OkCancel) = vbCancel Then Exit Sub End Try End Sub @@ -1321,7 +1389,8 @@ dt_tm = y & "-" & m & "-" & d & " " & h & ":" & n & ":" & s 'MsgBox(dt_tm & " " & lvl) - st = txtStn.Text + 'st = txtStn.Text + st = cboStns.SelectedValue acquisitiontype = 6 dttcom = 0 col = 0 @@ -1384,7 +1453,147 @@ End Try End Sub + Sub List_NOAAGTSFields() + + Try + + cmbFields.Items.Clear() + ' Add station, date and time headers whichever exist + cmbFields.Items.Add("station_id") + cmbFields.Items.Add("date") + cmbFields.Items.Add("date_time") + 'cmbFields.Items.Add("value") + cmbFields.Items.Add("NA") + ' Add the AWS element codes existing in obselement table + + dbConnectionString = frmLogin.txtusrpwd.Text + dbcon.ConnectionString = dbConnectionString + dbcon.Open() + + sql = "select elementId, abbreviation from obselement where elementId < 881 ;" + + da1 = New MySql.Data.MySqlClient.MySqlDataAdapter(sql, dbcon) + ds1.Clear() + da1.Fill(ds1, "obselement") + + kount = ds1.Tables("obselement").Rows.Count + + If kount = 0 Then Exit Sub + + For i = 0 To kount - 1 + cmbFields.Items.Add(ds1.Tables("obselement").Rows(i).Item("elementId") & "-" & ds1.Tables("obselement").Rows(i).Item("abbreviation")) + Next + + Catch ex As Exception + MsgBox(ex.Message) + dbcon.Close() + End Try + dbcon.Close() + End Sub + Sub Load_NOAAGTS() + 'MsgBox("Aws") + Dim st, cod, dttim, y, m, d, h, tt, dt, dat, hd, flg As String + Dim dt_tm As Boolean + Dim acquisitiontype As Integer + + Try + Using MyReader As New Microsoft.VisualBasic.FileIO.TextFieldParser(txtImportFile.Text) + MyReader.TextFieldType = FileIO.FieldType.Delimited + MyReader.SetDelimiters(delimit) + + Do While MyReader.EndOfData = False + + currentRow = MyReader.ReadFields() + If MyReader.LineNumber > Val(txtStartRow.Text) Then + + ' Initialize values + col = 0 + 'st = txtStn.Text + st = cboStns.SelectedValue + acquisitiontype = 3 + dt_tm = False + dt = "" + dttim = "" + h = txtObsHour.Text + For Each currentField In currentRow + hd = DataGridView1.Columns(col).Name + dat = currentField + + With DataGridView1 + If col < .ColumnCount Then + If .Columns(col).Name = "station_id" Then ' Station column found + st = dat + ElseIf .Columns(col).Name = "date_time" Then ' Combined Date and Timme column found + dttim = dat + dt_tm = True + ElseIf .Columns(col).Name = "date" Then ' Separate Date column found + dt = dat + ElseIf .Columns(col).Name = "NA" Then ' Not Required + 'Do nothing + Else ' Data Column found + 'MsgBox(st) + cod = .Columns(col).Name + ' dat = .Rows(i).Cells(j).Value + If dt_tm = False Then dttim = dt & " " & h & ":00" + + dttim = DateAndTime.Year(dttim) & "-" & DateAndTime.Month(dttim) & "-" & DateAndTime.Day(dttim) & " " & Format(DateAndTime.Hour(dttim), "00") & ":" & Format(DateAndTime.Minute(dttim), "00") & ":" & Format(DateAndTime.Second(dttim), "00") + + If IsDate(dttim) Then + + ' Check for missing flag data values + If dat = txtMissingFlag.Text Then + ' Skip Uploading Missing data + + 'If IsDate(dttim) Then + ' If Not Add_Record(st, cod, dttim, "", "M", acquisitiontype) Then Exit For + ' lblRecords.Text = "Loading: " & MyReader.LineNumber - 1 & " of " & lblTRecords.Text ' & " " & '.RowCount - Val(txtStartRow.Text) '1 + ' lblRecords.Refresh() + + 'End If + col = col + 1 + Continue For + End If + + 'flg = "" + If IsNumeric(dat) Then + ' If chkScale.Checked = True Then Scale_Data(cod, dat) + 'Else + ' Treat string data values as missing data + 'flg = "M" + 'dat = "" + ' Units coversions + If cod = 2 Or cod = 3 Or cod = 4 Or cod = 101 Or cod = 102 Or cod = 103 Then ' Temperatures - Fahreheit to Celsius + dat = 5 / 9 * (Val(dat) - 32) + ElseIf cod = 5 Or cod = 50 Then ' Precipitation/Snow Depth - inches to mm + dat = Val(dat) * 25.4 + ElseIf cod = 110 Then ' Visibility - Miles to Metres + dat = Val(dat) * 1609.34 + ElseIf cod = 58 Or cod = 60 Or cod = 111 Then ' Wind Speed - Knots to M/s + dat = Val(dat) * 0.514444 + End If + End If + + If Station_Element(st, cod) Then Add_Record(st, cod, dttim, dat, flg, acquisitiontype) + + End If + End If + End If + End With + + col = col + 1 + ' Show upload progress + lblRecords.Text = "Loading: " & MyReader.LineNumber - 1 & " of " & lblTRecords.Text '.RowCount - Val(txtStartRow.Text) '1 + lblRecords.Refresh() + + Next + End If + Loop + End Using + Catch ex As Exception + MsgBox(ex.HResult & " " & ex.Message) + End Try + End Sub Function Get_DateTime(datRow() As String, ByRef dtt As Date, ByRef lvl As String) As Boolean Dim datValue As String Dim itm As Integer @@ -1458,7 +1667,8 @@ Get_RecordIdx = True Try With DataGridView1 - stn = txtStn.Text + 'stn = txtStn.Text + stn = cboStns.SelectedValue hh = txtObsHour.Text For i = 0 To .Columns.Count - 1 If .Columns(i).Name = "station_id" Then @@ -1599,7 +1809,7 @@ Try sql = "select elementId, elementScale from obselement where elementId like " & code & ";" - 'MsgBox(sql) + da1 = New MySql.Data.MySqlClient.MySqlDataAdapter(sql, dbcon) ds1.Clear() da1.Fill(ds1, "obselement") @@ -1676,7 +1886,7 @@ elm = True Station_Element = True Try - ' Check if Station exist + 'Check If Station exist sql = "select stationId from station where stationId like '" & stn_id & "';" da1 = New MySql.Data.MySqlClient.MySqlDataAdapter(sql, dbcon) @@ -1724,12 +1934,15 @@ Return True End If + Catch ex As Exception MsgBox(ex.Message) End Try End Function + + Function Get_Code_Scale(code As String, ByRef obsv As String) As Boolean 'MsgBox(code & " " & obsv) Dim scales As Decimal @@ -1806,8 +2019,10 @@ strw = txtStartRow.Text obshr = txtObsHour.Text scal = chkScale.Checked - id = txtStn.Text - code = txtElmCode.Text + 'id = txtStn.Text + id = cboStns.SelectedValue + 'code = txtElmCode.Text + code = cboElement.SelectedValue flg = txtMissingFlag.Text PrintLine(100, dlt & "," & strw & "," & obshr & "," & scal & "," & id & "," & code & "," & flg) Catch ex As Exception @@ -1818,6 +2033,8 @@ Private Sub cmdLoadSpecs_Click(sender As Object, e As EventArgs) Handles cmdLoadSpecs.Click Dim sch, hdr() As String + Dim Recs As New dataEntryGlobalRoutines + dlgOpenImportFile.Filter = "Schema Files|*.sch;*.*" dlgOpenImportFile.Title = "Schema File" dlgOpenImportFile.ShowDialog() @@ -1860,8 +2077,12 @@ txtStartRow.Text = hdr(1) txtObsHour.Text = hdr(2) chkScale.Checked = hdr(3) - txtStn.Text = hdr(4) - txtElmCode.Text = hdr(5) + 'txtStn.Text = hdr(4) + cboStns.Text = hdr(4) + Recs.Valid_Stn(cboStns) + 'txtElmCode.Text = hdr(5) + cboElement.Text = hdr(5) + Recs.Valid_Elm(cboElement) ' The following code added to cater for the added object for missing data flag text box If hdr.Count > 6 Then txtMissingFlag.Text = hdr(6) @@ -1917,6 +2138,52 @@ lblMissingFlag.Visible = False txtMissingFlag.Visible = False End If + + Dim ds1, ds2 As New DataSet + Dim sql1 As String + Dim da1, da11 As MySql.Data.MySqlClient.MySqlDataAdapter + Try + dbConnectionString = frmLogin.txtusrpwd.Text + dbcon.ConnectionString = dbConnectionString + dbcon.Open() + + ' Populate Stations + sql1 = "SELECT stationId,stationName FROM station" + da1 = New MySql.Data.MySqlClient.MySqlDataAdapter(sql1, dbcon) + ds1.Clear() + da1.Fill(ds1, "station") + + If ds1.Tables("station").Rows.Count > 0 Then + With cboStns + .DataSource = ds1.Tables("station") + .DisplayMember = "stationName" + .ValueMember = "stationId" + .SelectedIndex = -1 + End With + Else + MsgBox(msgStationInformationNotFound, MsgBoxStyle.Exclamation) + End If + + ' Populate elements + sql1 = "SELECT elementId,elementName FROM obselement" + da11 = New MySql.Data.MySqlClient.MySqlDataAdapter(sql1, dbcon) + ds2.Clear() + da11.Fill(ds2, "element") + + If ds2.Tables("element").Rows.Count > 0 Then + With cboElement + .DataSource = ds2.Tables("element") + .DisplayMember = "elementName" + .ValueMember = "elementId" + .SelectedIndex = -1 + End With + Else + MsgBox(msgStationInformationNotFound, MsgBoxStyle.Exclamation) + End If + dbcon.Close() + Catch ex As Exception + dbcon.Close() + End Try End Sub Function UTC_Convert(dttime As String) As String @@ -1930,4 +2197,59 @@ Return dttime End Try End Function + + Private Sub txtStns_KeyDown(sender As Object, e As KeyEventArgs) Handles cboStns.KeyDown + Dim Recs As New dataEntryGlobalRoutines + + If e.KeyValue = 13 Then + 'MsgBox(txtStns.SelectedValue) + 'txtStns.Text = txtStns.SelectedValue + Recs.Valid_Stn(cboStns) + End If + End Sub + + Private Sub txtStns_SelectedValueChanged(sender As Object, e As EventArgs) Handles cboStns.SelectedValueChanged + 'Try + ' 'MsgBox(txtStns.SelectedValue) + ' txtStns.Text = txtStns.SelectedValue + 'Catch ex As Exception + + 'End Try + End Sub + + 'Private Sub txtStns_TextChanged(sender As Object, e As EventArgs) Handles txtStns.TextChanged + ' Try + + ' txtStns.Text = txtStns.SelectedValue + ' Catch ex As Exception + + ' End Try + 'End Sub + + Private Sub txtStns_Click(sender As Object, e As EventArgs) Handles cboStns.Click + 'Try + + ' txtStns.Text = txtStns.SelectedValue + 'Catch ex As Exception + + 'End Try + End Sub + + Private Sub cboElement_KeyDown(sender As Object, e As KeyEventArgs) Handles cboElement.KeyDown + Dim Recs As New dataEntryGlobalRoutines + + If e.KeyValue = 13 Then + Recs.Valid_Elm(cboElement) + End If + End Sub + + 'Private Sub txtStns_SelectedIndexChanged(sender As Object, e As EventArgs) Handles txtStns.SelectedIndexChanged + ' Try + ' MsgBox(txtStns.SelectedValue) + ' txtStns.Text = "" + ' 'txtStns.Text = txtStns.SelectedValue + ' Catch ex As Exception + + ' End Try + 'End Sub End Class \ No newline at end of file diff --git a/ClimsoftVer4/ClimsoftVer4/frmImportDaily0.vb b/ClimsoftVer4/ClimsoftVer4/frmImportDaily0.vb new file mode 100644 index 00000000..495bd27f Binary files /dev/null and b/ClimsoftVer4/ClimsoftVer4/frmImportDaily0.vb differ diff --git a/ClimsoftVer4/ClimsoftVer4/frmImportDaily1.resx b/ClimsoftVer4/ClimsoftVer4/frmImportDaily1.resx new file mode 100644 index 00000000..29d87f44 --- /dev/null +++ b/ClimsoftVer4/ClimsoftVer4/frmImportDaily1.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 172, 17 + + + 43 + + \ No newline at end of file diff --git a/ClimsoftVer4/ClimsoftVer4/frmLogin.vb b/ClimsoftVer4/ClimsoftVer4/frmLogin.vb index c4ef8779..f6484b73 100644 --- a/ClimsoftVer4/ClimsoftVer4/frmLogin.vb +++ b/ClimsoftVer4/ClimsoftVer4/frmLogin.vb @@ -68,7 +68,7 @@ Public Class frmLogin End Try End Using Else - connectionDetails.Add("Default database|" & My.Settings.defaultDatabase) + connectionDetails.Add("Default_database|" & My.Settings.defaultDatabase) End If End Sub diff --git a/ClimsoftVer4/ClimsoftVer4/frmQC.vb b/ClimsoftVer4/ClimsoftVer4/frmQC.vb index 7a1a6dc2..5a84bf1a 100644 --- a/ClimsoftVer4/ClimsoftVer4/frmQC.vb +++ b/ClimsoftVer4/ClimsoftVer4/frmQC.vb @@ -409,7 +409,7 @@ Public Class frmQC "select recordedfrom,describedby,obsdatetime,year(obsdatetime) as yyyy, month(obsdatetime) as mm,day(obsdatetime) as dd, hour(obsdatetime) as hh,obsvalue,upperlimit,qcStatus,acquisitionType,obsLevel,capturedBy,dataForm " & "from observationinitial,obselement where describedBy=elementId and " & stnelm_selected & " year(obsdatetime) " & "between " & beginYear & " and " & endYear & " and month(obsdatetime) between " & beginMonth & " and " & endMonth & " and " & - "upperlimit <> '' and cast(obsValue as INT) > cast(upperlimit as INT);" + "upperlimit <> '' and cast(obsValue as SIGNED) > cast(upperlimit as SIGNED);" ''"union all select 'StationId','ElementId','DateTime','yyyy','mm','dd','hh','ObsValue','upperlimit','qcStatus','acquisitionType','obsLevel','capturedBy','dataForm' " & _ @@ -464,7 +464,7 @@ Public Class frmQC "select recordedfrom,describedby,obsdatetime,year(obsdatetime) as yyyy, month(obsdatetime) as mm,day(obsdatetime) as dd, hour(obsdatetime) as hh,obsvalue,lowerlimit,qcStatus,acquisitionType,obsLevel,capturedBy,dataForm " & "From observationinitial,obselement where describedBy=elementId and " & stnelm_selected & " year(obsdatetime) " & "between " & beginYear & " and " & endYear & " and month(obsdatetime) between " & beginMonth & " and " & endMonth & " and " & - "lowerLimit <> '' and cast(obsValue as INT) < cast(lowerlimit as INT);" + "lowerLimit <> '' and cast(obsValue as SIGNED) < cast(lowerlimit as SIGNED);" '"union all select 'StationId','ElementId','DateTime','yyyy','mm','dd','hh','ObsValue','lowerlimit','qcStatus','acquisitionType','obsLevel','capturedBy','dataForm' " & _ @@ -652,7 +652,7 @@ Public Class frmQC strSQL = "SELECT 'stationId','elementId_1','elementId_2','obsDatetime1','obsdatetime_2','yyyy','mm','dd','hh_1','hh_2','obsValue_1','obsValue_2','qcStatus_1','qcStatus_2','acquisitionType_2','obsLevel_2','capturedBy_2','dataForm_2' " & "union all SELECT stationId_1,elementId_1,elementId_2,obsDatetime_1,obsDatetime_2,year(obsDatetime_1) as yyyy, month(obsDatetime_1) as mm, day(obsDatetime_1) as dd, hour(obsDatetime_1) as hh_1, hour(obsDatetime_2) as hh_2,obsValue_1,obsValue_2,qcStatus_1,qcStatus_2,acquisitionType_2,obsLevel_2,capturedBy_2,dataForm_2 " & - "from qc_interelement_1,qc_interelement_2 WHERE stationId_1=stationId_2 and obsDatetime_1=obsDatetime_2 and cast(obsValue_1 as INT) < cast(obsValue_2 as INT);" + "from qc_interelement_1,qc_interelement_2 WHERE stationId_1=stationId_2 and obsDatetime_1=obsDatetime_2 and cast(obsValue_1 as SIGNED) < cast(obsValue_2 as SIGNED);" ' '' Create the Command for executing query and set its properties ''objCmd = New MySql.Data.MySqlClient.MySqlCommand(strSQL, conn) @@ -682,7 +682,7 @@ Public Class frmQC "union all SELECT stationId_1,elementId_1,elementId_2,obsDatetime_1,obsDatetime_2,year(obsDatetime_1) as yyyy, month(obsDatetime_1) as mm, day(obsDatetime_1) as dd, hour(obsDatetime_1) as hh_1, hour(obsDatetime_2) as hh_2,obsValue_1,obsValue_2,qcStatus_1,qcStatus_2,acquisitionType_2,obsLevel_2,capturedBy_2,dataForm_2 " & "from qc_interelement_1,qc_interelement_2 WHERE stationId_1=stationId_2 and " & "year(obsDatetime_1)=year(obsDatetime_2) and month(obsDatetime_1)=month(obsDatetime_2) " & - "and day(obsDatetime_1)=day(obsDatetime_2) And cast(obsValue_1 As INT) < cast(obsValue_2 As INT);" + "and day(obsDatetime_1)=day(obsDatetime_2) And cast(obsValue_1 As SIGNED) < cast(obsValue_2 As SIGNED);" End If '' Create the Command for executing query and set its properties diff --git a/ClimsoftVer4/ClimsoftVer4/frmSplashScreen.Designer.vb b/ClimsoftVer4/ClimsoftVer4/frmSplashScreen.Designer.vb index 63b233b9..579094b9 100644 --- a/ClimsoftVer4/ClimsoftVer4/frmSplashScreen.Designer.vb +++ b/ClimsoftVer4/ClimsoftVer4/frmSplashScreen.Designer.vb @@ -89,7 +89,7 @@ Partial Class frmSplashScreen Me.lblVersion.Name = "lblVersion" Me.lblVersion.Size = New System.Drawing.Size(99, 27) Me.lblVersion.TabIndex = 6 - Me.lblVersion.Text = "Version 4.1.11" + Me.lblVersion.Text = "Version 4.1.12" ' 'Timer1 ' diff --git a/ClimsoftVer4/ClimsoftVer4/frmUserManagement.Designer.vb b/ClimsoftVer4/ClimsoftVer4/frmUserManagement.Designer.vb index c445750a..ad4dc9a5 100644 --- a/ClimsoftVer4/ClimsoftVer4/frmUserManagement.Designer.vb +++ b/ClimsoftVer4/ClimsoftVer4/frmUserManagement.Designer.vb @@ -164,12 +164,11 @@ Partial Class frmUserManagement Me.lblFrmUserManagementGuidelines.AutoSize = True Me.lblFrmUserManagementGuidelines.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblFrmUserManagementGuidelines.ForeColor = System.Drawing.Color.Red - Me.lblFrmUserManagementGuidelines.Location = New System.Drawing.Point(32, 18) + Me.lblFrmUserManagementGuidelines.Location = New System.Drawing.Point(125, 16) Me.lblFrmUserManagementGuidelines.Name = "lblFrmUserManagementGuidelines" - Me.lblFrmUserManagementGuidelines.Size = New System.Drawing.Size(561, 16) + Me.lblFrmUserManagementGuidelines.Size = New System.Drawing.Size(466, 16) Me.lblFrmUserManagementGuidelines.TabIndex = 12 - Me.lblFrmUserManagementGuidelines.Text = "To remove a user account, select the username on the grid display and click on De" & - "lete button." + Me.lblFrmUserManagementGuidelines.Text = "To delete or update user account, first select the username on the grid display" ' 'btnUpdate '