From e00b04d4c345c8eed0fe5975a84ff806d9583a50 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 21 Mar 2016 15:20:09 +0300 Subject: [PATCH 01/21] Editing dlgChangeFormatDayMonth --- instat/dlgChangeFormatDayMonth.designer.vb | 112 ++++++++++----------- instat/dlgChangeFormatDayMonth.vb | 2 +- 2 files changed, 55 insertions(+), 59 deletions(-) diff --git a/instat/dlgChangeFormatDayMonth.designer.vb b/instat/dlgChangeFormatDayMonth.designer.vb index 62ac6755f76..f4c5235be55 100644 --- a/instat/dlgChangeFormatDayMonth.designer.vb +++ b/instat/dlgChangeFormatDayMonth.designer.vb @@ -28,12 +28,12 @@ Partial Class dlgChangeFormatDayMonth 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() + Me.ucrInputPeriod = New instat.ucrInputTextBox() + Me.ucrInputColumnName = New instat.ucrInputTextBox() + Me.ucrInputMonthFormat = New instat.ucrInputTextBox() + Me.ucrInputRequiredFormat = New instat.ucrInputTextBox() CType(Me.nudOption, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -51,40 +51,40 @@ Partial Class dlgChangeFormatDayMonth 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.Size = New System.Drawing.Size(37, 13) Me.lblPeriod.TabIndex = 2 Me.lblPeriod.Tag = "Period" - Me.lblPeriod.Text = "Label2" + Me.lblPeriod.Text = "Period" ' '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.Size = New System.Drawing.Size(73, 13) Me.lblColumnName.TabIndex = 3 Me.lblColumnName.Tag = "Column_Name" - Me.lblColumnName.Text = "Label3" + Me.lblColumnName.Text = "Column Name" ' '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.Size = New System.Drawing.Size(72, 13) Me.lblMonthFormat.TabIndex = 4 Me.lblMonthFormat.Tag = "Month_Format" - Me.lblMonthFormat.Text = "Label4" + Me.lblMonthFormat.Text = "Month Format" ' 'lblRequiredFormat ' Me.lblRequiredFormat.AutoSize = True - Me.lblRequiredFormat.Location = New System.Drawing.Point(32, 116) + Me.lblRequiredFormat.Location = New System.Drawing.Point(32, 123) Me.lblRequiredFormat.Name = "lblRequiredFormat" - Me.lblRequiredFormat.Size = New System.Drawing.Size(39, 13) + Me.lblRequiredFormat.Size = New System.Drawing.Size(85, 13) Me.lblRequiredFormat.TabIndex = 5 Me.lblRequiredFormat.Tag = "Required_Format" - Me.lblRequiredFormat.Text = "Label5" + Me.lblRequiredFormat.Text = "Required Format" ' 'nudOption ' @@ -94,65 +94,61 @@ Partial Class dlgChangeFormatDayMonth 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.Size = New System.Drawing.Size(38, 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 = "" + Me.lblOption.Text = "Option" ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(7, 227) + Me.ucrBase.Location = New System.Drawing.Point(7, 201) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) + Me.ucrBase.Size = New System.Drawing.Size(410, 53) Me.ucrBase.TabIndex = 0 ' + 'ucrInputPeriod + ' + Me.ucrInputPeriod.Location = New System.Drawing.Point(129, 37) + Me.ucrInputPeriod.Name = "ucrInputPeriod" + Me.ucrInputPeriod.Size = New System.Drawing.Size(100, 21) + Me.ucrInputPeriod.TabIndex = 12 + ' + 'ucrInputColumnName + ' + Me.ucrInputColumnName.Location = New System.Drawing.Point(129, 63) + Me.ucrInputColumnName.Name = "ucrInputColumnName" + Me.ucrInputColumnName.Size = New System.Drawing.Size(100, 21) + Me.ucrInputColumnName.TabIndex = 13 + ' + 'ucrInputMonthFormat + ' + Me.ucrInputMonthFormat.Location = New System.Drawing.Point(129, 89) + Me.ucrInputMonthFormat.Name = "ucrInputMonthFormat" + Me.ucrInputMonthFormat.Size = New System.Drawing.Size(100, 21) + Me.ucrInputMonthFormat.TabIndex = 14 + ' + 'ucrInputRequiredFormat + ' + Me.ucrInputRequiredFormat.Location = New System.Drawing.Point(129, 115) + Me.ucrInputRequiredFormat.Name = "ucrInputRequiredFormat" + Me.ucrInputRequiredFormat.Size = New System.Drawing.Size(100, 21) + Me.ucrInputRequiredFormat.TabIndex = 15 + ' '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, 262) - Me.Controls.Add(Me.txtRequiredFormat) + Me.ClientSize = New System.Drawing.Size(429, 263) + Me.Controls.Add(Me.ucrInputRequiredFormat) + Me.Controls.Add(Me.ucrInputMonthFormat) + Me.Controls.Add(Me.ucrInputColumnName) + Me.Controls.Add(Me.ucrInputPeriod) 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) @@ -179,9 +175,9 @@ Partial Class dlgChangeFormatDayMonth 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 + Friend WithEvents ucrInputPeriod As ucrInputTextBox + Friend WithEvents ucrInputColumnName As ucrInputTextBox + Friend WithEvents ucrInputMonthFormat As ucrInputTextBox + Friend WithEvents ucrInputRequiredFormat As ucrInputTextBox End Class diff --git a/instat/dlgChangeFormatDayMonth.vb b/instat/dlgChangeFormatDayMonth.vb index 684114f5607..2c8017e133d 100644 --- a/instat/dlgChangeFormatDayMonth.vb +++ b/instat/dlgChangeFormatDayMonth.vb @@ -19,7 +19,7 @@ Imports instat.Translations 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 From 7a3d8b5bb34d5f2ef3dec61e99ca28c72b113192 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 21 Mar 2016 15:25:24 +0300 Subject: [PATCH 02/21] Editing dlgChangeFormatDayMonth --- instat/dlgChangeFormatDayMonth.vb | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/instat/dlgChangeFormatDayMonth.vb b/instat/dlgChangeFormatDayMonth.vb index 2c8017e133d..250f2dcd78b 100644 --- a/instat/dlgChangeFormatDayMonth.vb +++ b/instat/dlgChangeFormatDayMonth.vb @@ -15,12 +15,39 @@ ' along with this program. If not, see . Imports instat.Translations - Public Class dlgChangeFormatDayMonth - Private Sub UcrButtons1_Load(sender As Object, e As EventArgs) Handles ucrBase.Load +Public Class dlgChangeFormatDayMonth + Public bFirstLoad As Boolean = True + Private Sub ucrBase_Load(sender As Object, e As EventArgs) Handles ucrBase.Load autoTranslate(Me) + + + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() ucrBase.clsRsyntax.SetFunction("climate_obj$change_format_day_month()") + End Sub + Private Sub SetDefaults() End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOKEnabled() + + End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + TestOKEnabled() + End Sub End Class From 85cdc80c935e54ad8d932f07b1db2f8d311fbd33 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 21 Mar 2016 15:34:33 +0300 Subject: [PATCH 03/21] Editing dlgMonthDay --- instat/dlgDayMonth.designer.vb | 84 +++++++++++++++++----------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/instat/dlgDayMonth.designer.vb b/instat/dlgDayMonth.designer.vb index 65b33cb780d..0a6358c36c3 100644 --- a/instat/dlgDayMonth.designer.vb +++ b/instat/dlgDayMonth.designer.vb @@ -22,39 +22,16 @@ Partial Class dlgDayMonth '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.ucrInputColumnName1 = New instat.ucrInputTextBox() + Me.ucrInputTimePeriod = New instat.ucrInputTextBox() + Me.ucrInputRequiredTimeFormat = New instat.ucrInputTextBox() 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 @@ -69,52 +46,75 @@ Partial Class dlgDayMonth 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.Size = New System.Drawing.Size(73, 13) Me.lblColumnName.TabIndex = 5 Me.lblColumnName.Tag = "Column_Name" - Me.lblColumnName.Text = "Label2" + Me.lblColumnName.Text = "Column Name" ' 'lblTimePeriod ' Me.lblTimePeriod.AutoSize = True - Me.lblTimePeriod.Location = New System.Drawing.Point(40, 110) + Me.lblTimePeriod.Location = New System.Drawing.Point(40, 102) Me.lblTimePeriod.Name = "lblTimePeriod" - Me.lblTimePeriod.Size = New System.Drawing.Size(39, 13) + Me.lblTimePeriod.Size = New System.Drawing.Size(63, 13) Me.lblTimePeriod.TabIndex = 6 Me.lblTimePeriod.Tag = "Time_Period" - Me.lblTimePeriod.Text = "Label3" + Me.lblTimePeriod.Text = "Time Period" ' 'lblRequiredTimeFormat ' Me.lblRequiredTimeFormat.AutoSize = True - Me.lblRequiredTimeFormat.Location = New System.Drawing.Point(40, 152) + Me.lblRequiredTimeFormat.Location = New System.Drawing.Point(40, 129) Me.lblRequiredTimeFormat.Name = "lblRequiredTimeFormat" - Me.lblRequiredTimeFormat.Size = New System.Drawing.Size(39, 13) + Me.lblRequiredTimeFormat.Size = New System.Drawing.Size(111, 13) Me.lblRequiredTimeFormat.TabIndex = 7 Me.lblRequiredTimeFormat.Tag = "Required_Time_Format" - Me.lblRequiredTimeFormat.Text = "Label4" + Me.lblRequiredTimeFormat.Text = "Required Time Format" ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 227) + Me.ucrBase.Location = New System.Drawing.Point(12, 148) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 51) Me.ucrBase.TabIndex = 0 ' + 'ucrInputColumnName1 + ' + Me.ucrInputColumnName1.Location = New System.Drawing.Point(161, 67) + Me.ucrInputColumnName1.Name = "ucrInputColumnName1" + Me.ucrInputColumnName1.Size = New System.Drawing.Size(100, 21) + Me.ucrInputColumnName1.TabIndex = 8 + ' + 'ucrInputTimePeriod + ' + Me.ucrInputTimePeriod.Location = New System.Drawing.Point(161, 94) + Me.ucrInputTimePeriod.Name = "ucrInputTimePeriod" + Me.ucrInputTimePeriod.Size = New System.Drawing.Size(100, 21) + Me.ucrInputTimePeriod.TabIndex = 9 + ' + 'ucrInputRequiredTimeFormat + ' + Me.ucrInputRequiredTimeFormat.Location = New System.Drawing.Point(161, 121) + Me.ucrInputRequiredTimeFormat.Name = "ucrInputRequiredTimeFormat" + Me.ucrInputRequiredTimeFormat.Size = New System.Drawing.Size(100, 21) + Me.ucrInputRequiredTimeFormat.TabIndex = 10 + ' '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, 290) + Me.ClientSize = New System.Drawing.Size(441, 211) + Me.Controls.Add(Me.ucrInputRequiredTimeFormat) + Me.Controls.Add(Me.ucrInputTimePeriod) + Me.Controls.Add(Me.ucrInputColumnName1) 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) @@ -123,11 +123,11 @@ Partial Class dlgDayMonth End Sub 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 + Friend WithEvents ucrInputColumnName1 As ucrInputTextBox + Friend WithEvents ucrInputTimePeriod As ucrInputTextBox + Friend WithEvents ucrInputRequiredTimeFormat As ucrInputTextBox End Class From 641f5b5d3e55460eb9b5468bc394c07265f572e3 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 15:46:52 +0300 Subject: [PATCH 04/21] New dlgWindrose --- instat/dlgWindrose.Designer.vb | 50 ++++++++++++++ instat/dlgWindrose.fr-FR.resx | 15 +++++ instat/dlgWindrose.resx | 120 +++++++++++++++++++++++++++++++++ instat/dlgWindrose.sw-KE.resx | 15 +++++ instat/dlgWindrose.vb | 51 ++++++++++++++ instat/frmMain.Designer.vb | 6 +- instat/frmMain.vb | 4 ++ instat/instat.vbproj | 15 +++++ 8 files changed, 273 insertions(+), 3 deletions(-) create mode 100644 instat/dlgWindrose.Designer.vb create mode 100644 instat/dlgWindrose.fr-FR.resx create mode 100644 instat/dlgWindrose.resx create mode 100644 instat/dlgWindrose.sw-KE.resx create mode 100644 instat/dlgWindrose.vb diff --git a/instat/dlgWindrose.Designer.vb b/instat/dlgWindrose.Designer.vb new file mode 100644 index 00000000000..9c6d2657a4e --- /dev/null +++ b/instat/dlgWindrose.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgWindrose + 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.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(0, 260) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgWindrose + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(406, 317) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgWindrose" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Windrose" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgWindrose.fr-FR.resx b/instat/dlgWindrose.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgWindrose.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/dlgWindrose.resx b/instat/dlgWindrose.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgWindrose.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/dlgWindrose.sw-KE.resx b/instat/dlgWindrose.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgWindrose.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/dlgWindrose.vb b/instat/dlgWindrose.vb new file mode 100644 index 00000000000..102673d4f45 --- /dev/null +++ b/instat/dlgWindrose.vb @@ -0,0 +1,51 @@ + +' 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 dlgWindrose + Private bFirstLoad As Boolean = True + Private Sub dlgWindrose_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + Setdefaults() + bFirstLoad = False + Else + ReopenDialog() + + End If + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + + End Sub + + Private Sub Setdefaults() + + End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOkEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + Setdefaults() + End Sub +End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 42ea7ea290a..67f89825dc9 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -374,21 +374,21 @@ Partial Class frmMain 'mnuStatisticsAnalysisOfVarianceOneWay ' Me.mnuStatisticsAnalysisOfVarianceOneWay.Name = "mnuStatisticsAnalysisOfVarianceOneWay" - Me.mnuStatisticsAnalysisOfVarianceOneWay.Size = New System.Drawing.Size(152, 22) + Me.mnuStatisticsAnalysisOfVarianceOneWay.Size = New System.Drawing.Size(144, 22) Me.mnuStatisticsAnalysisOfVarianceOneWay.Tag = "One_Way" Me.mnuStatisticsAnalysisOfVarianceOneWay.Text = "One-way..." ' 'mnuStatisticsAnalysisOfVarianceOrthogonal ' Me.mnuStatisticsAnalysisOfVarianceOrthogonal.Name = "mnuStatisticsAnalysisOfVarianceOrthogonal" - Me.mnuStatisticsAnalysisOfVarianceOrthogonal.Size = New System.Drawing.Size(152, 22) + Me.mnuStatisticsAnalysisOfVarianceOrthogonal.Size = New System.Drawing.Size(144, 22) Me.mnuStatisticsAnalysisOfVarianceOrthogonal.Tag = "Orthogonal" Me.mnuStatisticsAnalysisOfVarianceOrthogonal.Text = "Orthogonal..." ' 'mnuStatisticsAnalysisOfVarianceGeneral ' Me.mnuStatisticsAnalysisOfVarianceGeneral.Name = "mnuStatisticsAnalysisOfVarianceGeneral" - Me.mnuStatisticsAnalysisOfVarianceGeneral.Size = New System.Drawing.Size(152, 22) + Me.mnuStatisticsAnalysisOfVarianceGeneral.Size = New System.Drawing.Size(144, 22) Me.mnuStatisticsAnalysisOfVarianceGeneral.Tag = "General" Me.mnuStatisticsAnalysisOfVarianceGeneral.Text = "General..." ' diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 76e67a85af1..1c41542ea0d 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -951,5 +951,9 @@ Public Class frmMain Private Sub mnuStatisticsAnalysisOfVarianceGeneral_Click(sender As Object, e As EventArgs) Handles mnuStatisticsAnalysisOfVarianceGeneral.Click dlgGeneralANOVA.ShowDialog() End Sub + + Private Sub mnuGraphicsWindrose_Click(sender As Object, e As EventArgs) Handles mnuGraphicsWindrose.Click + dlgWindrose.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 45f5d1ecdab..9f20d9acacc 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -478,6 +478,12 @@ Form + + dlgWindrose.vb + + + Form + sdgCanonicalCorrelation.vb @@ -2015,6 +2021,15 @@ dlgViewModels.vb + + dlgWindrose.vb + + + dlgWindrose.vb + + + dlgWindrose.vb + sdgBarChart.vb From a45da65e9da10b57c34778298fc80804b34f7ee4 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 21 Mar 2016 15:47:20 +0300 Subject: [PATCH 05/21] Editing dlgDayMonth --- instat/dlgChangeFormatDayMonth.vb | 2 +- instat/dlgDayMonth.vb | 34 ++++++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/instat/dlgChangeFormatDayMonth.vb b/instat/dlgChangeFormatDayMonth.vb index 250f2dcd78b..feab063700b 100644 --- a/instat/dlgChangeFormatDayMonth.vb +++ b/instat/dlgChangeFormatDayMonth.vb @@ -17,7 +17,7 @@ Imports instat.Translations Public Class dlgChangeFormatDayMonth Public bFirstLoad As Boolean = True - Private Sub ucrBase_Load(sender As Object, e As EventArgs) Handles ucrBase.Load + Private Sub dlgChangeFormatDayMonth_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) diff --git a/instat/dlgDayMonth.vb b/instat/dlgDayMonth.vb index 4e50ccafd65..47fb534f423 100644 --- a/instat/dlgDayMonth.vb +++ b/instat/dlgDayMonth.vb @@ -17,10 +17,38 @@ Imports instat.Translations Public Class dlgDayMonth + Public bFirstLoad As Boolean = True Private Sub dlgDayMonth_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - ucrBase.clsRsyntax.SetFunction("climate_obj$day_month()") - ucrBase.clsRsyntax.iCallType = 0 + autoTranslate(Me) + + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.clsRsyntax.SetFunction("climate_obj$day_month()") + End Sub + + Private Sub SetDefaults() + + End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOKEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + TestOKEnabled() End Sub End Class \ No newline at end of file From 59afb9b4801ea9bec5d327bb9911c83399acb828 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 21 Mar 2016 15:56:25 +0300 Subject: [PATCH 06/21] Editing dlgCPTtoTabularData --- instat/dlgCPTtoTabularData.designer.vb | 34 +++++++++++++------------- instat/dlgCPTtoTabularData.vb | 33 ++++++++++++++++--------- 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/instat/dlgCPTtoTabularData.designer.vb b/instat/dlgCPTtoTabularData.designer.vb index 3268960f11e..5b44b61bfd6 100644 --- a/instat/dlgCPTtoTabularData.designer.vb +++ b/instat/dlgCPTtoTabularData.designer.vb @@ -64,40 +64,40 @@ Partial Class dlgCPTtoTabularData 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.Size = New System.Drawing.Size(95, 13) Me.lblMaxLon.TabIndex = 7 - Me.lblMaxLon.Tag = "Max_Lon" - Me.lblMaxLon.Text = "Max Lon" + Me.lblMaxLon.Tag = "Maximum_Logitude" + Me.lblMaxLon.Text = "Maximum Logitude" ' '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.Size = New System.Drawing.Size(98, 13) Me.lblMinLon.TabIndex = 6 - Me.lblMinLon.Tag = "Min_Lon" - Me.lblMinLon.Text = "Min Lon" + Me.lblMinLon.Tag = "Minimum_Longitude" + Me.lblMinLon.Text = "Minimum Longitude" ' '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.Size = New System.Drawing.Size(92, 13) Me.lblMaxLat.TabIndex = 5 - Me.lblMaxLat.Tag = "Max_Lat" - Me.lblMaxLat.Text = "Max Lat" + Me.lblMaxLat.Tag = "Maximum_Latitude" + Me.lblMaxLat.Text = "Maximum Latitude" ' '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.Size = New System.Drawing.Size(89, 13) Me.lblMinLat.TabIndex = 4 - Me.lblMinLat.Tag = "Min_Lat" - Me.lblMinLat.Text = "Min Lat" + Me.lblMinLat.Tag = "Minimum_Latitude" + Me.lblMinLat.Text = "Minimum Latitude" ' 'nudMaxLat ' @@ -143,26 +143,26 @@ Partial Class dlgCPTtoTabularData 'chkWestEast ' Me.chkWestEast.AutoSize = True - Me.chkWestEast.Location = New System.Drawing.Point(325, 196) + Me.chkWestEast.Location = New System.Drawing.Point(37, 205) Me.chkWestEast.Name = "chkWestEast" - Me.chkWestEast.Size = New System.Drawing.Size(81, 17) + Me.chkWestEast.Size = New System.Drawing.Size(75, 17) Me.chkWestEast.TabIndex = 8 Me.chkWestEast.Tag = "West_East" - Me.chkWestEast.Text = "CheckBox1" + Me.chkWestEast.Text = "West East" Me.chkWestEast.UseVisualStyleBackColor = True ' 'ucrBase ' Me.ucrBase.Location = New System.Drawing.Point(10, 228) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) + Me.ucrBase.Size = New System.Drawing.Size(410, 60) 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, 262) + Me.ClientSize = New System.Drawing.Size(432, 290) Me.Controls.Add(Me.chkWestEast) Me.Controls.Add(Me.lbl) Me.Controls.Add(Me.grpDomain) diff --git a/instat/dlgCPTtoTabularData.vb b/instat/dlgCPTtoTabularData.vb index 9b68fbee588..13326bf435b 100644 --- a/instat/dlgCPTtoTabularData.vb +++ b/instat/dlgCPTtoTabularData.vb @@ -15,26 +15,37 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgCPTtoTabularData - 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 - + Public bFirstLoad As Boolean = True Private Sub dlgCPTtoTabularData_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + TestOKEnabled() End Sub - - Private Sub NumericUpDown1_ValueChanged(sender As Object, e As EventArgs) Handles nudMinLat.ValueChanged + Private Sub InitialiseDialog() + ucrBase.clsRsyntax.SetFunction("climate_obj$SST_domain()") + End Sub + Private Sub SetDefaults() End Sub + Private Sub ReopenDialog() - Private Sub NumericUpDown4_ValueChanged(sender As Object, e As EventArgs) Handles nudMaxLat.ValueChanged + End Sub + Private Sub TestOKEnabled() End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + TestOKEnabled() + 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 From d2449c4041ef53110e2c37e8f77fe61ca1be9ec0 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 16:00:07 +0300 Subject: [PATCH 07/21] new dlgGroup for stats menu --- instat/dlgGroup.Designer.vb | 50 +++++++++++++++ instat/dlgGroup.fr-FR.resx | 15 +++++ instat/dlgGroup.resx | 120 ++++++++++++++++++++++++++++++++++++ instat/dlgGroup.sw-KE.resx | 15 +++++ instat/dlgGroup.vb | 53 ++++++++++++++++ instat/frmMain.vb | 4 ++ instat/instat.vbproj | 15 +++++ 7 files changed, 272 insertions(+) create mode 100644 instat/dlgGroup.Designer.vb create mode 100644 instat/dlgGroup.fr-FR.resx create mode 100644 instat/dlgGroup.resx create mode 100644 instat/dlgGroup.sw-KE.resx create mode 100644 instat/dlgGroup.vb diff --git a/instat/dlgGroup.Designer.vb b/instat/dlgGroup.Designer.vb new file mode 100644 index 00000000000..d03d25e37a9 --- /dev/null +++ b/instat/dlgGroup.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgGroup + 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.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(4, 327) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 1 + ' + 'dlgGroup + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(426, 392) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgGroup" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Group" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgGroup.fr-FR.resx b/instat/dlgGroup.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgGroup.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/dlgGroup.resx b/instat/dlgGroup.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgGroup.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/dlgGroup.sw-KE.resx b/instat/dlgGroup.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgGroup.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/dlgGroup.vb b/instat/dlgGroup.vb new file mode 100644 index 00000000000..8498159702f --- /dev/null +++ b/instat/dlgGroup.vb @@ -0,0 +1,53 @@ +' 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 dlgGroup + Private bFirstLoad As Boolean = True + Private Sub dlgGroup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + If bFirstLoad Then + InitialiseDialog() + Setdefaults() + bFirstLoad = False + Else + ReopenDialog() + + End If + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + + End Sub + + Private Sub Setdefaults() + + End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOkEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + Setdefaults() + End Sub + +End Class \ No newline at end of file diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 1c41542ea0d..ca216a4edd9 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -955,5 +955,9 @@ Public Class frmMain Private Sub mnuGraphicsWindrose_Click(sender As Object, e As EventArgs) Handles mnuGraphicsWindrose.Click dlgWindrose.ShowDialog() End Sub + + Private Sub mnuStatisticsTablesGroup_Click(sender As Object, e As EventArgs) Handles mnuStatisticsTablesGroup.Click + dlgGroup.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 9f20d9acacc..8ec187dd0cc 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -304,6 +304,12 @@ Form + + dlgGroup.vb + + + Form + dlgHideShowColumns.vb @@ -1751,6 +1757,15 @@ dlgFromLibrary.vb + + dlgGroup.vb + + + dlgGroup.vb + + + dlgGroup.vb + dlgHideShowColumns.vb From 8cdb8bb666230f23633c4449a58fc6856a11a99a Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 21 Mar 2016 16:00:12 +0300 Subject: [PATCH 08/21] Editing dlgDisplayDaily --- instat/dlgDisplayDaily.vb | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/instat/dlgDisplayDaily.vb b/instat/dlgDisplayDaily.vb index 687c90f380a..8f9344a711e 100644 --- a/instat/dlgDisplayDaily.vb +++ b/instat/dlgDisplayDaily.vb @@ -16,10 +16,34 @@ Imports instat.Translations Public Class dlgDisplayDaily + Public bFirstLoad As Boolean = True Private Sub dlgDisplayDaily_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - ucrBase.clsRsyntax.SetFunction("climate_obj$display_daily_rain()") - ucrBase.clsRsyntax.iCallType = 0 + autoTranslate(Me) + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + + TestOKEnabled() + + End Sub + Private Sub InitialiseDialog() + ucrBase.clsRsyntax.SetFunction("climate_obj$display_daily_rain()") + End Sub + Private Sub SetDefaults() + + End Sub + Private Sub ReopenDialog() + + End Sub + Private Sub TestOKEnabled() + End Sub - + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + TestOKEnabled() + End Sub End Class \ No newline at end of file From 77504b7806e1b5de9a8ae61878cfdab8a51e2636 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 21 Mar 2016 16:06:14 +0300 Subject: [PATCH 09/21] editing dlDisplayDaily --- instat/dlgDisplayDaily.Designer.vb | 126 ++++++++++++++--------------- 1 file changed, 62 insertions(+), 64 deletions(-) diff --git a/instat/dlgDisplayDaily.Designer.vb b/instat/dlgDisplayDaily.Designer.vb index 43bf388a34c..6d9ba91e6eb 100644 --- a/instat/dlgDisplayDaily.Designer.vb +++ b/instat/dlgDisplayDaily.Designer.vb @@ -26,10 +26,6 @@ Partial Class dlgDisplayDaily 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() @@ -39,6 +35,10 @@ Partial Class dlgDisplayDaily Me.Label3 = New System.Windows.Forms.Label() Me.chkMonthAbbreviation = New System.Windows.Forms.CheckBox() Me.ucrBase = New instat.ucrButtons() + Me.ucrInputMonthSummaries = New instat.ucrInputTextBox() + Me.ucrInputVariable = New instat.ucrInputTextBox() + Me.ucrInputDayDisplay = New instat.ucrInputTextBox() + Me.ucrInputSummaryNames = New instat.ucrInputTextBox() CType(Me.nudDecimalPlaces, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -48,21 +48,21 @@ Partial Class dlgDisplayDaily 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.Size = New System.Drawing.Size(82, 17) Me.chkPrintTables.TabIndex = 1 Me.chkPrintTables.Tag = "Print_Tables" - Me.chkPrintTables.Text = "CheckBox1" + Me.chkPrintTables.Text = "Print Tables" Me.chkPrintTables.UseVisualStyleBackColor = True ' 'chkRemoveNA ' Me.chkRemoveNA.AutoSize = True - Me.chkRemoveNA.Location = New System.Drawing.Point(346, 220) + Me.chkRemoveNA.Location = New System.Drawing.Point(301, 220) Me.chkRemoveNA.Name = "chkRemoveNA" - Me.chkRemoveNA.Size = New System.Drawing.Size(81, 17) + Me.chkRemoveNA.Size = New System.Drawing.Size(139, 17) Me.chkRemoveNA.TabIndex = 2 - Me.chkRemoveNA.Tag = "Remove_NA" - Me.chkRemoveNA.Text = "CheckBox2" + Me.chkRemoveNA.Tag = "Remove_Missing_Values" + Me.chkRemoveNA.Text = "Remove Missing Values" Me.chkRemoveNA.UseVisualStyleBackColor = True ' 'nudDecimalPlaces @@ -80,95 +80,65 @@ Partial Class dlgDisplayDaily 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.Size = New System.Drawing.Size(45, 13) Me.lblVariable.TabIndex = 10 Me.lblVariable.Tag = "Variable" - Me.lblVariable.Text = "Label1" + Me.lblVariable.Text = "Variable" ' '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.Size = New System.Drawing.Size(63, 13) Me.lblDayDisplay.TabIndex = 11 Me.lblDayDisplay.Tag = "Day_Display" - Me.lblDayDisplay.Text = "Label2" + Me.lblDayDisplay.Text = "Day Display" ' '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.Size = New System.Drawing.Size(80, 13) Me.lblDecimalPlaces.TabIndex = 12 Me.lblDecimalPlaces.Tag = "Decimal_Places" - Me.lblDecimalPlaces.Text = "Label3" + Me.lblDecimalPlaces.Text = "Decimal Places" ' '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.Size = New System.Drawing.Size(54, 13) Me.lblThreshold.TabIndex = 13 Me.lblThreshold.Tag = "Threshold" - Me.lblThreshold.Text = "Label4" + Me.lblThreshold.Text = "Threshold" ' '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.Size = New System.Drawing.Size(86, 13) Me.lblSummaryNames.TabIndex = 14 Me.lblSummaryNames.Tag = "Summary_Names" - Me.lblSummaryNames.Text = "Label5" + Me.lblSummaryNames.Text = "Summary Names" ' '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.Size = New System.Drawing.Size(91, 13) Me.lblMonth_Summaries.TabIndex = 16 Me.lblMonth_Summaries.Tag = "Month_Summaries" - Me.lblMonth_Summaries.Text = "Label7" + Me.lblMonth_Summaries.Text = "Month Summaries" ' 'Label3 ' @@ -184,24 +154,56 @@ Partial Class dlgDisplayDaily 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.Size = New System.Drawing.Size(118, 17) Me.chkMonthAbbreviation.TabIndex = 18 Me.chkMonthAbbreviation.Tag = "Month_Abbreviation" - Me.chkMonthAbbreviation.Text = "CheckBox1" + Me.chkMonthAbbreviation.Text = "Month Abbreviation" Me.chkMonthAbbreviation.UseVisualStyleBackColor = True ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(30, 284) + Me.ucrBase.Location = New System.Drawing.Point(30, 243) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 56) Me.ucrBase.TabIndex = 0 ' + 'ucrInputMonthSummaries + ' + Me.ucrInputMonthSummaries.Location = New System.Drawing.Point(194, 31) + Me.ucrInputMonthSummaries.Name = "ucrInputMonthSummaries" + Me.ucrInputMonthSummaries.Size = New System.Drawing.Size(100, 21) + Me.ucrInputMonthSummaries.TabIndex = 19 + ' + 'ucrInputVariable + ' + Me.ucrInputVariable.Location = New System.Drawing.Point(194, 59) + Me.ucrInputVariable.Name = "ucrInputVariable" + Me.ucrInputVariable.Size = New System.Drawing.Size(100, 21) + Me.ucrInputVariable.TabIndex = 20 + ' + 'ucrInputDayDisplay + ' + Me.ucrInputDayDisplay.Location = New System.Drawing.Point(194, 86) + Me.ucrInputDayDisplay.Name = "ucrInputDayDisplay" + Me.ucrInputDayDisplay.Size = New System.Drawing.Size(100, 21) + Me.ucrInputDayDisplay.TabIndex = 21 + ' + 'ucrInputSummaryNames + ' + Me.ucrInputSummaryNames.Location = New System.Drawing.Point(119, 169) + Me.ucrInputSummaryNames.Name = "ucrInputSummaryNames" + Me.ucrInputSummaryNames.Size = New System.Drawing.Size(90, 21) + Me.ucrInputSummaryNames.TabIndex = 22 + ' 'dlgDisplayDaily ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(462, 352) + Me.ClientSize = New System.Drawing.Size(462, 304) + Me.Controls.Add(Me.ucrInputSummaryNames) + Me.Controls.Add(Me.ucrInputDayDisplay) + Me.Controls.Add(Me.ucrInputVariable) + Me.Controls.Add(Me.ucrInputMonthSummaries) Me.Controls.Add(Me.chkMonthAbbreviation) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.lblMonth_Summaries) @@ -210,10 +212,6 @@ Partial Class dlgDisplayDaily 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) @@ -237,10 +235,6 @@ Partial Class dlgDisplayDaily 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 @@ -249,4 +243,8 @@ Partial Class dlgDisplayDaily Friend WithEvents lblMonth_Summaries As Label Friend WithEvents Label3 As Label Friend WithEvents chkMonthAbbreviation As CheckBox + Friend WithEvents ucrInputMonthSummaries As ucrInputTextBox + Friend WithEvents ucrInputVariable As ucrInputTextBox + Friend WithEvents ucrInputDayDisplay As ucrInputTextBox + Friend WithEvents ucrInputSummaryNames As ucrInputTextBox End Class From 3be9d95d0bc9b716e9c9e8d875287b90425b1b78 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 16:08:54 +0300 Subject: [PATCH 10/21] new dlgGeneral for stats menu --- instat/dlgGeneralTables.Designer.vb | 50 ++++++++++++ instat/dlgGeneralTables.fr-FR.resx | 15 ++++ instat/dlgGeneralTables.resx | 120 ++++++++++++++++++++++++++++ instat/dlgGeneralTables.sw-KE.resx | 15 ++++ instat/dlgGeneralTables.vb | 52 ++++++++++++ instat/frmMain.vb | 4 + instat/instat.vbproj | 15 ++++ 7 files changed, 271 insertions(+) create mode 100644 instat/dlgGeneralTables.Designer.vb create mode 100644 instat/dlgGeneralTables.fr-FR.resx create mode 100644 instat/dlgGeneralTables.resx create mode 100644 instat/dlgGeneralTables.sw-KE.resx create mode 100644 instat/dlgGeneralTables.vb diff --git a/instat/dlgGeneralTables.Designer.vb b/instat/dlgGeneralTables.Designer.vb new file mode 100644 index 00000000000..46b0b9d53d1 --- /dev/null +++ b/instat/dlgGeneralTables.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgGeneralTables + 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.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(3, 316) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgGeneralTables + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(421, 376) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgGeneralTables" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "General Tables" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgGeneralTables.fr-FR.resx b/instat/dlgGeneralTables.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgGeneralTables.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/dlgGeneralTables.resx b/instat/dlgGeneralTables.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgGeneralTables.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/dlgGeneralTables.sw-KE.resx b/instat/dlgGeneralTables.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgGeneralTables.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/dlgGeneralTables.vb b/instat/dlgGeneralTables.vb new file mode 100644 index 00000000000..b2379dcd94e --- /dev/null +++ b/instat/dlgGeneralTables.vb @@ -0,0 +1,52 @@ +' 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 dlgGeneralTables + Private bFirstLoad As Boolean = True + Private Sub dlgGeneralTables_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + If bFirstLoad Then + InitialiseDialog() + Setdefaults() + bFirstLoad = False + Else + ReopenDialog() + + End If + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + + End Sub + + Private Sub Setdefaults() + + End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOkEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + Setdefaults() + End Sub + +End Class \ No newline at end of file diff --git a/instat/frmMain.vb b/instat/frmMain.vb index ca216a4edd9..9ab1837f61d 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -959,5 +959,9 @@ Public Class frmMain Private Sub mnuStatisticsTablesGroup_Click(sender As Object, e As EventArgs) Handles mnuStatisticsTablesGroup.Click dlgGroup.ShowDialog() End Sub + + Private Sub mnuStatisticsTablesGeneral_Click(sender As Object, e As EventArgs) Handles mnuStatisticsTablesGeneral.Click + dlgGeneralTables.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 8ec187dd0cc..bb996334ed1 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -304,6 +304,12 @@ Form + + dlgGeneralTables.vb + + + Form + dlgGroup.vb @@ -1757,6 +1763,15 @@ dlgFromLibrary.vb + + dlgGeneralTables.vb + + + dlgGeneralTables.vb + + + dlgGeneralTables.vb + dlgGroup.vb From 8fc0c44406c6db7a0b97407e31355059ee1e0dc8 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 21 Mar 2016 16:11:45 +0300 Subject: [PATCH 11/21] Editing dlgDOYofYear --- instat/dlgDisplayDoyofYear.vb | 43 +++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/instat/dlgDisplayDoyofYear.vb b/instat/dlgDisplayDoyofYear.vb index b4b1ac46550..3921a3202dd 100644 --- a/instat/dlgDisplayDoyofYear.vb +++ b/instat/dlgDisplayDoyofYear.vb @@ -1,12 +1,37 @@ Imports instat.Translations Public Class dlgDisplayDOYofYear - Private Sub UcrButtons1_Load(sender As Object, e As EventArgs) Handles ucrBase.Load - autoTranslate(Me) - ucrBase.clsRsyntax.SetFunction("climate_obj$display_doy()") - ucrBase.clsRsyntax.iCallType = 0 - End Sub - - Private Sub dlgDisplayDoyofYear_Load(sender As Object, e As EventArgs) Handles MyBase.Load - - End Sub + Public bFirstLoad As Boolean = True + Private Sub dlgDisplayDOYofYear_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + + + + If bFirstLoad Then + InitialiseDialog() + SetDefaults() + bFirstLoad = False + Else + ReopenDialog() + End If + + TestOKEnabled() + End Sub + Private Sub InitialiseDialog() + ucrBase.clsRsyntax.SetFunction("climate_obj$display_doy()") + End Sub + Private Sub SetDefaults() + + End Sub + Private Sub ReopenDialog() + + End Sub + Private Sub TestOKEnabled() + + End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + TestOKEnabled() + End Sub + + End Class \ No newline at end of file From 88d5018885e672e495995443c8740c7c9374f7e8 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 16:18:08 +0300 Subject: [PATCH 12/21] new dlgMultipleResponse for the stats menu --- instat/dlgMultipleResponse.Designer.vb | 50 +++++++++++ instat/dlgMultipleResponse.fr-FR.resx | 15 ++++ instat/dlgMultipleResponse.resx | 120 +++++++++++++++++++++++++ instat/dlgMultipleResponse.sw-KE.resx | 15 ++++ instat/dlgMultipleResponse.vb | 53 +++++++++++ instat/frmMain.vb | 4 + instat/instat.vbproj | 15 ++++ 7 files changed, 272 insertions(+) create mode 100644 instat/dlgMultipleResponse.Designer.vb create mode 100644 instat/dlgMultipleResponse.fr-FR.resx create mode 100644 instat/dlgMultipleResponse.resx create mode 100644 instat/dlgMultipleResponse.sw-KE.resx create mode 100644 instat/dlgMultipleResponse.vb diff --git a/instat/dlgMultipleResponse.Designer.vb b/instat/dlgMultipleResponse.Designer.vb new file mode 100644 index 00000000000..f6e87fc9e3b --- /dev/null +++ b/instat/dlgMultipleResponse.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgMultipleResponse + 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.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(-2, 315) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgMultipleResponse + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(411, 380) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgMultipleResponse" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Multiple Response" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgMultipleResponse.fr-FR.resx b/instat/dlgMultipleResponse.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgMultipleResponse.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/dlgMultipleResponse.resx b/instat/dlgMultipleResponse.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgMultipleResponse.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/dlgMultipleResponse.sw-KE.resx b/instat/dlgMultipleResponse.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgMultipleResponse.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/dlgMultipleResponse.vb b/instat/dlgMultipleResponse.vb new file mode 100644 index 00000000000..e311a6f6432 --- /dev/null +++ b/instat/dlgMultipleResponse.vb @@ -0,0 +1,53 @@ +' 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 dlgMultipleResponse + Private bFirstLoad As Boolean = True + + Private Sub dlgMultipleResponse_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + If bFirstLoad Then + InitialiseDialog() + Setdefaults() + bFirstLoad = False + Else + ReopenDialog() + + End If + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + + End Sub + + Private Sub Setdefaults() + + End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOkEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + Setdefaults() + End Sub + +End Class \ No newline at end of file diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 9ab1837f61d..49fbf5cab28 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -963,5 +963,9 @@ Public Class frmMain Private Sub mnuStatisticsTablesGeneral_Click(sender As Object, e As EventArgs) Handles mnuStatisticsTablesGeneral.Click dlgGeneralTables.ShowDialog() End Sub + + Private Sub mnuStatisticsTablesMultipleResponse_Click(sender As Object, e As EventArgs) Handles mnuStatisticsTablesMultipleResponse.Click + dlgMultipleResponse.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index bb996334ed1..9a51651ba3f 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -340,6 +340,12 @@ Form + + dlgMultipleResponse.vb + + + Form + dlgOneWayANOVA.vb @@ -1817,6 +1823,15 @@ dlgMatchText.vb + + dlgMultipleResponse.vb + + + dlgMultipleResponse.vb + + + dlgMultipleResponse.vb + dlgOneWayANOVA.vb From 1f3b8e3cb439f10a2997b6d78544a0b9139a0049 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Mon, 21 Mar 2016 16:21:06 +0300 Subject: [PATCH 13/21] Editing dlgDisplayofYear --- instat/dlgDisplayDoyofYear.designer.vb | 489 ++++++++++++------------- 1 file changed, 244 insertions(+), 245 deletions(-) diff --git a/instat/dlgDisplayDoyofYear.designer.vb b/instat/dlgDisplayDoyofYear.designer.vb index 68428e1c861..e2f2db5823c 100644 --- a/instat/dlgDisplayDoyofYear.designer.vb +++ b/instat/dlgDisplayDoyofYear.designer.vb @@ -22,253 +22,248 @@ Partial Class dlgDisplayDOYofYear 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.txtTitle = New System.Windows.Forms.TextBox() - Me.TextBox3 = New System.Windows.Forms.TextBox() - Me.txtFile = New System.Windows.Forms.TextBox() - Me.txtDayDisplay = New System.Windows.Forms.TextBox() - Me.lblHeight = New System.Windows.Forms.Label() - Me.lblTitle = New System.Windows.Forms.Label() - Me.lblDayDisplay = New System.Windows.Forms.Label() - Me.lblFile = New System.Windows.Forms.Label() - Me.lblNAString = New System.Windows.Forms.Label() - Me.lblFontSize = New System.Windows.Forms.Label() - Me.lblWidth = New System.Windows.Forms.Label() - Me.lblHeaderFontSize = New System.Windows.Forms.Label() - Me.chkMonthAbbreviations = New System.Windows.Forms.CheckBox() - Me.chkSaveTable = New System.Windows.Forms.CheckBox() - Me.chkRowNames = New System.Windows.Forms.CheckBox() - Me.nudHeight = New System.Windows.Forms.NumericUpDown() - Me.nudHeaderFontSize = New System.Windows.Forms.NumericUpDown() - Me.nudFontSize = New System.Windows.Forms.NumericUpDown() - Me.nudWidth = New System.Windows.Forms.NumericUpDown() - Me.ucrBase = New instat.ucrButtons() - CType(Me.nudHeight, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudHeaderFontSize, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudFontSize, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.nudWidth, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'txtTitle - ' - Me.txtTitle.Location = New System.Drawing.Point(144, 36) - Me.txtTitle.Name = "txtTitle" - Me.txtTitle.Size = New System.Drawing.Size(197, 20) - Me.txtTitle.TabIndex = 1 - Me.txtTitle.Tag = "Title" - ' - 'TextBox3 - ' - Me.TextBox3.Location = New System.Drawing.Point(144, 114) - Me.TextBox3.Name = "TextBox3" - Me.TextBox3.Size = New System.Drawing.Size(100, 20) - Me.TextBox3.TabIndex = 3 - ' - 'txtFile - ' - Me.txtFile.Location = New System.Drawing.Point(144, 88) - Me.txtFile.Name = "txtFile" - Me.txtFile.Size = New System.Drawing.Size(100, 20) - Me.txtFile.TabIndex = 4 - Me.txtFile.Tag = "" - ' - 'txtDayDisplay - ' - Me.txtDayDisplay.Location = New System.Drawing.Point(144, 62) - Me.txtDayDisplay.Name = "txtDayDisplay" - Me.txtDayDisplay.Size = New System.Drawing.Size(100, 20) - Me.txtDayDisplay.TabIndex = 5 - Me.txtDayDisplay.Tag = "" - ' - 'lblHeight - ' - Me.lblHeight.AutoSize = True - Me.lblHeight.Location = New System.Drawing.Point(37, 266) - Me.lblHeight.Name = "lblHeight" - Me.lblHeight.Size = New System.Drawing.Size(39, 13) - Me.lblHeight.TabIndex = 6 - Me.lblHeight.Tag = "Height" - Me.lblHeight.Text = "Label1" - ' - 'lblTitle - ' - Me.lblTitle.AutoSize = True - Me.lblTitle.Location = New System.Drawing.Point(35, 36) - Me.lblTitle.Name = "lblTitle" - Me.lblTitle.Size = New System.Drawing.Size(39, 13) - Me.lblTitle.TabIndex = 7 - Me.lblTitle.Tag = "Title" - Me.lblTitle.Text = "Label2" - ' - 'lblDayDisplay - ' - Me.lblDayDisplay.AutoSize = True - Me.lblDayDisplay.Location = New System.Drawing.Point(35, 65) - Me.lblDayDisplay.Name = "lblDayDisplay" - Me.lblDayDisplay.Size = New System.Drawing.Size(39, 13) - Me.lblDayDisplay.TabIndex = 8 - Me.lblDayDisplay.Tag = "Day_Display" - Me.lblDayDisplay.Text = "Label3" - ' - 'lblFile - ' - Me.lblFile.AutoSize = True - Me.lblFile.Location = New System.Drawing.Point(35, 95) - Me.lblFile.Name = "lblFile" - Me.lblFile.Size = New System.Drawing.Size(39, 13) - Me.lblFile.TabIndex = 9 - Me.lblFile.Tag = "File" - Me.lblFile.Text = "Label4" - ' - 'lblNAString - ' - Me.lblNAString.AutoSize = True - Me.lblNAString.Location = New System.Drawing.Point(37, 121) - Me.lblNAString.Name = "lblNAString" - Me.lblNAString.Size = New System.Drawing.Size(39, 13) - Me.lblNAString.TabIndex = 10 - Me.lblNAString.Tag = "NA_String" - Me.lblNAString.Text = "Label5" - ' - 'lblFontSize - ' - Me.lblFontSize.AutoSize = True - Me.lblFontSize.Location = New System.Drawing.Point(37, 190) - Me.lblFontSize.Name = "lblFontSize" - Me.lblFontSize.Size = New System.Drawing.Size(39, 13) - Me.lblFontSize.TabIndex = 11 - Me.lblFontSize.Tag = "Font_Size" - Me.lblFontSize.Text = "Label6" - ' - 'lblWidth - ' - Me.lblWidth.AutoSize = True - Me.lblWidth.Location = New System.Drawing.Point(37, 216) - Me.lblWidth.Name = "lblWidth" - Me.lblWidth.Size = New System.Drawing.Size(39, 13) - Me.lblWidth.TabIndex = 12 - Me.lblWidth.Tag = "Width" - Me.lblWidth.Text = "Label7" - ' - 'lblHeaderFontSize - ' - Me.lblHeaderFontSize.AutoSize = True - Me.lblHeaderFontSize.Location = New System.Drawing.Point(35, 242) - Me.lblHeaderFontSize.Name = "lblHeaderFontSize" - Me.lblHeaderFontSize.Size = New System.Drawing.Size(39, 13) - Me.lblHeaderFontSize.TabIndex = 13 - Me.lblHeaderFontSize.Tag = "Header_Font_Size" - Me.lblHeaderFontSize.Text = "Label8" - ' - 'chkMonthAbbreviations - ' - Me.chkMonthAbbreviations.AutoSize = True - Me.chkMonthAbbreviations.Location = New System.Drawing.Point(337, 238) - Me.chkMonthAbbreviations.Name = "chkMonthAbbreviations" - Me.chkMonthAbbreviations.Size = New System.Drawing.Size(81, 17) - Me.chkMonthAbbreviations.TabIndex = 14 - Me.chkMonthAbbreviations.Tag = "Month_Abbreviations" - Me.chkMonthAbbreviations.Text = "CheckBox1" - Me.chkMonthAbbreviations.UseVisualStyleBackColor = True - ' - 'chkSaveTable - ' - Me.chkSaveTable.AutoSize = True - Me.chkSaveTable.Location = New System.Drawing.Point(461, 191) - Me.chkSaveTable.Name = "chkSaveTable" - Me.chkSaveTable.Size = New System.Drawing.Size(81, 17) - Me.chkSaveTable.TabIndex = 15 - Me.chkSaveTable.Tag = "Save_Table" - Me.chkSaveTable.Text = "CheckBox2" - Me.chkSaveTable.UseVisualStyleBackColor = True - ' - 'chkRowNames - ' - Me.chkRowNames.AutoSize = True - Me.chkRowNames.Location = New System.Drawing.Point(337, 191) - Me.chkRowNames.Name = "chkRowNames" - Me.chkRowNames.Size = New System.Drawing.Size(81, 17) - Me.chkRowNames.TabIndex = 16 - Me.chkRowNames.Tag = "Row_Names" - Me.chkRowNames.Text = "CheckBox3" - Me.chkRowNames.UseVisualStyleBackColor = True - ' - 'nudHeight - ' - Me.nudHeight.Location = New System.Drawing.Point(144, 266) - Me.nudHeight.Name = "nudHeight" - Me.nudHeight.Size = New System.Drawing.Size(74, 20) - Me.nudHeight.TabIndex = 17 - ' - 'nudHeaderFontSize - ' - Me.nudHeaderFontSize.Location = New System.Drawing.Point(144, 240) - Me.nudHeaderFontSize.Name = "nudHeaderFontSize" - Me.nudHeaderFontSize.Size = New System.Drawing.Size(74, 20) - Me.nudHeaderFontSize.TabIndex = 18 - ' - 'nudFontSize - ' - Me.nudFontSize.Location = New System.Drawing.Point(144, 191) - Me.nudFontSize.Name = "nudFontSize" - Me.nudFontSize.Size = New System.Drawing.Size(74, 20) - Me.nudFontSize.TabIndex = 19 - ' - 'nudWidth - ' - Me.nudWidth.Location = New System.Drawing.Point(144, 214) - Me.nudWidth.Name = "nudWidth" - Me.nudWidth.Size = New System.Drawing.Size(74, 20) - Me.nudWidth.TabIndex = 20 - ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(82, 330) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 32) - Me.ucrBase.TabIndex = 0 - ' - 'dlgDisplayDOYofYear - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(583, 362) - Me.Controls.Add(Me.nudWidth) - Me.Controls.Add(Me.nudFontSize) - Me.Controls.Add(Me.nudHeaderFontSize) - Me.Controls.Add(Me.nudHeight) - Me.Controls.Add(Me.chkRowNames) - Me.Controls.Add(Me.chkSaveTable) - Me.Controls.Add(Me.chkMonthAbbreviations) - Me.Controls.Add(Me.lblHeaderFontSize) - Me.Controls.Add(Me.lblWidth) - Me.Controls.Add(Me.lblFontSize) - Me.Controls.Add(Me.lblNAString) - Me.Controls.Add(Me.lblFile) - Me.Controls.Add(Me.lblDayDisplay) - Me.Controls.Add(Me.lblTitle) - Me.Controls.Add(Me.lblHeight) - Me.Controls.Add(Me.txtDayDisplay) - Me.Controls.Add(Me.txtFile) - Me.Controls.Add(Me.TextBox3) - Me.Controls.Add(Me.txtTitle) - Me.Controls.Add(Me.ucrBase) - Me.Name = "dlgDisplayDOYofYear" - Me.Tag = "Display_DOY_of_Year" - Me.Text = "Display Day Of Year" - CType(Me.nudHeight, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudHeaderFontSize, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudFontSize, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.nudWidth, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - + Me.lblHeight = New System.Windows.Forms.Label() + Me.lblTitle = New System.Windows.Forms.Label() + Me.lblDayDisplay = New System.Windows.Forms.Label() + Me.lblFile = New System.Windows.Forms.Label() + Me.lblNAString = New System.Windows.Forms.Label() + Me.lblFontSize = New System.Windows.Forms.Label() + Me.lblWidth = New System.Windows.Forms.Label() + Me.lblHeaderFontSize = New System.Windows.Forms.Label() + Me.chkMonthAbbreviations = New System.Windows.Forms.CheckBox() + Me.chkSaveTable = New System.Windows.Forms.CheckBox() + Me.chkRowNames = New System.Windows.Forms.CheckBox() + Me.nudHeight = New System.Windows.Forms.NumericUpDown() + Me.nudHeaderFontSize = New System.Windows.Forms.NumericUpDown() + Me.nudFontSize = New System.Windows.Forms.NumericUpDown() + Me.nudWidth = New System.Windows.Forms.NumericUpDown() + Me.ucrBase = New instat.ucrButtons() + Me.ucrInputTitle = New instat.ucrInputTextBox() + Me.ucrInputDisplayDaily = New instat.ucrInputTextBox() + Me.ucrInputFile = New instat.ucrInputTextBox() + Me.ucrInputMissingValues = New instat.ucrInputTextBox() + CType(Me.nudHeight, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudHeaderFontSize, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudFontSize, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.nudWidth, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblHeight + ' + Me.lblHeight.AutoSize = True + Me.lblHeight.Location = New System.Drawing.Point(37, 205) + Me.lblHeight.Name = "lblHeight" + Me.lblHeight.Size = New System.Drawing.Size(38, 13) + Me.lblHeight.TabIndex = 6 + Me.lblHeight.Tag = "Height" + Me.lblHeight.Text = "Height" + ' + 'lblTitle + ' + Me.lblTitle.AutoSize = True + Me.lblTitle.Location = New System.Drawing.Point(37, 20) + Me.lblTitle.Name = "lblTitle" + Me.lblTitle.Size = New System.Drawing.Size(27, 13) + Me.lblTitle.TabIndex = 7 + Me.lblTitle.Tag = "Title" + Me.lblTitle.Text = "Title" + ' + 'lblDayDisplay + ' + Me.lblDayDisplay.AutoSize = True + Me.lblDayDisplay.Location = New System.Drawing.Point(37, 47) + Me.lblDayDisplay.Name = "lblDayDisplay" + Me.lblDayDisplay.Size = New System.Drawing.Size(63, 13) + Me.lblDayDisplay.TabIndex = 8 + Me.lblDayDisplay.Tag = "Display_Day" + Me.lblDayDisplay.Text = "Display Day" + ' + 'lblFile + ' + Me.lblFile.AutoSize = True + Me.lblFile.Location = New System.Drawing.Point(37, 74) + Me.lblFile.Name = "lblFile" + Me.lblFile.Size = New System.Drawing.Size(23, 13) + Me.lblFile.TabIndex = 9 + Me.lblFile.Tag = "File" + Me.lblFile.Text = "File" + ' + 'lblNAString + ' + Me.lblNAString.AutoSize = True + Me.lblNAString.Location = New System.Drawing.Point(37, 101) + Me.lblNAString.Name = "lblNAString" + Me.lblNAString.Size = New System.Drawing.Size(77, 13) + Me.lblNAString.TabIndex = 10 + Me.lblNAString.Tag = "Missing_Values" + Me.lblNAString.Text = "Missing Values" + ' + 'lblFontSize + ' + Me.lblFontSize.AutoSize = True + Me.lblFontSize.Location = New System.Drawing.Point(37, 127) + Me.lblFontSize.Name = "lblFontSize" + Me.lblFontSize.Size = New System.Drawing.Size(51, 13) + Me.lblFontSize.TabIndex = 11 + Me.lblFontSize.Tag = "Font_Size" + Me.lblFontSize.Text = "Font Size" + ' + 'lblWidth + ' + Me.lblWidth.AutoSize = True + Me.lblWidth.Location = New System.Drawing.Point(37, 153) + Me.lblWidth.Name = "lblWidth" + Me.lblWidth.Size = New System.Drawing.Size(35, 13) + Me.lblWidth.TabIndex = 12 + Me.lblWidth.Tag = "Width" + Me.lblWidth.Text = "Width" + ' + 'lblHeaderFontSize + ' + Me.lblHeaderFontSize.AutoSize = True + Me.lblHeaderFontSize.Location = New System.Drawing.Point(37, 179) + Me.lblHeaderFontSize.Name = "lblHeaderFontSize" + Me.lblHeaderFontSize.Size = New System.Drawing.Size(89, 13) + Me.lblHeaderFontSize.TabIndex = 13 + Me.lblHeaderFontSize.Tag = "Header_Font_Size" + Me.lblHeaderFontSize.Text = "Header Font Size" + ' + 'chkMonthAbbreviations + ' + Me.chkMonthAbbreviations.AutoSize = True + Me.chkMonthAbbreviations.Location = New System.Drawing.Point(144, 224) + Me.chkMonthAbbreviations.Name = "chkMonthAbbreviations" + Me.chkMonthAbbreviations.Size = New System.Drawing.Size(123, 17) + Me.chkMonthAbbreviations.TabIndex = 14 + Me.chkMonthAbbreviations.Tag = "Month_Abbreviations" + Me.chkMonthAbbreviations.Text = "Month Abbreviations" + Me.chkMonthAbbreviations.UseVisualStyleBackColor = True + ' + 'chkSaveTable + ' + Me.chkSaveTable.AutoSize = True + Me.chkSaveTable.Location = New System.Drawing.Point(322, 224) + Me.chkSaveTable.Name = "chkSaveTable" + Me.chkSaveTable.Size = New System.Drawing.Size(81, 17) + Me.chkSaveTable.TabIndex = 15 + Me.chkSaveTable.Tag = "Save_Table" + Me.chkSaveTable.Text = "Save Table" + Me.chkSaveTable.UseVisualStyleBackColor = True + ' + 'chkRowNames + ' + Me.chkRowNames.AutoSize = True + Me.chkRowNames.Location = New System.Drawing.Point(30, 221) + Me.chkRowNames.Name = "chkRowNames" + Me.chkRowNames.Size = New System.Drawing.Size(84, 17) + Me.chkRowNames.TabIndex = 16 + Me.chkRowNames.Tag = "Row_Names" + Me.chkRowNames.Text = "Row Names" + Me.chkRowNames.UseVisualStyleBackColor = True + ' + 'nudHeight + ' + Me.nudHeight.Location = New System.Drawing.Point(144, 198) + Me.nudHeight.Name = "nudHeight" + Me.nudHeight.Size = New System.Drawing.Size(74, 20) + Me.nudHeight.TabIndex = 17 + ' + 'nudHeaderFontSize + ' + Me.nudHeaderFontSize.Location = New System.Drawing.Point(144, 172) + Me.nudHeaderFontSize.Name = "nudHeaderFontSize" + Me.nudHeaderFontSize.Size = New System.Drawing.Size(74, 20) + Me.nudHeaderFontSize.TabIndex = 18 + ' + 'nudFontSize + ' + Me.nudFontSize.Location = New System.Drawing.Point(144, 120) + Me.nudFontSize.Name = "nudFontSize" + Me.nudFontSize.Size = New System.Drawing.Size(74, 20) + Me.nudFontSize.TabIndex = 19 + ' + 'nudWidth + ' + Me.nudWidth.Location = New System.Drawing.Point(144, 146) + Me.nudWidth.Name = "nudWidth" + Me.nudWidth.Size = New System.Drawing.Size(74, 20) + Me.nudWidth.TabIndex = 20 + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(12, 247) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 57) + Me.ucrBase.TabIndex = 0 + ' + 'ucrInputTitle + ' + Me.ucrInputTitle.Location = New System.Drawing.Point(144, 12) + Me.ucrInputTitle.Name = "ucrInputTitle" + Me.ucrInputTitle.Size = New System.Drawing.Size(142, 21) + Me.ucrInputTitle.TabIndex = 21 + ' + 'ucrInputDisplayDaily + ' + Me.ucrInputDisplayDaily.Location = New System.Drawing.Point(144, 39) + Me.ucrInputDisplayDaily.Name = "ucrInputDisplayDaily" + Me.ucrInputDisplayDaily.Size = New System.Drawing.Size(142, 21) + Me.ucrInputDisplayDaily.TabIndex = 22 + ' + 'ucrInputFile + ' + Me.ucrInputFile.Location = New System.Drawing.Point(144, 66) + Me.ucrInputFile.Name = "ucrInputFile" + Me.ucrInputFile.Size = New System.Drawing.Size(142, 21) + Me.ucrInputFile.TabIndex = 22 + ' + 'ucrInputMissingValues + ' + Me.ucrInputMissingValues.Location = New System.Drawing.Point(144, 93) + Me.ucrInputMissingValues.Name = "ucrInputMissingValues" + Me.ucrInputMissingValues.Size = New System.Drawing.Size(142, 21) + Me.ucrInputMissingValues.TabIndex = 22 + ' + 'dlgDisplayDOYofYear + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(428, 307) + Me.Controls.Add(Me.ucrInputMissingValues) + Me.Controls.Add(Me.ucrInputFile) + Me.Controls.Add(Me.ucrInputDisplayDaily) + Me.Controls.Add(Me.ucrInputTitle) + Me.Controls.Add(Me.nudWidth) + Me.Controls.Add(Me.nudFontSize) + Me.Controls.Add(Me.nudHeaderFontSize) + Me.Controls.Add(Me.nudHeight) + Me.Controls.Add(Me.chkRowNames) + Me.Controls.Add(Me.chkSaveTable) + Me.Controls.Add(Me.chkMonthAbbreviations) + Me.Controls.Add(Me.lblHeaderFontSize) + Me.Controls.Add(Me.lblWidth) + Me.Controls.Add(Me.lblFontSize) + Me.Controls.Add(Me.lblNAString) + Me.Controls.Add(Me.lblFile) + Me.Controls.Add(Me.lblDayDisplay) + Me.Controls.Add(Me.lblTitle) + Me.Controls.Add(Me.lblHeight) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgDisplayDOYofYear" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Display_DOY_of_Year" + Me.Text = "Display Day Of Year" + CType(Me.nudHeight, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudHeaderFontSize, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudFontSize, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.nudWidth, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + End Sub Friend WithEvents ucrBase As ucrButtons - Friend WithEvents txtTitle As TextBox - Friend WithEvents TextBox3 As TextBox - Friend WithEvents txtFile As TextBox - Friend WithEvents txtDayDisplay As TextBox Friend WithEvents lblHeight As Label Friend WithEvents lblTitle As Label Friend WithEvents lblDayDisplay As Label @@ -283,5 +278,9 @@ Partial Class dlgDisplayDOYofYear Friend WithEvents nudHeight As NumericUpDown Friend WithEvents nudHeaderFontSize As NumericUpDown Friend WithEvents nudFontSize As NumericUpDown - Friend WithEvents nudWidth As NumericUpDown + Friend WithEvents nudWidth As NumericUpDown + Friend WithEvents ucrInputTitle As ucrInputTextBox + Friend WithEvents ucrInputDisplayDaily As ucrInputTextBox + Friend WithEvents ucrInputFile As ucrInputTextBox + Friend WithEvents ucrInputMissingValues As ucrInputTextBox End Class From 351a6f9530d7cbed5f6e86e552fe1101f4da4f40 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 16:27:00 +0300 Subject: [PATCH 14/21] new dlgOneSampleSumaryData for stats menu --- instat/dlgOneSampleSummaryData.Designer.vb | 50 +++++++++ instat/dlgOneSampleSummaryData.fr-FR.resx | 15 +++ instat/dlgOneSampleSummaryData.resx | 120 +++++++++++++++++++++ instat/dlgOneSampleSummaryData.sw-KE.resx | 15 +++ instat/dlgOneSampleSummaryData.vb | 52 +++++++++ instat/frmMain.vb | 4 + instat/instat.vbproj | 15 +++ 7 files changed, 271 insertions(+) create mode 100644 instat/dlgOneSampleSummaryData.Designer.vb create mode 100644 instat/dlgOneSampleSummaryData.fr-FR.resx create mode 100644 instat/dlgOneSampleSummaryData.resx create mode 100644 instat/dlgOneSampleSummaryData.sw-KE.resx create mode 100644 instat/dlgOneSampleSummaryData.vb diff --git a/instat/dlgOneSampleSummaryData.Designer.vb b/instat/dlgOneSampleSummaryData.Designer.vb new file mode 100644 index 00000000000..25b22e230eb --- /dev/null +++ b/instat/dlgOneSampleSummaryData.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgOneSampleSummaryData + 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.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(3, 203) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgOneSampleSummaryData + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(410, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgOneSampleSummaryData" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "One Sample Summary Data" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgOneSampleSummaryData.fr-FR.resx b/instat/dlgOneSampleSummaryData.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgOneSampleSummaryData.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/dlgOneSampleSummaryData.resx b/instat/dlgOneSampleSummaryData.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgOneSampleSummaryData.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/dlgOneSampleSummaryData.sw-KE.resx b/instat/dlgOneSampleSummaryData.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgOneSampleSummaryData.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/dlgOneSampleSummaryData.vb b/instat/dlgOneSampleSummaryData.vb new file mode 100644 index 00000000000..9f0a048608c --- /dev/null +++ b/instat/dlgOneSampleSummaryData.vb @@ -0,0 +1,52 @@ +' 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 dlgOneSampleSummaryData + Private bFirstLoad As Boolean = True + Private Sub dlgOneSampleSummaryData_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + If bFirstLoad Then + InitialiseDialog() + Setdefaults() + bFirstLoad = False + Else + ReopenDialog() + + End If + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + + End Sub + + Private Sub Setdefaults() + + End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOkEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + Setdefaults() + + End Sub +End Class \ No newline at end of file diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 49fbf5cab28..01b2dbf3a4e 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -967,5 +967,9 @@ Public Class frmMain Private Sub mnuStatisticsTablesMultipleResponse_Click(sender As Object, e As EventArgs) Handles mnuStatisticsTablesMultipleResponse.Click dlgMultipleResponse.ShowDialog() End Sub + + Private Sub mnuStatisticsSimpleModelsOneSampleSummaryData_Click(sender As Object, e As EventArgs) Handles mnuStatisticsSimpleModelsOneSampleSummaryData.Click + dlgOneSampleSummaryData.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 9a51651ba3f..f3c214582d0 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -346,6 +346,12 @@ Form + + dlgOneSampleSummaryData.vb + + + Form + dlgOneWayANOVA.vb @@ -1832,6 +1838,15 @@ dlgMultipleResponse.vb + + dlgOneSampleSummaryData.vb + + + dlgOneSampleSummaryData.vb + + + dlgOneSampleSummaryData.vb + dlgOneWayANOVA.vb From 9e7f85375f5020b36849ce4bc7e84b5800447f46 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 16:35:42 +0300 Subject: [PATCH 15/21] new dlgTwoSampleSummaryData for stats menu --- instat/dlgTwoSampleSummaryData.Designer.vb | 50 +++++++++ instat/dlgTwoSampleSummaryData.fr-FR.resx | 15 +++ instat/dlgTwoSampleSummaryData.resx | 120 +++++++++++++++++++++ instat/dlgTwoSampleSummaryData.sw-KE.resx | 15 +++ instat/dlgTwoSampleSummaryData.vb | 53 +++++++++ instat/frmMain.vb | 4 + instat/instat.vbproj | 15 +++ 7 files changed, 272 insertions(+) create mode 100644 instat/dlgTwoSampleSummaryData.Designer.vb create mode 100644 instat/dlgTwoSampleSummaryData.fr-FR.resx create mode 100644 instat/dlgTwoSampleSummaryData.resx create mode 100644 instat/dlgTwoSampleSummaryData.sw-KE.resx create mode 100644 instat/dlgTwoSampleSummaryData.vb diff --git a/instat/dlgTwoSampleSummaryData.Designer.vb b/instat/dlgTwoSampleSummaryData.Designer.vb new file mode 100644 index 00000000000..75e54c2f594 --- /dev/null +++ b/instat/dlgTwoSampleSummaryData.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgTwoSampleSummaryData + 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.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(3, 242) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgTwoSampleSummaryData + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(407, 294) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgTwoSampleSummaryData" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Two Sample Summary Data" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgTwoSampleSummaryData.fr-FR.resx b/instat/dlgTwoSampleSummaryData.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgTwoSampleSummaryData.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/dlgTwoSampleSummaryData.resx b/instat/dlgTwoSampleSummaryData.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgTwoSampleSummaryData.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/dlgTwoSampleSummaryData.sw-KE.resx b/instat/dlgTwoSampleSummaryData.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgTwoSampleSummaryData.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/dlgTwoSampleSummaryData.vb b/instat/dlgTwoSampleSummaryData.vb new file mode 100644 index 00000000000..9cd8f753429 --- /dev/null +++ b/instat/dlgTwoSampleSummaryData.vb @@ -0,0 +1,53 @@ +' 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 dlgTwoSampleSummaryData + Private bFirstLoad As Boolean = True + Private Sub dlgTwoSampleSummaryData_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + If bFirstLoad Then + InitialiseDialog() + Setdefaults() + bFirstLoad = False + Else + ReopenDialog() + + End If + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + + End Sub + + Private Sub Setdefaults() + + End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOkEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + Setdefaults() + + End Sub +End Class \ No newline at end of file diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 01b2dbf3a4e..75e9b42a8f2 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -971,5 +971,9 @@ Public Class frmMain Private Sub mnuStatisticsSimpleModelsOneSampleSummaryData_Click(sender As Object, e As EventArgs) Handles mnuStatisticsSimpleModelsOneSampleSummaryData.Click dlgOneSampleSummaryData.ShowDialog() End Sub + + Private Sub mnuStatisticsSimpleModelsTwoSamplesSummaryData_Click(sender As Object, e As EventArgs) Handles mnuStatisticsSimpleModelsTwoSamplesSummaryData.Click + dlgTwoSampleSummaryData.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index f3c214582d0..5a977c00d43 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -478,6 +478,12 @@ Form + + dlgTwoSampleSummaryData.vb + + + Form + dlgUnusedLevels.vb @@ -2045,6 +2051,15 @@ dlgNon_ParametricTwoWayAnova.vb + + dlgTwoSampleSummaryData.vb + + + dlgTwoSampleSummaryData.vb + + + dlgTwoSampleSummaryData.vb + dlgUnusedLevels.vb From fcfde027ccde715500175e8acce782377d874248 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 16:43:15 +0300 Subject: [PATCH 16/21] new dlgGodnessofFit for stats menu --- instat/dlgGoodnessofFit.Designer.vb | 50 ++++++++++++ instat/dlgGoodnessofFit.fr-FR.resx | 15 ++++ instat/dlgGoodnessofFit.resx | 120 ++++++++++++++++++++++++++++ instat/dlgGoodnessofFit.sw-KE.resx | 15 ++++ instat/dlgGoodnessofFit.vb | 52 ++++++++++++ instat/frmMain.vb | 4 + instat/instat.vbproj | 15 ++++ 7 files changed, 271 insertions(+) create mode 100644 instat/dlgGoodnessofFit.Designer.vb create mode 100644 instat/dlgGoodnessofFit.fr-FR.resx create mode 100644 instat/dlgGoodnessofFit.resx create mode 100644 instat/dlgGoodnessofFit.sw-KE.resx create mode 100644 instat/dlgGoodnessofFit.vb diff --git a/instat/dlgGoodnessofFit.Designer.vb b/instat/dlgGoodnessofFit.Designer.vb new file mode 100644 index 00000000000..94223690af1 --- /dev/null +++ b/instat/dlgGoodnessofFit.Designer.vb @@ -0,0 +1,50 @@ + _ +Partial Class dlgGoodnessofFit + 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.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(28, 222) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgGoodnessofFit + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(450, 287) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgGoodnessofFit" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Goodness of Fit" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgGoodnessofFit.fr-FR.resx b/instat/dlgGoodnessofFit.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgGoodnessofFit.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/dlgGoodnessofFit.resx b/instat/dlgGoodnessofFit.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgGoodnessofFit.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/dlgGoodnessofFit.sw-KE.resx b/instat/dlgGoodnessofFit.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/dlgGoodnessofFit.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/dlgGoodnessofFit.vb b/instat/dlgGoodnessofFit.vb new file mode 100644 index 00000000000..ee503db505c --- /dev/null +++ b/instat/dlgGoodnessofFit.vb @@ -0,0 +1,52 @@ +' 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 dlgGoodnessofFit + Private bFirstLoad As Boolean = True + Private Sub dlgGoodnessofFit_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + If bFirstLoad Then + InitialiseDialog() + Setdefaults() + bFirstLoad = False + Else + ReopenDialog() + + End If + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + + End Sub + + Private Sub Setdefaults() + + End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOkEnabled() + + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + Setdefaults() + + End Sub +End Class \ No newline at end of file diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 75e9b42a8f2..dd9db5a652e 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -975,5 +975,9 @@ Public Class frmMain Private Sub mnuStatisticsSimpleModelsTwoSamplesSummaryData_Click(sender As Object, e As EventArgs) Handles mnuStatisticsSimpleModelsTwoSamplesSummaryData.Click dlgTwoSampleSummaryData.ShowDialog() End Sub + + Private Sub mnuStatisticsSimpleModelsGoodnessOfFit_Click(sender As Object, e As EventArgs) Handles mnuStatisticsSimpleModelsGoodnessOfFit.Click + dlgGoodnessofFit.ShowDialog() + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 5a977c00d43..6464ce9d51c 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -310,6 +310,12 @@ Form + + dlgGoodnessofFit.vb + + + Form + dlgGroup.vb @@ -1790,6 +1796,15 @@ dlgGeneralTables.vb + + dlgGoodnessofFit.vb + + + dlgGoodnessofFit.vb + + + dlgGoodnessofFit.vb + dlgGroup.vb From bf87171f470504577c579b7970b403eac0080d4a Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 16:54:18 +0300 Subject: [PATCH 17/21] adding dlg twosample to main form --- instat/frmMain.vb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index dd9db5a652e..2d8aa3f7070 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -979,5 +979,9 @@ Public Class frmMain Private Sub mnuStatisticsSimpleModelsGoodnessOfFit_Click(sender As Object, e As EventArgs) Handles mnuStatisticsSimpleModelsGoodnessOfFit.Click dlgGoodnessofFit.ShowDialog() End Sub + + Private Sub mnuStatisticsNonParametricTwoSamples_Click(sender As Object, e As EventArgs) Handles mnuStatisticsNonParametricTwoSamples.Click + dlgTwoSamples.ShowDialog() + End Sub End Class From 3022e981a939d2d1729a745df5961fe345b9dc62 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 17:04:40 +0300 Subject: [PATCH 18/21] fixed crushing bug on the dialog by removing old code and replacing it with the new backbone --- instat/dlgMultipleRegression.Designer.vb | 12 ++++++--- instat/dlgMultipleRegression.vb | 34 +++++++++++++++++------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/instat/dlgMultipleRegression.Designer.vb b/instat/dlgMultipleRegression.Designer.vb index 0cb9a235658..75877451a71 100644 --- a/instat/dlgMultipleRegression.Designer.vb +++ b/instat/dlgMultipleRegression.Designer.vb @@ -34,12 +34,12 @@ Partial Class dlgMultipleRegression ' Me.ucrAddRemove.Location = New System.Drawing.Point(12, 12) Me.ucrAddRemove.Name = "ucrAddRemove" - Me.ucrAddRemove.Size = New System.Drawing.Size(211, 131) + Me.ucrAddRemove.Size = New System.Drawing.Size(226, 131) Me.ucrAddRemove.TabIndex = 3 ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(12, 283) + Me.ucrBase.Location = New System.Drawing.Point(4, 206) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 55) Me.ucrBase.TabIndex = 2 @@ -48,13 +48,15 @@ Partial Class dlgMultipleRegression ' Me.ucrReceiveExplanatoryVaraibles.Location = New System.Drawing.Point(247, 105) Me.ucrReceiveExplanatoryVaraibles.Name = "ucrReceiveExplanatoryVaraibles" - Me.ucrReceiveExplanatoryVaraibles.Size = New System.Drawing.Size(98, 118) + Me.ucrReceiveExplanatoryVaraibles.Selector = Nothing + Me.ucrReceiveExplanatoryVaraibles.Size = New System.Drawing.Size(131, 118) Me.ucrReceiveExplanatoryVaraibles.TabIndex = 0 ' 'ucrReceiveResponseVariable ' Me.ucrReceiveResponseVariable.Location = New System.Drawing.Point(247, 50) Me.ucrReceiveResponseVariable.Name = "ucrReceiveResponseVariable" + Me.ucrReceiveResponseVariable.Selector = Nothing Me.ucrReceiveResponseVariable.Size = New System.Drawing.Size(106, 26) Me.ucrReceiveResponseVariable.TabIndex = 4 ' @@ -82,16 +84,18 @@ Partial Class dlgMultipleRegression ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(441, 339) + Me.ClientSize = New System.Drawing.Size(409, 263) Me.Controls.Add(Me.lblResponseVariable) Me.Controls.Add(Me.lblExplanatoryVariables) Me.Controls.Add(Me.ucrReceiveResponseVariable) Me.Controls.Add(Me.ucrAddRemove) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrReceiveExplanatoryVaraibles) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgMultipleRegression" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Multiple Regression" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/dlgMultipleRegression.vb b/instat/dlgMultipleRegression.vb index 29c716b3833..f1e1c9f55c4 100644 --- a/instat/dlgMultipleRegression.vb +++ b/instat/dlgMultipleRegression.vb @@ -16,21 +16,37 @@ Imports instat.Translations Public Class dlgMultipleRegression + Private bFirstLoad As Boolean = True Private Sub dlgMultipleRegression_Load(sender As Object, e As EventArgs) Handles Me.Load + If bFirstLoad Then + InitialiseDialog() + Setdefaults() + bFirstLoad = False + Else + ReopenDialog() + + End If autoTranslate(Me) - ucrReceiveResponseVariable.Selector = ucrAddRemove - ucrReceiveResponseVariable.SetMeAsReceiver() - ucrBase.OKEnabled(False) - defaultSettings() + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + End Sub - Private Sub defaultSettings() - ucrAddRemove.lstAvailableVariable.ResetText() - ucrReceiveExplanatoryVaraibles.lstSelectedVariables.Items.Clear() - ucrReceiveResponseVariable.ResetText() + Private Sub Setdefaults() + + End Sub + + Private Sub ReopenDialog() + + End Sub + Private Sub TestOkEnabled() + End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - defaultSettings() + Setdefaults() End Sub + End Class \ No newline at end of file From b0eb6e657634e63b9ae3e8d6331389ac4602bbe6 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 17:19:40 +0300 Subject: [PATCH 19/21] Changing D for the Setdefaults --- instat/dlgGeneralTables.vb | 8 +++----- instat/dlgGoodnessofFit.vb | 8 +++----- instat/dlgGroup.vb | 7 +++---- instat/dlgMultipleRegression.vb | 7 +++---- instat/dlgMultipleResponse.vb | 8 +++----- instat/dlgOneSampleSummaryData.vb | 8 +++----- instat/dlgTwoSampleSummaryData.vb | 8 +++----- 7 files changed, 21 insertions(+), 33 deletions(-) diff --git a/instat/dlgGeneralTables.vb b/instat/dlgGeneralTables.vb index b2379dcd94e..84b03f32b4b 100644 --- a/instat/dlgGeneralTables.vb +++ b/instat/dlgGeneralTables.vb @@ -17,10 +17,9 @@ Imports instat.Translations Public Class dlgGeneralTables Private bFirstLoad As Boolean = True Private Sub dlgGeneralTables_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If bFirstLoad Then InitialiseDialog() - Setdefaults() + SetDefaults() bFirstLoad = False Else ReopenDialog() @@ -34,7 +33,7 @@ Public Class dlgGeneralTables End Sub - Private Sub Setdefaults() + Private Sub SetDefaults() End Sub @@ -46,7 +45,6 @@ Public Class dlgGeneralTables End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - Setdefaults() + SetDefaults() End Sub - End Class \ No newline at end of file diff --git a/instat/dlgGoodnessofFit.vb b/instat/dlgGoodnessofFit.vb index ee503db505c..63be1f67b08 100644 --- a/instat/dlgGoodnessofFit.vb +++ b/instat/dlgGoodnessofFit.vb @@ -17,10 +17,9 @@ Imports instat.Translations Public Class dlgGoodnessofFit Private bFirstLoad As Boolean = True Private Sub dlgGoodnessofFit_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If bFirstLoad Then InitialiseDialog() - Setdefaults() + SetDefaults() bFirstLoad = False Else ReopenDialog() @@ -34,7 +33,7 @@ Public Class dlgGoodnessofFit End Sub - Private Sub Setdefaults() + Private Sub SetDefaults() End Sub @@ -46,7 +45,6 @@ Public Class dlgGoodnessofFit End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - Setdefaults() - + SetDefaults() End Sub End Class \ No newline at end of file diff --git a/instat/dlgGroup.vb b/instat/dlgGroup.vb index 8498159702f..2b010c46b85 100644 --- a/instat/dlgGroup.vb +++ b/instat/dlgGroup.vb @@ -18,10 +18,9 @@ Imports instat.Translations Public Class dlgGroup Private bFirstLoad As Boolean = True Private Sub dlgGroup_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If bFirstLoad Then InitialiseDialog() - Setdefaults() + SetDefaults() bFirstLoad = False Else ReopenDialog() @@ -35,7 +34,7 @@ Public Class dlgGroup End Sub - Private Sub Setdefaults() + Private Sub SetDefaults() End Sub @@ -47,7 +46,7 @@ Public Class dlgGroup End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - Setdefaults() + SetDefaults() End Sub End Class \ No newline at end of file diff --git a/instat/dlgMultipleRegression.vb b/instat/dlgMultipleRegression.vb index f1e1c9f55c4..23bc7e43f87 100644 --- a/instat/dlgMultipleRegression.vb +++ b/instat/dlgMultipleRegression.vb @@ -20,7 +20,7 @@ Public Class dlgMultipleRegression Private Sub dlgMultipleRegression_Load(sender As Object, e As EventArgs) Handles Me.Load If bFirstLoad Then InitialiseDialog() - Setdefaults() + SetDefaults() bFirstLoad = False Else ReopenDialog() @@ -34,7 +34,7 @@ Public Class dlgMultipleRegression End Sub - Private Sub Setdefaults() + Private Sub SetDefaults() End Sub @@ -46,7 +46,6 @@ Public Class dlgMultipleRegression End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - Setdefaults() + SetDefaults() End Sub - End Class \ No newline at end of file diff --git a/instat/dlgMultipleResponse.vb b/instat/dlgMultipleResponse.vb index e311a6f6432..9e83161cfff 100644 --- a/instat/dlgMultipleResponse.vb +++ b/instat/dlgMultipleResponse.vb @@ -18,10 +18,9 @@ Public Class dlgMultipleResponse Private bFirstLoad As Boolean = True Private Sub dlgMultipleResponse_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If bFirstLoad Then InitialiseDialog() - Setdefaults() + SetDefaults() bFirstLoad = False Else ReopenDialog() @@ -35,7 +34,7 @@ Public Class dlgMultipleResponse End Sub - Private Sub Setdefaults() + Private Sub SetDefaults() End Sub @@ -47,7 +46,6 @@ Public Class dlgMultipleResponse End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - Setdefaults() + SetDefaults() End Sub - End Class \ No newline at end of file diff --git a/instat/dlgOneSampleSummaryData.vb b/instat/dlgOneSampleSummaryData.vb index 9f0a048608c..ed3820ca849 100644 --- a/instat/dlgOneSampleSummaryData.vb +++ b/instat/dlgOneSampleSummaryData.vb @@ -17,10 +17,9 @@ Imports instat.Translations Public Class dlgOneSampleSummaryData Private bFirstLoad As Boolean = True Private Sub dlgOneSampleSummaryData_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If bFirstLoad Then InitialiseDialog() - Setdefaults() + SetDefaults() bFirstLoad = False Else ReopenDialog() @@ -34,7 +33,7 @@ Public Class dlgOneSampleSummaryData End Sub - Private Sub Setdefaults() + Private Sub SetDefaults() End Sub @@ -46,7 +45,6 @@ Public Class dlgOneSampleSummaryData End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - Setdefaults() - + SetDefaults() End Sub End Class \ No newline at end of file diff --git a/instat/dlgTwoSampleSummaryData.vb b/instat/dlgTwoSampleSummaryData.vb index 9cd8f753429..2eefa324841 100644 --- a/instat/dlgTwoSampleSummaryData.vb +++ b/instat/dlgTwoSampleSummaryData.vb @@ -18,10 +18,9 @@ Imports instat.Translations Public Class dlgTwoSampleSummaryData Private bFirstLoad As Boolean = True Private Sub dlgTwoSampleSummaryData_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If bFirstLoad Then InitialiseDialog() - Setdefaults() + SetDefaults() bFirstLoad = False Else ReopenDialog() @@ -35,7 +34,7 @@ Public Class dlgTwoSampleSummaryData End Sub - Private Sub Setdefaults() + Private Sub SetDefaults() End Sub @@ -47,7 +46,6 @@ Public Class dlgTwoSampleSummaryData End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - Setdefaults() - + SetDefaults() End Sub End Class \ No newline at end of file From 0787fa264d1314ebd8fd48a65d16766411f31c62 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 17:20:50 +0300 Subject: [PATCH 20/21] changing D for thee SetDefaults for wind rose --- instat/dlgWindrose.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/dlgWindrose.vb b/instat/dlgWindrose.vb index 102673d4f45..1e4000cd0ad 100644 --- a/instat/dlgWindrose.vb +++ b/instat/dlgWindrose.vb @@ -20,7 +20,7 @@ Public Class dlgWindrose Private Sub dlgWindrose_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() - Setdefaults() + SetDefaults() bFirstLoad = False Else ReopenDialog() @@ -34,7 +34,7 @@ Public Class dlgWindrose End Sub - Private Sub Setdefaults() + Private Sub SetDefaults() End Sub @@ -46,6 +46,6 @@ Public Class dlgWindrose End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - Setdefaults() + SetDefaults() End Sub End Class \ No newline at end of file From ec7a7c3a874422acf3d7d90ec6b292002f9beb55 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 21 Mar 2016 17:33:20 +0300 Subject: [PATCH 21/21] changing dlggroup to dlggroupTables --- ....Designer.vb => dlgGroupTables.Designer.vb} | 2 +- ...up.fr-FR.resx => dlgGroupTables.fr-FR.resx} | 0 instat/{dlgGroup.resx => dlgGroupTables.resx} | 0 ...up.sw-KE.resx => dlgGroupTables.sw-KE.resx} | 0 instat/{dlgGroup.vb => dlgGroupTables.vb} | 2 +- instat/frmMain.vb | 2 +- instat/instat.vbproj | 18 +++++++++--------- 7 files changed, 12 insertions(+), 12 deletions(-) rename instat/{dlgGroup.Designer.vb => dlgGroupTables.Designer.vb} (98%) rename instat/{dlgGroup.fr-FR.resx => dlgGroupTables.fr-FR.resx} (100%) rename instat/{dlgGroup.resx => dlgGroupTables.resx} (100%) rename instat/{dlgGroup.sw-KE.resx => dlgGroupTables.sw-KE.resx} (100%) rename instat/{dlgGroup.vb => dlgGroupTables.vb} (98%) diff --git a/instat/dlgGroup.Designer.vb b/instat/dlgGroupTables.Designer.vb similarity index 98% rename from instat/dlgGroup.Designer.vb rename to instat/dlgGroupTables.Designer.vb index d03d25e37a9..66550f45b04 100644 --- a/instat/dlgGroup.Designer.vb +++ b/instat/dlgGroupTables.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class dlgGroup +Partial Class dlgGroupTables Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. diff --git a/instat/dlgGroup.fr-FR.resx b/instat/dlgGroupTables.fr-FR.resx similarity index 100% rename from instat/dlgGroup.fr-FR.resx rename to instat/dlgGroupTables.fr-FR.resx diff --git a/instat/dlgGroup.resx b/instat/dlgGroupTables.resx similarity index 100% rename from instat/dlgGroup.resx rename to instat/dlgGroupTables.resx diff --git a/instat/dlgGroup.sw-KE.resx b/instat/dlgGroupTables.sw-KE.resx similarity index 100% rename from instat/dlgGroup.sw-KE.resx rename to instat/dlgGroupTables.sw-KE.resx diff --git a/instat/dlgGroup.vb b/instat/dlgGroupTables.vb similarity index 98% rename from instat/dlgGroup.vb rename to instat/dlgGroupTables.vb index 2b010c46b85..218b1339ec1 100644 --- a/instat/dlgGroup.vb +++ b/instat/dlgGroupTables.vb @@ -15,7 +15,7 @@ ' along with this program. If not, see . Imports instat.Translations -Public Class dlgGroup +Public Class dlgGroupTables Private bFirstLoad As Boolean = True Private Sub dlgGroup_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 2d8aa3f7070..37fd6549e30 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -957,7 +957,7 @@ Public Class frmMain End Sub Private Sub mnuStatisticsTablesGroup_Click(sender As Object, e As EventArgs) Handles mnuStatisticsTablesGroup.Click - dlgGroup.ShowDialog() + dlgGroupTables.ShowDialog() End Sub Private Sub mnuStatisticsTablesGeneral_Click(sender As Object, e As EventArgs) Handles mnuStatisticsTablesGeneral.Click diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 6464ce9d51c..549afee29ba 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -316,10 +316,10 @@ Form - - dlgGroup.vb + + dlgGroupTables.vb - + Form @@ -1805,14 +1805,14 @@ dlgGoodnessofFit.vb - - dlgGroup.vb + + dlgGroupTables.vb - - dlgGroup.vb + + dlgGroupTables.vb - - dlgGroup.vb + + dlgGroupTables.vb dlgHideShowColumns.vb