diff --git a/instat/dlgBoxplotMethod.designer.vb b/instat/dlgBoxplotMethod.designer.vb index 353eb47fd27..e5ddc7a7401 100644 --- a/instat/dlgBoxplotMethod.designer.vb +++ b/instat/dlgBoxplotMethod.designer.vb @@ -1,53 +1,279 @@ - _ -Partial Class dlgBoxplotMethod - 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() + +Partial Class dlgBoxplotMethod + 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.ucrBase = New instat.ucrButtons() + Me.Label1 = New System.Windows.Forms.Label() + Me.lblTitle = New System.Windows.Forms.Label() + Me.txtInterestedVariable = New System.Windows.Forms.TextBox() + Me.txtFactor = New System.Windows.Forms.TextBox() + Me.txtXLabel = New System.Windows.Forms.TextBox() + Me.txtYLabel = New System.Windows.Forms.TextBox() + Me.txtFillColour = New System.Windows.Forms.TextBox() + Me.txtTitle = New System.Windows.Forms.TextBox() + Me.chkConvert = New System.Windows.Forms.CheckBox() + Me.chkHorizontal = New System.Windows.Forms.CheckBox() + Me.nudWhisklty = New System.Windows.Forms.NumericUpDown() + Me.lblFillColour = New System.Windows.Forms.Label() + Me.lblYLabel = New System.Windows.Forms.Label() + Me.lblXLabel = New System.Windows.Forms.Label() + Me.lblFactor = New System.Windows.Forms.Label() + Me.lblInterestedVariable = New System.Windows.Forms.Label() + Me.lblWhisklty = New System.Windows.Forms.Label() + Me.lblDataPeriodLabel = New System.Windows.Forms.Label() + Me.txtDataPeriodLabel = New System.Windows.Forms.TextBox() + CType(Me.nudWhisklty, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 274) + Me.ucrBase.Location = New System.Drawing.Point(35, 282) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 57) + Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 0 ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(146, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(125, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Data list not implemented" + ' + 'lblTitle + ' + Me.lblTitle.AutoSize = True + Me.lblTitle.Location = New System.Drawing.Point(12, 48) + Me.lblTitle.Name = "lblTitle" + Me.lblTitle.Size = New System.Drawing.Size(39, 13) + Me.lblTitle.TabIndex = 2 + Me.lblTitle.Tag = "Title" + Me.lblTitle.Text = "Label2" + ' + 'txtInterestedVariable + ' + Me.txtInterestedVariable.Location = New System.Drawing.Point(137, 168) + Me.txtInterestedVariable.Name = "txtInterestedVariable" + Me.txtInterestedVariable.Size = New System.Drawing.Size(100, 20) + Me.txtInterestedVariable.TabIndex = 3 + ' + 'txtFactor + ' + Me.txtFactor.Location = New System.Drawing.Point(137, 142) + Me.txtFactor.Name = "txtFactor" + Me.txtFactor.Size = New System.Drawing.Size(100, 20) + Me.txtFactor.TabIndex = 4 + ' + 'txtXLabel + ' + Me.txtXLabel.Location = New System.Drawing.Point(137, 116) + Me.txtXLabel.Name = "txtXLabel" + Me.txtXLabel.Size = New System.Drawing.Size(100, 20) + Me.txtXLabel.TabIndex = 5 + ' + 'txtYLabel + ' + Me.txtYLabel.Location = New System.Drawing.Point(137, 90) + Me.txtYLabel.Name = "txtYLabel" + Me.txtYLabel.Size = New System.Drawing.Size(100, 20) + Me.txtYLabel.TabIndex = 6 + Me.txtYLabel.Tag = "YLabel" + ' + 'txtFillColour + ' + Me.txtFillColour.Location = New System.Drawing.Point(137, 64) + Me.txtFillColour.Name = "txtFillColour" + Me.txtFillColour.Size = New System.Drawing.Size(100, 20) + Me.txtFillColour.TabIndex = 7 + ' + 'txtTitle + ' + Me.txtTitle.Location = New System.Drawing.Point(137, 41) + Me.txtTitle.Name = "txtTitle" + Me.txtTitle.Size = New System.Drawing.Size(100, 20) + Me.txtTitle.TabIndex = 8 + ' + 'chkConvert + ' + Me.chkConvert.AutoSize = True + Me.chkConvert.Location = New System.Drawing.Point(364, 187) + Me.chkConvert.Name = "chkConvert" + Me.chkConvert.Size = New System.Drawing.Size(81, 17) + Me.chkConvert.TabIndex = 9 + Me.chkConvert.Tag = "Convert" + Me.chkConvert.Text = "CheckBox1" + Me.chkConvert.UseVisualStyleBackColor = True + ' + 'chkHorizontal + ' + Me.chkHorizontal.AutoSize = True + Me.chkHorizontal.Location = New System.Drawing.Point(364, 221) + Me.chkHorizontal.Name = "chkHorizontal" + Me.chkHorizontal.Size = New System.Drawing.Size(81, 17) + Me.chkHorizontal.TabIndex = 10 + Me.chkHorizontal.Tag = "Horizontal" + Me.chkHorizontal.Text = "CheckBox2" + Me.chkHorizontal.UseVisualStyleBackColor = True + ' + 'nudWhisklty + ' + Me.nudWhisklty.Location = New System.Drawing.Point(137, 220) + Me.nudWhisklty.Name = "nudWhisklty" + Me.nudWhisklty.Size = New System.Drawing.Size(66, 20) + Me.nudWhisklty.TabIndex = 11 + ' + 'lblFillColour + ' + Me.lblFillColour.AutoSize = True + Me.lblFillColour.Location = New System.Drawing.Point(12, 71) + Me.lblFillColour.Name = "lblFillColour" + Me.lblFillColour.Size = New System.Drawing.Size(39, 13) + Me.lblFillColour.TabIndex = 12 + Me.lblFillColour.Tag = "Fill_Colour" + Me.lblFillColour.Text = "Label3" + ' + 'lblYLabel + ' + Me.lblYLabel.AutoSize = True + Me.lblYLabel.Location = New System.Drawing.Point(12, 93) + Me.lblYLabel.Name = "lblYLabel" + Me.lblYLabel.Size = New System.Drawing.Size(39, 13) + Me.lblYLabel.TabIndex = 14 + Me.lblYLabel.Tag = "Y_Label" + Me.lblYLabel.Text = "Label5" + ' + 'lblXLabel + ' + Me.lblXLabel.AutoSize = True + Me.lblXLabel.Location = New System.Drawing.Point(12, 123) + Me.lblXLabel.Name = "lblXLabel" + Me.lblXLabel.Size = New System.Drawing.Size(39, 13) + Me.lblXLabel.TabIndex = 15 + Me.lblXLabel.Tag = "X_Label" + Me.lblXLabel.Text = "Label6" + ' + 'lblFactor + ' + Me.lblFactor.AutoSize = True + Me.lblFactor.Location = New System.Drawing.Point(12, 149) + Me.lblFactor.Name = "lblFactor" + Me.lblFactor.Size = New System.Drawing.Size(39, 13) + Me.lblFactor.TabIndex = 16 + Me.lblFactor.Tag = "Factor" + Me.lblFactor.Text = "Label7" + ' + 'lblInterestedVariable + ' + Me.lblInterestedVariable.AutoSize = True + Me.lblInterestedVariable.Location = New System.Drawing.Point(12, 175) + Me.lblInterestedVariable.Name = "lblInterestedVariable" + Me.lblInterestedVariable.Size = New System.Drawing.Size(39, 13) + Me.lblInterestedVariable.TabIndex = 17 + Me.lblInterestedVariable.Tag = "Interested_Variable" + Me.lblInterestedVariable.Text = "Label8" + ' + 'lblWhisklty + ' + Me.lblWhisklty.AutoSize = True + Me.lblWhisklty.Location = New System.Drawing.Point(12, 220) + Me.lblWhisklty.Name = "lblWhisklty" + Me.lblWhisklty.Size = New System.Drawing.Size(39, 13) + Me.lblWhisklty.TabIndex = 18 + Me.lblWhisklty.Text = "Label4" + ' + 'lblDataPeriodLabel + ' + Me.lblDataPeriodLabel.AutoSize = True + Me.lblDataPeriodLabel.Location = New System.Drawing.Point(12, 194) + Me.lblDataPeriodLabel.Name = "lblDataPeriodLabel" + Me.lblDataPeriodLabel.Size = New System.Drawing.Size(39, 13) + Me.lblDataPeriodLabel.TabIndex = 19 + Me.lblDataPeriodLabel.Tag = "Period_Label" + Me.lblDataPeriodLabel.Text = "Label2" + ' + 'txtDataPeriodLabel + ' + Me.txtDataPeriodLabel.Location = New System.Drawing.Point(137, 194) + Me.txtDataPeriodLabel.Name = "txtDataPeriodLabel" + Me.txtDataPeriodLabel.Size = New System.Drawing.Size(100, 20) + Me.txtDataPeriodLabel.TabIndex = 20 + ' 'dlgBoxplotMethod ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(441, 343) + Me.ClientSize = New System.Drawing.Size(489, 336) + Me.Controls.Add(Me.txtDataPeriodLabel) + Me.Controls.Add(Me.lblDataPeriodLabel) + Me.Controls.Add(Me.lblWhisklty) + Me.Controls.Add(Me.lblInterestedVariable) + Me.Controls.Add(Me.lblFactor) + Me.Controls.Add(Me.lblXLabel) + Me.Controls.Add(Me.lblYLabel) + Me.Controls.Add(Me.lblFillColour) + Me.Controls.Add(Me.nudWhisklty) + Me.Controls.Add(Me.chkHorizontal) + Me.Controls.Add(Me.chkConvert) + Me.Controls.Add(Me.txtTitle) + Me.Controls.Add(Me.txtFillColour) + Me.Controls.Add(Me.txtYLabel) + Me.Controls.Add(Me.txtXLabel) + Me.Controls.Add(Me.txtFactor) + Me.Controls.Add(Me.txtInterestedVariable) + Me.Controls.Add(Me.lblTitle) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgBoxplotMethod" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Boxplot_method" - Me.Text = "Boxplot method" + Me.Text = "Boxplot Method" + CType(Me.nudWhisklty, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents Label1 As Label + Friend WithEvents lblTitle As Label + Friend WithEvents txtInterestedVariable As TextBox + Friend WithEvents txtFactor As TextBox + Friend WithEvents txtXLabel As TextBox + Friend WithEvents txtYLabel As TextBox + Friend WithEvents txtFillColour As TextBox + Friend WithEvents txtTitle As TextBox + Friend WithEvents chkConvert As CheckBox + Friend WithEvents chkHorizontal As CheckBox + Friend WithEvents nudWhisklty As NumericUpDown + Friend WithEvents lblFillColour As Label + Friend WithEvents lblYLabel As Label + Friend WithEvents lblXLabel As Label + Friend WithEvents lblFactor As Label + Friend WithEvents lblInterestedVariable As Label + Friend WithEvents lblWhisklty As Label + Friend WithEvents lblDataPeriodLabel As Label + Friend WithEvents txtDataPeriodLabel As TextBox +End Class \ No newline at end of file diff --git a/instat/dlgBoxplotMethod.vb b/instat/dlgBoxplotMethod.vb index 044cb6d78e9..207a52f5767 100644 --- a/instat/dlgBoxplotMethod.vb +++ b/instat/dlgBoxplotMethod.vb @@ -13,15 +13,69 @@ ' ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat.Translations -Public Class dlgBoxplotMethod - Private Sub dlgBoxplotMethod_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - ucrBase.clsRsyntax.SetFunction("climate_obj$boxplot") - ucrBase.clsRsyntax.iCallType = 0 - End Sub +Imports instat.Translations + Public Class dlgBoxplotMethod + Private Sub ucrBase_Load(sender As Object, e As EventArgs) Handles ucrBase.Load + autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("climate_obj$boxplot") + ucrBase.clsRsyntax.iCallType = 0 + End Sub + Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles chkConvert.CheckedChanged + If chkConvert.Checked Then + ucrBase.clsRsyntax.AddParameter("convert", chkConvert.Checked.ToString().ToUpper()) + End If + End Sub -End Class \ No newline at end of file + + Private Sub txtTitle_TextChanged(sender As Object, e As EventArgs) Handles txtTitle.TextChanged + ucrBase.clsRsyntax.AddParameter("title", Chr(34) & txtTitle.Text.ToString() & Chr(34)) + + End Sub + + Private Sub chkHorizontal_CheckedChanged(sender As Object, e As EventArgs) Handles chkHorizontal.CheckedChanged + If chkHorizontal.Checked Then + ucrBase.clsRsyntax.AddParameter("horizontal", chkHorizontal.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub nudWhisklty_ValueChanged(sender As Object, e As EventArgs) Handles nudWhisklty.ValueChanged + ucrBase.clsRsyntax.AddParameter("whisklty", nudWhisklty.Value.ToString()) + + End Sub + + Private Sub txtFillColour_TextChanged(sender As Object, e As EventArgs) Handles txtFillColour.TextChanged + ucrBase.clsRsyntax.AddParameter("fill_col", Chr(34) & txtFillColour.Text.ToString() & Chr(34)) + + End Sub + + Private Sub txtYLabel_TextChanged(sender As Object, e As EventArgs) Handles txtYLabel.TextChanged + ucrBase.clsRsyntax.AddParameter("ylabel", Chr(34) & txtYLabel.Text.ToString() & Chr(34)) + + End Sub + + Private Sub txtXLabel_TextChanged(sender As Object, e As EventArgs) Handles txtXLabel.TextChanged + ucrBase.clsRsyntax.AddParameter("xlabel", Chr(34) & txtXLabel.Text.ToString() & Chr(34)) + End Sub + + Private Sub txtFactor_TextChanged(sender As Object, e As EventArgs) Handles txtFactor.TextChanged + ucrBase.clsRsyntax.AddParameter("factor", Chr(34) & txtFactor.Text.ToString() & Chr(34)) + End Sub + + Private Sub txtInterestedVariable_TextChanged(sender As Object, e As EventArgs) Handles txtInterestedVariable.TextChanged + ucrBase.clsRsyntax.AddParameter("interested_var", Chr(34) & txtInterestedVariable.Text.ToString() & Chr(34)) + End Sub + + Private Sub txtDataPeriodLabel_TextChanged(sender As Object, e As EventArgs) Handles txtDataPeriodLabel.TextChanged + ucrBase.clsRsyntax.AddParameter("data_period_label", Chr(34) & txtDataPeriodLabel.Text.ToString() & Chr(34)) + + End Sub + + + + + + End Class \ No newline at end of file diff --git a/instat/dlgCPTtoTabularData.designer.vb b/instat/dlgCPTtoTabularData.designer.vb index aa8c13c9ab6..3268960f11e 100644 --- a/instat/dlgCPTtoTabularData.designer.vb +++ b/instat/dlgCPTtoTabularData.designer.vb @@ -1,53 +1,199 @@ - _ -Partial Class dlgCPTtoTabularData - 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() + +Partial Class dlgCPTtoTabularData + 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.grpDomain = New System.Windows.Forms.GroupBox() + Me.lblMaxLon = New System.Windows.Forms.Label() + Me.lblMinLon = New System.Windows.Forms.Label() + Me.lblMaxLat = New System.Windows.Forms.Label() + Me.lblMinLat = New System.Windows.Forms.Label() + Me.nudMaxLat = New System.Windows.Forms.NumericUpDown() + Me.nudMinLon = New System.Windows.Forms.NumericUpDown() + Me.nudMaxLongitude = New System.Windows.Forms.NumericUpDown() + Me.nudMinLat = New System.Windows.Forms.NumericUpDown() + Me.lbl = New System.Windows.Forms.Label() + Me.chkWestEast = New System.Windows.Forms.CheckBox() Me.ucrBase = New instat.ucrButtons() + Me.grpDomain.SuspendLayout() + CType(Me.nudMaxLat, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudMinLon, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudMaxLongitude, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudMinLat, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'grpDomain + ' + Me.grpDomain.Controls.Add(Me.lblMaxLon) + Me.grpDomain.Controls.Add(Me.lblMinLon) + Me.grpDomain.Controls.Add(Me.lblMaxLat) + Me.grpDomain.Controls.Add(Me.lblMinLat) + Me.grpDomain.Controls.Add(Me.nudMaxLat) + Me.grpDomain.Controls.Add(Me.nudMinLon) + Me.grpDomain.Controls.Add(Me.nudMaxLongitude) + Me.grpDomain.Controls.Add(Me.nudMinLat) + Me.grpDomain.Location = New System.Drawing.Point(37, 44) + Me.grpDomain.Name = "grpDomain" + Me.grpDomain.Size = New System.Drawing.Size(282, 155) + Me.grpDomain.TabIndex = 1 + Me.grpDomain.TabStop = False + Me.grpDomain.Tag = "Domain" + Me.grpDomain.Text = "Domain" + ' + 'lblMaxLon + ' + Me.lblMaxLon.AutoSize = True + Me.lblMaxLon.Location = New System.Drawing.Point(8, 122) + Me.lblMaxLon.Name = "lblMaxLon" + Me.lblMaxLon.Size = New System.Drawing.Size(48, 13) + Me.lblMaxLon.TabIndex = 7 + Me.lblMaxLon.Tag = "Max_Lon" + Me.lblMaxLon.Text = "Max Lon" + ' + 'lblMinLon + ' + Me.lblMinLon.AutoSize = True + Me.lblMinLon.Location = New System.Drawing.Point(8, 82) + Me.lblMinLon.Name = "lblMinLon" + Me.lblMinLon.Size = New System.Drawing.Size(45, 13) + Me.lblMinLon.TabIndex = 6 + Me.lblMinLon.Tag = "Min_Lon" + Me.lblMinLon.Text = "Min Lon" + ' + 'lblMaxLat + ' + Me.lblMaxLat.AutoSize = True + Me.lblMaxLat.Location = New System.Drawing.Point(8, 63) + Me.lblMaxLat.Name = "lblMaxLat" + Me.lblMaxLat.Size = New System.Drawing.Size(45, 13) + Me.lblMaxLat.TabIndex = 5 + Me.lblMaxLat.Tag = "Max_Lat" + Me.lblMaxLat.Text = "Max Lat" + ' + 'lblMinLat + ' + Me.lblMinLat.AutoSize = True + Me.lblMinLat.Location = New System.Drawing.Point(8, 37) + Me.lblMinLat.Name = "lblMinLat" + Me.lblMinLat.Size = New System.Drawing.Size(42, 13) + Me.lblMinLat.TabIndex = 4 + Me.lblMinLat.Tag = "Min_Lat" + Me.lblMinLat.Text = "Min Lat" + ' + 'nudMaxLat + ' + Me.nudMaxLat.Location = New System.Drawing.Point(115, 56) + Me.nudMaxLat.Name = "nudMaxLat" + Me.nudMaxLat.Size = New System.Drawing.Size(70, 20) + Me.nudMaxLat.TabIndex = 3 + Me.nudMaxLat.Tag = "" + ' + 'nudMinLon + ' + Me.nudMinLon.Location = New System.Drawing.Point(115, 82) + Me.nudMinLon.Name = "nudMinLon" + Me.nudMinLon.Size = New System.Drawing.Size(70, 20) + Me.nudMinLon.TabIndex = 2 + ' + 'nudMaxLongitude + ' + Me.nudMaxLongitude.Location = New System.Drawing.Point(115, 115) + Me.nudMaxLongitude.Name = "nudMaxLongitude" + Me.nudMaxLongitude.Size = New System.Drawing.Size(70, 20) + Me.nudMaxLongitude.TabIndex = 1 + Me.nudMaxLongitude.Tag = "" + ' + 'nudMinLat + ' + Me.nudMinLat.Location = New System.Drawing.Point(115, 30) + Me.nudMinLat.Name = "nudMinLat" + Me.nudMinLat.Size = New System.Drawing.Size(70, 20) + Me.nudMinLat.TabIndex = 0 + Me.nudMinLat.Tag = "" + ' + 'lbl + ' + Me.lbl.AutoSize = True + Me.lbl.Location = New System.Drawing.Point(26, 9) + Me.lbl.Name = "lbl" + Me.lbl.Size = New System.Drawing.Size(86, 13) + Me.lbl.TabIndex = 8 + Me.lbl.Tag = "" + Me.lbl.Text = "Not implemented" + ' + 'chkWestEast + ' + Me.chkWestEast.AutoSize = True + Me.chkWestEast.Location = New System.Drawing.Point(325, 196) + Me.chkWestEast.Name = "chkWestEast" + Me.chkWestEast.Size = New System.Drawing.Size(81, 17) + Me.chkWestEast.TabIndex = 8 + Me.chkWestEast.Tag = "West_East" + Me.chkWestEast.Text = "CheckBox1" + Me.chkWestEast.UseVisualStyleBackColor = True + ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 291) + Me.ucrBase.Location = New System.Drawing.Point(10, 228) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 65) + Me.ucrBase.Size = New System.Drawing.Size(410, 32) Me.ucrBase.TabIndex = 0 ' 'dlgCPTtoTabularData ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(432, 368) + Me.ClientSize = New System.Drawing.Size(432, 262) + Me.Controls.Add(Me.chkWestEast) + Me.Controls.Add(Me.lbl) + Me.Controls.Add(Me.grpDomain) Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgCPTtoTabularData" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "CPT_to_tabular_data" - Me.Text = "CPT to tabular data" + Me.Tag = "CPT_to_Tabular_Data" + Me.Text = "CPT to Tabular Data" + Me.grpDomain.ResumeLayout(False) + Me.grpDomain.PerformLayout() + CType(Me.nudMaxLat, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudMinLon, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudMaxLongitude, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudMinLat, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents grpDomain As GroupBox + Friend WithEvents lblMaxLon As Label + Friend WithEvents lblMinLon As Label + Friend WithEvents lblMaxLat As Label + Friend WithEvents lblMinLat As Label + Friend WithEvents nudMaxLat As NumericUpDown + Friend WithEvents nudMinLon As NumericUpDown + Friend WithEvents nudMaxLongitude As NumericUpDown + Friend WithEvents nudMinLat As NumericUpDown + Friend WithEvents lbl As Label + Friend WithEvents chkWestEast As CheckBox +End Class \ No newline at end of file diff --git a/instat/dlgCPTtoTabularData.vb b/instat/dlgCPTtoTabularData.vb index 43c9e5a71e6..9b68fbee588 100644 --- a/instat/dlgCPTtoTabularData.vb +++ b/instat/dlgCPTtoTabularData.vb @@ -13,11 +13,28 @@ ' ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat.Translations +Imports instat.Translations Public Class dlgCPTtoTabularData - Private Sub dlgCPTtoTabularData_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - ucrBase.clsRsyntax.SetFunction("climate_obj$SST_domain()") - ucrBase.clsRsyntax.iCallType = 0 + Private Sub UcrButtons1_Load(sender As Object, e As EventArgs) Handles ucrBase.Load + autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("climate_obj$SST_domain()") + ucrBase.clsRsyntax.iCallType = 0 + End Sub + + Private Sub dlgCPTtoTabularData_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + + End Sub + + Private Sub NumericUpDown1_ValueChanged(sender As Object, e As EventArgs) Handles nudMinLat.ValueChanged + + End Sub + + Private Sub NumericUpDown4_ValueChanged(sender As Object, e As EventArgs) Handles nudMaxLat.ValueChanged + + End Sub + + Private Sub NumericUpDown3_ValueChanged(sender As Object, e As EventArgs) Handles nudMinLon.ValueChanged + End Sub End Class \ No newline at end of file diff --git a/instat/dlgChangeFormatDayMonth.designer.vb b/instat/dlgChangeFormatDayMonth.designer.vb index 8e80ac3eeb1..62ac6755f76 100644 --- a/instat/dlgChangeFormatDayMonth.designer.vb +++ b/instat/dlgChangeFormatDayMonth.designer.vb @@ -1,53 +1,187 @@ - _ -Partial Class dlgChangeFormatDayMonth - 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() + +Partial Class dlgChangeFormatDayMonth + 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.Label1 = New System.Windows.Forms.Label() + Me.lblPeriod = New System.Windows.Forms.Label() + Me.lblColumnName = New System.Windows.Forms.Label() + Me.lblMonthFormat = New System.Windows.Forms.Label() + Me.lblRequiredFormat = New System.Windows.Forms.Label() + Me.nudOption = New System.Windows.Forms.NumericUpDown() + Me.txtColumnName = New System.Windows.Forms.TextBox() + Me.txtMonthFormat = New System.Windows.Forms.TextBox() + Me.txtPeriods = New System.Windows.Forms.TextBox() + Me.lblOption = New System.Windows.Forms.Label() + Me.txtRequiredFormat = New System.Windows.Forms.TextBox() Me.ucrBase = New instat.ucrButtons() + CType(Me.nudOption, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(32, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(125, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Data list not implemented" + ' + 'lblPeriod + ' + Me.lblPeriod.AutoSize = True + Me.lblPeriod.Location = New System.Drawing.Point(32, 45) + Me.lblPeriod.Name = "lblPeriod" + Me.lblPeriod.Size = New System.Drawing.Size(39, 13) + Me.lblPeriod.TabIndex = 2 + Me.lblPeriod.Tag = "Period" + Me.lblPeriod.Text = "Label2" + ' + 'lblColumnName + ' + Me.lblColumnName.AutoSize = True + Me.lblColumnName.Location = New System.Drawing.Point(32, 71) + Me.lblColumnName.Name = "lblColumnName" + Me.lblColumnName.Size = New System.Drawing.Size(39, 13) + Me.lblColumnName.TabIndex = 3 + Me.lblColumnName.Tag = "Column_Name" + Me.lblColumnName.Text = "Label3" + ' + 'lblMonthFormat + ' + Me.lblMonthFormat.AutoSize = True + Me.lblMonthFormat.Location = New System.Drawing.Point(32, 97) + Me.lblMonthFormat.Name = "lblMonthFormat" + Me.lblMonthFormat.Size = New System.Drawing.Size(39, 13) + Me.lblMonthFormat.TabIndex = 4 + Me.lblMonthFormat.Tag = "Month_Format" + Me.lblMonthFormat.Text = "Label4" + ' + 'lblRequiredFormat + ' + Me.lblRequiredFormat.AutoSize = True + Me.lblRequiredFormat.Location = New System.Drawing.Point(32, 116) + Me.lblRequiredFormat.Name = "lblRequiredFormat" + Me.lblRequiredFormat.Size = New System.Drawing.Size(39, 13) + Me.lblRequiredFormat.TabIndex = 5 + Me.lblRequiredFormat.Tag = "Required_Format" + Me.lblRequiredFormat.Text = "Label5" + ' + 'nudOption + ' + Me.nudOption.Location = New System.Drawing.Point(129, 175) + Me.nudOption.Name = "nudOption" + Me.nudOption.Size = New System.Drawing.Size(56, 20) + Me.nudOption.TabIndex = 6 + Me.nudOption.Tag = "Option" + ' + 'txtColumnName + ' + Me.txtColumnName.Location = New System.Drawing.Point(129, 64) + Me.txtColumnName.Name = "txtColumnName" + Me.txtColumnName.Size = New System.Drawing.Size(100, 20) + Me.txtColumnName.TabIndex = 7 + Me.txtColumnName.Tag = "" + ' + 'txtMonthFormat + ' + Me.txtMonthFormat.Location = New System.Drawing.Point(129, 90) + Me.txtMonthFormat.Name = "txtMonthFormat" + Me.txtMonthFormat.Size = New System.Drawing.Size(100, 20) + Me.txtMonthFormat.TabIndex = 8 + Me.txtMonthFormat.Tag = "" + ' + 'txtPeriods + ' + Me.txtPeriods.Location = New System.Drawing.Point(129, 38) + Me.txtPeriods.Name = "txtPeriods" + Me.txtPeriods.Size = New System.Drawing.Size(100, 20) + Me.txtPeriods.TabIndex = 9 + Me.txtPeriods.Tag = "" + ' + 'lblOption + ' + Me.lblOption.AutoSize = True + Me.lblOption.Location = New System.Drawing.Point(32, 177) + Me.lblOption.Name = "lblOption" + Me.lblOption.Size = New System.Drawing.Size(39, 13) + Me.lblOption.TabIndex = 10 + Me.lblOption.Tag = "Option" + Me.lblOption.Text = "Label6" + ' + 'txtRequiredFormat + ' + Me.txtRequiredFormat.Location = New System.Drawing.Point(129, 109) + Me.txtRequiredFormat.Name = "txtRequiredFormat" + Me.txtRequiredFormat.Size = New System.Drawing.Size(100, 20) + Me.txtRequiredFormat.TabIndex = 11 + Me.txtRequiredFormat.Tag = "" + ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 257) + Me.ucrBase.Location = New System.Drawing.Point(7, 227) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 54) + Me.ucrBase.Size = New System.Drawing.Size(410, 32) Me.ucrBase.TabIndex = 0 ' 'dlgChangeFormatDayMonth ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(429, 323) + Me.ClientSize = New System.Drawing.Size(429, 262) + Me.Controls.Add(Me.txtRequiredFormat) + Me.Controls.Add(Me.lblOption) + Me.Controls.Add(Me.txtPeriods) + Me.Controls.Add(Me.txtMonthFormat) + Me.Controls.Add(Me.txtColumnName) + Me.Controls.Add(Me.nudOption) + Me.Controls.Add(Me.lblRequiredFormat) + Me.Controls.Add(Me.lblMonthFormat) + Me.Controls.Add(Me.lblColumnName) + Me.Controls.Add(Me.lblPeriod) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgChangeFormatDayMonth" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Change_format_day_month" - Me.Text = "Change format day month" + Me.Tag = "Change_Format_Day_Month" + Me.Text = "Change Format Day Month" + CType(Me.nudOption, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents Label1 As Label + Friend WithEvents lblPeriod As Label + Friend WithEvents lblColumnName As Label + Friend WithEvents lblMonthFormat As Label + Friend WithEvents lblRequiredFormat As Label + Friend WithEvents nudOption As NumericUpDown + Friend WithEvents txtColumnName As TextBox + Friend WithEvents txtMonthFormat As TextBox + Friend WithEvents txtPeriods As TextBox + Friend WithEvents lblOption As Label + Friend WithEvents txtRequiredFormat As TextBox +End Class diff --git a/instat/dlgChangeFormatDayMonth.vb b/instat/dlgChangeFormatDayMonth.vb index c9a2da80a5f..684114f5607 100644 --- a/instat/dlgChangeFormatDayMonth.vb +++ b/instat/dlgChangeFormatDayMonth.vb @@ -13,15 +13,15 @@ ' ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat.Translations -Public Class dlgChangeFormatDayMonth - Private Sub dlgChangeFormatDayMonth_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - ucrBase.clsRsyntax.SetFunction("climate_obj$change_format_day_month()") - ucrBase.clsRsyntax.iCallType = 0 - End Sub +Imports instat.Translations + Public Class dlgChangeFormatDayMonth + Private Sub UcrButtons1_Load(sender As Object, e As EventArgs) Handles ucrBase.Load + autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("climate_obj$change_format_day_month()") + ucrBase.clsRsyntax.iCallType = 0 + End Sub +End Class -End Class \ No newline at end of file diff --git a/instat/dlgDayMonth.designer.vb b/instat/dlgDayMonth.designer.vb index 38555736689..65b33cb780d 100644 --- a/instat/dlgDayMonth.designer.vb +++ b/instat/dlgDayMonth.designer.vb @@ -1,51 +1,133 @@ - _ -Partial Class dlgDayMonth - 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() + +Partial Class dlgDayMonth + 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.txtColumnName = New System.Windows.Forms.TextBox() + Me.txtTimePeriod = New System.Windows.Forms.TextBox() + Me.txtRequiredTimeFormat = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.lblColumnName = New System.Windows.Forms.Label() + Me.lblTimePeriod = New System.Windows.Forms.Label() + Me.lblRequiredTimeFormat = New System.Windows.Forms.Label() Me.ucrBase = New instat.ucrButtons() Me.SuspendLayout() ' + 'txtColumnName + ' + Me.txtColumnName.Location = New System.Drawing.Point(161, 68) + Me.txtColumnName.Name = "txtColumnName" + Me.txtColumnName.Size = New System.Drawing.Size(100, 20) + Me.txtColumnName.TabIndex = 1 + Me.txtColumnName.Tag = "" + ' + 'txtTimePeriod + ' + Me.txtTimePeriod.Location = New System.Drawing.Point(161, 110) + Me.txtTimePeriod.Name = "txtTimePeriod" + Me.txtTimePeriod.Size = New System.Drawing.Size(100, 20) + Me.txtTimePeriod.TabIndex = 2 + Me.txtTimePeriod.Tag = "" + ' + 'txtRequiredTimeFormat + ' + Me.txtRequiredTimeFormat.Location = New System.Drawing.Point(161, 149) + Me.txtRequiredTimeFormat.Name = "txtRequiredTimeFormat" + Me.txtRequiredTimeFormat.Size = New System.Drawing.Size(100, 20) + Me.txtRequiredTimeFormat.TabIndex = 3 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(40, 22) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(87, 13) + Me.Label1.TabIndex = 4 + Me.Label1.Text = "Not Implemented" + ' + 'lblColumnName + ' + Me.lblColumnName.AutoSize = True + Me.lblColumnName.Location = New System.Drawing.Point(40, 75) + Me.lblColumnName.Name = "lblColumnName" + Me.lblColumnName.Size = New System.Drawing.Size(39, 13) + Me.lblColumnName.TabIndex = 5 + Me.lblColumnName.Tag = "Column_Name" + Me.lblColumnName.Text = "Label2" + ' + 'lblTimePeriod + ' + Me.lblTimePeriod.AutoSize = True + Me.lblTimePeriod.Location = New System.Drawing.Point(40, 110) + Me.lblTimePeriod.Name = "lblTimePeriod" + Me.lblTimePeriod.Size = New System.Drawing.Size(39, 13) + Me.lblTimePeriod.TabIndex = 6 + Me.lblTimePeriod.Tag = "Time_Period" + Me.lblTimePeriod.Text = "Label3" + ' + 'lblRequiredTimeFormat + ' + Me.lblRequiredTimeFormat.AutoSize = True + Me.lblRequiredTimeFormat.Location = New System.Drawing.Point(40, 152) + Me.lblRequiredTimeFormat.Name = "lblRequiredTimeFormat" + Me.lblRequiredTimeFormat.Size = New System.Drawing.Size(39, 13) + Me.lblRequiredTimeFormat.TabIndex = 7 + Me.lblRequiredTimeFormat.Tag = "Required_Time_Format" + Me.lblRequiredTimeFormat.Text = "Label4" + ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 208) + Me.ucrBase.Location = New System.Drawing.Point(12, 227) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 66) + Me.ucrBase.Size = New System.Drawing.Size(410, 51) Me.ucrBase.TabIndex = 0 ' 'dlgDayMonth ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(441, 286) + Me.ClientSize = New System.Drawing.Size(441, 290) + Me.Controls.Add(Me.lblRequiredTimeFormat) + Me.Controls.Add(Me.lblTimePeriod) + Me.Controls.Add(Me.lblColumnName) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.txtRequiredTimeFormat) + Me.Controls.Add(Me.txtTimePeriod) + Me.Controls.Add(Me.txtColumnName) Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgDayMonth" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Day_Month" Me.Text = "Day Month" Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents txtColumnName As TextBox + Friend WithEvents txtTimePeriod As TextBox + Friend WithEvents txtRequiredTimeFormat As TextBox + Friend WithEvents Label1 As Label + Friend WithEvents lblColumnName As Label + Friend WithEvents lblTimePeriod As Label + Friend WithEvents lblRequiredTimeFormat As Label +End Class diff --git a/instat/dlgDisplayDaily.Designer.vb b/instat/dlgDisplayDaily.Designer.vb index 22221b059c9..43bf388a34c 100644 --- a/instat/dlgDisplayDaily.Designer.vb +++ b/instat/dlgDisplayDaily.Designer.vb @@ -1,53 +1,252 @@ - _ -Partial Class dlgDisplayDaily - 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() + +Partial Class dlgDisplayDaily + 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.chkPrintTables = New System.Windows.Forms.CheckBox() + Me.chkRemoveNA = New System.Windows.Forms.CheckBox() + Me.nudDecimalPlaces = New System.Windows.Forms.NumericUpDown() + Me.nudThreshold = New System.Windows.Forms.NumericUpDown() + Me.txtSummaryNames = New System.Windows.Forms.TextBox() + Me.txtDayDisplay = New System.Windows.Forms.TextBox() + Me.txtVariable = New System.Windows.Forms.TextBox() + Me.txtMonthSummaries = New System.Windows.Forms.TextBox() + Me.lblVariable = New System.Windows.Forms.Label() + Me.lblDayDisplay = New System.Windows.Forms.Label() + Me.lblDecimalPlaces = New System.Windows.Forms.Label() + Me.lblThreshold = New System.Windows.Forms.Label() + Me.lblSummaryNames = New System.Windows.Forms.Label() + Me.lblMonth_Summaries = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.chkMonthAbbreviation = New System.Windows.Forms.CheckBox() Me.ucrBase = New instat.ucrButtons() + CType(Me.nudDecimalPlaces, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'chkPrintTables + ' + Me.chkPrintTables.AutoSize = True + Me.chkPrintTables.Location = New System.Drawing.Point(194, 220) + Me.chkPrintTables.Name = "chkPrintTables" + Me.chkPrintTables.Size = New System.Drawing.Size(81, 17) + Me.chkPrintTables.TabIndex = 1 + Me.chkPrintTables.Tag = "Print_Tables" + Me.chkPrintTables.Text = "CheckBox1" + Me.chkPrintTables.UseVisualStyleBackColor = True + ' + 'chkRemoveNA + ' + Me.chkRemoveNA.AutoSize = True + Me.chkRemoveNA.Location = New System.Drawing.Point(346, 220) + Me.chkRemoveNA.Name = "chkRemoveNA" + Me.chkRemoveNA.Size = New System.Drawing.Size(81, 17) + Me.chkRemoveNA.TabIndex = 2 + Me.chkRemoveNA.Tag = "Remove_NA" + Me.chkRemoveNA.Text = "CheckBox2" + Me.chkRemoveNA.UseVisualStyleBackColor = True + ' + 'nudDecimalPlaces + ' + Me.nudDecimalPlaces.Location = New System.Drawing.Point(346, 132) + Me.nudDecimalPlaces.Maximum = New Decimal(New Integer() {3, 0, 0, 0}) + Me.nudDecimalPlaces.Name = "nudDecimalPlaces" + Me.nudDecimalPlaces.Size = New System.Drawing.Size(67, 20) + Me.nudDecimalPlaces.TabIndex = 3 + ' + 'nudThreshold + ' + Me.nudThreshold.Location = New System.Drawing.Point(109, 127) + Me.nudThreshold.Name = "nudThreshold" + Me.nudThreshold.Size = New System.Drawing.Size(76, 20) + Me.nudThreshold.TabIndex = 4 + ' + 'txtSummaryNames + ' + Me.txtSummaryNames.Location = New System.Drawing.Point(109, 170) + Me.txtSummaryNames.Name = "txtSummaryNames" + Me.txtSummaryNames.Size = New System.Drawing.Size(100, 20) + Me.txtSummaryNames.TabIndex = 5 + ' + 'txtDayDisplay + ' + Me.txtDayDisplay.Location = New System.Drawing.Point(194, 91) + Me.txtDayDisplay.Name = "txtDayDisplay" + Me.txtDayDisplay.Size = New System.Drawing.Size(100, 20) + Me.txtDayDisplay.TabIndex = 6 + Me.txtDayDisplay.Tag = "" + ' + 'txtVariable + ' + Me.txtVariable.Location = New System.Drawing.Point(194, 58) + Me.txtVariable.Name = "txtVariable" + Me.txtVariable.Size = New System.Drawing.Size(100, 20) + Me.txtVariable.TabIndex = 7 + ' + 'txtMonthSummaries + ' + Me.txtMonthSummaries.Location = New System.Drawing.Point(194, 32) + Me.txtMonthSummaries.Name = "txtMonthSummaries" + Me.txtMonthSummaries.Size = New System.Drawing.Size(100, 20) + Me.txtMonthSummaries.TabIndex = 8 + Me.txtMonthSummaries.Tag = "" + ' + 'lblVariable + ' + Me.lblVariable.AutoSize = True + Me.lblVariable.Location = New System.Drawing.Point(27, 65) + Me.lblVariable.Name = "lblVariable" + Me.lblVariable.Size = New System.Drawing.Size(39, 13) + Me.lblVariable.TabIndex = 10 + Me.lblVariable.Tag = "Variable" + Me.lblVariable.Text = "Label1" + ' + 'lblDayDisplay + ' + Me.lblDayDisplay.AutoSize = True + Me.lblDayDisplay.Location = New System.Drawing.Point(27, 94) + Me.lblDayDisplay.Name = "lblDayDisplay" + Me.lblDayDisplay.Size = New System.Drawing.Size(39, 13) + Me.lblDayDisplay.TabIndex = 11 + Me.lblDayDisplay.Tag = "Day_Display" + Me.lblDayDisplay.Text = "Label2" + ' + 'lblDecimalPlaces + ' + Me.lblDecimalPlaces.AutoSize = True + Me.lblDecimalPlaces.Location = New System.Drawing.Point(236, 134) + Me.lblDecimalPlaces.Name = "lblDecimalPlaces" + Me.lblDecimalPlaces.Size = New System.Drawing.Size(39, 13) + Me.lblDecimalPlaces.TabIndex = 12 + Me.lblDecimalPlaces.Tag = "Decimal_Places" + Me.lblDecimalPlaces.Text = "Label3" + ' + 'lblThreshold + ' + Me.lblThreshold.AutoSize = True + Me.lblThreshold.Location = New System.Drawing.Point(27, 134) + Me.lblThreshold.Name = "lblThreshold" + Me.lblThreshold.Size = New System.Drawing.Size(39, 13) + Me.lblThreshold.TabIndex = 13 + Me.lblThreshold.Tag = "Threshold" + Me.lblThreshold.Text = "Label4" + ' + 'lblSummaryNames + ' + Me.lblSummaryNames.AutoSize = True + Me.lblSummaryNames.Location = New System.Drawing.Point(27, 177) + Me.lblSummaryNames.Name = "lblSummaryNames" + Me.lblSummaryNames.Size = New System.Drawing.Size(39, 13) + Me.lblSummaryNames.TabIndex = 14 + Me.lblSummaryNames.Tag = "Summary_Names" + Me.lblSummaryNames.Text = "Label5" + ' + 'lblMonth_Summaries + ' + Me.lblMonth_Summaries.AutoSize = True + Me.lblMonth_Summaries.Location = New System.Drawing.Point(27, 39) + Me.lblMonth_Summaries.Name = "lblMonth_Summaries" + Me.lblMonth_Summaries.Size = New System.Drawing.Size(39, 13) + Me.lblMonth_Summaries.TabIndex = 16 + Me.lblMonth_Summaries.Tag = "Month_Summaries" + Me.lblMonth_Summaries.Text = "Label7" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(82, 9) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(88, 13) + Me.Label3.TabIndex = 17 + Me.Label3.Text = "Not implememted" + ' + 'chkMonthAbbreviation + ' + Me.chkMonthAbbreviation.AutoSize = True + Me.chkMonthAbbreviation.Location = New System.Drawing.Point(30, 220) + Me.chkMonthAbbreviation.Name = "chkMonthAbbreviation" + Me.chkMonthAbbreviation.Size = New System.Drawing.Size(81, 17) + Me.chkMonthAbbreviation.TabIndex = 18 + Me.chkMonthAbbreviation.Tag = "Month_Abbreviation" + Me.chkMonthAbbreviation.Text = "CheckBox1" + Me.chkMonthAbbreviation.UseVisualStyleBackColor = True + ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 230) + Me.ucrBase.Location = New System.Drawing.Point(30, 284) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 67) + Me.ucrBase.Size = New System.Drawing.Size(410, 56) Me.ucrBase.TabIndex = 0 ' 'dlgDisplayDaily ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(441, 309) + Me.ClientSize = New System.Drawing.Size(462, 352) + Me.Controls.Add(Me.chkMonthAbbreviation) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.lblMonth_Summaries) + Me.Controls.Add(Me.lblSummaryNames) + Me.Controls.Add(Me.lblThreshold) + Me.Controls.Add(Me.lblDecimalPlaces) + Me.Controls.Add(Me.lblDayDisplay) + Me.Controls.Add(Me.lblVariable) + Me.Controls.Add(Me.txtMonthSummaries) + Me.Controls.Add(Me.txtVariable) + Me.Controls.Add(Me.txtDayDisplay) + Me.Controls.Add(Me.txtSummaryNames) + Me.Controls.Add(Me.nudThreshold) + Me.Controls.Add(Me.nudDecimalPlaces) + Me.Controls.Add(Me.chkRemoveNA) + Me.Controls.Add(Me.chkPrintTables) Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDisplayDaily" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Display_daily" - Me.Text = "Display daily" + Me.Tag = "Display_Daily" + Me.Text = "Display Daily" + CType(Me.nudDecimalPlaces, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents chkPrintTables As CheckBox + Friend WithEvents chkRemoveNA As CheckBox + Friend WithEvents nudDecimalPlaces As NumericUpDown + Friend WithEvents nudThreshold As NumericUpDown + Friend WithEvents txtSummaryNames As TextBox + Friend WithEvents txtDayDisplay As TextBox + Friend WithEvents txtVariable As TextBox + Friend WithEvents txtMonthSummaries As TextBox + Friend WithEvents lblVariable As Label + Friend WithEvents lblDayDisplay As Label + Friend WithEvents lblDecimalPlaces As Label + Friend WithEvents lblThreshold As Label + Friend WithEvents lblSummaryNames As Label + Friend WithEvents lblMonth_Summaries As Label + Friend WithEvents Label3 As Label + Friend WithEvents chkMonthAbbreviation As CheckBox +End Class diff --git a/instat/dlgDisplayDailyDataRain.designer.vb b/instat/dlgDisplayDailyDataRain.designer.vb index 21f07c5d3d1..08b4b96227d 100644 --- a/instat/dlgDisplayDailyDataRain.designer.vb +++ b/instat/dlgDisplayDailyDataRain.designer.vb @@ -1,53 +1,298 @@ - _ -Partial Class dlgDisplayDailyDataRain - 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() + +Partial Class dlgDisplayDailyDataRain + 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.ucrBase = New instat.ucrButtons() + Me.txtSumLabel = New System.Windows.Forms.TextBox() + Me.txtMaxLabel = New System.Windows.Forms.TextBox() + Me.lblMaxLabel = New System.Windows.Forms.Label() + Me.lblSumLabel = New System.Windows.Forms.Label() + Me.chkMonthAbbreviation = New System.Windows.Forms.CheckBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.lblMonth_Summaries = New System.Windows.Forms.Label() + Me.lblSummaryNames = New System.Windows.Forms.Label() + Me.lblThreshold = New System.Windows.Forms.Label() + Me.lblDecimalPlaces = New System.Windows.Forms.Label() + Me.lblDayDisplay = New System.Windows.Forms.Label() + Me.lblVariable = New System.Windows.Forms.Label() + Me.txtMonthSummaries = New System.Windows.Forms.TextBox() + Me.txtVariable = New System.Windows.Forms.TextBox() + Me.txtDayDisplay = New System.Windows.Forms.TextBox() + Me.txtSummaryNames = New System.Windows.Forms.TextBox() + Me.nudThreshold = New System.Windows.Forms.NumericUpDown() + Me.nudDecimalPlaces = New System.Windows.Forms.NumericUpDown() + Me.chkRemoveNA = New System.Windows.Forms.CheckBox() + Me.chkPrintTables = New System.Windows.Forms.CheckBox() + CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudDecimalPlaces, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 239) + Me.ucrBase.Location = New System.Drawing.Point(56, 330) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 62) + Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 0 ' + 'txtSumLabel + ' + Me.txtSumLabel.Location = New System.Drawing.Point(433, 35) + Me.txtSumLabel.Name = "txtSumLabel" + Me.txtSumLabel.Size = New System.Drawing.Size(100, 20) + Me.txtSumLabel.TabIndex = 114 + ' + 'txtMaxLabel + ' + Me.txtMaxLabel.Location = New System.Drawing.Point(433, 68) + Me.txtMaxLabel.Name = "txtMaxLabel" + Me.txtMaxLabel.Size = New System.Drawing.Size(100, 20) + Me.txtMaxLabel.TabIndex = 113 + ' + 'lblMaxLabel + ' + Me.lblMaxLabel.AutoSize = True + Me.lblMaxLabel.Location = New System.Drawing.Point(339, 75) + Me.lblMaxLabel.Name = "lblMaxLabel" + Me.lblMaxLabel.Size = New System.Drawing.Size(39, 13) + Me.lblMaxLabel.TabIndex = 112 + Me.lblMaxLabel.Tag = "Max_Label" + Me.lblMaxLabel.Text = "Label2" + ' + 'lblSumLabel + ' + Me.lblSumLabel.AutoSize = True + Me.lblSumLabel.Location = New System.Drawing.Point(339, 34) + Me.lblSumLabel.Name = "lblSumLabel" + Me.lblSumLabel.Size = New System.Drawing.Size(39, 13) + Me.lblSumLabel.TabIndex = 111 + Me.lblSumLabel.Tag = "Sum_Label" + Me.lblSumLabel.Text = "Label1" + ' + 'chkMonthAbbreviation + ' + Me.chkMonthAbbreviation.AutoSize = True + Me.chkMonthAbbreviation.Location = New System.Drawing.Point(56, 246) + Me.chkMonthAbbreviation.Name = "chkMonthAbbreviation" + Me.chkMonthAbbreviation.Size = New System.Drawing.Size(81, 17) + Me.chkMonthAbbreviation.TabIndex = 110 + Me.chkMonthAbbreviation.Tag = "Month_Abbreviation" + Me.chkMonthAbbreviation.Text = "CheckBox1" + Me.chkMonthAbbreviation.UseVisualStyleBackColor = True + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(39, 0) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(88, 13) + Me.Label3.TabIndex = 109 + Me.Label3.Text = "Not implememted" + ' + 'lblMonth_Summaries + ' + Me.lblMonth_Summaries.AutoSize = True + Me.lblMonth_Summaries.Location = New System.Drawing.Point(50, 38) + Me.lblMonth_Summaries.Name = "lblMonth_Summaries" + Me.lblMonth_Summaries.Size = New System.Drawing.Size(39, 13) + Me.lblMonth_Summaries.TabIndex = 108 + Me.lblMonth_Summaries.Tag = "Month_Summaries" + Me.lblMonth_Summaries.Text = "Label7" + ' + 'lblSummaryNames + ' + Me.lblSummaryNames.AutoSize = True + Me.lblSummaryNames.Location = New System.Drawing.Point(50, 196) + Me.lblSummaryNames.Name = "lblSummaryNames" + Me.lblSummaryNames.Size = New System.Drawing.Size(39, 13) + Me.lblSummaryNames.TabIndex = 107 + Me.lblSummaryNames.Tag = "Summary_Names" + Me.lblSummaryNames.Text = "Label5" + ' + 'lblThreshold + ' + Me.lblThreshold.AutoSize = True + Me.lblThreshold.Location = New System.Drawing.Point(49, 158) + Me.lblThreshold.Name = "lblThreshold" + Me.lblThreshold.Size = New System.Drawing.Size(39, 13) + Me.lblThreshold.TabIndex = 106 + Me.lblThreshold.Tag = "Threshold" + Me.lblThreshold.Text = "Label4" + ' + 'lblDecimalPlaces + ' + Me.lblDecimalPlaces.AutoSize = True + Me.lblDecimalPlaces.Location = New System.Drawing.Point(339, 158) + Me.lblDecimalPlaces.Name = "lblDecimalPlaces" + Me.lblDecimalPlaces.Size = New System.Drawing.Size(39, 13) + Me.lblDecimalPlaces.TabIndex = 105 + Me.lblDecimalPlaces.Tag = "Decimal_Places" + Me.lblDecimalPlaces.Text = "Label3" + ' + 'lblDayDisplay + ' + Me.lblDayDisplay.AutoSize = True + Me.lblDayDisplay.Location = New System.Drawing.Point(50, 104) + Me.lblDayDisplay.Name = "lblDayDisplay" + Me.lblDayDisplay.Size = New System.Drawing.Size(39, 13) + Me.lblDayDisplay.TabIndex = 104 + Me.lblDayDisplay.Tag = "Day_Display" + Me.lblDayDisplay.Text = "Label2" + ' + 'lblVariable + ' + Me.lblVariable.AutoSize = True + Me.lblVariable.Location = New System.Drawing.Point(49, 68) + Me.lblVariable.Name = "lblVariable" + Me.lblVariable.Size = New System.Drawing.Size(39, 13) + Me.lblVariable.TabIndex = 103 + Me.lblVariable.Tag = "Variable" + Me.lblVariable.Text = "Label1" + ' + 'txtMonthSummaries + ' + Me.txtMonthSummaries.Location = New System.Drawing.Point(157, 31) + Me.txtMonthSummaries.Name = "txtMonthSummaries" + Me.txtMonthSummaries.Size = New System.Drawing.Size(100, 20) + Me.txtMonthSummaries.TabIndex = 102 + Me.txtMonthSummaries.Tag = "" + ' + 'txtVariable + ' + Me.txtVariable.Location = New System.Drawing.Point(157, 68) + Me.txtVariable.Name = "txtVariable" + Me.txtVariable.Size = New System.Drawing.Size(100, 20) + Me.txtVariable.TabIndex = 101 + ' + 'txtDayDisplay + ' + Me.txtDayDisplay.Location = New System.Drawing.Point(157, 97) + Me.txtDayDisplay.Name = "txtDayDisplay" + Me.txtDayDisplay.Size = New System.Drawing.Size(100, 20) + Me.txtDayDisplay.TabIndex = 100 + Me.txtDayDisplay.Tag = "" + ' + 'txtSummaryNames + ' + Me.txtSummaryNames.Location = New System.Drawing.Point(157, 193) + Me.txtSummaryNames.Name = "txtSummaryNames" + Me.txtSummaryNames.Size = New System.Drawing.Size(100, 20) + Me.txtSummaryNames.TabIndex = 99 + ' + 'nudThreshold + ' + Me.nudThreshold.Location = New System.Drawing.Point(157, 153) + Me.nudThreshold.Name = "nudThreshold" + Me.nudThreshold.Size = New System.Drawing.Size(76, 20) + Me.nudThreshold.TabIndex = 98 + ' + 'nudDecimalPlaces + ' + Me.nudDecimalPlaces.Location = New System.Drawing.Point(433, 153) + Me.nudDecimalPlaces.Maximum = New Decimal(New Integer() {3, 0, 0, 0}) + Me.nudDecimalPlaces.Name = "nudDecimalPlaces" + Me.nudDecimalPlaces.Size = New System.Drawing.Size(67, 20) + Me.nudDecimalPlaces.TabIndex = 97 + ' + 'chkRemoveNA + ' + Me.chkRemoveNA.AutoSize = True + Me.chkRemoveNA.Location = New System.Drawing.Point(372, 246) + Me.chkRemoveNA.Name = "chkRemoveNA" + Me.chkRemoveNA.Size = New System.Drawing.Size(81, 17) + Me.chkRemoveNA.TabIndex = 96 + Me.chkRemoveNA.Tag = "Remove_NA" + Me.chkRemoveNA.Text = "CheckBox2" + Me.chkRemoveNA.UseVisualStyleBackColor = True + ' + 'chkPrintTables + ' + Me.chkPrintTables.AutoSize = True + Me.chkPrintTables.Location = New System.Drawing.Point(220, 246) + Me.chkPrintTables.Name = "chkPrintTables" + Me.chkPrintTables.Size = New System.Drawing.Size(81, 17) + Me.chkPrintTables.TabIndex = 95 + Me.chkPrintTables.Tag = "Print_Tables" + Me.chkPrintTables.Text = "CheckBox1" + Me.chkPrintTables.UseVisualStyleBackColor = True + ' 'dlgDisplayDailyDataRain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(442, 313) + Me.ClientSize = New System.Drawing.Size(568, 394) + Me.Controls.Add(Me.txtSumLabel) + Me.Controls.Add(Me.txtMaxLabel) + Me.Controls.Add(Me.lblMaxLabel) + Me.Controls.Add(Me.lblSumLabel) + Me.Controls.Add(Me.chkMonthAbbreviation) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.lblMonth_Summaries) + Me.Controls.Add(Me.lblSummaryNames) + Me.Controls.Add(Me.lblThreshold) + Me.Controls.Add(Me.lblDecimalPlaces) + Me.Controls.Add(Me.lblDayDisplay) + Me.Controls.Add(Me.lblVariable) + Me.Controls.Add(Me.txtMonthSummaries) + Me.Controls.Add(Me.txtVariable) + Me.Controls.Add(Me.txtDayDisplay) + Me.Controls.Add(Me.txtSummaryNames) + Me.Controls.Add(Me.nudThreshold) + Me.Controls.Add(Me.nudDecimalPlaces) + Me.Controls.Add(Me.chkRemoveNA) + Me.Controls.Add(Me.chkPrintTables) Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDisplayDailyDataRain" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Display_daily_data_rain" - Me.Text = "Display daily data rain" + Me.Tag = "Display_Daily_Data_Rain" + Me.Text = "dlgDisplayDailyDataRain" + CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudDecimalPlaces, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents txtSumLabel As TextBox + Friend WithEvents txtMaxLabel As TextBox + Friend WithEvents lblMaxLabel As Label + Friend WithEvents lblSumLabel As Label + Friend WithEvents chkMonthAbbreviation As CheckBox + Friend WithEvents Label3 As Label + Friend WithEvents lblMonth_Summaries As Label + Friend WithEvents lblSummaryNames As Label + Friend WithEvents lblThreshold As Label + Friend WithEvents lblDecimalPlaces As Label + Friend WithEvents lblDayDisplay As Label + Friend WithEvents lblVariable As Label + Friend WithEvents txtMonthSummaries As TextBox + Friend WithEvents txtVariable As TextBox + Friend WithEvents txtDayDisplay As TextBox + Friend WithEvents txtSummaryNames As TextBox + Friend WithEvents nudThreshold As NumericUpDown + Friend WithEvents nudDecimalPlaces As NumericUpDown + Friend WithEvents chkRemoveNA As CheckBox + Friend WithEvents chkPrintTables As CheckBox +End Class diff --git a/instat/dlgExtremeEvents.Designer.vb b/instat/dlgExtremeEvents.Designer.vb index 245df854c45..6594555d96f 100644 --- a/instat/dlgExtremeEvents.Designer.vb +++ b/instat/dlgExtremeEvents.Designer.vb @@ -1,27 +1,27 @@ - _ -Partial Class dlgExtremeEvents - 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() + +Partial Class dlgExtremeEvents + 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.txtColumNameExtremeEvent = New System.Windows.Forms.TextBox() Me.txtColumnNameEventDay = New System.Windows.Forms.TextBox() Me.lblColumnNameExtremeEvent = New System.Windows.Forms.Label() @@ -235,16 +235,16 @@ Partial Class dlgExtremeEvents ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(61, 362) + Me.ucrBase.Location = New System.Drawing.Point(52, 384) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.Size = New System.Drawing.Size(410, 54) Me.ucrBase.TabIndex = 4 ' 'dlgExtremeEvents ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(536, 415) + Me.ClientSize = New System.Drawing.Size(536, 450) Me.Controls.Add(Me.chkThresholdValue) Me.Controls.Add(Me.Label6) Me.Controls.Add(Me.lblEndDay) @@ -265,12 +265,12 @@ Partial Class dlgExtremeEvents Me.Controls.Add(Me.lblColumnNameExtremeEvent) Me.Controls.Add(Me.txtColumnNameEventDay) Me.Controls.Add(Me.txtColumNameExtremeEvent) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgExtremeEvents" Me.Tag = "Extreme_Events" - Me.Text = "Extreme Events" + Me.Text = "dlgExtremeEvents" CType(Me.nudTotalDays, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.NumericUpDown7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).EndInit() @@ -279,26 +279,26 @@ Partial Class dlgExtremeEvents Me.ResumeLayout(False) Me.PerformLayout() - End Sub - - Friend WithEvents txtColumNameExtremeEvent As TextBox - Friend WithEvents txtColumnNameEventDay As TextBox - Friend WithEvents lblColumnNameExtremeEvent As Label - Friend WithEvents lblColumNameEventDay As Label - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents chkRemoveNA As CheckBox - Friend WithEvents chkExtremeMax As CheckBox - Friend WithEvents chkExtremeMin As CheckBox - Friend WithEvents CheckBox4 As CheckBox - Friend WithEvents nudTotalDays As NumericUpDown - Friend WithEvents NumericUpDown7 As NumericUpDown - Friend WithEvents nudThreshold As NumericUpDown - Friend WithEvents nudEndDay As NumericUpDown - Friend WithEvents nudStartDay As NumericUpDown - Friend WithEvents lblStartDay As Label - Friend WithEvents lblTotalDays As Label - Friend WithEvents lblThreshold As Label - Friend WithEvents lblEndDay As Label - Friend WithEvents Label6 As Label - Friend WithEvents chkThresholdValue As CheckBox -End Class + End Sub + + Friend WithEvents txtColumNameExtremeEvent As TextBox + Friend WithEvents txtColumnNameEventDay As TextBox + Friend WithEvents lblColumnNameExtremeEvent As Label + Friend WithEvents lblColumNameEventDay As Label + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents chkRemoveNA As CheckBox + Friend WithEvents chkExtremeMax As CheckBox + Friend WithEvents chkExtremeMin As CheckBox + Friend WithEvents CheckBox4 As CheckBox + Friend WithEvents nudTotalDays As NumericUpDown + Friend WithEvents NumericUpDown7 As NumericUpDown + Friend WithEvents nudThreshold As NumericUpDown + Friend WithEvents nudEndDay As NumericUpDown + Friend WithEvents nudStartDay As NumericUpDown + Friend WithEvents lblStartDay As Label + Friend WithEvents lblTotalDays As Label + Friend WithEvents lblThreshold As Label + Friend WithEvents lblEndDay As Label + Friend WithEvents Label6 As Label + Friend WithEvents chkThresholdValue As CheckBox +End Class \ No newline at end of file diff --git a/instat/dlgExtremeEvents.vb b/instat/dlgExtremeEvents.vb index 98a3c3c65d2..941d6038c1c 100644 --- a/instat/dlgExtremeEvents.vb +++ b/instat/dlgExtremeEvents.vb @@ -1,4 +1,18 @@ - +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see .Imports instat.Translations Imports instat.Translations Public Class dlgExtremeEvents Private Sub ucrBase_clickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk @@ -16,7 +30,7 @@ Public Class dlgExtremeEvents strScript = strScript & ", threshold_value=" & nudThreshold.Value.ToString() End If strScript = strScript & ",replace=True)" - frmMain.clsRLink.climateObject() + 'frmMain.clsRLink.climateObject() frmMain.clsRLink.RunScript(strScript, False) 'TODO fix this to update grids instead of calling FillData which no longer exists ' frmMain.FillData("climate_obj$climate_data_objects[[1]]$data") @@ -27,26 +41,64 @@ Public Class dlgExtremeEvents Private Sub chkDrySpell_CheckedChanged(sender As Object, e As EventArgs) Handles chkThresholdValue.CheckedChanged UpdateVisible() End Sub + Private Sub UpdateVisible() + lblThreshold.Visible = chkThresholdValue.Checked + End Sub + Private Sub dlgExtremeEvents_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Private Sub dlgStartofRains_Load(sender As Object, e As EventArgs) Handles Me.Load - UpdateVisible() autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("climate_obj$()") + ucrBase.clsRsyntax.iCallType = 0 End Sub - Private Sub UpdateVisible() - lblThreshold.Visible = chkThresholdValue.Checked + Private Sub txtColumnNameExtreme_Leave(sender As Object, e As EventArgs) Handles txtColumNameExtremeEvent.Leave + ucrBase.clsRsyntax.AddParameter("col_names", Chr(34) & txtColumNameExtremeEvent.Text & Chr(34)) + ucrBase.clsRsyntax.AddParameter("col_names", Chr(34) & txtColumnNameEventDay.Text & Chr(34)) ' this is not quite right the col_names is a vector that takes to parameters; is of the form col_names=c(par1,par2). Not sure of a way to proceed, could use some help + End Sub + Private Sub nudStartDay_Leave(sender As Object, e As EventArgs) Handles nudStartDay.Leave + ucrBase.clsRsyntax.AddParameter("start_day", nudStartDay.Value.ToString()) End Sub - Private Sub ucrBase_Load(sender As Object, e As EventArgs) Handles ucrBase.Load + Private Sub nudEndDay_Leave(sender As Object, e As EventArgs) Handles nudEndDay.Leave + ucrBase.clsRsyntax.AddParameter("end_day", nudEndDay.Value.ToString()) + End Sub + Private Sub nudTotalDays_Leave(sender As Object, e As EventArgs) Handles nudTotalDays.Leave + ucrBase.clsRsyntax.AddParameter("total_days", nudTotalDays.Value.ToString()) + End Sub + Private Sub chkThresholdValue_Leave(sender As Object, e As EventArgs) Handles chkThresholdValue.Leave + ucrBase.clsRsyntax.AddParameter("val_threshold", chkThresholdValue.Checked.ToString().ToUpper()) End Sub - Private Sub txtColumnNameExtremeEvent_Click(sender As Object, e As EventArgs) Handles lblColumnNameExtremeEvent.Click + Private Sub chkRemoveNA_Leave(sender As Object, e As EventArgs) Handles chkRemoveNA.Leave + ucrBase.clsRsyntax.AddParameter("na.rm", chkRemoveNA.Checked.ToString().ToUpper()) End Sub - Private Sub dlgExtremeEvents_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Private Sub txtTitle_Leave(sender As Object, e As EventArgs) Handles nudThreshold.Leave + If chkThresholdValue.Checked Then + ucrBase.clsRsyntax.AddParameter(" threshold_value", nudThreshold.Value.ToString()) + End If + End Sub + Private Sub chkExtremeMax_Leave(sender As Object, e As EventArgs) Handles chkExtremeMax.Leave + If chkExtremeMax.Checked Then + ucrBase.clsRsyntax.AddParameter("extreme_max", chkExtremeMax.Checked.ToString().ToUpper()) + End If End Sub + + Private Sub chkExtremeMin_Leave(sender As Object, e As EventArgs) Handles chkExtremeMin.Leave + If chkExtremeMin.Checked Then + ucrBase.clsRsyntax.AddParameter("extreme_min", chkExtremeMin.Checked.ToString().ToUpper()) + End If + End Sub + 'Reserved for two parameters that are not implemented well in the method namely upper_lim, and lower_lim. + ' Private Sub chk_Leave(sender As Object, e As EventArgs) Handles chkThresholdValue.Leave + ' ucrBase.clsRsyntax.AddParameter("val_threshold", chkThresholdValue.Checked.ToString().ToUpper()) + 'End Sub + + 'Private Sub chkThresholdValue_Leave(sender As Object, e As EventArgs) Handles chkThresholdValue.Leave + ' ucrBase.clsRsyntax.AddParameter("val_threshold", chkThresholdValue.Checked.ToString().ToUpper()) + 'End Sub End Class \ No newline at end of file diff --git a/instat/dlgHistogramMethod.designer.vb b/instat/dlgHistogramMethod.designer.vb index 7834b485c76..fbd3cc2d373 100644 --- a/instat/dlgHistogramMethod.designer.vb +++ b/instat/dlgHistogramMethod.designer.vb @@ -1,52 +1,64 @@ - _ -Partial Class dlgHistogramMethod - 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() + +Partial Class dlgHistogramMethod + 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.ucrBase = New instat.ucrButtons() + Me.Label1 = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 196) + Me.ucrBase.Location = New System.Drawing.Point(12, 207) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.Size = New System.Drawing.Size(410, 32) Me.ucrBase.TabIndex = 0 ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(94, 34) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(125, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Data list not implemented" + ' 'dlgHistogramMethod ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(434, 251) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgHistogramMethod" - Me.Tag = "Histogram_Method" - Me.Text = "Histogram Method" + Me.Text = "dlgHistogramMethod" Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents Label1 As Label +End Class \ No newline at end of file diff --git a/instat/dlgHistogramMethod.vb b/instat/dlgHistogramMethod.vb index 71d5b561eaa..35b431f3bec 100644 --- a/instat/dlgHistogramMethod.vb +++ b/instat/dlgHistogramMethod.vb @@ -1,8 +1,24 @@ -Imports instat.Translations -Public Class dlgHistogramMethod - Private Sub ucrBase_Load(sender As Object, e As EventArgs) Handles ucrBase.Load - autoTranslate(Me) - ucrBase.clsRsyntax.SetFunction("climate_obj$histogram") - ucrBase.clsRsyntax.iCallType = 0 - End Sub +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations +Public Class dlgHistogramMethod + Private Sub dlgHistogramMethod_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("climate_obj$histogram") + ucrBase.clsRsyntax.iCallType = 0 + End Sub End Class \ No newline at end of file diff --git a/instat/dlgIsNAListvb.designer.vb b/instat/dlgIsNAListvb.designer.vb index 3db8e78bffb..ee07bcd71dd 100644 --- a/instat/dlgIsNAListvb.designer.vb +++ b/instat/dlgIsNAListvb.designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class dlgIsNAList 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 @@ -20,33 +20,92 @@ Partial Class dlgIsNAList '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.Label1 = New System.Windows.Forms.Label() + Me.lblVariable = New System.Windows.Forms.Label() + Me.lblPeriod = New System.Windows.Forms.Label() + Me.txtPeriod = New System.Windows.Forms.TextBox() + Me.txtVariable = New System.Windows.Forms.TextBox() Me.ucrBase = New instat.ucrButtons() Me.SuspendLayout() ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(28, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(113, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Data list not implement" + ' + 'lblVariable + ' + Me.lblVariable.AutoSize = True + Me.lblVariable.Location = New System.Drawing.Point(28, 59) + Me.lblVariable.Name = "lblVariable" + Me.lblVariable.Size = New System.Drawing.Size(39, 13) + Me.lblVariable.TabIndex = 2 + Me.lblVariable.Tag = "Variable" + Me.lblVariable.Text = "Label2" + ' + 'lblPeriod + ' + Me.lblPeriod.AutoSize = True + Me.lblPeriod.Location = New System.Drawing.Point(28, 109) + Me.lblPeriod.Name = "lblPeriod" + Me.lblPeriod.Size = New System.Drawing.Size(39, 13) + Me.lblPeriod.TabIndex = 3 + Me.lblPeriod.Tag = "Period" + Me.lblPeriod.Text = "Label3" + ' + 'txtPeriod + ' + Me.txtPeriod.Location = New System.Drawing.Point(160, 106) + Me.txtPeriod.Name = "txtPeriod" + Me.txtPeriod.Size = New System.Drawing.Size(100, 20) + Me.txtPeriod.TabIndex = 4 + ' + 'txtVariable + ' + Me.txtVariable.Location = New System.Drawing.Point(160, 52) + Me.txtVariable.Name = "txtVariable" + Me.txtVariable.Size = New System.Drawing.Size(100, 20) + Me.txtVariable.TabIndex = 5 + ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(23, 228) + Me.ucrBase.Location = New System.Drawing.Point(19, 204) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) + Me.ucrBase.Size = New System.Drawing.Size(410, 54) Me.ucrBase.TabIndex = 0 ' 'dlgIsNAList ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(463, 262) + Me.ClientSize = New System.Drawing.Size(463, 264) + Me.Controls.Add(Me.txtVariable) + Me.Controls.Add(Me.txtPeriod) + Me.Controls.Add(Me.lblPeriod) + Me.Controls.Add(Me.lblVariable) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgIsNAList" Me.Tag = "Is_NA_List" - Me.Text = "dlgIsNAList" + Me.Text = "Is NA List" Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents ucrBase As ucrButtons + Friend WithEvents Label1 As Label + Friend WithEvents lblVariable As Label + Friend WithEvents lblPeriod As Label + Friend WithEvents txtPeriod As TextBox + Friend WithEvents txtVariable As TextBox End Class diff --git a/instat/dlgIsNAListvb.vb b/instat/dlgIsNAListvb.vb index ac13fceb5c2..66c725fa286 100644 --- a/instat/dlgIsNAListvb.vb +++ b/instat/dlgIsNAListvb.vb @@ -1,4 +1,20 @@ -Imports instat.Translations + +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . +Imports instat.Translations Public Class dlgIsNAList Private Sub UcrButtons1_Load(sender As Object, e As EventArgs) Handles ucrBase.Load autoTranslate(Me) diff --git a/instat/dlgSpellLength.Designer.vb b/instat/dlgSpellLength.Designer.vb index 6323eb0337b..4e6b8a9930e 100644 --- a/instat/dlgSpellLength.Designer.vb +++ b/instat/dlgSpellLength.Designer.vb @@ -1,50 +1,217 @@ - _ -Partial Class dlgSpellLength - 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() + +Partial Class dlgSpellLengths + 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.chkPrintTable = New System.Windows.Forms.CheckBox() + Me.chkMonthAbbreviations = New System.Windows.Forms.CheckBox() + Me.chkRemoveNA = New System.Windows.Forms.CheckBox() + Me.chkSeparate = New System.Windows.Forms.CheckBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.Threshold = New System.Windows.Forms.Label() + Me.lblYearList = New System.Windows.Forms.Label() + Me.lblDOYearList = New System.Windows.Forms.Label() + Me.nudThreshold = New System.Windows.Forms.NumericUpDown() + Me.txtListYears = New System.Windows.Forms.TextBox() + Me.txtDOYearList = New System.Windows.Forms.TextBox() + Me.txtDataframeNames = New System.Windows.Forms.TextBox() + Me.lblDataframeNames = New System.Windows.Forms.Label() Me.ucrBase = New instat.ucrButtons() + CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'chkPrintTable + ' + Me.chkPrintTable.AutoSize = True + Me.chkPrintTable.Location = New System.Drawing.Point(133, 184) + Me.chkPrintTable.Name = "chkPrintTable" + Me.chkPrintTable.Size = New System.Drawing.Size(81, 17) + Me.chkPrintTable.TabIndex = 1 + Me.chkPrintTable.Tag = "Print_Table" + Me.chkPrintTable.Text = "CheckBox1" + Me.chkPrintTable.UseVisualStyleBackColor = True + ' + 'chkMonthAbbreviations + ' + Me.chkMonthAbbreviations.AutoSize = True + Me.chkMonthAbbreviations.Location = New System.Drawing.Point(334, 184) + Me.chkMonthAbbreviations.Name = "chkMonthAbbreviations" + Me.chkMonthAbbreviations.Size = New System.Drawing.Size(81, 17) + Me.chkMonthAbbreviations.TabIndex = 2 + Me.chkMonthAbbreviations.Tag = "Month_Abbreviations" + Me.chkMonthAbbreviations.Text = "CheckBox2" + Me.chkMonthAbbreviations.UseVisualStyleBackColor = True + ' + 'chkRemoveNA + ' + Me.chkRemoveNA.AutoSize = True + Me.chkRemoveNA.Location = New System.Drawing.Point(133, 234) + Me.chkRemoveNA.Name = "chkRemoveNA" + Me.chkRemoveNA.Size = New System.Drawing.Size(81, 17) + Me.chkRemoveNA.TabIndex = 3 + Me.chkRemoveNA.Tag = "Remove_NA" + Me.chkRemoveNA.Text = "CheckBox3" + Me.chkRemoveNA.UseVisualStyleBackColor = True + ' + 'chkSeparate + ' + Me.chkSeparate.AutoSize = True + Me.chkSeparate.Location = New System.Drawing.Point(334, 234) + Me.chkSeparate.Name = "chkSeparate" + Me.chkSeparate.Size = New System.Drawing.Size(81, 17) + Me.chkSeparate.TabIndex = 4 + Me.chkSeparate.Tag = "Separate" + Me.chkSeparate.Text = "CheckBox4" + Me.chkSeparate.UseVisualStyleBackColor = True + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(93, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(125, 13) + Me.Label1.TabIndex = 5 + Me.Label1.Text = "Data list not implemented" + ' + 'Threshold + ' + Me.Threshold.AutoSize = True + Me.Threshold.Location = New System.Drawing.Point(29, 45) + Me.Threshold.Name = "Threshold" + Me.Threshold.Size = New System.Drawing.Size(39, 13) + Me.Threshold.TabIndex = 6 + Me.Threshold.Tag = "Threshold" + Me.Threshold.Text = "Label2" + ' + 'lblYearList + ' + Me.lblYearList.AutoSize = True + Me.lblYearList.Location = New System.Drawing.Point(29, 107) + Me.lblYearList.Name = "lblYearList" + Me.lblYearList.Size = New System.Drawing.Size(39, 13) + Me.lblYearList.TabIndex = 7 + Me.lblYearList.Tag = "Year_List" + Me.lblYearList.Text = "Label3" + ' + 'lblDOYearList + ' + Me.lblDOYearList.AutoSize = True + Me.lblDOYearList.Location = New System.Drawing.Point(29, 78) + Me.lblDOYearList.Name = "lblDOYearList" + Me.lblDOYearList.Size = New System.Drawing.Size(39, 13) + Me.lblDOYearList.TabIndex = 9 + Me.lblDOYearList.Tag = "DOY_List" + Me.lblDOYearList.Text = "Label5" + ' + 'nudThreshold + ' + Me.nudThreshold.Increment = New Decimal(New Integer() {1, 0, 0, 131072}) + Me.nudThreshold.Location = New System.Drawing.Point(133, 45) + Me.nudThreshold.Maximum = New Decimal(New Integer() {10, 0, 0, 0}) + Me.nudThreshold.Name = "nudThreshold" + Me.nudThreshold.Size = New System.Drawing.Size(58, 20) + Me.nudThreshold.TabIndex = 11 + ' + 'txtListYears + ' + Me.txtListYears.Location = New System.Drawing.Point(133, 104) + Me.txtListYears.Name = "txtListYears" + Me.txtListYears.Size = New System.Drawing.Size(100, 20) + Me.txtListYears.TabIndex = 12 + ' + 'txtDOYearList + ' + Me.txtDOYearList.Location = New System.Drawing.Point(133, 78) + Me.txtDOYearList.Name = "txtDOYearList" + Me.txtDOYearList.Size = New System.Drawing.Size(100, 20) + Me.txtDOYearList.TabIndex = 13 + ' + 'txtDataframeNames + ' + Me.txtDataframeNames.Location = New System.Drawing.Point(133, 130) + Me.txtDataframeNames.Name = "txtDataframeNames" + Me.txtDataframeNames.Size = New System.Drawing.Size(100, 20) + Me.txtDataframeNames.TabIndex = 14 + ' + 'lblDataframeNames + ' + Me.lblDataframeNames.AutoSize = True + Me.lblDataframeNames.Location = New System.Drawing.Point(29, 133) + Me.lblDataframeNames.Name = "lblDataframeNames" + Me.lblDataframeNames.Size = New System.Drawing.Size(39, 13) + Me.lblDataframeNames.TabIndex = 15 + Me.lblDataframeNames.Tag = "Dataframe_Names" + Me.lblDataframeNames.Text = "Label2" + ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(4, 211) + Me.ucrBase.Location = New System.Drawing.Point(53, 304) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 60) + Me.ucrBase.Size = New System.Drawing.Size(410, 51) Me.ucrBase.TabIndex = 0 ' - 'dlgSpellLength + 'dlgSpellLengths ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(420, 273) + Me.ClientSize = New System.Drawing.Size(511, 367) + Me.Controls.Add(Me.lblDataframeNames) + Me.Controls.Add(Me.txtDataframeNames) + Me.Controls.Add(Me.txtDOYearList) + Me.Controls.Add(Me.txtListYears) + Me.Controls.Add(Me.nudThreshold) + Me.Controls.Add(Me.lblDOYearList) + Me.Controls.Add(Me.lblYearList) + Me.Controls.Add(Me.Threshold) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.chkSeparate) + Me.Controls.Add(Me.chkRemoveNA) + Me.Controls.Add(Me.chkMonthAbbreviations) + Me.Controls.Add(Me.chkPrintTable) Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "dlgSpellLength" - Me.Tag = "Spell_Length" - Me.Text = "dlgSpellLength" + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgSpellLengths" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Spell Length" + CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub - End Sub - - Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents chkPrintTable As CheckBox + Friend WithEvents chkMonthAbbreviations As CheckBox + Friend WithEvents chkRemoveNA As CheckBox + Friend WithEvents chkSeparate As CheckBox + Friend WithEvents Label1 As Label + Friend WithEvents Threshold As Label + Friend WithEvents lblYearList As Label + Friend WithEvents lblDOYearList As Label + Friend WithEvents nudThreshold As NumericUpDown + Friend WithEvents txtListYears As TextBox + Friend WithEvents txtDOYearList As TextBox + Friend WithEvents txtDataframeNames As TextBox + Friend WithEvents lblDataframeNames As Label End Class diff --git a/instat/dlgSpellLength.resx b/instat/dlgSpellLength.resx index 1af7de150c9..29dcb1b3a35 100644 --- a/instat/dlgSpellLength.resx +++ b/instat/dlgSpellLength.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + \ No newline at end of file diff --git a/instat/dlgSpellLength.vb b/instat/dlgSpellLength.vb index 32ba6b15759..f6b8965fce4 100644 --- a/instat/dlgSpellLength.vb +++ b/instat/dlgSpellLength.vb @@ -1,21 +1,68 @@ -' Instat-R -' Copyright (C) 2015 -' -' This program is free software: you can redistribute it and/or modify -' it under the terms of the GNU General Public License as published by -' the Free Software Foundation, either version 3 of the License, or -' (at your option) any later version. -' -' This program is distributed in the hope that it will be useful, -' but WITHOUT ANY WARRANTY; without even the implied warranty of -' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -' GNU General Public License for more details. -' -' You should have received a copy of the GNU General Public License k -' along with this program. If not, see . -Imports instat.Translations -Public Class dlgSpellLength - Private Sub dlgSpellLength_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - End Sub +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . +Imports instat.Translations + +Public Class dlgSpellLengths + Private Sub dlgSpellLengths_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("climate_obj$spell_lengths") + ucrBase.clsRsyntax.iCallType = 0 + End Sub + + Private Sub nudThreshold_Leave(sender As Object, e As EventArgs) Handles nudThreshold.Leave + ucrBase.clsRsyntax.AddParameter("threshold", nudThreshold.Value.ToString()) + End Sub + + Private Sub chkPrintTable_Leave(sender As Object, e As EventArgs) Handles chkPrintTable.Leave + If chkPrintTable.Checked Then + ucrBase.clsRsyntax.AddParameter("print_table", chkPrintTable.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub chkMonthAbbreviations_Leave(sender As Object, e As EventArgs) Handles chkMonthAbbreviations.Leave + If chkMonthAbbreviations.Checked Then + ucrBase.clsRsyntax.AddParameter("month_list", chkMonthAbbreviations.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub chkSeparate_Leave(sender As Object, e As EventArgs) Handles chkSeparate.Leave + If chkSeparate.Checked Then + ucrBase.clsRsyntax.AddParameter("separate", chkSeparate.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub chkRemoveNA_Leave(sender As Object, e As EventArgs) Handles chkRemoveNA.Leave + If chkRemoveNA.Checked Then + ucrBase.clsRsyntax.AddParameter("na.rm", chkRemoveNA.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub txtDOYearList_Leave(sender As Object, e As EventArgs) Handles txtDOYearList.Leave + ucrBase.clsRsyntax.AddParameter("doy_m", Chr(34) & txtDOYearList.Text & Chr(34)) + 'this variable doy_m is a class list, however its a vector of the form c(m,n). + End Sub + + Private Sub txtListYears_Leave(sender As Object, e As EventArgs) Handles txtListYears.Leave + ucrBase.clsRsyntax.AddParameter("years", Chr(34) & txtListYears.Text & Chr(34)) + 'this variable doy_m is a class list, however its a vector of the form c(m,n). + + End Sub + End Class \ No newline at end of file diff --git a/instat/dlgSummaryStatistic.Designer.vb b/instat/dlgSummaryStatistic.Designer.vb new file mode 100644 index 00000000000..927d66b01af --- /dev/null +++ b/instat/dlgSummaryStatistic.Designer.vb @@ -0,0 +1,242 @@ + _ +Partial Class dlgSummaryStatistic + 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.ucrBase = New instat.ucrButtons() + Me.chkRemoveNA = New System.Windows.Forms.CheckBox() + Me.chkAppend = New System.Windows.Forms.CheckBox() + Me.chkConvert = New System.Windows.Forms.CheckBox() + Me.chkStatistics = New System.Windows.Forms.CheckBox() + Me.chkCounts = New System.Windows.Forms.CheckBox() + Me.chkPercents = New System.Windows.Forms.CheckBox() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.txtPeriodLabel = New System.Windows.Forms.TextBox() + Me.txtInterestedVariable = New System.Windows.Forms.TextBox() + Me.nudDigits = New System.Windows.Forms.NumericUpDown() + Me.lblInterestedVariable = New System.Windows.Forms.Label() + Me.lblPeriodLabel = New System.Windows.Forms.Label() + Me.lblFilename = New System.Windows.Forms.Label() + Me.lblDigits = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + CType(Me.nudDigits, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(37, 274) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 32) + Me.ucrBase.TabIndex = 0 + ' + 'chkRemoveNA + ' + Me.chkRemoveNA.AutoSize = True + Me.chkRemoveNA.Location = New System.Drawing.Point(150, 237) + Me.chkRemoveNA.Name = "chkRemoveNA" + Me.chkRemoveNA.Size = New System.Drawing.Size(81, 17) + Me.chkRemoveNA.TabIndex = 1 + Me.chkRemoveNA.Tag = "Remove_NA" + Me.chkRemoveNA.Text = "CheckBox1" + Me.chkRemoveNA.UseVisualStyleBackColor = True + ' + 'chkAppend + ' + Me.chkAppend.AutoSize = True + Me.chkAppend.Location = New System.Drawing.Point(324, 204) + Me.chkAppend.Name = "chkAppend" + Me.chkAppend.Size = New System.Drawing.Size(81, 17) + Me.chkAppend.TabIndex = 2 + Me.chkAppend.Tag = "Append" + Me.chkAppend.Text = "CheckBox2" + Me.chkAppend.UseVisualStyleBackColor = True + ' + 'chkConvert + ' + Me.chkConvert.AutoSize = True + Me.chkConvert.Location = New System.Drawing.Point(150, 204) + Me.chkConvert.Name = "chkConvert" + Me.chkConvert.Size = New System.Drawing.Size(81, 17) + Me.chkConvert.TabIndex = 3 + Me.chkConvert.Tag = "Convert" + Me.chkConvert.Text = "CheckBox3" + Me.chkConvert.UseVisualStyleBackColor = True + ' + 'chkStatistics + ' + Me.chkStatistics.AutoSize = True + Me.chkStatistics.Location = New System.Drawing.Point(324, 166) + Me.chkStatistics.Name = "chkStatistics" + Me.chkStatistics.Size = New System.Drawing.Size(81, 17) + Me.chkStatistics.TabIndex = 4 + Me.chkStatistics.Tag = "Statistics" + Me.chkStatistics.Text = "CheckBox4" + Me.chkStatistics.UseVisualStyleBackColor = True + ' + 'chkCounts + ' + Me.chkCounts.AutoSize = True + Me.chkCounts.Location = New System.Drawing.Point(150, 166) + Me.chkCounts.Name = "chkCounts" + Me.chkCounts.Size = New System.Drawing.Size(81, 17) + Me.chkCounts.TabIndex = 5 + Me.chkCounts.Tag = "Counts" + Me.chkCounts.Text = "CheckBox5" + Me.chkCounts.UseVisualStyleBackColor = True + ' + 'chkPercents + ' + Me.chkPercents.AutoSize = True + Me.chkPercents.Location = New System.Drawing.Point(324, 121) + Me.chkPercents.Name = "chkPercents" + Me.chkPercents.Size = New System.Drawing.Size(81, 17) + Me.chkPercents.TabIndex = 6 + Me.chkPercents.Tag = "Percents" + Me.chkPercents.Text = "CheckBox6" + Me.chkPercents.UseVisualStyleBackColor = True + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(150, 79) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(100, 20) + Me.TextBox1.TabIndex = 7 + ' + 'txtPeriodLabel + ' + Me.txtPeriodLabel.Location = New System.Drawing.Point(150, 53) + Me.txtPeriodLabel.Name = "txtPeriodLabel" + Me.txtPeriodLabel.Size = New System.Drawing.Size(100, 20) + Me.txtPeriodLabel.TabIndex = 8 + ' + 'txtInterestedVariable + ' + Me.txtInterestedVariable.Location = New System.Drawing.Point(150, 24) + Me.txtInterestedVariable.Name = "txtInterestedVariable" + Me.txtInterestedVariable.Size = New System.Drawing.Size(100, 20) + Me.txtInterestedVariable.TabIndex = 9 + ' + 'nudDigits + ' + Me.nudDigits.Location = New System.Drawing.Point(150, 118) + Me.nudDigits.Name = "nudDigits" + Me.nudDigits.Size = New System.Drawing.Size(50, 20) + Me.nudDigits.TabIndex = 10 + ' + 'lblInterestedVariable + ' + Me.lblInterestedVariable.AutoSize = True + Me.lblInterestedVariable.Location = New System.Drawing.Point(34, 27) + Me.lblInterestedVariable.Name = "lblInterestedVariable" + Me.lblInterestedVariable.Size = New System.Drawing.Size(39, 13) + Me.lblInterestedVariable.TabIndex = 11 + Me.lblInterestedVariable.Tag = "Interested_Variable" + Me.lblInterestedVariable.Text = "Label1" + ' + 'lblPeriodLabel + ' + Me.lblPeriodLabel.AutoSize = True + Me.lblPeriodLabel.Location = New System.Drawing.Point(34, 53) + Me.lblPeriodLabel.Name = "lblPeriodLabel" + Me.lblPeriodLabel.Size = New System.Drawing.Size(39, 13) + Me.lblPeriodLabel.TabIndex = 12 + Me.lblPeriodLabel.Tag = "Period_Label" + Me.lblPeriodLabel.Text = "Label2" + ' + 'lblFilename + ' + Me.lblFilename.AutoSize = True + Me.lblFilename.Location = New System.Drawing.Point(34, 86) + Me.lblFilename.Name = "lblFilename" + Me.lblFilename.Size = New System.Drawing.Size(39, 13) + Me.lblFilename.TabIndex = 13 + Me.lblFilename.Tag = "Filename" + Me.lblFilename.Text = "Label3" + ' + 'lblDigits + ' + Me.lblDigits.AutoSize = True + Me.lblDigits.Location = New System.Drawing.Point(34, 121) + Me.lblDigits.Name = "lblDigits" + Me.lblDigits.Size = New System.Drawing.Size(39, 13) + Me.lblDigits.TabIndex = 14 + Me.lblDigits.Tag = "Digits" + Me.lblDigits.Text = "Label4" + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(96, -1) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(125, 13) + Me.Label5.TabIndex = 15 + Me.Label5.Text = "Data list not implemented" + ' + 'dlgSummaryStatistic + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(472, 309) + Me.Controls.Add(Me.Label5) + Me.Controls.Add(Me.lblDigits) + Me.Controls.Add(Me.lblFilename) + Me.Controls.Add(Me.lblPeriodLabel) + Me.Controls.Add(Me.lblInterestedVariable) + Me.Controls.Add(Me.nudDigits) + Me.Controls.Add(Me.txtInterestedVariable) + Me.Controls.Add(Me.txtPeriodLabel) + Me.Controls.Add(Me.TextBox1) + Me.Controls.Add(Me.chkPercents) + Me.Controls.Add(Me.chkCounts) + Me.Controls.Add(Me.chkStatistics) + Me.Controls.Add(Me.chkConvert) + Me.Controls.Add(Me.chkAppend) + Me.Controls.Add(Me.chkRemoveNA) + Me.Controls.Add(Me.ucrBase) + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgSummaryStatistic" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Summary Statistic" + CType(Me.nudDigits, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents chkRemoveNA As CheckBox + Friend WithEvents chkAppend As CheckBox + Friend WithEvents chkConvert As CheckBox + Friend WithEvents chkStatistics As CheckBox + Friend WithEvents chkCounts As CheckBox + Friend WithEvents chkPercents As CheckBox + Friend WithEvents TextBox1 As TextBox + Friend WithEvents txtPeriodLabel As TextBox + Friend WithEvents txtInterestedVariable As TextBox + Friend WithEvents nudDigits As NumericUpDown + Friend WithEvents lblInterestedVariable As Label + Friend WithEvents lblPeriodLabel As Label + Friend WithEvents lblFilename As Label + Friend WithEvents lblDigits As Label + Friend WithEvents Label5 As Label +End Class diff --git a/instat/dlgSummaryStatistic.fr-FR.resx b/instat/dlgSummaryStatistic.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgSummaryStatistic.fr-FR.resx @@ -0,0 +1,15 @@ + + + + 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 + + \ No newline at end of file diff --git a/instat/dlgSummaryStatistic.resx b/instat/dlgSummaryStatistic.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgSummaryStatistic.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/instat/dlgSummaryStatistic.sw-KE.resx b/instat/dlgSummaryStatistic.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgSummaryStatistic.sw-KE.resx @@ -0,0 +1,15 @@ + + + + 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 + + \ No newline at end of file diff --git a/instat/dlgSummaryStatistic.vb b/instat/dlgSummaryStatistic.vb new file mode 100644 index 00000000000..516257c7b64 --- /dev/null +++ b/instat/dlgSummaryStatistic.vb @@ -0,0 +1,84 @@ + +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . +Imports instat.Translations +Public Class dlgSummaryStatistic + Private Sub dlgSummaryStatistic_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("climate_obj$summary_statistic") + ucrBase.clsRsyntax.iCallType = 1 + + End Sub + + Private Sub txtInterestedVariable_Leave(sender As Object, e As EventArgs) Handles txtInterestedVariable.Leave + ucrBase.clsRsyntax.AddParameter("interested_var", Chr(34) & txtInterestedVariable.Text & Chr(34)) + + End Sub + + Private Sub txtPeriodLabel_Leave(sender As Object, e As EventArgs) Handles txtPeriodLabel.Leave + ucrBase.clsRsyntax.AddParameter("data_period_label", Chr(34) & txtPeriodLabel.Text & Chr(34)) + + End Sub + + Private Sub TextBox1_Leave(sender As Object, e As EventArgs) Handles TextBox1.Leave + + End Sub + + Private Sub nudDigits_Leave(sender As Object, e As EventArgs) Handles nudDigits.Leave + ucrBase.clsRsyntax.AddParameter("digits", nudDigits.Value.ToString()) + + End Sub + + Private Sub chkPercents_Leave(sender As Object, e As EventArgs) Handles chkPercents.Leave + If chkPercents.Checked Then + ucrBase.clsRsyntax.AddParameter(" percents", chkPercents.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub chkStatistics_Leave(sender As Object, e As EventArgs) Handles chkStatistics.Leave + If chkStatistics.Checked Then + ucrBase.clsRsyntax.AddParameter(" statistics", chkStatistics.Checked.ToString().ToUpper) + End If + + End Sub + + Private Sub chkCounts_Leave(sender As Object, e As EventArgs) Handles chkCounts.Leave + If chkCounts.Checked Then + ucrBase.clsRsyntax.AddParameter(" counts", chkCounts.Checked.ToString().ToUpper) + End If + + End Sub + + Private Sub chkAppend_Leave(sender As Object, e As EventArgs) Handles chkAppend.Leave + If chkAppend.Checked Then + ucrBase.clsRsyntax.AddParameter(" append", chkAppend.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub chkConvert_Leave(sender As Object, e As EventArgs) Handles chkConvert.Leave + If chkConvert.Checked Then + ucrBase.clsRsyntax.AddParameter("convert", chkAppend.Checked.ToString().ToUpper()) + End If + End Sub + + Private Sub chkRemoveNA_Leave(sender As Object, e As EventArgs) Handles chkRemoveNA.Leave + If chkRemoveNA.Checked Then + ucrBase.clsRsyntax.AddParameter("na.rm", chkRemoveNA.Checked.ToString().ToUpper()) + End If + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgThreeSummaries.Designer.vb b/instat/dlgThreeSummaries.Designer.vb index 779c5fe2646..471b6c42759 100644 --- a/instat/dlgThreeSummaries.Designer.vb +++ b/instat/dlgThreeSummaries.Designer.vb @@ -1,52 +1,314 @@ - _ -Partial Class dlgThreeSummaries - 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() + +Partial Class dlgThreeSummaries + 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.ucrBase = New instat.ucrButtons() + Me.lblLinetype = New System.Windows.Forms.Label() + Me.lblLineWidth = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.lblTitle = New System.Windows.Forms.Label() + Me.lblVariable = New System.Windows.Forms.Label() + Me.lblYlabel = New System.Windows.Forms.Label() + Me.lblPlotType = New System.Windows.Forms.Label() + Me.lblMaximum = New System.Windows.Forms.Label() + Me.lblMean = New System.Windows.Forms.Label() + Me.lblMinimum = New System.Windows.Forms.Label() + Me.nudlineWidth = New System.Windows.Forms.NumericUpDown() + Me.nudPlotCharacter = New System.Windows.Forms.NumericUpDown() + Me.nudLineType = New System.Windows.Forms.NumericUpDown() + Me.txtColourMaximum = New System.Windows.Forms.TextBox() + Me.txtColourMean = New System.Windows.Forms.TextBox() + Me.txtPlotType = New System.Windows.Forms.TextBox() + Me.txtColourMinimum = New System.Windows.Forms.TextBox() + Me.txtYlabel = New System.Windows.Forms.TextBox() + Me.txtVariable = New System.Windows.Forms.TextBox() + Me.txtTitle = New System.Windows.Forms.TextBox() + Me.grpColour = New System.Windows.Forms.GroupBox() + Me.lblPlotCharacter = New System.Windows.Forms.Label() + CType(Me.nudlineWidth, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudPlotCharacter, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudLineType, System.ComponentModel.ISupportInitialize).BeginInit() + Me.grpColour.SuspendLayout() Me.SuspendLayout() ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 269) + Me.ucrBase.Location = New System.Drawing.Point(12, 303) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 55) + Me.ucrBase.Size = New System.Drawing.Size(410, 63) Me.ucrBase.TabIndex = 0 ' + 'lblLinetype + ' + Me.lblLinetype.AutoSize = True + Me.lblLinetype.Location = New System.Drawing.Point(12, 214) + Me.lblLinetype.Name = "lblLinetype" + Me.lblLinetype.Size = New System.Drawing.Size(39, 13) + Me.lblLinetype.TabIndex = 1 + Me.lblLinetype.Tag = "Line_type" + Me.lblLinetype.Text = "Label1" + ' + 'lblLineWidth + ' + Me.lblLineWidth.AutoSize = True + Me.lblLineWidth.Location = New System.Drawing.Point(54, 265) + Me.lblLineWidth.Name = "lblLineWidth" + Me.lblLineWidth.Size = New System.Drawing.Size(39, 13) + Me.lblLineWidth.TabIndex = 2 + Me.lblLineWidth.Tag = "Line_Width" + Me.lblLineWidth.Text = "Label2" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(367, 17) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(125, 13) + Me.Label3.TabIndex = 3 + Me.Label3.Text = "Data list not implemented" + ' + 'lblTitle + ' + Me.lblTitle.AutoSize = True + Me.lblTitle.Location = New System.Drawing.Point(54, 20) + Me.lblTitle.Name = "lblTitle" + Me.lblTitle.Size = New System.Drawing.Size(39, 13) + Me.lblTitle.TabIndex = 4 + Me.lblTitle.Tag = "Title" + Me.lblTitle.Text = "Label4" + ' + 'lblVariable + ' + Me.lblVariable.AutoSize = True + Me.lblVariable.Location = New System.Drawing.Point(54, 42) + Me.lblVariable.Name = "lblVariable" + Me.lblVariable.Size = New System.Drawing.Size(39, 13) + Me.lblVariable.TabIndex = 5 + Me.lblVariable.Text = "Label5" + ' + 'lblYlabel + ' + Me.lblYlabel.AutoSize = True + Me.lblYlabel.Location = New System.Drawing.Point(54, 62) + Me.lblYlabel.Name = "lblYlabel" + Me.lblYlabel.Size = New System.Drawing.Size(39, 13) + Me.lblYlabel.TabIndex = 6 + Me.lblYlabel.Tag = "Y_label" + Me.lblYlabel.Text = "Label6" + ' + 'lblPlotType + ' + Me.lblPlotType.AutoSize = True + Me.lblPlotType.Location = New System.Drawing.Point(231, 256) + Me.lblPlotType.Name = "lblPlotType" + Me.lblPlotType.Size = New System.Drawing.Size(39, 13) + Me.lblPlotType.TabIndex = 7 + Me.lblPlotType.Tag = "Plot_Type" + Me.lblPlotType.Text = "Label7" + ' + 'lblMaximum + ' + Me.lblMaximum.AutoSize = True + Me.lblMaximum.Location = New System.Drawing.Point(6, 22) + Me.lblMaximum.Name = "lblMaximum" + Me.lblMaximum.Size = New System.Drawing.Size(39, 13) + Me.lblMaximum.TabIndex = 8 + Me.lblMaximum.Tag = "Mean" + Me.lblMaximum.Text = "Label8" + ' + 'lblMean + ' + Me.lblMean.AutoSize = True + Me.lblMean.Location = New System.Drawing.Point(91, 55) + Me.lblMean.Name = "lblMean" + Me.lblMean.Size = New System.Drawing.Size(39, 13) + Me.lblMean.TabIndex = 9 + Me.lblMean.Text = "Label9" + ' + 'lblMinimum + ' + Me.lblMinimum.AutoSize = True + Me.lblMinimum.Location = New System.Drawing.Point(6, 87) + Me.lblMinimum.Name = "lblMinimum" + Me.lblMinimum.Size = New System.Drawing.Size(45, 13) + Me.lblMinimum.TabIndex = 10 + Me.lblMinimum.Text = "Label10" + ' + 'nudlineWidth + ' + Me.nudlineWidth.Location = New System.Drawing.Point(142, 254) + Me.nudlineWidth.Name = "nudlineWidth" + Me.nudlineWidth.Size = New System.Drawing.Size(49, 20) + Me.nudlineWidth.TabIndex = 11 + ' + 'nudPlotCharacter + ' + Me.nudPlotCharacter.Location = New System.Drawing.Point(195, 207) + Me.nudPlotCharacter.Name = "nudPlotCharacter" + Me.nudPlotCharacter.Size = New System.Drawing.Size(49, 20) + Me.nudPlotCharacter.TabIndex = 12 + ' + 'nudLineType + ' + Me.nudLineType.Location = New System.Drawing.Point(66, 207) + Me.nudLineType.Name = "nudLineType" + Me.nudLineType.Size = New System.Drawing.Size(49, 20) + Me.nudLineType.TabIndex = 13 + ' + 'txtColourMaximum + ' + Me.txtColourMaximum.Location = New System.Drawing.Point(109, 19) + Me.txtColourMaximum.Name = "txtColourMaximum" + Me.txtColourMaximum.Size = New System.Drawing.Size(100, 20) + Me.txtColourMaximum.TabIndex = 16 + ' + 'txtColourMean + ' + Me.txtColourMean.Location = New System.Drawing.Point(183, 52) + Me.txtColourMean.Name = "txtColourMean" + Me.txtColourMean.Size = New System.Drawing.Size(100, 20) + Me.txtColourMean.TabIndex = 17 + ' + 'txtPlotType + ' + Me.txtPlotType.Location = New System.Drawing.Point(289, 249) + Me.txtPlotType.Name = "txtPlotType" + Me.txtPlotType.Size = New System.Drawing.Size(149, 20) + Me.txtPlotType.TabIndex = 18 + ' + 'txtColourMinimum + ' + Me.txtColourMinimum.Location = New System.Drawing.Point(109, 87) + Me.txtColourMinimum.Name = "txtColourMinimum" + Me.txtColourMinimum.Size = New System.Drawing.Size(100, 20) + Me.txtColourMinimum.TabIndex = 19 + ' + 'txtYlabel + ' + Me.txtYlabel.Location = New System.Drawing.Point(142, 59) + Me.txtYlabel.Name = "txtYlabel" + Me.txtYlabel.Size = New System.Drawing.Size(210, 20) + Me.txtYlabel.TabIndex = 20 + ' + 'txtVariable + ' + Me.txtVariable.Location = New System.Drawing.Point(142, 39) + Me.txtVariable.Name = "txtVariable" + Me.txtVariable.Size = New System.Drawing.Size(210, 20) + Me.txtVariable.TabIndex = 21 + ' + 'txtTitle + ' + Me.txtTitle.Location = New System.Drawing.Point(142, 17) + Me.txtTitle.Name = "txtTitle" + Me.txtTitle.Size = New System.Drawing.Size(210, 20) + Me.txtTitle.TabIndex = 22 + ' + 'grpColour + ' + Me.grpColour.Controls.Add(Me.txtColourMaximum) + Me.grpColour.Controls.Add(Me.txtColourMinimum) + Me.grpColour.Controls.Add(Me.txtColourMean) + Me.grpColour.Controls.Add(Me.lblMinimum) + Me.grpColour.Controls.Add(Me.lblMean) + Me.grpColour.Controls.Add(Me.lblMaximum) + Me.grpColour.Location = New System.Drawing.Point(12, 94) + Me.grpColour.Name = "grpColour" + Me.grpColour.Size = New System.Drawing.Size(411, 107) + Me.grpColour.TabIndex = 23 + Me.grpColour.TabStop = False + Me.grpColour.Tag = "Colour" + Me.grpColour.Text = "Colours for Summaries" + ' + 'lblPlotCharacter + ' + Me.lblPlotCharacter.AutoSize = True + Me.lblPlotCharacter.Location = New System.Drawing.Point(152, 214) + Me.lblPlotCharacter.Name = "lblPlotCharacter" + Me.lblPlotCharacter.Size = New System.Drawing.Size(39, 13) + Me.lblPlotCharacter.TabIndex = 24 + Me.lblPlotCharacter.Tag = "lblPlotCharacter" + Me.lblPlotCharacter.Text = "Label4" + ' 'dlgThreeSummaries ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(428, 330) + Me.ClientSize = New System.Drawing.Size(555, 378) + Me.Controls.Add(Me.lblPlotCharacter) + Me.Controls.Add(Me.grpColour) + Me.Controls.Add(Me.txtTitle) + Me.Controls.Add(Me.txtVariable) + Me.Controls.Add(Me.txtYlabel) + Me.Controls.Add(Me.txtPlotType) + Me.Controls.Add(Me.nudLineType) + Me.Controls.Add(Me.nudPlotCharacter) + Me.Controls.Add(Me.nudlineWidth) + Me.Controls.Add(Me.lblPlotType) + Me.Controls.Add(Me.lblYlabel) + Me.Controls.Add(Me.lblVariable) + Me.Controls.Add(Me.lblTitle) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.lblLineWidth) + Me.Controls.Add(Me.lblLinetype) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgThreeSummaries" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "ThreeSummaries" + Me.Text = "Three Summaries" + CType(Me.nudlineWidth, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudPlotCharacter, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudLineType, System.ComponentModel.ISupportInitialize).EndInit() + Me.grpColour.ResumeLayout(False) + Me.grpColour.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents lblLinetype As Label + Friend WithEvents lblLineWidth As Label + Friend WithEvents Label3 As Label + Friend WithEvents lblTitle As Label + Friend WithEvents lblVariable As Label + Friend WithEvents lblYlabel As Label + Friend WithEvents lblPlotType As Label + Friend WithEvents lblMaximum As Label + Friend WithEvents lblMean As Label + Friend WithEvents lblMinimum As Label + Friend WithEvents nudlineWidth As NumericUpDown + Friend WithEvents nudPlotCharacter As NumericUpDown + Friend WithEvents nudLineType As NumericUpDown + Friend WithEvents txtColourMaximum As TextBox + Friend WithEvents txtColourMean As TextBox + Friend WithEvents txtPlotType As TextBox + Friend WithEvents txtColourMinimum As TextBox + Friend WithEvents txtYlabel As TextBox + Friend WithEvents txtVariable As TextBox + Friend WithEvents txtTitle As TextBox + Friend WithEvents grpColour As GroupBox + Friend WithEvents lblPlotCharacter As Label +End Class \ No newline at end of file diff --git a/instat/dlgView.Designer.vb b/instat/dlgView.Designer.vb new file mode 100644 index 00000000000..6b0fcca5841 --- /dev/null +++ b/instat/dlgView.Designer.vb @@ -0,0 +1,131 @@ + _ +Partial Class dlgView + 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.ucrBase = New instat.ucrButtons() + Me.ucrSelectorDataFrame = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverView = New instat.ucrReceiverMultiple() + Me.lblSelected = New System.Windows.Forms.Label() + Me.grpSpecifiedRows = New System.Windows.Forms.GroupBox() + Me.rdoTop = New System.Windows.Forms.RadioButton() + Me.rdoBottom = New System.Windows.Forms.RadioButton() + Me.grpSpecifiedRows.SuspendLayout() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 257) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'ucrSelectorDataFrame + ' + Me.ucrSelectorDataFrame.Location = New System.Drawing.Point(12, 12) + Me.ucrSelectorDataFrame.Name = "ucrSelectorDataFrame" + Me.ucrSelectorDataFrame.Size = New System.Drawing.Size(242, 179) + Me.ucrSelectorDataFrame.TabIndex = 1 + ' + 'ucrReceiverView + ' + Me.ucrReceiverView.Location = New System.Drawing.Point(293, 84) + Me.ucrReceiverView.Name = "ucrReceiverView" + Me.ucrReceiverView.Size = New System.Drawing.Size(121, 104) + Me.ucrReceiverView.TabIndex = 2 + ' + 'lblSelected + ' + Me.lblSelected.AutoSize = True + Me.lblSelected.Location = New System.Drawing.Point(290, 68) + Me.lblSelected.Name = "lblSelected" + Me.lblSelected.Size = New System.Drawing.Size(49, 13) + Me.lblSelected.TabIndex = 3 + Me.lblSelected.Tag = "Selected" + Me.lblSelected.Text = "Selected" + ' + 'grpSpecifiedRows + ' + Me.grpSpecifiedRows.Controls.Add(Me.rdoBottom) + Me.grpSpecifiedRows.Controls.Add(Me.rdoTop) + Me.grpSpecifiedRows.Location = New System.Drawing.Point(12, 197) + Me.grpSpecifiedRows.Name = "grpSpecifiedRows" + Me.grpSpecifiedRows.Size = New System.Drawing.Size(402, 54) + Me.grpSpecifiedRows.TabIndex = 4 + Me.grpSpecifiedRows.TabStop = False + Me.grpSpecifiedRows.Tag = "Specified_rows" + Me.grpSpecifiedRows.Text = "Specified rows" + ' + 'rdoTop + ' + Me.rdoTop.AutoSize = True + Me.rdoTop.Location = New System.Drawing.Point(6, 19) + Me.rdoTop.Name = "rdoTop" + Me.rdoTop.Size = New System.Drawing.Size(44, 17) + Me.rdoTop.TabIndex = 0 + Me.rdoTop.TabStop = True + Me.rdoTop.Tag = "Top" + Me.rdoTop.Text = "Top" + Me.rdoTop.UseVisualStyleBackColor = True + ' + 'rdoBottom + ' + Me.rdoBottom.AutoSize = True + Me.rdoBottom.Location = New System.Drawing.Point(152, 19) + Me.rdoBottom.Name = "rdoBottom" + Me.rdoBottom.Size = New System.Drawing.Size(58, 17) + Me.rdoBottom.TabIndex = 1 + Me.rdoBottom.TabStop = True + Me.rdoBottom.Tag = "Bottom" + Me.rdoBottom.Text = "Bottom" + Me.rdoBottom.UseVisualStyleBackColor = True + ' + 'dlgView + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(426, 320) + Me.Controls.Add(Me.grpSpecifiedRows) + Me.Controls.Add(Me.lblSelected) + Me.Controls.Add(Me.ucrReceiverView) + Me.Controls.Add(Me.ucrSelectorDataFrame) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgView" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "View" + Me.Text = "View" + Me.grpSpecifiedRows.ResumeLayout(False) + Me.grpSpecifiedRows.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrSelectorDataFrame As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverView As ucrReceiverMultiple + Friend WithEvents lblSelected As Label + Friend WithEvents grpSpecifiedRows As GroupBox + Friend WithEvents rdoBottom As RadioButton + Friend WithEvents rdoTop As RadioButton +End Class diff --git a/instat/dlgView.vb b/instat/dlgView.vb new file mode 100644 index 00000000000..6ed2a777c18 --- /dev/null +++ b/instat/dlgView.vb @@ -0,0 +1,28 @@ +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . +Imports instat.Translations +Public Class dlgView + Private Sub dlgView_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("view") + ucrReceiverView.Selector = ucrSelectorDataFrame + ucrReceiverView.SetMeAsReceiver() + + End Sub + Private Sub ucrReceiverView_Leave(sender As Object, e As EventArgs) Handles ucrReceiverView.Leave + ucrBase.clsRsyntax.AddParameter("X", ucrReceiverView.GetVariableNames()) + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgWaterBalance.Designer.vb b/instat/dlgWaterBalance.Designer.vb index 59100478163..786e6316981 100644 --- a/instat/dlgWaterBalance.Designer.vb +++ b/instat/dlgWaterBalance.Designer.vb @@ -1,27 +1,27 @@ - _ -Partial Class dlgWaterBalance - 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() + +Partial Class dlgWaterBalance + 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.ucrBase = New instat.ucrButtons() Me.nudEvaporation = New System.Windows.Forms.NumericUpDown() Me.nudMaximumCapacity = New System.Windows.Forms.NumericUpDown() @@ -34,6 +34,7 @@ Partial Class dlgWaterBalance Me.lblMaximumCapacity = New System.Windows.Forms.Label() Me.lblColumnName = New System.Windows.Forms.Label() Me.chkPrintTable = New System.Windows.Forms.CheckBox() + Me.chkMonthAbbreviations = New System.Windows.Forms.CheckBox() CType(Me.nudEvaporation, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudMaximumCapacity, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudDecimalPlace, System.ComponentModel.ISupportInitialize).BeginInit() @@ -41,9 +42,9 @@ Partial Class dlgWaterBalance ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(33, 217) + Me.ucrBase.Location = New System.Drawing.Point(55, 245) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 60) + Me.ucrBase.Size = New System.Drawing.Size(410, 32) Me.ucrBase.TabIndex = 0 ' 'nudEvaporation @@ -147,11 +148,23 @@ Partial Class dlgWaterBalance Me.chkPrintTable.Text = "CheckBox1" Me.chkPrintTable.UseVisualStyleBackColor = True ' + 'chkMonthAbbreviations + ' + Me.chkMonthAbbreviations.AutoSize = True + Me.chkMonthAbbreviations.Location = New System.Drawing.Point(113, 194) + Me.chkMonthAbbreviations.Name = "chkMonthAbbreviations" + Me.chkMonthAbbreviations.Size = New System.Drawing.Size(81, 17) + Me.chkMonthAbbreviations.TabIndex = 15 + Me.chkMonthAbbreviations.Tag = "Month_Abbreviations" + Me.chkMonthAbbreviations.Text = "CheckBox1" + Me.chkMonthAbbreviations.UseVisualStyleBackColor = True + ' 'dlgWaterBalance ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(464, 277) + Me.Controls.Add(Me.chkMonthAbbreviations) Me.Controls.Add(Me.chkPrintTable) Me.Controls.Add(Me.lblColumnName) Me.Controls.Add(Me.lblMaximumCapacity) @@ -174,18 +187,19 @@ Partial Class dlgWaterBalance Me.ResumeLayout(False) Me.PerformLayout() - End Sub - - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents nudEvaporation As NumericUpDown - Friend WithEvents nudMaximumCapacity As NumericUpDown - Friend WithEvents nudDecimalPlace As NumericUpDown - Friend WithEvents txtDisplayDayName As TextBox - Friend WithEvents txtColumnName As TextBox - Friend WithEvents lblDisplayDayName As Label - Friend WithEvents lblDecimalPlace As Label - Friend WithEvents lblEvaporation As Label - Friend WithEvents lblMaximumCapacity As Label - Friend WithEvents lblColumnName As Label - Friend WithEvents chkPrintTable As CheckBox -End Class + End Sub + + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents nudEvaporation As NumericUpDown + Friend WithEvents nudMaximumCapacity As NumericUpDown + Friend WithEvents nudDecimalPlace As NumericUpDown + Friend WithEvents txtDisplayDayName As TextBox + Friend WithEvents txtColumnName As TextBox + Friend WithEvents lblDisplayDayName As Label + Friend WithEvents lblDecimalPlace As Label + Friend WithEvents lblEvaporation As Label + Friend WithEvents lblMaximumCapacity As Label + Friend WithEvents lblColumnName As Label + Friend WithEvents chkPrintTable As CheckBox + Friend WithEvents chkMonthAbbreviations As CheckBox +End Class diff --git a/instat/dlgWaterBalance.vb b/instat/dlgWaterBalance.vb index 56e6151b594..ce40fa0ae05 100644 --- a/instat/dlgWaterBalance.vb +++ b/instat/dlgWaterBalance.vb @@ -1,38 +1,61 @@ -Imports instat.Translations +' Instat-R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Imports instat.Translations Public Class dlgWaterBalance - Private Sub ucrButtons_clickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk - Dim strScript As String - strScript = "climate_obj$display_water_balance(data_list=list()" - strScript = strScript & ", capacity_max=" & nudMaximumCapacity.ToString() - strScript = strScript & ", evaporation=" & nudEvaporation.ToString() - strScript = strScript & ", decimal_places=" & nudDecimalPlace.ToString() - strScript = strScript & ", day_display=" & Chr(34) & txtDisplayDayName.Text.ToString() & Chr(34) - If chkPrintTable.Checked Then - strScript = strScript & ", print_tables=" & chkPrintTable.Checked.ToString().ToUpper - End If - - strScript = strScript & ", col_name=" & Chr(34) & txtColumnName.Text & Chr(34) - strScript = strScript & ")" - frmMain.clsRLink.climateObject() - frmMain.clsRLink.RunScript(strScript, False) - 'TODO fix this to update grids instead of calling FillData which no longer exists - ' frmMain.FillData("climate_obj$climate_data_objects[[1]]$data") - ' frmMain.FillData("climate_obj$used_data_objects[[1]]$data") + Private Sub UcrButtons1_Load(sender As Object, e As EventArgs) Handles ucrBase.Load + autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("climate_obj$display_water_balance()") + ucrBase.clsRsyntax.iCallType = 1 + 'frmMain.FillData("climate_obj$climate_data_objects[[1]]$data") + 'frmMain.FillData("climate_obj$used_data_objects[[1]]$data") Me.Hide() End Sub + Private Sub dlgStartofRains_Load(sender As Object, e As EventArgs) Handles Me.Load + 'UpdateVisible() + autoTranslate(Me) + End Sub + Private Sub txtColunmName_Leave(sender As Object, e As EventArgs) Handles txtColumnName.Leave + ucrBase.clsRsyntax.AddParameter("col_name", Chr(34) & txtColumnName.Text & Chr(34)) + End Sub - Private Sub dlgStartofRains_Load(sender As Object, e As EventArgs) Handles Me.Load - 'UpdateVisible() - autoTranslate(Me) - End Sub + Private Sub nudEvapration_Leave(sender As Object, e As EventArgs) Handles nudEvaporation.Leave + ucrBase.clsRsyntax.AddParameter("evaporation", nudEvaporation.Value) + End Sub - Private Sub dlgInventoryPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Private Sub nudDecimalPlace_Leave(sender As Object, e As EventArgs) Handles nudDecimalPlace.Leave + ucrBase.clsRsyntax.AddParameter("decimal_places", nudDecimalPlace.Value) End Sub + Private Sub txtDisplayDayName_Leave(sender As Object, e As EventArgs) Handles txtDisplayDayName.Leave - Private Sub dlgWaterBalance_Load(sender As Object, e As EventArgs) Handles MyBase.Load + ucrBase.clsRsyntax.AddParameter("day_display", txtDisplayDayName.Text) + End Sub + + Private Sub nudMaximumCapacity_Leave(sender As Object, e As EventArgs) Handles nudMaximumCapacity.Leave + ucrBase.clsRsyntax.AddParameter("capacity_max", nudMaximumCapacity.Value) End Sub + Private Sub chkPrintTable_Leave(sender As Object, e As EventArgs) Handles chkPrintTable.Leave + If chkPrintTable.Checked Then + ucrBase.clsRsyntax.AddParameter("print_tables", chkPrintTable.Checked.ToString.ToUpper()) + + End If + End Sub + End Class \ No newline at end of file diff --git a/instat/dlgWindrosePlot.designer.vb b/instat/dlgWindrosePlot.designer.vb index 4bba2f6bfb6..dbb94a9f090 100644 --- a/instat/dlgWindrosePlot.designer.vb +++ b/instat/dlgWindrosePlot.designer.vb @@ -1,51 +1,115 @@ - _ -Partial Class dlgWindrosePlot - 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. + +Partial Class dlgWindrosePlot + 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() + Private Sub InitializeComponent() Me.ucrBase = New instat.ucrButtons() + Me.Label1 = New System.Windows.Forms.Label() + Me.lblWindroseType = New System.Windows.Forms.Label() + Me.lblWindThreshold = New System.Windows.Forms.Label() + Me.txtWindroseType = New System.Windows.Forms.TextBox() + Me.nudWindThreshold = New System.Windows.Forms.NumericUpDown() + CType(Me.nudWindThreshold, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 206) + Me.ucrBase.Location = New System.Drawing.Point(13, 171) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.Size = New System.Drawing.Size(410, 67) Me.ucrBase.TabIndex = 0 ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(111, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(125, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Data list not implemented" + ' + 'lblWindroseType + ' + Me.lblWindroseType.AutoSize = True + Me.lblWindroseType.Location = New System.Drawing.Point(35, 44) + Me.lblWindroseType.Name = "lblWindroseType" + Me.lblWindroseType.Size = New System.Drawing.Size(39, 13) + Me.lblWindroseType.TabIndex = 2 + Me.lblWindroseType.Tag = "Windrose_Type" + Me.lblWindroseType.Text = "Label2" + ' + 'lblWindThreshold + ' + Me.lblWindThreshold.AutoSize = True + Me.lblWindThreshold.Location = New System.Drawing.Point(35, 80) + Me.lblWindThreshold.Name = "lblWindThreshold" + Me.lblWindThreshold.Size = New System.Drawing.Size(39, 13) + Me.lblWindThreshold.TabIndex = 3 + Me.lblWindThreshold.Tag = "Wind_Threshold" + Me.lblWindThreshold.Text = "Label3" + ' + 'txtWindroseType + ' + Me.txtWindroseType.Location = New System.Drawing.Point(133, 41) + Me.txtWindroseType.Name = "txtWindroseType" + Me.txtWindroseType.Size = New System.Drawing.Size(100, 20) + Me.txtWindroseType.TabIndex = 4 + ' + 'nudWindThreshold + ' + Me.nudWindThreshold.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) + Me.nudWindThreshold.Location = New System.Drawing.Point(133, 80) + Me.nudWindThreshold.Maximum = New Decimal(New Integer() {10, 0, 0, 0}) + Me.nudWindThreshold.Name = "nudWindThreshold" + Me.nudWindThreshold.Size = New System.Drawing.Size(56, 20) + Me.nudWindThreshold.TabIndex = 5 + ' 'dlgWindrosePlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(433, 262) + Me.ClientSize = New System.Drawing.Size(435, 242) + Me.Controls.Add(Me.nudWindThreshold) + Me.Controls.Add(Me.txtWindroseType) + Me.Controls.Add(Me.lblWindThreshold) + Me.Controls.Add(Me.lblWindroseType) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgWindrosePlot" - Me.Text = "dlgWindrosePlot" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Windrose Plot" + CType(Me.nudWindThreshold, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents ucrBase As ucrButtons -End Class + Friend WithEvents Label1 As Label + Friend WithEvents lblWindroseType As Label + Friend WithEvents lblWindThreshold As Label + Friend WithEvents txtWindroseType As TextBox + Friend WithEvents nudWindThreshold As NumericUpDown +End Class \ No newline at end of file diff --git a/instat/dlgYearRaincount.designer.vb b/instat/dlgYearRaincount.designer.vb index ebae5a4c464..7f1ddaca38c 100644 --- a/instat/dlgYearRaincount.designer.vb +++ b/instat/dlgYearRaincount.designer.vb @@ -1,51 +1,439 @@ - _ -Partial Class dlgYearRaincount - 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() + +Partial Class dlgYearRaincount + 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.ucrBase = New instat.ucrButtons() + Me.Label1 = New System.Windows.Forms.Label() + Me.lblTitle = New System.Windows.Forms.Label() + Me.lblVariable = New System.Windows.Forms.Label() + Me.lblVariableLabel = New System.Windows.Forms.Label() + Me.lblType = New System.Windows.Forms.Label() + Me.lblXLabel = New System.Windows.Forms.Label() + Me.lblYLabel = New System.Windows.Forms.Label() + Me.lblLineType = New System.Windows.Forms.Label() + Me.lblPlotCharacter = New System.Windows.Forms.Label() + Me.lblYLimits = New System.Windows.Forms.Label() + Me.lblYGrid = New System.Windows.Forms.Label() + Me.lblLineWidth2 = New System.Windows.Forms.Label() + Me.lblLineWidth1 = New System.Windows.Forms.Label() + Me.nudPlotCharacter = New System.Windows.Forms.NumericUpDown() + Me.nudLineWidth2 = New System.Windows.Forms.NumericUpDown() + Me.nudLineWidth1 = New System.Windows.Forms.NumericUpDown() + Me.nudLineType = New System.Windows.Forms.NumericUpDown() + Me.chkPlotWindow = New System.Windows.Forms.CheckBox() + Me.chkRemoveNA = New System.Windows.Forms.CheckBox() + Me.chkGrid = New System.Windows.Forms.CheckBox() + Me.txtXLabel = New System.Windows.Forms.TextBox() + Me.txtYLabel = New System.Windows.Forms.TextBox() + Me.txtType = New System.Windows.Forms.TextBox() + Me.txtVariableLabel = New System.Windows.Forms.TextBox() + Me.txtVariable = New System.Windows.Forms.TextBox() + Me.txtTitle = New System.Windows.Forms.TextBox() + Me.nudYLimits = New System.Windows.Forms.NumericUpDown() + Me.nudYGrid = New System.Windows.Forms.NumericUpDown() + Me.txtColour1 = New System.Windows.Forms.TextBox() + Me.lblColour = New System.Windows.Forms.Label() + Me.lblColour2 = New System.Windows.Forms.Label() + Me.txtColour2 = New System.Windows.Forms.TextBox() + CType(Me.nudPlotCharacter, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudLineWidth2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudLineWidth1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudLineType, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudYLimits, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudYGrid, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(29, 207) + Me.ucrBase.Location = New System.Drawing.Point(82, 303) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 57) + Me.ucrBase.Size = New System.Drawing.Size(410, 51) Me.ucrBase.TabIndex = 0 ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(122, 18) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(125, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Data list not implemented" + ' + 'lblTitle + ' + Me.lblTitle.AutoSize = True + Me.lblTitle.Location = New System.Drawing.Point(12, 35) + Me.lblTitle.Name = "lblTitle" + Me.lblTitle.Size = New System.Drawing.Size(39, 13) + Me.lblTitle.TabIndex = 3 + Me.lblTitle.Text = "Label3" + ' + 'lblVariable + ' + Me.lblVariable.AutoSize = True + Me.lblVariable.Location = New System.Drawing.Point(12, 61) + Me.lblVariable.Name = "lblVariable" + Me.lblVariable.Size = New System.Drawing.Size(39, 13) + Me.lblVariable.TabIndex = 5 + Me.lblVariable.Text = "Label5" + ' + 'lblVariableLabel + ' + Me.lblVariableLabel.AutoSize = True + Me.lblVariableLabel.Location = New System.Drawing.Point(12, 87) + Me.lblVariableLabel.Name = "lblVariableLabel" + Me.lblVariableLabel.Size = New System.Drawing.Size(39, 13) + Me.lblVariableLabel.TabIndex = 6 + Me.lblVariableLabel.Tag = "Variable_Label" + Me.lblVariableLabel.Text = "Label6" + ' + 'lblType + ' + Me.lblType.AutoSize = True + Me.lblType.Location = New System.Drawing.Point(12, 110) + Me.lblType.Name = "lblType" + Me.lblType.Size = New System.Drawing.Size(39, 13) + Me.lblType.TabIndex = 7 + Me.lblType.Tag = "Type" + Me.lblType.Text = "Label7" + ' + 'lblXLabel + ' + Me.lblXLabel.AutoSize = True + Me.lblXLabel.Location = New System.Drawing.Point(12, 136) + Me.lblXLabel.Name = "lblXLabel" + Me.lblXLabel.Size = New System.Drawing.Size(39, 13) + Me.lblXLabel.TabIndex = 8 + Me.lblXLabel.Tag = "X_Label" + Me.lblXLabel.Text = "Label8" + ' + 'lblYLabel + ' + Me.lblYLabel.AutoSize = True + Me.lblYLabel.Location = New System.Drawing.Point(335, 146) + Me.lblYLabel.Name = "lblYLabel" + Me.lblYLabel.Size = New System.Drawing.Size(39, 13) + Me.lblYLabel.TabIndex = 9 + Me.lblYLabel.Tag = "Y_Label" + Me.lblYLabel.Text = "Label9" + ' + 'lblLineType + ' + Me.lblLineType.AutoSize = True + Me.lblLineType.Location = New System.Drawing.Point(264, 204) + Me.lblLineType.Name = "lblLineType" + Me.lblLineType.Size = New System.Drawing.Size(45, 13) + Me.lblLineType.TabIndex = 10 + Me.lblLineType.Tag = "Line_Type" + Me.lblLineType.Text = "Label10" + ' + 'lblPlotCharacter + ' + Me.lblPlotCharacter.AutoSize = True + Me.lblPlotCharacter.Location = New System.Drawing.Point(12, 203) + Me.lblPlotCharacter.Name = "lblPlotCharacter" + Me.lblPlotCharacter.Size = New System.Drawing.Size(45, 13) + Me.lblPlotCharacter.TabIndex = 11 + Me.lblPlotCharacter.Text = "Label11" + ' + 'lblYLimits + ' + Me.lblYLimits.AutoSize = True + Me.lblYLimits.Location = New System.Drawing.Point(12, 227) + Me.lblYLimits.Name = "lblYLimits" + Me.lblYLimits.Size = New System.Drawing.Size(45, 13) + Me.lblYLimits.TabIndex = 12 + Me.lblYLimits.Tag = "YLimits" + Me.lblYLimits.Text = "Label12" + ' + 'lblYGrid + ' + Me.lblYGrid.AutoSize = True + Me.lblYGrid.Location = New System.Drawing.Point(12, 253) + Me.lblYGrid.Name = "lblYGrid" + Me.lblYGrid.Size = New System.Drawing.Size(45, 13) + Me.lblYGrid.TabIndex = 13 + Me.lblYGrid.Tag = "YGrid" + Me.lblYGrid.Text = "Label13" + ' + 'lblLineWidth2 + ' + Me.lblLineWidth2.AutoSize = True + Me.lblLineWidth2.Location = New System.Drawing.Point(264, 229) + Me.lblLineWidth2.Name = "lblLineWidth2" + Me.lblLineWidth2.Size = New System.Drawing.Size(45, 13) + Me.lblLineWidth2.TabIndex = 14 + Me.lblLineWidth2.Tag = "Line_Width2" + Me.lblLineWidth2.Text = "Label14" + ' + 'lblLineWidth1 + ' + Me.lblLineWidth1.AutoSize = True + Me.lblLineWidth1.Location = New System.Drawing.Point(264, 251) + Me.lblLineWidth1.Name = "lblLineWidth1" + Me.lblLineWidth1.Size = New System.Drawing.Size(45, 13) + Me.lblLineWidth1.TabIndex = 15 + Me.lblLineWidth1.Tag = "Line_Width1" + Me.lblLineWidth1.Text = "Label15" + ' + 'nudPlotCharacter + ' + Me.nudPlotCharacter.Location = New System.Drawing.Point(125, 201) + Me.nudPlotCharacter.Name = "nudPlotCharacter" + Me.nudPlotCharacter.Size = New System.Drawing.Size(52, 20) + Me.nudPlotCharacter.TabIndex = 18 + ' + 'nudLineWidth2 + ' + Me.nudLineWidth2.Location = New System.Drawing.Point(356, 225) + Me.nudLineWidth2.Name = "nudLineWidth2" + Me.nudLineWidth2.Size = New System.Drawing.Size(52, 20) + Me.nudLineWidth2.TabIndex = 19 + ' + 'nudLineWidth1 + ' + Me.nudLineWidth1.Location = New System.Drawing.Point(356, 248) + Me.nudLineWidth1.Name = "nudLineWidth1" + Me.nudLineWidth1.Size = New System.Drawing.Size(52, 20) + Me.nudLineWidth1.TabIndex = 20 + ' + 'nudLineType + ' + Me.nudLineType.Location = New System.Drawing.Point(356, 201) + Me.nudLineType.Name = "nudLineType" + Me.nudLineType.Size = New System.Drawing.Size(52, 20) + Me.nudLineType.TabIndex = 21 + ' + 'chkPlotWindow + ' + Me.chkPlotWindow.AutoSize = True + Me.chkPlotWindow.Location = New System.Drawing.Point(356, 90) + Me.chkPlotWindow.Name = "chkPlotWindow" + Me.chkPlotWindow.Size = New System.Drawing.Size(81, 17) + Me.chkPlotWindow.TabIndex = 23 + Me.chkPlotWindow.Tag = "Plot_Window" + Me.chkPlotWindow.Text = "CheckBox2" + Me.chkPlotWindow.UseVisualStyleBackColor = True + ' + 'chkRemoveNA + ' + Me.chkRemoveNA.AutoSize = True + Me.chkRemoveNA.Location = New System.Drawing.Point(356, 64) + Me.chkRemoveNA.Name = "chkRemoveNA" + Me.chkRemoveNA.Size = New System.Drawing.Size(81, 17) + Me.chkRemoveNA.TabIndex = 24 + Me.chkRemoveNA.Tag = "Remove_NA" + Me.chkRemoveNA.Text = "CheckBox3" + Me.chkRemoveNA.UseVisualStyleBackColor = True + ' + 'chkGrid + ' + Me.chkGrid.AutoSize = True + Me.chkGrid.Location = New System.Drawing.Point(461, 204) + Me.chkGrid.Name = "chkGrid" + Me.chkGrid.Size = New System.Drawing.Size(81, 17) + Me.chkGrid.TabIndex = 25 + Me.chkGrid.Tag = "Grid" + Me.chkGrid.Text = "CheckBox4" + Me.chkGrid.UseVisualStyleBackColor = True + ' + 'txtXLabel + ' + Me.txtXLabel.Location = New System.Drawing.Point(125, 136) + Me.txtXLabel.Name = "txtXLabel" + Me.txtXLabel.Size = New System.Drawing.Size(100, 20) + Me.txtXLabel.TabIndex = 26 + ' + 'txtYLabel + ' + Me.txtYLabel.Location = New System.Drawing.Point(427, 139) + Me.txtYLabel.Name = "txtYLabel" + Me.txtYLabel.Size = New System.Drawing.Size(100, 20) + Me.txtYLabel.TabIndex = 27 + ' + 'txtType + ' + Me.txtType.Location = New System.Drawing.Point(125, 110) + Me.txtType.Name = "txtType" + Me.txtType.Size = New System.Drawing.Size(100, 20) + Me.txtType.TabIndex = 28 + ' + 'txtVariableLabel + ' + Me.txtVariableLabel.Location = New System.Drawing.Point(125, 87) + Me.txtVariableLabel.Name = "txtVariableLabel" + Me.txtVariableLabel.Size = New System.Drawing.Size(100, 20) + Me.txtVariableLabel.TabIndex = 29 + ' + 'txtVariable + ' + Me.txtVariable.Location = New System.Drawing.Point(125, 61) + Me.txtVariable.Name = "txtVariable" + Me.txtVariable.Size = New System.Drawing.Size(100, 20) + Me.txtVariable.TabIndex = 30 + ' + 'txtTitle + ' + Me.txtTitle.Location = New System.Drawing.Point(125, 35) + Me.txtTitle.Name = "txtTitle" + Me.txtTitle.Size = New System.Drawing.Size(215, 20) + Me.txtTitle.TabIndex = 31 + ' + 'nudYLimits + ' + Me.nudYLimits.Location = New System.Drawing.Point(125, 220) + Me.nudYLimits.Name = "nudYLimits" + Me.nudYLimits.Size = New System.Drawing.Size(52, 20) + Me.nudYLimits.TabIndex = 17 + ' + 'nudYGrid + ' + Me.nudYGrid.Location = New System.Drawing.Point(125, 246) + Me.nudYGrid.Name = "nudYGrid" + Me.nudYGrid.Size = New System.Drawing.Size(52, 20) + Me.nudYGrid.TabIndex = 18 + ' + 'txtColour1 + ' + Me.txtColour1.Location = New System.Drawing.Point(125, 162) + Me.txtColour1.Name = "txtColour1" + Me.txtColour1.Size = New System.Drawing.Size(100, 20) + Me.txtColour1.TabIndex = 32 + ' + 'lblColour + ' + Me.lblColour.AutoSize = True + Me.lblColour.Location = New System.Drawing.Point(12, 165) + Me.lblColour.Name = "lblColour" + Me.lblColour.Size = New System.Drawing.Size(39, 13) + Me.lblColour.TabIndex = 33 + Me.lblColour.Tag = "Colour1" + Me.lblColour.Text = "Label2" + ' + 'lblColour2 + ' + Me.lblColour2.AutoSize = True + Me.lblColour2.Location = New System.Drawing.Point(335, 169) + Me.lblColour2.Name = "lblColour2" + Me.lblColour2.Size = New System.Drawing.Size(39, 13) + Me.lblColour2.TabIndex = 34 + Me.lblColour2.Tag = "Colour2" + Me.lblColour2.Text = "Label2" + ' + 'txtColour2 + ' + Me.txtColour2.Location = New System.Drawing.Point(427, 169) + Me.txtColour2.Name = "txtColour2" + Me.txtColour2.Size = New System.Drawing.Size(100, 20) + Me.txtColour2.TabIndex = 35 + ' 'dlgYearRaincount ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(464, 262) + Me.ClientSize = New System.Drawing.Size(571, 366) + Me.Controls.Add(Me.txtColour2) + Me.Controls.Add(Me.lblColour2) + Me.Controls.Add(Me.lblColour) + Me.Controls.Add(Me.txtColour1) + Me.Controls.Add(Me.txtTitle) + Me.Controls.Add(Me.txtVariable) + Me.Controls.Add(Me.txtVariableLabel) + Me.Controls.Add(Me.txtType) + Me.Controls.Add(Me.txtYLabel) + Me.Controls.Add(Me.txtXLabel) + Me.Controls.Add(Me.chkGrid) + Me.Controls.Add(Me.chkRemoveNA) + Me.Controls.Add(Me.chkPlotWindow) + Me.Controls.Add(Me.nudLineType) + Me.Controls.Add(Me.nudLineWidth1) + Me.Controls.Add(Me.nudLineWidth2) + Me.Controls.Add(Me.nudYGrid) + Me.Controls.Add(Me.nudYLimits) + Me.Controls.Add(Me.nudPlotCharacter) + Me.Controls.Add(Me.lblLineWidth1) + Me.Controls.Add(Me.lblLineWidth2) + Me.Controls.Add(Me.lblYGrid) + Me.Controls.Add(Me.lblYLimits) + Me.Controls.Add(Me.lblPlotCharacter) + Me.Controls.Add(Me.lblLineType) + Me.Controls.Add(Me.lblYLabel) + Me.Controls.Add(Me.lblXLabel) + Me.Controls.Add(Me.lblType) + Me.Controls.Add(Me.lblVariableLabel) + Me.Controls.Add(Me.lblVariable) + Me.Controls.Add(Me.lblTitle) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgYearRaincount" - Me.Text = "dlgYearRaincount" + Me.Text = "Plot Yearly Rain Count" + CType(Me.nudPlotCharacter, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudLineWidth2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudLineWidth1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudLineType, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudYLimits, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudYGrid, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents Label1 As Label + Friend WithEvents lblTitle As Label + Friend WithEvents lblVariable As Label + Friend WithEvents lblVariableLabel As Label + Friend WithEvents lblType As Label + Friend WithEvents lblXLabel As Label + Friend WithEvents lblYLabel As Label + Friend WithEvents lblLineType As Label + Friend WithEvents lblPlotCharacter As Label + Friend WithEvents lblYLimits As Label + Friend WithEvents lblYGrid As Label + Friend WithEvents lblLineWidth2 As Label + Friend WithEvents lblLineWidth1 As Label + Friend WithEvents nudPlotCharacter As NumericUpDown + Friend WithEvents nudLineWidth2 As NumericUpDown + Friend WithEvents nudLineWidth1 As NumericUpDown + Friend WithEvents nudLineType As NumericUpDown + Friend WithEvents chkPlotWindow As CheckBox + Friend WithEvents chkRemoveNA As CheckBox + Friend WithEvents chkGrid As CheckBox + Friend WithEvents txtXLabel As TextBox + Friend WithEvents txtYLabel As TextBox + Friend WithEvents txtType As TextBox + Friend WithEvents txtVariableLabel As TextBox + Friend WithEvents txtVariable As TextBox + Friend WithEvents txtTitle As TextBox + Friend WithEvents nudYLimits As NumericUpDown + Friend WithEvents nudYGrid As NumericUpDown + Friend WithEvents txtColour1 As TextBox + Friend WithEvents lblColour As Label + Friend WithEvents lblColour2 As Label + Friend WithEvents txtColour2 As TextBox +End Class + - End Sub - - Friend WithEvents ucrBase As ucrButtons -End Class diff --git a/instat/dlgYearRaincount.resx b/instat/dlgYearRaincount.resx index 1af7de150c9..29dcb1b3a35 100644 --- a/instat/dlgYearRaincount.resx +++ b/instat/dlgYearRaincount.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + \ No newline at end of file diff --git a/instat/dlgYearRaincount.vb b/instat/dlgYearRaincount.vb index 282f6904be3..f706bbc6193 100644 --- a/instat/dlgYearRaincount.vb +++ b/instat/dlgYearRaincount.vb @@ -1,8 +1,111 @@ -Imports instat.Translations -Public Class dlgYearRaincount - Private Sub ucrBase_Load(sender As Object, e As EventArgs) Handles ucrBase.Load - autoTranslate(Me) - ucrBase.clsRsyntax.SetFunction("climate_obj$plot_yearly_rain_count") - ucrBase.clsRsyntax.iCallType = 0 - End Sub +'Imports instat.Translations +'Public Class dlgYearRaincount +' Private Sub ucrBase_Load(sender As Object, e As EventArgs) Handles ucrBase.Load +' autoTranslate(Me) +' ucrBase.clsRsyntax.SetFunction("climate_obj$plot_yearly_rain_count") +' ucrBase.clsRsyntax.iCallType = 0 +' End Sub + +' Private Sub dlgYearRaincount_Load(sender As Object, e As EventArgs) Handles MyBase.Load + +' End Sub +'End Class + +Imports instat.Translations +Public Class dlgYearRaincount + Private Sub dlgYearRaincount_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + ucrBase.clsRsyntax.SetFunction("climate_obj$plot_yearly_rain_count") + ucrBase.clsRsyntax.iCallType = 0 + End Sub + + Private Sub txtTitle_TextChanged(sender As Object, e As EventArgs) Handles txtTitle.TextChanged + ucrBase.clsRsyntax.AddParameter("title", Chr(34) & txtTitle.Text.ToString() & Chr(34)) + + End Sub + + Private Sub txtVariable_TextChanged(sender As Object, e As EventArgs) Handles txtVariable.TextChanged + + End Sub + + Private Sub txtVariableLabel_TextChanged(sender As Object, e As EventArgs) Handles txtVariableLabel.TextChanged + ucrBase.clsRsyntax.AddParameter("var_label", Chr(34) & txtVariableLabel.Text.ToString() & Chr(34)) + + End Sub + + Private Sub txtType_TextChanged(sender As Object, e As EventArgs) Handles txtType.TextChanged + ucrBase.clsRsyntax.AddParameter("type", Chr(34) & txtVariable.Text.ToString() & Chr(34)) + + End Sub + + Private Sub txtXLabel_TextChanged(sender As Object, e As EventArgs) Handles txtXLabel.TextChanged + ucrBase.clsRsyntax.AddParameter("xlab", Chr(34) & txtXLabel.Text.ToString() & Chr(34)) + + End Sub + + Private Sub txtYLabel_TextChanged(sender As Object, e As EventArgs) Handles txtYLabel.TextChanged + ucrBase.clsRsyntax.AddParameter("ylab", Chr(34) & txtYLabel.Text.ToString() & Chr(34)) + + End Sub + + Private Sub txtColour2_TextChanged(sender As Object, e As EventArgs) Handles txtColour2.TextChanged + ucrBase.clsRsyntax.AddParameter("col2", Chr(34) & txtColour2.Text.ToString() & Chr(34)) + + End Sub + + Private Sub txtColour1_TextChanged(sender As Object, e As EventArgs) Handles txtColour1.TextChanged + ucrBase.clsRsyntax.AddParameter("col1", Chr(34) & txtColour1.Text.ToString() & Chr(34)) + + End Sub + + Private Sub chkGrid_CheckedChanged(sender As Object, e As EventArgs) Handles chkGrid.CheckedChanged + If chkGrid.Checked Then + ucrBase.clsRsyntax.AddParameter("grid", chkGrid.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub chkPlotWindow_CheckedChanged(sender As Object, e As EventArgs) Handles chkPlotWindow.CheckedChanged + If chkPlotWindow.Checked Then + ucrBase.clsRsyntax.AddParameter("plot_window", chkPlotWindow.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub chkRemoveNA_CheckedChanged(sender As Object, e As EventArgs) Handles chkRemoveNA.CheckedChanged + If chkRemoveNA.Checked Then + ucrBase.clsRsyntax.AddParameter("na.rm", chkRemoveNA.Checked.ToString().ToUpper()) + End If + + End Sub + + Private Sub nudLineWidth1_ValueChanged(sender As Object, e As EventArgs) Handles nudLineWidth1.ValueChanged + ucrBase.clsRsyntax.AddParameter("lwd", nudLineWidth1.Value.ToString()) + + End Sub + + Private Sub nudLineWidth2_ValueChanged(sender As Object, e As EventArgs) Handles nudLineWidth2.ValueChanged + ucrBase.clsRsyntax.AddParameter("lwd2", nudLineWidth2.Value.ToString()) + + End Sub + + Private Sub nudLineType_ValueChanged(sender As Object, e As EventArgs) Handles nudLineType.ValueChanged + ucrBase.clsRsyntax.AddParameter("lty", nudLineType.Value.ToString()) + + End Sub + + Private Sub nudYGrid_ValueChanged(sender As Object, e As EventArgs) Handles nudYGrid.ValueChanged + ucrBase.clsRsyntax.AddParameter("ygrid", nudYGrid.Value.ToString()) + + End Sub + + Private Sub nudYLimits_ValueChanged(sender As Object, e As EventArgs) Handles nudYLimits.ValueChanged + ucrBase.clsRsyntax.AddParameter("ylim", nudYLimits.Value.ToString()) + + End Sub + + Private Sub nudPlotCharacter_ValueChanged(sender As Object, e As EventArgs) Handles nudPlotCharacter.ValueChanged + ucrBase.clsRsyntax.AddParameter("pch", nudPlotCharacter.Value.ToString()) + + End Sub End Class \ No newline at end of file diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 0defc529300..61fea84cf63 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -361,8 +361,8 @@ Public Class frmMain dlgRandomSample.ShowDialog() End Sub - Private Sub DisplayToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuManageDataView.Click - dlgDisplay.ShowDialog() + Private Sub ViewToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuManageDataView.Click + dlgView.ShowDialog() End Sub Private Sub ClearRemoveToolStripMenuItem_Click(sender As Object, e As EventArgs) diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 333673b5024..69b2cc8a118 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -293,12 +293,6 @@ Form - - dlgDisplay.vb - - - Form - dlgDisplayDaily.vb @@ -875,6 +869,12 @@ Form + + dlgView.vb + + + Form + dlgWaterBalance.vb @@ -1293,15 +1293,6 @@ dlgDescriptiveStatistics.vb - - dlgDisplay.vb - - - dlgDisplay.vb - - - dlgDisplay.vb - dlgDisplayDaily.vb @@ -2106,6 +2097,15 @@ dlgUnstackDailyData.vb + + dlgView.vb + + + dlgView.vb + + + dlgView.vb + dlgWaterBalance.vb