From c0aa202b4b4b385a9595e2f4133538bf122562af Mon Sep 17 00:00:00 2001 From: deaspo Date: Tue, 1 Mar 2016 21:04:28 +0300 Subject: [PATCH 01/16] Updated the Factors control with the following: Highlights the selected level; updated the radio group to select only the selected level --- instat/ucrFactor.vb | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/instat/ucrFactor.vb b/instat/ucrFactor.vb index c4983c1d700..b365844ed1a 100644 --- a/instat/ucrFactor.vb +++ b/instat/ucrFactor.vb @@ -80,14 +80,13 @@ Public Class ucrFactor shtCurrSheet.ColumnHeaders(iSelectorColumnIndex).Text = strSelectorColumnName InitialiseSelected() Else - shtCurrSheet.ColumnHeaders(iSelectorColumnIndex).DefaultCellBody = GetType(RadioButtonCell) shtCurrSheet.ColumnHeaders(iSelectorColumnIndex).Text = strSelectorColumnName InitialiseSelected() - 'Dim rgpSelectColumn As New RadioButtonGroup + Dim rgpselectcolumn As New RadioButtonGroup For i = 0 To shtCurrSheet.RowCount - 1 - 'Dim rdoTemp As New RadioButtonCell - 'rdoTemp.RadioGroup = rgpSelectColumn - 'shtCurrSheet(i, iSelectorColumnIndex) = rdoTemp + Dim rdotemp As New RadioButtonCell + rdotemp.RadioGroup = rgpselectcolumn + shtCurrSheet(i, iSelectorColumnIndex) = rdotemp Next End If End If @@ -102,7 +101,7 @@ Public Class ucrFactor End Sub Private Sub InitialiseSelected() - 'sets the default as unchecked, cells may be blank otherwise + 'sets the Default As unchecked, cells may be blank otherwise Dim i As Integer If iSelectorColumnIndex <> -1 Then For i = 0 To shtCurrSheet.RowCount - 1 @@ -135,4 +134,18 @@ Public Class ucrFactor Return strTemp End Function + Private Sub shtcurrsheet_celldatachanged(sender As Object, e As CellEventArgs) Handles shtCurrSheet.CellDataChanged + Dim i As Integer + Dim checked As Boolean + For i = 0 To grdFactorData.CurrentWorksheet.RowCount - 1 + If shtCurrSheet(i, iSelectorColumnIndex) IsNot Nothing Then + checked = DirectCast(shtCurrSheet(i, iSelectorColumnIndex), Boolean) + If checked Then + shtCurrSheet.RowHeaders(i).Style.BackColor = Color.Blue + Else + shtCurrSheet.RowHeaders(i).Style.BackColor = Color.White + End If + End If + Next + End Sub End Class From 6ffc7808786c99762517acfafab500cb0a8331b4 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Tue, 1 Mar 2016 21:14:00 +0300 Subject: [PATCH 02/16] Corrections of simple regression dialogue and subdialogue --- instat/sdgSimpleRegOptions.Designer.vb | 96 ++++++++----------- instat/sdgSimpleRegOptions.vb | 127 +++++++++---------------- 2 files changed, 85 insertions(+), 138 deletions(-) diff --git a/instat/sdgSimpleRegOptions.Designer.vb b/instat/sdgSimpleRegOptions.Designer.vb index 47df95ff437..613da8ad4bd 100644 --- a/instat/sdgSimpleRegOptions.Designer.vb +++ b/instat/sdgSimpleRegOptions.Designer.vb @@ -29,7 +29,7 @@ Partial Class sdgSimpleRegOptions Me.chkEstimatesPvalues = New System.Windows.Forms.CheckBox() Me.chkEstimates = New System.Windows.Forms.CheckBox() Me.chkAnovaPvalues = New System.Windows.Forms.CheckBox() - Me.chkAnovaTable = New System.Windows.Forms.CheckBox() + Me.chkANOVA = New System.Windows.Forms.CheckBox() Me.chkModel = New System.Windows.Forms.CheckBox() Me.tbGraphics = New System.Windows.Forms.TabPage() Me.grpModel = New System.Windows.Forms.GroupBox() @@ -37,12 +37,11 @@ Partial Class sdgSimpleRegOptions Me.chkPredictionInterval = New System.Windows.Forms.CheckBox() Me.nudConvidenceLevel = New System.Windows.Forms.NumericUpDown() Me.lblConfidenceLevel = New System.Windows.Forms.Label() - Me.chkConfidenceInterval = New System.Windows.Forms.CheckBox() + Me.chkConfidenceLimits = New System.Windows.Forms.CheckBox() Me.grpResiduals = New System.Windows.Forms.GroupBox() Me.chkFourinOne = New System.Windows.Forms.CheckBox() Me.chkAdditionalVariable = New System.Windows.Forms.CheckBox() Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() - Me.chkStandardError = New System.Windows.Forms.CheckBox() Me.tbRegOptions.SuspendLayout() Me.tbDisplay.SuspendLayout() CType(Me.nudConfidenceInteval, System.ComponentModel.ISupportInitialize).BeginInit() @@ -59,7 +58,7 @@ Partial Class sdgSimpleRegOptions Me.tbRegOptions.Location = New System.Drawing.Point(2, 3) Me.tbRegOptions.Name = "tbRegOptions" Me.tbRegOptions.SelectedIndex = 0 - Me.tbRegOptions.Size = New System.Drawing.Size(252, 233) + Me.tbRegOptions.Size = New System.Drawing.Size(252, 214) Me.tbRegOptions.TabIndex = 0 ' 'tbDisplay @@ -69,12 +68,12 @@ Partial Class sdgSimpleRegOptions Me.tbDisplay.Controls.Add(Me.chkEstimatesPvalues) Me.tbDisplay.Controls.Add(Me.chkEstimates) Me.tbDisplay.Controls.Add(Me.chkAnovaPvalues) - Me.tbDisplay.Controls.Add(Me.chkAnovaTable) + Me.tbDisplay.Controls.Add(Me.chkANOVA) Me.tbDisplay.Controls.Add(Me.chkModel) Me.tbDisplay.Location = New System.Drawing.Point(4, 22) Me.tbDisplay.Name = "tbDisplay" Me.tbDisplay.Padding = New System.Windows.Forms.Padding(3) - Me.tbDisplay.Size = New System.Drawing.Size(244, 207) + Me.tbDisplay.Size = New System.Drawing.Size(244, 188) Me.tbDisplay.TabIndex = 0 Me.tbDisplay.Tag = "Display" Me.tbDisplay.Text = "Display" @@ -104,19 +103,19 @@ Partial Class sdgSimpleRegOptions 'chkEstimatesPvalues ' Me.chkEstimatesPvalues.AutoSize = True - Me.chkEstimatesPvalues.Location = New System.Drawing.Point(118, 49) + Me.chkEstimatesPvalues.Location = New System.Drawing.Point(118, 73) Me.chkEstimatesPvalues.Name = "chkEstimatesPvalues" - Me.chkEstimatesPvalues.Size = New System.Drawing.Size(115, 17) + Me.chkEstimatesPvalues.Size = New System.Drawing.Size(67, 17) Me.chkEstimatesPvalues.TabIndex = 4 - Me.chkEstimatesPvalues.Tag = "Estimates_P_values" - Me.chkEstimatesPvalues.Text = "Estimates P-values" + Me.chkEstimatesPvalues.Tag = "P_values" + Me.chkEstimatesPvalues.Text = "P-values" Me.chkEstimatesPvalues.ThreeState = True Me.chkEstimatesPvalues.UseVisualStyleBackColor = True ' 'chkEstimates ' Me.chkEstimates.AutoSize = True - Me.chkEstimates.Location = New System.Drawing.Point(7, 49) + Me.chkEstimates.Location = New System.Drawing.Point(6, 73) Me.chkEstimates.Name = "chkEstimates" Me.chkEstimates.Size = New System.Drawing.Size(71, 17) Me.chkEstimates.TabIndex = 3 @@ -127,29 +126,29 @@ Partial Class sdgSimpleRegOptions 'chkAnovaPvalues ' Me.chkAnovaPvalues.AutoSize = True - Me.chkAnovaPvalues.Location = New System.Drawing.Point(118, 21) + Me.chkAnovaPvalues.Location = New System.Drawing.Point(118, 44) Me.chkAnovaPvalues.Name = "chkAnovaPvalues" - Me.chkAnovaPvalues.Size = New System.Drawing.Size(101, 17) + Me.chkAnovaPvalues.Size = New System.Drawing.Size(67, 17) Me.chkAnovaPvalues.TabIndex = 2 - Me.chkAnovaPvalues.Tag = "Anova_P_values" - Me.chkAnovaPvalues.Text = "Anova P-values" + Me.chkAnovaPvalues.Tag = "P_values" + Me.chkAnovaPvalues.Text = "P-values" Me.chkAnovaPvalues.UseVisualStyleBackColor = True ' - 'chkAnovaTable + 'chkANOVA ' - Me.chkAnovaTable.AutoSize = True - Me.chkAnovaTable.Location = New System.Drawing.Point(8, 21) - Me.chkAnovaTable.Name = "chkAnovaTable" - Me.chkAnovaTable.Size = New System.Drawing.Size(87, 17) - Me.chkAnovaTable.TabIndex = 1 - Me.chkAnovaTable.Tag = "Anova_Table" - Me.chkAnovaTable.Text = "Anova Table" - Me.chkAnovaTable.UseVisualStyleBackColor = True + Me.chkANOVA.AutoSize = True + Me.chkANOVA.Location = New System.Drawing.Point(6, 44) + Me.chkANOVA.Name = "chkANOVA" + Me.chkANOVA.Size = New System.Drawing.Size(63, 17) + Me.chkANOVA.TabIndex = 1 + Me.chkANOVA.Tag = "ANOVA" + Me.chkANOVA.Text = "ANOVA" + Me.chkANOVA.UseVisualStyleBackColor = True ' 'chkModel ' Me.chkModel.AutoSize = True - Me.chkModel.Location = New System.Drawing.Point(7, 74) + Me.chkModel.Location = New System.Drawing.Point(6, 15) Me.chkModel.Name = "chkModel" Me.chkModel.Size = New System.Drawing.Size(55, 17) Me.chkModel.TabIndex = 0 @@ -164,7 +163,7 @@ Partial Class sdgSimpleRegOptions Me.tbGraphics.Location = New System.Drawing.Point(4, 22) Me.tbGraphics.Name = "tbGraphics" Me.tbGraphics.Padding = New System.Windows.Forms.Padding(3) - Me.tbGraphics.Size = New System.Drawing.Size(244, 207) + Me.tbGraphics.Size = New System.Drawing.Size(244, 188) Me.tbGraphics.TabIndex = 1 Me.tbGraphics.Tag = "Graphics" Me.tbGraphics.Text = "Graphics" @@ -172,15 +171,14 @@ Partial Class sdgSimpleRegOptions ' 'grpModel ' - Me.grpModel.Controls.Add(Me.chkStandardError) Me.grpModel.Controls.Add(Me.chkFittedModel) Me.grpModel.Controls.Add(Me.chkPredictionInterval) Me.grpModel.Controls.Add(Me.nudConvidenceLevel) Me.grpModel.Controls.Add(Me.lblConfidenceLevel) - Me.grpModel.Controls.Add(Me.chkConfidenceInterval) + Me.grpModel.Controls.Add(Me.chkConfidenceLimits) Me.grpModel.Location = New System.Drawing.Point(16, 80) Me.grpModel.Name = "grpModel" - Me.grpModel.Size = New System.Drawing.Size(219, 121) + Me.grpModel.Size = New System.Drawing.Size(219, 102) Me.grpModel.TabIndex = 1 Me.grpModel.TabStop = False Me.grpModel.Tag = "Model" @@ -200,7 +198,7 @@ Partial Class sdgSimpleRegOptions 'chkPredictionInterval ' Me.chkPredictionInterval.AutoSize = True - Me.chkPredictionInterval.Location = New System.Drawing.Point(50, 98) + Me.chkPredictionInterval.Location = New System.Drawing.Point(50, 81) Me.chkPredictionInterval.Name = "chkPredictionInterval" Me.chkPredictionInterval.Size = New System.Drawing.Size(111, 17) Me.chkPredictionInterval.TabIndex = 3 @@ -229,16 +227,16 @@ Partial Class sdgSimpleRegOptions Me.lblConfidenceLevel.Tag = "Confidence_Level" Me.lblConfidenceLevel.Text = "Confidence Level" ' - 'chkConfidenceInterval + 'chkConfidenceLimits ' - Me.chkConfidenceInterval.AutoSize = True - Me.chkConfidenceInterval.Location = New System.Drawing.Point(49, 36) - Me.chkConfidenceInterval.Name = "chkConfidenceInterval" - Me.chkConfidenceInterval.Size = New System.Drawing.Size(118, 17) - Me.chkConfidenceInterval.TabIndex = 1 - Me.chkConfidenceInterval.Tag = "Confidence_Interval" - Me.chkConfidenceInterval.Text = "Confidence Interval" - Me.chkConfidenceInterval.UseVisualStyleBackColor = True + Me.chkConfidenceLimits.AutoSize = True + Me.chkConfidenceLimits.Location = New System.Drawing.Point(49, 36) + Me.chkConfidenceLimits.Name = "chkConfidenceLimits" + Me.chkConfidenceLimits.Size = New System.Drawing.Size(109, 17) + Me.chkConfidenceLimits.TabIndex = 1 + Me.chkConfidenceLimits.Tag = "Confidence_Limits" + Me.chkConfidenceLimits.Text = "Confidence Limits" + Me.chkConfidenceLimits.UseVisualStyleBackColor = True ' 'grpResiduals ' @@ -276,27 +274,16 @@ Partial Class sdgSimpleRegOptions ' 'ucrSdgButtons ' - Me.ucrSdgButtons.Location = New System.Drawing.Point(41, 242) + Me.ucrSdgButtons.Location = New System.Drawing.Point(41, 220) Me.ucrSdgButtons.Name = "ucrSdgButtons" Me.ucrSdgButtons.Size = New System.Drawing.Size(142, 30) Me.ucrSdgButtons.TabIndex = 0 ' - 'chkStandardError - ' - Me.chkStandardError.AutoSize = True - Me.chkStandardError.Location = New System.Drawing.Point(74, 77) - Me.chkStandardError.Name = "chkStandardError" - Me.chkStandardError.Size = New System.Drawing.Size(94, 17) - Me.chkStandardError.TabIndex = 5 - Me.chkStandardError.Tag = "Standard_Error" - Me.chkStandardError.Text = "Standard Error" - Me.chkStandardError.UseVisualStyleBackColor = True - ' 'sdgSimpleRegOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(266, 271) + Me.ClientSize = New System.Drawing.Size(255, 253) Me.Controls.Add(Me.tbRegOptions) Me.Controls.Add(Me.ucrSdgButtons) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -325,7 +312,7 @@ Partial Class sdgSimpleRegOptions Friend WithEvents chkEstimatesPvalues As CheckBox Friend WithEvents chkEstimates As CheckBox Friend WithEvents chkAnovaPvalues As CheckBox - Friend WithEvents chkAnovaTable As CheckBox + Friend WithEvents chkANOVA As CheckBox Friend WithEvents tbGraphics As TabPage Friend WithEvents grpModel As GroupBox Friend WithEvents grpResiduals As GroupBox @@ -333,9 +320,8 @@ Partial Class sdgSimpleRegOptions Friend WithEvents chkPredictionInterval As CheckBox Friend WithEvents nudConvidenceLevel As NumericUpDown Friend WithEvents lblConfidenceLevel As Label - Friend WithEvents chkConfidenceInterval As CheckBox + Friend WithEvents chkConfidenceLimits As CheckBox Friend WithEvents chkFourinOne As CheckBox Friend WithEvents chkAdditionalVariable As CheckBox Friend WithEvents chkModel As CheckBox - Friend WithEvents chkStandardError As CheckBox End Class diff --git a/instat/sdgSimpleRegOptions.vb b/instat/sdgSimpleRegOptions.vb index 44ae839d9d2..f937216862a 100644 --- a/instat/sdgSimpleRegOptions.vb +++ b/instat/sdgSimpleRegOptions.vb @@ -13,22 +13,21 @@ ' ' You should have received a copy of the GNU General Public License k ' along with this program. If not, see . -Imports instat.Translations +Imports instat.Translations Public Class sdgSimpleRegOptions - Public clsRModelFunction As RFunction - Public clsRGraphics, clsRFittedModelGraphics, clsRFittedModelGraphics2 As New RSyntax + Public clsRModelFunction As RFunction + Public clsRGraphics, clsRFittedModelGraphics, clsRFittedModelGraphics2 As New RSyntax Public clsRaovFunction, clsRaovpvalFunction, clsRestpvalFunction, clsRFourPlotsFunction, clsRgeom_point As New RFunction - Public clsRggplotFunction, clsRaesFunction, clsRStat_smooth As New RFunction - Public bFirstLoad As Boolean = True - 'Public clsRStat_smooth As New RFunction - + Public clsRggplotFunction, clsRaesFunction, clsRStat_smooth, clsRModelsFunction As New RFunction + Public bFirstLoad As Boolean = True + Private Sub sdgSimpleRegOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) - If bFirstLoad Then - SetDefaults() - bFirstLoad = False - End If + If bFirstLoad Then + SetDefaults() + bFirstLoad = False + End If End Sub Public Sub SetRModelFunction(clsRModelFunc As RFunction) @@ -36,28 +35,17 @@ Public Class sdgSimpleRegOptions End Sub Private Sub AnovaTable() - clsRaovFunction.SetRCommand("aov") - clsRaovFunction.AddParameter("", clsRFunctionParameter:=clsRModelFunction) + clsRaovFunction.SetRCommand("anova") + clsRaovFunction.AddParameter("", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) frmMain.clsRLink.RunScript(clsRaovFunction.ToScript(), 2) End Sub Private Sub AnovaTablePvalues() - clsRaovpvalFunction.SetRCommand("summary") - clsRaovpvalFunction.AddParameter("", clsRFunctionParameter:=clsRaovFunction) + clsRaovpvalFunction.SetRCommand("anova") + clsRaovpvalFunction.AddParameter("", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) frmMain.clsRLink.RunScript(clsRaovpvalFunction.ToScript(), 2) End Sub - 'Private Sub AnovaTablePvalues() - ' clsRaovpvalFunction.SetRCommand("summary") - ' clsRaovpvalFunction.AddParameter("", clsRFunctionParameter:=clsRaovFunction) - - ' clsRaovpval2Function.SetRCommand("HTML") - ' clsRaovpval2Function.AddParameter("x", clsRFunctionParameter:=clsRaovpvalFunction) - ' clsRaovpval2Function.AddParameter("nsmall", "c(3,1)") - ' clsRaovpval2Function.AddParameter("file", Chr(34) & Chr(34)) - ' frmMain.clsRLink.RunScript(clsRaovpval2Function.ToScript(), 1) - 'End Sub - Private Sub Estimates() frmMain.clsRLink.RunScript(dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction.ToScript(), 2) End Sub @@ -69,10 +57,9 @@ Public Class sdgSimpleRegOptions End Sub Private Sub Model() - 'I am not sure what should be output when model is checked. - 'There is an option lm$model which outputs the input variables which I think is not correct - 'For now it has the lm just like Estimates() - frmMain.clsRLink.RunScript(dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction.ToScript(), 2) + clsRModelsFunction.SetRCommand("formula") + clsRModelsFunction.AddParameter("", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) + frmMain.clsRLink.RunScript(clsRModelsFunction.ToScript(), 2) End Sub Private Sub FourPlots() @@ -82,8 +69,8 @@ Public Class sdgSimpleRegOptions clsRFourPlotsFunction.AddParameter("ncol", 2) 'these should be an option by the user as either 2 by 2, 4 by 1 or 1 by 4 clsRgeom_point.SetRCommand("geom_point") clsRGraphics.SetOperatorParameter(True, clsRFunc:=clsRFourPlotsFunction) - clsRGraphics.SetOperatorParameter(False, clsRFunc:=clsRgeom_point) - + clsRGraphics.SetOperatorParameter(False, clsRFunc:=clsRgeom_point) + frmMain.clsRLink.RunScript(clsRGraphics.GetScript, 0) End Sub @@ -93,18 +80,16 @@ Public Class sdgSimpleRegOptions clsRggplotFunction.AddParameter("", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) clsRaesFunction.SetRCommand("aes") 'this is not the right way of adding the aesthetics x and y since we are using the lm object - clsRaesFunction.AddParameter("y", dlgRegressionSimple.ucrResponse.GetVariableNames(bWithQuotes:=False)) - clsRaesFunction.AddParameter("x", dlgRegressionSimple.ucrExplanatory.GetVariableNames(bWithQuotes:=False)) + clsRaesFunction.AddParameter("y", dlgRegressionSimple.ucrResponse.GetVariableNames(bWithQuotes:=False)) + clsRaesFunction.AddParameter("x", dlgRegressionSimple.ucrExplanatory.GetVariableNames(bWithQuotes:=False)) clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction) clsRgeom_point.SetRCommand("geom_point") clsRFittedModelGraphics.SetOperatorParameter(True, clsRFunc:=clsRggplotFunction) clsRFittedModelGraphics.SetOperatorParameter(False, clsRFunc:=clsRgeom_point) - 'Public clsRStat_smooth As New RFunction - clsRStat_smooth.SetRCommand("stat_smooth") - clsRStat_smooth.AddParameter("method", "lm") - StandardError() + clsRStat_smooth.AddParameter("method", Chr(34) & "lm" & Chr(34)) + clsRStat_smooth.AddParameter("se", "TRUE") clsRStat_smooth.AddParameter("level", nudConvidenceLevel.Value) clsRFittedModelGraphics.AddOperatorParameter("", clsRFunc:=clsRStat_smooth) @@ -114,16 +99,16 @@ Public Class sdgSimpleRegOptions End Sub Public Sub SetDefaults() - chkAnovaTable.Checked = False - chkAnovaPvalues.Checked = False - chkAnovaPvalues.Enabled = False - chkEstimatesPvalues.Checked = False - chkEstimatesPvalues.Enabled = False + chkANOVA.Checked = True + chkModel.Checked = True + chkEstimates.Checked = True + chkAnovaPvalues.Checked = True + chkAnovaPvalues.Enabled = True + chkEstimatesPvalues.Checked = True + chkEstimatesPvalues.Enabled = True chkPredictionInterval.Enabled = False - chkConfidenceInterval.Checked = False - chkStandardError.Checked = False - chkStandardError.Enabled = False - chkConfidenceInterval.Enabled = False + chkConfidenceLimits.Checked = False + chkConfidenceLimits.Enabled = False lblConfidenceLevel.Enabled = False nudConvidenceLevel.Enabled = False chkPredictionInterval.Enabled = False @@ -133,54 +118,34 @@ Public Class sdgSimpleRegOptions chkAdditionalVariable.Checked = False End Sub - Private Sub chkAnovaTable_CheckedChanged(sender As Object, e As EventArgs) Handles chkAnovaTable.CheckedChanged - If (chkAnovaTable.Checked) Then + Private Sub chkAnovaTable_CheckedChanged(sender As Object, e As EventArgs) Handles chkANOVA.CheckedChanged + If (chkANOVA.Checked) Then chkAnovaPvalues.Enabled = True - chkEstimates.Checked = False 'should we run one command at a time? - chkModel.Checked = False Else + chkAnovaPvalues.Checked = False chkAnovaPvalues.Enabled = False End If End Sub - Private Sub StandardError() - If (chkStandardError.Checked = True) Then - clsRStat_smooth.AddParameter("se", "TRUE") - ElseIf (chkStandardError.Checked = False) Then - clsRStat_smooth.AddParameter("se", "FALSE") - Else - clsRStat_smooth.RemoveParameterByName("se") - End If - End Sub - Private Sub chkEstimates_CheckedChanged(sender As Object, e As EventArgs) Handles chkEstimates.CheckedChanged If (chkEstimates.Checked) Then chkEstimatesPvalues.Enabled = True - chkAnovaTable.Checked = False - chkModel.Checked = False Else + chkEstimatesPvalues.Checked = False chkEstimatesPvalues.Enabled = False End If End Sub - Private Sub chkModel_CheckedChanged(sender As Object, e As EventArgs) Handles chkModel.CheckedChanged - If (chkModel.Checked) Then - chkAnovaTable.Checked = False - chkEstimates.Checked = False - End If - End Sub - Private Sub chkFittedModel_CheckedChanged(sender As Object, e As EventArgs) Handles chkFittedModel.CheckedChanged - 'chkConfidenceInterval.Checked = True If (chkFittedModel.Checked) Then chkPredictionInterval.Enabled = True - chkConfidenceInterval.Enabled = True - chkConfidenceInterval.Checked = True + chkConfidenceLimits.Enabled = True + chkConfidenceLimits.Checked = True Else chkPredictionInterval.Enabled = False - chkConfidenceInterval.Checked = False - chkConfidenceInterval.Enabled = False + chkConfidenceLimits.Checked = False + chkConfidenceLimits.Enabled = False End If End Sub @@ -188,25 +153,21 @@ Public Class sdgSimpleRegOptions chkFourinOne.Checked = False End Sub - Private Sub chkConfidenceInterval_CheckedChanged(sender As Object, e As EventArgs) Handles chkConfidenceInterval.CheckedChanged - If (chkConfidenceInterval.Checked) Then + Private Sub chkConfidenceInterval_CheckedChanged(sender As Object, e As EventArgs) Handles chkConfidenceLimits.CheckedChanged + If (chkConfidenceLimits.Checked) Then lblConfidenceLevel.Enabled = True nudConvidenceLevel.Enabled = True chkPredictionInterval.Checked = False - chkStandardError.Enabled = True - chkStandardError.Checked = True Else lblConfidenceLevel.Enabled = False nudConvidenceLevel.Enabled = False - chkStandardError.Checked = False - chkStandardError.Enabled = False End If End Sub Private Sub chkPredictionInterval_CheckedChanged(sender As Object, e As EventArgs) Handles chkPredictionInterval.CheckedChanged If (chkPredictionInterval.Checked) Then - chkConfidenceInterval.Checked = False + chkConfidenceLimits.Checked = False End If End Sub @@ -215,7 +176,7 @@ Public Class sdgSimpleRegOptions End Sub Public Sub RegOptions() - If (chkAnovaTable.Checked) Then + If (chkANOVA.Checked) Then If (chkAnovaPvalues.Checked) Then AnovaTablePvalues() Else From 058cc8daf1cee845717efdce8734d262ba8cc365 Mon Sep 17 00:00:00 2001 From: dannyparsons Date: Tue, 1 Mar 2016 20:11:22 +0000 Subject: [PATCH 03/16] updated Input controls, added ConfidenceLimit control --- instat/instat.vbproj | 15 +++ instat/ucrInputComboBox.Designer.vb | 4 +- instat/ucrInputComboBox.vb | 1 + instat/ucrInputConfidenceLimit.Designer.vb | 60 +++++++++++ instat/ucrInputConfidenceLimit.fr-FR.resx | 15 +++ instat/ucrInputConfidenceLimit.resx | 120 +++++++++++++++++++++ instat/ucrInputConfidenceLimit.sw-KE.resx | 15 +++ instat/ucrInputConfidenceLimit.vb | 12 +++ instat/ucrInputTextBox.Designer.vb | 6 +- instat/ucrInputTextBox.vb | 1 + 10 files changed, 246 insertions(+), 3 deletions(-) create mode 100644 instat/ucrInputConfidenceLimit.Designer.vb create mode 100644 instat/ucrInputConfidenceLimit.fr-FR.resx create mode 100644 instat/ucrInputConfidenceLimit.resx create mode 100644 instat/ucrInputConfidenceLimit.sw-KE.resx create mode 100644 instat/ucrInputConfidenceLimit.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index c35ec9da47d..515e151034b 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -1206,6 +1206,12 @@ UserControl + + ucrInputConfidenceLimit.vb + + + UserControl + ucrInputTextBox.vb @@ -2808,6 +2814,15 @@ ucrInputComboBox.vb + + ucrInputConfidenceLimit.vb + + + ucrInputConfidenceLimit.vb + + + ucrInputConfidenceLimit.vb + ucrInputTextBox.vb diff --git a/instat/ucrInputComboBox.Designer.vb b/instat/ucrInputComboBox.Designer.vb index dccb480018e..0d3946eea4b 100644 --- a/instat/ucrInputComboBox.Designer.vb +++ b/instat/ucrInputComboBox.Designer.vb @@ -27,10 +27,11 @@ Partial Class ucrInputComboBox ' 'cboInput ' + Me.cboInput.Dock = System.Windows.Forms.DockStyle.Fill Me.cboInput.FormattingEnabled = True Me.cboInput.Location = New System.Drawing.Point(0, 0) Me.cboInput.Name = "cboInput" - Me.cboInput.Size = New System.Drawing.Size(121, 21) + Me.cboInput.Size = New System.Drawing.Size(137, 21) Me.cboInput.TabIndex = 0 ' 'ucrInputComboBox @@ -39,6 +40,7 @@ Partial Class ucrInputComboBox Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.cboInput) Me.Name = "ucrInputComboBox" + Me.Size = New System.Drawing.Size(137, 25) Me.ResumeLayout(False) End Sub diff --git a/instat/ucrInputComboBox.vb b/instat/ucrInputComboBox.vb index c45db0170f3..7891b5db789 100644 --- a/instat/ucrInputComboBox.vb +++ b/instat/ucrInputComboBox.vb @@ -37,6 +37,7 @@ Public Overrides Sub SetName(strName As String) If IsValid(strName) Then cboInput.Text = strName + OnNameChanged() Else MsgBox(strName & "is not a valid for this combobox", vbOKOnly) End If diff --git a/instat/ucrInputConfidenceLimit.Designer.vb b/instat/ucrInputConfidenceLimit.Designer.vb new file mode 100644 index 00000000000..f215c4a2dbb --- /dev/null +++ b/instat/ucrInputConfidenceLimit.Designer.vb @@ -0,0 +1,60 @@ + +Partial Class ucrInputConfidenceLimit + Inherits System.Windows.Forms.UserControl + + 'UserControl 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.ucrConfidenceLimit = New instat.ucrInputComboBox() + Me.lblConfidenceLimit = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'ucrConfidenceLimit + ' + Me.ucrConfidenceLimit.Location = New System.Drawing.Point(94, 0) + Me.ucrConfidenceLimit.Name = "ucrConfidenceLimit" + Me.ucrConfidenceLimit.Size = New System.Drawing.Size(56, 24) + Me.ucrConfidenceLimit.TabIndex = 0 + ' + 'lblConfidenceLimit + ' + Me.lblConfidenceLimit.AutoSize = True + Me.lblConfidenceLimit.Location = New System.Drawing.Point(3, 3) + Me.lblConfidenceLimit.Name = "lblConfidenceLimit" + Me.lblConfidenceLimit.Size = New System.Drawing.Size(88, 13) + Me.lblConfidenceLimit.TabIndex = 1 + Me.lblConfidenceLimit.Text = "Confidence Limit:" + ' + 'ucrInputConfidenceLimit + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblConfidenceLimit) + Me.Controls.Add(Me.ucrConfidenceLimit) + Me.Name = "ucrInputConfidenceLimit" + Me.Size = New System.Drawing.Size(154, 23) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrConfidenceLimit As ucrInputComboBox + Friend WithEvents lblConfidenceLimit As Label +End Class diff --git a/instat/ucrInputConfidenceLimit.fr-FR.resx b/instat/ucrInputConfidenceLimit.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/ucrInputConfidenceLimit.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/ucrInputConfidenceLimit.resx b/instat/ucrInputConfidenceLimit.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/ucrInputConfidenceLimit.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/ucrInputConfidenceLimit.sw-KE.resx b/instat/ucrInputConfidenceLimit.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/ucrInputConfidenceLimit.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/ucrInputConfidenceLimit.vb b/instat/ucrInputConfidenceLimit.vb new file mode 100644 index 00000000000..db0d787832b --- /dev/null +++ b/instat/ucrInputConfidenceLimit.vb @@ -0,0 +1,12 @@ +Public Class ucrInputConfidenceLimit + Public Event NameChanged() + Private Sub ucrConfidenceLimit_NameChanged() Handles ucrConfidenceLimit.NameChanged + RaiseEvent NameChanged() + End Sub + + Private Sub ucrInputConfidenceLimit_Load(sender As Object, e As EventArgs) Handles Me.Load + ucrConfidenceLimit.AddItems({99.9, 99, 95, 90, 85, 80}) + ucrConfidenceLimit.SetValidationTypeAsNumeric(dcmMin:=0, bIncludeMin:=False, dcmMax:=100, bIncludeMax:=False) + ucrConfidenceLimit.SetName(95) + End Sub +End Class diff --git a/instat/ucrInputTextBox.Designer.vb b/instat/ucrInputTextBox.Designer.vb index daa036449d1..06369c2f331 100644 --- a/instat/ucrInputTextBox.Designer.vb +++ b/instat/ucrInputTextBox.Designer.vb @@ -27,9 +27,10 @@ Partial Class ucrInputTextBox ' 'txtInput ' - Me.txtInput.Location = New System.Drawing.Point(0, 3) + Me.txtInput.Dock = System.Windows.Forms.DockStyle.Fill + Me.txtInput.Location = New System.Drawing.Point(0, 0) Me.txtInput.Name = "txtInput" - Me.txtInput.Size = New System.Drawing.Size(139, 20) + Me.txtInput.Size = New System.Drawing.Size(142, 20) Me.txtInput.TabIndex = 0 ' 'ucrInputTextBox @@ -38,6 +39,7 @@ Partial Class ucrInputTextBox Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.txtInput) Me.Name = "ucrInputTextBox" + Me.Size = New System.Drawing.Size(142, 21) Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/ucrInputTextBox.vb b/instat/ucrInputTextBox.vb index 15f90af6183..dacd9d05ae3 100644 --- a/instat/ucrInputTextBox.vb +++ b/instat/ucrInputTextBox.vb @@ -2,6 +2,7 @@ Public Overrides Sub SetName(strName As String) If IsValid(strName) Then txtInput.Text = strName + OnNameChanged() Else MsgBox(strName & "is not a valid for this textbox", vbOKOnly) End If From 2936572d6a1bdd54ac489e733f73b7d895ec9c94 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 02:04:11 +0300 Subject: [PATCH 04/16] frmMain Declaring Dialogs --- instat/frmMain.vb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 19fbe3c750e..f485dd187ab 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -806,4 +806,15 @@ Public Class frmMain Next End Sub + Private Sub mnuStatistcsMultivariatePrincipalComponents_Click(sender As Object, e As EventArgs) Handles mnuStatistcsMultivariatePrincipalComponents.Click + dlgPrincipalComponentAnalysis.ShowDialog() + End Sub + + Private Sub mnuStatistcsMultivariateCanonicalCorrelations_Click(sender As Object, e As EventArgs) Handles mnuStatistcsMultivariateCanonicalCorrelations.Click + dlgCanonicalCorrelationAnalysis.ShowDialog() + End Sub + + Private Sub mnuManageFactorRecode_Click(sender As Object, e As EventArgs) Handles mnuManageFactorRecode.Click + dlgRecode.ShowDialog() + End Sub End Class From e02dd25a94d09b0ce6e7ad3784023d07b0704846 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 02:50:56 +0300 Subject: [PATCH 05/16] manageMenu declaring dialogs in the manage menu --- instat/frmMain.vb | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index f485dd187ab..e4d3d6c05e6 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -603,8 +603,8 @@ Public Class frmMain End If End Sub - Private Sub SubsetToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuManageRechapeMerge.Click - dlgSubset.ShowDialog() + Private Sub mnuManageReshapeMerge_Click(sender As Object, e As EventArgs) Handles mnuManageRechapeMerge.Click + dlgMerge.ShowDialog() End Sub Private Sub mnuFileOptions_Click(sender As Object, e As EventArgs) Handles mnuFileOptions.Click @@ -817,4 +817,44 @@ Public Class frmMain Private Sub mnuManageFactorRecode_Click(sender As Object, e As EventArgs) Handles mnuManageFactorRecode.Click dlgRecode.ShowDialog() End Sub + + Private Sub mnuManageDataFileCopySheet_Click(sender As Object, e As EventArgs) Handles mnuManageDataFileCopySheet.Click + dlgCopySheet.ShowDialog() + End Sub + + Private Sub mnuManageDataFileReorderSheets_Click(sender As Object, e As EventArgs) Handles mnuManageDataFileReorderSheets.Click + dlgReorderSheet.ShowDialog() + End Sub + + Private Sub mnuManageDataFileRenameSheet_Click(sender As Object, e As EventArgs) Handles mnuManageDataFileRenameSheet.Click + dlgRenameSheet.ShowDialog() + End Sub + + Private Sub mnuManageRechapeColumnSummaries_Click(sender As Object, e As EventArgs) Handles mnuManageRechapeColumnSummaries.Click + dlgColumnStats.ShowDialog() + End Sub + + Private Sub mnuManageSheetReorder_Click(sender As Object, e As EventArgs) Handles mnuManageSheetReorder.Click + dlgReorderSheet.ShowDialog() + End Sub + + Private Sub mnuManageFactorIndicatorVariables_Click(sender As Object, e As EventArgs) Handles mnuManageFactorIndicatorVariables.Click + dlgIndicatorVariable.ShowDialog() + End Sub + + Private Sub mnuManageFactorInteraction_Click(sender As Object, e As EventArgs) Handles mnuManageFactorInteraction.Click + dlgInteractions.ShowDialog() + End Sub + + Private Sub mnuManageFactorReferenceLevels_Click(sender As Object, e As EventArgs) Handles mnuManageFactorReferenceLevels.Click + dlgReferenceLevel.ShowDialog() + End Sub + + Private Sub mnuMangeFactorLabel_Click(sender As Object, e As EventArgs) Handles mnuMangeFactorLabel.Click + dlgLabels.ShowDialog() + End Sub + + Private Sub mnuManageFactorconvertToFactor_Click(sender As Object, e As EventArgs) Handles mnuManageFactorconvertToFactor.Click + dlgConvertColumnsToFactors.ShowDialog() + End Sub End Class From 86fa9df16cfb20f51626836664aacbee930ca4f8 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 09:48:28 +0300 Subject: [PATCH 06/16] dlgCumulativeDistribution Creating Empty dialog --- instat/dlgCumulativeDistribution.Designer.vb | 51 ++++++++ instat/dlgCumulativeDistribution.fr-FR.resx | 15 +++ instat/dlgCumulativeDistribution.resx | 120 +++++++++++++++++++ instat/dlgCumulativeDistribution.sw-KE.resx | 15 +++ instat/dlgCumulativeDistribution.vb | 5 + instat/instat.vbproj | 15 +++ 6 files changed, 221 insertions(+) create mode 100644 instat/dlgCumulativeDistribution.Designer.vb create mode 100644 instat/dlgCumulativeDistribution.fr-FR.resx create mode 100644 instat/dlgCumulativeDistribution.resx create mode 100644 instat/dlgCumulativeDistribution.sw-KE.resx create mode 100644 instat/dlgCumulativeDistribution.vb diff --git a/instat/dlgCumulativeDistribution.Designer.vb b/instat/dlgCumulativeDistribution.Designer.vb new file mode 100644 index 00000000000..c6413c8c04c --- /dev/null +++ b/instat/dlgCumulativeDistribution.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgCumulativeDistribution + 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(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgCumulativeDistribution + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(435, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgCumulativeDistribution" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Cumulative_Distribution" + Me.Text = "Cumulative Distribution" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgCumulativeDistribution.fr-FR.resx b/instat/dlgCumulativeDistribution.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgCumulativeDistribution.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/dlgCumulativeDistribution.resx b/instat/dlgCumulativeDistribution.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgCumulativeDistribution.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/dlgCumulativeDistribution.sw-KE.resx b/instat/dlgCumulativeDistribution.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgCumulativeDistribution.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/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb new file mode 100644 index 00000000000..000d5802aed --- /dev/null +++ b/instat/dlgCumulativeDistribution.vb @@ -0,0 +1,5 @@ +Public Class dlgCumulativeDistribution + Private Sub dlgCumulativeDistribution_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 515e151034b..ac5cc6aeb01 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -238,6 +238,12 @@ Form + + dlgCumulativeDistribution.vb + + + Form + dlgDeleteColumn.vb @@ -1430,6 +1436,15 @@ dlgCopySheet.vb + + dlgCumulativeDistribution.vb + + + dlgCumulativeDistribution.vb + + + dlgCumulativeDistribution.vb + dlgDeleteColumn.vb From 207d7eea0f4a36c7cd63e35e8be3ddd49379fa30 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 09:50:34 +0300 Subject: [PATCH 07/16] Adding Basic code --- instat/dlgCumulativeDistribution.vb | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index 000d5802aed..97c9773831e 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -1,5 +1,22 @@ -Public Class dlgCumulativeDistribution - Private Sub dlgCumulativeDistribution_Load(sender As Object, e As EventArgs) Handles MyBase.Load +' 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 dlgCumulativeDistribution + Private Sub dlgCumulativeDistribution_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) End Sub End Class \ No newline at end of file From b868f432a7a1b356f44c4508f3d1152056af11e9 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 09:59:01 +0300 Subject: [PATCH 08/16] dlgReorderLevels Creating new dialog --- instat/dlgReorderLevels.Designer.vb | 51 ++++++++++++ instat/dlgReorderLevels.fr-FR.resx | 15 ++++ instat/dlgReorderLevels.resx | 120 ++++++++++++++++++++++++++++ instat/dlgReorderLevels.sw-KE.resx | 15 ++++ instat/dlgReorderLevels.vb | 3 + instat/instat.vbproj | 15 ++++ 6 files changed, 219 insertions(+) create mode 100644 instat/dlgReorderLevels.Designer.vb create mode 100644 instat/dlgReorderLevels.fr-FR.resx create mode 100644 instat/dlgReorderLevels.resx create mode 100644 instat/dlgReorderLevels.sw-KE.resx create mode 100644 instat/dlgReorderLevels.vb diff --git a/instat/dlgReorderLevels.Designer.vb b/instat/dlgReorderLevels.Designer.vb new file mode 100644 index 00000000000..a7f61f5e358 --- /dev/null +++ b/instat/dlgReorderLevels.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgReorderLevels + 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(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgReorderLevels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(447, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgReorderLevels" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Reorder_Levels" + Me.Text = "Reorder Levels" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgReorderLevels.fr-FR.resx b/instat/dlgReorderLevels.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReorderLevels.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/dlgReorderLevels.resx b/instat/dlgReorderLevels.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgReorderLevels.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/dlgReorderLevels.sw-KE.resx b/instat/dlgReorderLevels.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReorderLevels.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/dlgReorderLevels.vb b/instat/dlgReorderLevels.vb new file mode 100644 index 00000000000..2287b8b7d6d --- /dev/null +++ b/instat/dlgReorderLevels.vb @@ -0,0 +1,3 @@ +Public Class dlgReorderLevels + +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index ac5cc6aeb01..cfa65503e13 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -298,6 +298,12 @@ Form + + dlgReorderLevels.vb + + + Form + dlgReorderSheet.vb @@ -1526,6 +1532,15 @@ dlgRenameSheet.vb + + dlgReorderLevels.vb + + + dlgReorderLevels.vb + + + dlgReorderLevels.vb + dlgReorderSheet.vb From b69258b44d8b227b08b52d18a64465e1899c3886 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 10:00:41 +0300 Subject: [PATCH 09/16] dlgReoderLevels Adding Basic code --- instat/dlgReorderLevels.vb | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/instat/dlgReorderLevels.vb b/instat/dlgReorderLevels.vb index 2287b8b7d6d..4dfd9bdf3a5 100644 --- a/instat/dlgReorderLevels.vb +++ b/instat/dlgReorderLevels.vb @@ -1,3 +1,22 @@ -Public Class dlgReorderLevels +' 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 dlgReorderLevels + Private Sub dlgReorderLevels_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub End Class \ No newline at end of file From c3b1c5c824a4f72382d07fc96e81005434e68a41 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 10:11:57 +0300 Subject: [PATCH 10/16] dlgReferenceLevels: Creating New Dialog --- instat/dlgReferenceLevels.Designer.vb | 51 +++++++++++ instat/dlgReferenceLevels.fr-FR.resx | 15 ++++ instat/dlgReferenceLevels.resx | 120 ++++++++++++++++++++++++++ instat/dlgReferenceLevels.sw-KE.resx | 15 ++++ instat/dlgReferenceLevels.vb | 22 +++++ instat/instat.vbproj | 15 ++++ 6 files changed, 238 insertions(+) create mode 100644 instat/dlgReferenceLevels.Designer.vb create mode 100644 instat/dlgReferenceLevels.fr-FR.resx create mode 100644 instat/dlgReferenceLevels.resx create mode 100644 instat/dlgReferenceLevels.sw-KE.resx create mode 100644 instat/dlgReferenceLevels.vb diff --git a/instat/dlgReferenceLevels.Designer.vb b/instat/dlgReferenceLevels.Designer.vb new file mode 100644 index 00000000000..b9a20047b2e --- /dev/null +++ b/instat/dlgReferenceLevels.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgReferenceLevels + 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(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgReferenceLevels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(432, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgReferenceLevels" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Reference_Levels" + Me.Text = "Reference Levels" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgReferenceLevels.fr-FR.resx b/instat/dlgReferenceLevels.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReferenceLevels.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/dlgReferenceLevels.resx b/instat/dlgReferenceLevels.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgReferenceLevels.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/dlgReferenceLevels.sw-KE.resx b/instat/dlgReferenceLevels.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgReferenceLevels.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/dlgReferenceLevels.vb b/instat/dlgReferenceLevels.vb new file mode 100644 index 00000000000..ecdc7903194 --- /dev/null +++ b/instat/dlgReferenceLevels.vb @@ -0,0 +1,22 @@ +' 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 dlgReferenceLevels + Private Sub dlgReferenceLevels_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index cfa65503e13..5ece843a184 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -292,6 +292,12 @@ Form + + dlgReferenceLevels.vb + + + Form + dlgRenameSheet.vb @@ -1523,6 +1529,15 @@ dlgPrintPreviewOptions.vb + + dlgReferenceLevels.vb + + + dlgReferenceLevels.vb + + + dlgReferenceLevels.vb + dlgRenameSheet.vb From ac312c868a855135c3949896b75b469290d563ed Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 10:35:29 +0300 Subject: [PATCH 11/16] dlgUnusedLevels: Creating New Dialog --- instat/dlgUnusedLevels.Designer.vb | 51 ++++++++++++ instat/dlgUnusedLevels.fr-FR.resx | 15 ++++ instat/dlgUnusedLevels.resx | 120 +++++++++++++++++++++++++++++ instat/dlgUnusedLevels.sw-KE.resx | 15 ++++ instat/dlgUnusedLevels.vb | 22 ++++++ instat/instat.vbproj | 15 ++++ 6 files changed, 238 insertions(+) create mode 100644 instat/dlgUnusedLevels.Designer.vb create mode 100644 instat/dlgUnusedLevels.fr-FR.resx create mode 100644 instat/dlgUnusedLevels.resx create mode 100644 instat/dlgUnusedLevels.sw-KE.resx create mode 100644 instat/dlgUnusedLevels.vb diff --git a/instat/dlgUnusedLevels.Designer.vb b/instat/dlgUnusedLevels.Designer.vb new file mode 100644 index 00000000000..c9db27cd9bf --- /dev/null +++ b/instat/dlgUnusedLevels.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgUnusedLevels + 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(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgUnusedLevels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(424, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgUnusedLevels" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Unused_Levels" + Me.Text = "Unused Levels" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgUnusedLevels.fr-FR.resx b/instat/dlgUnusedLevels.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgUnusedLevels.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/dlgUnusedLevels.resx b/instat/dlgUnusedLevels.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgUnusedLevels.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/dlgUnusedLevels.sw-KE.resx b/instat/dlgUnusedLevels.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgUnusedLevels.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/dlgUnusedLevels.vb b/instat/dlgUnusedLevels.vb new file mode 100644 index 00000000000..e45ee7e6f3a --- /dev/null +++ b/instat/dlgUnusedLevels.vb @@ -0,0 +1,22 @@ +' 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 dlgUnusedLevels + Private Sub dlgUnusedLevels_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 5ece843a184..deab9c86e1d 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -328,6 +328,12 @@ Form + + dlgUnusedLevels.vb + + + Form + sdgCanonicalCorrelation.vb @@ -1583,6 +1589,15 @@ dlgSummaryBarOrPieChart.vb + + dlgUnusedLevels.vb + + + dlgUnusedLevels.vb + + + dlgUnusedLevels.vb + sdgBarChart.vb From 8ad5b06e8fb125a93c90b70c4ec4ed44cc952851 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 10:44:10 +0300 Subject: [PATCH 12/16] dlgRestrict Creating New Dialog --- instat/dlgRestrict.Designer.vb | 51 ++++++++++++++ instat/dlgRestrict.fr-FR.resx | 15 +++++ instat/dlgRestrict.resx | 120 +++++++++++++++++++++++++++++++++ instat/dlgRestrict.sw-KE.resx | 15 +++++ instat/dlgRestrict.vb | 22 ++++++ instat/instat.vbproj | 15 +++++ 6 files changed, 238 insertions(+) create mode 100644 instat/dlgRestrict.Designer.vb create mode 100644 instat/dlgRestrict.fr-FR.resx create mode 100644 instat/dlgRestrict.resx create mode 100644 instat/dlgRestrict.sw-KE.resx create mode 100644 instat/dlgRestrict.vb diff --git a/instat/dlgRestrict.Designer.vb b/instat/dlgRestrict.Designer.vb new file mode 100644 index 00000000000..b9c7cd6b688 --- /dev/null +++ b/instat/dlgRestrict.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgRestrict + 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(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgRestrict + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(446, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgRestrict" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Restrict_Filter" + Me.Text = "Restrict (Filter)" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgRestrict.fr-FR.resx b/instat/dlgRestrict.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRestrict.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/dlgRestrict.resx b/instat/dlgRestrict.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgRestrict.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/dlgRestrict.sw-KE.resx b/instat/dlgRestrict.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRestrict.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/dlgRestrict.vb b/instat/dlgRestrict.vb new file mode 100644 index 00000000000..1a72998d9a0 --- /dev/null +++ b/instat/dlgRestrict.vb @@ -0,0 +1,22 @@ +' 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 dlgRestrict + Private Sub dlgRestrict_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index deab9c86e1d..c4d3c052f3a 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -316,6 +316,12 @@ Form + + dlgRestrict.vb + + + Form + dlgScatterPlot.vb @@ -1571,6 +1577,15 @@ dlgReorderSheet.vb + + dlgRestrict.vb + + + dlgRestrict.vb + + + dlgRestrict.vb + dlgScatterPlot.vb From 71a62a195cd7b5c1198ddc7d8e32d78a85f6dd26 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 10:51:31 +0300 Subject: [PATCH 13/16] dlgProtect Creating New Dialog --- instat/dlgProtect.Designer.vb | 51 +++++++++++++++ instat/dlgProtect.fr-FR.resx | 15 +++++ instat/dlgProtect.resx | 120 ++++++++++++++++++++++++++++++++++ instat/dlgProtect.sw-KE.resx | 15 +++++ instat/dlgProtect.vb | 22 +++++++ instat/instat.vbproj | 15 +++++ 6 files changed, 238 insertions(+) create mode 100644 instat/dlgProtect.Designer.vb create mode 100644 instat/dlgProtect.fr-FR.resx create mode 100644 instat/dlgProtect.resx create mode 100644 instat/dlgProtect.sw-KE.resx create mode 100644 instat/dlgProtect.vb diff --git a/instat/dlgProtect.Designer.vb b/instat/dlgProtect.Designer.vb new file mode 100644 index 00000000000..1dbb9c8b953 --- /dev/null +++ b/instat/dlgProtect.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgProtect + 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(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgProtect + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(437, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgProtect" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Protect_Lock_Unlock" + Me.Text = "Protect (Lock/Unlock)" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgProtect.fr-FR.resx b/instat/dlgProtect.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgProtect.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/dlgProtect.resx b/instat/dlgProtect.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgProtect.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/dlgProtect.sw-KE.resx b/instat/dlgProtect.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgProtect.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/dlgProtect.vb b/instat/dlgProtect.vb new file mode 100644 index 00000000000..378cd2a8887 --- /dev/null +++ b/instat/dlgProtect.vb @@ -0,0 +1,22 @@ +' 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 dlgProtect + Private Sub dlgProtect_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index c4d3c052f3a..42f046c13fa 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -292,6 +292,12 @@ Form + + dlgProtect.vb + + + Form + dlgReferenceLevels.vb @@ -1541,6 +1547,15 @@ dlgPrintPreviewOptions.vb + + dlgProtect.vb + + + dlgProtect.vb + + + dlgProtect.vb + dlgReferenceLevels.vb From 0c598e5f4310adf4cd1672d393e5da8a30ab768a Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 10:58:32 +0300 Subject: [PATCH 14/16] dlgHideShowColumns Creating New Dialog --- instat/dlgHideShowColumns.Designer.vb | 51 +++++++++++ instat/dlgHideShowColumns.fr-FR.resx | 15 ++++ instat/dlgHideShowColumns.resx | 120 ++++++++++++++++++++++++++ instat/dlgHideShowColumns.sw-KE.resx | 15 ++++ instat/dlgHideShowColumns.vb | 22 +++++ instat/instat.vbproj | 15 ++++ 6 files changed, 238 insertions(+) create mode 100644 instat/dlgHideShowColumns.Designer.vb create mode 100644 instat/dlgHideShowColumns.fr-FR.resx create mode 100644 instat/dlgHideShowColumns.resx create mode 100644 instat/dlgHideShowColumns.sw-KE.resx create mode 100644 instat/dlgHideShowColumns.vb diff --git a/instat/dlgHideShowColumns.Designer.vb b/instat/dlgHideShowColumns.Designer.vb new file mode 100644 index 00000000000..6f4a5cdfe9a --- /dev/null +++ b/instat/dlgHideShowColumns.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgHideShowColumns + 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(13, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgHideShowColumns + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(425, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgHideShowColumns" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Hide_Show_Columns" + Me.Text = "Hide/Show Column(s)" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgHideShowColumns.fr-FR.resx b/instat/dlgHideShowColumns.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgHideShowColumns.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/dlgHideShowColumns.resx b/instat/dlgHideShowColumns.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgHideShowColumns.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/dlgHideShowColumns.sw-KE.resx b/instat/dlgHideShowColumns.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgHideShowColumns.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/dlgHideShowColumns.vb b/instat/dlgHideShowColumns.vb new file mode 100644 index 00000000000..f43cfcabee5 --- /dev/null +++ b/instat/dlgHideShowColumns.vb @@ -0,0 +1,22 @@ +' 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 dlgHideShowColumns + Private Sub dlgHideShowColumns_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 42f046c13fa..35320039b14 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -262,6 +262,12 @@ Form + + dlgHideShowColumns.vb + + + Form + dlgInsertColumn.vb @@ -1502,6 +1508,15 @@ dlgFromLibrary.vb + + dlgHideShowColumns.vb + + + dlgHideShowColumns.vb + + + dlgHideShowColumns.vb + dlgInsertColumn.vb From cfaf5d811824b1ee31a9428a12a112dbe9dd4cb3 Mon Sep 17 00:00:00 2001 From: Stephen Kogo Date: Wed, 2 Mar 2016 11:00:23 +0300 Subject: [PATCH 15/16] Fixed standard error and Confidence Limits for fitted model in simple regression --- instat/sdgSimpleRegOptions.vb | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/instat/sdgSimpleRegOptions.vb b/instat/sdgSimpleRegOptions.vb index f937216862a..6d85eac7c38 100644 --- a/instat/sdgSimpleRegOptions.vb +++ b/instat/sdgSimpleRegOptions.vb @@ -35,6 +35,7 @@ Public Class sdgSimpleRegOptions End Sub Private Sub AnovaTable() + 'p-values should be false here clsRaovFunction.SetRCommand("anova") clsRaovFunction.AddParameter("", clsRFunctionParameter:=dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction) frmMain.clsRLink.RunScript(clsRaovFunction.ToScript(), 2) @@ -47,6 +48,7 @@ Public Class sdgSimpleRegOptions End Sub Private Sub Estimates() + 'p-values should be false here frmMain.clsRLink.RunScript(dlgRegressionSimple.ucrBase.clsRsyntax.clsBaseFunction.ToScript(), 2) End Sub @@ -89,8 +91,7 @@ Public Class sdgSimpleRegOptions clsRStat_smooth.SetRCommand("stat_smooth") clsRStat_smooth.AddParameter("method", Chr(34) & "lm" & Chr(34)) - clsRStat_smooth.AddParameter("se", "TRUE") - clsRStat_smooth.AddParameter("level", nudConvidenceLevel.Value) + ConfidenceSE() clsRFittedModelGraphics.AddOperatorParameter("", clsRFunc:=clsRStat_smooth) 'need to factor in prediction interval @@ -153,7 +154,7 @@ Public Class sdgSimpleRegOptions chkFourinOne.Checked = False End Sub - Private Sub chkConfidenceInterval_CheckedChanged(sender As Object, e As EventArgs) Handles chkConfidenceLimits.CheckedChanged + Private Sub chkConfidenceLimits_CheckedChanged(sender As Object, e As EventArgs) Handles chkConfidenceLimits.CheckedChanged If (chkConfidenceLimits.Checked) Then lblConfidenceLevel.Enabled = True nudConvidenceLevel.Enabled = True @@ -165,6 +166,19 @@ Public Class sdgSimpleRegOptions End If End Sub + Private Sub ConfidenceSE() + If (chkConfidenceLimits.Checked = True) Then + clsRStat_smooth.AddParameter("se", "TRUE") + clsRStat_smooth.AddParameter("level", nudConvidenceLevel.Value) + ElseIf (chkConfidenceLimits.Checked = False) Then + clsRStat_smooth.AddParameter("se", "FALSE") + clsRStat_smooth.RemoveParameterByName("level") + Else + clsRStat_smooth.RemoveParameterByName("se") + clsRStat_smooth.RemoveParameterByName("level") + End If + End Sub + Private Sub chkPredictionInterval_CheckedChanged(sender As Object, e As EventArgs) Handles chkPredictionInterval.CheckedChanged If (chkPredictionInterval.Checked) Then chkConfidenceLimits.Checked = False From 659c172dfb7a1978d22cf0990c6c837a6a3dab01 Mon Sep 17 00:00:00 2001 From: John Lunalo Date: Wed, 2 Mar 2016 11:04:42 +0300 Subject: [PATCH 16/16] dlgRandomSubset Adding New Dialog --- instat/dlgRandomSubset.Designer.vb | 51 ++++++++++++ instat/dlgRandomSubset.fr-FR.resx | 15 ++++ instat/dlgRandomSubset.resx | 120 +++++++++++++++++++++++++++++ instat/dlgRandomSubset.sw-KE.resx | 15 ++++ instat/dlgRandomSubset.vb | 3 + instat/instat.vbproj | 15 ++++ 6 files changed, 219 insertions(+) create mode 100644 instat/dlgRandomSubset.Designer.vb create mode 100644 instat/dlgRandomSubset.fr-FR.resx create mode 100644 instat/dlgRandomSubset.resx create mode 100644 instat/dlgRandomSubset.sw-KE.resx create mode 100644 instat/dlgRandomSubset.vb diff --git a/instat/dlgRandomSubset.Designer.vb b/instat/dlgRandomSubset.Designer.vb new file mode 100644 index 00000000000..bcb65b7d90f --- /dev/null +++ b/instat/dlgRandomSubset.Designer.vb @@ -0,0 +1,51 @@ + _ +Partial Class dlgRandomSubset + 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(12, 196) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 53) + Me.ucrBase.TabIndex = 0 + ' + 'dlgRandomSubset + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(429, 261) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgRandomSubset" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Tag = "Random_Subset" + Me.Text = "Random Subset" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgRandomSubset.fr-FR.resx b/instat/dlgRandomSubset.fr-FR.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRandomSubset.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/dlgRandomSubset.resx b/instat/dlgRandomSubset.resx new file mode 100644 index 00000000000..29dcb1b3a35 --- /dev/null +++ b/instat/dlgRandomSubset.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/dlgRandomSubset.sw-KE.resx b/instat/dlgRandomSubset.sw-KE.resx new file mode 100644 index 00000000000..9c9f69d752c --- /dev/null +++ b/instat/dlgRandomSubset.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/dlgRandomSubset.vb b/instat/dlgRandomSubset.vb new file mode 100644 index 00000000000..0a96bbb1be1 --- /dev/null +++ b/instat/dlgRandomSubset.vb @@ -0,0 +1,3 @@ +Public Class dlgRandomSubset + +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 35320039b14..51034daf507 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -304,6 +304,12 @@ Form + + dlgRandomSubset.vb + + + Form + dlgReferenceLevels.vb @@ -1571,6 +1577,15 @@ dlgProtect.vb + + dlgRandomSubset.vb + + + dlgRandomSubset.vb + + + dlgRandomSubset.vb + dlgReferenceLevels.vb