From 1141bae5b97190369b5020041b484a21aea3c006 Mon Sep 17 00:00:00 2001 From: Lily Date: Sat, 5 Nov 2016 18:14:31 +0000 Subject: [PATCH 01/16] Contrasts layout edited --- instat/dlgContrasts.Designer.vb | 30 +++++++++++++++--------------- instat/dlgContrasts.vb | 1 + 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/instat/dlgContrasts.Designer.vb b/instat/dlgContrasts.Designer.vb index a81f438321c..723e0a8af31 100644 --- a/instat/dlgContrasts.Designer.vb +++ b/instat/dlgContrasts.Designer.vb @@ -33,7 +33,7 @@ Partial Class dlgContrasts ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(13, 196) + Me.ucrBase.Location = New System.Drawing.Point(13, 200) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 60) Me.ucrBase.TabIndex = 0 @@ -41,7 +41,7 @@ Partial Class dlgContrasts 'ucrSelectorForContrast ' Me.ucrSelectorForContrast.bShowHiddenColumns = False - Me.ucrSelectorForContrast.bUseCurrentFilter = False + Me.ucrSelectorForContrast.bUseCurrentFilter = True Me.ucrSelectorForContrast.Location = New System.Drawing.Point(13, 13) Me.ucrSelectorForContrast.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForContrast.Name = "ucrSelectorForContrast" @@ -50,7 +50,7 @@ Partial Class dlgContrasts ' 'ucrReceiverForContrasts ' - Me.ucrReceiverForContrasts.Location = New System.Drawing.Point(239, 26) + Me.ucrReceiverForContrasts.Location = New System.Drawing.Point(244, 48) Me.ucrReceiverForContrasts.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverForContrasts.Name = "ucrReceiverForContrasts" Me.ucrReceiverForContrasts.Selector = Nothing @@ -60,44 +60,44 @@ Partial Class dlgContrasts 'lblFactorReceiver ' Me.lblFactorReceiver.AutoSize = True - Me.lblFactorReceiver.Location = New System.Drawing.Point(236, 9) + Me.lblFactorReceiver.Location = New System.Drawing.Point(243, 33) Me.lblFactorReceiver.Name = "lblFactorReceiver" - Me.lblFactorReceiver.Size = New System.Drawing.Size(90, 13) + Me.lblFactorReceiver.Size = New System.Drawing.Size(93, 13) Me.lblFactorReceiver.TabIndex = 3 - Me.lblFactorReceiver.Text = "Selected Variable" + Me.lblFactorReceiver.Text = "Selected Variable:" ' 'chkOverwriteExistContrast ' Me.chkOverwriteExistContrast.AutoSize = True - Me.chkOverwriteExistContrast.Location = New System.Drawing.Point(242, 153) + Me.chkOverwriteExistContrast.Location = New System.Drawing.Point(244, 131) Me.chkOverwriteExistContrast.Name = "chkOverwriteExistContrast" - Me.chkOverwriteExistContrast.Size = New System.Drawing.Size(192, 17) + Me.chkOverwriteExistContrast.Size = New System.Drawing.Size(195, 17) Me.chkOverwriteExistContrast.TabIndex = 11 - Me.chkOverwriteExistContrast.Text = "Overwrite existing contrast columns" + Me.chkOverwriteExistContrast.Text = "Overwrite Existing Contrast Columns" Me.chkOverwriteExistContrast.UseVisualStyleBackColor = True ' 'ucrInputContrast ' Me.ucrInputContrast.IsReadOnly = False - Me.ucrInputContrast.Location = New System.Drawing.Point(241, 71) + Me.ucrInputContrast.Location = New System.Drawing.Point(244, 93) Me.ucrInputContrast.Name = "ucrInputContrast" - Me.ucrInputContrast.Size = New System.Drawing.Size(137, 21) + Me.ucrInputContrast.Size = New System.Drawing.Size(120, 21) Me.ucrInputContrast.TabIndex = 13 ' 'lblSelectContrast ' Me.lblSelectContrast.AutoSize = True - Me.lblSelectContrast.Location = New System.Drawing.Point(239, 54) + Me.lblSelectContrast.Location = New System.Drawing.Point(244, 78) Me.lblSelectContrast.Name = "lblSelectContrast" - Me.lblSelectContrast.Size = New System.Drawing.Size(79, 13) + Me.lblSelectContrast.Size = New System.Drawing.Size(82, 13) Me.lblSelectContrast.TabIndex = 14 - Me.lblSelectContrast.Text = "Select Contrast" + Me.lblSelectContrast.Text = "Select Contrast:" ' 'dlgContrasts ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(429, 256) + Me.ClientSize = New System.Drawing.Size(444, 255) Me.Controls.Add(Me.lblSelectContrast) Me.Controls.Add(Me.ucrInputContrast) Me.Controls.Add(Me.chkOverwriteExistContrast) diff --git a/instat/dlgContrasts.vb b/instat/dlgContrasts.vb index 933f9947b6d..1f0fb44e1f3 100644 --- a/instat/dlgContrasts.vb +++ b/instat/dlgContrasts.vb @@ -53,6 +53,7 @@ Public Class dlgContrasts ucrInputContrast.SetName("Treatment/Control") ucrSelectorForContrast.Reset() ucrInputContrast.Reset() + chkOverwriteExistContrast.Checked = False End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset From ba0ad01cee90f2bdab7a6c1e5c8d063cbc12847d Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 16:11:17 +0000 Subject: [PATCH 02/16] dlgRugplot and DotPlot --- instat/dlgDotPlot.designer.vb | 23 +++++++++++----------- instat/dlgDotPlot.vb | 7 ++++++- instat/dlgRugPlot.Designer.vb | 36 +++++++++++++++++------------------ instat/dlgRugPlot.vb | 7 ++++++- 4 files changed, 42 insertions(+), 31 deletions(-) diff --git a/instat/dlgDotPlot.designer.vb b/instat/dlgDotPlot.designer.vb index 2ab2b2fcad4..f6710803651 100644 --- a/instat/dlgDotPlot.designer.vb +++ b/instat/dlgDotPlot.designer.vb @@ -36,7 +36,7 @@ Partial Class dlgDotPlot ' 'cmdDotPlotOptions ' - Me.cmdDotPlotOptions.Location = New System.Drawing.Point(10, 204) + Me.cmdDotPlotOptions.Location = New System.Drawing.Point(10, 200) Me.cmdDotPlotOptions.Name = "cmdDotPlotOptions" Me.cmdDotPlotOptions.Size = New System.Drawing.Size(120, 25) Me.cmdDotPlotOptions.TabIndex = 7 @@ -46,7 +46,7 @@ Partial Class dlgDotPlot ' 'cmdOptions ' - Me.cmdOptions.Location = New System.Drawing.Point(10, 239) + Me.cmdOptions.Location = New System.Drawing.Point(10, 231) Me.cmdOptions.Name = "cmdOptions" Me.cmdOptions.Size = New System.Drawing.Size(120, 25) Me.cmdOptions.TabIndex = 8 @@ -61,18 +61,18 @@ Partial Class dlgDotPlot Me.lblFactor.Name = "lblFactor" Me.lblFactor.Size = New System.Drawing.Size(88, 13) Me.lblFactor.TabIndex = 3 - Me.lblFactor.Tag = "Factor_Optional" - Me.lblFactor.Text = "Factor (Optional)" + Me.lblFactor.Tag = "Factor_Optional:" + Me.lblFactor.Text = "Factor (Optional):" ' 'lblSecondFactor ' Me.lblSecondFactor.AutoSize = True - Me.lblSecondFactor.Location = New System.Drawing.Point(255, 212) + Me.lblSecondFactor.Location = New System.Drawing.Point(254, 212) Me.lblSecondFactor.Name = "lblSecondFactor" Me.lblSecondFactor.Size = New System.Drawing.Size(128, 13) Me.lblSecondFactor.TabIndex = 5 - Me.lblSecondFactor.Tag = "Second_Factor_Optional" - Me.lblSecondFactor.Text = "Second Factor (Optional)" + Me.lblSecondFactor.Tag = "Second_Factor_Optional:" + Me.lblSecondFactor.Text = "Second Factor (Optional):" ' 'ucrVariablesAsFactorDotPlot ' @@ -84,7 +84,7 @@ Partial Class dlgDotPlot ' 'ucrSaveDotPlot ' - Me.ucrSaveDotPlot.Location = New System.Drawing.Point(10, 275) + Me.ucrSaveDotPlot.Location = New System.Drawing.Point(10, 266) Me.ucrSaveDotPlot.Name = "ucrSaveDotPlot" Me.ucrSaveDotPlot.Size = New System.Drawing.Size(265, 20) Me.ucrSaveDotPlot.TabIndex = 10 @@ -92,6 +92,7 @@ Partial Class dlgDotPlot 'ucrDotPlotSelector ' Me.ucrDotPlotSelector.bShowHiddenColumns = False + Me.ucrDotPlotSelector.bUseCurrentFilter = True Me.ucrDotPlotSelector.Location = New System.Drawing.Point(10, 10) Me.ucrDotPlotSelector.Margin = New System.Windows.Forms.Padding(0) Me.ucrDotPlotSelector.Name = "ucrDotPlotSelector" @@ -118,7 +119,7 @@ Partial Class dlgDotPlot ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(10, 306) + Me.ucrBase.Location = New System.Drawing.Point(10, 292) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 9 @@ -127,7 +128,7 @@ Partial Class dlgDotPlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(419, 360) + Me.ClientSize = New System.Drawing.Size(421, 350) Me.Controls.Add(Me.ucrVariablesAsFactorDotPlot) Me.Controls.Add(Me.ucrSaveDotPlot) Me.Controls.Add(Me.cmdOptions) @@ -138,7 +139,7 @@ Partial Class dlgDotPlot Me.Controls.Add(Me.ucrSecondFactorReceiver) Me.Controls.Add(Me.ucrFactorReceiver) Me.Controls.Add(Me.ucrBase) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDotPlot" diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb index 7ae5935f3e7..f59b77a6885 100644 --- a/instat/dlgDotPlot.vb +++ b/instat/dlgDotPlot.vb @@ -53,7 +53,6 @@ Public Class dlgDotPlot ucrBase.iHelpTopicID = 437 ucrSaveDotPlot.SetDataFrameSelector(ucrDotPlotSelector.ucrAvailableDataFrames) - ucrSaveDotPlot.strPrefix = "Dotplot" ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False End Sub @@ -70,6 +69,7 @@ Public Class dlgDotPlot clsRaesFunction.ClearParameters() clsRgeom_dotplot.ClearParameters() ucrDotPlotSelector.Reset() + ucrSaveDotPlot.strPrefix = "Dotplot" ucrVariablesAsFactorDotPlot.ResetControl() ucrSaveDotPlot.Reset() sdgPlots.Reset() @@ -133,6 +133,11 @@ Public Class dlgDotPlot clsRaesFunction.AddParameter("y", ucrVariablesAsFactorDotPlot.GetVariableNames(False)) clsRgeom_dotplot.AddParameter("binaxis", Chr(34) & "y" & Chr(34)) End If + If ucrVariablesAsFactorDotPlot.bSingleVariable Then + ucrVariablesAsFactorDotPlot.ucrSingleVariable.Focus() + Else + ucrVariablesAsFactorDotPlot.ucrMultipleVariables.Focus() + End If TestOkEnabled() End Sub diff --git a/instat/dlgRugPlot.Designer.vb b/instat/dlgRugPlot.Designer.vb index d381f3e5c19..c42df8a65e4 100644 --- a/instat/dlgRugPlot.Designer.vb +++ b/instat/dlgRugPlot.Designer.vb @@ -36,14 +36,14 @@ Partial Class dlgRugPlot ' 'ucrSaveRugPlot ' - Me.ucrSaveRugPlot.Location = New System.Drawing.Point(18, 273) + Me.ucrSaveRugPlot.Location = New System.Drawing.Point(10, 264) Me.ucrSaveRugPlot.Name = "ucrSaveRugPlot" Me.ucrSaveRugPlot.Size = New System.Drawing.Size(265, 20) Me.ucrSaveRugPlot.TabIndex = 18 ' 'cmdOptions ' - Me.cmdOptions.Location = New System.Drawing.Point(18, 237) + Me.cmdOptions.Location = New System.Drawing.Point(10, 233) Me.cmdOptions.Name = "cmdOptions" Me.cmdOptions.Size = New System.Drawing.Size(120, 25) Me.cmdOptions.TabIndex = 16 @@ -53,7 +53,7 @@ Partial Class dlgRugPlot ' 'cmdRugPlotOptions ' - Me.cmdRugPlotOptions.Location = New System.Drawing.Point(18, 202) + Me.cmdRugPlotOptions.Location = New System.Drawing.Point(10, 202) Me.cmdRugPlotOptions.Name = "cmdRugPlotOptions" Me.cmdRugPlotOptions.Size = New System.Drawing.Size(120, 25) Me.cmdRugPlotOptions.TabIndex = 15 @@ -64,8 +64,8 @@ Partial Class dlgRugPlot 'ucrRugPlotSelector ' Me.ucrRugPlotSelector.bShowHiddenColumns = False - Me.ucrRugPlotSelector.bUseCurrentFilter = False - Me.ucrRugPlotSelector.Location = New System.Drawing.Point(18, 8) + Me.ucrRugPlotSelector.bUseCurrentFilter = True + Me.ucrRugPlotSelector.Location = New System.Drawing.Point(10, 10) Me.ucrRugPlotSelector.Margin = New System.Windows.Forms.Padding(0) Me.ucrRugPlotSelector.Name = "ucrRugPlotSelector" Me.ucrRugPlotSelector.Size = New System.Drawing.Size(210, 180) @@ -73,14 +73,14 @@ Partial Class dlgRugPlot ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(18, 304) + Me.ucrBase.Location = New System.Drawing.Point(10, 290) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 17 ' 'ucrVariablesAsFactorForRugPlot ' - Me.ucrVariablesAsFactorForRugPlot.Location = New System.Drawing.Point(284, 31) + Me.ucrVariablesAsFactorForRugPlot.Location = New System.Drawing.Point(273, 31) Me.ucrVariablesAsFactorForRugPlot.Name = "ucrVariablesAsFactorForRugPlot" Me.ucrVariablesAsFactorForRugPlot.Size = New System.Drawing.Size(125, 136) Me.ucrVariablesAsFactorForRugPlot.TabIndex = 19 @@ -88,7 +88,7 @@ Partial Class dlgRugPlot ' 'ucrFactorOptionalReceiver ' - Me.ucrFactorOptionalReceiver.Location = New System.Drawing.Point(285, 238) + Me.ucrFactorOptionalReceiver.Location = New System.Drawing.Point(273, 238) Me.ucrFactorOptionalReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrFactorOptionalReceiver.Name = "ucrFactorOptionalReceiver" Me.ucrFactorOptionalReceiver.Selector = Nothing @@ -98,16 +98,16 @@ Partial Class dlgRugPlot 'lblFactorOptional ' Me.lblFactorOptional.AutoSize = True - Me.lblFactorOptional.Location = New System.Drawing.Point(285, 223) + Me.lblFactorOptional.Location = New System.Drawing.Point(276, 224) Me.lblFactorOptional.Name = "lblFactorOptional" - Me.lblFactorOptional.Size = New System.Drawing.Size(108, 13) + Me.lblFactorOptional.Size = New System.Drawing.Size(111, 13) Me.lblFactorOptional.TabIndex = 22 - Me.lblFactorOptional.Tag = "By_Variable_Optional" - Me.lblFactorOptional.Text = "By Variable (Optional)" + Me.lblFactorOptional.Tag = "By_Variable_Optional:" + Me.lblFactorOptional.Text = "By Variable (Optional):" ' 'ucrReceiverX ' - Me.ucrReceiverX.Location = New System.Drawing.Point(285, 192) + Me.ucrReceiverX.Location = New System.Drawing.Point(273, 197) Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverX.Name = "ucrReceiverX" Me.ucrReceiverX.Selector = Nothing @@ -117,18 +117,18 @@ Partial Class dlgRugPlot 'lblXVariable ' Me.lblXVariable.AutoSize = True - Me.lblXVariable.Location = New System.Drawing.Point(284, 176) + Me.lblXVariable.Location = New System.Drawing.Point(276, 183) Me.lblXVariable.Name = "lblXVariable" - Me.lblXVariable.Size = New System.Drawing.Size(64, 13) + Me.lblXVariable.Size = New System.Drawing.Size(58, 13) Me.lblXVariable.TabIndex = 20 - Me.lblXVariable.Tag = "X_Variable" - Me.lblXVariable.Text = "X - Variable" + Me.lblXVariable.Tag = "X_Variable:" + Me.lblXVariable.Text = "X Variable:" ' 'dlgRugPlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(444, 370) + Me.ClientSize = New System.Drawing.Size(419, 349) Me.Controls.Add(Me.ucrVariablesAsFactorForRugPlot) Me.Controls.Add(Me.ucrFactorOptionalReceiver) Me.Controls.Add(Me.lblFactorOptional) diff --git a/instat/dlgRugPlot.vb b/instat/dlgRugPlot.vb index 70f58c6a344..9cfef5c0963 100644 --- a/instat/dlgRugPlot.vb +++ b/instat/dlgRugPlot.vb @@ -88,7 +88,6 @@ Public Class dlgRugPlot 'wrong topic ucrSaveRugPlot.SetDataFrameSelector(ucrRugPlotSelector.ucrAvailableDataFrames) - ucrSaveRugPlot.strPrefix = "Rug" ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False End Sub @@ -98,6 +97,7 @@ Public Class dlgRugPlot ucrRugPlotSelector.Reset() ucrRugPlotSelector.Focus() ucrVariablesAsFactorForRugPlot.ResetControl() + ucrSaveRugPlot.strPrefix = "Rug" sdgPlots.Reset() TestOkEnabled() End Sub @@ -117,6 +117,11 @@ Public Class dlgRugPlot Else clsRaesFunction.RemoveParameterByName("y") End If + If ucrVariablesAsFactorForRugPlot.bSingleVariable Then + ucrVariablesAsFactorForRugPlot.ucrSingleVariable.Focus() + Else + ucrVariablesAsFactorForRugPlot.ucrMultipleVariables.Focus() + End If TestOkEnabled() End Sub From 52310f12d7e5ce5b082f298839811788f594e223 Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 16:21:09 +0000 Subject: [PATCH 03/16] removed focus code for when you change from single ot multiple --- instat/dlgDotPlot.vb | 5 ----- instat/dlgRugPlot.vb | 5 ----- 2 files changed, 10 deletions(-) diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb index f59b77a6885..746843fd572 100644 --- a/instat/dlgDotPlot.vb +++ b/instat/dlgDotPlot.vb @@ -133,11 +133,6 @@ Public Class dlgDotPlot clsRaesFunction.AddParameter("y", ucrVariablesAsFactorDotPlot.GetVariableNames(False)) clsRgeom_dotplot.AddParameter("binaxis", Chr(34) & "y" & Chr(34)) End If - If ucrVariablesAsFactorDotPlot.bSingleVariable Then - ucrVariablesAsFactorDotPlot.ucrSingleVariable.Focus() - Else - ucrVariablesAsFactorDotPlot.ucrMultipleVariables.Focus() - End If TestOkEnabled() End Sub diff --git a/instat/dlgRugPlot.vb b/instat/dlgRugPlot.vb index 9cfef5c0963..9dff6784dc6 100644 --- a/instat/dlgRugPlot.vb +++ b/instat/dlgRugPlot.vb @@ -117,11 +117,6 @@ Public Class dlgRugPlot Else clsRaesFunction.RemoveParameterByName("y") End If - If ucrVariablesAsFactorForRugPlot.bSingleVariable Then - ucrVariablesAsFactorForRugPlot.ucrSingleVariable.Focus() - Else - ucrVariablesAsFactorForRugPlot.ucrMultipleVariables.Focus() - End If TestOkEnabled() End Sub From 7fdd93d60e8ad952c4a6c7d04ed540e8e46c8b90 Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 17:54:54 +0000 Subject: [PATCH 04/16] sdgPCA edits --- .../sdgPrincipalComponentAnalysis.Designer.vb | 23 ++++++++++--------- instat/sdgPrincipalComponentAnalysis.vb | 3 ++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/instat/sdgPrincipalComponentAnalysis.Designer.vb b/instat/sdgPrincipalComponentAnalysis.Designer.vb index 11c8fa77209..092269c32a2 100644 --- a/instat/sdgPrincipalComponentAnalysis.Designer.vb +++ b/instat/sdgPrincipalComponentAnalysis.Designer.vb @@ -76,11 +76,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.rdoPointBip = New System.Windows.Forms.RadioButton() Me.lblBipInd = New System.Windows.Forms.Label() Me.tbBarPlot = New System.Windows.Forms.TabPage() + Me.ucrReceiverFactor = New instat.ucrReceiverSingle() Me.ucrSelectorFactor = New instat.ucrSelectorByDataFrameAddRemove() Me.lblFactorVariable = New System.Windows.Forms.Label() Me.tbSave = New System.Windows.Forms.TabPage() Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() - Me.ucrReceiverFactor = New instat.ucrReceiverSingle() Me.tbRegOptions.SuspendLayout() Me.tbDisplay.SuspendLayout() Me.tbGraphics.SuspendLayout() @@ -690,10 +690,19 @@ Partial Class sdgPrincipalComponentAnalysis Me.tbBarPlot.Text = "Bar Plot" Me.tbBarPlot.UseVisualStyleBackColor = True ' + 'ucrReceiverFactor + ' + Me.ucrReceiverFactor.Location = New System.Drawing.Point(255, 44) + Me.ucrReceiverFactor.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFactor.Name = "ucrReceiverFactor" + Me.ucrReceiverFactor.Selector = Nothing + Me.ucrReceiverFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverFactor.TabIndex = 5 + ' 'ucrSelectorFactor ' Me.ucrSelectorFactor.bShowHiddenColumns = False - Me.ucrSelectorFactor.bUseCurrentFilter = False + Me.ucrSelectorFactor.bUseCurrentFilter = True Me.ucrSelectorFactor.Location = New System.Drawing.Point(12, 8) Me.ucrSelectorFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorFactor.Name = "ucrSelectorFactor" @@ -728,15 +737,6 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrSdgButtons.Size = New System.Drawing.Size(142, 30) Me.ucrSdgButtons.TabIndex = 0 ' - 'ucrReceiverFactor - ' - Me.ucrReceiverFactor.Location = New System.Drawing.Point(255, 44) - Me.ucrReceiverFactor.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverFactor.Name = "ucrReceiverFactor" - Me.ucrReceiverFactor.Selector = Nothing - Me.ucrReceiverFactor.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverFactor.TabIndex = 5 - ' 'sdgPrincipalComponentAnalysis ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -748,6 +748,7 @@ Partial Class sdgPrincipalComponentAnalysis Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgPrincipalComponentAnalysis" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Tag = "PCA_Options" Me.Text = "PCA Options" Me.tbRegOptions.ResumeLayout(False) diff --git a/instat/sdgPrincipalComponentAnalysis.vb b/instat/sdgPrincipalComponentAnalysis.vb index 79e1c0abc56..969c07df660 100644 --- a/instat/sdgPrincipalComponentAnalysis.vb +++ b/instat/sdgPrincipalComponentAnalysis.vb @@ -38,7 +38,7 @@ Public Class sdgPrincipalComponentAnalysis chkEigenValues.Checked = True chkEigenVectors.Checked = True chkScores.Checked = True - chkResiduals.Checked = True + chkResiduals.Checked = False ' this is temporary chkRotation.Checked = True rdoBarGeom.Checked = False rdoLineGeom.Checked = False @@ -57,6 +57,7 @@ Public Class sdgPrincipalComponentAnalysis rdoScreePlot.Checked = True rdoBarPlot.Checked = False nudDim2Var.Value = 2 + chkResiduals.Enabled = False ' this is temporary Dimensions() End Sub From f472e3272bfc4bb52df2afbfe7e9a221c23148e8 Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 18:04:16 +0000 Subject: [PATCH 05/16] dlg and sdg for canonical correlations --- ...dlgCanonicalCorrelationAnalysis.Designer.vb | 18 +++++++++--------- instat/sdgCanonicalCorrelation.Designer.vb | 11 ++++++----- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/instat/dlgCanonicalCorrelationAnalysis.Designer.vb b/instat/dlgCanonicalCorrelationAnalysis.Designer.vb index 90741c21774..9933abc200e 100644 --- a/instat/dlgCanonicalCorrelationAnalysis.Designer.vb +++ b/instat/dlgCanonicalCorrelationAnalysis.Designer.vb @@ -35,25 +35,25 @@ Partial Class dlgCanonicalCorrelationAnalysis ' 'lblYVariables ' - Me.lblYVariables.Location = New System.Drawing.Point(291, 15) + Me.lblYVariables.Location = New System.Drawing.Point(267, 25) Me.lblYVariables.Name = "lblYVariables" - Me.lblYVariables.Size = New System.Drawing.Size(100, 23) + Me.lblYVariables.Size = New System.Drawing.Size(100, 19) Me.lblYVariables.TabIndex = 4 - Me.lblYVariables.Tag = "Y_Variables" + Me.lblYVariables.Tag = "Y_Variables:" Me.lblYVariables.Text = "Y Variables:" ' 'lblXVariables ' - Me.lblXVariables.Location = New System.Drawing.Point(290, 144) + Me.lblXVariables.Location = New System.Drawing.Point(269, 152) Me.lblXVariables.Name = "lblXVariables" Me.lblXVariables.Size = New System.Drawing.Size(100, 23) Me.lblXVariables.TabIndex = 3 - Me.lblXVariables.Tag = "X_Variables" + Me.lblXVariables.Tag = "X_Variables:" Me.lblXVariables.Text = "X Variables:" ' 'cmdCCAOptions ' - Me.cmdCCAOptions.Location = New System.Drawing.Point(313, 270) + Me.cmdCCAOptions.Location = New System.Drawing.Point(291, 270) Me.cmdCCAOptions.Name = "cmdCCAOptions" Me.cmdCCAOptions.Size = New System.Drawing.Size(95, 23) Me.cmdCCAOptions.TabIndex = 2 @@ -73,7 +73,7 @@ Partial Class dlgCanonicalCorrelationAnalysis ' 'ucrReceiverXvariables ' - Me.ucrReceiverXvariables.Location = New System.Drawing.Point(288, 161) + Me.ucrReceiverXvariables.Location = New System.Drawing.Point(266, 167) Me.ucrReceiverXvariables.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverXvariables.Name = "ucrReceiverXvariables" Me.ucrReceiverXvariables.Selector = Nothing @@ -90,7 +90,7 @@ Partial Class dlgCanonicalCorrelationAnalysis ' 'ucrReceiverYvariables ' - Me.ucrReceiverYvariables.Location = New System.Drawing.Point(288, 34) + Me.ucrReceiverYvariables.Location = New System.Drawing.Point(266, 40) Me.ucrReceiverYvariables.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYvariables.Name = "ucrReceiverYvariables" Me.ucrReceiverYvariables.Selector = Nothing @@ -100,7 +100,7 @@ Partial Class dlgCanonicalCorrelationAnalysis 'ucrSelectorCCA ' Me.ucrSelectorCCA.bShowHiddenColumns = False - Me.ucrSelectorCCA.bUseCurrentFilter = False + Me.ucrSelectorCCA.bUseCurrentFilter = True Me.ucrSelectorCCA.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorCCA.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCCA.Name = "ucrSelectorCCA" diff --git a/instat/sdgCanonicalCorrelation.Designer.vb b/instat/sdgCanonicalCorrelation.Designer.vb index edba0b11655..c1a220f2986 100644 --- a/instat/sdgCanonicalCorrelation.Designer.vb +++ b/instat/sdgCanonicalCorrelation.Designer.vb @@ -62,7 +62,7 @@ Partial Class sdgCanonicalCorrelation 'chkCoef ' Me.chkCoef.AutoSize = True - Me.chkCoef.Location = New System.Drawing.Point(6, 49) + Me.chkCoef.Location = New System.Drawing.Point(10, 39) Me.chkCoef.Name = "chkCoef" Me.chkCoef.Size = New System.Drawing.Size(81, 17) Me.chkCoef.TabIndex = 1 @@ -73,7 +73,7 @@ Partial Class sdgCanonicalCorrelation 'chkCanonicalCorrelations ' Me.chkCanonicalCorrelations.AutoSize = True - Me.chkCanonicalCorrelations.Location = New System.Drawing.Point(6, 15) + Me.chkCanonicalCorrelations.Location = New System.Drawing.Point(10, 15) Me.chkCanonicalCorrelations.Name = "chkCanonicalCorrelations" Me.chkCanonicalCorrelations.Size = New System.Drawing.Size(131, 17) Me.chkCanonicalCorrelations.TabIndex = 0 @@ -98,7 +98,7 @@ Partial Class sdgCanonicalCorrelation 'rdoYVariables ' Me.rdoYVariables.AutoSize = True - Me.rdoYVariables.Location = New System.Drawing.Point(117, 33) + Me.rdoYVariables.Location = New System.Drawing.Point(18, 61) Me.rdoYVariables.Name = "rdoYVariables" Me.rdoYVariables.Size = New System.Drawing.Size(78, 17) Me.rdoYVariables.TabIndex = 3 @@ -110,7 +110,7 @@ Partial Class sdgCanonicalCorrelation 'rdoXVariables ' Me.rdoXVariables.AutoSize = True - Me.rdoXVariables.Location = New System.Drawing.Point(35, 33) + Me.rdoXVariables.Location = New System.Drawing.Point(18, 38) Me.rdoXVariables.Name = "rdoXVariables" Me.rdoXVariables.Size = New System.Drawing.Size(78, 17) Me.rdoXVariables.TabIndex = 2 @@ -122,7 +122,7 @@ Partial Class sdgCanonicalCorrelation 'chkPairwisePlot ' Me.chkPairwisePlot.AutoSize = True - Me.chkPairwisePlot.Location = New System.Drawing.Point(14, 20) + Me.chkPairwisePlot.Location = New System.Drawing.Point(10, 15) Me.chkPairwisePlot.Name = "chkPairwisePlot" Me.chkPairwisePlot.Size = New System.Drawing.Size(86, 17) Me.chkPairwisePlot.TabIndex = 1 @@ -148,6 +148,7 @@ Partial Class sdgCanonicalCorrelation Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgCanonicalCorrelation" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Tag = "PCA_Options" Me.Text = "PCA Options" Me.tbRegOptions.ResumeLayout(False) From d53c462c9f6d6c147456ee18afd4d371f1347fe6 Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 18:41:32 +0000 Subject: [PATCH 06/16] dlgDisplayDaily Test Ok Disabled --- instat/dlgDisplayDaily.Designer.vb | 103 +++++++++++++++-------------- instat/dlgDisplayDaily.vb | 2 +- 2 files changed, 54 insertions(+), 51 deletions(-) diff --git a/instat/dlgDisplayDaily.Designer.vb b/instat/dlgDisplayDaily.Designer.vb index 6d9ba91e6eb..bc99afb9ce7 100644 --- a/instat/dlgDisplayDaily.Designer.vb +++ b/instat/dlgDisplayDaily.Designer.vb @@ -32,13 +32,13 @@ Partial Class dlgDisplayDaily Me.lblThreshold = New System.Windows.Forms.Label() Me.lblSummaryNames = New System.Windows.Forms.Label() Me.lblMonth_Summaries = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() Me.chkMonthAbbreviation = New System.Windows.Forms.CheckBox() Me.ucrBase = New instat.ucrButtons() Me.ucrInputMonthSummaries = New instat.ucrInputTextBox() Me.ucrInputVariable = New instat.ucrInputTextBox() Me.ucrInputDayDisplay = New instat.ucrInputTextBox() Me.ucrInputSummaryNames = New instat.ucrInputTextBox() + Me.UcrDialogDisabled1 = New instat.ucrDialogDisabled() CType(Me.nudDecimalPlaces, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudThreshold, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -46,7 +46,7 @@ Partial Class dlgDisplayDaily 'chkPrintTables ' Me.chkPrintTables.AutoSize = True - Me.chkPrintTables.Location = New System.Drawing.Point(194, 220) + Me.chkPrintTables.Location = New System.Drawing.Point(15, 186) Me.chkPrintTables.Name = "chkPrintTables" Me.chkPrintTables.Size = New System.Drawing.Size(82, 17) Me.chkPrintTables.TabIndex = 1 @@ -57,7 +57,7 @@ Partial Class dlgDisplayDaily 'chkRemoveNA ' Me.chkRemoveNA.AutoSize = True - Me.chkRemoveNA.Location = New System.Drawing.Point(301, 220) + Me.chkRemoveNA.Location = New System.Drawing.Point(15, 209) Me.chkRemoveNA.Name = "chkRemoveNA" Me.chkRemoveNA.Size = New System.Drawing.Size(139, 17) Me.chkRemoveNA.TabIndex = 2 @@ -67,92 +67,83 @@ Partial Class dlgDisplayDaily ' 'nudDecimalPlaces ' - Me.nudDecimalPlaces.Location = New System.Drawing.Point(346, 132) + Me.nudDecimalPlaces.Location = New System.Drawing.Point(326, 109) Me.nudDecimalPlaces.Maximum = New Decimal(New Integer() {3, 0, 0, 0}) Me.nudDecimalPlaces.Name = "nudDecimalPlaces" - Me.nudDecimalPlaces.Size = New System.Drawing.Size(67, 20) + Me.nudDecimalPlaces.Size = New System.Drawing.Size(49, 20) Me.nudDecimalPlaces.TabIndex = 3 ' 'nudThreshold ' - Me.nudThreshold.Location = New System.Drawing.Point(109, 127) + Me.nudThreshold.Location = New System.Drawing.Point(116, 109) Me.nudThreshold.Name = "nudThreshold" - Me.nudThreshold.Size = New System.Drawing.Size(76, 20) + Me.nudThreshold.Size = New System.Drawing.Size(49, 20) Me.nudThreshold.TabIndex = 4 ' 'lblVariable ' Me.lblVariable.AutoSize = True - Me.lblVariable.Location = New System.Drawing.Point(27, 65) + Me.lblVariable.Location = New System.Drawing.Point(12, 58) Me.lblVariable.Name = "lblVariable" - Me.lblVariable.Size = New System.Drawing.Size(45, 13) + Me.lblVariable.Size = New System.Drawing.Size(48, 13) Me.lblVariable.TabIndex = 10 - Me.lblVariable.Tag = "Variable" - Me.lblVariable.Text = "Variable" + Me.lblVariable.Tag = "Variable:" + Me.lblVariable.Text = "Variable:" ' 'lblDayDisplay ' Me.lblDayDisplay.AutoSize = True - Me.lblDayDisplay.Location = New System.Drawing.Point(27, 94) + Me.lblDayDisplay.Location = New System.Drawing.Point(12, 85) Me.lblDayDisplay.Name = "lblDayDisplay" - Me.lblDayDisplay.Size = New System.Drawing.Size(63, 13) + Me.lblDayDisplay.Size = New System.Drawing.Size(66, 13) Me.lblDayDisplay.TabIndex = 11 - Me.lblDayDisplay.Tag = "Day_Display" - Me.lblDayDisplay.Text = "Day Display" + Me.lblDayDisplay.Tag = "Day_Display:" + Me.lblDayDisplay.Text = "Day Display:" ' 'lblDecimalPlaces ' Me.lblDecimalPlaces.AutoSize = True - Me.lblDecimalPlaces.Location = New System.Drawing.Point(236, 134) + Me.lblDecimalPlaces.Location = New System.Drawing.Point(237, 112) Me.lblDecimalPlaces.Name = "lblDecimalPlaces" - Me.lblDecimalPlaces.Size = New System.Drawing.Size(80, 13) + Me.lblDecimalPlaces.Size = New System.Drawing.Size(83, 13) Me.lblDecimalPlaces.TabIndex = 12 - Me.lblDecimalPlaces.Tag = "Decimal_Places" - Me.lblDecimalPlaces.Text = "Decimal Places" + Me.lblDecimalPlaces.Tag = "Decimal_Places:" + Me.lblDecimalPlaces.Text = "Decimal Places:" ' 'lblThreshold ' Me.lblThreshold.AutoSize = True - Me.lblThreshold.Location = New System.Drawing.Point(27, 134) + Me.lblThreshold.Location = New System.Drawing.Point(12, 112) Me.lblThreshold.Name = "lblThreshold" - Me.lblThreshold.Size = New System.Drawing.Size(54, 13) + Me.lblThreshold.Size = New System.Drawing.Size(57, 13) Me.lblThreshold.TabIndex = 13 - Me.lblThreshold.Tag = "Threshold" - Me.lblThreshold.Text = "Threshold" + Me.lblThreshold.Tag = "Threshold:" + Me.lblThreshold.Text = "Threshold:" ' 'lblSummaryNames ' Me.lblSummaryNames.AutoSize = True - Me.lblSummaryNames.Location = New System.Drawing.Point(27, 177) + Me.lblSummaryNames.Location = New System.Drawing.Point(12, 139) Me.lblSummaryNames.Name = "lblSummaryNames" - Me.lblSummaryNames.Size = New System.Drawing.Size(86, 13) + Me.lblSummaryNames.Size = New System.Drawing.Size(89, 13) Me.lblSummaryNames.TabIndex = 14 - Me.lblSummaryNames.Tag = "Summary_Names" - Me.lblSummaryNames.Text = "Summary Names" + Me.lblSummaryNames.Tag = "Summary_Names:" + 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.Location = New System.Drawing.Point(12, 31) Me.lblMonth_Summaries.Name = "lblMonth_Summaries" - Me.lblMonth_Summaries.Size = New System.Drawing.Size(91, 13) + Me.lblMonth_Summaries.Size = New System.Drawing.Size(94, 13) Me.lblMonth_Summaries.TabIndex = 16 - Me.lblMonth_Summaries.Tag = "Month_Summaries" - Me.lblMonth_Summaries.Text = "Month Summaries" - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(82, 9) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(88, 13) - Me.Label3.TabIndex = 17 - Me.Label3.Text = "Not implememted" + Me.lblMonth_Summaries.Tag = "Month_Summaries:" + Me.lblMonth_Summaries.Text = "Month Summaries:" ' 'chkMonthAbbreviation ' Me.chkMonthAbbreviation.AutoSize = True - Me.chkMonthAbbreviation.Location = New System.Drawing.Point(30, 220) + Me.chkMonthAbbreviation.Location = New System.Drawing.Point(15, 163) Me.chkMonthAbbreviation.Name = "chkMonthAbbreviation" Me.chkMonthAbbreviation.Size = New System.Drawing.Size(118, 17) Me.chkMonthAbbreviation.TabIndex = 18 @@ -162,50 +153,62 @@ Partial Class dlgDisplayDaily ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(30, 243) + Me.ucrBase.Location = New System.Drawing.Point(15, 232) 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.IsReadOnly = False + Me.ucrInputMonthSummaries.Location = New System.Drawing.Point(116, 28) 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.IsReadOnly = False + Me.ucrInputVariable.Location = New System.Drawing.Point(116, 55) 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.IsReadOnly = False + Me.ucrInputDayDisplay.Location = New System.Drawing.Point(116, 82) 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.IsReadOnly = False + Me.ucrInputSummaryNames.Location = New System.Drawing.Point(116, 136) Me.ucrInputSummaryNames.Name = "ucrInputSummaryNames" - Me.ucrInputSummaryNames.Size = New System.Drawing.Size(90, 21) + Me.ucrInputSummaryNames.Size = New System.Drawing.Size(100, 21) Me.ucrInputSummaryNames.TabIndex = 22 ' + 'UcrDialogDisabled1 + ' + Me.UcrDialogDisabled1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UcrDialogDisabled1.Location = New System.Drawing.Point(93, 107) + Me.UcrDialogDisabled1.Name = "UcrDialogDisabled1" + Me.UcrDialogDisabled1.Size = New System.Drawing.Size(240, 50) + Me.UcrDialogDisabled1.TabIndex = 23 + ' '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, 304) + Me.ClientSize = New System.Drawing.Size(427, 291) + Me.Controls.Add(Me.UcrDialogDisabled1) 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) Me.Controls.Add(Me.lblSummaryNames) Me.Controls.Add(Me.lblThreshold) @@ -241,10 +244,10 @@ Partial Class dlgDisplayDaily Friend WithEvents lblThreshold As Label Friend WithEvents lblSummaryNames As Label Friend WithEvents lblMonth_Summaries As Label - Friend WithEvents Label3 As Label Friend WithEvents chkMonthAbbreviation As CheckBox Friend WithEvents ucrInputMonthSummaries As ucrInputTextBox Friend WithEvents ucrInputVariable As ucrInputTextBox Friend WithEvents ucrInputDayDisplay As ucrInputTextBox Friend WithEvents ucrInputSummaryNames As ucrInputTextBox + Friend WithEvents UcrDialogDisabled1 As ucrDialogDisabled End Class diff --git a/instat/dlgDisplayDaily.vb b/instat/dlgDisplayDaily.vb index 8f9344a711e..a3b2b163b43 100644 --- a/instat/dlgDisplayDaily.vb +++ b/instat/dlgDisplayDaily.vb @@ -34,7 +34,7 @@ Public Class dlgDisplayDaily ucrBase.clsRsyntax.SetFunction("climate_obj$display_daily_rain()") End Sub Private Sub SetDefaults() - + ucrBase.OKEnabled(False) End Sub Private Sub ReopenDialog() From 99c04d6c8b077aedf613d1cbe93f69aa9164430b Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 18:53:59 +0000 Subject: [PATCH 07/16] dlgStartofRains --- instat/dlgStartofRains.Designer.vb | 90 +++++++++++++++--------------- instat/dlgStartofRains.vb | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/instat/dlgStartofRains.Designer.vb b/instat/dlgStartofRains.Designer.vb index 6d4b888ef8e..41fe5b59f7d 100644 --- a/instat/dlgStartofRains.Designer.vb +++ b/instat/dlgStartofRains.Designer.vb @@ -22,7 +22,6 @@ Partial Class dlgStartofRains 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.lblDataList = New System.Windows.Forms.Label() Me.lblEarliest = New System.Windows.Forms.Label() Me.nudNumberofRainDays = New System.Windows.Forms.NumericUpDown() Me.lblThreshold = New System.Windows.Forms.Label() @@ -40,6 +39,7 @@ Partial Class dlgStartofRains Me.nudThreashold = New System.Windows.Forms.NumericUpDown() Me.ucrBase = New instat.ucrButtons() Me.ucrInputColumnName = New instat.ucrInputTextBox() + Me.UcrDialogDisabled1 = New instat.ucrDialogDisabled() CType(Me.nudNumberofRainDays, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudTotalRain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.nudWithin, System.ComponentModel.ISupportInitialize).BeginInit() @@ -48,77 +48,67 @@ Partial Class dlgStartofRains CType(Me.nudThreashold, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'lblDataList - ' - Me.lblDataList.AutoSize = True - Me.lblDataList.Location = New System.Drawing.Point(36, 35) - Me.lblDataList.Name = "lblDataList" - Me.lblDataList.Size = New System.Drawing.Size(106, 13) - Me.lblDataList.TabIndex = 1 - Me.lblDataList.Tag = "Not_Yet_Implemented" - Me.lblDataList.Text = "Not Yet Implemented" - ' 'lblEarliest ' Me.lblEarliest.AutoSize = True - Me.lblEarliest.Location = New System.Drawing.Point(39, 75) + Me.lblEarliest.Location = New System.Drawing.Point(9, 15) Me.lblEarliest.Name = "lblEarliest" - Me.lblEarliest.Size = New System.Drawing.Size(61, 13) + Me.lblEarliest.Size = New System.Drawing.Size(66, 13) Me.lblEarliest.TabIndex = 2 Me.lblEarliest.Tag = "Earliest_day" - Me.lblEarliest.Text = "Earliest day" + Me.lblEarliest.Text = "Earliest Day:" ' 'nudNumberofRainDays ' - Me.nudNumberofRainDays.Location = New System.Drawing.Point(192, 110) + Me.nudNumberofRainDays.Location = New System.Drawing.Point(133, 60) Me.nudNumberofRainDays.Name = "nudNumberofRainDays" - Me.nudNumberofRainDays.Size = New System.Drawing.Size(35, 20) + Me.nudNumberofRainDays.Size = New System.Drawing.Size(53, 20) Me.nudNumberofRainDays.TabIndex = 4 Me.nudNumberofRainDays.Value = New Decimal(New Integer() {2, 0, 0, 0}) ' 'lblThreshold ' Me.lblThreshold.AutoSize = True - Me.lblThreshold.Location = New System.Drawing.Point(39, 95) + Me.lblThreshold.Location = New System.Drawing.Point(9, 40) Me.lblThreshold.Name = "lblThreshold" - Me.lblThreshold.Size = New System.Drawing.Size(54, 13) + Me.lblThreshold.Size = New System.Drawing.Size(57, 13) Me.lblThreshold.TabIndex = 5 Me.lblThreshold.Tag = "Threshold" - Me.lblThreshold.Text = "Threshold" + Me.lblThreshold.Text = "Threshold:" ' 'lblNumberRainDays ' Me.lblNumberRainDays.AutoSize = True - Me.lblNumberRainDays.Location = New System.Drawing.Point(39, 115) + Me.lblNumberRainDays.Location = New System.Drawing.Point(9, 65) Me.lblNumberRainDays.Name = "lblNumberRainDays" - Me.lblNumberRainDays.Size = New System.Drawing.Size(108, 13) + Me.lblNumberRainDays.Size = New System.Drawing.Size(111, 13) Me.lblNumberRainDays.TabIndex = 7 Me.lblNumberRainDays.Tag = "Number_of_Rain_Days" - Me.lblNumberRainDays.Text = "Number of Rain Days" + Me.lblNumberRainDays.Text = "Number of Rain Days:" ' 'lblTotalRain ' Me.lblTotalRain.AutoSize = True - Me.lblTotalRain.Location = New System.Drawing.Point(39, 135) + Me.lblTotalRain.Location = New System.Drawing.Point(10, 90) Me.lblTotalRain.Name = "lblTotalRain" - Me.lblTotalRain.Size = New System.Drawing.Size(56, 13) + Me.lblTotalRain.Size = New System.Drawing.Size(59, 13) Me.lblTotalRain.TabIndex = 8 Me.lblTotalRain.Tag = "Total_Rain" - Me.lblTotalRain.Text = "Total Rain" + Me.lblTotalRain.Text = "Total Rain:" ' 'nudTotalRain ' - Me.nudTotalRain.Location = New System.Drawing.Point(192, 131) + Me.nudTotalRain.Location = New System.Drawing.Point(133, 85) Me.nudTotalRain.Maximum = New Decimal(New Integer() {200, 0, 0, 0}) Me.nudTotalRain.Name = "nudTotalRain" - Me.nudTotalRain.Size = New System.Drawing.Size(35, 20) + Me.nudTotalRain.Size = New System.Drawing.Size(53, 20) Me.nudTotalRain.TabIndex = 9 Me.nudTotalRain.Value = New Decimal(New Integer() {20, 0, 0, 0}) ' 'chkDrySpell ' Me.chkDrySpell.AutoSize = True - Me.chkDrySpell.Location = New System.Drawing.Point(12, 163) + Me.chkDrySpell.Location = New System.Drawing.Point(14, 135) Me.chkDrySpell.Name = "chkDrySpell" Me.chkDrySpell.Size = New System.Drawing.Size(68, 17) Me.chkDrySpell.TabIndex = 10 @@ -128,7 +118,7 @@ Partial Class dlgStartofRains ' 'nudWithin ' - Me.nudWithin.Location = New System.Drawing.Point(288, 189) + Me.nudWithin.Location = New System.Drawing.Point(151, 174) Me.nudWithin.Maximum = New Decimal(New Integer() {200, 0, 0, 0}) Me.nudWithin.Name = "nudWithin" Me.nudWithin.Size = New System.Drawing.Size(35, 20) @@ -138,7 +128,7 @@ Partial Class dlgStartofRains 'lblWithin ' Me.lblWithin.AutoSize = True - Me.lblWithin.Location = New System.Drawing.Point(233, 193) + Me.lblWithin.Location = New System.Drawing.Point(106, 178) Me.lblWithin.Name = "lblWithin" Me.lblWithin.Size = New System.Drawing.Size(37, 13) Me.lblWithin.TabIndex = 13 @@ -148,16 +138,16 @@ Partial Class dlgStartofRains 'lblDryLength ' Me.lblDryLength.AutoSize = True - Me.lblDryLength.Location = New System.Drawing.Point(39, 193) + Me.lblDryLength.Location = New System.Drawing.Point(23, 158) Me.lblDryLength.Name = "lblDryLength" - Me.lblDryLength.Size = New System.Drawing.Size(97, 13) + Me.lblDryLength.Size = New System.Drawing.Size(100, 13) Me.lblDryLength.TabIndex = 12 Me.lblDryLength.Tag = "Length_of_Dry_Spell" - Me.lblDryLength.Text = "Length of Dry Spell" + Me.lblDryLength.Text = "Length of Dry Spell:" ' 'nudDryLength ' - Me.nudDryLength.Location = New System.Drawing.Point(192, 189) + Me.nudDryLength.Location = New System.Drawing.Point(65, 174) Me.nudDryLength.Name = "nudDryLength" Me.nudDryLength.Size = New System.Drawing.Size(35, 20) Me.nudDryLength.TabIndex = 11 @@ -166,7 +156,7 @@ Partial Class dlgStartofRains 'lblDays ' Me.lblDays.AutoSize = True - Me.lblDays.Location = New System.Drawing.Point(329, 193) + Me.lblDays.Location = New System.Drawing.Point(192, 176) Me.lblDays.Name = "lblDays" Me.lblDays.Size = New System.Drawing.Size(31, 13) Me.lblDays.TabIndex = 15 @@ -176,16 +166,16 @@ Partial Class dlgStartofRains 'lblColumnName ' Me.lblColumnName.AutoSize = True - Me.lblColumnName.Location = New System.Drawing.Point(39, 230) + Me.lblColumnName.Location = New System.Drawing.Point(11, 221) Me.lblColumnName.Name = "lblColumnName" - Me.lblColumnName.Size = New System.Drawing.Size(73, 13) + Me.lblColumnName.Size = New System.Drawing.Size(76, 13) Me.lblColumnName.TabIndex = 16 Me.lblColumnName.Tag = "Column_Name" - Me.lblColumnName.Text = "Column Name" + Me.lblColumnName.Text = "Column Name:" ' 'nudEarliest ' - Me.nudEarliest.Location = New System.Drawing.Point(192, 68) + Me.nudEarliest.Location = New System.Drawing.Point(133, 12) Me.nudEarliest.Maximum = New Decimal(New Integer() {366, 0, 0, 0}) Me.nudEarliest.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) Me.nudEarliest.Name = "nudEarliest" @@ -197,7 +187,7 @@ Partial Class dlgStartofRains ' Me.nudThreashold.DecimalPlaces = 2 Me.nudThreashold.Increment = New Decimal(New Integer() {1, 0, 0, 65536}) - Me.nudThreashold.Location = New System.Drawing.Point(192, 89) + Me.nudThreashold.Location = New System.Drawing.Point(133, 36) Me.nudThreashold.Name = "nudThreashold" Me.nudThreashold.Size = New System.Drawing.Size(53, 20) Me.nudThreashold.TabIndex = 19 @@ -205,23 +195,33 @@ Partial Class dlgStartofRains ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(14, 275) + Me.ucrBase.Location = New System.Drawing.Point(12, 245) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(409, 52) Me.ucrBase.TabIndex = 0 ' 'ucrInputColumnName ' - Me.ucrInputColumnName.Location = New System.Drawing.Point(192, 221) + Me.ucrInputColumnName.IsReadOnly = False + Me.ucrInputColumnName.Location = New System.Drawing.Point(95, 218) Me.ucrInputColumnName.Name = "ucrInputColumnName" Me.ucrInputColumnName.Size = New System.Drawing.Size(142, 21) Me.ucrInputColumnName.TabIndex = 20 ' + 'UcrDialogDisabled1 + ' + Me.UcrDialogDisabled1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UcrDialogDisabled1.Location = New System.Drawing.Point(88, 141) + Me.UcrDialogDisabled1.Name = "UcrDialogDisabled1" + Me.UcrDialogDisabled1.Size = New System.Drawing.Size(240, 50) + Me.UcrDialogDisabled1.TabIndex = 21 + ' 'dlgStartofRains ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(449, 328) + Me.ClientSize = New System.Drawing.Size(419, 304) + Me.Controls.Add(Me.UcrDialogDisabled1) Me.Controls.Add(Me.ucrInputColumnName) Me.Controls.Add(Me.nudThreashold) Me.Controls.Add(Me.nudEarliest) @@ -238,12 +238,12 @@ Partial Class dlgStartofRains Me.Controls.Add(Me.lblThreshold) Me.Controls.Add(Me.nudNumberofRainDays) Me.Controls.Add(Me.lblEarliest) - Me.Controls.Add(Me.lblDataList) Me.Controls.Add(Me.ucrBase) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgStartofRains" Me.ShowIcon = False + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Start of Rains" CType(Me.nudNumberofRainDays, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.nudTotalRain, System.ComponentModel.ISupportInitialize).EndInit() @@ -257,7 +257,6 @@ Partial Class dlgStartofRains End Sub Friend WithEvents ucrBase As ucrButtons - Friend WithEvents lblDataList As Label Friend WithEvents lblEarliest As Label Friend WithEvents nudNumberofRainDays As NumericUpDown Friend WithEvents lblThreshold As Label @@ -274,4 +273,5 @@ Partial Class dlgStartofRains Friend WithEvents nudEarliest As NumericUpDown Friend WithEvents nudThreashold As NumericUpDown Friend WithEvents ucrInputColumnName As ucrInputTextBox + Friend WithEvents UcrDialogDisabled1 As ucrDialogDisabled End Class diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 495bac2c0fe..14c1cedd7d3 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -53,7 +53,7 @@ Public Class dlgStartofRains End Sub Private Sub SetDefaults() - + ucrBase.OKEnabled(False) End Sub Private Sub ReopenDialog() From a488038c7002b7096d16f20d3a0d2924a56dd66c Mon Sep 17 00:00:00 2001 From: FrancoisJRenaud Date: Sun, 6 Nov 2016 22:15:00 +0300 Subject: [PATCH 08/16] Default Flip Coordinates button on dlgBarAndPieChart --- instat/dlgBarAndPieChart.Designer.vb | 14 ++++++++++++++ instat/dlgBarAndPieChart.vb | 15 +++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb index 6b6bc42d401..2231b12d32a 100644 --- a/instat/dlgBarAndPieChart.Designer.vb +++ b/instat/dlgBarAndPieChart.Designer.vb @@ -35,6 +35,7 @@ Partial Class dlgBarAndPieChart Me.rdoPieChart = New System.Windows.Forms.RadioButton() Me.rdoBarChart = New System.Windows.Forms.RadioButton() Me.grpSelection = New System.Windows.Forms.GroupBox() + Me.chkFlipCoordinates = New System.Windows.Forms.CheckBox() Me.grpSelection.SuspendLayout() Me.SuspendLayout() ' @@ -164,11 +165,23 @@ Partial Class dlgBarAndPieChart Me.grpSelection.TabIndex = 0 Me.grpSelection.TabStop = False ' + 'chkFlipCoordinates + ' + Me.chkFlipCoordinates.AutoSize = True + Me.chkFlipCoordinates.Location = New System.Drawing.Point(258, 249) + Me.chkFlipCoordinates.Name = "chkFlipCoordinates" + Me.chkFlipCoordinates.Size = New System.Drawing.Size(100, 17) + Me.chkFlipCoordinates.TabIndex = 10 + Me.chkFlipCoordinates.Tag = "Horizontal_Boxplot" + Me.chkFlipCoordinates.Text = "Flip coordinates" + Me.chkFlipCoordinates.UseVisualStyleBackColor = True + ' 'dlgBarAndPieChart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(421, 379) + Me.Controls.Add(Me.chkFlipCoordinates) Me.Controls.Add(Me.ucrSaveBar) Me.Controls.Add(Me.grpSelection) Me.Controls.Add(Me.cmdOptions) @@ -207,4 +220,5 @@ Partial Class dlgBarAndPieChart Friend WithEvents rdoPieChart As RadioButton Friend WithEvents rdoBarChart As RadioButton Friend WithEvents grpSelection As GroupBox + Friend WithEvents chkFlipCoordinates As CheckBox End Class diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 37b6e22e3de..e0b2d08f88d 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -43,6 +43,7 @@ Public Class dlgBarAndPieChart ucrFactorReceiver.SetMeAsReceiver() ucrSaveBar.Reset() sdgPlots.Reset() + chkFlipCoordinates.Checked = False End Sub Private Sub InitialiseDialog() @@ -197,4 +198,18 @@ Public Class dlgBarAndPieChart Private Sub ucrSaveBar_ContentsChanged() Handles ucrSaveBar.ContentsChanged TestOKEnabled() End Sub + + Public Sub SetCoordFlip() + Dim clsTempRFunc As New RFunction + If chkFlipCoordinates.Checked Then + clsTempRFunc.SetRCommand("coord_flip") + ucrBase.clsRsyntax.AddOperatorParameter("coord_flip", clsRFunc:=clsTempRFunc) + Else + ucrBase.clsRsyntax.RemoveOperatorParameter("coord_flip") + End If + End Sub + + Private Sub chkFlipCoordinates_CheckedChanged(sender As Object, e As EventArgs) Handles chkFlipCoordinates.CheckedChanged + SetCoordFlip() + End Sub End Class \ No newline at end of file From a533fdae83e848e3f91aff5ee9a3751cc3149e48 Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 19:24:54 +0000 Subject: [PATCH 09/16] sdgPlots and ucrAxes changes --- instat/sdgPlots.Designer.vb | 68 +++++++++++++++--------------- instat/sdgPlots.vb | 12 ++++-- instat/ucrAxes.Designer.vb | 84 ++++++++++++++++++------------------- instat/ucrAxes.vb | 9 ++++ 4 files changed, 94 insertions(+), 79 deletions(-) diff --git a/instat/sdgPlots.Designer.vb b/instat/sdgPlots.Designer.vb index cba3d0e7636..98f6aa721d8 100644 --- a/instat/sdgPlots.Designer.vb +++ b/instat/sdgPlots.Designer.vb @@ -24,6 +24,7 @@ Partial Class sdgPlots Private Sub InitializeComponent() Me.tabctrlBoxSubdialog = New System.Windows.Forms.TabControl() Me.tabFacet = New System.Windows.Forms.TabPage() + Me.chkFreeSpace = New System.Windows.Forms.CheckBox() Me.ucrFacetSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.nudNoOfRowsOrColumns = New System.Windows.Forms.NumericUpDown() Me.chkNoOfRowsOrColumns = New System.Windows.Forms.CheckBox() @@ -59,7 +60,6 @@ Partial Class sdgPlots Me.ucrInputThemes = New instat.ucrInputComboBox() Me.lblTheme = New System.Windows.Forms.Label() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.chkFreeSpace = New System.Windows.Forms.CheckBox() Me.tabctrlBoxSubdialog.SuspendLayout() Me.tabFacet.SuspendLayout() CType(Me.nudNoOfRowsOrColumns, System.ComponentModel.ISupportInitialize).BeginInit() @@ -110,10 +110,21 @@ Partial Class sdgPlots Me.tabFacet.Text = "Facets" Me.tabFacet.UseVisualStyleBackColor = True ' + 'chkFreeSpace + ' + Me.chkFreeSpace.AutoSize = True + Me.chkFreeSpace.Location = New System.Drawing.Point(273, 252) + Me.chkFreeSpace.Name = "chkFreeSpace" + Me.chkFreeSpace.Size = New System.Drawing.Size(81, 17) + Me.chkFreeSpace.TabIndex = 21 + Me.chkFreeSpace.Tag = "Free_scales" + Me.chkFreeSpace.Text = "Free Space" + Me.chkFreeSpace.UseVisualStyleBackColor = True + ' 'ucrFacetSelector ' Me.ucrFacetSelector.bShowHiddenColumns = False - Me.ucrFacetSelector.bUseCurrentFilter = False + Me.ucrFacetSelector.bUseCurrentFilter = True Me.ucrFacetSelector.Location = New System.Drawing.Point(8, 36) Me.ucrFacetSelector.Margin = New System.Windows.Forms.Padding(0) Me.ucrFacetSelector.Name = "ucrFacetSelector" @@ -122,25 +133,25 @@ Partial Class sdgPlots ' 'nudNoOfRowsOrColumns ' - Me.nudNoOfRowsOrColumns.Location = New System.Drawing.Point(172, 262) + Me.nudNoOfRowsOrColumns.Location = New System.Drawing.Point(169, 261) Me.nudNoOfRowsOrColumns.Name = "nudNoOfRowsOrColumns" - Me.nudNoOfRowsOrColumns.Size = New System.Drawing.Size(39, 20) + Me.nudNoOfRowsOrColumns.Size = New System.Drawing.Size(47, 20) Me.nudNoOfRowsOrColumns.TabIndex = 19 ' 'chkNoOfRowsOrColumns ' Me.chkNoOfRowsOrColumns.AutoSize = True - Me.chkNoOfRowsOrColumns.Location = New System.Drawing.Point(8, 264) + Me.chkNoOfRowsOrColumns.Location = New System.Drawing.Point(8, 263) Me.chkNoOfRowsOrColumns.Name = "chkNoOfRowsOrColumns" - Me.chkNoOfRowsOrColumns.Size = New System.Drawing.Size(133, 17) + Me.chkNoOfRowsOrColumns.Size = New System.Drawing.Size(136, 17) Me.chkNoOfRowsOrColumns.TabIndex = 18 - Me.chkNoOfRowsOrColumns.Text = "Fixed Number of Rows" + Me.chkNoOfRowsOrColumns.Text = "Fixed Number of Rows:" Me.chkNoOfRowsOrColumns.UseVisualStyleBackColor = True ' 'chkIncludeFacets ' Me.chkIncludeFacets.AutoSize = True - Me.chkIncludeFacets.Location = New System.Drawing.Point(8, 11) + Me.chkIncludeFacets.Location = New System.Drawing.Point(8, 12) Me.chkIncludeFacets.Name = "chkIncludeFacets" Me.chkIncludeFacets.Size = New System.Drawing.Size(96, 17) Me.chkIncludeFacets.TabIndex = 16 @@ -151,7 +162,7 @@ Partial Class sdgPlots 'chkFreeScalesY ' Me.chkFreeScalesY.AutoSize = True - Me.chkFreeScalesY.Location = New System.Drawing.Point(273, 241) + Me.chkFreeScalesY.Location = New System.Drawing.Point(273, 229) Me.chkFreeScalesY.Name = "chkFreeScalesY" Me.chkFreeScalesY.Size = New System.Drawing.Size(114, 17) Me.chkFreeScalesY.TabIndex = 14 @@ -172,7 +183,7 @@ Partial Class sdgPlots 'chkFreeScalesX ' Me.chkFreeScalesX.AutoSize = True - Me.chkFreeScalesX.Location = New System.Drawing.Point(273, 212) + Me.chkFreeScalesX.Location = New System.Drawing.Point(273, 206) Me.chkFreeScalesX.Name = "chkFreeScalesX" Me.chkFreeScalesX.Size = New System.Drawing.Size(114, 17) Me.chkFreeScalesX.TabIndex = 12 @@ -207,21 +218,21 @@ Partial Class sdgPlots 'lblFactor2 ' Me.lblFactor2.AutoSize = True - Me.lblFactor2.Location = New System.Drawing.Point(270, 133) + Me.lblFactor2.Location = New System.Drawing.Point(274, 133) Me.lblFactor2.Name = "lblFactor2" - Me.lblFactor2.Size = New System.Drawing.Size(106, 13) + Me.lblFactor2.Size = New System.Drawing.Size(109, 13) Me.lblFactor2.TabIndex = 4 - Me.lblFactor2.Text = "2nd Factor (Optional)" + Me.lblFactor2.Text = "2nd Factor (Optional):" ' 'lblFactor1 ' Me.lblFactor1.AutoSize = True - Me.lblFactor1.Location = New System.Drawing.Point(270, 80) + Me.lblFactor1.Location = New System.Drawing.Point(272, 78) Me.lblFactor1.Name = "lblFactor1" - Me.lblFactor1.Size = New System.Drawing.Size(54, 13) + Me.lblFactor1.Size = New System.Drawing.Size(57, 13) Me.lblFactor1.TabIndex = 3 Me.lblFactor1.Tag = "" - Me.lblFactor1.Text = "1st Factor" + Me.lblFactor1.Text = "1st Factor:" ' 'ucr2ndFactorReceiver ' @@ -277,18 +288,18 @@ Partial Class sdgPlots 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(10, 32) + Me.Label1.Location = New System.Drawing.Point(7, 17) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(59, 13) + Me.Label1.Size = New System.Drawing.Size(62, 13) Me.Label1.TabIndex = 10 - Me.Label1.Text = "Graph Title" + Me.Label1.Text = "Graph Title:" ' 'ucrInputGraphTitle ' Me.ucrInputGraphTitle.IsReadOnly = False - Me.ucrInputGraphTitle.Location = New System.Drawing.Point(72, 29) + Me.ucrInputGraphTitle.Location = New System.Drawing.Point(75, 14) Me.ucrInputGraphTitle.Name = "ucrInputGraphTitle" - Me.ucrInputGraphTitle.Size = New System.Drawing.Size(170, 21) + Me.ucrInputGraphTitle.Size = New System.Drawing.Size(166, 21) Me.ucrInputGraphTitle.TabIndex = 9 ' 'grpLegendTitle @@ -298,7 +309,7 @@ Partial Class sdgPlots Me.grpLegendTitle.Controls.Add(Me.chkDisplayLegendTitle) Me.grpLegendTitle.Controls.Add(Me.chkOverwriteLegendTitle) Me.grpLegendTitle.Controls.Add(Me.rdoLegendTitleAuto) - Me.grpLegendTitle.Location = New System.Drawing.Point(7, 81) + Me.grpLegendTitle.Location = New System.Drawing.Point(6, 57) Me.grpLegendTitle.Name = "grpLegendTitle" Me.grpLegendTitle.Size = New System.Drawing.Size(278, 130) Me.grpLegendTitle.TabIndex = 8 @@ -308,7 +319,7 @@ Partial Class sdgPlots 'ucrInputLegend ' Me.ucrInputLegend.IsReadOnly = False - Me.ucrInputLegend.Location = New System.Drawing.Point(106, 94) + Me.ucrInputLegend.Location = New System.Drawing.Point(106, 92) Me.ucrInputLegend.Name = "ucrInputLegend" Me.ucrInputLegend.Size = New System.Drawing.Size(166, 21) Me.ucrInputLegend.TabIndex = 11 @@ -457,17 +468,6 @@ Partial Class sdgPlots Me.ucrBaseSubdialog.Size = New System.Drawing.Size(160, 41) Me.ucrBaseSubdialog.TabIndex = 1 ' - 'chkFreeSpace - ' - Me.chkFreeSpace.AutoSize = True - Me.chkFreeSpace.Location = New System.Drawing.Point(273, 269) - Me.chkFreeSpace.Name = "chkFreeSpace" - Me.chkFreeSpace.Size = New System.Drawing.Size(81, 17) - Me.chkFreeSpace.TabIndex = 21 - Me.chkFreeSpace.Tag = "Free_scales" - Me.chkFreeSpace.Text = "Free Space" - Me.chkFreeSpace.UseVisualStyleBackColor = True - ' 'sdgPlots ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index bd75aa56ad0..2d1ba5af942 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -64,10 +64,12 @@ Public Class sdgPlots LegendDefaults() bLayersDefaultIsGlobal = False End Sub + Private Sub TitleDefaults() chkDisplayLegendTitle.Checked = True chkOverwriteLegendTitle.Checked = False ucrInputLegend.Visible = False + ucrInputGraphTitle.ResetText() End Sub Public Sub Reset() @@ -125,12 +127,17 @@ Public Class sdgPlots rdoHorizontal.Visible = True rdoHorizontal.Checked = True rdoVertical.Visible = True - chkNoOfRowsOrColumns.Visible = True chkNoOfRowsOrColumns.Checked = False nudNoOfRowsOrColumns.Visible = True + nudNoOfRowsOrColumns.Value = 0 + chkMargin.Checked = False + chkFreeScalesX.Checked = False + chkFreeScalesY.Checked = False + chkFreeSpace.Checked = False chkMargin.Visible = True chkFreeScalesX.Visible = True chkFreeScalesY.Visible = True + chkFreeSpace.Visible = True 'In case IncludeFacets is checked, the facets need to be set. Still might not be included as RSyntax parameter if no no variable has been set for faceting, but this is then decided in the IncludeFacetsParameter below. SetFacets() SecondFactorReceiverEnabled() @@ -147,6 +154,7 @@ Public Class sdgPlots chkFreeScalesY.Visible = False chkNoOfRowsOrColumns.Visible = False nudNoOfRowsOrColumns.Visible = False + chkFreeSpace.Visible = False End If 'Then the RSyntax is populated with the appropriate facet parameter (as part of the whole ggplot script) or not. IncludeFacetsParameter() @@ -326,7 +334,6 @@ Public Class sdgPlots End If End Sub - Private Sub chkChangeLegendTitle_CheckedChanged(sender As Object, e As EventArgs) Handles chkDisplayLegendTitle.CheckedChanged 'The Overwrite Legend Title check box should only be available when the Display Legend Title is ticked. If chkDisplayLegendTitle.Checked Then @@ -377,7 +384,6 @@ Public Class sdgPlots chkOverwriteLegendTitle.Checked = False ucrInputLegend.Visible = False ucrInputLegend.ResetText() - ElseIf rdoLegendTitleCustom.Checked Then chkDisplayLegendTitle.Visible = True chkOverwriteLegendTitle.Visible = True diff --git a/instat/ucrAxes.Designer.vb b/instat/ucrAxes.Designer.vb index edef5b57984..a44a554155e 100644 --- a/instat/ucrAxes.Designer.vb +++ b/instat/ucrAxes.Designer.vb @@ -25,15 +25,12 @@ Partial Class ucrAxes Me.grpAxisTitle = New System.Windows.Forms.GroupBox() Me.rdoTitleCustom = New System.Windows.Forms.RadioButton() Me.rdoTitleAuto = New System.Windows.Forms.RadioButton() - Me.ucrOverwriteTitle = New instat.ucrInputTextBox() Me.chkOverwriteTitle = New System.Windows.Forms.CheckBox() Me.chkDisplayTitle = New System.Windows.Forms.CheckBox() Me.grpTickMarkers = New System.Windows.Forms.GroupBox() - Me.ucrTickMarkers = New instat.ucrInputComboBox() Me.lblTickMarkersNoOfDecimalPlaces = New System.Windows.Forms.Label() Me.nudTickMarkersNoOfDecimalPlaces = New System.Windows.Forms.NumericUpDown() Me.rdoTickMarkersAuto = New System.Windows.Forms.RadioButton() - Me.ucrSpecificValues = New instat.ucrInputTextBox() Me.rdoTickMarkersCustom = New System.Windows.Forms.RadioButton() Me.nudInStepsOf = New System.Windows.Forms.NumericUpDown() Me.lblInStepsOf = New System.Windows.Forms.Label() @@ -50,6 +47,9 @@ Partial Class ucrAxes Me.lblLowerLimit = New System.Windows.Forms.Label() Me.rdoScalesCustom = New System.Windows.Forms.RadioButton() Me.rdoScalesAuto = New System.Windows.Forms.RadioButton() + Me.ucrTickMarkers = New instat.ucrInputComboBox() + Me.ucrSpecificValues = New instat.ucrInputTextBox() + Me.ucrOverwriteTitle = New instat.ucrInputTextBox() Me.grpAxisTitle.SuspendLayout() Me.grpTickMarkers.SuspendLayout() CType(Me.nudTickMarkersNoOfDecimalPlaces, System.ComponentModel.ISupportInitialize).BeginInit() @@ -98,14 +98,6 @@ Partial Class ucrAxes Me.rdoTitleAuto.Text = "Auto" Me.rdoTitleAuto.UseVisualStyleBackColor = True ' - 'ucrOverwriteTitle - ' - Me.ucrOverwriteTitle.IsReadOnly = False - Me.ucrOverwriteTitle.Location = New System.Drawing.Point(98, 79) - Me.ucrOverwriteTitle.Name = "ucrOverwriteTitle" - Me.ucrOverwriteTitle.Size = New System.Drawing.Size(137, 21) - Me.ucrOverwriteTitle.TabIndex = 1 - ' 'chkOverwriteTitle ' Me.chkOverwriteTitle.AutoSize = True @@ -147,22 +139,14 @@ Partial Class ucrAxes Me.grpTickMarkers.TabStop = False Me.grpTickMarkers.Text = "Tick Marks" ' - 'ucrTickMarkers - ' - Me.ucrTickMarkers.IsReadOnly = False - Me.ucrTickMarkers.Location = New System.Drawing.Point(6, 51) - Me.ucrTickMarkers.Name = "ucrTickMarkers" - Me.ucrTickMarkers.Size = New System.Drawing.Size(137, 21) - Me.ucrTickMarkers.TabIndex = 16 - ' 'lblTickMarkersNoOfDecimalPlaces ' Me.lblTickMarkersNoOfDecimalPlaces.AutoSize = True Me.lblTickMarkersNoOfDecimalPlaces.Location = New System.Drawing.Point(3, 118) Me.lblTickMarkersNoOfDecimalPlaces.Name = "lblTickMarkersNoOfDecimalPlaces" - Me.lblTickMarkersNoOfDecimalPlaces.Size = New System.Drawing.Size(132, 13) + Me.lblTickMarkersNoOfDecimalPlaces.Size = New System.Drawing.Size(135, 13) Me.lblTickMarkersNoOfDecimalPlaces.TabIndex = 10 - Me.lblTickMarkersNoOfDecimalPlaces.Text = "Number of Decimal Places" + Me.lblTickMarkersNoOfDecimalPlaces.Text = "Number of Decimal Places:" ' 'nudTickMarkersNoOfDecimalPlaces ' @@ -182,14 +166,6 @@ Partial Class ucrAxes Me.rdoTickMarkersAuto.Text = "Auto" Me.rdoTickMarkersAuto.UseVisualStyleBackColor = True ' - 'ucrSpecificValues - ' - Me.ucrSpecificValues.IsReadOnly = False - Me.ucrSpecificValues.Location = New System.Drawing.Point(6, 78) - Me.ucrSpecificValues.Name = "ucrSpecificValues" - Me.ucrSpecificValues.Size = New System.Drawing.Size(173, 21) - Me.ucrSpecificValues.TabIndex = 15 - ' 'rdoTickMarkersCustom ' Me.rdoTickMarkersCustom.AutoSize = True @@ -213,18 +189,18 @@ Partial Class ucrAxes Me.lblInStepsOf.AutoSize = True Me.lblInStepsOf.Location = New System.Drawing.Point(6, 221) Me.lblInStepsOf.Name = "lblInStepsOf" - Me.lblInStepsOf.Size = New System.Drawing.Size(58, 13) + Me.lblInStepsOf.Size = New System.Drawing.Size(61, 13) Me.lblInStepsOf.TabIndex = 9 - Me.lblInStepsOf.Text = "In Steps of" + Me.lblInStepsOf.Text = "In Steps of:" ' 'lblFrom ' Me.lblFrom.AutoSize = True Me.lblFrom.Location = New System.Drawing.Point(6, 149) Me.lblFrom.Name = "lblFrom" - Me.lblFrom.Size = New System.Drawing.Size(30, 13) + Me.lblFrom.Size = New System.Drawing.Size(33, 13) Me.lblFrom.TabIndex = 5 - Me.lblFrom.Text = "From" + Me.lblFrom.Text = "From:" ' 'nudFrom ' @@ -245,9 +221,9 @@ Partial Class ucrAxes Me.lblTo.AutoSize = True Me.lblTo.Location = New System.Drawing.Point(6, 186) Me.lblTo.Name = "lblTo" - Me.lblTo.Size = New System.Drawing.Size(20, 13) + Me.lblTo.Size = New System.Drawing.Size(23, 13) Me.lblTo.TabIndex = 6 - Me.lblTo.Text = "To" + Me.lblTo.Text = "To:" ' 'grpScales ' @@ -268,7 +244,7 @@ Partial Class ucrAxes ' 'nudScalesNoOfDecimalPlaces ' - Me.nudScalesNoOfDecimalPlaces.Location = New System.Drawing.Point(140, 119) + Me.nudScalesNoOfDecimalPlaces.Location = New System.Drawing.Point(140, 118) Me.nudScalesNoOfDecimalPlaces.Name = "nudScalesNoOfDecimalPlaces" Me.nudScalesNoOfDecimalPlaces.Size = New System.Drawing.Size(39, 20) Me.nudScalesNoOfDecimalPlaces.TabIndex = 7 @@ -278,9 +254,9 @@ Partial Class ucrAxes Me.lblScalesNoDecimalPlaces.AutoSize = True Me.lblScalesNoDecimalPlaces.Location = New System.Drawing.Point(3, 121) Me.lblScalesNoDecimalPlaces.Name = "lblScalesNoDecimalPlaces" - Me.lblScalesNoDecimalPlaces.Size = New System.Drawing.Size(132, 13) + Me.lblScalesNoDecimalPlaces.Size = New System.Drawing.Size(135, 13) Me.lblScalesNoDecimalPlaces.TabIndex = 6 - Me.lblScalesNoDecimalPlaces.Text = "Number of Decimal Places" + Me.lblScalesNoDecimalPlaces.Text = "Number of Decimal Places:" ' 'nudUpperLimit ' @@ -301,18 +277,18 @@ Partial Class ucrAxes Me.lblUpperLimit.AutoSize = True Me.lblUpperLimit.Location = New System.Drawing.Point(3, 87) Me.lblUpperLimit.Name = "lblUpperLimit" - Me.lblUpperLimit.Size = New System.Drawing.Size(63, 13) + Me.lblUpperLimit.Size = New System.Drawing.Size(66, 13) Me.lblUpperLimit.TabIndex = 5 - Me.lblUpperLimit.Text = "Upper Limit " + Me.lblUpperLimit.Text = "Upper Limit :" ' 'lblLowerLimit ' Me.lblLowerLimit.AutoSize = True Me.lblLowerLimit.Location = New System.Drawing.Point(3, 54) Me.lblLowerLimit.Name = "lblLowerLimit" - Me.lblLowerLimit.Size = New System.Drawing.Size(63, 13) + Me.lblLowerLimit.Size = New System.Drawing.Size(66, 13) Me.lblLowerLimit.TabIndex = 3 - Me.lblLowerLimit.Text = "Lower Limit " + Me.lblLowerLimit.Text = "Lower Limit :" ' 'rdoScalesCustom ' @@ -336,6 +312,30 @@ Partial Class ucrAxes Me.rdoScalesAuto.Text = "Auto" Me.rdoScalesAuto.UseVisualStyleBackColor = True ' + 'ucrTickMarkers + ' + Me.ucrTickMarkers.IsReadOnly = False + Me.ucrTickMarkers.Location = New System.Drawing.Point(6, 51) + Me.ucrTickMarkers.Name = "ucrTickMarkers" + Me.ucrTickMarkers.Size = New System.Drawing.Size(137, 21) + Me.ucrTickMarkers.TabIndex = 16 + ' + 'ucrSpecificValues + ' + Me.ucrSpecificValues.IsReadOnly = False + Me.ucrSpecificValues.Location = New System.Drawing.Point(6, 78) + Me.ucrSpecificValues.Name = "ucrSpecificValues" + Me.ucrSpecificValues.Size = New System.Drawing.Size(173, 21) + Me.ucrSpecificValues.TabIndex = 15 + ' + 'ucrOverwriteTitle + ' + Me.ucrOverwriteTitle.IsReadOnly = False + Me.ucrOverwriteTitle.Location = New System.Drawing.Point(106, 78) + Me.ucrOverwriteTitle.Name = "ucrOverwriteTitle" + Me.ucrOverwriteTitle.Size = New System.Drawing.Size(131, 21) + Me.ucrOverwriteTitle.TabIndex = 1 + ' 'ucrAxes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index 2a4bd27c0b1..e423c299d09 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -40,6 +40,15 @@ Public Class ucrAxes ScalesDefaults() TickMarkersDefaults() ucrTickMarkers.SetName("Interval") + TitleFunction() + ucrOverwriteTitle.SetName("") + nudTickMarkersNoOfDecimalPlaces.Value = 0 + nudFrom.Value = 0 + nudTo.Value = 0 + nudInStepsOf.Value = 0 + nudLowerLimit.Value = 0 + nudUpperLimit.Value = 0 + nudScalesNoOfDecimalPlaces.Value = 0 End Sub Public Sub Reset() From 498c7d3d3387ce198c4d380f9256fbe7b5bafc36 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Sun, 6 Nov 2016 22:52:59 +0300 Subject: [PATCH 10/16] lined up and aligned aes receivers on layers dialog --- instat/UcrGeomListWithAes.designer.vb | 44 +++++++++++++-------------- instat/sdgLayerOptions.Designer.vb | 16 +++++----- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/instat/UcrGeomListWithAes.designer.vb b/instat/UcrGeomListWithAes.designer.vb index 92756749b8a..34de52b393f 100644 --- a/instat/UcrGeomListWithAes.designer.vb +++ b/instat/UcrGeomListWithAes.designer.vb @@ -50,7 +50,7 @@ Partial Class UcrGeomListWithParameters 'UcrSelector ' Me.UcrSelector.bShowHiddenColumns = False - Me.UcrSelector.bUseCurrentFilter = False + Me.UcrSelector.bUseCurrentFilter = True Me.UcrSelector.Location = New System.Drawing.Point(3, 56) Me.UcrSelector.Margin = New System.Windows.Forms.Padding(0) Me.UcrSelector.Name = "UcrSelector" @@ -67,7 +67,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam1 ' - Me.ucrReceiverParam1.Location = New System.Drawing.Point(98, 25) + Me.ucrReceiverParam1.Location = New System.Drawing.Point(97, 25) Me.ucrReceiverParam1.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam1.Name = "ucrReceiverParam1" Me.ucrReceiverParam1.Selector = Nothing @@ -76,7 +76,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam2 ' - Me.ucrReceiverParam2.Location = New System.Drawing.Point(98, 53) + Me.ucrReceiverParam2.Location = New System.Drawing.Point(97, 51) Me.ucrReceiverParam2.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam2.Name = "ucrReceiverParam2" Me.ucrReceiverParam2.Selector = Nothing @@ -85,7 +85,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam3 ' - Me.ucrReceiverParam3.Location = New System.Drawing.Point(98, 81) + Me.ucrReceiverParam3.Location = New System.Drawing.Point(97, 77) Me.ucrReceiverParam3.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam3.Name = "ucrReceiverParam3" Me.ucrReceiverParam3.Selector = Nothing @@ -94,7 +94,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam4 ' - Me.ucrReceiverParam4.Location = New System.Drawing.Point(98, 109) + Me.ucrReceiverParam4.Location = New System.Drawing.Point(97, 103) Me.ucrReceiverParam4.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam4.Name = "ucrReceiverParam4" Me.ucrReceiverParam4.Selector = Nothing @@ -103,7 +103,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam5 ' - Me.ucrReceiverParam5.Location = New System.Drawing.Point(98, 137) + Me.ucrReceiverParam5.Location = New System.Drawing.Point(97, 129) Me.ucrReceiverParam5.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam5.Name = "ucrReceiverParam5" Me.ucrReceiverParam5.Selector = Nothing @@ -134,7 +134,7 @@ Partial Class UcrGeomListWithParameters Me.grpAesList.Controls.Add(Me.ucrReceiverParam2) Me.grpAesList.Location = New System.Drawing.Point(242, 19) Me.grpAesList.Name = "grpAesList" - Me.grpAesList.Size = New System.Drawing.Size(219, 296) + Me.grpAesList.Size = New System.Drawing.Size(219, 321) Me.grpAesList.TabIndex = 9 Me.grpAesList.TabStop = False Me.grpAesList.Text = "Geom Aesthetics" @@ -142,7 +142,7 @@ Partial Class UcrGeomListWithParameters 'lblGgParam6 ' Me.lblGgParam6.AutoSize = True - Me.lblGgParam6.Location = New System.Drawing.Point(7, 165) + Me.lblGgParam6.Location = New System.Drawing.Point(7, 159) Me.lblGgParam6.Name = "lblGgParam6" Me.lblGgParam6.Size = New System.Drawing.Size(29, 13) Me.lblGgParam6.TabIndex = 10 @@ -151,7 +151,7 @@ Partial Class UcrGeomListWithParameters 'lblGgParam10 ' Me.lblGgParam10.AutoSize = True - Me.lblGgParam10.Location = New System.Drawing.Point(6, 267) + Me.lblGgParam10.Location = New System.Drawing.Point(7, 263) Me.lblGgParam10.Name = "lblGgParam10" Me.lblGgParam10.Size = New System.Drawing.Size(39, 13) Me.lblGgParam10.TabIndex = 10 @@ -160,7 +160,7 @@ Partial Class UcrGeomListWithParameters 'lblGgParam9 ' Me.lblGgParam9.AutoSize = True - Me.lblGgParam9.Location = New System.Drawing.Point(7, 241) + Me.lblGgParam9.Location = New System.Drawing.Point(7, 237) Me.lblGgParam9.Name = "lblGgParam9" Me.lblGgParam9.Size = New System.Drawing.Size(39, 13) Me.lblGgParam9.TabIndex = 10 @@ -169,7 +169,7 @@ Partial Class UcrGeomListWithParameters 'lblGgParam8 ' Me.lblGgParam8.AutoSize = True - Me.lblGgParam8.Location = New System.Drawing.Point(6, 216) + Me.lblGgParam8.Location = New System.Drawing.Point(7, 211) Me.lblGgParam8.Name = "lblGgParam8" Me.lblGgParam8.Size = New System.Drawing.Size(39, 13) Me.lblGgParam8.TabIndex = 10 @@ -178,7 +178,7 @@ Partial Class UcrGeomListWithParameters 'lblGgParam7 ' Me.lblGgParam7.AutoSize = True - Me.lblGgParam7.Location = New System.Drawing.Point(7, 193) + Me.lblGgParam7.Location = New System.Drawing.Point(7, 185) Me.lblGgParam7.Name = "lblGgParam7" Me.lblGgParam7.Size = New System.Drawing.Size(39, 13) Me.lblGgParam7.TabIndex = 10 @@ -187,7 +187,7 @@ Partial Class UcrGeomListWithParameters 'lblGgParam5 ' Me.lblGgParam5.AutoSize = True - Me.lblGgParam5.Location = New System.Drawing.Point(7, 137) + Me.lblGgParam5.Location = New System.Drawing.Point(7, 133) Me.lblGgParam5.Name = "lblGgParam5" Me.lblGgParam5.Size = New System.Drawing.Size(39, 13) Me.lblGgParam5.TabIndex = 10 @@ -196,7 +196,7 @@ Partial Class UcrGeomListWithParameters 'lblGgParam4 ' Me.lblGgParam4.AutoSize = True - Me.lblGgParam4.Location = New System.Drawing.Point(7, 109) + Me.lblGgParam4.Location = New System.Drawing.Point(7, 107) Me.lblGgParam4.Name = "lblGgParam4" Me.lblGgParam4.Size = New System.Drawing.Size(39, 13) Me.lblGgParam4.TabIndex = 10 @@ -214,7 +214,7 @@ Partial Class UcrGeomListWithParameters 'lblGgParam2 ' Me.lblGgParam2.AutoSize = True - Me.lblGgParam2.Location = New System.Drawing.Point(7, 53) + Me.lblGgParam2.Location = New System.Drawing.Point(7, 55) Me.lblGgParam2.Name = "lblGgParam2" Me.lblGgParam2.Size = New System.Drawing.Size(39, 13) Me.lblGgParam2.TabIndex = 10 @@ -223,7 +223,7 @@ Partial Class UcrGeomListWithParameters 'lblGgParam1 ' Me.lblGgParam1.AutoSize = True - Me.lblGgParam1.Location = New System.Drawing.Point(7, 25) + Me.lblGgParam1.Location = New System.Drawing.Point(7, 29) Me.lblGgParam1.Name = "lblGgParam1" Me.lblGgParam1.Size = New System.Drawing.Size(39, 13) Me.lblGgParam1.TabIndex = 9 @@ -231,7 +231,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam10 ' - Me.ucrReceiverParam10.Location = New System.Drawing.Point(97, 267) + Me.ucrReceiverParam10.Location = New System.Drawing.Point(97, 259) Me.ucrReceiverParam10.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam10.Name = "ucrReceiverParam10" Me.ucrReceiverParam10.Selector = Nothing @@ -240,7 +240,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam9 ' - Me.ucrReceiverParam9.Location = New System.Drawing.Point(98, 241) + Me.ucrReceiverParam9.Location = New System.Drawing.Point(97, 233) Me.ucrReceiverParam9.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam9.Name = "ucrReceiverParam9" Me.ucrReceiverParam9.Selector = Nothing @@ -249,7 +249,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam8 ' - Me.ucrReceiverParam8.Location = New System.Drawing.Point(97, 216) + Me.ucrReceiverParam8.Location = New System.Drawing.Point(97, 207) Me.ucrReceiverParam8.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam8.Name = "ucrReceiverParam8" Me.ucrReceiverParam8.Selector = Nothing @@ -258,7 +258,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam7 ' - Me.ucrReceiverParam7.Location = New System.Drawing.Point(98, 193) + Me.ucrReceiverParam7.Location = New System.Drawing.Point(97, 181) Me.ucrReceiverParam7.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam7.Name = "ucrReceiverParam7" Me.ucrReceiverParam7.Selector = Nothing @@ -267,7 +267,7 @@ Partial Class UcrGeomListWithParameters ' 'ucrReceiverParam6 ' - Me.ucrReceiverParam6.Location = New System.Drawing.Point(98, 165) + Me.ucrReceiverParam6.Location = New System.Drawing.Point(97, 155) Me.ucrReceiverParam6.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverParam6.Name = "ucrReceiverParam6" Me.ucrReceiverParam6.Selector = Nothing @@ -303,7 +303,7 @@ Partial Class UcrGeomListWithParameters Me.Controls.Add(Me.lblAesList) Me.Controls.Add(Me.UcrSelector) Me.Name = "UcrGeomListWithParameters" - Me.Size = New System.Drawing.Size(467, 317) + Me.Size = New System.Drawing.Size(467, 343) Me.Controls.SetChildIndex(Me.UcrSelector, 0) Me.Controls.SetChildIndex(Me.lblAesList, 0) Me.Controls.SetChildIndex(Me.grpAesList, 0) diff --git a/instat/sdgLayerOptions.Designer.vb b/instat/sdgLayerOptions.Designer.vb index 878737b5c3a..1d1b9bc56dc 100644 --- a/instat/sdgLayerOptions.Designer.vb +++ b/instat/sdgLayerOptions.Designer.vb @@ -24,8 +24,8 @@ Partial Class sdgLayerOptions Private Sub InitializeComponent() Me.tbcLayers = New System.Windows.Forms.TabControl() Me.tbpAesthetics = New System.Windows.Forms.TabPage() - Me.ucrGeomWithAes = New instat.UcrGeomListWithParameters() Me.tbpGeomParameters = New System.Windows.Forms.TabPage() + Me.ucrGeomWithAes = New instat.UcrGeomListWithParameters() Me.ucrLayerParameter = New instat.ucrLayerParameters() Me.ucrSdgLayerBase = New instat.ucrButtonsSubdialogue() Me.tbcLayers.SuspendLayout() @@ -54,13 +54,6 @@ Partial Class sdgLayerOptions Me.tbpAesthetics.Text = "Layer Dimensions(Aesthetics)" Me.tbpAesthetics.UseVisualStyleBackColor = True ' - 'ucrGeomWithAes - ' - Me.ucrGeomWithAes.Location = New System.Drawing.Point(6, 6) - Me.ucrGeomWithAes.Name = "ucrGeomWithAes" - Me.ucrGeomWithAes.Size = New System.Drawing.Size(467, 286) - Me.ucrGeomWithAes.TabIndex = 0 - ' 'tbpGeomParameters ' Me.tbpGeomParameters.Controls.Add(Me.ucrLayerParameter) @@ -72,6 +65,13 @@ Partial Class sdgLayerOptions Me.tbpGeomParameters.Text = "Layer Parameters(Geom Parameters)" Me.tbpGeomParameters.UseVisualStyleBackColor = True ' + 'ucrGeomWithAes + ' + Me.ucrGeomWithAes.Location = New System.Drawing.Point(6, 6) + Me.ucrGeomWithAes.Name = "ucrGeomWithAes" + Me.ucrGeomWithAes.Size = New System.Drawing.Size(467, 347) + Me.ucrGeomWithAes.TabIndex = 0 + ' 'ucrLayerParameter ' Me.ucrLayerParameter.Location = New System.Drawing.Point(3, 3) From 1064bdfb59db29fe0829ee73ecff37525811b492 Mon Sep 17 00:00:00 2001 From: FrancoisJRenaud Date: Sun, 6 Nov 2016 22:59:05 +0300 Subject: [PATCH 11/16] Coordinate_flip for cartesian only and pie chart bug solving --- instat/dlgBarAndPieChart.vb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index e0b2d08f88d..7cae3a40148 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -134,6 +134,8 @@ Public Class dlgBarAndPieChart cmdPieChartOptions.Visible = False ucrSecondReceiver.Visible = True lblSecondFactor.Visible = True + chkFlipCoordinates.Visible = True + SetCoordFlip() ElseIf rdoPieChart.Checked = True Then ucrSaveBar.strPrefix = "Pie" clsRaesFunction.AddParameter("x", Chr(34) & Chr(34)) @@ -145,15 +147,18 @@ Public Class dlgBarAndPieChart cmdPieChartOptions.Visible = True ucrSecondReceiver.Visible = False lblSecondFactor.Visible = False + chkFlipCoordinates.Visible = False + ucrBase.clsRsyntax.RemoveOperatorParameter("coord_flip") End If + SetSecondFactorReceiverParameter() 'Warning: need to set second factor first, as in the pie chart case, it erases "fill" parameter (in clsRaesFunction), which is the parameter that takes the value in the first factor receiver. SetFactorReceiverParameter() - SetSecondFactorReceiverParameter() TestOKEnabled() End Sub Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click sdgPlots.SetDataFrame(strNewDataFrame:=ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text) sdgPlots.ShowDialog() + 'Warning, when coordinate flip is added to coordinates tab on sdgPLots, then link with chkFlipCoordinates... End Sub Private Sub cmdBarChartOptions_Click(sender As Object, e As EventArgs) Handles cmdBarChartOptions.Click From 718c3a0f601a78107daa52d9d26cf572a4d8c148 Mon Sep 17 00:00:00 2001 From: maxwell fundi Date: Sun, 6 Nov 2016 22:59:53 +0300 Subject: [PATCH 12/16] Removing thre blank geom on ucrGeoms --- instat/ucrGeom.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 9da9a0a3911..5907d296f70 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -480,9 +480,9 @@ Public Class ucrGeom 'clsgeom_errorbarh.AddAesParameter("size") 'add layer parameters - clsgeom_errorbarh.AddLayerParameter("stat", "list", Chr(34) & "identity" & Chr(34)) - clsgeom_errorbarh.AddLayerParameter("position", "list", Chr(34) & "identity" & Chr(34)) - lstAllGeoms.Add(clsgeom_errorbarh) + 'clsgeom_errorbarh.AddLayerParameter("stat", "list", Chr(34) & "identity" & Chr(34)) + 'clsgeom_errorbarh.AddLayerParameter("position", "list", Chr(34) & "identity" & Chr(34)) + 'lstAllGeoms.Add(clsgeom_errorbarh) clsgeom_freqpoly.strGeomName = "geom_freqpoly" clsgeom_freqpoly.AddAesParameter("x", strIncludedDataTypes:={"numeric"}, bIsMandatory:=True) From 1d6d439579a38b9bb991697798fcc58b99e4c346 Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 20:55:51 +0000 Subject: [PATCH 13/16] resettext() to reset() --- instat/sdgPlots.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 2d1ba5af942..ac23647ea09 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -69,7 +69,7 @@ Public Class sdgPlots chkDisplayLegendTitle.Checked = True chkOverwriteLegendTitle.Checked = False ucrInputLegend.Visible = False - ucrInputGraphTitle.ResetText() + ucrInputGraphTitle.Reset() End Sub Public Sub Reset() From 9b4e032823fdd025604b2580c4a996fb01d5daff Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 21:45:52 +0000 Subject: [PATCH 14/16] dlgOptions - amended --- instat/dlgOptions.Designer.vb | 832 +++++++++++++++++----------------- instat/dlgOptions.vb | 1 + 2 files changed, 417 insertions(+), 416 deletions(-) diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index e70c532f306..48dac73bd7d 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -22,77 +22,77 @@ Partial Class dlgOptions 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") - Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") - Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") - Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") - Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") - Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") + Dim TreeNode13 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") + Dim TreeNode14 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") + Dim TreeNode15 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") + Dim TreeNode16 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") + Dim TreeNode17 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") + Dim TreeNode18 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") Me.cmdApply = New System.Windows.Forms.Button() Me.cmdHelp = New System.Windows.Forms.Button() Me.cmdCancel = New System.Windows.Forms.Button() Me.cmdOk = New System.Windows.Forms.Button() Me.tbcOptions = New System.Windows.Forms.TabControl() - Me.tbpWorkingDirectory = New System.Windows.Forms.TabPage() - Me.lblWorkingDirectory = New System.Windows.Forms.Label() - Me.ucrWorkingDirectory = New instat.ucrInputTextBox() - Me.cmdWorkingDirectory = New System.Windows.Forms.Button() - Me.tbpDataView = New System.Windows.Forms.TabPage() - Me.nudMaxRows = New System.Windows.Forms.NumericUpDown() - Me.lblMaxRows = New System.Windows.Forms.Label() - Me.tbpCommands = New System.Windows.Forms.TabPage() - Me.pnScriptOptions = New System.Windows.Forms.Panel() - Me.chkIncludeDefaultParams = New System.Windows.Forms.CheckBox() - Me.tbpEditor = New System.Windows.Forms.TabPage() - Me.pnFormatEditor = New System.Windows.Forms.Panel() - Me.lblFont = New System.Windows.Forms.Label() - Me.cmdEditorFont = New System.Windows.Forms.Button() - Me.tbpOutputWindow = New System.Windows.Forms.TabPage() - Me.pnFormatOptions = New System.Windows.Forms.Panel() - Me.lblCommandFormat = New System.Windows.Forms.Label() - Me.cmdCommentFormat = New System.Windows.Forms.Button() - Me.lblOutputFormat = New System.Windows.Forms.Label() - Me.cmdOutputFormat = New System.Windows.Forms.Button() - Me.lblCommentFormat = New System.Windows.Forms.Label() - Me.cmdCommandFormat = New System.Windows.Forms.Button() - Me.rtbCommandPreview = New System.Windows.Forms.RichTextBox() - Me.rtbOutputPreview = New System.Windows.Forms.RichTextBox() - Me.rtbCommentPreview = New System.Windows.Forms.RichTextBox() - Me.tbpImport = New System.Windows.Forms.TabPage() - Me.pnImportData = New System.Windows.Forms.Panel() - Me.nudPreviewRows = New System.Windows.Forms.NumericUpDown() - Me.lblPreviewRows = New System.Windows.Forms.Label() - Me.tbpComments = New System.Windows.Forms.TabPage() - Me.pnComments = New System.Windows.Forms.Panel() - Me.txtComment = New System.Windows.Forms.TextBox() - Me.lblComment = New System.Windows.Forms.Label() Me.tbpLanguages = New System.Windows.Forms.TabPage() Me.pnLanguages = New System.Windows.Forms.Panel() Me.grpLanguage = New System.Windows.Forms.GroupBox() - Me.rdoFrench = New System.Windows.Forms.RadioButton() - Me.rdoKiswahili = New System.Windows.Forms.RadioButton() - Me.rdoEnglish = New System.Windows.Forms.RadioButton() Me.rdoSpanish = New System.Windows.Forms.RadioButton() + Me.rdoEnglish = New System.Windows.Forms.RadioButton() + Me.rdoKiswahili = New System.Windows.Forms.RadioButton() + Me.rdoFrench = New System.Windows.Forms.RadioButton() + Me.tbpComments = New System.Windows.Forms.TabPage() + Me.pnComments = New System.Windows.Forms.Panel() + Me.lblComment = New System.Windows.Forms.Label() + Me.txtComment = New System.Windows.Forms.TextBox() + Me.tbpImport = New System.Windows.Forms.TabPage() + Me.pnImportData = New System.Windows.Forms.Panel() + Me.lblPreviewRows = New System.Windows.Forms.Label() + Me.nudPreviewRows = New System.Windows.Forms.NumericUpDown() + Me.tbpOutputWindow = New System.Windows.Forms.TabPage() + Me.pnFormatOptions = New System.Windows.Forms.Panel() + Me.rtbCommentPreview = New System.Windows.Forms.RichTextBox() + Me.rtbOutputPreview = New System.Windows.Forms.RichTextBox() + Me.rtbCommandPreview = New System.Windows.Forms.RichTextBox() + Me.cmdCommandFormat = New System.Windows.Forms.Button() + Me.lblCommentFormat = New System.Windows.Forms.Label() + Me.cmdOutputFormat = New System.Windows.Forms.Button() + Me.lblOutputFormat = New System.Windows.Forms.Label() + Me.cmdCommentFormat = New System.Windows.Forms.Button() + Me.lblCommandFormat = New System.Windows.Forms.Label() + Me.tbpEditor = New System.Windows.Forms.TabPage() + Me.pnFormatEditor = New System.Windows.Forms.Panel() + Me.cmdEditorFont = New System.Windows.Forms.Button() + Me.lblFont = New System.Windows.Forms.Label() + Me.tbpCommands = New System.Windows.Forms.TabPage() + Me.pnScriptOptions = New System.Windows.Forms.Panel() + Me.chkIncludeDefaultParams = New System.Windows.Forms.CheckBox() + Me.tbpDataView = New System.Windows.Forms.TabPage() + Me.lblMaxRows = New System.Windows.Forms.Label() + Me.nudMaxRows = New System.Windows.Forms.NumericUpDown() + Me.tbpWorkingDirectory = New System.Windows.Forms.TabPage() + Me.cmdWorkingDirectory = New System.Windows.Forms.Button() + Me.ucrWorkingDirectory = New instat.ucrInputTextBox() + Me.lblWorkingDirectory = New System.Windows.Forms.Label() Me.trOptions = New System.Windows.Forms.TreeView() Me.spltControls = New System.Windows.Forms.SplitContainer() Me.tbcOptions.SuspendLayout() - Me.tbpWorkingDirectory.SuspendLayout() - Me.tbpDataView.SuspendLayout() - CType(Me.nudMaxRows, System.ComponentModel.ISupportInitialize).BeginInit() - Me.tbpCommands.SuspendLayout() - Me.pnScriptOptions.SuspendLayout() - Me.tbpEditor.SuspendLayout() - Me.pnFormatEditor.SuspendLayout() - Me.tbpOutputWindow.SuspendLayout() - Me.pnFormatOptions.SuspendLayout() - Me.tbpImport.SuspendLayout() - Me.pnImportData.SuspendLayout() - CType(Me.nudPreviewRows, System.ComponentModel.ISupportInitialize).BeginInit() - Me.tbpComments.SuspendLayout() - Me.pnComments.SuspendLayout() Me.tbpLanguages.SuspendLayout() Me.pnLanguages.SuspendLayout() Me.grpLanguage.SuspendLayout() + Me.tbpComments.SuspendLayout() + Me.pnComments.SuspendLayout() + Me.tbpImport.SuspendLayout() + Me.pnImportData.SuspendLayout() + CType(Me.nudPreviewRows, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tbpOutputWindow.SuspendLayout() + Me.pnFormatOptions.SuspendLayout() + Me.tbpEditor.SuspendLayout() + Me.pnFormatEditor.SuspendLayout() + Me.tbpCommands.SuspendLayout() + Me.pnScriptOptions.SuspendLayout() + Me.tbpDataView.SuspendLayout() + CType(Me.nudMaxRows, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tbpWorkingDirectory.SuspendLayout() CType(Me.spltControls, System.ComponentModel.ISupportInitialize).BeginInit() Me.spltControls.Panel1.SuspendLayout() Me.spltControls.Panel2.SuspendLayout() @@ -101,7 +101,7 @@ Partial Class dlgOptions ' 'cmdApply ' - Me.cmdApply.Location = New System.Drawing.Point(316, 320) + Me.cmdApply.Location = New System.Drawing.Point(396, 324) Me.cmdApply.Name = "cmdApply" Me.cmdApply.Size = New System.Drawing.Size(75, 23) Me.cmdApply.TabIndex = 10 @@ -111,7 +111,7 @@ Partial Class dlgOptions ' 'cmdHelp ' - Me.cmdHelp.Location = New System.Drawing.Point(397, 320) + Me.cmdHelp.Location = New System.Drawing.Point(477, 324) Me.cmdHelp.Name = "cmdHelp" Me.cmdHelp.Size = New System.Drawing.Size(75, 23) Me.cmdHelp.TabIndex = 12 @@ -121,7 +121,7 @@ Partial Class dlgOptions ' 'cmdCancel ' - Me.cmdCancel.Location = New System.Drawing.Point(235, 320) + Me.cmdCancel.Location = New System.Drawing.Point(315, 324) Me.cmdCancel.Name = "cmdCancel" Me.cmdCancel.Size = New System.Drawing.Size(75, 23) Me.cmdCancel.TabIndex = 9 @@ -131,7 +131,7 @@ Partial Class dlgOptions ' 'cmdOk ' - Me.cmdOk.Location = New System.Drawing.Point(154, 320) + Me.cmdOk.Location = New System.Drawing.Point(234, 324) Me.cmdOk.Name = "cmdOk" Me.cmdOk.Size = New System.Drawing.Size(75, 23) Me.cmdOk.TabIndex = 11 @@ -156,148 +156,162 @@ Partial Class dlgOptions Me.tbcOptions.Size = New System.Drawing.Size(572, 317) Me.tbcOptions.TabIndex = 0 ' - 'tbpWorkingDirectory + 'tbpLanguages ' - Me.tbpWorkingDirectory.Controls.Add(Me.cmdWorkingDirectory) - Me.tbpWorkingDirectory.Controls.Add(Me.ucrWorkingDirectory) - Me.tbpWorkingDirectory.Controls.Add(Me.lblWorkingDirectory) - Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 22) - Me.tbpWorkingDirectory.Name = "tbpWorkingDirectory" - Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(3) - Me.tbpWorkingDirectory.Size = New System.Drawing.Size(564, 291) - Me.tbpWorkingDirectory.TabIndex = 11 - Me.tbpWorkingDirectory.Text = "Working Directory" - Me.tbpWorkingDirectory.UseVisualStyleBackColor = True + Me.tbpLanguages.Controls.Add(Me.pnLanguages) + Me.tbpLanguages.Location = New System.Drawing.Point(4, 22) + Me.tbpLanguages.Name = "tbpLanguages" + Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(3) + Me.tbpLanguages.Size = New System.Drawing.Size(564, 291) + Me.tbpLanguages.TabIndex = 0 + Me.tbpLanguages.Tag = "Languages" + Me.tbpLanguages.Text = "Languages" + Me.tbpLanguages.UseVisualStyleBackColor = True ' - 'lblWorkingDirectory + 'pnLanguages ' - Me.lblWorkingDirectory.AutoSize = True - Me.lblWorkingDirectory.Location = New System.Drawing.Point(3, 17) - Me.lblWorkingDirectory.Name = "lblWorkingDirectory" - Me.lblWorkingDirectory.Size = New System.Drawing.Size(92, 13) - Me.lblWorkingDirectory.TabIndex = 0 - Me.lblWorkingDirectory.Text = "Working Directory" + Me.pnLanguages.AutoSize = True + Me.pnLanguages.Controls.Add(Me.grpLanguage) + Me.pnLanguages.Location = New System.Drawing.Point(3, 3) + Me.pnLanguages.Name = "pnLanguages" + Me.pnLanguages.Size = New System.Drawing.Size(122, 126) + Me.pnLanguages.TabIndex = 1 ' - 'ucrWorkingDirectory + 'grpLanguage ' - Me.ucrWorkingDirectory.IsReadOnly = False - Me.ucrWorkingDirectory.Location = New System.Drawing.Point(101, 17) - Me.ucrWorkingDirectory.Name = "ucrWorkingDirectory" - Me.ucrWorkingDirectory.Size = New System.Drawing.Size(282, 21) - Me.ucrWorkingDirectory.TabIndex = 1 + Me.grpLanguage.Controls.Add(Me.rdoSpanish) + Me.grpLanguage.Controls.Add(Me.rdoEnglish) + Me.grpLanguage.Controls.Add(Me.rdoKiswahili) + Me.grpLanguage.Controls.Add(Me.rdoFrench) + Me.grpLanguage.Location = New System.Drawing.Point(10, 10) + Me.grpLanguage.Name = "grpLanguage" + Me.grpLanguage.Size = New System.Drawing.Size(109, 113) + Me.grpLanguage.TabIndex = 2 + Me.grpLanguage.TabStop = False + Me.grpLanguage.Text = "Language" ' - 'cmdWorkingDirectory + 'rdoSpanish ' - Me.cmdWorkingDirectory.Location = New System.Drawing.Point(383, 17) - Me.cmdWorkingDirectory.Name = "cmdWorkingDirectory" - Me.cmdWorkingDirectory.Size = New System.Drawing.Size(24, 21) - Me.cmdWorkingDirectory.TabIndex = 2 - Me.cmdWorkingDirectory.Text = "..." - Me.cmdWorkingDirectory.UseVisualStyleBackColor = True + Me.rdoSpanish.AutoSize = True + Me.rdoSpanish.Enabled = False + Me.rdoSpanish.Location = New System.Drawing.Point(7, 88) + Me.rdoSpanish.Name = "rdoSpanish" + Me.rdoSpanish.Size = New System.Drawing.Size(63, 17) + Me.rdoSpanish.TabIndex = 2 + Me.rdoSpanish.Text = "Spanish" + Me.rdoSpanish.UseVisualStyleBackColor = True ' - 'tbpDataView + 'rdoEnglish ' - Me.tbpDataView.Controls.Add(Me.lblMaxRows) - Me.tbpDataView.Controls.Add(Me.nudMaxRows) - Me.tbpDataView.Location = New System.Drawing.Point(4, 22) - Me.tbpDataView.Name = "tbpDataView" - Me.tbpDataView.Padding = New System.Windows.Forms.Padding(3) - Me.tbpDataView.Size = New System.Drawing.Size(420, 291) - Me.tbpDataView.TabIndex = 9 - Me.tbpDataView.Text = "Data View" - Me.tbpDataView.UseVisualStyleBackColor = True + Me.rdoEnglish.AutoSize = True + Me.rdoEnglish.Location = New System.Drawing.Point(7, 19) + Me.rdoEnglish.Name = "rdoEnglish" + Me.rdoEnglish.Size = New System.Drawing.Size(59, 17) + Me.rdoEnglish.TabIndex = 1 + Me.rdoEnglish.Tag = "English" + Me.rdoEnglish.Text = "English" + Me.rdoEnglish.UseVisualStyleBackColor = True ' - 'nudMaxRows + 'rdoKiswahili ' - Me.nudMaxRows.Location = New System.Drawing.Point(194, 39) - Me.nudMaxRows.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) - Me.nudMaxRows.Name = "nudMaxRows" - Me.nudMaxRows.Size = New System.Drawing.Size(62, 20) - Me.nudMaxRows.TabIndex = 0 - Me.nudMaxRows.Value = New Decimal(New Integer() {1, 0, 0, 0}) + Me.rdoKiswahili.AutoSize = True + Me.rdoKiswahili.Location = New System.Drawing.Point(7, 65) + Me.rdoKiswahili.Name = "rdoKiswahili" + Me.rdoKiswahili.Size = New System.Drawing.Size(65, 17) + Me.rdoKiswahili.TabIndex = 3 + Me.rdoKiswahili.Tag = "Kiswahili" + Me.rdoKiswahili.Text = "Kiswahili" + Me.rdoKiswahili.UseVisualStyleBackColor = True ' - 'lblMaxRows + 'rdoFrench ' - Me.lblMaxRows.AutoSize = True - Me.lblMaxRows.Location = New System.Drawing.Point(6, 41) - Me.lblMaxRows.Name = "lblMaxRows" - Me.lblMaxRows.Size = New System.Drawing.Size(182, 13) - Me.lblMaxRows.TabIndex = 1 - Me.lblMaxRows.Text = "Maximum Number of Rows to Display" + Me.rdoFrench.AutoSize = True + Me.rdoFrench.Location = New System.Drawing.Point(7, 42) + Me.rdoFrench.Name = "rdoFrench" + Me.rdoFrench.Size = New System.Drawing.Size(58, 17) + Me.rdoFrench.TabIndex = 2 + Me.rdoFrench.Tag = "French" + Me.rdoFrench.Text = "French" + Me.rdoFrench.UseVisualStyleBackColor = True ' - 'tbpCommands + 'tbpComments ' - Me.tbpCommands.Controls.Add(Me.pnScriptOptions) - Me.tbpCommands.Location = New System.Drawing.Point(4, 22) - Me.tbpCommands.Name = "tbpCommands" - Me.tbpCommands.Padding = New System.Windows.Forms.Padding(3) - Me.tbpCommands.Size = New System.Drawing.Size(420, 291) - Me.tbpCommands.TabIndex = 4 - Me.tbpCommands.Tag = "Commands" - Me.tbpCommands.Text = "Commands" - Me.tbpCommands.UseVisualStyleBackColor = True + Me.tbpComments.Controls.Add(Me.pnComments) + Me.tbpComments.Location = New System.Drawing.Point(4, 22) + Me.tbpComments.Name = "tbpComments" + Me.tbpComments.Padding = New System.Windows.Forms.Padding(3) + Me.tbpComments.Size = New System.Drawing.Size(564, 291) + Me.tbpComments.TabIndex = 1 + Me.tbpComments.Tag = "Comments" + Me.tbpComments.Text = "Comments" + Me.tbpComments.UseVisualStyleBackColor = True ' - 'pnScriptOptions + 'pnComments ' - Me.pnScriptOptions.AutoSize = True - Me.pnScriptOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.pnScriptOptions.Controls.Add(Me.chkIncludeDefaultParams) - Me.pnScriptOptions.Location = New System.Drawing.Point(3, 6) - Me.pnScriptOptions.Name = "pnScriptOptions" - Me.pnScriptOptions.Size = New System.Drawing.Size(267, 23) - Me.pnScriptOptions.TabIndex = 1 + Me.pnComments.AutoSize = True + Me.pnComments.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnComments.Controls.Add(Me.lblComment) + Me.pnComments.Controls.Add(Me.txtComment) + Me.pnComments.Location = New System.Drawing.Point(10, 10) + Me.pnComments.Name = "pnComments" + Me.pnComments.Size = New System.Drawing.Size(338, 29) + Me.pnComments.TabIndex = 2 ' - 'chkIncludeDefaultParams + 'lblComment ' - Me.chkIncludeDefaultParams.AutoSize = True - Me.chkIncludeDefaultParams.Location = New System.Drawing.Point(3, 3) - Me.chkIncludeDefaultParams.Name = "chkIncludeDefaultParams" - Me.chkIncludeDefaultParams.Size = New System.Drawing.Size(261, 17) - Me.chkIncludeDefaultParams.TabIndex = 0 - Me.chkIncludeDefaultParams.Tag = "Include_Default_Parameter_Values_in_R_Commands" - Me.chkIncludeDefaultParams.Text = "Include Default Parameter Values in R Commands" - Me.chkIncludeDefaultParams.UseVisualStyleBackColor = True + Me.lblComment.AutoSize = True + Me.lblComment.Location = New System.Drawing.Point(2, 9) + Me.lblComment.Name = "lblComment" + Me.lblComment.Size = New System.Drawing.Size(54, 13) + Me.lblComment.TabIndex = 0 + Me.lblComment.Tag = "Comment:" + Me.lblComment.Text = "Comment:" ' - 'tbpEditor + 'txtComment ' - Me.tbpEditor.Controls.Add(Me.pnFormatEditor) - Me.tbpEditor.Location = New System.Drawing.Point(4, 22) - Me.tbpEditor.Name = "tbpEditor" - Me.tbpEditor.Padding = New System.Windows.Forms.Padding(3) - Me.tbpEditor.Size = New System.Drawing.Size(420, 291) - Me.tbpEditor.TabIndex = 10 - Me.tbpEditor.Text = "Editor Window" - Me.tbpEditor.ToolTipText = "Data View" - Me.tbpEditor.UseVisualStyleBackColor = True + Me.txtComment.Location = New System.Drawing.Point(59, 6) + Me.txtComment.Name = "txtComment" + Me.txtComment.Size = New System.Drawing.Size(276, 20) + Me.txtComment.TabIndex = 1 ' - 'pnFormatEditor + 'tbpImport ' - Me.pnFormatEditor.AutoSize = True - Me.pnFormatEditor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.pnFormatEditor.Controls.Add(Me.cmdEditorFont) - Me.pnFormatEditor.Controls.Add(Me.lblFont) - Me.pnFormatEditor.Location = New System.Drawing.Point(6, 6) - Me.pnFormatEditor.Name = "pnFormatEditor" - Me.pnFormatEditor.Size = New System.Drawing.Size(391, 46) - Me.pnFormatEditor.TabIndex = 22 + Me.tbpImport.Controls.Add(Me.pnImportData) + Me.tbpImport.Location = New System.Drawing.Point(4, 22) + Me.tbpImport.Name = "tbpImport" + Me.tbpImport.Size = New System.Drawing.Size(564, 291) + Me.tbpImport.TabIndex = 3 + Me.tbpImport.Text = "Import" + Me.tbpImport.UseVisualStyleBackColor = True ' - 'lblFont + 'pnImportData ' - Me.lblFont.AutoSize = True - Me.lblFont.Location = New System.Drawing.Point(0, 25) - Me.lblFont.Name = "lblFont" - Me.lblFont.Size = New System.Drawing.Size(63, 13) - Me.lblFont.TabIndex = 17 - Me.lblFont.Text = "Format Font" + Me.pnImportData.AutoSize = True + Me.pnImportData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnImportData.Controls.Add(Me.lblPreviewRows) + Me.pnImportData.Controls.Add(Me.nudPreviewRows) + Me.pnImportData.Location = New System.Drawing.Point(10, 10) + Me.pnImportData.Name = "pnImportData" + Me.pnImportData.Size = New System.Drawing.Size(181, 30) + Me.pnImportData.TabIndex = 2 ' - 'cmdEditorFont + 'lblPreviewRows ' - Me.cmdEditorFont.Location = New System.Drawing.Point(288, 20) - Me.cmdEditorFont.Name = "cmdEditorFont" - Me.cmdEditorFont.Size = New System.Drawing.Size(100, 23) - Me.cmdEditorFont.TabIndex = 10 - Me.cmdEditorFont.Text = "Change..." - Me.cmdEditorFont.UseVisualStyleBackColor = True + Me.lblPreviewRows.AutoSize = True + Me.lblPreviewRows.Location = New System.Drawing.Point(3, 9) + Me.lblPreviewRows.Name = "lblPreviewRows" + Me.lblPreviewRows.Size = New System.Drawing.Size(130, 13) + Me.lblPreviewRows.TabIndex = 0 + Me.lblPreviewRows.Text = "Number of Preview Rows:" + ' + 'nudPreviewRows + ' + Me.nudPreviewRows.Location = New System.Drawing.Point(134, 7) + Me.nudPreviewRows.Minimum = New Decimal(New Integer() {10, 0, 0, 0}) + Me.nudPreviewRows.Name = "nudPreviewRows" + Me.nudPreviewRows.Size = New System.Drawing.Size(44, 20) + Me.nudPreviewRows.TabIndex = 1 + Me.nudPreviewRows.Value = New Decimal(New Integer() {10, 0, 0, 0}) ' 'tbpOutputWindow ' @@ -305,7 +319,7 @@ Partial Class dlgOptions Me.tbpOutputWindow.Location = New System.Drawing.Point(4, 22) Me.tbpOutputWindow.Name = "tbpOutputWindow" Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(3) - Me.tbpOutputWindow.Size = New System.Drawing.Size(420, 291) + Me.tbpOutputWindow.Size = New System.Drawing.Size(564, 291) Me.tbpOutputWindow.TabIndex = 2 Me.tbpOutputWindow.Text = "Output Window" Me.tbpOutputWindow.UseVisualStyleBackColor = True @@ -323,277 +337,263 @@ Partial Class dlgOptions Me.pnFormatOptions.Controls.Add(Me.lblOutputFormat) Me.pnFormatOptions.Controls.Add(Me.cmdCommentFormat) Me.pnFormatOptions.Controls.Add(Me.lblCommandFormat) - Me.pnFormatOptions.Location = New System.Drawing.Point(0, 0) + Me.pnFormatOptions.Location = New System.Drawing.Point(10, 10) Me.pnFormatOptions.Name = "pnFormatOptions" - Me.pnFormatOptions.Size = New System.Drawing.Size(391, 129) + Me.pnFormatOptions.Size = New System.Drawing.Size(391, 118) Me.pnFormatOptions.TabIndex = 21 ' - 'lblCommandFormat - ' - Me.lblCommandFormat.AutoSize = True - Me.lblCommandFormat.Location = New System.Drawing.Point(0, 25) - Me.lblCommandFormat.Name = "lblCommandFormat" - Me.lblCommandFormat.Size = New System.Drawing.Size(89, 13) - Me.lblCommandFormat.TabIndex = 17 - Me.lblCommandFormat.Text = "Command Format" - ' - 'cmdCommentFormat - ' - Me.cmdCommentFormat.Location = New System.Drawing.Point(288, 100) - Me.cmdCommentFormat.Name = "cmdCommentFormat" - Me.cmdCommentFormat.Size = New System.Drawing.Size(100, 23) - Me.cmdCommentFormat.TabIndex = 16 - Me.cmdCommentFormat.Text = "Change..." - Me.cmdCommentFormat.UseVisualStyleBackColor = True - ' - 'lblOutputFormat + 'rtbCommentPreview ' - Me.lblOutputFormat.AutoSize = True - Me.lblOutputFormat.Location = New System.Drawing.Point(0, 65) - Me.lblOutputFormat.Name = "lblOutputFormat" - Me.lblOutputFormat.Size = New System.Drawing.Size(74, 13) - Me.lblOutputFormat.TabIndex = 18 - Me.lblOutputFormat.Text = "Output Format" + Me.rtbCommentPreview.Location = New System.Drawing.Point(100, 89) + Me.rtbCommentPreview.Name = "rtbCommentPreview" + Me.rtbCommentPreview.ReadOnly = True + Me.rtbCommentPreview.Size = New System.Drawing.Size(171, 26) + Me.rtbCommentPreview.TabIndex = 22 + Me.rtbCommentPreview.Text = "" ' - 'cmdOutputFormat + 'rtbOutputPreview ' - Me.cmdOutputFormat.Location = New System.Drawing.Point(288, 60) - Me.cmdOutputFormat.Name = "cmdOutputFormat" - Me.cmdOutputFormat.Size = New System.Drawing.Size(100, 23) - Me.cmdOutputFormat.TabIndex = 16 - Me.cmdOutputFormat.Text = "Change..." - Me.cmdOutputFormat.UseVisualStyleBackColor = True + Me.rtbOutputPreview.Location = New System.Drawing.Point(100, 49) + Me.rtbOutputPreview.Name = "rtbOutputPreview" + Me.rtbOutputPreview.ReadOnly = True + Me.rtbOutputPreview.Size = New System.Drawing.Size(171, 26) + Me.rtbOutputPreview.TabIndex = 21 + Me.rtbOutputPreview.Text = "" ' - 'lblCommentFormat + 'rtbCommandPreview ' - Me.lblCommentFormat.AutoSize = True - Me.lblCommentFormat.Location = New System.Drawing.Point(0, 105) - Me.lblCommentFormat.Name = "lblCommentFormat" - Me.lblCommentFormat.Size = New System.Drawing.Size(86, 13) - Me.lblCommentFormat.TabIndex = 19 - Me.lblCommentFormat.Text = "Comment Format" + Me.rtbCommandPreview.Location = New System.Drawing.Point(100, 9) + Me.rtbCommandPreview.Name = "rtbCommandPreview" + Me.rtbCommandPreview.ReadOnly = True + Me.rtbCommandPreview.Size = New System.Drawing.Size(171, 26) + Me.rtbCommandPreview.TabIndex = 20 + Me.rtbCommandPreview.Text = "" ' 'cmdCommandFormat ' - Me.cmdCommandFormat.Location = New System.Drawing.Point(288, 20) + Me.cmdCommandFormat.Location = New System.Drawing.Point(288, 9) Me.cmdCommandFormat.Name = "cmdCommandFormat" Me.cmdCommandFormat.Size = New System.Drawing.Size(100, 23) Me.cmdCommandFormat.TabIndex = 10 Me.cmdCommandFormat.Text = "Change..." Me.cmdCommandFormat.UseVisualStyleBackColor = True ' - 'rtbCommandPreview + 'lblCommentFormat ' - Me.rtbCommandPreview.Location = New System.Drawing.Point(100, 20) - Me.rtbCommandPreview.Name = "rtbCommandPreview" - Me.rtbCommandPreview.ReadOnly = True - Me.rtbCommandPreview.Size = New System.Drawing.Size(171, 26) - Me.rtbCommandPreview.TabIndex = 20 - Me.rtbCommandPreview.Text = "" + Me.lblCommentFormat.AutoSize = True + Me.lblCommentFormat.Location = New System.Drawing.Point(4, 94) + Me.lblCommentFormat.Name = "lblCommentFormat" + Me.lblCommentFormat.Size = New System.Drawing.Size(89, 13) + Me.lblCommentFormat.TabIndex = 19 + Me.lblCommentFormat.Text = "Comment Format:" ' - 'rtbOutputPreview + 'cmdOutputFormat ' - Me.rtbOutputPreview.Location = New System.Drawing.Point(100, 60) - Me.rtbOutputPreview.Name = "rtbOutputPreview" - Me.rtbOutputPreview.ReadOnly = True - Me.rtbOutputPreview.Size = New System.Drawing.Size(171, 26) - Me.rtbOutputPreview.TabIndex = 21 - Me.rtbOutputPreview.Text = "" + Me.cmdOutputFormat.Location = New System.Drawing.Point(288, 49) + Me.cmdOutputFormat.Name = "cmdOutputFormat" + Me.cmdOutputFormat.Size = New System.Drawing.Size(100, 23) + Me.cmdOutputFormat.TabIndex = 16 + Me.cmdOutputFormat.Text = "Change..." + Me.cmdOutputFormat.UseVisualStyleBackColor = True ' - 'rtbCommentPreview + 'lblOutputFormat ' - Me.rtbCommentPreview.Location = New System.Drawing.Point(100, 100) - Me.rtbCommentPreview.Name = "rtbCommentPreview" - Me.rtbCommentPreview.ReadOnly = True - Me.rtbCommentPreview.Size = New System.Drawing.Size(171, 26) - Me.rtbCommentPreview.TabIndex = 22 - Me.rtbCommentPreview.Text = "" + Me.lblOutputFormat.AutoSize = True + Me.lblOutputFormat.Location = New System.Drawing.Point(4, 54) + Me.lblOutputFormat.Name = "lblOutputFormat" + Me.lblOutputFormat.Size = New System.Drawing.Size(77, 13) + Me.lblOutputFormat.TabIndex = 18 + Me.lblOutputFormat.Text = "Output Format:" ' - 'tbpImport + 'cmdCommentFormat ' - Me.tbpImport.Controls.Add(Me.pnImportData) - Me.tbpImport.Location = New System.Drawing.Point(4, 22) - Me.tbpImport.Name = "tbpImport" - Me.tbpImport.Size = New System.Drawing.Size(420, 291) - Me.tbpImport.TabIndex = 3 - Me.tbpImport.Text = "Import" - Me.tbpImport.UseVisualStyleBackColor = True + Me.cmdCommentFormat.Location = New System.Drawing.Point(288, 89) + Me.cmdCommentFormat.Name = "cmdCommentFormat" + Me.cmdCommentFormat.Size = New System.Drawing.Size(100, 23) + Me.cmdCommentFormat.TabIndex = 16 + Me.cmdCommentFormat.Text = "Change..." + Me.cmdCommentFormat.UseVisualStyleBackColor = True ' - 'pnImportData + 'lblCommandFormat ' - Me.pnImportData.AutoSize = True - Me.pnImportData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.pnImportData.Controls.Add(Me.lblPreviewRows) - Me.pnImportData.Controls.Add(Me.nudPreviewRows) - Me.pnImportData.Location = New System.Drawing.Point(3, 3) - Me.pnImportData.Name = "pnImportData" - Me.pnImportData.Size = New System.Drawing.Size(181, 30) - Me.pnImportData.TabIndex = 2 + Me.lblCommandFormat.AutoSize = True + Me.lblCommandFormat.Location = New System.Drawing.Point(4, 14) + Me.lblCommandFormat.Name = "lblCommandFormat" + Me.lblCommandFormat.Size = New System.Drawing.Size(92, 13) + Me.lblCommandFormat.TabIndex = 17 + Me.lblCommandFormat.Text = "Command Format:" ' - 'nudPreviewRows + 'tbpEditor ' - Me.nudPreviewRows.Location = New System.Drawing.Point(134, 7) - Me.nudPreviewRows.Minimum = New Decimal(New Integer() {10, 0, 0, 0}) - Me.nudPreviewRows.Name = "nudPreviewRows" - Me.nudPreviewRows.Size = New System.Drawing.Size(44, 20) - Me.nudPreviewRows.TabIndex = 1 - Me.nudPreviewRows.Value = New Decimal(New Integer() {10, 0, 0, 0}) + Me.tbpEditor.Controls.Add(Me.pnFormatEditor) + Me.tbpEditor.Location = New System.Drawing.Point(4, 22) + Me.tbpEditor.Name = "tbpEditor" + Me.tbpEditor.Padding = New System.Windows.Forms.Padding(3) + Me.tbpEditor.Size = New System.Drawing.Size(564, 291) + Me.tbpEditor.TabIndex = 10 + Me.tbpEditor.Text = "Editor Window" + Me.tbpEditor.ToolTipText = "Data View" + Me.tbpEditor.UseVisualStyleBackColor = True ' - 'lblPreviewRows + 'pnFormatEditor ' - Me.lblPreviewRows.AutoSize = True - Me.lblPreviewRows.Location = New System.Drawing.Point(3, 9) - Me.lblPreviewRows.Name = "lblPreviewRows" - Me.lblPreviewRows.Size = New System.Drawing.Size(127, 13) - Me.lblPreviewRows.TabIndex = 0 - Me.lblPreviewRows.Text = "Number of Preview Rows" + Me.pnFormatEditor.AutoSize = True + Me.pnFormatEditor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnFormatEditor.Controls.Add(Me.cmdEditorFont) + Me.pnFormatEditor.Controls.Add(Me.lblFont) + Me.pnFormatEditor.Location = New System.Drawing.Point(10, 10) + Me.pnFormatEditor.Name = "pnFormatEditor" + Me.pnFormatEditor.Size = New System.Drawing.Size(212, 28) + Me.pnFormatEditor.TabIndex = 22 ' - 'tbpComments + 'cmdEditorFont ' - Me.tbpComments.Controls.Add(Me.pnComments) - Me.tbpComments.Location = New System.Drawing.Point(4, 22) - Me.tbpComments.Name = "tbpComments" - Me.tbpComments.Padding = New System.Windows.Forms.Padding(3) - Me.tbpComments.Size = New System.Drawing.Size(420, 291) - Me.tbpComments.TabIndex = 1 - Me.tbpComments.Tag = "Comments" - Me.tbpComments.Text = "Comments" - Me.tbpComments.UseVisualStyleBackColor = True + Me.cmdEditorFont.Location = New System.Drawing.Point(109, 2) + Me.cmdEditorFont.Name = "cmdEditorFont" + Me.cmdEditorFont.Size = New System.Drawing.Size(100, 23) + Me.cmdEditorFont.TabIndex = 10 + Me.cmdEditorFont.Text = "Change..." + Me.cmdEditorFont.UseVisualStyleBackColor = True ' - 'pnComments + 'lblFont ' - Me.pnComments.AutoSize = True - Me.pnComments.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.pnComments.Controls.Add(Me.lblComment) - Me.pnComments.Controls.Add(Me.txtComment) - Me.pnComments.Location = New System.Drawing.Point(6, 6) - Me.pnComments.Name = "pnComments" - Me.pnComments.Size = New System.Drawing.Size(338, 33) - Me.pnComments.TabIndex = 2 + Me.lblFont.AutoSize = True + Me.lblFont.Location = New System.Drawing.Point(4, 7) + Me.lblFont.Name = "lblFont" + Me.lblFont.Size = New System.Drawing.Size(66, 13) + Me.lblFont.TabIndex = 17 + Me.lblFont.Text = "Format Font:" ' - 'txtComment + 'tbpCommands ' - Me.txtComment.Location = New System.Drawing.Point(59, 10) - Me.txtComment.Name = "txtComment" - Me.txtComment.Size = New System.Drawing.Size(276, 20) - Me.txtComment.TabIndex = 1 + Me.tbpCommands.Controls.Add(Me.pnScriptOptions) + Me.tbpCommands.Location = New System.Drawing.Point(4, 22) + Me.tbpCommands.Name = "tbpCommands" + Me.tbpCommands.Padding = New System.Windows.Forms.Padding(3) + Me.tbpCommands.Size = New System.Drawing.Size(564, 291) + Me.tbpCommands.TabIndex = 4 + Me.tbpCommands.Tag = "Commands" + Me.tbpCommands.Text = "Commands" + Me.tbpCommands.UseVisualStyleBackColor = True ' - 'lblComment + 'pnScriptOptions ' - Me.lblComment.AutoSize = True - Me.lblComment.Location = New System.Drawing.Point(2, 10) - Me.lblComment.Name = "lblComment" - Me.lblComment.Size = New System.Drawing.Size(51, 13) - Me.lblComment.TabIndex = 0 - Me.lblComment.Tag = "Comment" - Me.lblComment.Text = "Comment" + Me.pnScriptOptions.AutoSize = True + Me.pnScriptOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnScriptOptions.Controls.Add(Me.chkIncludeDefaultParams) + Me.pnScriptOptions.Location = New System.Drawing.Point(10, 10) + Me.pnScriptOptions.Name = "pnScriptOptions" + Me.pnScriptOptions.Size = New System.Drawing.Size(267, 23) + Me.pnScriptOptions.TabIndex = 1 ' - 'tbpLanguages + 'chkIncludeDefaultParams ' - Me.tbpLanguages.Controls.Add(Me.pnLanguages) - Me.tbpLanguages.Location = New System.Drawing.Point(4, 22) - Me.tbpLanguages.Name = "tbpLanguages" - Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(3) - Me.tbpLanguages.Size = New System.Drawing.Size(564, 291) - Me.tbpLanguages.TabIndex = 0 - Me.tbpLanguages.Tag = "Languages" - Me.tbpLanguages.Text = "Languages" - Me.tbpLanguages.UseVisualStyleBackColor = True + Me.chkIncludeDefaultParams.AutoSize = True + Me.chkIncludeDefaultParams.Location = New System.Drawing.Point(3, 3) + Me.chkIncludeDefaultParams.Name = "chkIncludeDefaultParams" + Me.chkIncludeDefaultParams.Size = New System.Drawing.Size(261, 17) + Me.chkIncludeDefaultParams.TabIndex = 0 + Me.chkIncludeDefaultParams.Tag = "Include_Default_Parameter_Values_in_R_Commands" + Me.chkIncludeDefaultParams.Text = "Include Default Parameter Values in R Commands" + Me.chkIncludeDefaultParams.UseVisualStyleBackColor = True ' - 'pnLanguages + 'tbpDataView ' - Me.pnLanguages.AutoSize = True - Me.pnLanguages.Controls.Add(Me.grpLanguage) - Me.pnLanguages.Location = New System.Drawing.Point(3, 3) - Me.pnLanguages.Name = "pnLanguages" - Me.pnLanguages.Size = New System.Drawing.Size(118, 121) - Me.pnLanguages.TabIndex = 1 + Me.tbpDataView.Controls.Add(Me.lblMaxRows) + Me.tbpDataView.Controls.Add(Me.nudMaxRows) + Me.tbpDataView.Location = New System.Drawing.Point(4, 22) + Me.tbpDataView.Name = "tbpDataView" + Me.tbpDataView.Padding = New System.Windows.Forms.Padding(3) + Me.tbpDataView.Size = New System.Drawing.Size(564, 291) + Me.tbpDataView.TabIndex = 9 + Me.tbpDataView.Text = "Data View" + Me.tbpDataView.UseVisualStyleBackColor = True ' - 'grpLanguage + 'lblMaxRows ' - Me.grpLanguage.Controls.Add(Me.rdoSpanish) - Me.grpLanguage.Controls.Add(Me.rdoEnglish) - Me.grpLanguage.Controls.Add(Me.rdoKiswahili) - Me.grpLanguage.Controls.Add(Me.rdoFrench) - Me.grpLanguage.Location = New System.Drawing.Point(3, 3) - Me.grpLanguage.Name = "grpLanguage" - Me.grpLanguage.Size = New System.Drawing.Size(109, 113) - Me.grpLanguage.TabIndex = 2 - Me.grpLanguage.TabStop = False - Me.grpLanguage.Text = "Language" + Me.lblMaxRows.AutoSize = True + Me.lblMaxRows.Location = New System.Drawing.Point(10, 18) + Me.lblMaxRows.Name = "lblMaxRows" + Me.lblMaxRows.Size = New System.Drawing.Size(185, 13) + Me.lblMaxRows.TabIndex = 1 + Me.lblMaxRows.Text = "Maximum Number of Rows to Display:" ' - 'rdoFrench + 'nudMaxRows ' - Me.rdoFrench.AutoSize = True - Me.rdoFrench.Location = New System.Drawing.Point(7, 42) - Me.rdoFrench.Name = "rdoFrench" - Me.rdoFrench.Size = New System.Drawing.Size(58, 17) - Me.rdoFrench.TabIndex = 2 - Me.rdoFrench.Tag = "French" - Me.rdoFrench.Text = "French" - Me.rdoFrench.UseVisualStyleBackColor = True + Me.nudMaxRows.Location = New System.Drawing.Point(198, 15) + Me.nudMaxRows.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) + Me.nudMaxRows.Name = "nudMaxRows" + Me.nudMaxRows.Size = New System.Drawing.Size(62, 20) + Me.nudMaxRows.TabIndex = 0 + Me.nudMaxRows.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' - 'rdoKiswahili + 'tbpWorkingDirectory ' - Me.rdoKiswahili.AutoSize = True - Me.rdoKiswahili.Location = New System.Drawing.Point(7, 65) - Me.rdoKiswahili.Name = "rdoKiswahili" - Me.rdoKiswahili.Size = New System.Drawing.Size(65, 17) - Me.rdoKiswahili.TabIndex = 3 - Me.rdoKiswahili.Tag = "Kiswahili" - Me.rdoKiswahili.Text = "Kiswahili" - Me.rdoKiswahili.UseVisualStyleBackColor = True + Me.tbpWorkingDirectory.Controls.Add(Me.cmdWorkingDirectory) + Me.tbpWorkingDirectory.Controls.Add(Me.ucrWorkingDirectory) + Me.tbpWorkingDirectory.Controls.Add(Me.lblWorkingDirectory) + Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 22) + Me.tbpWorkingDirectory.Name = "tbpWorkingDirectory" + Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(3) + Me.tbpWorkingDirectory.Size = New System.Drawing.Size(564, 291) + Me.tbpWorkingDirectory.TabIndex = 11 + Me.tbpWorkingDirectory.Text = "Working Directory" + Me.tbpWorkingDirectory.UseVisualStyleBackColor = True ' - 'rdoEnglish + 'cmdWorkingDirectory ' - Me.rdoEnglish.AutoSize = True - Me.rdoEnglish.Location = New System.Drawing.Point(7, 19) - Me.rdoEnglish.Name = "rdoEnglish" - Me.rdoEnglish.Size = New System.Drawing.Size(59, 17) - Me.rdoEnglish.TabIndex = 1 - Me.rdoEnglish.Tag = "English" - Me.rdoEnglish.Text = "English" - Me.rdoEnglish.UseVisualStyleBackColor = True + Me.cmdWorkingDirectory.Location = New System.Drawing.Point(399, 16) + Me.cmdWorkingDirectory.Name = "cmdWorkingDirectory" + Me.cmdWorkingDirectory.Size = New System.Drawing.Size(24, 21) + Me.cmdWorkingDirectory.TabIndex = 2 + Me.cmdWorkingDirectory.Text = "..." + Me.cmdWorkingDirectory.UseVisualStyleBackColor = True ' - 'rdoSpanish + 'ucrWorkingDirectory ' - Me.rdoSpanish.AutoSize = True - Me.rdoSpanish.Enabled = False - Me.rdoSpanish.Location = New System.Drawing.Point(7, 88) - Me.rdoSpanish.Name = "rdoSpanish" - Me.rdoSpanish.Size = New System.Drawing.Size(63, 17) - Me.rdoSpanish.TabIndex = 2 - Me.rdoSpanish.Text = "Spanish" - Me.rdoSpanish.UseVisualStyleBackColor = True + Me.ucrWorkingDirectory.IsReadOnly = False + Me.ucrWorkingDirectory.Location = New System.Drawing.Point(111, 17) + Me.ucrWorkingDirectory.Name = "ucrWorkingDirectory" + Me.ucrWorkingDirectory.Size = New System.Drawing.Size(282, 21) + Me.ucrWorkingDirectory.TabIndex = 1 + ' + 'lblWorkingDirectory + ' + Me.lblWorkingDirectory.AutoSize = True + Me.lblWorkingDirectory.Location = New System.Drawing.Point(13, 20) + Me.lblWorkingDirectory.Name = "lblWorkingDirectory" + Me.lblWorkingDirectory.Size = New System.Drawing.Size(95, 13) + Me.lblWorkingDirectory.TabIndex = 0 + Me.lblWorkingDirectory.Text = "Working Directory:" ' 'trOptions ' Me.trOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.trOptions.Location = New System.Drawing.Point(0, 0) Me.trOptions.Name = "trOptions" - TreeNode1.Name = "ndLanguages" - TreeNode1.Tag = "1" - TreeNode1.Text = "Languages" - TreeNode1.ToolTipText = "Choose different languages" - TreeNode2.Name = "ndComments" - TreeNode2.Tag = "2" - TreeNode2.Text = "Comments" - TreeNode2.ToolTipText = "Comments for the dialogs" - TreeNode3.Name = "ndImport" - TreeNode3.Tag = "3" - TreeNode3.Text = "Import" - TreeNode3.ToolTipText = "Import Data Settings" - TreeNode4.Name = "ndOutputWindow" - TreeNode4.Tag = "4" - TreeNode4.Text = "Output Window" - TreeNode4.ToolTipText = "Output Window Formatting Options" - TreeNode5.Name = "ndCommands" - TreeNode5.Tag = "8" - TreeNode5.Text = "Commands" - TreeNode5.ToolTipText = "Commands Options" - TreeNode6.Name = "ndDataView" - TreeNode6.Text = "Data View" - Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode1, TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6}) + TreeNode13.Name = "ndLanguages" + TreeNode13.Tag = "1" + TreeNode13.Text = "Languages" + TreeNode13.ToolTipText = "Choose different languages" + TreeNode14.Name = "ndComments" + TreeNode14.Tag = "2" + TreeNode14.Text = "Comments" + TreeNode14.ToolTipText = "Comments for the dialogs" + TreeNode15.Name = "ndImport" + TreeNode15.Tag = "3" + TreeNode15.Text = "Import" + TreeNode15.ToolTipText = "Import Data Settings" + TreeNode16.Name = "ndOutputWindow" + TreeNode16.Tag = "4" + TreeNode16.Text = "Output Window" + TreeNode16.ToolTipText = "Output Window Formatting Options" + TreeNode17.Name = "ndCommands" + TreeNode17.Tag = "8" + TreeNode17.Text = "Commands" + TreeNode17.ToolTipText = "Commands Options" + TreeNode18.Name = "ndDataView" + TreeNode18.Text = "Data View" + Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode13, TreeNode14, TreeNode15, TreeNode16, TreeNode17, TreeNode18}) Me.trOptions.Size = New System.Drawing.Size(184, 317) Me.trOptions.TabIndex = 0 ' @@ -617,7 +617,7 @@ Partial Class dlgOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(767, 343) + Me.ClientSize = New System.Drawing.Size(770, 353) Me.Controls.Add(Me.cmdApply) Me.Controls.Add(Me.cmdHelp) Me.Controls.Add(Me.cmdCancel) @@ -629,37 +629,37 @@ Partial Class dlgOptions Me.Tag = "Options" Me.Text = "Options" Me.tbcOptions.ResumeLayout(False) - Me.tbpWorkingDirectory.ResumeLayout(False) - Me.tbpWorkingDirectory.PerformLayout() - Me.tbpDataView.ResumeLayout(False) - Me.tbpDataView.PerformLayout() - CType(Me.nudMaxRows, System.ComponentModel.ISupportInitialize).EndInit() - Me.tbpCommands.ResumeLayout(False) - Me.tbpCommands.PerformLayout() - Me.pnScriptOptions.ResumeLayout(False) - Me.pnScriptOptions.PerformLayout() - Me.tbpEditor.ResumeLayout(False) - Me.tbpEditor.PerformLayout() - Me.pnFormatEditor.ResumeLayout(False) - Me.pnFormatEditor.PerformLayout() - Me.tbpOutputWindow.ResumeLayout(False) - Me.tbpOutputWindow.PerformLayout() - Me.pnFormatOptions.ResumeLayout(False) - Me.pnFormatOptions.PerformLayout() - Me.tbpImport.ResumeLayout(False) - Me.tbpImport.PerformLayout() - Me.pnImportData.ResumeLayout(False) - Me.pnImportData.PerformLayout() - CType(Me.nudPreviewRows, System.ComponentModel.ISupportInitialize).EndInit() - Me.tbpComments.ResumeLayout(False) - Me.tbpComments.PerformLayout() - Me.pnComments.ResumeLayout(False) - Me.pnComments.PerformLayout() Me.tbpLanguages.ResumeLayout(False) Me.tbpLanguages.PerformLayout() Me.pnLanguages.ResumeLayout(False) Me.grpLanguage.ResumeLayout(False) Me.grpLanguage.PerformLayout() + Me.tbpComments.ResumeLayout(False) + Me.tbpComments.PerformLayout() + Me.pnComments.ResumeLayout(False) + Me.pnComments.PerformLayout() + Me.tbpImport.ResumeLayout(False) + Me.tbpImport.PerformLayout() + Me.pnImportData.ResumeLayout(False) + Me.pnImportData.PerformLayout() + CType(Me.nudPreviewRows, System.ComponentModel.ISupportInitialize).EndInit() + Me.tbpOutputWindow.ResumeLayout(False) + Me.tbpOutputWindow.PerformLayout() + Me.pnFormatOptions.ResumeLayout(False) + Me.pnFormatOptions.PerformLayout() + Me.tbpEditor.ResumeLayout(False) + Me.tbpEditor.PerformLayout() + Me.pnFormatEditor.ResumeLayout(False) + Me.pnFormatEditor.PerformLayout() + Me.tbpCommands.ResumeLayout(False) + Me.tbpCommands.PerformLayout() + Me.pnScriptOptions.ResumeLayout(False) + Me.pnScriptOptions.PerformLayout() + Me.tbpDataView.ResumeLayout(False) + Me.tbpDataView.PerformLayout() + CType(Me.nudMaxRows, System.ComponentModel.ISupportInitialize).EndInit() + Me.tbpWorkingDirectory.ResumeLayout(False) + Me.tbpWorkingDirectory.PerformLayout() Me.spltControls.Panel1.ResumeLayout(False) Me.spltControls.Panel2.ResumeLayout(False) CType(Me.spltControls, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index d803118b2c7..21b26f20708 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -44,6 +44,7 @@ Public Class dlgOptions Private Sub InitialiseDialog() Dim strPreviewText As String nudMaxRows.Maximum = Integer.MaxValue + nudMaxRows.Increment = 10 strPreviewText = "R-Instat 2016" rtbCommandPreview.Text = strPreviewText rtbCommentPreview.Text = strPreviewText From 584d6f101ac097f30923413d62f8112a0adbb82d Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 6 Nov 2016 22:08:21 +0000 Subject: [PATCH 15/16] sdg's for Model - One Variable. Made Centre Parents and Changed some defaults --- instat/sdgOneVarCompareModels.Designer.vb | 19 ++++++++++--------- instat/sdgOneVarFitModDisplay.Designer.vb | 1 + instat/sdgOneVarFitModDisplay.vb | 4 ++-- instat/sdgOneVarFitModel.Designer.vb | 1 + instat/sdgOneVarUseModBootstrap.Designer.vb | 1 + instat/sdgOneVarUseModFit.Designer.vb | 3 ++- instat/sdgOneVarUseModFit.vb | 1 + 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/instat/sdgOneVarCompareModels.Designer.vb b/instat/sdgOneVarCompareModels.Designer.vb index e21ad26a0f6..0b9257fd479 100644 --- a/instat/sdgOneVarCompareModels.Designer.vb +++ b/instat/sdgOneVarCompareModels.Designer.vb @@ -29,6 +29,7 @@ Partial Class sdgOneVarCompareModels Me.lblGoF = New System.Windows.Forms.Label() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.ucrDisplayChiData = New instat.ucrInputTextBox() Me.ucrObjectName = New instat.ucrInputTextBox() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.ucrSavePlots = New instat.ucrSaveGraph() @@ -36,7 +37,6 @@ Partial Class sdgOneVarCompareModels Me.chkCDF = New System.Windows.Forms.CheckBox() Me.chkPP = New System.Windows.Forms.CheckBox() Me.chkDensity = New System.Windows.Forms.CheckBox() - Me.ucrDisplayChiData = New instat.ucrInputTextBox() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -114,6 +114,14 @@ Partial Class sdgOneVarCompareModels Me.TabPage1.Text = "Fit" Me.TabPage1.UseVisualStyleBackColor = True ' + 'ucrDisplayChiData + ' + Me.ucrDisplayChiData.IsReadOnly = False + Me.ucrDisplayChiData.Location = New System.Drawing.Point(129, 51) + Me.ucrDisplayChiData.Name = "ucrDisplayChiData" + Me.ucrDisplayChiData.Size = New System.Drawing.Size(139, 21) + Me.ucrDisplayChiData.TabIndex = 6 + ' 'ucrObjectName ' Me.ucrObjectName.IsReadOnly = False @@ -184,14 +192,6 @@ Partial Class sdgOneVarCompareModels Me.chkDensity.Text = "Density" Me.chkDensity.UseVisualStyleBackColor = True ' - 'ucrDisplayChiData - ' - Me.ucrDisplayChiData.IsReadOnly = False - Me.ucrDisplayChiData.Location = New System.Drawing.Point(129, 51) - Me.ucrDisplayChiData.Name = "ucrDisplayChiData" - Me.ucrDisplayChiData.Size = New System.Drawing.Size(139, 21) - Me.ucrDisplayChiData.TabIndex = 6 - ' 'sdgOneVarCompareModels ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -203,6 +203,7 @@ Partial Class sdgOneVarCompareModels Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgOneVarCompareModels" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Display Options" Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) diff --git a/instat/sdgOneVarFitModDisplay.Designer.vb b/instat/sdgOneVarFitModDisplay.Designer.vb index 9e9b192372e..daaf4520e2c 100644 --- a/instat/sdgOneVarFitModDisplay.Designer.vb +++ b/instat/sdgOneVarFitModDisplay.Designer.vb @@ -210,6 +210,7 @@ Partial Class sdgOneVarFitModDisplay Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgOneVarFitModDisplay" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Display Options" Me.tbclikelihood.ResumeLayout(False) Me.tbclikelihood.PerformLayout() diff --git a/instat/sdgOneVarFitModDisplay.vb b/instat/sdgOneVarFitModDisplay.vb index 5de11a7859d..68388868e37 100644 --- a/instat/sdgOneVarFitModDisplay.vb +++ b/instat/sdgOneVarFitModDisplay.vb @@ -29,9 +29,7 @@ Public Class sdgOneVarFitModDisplay Public Sub InitialiseDialog() UcrSaveLikelihood.SetDataFrameSelector(dlgOneVarFitModel.ucrSelectorOneVarFitMod.ucrAvailableDataFrames) - UcrSaveLikelihood.strPrefix = "Likelihood" ucrSavePlots.SetDataFrameSelector(dlgOneVarFitModel.ucrSelectorOneVarFitMod.ucrAvailableDataFrames) - ucrSavePlots.strPrefix = "Plot" clsRLogLikFunction.SetRCommand("llplot") End Sub @@ -40,6 +38,8 @@ Public Class sdgOneVarFitModDisplay rdoLoglik.Checked = True 'ucrSaveLikelihood.Enabled = False 'ucrBase.ihelptopicID = + ucrSavePlots.strPrefix = "Plot" + UcrSaveLikelihood.strPrefix = "Likelihood" UcrSaveLikelihood.Reset() ucrSavePlots.Reset() End Sub diff --git a/instat/sdgOneVarFitModel.Designer.vb b/instat/sdgOneVarFitModel.Designer.vb index 80ec0a1891e..727c58acbc6 100644 --- a/instat/sdgOneVarFitModel.Designer.vb +++ b/instat/sdgOneVarFitModel.Designer.vb @@ -208,6 +208,7 @@ Partial Class sdgOneVarFitModel Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgOneVarFitModel" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Fitting Options" Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) diff --git a/instat/sdgOneVarUseModBootstrap.Designer.vb b/instat/sdgOneVarUseModBootstrap.Designer.vb index bfb4de451a5..fe8016d4dab 100644 --- a/instat/sdgOneVarUseModBootstrap.Designer.vb +++ b/instat/sdgOneVarUseModBootstrap.Designer.vb @@ -106,6 +106,7 @@ Partial Class sdgOneVarUseModBootstrap Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgOneVarUseModBootstrap" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Bootstrap Options" CType(Me.nudCI, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.nudIterations, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/instat/sdgOneVarUseModFit.Designer.vb b/instat/sdgOneVarUseModFit.Designer.vb index 4948d7a1dcf..2347d63ddd1 100644 --- a/instat/sdgOneVarUseModFit.Designer.vb +++ b/instat/sdgOneVarUseModFit.Designer.vb @@ -72,7 +72,7 @@ Partial Class sdgOneVarUseModFit Me.tbcPlots.Location = New System.Drawing.Point(4, 22) Me.tbcPlots.Name = "tbcPlots" Me.tbcPlots.Padding = New System.Windows.Forms.Padding(3) - Me.tbcPlots.Size = New System.Drawing.Size(210, 191) + Me.tbcPlots.Size = New System.Drawing.Size(210, 183) Me.tbcPlots.TabIndex = 0 Me.tbcPlots.Text = "Plots" Me.tbcPlots.UseVisualStyleBackColor = True @@ -268,6 +268,7 @@ Partial Class sdgOneVarUseModFit Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgOneVarUseModFit" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Fit Model" Me.tbcQuantiles.ResumeLayout(False) Me.tbcPlots.ResumeLayout(False) diff --git a/instat/sdgOneVarUseModFit.vb b/instat/sdgOneVarUseModFit.vb index 2f692749381..caf666d6c8e 100644 --- a/instat/sdgOneVarUseModFit.vb +++ b/instat/sdgOneVarUseModFit.vb @@ -43,6 +43,7 @@ Public Class sdgOneVarUseModFit rdoPlotAll.Checked = True rdoSeqValues.Checked = True rdoInsertValues.Enabled = False + ucrInputValues.Visible = False SetPlotOptions() nudFrom.Value = 0 nudTo.Value = 1 From 67a90c77ce1263279660513d165a8cb4a66c50c7 Mon Sep 17 00:00:00 2001 From: Danny Parsons Date: Sun, 6 Nov 2016 22:48:31 +0000 Subject: [PATCH 16/16] disabled language options on Options dialog --- instat/dlgOptions.vb | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index d803118b2c7..fdf470a280c 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -49,6 +49,10 @@ Public Class dlgOptions rtbCommentPreview.Text = strPreviewText rtbOutputPreview.Text = strPreviewText SetView() + 'temp disabled as not functioning yet + rdoFrench.Enabled = False + rdoKiswahili.Enabled = False + rdoSpanish.Enabled = False End Sub Private Sub LoadInstatOptions() @@ -64,13 +68,16 @@ Public Class dlgOptions Select Case frmMain.clsInstatOptions.strLanguageCultureCode Case "en-GB" + rdoEnglish.Checked = True + ' temp disabled as not functioning + 'Case "fr-FR" + ' rdoFrench.Checked = True + 'Case "sw-KE" + ' rdoKiswahili.Checked = True + 'Case "es-ES" + ' rdoSpanish.Checked = True + Case Else rdoEnglish.Checked = True - Case "fr-FR" - rdoFrench.Checked = True - Case "sw-KE" - rdoKiswahili.Checked = True - Case "es-ES" - rdoSpanish.Checked = True End Select End Sub