diff --git a/instat/dlgPICSARainfall.vb b/instat/dlgPICSARainfall.vb index 530be55f288..87a8807084f 100644 --- a/instat/dlgPICSARainfall.vb +++ b/instat/dlgPICSARainfall.vb @@ -51,6 +51,7 @@ Public Class dlgPICSARainfall Private clsMeanFunction As New RFunction Private clsRoundMeanY As New RFunction + Private clsPasteRoundMeanY As New RFunction Private clsAsDateMeanY As New RFunction Private clsMedianFunction As New RFunction Private clsRoundMedianY As New RFunction @@ -208,6 +209,7 @@ Public Class dlgPICSARainfall clsGeomHlineAesMean = New RFunction clsMeanFunction = New RFunction clsRoundMeanY = New RFunction + clsPasteRoundMeanY = New RFunction clsAsDateMeanY = New RFunction clsGeomHlineMedian = New RFunction clsGeomHlineAesMedian = New RFunction @@ -326,6 +328,7 @@ Public Class dlgPICSARainfall clsMeanFunction.AddParameter("na.rm", "TRUE") clsRoundMeanY.SetRCommand("round") + clsPasteRoundMeanY.SetRCommand("round") clsRoundMeanY.AddParameter("x", clsRFunctionParameter:=clsMeanFunction, iPosition:=0) @@ -348,7 +351,7 @@ Public Class dlgPICSARainfall clsPasteMeanY.SetRCommand("paste") clsPasteMeanY.AddParameter("0", Chr(34) & "Mean:" & Chr(34), bIncludeArgumentName:=False, iPosition:=0) - clsPasteMeanY.AddParameter("1", clsRFunctionParameter:=clsRoundMeanY, bIncludeArgumentName:=False, iPosition:=1) + clsPasteMeanY.AddParameter("1", clsRFunctionParameter:=clsPasteRoundMeanY, bIncludeArgumentName:=False, iPosition:=1) clsFormatMeanY.SetRCommand("format") clsFormatMeanY.AddParameter("x", strMeanName, iPosition:=0) @@ -623,9 +626,9 @@ Public Class dlgPICSARainfall 'add more functions Private Sub cmdPICSAOptions_Click(sender As Object, e As EventArgs) Handles cmdPICSAOptions.Click - sdgPICSARainfallGraph.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, dctNewThemeFunctions:=dctThemeFunctions, clsNewLabsFunction:=clsLabsFunction, clsNewThemeFunction:=clsThemeFunction, clsNewXScaleContinuousFunction:=clsXScalecontinuousFunction, clsNewYScaleContinuousFunction:=clsYScalecontinuousFunction, clsNewGeomhlineMean:=clsGeomHlineMean, clsNewGeomhlineMedian:=clsGeomHlineMedian, clsNewGeomhlineLowerTercile:=clsGeomHlineLowerTercile, clsNewGeomhlineUpperTercile:=clsGeomHlineUpperTercile, clsNewXLabsFunction:=clsXLabsFunction, clsNewYLabsFunction:=clsYLabsFunction, clsNewRaesFunction:=clsRaesFunction, clsNewAsDate:=clsAsDate, clsNewAsDateYLimit:=clsAsDateYLimit, clsNewAsNumeric:=clsAsNumeric, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewDatePeriodOperator:=clsDatePeriodOperator, clsNewGeomTextLabelMeanLine:=clsGeomTextLabelMeanLine, clsNewRoundMeanY:=clsRoundMeanY, clsNewPasteMeanY:=clsPasteMeanY, clsNewGeomTextLabelMedianLine:=clsGeomTextLabelMedianLine, clsNewRoundMedianY:=clsRoundMedianY, clsNewPasteMedianY:=clsPasteMedianY, clsNewGeomTextLabelLowerTercileLine:=clsGeomTextLabelLowerTercileLine, clsNewRoundLowerTercileY:=clsRoundLowerTercileY, clsNewPasteLowerTercileY:=clsPasteLowerTercileY, clsNewGeomTextLabelUpperTercileLine:=clsGeomTextLabelUpperTercileLine, clsNewRoundUpperTercileY:=clsRoundUpperTercileY, clsNewPasteUpperTercileY:=clsPasteUpperTercileY, strXAxisType:=ucrReceiverX.strCurrDataType, clsNewMutateFunction:=clsMutateFunction, clsNewMeanFunction:=clsMeanFunction, clsNewMedianFunction:=clsMedianFunction, clsNewLowerTercileFunction:=clsLowerTercileFunction, clsNewUpperTercileFunction:=clsUpperTercileFunction, clsNewAsDateMeanY:=clsAsDateMeanY, clsNewAsDateMedianY:=clsAsDateMedianY, clsNewAsDateLowerTercileY:=clsAsDateLowerTercileY, clsNewAsDateUpperTercileY:=clsAsDateUpperTercileY, clsNewFormatMeanY:=clsFormatMeanY, clsNewFormatMedianY:=clsFormatMedianY, clsNewFormatLowerTercileY:=clsFormatLowerTercileY, clsNewFormatUpperTercileY:=clsFormatUpperTercileY, clsNewYLimitsYDate:=clsYLimitsYDate, bReset:=bResetSubdialog) + sdgPICSARainfallGraph.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewPipeOperator:=clsPipeOperator, dctNewThemeFunctions:=dctThemeFunctions, clsNewLabsFunction:=clsLabsFunction, clsNewThemeFunction:=clsThemeFunction, clsNewXScaleContinuousFunction:=clsXScalecontinuousFunction, clsNewYScaleContinuousFunction:=clsYScalecontinuousFunction, clsNewGeomhlineMean:=clsGeomHlineMean, clsNewGeomhlineMedian:=clsGeomHlineMedian, clsNewGeomhlineLowerTercile:=clsGeomHlineLowerTercile, clsNewGeomhlineUpperTercile:=clsGeomHlineUpperTercile, clsNewXLabsFunction:=clsXLabsFunction, clsNewYLabsFunction:=clsYLabsFunction, clsNewRaesFunction:=clsRaesFunction, clsNewAsDate:=clsAsDate, clsNewAsDateYLimit:=clsAsDateYLimit, clsNewAsNumeric:=clsAsNumeric, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewDatePeriodOperator:=clsDatePeriodOperator, clsNewGeomTextLabelMeanLine:=clsGeomTextLabelMeanLine, clsNewRoundMeanY:=clsRoundMeanY, clsNewPasteRoundMeanY:=clsPasteRoundMeanY, clsNewPasteMeanY:=clsPasteMeanY, clsNewGeomTextLabelMedianLine:=clsGeomTextLabelMedianLine, clsNewRoundMedianY:=clsRoundMedianY, clsNewPasteMedianY:=clsPasteMedianY, clsNewGeomTextLabelLowerTercileLine:=clsGeomTextLabelLowerTercileLine, clsNewRoundLowerTercileY:=clsRoundLowerTercileY, clsNewPasteLowerTercileY:=clsPasteLowerTercileY, clsNewGeomTextLabelUpperTercileLine:=clsGeomTextLabelUpperTercileLine, clsNewRoundUpperTercileY:=clsRoundUpperTercileY, clsNewPasteUpperTercileY:=clsPasteUpperTercileY, strXAxisType:=ucrReceiverX.strCurrDataType, clsNewMutateFunction:=clsMutateFunction, clsNewMeanFunction:=clsMeanFunction, clsNewMedianFunction:=clsMedianFunction, clsNewLowerTercileFunction:=clsLowerTercileFunction, clsNewUpperTercileFunction:=clsUpperTercileFunction, clsNewAsDateMeanY:=clsAsDateMeanY, clsNewAsDateMedianY:=clsAsDateMedianY, clsNewAsDateLowerTercileY:=clsAsDateLowerTercileY, clsNewAsDateUpperTercileY:=clsAsDateUpperTercileY, clsNewFormatMeanY:=clsFormatMeanY, clsNewFormatMedianY:=clsFormatMedianY, clsNewFormatLowerTercileY:=clsFormatLowerTercileY, clsNewFormatUpperTercileY:=clsFormatUpperTercileY, clsNewYLimitsYDate:=clsYLimitsYDate, bReset:=bResetSubdialog) sdgPICSARainfallGraph.ShowDialog() - AddRemoveHLineCalculations() + AddRemoveGroupBy() bResetSubdialog = False End Sub @@ -633,8 +636,7 @@ Public Class dlgPICSARainfall sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsFacetFunction, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrSelectorPICSARainfall, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False - 'ucrReceiverFacetBy.SetRCode(clsFacetOperator) - AddRemoveGroupBy() + 'AddRemoveGroupByAndHlines() End Sub Private Sub cmdLineOptions_Click(sender As Object, e As EventArgs) Handles cmdLineOptions.Click @@ -716,7 +718,7 @@ Public Class dlgPICSARainfall End Sub Private Sub ucrVariablesAsFactorForPicsa_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrVariablesAsFactorForPicsa.ControlValueChanged, ucrReceiverColourBy.ControlValueChanged, ucrReceiverFacetBy.ControlValueChanged - AddRemoveHLineCalculations() + AddRemoveGroupBy() End Sub Private Sub ucrSelectorPICSARainfall_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorPICSARainfall.ControlValueChanged @@ -727,38 +729,34 @@ Public Class dlgPICSARainfall Private Sub AddRemoveGroupBy() Dim i As Integer = 0 - clsGroupByFunction.ClearParameters() - If clsBaseOperator.ContainsParameter("facets") Then - For Each clsTempParam As RParameter In clsFacetOperator.clsParameters - If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then - clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) - End If + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + For Each clsTempParam As RParameter In clsFacetOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End If + + If clsRaesFunction.ContainsParameter("colour") Then + clsGroupByFunction.AddParameter(i, ucrReceiverColourBy.GetVariableNames(bWithQuotes:=False), bIncludeArgumentName:=False, iPosition:=0) i = i + 1 - Next - Else - End If - AddRemoveHLineCalculations() - End Sub + End If - Private Sub AddRemoveHLineCalculations() - If clsBaseOperator.ContainsParameter("hlinemean") OrElse clsBaseOperator.ContainsParameter("hlinemedian") OrElse clsBaseOperator.ContainsParameter("hlinelowertercile") OrElse clsBaseOperator.ContainsParameter("hlineuppertercile") Then - clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) If Not ucrVariablesAsFactorForPicsa.bSingleVariable Then - clsGroupByFunction.AddParameter("0", "variable", bIncludeArgumentName:=False, iPosition:=0) + clsGroupByFunction.AddParameter(i, "variable", bIncludeArgumentName:=False, iPosition:=0) + i = i + 1 + End If + + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) Else - If (Not ucrReceiverColourBy.IsEmpty AndAlso Not ucrReceiverFacetBy.IsEmpty) Then - clsGroupByFunction.AddParameter("0", ucrReceiverColourBy.GetVariableNames(bWithQuotes:=False), bIncludeArgumentName:=False, iPosition:=0) - ElseIf (Not ucrReceiverColourBy.IsEmpty AndAlso ucrReceiverFacetBy.IsEmpty) Then - clsGroupByFunction.AddParameter("0", ucrReceiverColourBy.GetVariableNames(bWithQuotes:=False), bIncludeArgumentName:=False, iPosition:=0) - Else - clsGroupByFunction.RemoveParameterByName("0") - clsPipeOperator.RemoveParameterByName("group_by") - End If + clsPipeOperator.RemoveParameterByName("group_by") End If - clsPipeOperator.AddParameter("mutate", clsRFunctionParameter:=clsMutateFunction, iPosition:=2) Else clsPipeOperator.RemoveParameterByName("group_by") - clsPipeOperator.RemoveParameterByName("mutate") End If SetPipeAssignTo() End Sub diff --git a/instat/sdgPICSARainfallGraph.Designer.vb b/instat/sdgPICSARainfallGraph.Designer.vb index 73c663e73ec..44688fd06fa 100644 --- a/instat/sdgPICSARainfallGraph.Designer.vb +++ b/instat/sdgPICSARainfallGraph.Designer.vb @@ -68,6 +68,8 @@ Partial Class sdgPICSARainfallGraph Me.ucrInputXTo = New instat.ucrInputTextBox() Me.ucrNudXAxisAngle = New instat.ucrNud() Me.tpYAxis = New System.Windows.Forms.TabPage() + Me.ucrNudUpperLimit = New instat.ucrNud() + Me.ucrNudLowerLimit = New instat.ucrNud() Me.lblDateDisplayFormat = New System.Windows.Forms.Label() Me.rdoYDate = New System.Windows.Forms.RadioButton() Me.rdoYNumeric = New System.Windows.Forms.RadioButton() @@ -75,7 +77,9 @@ Partial Class sdgPICSARainfallGraph Me.lblYInStepsOf = New System.Windows.Forms.Label() Me.lblYTo = New System.Windows.Forms.Label() Me.lblYFrom = New System.Windows.Forms.Label() + Me.ucrInputYSpecifyUpperLimitDateMonth = New instat.ucrInputComboBox() Me.ucrInputYSpecifyUpperLimitNumeric = New instat.ucrInputTextBox() + Me.ucrInputYSpecifyLowerLimitDateMonth = New instat.ucrInputComboBox() Me.ucrChkYSpecifyUpperLimit = New instat.ucrCheck() Me.ucrInputYSpecifyLowerLimitNumeric = New instat.ucrInputTextBox() Me.ucrChkYSpecifyLowerLimit = New instat.ucrCheck() @@ -160,8 +164,6 @@ Partial Class sdgPICSARainfallGraph Me.UcrChkPnlBackgroundFill = New instat.ucrCheck() Me.ucrChkPnlBackgroundColour = New instat.ucrCheck() Me.ucrSdgPICSARainfalbuttons = New instat.ucrButtonsSubdialogue() - Me.ucrInputYSpecifyLowerLimitDateMonth = New instat.ucrInputComboBox() - Me.ucrInputYSpecifyUpperLimitDateMonth = New instat.ucrInputComboBox() Me.tbPICSA.SuspendLayout() Me.tpTitles.SuspendLayout() Me.grpyAxisTitle.SuspendLayout() @@ -528,6 +530,8 @@ Partial Class sdgPICSARainfallGraph ' 'tpYAxis ' + Me.tpYAxis.Controls.Add(Me.ucrNudUpperLimit) + Me.tpYAxis.Controls.Add(Me.ucrNudLowerLimit) Me.tpYAxis.Controls.Add(Me.lblDateDisplayFormat) Me.tpYAxis.Controls.Add(Me.rdoYDate) Me.tpYAxis.Controls.Add(Me.rdoYNumeric) @@ -559,6 +563,26 @@ Partial Class sdgPICSARainfallGraph Me.tpYAxis.Name = "tpYAxis" Me.tpYAxis.UseVisualStyleBackColor = True ' + 'ucrNudUpperLimit + ' + Me.ucrNudUpperLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudUpperLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + resources.ApplyResources(Me.ucrNudUpperLimit, "ucrNudUpperLimit") + Me.ucrNudUpperLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudUpperLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudUpperLimit.Name = "ucrNudUpperLimit" + Me.ucrNudUpperLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudLowerLimit + ' + Me.ucrNudLowerLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLowerLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + resources.ApplyResources(Me.ucrNudLowerLimit, "ucrNudLowerLimit") + Me.ucrNudLowerLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLowerLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLowerLimit.Name = "ucrNudLowerLimit" + Me.ucrNudLowerLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblDateDisplayFormat ' resources.ApplyResources(Me.lblDateDisplayFormat, "lblDateDisplayFormat") @@ -604,6 +628,13 @@ Partial Class sdgPICSARainfallGraph resources.ApplyResources(Me.lblYFrom, "lblYFrom") Me.lblYFrom.Name = "lblYFrom" ' + 'ucrInputYSpecifyUpperLimitDateMonth + ' + Me.ucrInputYSpecifyUpperLimitDateMonth.AddQuotesIfUnrecognised = True + Me.ucrInputYSpecifyUpperLimitDateMonth.IsReadOnly = False + resources.ApplyResources(Me.ucrInputYSpecifyUpperLimitDateMonth, "ucrInputYSpecifyUpperLimitDateMonth") + Me.ucrInputYSpecifyUpperLimitDateMonth.Name = "ucrInputYSpecifyUpperLimitDateMonth" + ' 'ucrInputYSpecifyUpperLimitNumeric ' Me.ucrInputYSpecifyUpperLimitNumeric.AddQuotesIfUnrecognised = True @@ -612,6 +643,13 @@ Partial Class sdgPICSARainfallGraph resources.ApplyResources(Me.ucrInputYSpecifyUpperLimitNumeric, "ucrInputYSpecifyUpperLimitNumeric") Me.ucrInputYSpecifyUpperLimitNumeric.Name = "ucrInputYSpecifyUpperLimitNumeric" ' + 'ucrInputYSpecifyLowerLimitDateMonth + ' + Me.ucrInputYSpecifyLowerLimitDateMonth.AddQuotesIfUnrecognised = True + Me.ucrInputYSpecifyLowerLimitDateMonth.IsReadOnly = False + resources.ApplyResources(Me.ucrInputYSpecifyLowerLimitDateMonth, "ucrInputYSpecifyLowerLimitDateMonth") + Me.ucrInputYSpecifyLowerLimitDateMonth.Name = "ucrInputYSpecifyLowerLimitDateMonth" + ' 'ucrChkYSpecifyUpperLimit ' Me.ucrChkYSpecifyUpperLimit.Checked = False @@ -1233,20 +1271,6 @@ Partial Class sdgPICSARainfallGraph resources.ApplyResources(Me.ucrSdgPICSARainfalbuttons, "ucrSdgPICSARainfalbuttons") Me.ucrSdgPICSARainfalbuttons.Name = "ucrSdgPICSARainfalbuttons" ' - 'ucrInputYSpecifyLowerLimitDateMonth - ' - Me.ucrInputYSpecifyLowerLimitDateMonth.AddQuotesIfUnrecognised = True - Me.ucrInputYSpecifyLowerLimitDateMonth.IsReadOnly = False - resources.ApplyResources(Me.ucrInputYSpecifyLowerLimitDateMonth, "ucrInputYSpecifyLowerLimitDateMonth") - Me.ucrInputYSpecifyLowerLimitDateMonth.Name = "ucrInputYSpecifyLowerLimitDateMonth" - ' - 'ucrInputYSpecifyUpperLimitDateMonth - ' - Me.ucrInputYSpecifyUpperLimitDateMonth.AddQuotesIfUnrecognised = True - Me.ucrInputYSpecifyUpperLimitDateMonth.IsReadOnly = False - resources.ApplyResources(Me.ucrInputYSpecifyUpperLimitDateMonth, "ucrInputYSpecifyUpperLimitDateMonth") - Me.ucrInputYSpecifyUpperLimitDateMonth.Name = "ucrInputYSpecifyUpperLimitDateMonth" - ' 'sdgPICSARainfallGraph ' resources.ApplyResources(Me, "$this") @@ -1424,4 +1448,6 @@ Partial Class sdgPICSARainfallGraph Friend WithEvents lblMajorGridLineColour As Label Friend WithEvents ucrInputYSpecifyUpperLimitDateMonth As ucrInputComboBox Friend WithEvents ucrInputYSpecifyLowerLimitDateMonth As ucrInputComboBox + Friend WithEvents ucrNudUpperLimit As ucrNud + Friend WithEvents ucrNudLowerLimit As ucrNud End Class diff --git a/instat/sdgPICSARainfallGraph.resx b/instat/sdgPICSARainfallGraph.resx index 7d25c65604f..da404c2a414 100644 --- a/instat/sdgPICSARainfallGraph.resx +++ b/instat/sdgPICSARainfallGraph.resx @@ -210,2531 +210,1706 @@ 9 - - grpyAxisTitle - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - tpTitles + + NoControl - - 0 + + 6, 82 - - grpAxes + + 30, 13 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 45 - - tpTitles + + Size: - - 1 + + lblYAxisTitleSize - - grpGraphTitles + + System.Windows.Forms.Label, 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 + + grpyAxisTitle - - tpTitles + + 0 - - 2 + + True - - 4, 22 + + NoControl - - 3, 3, 3, 3 + + 6, 21 - - 567, 309 + + 50, 17 - - 0 + + 44 - - Titles + + Auto - - tpTitles + + rdoAutoYAxis - - System.Windows.Forms.TabPage, 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 - - tbPICSA + + grpyAxisTitle - - 0 + + 1 - - grpXAxisLabels + + 6, 44 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 181, 21 - - tpXAxis + + 14 - - 0 + + ucrInputYAxisTitle - - 4, 22 + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 3, 3, 3, 3 + + grpyAxisTitle - - 567, 309 + + 2 - - 1 + + True - - X-Axis + + NoControl - - tpXAxis + + 142, 21 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 62, 17 - - tbPICSA + + 42 - - 1 + + No Title - - True + + rdoNoYAxisTitle - - NoControl + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 15, 94 + + grpyAxisTitle - - 79, 13 + + 3 - - 50 + + 43, 79 - - Display Format: + + 50, 20 - - lblDateDisplayFormat + + 22 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ucrNudYAxisTitleSize - - tpYAxis + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 0 + + grpyAxisTitle - - Button + + 4 - - Flat + + True - + NoControl - - 282, 16 - - - 98, 27 + + 67, 21 - - 43 + + 60, 17 - - Date + + 41 - - MiddleCenter + + Specify - - rdoYDate + + rdoSpecifyYAxisTitle - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpYAxis + + grpyAxisTitle - - 1 + + 5 - - Button + + 6, 15 - - Flat + + 204, 57 - - NoControl + + 37 - - 186, 16 + + UcrPnlYAxisTitle - - 98, 27 + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 42 + + grpyAxisTitle - - Numeric + + 6 - - MiddleCenter + + 306, 129 - - rdoYNumeric + + 228, 105 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 36 - - tpYAxis + + Y-Axis Title - - 2 + + grpyAxisTitle - + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTitles + + + 0 + + True - + NoControl - - 15, 63 + + 6, 82 - - 65, 13 + + 30, 13 - - 37 + + 44 - - Start Month: + + Size: - - lblStartMonth + + lblXAxisTitleSize - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpYAxis + + grpAxes - - 3 + + 0 - + True - + NoControl - - 378, 64 - - - 61, 13 - - - 22 - - - In Steps of: + + 6, 21 - - lblYInStepsOf + + 50, 17 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 43 - - tpYAxis + + Auto - - 4 + + rdoAutoXAxis - - True + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + grpAxes - - 257, 64 + + 1 - - 23, 13 + + 6, 44 - - 21 + + 181, 21 - - To: + + 42 - - lblYTo + + ucrInputXAxisTitle - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - tpYAxis + + grpAxes - - 5 + + 2 - + True - + NoControl - - 132, 64 + + 142, 21 - - 33, 13 + + 62, 17 - - 20 + + 41 - - From: + + No Title - - lblYFrom + + rdoNoTitleXAxisTitle - - 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 - - tpYAxis + + grpAxes - - 6 + + 3 - - 243, 156 + + True - - 93, 21 + + NoControl - - 49 + + 67, 21 - - ucrInputYSpecifyUpperLimitDateMonth + + 62, 17 - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 40 - - tpYAxis + + Specifiy - - 7 + + rdoSpecifyXAxisTitle - - 169, 157 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 59, 21 + + grpAxes - - 48 + + 4 - - ucrInputYSpecifyUpperLimitNumeric + + 6, 15 - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 204, 57 - - tpYAxis + + 36 - - 8 + + ucrPnlXAxisTitle - - 243, 126 + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 93, 21 + + grpAxes - - 46 + + 5 - - ucrInputYSpecifyLowerLimitDateMonth + + 43, 79 - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 50, 20 - - tpYAxis + + 23 - - 9 + + ucrNudXAxisTitleSize - - 18, 157 + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 141, 20 + + grpAxes - - 47 - - - ucrChkYSpecifyUpperLimit - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 10 - - - 169, 127 - - - 59, 21 - - - 45 - - - ucrInputYSpecifyLowerLimitNumeric - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 11 - - - 18, 127 - - - 141, 20 - - - 44 - - - ucrChkYSpecifyLowerLimit - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 12 - - - 161, 7 - - - 243, 48 - - - 39 - - - ucrPnlYAxisType - - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 13 - - - 86, 60 - - - 96, 21 - - - 38 - - - ucrInputStartMonth - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 14 - - - 18, 61 - - - 111, 20 - - - 29 - - - ucrChkSpecifyYAxisTickMarks - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 15 - - - 382, 89 - - - 45, 20 - - - 36 - - - ucrNudDateBreakNumber - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 16 - - - 443, 61 - - - 50, 21 - - - 23 - - - ucrInputYInStepsOf - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 17 - - - 433, 88 - - - 70, 21 - - - 35 - - - ucrInputDateBreakTime - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 18 - - - 279, 90 - - - 100, 20 - - - 34 - - - ucrChkSpecifyDateBreaks - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 19 - - - 99, 90 - - - 141, 21 - - - 32 - - - ucrInputDateDisplayFormat - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 20 - - - 284, 61 - - - 52, 21 - - - 24 - - - ucrInputYTo - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 21 - - - 97, 195 - - - 50, 20 - - - 33 - - - ucrNudYAxisAngle - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 22 - - - 252, 195 - - - 50, 20 - - - 4 - - - ucrNudYAxisLabelSize - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 23 - - - 18, 195 - - - 75, 20 - - - 32 - - - ucrChkYAxisAngle - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 24 - - - 169, 61 - - - 50, 21 - - - 25 - - - ucrInputYFrom - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 25 - - - 173, 195 - - - 75, 20 - - - 31 - - - ucrChkYAxisLabelSize - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpYAxis - - - 26 - - - 4, 22 - - - 3, 3, 3, 3 - - - 567, 309 - - - 4 - - - Y-Axis - - - tpYAxis - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tbPICSA - - - 2 - - - ucrInputTercilesLineLabelTextUpper - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 0 - - - lblTercilesLineLabelTextUpper - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLines - - - 1 - - - grpLinesFormat - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLines - - - 2 - - - lblTercilesLineLabelTextLower - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLines - - - 3 - - - lblTercilesLineType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLines - - - 4 - - - lblMedianLineLabelText - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLines - - - 5 - - - lblMedianLineType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLines - - - 6 - - - lblMeanLineLabelText - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLines - - - 7 - - - lblMeanLineType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLines - - - 8 - - - ucrChkTercilesLineLabelIncludeValue - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 9 - - - ucrChkMedianLineLabelIncludeValue - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 10 - - - ucrChkMeanLineLabelIncludeValue - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 11 - - - ucrInputTercilesLineLabelTextLower - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 12 - - - ucrInputTercilesLabelType - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 13 - - - ucrInputMedianLineLabelText - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 14 - - - ucrInputMedianLabelType - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 15 - - - ucrInputMeanLineLabelText - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 16 - - - ucrChkAddTercilesLabel - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 17 - - - ucrChkAddMedianLabel - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 18 - - - ucrInputMeanLabelType - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 19 - - - ucrChkAddMean - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 20 - - - ucrChkAddMeanLabel - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 21 - - - ucrChkAddMedian - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 22 - - - ucrChkAddTerciles - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 23 - - - 4, 22 - - - 3, 3, 3, 3 - - - 567, 309 - - - 2 - - - Lines - - - tpLines - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tbPICSA - - - 3 - - - grpMinorGridLine - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPanel - - - 0 - - - grpPnlBorder - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPanel - - - 1 - - - grpMajorGridLines - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPanel - - - 2 - - - grpPnlBackground - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPanel - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 567, 309 - - - 3 - - - Panel - - - tpPanel - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tbPICSA - - - 4 - - - 10, 4 - - - 575, 335 - - - 26 - - - tbPICSA - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - lblYAxisTitleSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpyAxisTitle - - - 0 - - - rdoAutoYAxis - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpyAxisTitle - - - 1 - - - ucrInputYAxisTitle - - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpyAxisTitle - - - 2 - - - rdoNoYAxisTitle - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpyAxisTitle - - - 3 - - - ucrNudYAxisTitleSize - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpyAxisTitle - - - 4 - - - rdoSpecifyYAxisTitle - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpyAxisTitle - - - 5 - - - UcrPnlYAxisTitle - - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpyAxisTitle - - + 6 - - 306, 129 + + 9, 129 - + 228, 105 - - 36 + + 18 - - Y-Axis Title + + X-Axis Title - - grpyAxisTitle + + grpAxes - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpTitles - - 0 + + 1 - + True - + NoControl - - 6, 82 + + 360, 83 - - 30, 13 + + 69, 13 - - 45 + + 26 - - Size: + + Caption Size: - - lblYAxisTitleSize + + lblCaptionSize - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpyAxisTitle + + grpGraphTitles - + 0 - + True - + NoControl - - 6, 21 + + 360, 53 + + + 75, 13 + + + 27 + + + Sub Title Size: - - 50, 17 + + lblSubTitleSize - - 44 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Auto + + grpGraphTitles - - rdoAutoYAxis + + 1 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - grpyAxisTitle + + NoControl - - 1 + + 361, 23 - - 6, 44 + + 53, 13 - - 181, 21 + + 28 - - 14 + + Title Size: - - ucrInputYAxisTitle + + lblTitleSize - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpyAxisTitle + + grpGraphTitles - + 2 - + True - + NoControl - - 142, 21 + + 5, 83 - - 62, 17 + + 78, 13 - - 42 + + 23 - - No Title + + Graph Caption: - - rdoNoYAxisTitle + + lblCaption - - 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 - - grpyAxisTitle + + grpGraphTitles - + 3 - - 43, 79 + + True - - 50, 20 + + NoControl - - 22 + + 5, 53 - - ucrNudYAxisTitleSize + + 84, 13 - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 24 - - grpyAxisTitle + + Graph Sub Title: - + + lblSubTitle + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGraphTitles + + 4 - + True - + NoControl - - 67, 21 + + 6, 23 - - 60, 17 + + 62, 13 - - 41 + + 25 - - Specify + + Graph Title: - - rdoSpecifyYAxisTitle + + lblTitle - - 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 - - grpyAxisTitle + + grpGraphTitles - + 5 - - 6, 15 + + 448, 78 - - 204, 57 + + 50, 20 - - 37 + + 22 - - UcrPnlYAxisTitle + + ucrNudCaptionSize - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpyAxisTitle + + grpGraphTitles - + 6 - - lblXAxisTitleSize + + 448, 48 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 50, 20 - - grpAxes + + 21 - - 0 + + ucrNudSubTitleSize - - rdoAutoXAxis + + instat.ucrNud, 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 + + grpGraphTitles - - grpAxes + + 7 - - 1 + + 448, 18 - - ucrInputXAxisTitle + + 50, 20 - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 20 - - grpAxes + + ucrNudTitleSize - - 2 + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - rdoNoTitleXAxisTitle + + grpGraphTitles + + + 8 + + + 119, 78 + + + 181, 21 + + + 16 + + + ucrInputGraphcCaption + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpGraphTitles - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9 - - grpAxes + + 119, 18 - - 3 + + 181, 21 - - rdoSpecifyXAxisTitle + + 12 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ucrInputGraphTitle - - grpAxes + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 4 + + grpGraphTitles - - ucrPnlXAxisTitle + + 10 - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 119, 48 - - grpAxes + + 181, 21 - - 5 + + 14 - - ucrNudXAxisTitleSize + + ucrInputGraphSubTitle - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpAxes + + grpGraphTitles - - 6 + + 11 - - 9, 129 + + 9, 10 - - 228, 105 + + 525, 110 - - 18 + + 17 - - X-Axis Title + + Graph - - grpAxes + + grpGraphTitles - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpTitles - - 1 - - - True + + 2 - - NoControl + + 4, 22 - - 6, 82 + + 3, 3, 3, 3 - - 30, 13 + + 567, 309 - - 44 + + 0 - - Size: + + Titles - - lblXAxisTitleSize + + tpTitles - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpAxes + + tbPICSA - + 0 - - True + + 162, 57 - - NoControl + + 75, 20 - - 6, 21 + + 30 - - 50, 17 + + ucrChkXAxisLabelSize - - 43 + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - Auto + + grpXAxisLabels - - rdoAutoXAxis + + 0 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 57 - - grpAxes + + 75, 20 - - 1 + + 29 - - 6, 44 + + ucrChkXAxisAngle - - 181, 21 + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 42 + + grpXAxisLabels - - ucrInputXAxisTitle + + 1 - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 6, 22 - - grpAxes + + 100, 20 - - 2 + + 28 - - True + + ucrChkSpecifyXAxisTickMarks - - NoControl + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 142, 21 + + grpXAxisLabels - - 62, 17 + + 2 - - 41 + + 160, 21 - - No Title + + 50, 21 - - rdoNoTitleXAxisTitle + + 25 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ucrInputXFrom - - grpAxes + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 3 + + grpXAxisLabels - - True + + 4 - - NoControl + + 433, 21 - - 67, 21 + + 51, 21 - - 62, 17 + + 23 - - 40 + + ucrInputXInStepsOf + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - Specifiy + + grpXAxisLabels - - rdoSpecifyXAxisTitle + + 5 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 241, 57 - - grpAxes + + 50, 20 - + 4 - - 6, 15 + + ucrNudXaxisLabelSize - - 204, 57 + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 36 + + grpXAxisLabels - - ucrPnlXAxisTitle + + 6 - - instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 275, 21 - - grpAxes + + 51, 21 - - 5 + + 24 - - 43, 79 + + ucrInputXTo - - 50, 20 + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 23 + + grpXAxisLabels - - ucrNudXAxisTitleSize + + 7 - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 86, 57 - - grpAxes + + 50, 20 - - 6 + + 4 - - lblCaptionSize + + ucrNudXAxisAngle - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles + + grpXAxisLabels - - 0 + + 8 - - lblSubTitleSize + + 6, 8 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 504, 93 - - grpGraphTitles + + 27 - - 1 + + X-Axis - - lblTitleSize + + grpXAxisLabels - - System.Windows.Forms.Label, 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 - - grpGraphTitles + + tpXAxis - - 2 + + 0 - - lblCaption + + 4, 22 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3, 3, 3 - - grpGraphTitles + + 567, 309 - - 3 + + 1 - - lblSubTitle + + X-Axis - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tpXAxis - - grpGraphTitles + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 + + tbPICSA - - lblTitle + + 1 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 183, 158 - - grpGraphTitles + + 45, 20 - - 5 + + 52 - - ucrNudCaptionSize + + ucrNudUpperLimit - + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles - - - 6 + + tpYAxis - - ucrNudSubTitleSize + + 0 - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 183, 127 - - grpGraphTitles + + 45, 20 - - 7 + + 51 - - ucrNudTitleSize + + ucrNudLowerLimit - + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles + + tpYAxis - - 8 + + 1 - - ucrInputGraphcCaption + + True - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + NoControl - - grpGraphTitles + + 15, 94 - - 9 + + 79, 13 - - ucrInputGraphTitle + + 50 - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + Display Format: - - grpGraphTitles + + lblDateDisplayFormat - - 10 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ucrInputGraphSubTitle + + tpYAxis - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 2 - - grpGraphTitles + + Button - - 11 + + Flat - - 9, 10 + + NoControl - - 525, 110 + + 282, 16 + + + 98, 27 + + + 43 - - 17 + + Date - - Graph + + MiddleCenter - - grpGraphTitles + + rdoYDate - - System.Windows.Forms.GroupBox, 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 - - tpTitles + + tpYAxis - - 2 + + 3 - - True + + Button - + + Flat + + NoControl - - 360, 83 + + 186, 16 - - 69, 13 + + 98, 27 - - 26 + + 42 - - Caption Size: + + Numeric - - lblCaptionSize + + MiddleCenter - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + rdoYNumeric - - grpGraphTitles + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tpYAxis - + + 4 + + True - + NoControl - - 360, 53 + + 15, 63 - - 75, 13 + + 65, 13 - - 27 + + 37 - - Sub Title Size: + + Start Month: - - lblSubTitleSize + + lblStartMonth - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpGraphTitles + + tpYAxis - - 1 + + 5 - + True - + NoControl - - 361, 23 + + 378, 64 - - 53, 13 + + 61, 13 - - 28 + + 22 - - Title Size: + + In Steps of: - - lblTitleSize + + lblYInStepsOf - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpGraphTitles + + tpYAxis - - 2 + + 6 - + True - + NoControl - - 5, 83 + + 257, 64 - - 78, 13 + + 23, 13 - - 23 + + 21 - - Graph Caption: + + To: - - lblCaption + + lblYTo - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpGraphTitles + + tpYAxis - - 3 + + 7 - + True - + NoControl - - 5, 53 + + 132, 64 - - 84, 13 + + 33, 13 - - 24 + + 20 - - Graph Sub Title: + + From: - - lblSubTitle + + lblYFrom - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - grpGraphTitles - - - 4 - - - True - - - NoControl + + tpYAxis - - 6, 23 + + 8 - - 62, 13 + + 243, 156 - - 25 + + 93, 21 - - Graph Title: + + 49 - - lblTitle + + ucrInputYSpecifyUpperLimitDateMonth - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles + + tpYAxis - - 5 + + 9 - - 448, 78 + + 169, 157 - - 50, 20 + + 59, 21 - - 22 + + 48 - - ucrNudCaptionSize + + ucrInputYSpecifyUpperLimitNumeric - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles + + tpYAxis - - 6 + + 10 - - 448, 48 + + 243, 126 - - 50, 20 + + 93, 21 - - 21 + + 46 - - ucrNudSubTitleSize + + ucrInputYSpecifyLowerLimitDateMonth - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles + + tpYAxis - - 7 + + 11 - - 448, 18 + + 18, 157 - - 50, 20 + + 141, 20 - - 20 + + 47 - - ucrNudTitleSize + + ucrChkYSpecifyUpperLimit - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles + + tpYAxis - - 8 + + 12 - - 119, 78 + + 169, 127 - - 181, 21 + + 59, 21 - - 16 + + 45 - - ucrInputGraphcCaption + + ucrInputYSpecifyLowerLimitNumeric - + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles + + tpYAxis - - 9 + + 13 - - 119, 18 + + 18, 127 - - 181, 21 + + 141, 20 - - 12 + + 44 - - ucrInputGraphTitle + + ucrChkYSpecifyLowerLimit - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles + + tpYAxis - - 10 + + 14 - - 119, 48 + + 161, 7 - - 181, 21 + + 243, 48 - - 14 + + 39 - - ucrInputGraphSubTitle + + ucrPnlYAxisType - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpGraphTitles + + tpYAxis - - 11 + + 15 - - ucrChkXAxisLabelSize + + 86, 60 - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 96, 21 - - grpXAxisLabels + + 38 - - 0 + + ucrInputStartMonth - - ucrChkXAxisAngle + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + 16 - - 1 + + 18, 61 - - ucrChkSpecifyXAxisTickMarks + + 111, 20 - + + 29 + + + ucrChkSpecifyYAxisTickMarks + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpXAxisLabels + + tpYAxis - - 2 + + 17 - - ucrInputXFrom + + 382, 89 - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 45, 20 - - grpXAxisLabels + + 36 - - 4 + + ucrNudDateBreakNumber - - ucrInputXInStepsOf + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + 18 - - 5 + + 443, 61 - - ucrNudXaxisLabelSize + + 50, 21 - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 23 - - grpXAxisLabels + + ucrInputYInStepsOf - - 6 + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - ucrInputXTo + + tpYAxis + + + 19 - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 433, 88 - - grpXAxisLabels + + 70, 21 - - 7 + + 35 - - ucrNudXAxisAngle + + ucrInputDateBreakTime - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpXAxisLabels + + tpYAxis - - 8 + + 20 - - 6, 8 + + 279, 90 - - 504, 93 + + 100, 20 - - 27 + + 34 - - X-Axis + + ucrChkSpecifyDateBreaks - - grpXAxisLabels + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tpYAxis - - tpXAxis + + 21 - - 0 + + 99, 90 - - 162, 57 + + 141, 21 - - 75, 20 + + 32 - - 30 + + ucrInputDateDisplayFormat - - ucrChkXAxisLabelSize + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + 22 - - 0 + + 284, 61 - - 6, 57 + + 52, 21 - - 75, 20 + + 24 - - 29 + + ucrInputYTo - - ucrChkXAxisAngle + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + 23 - - 1 + + 97, 195 - - 6, 22 + + 50, 20 - - 100, 20 + + 33 - - 28 + + ucrNudYAxisAngle - - ucrChkSpecifyXAxisTickMarks + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + 24 - - 2 + + 252, 195 - - 160, 21 + + 50, 20 - - 50, 21 + + 4 - - 25 + + ucrNudYAxisLabelSize - - ucrInputXFrom + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + 25 - - 4 + + 18, 195 - - 433, 21 + + 75, 20 - - 51, 21 + + 32 - - 23 + + ucrChkYAxisAngle - - ucrInputXInStepsOf + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + 26 - - 5 + + 169, 61 - - 241, 57 + + 50, 21 - - 50, 20 + + 25 - - 4 + + ucrInputYFrom - - ucrNudXaxisLabelSize + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + 27 - - 6 + + 173, 195 - - 275, 21 + + 75, 20 - - 51, 21 + + 31 - - 24 + + ucrChkYAxisLabelSize - - ucrInputXTo + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + 28 - - 7 + + 4, 22 - - 86, 57 + + 3, 3, 3, 3 - - 50, 20 + + 567, 309 - + 4 - - ucrNudXAxisAngle + + Y-Axis - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpYAxis - - grpXAxisLabels + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8 + + tbPICSA + + + 2 264, 201 @@ -2787,126 +1962,6 @@ 1 - - ucrNudLabelTransparency - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpLinesFormat - - - 0 - - - lblLabelTransparency - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpLinesFormat - - - 1 - - - ucrNudHLineSize - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpLinesFormat - - - 2 - - - ucrChkHLineSize - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpLinesFormat - - - 3 - - - ucrInputHLineType - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpLinesFormat - - - 4 - - - ucrInputHLineColour - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpLinesFormat - - - 5 - - - ucrChkHLineType - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpLinesFormat - - - 6 - - - ucrChkHLineColour - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpLinesFormat - - - 7 - - - 15, 230 - - - 487, 75 - - - 20 - - - Line Format - - - grpLinesFormat - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLines - - - 2 - 334, 50 @@ -3084,6 +2139,30 @@ 7 + + 15, 230 + + + 487, 75 + + + 20 + + + Line Format + + + grpLinesFormat + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpLines + + + 2 + True @@ -3549,143 +2628,62 @@ ucrChkAddMedian - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 22 - - - 25, 144 - - - 129, 20 - - - 1 - - - ucrChkAddTerciles - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpLines - - - 23 - - - lblMinorGridLineSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpMinorGridLine - - - 0 - - - ucrChkIncludeMinorGridLines - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpMinorGridLine - - - 1 - - - lblMinorGridLineLinetype - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpMinorGridLine - - - 2 - - - ucrNudMinorGridLineSize - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpMinorGridLine - - - 3 - - - lblMinorGridLineColour - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpMinorGridLine + + tpLines - - 4 + + 22 - - ucrInputMinorGridLineLinetype + + 25, 144 - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 129, 20 - - grpMinorGridLine + + 1 - - 5 + + ucrChkAddTerciles - - ucrInputMinorGridLineColour + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tpLines - - grpMinorGridLine + + 23 - - 6 + + 4, 22 - - 264, 166 + + 3, 3, 3, 3 - - 226, 140 + + 567, 309 - - 3 + + 2 - - Minor Grid Lines + + Lines - - grpMinorGridLine + + tpLines - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpPanel + + tbPICSA - - 0 + + 3 True @@ -3861,101 +2859,29 @@ 6 - - ucrNudBorderSize - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBorder - - - 0 - - - UcrChkBorderSize - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBorder - - - 1 - - - ucrInputBorderLinetype - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBorder - - - 2 - - - ucrInputBorderColour - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 264, 166 - - grpPnlBorder + + 226, 140 - + 3 - - ucrChkBorderLineType - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBorder - - - 4 - - - ucrChkBorderColour - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBorder - - - 5 - - - 264, 9 - - - 226, 117 - - - 2 - - - Border + + Minor Grid Lines - - grpPnlBorder + + grpMinorGridLine - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpPanel - - 1 + + 0 95, 86 @@ -4057,139 +2983,55 @@ instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - grpPnlBorder - - - 4 - - - 6, 23 - - - 100, 20 - - - 1 - - - ucrChkBorderColour - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBorder - - - 5 - - - lblMajorGridLineSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpMajorGridLines - - - 0 - - - lblMajorGridLineLinetype - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpMajorGridLines - - - 1 - - - lblMajorGridLineColour - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpMajorGridLines - - - 2 - - - ucrChkIncludeMajorGridLines - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpMajorGridLines - - - 3 - - - ucrNudMajorGridLineSize - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpMajorGridLines + grpPnlBorder - + 4 - - ucrInputMajorGridLineLinetype - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 6, 23 - - grpMajorGridLines + + 100, 20 - - 5 + + 1 - - ucrInputMajorGridLineColour + + ucrChkBorderColour - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - grpMajorGridLines + + grpPnlBorder - - 6 + + 5 - - 6, 166 + + 264, 9 - - 226, 140 + + 226, 117 - - 1 + + 2 - - Major Grid Lines + + Border - - grpMajorGridLines + + grpPnlBorder - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpPanel - - 2 + + 1 True @@ -4362,125 +3204,29 @@ 6 - - ucrNudPnlBackgroundSize - - - instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBackground - - - 0 - - - UcrInputPnlBackgroundFill - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + 6, 166 - - grpPnlBackground + + 226, 140 - + 1 - - UcrInputPnlBackgroundLinetype - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBackground - - - 2 - - - UcrInputPnlBackgroundColour - - - instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBackground - - - 3 - - - UcrChkPnlBackgroundSize - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBackground - - - 4 - - - UcrChkPnlBackgroundLineType - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBackground - - - 5 - - - UcrChkPnlBackgroundFill - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBackground - - - 6 - - - ucrChkPnlBackgroundColour - - - instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - grpPnlBackground - - - 7 - - - 6, 9 - - - 226, 154 - - - 0 - - - Background + + Major Grid Lines - - grpPnlBackground + + grpMajorGridLines - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpPanel - - 3 + + 2 94, 120 @@ -4650,6 +3396,78 @@ 7 + + 6, 9 + + + 226, 154 + + + 0 + + + Background + + + grpPnlBackground + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpPanel + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 567, 309 + + + 3 + + + Panel + + + tpPanel + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbPICSA + + + 4 + + + 10, 4 + + + 575, 335 + + + 26 + + + tbPICSA + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + 217, 338 diff --git a/instat/sdgPICSARainfallGraph.vb b/instat/sdgPICSARainfallGraph.vb index 576cb2c0b74..5ccbe86b92b 100644 --- a/instat/sdgPICSARainfallGraph.vb +++ b/instat/sdgPICSARainfallGraph.vb @@ -35,6 +35,7 @@ Public Class sdgPICSARainfallGraph Public clsBaseOperator As ROperator + Public clsPipeOperator As ROperator Public clsLabsFunction, clsXLabsFunction, clsYLabsFunction As RFunction Public clsXScaleContinuousFunction, clsYScaleContinuousFunction As New RFunction Public clsCLimitsYContinuous, clsCLimitsYDate, clsYLimitsYDate, clsAsDateLimit As New RFunction @@ -74,6 +75,7 @@ Public Class sdgPICSARainfallGraph Private clsGeomTextLabelMeanLine As New RFunction Private clsRoundMeanY As New RFunction + Private clsPasteRoundMeanY As New RFunction Private clsPasteMeanY As New RFunction Private clsFormatMeanY As New RFunction Private clsGeomTextLabelMedianLine As New RFunction @@ -529,13 +531,24 @@ Public Class sdgPICSARainfallGraph ucrNudLabelTransparency.Minimum = 0 ucrNudLabelTransparency.Maximum = 1 + ucrNudLowerLimit.Increment = 1 + ucrNudLowerLimit.Minimum = 1 + ucrNudLowerLimit.Maximum = 31 + ucrNudLowerLimit.Value = 1 + + ucrNudUpperLimit.Increment = 1 + ucrNudUpperLimit.Minimum = 1 + ucrNudUpperLimit.Maximum = 31 + ucrNudUpperLimit.Value = 31 + + bControlsInitialised = True End Sub - Public Sub SetRCode(clsNewOperator As ROperator, Optional clsNewLabsFunction As RFunction = Nothing, Optional clsNewXLabsFunction As RFunction = Nothing, Optional clsNewYLabsFunction As RFunction = Nothing, Optional clsNewXScaleContinuousFunction As RFunction = Nothing, Optional clsNewYScaleContinuousFunction As RFunction = Nothing, Optional clsNewYScaleDateFunction As RFunction = Nothing, Optional clsNewThemeFunction As RFunction = Nothing, Optional dctNewThemeFunctions As Dictionary(Of String, RFunction) = Nothing, Optional clsNewGeomhlineMean As RFunction = Nothing, Optional clsNewGeomhlineMedian As RFunction = Nothing, Optional clsNewGeomhlineLowerTercile As RFunction = Nothing, Optional clsNewGeomhlineUpperTercile As RFunction = Nothing, Optional clsNewRaesFunction As RFunction = Nothing, Optional clsNewAsDate As RFunction = Nothing, Optional clsNewAsDateYLimit As RFunction = Nothing, Optional clsNewAsNumeric As RFunction = Nothing, Optional clsNewDatePeriodOperator As ROperator = Nothing, Optional clsNewGeomTextLabelMeanLine As RFunction = Nothing, Optional clsNewRoundMeanY As RFunction = Nothing, Optional clsNewPasteMeanY As RFunction = Nothing, Optional clsNewGeomTextLabelMedianLine As RFunction = Nothing, Optional clsNewRoundMedianY As RFunction = Nothing, Optional clsNewPasteMedianY As RFunction = Nothing, Optional clsNewGeomTextLabelLowerTercileLine As RFunction = Nothing, Optional clsNewRoundLowerTercileY As RFunction = Nothing, Optional clsNewPasteLowerTercileY As RFunction = Nothing, Optional clsNewGeomTextLabelUpperTercileLine As RFunction = Nothing, Optional clsNewRoundUpperTercileY As RFunction = Nothing, Optional clsNewPasteUpperTercileY As RFunction = Nothing, Optional strXAxisType As String = "", Optional clsNewMutateFunction As RFunction = Nothing, Optional clsNewMeanFunction As RFunction = Nothing, Optional clsNewMedianFunction As RFunction = Nothing, Optional clsNewLowerTercileFunction As RFunction = Nothing, Optional clsNewUpperTercileFunction As RFunction = Nothing, Optional clsNewAsDateMeanY As RFunction = Nothing, Optional clsNewAsDateMedianY As RFunction = Nothing, Optional clsNewAsDateLowerTercileY As RFunction = Nothing, Optional clsNewAsDateUpperTercileY As RFunction = Nothing, Optional clsNewFormatMeanY As RFunction = Nothing, Optional clsNewFormatMedianY As RFunction = Nothing, Optional clsNewFormatLowerTercileY As RFunction = Nothing, Optional clsNewFormatUpperTercileY As RFunction = Nothing, Optional clsNewYLimitsYDate As RFunction = Nothing, Optional bReset As Boolean = False) + Public Sub SetRCode(clsNewOperator As ROperator, clsNewPipeOperator As ROperator, Optional clsNewLabsFunction As RFunction = Nothing, Optional clsNewXLabsFunction As RFunction = Nothing, Optional clsNewYLabsFunction As RFunction = Nothing, Optional clsNewXScaleContinuousFunction As RFunction = Nothing, Optional clsNewYScaleContinuousFunction As RFunction = Nothing, Optional clsNewYScaleDateFunction As RFunction = Nothing, Optional clsNewThemeFunction As RFunction = Nothing, Optional dctNewThemeFunctions As Dictionary(Of String, RFunction) = Nothing, Optional clsNewGeomhlineMean As RFunction = Nothing, Optional clsNewGeomhlineMedian As RFunction = Nothing, Optional clsNewGeomhlineLowerTercile As RFunction = Nothing, Optional clsNewGeomhlineUpperTercile As RFunction = Nothing, Optional clsNewRaesFunction As RFunction = Nothing, Optional clsNewAsDate As RFunction = Nothing, Optional clsNewAsDateYLimit As RFunction = Nothing, Optional clsNewAsNumeric As RFunction = Nothing, Optional clsNewDatePeriodOperator As ROperator = Nothing, Optional clsNewGeomTextLabelMeanLine As RFunction = Nothing, Optional clsNewRoundMeanY As RFunction = Nothing, Optional clsNewPasteRoundMeanY As RFunction = Nothing, Optional clsNewPasteMeanY As RFunction = Nothing, Optional clsNewGeomTextLabelMedianLine As RFunction = Nothing, Optional clsNewRoundMedianY As RFunction = Nothing, Optional clsNewPasteMedianY As RFunction = Nothing, Optional clsNewGeomTextLabelLowerTercileLine As RFunction = Nothing, Optional clsNewRoundLowerTercileY As RFunction = Nothing, Optional clsNewPasteLowerTercileY As RFunction = Nothing, Optional clsNewGeomTextLabelUpperTercileLine As RFunction = Nothing, Optional clsNewRoundUpperTercileY As RFunction = Nothing, Optional clsNewPasteUpperTercileY As RFunction = Nothing, Optional strXAxisType As String = "", Optional clsNewMutateFunction As RFunction = Nothing, Optional clsNewMeanFunction As RFunction = Nothing, Optional clsNewMedianFunction As RFunction = Nothing, Optional clsNewLowerTercileFunction As RFunction = Nothing, Optional clsNewUpperTercileFunction As RFunction = Nothing, Optional clsNewAsDateMeanY As RFunction = Nothing, Optional clsNewAsDateMedianY As RFunction = Nothing, Optional clsNewAsDateLowerTercileY As RFunction = Nothing, Optional clsNewAsDateUpperTercileY As RFunction = Nothing, Optional clsNewFormatMeanY As RFunction = Nothing, Optional clsNewFormatMedianY As RFunction = Nothing, Optional clsNewFormatLowerTercileY As RFunction = Nothing, Optional clsNewFormatUpperTercileY As RFunction = Nothing, Optional clsNewYLimitsYDate As RFunction = Nothing, Optional bReset As Boolean = False) bRCodeSet = False clsBaseOperator = clsNewOperator - + clsPipeOperator = clsNewPipeOperator If Not bControlsInitialised Then InitialiseControls() End If @@ -561,6 +574,7 @@ Public Class sdgPICSARainfallGraph clsGeomTextLabelMeanLine = clsNewGeomTextLabelMeanLine clsRoundMeanY = clsNewRoundMeanY + clsPasteRoundMeanY = clsNewPasteRoundMeanY clsPasteMeanY = clsNewPasteMeanY clsFormatMeanY = clsNewFormatMeanY clsGeomTextLabelMedianLine = clsNewGeomTextLabelMedianLine @@ -818,10 +832,10 @@ Public Class sdgPICSARainfallGraph ' scale_y_date function is used for the days lables ' scale_y_date(date_label = %d %b) - for day/month option ' scale_y_date(date_label = %j) - for day option - ucrInputDateDisplayFormat.AddAdditionalCodeParameterPair(clsFormatMeanY, New RParameter("format", 1), iAdditionalPairNo:=1) - ucrInputDateDisplayFormat.AddAdditionalCodeParameterPair(clsFormatMedianY, New RParameter("format", 1), iAdditionalPairNo:=2) - ucrInputDateDisplayFormat.AddAdditionalCodeParameterPair(clsFormatLowerTercileY, New RParameter("format", 1), iAdditionalPairNo:=3) - ucrInputDateDisplayFormat.AddAdditionalCodeParameterPair(clsFormatUpperTercileY, New RParameter("format", 1), iAdditionalPairNo:=4) + ucrInputDateDisplayFormat.AddAdditionalCodeParameterPair(clsFormatMeanY, New RParameter("format", 3), iAdditionalPairNo:=1) + ucrInputDateDisplayFormat.AddAdditionalCodeParameterPair(clsFormatMedianY, New RParameter("format", 3), iAdditionalPairNo:=2) + ucrInputDateDisplayFormat.AddAdditionalCodeParameterPair(clsFormatLowerTercileY, New RParameter("format", 3), iAdditionalPairNo:=3) + ucrInputDateDisplayFormat.AddAdditionalCodeParameterPair(clsFormatUpperTercileY, New RParameter("format", 3), iAdditionalPairNo:=4) ucrInputDateDisplayFormat.SetRCode(clsYScaleDateFunction, bReset, bCloneIfNeeded:=True) @@ -891,7 +905,7 @@ Public Class sdgPICSARainfallGraph ucrNudLabelTransparency.AddAdditionalCodeParameterPair(clsGeomTextLabelUpperTercileLine, New RParameter("alpha", 4), iAdditionalPairNo:=3) ucrNudLabelTransparency.SetRCode(clsGeomTextLabelMeanLine, bReset, bCloneIfNeeded:=True) - bRCodeSet = True + bRCodeSet = True AddRemoveTheme() AddRemoveLabs() AddRemoveXLabs() @@ -911,8 +925,21 @@ Public Class sdgPICSARainfallGraph AddRemoveMinorGridLines() AddRemovePanelBorder() AddRemoveDateBreaks() + ucrNudLowerLimit.Value = 1 + ucrNudUpperLimit.Value = 31 + ucrInputYSpecifyLowerLimitDateMonth.SetName("January") + ucrInputYSpecifyUpperLimitDateMonth.SetName("December") End Sub + Private Sub ucrChkAddMedian_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddMean.ControlValueChanged, ucrChkAddMedian.ControlValueChanged, ucrChkAddTerciles.ControlValueChanged + If ucrChkAddMean.Checked OrElse ucrChkAddMedian.Checked OrElse ucrChkAddTerciles.Checked Then + clsPipeOperator.AddParameter("mutate", clsRFunctionParameter:=clsMutateFunction, iPosition:=2) + Else + clsPipeOperator.RemoveParameterByName("mutate") + End If + End Sub + + Private Sub AddRemoveHline() If bRCodeSet Then If ucrChkAddMean.Checked Then @@ -927,15 +954,14 @@ Public Class sdgPICSARainfallGraph If ucrChkMeanLineLabelIncludeValue.Checked Then If rdoYNumeric.Checked Then 'a vector of mean, 'strMeanName' should be povided for faceting - clsPasteMeanY.AddParameter("1", clsRFunctionParameter:=clsRoundMeanY, bIncludeArgumentName:=False, iPosition:=1) - clsRoundMeanY.AddParameter("0", strMeanName, bIncludeArgumentName:=False, iPosition:=0) + clsPasteRoundMeanY.AddParameter("0", strMeanName, bIncludeArgumentName:=False, iPosition:=0) ElseIf rdoYDate.Checked Then - clsRoundMeanY.AddParameter("0", clsRFunctionParameter:=clsMeanFunction, bIncludeArgumentName:=False, iPosition:=0) + clsPasteRoundMeanY.AddParameter("0", clsRFunctionParameter:=clsMeanFunction, bIncludeArgumentName:=False, iPosition:=0) clsPasteMeanY.AddParameter("0", clsRFunctionParameter:=clsFormatMeanY, bIncludeArgumentName:=False, iPosition:=1) End If Else clsPasteMeanY.RemoveParameterByName("1") - clsRoundMeanY.RemoveParameterByName("0") + clsPasteRoundMeanY.RemoveParameterByName("0") End If Else clsBaseOperator.RemoveParameterByName("annotate_mean") @@ -1257,7 +1283,7 @@ Public Class sdgPICSARainfallGraph Private Sub AddRemoveDateBreaks() If bRCodeSet Then If ucrChkSpecifyDateBreaks.Checked AndAlso ucrNudDateBreakNumber.GetText <> "" AndAlso ucrInputDateBreakTime.GetText <> "" Then - clsYScaleDateFunction.AddParameter("date_breaks", clsROperatorParameter:=clsDatePeriodOperator) + clsYScaleDateFunction.AddParameter("date_breaks", clsROperatorParameter:=clsDatePeriodOperator, iPosition:=1) Else clsYScaleDateFunction.RemoveParameterByName("date_breaks") End If @@ -1270,18 +1296,36 @@ Public Class sdgPICSARainfallGraph AddRemoveDateLimits() End Sub + Private Sub SetDefault() + clsYLimitsYDate.AddParameter("min", 1) + clsYLimitsYDate.AddParameter("max", 31) + clsAsDateYLimit.AddParameter("x", clsRFunctionParameter:=clsYLimitsYDate) + clsYScaleDateFunction.AddParameter("limits", clsRFunctionParameter:=clsAsDateYLimit, iPosition:=0) + End Sub Private Sub AddRemoveDateLimits() - If rdoYDate.Checked AndAlso ucrChkYSpecifyLowerLimit.Checked AndAlso ucrChkYSpecifyUpperLimit.Checked Then - clsYLimitsYDate.AddParameter("min", Chr(34) & strLeapYearSelected & "/" & ucrInputYSpecifyLowerLimitDateMonth.GetText & "/" & ucrInputYSpecifyLowerLimitNumeric.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=0) - clsYLimitsYDate.AddParameter("max", Chr(34) & strLeapYearSelected & "/" & ucrInputYSpecifyUpperLimitDateMonth.GetText & "/" & ucrInputYSpecifyUpperLimitNumeric.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) - clsAsDateYLimit.AddParameter("x", clsRFunctionParameter:=clsYLimitsYDate) - clsYScaleDateFunction.AddParameter("limits", clsRFunctionParameter:=clsAsDateYLimit) - Else - clsYScaleDateFunction.RemoveParameterByName("limits") - clsYLimitsYDate.RemoveParameterByName("min") - clsYLimitsYDate.RemoveParameterByName("max") + If rdoYDate.Checked Then + If ucrChkYSpecifyLowerLimit.Checked AndAlso ucrChkYSpecifyUpperLimit.Checked Then + clsYLimitsYDate.AddParameter("min", Chr(34) & strLeapYearSelected & "/" & ucrInputYSpecifyLowerLimitDateMonth.GetText & "/" & ucrNudLowerLimit.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + clsYLimitsYDate.AddParameter("max", Chr(34) & strLeapYearSelected & "/" & ucrInputYSpecifyUpperLimitDateMonth.GetText & "/" & ucrNudUpperLimit.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) + clsAsDateYLimit.AddParameter("x", clsRFunctionParameter:=clsYLimitsYDate) + clsYScaleDateFunction.AddParameter("limits", clsRFunctionParameter:=clsAsDateYLimit, iPosition:=0) + ElseIf ucrChkYSpecifyLowerLimit.Checked AndAlso Not ucrChkYSpecifyUpperLimit.Checked Then + clsYLimitsYDate.AddParameter("min", Chr(34) & strLeapYearSelected & "/" & ucrInputYSpecifyLowerLimitDateMonth.GetText & "/" & ucrNudLowerLimit.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + clsYLimitsYDate.AddParameter("max", "NA", bIncludeArgumentName:=False, iPosition:=1) + clsAsDateYLimit.AddParameter("x", clsRFunctionParameter:=clsYLimitsYDate) + clsYScaleDateFunction.AddParameter("limits", clsRFunctionParameter:=clsAsDateYLimit, iPosition:=0) + ElseIf Not ucrChkYSpecifyLowerLimit.Checked AndAlso ucrChkYSpecifyUpperLimit.Checked Then + clsYLimitsYDate.AddParameter("min", "NA", bIncludeArgumentName:=False, iPosition:=0) + clsYLimitsYDate.AddParameter("max", Chr(34) & strLeapYearSelected & "/" & ucrInputYSpecifyUpperLimitDateMonth.GetText & "/" & ucrNudUpperLimit.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) + clsAsDateYLimit.AddParameter("x", clsRFunctionParameter:=clsYLimitsYDate) + clsYScaleDateFunction.AddParameter("limits", clsRFunctionParameter:=clsAsDateYLimit, iPosition:=0) + Else + clsYScaleDateFunction.RemoveParameterByName("limits") + clsYLimitsYDate.RemoveParameterByName("min") + clsYLimitsYDate.RemoveParameterByName("max") + End If End If End Sub @@ -1291,16 +1335,34 @@ Public Class sdgPICSARainfallGraph If rdoYDate.Checked Then If ucrChkYSpecifyLowerLimit.Checked Then + ucrNudLowerLimit.Visible = True ucrInputYSpecifyLowerLimitDateMonth.Visible = True + ucrInputYSpecifyLowerLimitNumeric.Visible = False Else + ucrNudLowerLimit.Visible = False ucrInputYSpecifyLowerLimitDateMonth.Visible = False End If If ucrChkYSpecifyUpperLimit.Checked Then + ucrNudUpperLimit.Visible = True ucrInputYSpecifyUpperLimitDateMonth.Visible = True + ucrInputYSpecifyUpperLimitNumeric.Visible = False Else + ucrNudUpperLimit.Visible = False ucrInputYSpecifyUpperLimitDateMonth.Visible = False End If + Else + ucrNudLowerLimit.Visible = False + ucrNudUpperLimit.Visible = False + If ucrChkYSpecifyLowerLimit.Checked Then + ucrInputYSpecifyLowerLimitNumeric.Visible = True + End If + If ucrChkYSpecifyUpperLimit.Checked Then + ucrInputYSpecifyUpperLimitNumeric.Visible = True + End If + + + End If End Sub