From 868af224b1f0ecb9e518f1c3d9559397df7cf9cb Mon Sep 17 00:00:00 2001 From: Haward Ketoyo Date: Mon, 2 Aug 2021 14:29:43 +0300 Subject: [PATCH 01/31] Added parameters se and Orientation then updated the code --- instat/ucrGeom.vb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 8e27f4b0892..acb0148e8ee 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1716,10 +1716,10 @@ Public Class ucrGeom clsgeom_smooth.strGeomName = "geom_smooth" - ' mandatory + 'Mandatory Aesthetics clsgeom_smooth.AddAesParameter("x", bIsMandatory:=True) clsgeom_smooth.AddAesParameter("y", bIsMandatory:=True) - ' optional + 'Optional Aesthetics clsgeom_smooth.AddAesParameter("alpha") clsgeom_smooth.AddAesParameter("colour") clsgeom_smooth.AddAesParameter("fill") @@ -1728,22 +1728,24 @@ Public Class ucrGeom clsgeom_smooth.AddAesParameter("size") clsgeom_smooth.AddAesParameter("weight") - 'add layer parameter + 'Add layer parameters ''****Not sure how many positions exist for geom_smooth clsgeom_smooth.AddLayerParameter("position", "list", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34), Chr(34) & "jitter" & Chr(34)}) 'Can we have stack, DoDragDrop, fill positions here) clsgeom_smooth.AddLayerParameter("method", "list", Chr(34) & "lm" & Chr(34), lstParameterStrings:={Chr(34) & "lm" & Chr(34), Chr(34) & "glm" & Chr(34), Chr(34) & "gam" & Chr(34), Chr(34) & "loess" & Chr(34), Chr(34) & "rlm" & Chr(34)}) 'formula has to be an input and we dont have that currently. its passed in like this formula= y ~ x or formula= y ~ poly(x, 2) or formula= y ~ log(x) so the user has to type in stuff - clsgeom_smooth.AddLayerParameter("formula", "editablelist", Chr(34) & "y ~ x" & Chr(34), lstParameterStrings:={Chr(34) & "y ~ x" & Chr(34), Chr(34) & "y ~ poly(x, 2)" & Chr(34), Chr(34) & "y ~ log(x)" & Chr(34), Chr(34) & " y ~ splines::bs(x,3)" & Chr(34)}) - clsgeom_smooth.AddLayerParameter("se", "boolean", "TRUE") + clsgeom_smooth.AddLayerParameter("formula", "editablelist", "y ~ x", lstParameterStrings:={"y ~ x", "y ~ poly(x, 2)", "y ~ log(x)", " y ~ splines::bs(x,3)"}) + clsgeom_smooth.AddLayerParameter("se", "list", "TRUE", lstParameterStrings:={"TRUE", "FALSE"}) + clsgeom_smooth.AddLayerParameter("method.args", "editablelist", "list()", lstParameterStrings:={"list()"}) clsgeom_smooth.AddLayerParameter("colour", "colour", Chr(34) & "black" & Chr(34)) clsgeom_smooth.AddLayerParameter("na.rm", "boolean", "FALSE") + clsgeom_smooth.AddLayerParameter("orientation", "list", "NA", lstParameterStrings:={"NA", Chr(34) & "x" & Chr(34), Chr(34) & "y" & Chr(34)}) clsgeom_smooth.AddLayerParameter("show.legend", "list", "TRUE", lstParameterStrings:={"NA", "TRUE", "FALSE"}) 'geom and stat are missing here as we dont know how to override the default connection between geom_smooth and stat_smooth 'you can have stat_smooth or geom_smooth. I am not sure how we can do that from here, changing the smothing function clsgeom_smooth.AddLayerParameter("n", "numeric", "0") - clsgeom_smooth.AddLayerParameter("span", "numeric", "0", lstParameterStrings:={1, 0, 1}) + clsgeom_smooth.AddLayerParameter("span", "numeric", "0.3", lstParameterStrings:={2, 0, 1}) clsgeom_smooth.AddLayerParameter("fullrange", "boolean", "FALSE") clsgeom_smooth.AddLayerParameter("level", "numeric", "0.95", lstParameterStrings:={2, 0, 1}) From f2ed05b69d7868f25ded31776e306054f0716792 Mon Sep 17 00:00:00 2001 From: Haward Ketoyo Date: Tue, 3 Aug 2021 17:24:20 +0300 Subject: [PATCH 02/31] fixed se label and added linetype and size parameters. --- instat/ucrGeom.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index acb0148e8ee..950f958aff5 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1735,7 +1735,7 @@ Public Class ucrGeom clsgeom_smooth.AddLayerParameter("method", "list", Chr(34) & "lm" & Chr(34), lstParameterStrings:={Chr(34) & "lm" & Chr(34), Chr(34) & "glm" & Chr(34), Chr(34) & "gam" & Chr(34), Chr(34) & "loess" & Chr(34), Chr(34) & "rlm" & Chr(34)}) 'formula has to be an input and we dont have that currently. its passed in like this formula= y ~ x or formula= y ~ poly(x, 2) or formula= y ~ log(x) so the user has to type in stuff clsgeom_smooth.AddLayerParameter("formula", "editablelist", "y ~ x", lstParameterStrings:={"y ~ x", "y ~ poly(x, 2)", "y ~ log(x)", " y ~ splines::bs(x,3)"}) - clsgeom_smooth.AddLayerParameter("se", "list", "TRUE", lstParameterStrings:={"TRUE", "FALSE"}) + clsgeom_smooth.AddLayerParameter("se ", "list", "TRUE", lstParameterStrings:={"TRUE", "FALSE"}) clsgeom_smooth.AddLayerParameter("method.args", "editablelist", "list()", lstParameterStrings:={"list()"}) clsgeom_smooth.AddLayerParameter("colour", "colour", Chr(34) & "black" & Chr(34)) clsgeom_smooth.AddLayerParameter("na.rm", "boolean", "FALSE") @@ -1748,6 +1748,8 @@ Public Class ucrGeom clsgeom_smooth.AddLayerParameter("span", "numeric", "0.3", lstParameterStrings:={2, 0, 1}) clsgeom_smooth.AddLayerParameter("fullrange", "boolean", "FALSE") clsgeom_smooth.AddLayerParameter("level", "numeric", "0.95", lstParameterStrings:={2, 0, 1}) + clsgeom_smooth.AddLayerParameter("size", "numeric", "0.5", lstParameterStrings:={1, 0}) 'Note: negative size gives size 0 in general, but 'Warning: sometimesgive errors... + clsgeom_smooth.AddLayerParameter("linetype", "list", Chr(34) & "blank" & Chr(34), lstParameterStrings:=strLineType) 'method.args is a list of methods passed into the moddeling function 'its passed in like this** method.args = list(family = "binomial") we currently dont have this too. From 44a5202c6ec7b222b0405e697a2556219e28d6a3 Mon Sep 17 00:00:00 2001 From: rachelkg <85707390+rachelkg@users.noreply.github.com> Date: Thu, 12 Aug 2021 17:11:40 -0700 Subject: [PATCH 03/31] French layout review Aug10th --- instat/dlgColumnStats.resx | 12 +- instat/dlgConvertColumns.Designer.vb | 24 +- instat/dlgConvertColumns.resx | 5 +- instat/dlgExportRObjects.Designer.vb | 6 +- instat/dlgExportRObjects.resx | 12 +- instat/dlgExportRWorkspace.resx | 12 +- instat/dlgExportToCPT.resx | 2 +- instat/dlgExportToOpenRefine.resx | 4 +- instat/dlgFromLibrary.resx | 2 +- instat/dlgImportFromODK.Designer.vb | 1 + instat/dlgImportFromODK.resx | 12 +- instat/dlgNewDataFrame.resx | 22 +- instat/dlgOneWayFrequencies.Designer.vb | 135 ++-------- instat/dlgOneWayFrequencies.resx | 325 +++-------------------- instat/dlgOneWayFrequencies.vb | 6 +- instat/dlgReorderColumns.Designer.vb | 1 + instat/dlgReorderColumns.resx | 2 +- instat/dlgRownamesOrNumbers.resx | 332 ++++++++++++++++-------- instat/dlgSaveAs.resx | 8 +- instat/ucrSave.Designer.vb | 6 +- instat/ucrSave.resx | 18 +- 21 files changed, 349 insertions(+), 598 deletions(-) diff --git a/instat/dlgColumnStats.resx b/instat/dlgColumnStats.resx index 6bed6580433..851c9eea6b9 100644 --- a/instat/dlgColumnStats.resx +++ b/instat/dlgColumnStats.resx @@ -184,10 +184,10 @@ NoControl - 148, 113 + 119, 140 - 104, 26 + 133, 26 20 @@ -253,7 +253,7 @@ 6, 117 - 130, 20 + 218, 20 4 @@ -316,7 +316,7 @@ 10, 196 - 258, 145 + 258, 172 7 @@ -418,7 +418,7 @@ 6, 13 - 416, 418 + 416, 428 274, 190 @@ -493,7 +493,7 @@ 9 - 10, 358 + 6, 374 402, 53 diff --git a/instat/dlgConvertColumns.Designer.vb b/instat/dlgConvertColumns.Designer.vb index 0ae926a6fa2..c389e7249e6 100644 --- a/instat/dlgConvertColumns.Designer.vb +++ b/instat/dlgConvertColumns.Designer.vb @@ -47,17 +47,17 @@ Partial Class dlgConvertColumns Me.rdoNumeric = New System.Windows.Forms.RadioButton() Me.rdoOrderedFactor = New System.Windows.Forms.RadioButton() Me.rdoFactor = New System.Windows.Forms.RadioButton() + Me.ucrPnlConvertTo = New instat.UcrPanel() Me.rdoConvertOrdinals = New System.Windows.Forms.RadioButton() Me.grpFactorToNumericOptions = New System.Windows.Forms.GroupBox() Me.rdoDefault = New System.Windows.Forms.RadioButton() Me.rdoConvertLevels = New System.Windows.Forms.RadioButton() + Me.ucrPnlFactorToNumericOptions = New instat.UcrPanel() Me.ucrChkIgnoreLabels = New instat.ucrCheck() Me.ucrChkCreateLabels = New instat.ucrCheck() - Me.ucrPnlFactorToNumericOptions = New instat.UcrPanel() Me.ucrChkKeepAttributes = New instat.ucrCheck() Me.ucrNudDisplayDecimals = New instat.ucrNud() Me.ucrChkSpecifyDecimalsToDisplay = New instat.ucrCheck() - Me.ucrPnlConvertTo = New instat.UcrPanel() Me.ucrSelectorDataFrameColumns = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverColumnsToConvert = New instat.ucrReceiverMultiple() Me.ucrBase = New instat.ucrButtons() @@ -126,6 +126,11 @@ Partial Class dlgConvertColumns Me.rdoFactor.TabStop = True Me.rdoFactor.UseVisualStyleBackColor = True ' + 'ucrPnlConvertTo + ' + resources.ApplyResources(Me.ucrPnlConvertTo, "ucrPnlConvertTo") + Me.ucrPnlConvertTo.Name = "ucrPnlConvertTo" + ' 'rdoConvertOrdinals ' resources.ApplyResources(Me.rdoConvertOrdinals, "rdoConvertOrdinals") @@ -157,6 +162,11 @@ Partial Class dlgConvertColumns Me.rdoConvertLevels.TabStop = True Me.rdoConvertLevels.UseVisualStyleBackColor = True ' + 'ucrPnlFactorToNumericOptions + ' + resources.ApplyResources(Me.ucrPnlFactorToNumericOptions, "ucrPnlFactorToNumericOptions") + Me.ucrPnlFactorToNumericOptions.Name = "ucrPnlFactorToNumericOptions" + ' 'ucrChkIgnoreLabels ' Me.ucrChkIgnoreLabels.Checked = False @@ -169,11 +179,6 @@ Partial Class dlgConvertColumns resources.ApplyResources(Me.ucrChkCreateLabels, "ucrChkCreateLabels") Me.ucrChkCreateLabels.Name = "ucrChkCreateLabels" ' - 'ucrPnlFactorToNumericOptions - ' - resources.ApplyResources(Me.ucrPnlFactorToNumericOptions, "ucrPnlFactorToNumericOptions") - Me.ucrPnlFactorToNumericOptions.Name = "ucrPnlFactorToNumericOptions" - ' 'ucrChkKeepAttributes ' Me.ucrChkKeepAttributes.Checked = False @@ -196,11 +201,6 @@ Partial Class dlgConvertColumns resources.ApplyResources(Me.ucrChkSpecifyDecimalsToDisplay, "ucrChkSpecifyDecimalsToDisplay") Me.ucrChkSpecifyDecimalsToDisplay.Name = "ucrChkSpecifyDecimalsToDisplay" ' - 'ucrPnlConvertTo - ' - resources.ApplyResources(Me.ucrPnlConvertTo, "ucrPnlConvertTo") - Me.ucrPnlConvertTo.Name = "ucrPnlConvertTo" - ' 'ucrSelectorDataFrameColumns ' Me.ucrSelectorDataFrameColumns.bDropUnusedFilterLevels = False diff --git a/instat/dlgConvertColumns.resx b/instat/dlgConvertColumns.resx index fa212585232..992667dc1c0 100644 --- a/instat/dlgConvertColumns.resx +++ b/instat/dlgConvertColumns.resx @@ -568,7 +568,7 @@ 3 - 253, 316 + 242, 316 50, 20 @@ -663,9 +663,6 @@ 10 - - NoControl - CenterScreen diff --git a/instat/dlgExportRObjects.Designer.vb b/instat/dlgExportRObjects.Designer.vb index 5d6715e539f..40f7e69617d 100644 --- a/instat/dlgExportRObjects.Designer.vb +++ b/instat/dlgExportRObjects.Designer.vb @@ -55,12 +55,14 @@ Partial Class dlgExportRObjects ' Me.ucrFilePath.DefaultFileSuggestionName = "" Me.ucrFilePath.FilePath = "" - Me.ucrFilePath.FilePathBrowseText = "Browse" + Me.ucrFilePath.FilePathBrowseText = resources.GetString("ucrFilePath.FilePathBrowseText") Me.ucrFilePath.FilePathDialogFilter = "Saved R objects (*.RData)|*.RData|Serialized R Objects (*.rds)|*.rds" Me.ucrFilePath.FilePathDialogTitle = "Export R Objects" - Me.ucrFilePath.FilePathLabel = "Export File:" + Me.ucrFilePath.FilePathLabel = resources.GetString("ucrFilePath.FilePathLabel") + Me.ucrFilePath.FolderBrowse = False resources.ApplyResources(Me.ucrFilePath, "ucrFilePath") Me.ucrFilePath.Name = "ucrFilePath" + Me.ucrFilePath.SelectedFileFilterIndex = 1 ' 'ucrReceiverMultipleObjects ' diff --git a/instat/dlgExportRObjects.resx b/instat/dlgExportRObjects.resx index 4164aefba4b..a54ab71d13e 100644 --- a/instat/dlgExportRObjects.resx +++ b/instat/dlgExportRObjects.resx @@ -150,6 +150,14 @@ 1 + + Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) +A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. + + + Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) +A problem occured attempting to translate string 'Export File:' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. + 14, 199 @@ -178,7 +186,7 @@ 6, 13 - 417, 288 + 423, 288 10, 10 @@ -211,7 +219,7 @@ 4, 5, 4, 5 - 398, 52 + 412, 52 6 diff --git a/instat/dlgExportRWorkspace.resx b/instat/dlgExportRWorkspace.resx index d6621ba6f0e..248cd0cfb12 100644 --- a/instat/dlgExportRWorkspace.resx +++ b/instat/dlgExportRWorkspace.resx @@ -123,7 +123,7 @@ - 10, 15 + 7, 13 76, 13 @@ -150,7 +150,7 @@ True - 247, 45 + 247, 44 115, 13 @@ -284,11 +284,13 @@ Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. +A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) +A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Export File:' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. +A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) +A problem occured attempting to translate string 'Export File:' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. 14, 245 @@ -318,7 +320,7 @@ A problem occured attempting to translate string 'Export File:' to language en u 4, 5, 4, 5 - 398, 52 + 404, 52 10 diff --git a/instat/dlgExportToCPT.resx b/instat/dlgExportToCPT.resx index 734e7479ae7..6ddcf304423 100644 --- a/instat/dlgExportToCPT.resx +++ b/instat/dlgExportToCPT.resx @@ -613,7 +613,7 @@ 9 - 8, 529 + 15, 529 410, 52 diff --git a/instat/dlgExportToOpenRefine.resx b/instat/dlgExportToOpenRefine.resx index 1765dcfcb76..ee40aa2c91c 100644 --- a/instat/dlgExportToOpenRefine.resx +++ b/instat/dlgExportToOpenRefine.resx @@ -175,7 +175,7 @@ 10, 86 - 172, 20 + 318, 20 3 @@ -193,7 +193,7 @@ 1 - 10, 112 + 6, 112 407, 52 diff --git a/instat/dlgFromLibrary.resx b/instat/dlgFromLibrary.resx index 4fcb7b95478..20750112ca4 100644 --- a/instat/dlgFromLibrary.resx +++ b/instat/dlgFromLibrary.resx @@ -376,7 +376,7 @@ 4, 5, 4, 5 - 264, 24 + 315, 24 7 diff --git a/instat/dlgImportFromODK.Designer.vb b/instat/dlgImportFromODK.Designer.vb index 716fec6d1b6..a53e03a5a3a 100644 --- a/instat/dlgImportFromODK.Designer.vb +++ b/instat/dlgImportFromODK.Designer.vb @@ -69,6 +69,7 @@ Partial Class dlgImportFromODK 'ucrInputChooseForm ' Me.ucrInputChooseForm.AddQuotesIfUnrecognised = True + Me.ucrInputChooseForm.GetSetSelectedIndex = -1 Me.ucrInputChooseForm.IsReadOnly = False resources.ApplyResources(Me.ucrInputChooseForm, "ucrInputChooseForm") Me.ucrInputChooseForm.Name = "ucrInputChooseForm" diff --git a/instat/dlgImportFromODK.resx b/instat/dlgImportFromODK.resx index 57a76237172..20391578101 100644 --- a/instat/dlgImportFromODK.resx +++ b/instat/dlgImportFromODK.resx @@ -168,10 +168,10 @@ 7 - 10, 81 + 10, 84 - 102, 23 + 121, 23 3 @@ -192,14 +192,14 @@ 3 - 131, 114 + 116, 114 6, 8, 6, 8 - 152, 21 + 167, 21 5 @@ -217,13 +217,13 @@ 4 - 131, 56 + 116, 56 6, 8, 6, 8 - 152, 21 + 167, 21 2 diff --git a/instat/dlgNewDataFrame.resx b/instat/dlgNewDataFrame.resx index bcfb7726192..a854cef12e9 100644 --- a/instat/dlgNewDataFrame.resx +++ b/instat/dlgNewDataFrame.resx @@ -369,15 +369,6 @@ 17, 17 - - 165, 114 - - - mnuStripCommand - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Ctrl+X @@ -423,6 +414,15 @@ Select All + + 165, 114 + + + mnuStripCommand + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True @@ -589,7 +589,7 @@ 4, 5, 4, 5 - 373, 24 + 416, 24 14 @@ -655,7 +655,7 @@ 14 - 11, 318 + 20, 318 4, 5, 4, 5 diff --git a/instat/dlgOneWayFrequencies.Designer.vb b/instat/dlgOneWayFrequencies.Designer.vb index 55c1b4c13ac..95083f7b68e 100644 --- a/instat/dlgOneWayFrequencies.Designer.vb +++ b/instat/dlgOneWayFrequencies.Designer.vb @@ -40,8 +40,8 @@ Partial Class dlgOneWayFrequencies Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgOneWayFrequencies)) Me.grpSort = New System.Windows.Forms.GroupBox() - Me.rdoDescendingFrequencies = New System.Windows.Forms.RadioButton() - Me.rdoAscendingFrequencies = New System.Windows.Forms.RadioButton() + Me.rdoDescending = New System.Windows.Forms.RadioButton() + Me.rdoAscending = New System.Windows.Forms.RadioButton() Me.rdoNone = New System.Windows.Forms.RadioButton() Me.cmdOptions = New System.Windows.Forms.Button() Me.lblSelectedVariable = New System.Windows.Forms.Label() @@ -51,45 +51,32 @@ Partial Class dlgOneWayFrequencies Me.grpOutput = New System.Windows.Forms.GroupBox() Me.rdoAsHtml = New System.Windows.Forms.RadioButton() Me.rdoAsText = New System.Windows.Forms.RadioButton() - Me.ucrPnlOutput = New instat.UcrPanel() - Me.ucrSaveGraph = New instat.ucrSave() - Me.ucrReceiverOneWayFreq = New instat.ucrReceiverMultiple() - Me.ucrNudGroups = New instat.ucrNud() - Me.ucrPnlFrequencies = New instat.UcrPanel() - Me.ucrChkGroupData = New instat.ucrCheck() - Me.ucrReceiverWeights = New instat.ucrReceiverSingle() - Me.ucrChkWeights = New instat.ucrCheck() - Me.ucrChkFlip = New instat.ucrCheck() - Me.ucrPnlSort = New instat.UcrPanel() - Me.ucrBase = New instat.ucrButtons() - Me.ucrSelectorOneWayFreq = New instat.ucrSelectorByDataFrameAddRemove() Me.grpSort.SuspendLayout() Me.grpOutput.SuspendLayout() Me.SuspendLayout() ' 'grpSort ' - Me.grpSort.Controls.Add(Me.rdoDescendingFrequencies) - Me.grpSort.Controls.Add(Me.rdoAscendingFrequencies) + Me.grpSort.Controls.Add(Me.rdoDescending) + Me.grpSort.Controls.Add(Me.rdoAscending) Me.grpSort.Controls.Add(Me.rdoNone) - Me.grpSort.Controls.Add(Me.ucrPnlSort) resources.ApplyResources(Me.grpSort, "grpSort") Me.grpSort.Name = "grpSort" Me.grpSort.TabStop = False ' - 'rdoDescendingFrequencies + 'rdoDescending ' - resources.ApplyResources(Me.rdoDescendingFrequencies, "rdoDescendingFrequencies") - Me.rdoDescendingFrequencies.Name = "rdoDescendingFrequencies" - Me.rdoDescendingFrequencies.TabStop = True - Me.rdoDescendingFrequencies.UseVisualStyleBackColor = True + resources.ApplyResources(Me.rdoDescending, "rdoDescending") + Me.rdoDescending.Name = "rdoDescending" + Me.rdoDescending.TabStop = True + Me.rdoDescending.UseVisualStyleBackColor = True ' - 'rdoAscendingFrequencies + 'rdoAscending ' - resources.ApplyResources(Me.rdoAscendingFrequencies, "rdoAscendingFrequencies") - Me.rdoAscendingFrequencies.Name = "rdoAscendingFrequencies" - Me.rdoAscendingFrequencies.TabStop = True - Me.rdoAscendingFrequencies.UseVisualStyleBackColor = True + resources.ApplyResources(Me.rdoAscending, "rdoAscending") + Me.rdoAscending.Name = "rdoAscending" + Me.rdoAscending.TabStop = True + Me.rdoAscending.UseVisualStyleBackColor = True ' 'rdoNone ' @@ -140,7 +127,6 @@ Partial Class dlgOneWayFrequencies ' Me.grpOutput.Controls.Add(Me.rdoAsHtml) Me.grpOutput.Controls.Add(Me.rdoAsText) - Me.grpOutput.Controls.Add(Me.ucrPnlOutput) resources.ApplyResources(Me.grpOutput, "grpOutput") Me.grpOutput.Name = "grpOutput" Me.grpOutput.TabStop = False @@ -157,106 +143,17 @@ Partial Class dlgOneWayFrequencies Me.rdoAsText.Name = "rdoAsText" Me.rdoAsText.UseVisualStyleBackColor = True ' - 'ucrPnlOutput - ' - resources.ApplyResources(Me.ucrPnlOutput, "ucrPnlOutput") - Me.ucrPnlOutput.Name = "ucrPnlOutput" - ' - 'ucrSaveGraph - ' - resources.ApplyResources(Me.ucrSaveGraph, "ucrSaveGraph") - Me.ucrSaveGraph.Name = "ucrSaveGraph" - ' - 'ucrReceiverOneWayFreq - ' - Me.ucrReceiverOneWayFreq.frmParent = Me - resources.ApplyResources(Me.ucrReceiverOneWayFreq, "ucrReceiverOneWayFreq") - Me.ucrReceiverOneWayFreq.Name = "ucrReceiverOneWayFreq" - Me.ucrReceiverOneWayFreq.Selector = Nothing - Me.ucrReceiverOneWayFreq.strNcFilePath = "" - Me.ucrReceiverOneWayFreq.ucrSelector = Nothing - ' - 'ucrNudGroups - ' - Me.ucrNudGroups.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudGroups.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - resources.ApplyResources(Me.ucrNudGroups, "ucrNudGroups") - Me.ucrNudGroups.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudGroups.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudGroups.Name = "ucrNudGroups" - Me.ucrNudGroups.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrPnlFrequencies - ' - resources.ApplyResources(Me.ucrPnlFrequencies, "ucrPnlFrequencies") - Me.ucrPnlFrequencies.Name = "ucrPnlFrequencies" - ' - 'ucrChkGroupData - ' - Me.ucrChkGroupData.Checked = False - resources.ApplyResources(Me.ucrChkGroupData, "ucrChkGroupData") - Me.ucrChkGroupData.Name = "ucrChkGroupData" - ' - 'ucrReceiverWeights - ' - Me.ucrReceiverWeights.frmParent = Me - resources.ApplyResources(Me.ucrReceiverWeights, "ucrReceiverWeights") - Me.ucrReceiverWeights.Name = "ucrReceiverWeights" - Me.ucrReceiverWeights.Selector = Nothing - Me.ucrReceiverWeights.strNcFilePath = "" - Me.ucrReceiverWeights.ucrSelector = Nothing - ' - 'ucrChkWeights - ' - Me.ucrChkWeights.Checked = False - resources.ApplyResources(Me.ucrChkWeights, "ucrChkWeights") - Me.ucrChkWeights.Name = "ucrChkWeights" - ' - 'ucrChkFlip - ' - Me.ucrChkFlip.Checked = False - resources.ApplyResources(Me.ucrChkFlip, "ucrChkFlip") - Me.ucrChkFlip.Name = "ucrChkFlip" - ' - 'ucrPnlSort - ' - resources.ApplyResources(Me.ucrPnlSort, "ucrPnlSort") - Me.ucrPnlSort.Name = "ucrPnlSort" - ' - 'ucrBase - ' - resources.ApplyResources(Me.ucrBase, "ucrBase") - Me.ucrBase.Name = "ucrBase" - ' - 'ucrSelectorOneWayFreq - ' - Me.ucrSelectorOneWayFreq.bDropUnusedFilterLevels = False - Me.ucrSelectorOneWayFreq.bShowHiddenColumns = False - Me.ucrSelectorOneWayFreq.bUseCurrentFilter = True - resources.ApplyResources(Me.ucrSelectorOneWayFreq, "ucrSelectorOneWayFreq") - Me.ucrSelectorOneWayFreq.Name = "ucrSelectorOneWayFreq" - ' 'dlgOneWayFrequencies ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.grpOutput) - Me.Controls.Add(Me.ucrSaveGraph) - Me.Controls.Add(Me.ucrReceiverOneWayFreq) Me.Controls.Add(Me.rdoBoth) Me.Controls.Add(Me.rdoGraph) - Me.Controls.Add(Me.ucrNudGroups) Me.Controls.Add(Me.rdoTable) - Me.Controls.Add(Me.ucrPnlFrequencies) - Me.Controls.Add(Me.ucrChkGroupData) - Me.Controls.Add(Me.ucrReceiverWeights) - Me.Controls.Add(Me.ucrChkWeights) - Me.Controls.Add(Me.ucrChkFlip) Me.Controls.Add(Me.lblSelectedVariable) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.grpSort) - Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.ucrSelectorOneWayFreq) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -272,8 +169,8 @@ Partial Class dlgOneWayFrequencies Friend WithEvents ucrSelectorOneWayFreq As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrBase As ucrButtons Friend WithEvents grpSort As GroupBox - Friend WithEvents rdoDescendingFrequencies As RadioButton - Friend WithEvents rdoAscendingFrequencies As RadioButton + Friend WithEvents rdoDescending As RadioButton + Friend WithEvents rdoAscending As RadioButton Friend WithEvents rdoNone As RadioButton Friend WithEvents ucrPnlSort As UcrPanel Friend WithEvents cmdOptions As Button diff --git a/instat/dlgOneWayFrequencies.resx b/instat/dlgOneWayFrequencies.resx index ceb3bb069d2..4dabbd7d78c 100644 --- a/instat/dlgOneWayFrequencies.resx +++ b/instat/dlgOneWayFrequencies.resx @@ -118,60 +118,60 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - + 6, 65 - + 155, 17 - + 3 - - Descending Frequencies + + Descending - - rdoDescendingFrequencies + + rdoDescending - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + grpSort - + 0 - + NoControl - + 6, 43 - + 155, 17 - + 2 - - Ascending Frequencies + + Ascending - - rdoAscendingFrequencies + + rdoAscending - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + grpSort - + 1 @@ -201,27 +201,6 @@ 2 - - 3, 14 - - - 158, 69 - - - 0 - - - ucrPnlSort - - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpSort - - - 3 - 258, 185 @@ -244,7 +223,7 @@ $this - 14 + 6 NoControl @@ -271,7 +250,7 @@ $this - 13 + 5 True @@ -301,7 +280,7 @@ $this - 12 + 4 Button @@ -337,7 +316,7 @@ $this - 4 + 2 Button @@ -373,7 +352,7 @@ $this - 6 + 3 Button @@ -409,7 +388,7 @@ $this - 3 + 1 True @@ -471,27 +450,6 @@ 1 - - 3, 16 - - - 150, 53 - - - 0 - - - ucrPnlOutput - - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpOutput - - - 2 - 258, 275 @@ -516,30 +474,6 @@ 0 - - 10, 353 - - - 4, 5, 4, 5 - - - 254, 24 - - - 15 - - - ucrSaveGraph - - - instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 1 - True @@ -549,188 +483,11 @@ 435, 447 - - 142, 277 - - - 50, 20 - - - 13 - - - ucrNudGroups - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 5 - - - 64, 6 - - - 315, 35 - - - 0 - - - ucrPnlFrequencies - - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 7 - - - 10, 280 - - - 145, 20 - - - 12 - - - ucrChkGroupData - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 8 - - - 142, 254 - - - 0, 0, 0, 0 - - - 90, 20 - - - 11 - - - ucrReceiverWeights - - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 9 - - - 10, 256 - - - 145, 20 - - - 10 - - - ucrChkWeights - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 10 - - - 10, 304 - - - 210, 20 - - - 14 - - - ucrChkFlip - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 11 - - - 10, 385 - - - 410, 52 - - - 16 - - - ucrBase - - - instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 15 - - - 10, 45 - - - 0, 0, 0, 0 - - - 210, 180 - - - 4 - - - ucrSelectorOneWayFreq - - - instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 16 - - - NoControl - CenterScreen - One Way Frequencies + Frequencies dlgOneWayFrequencies @@ -738,28 +495,4 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 258, 79 - - - 0, 0, 0, 0 - - - 120, 100 - - - 6 - - - ucrReceiverOneWayFreq - - - instat.ucrReceiverMultiple, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 2 - \ No newline at end of file diff --git a/instat/dlgOneWayFrequencies.vb b/instat/dlgOneWayFrequencies.vb index 5247c5487fd..10c82d4bd15 100644 --- a/instat/dlgOneWayFrequencies.vb +++ b/instat/dlgOneWayFrequencies.vb @@ -27,7 +27,7 @@ Public Class dlgOneWayFrequencies Public strDefaultDataFrame As String = "" Public strDefaultColumns() As String = Nothing - Private Sub dlgOneWayFrequencies_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Private Sub dlgOneWayFrequencies_Load(sender As Object, e As EventArgs) If bFirstLoad Then InitialiseDialog() bFirstLoad = False @@ -62,8 +62,8 @@ Public Class dlgOneWayFrequencies ucrPnlSort.SetParameter(New RParameter("sort.frq", 2)) ucrPnlSort.AddRadioButton(rdoNone, Chr(34) & "none" & Chr(34)) - ucrPnlSort.AddRadioButton(rdoAscendingFrequencies, Chr(34) & "asc" & Chr(34)) - ucrPnlSort.AddRadioButton(rdoDescendingFrequencies, Chr(34) & "desc" & Chr(34)) + ucrPnlSort.AddRadioButton(rdoAscending, Chr(34) & "asc" & Chr(34)) + ucrPnlSort.AddRadioButton(rdoDescending, Chr(34) & "desc" & Chr(34)) ucrPnlSort.SetRDefault(Chr(34) & "none" & Chr(34)) ucrChkWeights.SetText("Weights") diff --git a/instat/dlgReorderColumns.Designer.vb b/instat/dlgReorderColumns.Designer.vb index aa8c90e2a07..63cdf8ebfe2 100644 --- a/instat/dlgReorderColumns.Designer.vb +++ b/instat/dlgReorderColumns.Designer.vb @@ -59,6 +59,7 @@ Partial Class dlgReorderColumns ' 'ucrDataFrameSelect ' + Me.ucrDataFrameSelect.bDropUnusedFilterLevels = False Me.ucrDataFrameSelect.bUseCurrentFilter = True resources.ApplyResources(Me.ucrDataFrameSelect, "ucrDataFrameSelect") Me.ucrDataFrameSelect.Name = "ucrDataFrameSelect" diff --git a/instat/dlgReorderColumns.resx b/instat/dlgReorderColumns.resx index 5b41a7fd140..67e504d8094 100644 --- a/instat/dlgReorderColumns.resx +++ b/instat/dlgReorderColumns.resx @@ -123,7 +123,7 @@ - 170, 13 + 175, 13 103, 13 diff --git a/instat/dlgRownamesOrNumbers.resx b/instat/dlgRownamesOrNumbers.resx index 958173b37a5..9a7737d2636 100644 --- a/instat/dlgRownamesOrNumbers.resx +++ b/instat/dlgRownamesOrNumbers.resx @@ -145,7 +145,7 @@ 1 - 9, 281 + 9, 279 410, 52 @@ -169,7 +169,7 @@ 3, 14 - 273, 166 + 352, 166 0 @@ -193,16 +193,7 @@ 6, 13 - 522, 336 - - - 24, 213 - - - 188, 20 - - - 9 + 601, 336 ucrChkAsNumeric @@ -216,21 +207,6 @@ 0 - - True - - - 130, 186 - - - 82, 17 - - - 9 - - - Descending - rdoSortDescending @@ -243,21 +219,6 @@ 1 - - True - - - 24, 186 - - - 75, 17 - - - 8 - - - Ascending - rdoSortAscending @@ -270,15 +231,6 @@ 2 - - 7, 171 - - - 206, 36 - - - 7 - ucrPnlSortOptions @@ -291,18 +243,6 @@ 3 - - 24, 42 - - - 4, 5, 4, 5 - - - 206, 21 - - - 2 - ucrNewColumnName @@ -315,18 +255,6 @@ 4 - - 9, 156 - - - 267, 17 - - - 6 - - - Sort by Row Names - rdoSortbyRowNames @@ -339,18 +267,6 @@ 5 - - 9, 127 - - - 267, 17 - - - 5 - - - Reset Row Names to Positive Integers - rdoResetintoPositiveIntegers @@ -363,18 +279,6 @@ 6 - - 9, 72 - - - 267, 17 - - - 3 - - - Set Row Names from Column - rdoSetRowNamesFromColumn @@ -387,18 +291,6 @@ 7 - - 9, 19 - - - 267, 17 - - - 1 - - - Copy Row Names into Column - rdoCopyRowNamesIntoFirstColumn @@ -415,7 +307,7 @@ 228, 34 - 282, 241 + 361, 241 1 @@ -471,4 +363,220 @@ 9 + + 9, 19 + + + 267, 17 + + + 1 + + + Copy Row Names into Column + + + rdoCopyRowNamesIntoFirstColumn + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpboxOptionsforRowNamesorNumbercols + + + 8 + + + 9, 72 + + + 267, 17 + + + 3 + + + Set Row Names from Column + + + rdoSetRowNamesFromColumn + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpboxOptionsforRowNamesorNumbercols + + + 7 + + + 9, 127 + + + 267, 17 + + + 5 + + + Reset Row Names to Positive Integers + + + rdoResetintoPositiveIntegers + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpboxOptionsforRowNamesorNumbercols + + + 6 + + + 9, 156 + + + 267, 17 + + + 6 + + + Sort by Row Names + + + rdoSortbyRowNames + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpboxOptionsforRowNamesorNumbercols + + + 5 + + + True + + + 130, 186 + + + 82, 17 + + + 9 + + + Descending + + + rdoSortDescending + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpboxOptionsforRowNamesorNumbercols + + + 1 + + + True + + + 24, 186 + + + 75, 17 + + + 8 + + + Ascending + + + rdoSortAscending + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpboxOptionsforRowNamesorNumbercols + + + 2 + + + 9, 44 + + + 4, 5, 4, 5 + + + 343, 21 + + + 2 + + + ucrNewColumnName + + + instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpboxOptionsforRowNamesorNumbercols + + + 4 + + + 24, 213 + + + 188, 20 + + + 9 + + + ucrChkAsNumeric + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpboxOptionsforRowNamesorNumbercols + + + 0 + + + 7, 171 + + + 206, 36 + + + 7 + + + ucrPnlSortOptions + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpboxOptionsforRowNamesorNumbercols + + + 3 + \ No newline at end of file diff --git a/instat/dlgSaveAs.resx b/instat/dlgSaveAs.resx index 6be35a4c7c6..7cff4a99876 100644 --- a/instat/dlgSaveAs.resx +++ b/instat/dlgSaveAs.resx @@ -176,11 +176,13 @@ Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. +A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) +A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Save Data To:' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. +A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) +A problem occured attempting to translate string 'Save Data To:' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db. 1, 11 @@ -210,7 +212,7 @@ A problem occured attempting to translate string 'Save Data To:' to language en 6, 13 - 430, 124 + 434, 124 CenterScreen diff --git a/instat/ucrSave.Designer.vb b/instat/ucrSave.Designer.vb index ce4e8c32da4..29cadbf14b3 100644 --- a/instat/ucrSave.Designer.vb +++ b/instat/ucrSave.Designer.vb @@ -83,11 +83,11 @@ Partial Class ucrSave ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.ucrInputComboSave) - Me.Controls.Add(Me.ucrInputTextSave) + Me.Controls.Add(Me.btnColumnPosition) Me.Controls.Add(Me.lblSaveText) Me.Controls.Add(Me.ucrChkSave) - Me.Controls.Add(Me.btnColumnPosition) + Me.Controls.Add(Me.ucrInputTextSave) + Me.Controls.Add(Me.ucrInputComboSave) Me.Name = "ucrSave" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/ucrSave.resx b/instat/ucrSave.resx index 9aa7266dde3..00a914642d7 100644 --- a/instat/ucrSave.resx +++ b/instat/ucrSave.resx @@ -142,7 +142,7 @@ $this - 3 + 2 True @@ -169,13 +169,13 @@ $this - 2 + 1 Right - 210, 0 + 264, 0 9, 12, 9, 12 @@ -196,16 +196,16 @@ $this - 0 + 4 - 182, 0 + 189, 0 9, 12, 9, 12 - 155, 34 + 92, 34 3 @@ -220,7 +220,7 @@ $this - 1 + 3 True @@ -232,7 +232,7 @@ Right - 349, 0 + 210, 0 54, 34 @@ -253,7 +253,7 @@ $this - 4 + 0 True From 2ab8bab29b2cea2ddcaa492ec840942e2e81b8cf Mon Sep 17 00:00:00 2001 From: lloyddewit Date: Fri, 13 Aug 2021 11:40:45 +0200 Subject: [PATCH 04/31] Readded ' Handles MyBase.Load' to '_Load' sub --- instat/dlgOneWayFrequencies.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgOneWayFrequencies.vb b/instat/dlgOneWayFrequencies.vb index 10c82d4bd15..64c0d6b1622 100644 --- a/instat/dlgOneWayFrequencies.vb +++ b/instat/dlgOneWayFrequencies.vb @@ -27,7 +27,7 @@ Public Class dlgOneWayFrequencies Public strDefaultDataFrame As String = "" Public strDefaultColumns() As String = Nothing - Private Sub dlgOneWayFrequencies_Load(sender As Object, e As EventArgs) + Private Sub dlgOneWayFrequencies_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() bFirstLoad = False From db095f2a91a32d11ce895643687d94925356002d Mon Sep 17 00:00:00 2001 From: Haward Ketoyo Date: Mon, 16 Aug 2021 10:32:11 +0300 Subject: [PATCH 05/31] Removed extra space --- instat/ucrGeom.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 950f958aff5..af02d9f52e3 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1734,7 +1734,7 @@ Public Class ucrGeom 'Can we have stack, DoDragDrop, fill positions here) clsgeom_smooth.AddLayerParameter("method", "list", Chr(34) & "lm" & Chr(34), lstParameterStrings:={Chr(34) & "lm" & Chr(34), Chr(34) & "glm" & Chr(34), Chr(34) & "gam" & Chr(34), Chr(34) & "loess" & Chr(34), Chr(34) & "rlm" & Chr(34)}) 'formula has to be an input and we dont have that currently. its passed in like this formula= y ~ x or formula= y ~ poly(x, 2) or formula= y ~ log(x) so the user has to type in stuff - clsgeom_smooth.AddLayerParameter("formula", "editablelist", "y ~ x", lstParameterStrings:={"y ~ x", "y ~ poly(x, 2)", "y ~ log(x)", " y ~ splines::bs(x,3)"}) + clsgeom_smooth.AddLayerParameter("formula", "editablelist", "y ~ x", lstParameterStrings:={"y ~ x", "y ~ poly(x, 2)", "y ~ log(x)", "y ~ splines::bs(x,3)"}) clsgeom_smooth.AddLayerParameter("se ", "list", "TRUE", lstParameterStrings:={"TRUE", "FALSE"}) clsgeom_smooth.AddLayerParameter("method.args", "editablelist", "list()", lstParameterStrings:={"list()"}) clsgeom_smooth.AddLayerParameter("colour", "colour", Chr(34) & "black" & Chr(34)) From 6490b16a889b783461053f65388fcdedc4bb0f68 Mon Sep 17 00:00:00 2001 From: Antoine Ntalumeso Date: Mon, 16 Aug 2021 10:08:42 +0200 Subject: [PATCH 06/31] Bug fix: corrected the means and medians in PICSA rainfall graph --- instat/dlgPICSARainfall.vb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/instat/dlgPICSARainfall.vb b/instat/dlgPICSARainfall.vb index a69f5a450b9..513cca42bc7 100644 --- a/instat/dlgPICSARainfall.vb +++ b/instat/dlgPICSARainfall.vb @@ -113,7 +113,6 @@ Public Class dlgPICSARainfall Private clsCoordPolarFunction As New RFunction Private clsCoordPolarStartOperator As New ROperator - Private Sub dlgPCSARainfall_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -190,6 +189,7 @@ Public Class dlgPICSARainfall ucrSave.SetDataFrameSelector(ucrSelectorPICSARainfall.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_graph") End Sub + Private Sub SetDefaults() Dim clsPanelBackgroundElementRect As New RFunction Dim clsXElementLabels As New RFunction @@ -635,6 +635,7 @@ Public Class dlgPICSARainfall ucrBase.OKEnabled(True) End If End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) @@ -673,6 +674,7 @@ Public Class dlgPICSARainfall End If UpdateParameters() AddRemoveFacets() + AddRemoveGroupBy() End Sub Private Sub UpdateParameters() @@ -745,6 +747,7 @@ Public Class dlgPICSARainfall clsFacetOperator.RemoveParameterByName("right") End If End Sub + Private Sub ucrVariablesAsFactorForPicsa_ControlValueChanged() Handles ucrVariablesAsFactorForPicsa.ControlValueChanged TempOptionsDisabledInMultipleVariablesCase() End Sub @@ -808,9 +811,11 @@ Public Class dlgPICSARainfall clsGeomLine.AddParameter("colour", Chr(34) & "blue" & Chr(34)) End If End Sub + Private Sub ucrReceiverX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged XAxisDataTypeCheck() End Sub + Private Sub XAxisDataTypeCheck() If Not ucrReceiverX.IsEmpty AndAlso ucrReceiverX.strCurrDataType.Contains("factor") Then clsGeomLine.AddParameter("group", 1) From 7c971ee1669936c1fd2aa8e7cb6a047e9be88a47 Mon Sep 17 00:00:00 2001 From: Haward Ketoyo Date: Mon, 16 Aug 2021 12:36:40 +0300 Subject: [PATCH 07/31] Added a comment to explain why an extra space is needed. --- instat/ucrGeom.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index af02d9f52e3..66b9a2cf01d 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1735,7 +1735,7 @@ Public Class ucrGeom clsgeom_smooth.AddLayerParameter("method", "list", Chr(34) & "lm" & Chr(34), lstParameterStrings:={Chr(34) & "lm" & Chr(34), Chr(34) & "glm" & Chr(34), Chr(34) & "gam" & Chr(34), Chr(34) & "loess" & Chr(34), Chr(34) & "rlm" & Chr(34)}) 'formula has to be an input and we dont have that currently. its passed in like this formula= y ~ x or formula= y ~ poly(x, 2) or formula= y ~ log(x) so the user has to type in stuff clsgeom_smooth.AddLayerParameter("formula", "editablelist", "y ~ x", lstParameterStrings:={"y ~ x", "y ~ poly(x, 2)", "y ~ log(x)", "y ~ splines::bs(x,3)"}) - clsgeom_smooth.AddLayerParameter("se ", "list", "TRUE", lstParameterStrings:={"TRUE", "FALSE"}) + clsgeom_smooth.AddLayerParameter("se ", "list", "TRUE", lstParameterStrings:={"TRUE", "FALSE"}) 'We add space after parameter name se ("se ") for correct labeling, if the space is omitted, vb labels "se" as "ifelse" but when the space is included "se " is correctly labelled as "se". clsgeom_smooth.AddLayerParameter("method.args", "editablelist", "list()", lstParameterStrings:={"list()"}) clsgeom_smooth.AddLayerParameter("colour", "colour", Chr(34) & "black" & Chr(34)) clsgeom_smooth.AddLayerParameter("na.rm", "boolean", "FALSE") From 1dc8fe87b1761c6f8117681c4de5196d4e02e5ef Mon Sep 17 00:00:00 2001 From: rachelkg <85707390+rachelkg@users.noreply.github.com> Date: Mon, 16 Aug 2021 17:00:47 -0700 Subject: [PATCH 08/31] French layout review Aug 16th --- instat/dlgAddKey.resx | 2 +- instat/dlgAnonymiseIDColumn.Designer.vb | 2 +- instat/dlgAppend.resx | 9 +- instat/dlgBoxPlot.designer.vb | 16 +- instat/dlgBoxPlot.resx | 20 +- instat/dlgClimaticSummary.Designer.vb | 86 +- instat/dlgClimaticSummary.resx | 29 +- instat/dlgColumnStats.Designer.vb | 16 +- instat/dlgColumnStats.resx | 34 +- instat/dlgConvertColumns.Designer.vb | 2 +- instat/dlgConvertColumns.resx | 232 ++- instat/dlgConvertColumns.vb | 6 +- instat/dlgCopySheet.Designer.vb | 65 + instat/dlgCopySheet.sw-KE.Designer.vb | 0 instat/dlgCountinFactor.resx | 2 +- instat/dlgCountinFactor.vb | 4 + instat/dlgDuplicateColumns.resx | 220 ++- instat/dlgDuplicateColumns.vb | 4 +- instat/dlgMakeDate.Designer.vb | 2 +- instat/dlgMakeDate.resx | 1992 +++++++++++------------ instat/dlgOneVariableGraph.resx | 62 +- instat/dlgRegularSequence.designer.vb | 4 +- instat/dlgRegularSequence.resx | 124 +- instat/dlgScatterPlot.Designer.vb | 16 +- instat/dlgScatterPlot.resx | 20 +- instat/dlgScatterPlot.vb | 2 +- instat/dlgStack.Designer.vb | 2 +- instat/dlgStack.resx | 24 +- instat/dlgTransformText.Designer.vb | 4 +- instat/dlgTransformText.resx | 596 ++++--- instat/dlgTransformText.vb | 4 + instat/dlgVisualizeData.Designer.vb | 8 +- instat/instat.vbproj | 10 + instat/sdgMissingOptions.Designer.vb | 2 +- instat/ucrCalculator.resx | 2 +- instat/ucrFilter.resx | 290 +--- instat/ucrSave.Designer.vb | 2 +- instat/ucrSave.resx | 30 +- 38 files changed, 2032 insertions(+), 1913 deletions(-) create mode 100644 instat/dlgCopySheet.Designer.vb create mode 100644 instat/dlgCopySheet.sw-KE.Designer.vb diff --git a/instat/dlgAddKey.resx b/instat/dlgAddKey.resx index 55a5d478c81..e5241587a4d 100644 --- a/instat/dlgAddKey.resx +++ b/instat/dlgAddKey.resx @@ -184,7 +184,7 @@ 4, 5, 4, 5 - 206, 27 + 306, 27 8 diff --git a/instat/dlgAnonymiseIDColumn.Designer.vb b/instat/dlgAnonymiseIDColumn.Designer.vb index 925ecd6aa1e..7a22fd4d076 100644 --- a/instat/dlgAnonymiseIDColumn.Designer.vb +++ b/instat/dlgAnonymiseIDColumn.Designer.vb @@ -97,7 +97,7 @@ Partial Class dlgAnonymiseIDColumn Me.ucrSaveAnonymisedColumn.Location = New System.Drawing.Point(10, 205) Me.ucrSaveAnonymisedColumn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveAnonymisedColumn.Name = "ucrSaveAnonymisedColumn" - Me.ucrSaveAnonymisedColumn.Size = New System.Drawing.Size(250, 22) + Me.ucrSaveAnonymisedColumn.Size = New System.Drawing.Size(321, 22) Me.ucrSaveAnonymisedColumn.TabIndex = 7 ' 'ucrReceiverIDColumn diff --git a/instat/dlgAppend.resx b/instat/dlgAppend.resx index 916a7ef953d..bfd393964ba 100644 --- a/instat/dlgAppend.resx +++ b/instat/dlgAppend.resx @@ -187,7 +187,7 @@ NoControl - 136, 180 + 132, 179 90, 13 @@ -256,10 +256,10 @@ 1 - 258, 176 + 242, 176 - 120, 21 + 122, 21 6 @@ -330,9 +330,6 @@ 8 - - NoControl - CenterScreen diff --git a/instat/dlgBoxPlot.designer.vb b/instat/dlgBoxPlot.designer.vb index 7858f6b0d70..174db6efe1c 100644 --- a/instat/dlgBoxPlot.designer.vb +++ b/instat/dlgBoxPlot.designer.vb @@ -42,7 +42,7 @@ Partial Class dlgBoxplot Me.cmdOptions = New System.Windows.Forms.Button() Me.lblByFactors = New System.Windows.Forms.Label() Me.lblBySecondFactor = New System.Windows.Forms.Label() - Me.cmdBoxPlotOptions = New System.Windows.Forms.Button() + Me.cmdBoxOptions = New System.Windows.Forms.Button() Me.rdoBoxplotTufte = New System.Windows.Forms.RadioButton() Me.rdoJitter = New System.Windows.Forms.RadioButton() Me.rdoViolin = New System.Windows.Forms.RadioButton() @@ -85,12 +85,12 @@ Partial Class dlgBoxplot Me.lblBySecondFactor.Name = "lblBySecondFactor" Me.lblBySecondFactor.Tag = "By_Second_Factor:" ' - 'cmdBoxPlotOptions + 'cmdBoxOptions ' - resources.ApplyResources(Me.cmdBoxPlotOptions, "cmdBoxPlotOptions") - Me.cmdBoxPlotOptions.Name = "cmdBoxPlotOptions" - Me.cmdBoxPlotOptions.Tag = "Boxplot_Options" - Me.cmdBoxPlotOptions.UseVisualStyleBackColor = True + resources.ApplyResources(Me.cmdBoxOptions, "cmdBoxOptions") + Me.cmdBoxOptions.Name = "cmdBoxOptions" + Me.cmdBoxOptions.Tag = "Box_Options" + Me.cmdBoxOptions.UseVisualStyleBackColor = True ' 'rdoBoxplotTufte ' @@ -269,7 +269,7 @@ Partial Class dlgBoxplot Me.Controls.Add(Me.rdoJitter) Me.Controls.Add(Me.rdoBoxplotTufte) Me.Controls.Add(Me.ucrVariablesAsFactorForBoxplot) - Me.Controls.Add(Me.cmdBoxPlotOptions) + Me.Controls.Add(Me.cmdBoxOptions) Me.Controls.Add(Me.ucrSecondFactorReceiver) Me.Controls.Add(Me.ucrSelectorBoxPlot) Me.Controls.Add(Me.lblBySecondFactor) @@ -296,7 +296,7 @@ Partial Class dlgBoxplot Friend WithEvents ucrSelectorBoxPlot As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrSecondFactorReceiver As ucrReceiverSingle Friend WithEvents lblBySecondFactor As Label - Friend WithEvents cmdBoxPlotOptions As Button + Friend WithEvents cmdBoxOptions As Button Friend WithEvents ucrVariablesAsFactorForBoxplot As ucrVariablesAsFactor Friend WithEvents rdoBoxplotTufte As RadioButton Friend WithEvents rdoJitter As RadioButton diff --git a/instat/dlgBoxPlot.resx b/instat/dlgBoxPlot.resx index eabb5733ec9..3e7d1ad1992 100644 --- a/instat/dlgBoxPlot.resx +++ b/instat/dlgBoxPlot.resx @@ -207,31 +207,31 @@ 19 - + NoControl - + 10, 237 - + 149, 25 - + 10 - + Box Options - - cmdBoxPlotOptions + + cmdBoxOptions - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 16 diff --git a/instat/dlgClimaticSummary.Designer.vb b/instat/dlgClimaticSummary.Designer.vb index f0869eb1b2b..dea63f0418c 100644 --- a/instat/dlgClimaticSummary.Designer.vb +++ b/instat/dlgClimaticSummary.Designer.vb @@ -49,18 +49,18 @@ Partial Class dlgClimaticSummary Me.cmdSummary = New System.Windows.Forms.Button() Me.lblWithinYear = New System.Windows.Forms.Label() Me.grpOptions = New System.Windows.Forms.GroupBox() - Me.cmdMissingOptions = New System.Windows.Forms.Button() + Me.cmdOptions = New System.Windows.Forms.Button() + Me.ucrChkOmitMissing = New instat.ucrCheck() + Me.ucrChkAddDateColumn = New instat.ucrCheck() + Me.ucrChkStoreResults = New instat.ucrCheck() + Me.ucrChkPrintOutput = New instat.ucrCheck() + Me.ucrChkDropUnusedLevels = New instat.ucrCheck() Me.cmdDoyRange = New System.Windows.Forms.Button() Me.lblYear = New System.Windows.Forms.Label() Me.rdoStation = New System.Windows.Forms.RadioButton() Me.rdoDaily = New System.Windows.Forms.RadioButton() Me.ucrReceiverElements = New instat.ucrReceiverMultiple() Me.ucrInputFilterPreview = New instat.ucrInputTextBox() - Me.ucrChkOmitMissing = New instat.ucrCheck() - Me.ucrChkAddDateColumn = New instat.ucrCheck() - Me.ucrChkStoreResults = New instat.ucrCheck() - Me.ucrChkPrintOutput = New instat.ucrCheck() - Me.ucrChkDropUnusedLevels = New instat.ucrCheck() Me.ucrSelectorVariable = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverWithinYear = New instat.ucrReceiverSingle() Me.ucrReceiverDOY = New instat.ucrReceiverSingle() @@ -136,7 +136,7 @@ Partial Class dlgClimaticSummary ' 'grpOptions ' - Me.grpOptions.Controls.Add(Me.cmdMissingOptions) + Me.grpOptions.Controls.Add(Me.cmdOptions) Me.grpOptions.Controls.Add(Me.ucrChkOmitMissing) Me.grpOptions.Controls.Add(Me.ucrChkAddDateColumn) Me.grpOptions.Controls.Add(Me.ucrChkStoreResults) @@ -146,12 +146,42 @@ Partial Class dlgClimaticSummary Me.grpOptions.Name = "grpOptions" Me.grpOptions.TabStop = False ' - 'cmdMissingOptions + 'cmdOptions + ' + resources.ApplyResources(Me.cmdOptions, "cmdOptions") + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Tag = "Options" + Me.cmdOptions.UseVisualStyleBackColor = True + ' + 'ucrChkOmitMissing + ' + Me.ucrChkOmitMissing.Checked = False + resources.ApplyResources(Me.ucrChkOmitMissing, "ucrChkOmitMissing") + Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" + ' + 'ucrChkAddDateColumn + ' + Me.ucrChkAddDateColumn.Checked = False + resources.ApplyResources(Me.ucrChkAddDateColumn, "ucrChkAddDateColumn") + Me.ucrChkAddDateColumn.Name = "ucrChkAddDateColumn" + ' + 'ucrChkStoreResults + ' + Me.ucrChkStoreResults.Checked = False + resources.ApplyResources(Me.ucrChkStoreResults, "ucrChkStoreResults") + Me.ucrChkStoreResults.Name = "ucrChkStoreResults" + ' + 'ucrChkPrintOutput + ' + Me.ucrChkPrintOutput.Checked = False + resources.ApplyResources(Me.ucrChkPrintOutput, "ucrChkPrintOutput") + Me.ucrChkPrintOutput.Name = "ucrChkPrintOutput" + ' + 'ucrChkDropUnusedLevels ' - resources.ApplyResources(Me.cmdMissingOptions, "cmdMissingOptions") - Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Tag = "MissingOptions" - Me.cmdMissingOptions.UseVisualStyleBackColor = True + Me.ucrChkDropUnusedLevels.Checked = False + resources.ApplyResources(Me.ucrChkDropUnusedLevels, "ucrChkDropUnusedLevels") + Me.ucrChkDropUnusedLevels.Name = "ucrChkDropUnusedLevels" ' 'cmdDoyRange ' @@ -202,36 +232,6 @@ Partial Class dlgClimaticSummary resources.ApplyResources(Me.ucrInputFilterPreview, "ucrInputFilterPreview") Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" ' - 'ucrChkOmitMissing - ' - Me.ucrChkOmitMissing.Checked = False - resources.ApplyResources(Me.ucrChkOmitMissing, "ucrChkOmitMissing") - Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - ' - 'ucrChkAddDateColumn - ' - Me.ucrChkAddDateColumn.Checked = False - resources.ApplyResources(Me.ucrChkAddDateColumn, "ucrChkAddDateColumn") - Me.ucrChkAddDateColumn.Name = "ucrChkAddDateColumn" - ' - 'ucrChkStoreResults - ' - Me.ucrChkStoreResults.Checked = False - resources.ApplyResources(Me.ucrChkStoreResults, "ucrChkStoreResults") - Me.ucrChkStoreResults.Name = "ucrChkStoreResults" - ' - 'ucrChkPrintOutput - ' - Me.ucrChkPrintOutput.Checked = False - resources.ApplyResources(Me.ucrChkPrintOutput, "ucrChkPrintOutput") - Me.ucrChkPrintOutput.Name = "ucrChkPrintOutput" - ' - 'ucrChkDropUnusedLevels - ' - Me.ucrChkDropUnusedLevels.Checked = False - resources.ApplyResources(Me.ucrChkDropUnusedLevels, "ucrChkDropUnusedLevels") - Me.ucrChkDropUnusedLevels.Name = "ucrChkDropUnusedLevels" - ' 'ucrSelectorVariable ' Me.ucrSelectorVariable.bDropUnusedFilterLevels = False @@ -359,7 +359,7 @@ Partial Class dlgClimaticSummary Friend WithEvents ucrReceiverYear As ucrReceiverSingle Friend WithEvents ucrChkAddDateColumn As ucrCheck Friend WithEvents ucrChkOmitMissing As ucrCheck - Friend WithEvents cmdMissingOptions As Button + Friend WithEvents cmdOptions As Button Friend WithEvents ucrReceiverElements As ucrReceiverMultiple Friend WithEvents rdoStation As RadioButton Friend WithEvents rdoDaily As RadioButton diff --git a/instat/dlgClimaticSummary.resx b/instat/dlgClimaticSummary.resx index 5ce36977997..30378a3a8e7 100644 --- a/instat/dlgClimaticSummary.resx +++ b/instat/dlgClimaticSummary.resx @@ -405,31 +405,31 @@ 8 - + NoControl - - 187, 83 + + 217, 83 - - 90, 26 + + 60, 26 - + 19 - - Missing Options + + Options - - cmdMissingOptions + + cmdOptions - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + grpOptions - + 0 @@ -906,9 +906,6 @@ 23 - - NoControl - CenterScreen diff --git a/instat/dlgColumnStats.Designer.vb b/instat/dlgColumnStats.Designer.vb index 6af6f67df3d..5b33907d95f 100644 --- a/instat/dlgColumnStats.Designer.vb +++ b/instat/dlgColumnStats.Designer.vb @@ -42,7 +42,7 @@ Partial Class dlgColumnStats Me.lblSelectedVariables = New System.Windows.Forms.Label() Me.lblSummariseBy = New System.Windows.Forms.Label() Me.grpOptions = New System.Windows.Forms.GroupBox() - Me.cmdMissingOptions = New System.Windows.Forms.Button() + Me.cmdOptions = New System.Windows.Forms.Button() Me.ucrChkOriginalLevel = New instat.ucrCheck() Me.ucrChkStoreResults = New instat.ucrCheck() Me.ucrChkOmitMissing = New instat.ucrCheck() @@ -71,7 +71,7 @@ Partial Class dlgColumnStats ' 'grpOptions ' - Me.grpOptions.Controls.Add(Me.cmdMissingOptions) + Me.grpOptions.Controls.Add(Me.cmdOptions) Me.grpOptions.Controls.Add(Me.ucrChkOriginalLevel) Me.grpOptions.Controls.Add(Me.ucrChkStoreResults) Me.grpOptions.Controls.Add(Me.ucrChkOmitMissing) @@ -81,12 +81,12 @@ Partial Class dlgColumnStats Me.grpOptions.Name = "grpOptions" Me.grpOptions.TabStop = False ' - 'cmdMissingOptions + 'cmdOptions ' - resources.ApplyResources(Me.cmdMissingOptions, "cmdMissingOptions") - Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Tag = "MissingOptions" - Me.cmdMissingOptions.UseVisualStyleBackColor = True + resources.ApplyResources(Me.cmdOptions, "cmdOptions") + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Tag = "Options" + Me.cmdOptions.UseVisualStyleBackColor = True ' 'ucrChkOriginalLevel ' @@ -220,5 +220,5 @@ Partial Class dlgColumnStats Friend WithEvents ucrChkOriginalLevel As ucrCheck Friend WithEvents ucrChkWeights As ucrCheck Friend WithEvents ucrReceiverWeights As ucrReceiverSingle - Friend WithEvents cmdMissingOptions As Button + Friend WithEvents cmdOptions As Button End Class diff --git a/instat/dlgColumnStats.resx b/instat/dlgColumnStats.resx index 851c9eea6b9..438224c6089 100644 --- a/instat/dlgColumnStats.resx +++ b/instat/dlgColumnStats.resx @@ -180,31 +180,31 @@ 7 - + NoControl - - 119, 140 + + 190, 114 - - 133, 26 + + 62, 26 - + 20 - - Missing Options + + Options - - cmdMissingOptions + + cmdOptions - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + grpOptions - + 0 @@ -253,7 +253,7 @@ 6, 117 - 218, 20 + 178, 20 4 @@ -316,7 +316,7 @@ 10, 196 - 258, 172 + 258, 155 7 @@ -418,7 +418,7 @@ 6, 13 - 416, 428 + 416, 419 274, 190 @@ -493,7 +493,7 @@ 9 - 6, 374 + 6, 363 402, 53 diff --git a/instat/dlgConvertColumns.Designer.vb b/instat/dlgConvertColumns.Designer.vb index c389e7249e6..4164d27771e 100644 --- a/instat/dlgConvertColumns.Designer.vb +++ b/instat/dlgConvertColumns.Designer.vb @@ -229,7 +229,6 @@ Partial Class dlgConvertColumns Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.ucrChkIgnoreLabels) Me.Controls.Add(Me.ucrChkCreateLabels) - Me.Controls.Add(Me.grpFactorToNumericOptions) Me.Controls.Add(Me.ucrChkKeepAttributes) Me.Controls.Add(Me.ucrNudDisplayDecimals) Me.Controls.Add(Me.ucrChkSpecifyDecimalsToDisplay) @@ -238,6 +237,7 @@ Partial Class dlgConvertColumns Me.Controls.Add(Me.lblColumnsToConvert) Me.Controls.Add(Me.ucrReceiverColumnsToConvert) Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.grpFactorToNumericOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/dlgConvertColumns.resx b/instat/dlgConvertColumns.resx index 992667dc1c0..990767cb3b0 100644 --- a/instat/dlgConvertColumns.resx +++ b/instat/dlgConvertColumns.resx @@ -148,7 +148,115 @@ $this - 8 + 7 + + + rdoLogical + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 0 + + + rdoCharacter + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 1 + + + rdoInteger + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 2 + + + rdoNumeric + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 3 + + + rdoOrderedFactor + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 4 + + + rdoFactor + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 5 + + + ucrPnlConvertTo + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpConvertTo + + + 6 + + + 10, 196 + + + 357, 88 + + + 3 + + + Convert To + + + grpConvertTo + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 True @@ -351,30 +459,6 @@ 6 - - 10, 196 - - - 357, 88 - - - 3 - - - Convert To - - - grpConvertTo - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 6 - NoControl @@ -402,6 +486,66 @@ 1 + + rdoDefault + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactorToNumericOptions + + + 0 + + + rdoConvertLevels + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactorToNumericOptions + + + 2 + + + ucrPnlFactorToNumericOptions + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpFactorToNumericOptions + + + 3 + + + 10, 316 + + + 213, 92 + + + 7 + + + Factor Options + + + grpFactorToNumericOptions + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + True @@ -480,30 +624,6 @@ 3 - - 10, 316 - - - 213, 92 - - - 7 - - - Factor Options - - - grpFactorToNumericOptions - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - 307, 290 @@ -565,7 +685,7 @@ $this - 3 + 2 242, 316 @@ -586,13 +706,13 @@ $this - 4 + 3 10, 316 - 242, 20 + 226, 23 5 @@ -607,7 +727,7 @@ $this - 5 + 4 10, 10 @@ -631,7 +751,7 @@ $this - 7 + 6 True @@ -661,7 +781,7 @@ $this - 10 + 9 CenterScreen @@ -697,6 +817,6 @@ $this - 9 + 8 \ No newline at end of file diff --git a/instat/dlgConvertColumns.vb b/instat/dlgConvertColumns.vb index 76f9f3ed4c4..ba3cab82a16 100644 --- a/instat/dlgConvertColumns.vb +++ b/instat/dlgConvertColumns.vb @@ -81,7 +81,7 @@ Public Class dlgConvertColumns ucrPnlFactorToNumericOptions.SetLinkedDisplayControl(grpFactorToNumericOptions) ucrChkSpecifyDecimalsToDisplay.SetParameter(New RParameter("set_digits", 4)) - ucrChkSpecifyDecimalsToDisplay.SetText("Specify Decimals (from Numeric)") + ucrChkSpecifyDecimalsToDisplay.SetText("Specify Decimals (if Numeric)") ucrChkSpecifyDecimalsToDisplay.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkSpecifyDecimalsToDisplay.SetRDefault("FALSE") ucrChkSpecifyDecimalsToDisplay.AddToLinkedControls(ucrLinked:=ucrNudDisplayDecimals, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -177,4 +177,8 @@ Public Class dlgConvertColumns ucrChkIgnoreLabels.SetText("Ignore Labels") End If End Sub + + Private Sub ucrChkSpecifyDecimalsToDisplay_Load(sender As Object, e As EventArgs) Handles ucrChkSpecifyDecimalsToDisplay.Load + + End Sub End Class \ No newline at end of file diff --git a/instat/dlgCopySheet.Designer.vb b/instat/dlgCopySheet.Designer.vb new file mode 100644 index 00000000000..79bd1502d9c --- /dev/null +++ b/instat/dlgCopySheet.Designer.vb @@ -0,0 +1,65 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + + +'This class was auto-generated by the StronglyTypedResourceBuilder +'class via a tool like ResGen or Visual Studio. +'To add or remove a member, edit your .ResX file then rerun ResGen +'with the /str option, or rebuild your VS project. +''' +''' A strongly-typed resource class, for looking up localized strings, etc. +''' + _ +Friend Class dlgCopySheet + + Private Shared resourceMan As Global.System.Resources.ResourceManager + + Private Shared resourceCulture As Global.System.Globalization.CultureInfo + + _ + Friend Sub New() + MyBase.New + End Sub + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("instat.dlgCopySheet", GetType(dlgCopySheet).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Shared Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property +End Class diff --git a/instat/dlgCopySheet.sw-KE.Designer.vb b/instat/dlgCopySheet.sw-KE.Designer.vb new file mode 100644 index 00000000000..e69de29bb2d diff --git a/instat/dlgCountinFactor.resx b/instat/dlgCountinFactor.resx index c9ae6d5fd3d..0fe574030a8 100644 --- a/instat/dlgCountinFactor.resx +++ b/instat/dlgCountinFactor.resx @@ -154,7 +154,7 @@ 4, 5, 4, 5 - 255, 22 + 317, 22 3 diff --git a/instat/dlgCountinFactor.vb b/instat/dlgCountinFactor.vb index e6fa41b4a75..fe040997b6e 100644 --- a/instat/dlgCountinFactor.vb +++ b/instat/dlgCountinFactor.vb @@ -89,4 +89,8 @@ Public Class dlgCountinFactor Private Sub ucrCountReceiver_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrCountReceiver.ControlContentsChanged, ucrNewColName.ControlContentsChanged TestOkEnabled() End Sub + + Private Sub ucrNewColName_Load(sender As Object, e As EventArgs) Handles ucrNewColName.Load + + End Sub End Class \ No newline at end of file diff --git a/instat/dlgDuplicateColumns.resx b/instat/dlgDuplicateColumns.resx index 8683690d489..c10f2d28cc1 100644 --- a/instat/dlgDuplicateColumns.resx +++ b/instat/dlgDuplicateColumns.resx @@ -150,6 +150,114 @@ 10 + + rdoConvertToLogical + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 0 + + + rdoConvertToCharacter + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 1 + + + rdoConvertToInteger + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 2 + + + rdoConvertToNumeric + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 3 + + + rdoConvertToOrderedFactor + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 4 + + + rdoConvertToFactor + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpConvertTo + + + 5 + + + ucrPnlConvertTo + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpConvertTo + + + 6 + + + 228, 77 + + + 235, 100 + + + 4 + + + Convert To + + + grpConvertTo + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + True @@ -354,29 +462,77 @@ 6 - - 228, 77 + + rdoConvertDefault - - 235, 100 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 + + grpFactorToNumericOptions - - Convert To + + 0 - - grpConvertTo + + rdoConvertOrdinals - + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactorToNumericOptions + + + 1 + + + rdoConvertLevels + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactorToNumericOptions + + + 2 + + + ucrPnlConvertFactorToNumericOptions + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpFactorToNumericOptions + + + 3 + + + 228, 236 + + + 196, 102 + + + 16 + + + Factor Options + + + grpFactorToNumericOptions + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 6 + + 5 True @@ -475,7 +631,7 @@ 6, 8, 6, 8 - 141, 74 + 190, 74 17 @@ -492,30 +648,6 @@ 3 - - 228, 236 - - - 156, 102 - - - 16 - - - Factor Options - - - grpFactorToNumericOptions - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - 228, 55 @@ -523,7 +655,7 @@ 6, 8, 6, 8 - 100, 20 + 165, 20 3 @@ -541,7 +673,7 @@ 1 - 369, 181 + 371, 181 6, 8, 6, 8 @@ -571,7 +703,7 @@ 6, 8, 6, 8 - 120, 20 + 139, 20 12 @@ -589,7 +721,7 @@ 3 - 425, 209 + 413, 209 6, 8, 6, 8 @@ -652,7 +784,7 @@ 4, 5, 4, 5 - 293, 22 + 327, 22 30 diff --git a/instat/dlgDuplicateColumns.vb b/instat/dlgDuplicateColumns.vb index 2e9180b0b9f..7095bf58fde 100644 --- a/instat/dlgDuplicateColumns.vb +++ b/instat/dlgDuplicateColumns.vb @@ -95,7 +95,7 @@ Public Class dlgDuplicateColumns ucrPnlConvertFactorToNumericOptions.SetLinkedDisplayControl(grpFactorToNumericOptions) ucrChkConvertSpecifyDecimalsToDisplay.SetParameter(New RParameter("set_decimals", 4)) - ucrChkConvertSpecifyDecimalsToDisplay.SetText("Specify Decimals (from Numeric)") + ucrChkConvertSpecifyDecimalsToDisplay.SetText("Specify Decimals (if Numeric)") ucrChkConvertSpecifyDecimalsToDisplay.SetRDefault("FALSE") ucrChkConvertSpecifyDecimalsToDisplay.AddToLinkedControls(ucrNudConvertDisplayDecimals, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -219,5 +219,7 @@ Public Class dlgDuplicateColumns TestOKEnabled() End Sub + Private Sub ucrChkConvertSpecifyDecimalsToDisplay_Load(sender As Object, e As EventArgs) Handles ucrChkConvertSpecifyDecimalsToDisplay.Load + End Sub End Class diff --git a/instat/dlgMakeDate.Designer.vb b/instat/dlgMakeDate.Designer.vb index 7e5b18c63ce..40bc66d814d 100644 --- a/instat/dlgMakeDate.Designer.vb +++ b/instat/dlgMakeDate.Designer.vb @@ -605,7 +605,6 @@ Partial Class dlgMakeDate ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.grpThreeColumns) Me.Controls.Add(Me.cmdHelp) Me.Controls.Add(Me.rdoThreeColumns) Me.Controls.Add(Me.rdoTwoColumns) @@ -616,6 +615,7 @@ Partial Class dlgMakeDate Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrSelectorMakeDate) Me.Controls.Add(Me.grpSingleColumn) + Me.Controls.Add(Me.grpThreeColumns) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/dlgMakeDate.resx b/instat/dlgMakeDate.resx index 27f8f24c0c0..14974bcf474 100644 --- a/instat/dlgMakeDate.resx +++ b/instat/dlgMakeDate.resx @@ -255,1288 +255,1427 @@ 517, 477 - - 8, 247 + + NoControl - - 53, 21 + + 406, 389 - - 16 + + 78, 22 - - ucrInputDayThree + + 9 - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + Help... - - grpThreeColumns + + cmdHelp - + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 - + Button - + Flat - + NoControl - - 58, 213 + + 324, 8 - - 54, 23 + + 137, 28 - - 15 + + 3 - - Value + + Year - Month - Day - + MiddleCenter - - rdoDayValue + + rdoThreeColumns - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpThreeColumns + + $this - + 1 - + Button - + Flat - + NoControl - - 8, 213 + + 189, 8 - - 59, 23 + + 137, 28 - - 14 + + 2 - - Column + + Year and Day of Year - + MiddleCenter - - rdoDayColumn + + rdoTwoColumns - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpThreeColumns + + $this - + 2 - - 5, 207 + + Button - - 109, 34 + + Flat - - 13 + + NoControl - - ucrPnlDayType + + 54, 8 - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 137, 28 - - grpThreeColumns + + 1 - - 3 + + Single Column - - 8, 68 + + MiddleCenter - - 53, 21 + + rdoSingleColumn - - 3 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ucrInputYearThree + + $this - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 3 - - grpThreeColumns + + 10, 4 - - 4 + + 495, 35 - - Button + + 0 - - Flat + + ucrPnlDate - - NoControl + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 60, 38 + + $this - - 54, 23 + + 4 - - 2 + + 10, 394 - - Value + + 4, 5, 4, 5 - - MiddleCenter + + 290, 24 - - rdoYearValue + + 10 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ucrSaveDate - - grpThreeColumns + + instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 5 + + $this - - Button + + 5 - - Flat + + 10, 422 - - NoControl + + 417, 54 - - 8, 38 + + 11 - - 59, 23 + + ucrBase - - 1 + + instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - Column + + $this - - MiddleCenter + + 7 - - rdoYearColumn + + 10, 51 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0, 0, 0 - - grpThreeColumns + + 210, 180 - - 6 + + 4 - - Button + + ucrSelectorMakeDate - - Flat + + instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - NoControl + + $this - - 58, 128 + + 8 - - 54, 23 + + 10, 17 - - 8 + + 238, 134 - - Value + + 0 - - MiddleCenter + + Or construct your own format using: +Day: +%d - Day of the Month (1-31) +%j - Day of the year (1-365/366) + +Month: +%m - Number (1-12) +%b - Abbreviated month +%B - Full month + +Year: +%Y - 4-digit +%y - 2-digit + +Click 'Help' to see the full list + +Examples: +%d/%m/%y (24/12/93) +%m:%d:%Y (12:24:1993) +%Y-%b-%d (1993-Dec-24) - - rdoMonthValue + + txtTextDateFormats - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpThreeColumns + + grpFormats - - 7 + + 0 - - Button + + 6, 169 - - Flat + + 254, 161 - + + 12 + + + Format Description + + + grpFormats + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpSingleColumn + + + 0 + + + True + + NoControl - - 8, 128 + + 111, 144 - - 59, 23 + + 34, 13 - + 7 - - Column + + Units: - - MiddleCenter + + lblUnits - - rdoMonthColumn + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + grpSingleColumn - - grpThreeColumns + + 1 - + + 130, 110 + + + 119, 21 + + + 5 + + + ucrDtpSpecifyOrigin + + + instat.ucrDateTimePicker, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpSingleColumn + + + 2 + + + 145, 140 + + + 93, 21 + + 8 - - 8, 159 + + ucrInputUnits - - 53, 21 + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 10 + + grpSingleColumn - - ucrInputMonthThree + + 3 - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + True - - grpThreeColumns + + NoControl - - 9 + + 4, 99 - + + 29, 13 + + + 6 + + + Day: + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFormatField + + + 0 + + True - + NoControl - - 148, 50 + + 4, 73 - - 42, 13 + + 40, 13 - + 4 - - Format: + + Month: - - lblYearFormat + + Label2 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpThreeColumns + + grpFormatField - - 10 + + 1 - + True - + NoControl - - 148, 141 + + 4, 47 - - 42, 13 + + 32, 13 - - 9 + + 2 - - Format: + + Year: - - lblMonthFormat + + Label3 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpThreeColumns + + grpFormatField - - 11 + + 2 - - 151, 158 + + True - - 99, 21 + + NoControl - - 11 + + 4, 21 - - ucrInputMonthOption + + 56, 13 - + + 0 + + + Separator: + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFormatField + + + 3 + + + 75, 69 + + + 137, 21 + + + 5 + + + UcrInputComboBox1 + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpThreeColumns + + grpFormatField - - 12 + + 4 - - 151, 67 + + 75, 95 - - 99, 21 + + 137, 21 - + + 7 + + + UcrInputComboBox2 + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpFormatField + + 5 - - ucrInputYearOption + + 75, 43 - + + 137, 21 + + + 3 + + + UcrInputComboBox3 + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpThreeColumns + + grpFormatField - - 13 + + 6 - - True + + 75, 17 - - NoControl + + 137, 21 - - 9, 194 + + 1 - - 74, 13 + + UcrInputComboBox4 - - 12 + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - Day of Month: + + grpFormatField - - lblDayofMonth + + 7 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 7, 169 - - grpThreeColumns + + 254, 124 - - 14 + + 9 - + + Format Field + + + grpFormatField + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpSingleColumn + + + 4 + + True - + NoControl - - 9, 110 + + 15, 110 - - 40, 13 + + 95, 17 - - 6 + + 3 - - Month: + + Specify Format - - lblMonthThree + + rdoSpecifyFormat - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpThreeColumns + + grpSingleColumn - - 15 + + 5 - + True - + NoControl - - 9, 19 + + 15, 81 - - 32, 13 + + 52, 17 - - 0 + + 2 - - Year: + + Origin - - lblYearThree + + rdoOrigin - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpThreeColumns + + grpSingleColumn - - 16 + + 6 - - 8, 68 + + True - - 0, 0, 0, 0 + + NoControl - - 106, 20 + + 15, 52 - + + 94, 17 + + 1 - - ucrReceiverYearThree + + Default Format - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + rdoDefaultFormat - - grpThreeColumns + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17 + + grpSingleColumn - - 8, 247 + + 7 - - 0, 0, 0, 0 + + 8, 47 - - 106, 20 + + 116, 88 - - 9 + + 2 - - ucrReceiverDayThree + + ucrPnlFormat - - instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpThreeColumns + + grpSingleColumn - - 18 + + 8 - - 8, 159 + + 6, 25 - + 0, 0, 0, 0 - - 106, 20 + + 129, 20 - - 5 + + 0 - - ucrReceiverMonthThree + + ucrReceiverForDate - + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpThreeColumns + + grpSingleColumn - - 19 + + 9 - - 6, 32 + + 130, 110 - - 109, 34 + + 120, 21 - - 15 + + 6 - - ucrPnlYearType + + ucrInputFormat - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpThreeColumns + + grpSingleColumn - - 20 + + 10 - - 5, 122 + + 130, 80 - - 109, 34 + + 119, 21 - - 16 + + 4 - - ucrPnlMonthType + + ucrInputOrigin - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpThreeColumns + + grpSingleColumn - - 21 + + 11 - + 238, 51 - - 267, 292 + + 267, 336 - - 8 + + 5 - - Year Month Day + + Single Column - - grpThreeColumns + + grpSingleColumn - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 0 - - - NoControl - - - 406, 389 + + 9 - - 78, 22 + + 8, 247 - - 9 + + 53, 21 - - Help... + + 16 - - cmdHelp + + ucrInputDayThree - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - $this + + grpThreeColumns - - 1 + + 0 - + Button - + Flat - + NoControl - - 324, 8 + + 58, 213 - - 137, 28 + + 54, 23 - - 3 + + 15 - - Year - Month - Day + + Value - + MiddleCenter - - rdoThreeColumns + + rdoDayValue - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + grpThreeColumns - - 2 + + 1 - + Button - + Flat - + NoControl - - 189, 8 + + 8, 213 - - 137, 28 + + 59, 23 - - 2 + + 14 - - Year and Day of Year + + Column - + MiddleCenter - - rdoTwoColumns + + rdoDayColumn - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this - - - 3 - - - Button - - - Flat + + grpThreeColumns - - NoControl + + 2 - - 54, 8 + + 5, 207 - - 137, 28 + + 109, 34 - - 1 + + 13 - - Single Column + + ucrPnlDayType - - MiddleCenter + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - rdoSingleColumn + + grpThreeColumns - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3 - - $this + + 8, 68 - - 4 + + 53, 21 - - 10, 4 + + 3 - - 495, 35 + + ucrInputYearThree - - 0 + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - ucrPnlDate + + grpThreeColumns - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 4 - - $this + + Button - - 5 + + Flat - - 10, 394 + + NoControl - - 4, 5, 4, 5 + + 60, 38 - - 290, 24 + + 54, 23 - - 10 + + 2 - - ucrSaveDate + + Value - - instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + MiddleCenter - - $this + + rdoYearValue - - 6 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 10, 422 + + grpThreeColumns - - 417, 54 + + 5 - - 11 + + Button - - ucrBase + + Flat - - instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + NoControl - - $this + + 8, 38 - - 8 + + 59, 23 - - 10, 51 + + 1 - - 0, 0, 0, 0 + + Column - - 210, 180 + + MiddleCenter - - 4 + + rdoYearColumn - - ucrSelectorMakeDate + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + grpThreeColumns - - $this + + 6 - - 9 + + Button - - txtTextDateFormats + + Flat - - System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - grpFormats + + 58, 128 - - 0 + + 54, 23 - - 6, 169 + + 8 - - 254, 161 + + Value - - 12 + + MiddleCenter - - Format Description + + rdoMonthValue - - grpFormats + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + grpThreeColumns - - grpSingleColumn + + 7 - - 0 + + Button - - True + + Flat - + NoControl - - 111, 144 + + 8, 128 - - 34, 13 + + 59, 23 - + 7 - - Units: + + Column - - lblUnits + + MiddleCenter - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + rdoMonthColumn - - grpSingleColumn + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + grpThreeColumns - - 130, 110 + + 8 - - 119, 21 + + 8, 159 - - 5 + + 53, 21 - - ucrDtpSpecifyOrigin + + 10 - - instat.ucrDateTimePicker, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + ucrInputMonthThree - - grpSingleColumn + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 2 + + grpThreeColumns - - 145, 140 + + 9 - - 93, 21 + + True - - 8 + + NoControl - - ucrInputUnits + + 148, 50 - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 42, 13 - - grpSingleColumn + + 4 - - 3 + + Format: - - Label1 + + lblYearFormat - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpFormatField + + grpThreeColumns - - 0 + + 10 - - Label2 + + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - grpFormatField + + 148, 141 - - 1 + + 42, 13 - - Label3 + + 9 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Format: - - grpFormatField + + lblMonthFormat - - 2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Label4 + + grpThreeColumns - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 11 - - grpFormatField + + 151, 158 - - 3 + + 99, 21 - - UcrInputComboBox1 + + 11 - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + ucrInputMonthOption - - grpFormatField + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 4 + + grpThreeColumns - - UcrInputComboBox2 + + 12 - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 151, 67 - - grpFormatField + + 99, 21 - + 5 - - UcrInputComboBox3 + + ucrInputYearOption - + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpFormatField - - - 6 - - - UcrInputComboBox4 + + grpThreeColumns - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 13 - - grpFormatField + + True - - 7 + + NoControl - - 7, 169 + + 9, 194 - - 254, 124 + + 74, 13 - - 9 + + 12 - - Format Field + + Day of Month: - - grpFormatField + + lblDayofMonth - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpSingleColumn + + grpThreeColumns - - 4 + + 14 - + True - + NoControl - - 15, 110 + + 9, 110 - - 95, 17 + + 40, 13 - - 3 + + 6 - - Specify Format + + Month: - - rdoSpecifyFormat + + lblMonthThree - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpSingleColumn + + grpThreeColumns - - 5 + + 15 - + True - + NoControl - - 15, 81 - - - 52, 17 + + 9, 19 - - 2 + + 32, 13 - - Origin + + 0 - - rdoOrigin + + Year: - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + lblYearThree - - grpSingleColumn + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + grpThreeColumns - - True + + 16 - - NoControl + + 8, 68 - - 15, 52 + + 0, 0, 0, 0 - - 94, 17 + + 106, 20 - + 1 - - Default Format + + ucrReceiverYearThree - - rdoDefaultFormat + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + grpThreeColumns - - grpSingleColumn + + 17 - - 7 + + 8, 247 - - 8, 47 + + 0, 0, 0, 0 - - 116, 88 + + 106, 20 - - 2 + + 9 - - ucrPnlFormat + + ucrReceiverDayThree - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpSingleColumn + + grpThreeColumns - - 8 + + 18 - - 6, 25 + + 8, 159 - + 0, 0, 0, 0 - - 129, 20 + + 106, 20 - - 0 + + 5 - - ucrReceiverForDate + + ucrReceiverMonthThree - + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpSingleColumn + + grpThreeColumns - - 9 + + 19 - - 130, 110 + + 6, 32 - - 120, 21 + + 109, 34 - - 6 + + 15 - - ucrInputFormat + + ucrPnlYearType - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpSingleColumn + + grpThreeColumns - - 10 + + 20 - - 130, 80 + + 5, 122 - - 119, 21 + + 109, 34 - - 4 + + 16 - - ucrInputOrigin + + ucrPnlMonthType - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpSingleColumn + + grpThreeColumns - - 11 + + 21 - + 238, 51 - - 267, 336 - - - 5 + + 267, 292 - - Single Column + + 8 - - grpSingleColumn + + Year Month Day - + + grpThreeColumns + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 10 @@ -1657,255 +1796,8 @@ $this - 7 - - - 10, 17 - - - 238, 134 - - - 0 - - - Or construct your own format using: -Day: -%d - Day of the Month (1-31) -%j - Day of the year (1-365/366) - -Month: -%m - Number (1-12) -%b - Abbreviated month -%B - Full month - -Year: -%Y - 4-digit -%y - 2-digit - -Click 'Help' to see the full list - -Examples: -%d/%m/%y (24/12/93) -%m:%d:%Y (12:24:1993) -%Y-%b-%d (1993-Dec-24) - - - txtTextDateFormats - - - System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpFormats - - - 0 - - - True - - - NoControl - - - 4, 99 - - - 29, 13 - - - 6 - - - Day: - - - Label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpFormatField - - - 0 - - - True - - - NoControl - - - 4, 73 - - - 40, 13 - - - 4 - - - Month: - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpFormatField - - - 1 - - - True - - - NoControl - - - 4, 47 - - - 32, 13 - - - 2 - - - Year: - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpFormatField - - - 2 - - - True - - - NoControl - - - 4, 21 - - - 56, 13 - - - 0 - - - Separator: - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpFormatField - - - 3 - - - 75, 69 - - - 137, 21 - - - 5 - - - UcrInputComboBox1 - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpFormatField - - - 4 - - - 75, 95 - - - 137, 21 - - - 7 - - - UcrInputComboBox2 - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpFormatField - - - 5 - - - 75, 43 - - - 137, 21 - - - 3 - - - UcrInputComboBox3 - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpFormatField - - 6 - - 75, 17 - - - 137, 21 - - - 1 - - - UcrInputComboBox4 - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpFormatField - - - 7 - 17, 17 diff --git a/instat/dlgOneVariableGraph.resx b/instat/dlgOneVariableGraph.resx index f105744422d..eb177840580 100644 --- a/instat/dlgOneVariableGraph.resx +++ b/instat/dlgOneVariableGraph.resx @@ -144,7 +144,7 @@ $this - 5 + 4 10, 201 @@ -168,7 +168,7 @@ $this - 3 + 2 False @@ -288,7 +288,7 @@ $this - 1 + 0 10, 238 @@ -309,7 +309,7 @@ $this - 2 + 1 9, 292 @@ -330,7 +330,7 @@ $this - 4 + 3 True @@ -341,34 +341,10 @@ 409, 348 - - 10, 266 - - - - 4, 5, 4, 5 - - - 255, 24 - - - 6 - - - ucrSaveGraph - - - instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 0 - 10, 10 + 0, 0, 0, 0 @@ -388,6 +364,30 @@ $this + 6 + + + 10, 266 + + + 4, 5, 4, 5 + + + 319, 24 + + + 6 + + + ucrSaveGraph + + + instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + 7 @@ -424,6 +424,6 @@ $this - 6 + 5 \ No newline at end of file diff --git a/instat/dlgRegularSequence.designer.vb b/instat/dlgRegularSequence.designer.vb index 69ab2aa61f3..107e2ee4243 100644 --- a/instat/dlgRegularSequence.designer.vb +++ b/instat/dlgRegularSequence.designer.vb @@ -70,10 +70,8 @@ Partial Class dlgRegularSequence 'grpSequenceDefinition ' Me.grpSequenceDefinition.Controls.Add(Me.ucrInputComboDatesBy) - Me.grpSequenceDefinition.Controls.Add(Me.ucrDateTimePickerTo) Me.grpSequenceDefinition.Controls.Add(Me.ucrChkDefineAsFactor) Me.grpSequenceDefinition.Controls.Add(Me.ucrNudRepeatValues) - Me.grpSequenceDefinition.Controls.Add(Me.ucrDateTimePickerFrom) Me.grpSequenceDefinition.Controls.Add(Me.ucrInputInStepsOf) Me.grpSequenceDefinition.Controls.Add(Me.ucrInputTo) Me.grpSequenceDefinition.Controls.Add(Me.ucrInputFrom) @@ -84,6 +82,8 @@ Partial Class dlgRegularSequence Me.grpSequenceDefinition.Controls.Add(Me.lblInStepsOf) Me.grpSequenceDefinition.Controls.Add(Me.lblTo) Me.grpSequenceDefinition.Controls.Add(Me.lblFrom) + Me.grpSequenceDefinition.Controls.Add(Me.ucrDateTimePickerTo) + Me.grpSequenceDefinition.Controls.Add(Me.ucrDateTimePickerFrom) resources.ApplyResources(Me.grpSequenceDefinition, "grpSequenceDefinition") Me.grpSequenceDefinition.Name = "grpSequenceDefinition" Me.grpSequenceDefinition.TabStop = False diff --git a/instat/dlgRegularSequence.resx b/instat/dlgRegularSequence.resx index 3a20285831e..5bb64b3ebdc 100644 --- a/instat/dlgRegularSequence.resx +++ b/instat/dlgRegularSequence.resx @@ -140,27 +140,6 @@ 0 - - 78, 50 - - - 157, 20 - - - 15 - - - ucrDateTimePickerTo - - - instat.ucrDateTimePicker, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpSequenceDefinition - - - 1 - 5, 158 @@ -180,10 +159,10 @@ grpSequenceDefinition - 2 + 1 - 111, 102 + 111, 101 50, 23 @@ -201,34 +180,13 @@ grpSequenceDefinition - 3 - - - 78, 24 - - - 157, 20 - - - 14 - - - ucrDateTimePickerFrom - - - instat.ucrDateTimePicker, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpSequenceDefinition - - - 4 + 2 - 117, 76 + 111, 76 - 53, 23 + 50, 23 7 @@ -243,10 +201,10 @@ grpSequenceDefinition - 5 + 3 - 138, 50 + 111, 50 50, 23 @@ -264,10 +222,10 @@ grpSequenceDefinition - 6 + 4 - 138, 24 + 111, 24 50, 23 @@ -285,13 +243,13 @@ grpSequenceDefinition - 7 + 5 111, 128 - 51, 23 + 50, 23 12 @@ -306,7 +264,7 @@ grpSequenceDefinition - 8 + 6 True @@ -337,7 +295,7 @@ grpSequenceDefinition - 9 + 7 True @@ -367,7 +325,7 @@ grpSequenceDefinition - 10 + 8 True @@ -397,7 +355,7 @@ grpSequenceDefinition - 11 + 9 Microsoft Sans Serif, 8.25pt @@ -427,7 +385,7 @@ grpSequenceDefinition - 12 + 10 True @@ -460,7 +418,7 @@ grpSequenceDefinition - 13 + 11 True @@ -493,6 +451,48 @@ grpSequenceDefinition + 12 + + + 78, 50 + + + 157, 20 + + + 15 + + + ucrDateTimePickerTo + + + instat.ucrDateTimePicker, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpSequenceDefinition + + + 13 + + + 78, 24 + + + 157, 20 + + + 14 + + + ucrDateTimePickerFrom + + + instat.ucrDateTimePicker, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpSequenceDefinition + + 14 @@ -556,7 +556,7 @@ 256, 96 - 185, 172 + 185, 140 6 @@ -583,7 +583,7 @@ NoControl - 255, 271 + 256, 243 185, 52 @@ -703,7 +703,7 @@ 4, 5, 4, 5 - 235, 24 + 325, 24 8 diff --git a/instat/dlgScatterPlot.Designer.vb b/instat/dlgScatterPlot.Designer.vb index 7ecc845a3fb..7233b536ddc 100644 --- a/instat/dlgScatterPlot.Designer.vb +++ b/instat/dlgScatterPlot.Designer.vb @@ -42,7 +42,7 @@ Partial Class dlgScatterPlot Me.cmdOptions = New System.Windows.Forms.Button() Me.lblFactorOptional = New System.Windows.Forms.Label() Me.lblXVariable = New System.Windows.Forms.Label() - Me.cmdScatterPlotOptions = New System.Windows.Forms.Button() + Me.cmdPointOptions = New System.Windows.Forms.Button() Me.lblVariable = New System.Windows.Forms.Label() Me.ucrReceiverLabel = New instat.ucrReceiverSingle() Me.ucrChkWithSE = New instat.ucrCheck() @@ -74,12 +74,12 @@ Partial Class dlgScatterPlot Me.lblXVariable.Name = "lblXVariable" Me.lblXVariable.Tag = "X_Variable:" ' - 'cmdScatterPlotOptions + 'cmdPointOptions ' - resources.ApplyResources(Me.cmdScatterPlotOptions, "cmdScatterPlotOptions") - Me.cmdScatterPlotOptions.Name = "cmdScatterPlotOptions" - Me.cmdScatterPlotOptions.Tag = "ScatterPlot_Options" - Me.cmdScatterPlotOptions.UseVisualStyleBackColor = True + resources.ApplyResources(Me.cmdPointOptions, "cmdPointOptions") + Me.cmdPointOptions.Name = "cmdPointOptions" + Me.cmdPointOptions.Tag = "Point_Options" + Me.cmdPointOptions.UseVisualStyleBackColor = True ' 'lblVariable ' @@ -164,7 +164,7 @@ Partial Class dlgScatterPlot Me.Controls.Add(Me.ucrSaveScatterPlot) Me.Controls.Add(Me.ucrSelectorForScatter) Me.Controls.Add(Me.ucrVariablesAsFactorForScatter) - Me.Controls.Add(Me.cmdScatterPlotOptions) + Me.Controls.Add(Me.cmdPointOptions) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrFactorOptionalReceiver) Me.Controls.Add(Me.lblFactorOptional) @@ -186,7 +186,7 @@ Partial Class dlgScatterPlot Friend WithEvents lblFactorOptional As Label Friend WithEvents ucrReceiverX As ucrReceiverSingle Friend WithEvents lblXVariable As Label - Friend WithEvents cmdScatterPlotOptions As Button + Friend WithEvents cmdPointOptions As Button Friend WithEvents ucrVariablesAsFactorForScatter As ucrVariablesAsFactor Friend WithEvents ucrSelectorForScatter As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrSaveScatterPlot As ucrSave diff --git a/instat/dlgScatterPlot.resx b/instat/dlgScatterPlot.resx index 2945c9d69f3..2956d64d9d5 100644 --- a/instat/dlgScatterPlot.resx +++ b/instat/dlgScatterPlot.resx @@ -207,31 +207,31 @@ 12 - + NoControl - + 10, 198 - + 147, 25 - + 8 - + Point Options - - cmdScatterPlotOptions + + cmdPointOptions - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 7 diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb index c380f6b9fa7..fffd9eec02c 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -220,7 +220,7 @@ Public Class dlgScatterPlot bResetSubdialog = False End Sub - Private Sub cmdScatterPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdScatterPlotOptions.Click + Private Sub cmdScatterPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdPointOptions.Click 'SetupLayer sends the components storing the plot info (clsRaesFunction, clsRggplotFunction, ...) of dlgScatteredPlot through to sdgLayerOptions where these will be edited. sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsRScatterGeomFunction, clsNewGlobalAesFunc:=clsRaesFunction, clsNewLocalAes:=clsLocalRaesFunction, bFixGeom:=True, ucrNewBaseSelector:=ucrSelectorForScatter, bApplyAesGlobally:=True, bReset:=bResetlayerSubdialog) 'Coming from the sdgLayerOptions, clsRaesFunction and others has been modified. One then needs to display these modifications on the dlgScatteredPlot. diff --git a/instat/dlgStack.Designer.vb b/instat/dlgStack.Designer.vb index 27dc8a8a238..5ceafd5eba8 100644 --- a/instat/dlgStack.Designer.vb +++ b/instat/dlgStack.Designer.vb @@ -159,7 +159,6 @@ Partial Class dlgStack Me.Controls.Add(Me.lblSets) Me.Controls.Add(Me.ucrNudNoSets) Me.Controls.Add(Me.ucrChkStackMultipleSets) - Me.Controls.Add(Me.ucrSaveNewDataName) Me.Controls.Add(Me.ucrChkCarryColumns) Me.Controls.Add(Me.ucrStackDataInto) Me.Controls.Add(Me.ucrFactorInto) @@ -170,6 +169,7 @@ Partial Class dlgStack Me.Controls.Add(Me.lblStackDataInto) Me.Controls.Add(Me.lblColumnsTostack) Me.Controls.Add(Me.ucrReceiverColumnsToBeStack) + Me.Controls.Add(Me.ucrSaveNewDataName) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/dlgStack.resx b/instat/dlgStack.resx index 76dac10dd0d..abc70fa27c2 100644 --- a/instat/dlgStack.resx +++ b/instat/dlgStack.resx @@ -148,7 +148,7 @@ $this - 12 + 11 True @@ -178,7 +178,7 @@ $this - 11 + 10 True @@ -208,7 +208,7 @@ $this - 10 + 9 True @@ -289,7 +289,7 @@ 4, 5, 4, 5 - 248, 20 + 332, 20 12 @@ -304,7 +304,7 @@ $this - 3 + 13 288, 159 @@ -328,7 +328,7 @@ $this - 4 + 3 126, 257 @@ -352,7 +352,7 @@ $this - 5 + 4 126, 226 @@ -376,7 +376,7 @@ $this - 6 + 5 True @@ -409,7 +409,7 @@ $this - 8 + 7 10, 316 @@ -433,7 +433,7 @@ $this - 9 + 8 288, 60 @@ -457,7 +457,7 @@ $this - 13 + 12 CenterScreen @@ -493,6 +493,6 @@ $this - 7 + 6 \ No newline at end of file diff --git a/instat/dlgTransformText.Designer.vb b/instat/dlgTransformText.Designer.vb index 2534f03a9b2..46e7fe5910d 100644 --- a/instat/dlgTransformText.Designer.vb +++ b/instat/dlgTransformText.Designer.vb @@ -125,10 +125,8 @@ Partial Class dlgTransformText Me.grpParameters.Controls.Add(Me.lblToSubstring) Me.grpParameters.Controls.Add(Me.lblLastWord) Me.grpParameters.Controls.Add(Me.lblPad) - Me.grpParameters.Controls.Add(Me.ucrNudTo) Me.grpParameters.Controls.Add(Me.ucrReceiverFirstWord) Me.grpParameters.Controls.Add(Me.rdoBothPad) - Me.grpParameters.Controls.Add(Me.ucrNudFirstWord) Me.grpParameters.Controls.Add(Me.ucrNudFrom) Me.grpParameters.Controls.Add(Me.rdoRightPad) Me.grpParameters.Controls.Add(Me.rdoLeftPad) @@ -139,6 +137,8 @@ Partial Class dlgTransformText Me.grpParameters.Controls.Add(Me.ucrInputTo) Me.grpParameters.Controls.Add(Me.lblWidth) Me.grpParameters.Controls.Add(Me.lblTo) + Me.grpParameters.Controls.Add(Me.ucrNudFirstWord) + Me.grpParameters.Controls.Add(Me.ucrNudTo) resources.ApplyResources(Me.grpParameters, "grpParameters") Me.grpParameters.Name = "grpParameters" Me.grpParameters.TabStop = False diff --git a/instat/dlgTransformText.resx b/instat/dlgTransformText.resx index 5e281b1aaa4..48c5cdd0562 100644 --- a/instat/dlgTransformText.resx +++ b/instat/dlgTransformText.resx @@ -219,7 +219,7 @@ grpParameters - 16 + 14 True @@ -300,7 +300,7 @@ grpParameters - 17 + 15 73, 139 @@ -374,28 +374,6 @@ 507, 498 - - - Button - - - Flat - - - 252, 4 - - - 83, 43 - - - 4 - - - Trim - - - MiddleCenter - rdoTrim @@ -408,27 +386,6 @@ 1 - - Button - - - Flat - - - 333, 4 - - - 83, 43 - - - 5 - - - Words - - - MiddleCenter - rdoWords @@ -441,27 +398,6 @@ 2 - - Button - - - Flat - - - 414, 4 - - - 83, 43 - - - 6 - - - Substring - - - MiddleCenter - rdoSubstring @@ -474,27 +410,6 @@ 3 - - Button - - - Flat - - - 171, 4 - - - 83, 43 - - - 3 - - - Pad - - - MiddleCenter - rdoPad @@ -507,27 +422,6 @@ 4 - - Button - - - Flat - - - 90, 4 - - - 83, 43 - - - 2 - - - Length - - - MiddleCenter - rdoLength @@ -540,27 +434,6 @@ 5 - - Button - - - Flat - - - 10, 4 - - - 83, 43 - - - 1 - - - Convert Case - - - MiddleCenter - rdoConvertCase @@ -573,18 +446,6 @@ 6 - - 10, 417 - - - 4, 5, 4, 5 - - - 331, 22 - - - 11 - ucrNewColName @@ -597,18 +458,6 @@ 7 - - 253, 100 - - - 0, 0, 0, 0 - - - 135, 26 - - - 9 - ucrReceiverTransformText @@ -621,18 +470,6 @@ 10 - - 10, 50 - - - 0, 0, 0, 0 - - - 242, 185 - - - 7 - ucrSelectorForTransformText @@ -645,15 +482,6 @@ 11 - - 10, 442 - - - 410, 53 - - - 12 - ucrBase @@ -666,6 +494,7 @@ 12 + CenterScreen @@ -703,7 +532,7 @@ 3 - 96, 84 + 98, 84 50, 20 @@ -771,27 +600,6 @@ 8 - - 95, 50 - - - 50, 20 - - - 46 - - - ucrNudTo - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpParameters - - - 9 - 106, 50 @@ -814,7 +622,7 @@ grpParameters - 10 + 9 True @@ -841,31 +649,10 @@ grpParameters - 11 - - - 95, 23 - - - 50, 20 - - - 44 - - - ucrNudFirstWord - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpParameters - - - 12 + 10 - 95, 23 + 97, 23 50, 20 @@ -883,7 +670,7 @@ grpParameters - 13 + 11 True @@ -910,7 +697,7 @@ grpParameters - 14 + 12 True @@ -937,7 +724,7 @@ grpParameters - 15 + 13 78, 50 @@ -958,7 +745,7 @@ grpParameters - 18 + 16 6, 14 @@ -979,7 +766,7 @@ grpParameters - 19 + 17 75, 22 @@ -1000,7 +787,7 @@ grpParameters - 20 + 18 True @@ -1027,7 +814,7 @@ grpParameters - 21 + 19 True @@ -1054,22 +841,64 @@ grpParameters - 22 + 20 - - 10, 238 + + 97, 23 - - 397, 173 + + 50, 20 - - 10 + + 44 - - Options + + ucrNudFirstWord - - grpParameters + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpParameters + + + 21 + + + 97, 50 + + + 50, 20 + + + 46 + + + ucrNudTo + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpParameters + + + 22 + + + 10, 238 + + + 397, 173 + + + 10 + + + Options + + + grpParameters System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1080,4 +909,295 @@ 8 + + 253, 100 + + + 0, 0, 0, 0 + + + 135, 26 + + + 9 + + + ucrReceiverTransformText + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 10 + + + 10, 442 + + + 410, 53 + + + 12 + + + ucrBase + + + instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 12 + + + 10, 417 + + + 4, 5, 4, 5 + + + 331, 22 + + + 11 + + + ucrNewColName + + + instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 7 + + + 10, 50 + + + 0, 0, 0, 0 + + + 242, 185 + + + 7 + + + ucrSelectorForTransformText + + + instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 11 + + + Button + + + Flat + + + 10, 4 + + + 83, 43 + + + 1 + + + Convert Case + + + MiddleCenter + + + rdoConvertCase + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Button + + + Flat + + + 90, 4 + + + 83, 43 + + + 2 + + + Length + + + MiddleCenter + + + rdoLength + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Button + + + Flat + + + 171, 4 + + + 83, 43 + + + 3 + + + Pad + + + MiddleCenter + + + rdoPad + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + Button + + + Flat + + + 414, 4 + + + 83, 43 + + + 6 + + + Substring + + + MiddleCenter + + + rdoSubstring + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Button + + + Flat + + + 333, 4 + + + 83, 43 + + + 5 + + + Words + + + MiddleCenter + + + rdoWords + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Button + + + Flat + + + 252, 4 + + + 83, 43 + + + 4 + + + Trim + + + MiddleCenter + + + rdoTrim + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + \ No newline at end of file diff --git a/instat/dlgTransformText.vb b/instat/dlgTransformText.vb index 669d64a4b1c..66aadc2894e 100644 --- a/instat/dlgTransformText.vb +++ b/instat/dlgTransformText.vb @@ -330,6 +330,10 @@ Public Class dlgTransformText End If End Sub + Private Sub rdoSubstring_CheckedChanged(sender As Object, e As EventArgs) Handles rdoSubstring.CheckedChanged + + End Sub + Private Sub ucrPnl_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOperation.ControlValueChanged, ucrInputTo.ControlValueChanged If bRCodeSet Then If rdoLength.Checked Then diff --git a/instat/dlgVisualizeData.Designer.vb b/instat/dlgVisualizeData.Designer.vb index d38d8abde72..4708e07641c 100644 --- a/instat/dlgVisualizeData.Designer.vb +++ b/instat/dlgVisualizeData.Designer.vb @@ -124,7 +124,7 @@ Partial Class dlgVisualizeData 'lblMillionDataPoints ' Me.lblMillionDataPoints.AutoSize = True - Me.lblMillionDataPoints.Location = New System.Drawing.Point(165, 296) + Me.lblMillionDataPoints.Location = New System.Drawing.Point(162, 296) Me.lblMillionDataPoints.Name = "lblMillionDataPoints" Me.lblMillionDataPoints.Size = New System.Drawing.Size(94, 13) Me.lblMillionDataPoints.TabIndex = 16 @@ -142,7 +142,7 @@ Partial Class dlgVisualizeData 'lblSampling ' Me.lblSampling.AutoSize = True - Me.lblSampling.Location = New System.Drawing.Point(188, 242) + Me.lblSampling.Location = New System.Drawing.Point(191, 244) Me.lblSampling.Name = "lblSampling" Me.lblSampling.Size = New System.Drawing.Size(94, 13) Me.lblSampling.TabIndex = 9 @@ -152,7 +152,7 @@ Partial Class dlgVisualizeData ' Me.ucrNudSamplingFunction.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSamplingFunction.Increment = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSamplingFunction.Location = New System.Drawing.Point(338, 238) + Me.ucrNudSamplingFunction.Location = New System.Drawing.Point(330, 242) Me.ucrNudSamplingFunction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSamplingFunction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSamplingFunction.Name = "ucrNudSamplingFunction" @@ -221,7 +221,7 @@ Partial Class dlgVisualizeData Me.ucrSaveGraph.Location = New System.Drawing.Point(10, 321) Me.ucrSaveGraph.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveGraph.Name = "ucrSaveGraph" - Me.ucrSaveGraph.Size = New System.Drawing.Size(338, 24) + Me.ucrSaveGraph.Size = New System.Drawing.Size(319, 24) Me.ucrSaveGraph.TabIndex = 17 ' 'ucrSelectorVisualizeData diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 4e650a19376..9c57c2148cb 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -275,6 +275,16 @@ Form + + True + True + dlgCopySheet.resx + + + True + True + dlgCopySheet.sw-KE.resx + dlgCopySpecial.vb diff --git a/instat/sdgMissingOptions.Designer.vb b/instat/sdgMissingOptions.Designer.vb index d4a48ea8baf..258faa2600d 100644 --- a/instat/sdgMissingOptions.Designer.vb +++ b/instat/sdgMissingOptions.Designer.vb @@ -145,7 +145,7 @@ Partial Class sdgMissingOptions Me.MinimizeBox = False Me.Name = "sdgMissingOptions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Missing Options" + Me.Text = "Options for Missing Values" Me.ResumeLayout(False) End Sub diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index 7d04ebee1b1..1253a88bbad 100644 --- a/instat/ucrCalculator.resx +++ b/instat/ucrCalculator.resx @@ -10657,7 +10657,7 @@ 4, 5, 4, 5 - 375, 22 + 300, 22 196 diff --git a/instat/ucrFilter.resx b/instat/ucrFilter.resx index fd44fdab400..7087544b016 100644 --- a/instat/ucrFilter.resx +++ b/instat/ucrFilter.resx @@ -349,7 +349,7 @@ 5, 366 - 91, 19 + 158, 19 17 @@ -369,264 +369,6 @@ 5 - - cmdClear - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 0 - - - cmdComma - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 1 - - - cmdBrackets - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 2 - - - cmdPower - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 3 - - - cmdDivide - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 4 - - - cmdPlus - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 5 - - - cmdMinus - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 6 - - - cmdMultiply - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 7 - - - cmdDot - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 8 - - - cmd9 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 9 - - - cmd8 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 10 - - - cmd7 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 11 - - - cmd6 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 12 - - - cmd5 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 13 - - - cmd4 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 14 - - - cmd3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 15 - - - cmd2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 16 - - - cmd0 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 17 - - - cmd1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpNumeric - - - 18 - - - 398, 66 - - - 2, 3, 2, 3 - - - 2, 3, 2, 3 - - - 205, 134 - - - 180 - - - Numeric - - - grpNumeric - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - NoControl @@ -1218,6 +960,36 @@ 18 + + 398, 66 + + + 2, 3, 2, 3 + + + 2, 3, 2, 3 + + + 205, 134 + + + 180 + + + Numeric + + + grpNumeric + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + Microsoft Sans Serif, 8.25pt diff --git a/instat/ucrSave.Designer.vb b/instat/ucrSave.Designer.vb index 29cadbf14b3..ad6105e78c3 100644 --- a/instat/ucrSave.Designer.vb +++ b/instat/ucrSave.Designer.vb @@ -83,10 +83,10 @@ Partial Class ucrSave ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.btnColumnPosition) Me.Controls.Add(Me.lblSaveText) Me.Controls.Add(Me.ucrChkSave) Me.Controls.Add(Me.ucrInputTextSave) + Me.Controls.Add(Me.btnColumnPosition) Me.Controls.Add(Me.ucrInputComboSave) Me.Name = "ucrSave" Me.ResumeLayout(False) diff --git a/instat/ucrSave.resx b/instat/ucrSave.resx index 00a914642d7..04f0b298b61 100644 --- a/instat/ucrSave.resx +++ b/instat/ucrSave.resx @@ -142,7 +142,7 @@ $this - 2 + 1 True @@ -169,13 +169,13 @@ $this - 1 + 0 - - Right + + Top - 264, 0 + 109, 0 9, 12, 9, 12 @@ -199,13 +199,13 @@ 4 - 189, 0 + 115, 1 9, 12, 9, 12 - 92, 34 + 133, 34 3 @@ -220,7 +220,10 @@ $this - 3 + 2 + + + Top, Right True @@ -228,14 +231,11 @@ GrowAndShrink - - Right - - 210, 0 + 251, -1 - 54, 34 + 54, 23 5 @@ -253,7 +253,7 @@ $this - 0 + 3 True @@ -265,7 +265,7 @@ 4, 5, 4, 5 - 403, 34 + 309, 34 ucrSave From a27b159af9662bbffd3243cbab4e2dfa924d1056 Mon Sep 17 00:00:00 2001 From: Antoine Ntalumeso Date: Wed, 18 Aug 2021 13:11:08 +0200 Subject: [PATCH 09/31] Small code change --- instat/dlgPICSARainfall.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgPICSARainfall.vb b/instat/dlgPICSARainfall.vb index 513cca42bc7..3526abedc1a 100644 --- a/instat/dlgPICSARainfall.vb +++ b/instat/dlgPICSARainfall.vb @@ -257,7 +257,7 @@ Public Class dlgPICSARainfall clsPasteUpperTercileY = New RFunction clsFormatUpperTercileY = New RFunction - ucrInputStation.SetText(strNone) + ucrInputStation.SetName(strNone) ucrInputStation.bUpdateRCodeFromControl = True clsDatePeriodOperator = New ROperator From 6de6db4b57f52a81e671f37bb3708f001c2b911f Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Wed, 18 Aug 2021 23:15:20 +0300 Subject: [PATCH 10/31] added label controls --- instat/dlgBarAndPieChart.Designer.vb | 66 +++++++ instat/dlgBarAndPieChart.resx | 262 ++++++++++++++++++++++----- 2 files changed, 284 insertions(+), 44 deletions(-) diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb index 93f21c798aa..cfc7acf0a78 100644 --- a/instat/dlgBarAndPieChart.Designer.vb +++ b/instat/dlgBarAndPieChart.Designer.vb @@ -50,6 +50,11 @@ Partial Class dlgBarAndPieChart Me.lblXvariable = New System.Windows.Forms.Label() Me.rdoPie = New System.Windows.Forms.RadioButton() Me.rdoDonut = New System.Windows.Forms.RadioButton() + Me.lblLabelPosition = New System.Windows.Forms.Label() + Me.lblLabelColour = New System.Windows.Forms.Label() + Me.ucrInputLabelPosition = New instat.ucrInputComboBox() + Me.ucrInputLabelColour = New instat.ucrInputComboBox() + Me.ucrChkAddLabels = New instat.ucrCheck() Me.ucrChkPolarCoordinates = New instat.ucrCheck() Me.ucrPnlPolar = New instat.UcrPanel() Me.ucrChkBacktoback = New instat.ucrCheck() @@ -62,6 +67,8 @@ Partial Class dlgBarAndPieChart Me.ucrBarChartSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrPnlOptions = New instat.UcrPanel() + Me.ucrInputLabelSize = New instat.ucrInputComboBox() + Me.lblLabelSize = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'lblByFactor @@ -146,6 +153,38 @@ Partial Class dlgBarAndPieChart Me.rdoDonut.TabStop = True Me.rdoDonut.UseVisualStyleBackColor = True ' + 'lblLabelPosition + ' + resources.ApplyResources(Me.lblLabelPosition, "lblLabelPosition") + Me.lblLabelPosition.Name = "lblLabelPosition" + ' + 'lblLabelColour + ' + resources.ApplyResources(Me.lblLabelColour, "lblLabelColour") + Me.lblLabelColour.Name = "lblLabelColour" + ' + 'ucrInputLabelPosition + ' + Me.ucrInputLabelPosition.AddQuotesIfUnrecognised = True + Me.ucrInputLabelPosition.GetSetSelectedIndex = -1 + Me.ucrInputLabelPosition.IsReadOnly = False + resources.ApplyResources(Me.ucrInputLabelPosition, "ucrInputLabelPosition") + Me.ucrInputLabelPosition.Name = "ucrInputLabelPosition" + ' + 'ucrInputLabelColour + ' + Me.ucrInputLabelColour.AddQuotesIfUnrecognised = True + Me.ucrInputLabelColour.GetSetSelectedIndex = -1 + Me.ucrInputLabelColour.IsReadOnly = False + resources.ApplyResources(Me.ucrInputLabelColour, "ucrInputLabelColour") + Me.ucrInputLabelColour.Name = "ucrInputLabelColour" + ' + 'ucrChkAddLabels + ' + Me.ucrChkAddLabels.Checked = False + resources.ApplyResources(Me.ucrChkAddLabels, "ucrChkAddLabels") + Me.ucrChkAddLabels.Name = "ucrChkAddLabels" + ' 'ucrChkPolarCoordinates ' Me.ucrChkPolarCoordinates.Checked = False @@ -228,10 +267,30 @@ Partial Class dlgBarAndPieChart resources.ApplyResources(Me.ucrPnlOptions, "ucrPnlOptions") Me.ucrPnlOptions.Name = "ucrPnlOptions" ' + 'ucrInputLabelSize + ' + Me.ucrInputLabelSize.AddQuotesIfUnrecognised = True + Me.ucrInputLabelSize.GetSetSelectedIndex = -1 + Me.ucrInputLabelSize.IsReadOnly = False + resources.ApplyResources(Me.ucrInputLabelSize, "ucrInputLabelSize") + Me.ucrInputLabelSize.Name = "ucrInputLabelSize" + ' + 'lblLabelSize + ' + resources.ApplyResources(Me.lblLabelSize, "lblLabelSize") + Me.lblLabelSize.Name = "lblLabelSize" + ' 'dlgBarAndPieChart ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblLabelSize) + Me.Controls.Add(Me.ucrInputLabelSize) + Me.Controls.Add(Me.lblLabelColour) + Me.Controls.Add(Me.lblLabelPosition) + Me.Controls.Add(Me.ucrInputLabelPosition) + Me.Controls.Add(Me.ucrInputLabelColour) + Me.Controls.Add(Me.ucrChkAddLabels) Me.Controls.Add(Me.rdoDonut) Me.Controls.Add(Me.rdoPie) Me.Controls.Add(Me.ucrChkPolarCoordinates) @@ -288,4 +347,11 @@ Partial Class dlgBarAndPieChart Friend WithEvents ucrPnlPolar As UcrPanel Friend WithEvents rdoDonut As RadioButton Friend WithEvents rdoPie As RadioButton + Friend WithEvents ucrChkAddLabels As ucrCheck + Friend WithEvents lblLabelColour As Label + Friend WithEvents lblLabelPosition As Label + Friend WithEvents ucrInputLabelPosition As ucrInputComboBox + Friend WithEvents ucrInputLabelColour As ucrInputComboBox + Friend WithEvents lblLabelSize As Label + Friend WithEvents ucrInputLabelSize As ucrInputComboBox End Class \ No newline at end of file diff --git a/instat/dlgBarAndPieChart.resx b/instat/dlgBarAndPieChart.resx index ac76ee63ded..0b2c63f4aab 100644 --- a/instat/dlgBarAndPieChart.resx +++ b/instat/dlgBarAndPieChart.resx @@ -133,7 +133,7 @@ 76, 13 - 8 + 7 By Factor (Fill): @@ -148,7 +148,7 @@ $this - 16 + 23 NoControl @@ -160,7 +160,7 @@ 121, 25 - 13 + 12 Plot Options @@ -175,7 +175,7 @@ $this - 15 + 22 NoControl @@ -202,7 +202,7 @@ $this - 21 + 28 Button @@ -214,7 +214,7 @@ NoControl - 216, 12 + 218, 12 110, 28 @@ -238,7 +238,7 @@ $this - 14 + 21 NoControl @@ -265,7 +265,7 @@ $this - 20 + 27 True @@ -280,7 +280,7 @@ 47, 13 - 10 + 9 Position: @@ -295,7 +295,7 @@ $this - 11 + 18 NoControl @@ -307,7 +307,7 @@ 121, 25 - 12 + 11 Column Chart Options @@ -322,7 +322,7 @@ $this - 10 + 17 Button @@ -358,7 +358,7 @@ $this - 8 + 15 True @@ -373,7 +373,7 @@ 58, 13 - 6 + 5 X Variable: @@ -388,7 +388,7 @@ $this - 5 + 12 True @@ -418,7 +418,7 @@ $this - 1 + 8 True @@ -433,7 +433,7 @@ 54, 17 - 19 + 17 Donut @@ -448,7 +448,130 @@ $this - 0 + 7 + + + True + + + NoControl + + + 101, 381 + + + 47, 13 + + + 20 + + + Position: + + + lblLabelPosition + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + + NoControl + + + 210, 381 + + + 40, 13 + + + 22 + + + Colour: + + + lblLabelColour + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + 151, 377 + + + 57, 21 + + + 21 + + + ucrInputLabelPosition + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 4 + + + 252, 377 + + + 57, 21 + + + 23 + + + ucrInputLabelColour + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 5 + + + 10, 377 + + + 93, 20 + + + 19 + + + ucrChkAddLabels + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 6 10, 351 @@ -457,7 +580,7 @@ 83, 20 - 16 + 15 ucrChkPolarCoordinates @@ -469,7 +592,7 @@ $this - 2 + 9 108, 349 @@ -478,7 +601,7 @@ 157, 24 - 20 + 16 ucrPnlPolar @@ -490,7 +613,7 @@ $this - 3 + 10 10, 299 @@ -499,7 +622,7 @@ 166, 20 - 14 + 13 ucrChkBacktoback @@ -511,7 +634,7 @@ $this - 4 + 11 True @@ -520,7 +643,58 @@ 6, 13 - 415, 459 + 415, 486 + + + True + + + NoControl + + + 313, 381 + + + 30, 13 + + + 24 + + + Size: + + + lblLabelSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + 346, 377 + + + 57, 21 + + + 25 + + + ucrInputLabelSize + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 252, 62 @@ -529,7 +703,7 @@ 125, 136 - 5 + 4 ucrVariablesAsFactorForBarChart @@ -541,7 +715,7 @@ $this - 7 + 14 252, 313 @@ -550,7 +724,7 @@ 120, 21 - 11 + 10 ucrInputBarChartPositions @@ -562,10 +736,10 @@ $this - 9 + 16 - 10, 379 + 10, 406 4, 5, 4, 5 @@ -574,7 +748,7 @@ 255, 24 - 17 + 26 ucrSaveBar @@ -586,7 +760,7 @@ $this - 12 + 19 10, 325 @@ -595,7 +769,7 @@ 166, 20 - 15 + 14 ucrChkFlipCoordinates @@ -607,7 +781,7 @@ $this - 13 + 20 252, 270 @@ -619,7 +793,7 @@ 120, 20 - 9 + 8 ucrReceiverByFactor @@ -631,7 +805,7 @@ $this - 17 + 24 10, 41 @@ -643,7 +817,7 @@ 210, 180 - 4 + 3 ucrBarChartSelector @@ -655,16 +829,16 @@ $this - 18 + 25 - 10, 404 + 10, 432 402, 52 - 21 + 27 ucrBase @@ -676,7 +850,7 @@ $this - 19 + 26 103, 6 @@ -697,7 +871,7 @@ $this - 22 + 29 CenterScreen @@ -721,7 +895,7 @@ 120, 21 - 7 + 6 ucrReceiverX @@ -733,6 +907,6 @@ $this - 6 + 13 \ No newline at end of file From 7dfd0ce83f2c25bd776c3e708a39ee177a748b2b Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Wed, 18 Aug 2021 23:15:58 +0300 Subject: [PATCH 11/31] setting up labeling functionality --- instat/dlgBarAndPieChart.vb | 87 ++++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 7 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 9ea3f106d7f..fc6659d05ab 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -56,6 +56,8 @@ Public Class dlgBarAndPieChart Private clsYScaleDateFunction As New RFunction Private clsScaleFillViridisFunction As New RFunction Private clsScaleColourViridisFunction As New RFunction + Private clsGeomTextFunction As New RFunction + Private clsLabelAesFunction As New RFunction Private Sub dlgBarAndPieChart_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -77,6 +79,9 @@ Public Class dlgBarAndPieChart Dim clsRCoordPolarFunction As New RFunction Dim dctPositionPairs As New Dictionary(Of String, String) Dim dctStatOptions As New Dictionary(Of String, String) + Dim dctLabelColours As New Dictionary(Of String, String) + Dim dctLabelPositions As New Dictionary(Of String, String) + Dim dctLabelSizes As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 @@ -121,7 +126,6 @@ Public Class dlgBarAndPieChart ucrSaveBar.SetPrefix("bar") ucrSaveBar.SetAssignToIfUncheckedValue("last_graph") - clsCoordFlipFunc.SetPackageName("ggplot2") clsCoordFlipFunc.SetRCommand("coord_flip") clsCoordFlipParam.SetArgumentName("coord_flip") @@ -144,16 +148,44 @@ Public Class dlgBarAndPieChart ucrPnlPolar.AddRadioButton(rdoDonut) ucrInputBarChartPositions.SetParameter(New RParameter("position", 0)) - dctPositionPairs.Add("Stack", Chr(34) & "stack" & Chr(34)) dctPositionPairs.Add("Dodge", Chr(34) & "dodge" & Chr(34)) + dctPositionPairs.Add("Fill", Chr(34) & "fill" & Chr(34)) + dctPositionPairs.Add("Stack", Chr(34) & "stack" & Chr(34)) dctPositionPairs.Add("Identity", Chr(34) & "identity" & Chr(34)) dctPositionPairs.Add("Jitter", Chr(34) & "jitter" & Chr(34)) - dctPositionPairs.Add("Fill", Chr(34) & "fill" & Chr(34)) dctPositionPairs.Add("Stack in reverse", "position_stack(reverse = TRUE)") ucrInputBarChartPositions.SetItems(dctPositionPairs) ucrInputBarChartPositions.SetDropDownStyleAsNonEditable() ucrInputBarChartPositions.SetRDefault(Chr(34) & "stack" & Chr(34)) + ucrInputLabelColour.SetParameter(New RParameter("colour", 4)) + dctLabelColours.Add("Black", Chr(34) & "black" & Chr(34)) + dctLabelColours.Add("White", Chr(34) & "white" & Chr(34)) + ucrInputLabelColour.SetItems(dctLabelColours) + ucrInputLabelColour.bAllowNonConditionValues = True + + ucrInputLabelPosition.SetParameter(New RParameter("vjust", 2)) + dctLabelPositions.Add("Out", "-0.25") + dctLabelPositions.Add("In", "5") + ucrInputLabelPosition.SetItems(dctLabelPositions) + ucrInputLabelPosition.SetDropDownStyleAsNonEditable() + + ucrInputLabelSize.SetParameter(New RParameter("size", 5)) + dctLabelSizes.Add("Default", "4") + dctLabelSizes.Add("Small", "3") + dctLabelSizes.Add("Big", "7") + ucrInputLabelSize.SetItems(dctLabelSizes) + ucrInputLabelSize.SetDropDownStyleAsNonEditable() + + ucrChkAddLabels.SetText("Add Labels") + ucrChkAddLabels.AddParameterPresentCondition(True, "geom_text") + ucrChkAddLabels.AddParameterPresentCondition(False, "geom_text", False) + ucrChkAddLabels.AddToLinkedControls(ucrInputLabelColour, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkAddLabels.AddToLinkedControls(ucrInputLabelPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkAddLabels.AddToLinkedControls(ucrInputLabelSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrInputLabelColour.SetLinkedDisplayControl(lblLabelColour) + ucrInputLabelPosition.SetLinkedDisplayControl(lblLabelPosition) + ucrInputLabelSize.SetLinkedDisplayControl(lblLabelSize) End Sub Private Sub SetDefaults() @@ -176,6 +208,8 @@ Public Class dlgBarAndPieChart clsPolarCoordFunction = New RFunction clsScaleXdiscretFunction = New RFunction clsExpansionFunction = New RFunction + clsGeomTextFunction = New RFunction + clsLabelAesFunction = New RFunction ucrBarChartSelector.Reset() ucrBarChartSelector.SetGgplotFunction(clsBaseOperator) @@ -202,7 +236,7 @@ Public Class dlgBarAndPieChart clsRgeomBarFunction.SetPackageName("ggplot2") clsRgeomBarFunction.SetRCommand("geom_bar") - clsRgeomBarFunction.AddParameter("position", Chr(34) & "fill" & Chr(34), iPosition:=0) + clsRgeomBarFunction.AddParameter("position", Chr(34) & "dodge" & Chr(34), iPosition:=0) clsRgeomBarFunction.AddParameter("stat", Chr(34) & "count" & Chr(34), iPosition:=1) clsRggplotFunction.SetPackageName("ggplot2") @@ -257,6 +291,16 @@ Public Class dlgBarAndPieChart clsScaleYSymmetricFunction.SetPackageName("lemon") clsScaleYSymmetricFunction.SetRCommand("scale_y_symmetric") + clsGeomTextFunction.SetPackageName("ggplot2") + clsGeomTextFunction.SetRCommand("geom_text") + clsGeomTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsLabelAesFunction, iPosition:=1) + clsGeomTextFunction.AddParameter("colour", "black", iPosition:=4) + clsGeomTextFunction.AddParameter("vjust", "-0.25", iPosition:=2) + clsGeomTextFunction.AddParameter("size", "4", iPosition:=5) + + clsLabelAesFunction.SetPackageName("ggplot2") + clsLabelAesFunction.SetRCommand("aes") + clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -298,7 +342,10 @@ Public Class dlgBarAndPieChart ucrChkFlipCoordinates.SetRCode(clsBaseOperator, bReset) ucrChkBacktoback.SetRCode(clsScaleYSymmetricFunction, bReset) ucrInputBarChartPositions.SetRCode(clsRgeomBarFunction, bReset) - + ucrInputLabelColour.SetRCode(clsGeomTextFunction, bReset) + ucrChkAddLabels.SetRCode(clsBaseOperator, bReset) + ucrInputLabelPosition.SetRCode(clsGeomTextFunction, bReset) + ucrInputLabelSize.SetRCode(clsGeomTextFunction, bReset) End Sub Private Sub TestOkEnabled() @@ -489,7 +536,7 @@ Public Class dlgBarAndPieChart End If End If ChangeParameterName() - + SetGeomTextOptions() End Sub Private Sub ucrChkPolarCoordinates_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPolarCoordinates.ControlValueChanged, ucrPnlPolar.ControlValueChanged @@ -513,8 +560,34 @@ Public Class dlgBarAndPieChart End Sub + Private Sub ucrChkAddLabels_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddLabels.ControlValueChanged + If ucrChkAddLabels.Checked Then + clsBaseOperator.AddParameter("geom_text", clsRFunctionParameter:=clsGeomTextFunction, iPosition:=5) + Else + clsBaseOperator.RemoveParameterByName("geom_text") + End If + End Sub + + Private Sub SetGeomTextOptions() + If rdoFrequency.Checked Then + clsGeomTextFunction.AddParameter("stat", Chr(34) & "count" & Chr(34), iPosition:=0) + clsLabelAesFunction.AddParameter("label", "..count..", iPosition:=0) + If ucrInputBarChartPositions.GetText = "Dodge" Then + clsGeomTextFunction.AddParameter("position", "position_dodge(width=0.9)", iPosition:=2) + Else + 'TODO: Add defaults for other position options + End If + Else + clsGeomTextFunction.RemoveParameterByName("stat") + clsLabelAesFunction.AddParameter("label", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=0) + End If + End Sub + + Private Sub ucrInputBarChartPositions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputBarChartPositions.ControlValueChanged + SetGeomTextOptions() + End Sub + Private Sub ucrSaveBar_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorForBarChart.ControlContentsChanged, ucrReceiverByFactor.ControlContentsChanged, ucrSaveBar.ControlContentsChanged, ucrReceiverX.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged, ucrChkBacktoback.ControlContentsChanged, ucrChkPolarCoordinates.ControlContentsChanged TestOkEnabled() End Sub - End Class From 9b9cd6ca47f25a8ab7338db6afc403f7e16272c4 Mon Sep 17 00:00:00 2001 From: ivanluv Date: Thu, 19 Aug 2021 10:44:23 +0300 Subject: [PATCH 12/31] Adding the annotate function to the bar and pie chart dialogue --- instat/dlgBarAndPieChart.vb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index fc6659d05ab..5c149e50e16 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -58,6 +58,7 @@ Public Class dlgBarAndPieChart Private clsScaleColourViridisFunction As New RFunction Private clsGeomTextFunction As New RFunction Private clsLabelAesFunction As New RFunction + Private clsAnnotateFunction As New RFunction Private Sub dlgBarAndPieChart_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -317,6 +318,7 @@ Public Class dlgBarAndPieChart clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() clsScaleFillViridisFunction = GgplotDefaults.clsScaleFillViridisFunction clsScaleColourViridisFunction = GgplotDefaults.clsScaleColorViridisFunction + clsAnnotateFunction = GgplotDefaults.clsAnnotateFunction clsScaleColourViridisFunction.AddParameter("discrete", "TRUE", iPosition:=5) clsScaleFillViridisFunction.AddParameter("discrete", "TRUE", iPosition:=5) @@ -373,9 +375,9 @@ Public Class dlgBarAndPieChart Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click If rdoValue.Checked Or rdoFrequency.Checked Then - sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewGlobalAesFunction:=clsBarAesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrBarChartSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, bReset:=bResetSubdialog, bNewEnableDiscrete:=False) + sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewGlobalAesFunction:=clsBarAesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrBarChartSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, bReset:=bResetSubdialog, bNewEnableDiscrete:=False) Else - sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewGlobalAesFunction:=clsPieAesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrBarChartSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, bReset:=bResetSubdialog) + sdgPlots.SetRCode(clsNewOperator:=clsBaseOperator, clsNewGlobalAesFunction:=clsPieAesFunction, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewThemeFunction:=clsThemeFuction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrBarChartSelector, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, bReset:=bResetSubdialog) End If sdgPlots.ShowDialog() bResetSubdialog = False From 752d5031170bc7899fb64739893e6c39b4bed1de Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 20 Aug 2021 11:35:36 +0300 Subject: [PATCH 13/31] Bug fix --- instat/dlgBarAndPieChart.vb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 5c149e50e16..4c8a2e7fd92 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -181,9 +181,7 @@ Public Class dlgBarAndPieChart ucrChkAddLabels.SetText("Add Labels") ucrChkAddLabels.AddParameterPresentCondition(True, "geom_text") ucrChkAddLabels.AddParameterPresentCondition(False, "geom_text", False) - ucrChkAddLabels.AddToLinkedControls(ucrInputLabelColour, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkAddLabels.AddToLinkedControls(ucrInputLabelPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkAddLabels.AddToLinkedControls(ucrInputLabelSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkAddLabels.AddToLinkedControls({ucrInputLabelPosition, ucrInputLabelSize, ucrInputLabelColour}, {True}, bNewLinkedHideIfParameterMissing:=True) ucrInputLabelColour.SetLinkedDisplayControl(lblLabelColour) ucrInputLabelPosition.SetLinkedDisplayControl(lblLabelPosition) ucrInputLabelSize.SetLinkedDisplayControl(lblLabelSize) From c906da7a3cd028b625512f6e186b9b48b54adcc0 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 20 Aug 2021 19:01:21 +0300 Subject: [PATCH 14/31] added path and step controls --- instat/dlgLinePlot.designer.vb | 37 +++++++ instat/dlgLinePlot.resx | 176 ++++++++++++++++++++++++++------- 2 files changed, 176 insertions(+), 37 deletions(-) diff --git a/instat/dlgLinePlot.designer.vb b/instat/dlgLinePlot.designer.vb index 4a3bc6da372..c9acacfff53 100644 --- a/instat/dlgLinePlot.designer.vb +++ b/instat/dlgLinePlot.designer.vb @@ -45,6 +45,10 @@ Partial Class dlgLinePlot Me.cmdLineOptions = New System.Windows.Forms.Button() Me.lblFactorOptional = New System.Windows.Forms.Label() Me.lblGroupLine = New System.Windows.Forms.Label() + Me.rdoPath = New System.Windows.Forms.RadioButton() + Me.rdoStep = New System.Windows.Forms.RadioButton() + Me.ucrPnlStepOrPath = New instat.UcrPanel() + Me.ucrChkPathOrStep = New instat.ucrCheck() Me.ucrChkValley = New instat.ucrCheck() Me.ucrChkPeak = New instat.ucrCheck() Me.ucrReceiverGroup = New instat.ucrReceiverSingle() @@ -95,6 +99,31 @@ Partial Class dlgLinePlot resources.ApplyResources(Me.lblGroupLine, "lblGroupLine") Me.lblGroupLine.Name = "lblGroupLine" ' + 'rdoPath + ' + resources.ApplyResources(Me.rdoPath, "rdoPath") + Me.rdoPath.Name = "rdoPath" + Me.rdoPath.TabStop = True + Me.rdoPath.UseVisualStyleBackColor = True + ' + 'rdoStep + ' + resources.ApplyResources(Me.rdoStep, "rdoStep") + Me.rdoStep.Name = "rdoStep" + Me.rdoStep.TabStop = True + Me.rdoStep.UseVisualStyleBackColor = True + ' + 'ucrPnlStepOrPath + ' + resources.ApplyResources(Me.ucrPnlStepOrPath, "ucrPnlStepOrPath") + Me.ucrPnlStepOrPath.Name = "ucrPnlStepOrPath" + ' + 'ucrChkPathOrStep + ' + Me.ucrChkPathOrStep.Checked = False + resources.ApplyResources(Me.ucrChkPathOrStep, "ucrChkPathOrStep") + Me.ucrChkPathOrStep.Name = "ucrChkPathOrStep" + ' 'ucrChkValley ' Me.ucrChkValley.Checked = False @@ -184,6 +213,10 @@ Partial Class dlgLinePlot ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.rdoStep) + Me.Controls.Add(Me.rdoPath) + Me.Controls.Add(Me.ucrPnlStepOrPath) + Me.Controls.Add(Me.ucrChkPathOrStep) Me.Controls.Add(Me.lblGroupLine) Me.Controls.Add(Me.ucrChkValley) Me.Controls.Add(Me.ucrChkPeak) @@ -229,4 +262,8 @@ Partial Class dlgLinePlot Friend WithEvents ucrChkValley As ucrCheck Friend WithEvents ucrChkPeak As ucrCheck Friend WithEvents lblGroupLine As Label + Friend WithEvents ucrChkPathOrStep As ucrCheck + Friend WithEvents ucrPnlStepOrPath As UcrPanel + Friend WithEvents rdoStep As RadioButton + Friend WithEvents rdoPath As RadioButton End Class diff --git a/instat/dlgLinePlot.resx b/instat/dlgLinePlot.resx index e730566be60..f4be6d4856c 100644 --- a/instat/dlgLinePlot.resx +++ b/instat/dlgLinePlot.resx @@ -127,7 +127,7 @@ - 249, 189 + 249, 180 58, 13 @@ -148,7 +148,7 @@ $this - 16 + 20 True @@ -175,7 +175,7 @@ $this - 17 + 21 NoControl @@ -187,7 +187,7 @@ 148, 23 - 10 + 11 Plot Options @@ -202,7 +202,7 @@ $this - 10 + 14 NoControl @@ -214,7 +214,7 @@ 148, 23 - 9 + 10 Line Options @@ -229,7 +229,7 @@ $this - 9 + 13 True @@ -238,7 +238,7 @@ NoControl - 249, 233 + 249, 224 88, 13 @@ -259,7 +259,7 @@ $this - 14 + 18 True @@ -268,7 +268,7 @@ NoControl - 249, 274 + 249, 265 39, 13 @@ -289,13 +289,115 @@ $this + 4 + + + True + + + NoControl + + + 159, 368 + + + 47, 17 + + + 18 + + + Path + + + rdoPath + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + NoControl + + + 219, 368 + + + 47, 17 + + + 19 + + + Step + + + rdoStep + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 + + 150, 362 + + + 148, 29 + + + 17 + + + ucrPnlStepOrPath + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + + + 9, 366 + + + 148, 20 + + + 16 + + + ucrChkPathOrStep + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + 161, 340 - 194, 20 + 146, 20 15 @@ -310,13 +412,13 @@ $this - 1 + 5 9, 340 - 165, 20 + 149, 20 14 @@ -331,7 +433,7 @@ $this - 2 + 6 True @@ -340,16 +442,16 @@ 6, 13 - 417, 458 + 417, 475 - 249, 314 + 249, 305 - 194, 20 + 156, 20 - 13 + 9 ucrChkWithSE @@ -361,7 +463,7 @@ $this - 4 + 8 9, 314 @@ -370,7 +472,7 @@ 234, 24 - 12 + 13 ucrChkLineofBestFit @@ -382,7 +484,7 @@ $this - 5 + 9 9, 288 @@ -391,7 +493,7 @@ 227, 24 - 11 + 12 ucrChkPoints @@ -403,10 +505,10 @@ $this - 6 + 10 - 9, 366 + 9, 393 4, 5, 4, 5 @@ -415,7 +517,7 @@ 346, 24 - 16 + 20 ucrSave @@ -427,7 +529,7 @@ $this - 7 + 11 249, 30 @@ -448,7 +550,7 @@ $this - 8 + 12 10, 10 @@ -472,16 +574,16 @@ $this - 11 + 15 - 9, 396 + 9, 418 410, 53 - 17 + 21 ucrBase @@ -493,10 +595,10 @@ $this - 12 + 16 - 249, 248 + 249, 239 0, 0, 0, 0 @@ -517,10 +619,10 @@ $this - 13 + 17 - 249, 202 + 249, 193 0, 0, 0, 0 @@ -541,7 +643,7 @@ $this - 15 + 19 CenterScreen @@ -556,7 +658,7 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 249, 287 + 249, 278 0, 0, 0, 0 @@ -577,6 +679,6 @@ $this - 3 + 7 \ No newline at end of file From 30e38f0e5d1c58ade9e4a6f1c8f9f93130968917 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 20 Aug 2021 19:01:41 +0300 Subject: [PATCH 15/31] setting up path and step plots --- instat/dlgLinePlot.vb | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 2004db85a5a..9274d9aed03 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -157,6 +157,16 @@ Public Class dlgLinePlot ucrSave.SetCheckBoxText("Save Graph") ucrSave.SetDataFrameSelector(ucrLinePlotSelector.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_graph") + + ucrPnlStepOrPath.AddRadioButton(rdoStep) + ucrPnlStepOrPath.AddRadioButton(rdoPath) + ucrPnlStepOrPath.AddFunctionNamesCondition(rdoPath, "geom_path") + ucrPnlStepOrPath.AddFunctionNamesCondition(rdoStep, "geom_step") + ucrChkPathOrStep.AddToLinkedControls(ucrPnlStepOrPath, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkPathOrStep.SetText("Use path or step") + ucrChkPathOrStep.AddFunctionNamesCondition(True, {"geom_step", "geom_path"}) + ucrChkPathOrStep.AddFunctionNamesCondition(False, {"geom_step", "geom_path"}, False) End Sub Private Sub SetDefaults() @@ -171,6 +181,7 @@ Public Class dlgLinePlot ucrVariablesAsFactorForLinePlot.SetMeAsReceiver() bResetSubdialog = True bResetLineLayerSubdialog = True + rdoPath.Checked = True clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) @@ -227,6 +238,7 @@ Public Class dlgLinePlot 'set Rcode for checkboxes ucrChkPeak.SetRCode(clsBaseOperator, bReset) ucrChkValley.SetRCode(clsBaseOperator, bReset) + ucrChkPathOrStep.SetRCode(clsRgeomlineplotFunction, bReset) End Sub Private Sub TestOkEnabled() @@ -297,10 +309,6 @@ Public Class dlgLinePlot Private Sub UcrVariablesAsFactor_ControlValueChanged() Handles ucrVariablesAsFactorForLinePlot.ControlValueChanged TempOptionsDisabledInMultipleVariablesCase() - End Sub - - Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrVariablesAsFactorForLinePlot.ControlContentsChanged, ucrSave.ControlContentsChanged - TestOkEnabled() End Sub Private Sub ucrReceiverX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged, ucrFactorOptionalReceiver.ControlValueChanged @@ -320,4 +328,31 @@ Public Class dlgLinePlot clsRaesFunction.RemoveParameterByName("group") End If End Sub + + Private Sub ucrChkPathOrStep_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPathOrStep.ControlValueChanged, ucrPnlStepOrPath.ControlValueChanged + If ucrChkPathOrStep.Checked Then + If rdoStep.Checked Then + ucrSave.SetPrefix("stepplot") + clsRgeomlineplotFunction.SetRCommand("geom_step") + Else + ucrSave.SetPrefix("pathplot") + clsRgeomlineplotFunction.SetRCommand("geom_path") + End If + Else + ucrSave.SetPrefix("lineplot") + clsRgeomlineplotFunction.SetRCommand("geom_line") + End If + End Sub + + Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrVariablesAsFactorForLinePlot.ControlContentsChanged, ucrSave.ControlContentsChanged + TestOkEnabled() + End Sub + + Private Sub AllControl_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorForLinePlot.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverX.ControlContentsChanged + + End Sub + + Private Sub UcrVariablesAsFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorForLinePlot.ControlValueChanged + + End Sub End Class \ No newline at end of file From 7b2aa0133348fc832efd32a65e7edd6730586334 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Fri, 20 Aug 2021 19:02:11 +0300 Subject: [PATCH 16/31] removed redundant code --- instat/dlgLinePlot.vb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 9274d9aed03..24ca8109fee 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -347,12 +347,4 @@ Public Class dlgLinePlot Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrVariablesAsFactorForLinePlot.ControlContentsChanged, ucrSave.ControlContentsChanged TestOkEnabled() End Sub - - Private Sub AllControl_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorForLinePlot.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverX.ControlContentsChanged - - End Sub - - Private Sub UcrVariablesAsFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorForLinePlot.ControlValueChanged - - End Sub End Class \ No newline at end of file From e435dd91d4a8a7a76a59eda40fe2d4609fd93b48 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Sun, 22 Aug 2021 21:51:48 +0300 Subject: [PATCH 17/31] small changes to 1 way summaries --- instat/dlgOneWayFrequencies.Designer.vb | 12 ++++++------ instat/dlgOneWayFrequencies.resx | 5 +---- instat/dlgOneWayFrequencies.vb | 1 + 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/instat/dlgOneWayFrequencies.Designer.vb b/instat/dlgOneWayFrequencies.Designer.vb index 55c1b4c13ac..a625f0b4c35 100644 --- a/instat/dlgOneWayFrequencies.Designer.vb +++ b/instat/dlgOneWayFrequencies.Designer.vb @@ -43,6 +43,7 @@ Partial Class dlgOneWayFrequencies Me.rdoDescendingFrequencies = New System.Windows.Forms.RadioButton() Me.rdoAscendingFrequencies = New System.Windows.Forms.RadioButton() Me.rdoNone = New System.Windows.Forms.RadioButton() + Me.ucrPnlSort = New instat.UcrPanel() Me.cmdOptions = New System.Windows.Forms.Button() Me.lblSelectedVariable = New System.Windows.Forms.Label() Me.rdoGraph = New System.Windows.Forms.RadioButton() @@ -60,7 +61,6 @@ Partial Class dlgOneWayFrequencies Me.ucrReceiverWeights = New instat.ucrReceiverSingle() Me.ucrChkWeights = New instat.ucrCheck() Me.ucrChkFlip = New instat.ucrCheck() - Me.ucrPnlSort = New instat.UcrPanel() Me.ucrBase = New instat.ucrButtons() Me.ucrSelectorOneWayFreq = New instat.ucrSelectorByDataFrameAddRemove() Me.grpSort.SuspendLayout() @@ -98,6 +98,11 @@ Partial Class dlgOneWayFrequencies Me.rdoNone.TabStop = True Me.rdoNone.UseVisualStyleBackColor = True ' + 'ucrPnlSort + ' + resources.ApplyResources(Me.ucrPnlSort, "ucrPnlSort") + Me.ucrPnlSort.Name = "ucrPnlSort" + ' 'cmdOptions ' resources.ApplyResources(Me.cmdOptions, "cmdOptions") @@ -218,11 +223,6 @@ Partial Class dlgOneWayFrequencies resources.ApplyResources(Me.ucrChkFlip, "ucrChkFlip") Me.ucrChkFlip.Name = "ucrChkFlip" ' - 'ucrPnlSort - ' - resources.ApplyResources(Me.ucrPnlSort, "ucrPnlSort") - Me.ucrPnlSort.Name = "ucrPnlSort" - ' 'ucrBase ' resources.ApplyResources(Me.ucrBase, "ucrBase") diff --git a/instat/dlgOneWayFrequencies.resx b/instat/dlgOneWayFrequencies.resx index ceb3bb069d2..dab69e51a07 100644 --- a/instat/dlgOneWayFrequencies.resx +++ b/instat/dlgOneWayFrequencies.resx @@ -547,7 +547,7 @@ 6, 13 - 435, 447 + 435, 448 142, 277 @@ -723,9 +723,6 @@ 16 - - NoControl - CenterScreen diff --git a/instat/dlgOneWayFrequencies.vb b/instat/dlgOneWayFrequencies.vb index 5247c5487fd..4c797c3dd89 100644 --- a/instat/dlgOneWayFrequencies.vb +++ b/instat/dlgOneWayFrequencies.vb @@ -70,6 +70,7 @@ Public Class dlgOneWayFrequencies ucrChkWeights.SetParameter(ucrReceiverWeights.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkWeights.AddToLinkedControls(ucrReceiverWeights, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlFrequencies.AddRadioButton(rdoTable) ucrPnlFrequencies.AddRadioButton(rdoGraph) ucrPnlFrequencies.AddRadioButton(rdoBoth) From 8869c6068622fc7035ddbd5f3676655b2bc6c716 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Sun, 22 Aug 2021 22:02:52 +0300 Subject: [PATCH 18/31] Name change saved --- instat/dlgOneWayFrequencies.Designer.vb | 16 ++++++++-------- instat/dlgOneWayFrequencies.resx | 20 ++++++++++---------- instat/dlgOneWayFrequencies.vb | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/instat/dlgOneWayFrequencies.Designer.vb b/instat/dlgOneWayFrequencies.Designer.vb index a625f0b4c35..6b7492c75d3 100644 --- a/instat/dlgOneWayFrequencies.Designer.vb +++ b/instat/dlgOneWayFrequencies.Designer.vb @@ -41,7 +41,7 @@ Partial Class dlgOneWayFrequencies Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgOneWayFrequencies)) Me.grpSort = New System.Windows.Forms.GroupBox() Me.rdoDescendingFrequencies = New System.Windows.Forms.RadioButton() - Me.rdoAscendingFrequencies = New System.Windows.Forms.RadioButton() + Me.rdoAscending = New System.Windows.Forms.RadioButton() Me.rdoNone = New System.Windows.Forms.RadioButton() Me.ucrPnlSort = New instat.UcrPanel() Me.cmdOptions = New System.Windows.Forms.Button() @@ -70,7 +70,7 @@ Partial Class dlgOneWayFrequencies 'grpSort ' Me.grpSort.Controls.Add(Me.rdoDescendingFrequencies) - Me.grpSort.Controls.Add(Me.rdoAscendingFrequencies) + Me.grpSort.Controls.Add(Me.rdoAscending) Me.grpSort.Controls.Add(Me.rdoNone) Me.grpSort.Controls.Add(Me.ucrPnlSort) resources.ApplyResources(Me.grpSort, "grpSort") @@ -84,12 +84,12 @@ Partial Class dlgOneWayFrequencies Me.rdoDescendingFrequencies.TabStop = True Me.rdoDescendingFrequencies.UseVisualStyleBackColor = True ' - 'rdoAscendingFrequencies + 'rdoAscending ' - resources.ApplyResources(Me.rdoAscendingFrequencies, "rdoAscendingFrequencies") - Me.rdoAscendingFrequencies.Name = "rdoAscendingFrequencies" - Me.rdoAscendingFrequencies.TabStop = True - Me.rdoAscendingFrequencies.UseVisualStyleBackColor = True + resources.ApplyResources(Me.rdoAscending, "rdoAscending") + Me.rdoAscending.Name = "rdoAscending" + Me.rdoAscending.TabStop = True + Me.rdoAscending.UseVisualStyleBackColor = True ' 'rdoNone ' @@ -273,7 +273,7 @@ Partial Class dlgOneWayFrequencies Friend WithEvents ucrBase As ucrButtons Friend WithEvents grpSort As GroupBox Friend WithEvents rdoDescendingFrequencies As RadioButton - Friend WithEvents rdoAscendingFrequencies As RadioButton + Friend WithEvents rdoAscending As RadioButton Friend WithEvents rdoNone As RadioButton Friend WithEvents ucrPnlSort As UcrPanel Friend WithEvents cmdOptions As Button diff --git a/instat/dlgOneWayFrequencies.resx b/instat/dlgOneWayFrequencies.resx index dab69e51a07..df17ef5eb7d 100644 --- a/instat/dlgOneWayFrequencies.resx +++ b/instat/dlgOneWayFrequencies.resx @@ -147,31 +147,31 @@ 0 - + NoControl - + 6, 43 - + 155, 17 - + 2 - + Ascending Frequencies - - rdoAscendingFrequencies + + rdoAscending - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + grpSort - + 1 diff --git a/instat/dlgOneWayFrequencies.vb b/instat/dlgOneWayFrequencies.vb index 4c797c3dd89..105605d9e0f 100644 --- a/instat/dlgOneWayFrequencies.vb +++ b/instat/dlgOneWayFrequencies.vb @@ -62,7 +62,7 @@ Public Class dlgOneWayFrequencies ucrPnlSort.SetParameter(New RParameter("sort.frq", 2)) ucrPnlSort.AddRadioButton(rdoNone, Chr(34) & "none" & Chr(34)) - ucrPnlSort.AddRadioButton(rdoAscendingFrequencies, Chr(34) & "asc" & Chr(34)) + ucrPnlSort.AddRadioButton(rdoAscending, Chr(34) & "asc" & Chr(34)) ucrPnlSort.AddRadioButton(rdoDescendingFrequencies, Chr(34) & "desc" & Chr(34)) ucrPnlSort.SetRDefault(Chr(34) & "none" & Chr(34)) From 810b220ee85dc9fdd1740a493aa7c024fea7977c Mon Sep 17 00:00:00 2001 From: patowhiz Date: Sun, 22 Aug 2021 22:05:16 +0300 Subject: [PATCH 19/31] changed descending --- instat/dlgOneWayFrequencies.Designer.vb | 16 ++++++++-------- instat/dlgOneWayFrequencies.resx | 20 ++++++++++---------- instat/dlgOneWayFrequencies.vb | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/instat/dlgOneWayFrequencies.Designer.vb b/instat/dlgOneWayFrequencies.Designer.vb index 6b7492c75d3..142387e44b7 100644 --- a/instat/dlgOneWayFrequencies.Designer.vb +++ b/instat/dlgOneWayFrequencies.Designer.vb @@ -40,7 +40,7 @@ Partial Class dlgOneWayFrequencies Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgOneWayFrequencies)) Me.grpSort = New System.Windows.Forms.GroupBox() - Me.rdoDescendingFrequencies = New System.Windows.Forms.RadioButton() + Me.rdoDescending = New System.Windows.Forms.RadioButton() Me.rdoAscending = New System.Windows.Forms.RadioButton() Me.rdoNone = New System.Windows.Forms.RadioButton() Me.ucrPnlSort = New instat.UcrPanel() @@ -69,7 +69,7 @@ Partial Class dlgOneWayFrequencies ' 'grpSort ' - Me.grpSort.Controls.Add(Me.rdoDescendingFrequencies) + Me.grpSort.Controls.Add(Me.rdoDescending) Me.grpSort.Controls.Add(Me.rdoAscending) Me.grpSort.Controls.Add(Me.rdoNone) Me.grpSort.Controls.Add(Me.ucrPnlSort) @@ -77,12 +77,12 @@ Partial Class dlgOneWayFrequencies Me.grpSort.Name = "grpSort" Me.grpSort.TabStop = False ' - 'rdoDescendingFrequencies + 'rdoDescending ' - resources.ApplyResources(Me.rdoDescendingFrequencies, "rdoDescendingFrequencies") - Me.rdoDescendingFrequencies.Name = "rdoDescendingFrequencies" - Me.rdoDescendingFrequencies.TabStop = True - Me.rdoDescendingFrequencies.UseVisualStyleBackColor = True + resources.ApplyResources(Me.rdoDescending, "rdoDescending") + Me.rdoDescending.Name = "rdoDescending" + Me.rdoDescending.TabStop = True + Me.rdoDescending.UseVisualStyleBackColor = True ' 'rdoAscending ' @@ -272,7 +272,7 @@ Partial Class dlgOneWayFrequencies Friend WithEvents ucrSelectorOneWayFreq As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrBase As ucrButtons Friend WithEvents grpSort As GroupBox - Friend WithEvents rdoDescendingFrequencies As RadioButton + Friend WithEvents rdoDescending As RadioButton Friend WithEvents rdoAscending As RadioButton Friend WithEvents rdoNone As RadioButton Friend WithEvents ucrPnlSort As UcrPanel diff --git a/instat/dlgOneWayFrequencies.resx b/instat/dlgOneWayFrequencies.resx index df17ef5eb7d..094ac19954b 100644 --- a/instat/dlgOneWayFrequencies.resx +++ b/instat/dlgOneWayFrequencies.resx @@ -118,33 +118,33 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + NoControl - + 6, 65 - + 155, 17 - + 3 - + Descending Frequencies - - rdoDescendingFrequencies + + rdoDescending - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + grpSort - + 0 diff --git a/instat/dlgOneWayFrequencies.vb b/instat/dlgOneWayFrequencies.vb index 105605d9e0f..aaaf3704005 100644 --- a/instat/dlgOneWayFrequencies.vb +++ b/instat/dlgOneWayFrequencies.vb @@ -63,7 +63,7 @@ Public Class dlgOneWayFrequencies ucrPnlSort.SetParameter(New RParameter("sort.frq", 2)) ucrPnlSort.AddRadioButton(rdoNone, Chr(34) & "none" & Chr(34)) ucrPnlSort.AddRadioButton(rdoAscending, Chr(34) & "asc" & Chr(34)) - ucrPnlSort.AddRadioButton(rdoDescendingFrequencies, Chr(34) & "desc" & Chr(34)) + ucrPnlSort.AddRadioButton(rdoDescending, Chr(34) & "desc" & Chr(34)) ucrPnlSort.SetRDefault(Chr(34) & "none" & Chr(34)) ucrChkWeights.SetText("Weights") From ddd28fcbb415ee57409a09ceb78150e0d0b4c683 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 23 Aug 2021 11:39:57 +0300 Subject: [PATCH 20/31] more position defaults added --- instat/dlgBarAndPieChart.vb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 4c8a2e7fd92..bf548541e1a 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -574,8 +574,16 @@ Public Class dlgBarAndPieChart clsLabelAesFunction.AddParameter("label", "..count..", iPosition:=0) If ucrInputBarChartPositions.GetText = "Dodge" Then clsGeomTextFunction.AddParameter("position", "position_dodge(width=0.9)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Fill" Then + clsGeomTextFunction.AddParameter("position", "position_fill(vjust=0.9)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Stack" Then + clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.9)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Jitter" Then + clsGeomTextFunction.AddParameter("position", "position_jitter(width=0.9)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Stack in reverse" Then + clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.5)", iPosition:=2) Else - 'TODO: Add defaults for other position options + clsGeomTextFunction.AddParameter("position", "position_identity()", iPosition:=2) End If Else clsGeomTextFunction.RemoveParameterByName("stat") From 711d48f37378969d9c7f3eefe591151d51ec1d72 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 23 Aug 2021 11:48:49 +0300 Subject: [PATCH 21/31] minor adjustment --- instat/dlgBarAndPieChart.vb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index bf548541e1a..8ba8a6d04ae 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -569,22 +569,22 @@ Public Class dlgBarAndPieChart End Sub Private Sub SetGeomTextOptions() + If ucrInputBarChartPositions.GetText = "Dodge" Then + clsGeomTextFunction.AddParameter("position", "position_dodge(width=0.9)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Fill" Then + clsGeomTextFunction.AddParameter("position", "position_fill(vjust=0.9)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Stack" Then + clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.9)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Jitter" Then + clsGeomTextFunction.AddParameter("position", "position_jitter(width=0.9)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Stack in reverse" Then + clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.5)", iPosition:=2) + Else + clsGeomTextFunction.AddParameter("position", "position_identity()", iPosition:=2) + End If If rdoFrequency.Checked Then clsGeomTextFunction.AddParameter("stat", Chr(34) & "count" & Chr(34), iPosition:=0) clsLabelAesFunction.AddParameter("label", "..count..", iPosition:=0) - If ucrInputBarChartPositions.GetText = "Dodge" Then - clsGeomTextFunction.AddParameter("position", "position_dodge(width=0.9)", iPosition:=2) - ElseIf ucrInputBarChartPositions.GetText = "Fill" Then - clsGeomTextFunction.AddParameter("position", "position_fill(vjust=0.9)", iPosition:=2) - ElseIf ucrInputBarChartPositions.GetText = "Stack" Then - clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.9)", iPosition:=2) - ElseIf ucrInputBarChartPositions.GetText = "Jitter" Then - clsGeomTextFunction.AddParameter("position", "position_jitter(width=0.9)", iPosition:=2) - ElseIf ucrInputBarChartPositions.GetText = "Stack in reverse" Then - clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.5)", iPosition:=2) - Else - clsGeomTextFunction.AddParameter("position", "position_identity()", iPosition:=2) - End If Else clsGeomTextFunction.RemoveParameterByName("stat") clsLabelAesFunction.AddParameter("label", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=0) From b8c5cf0576dd2403eda7fa190b695e2534ed7498 Mon Sep 17 00:00:00 2001 From: Antoine Ntalumeso Date: Mon, 23 Aug 2021 14:27:16 +0200 Subject: [PATCH 22/31] Small design fixed --- instat/dlgBarAndPieChart.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/instat/dlgBarAndPieChart.resx b/instat/dlgBarAndPieChart.resx index ac76ee63ded..949f3891367 100644 --- a/instat/dlgBarAndPieChart.resx +++ b/instat/dlgBarAndPieChart.resx @@ -154,10 +154,10 @@ NoControl - 10, 262 + 11, 262 - 121, 25 + 166, 25 13 @@ -244,10 +244,10 @@ NoControl - 10, 231 + 11, 231 - 121, 25 + 166, 25 10 @@ -301,10 +301,10 @@ NoControl - 10, 231 + 11, 231 - 121, 25 + 165, 25 12 From 077f4e93b4f51efefb2c9c9b1a245fdba92e9178 Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 23 Aug 2021 18:21:23 +0300 Subject: [PATCH 23/31] reverse labels --- instat/dlgBarAndPieChart.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 8ba8a6d04ae..0fe8a90d4f6 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -578,7 +578,7 @@ Public Class dlgBarAndPieChart ElseIf ucrInputBarChartPositions.GetText = "Jitter" Then clsGeomTextFunction.AddParameter("position", "position_jitter(width=0.9)", iPosition:=2) ElseIf ucrInputBarChartPositions.GetText = "Stack in reverse" Then - clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.5)", iPosition:=2) + clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.5, reverse = TRUE)", iPosition:=2) Else clsGeomTextFunction.AddParameter("position", "position_identity()", iPosition:=2) End If From 40b51efafcfd3b9b73d04bd0ce22cb6e5dc26409 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 23 Aug 2021 18:55:19 +0300 Subject: [PATCH 24/31] minor change to save control --- instat/ucrSave.Designer.vb | 92 +++++++++++++++++++------------------- instat/ucrSave.resx | 6 +-- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/instat/ucrSave.Designer.vb b/instat/ucrSave.Designer.vb index ce4e8c32da4..88989298b55 100644 --- a/instat/ucrSave.Designer.vb +++ b/instat/ucrSave.Designer.vb @@ -1,43 +1,43 @@ -' R- Instat -' Copyright (C) 2015-2017 -' -' This program is free software: you can redistribute it and/or modify -' it under the terms of the GNU General Public License as published by -' the Free Software Foundation, either version 3 of the License, or -' (at your option) any later version. -' -' This program is distributed in the hope that it will be useful, -' but WITHOUT ANY WARRANTY; without even the implied warranty of -' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -' GNU General Public License for more details. -' -' You should have received a copy of the GNU General Public License -' along with this program. If not, see . - - -Partial Class ucrSave - Inherits instat.ucrCore - - 'UserControl overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - - Private Sub InitializeComponent() +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . + + +Partial Class ucrSave + Inherits instat.ucrCore + + 'UserControl overrides dispose to clean up the component list. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(ucrSave)) Me.ucrChkSave = New instat.ucrCheck() Me.lblSaveText = New System.Windows.Forms.Label() @@ -92,11 +92,11 @@ Partial Class ucrSave Me.ResumeLayout(False) Me.PerformLayout() - End Sub - - Friend WithEvents ucrChkSave As ucrCheck - Friend WithEvents lblSaveText As Label - Friend WithEvents ucrInputComboSave As ucrInputComboBox + End Sub + + Friend WithEvents ucrChkSave As ucrCheck + Friend WithEvents lblSaveText As Label + Friend WithEvents ucrInputComboSave As ucrInputComboBox Friend WithEvents ucrInputTextSave As ucrInputTextBox Friend WithEvents btnColumnPosition As Button -End Class +End Class diff --git a/instat/ucrSave.resx b/instat/ucrSave.resx index 9aa7266dde3..9a52af84abf 100644 --- a/instat/ucrSave.resx +++ b/instat/ucrSave.resx @@ -181,7 +181,7 @@ 9, 12, 9, 12 - 139, 34 + 139, 35 4 @@ -235,7 +235,7 @@ 349, 0 - 54, 34 + 54, 35 5 @@ -265,7 +265,7 @@ 4, 5, 4, 5 - 403, 34 + 403, 35 ucrSave From f7fe88498913868e8e50177034cdb0b63d9111c3 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 23 Aug 2021 18:57:24 +0300 Subject: [PATCH 25/31] spcaes added --- instat/ucrSave.Designer.vb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/instat/ucrSave.Designer.vb b/instat/ucrSave.Designer.vb index 88989298b55..5fc76dca874 100644 --- a/instat/ucrSave.Designer.vb +++ b/instat/ucrSave.Designer.vb @@ -83,11 +83,17 @@ Partial Class ucrSave ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrInputComboSave) + Me.Controls.Add(Me.ucrInputTextSave) + Me.Controls.Add(Me.lblSaveText) + Me.Controls.Add(Me.ucrChkSave) + Me.Controls.Add(Me.btnColumnPosition) + Me.Name = "ucrSave" Me.ResumeLayout(False) Me.PerformLayout() From e248e8fa00ccf0636f1d13747bb5cffee1ec2787 Mon Sep 17 00:00:00 2001 From: rachelkg <85707390+rachelkg@users.noreply.github.com> Date: Mon, 23 Aug 2021 09:10:51 -0700 Subject: [PATCH 26/31] French layout changes --- instat/dlgBoxPlot.designer.vb | 16 ++-- instat/dlgBoxPlot.resx | 38 +++++----- instat/dlgBoxPlot.vb | 10 ++- instat/dlgClimaticSummary.Designer.vb | 16 ++-- instat/dlgClimaticSummary.resx | 20 ++--- instat/dlgColumnStats.Designer.vb | 16 ++-- instat/dlgColumnStats.resx | 20 ++--- instat/dlgOneVariableGraph.resx | 104 +++++++++++++++++++------- instat/dlgOneWayFrequencies.resx | 4 +- 9 files changed, 148 insertions(+), 96 deletions(-) diff --git a/instat/dlgBoxPlot.designer.vb b/instat/dlgBoxPlot.designer.vb index 174db6efe1c..3a9e8306a74 100644 --- a/instat/dlgBoxPlot.designer.vb +++ b/instat/dlgBoxPlot.designer.vb @@ -42,7 +42,7 @@ Partial Class dlgBoxplot Me.cmdOptions = New System.Windows.Forms.Button() Me.lblByFactors = New System.Windows.Forms.Label() Me.lblBySecondFactor = New System.Windows.Forms.Label() - Me.cmdBoxOptions = New System.Windows.Forms.Button() + Me.cmdBoxPlotOptions = New System.Windows.Forms.Button() Me.rdoBoxplotTufte = New System.Windows.Forms.RadioButton() Me.rdoJitter = New System.Windows.Forms.RadioButton() Me.rdoViolin = New System.Windows.Forms.RadioButton() @@ -85,12 +85,12 @@ Partial Class dlgBoxplot Me.lblBySecondFactor.Name = "lblBySecondFactor" Me.lblBySecondFactor.Tag = "By_Second_Factor:" ' - 'cmdBoxOptions + 'cmdBoxPlotOptions ' - resources.ApplyResources(Me.cmdBoxOptions, "cmdBoxOptions") - Me.cmdBoxOptions.Name = "cmdBoxOptions" - Me.cmdBoxOptions.Tag = "Box_Options" - Me.cmdBoxOptions.UseVisualStyleBackColor = True + resources.ApplyResources(Me.cmdBoxPlotOptions, "cmdBoxPlotOptions") + Me.cmdBoxPlotOptions.Name = "cmdBoxPlotOptions" + Me.cmdBoxPlotOptions.Tag = "Boxplot_Options" + Me.cmdBoxPlotOptions.UseVisualStyleBackColor = True ' 'rdoBoxplotTufte ' @@ -269,7 +269,6 @@ Partial Class dlgBoxplot Me.Controls.Add(Me.rdoJitter) Me.Controls.Add(Me.rdoBoxplotTufte) Me.Controls.Add(Me.ucrVariablesAsFactorForBoxplot) - Me.Controls.Add(Me.cmdBoxOptions) Me.Controls.Add(Me.ucrSecondFactorReceiver) Me.Controls.Add(Me.ucrSelectorBoxPlot) Me.Controls.Add(Me.lblBySecondFactor) @@ -278,6 +277,7 @@ Partial Class dlgBoxplot Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrPnlPlots) + Me.Controls.Add(Me.cmdBoxPlotOptions) Me.Cursor = System.Windows.Forms.Cursors.Default Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False @@ -296,7 +296,7 @@ Partial Class dlgBoxplot Friend WithEvents ucrSelectorBoxPlot As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrSecondFactorReceiver As ucrReceiverSingle Friend WithEvents lblBySecondFactor As Label - Friend WithEvents cmdBoxOptions As Button + Friend WithEvents cmdBoxPlotOptions As Button Friend WithEvents ucrVariablesAsFactorForBoxplot As ucrVariablesAsFactor Friend WithEvents rdoBoxplotTufte As RadioButton Friend WithEvents rdoJitter As RadioButton diff --git a/instat/dlgBoxPlot.resx b/instat/dlgBoxPlot.resx index 3e7d1ad1992..de1c9b1f253 100644 --- a/instat/dlgBoxPlot.resx +++ b/instat/dlgBoxPlot.resx @@ -145,7 +145,7 @@ $this - 22 + 21 True @@ -175,7 +175,7 @@ $this - 20 + 19 True @@ -205,34 +205,34 @@ $this - 19 + 18 - + NoControl - + 10, 237 - + 149, 25 - + 10 - + Box Options - - cmdBoxOptions + + cmdBoxPlotOptions - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 16 + + 24 Button @@ -649,7 +649,7 @@ $this - 17 + 16 10, 50 @@ -673,7 +673,7 @@ $this - 18 + 17 275, 220 @@ -697,7 +697,7 @@ $this - 21 + 20 10, 430 @@ -718,7 +718,7 @@ $this - 23 + 22 7, 12 @@ -739,7 +739,7 @@ $this - 24 + 23 CenterScreen diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index 05096489c33..13fec525466 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -158,7 +158,7 @@ Public Class dlgBoxplot ucrNudTransparency.SetLinkedDisplayControl(lblTransparency) ucrNudTransparency.SetRDefault(1) - ucrChkTufte.SetText("Tufte Box plots") + ucrChkTufte.SetText("Tufte Boxplots") ucrChkTufte.AddFunctionNamesCondition(False, "geom_tufteboxplot", False) ucrChkTufte.AddFunctionNamesCondition(True, "geom_tufteboxplot") @@ -373,13 +373,13 @@ Public Class dlgBoxplot clsStatSummary.AddParameter("size", 1.5, iPosition:=3) If rdoBoxplotTufte.Checked Then If ucrChkTufte.Checked Then - cmdBoxPlotOptions.Text = "Tufte Boxplot Options" + cmdBoxPlotOptions.Text = "Tufte Box Options" ucrSaveBoxplot.SetPrefix("tufte_boxplot") clsCurrGeomFunc = clsTufteBoxplotFunc clsStatSummary.AddParameter("size", 0.7, iPosition:=3) ucrSecondFactorReceiver.ChangeParameterName("colour") Else - cmdBoxPlotOptions.Text = "Boxplot Options" + cmdBoxPlotOptions.Text = "Box Options" ucrSaveBoxplot.SetPrefix("boxplot") ucrSecondFactorReceiver.ChangeParameterName("fill") clsCurrGeomFunc = clsBoxplotFunc @@ -433,6 +433,10 @@ Public Class dlgBoxplot End If End Sub + Private Sub ucrVariablesAsFactorForBoxplot_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorForBoxplot.ControlContentsChanged + + End Sub + 'this code is commented out but will work once we get the feature of linking controls with the contents of a receiver 'Private Sub SwapFactors() ' If ucrChkSwapParameters.Checked Then diff --git a/instat/dlgClimaticSummary.Designer.vb b/instat/dlgClimaticSummary.Designer.vb index dea63f0418c..23211deea52 100644 --- a/instat/dlgClimaticSummary.Designer.vb +++ b/instat/dlgClimaticSummary.Designer.vb @@ -49,7 +49,7 @@ Partial Class dlgClimaticSummary Me.cmdSummary = New System.Windows.Forms.Button() Me.lblWithinYear = New System.Windows.Forms.Label() Me.grpOptions = New System.Windows.Forms.GroupBox() - Me.cmdOptions = New System.Windows.Forms.Button() + Me.cmdMissingOptions = New System.Windows.Forms.Button() Me.ucrChkOmitMissing = New instat.ucrCheck() Me.ucrChkAddDateColumn = New instat.ucrCheck() Me.ucrChkStoreResults = New instat.ucrCheck() @@ -136,7 +136,7 @@ Partial Class dlgClimaticSummary ' 'grpOptions ' - Me.grpOptions.Controls.Add(Me.cmdOptions) + Me.grpOptions.Controls.Add(Me.cmdMissingOptions) Me.grpOptions.Controls.Add(Me.ucrChkOmitMissing) Me.grpOptions.Controls.Add(Me.ucrChkAddDateColumn) Me.grpOptions.Controls.Add(Me.ucrChkStoreResults) @@ -146,12 +146,12 @@ Partial Class dlgClimaticSummary Me.grpOptions.Name = "grpOptions" Me.grpOptions.TabStop = False ' - 'cmdOptions + 'cmdMissingOptions ' - resources.ApplyResources(Me.cmdOptions, "cmdOptions") - Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Tag = "Options" - Me.cmdOptions.UseVisualStyleBackColor = True + resources.ApplyResources(Me.cmdMissingOptions, "cmdMissingOptions") + Me.cmdMissingOptions.Name = "cmdMissingOptions" + Me.cmdMissingOptions.Tag = "MissingOptions" + Me.cmdMissingOptions.UseVisualStyleBackColor = True ' 'ucrChkOmitMissing ' @@ -359,7 +359,7 @@ Partial Class dlgClimaticSummary Friend WithEvents ucrReceiverYear As ucrReceiverSingle Friend WithEvents ucrChkAddDateColumn As ucrCheck Friend WithEvents ucrChkOmitMissing As ucrCheck - Friend WithEvents cmdOptions As Button + Friend WithEvents cmdMissingOptions As Button Friend WithEvents ucrReceiverElements As ucrReceiverMultiple Friend WithEvents rdoStation As RadioButton Friend WithEvents rdoDaily As RadioButton diff --git a/instat/dlgClimaticSummary.resx b/instat/dlgClimaticSummary.resx index 30378a3a8e7..e74ad972186 100644 --- a/instat/dlgClimaticSummary.resx +++ b/instat/dlgClimaticSummary.resx @@ -405,31 +405,31 @@ 8 - + NoControl - + 217, 83 - + 60, 26 - + 19 - + Options - - cmdOptions + + cmdMissingOptions - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + grpOptions - + 0 diff --git a/instat/dlgColumnStats.Designer.vb b/instat/dlgColumnStats.Designer.vb index 5b33907d95f..6af6f67df3d 100644 --- a/instat/dlgColumnStats.Designer.vb +++ b/instat/dlgColumnStats.Designer.vb @@ -42,7 +42,7 @@ Partial Class dlgColumnStats Me.lblSelectedVariables = New System.Windows.Forms.Label() Me.lblSummariseBy = New System.Windows.Forms.Label() Me.grpOptions = New System.Windows.Forms.GroupBox() - Me.cmdOptions = New System.Windows.Forms.Button() + Me.cmdMissingOptions = New System.Windows.Forms.Button() Me.ucrChkOriginalLevel = New instat.ucrCheck() Me.ucrChkStoreResults = New instat.ucrCheck() Me.ucrChkOmitMissing = New instat.ucrCheck() @@ -71,7 +71,7 @@ Partial Class dlgColumnStats ' 'grpOptions ' - Me.grpOptions.Controls.Add(Me.cmdOptions) + Me.grpOptions.Controls.Add(Me.cmdMissingOptions) Me.grpOptions.Controls.Add(Me.ucrChkOriginalLevel) Me.grpOptions.Controls.Add(Me.ucrChkStoreResults) Me.grpOptions.Controls.Add(Me.ucrChkOmitMissing) @@ -81,12 +81,12 @@ Partial Class dlgColumnStats Me.grpOptions.Name = "grpOptions" Me.grpOptions.TabStop = False ' - 'cmdOptions + 'cmdMissingOptions ' - resources.ApplyResources(Me.cmdOptions, "cmdOptions") - Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Tag = "Options" - Me.cmdOptions.UseVisualStyleBackColor = True + resources.ApplyResources(Me.cmdMissingOptions, "cmdMissingOptions") + Me.cmdMissingOptions.Name = "cmdMissingOptions" + Me.cmdMissingOptions.Tag = "MissingOptions" + Me.cmdMissingOptions.UseVisualStyleBackColor = True ' 'ucrChkOriginalLevel ' @@ -220,5 +220,5 @@ Partial Class dlgColumnStats Friend WithEvents ucrChkOriginalLevel As ucrCheck Friend WithEvents ucrChkWeights As ucrCheck Friend WithEvents ucrReceiverWeights As ucrReceiverSingle - Friend WithEvents cmdOptions As Button + Friend WithEvents cmdMissingOptions As Button End Class diff --git a/instat/dlgColumnStats.resx b/instat/dlgColumnStats.resx index 438224c6089..85e80373fbe 100644 --- a/instat/dlgColumnStats.resx +++ b/instat/dlgColumnStats.resx @@ -180,31 +180,31 @@ 7 - + NoControl - + 190, 114 - + 62, 26 - + 20 - + Options - - cmdOptions + + cmdMissingOptions - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + grpOptions - + 0 diff --git a/instat/dlgOneVariableGraph.resx b/instat/dlgOneVariableGraph.resx index eb177840580..36b5dfd42f4 100644 --- a/instat/dlgOneVariableGraph.resx +++ b/instat/dlgOneVariableGraph.resx @@ -170,6 +170,78 @@ 2 + + rdoSingleGraphs + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutput + + + 0 + + + rdoCombine + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutput + + + 1 + + + rdoFacets + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpOutput + + + 2 + + + ucrPnlOutput + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpOutput + + + 3 + + + 248, 172 + + + 142, 91 + + + 4 + + + Output + + + grpOutput + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + False @@ -266,30 +338,6 @@ 3 - - 248, 172 - - - 142, 91 - - - 4 - - - Output - - - grpOutput - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - 10, 238 @@ -312,10 +360,10 @@ 1 - 9, 292 + 4, 292 - 395, 52 + 401, 52 7 @@ -367,13 +415,13 @@ 6 - 10, 266 + 10, 265 4, 5, 4, 5 - 319, 24 + 361, 24 6 diff --git a/instat/dlgOneWayFrequencies.resx b/instat/dlgOneWayFrequencies.resx index fc0143a6904..a36d58697ba 100644 --- a/instat/dlgOneWayFrequencies.resx +++ b/instat/dlgOneWayFrequencies.resx @@ -133,7 +133,7 @@ 3 - Descending Frequencies + Descending rdoDescending @@ -160,7 +160,7 @@ 2 - Ascending Frequencies + Ascending rdoAscending From 02082ef622d15c4afb249f28fb6a2abbde833333 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 23 Aug 2021 19:34:10 +0300 Subject: [PATCH 27/31] Changed ucrChkSpecifyDecimalsToDisplay of dlgConvertColumns --- instat/dlgConvertColumns.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgConvertColumns.vb b/instat/dlgConvertColumns.vb index 76f9f3ed4c4..4022401039a 100644 --- a/instat/dlgConvertColumns.vb +++ b/instat/dlgConvertColumns.vb @@ -81,7 +81,7 @@ Public Class dlgConvertColumns ucrPnlFactorToNumericOptions.SetLinkedDisplayControl(grpFactorToNumericOptions) ucrChkSpecifyDecimalsToDisplay.SetParameter(New RParameter("set_digits", 4)) - ucrChkSpecifyDecimalsToDisplay.SetText("Specify Decimals (from Numeric)") + ucrChkSpecifyDecimalsToDisplay.SetText("Specify Decimals (if Numeric)") ucrChkSpecifyDecimalsToDisplay.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkSpecifyDecimalsToDisplay.SetRDefault("FALSE") ucrChkSpecifyDecimalsToDisplay.AddToLinkedControls(ucrLinked:=ucrNudDisplayDecimals, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) From da63b5f907e156a5e5dd85a38c2bc38f35d3648c Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Mon, 23 Aug 2021 19:35:31 +0300 Subject: [PATCH 28/31] changed the geom_text position values --- instat/dlgBarAndPieChart.vb | 10 +++++----- instat/ucrGeom.vb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 0fe8a90d4f6..e328280893e 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -570,15 +570,15 @@ Public Class dlgBarAndPieChart Private Sub SetGeomTextOptions() If ucrInputBarChartPositions.GetText = "Dodge" Then - clsGeomTextFunction.AddParameter("position", "position_dodge(width=0.9)", iPosition:=2) + clsGeomTextFunction.AddParameter("position", "position_dodge(width = 0.9)", iPosition:=2) ElseIf ucrInputBarChartPositions.GetText = "Fill" Then - clsGeomTextFunction.AddParameter("position", "position_fill(vjust=0.9)", iPosition:=2) + clsGeomTextFunction.AddParameter("position", "position_fill(vjust = 0.9)", iPosition:=2) ElseIf ucrInputBarChartPositions.GetText = "Stack" Then - clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.9)", iPosition:=2) + clsGeomTextFunction.AddParameter("position", "position_stack(vjust = 0.9)", iPosition:=2) ElseIf ucrInputBarChartPositions.GetText = "Jitter" Then - clsGeomTextFunction.AddParameter("position", "position_jitter(width=0.9)", iPosition:=2) + clsGeomTextFunction.AddParameter("position", "position_jitter(width = 0.9)", iPosition:=2) ElseIf ucrInputBarChartPositions.GetText = "Stack in reverse" Then - clsGeomTextFunction.AddParameter("position", "position_stack(vjust=0.5, reverse = TRUE)", iPosition:=2) + clsGeomTextFunction.AddParameter("position", "position_stack(vjust = 0.5, reverse = TRUE)", iPosition:=2) Else clsGeomTextFunction.AddParameter("position", "position_identity()", iPosition:=2) End If diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 9c7b448bd91..1fd3e49db82 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1860,7 +1860,7 @@ Public Class ucrGeom clsgeom_text.AddLayerParameter("parse", "boolean", "FALSE") 'If TRUE, the labels will be parsed into expressions and displayed as described in ?plotmath 'Global Layer parameters clsgeom_text.AddLayerParameter("show.legend", "list", "TRUE", lstParameterStrings:={"NA", "TRUE", "FALSE"}) - clsgeom_text.AddLayerParameter("position", "editablelist", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34), Chr(34) & "stack" & Chr(34), "position_dodge(width = 0.9)", Chr(34) & "dodge2" & Chr(34), Chr(34) & "jitter" & Chr(34), Chr(34) & "fill" & Chr(34)}) 'Warning/Task: really need to specify values for width in position_dodge, as "dodge" doesn't have default values for this geom (sends a warning). This is necessary if you want to get the labels on top of dodged bars for instance... For the moment added position_jitterdodge() that works fine. + clsgeom_text.AddLayerParameter("position", "editablelist", "position_identity()", lstParameterStrings:={"position_identity()", "position_stack(vjust = 0.9)", "position_stack(vjust = 0.5, reverse = TRUE)", "position_dodge(width = 0.9)", "position_jitter(width = 0.9)", "position_fill(vjust = 0.9)"}) 'Warning/Task: really need to specify values for width in position_dodge, as "dodge" doesn't have default values for this geom (sends a warning). This is necessary if you want to get the labels on top of dodged bars for instance... For the moment added position_jitterdodge() that works fine. 'Warning: cannot use both position and nudge_x;nudge_y !!! Doesn't crash the software... clsgeom_text.AddLayerParameter("stat", "list", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34), Chr(34) & "bin" & Chr(34), Chr(34) & "count" & Chr(34), Chr(34) & "density" & Chr(34), Chr(34) & "sum" & Chr(34), Chr(34) & "unique" & Chr(34)}) 'Warning: stat count cannot be used with y aesthetic !!! 'Warning: summary and ecdf is source of errors. 'Aesthetics as layer parameters. From 68b9f17b609dbc68c96e407920ab11579b92c726 Mon Sep 17 00:00:00 2001 From: rachelkg <85707390+rachelkg@users.noreply.github.com> Date: Mon, 23 Aug 2021 10:45:22 -0700 Subject: [PATCH 29/31] Fixed calculator save --- instat/ucrCalculator.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index 1253a88bbad..6b66b8eaaf5 100644 --- a/instat/ucrCalculator.resx +++ b/instat/ucrCalculator.resx @@ -10657,7 +10657,7 @@ 4, 5, 4, 5 - 300, 22 + 327, 22 196 From 272d063cd35ecdf35bed95b1385cebde54a9d0f2 Mon Sep 17 00:00:00 2001 From: lloyddewit Date: Thu, 26 Aug 2021 17:17:09 +0200 Subject: [PATCH 30/31] Removed empty handler functions that were inserted automatically by Visual Studio Designer. --- instat/dlgBoxPlot.vb | 4 ---- instat/dlgConvertColumns.vb | 3 --- instat/dlgCountinFactor.vb | 4 ---- instat/dlgDuplicateColumns.vb | 4 ---- instat/dlgTransformText.vb | 4 ---- 5 files changed, 19 deletions(-) diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index 13fec525466..fc556ae7144 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -433,10 +433,6 @@ Public Class dlgBoxplot End If End Sub - Private Sub ucrVariablesAsFactorForBoxplot_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorForBoxplot.ControlContentsChanged - - End Sub - 'this code is commented out but will work once we get the feature of linking controls with the contents of a receiver 'Private Sub SwapFactors() ' If ucrChkSwapParameters.Checked Then diff --git a/instat/dlgConvertColumns.vb b/instat/dlgConvertColumns.vb index ba3cab82a16..949c9d9bf9b 100644 --- a/instat/dlgConvertColumns.vb +++ b/instat/dlgConvertColumns.vb @@ -178,7 +178,4 @@ Public Class dlgConvertColumns End If End Sub - Private Sub ucrChkSpecifyDecimalsToDisplay_Load(sender As Object, e As EventArgs) Handles ucrChkSpecifyDecimalsToDisplay.Load - - End Sub End Class \ No newline at end of file diff --git a/instat/dlgCountinFactor.vb b/instat/dlgCountinFactor.vb index fe040997b6e..e6fa41b4a75 100644 --- a/instat/dlgCountinFactor.vb +++ b/instat/dlgCountinFactor.vb @@ -89,8 +89,4 @@ Public Class dlgCountinFactor Private Sub ucrCountReceiver_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrCountReceiver.ControlContentsChanged, ucrNewColName.ControlContentsChanged TestOkEnabled() End Sub - - Private Sub ucrNewColName_Load(sender As Object, e As EventArgs) Handles ucrNewColName.Load - - End Sub End Class \ No newline at end of file diff --git a/instat/dlgDuplicateColumns.vb b/instat/dlgDuplicateColumns.vb index 7095bf58fde..3c62bc63a56 100644 --- a/instat/dlgDuplicateColumns.vb +++ b/instat/dlgDuplicateColumns.vb @@ -218,8 +218,4 @@ Public Class dlgDuplicateColumns Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDuplicateColumns.ControlContentsChanged, ucrPnlConvertTo.ControlContentsChanged, ucrNudConvertDisplayDecimals.ControlContentsChanged, ucrChkConvertSpecifyDecimalsToDisplay.ControlContentsChanged, ucrChkChangeType.ControlContentsChanged TestOKEnabled() End Sub - - Private Sub ucrChkConvertSpecifyDecimalsToDisplay_Load(sender As Object, e As EventArgs) Handles ucrChkConvertSpecifyDecimalsToDisplay.Load - - End Sub End Class diff --git a/instat/dlgTransformText.vb b/instat/dlgTransformText.vb index 66aadc2894e..669d64a4b1c 100644 --- a/instat/dlgTransformText.vb +++ b/instat/dlgTransformText.vb @@ -330,10 +330,6 @@ Public Class dlgTransformText End If End Sub - Private Sub rdoSubstring_CheckedChanged(sender As Object, e As EventArgs) Handles rdoSubstring.CheckedChanged - - End Sub - Private Sub ucrPnl_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOperation.ControlValueChanged, ucrInputTo.ControlValueChanged If bRCodeSet Then If rdoLength.Checked Then From 05841bc41b0652f44c4a0e629d77151d402b18d1 Mon Sep 17 00:00:00 2001 From: lloyddewit Date: Thu, 26 Aug 2021 17:20:09 +0200 Subject: [PATCH 31/31] Removed accidental extra line --- instat/dlgOneWayFrequencies.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/dlgOneWayFrequencies.vb b/instat/dlgOneWayFrequencies.vb index aaaf3704005..64c0d6b1622 100644 --- a/instat/dlgOneWayFrequencies.vb +++ b/instat/dlgOneWayFrequencies.vb @@ -70,7 +70,6 @@ Public Class dlgOneWayFrequencies ucrChkWeights.SetParameter(ucrReceiverWeights.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkWeights.AddToLinkedControls(ucrReceiverWeights, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlFrequencies.AddRadioButton(rdoTable) ucrPnlFrequencies.AddRadioButton(rdoGraph) ucrPnlFrequencies.AddRadioButton(rdoBoth)