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/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..7f9a960697f 100644 --- a/instat/dlgBarAndPieChart.resx +++ b/instat/dlgBarAndPieChart.resx @@ -133,7 +133,7 @@ 76, 13 - 8 + 7 By Factor (Fill): @@ -148,19 +148,19 @@ $this - 16 + 23 NoControl - 10, 262 + 11, 262 - 121, 25 + 166, 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,16 +238,16 @@ $this - 14 + 21 NoControl - 10, 231 + 11, 231 - 121, 25 + 166, 25 10 @@ -265,7 +265,7 @@ $this - 20 + 27 True @@ -280,7 +280,7 @@ 47, 13 - 10 + 9 Position: @@ -295,19 +295,19 @@ $this - 11 + 18 NoControl - 10, 231 + 11, 231 - 121, 25 + 165, 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 diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 9ea3f106d7f..e328280893e 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -56,6 +56,9 @@ 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 clsAnnotateFunction As New RFunction Private Sub dlgBarAndPieChart_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -77,6 +80,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 +127,6 @@ Public Class dlgBarAndPieChart ucrSaveBar.SetPrefix("bar") ucrSaveBar.SetAssignToIfUncheckedValue("last_graph") - clsCoordFlipFunc.SetPackageName("ggplot2") clsCoordFlipFunc.SetRCommand("coord_flip") clsCoordFlipParam.SetArgumentName("coord_flip") @@ -144,16 +149,42 @@ 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({ucrInputLabelPosition, ucrInputLabelSize, ucrInputLabelColour}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrInputLabelColour.SetLinkedDisplayControl(lblLabelColour) + ucrInputLabelPosition.SetLinkedDisplayControl(lblLabelPosition) + ucrInputLabelSize.SetLinkedDisplayControl(lblLabelSize) End Sub Private Sub SetDefaults() @@ -176,6 +207,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 +235,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 +290,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() @@ -273,6 +316,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) @@ -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() @@ -326,9 +373,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 @@ -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,42 @@ 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 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, reverse = TRUE)", 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) + 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 diff --git a/instat/dlgBoxPlot.designer.vb b/instat/dlgBoxPlot.designer.vb index 7858f6b0d70..3a9e8306a74 100644 --- a/instat/dlgBoxPlot.designer.vb +++ b/instat/dlgBoxPlot.designer.vb @@ -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.cmdBoxPlotOptions) 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 diff --git a/instat/dlgBoxPlot.resx b/instat/dlgBoxPlot.resx index eabb5733ec9..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,7 +205,7 @@ $this - 19 + 18 NoControl @@ -232,7 +232,7 @@ $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..fc556ae7144 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 diff --git a/instat/dlgClimaticSummary.Designer.vb b/instat/dlgClimaticSummary.Designer.vb index f0869eb1b2b..23211deea52 100644 --- a/instat/dlgClimaticSummary.Designer.vb +++ b/instat/dlgClimaticSummary.Designer.vb @@ -50,17 +50,17 @@ Partial Class dlgClimaticSummary Me.lblWithinYear = New System.Windows.Forms.Label() Me.grpOptions = New System.Windows.Forms.GroupBox() Me.cmdMissingOptions = 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() @@ -153,6 +153,36 @@ Partial Class dlgClimaticSummary Me.cmdMissingOptions.Tag = "MissingOptions" Me.cmdMissingOptions.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 + ' + Me.ucrChkDropUnusedLevels.Checked = False + resources.ApplyResources(Me.ucrChkDropUnusedLevels, "ucrChkDropUnusedLevels") + Me.ucrChkDropUnusedLevels.Name = "ucrChkDropUnusedLevels" + ' 'cmdDoyRange ' resources.ApplyResources(Me.cmdDoyRange, "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 diff --git a/instat/dlgClimaticSummary.resx b/instat/dlgClimaticSummary.resx index 5ce36977997..e74ad972186 100644 --- a/instat/dlgClimaticSummary.resx +++ b/instat/dlgClimaticSummary.resx @@ -409,16 +409,16 @@ NoControl - 187, 83 + 217, 83 - 90, 26 + 60, 26 19 - Missing Options + Options cmdMissingOptions @@ -906,9 +906,6 @@ 23 - - NoControl - CenterScreen diff --git a/instat/dlgColumnStats.resx b/instat/dlgColumnStats.resx index 6bed6580433..85e80373fbe 100644 --- a/instat/dlgColumnStats.resx +++ b/instat/dlgColumnStats.resx @@ -184,16 +184,16 @@ NoControl - 148, 113 + 190, 114 - 104, 26 + 62, 26 20 - Missing Options + Options cmdMissingOptions @@ -253,7 +253,7 @@ 6, 117 - 130, 20 + 178, 20 4 @@ -316,7 +316,7 @@ 10, 196 - 258, 145 + 258, 155 7 @@ -418,7 +418,7 @@ 6, 13 - 416, 418 + 416, 419 274, 190 @@ -493,7 +493,7 @@ 9 - 10, 358 + 6, 363 402, 53 diff --git a/instat/dlgConvertColumns.Designer.vb b/instat/dlgConvertColumns.Designer.vb index 0ae926a6fa2..4164d27771e 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 @@ -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 fa212585232..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,10 +685,10 @@ $this - 3 + 2 - 253, 316 + 242, 316 50, 20 @@ -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,10 +781,7 @@ $this - 10 - - - NoControl + 9 CenterScreen @@ -700,6 +817,6 @@ $this - 9 + 8 \ No newline at end of file diff --git a/instat/dlgConvertColumns.vb b/instat/dlgConvertColumns.vb index 76f9f3ed4c4..949c9d9bf9b 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,5 @@ Public Class dlgConvertColumns ucrChkIgnoreLabels.SetText("Ignore Labels") End If 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/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..3c62bc63a56 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) @@ -218,6 +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 - - End Class 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/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 diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 2004db85a5a..24ca8109fee 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,23 @@ 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 End Class \ No newline at end of file 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/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/dlgOneVariableGraph.resx b/instat/dlgOneVariableGraph.resx index f105744422d..36b5dfd42f4 100644 --- a/instat/dlgOneVariableGraph.resx +++ b/instat/dlgOneVariableGraph.resx @@ -144,7 +144,7 @@ $this - 5 + 4 10, 201 @@ -168,8 +168,80 @@ $this + 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 - - - 1 - 10, 238 @@ -309,13 +357,13 @@ $this - 2 + 1 - 9, 292 + 4, 292 - 395, 52 + 401, 52 7 @@ -330,7 +378,7 @@ $this - 4 + 3 True @@ -341,34 +389,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 +412,30 @@ $this + 6 + + + 10, 265 + + + 4, 5, 4, 5 + + + 361, 24 + + + 6 + + + ucrSaveGraph + + + instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + 7 @@ -424,6 +472,6 @@ $this - 6 + 5 \ No newline at end of file diff --git a/instat/dlgOneWayFrequencies.Designer.vb b/instat/dlgOneWayFrequencies.Designer.vb index 55c1b4c13ac..a11e6bbe595 100644 --- a/instat/dlgOneWayFrequencies.Designer.vb +++ b/instat/dlgOneWayFrequencies.Designer.vb @@ -1,296 +1,296 @@ -' 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 dlgOneWayFrequencies - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - - Private Sub InitializeComponent() - 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.rdoNone = New System.Windows.Forms.RadioButton() - Me.cmdOptions = New System.Windows.Forms.Button() - Me.lblSelectedVariable = New System.Windows.Forms.Label() - Me.rdoGraph = New System.Windows.Forms.RadioButton() - Me.rdoTable = New System.Windows.Forms.RadioButton() - Me.rdoBoth = New System.Windows.Forms.RadioButton() - 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.rdoNone) - Me.grpSort.Controls.Add(Me.ucrPnlSort) - resources.ApplyResources(Me.grpSort, "grpSort") - Me.grpSort.Name = "grpSort" - Me.grpSort.TabStop = False - ' - 'rdoDescendingFrequencies - ' - resources.ApplyResources(Me.rdoDescendingFrequencies, "rdoDescendingFrequencies") - Me.rdoDescendingFrequencies.Name = "rdoDescendingFrequencies" - Me.rdoDescendingFrequencies.TabStop = True - Me.rdoDescendingFrequencies.UseVisualStyleBackColor = True - ' - 'rdoAscendingFrequencies - ' - resources.ApplyResources(Me.rdoAscendingFrequencies, "rdoAscendingFrequencies") - Me.rdoAscendingFrequencies.Name = "rdoAscendingFrequencies" - Me.rdoAscendingFrequencies.TabStop = True - Me.rdoAscendingFrequencies.UseVisualStyleBackColor = True - ' - 'rdoNone - ' - resources.ApplyResources(Me.rdoNone, "rdoNone") - Me.rdoNone.Name = "rdoNone" - Me.rdoNone.TabStop = True - Me.rdoNone.UseVisualStyleBackColor = True - ' - 'cmdOptions - ' - resources.ApplyResources(Me.cmdOptions, "cmdOptions") - Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.UseVisualStyleBackColor = True - ' - 'lblSelectedVariable - ' - resources.ApplyResources(Me.lblSelectedVariable, "lblSelectedVariable") - Me.lblSelectedVariable.Name = "lblSelectedVariable" - ' - 'rdoGraph - ' - resources.ApplyResources(Me.rdoGraph, "rdoGraph") - Me.rdoGraph.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoGraph.FlatAppearance.BorderSize = 2 - Me.rdoGraph.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoGraph.Name = "rdoGraph" - Me.rdoGraph.UseVisualStyleBackColor = True - ' - 'rdoTable - ' - resources.ApplyResources(Me.rdoTable, "rdoTable") - Me.rdoTable.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoTable.FlatAppearance.BorderSize = 2 - Me.rdoTable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoTable.Name = "rdoTable" - Me.rdoTable.UseVisualStyleBackColor = True - ' - 'rdoBoth - ' - resources.ApplyResources(Me.rdoBoth, "rdoBoth") - Me.rdoBoth.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoBoth.FlatAppearance.BorderSize = 2 - Me.rdoBoth.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoBoth.Name = "rdoBoth" - Me.rdoBoth.UseVisualStyleBackColor = True - ' - 'grpOutput - ' - 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 - ' - 'rdoAsHtml - ' - resources.ApplyResources(Me.rdoAsHtml, "rdoAsHtml") - Me.rdoAsHtml.Name = "rdoAsHtml" - Me.rdoAsHtml.UseVisualStyleBackColor = True - ' - 'rdoAsText - ' - resources.ApplyResources(Me.rdoAsText, "rdoAsText") - 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 - Me.Name = "dlgOneWayFrequencies" - Me.grpSort.ResumeLayout(False) - Me.grpOutput.ResumeLayout(False) - Me.grpOutput.PerformLayout() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - 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 rdoNone As RadioButton - Friend WithEvents ucrPnlSort As UcrPanel - Friend WithEvents cmdOptions As Button - Friend WithEvents lblSelectedVariable As Label - Friend WithEvents ucrChkFlip As ucrCheck - Friend WithEvents ucrReceiverWeights As ucrReceiverSingle - Friend WithEvents ucrChkWeights As ucrCheck - Friend WithEvents ucrNudGroups As ucrNud - Friend WithEvents ucrChkGroupData As ucrCheck - Friend WithEvents rdoGraph As RadioButton - Friend WithEvents rdoTable As RadioButton - Friend WithEvents ucrPnlFrequencies As UcrPanel - Friend WithEvents rdoBoth As RadioButton - Friend WithEvents ucrReceiverOneWayFreq As ucrReceiverMultiple - Friend WithEvents ucrSaveGraph As ucrSave - Friend WithEvents grpOutput As GroupBox - Friend WithEvents rdoAsHtml As RadioButton - Friend WithEvents rdoAsText As RadioButton - Friend WithEvents ucrPnlOutput As UcrPanel -End Class +' 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 dlgOneWayFrequencies + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + + Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgOneWayFrequencies)) + Me.grpSort = New System.Windows.Forms.GroupBox() + 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() + Me.cmdOptions = New System.Windows.Forms.Button() + Me.lblSelectedVariable = New System.Windows.Forms.Label() + Me.rdoGraph = New System.Windows.Forms.RadioButton() + Me.rdoTable = New System.Windows.Forms.RadioButton() + Me.rdoBoth = New System.Windows.Forms.RadioButton() + 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.ucrBase = New instat.ucrButtons() + Me.ucrSelectorOneWayFreq = New instat.ucrSelectorByDataFrameAddRemove() + Me.grpSort.SuspendLayout() + Me.grpOutput.SuspendLayout() + Me.SuspendLayout() + ' + 'grpSort + ' + 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 + ' + 'rdoDescending + ' + resources.ApplyResources(Me.rdoDescending, "rdoDescending") + Me.rdoDescending.Name = "rdoDescending" + Me.rdoDescending.TabStop = True + Me.rdoDescending.UseVisualStyleBackColor = True + ' + 'rdoAscending + ' + resources.ApplyResources(Me.rdoAscending, "rdoAscending") + Me.rdoAscending.Name = "rdoAscending" + Me.rdoAscending.TabStop = True + Me.rdoAscending.UseVisualStyleBackColor = True + ' + 'rdoNone + ' + resources.ApplyResources(Me.rdoNone, "rdoNone") + Me.rdoNone.Name = "rdoNone" + Me.rdoNone.TabStop = True + Me.rdoNone.UseVisualStyleBackColor = True + ' + 'ucrPnlSort + ' + resources.ApplyResources(Me.ucrPnlSort, "ucrPnlSort") + Me.ucrPnlSort.Name = "ucrPnlSort" + ' + 'cmdOptions + ' + resources.ApplyResources(Me.cmdOptions, "cmdOptions") + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.UseVisualStyleBackColor = True + ' + 'lblSelectedVariable + ' + resources.ApplyResources(Me.lblSelectedVariable, "lblSelectedVariable") + Me.lblSelectedVariable.Name = "lblSelectedVariable" + ' + 'rdoGraph + ' + resources.ApplyResources(Me.rdoGraph, "rdoGraph") + Me.rdoGraph.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGraph.FlatAppearance.BorderSize = 2 + Me.rdoGraph.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGraph.Name = "rdoGraph" + Me.rdoGraph.UseVisualStyleBackColor = True + ' + 'rdoTable + ' + resources.ApplyResources(Me.rdoTable, "rdoTable") + Me.rdoTable.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoTable.FlatAppearance.BorderSize = 2 + Me.rdoTable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoTable.Name = "rdoTable" + Me.rdoTable.UseVisualStyleBackColor = True + ' + 'rdoBoth + ' + resources.ApplyResources(Me.rdoBoth, "rdoBoth") + Me.rdoBoth.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoBoth.FlatAppearance.BorderSize = 2 + Me.rdoBoth.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoBoth.Name = "rdoBoth" + Me.rdoBoth.UseVisualStyleBackColor = True + ' + 'grpOutput + ' + 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 + ' + 'rdoAsHtml + ' + resources.ApplyResources(Me.rdoAsHtml, "rdoAsHtml") + Me.rdoAsHtml.Name = "rdoAsHtml" + Me.rdoAsHtml.UseVisualStyleBackColor = True + ' + 'rdoAsText + ' + resources.ApplyResources(Me.rdoAsText, "rdoAsText") + 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" + ' + '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 + Me.Name = "dlgOneWayFrequencies" + Me.grpSort.ResumeLayout(False) + Me.grpOutput.ResumeLayout(False) + Me.grpOutput.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrSelectorOneWayFreq As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents grpSort As GroupBox + 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 + Friend WithEvents lblSelectedVariable As Label + Friend WithEvents ucrChkFlip As ucrCheck + Friend WithEvents ucrReceiverWeights As ucrReceiverSingle + Friend WithEvents ucrChkWeights As ucrCheck + Friend WithEvents ucrNudGroups As ucrNud + Friend WithEvents ucrChkGroupData As ucrCheck + Friend WithEvents rdoGraph As RadioButton + Friend WithEvents rdoTable As RadioButton + Friend WithEvents ucrPnlFrequencies As UcrPanel + Friend WithEvents rdoBoth As RadioButton + Friend WithEvents ucrReceiverOneWayFreq As ucrReceiverMultiple + Friend WithEvents ucrSaveGraph As ucrSave + Friend WithEvents grpOutput As GroupBox + Friend WithEvents rdoAsHtml As RadioButton + Friend WithEvents rdoAsText As RadioButton + Friend WithEvents ucrPnlOutput As UcrPanel +End Class diff --git a/instat/dlgOneWayFrequencies.resx b/instat/dlgOneWayFrequencies.resx index ceb3bb069d2..a36d58697ba 100644 --- a/instat/dlgOneWayFrequencies.resx +++ b/instat/dlgOneWayFrequencies.resx @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 0, 0 - - - - 6, 8, 6, 8 - - - 100, 20 - - - - 0 - - - ucrChkSave - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 3 - - - True - - - 0, 3 - - - 39, 13 - - - 1 - - - Label1 - - - lblSaveText - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - Right - - - 210, 0 - - - 9, 12, 9, 12 - - - 139, 34 - - - 4 - - - ucrInputComboSave - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 0 - - - 182, 0 - - - 9, 12, 9, 12 - - - 155, 34 - - - 3 - - - ucrInputTextSave - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 1 - - - True - - - GrowAndShrink - - - Right - - - 349, 0 - - - 54, 34 - - - 5 - - - Position - - - btnColumnPosition - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - True - - - 6, 13 - - - 4, 5, 4, 5 - - - 403, 34 - - - ucrSave - - - instat.ucrCore, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 0, 0 + + + + 6, 8, 6, 8 + + + 100, 20 + + + + 0 + + + ucrChkSave + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + + + True + + + 0, 3 + + + 39, 13 + + + 1 + + + Label1 + + + lblSaveText + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Right + + + 210, 0 + + + 9, 12, 9, 12 + + + 139, 34 + + + 4 + + + ucrInputComboSave + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 0 + + + 182, 0 + + + 9, 12, 9, 12 + + + 155, 34 + + + 3 + + + ucrInputTextSave + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + True + + + GrowAndShrink + + + Right + + + 349, 0 + + + 54, 34 + + + 5 + + + Position + + + btnColumnPosition + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + 6, 13 + + + 4, 5, 4, 5 + + + 403, 34 + + + ucrSave + + + instat.ucrCore, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file