diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index eabdcff9ddc..9d1250831aa 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -294,6 +294,8 @@ Public Class clsDataFramePage columnHeader.strTypeShortCode = "(CX)" ElseIf strHeaderType.Contains("sfc_MULTIPOLYGON") OrElse strHeaderType.Contains("sfc") Then columnHeader.strTypeShortCode = "(G)" + ElseIf strHeaderType.Contains("Timeseries") OrElse strHeaderType.Contains("ts") Then + columnHeader.strTypeShortCode = "(TS)" ' Types of data for specific Application areas e.g. survival are coded with "(A)" ' No examples implemented yet. 'ElseIf strType.Contains() Then diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 6a5935e111a..dd664f4f927 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -1420,6 +1420,8 @@ Public Class RLink clsGetItems.SetRCommand(strInstatDataObject & "$get_link_names") Case "key" clsGetItems.SetRCommand(strInstatDataObject & "$get_key_names") + Case "scalar" + clsGetItems.SetRCommand(strInstatDataObject & "$get_scalar_names") Case "database_variables" clsGetItems.SetRCommand(strInstatDataObject & "$get_database_variable_names") clsGetItems.AddParameter("query", Chr(34) & strDatabaseQuery & Chr(34)) diff --git a/instat/clsRSyntax.vb b/instat/clsRSyntax.vb index c73283a7497..962d041bf4a 100644 --- a/instat/clsRSyntax.vb +++ b/instat/clsRSyntax.vb @@ -309,8 +309,8 @@ Public Class RSyntax 'Sometimes the output of the R-command we deal with should not be part of the script... 'That's only the case when this output has already been assigned. If (bUseBaseFunction AndAlso clsBaseFunction.IsAssigned()) OrElse - (bUseBaseOperator AndAlso clsBaseFunction.IsAssigned()) OrElse - (bUseCommandString AndAlso clsBaseFunction.IsAssigned()) Then + (bUseBaseOperator AndAlso clsBaseOperator.IsAssigned()) OrElse + (bUseCommandString AndAlso clsBaseCommandString.IsAssigned()) Then Return strScript End If End If diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index caa3ae1e37f..4b478348a95 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -198,7 +198,7 @@ Public Class dlgBoxplot ucrSaveBoxplot.SetPrefix("box_plot") ucrSaveBoxplot.SetIsComboBox() - ucrSaveBoxplot.SetCheckBoxText("Save Graph") + ucrSaveBoxplot.SetCheckBoxText("Store Graph") ucrSaveBoxplot.SetSaveTypeAsGraph() ucrSaveBoxplot.SetDataFrameSelector(ucrSelectorBoxPlot.ucrAvailableDataFrames) ucrSaveBoxplot.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 1a856338a42..29894939661 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -21,6 +21,8 @@ Public Class dlgCalculator Private clsAttachFunction As New RFunction Private clsDetachFunction As New RFunction Private clsRemoveLabelsFunction As New RFunction + Private clsScalarsDataFuntion, clsAddScalarFunction As New RFunction + Private clsAttachScalarsFunction, clsDetachScalarsFunction As New RFunction Public bFirstLoad As Boolean = True Public iHelpCalcID As Integer 'holds the original width of the form @@ -35,15 +37,15 @@ Public Class dlgCalculator iBasicWidth = Me.Width SetDefaults() bFirstLoad = False - Else - ReopenDialog() End If + + ReopenDialog() TestOKEnabled() autoTranslate(Me) End Sub Private Sub TestOKEnabled() - ucrBase.OKEnabled(Not ucrCalc.ucrReceiverForCalculation.IsEmpty AndAlso ucrCalc.ucrSaveResultInto.IsComplete) + ucrBase.OKEnabled(Not ucrCalc.ucrReceiverForCalculation.IsEmpty) End Sub Private Sub SetDefaults() @@ -54,6 +56,8 @@ Public Class dlgCalculator ucrCalc.ucrSaveResultInto.Reset() ucrCalc.ucrSaveResultInto.ucrChkSave.Checked = True ucrCalc.chkShowParameters.Checked = False + ucrCalc.ucrChkStoreScalar.Checked = False + ucrCalc.ucrSelectorForCalculations.ResetCheckBoxScalar() ucrCalc.ucrSaveResultInto.SetRCode(ucrBase.clsRsyntax.clsBaseCommandString) SaveResults() ucrCalc.ucrSelectorForCalculations.bUseCurrentFilter = False @@ -69,6 +73,8 @@ Public Class dlgCalculator Private Sub ReopenDialog() SaveResults() + ucrCalc.ucrSelectorForCalculations.ShowCheckBoxScalar(True) + ucrCalc.ucrChkStoreScalar.Checked = False End Sub Private Sub InitialiseDialog() @@ -77,6 +83,14 @@ Public Class dlgCalculator ucrCalc.ucrTryCalculator.SetIsCommand() ucrCalc.ucrTryCalculator.SetReceiver(ucrCalc.ucrReceiverForCalculation) + ucrCalc.ucrSelectorForCalculations.SetItemType("column") + ucrCalc.ucrReceiverForCalculation.strSelectorHeading = "Variables" + + clsAddScalarFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_scalar") + + clsScalarsDataFuntion.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_scalars") + clsScalarsDataFuntion.SetAssignTo("scalars") + clsRemoveLabelsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$append_to_variables_metadata") clsRemoveLabelsFunction.AddParameter("property", Chr(34) & "labels" & Chr(34), iPosition:=2) clsRemoveLabelsFunction.AddParameter("new_val", Chr(34) & Chr(34), iPosition:=3) @@ -84,21 +98,49 @@ Public Class dlgCalculator clsAttachFunction.SetRCommand("attach") clsDetachFunction.SetRCommand("detach") clsAttachFunction.AddParameter("what", clsRFunctionParameter:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.clsCurrDataFrame) - clsDetachFunction.AddParameter("name", clsRFunctionParameter:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.clsCurrDataFrame) clsDetachFunction.AddParameter("unload", "TRUE") + + clsAttachScalarsFunction.SetRCommand("attach") + clsDetachScalarsFunction.SetRCommand("detach") + clsAttachScalarsFunction.AddParameter("what", clsRFunctionParameter:=clsScalarsDataFuntion) + clsDetachScalarsFunction.AddParameter("name", "scalars") + clsDetachScalarsFunction.AddParameter("unload", "TRUE") + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachFunction, 0) - ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) + + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 1) + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) + ucrBase.clsRsyntax.SetCommandString("") ucrCalc.ucrSaveResultInto.SetPrefix("calc") ucrCalc.ucrSaveResultInto.SetSaveTypeAsColumn() ucrCalc.ucrSaveResultInto.SetIsComboBox() - ucrCalc.ucrSaveResultInto.SetCheckBoxText("Save Result") + ucrCalc.ucrSaveResultInto.SetCheckBoxText("Store Result") ucrCalc.ucrSaveResultInto.SetAssignToIfUncheckedValue("last_calc") ucrCalc.ucrSaveResultInto.SetDataFrameSelector(ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames) ucrCalc.ucrTryCalculator.StrvecOutputRequired() + AddHandler ucrCalc.ucrSelectorForCalculations.checkBoxScalar.CheckedChanged, AddressOf checkBoxScalar_CheckedChanged + + End Sub + + Private Sub checkBoxScalar_CheckedChanged() + SetItemType() + End Sub + + Private Sub SetItemType() + If Not String.IsNullOrEmpty(ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame) Then + If ucrCalc.ucrSelectorForCalculations.checkBoxScalar.Checked Then + ucrCalc.ucrReceiverForCalculation.strSelectorHeading = "Scalars" + ucrCalc.ucrSelectorForCalculations.SetItemType("scalar") + Else + ucrCalc.ucrReceiverForCalculation.strSelectorHeading = "Variables" + ucrCalc.ucrSelectorForCalculations.SetItemType("column") + End If + End If End Sub Public Sub SetDefaultKeyboard(strNewDefaultKeyboard As String) @@ -112,7 +154,6 @@ Public Class dlgCalculator Private Sub ucrCalc_SaveNameChanged() Handles ucrCalc.SaveNameChanged SaveResults() - TestOKEnabled() End Sub Private Sub ucrCalc_ControlValueChanged() Handles ucrCalc.ControlValueChanged @@ -125,7 +166,7 @@ Public Class dlgCalculator Private Sub SaveResults() If ucrCalc.ucrSaveResultInto.ucrChkSave.Checked AndAlso ucrCalc.ucrSaveResultInto.IsComplete Then clsRemoveLabelsFunction.AddParameter("col_names", Chr(34) & ucrCalc.ucrSaveResultInto.GetText() & Chr(34), iPosition:=1) - ucrBase.clsRsyntax.AddToAfterCodes(clsRemoveLabelsFunction, 1) + ucrBase.clsRsyntax.AddToAfterCodes(clsRemoveLabelsFunction, 3) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = True ucrBase.clsRsyntax.iCallType = 0 Else @@ -134,6 +175,43 @@ Public Class dlgCalculator ucrBase.clsRsyntax.iCallType = 5 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False End If + ManageScalarStorage() + End Sub + + Private Sub ManageScalarStorage() + + Dim dataFrameName As String = ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame + + ' Check if scalar should be stored + If ucrCalc.ucrChkStoreScalar.Checked AndAlso Not ucrCalc.ucrReceiverForCalculation.IsEmpty _ + AndAlso ucrCalc.ucrSaveResultInto.GetText <> "" _ + AndAlso Not String.IsNullOrEmpty(dataFrameName) Then + Dim strResut As String = ucrCalc.ucrSaveResultInto.GetText + clsAddScalarFunction.AddParameter("scalar_name", Chr(34) & strResut & Chr(34), iPosition:=1) + clsAddScalarFunction.AddParameter("scalar_value", strResut, iPosition:=2) + ucrBase.clsRsyntax.AddToAfterCodes(clsAddScalarFunction, 0) + ucrBase.clsRsyntax.SetAssignTo(strResut) + ucrCalc.ucrSaveResultInto.btnColumnPosition.Enabled = False + ucrCalc.ucrSaveResultInto.btnColumnPosition.Visible = True + ucrCalc.ucrSaveResultInto.ucrChkSave.Checked = False + ucrCalc.ucrSaveResultInto.ucrChkSave.Enabled = False + ucrCalc.ucrSaveResultInto.ucrInputComboSave.Visible = True + ucrCalc.ucrSaveResultInto.ucrInputComboSave.Enabled = True + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsAddScalarFunction) + ucrCalc.ucrSaveResultInto.btnColumnPosition.Enabled = True + ucrCalc.ucrSaveResultInto.btnColumnPosition.Visible = True + ucrCalc.ucrSaveResultInto.ucrChkSave.Enabled = True + ucrCalc.ucrSaveResultInto.ucrInputComboSave.Visible = True + ucrCalc.ucrSaveResultInto.ucrInputComboSave.Enabled = True + + End If + + ' Update command string and clear input try message name + ucrBase.clsRsyntax.SetCommandString(ucrCalc.ucrReceiverForCalculation.GetVariableNames(False)) + + ' Test if OK button can be enabled + TestOKEnabled() End Sub @@ -142,13 +220,46 @@ Public Class dlgCalculator End Sub Private Sub ucrCalc_SelectionChanged() Handles ucrCalc.SelectionChanged - ucrBase.clsRsyntax.SetCommandString(ucrCalc.ucrReceiverForCalculation.GetVariableNames(False)) - ucrCalc.ucrTryCalculator.ucrInputTryMessage.SetName("") + ucrCalc.ucrChkStoreScalar.Checked = False + ManageScalarStorage() + SaveResults() TestOKEnabled() End Sub Private Sub ucrSelectorForCalculation_DataframeChanged() Handles ucrCalc.DataFrameChanged - clsRemoveLabelsFunction.AddParameter("data_name", Chr(34) & ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame & Chr(34), iPosition:=0) + If Not String.IsNullOrEmpty(ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame) Then + Dim strDataFrame As String = ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame + ucrCalc.ucrTryCalculator.ucrInputTryMessage.SetName("") + clsScalarsDataFuntion.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34)) + clsDetachFunction.AddParameter("name", strDataFrame) + clsAddScalarFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) + clsRemoveLabelsFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) + SaveResults() + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachFunction, 0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) + + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 1) + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) + ucrCalc.ucrSaveResultInto.Enabled = True + ucrCalc.ucrChkStoreScalar.Visible = True + Else + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachFunction) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachScalarsFunction) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDetachFunction) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDetachScalarsFunction) + ucrCalc.ucrSelectorForCalculations.ResetCheckBoxScalar() + ucrCalc.ucrSaveResultInto.Enabled = False + ucrCalc.ucrChkStoreScalar.Visible = False + ucrCalc.ucrChkStoreScalar.Checked = False + End If + End Sub + + Private Sub ucrCalc_Click() Handles ucrCalc.CheckBoxClick + ManageScalarStorage() + End Sub + + Private Sub ucrCalc_ClearClick() Handles ucrCalc.ClearClick + ucrCalc.ucrChkStoreScalar.Checked = False End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -212,10 +323,6 @@ Public Class dlgCalculator End Select End Sub - Private Sub ucrSelectorForCalculations_DataframeChanged() Handles ucrCalc.DataFrameChanged - ucrCalc.ucrTryCalculator.ucrInputTryMessage.SetName("") - SaveResults() - End Sub End Class diff --git a/instat/dlgCluster.vb b/instat/dlgCluster.vb index a6b090c6139..724e58ea15e 100644 --- a/instat/dlgCluster.vb +++ b/instat/dlgCluster.vb @@ -111,7 +111,7 @@ Public Class dlgCluster ucrSaveDistance.SetSaveTypeAsDataFrame() ucrSaveDistance.SetDataFrameSelector(ucrSelectorPrepareData.ucrAvailableDataFrames) - ucrSaveDistance.SetCheckBoxText("Save Result:") + ucrSaveDistance.SetCheckBoxText("Store Result:") ucrSaveDistance.SetPrefix("distance") ucrSaveDistance.SetIsComboBox() ucrSaveDistance.SetAssignToIfUncheckedValue("last_distance") diff --git a/instat/dlgCompareColumns.vb b/instat/dlgCompareColumns.vb index b1336fb1939..38838c9e50f 100644 --- a/instat/dlgCompareColumns.vb +++ b/instat/dlgCompareColumns.vb @@ -114,7 +114,7 @@ Public Class dlgCompareColumns ucrSaveLogical.SetLabelText("New Column Name:") - ucrSaveLogical.SetLabelText("Save result for second column:") + ucrSaveLogical.SetLabelText("Store result for second column:") ucrSaveLogical.setLinkedReceiver(ucrReceiverSecond) ucrBase.clsRsyntax.iCallType = 2 diff --git a/instat/dlgDeleteObjects.vb b/instat/dlgDeleteObjects.vb index fa78b766a2c..85aa409d968 100644 --- a/instat/dlgDeleteObjects.vb +++ b/instat/dlgDeleteObjects.vb @@ -51,6 +51,7 @@ Public Class dlgDeleteObjects dctTypes.Add("Filters", Chr(34) & "filter" & Chr(34)) dctTypes.Add("Column selections", Chr(34) & "column_selection" & Chr(34)) dctTypes.Add("Calculations", Chr(34) & "calculation" & Chr(34)) + dctTypes.Add("Scalars", Chr(34) & "scalar" & Chr(34)) ucrInputComboType.SetItems(dctTypes) ucrInputComboType.SetDropDownStyleAsNonEditable() @@ -58,9 +59,6 @@ Public Class dlgDeleteObjects ucrReceiverObjectsToDelete.SetParameterIsString() ucrReceiverObjectsToDelete.Selector = ucrSelectorDeleteObject ucrReceiverObjectsToDelete.SetMeAsReceiver() - - - End Sub Private Sub SetDefaults() diff --git a/instat/dlgDuplicateColumns.Designer.vb b/instat/dlgDuplicateColumns.Designer.vb index 382c3a4b4db..635dff871c9 100644 --- a/instat/dlgDuplicateColumns.Designer.vb +++ b/instat/dlgDuplicateColumns.Designer.vb @@ -61,6 +61,7 @@ Partial Class dlgDuplicateColumns Me.ucrSelectorForDuplicateColumn = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrSaveColumn = New instat.ucrSave() + Me.ucrChkIgnoreLabels = New instat.ucrCheck() Me.grpConvertTo.SuspendLayout() Me.grpFactorToNumericOptions.SuspendLayout() Me.SuspendLayout() @@ -328,12 +329,23 @@ Partial Class dlgDuplicateColumns Me.ucrSaveColumn.Size = New System.Drawing.Size(327, 22) Me.ucrSaveColumn.TabIndex = 30 ' + 'ucrChkIgnoreLabels + ' + Me.ucrChkIgnoreLabels.AutoSize = True + Me.ucrChkIgnoreLabels.Checked = False + Me.ucrChkIgnoreLabels.Location = New System.Drawing.Point(371, 340) + Me.ucrChkIgnoreLabels.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrChkIgnoreLabels.Name = "ucrChkIgnoreLabels" + Me.ucrChkIgnoreLabels.Size = New System.Drawing.Size(100, 23) + Me.ucrChkIgnoreLabels.TabIndex = 31 + ' 'dlgDuplicateColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(486, 432) + Me.Controls.Add(Me.ucrChkIgnoreLabels) Me.Controls.Add(Me.ucrSaveColumn) Me.Controls.Add(Me.ucrChkChangeType) Me.Controls.Add(Me.ucrChkConvertCreateLabels) @@ -385,4 +397,5 @@ Partial Class dlgDuplicateColumns Friend WithEvents ucrChkConvertKeepAttributes As ucrCheck Friend WithEvents ucrChkChangeType As ucrCheck Friend WithEvents ucrSaveColumn As ucrSave + Friend WithEvents ucrChkIgnoreLabels As ucrCheck End Class diff --git a/instat/dlgDuplicateColumns.vb b/instat/dlgDuplicateColumns.vb index 449efa4c616..e7dce8b043d 100644 --- a/instat/dlgDuplicateColumns.vb +++ b/instat/dlgDuplicateColumns.vb @@ -108,6 +108,12 @@ Public Class dlgDuplicateColumns ucrChkConvertKeepAttributes.SetText("Keep Attributes") ucrChkConvertKeepAttributes.SetRDefault("TRUE") + ucrPnlConvertTo.AddToLinkedControls(ucrChkIgnoreLabels, {rdoConvertToNumeric}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkIgnoreLabels.SetParameter(New RParameter("ignore_labels", 7)) + ucrChkIgnoreLabels.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkIgnoreLabels.SetRDefault("FALSE") + ucrChkIgnoreLabels.SetText("Ignore Labels") + ucrPnlConvertTo.AddToLinkedControls(ucrChkConvertCreateLabels, {rdoConvertToNumeric}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkConvertCreateLabels.SetParameter(New RParameter("keep.labels", 7)) ucrChkConvertCreateLabels.SetText("Create Labels") @@ -218,4 +224,12 @@ Public Class dlgDuplicateColumns Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDuplicateColumns.ControlContentsChanged, ucrPnlConvertTo.ControlContentsChanged, ucrNudConvertDisplayDecimals.ControlContentsChanged, ucrChkConvertSpecifyDecimalsToDisplay.ControlContentsChanged, ucrChkChangeType.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrChkIgnoreLabels_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIgnoreLabels.ControlValueChanged + If ucrChkIgnoreLabels.Checked Then + clsConvertFunction.AddParameter("ignore_labels", "TRUE") + Else + clsConvertFunction.RemoveParameterByName("ignore_labels") + End If + End Sub End Class diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index f4685299ee9..2067cedc683 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -98,19 +98,26 @@ Public Class dlgEndOfRainsSeason Private clsEndSeasonWBMinCalcSubCalcsList As New RFunction Private clsReduceWBMinFunction As New RFunction Private clsReduceWBMinFunction1 As New RFunction + Private clsReduceWBMinFunction2 As New RFunction Private clsPMinWBMinFunction As New RFunction Private clsWBMinTailFunction As New RFunction Private clsWBMinTailFunction1 As New RFunction + Private clsWBMinTailFunction2 As New RFunction Private clsWBMinEvapOperator As New ROperator + Private clsMinusMinOperator As New ROperator + Private clsMinusMaxOperator As New ROperator ' Water Balance max Private clsEndSeasonWBMaxCalc As New RFunction Private clsEndSeasonWBMaxCalcSubCalcsList As New RFunction Private clsReduceWBMaxFunction As New RFunction Private clsReduceWBMaxFunction1 As New RFunction + Private clsReduceWBMaxFunction2 As New RFunction + Private clsAsNumericFunction As New RFunction Private clsPMinWBMaxFunction As New RFunction Private clsWBMaxTailFunction As New RFunction Private clsWBMaxTailFunction1 As New RFunction + Private clsWBMaxTailFunction2 As New RFunction Private clsWBMaxEvapOperator As New ROperator ' Water Balance @@ -297,11 +304,11 @@ Public Class dlgEndOfRainsSeason ucrInputEndofSeasonOccurence.SetDataFrameSelector(ucrSelectorForWaterBalance.ucrAvailableDataFrames) ucrInputEndofSeasonOccurence.SetValidationTypeAsRVariable() - ucrChkWB.SetParameter(New RParameter("WB_evap")) - ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkWB.AddParameterPresentCondition(True, "WB_evap", True) + ucrChkWB.AddParameterPresentCondition(False, "WB_evap", False) ucrChkWB.SetText("Reducing") - ucrNudWB.SetParameter(New RParameter("WB_evap_value")) + ucrNudWB.SetParameter(New RParameter("WB_evap_value", 2, False)) ucrNudWB.SetMinMax(0, 1) ucrNudWB.Increment = 0.01 ucrNudWB.DecimalPlaces = 2 @@ -421,9 +428,11 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMinCalcSubCalcsList.Clear() clsReduceWBMinFunction.Clear() clsReduceWBMinFunction1.Clear() + clsReduceWBMinFunction2.Clear() clsPMinWBMinFunction.Clear() clsWBMinTailFunction.Clear() clsWBMinTailFunction1.Clear() + clsWBMinTailFunction2.Clear() clsWBMinEvapOperator.Clear() ' Water Balance max @@ -431,9 +440,11 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMaxCalcSubCalcsList.Clear() clsReduceWBMaxFunction.Clear() clsReduceWBMaxFunction1.Clear() + clsReduceWBMaxFunction2.Clear() clsPMinWBMaxFunction.Clear() clsWBMaxTailFunction.Clear() clsWBMaxTailFunction1.Clear() + clsWBMaxTailFunction2.Clear() clsWBMaxEvapOperator.Clear() ' Water Balance @@ -484,6 +495,9 @@ Public Class dlgEndOfRainsSeason 'temporary fix rdoEndOfRains.Checked = True + ucrNudCapacity.SetText("100") + ucrNudWBLessThan.SetText("0.5") + ' Group by clsGroupByStationYearCalc.SetRCommand("instat_calculation$new") clsGroupByStationYearCalc.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0) @@ -694,9 +708,14 @@ Public Class dlgEndOfRainsSeason clsReduceWBMinFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) clsReduceWBMinFunction1.AddParameter(".init", "0", iPosition:=2) + clsReduceWBMinFunction2.bToScriptAsRString = True + clsReduceWBMinFunction2.SetPackageName("purrr") + clsReduceWBMinFunction2.SetRCommand("accumulate") + clsReduceWBMinFunction2.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction2.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction2, iPosition:=1) + clsReduceWBMinFunction2.AddParameter(".init", "0", iPosition:=2) + clsPMinWBMinFunction.SetRCommand(" ~ pmin") - clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPMinWBMinFunction.AddParameter("1", iCapacityDefault, iPosition:=1, bIncludeArgumentName:=False) clsWBMinTailFunction.SetRCommand("tail") clsWBMinTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMinEvapOperator, iPosition:=0) @@ -706,9 +725,21 @@ Public Class dlgEndOfRainsSeason clsWBMinTailFunction1.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(False), iPosition:=0) clsWBMinTailFunction1.AddParameter("n", "-1", iPosition:=1) + clsAsNumericFunction = New RFunction + clsAsNumericFunction.SetRCommand("as.numeric") + clsAsNumericFunction.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(), iPosition:=0, bIncludeArgumentName:=False) + + clsMinusMinOperator = New ROperator + clsMinusMinOperator.SetOperation("-") + clsMinusMinOperator.AddParameter("left", strRainMin, iPosition:=0, bIncludeArgumentName:=False) + clsMinusMinOperator.AddParameter("right", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMinTailFunction2.SetRCommand("tail") + clsWBMinTailFunction2.AddParameter("x", clsROperatorParameter:=clsMinusMinOperator, iPosition:=0, bIncludeArgumentName:=False) + clsWBMinTailFunction2.AddParameter("n", "-1", iPosition:=1) + clsWBMinEvapOperator.SetOperation("-") clsWBMinEvapOperator.AddParameter("0", strRainMin, iPosition:=0) - clsWBMinEvapOperator.AddParameter("value", "5", iPosition:=1) ' Water Balance max clsEndSeasonWBMaxCalc.SetRCommand("instat_calculation$new") @@ -735,9 +766,14 @@ Public Class dlgEndOfRainsSeason clsReduceWBMaxFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) clsReduceWBMaxFunction1.AddParameter(".init", "0", iPosition:=2) + clsReduceWBMaxFunction2.bToScriptAsRString = True + clsReduceWBMaxFunction2.SetPackageName("purrr") + clsReduceWBMaxFunction2.SetRCommand("accumulate") + clsReduceWBMaxFunction2.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction2.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction2, iPosition:=1) + clsReduceWBMaxFunction2.AddParameter(".init", "0", iPosition:=2) + clsPMinWBMaxFunction.SetRCommand(" ~ pmin") - clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPMinWBMaxFunction.AddParameter("1", iCapacityDefault, iPosition:=1, bIncludeArgumentName:=False) clsWBMaxTailFunction.SetRCommand("tail") clsWBMaxTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMaxEvapOperator, iPosition:=0) @@ -747,6 +783,15 @@ Public Class dlgEndOfRainsSeason clsWBMaxTailFunction1.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(False), iPosition:=0) clsWBMaxTailFunction1.AddParameter("n", "-1", iPosition:=1) + clsMinusMaxOperator = New ROperator + clsMinusMaxOperator.SetOperation("-") + clsMinusMaxOperator.AddParameter("left", strRainMax, iPosition:=0, bIncludeArgumentName:=False) + clsMinusMaxOperator.AddParameter("right", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMaxTailFunction2.SetRCommand("tail") + clsWBMaxTailFunction2.AddParameter("x", clsROperatorParameter:=clsMinusMaxOperator, iPosition:=0) + clsWBMaxTailFunction2.AddParameter("n", "-1", iPosition:=1) + clsWBMaxEvapOperator.SetOperation("-") clsWBMaxEvapOperator.AddParameter("0", strRainMax, iPosition:=0) clsWBMaxEvapOperator.AddParameter("value", "5", iPosition:=1) @@ -880,13 +925,9 @@ Public Class dlgEndOfRainsSeason ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIfElseRainMinFunction, New RParameter("no", 2), iAdditionalPairNo:=2) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIfElseRainMaxFunction, New RParameter("no", 2), iAdditionalPairNo:=3) ucrReceiverEvaporation.AddAdditionalCodeParameterPair(clsWBMaxTailFunction1, New RParameter("x", 0), iAdditionalPairNo:=1) + ucrReceiverEvaporation.AddAdditionalCodeParameterPair(clsAsNumericFunction, New RParameter("x", 0), iAdditionalPairNo:=2) ucrReceiverDate.AddAdditionalCodeParameterPair(clsFirstDateFunction, New RParameter("x", 0), iAdditionalPairNo:=1) - ucrNudCapacity.AddAdditionalCodeParameterPair(clsPMinWBMinFunction, New RParameter("1", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) - ucrNudCapacity.AddAdditionalCodeParameterPair(clsPMinWBMaxFunction, New RParameter("1", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) - - ucrInputEvaporation.AddAdditionalCodeParameterPair(clsWBMaxEvapOperator, New RParameter("value", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) - ucrReceiverDOY.SetRCode(clsDayToOperator, bReset) ucrInputEndRainDoy.SetRCode(clsEndRainsLastDoySummaryCalc, bReset) @@ -904,11 +945,11 @@ Public Class dlgEndOfRainsSeason ucrNudWBLessThan.SetRCode(clsEndSeasonWBConditionOperator, bReset) If bReset Then + ucrChkWB.SetRCode(clsWBEvaporationMinFunction, bReset) + ucrNudWB.SetRCode(clsWBEvaporationMinFunction, bReset) ucrPnlEvaporation.SetRCode(clsWBMinEvapOperator, bReset) - ucrInputEvaporation.SetRCode(clsWBMinEvapOperator, bReset) ucrReceiverEvaporation.SetRCode(clsWBMinTailFunction1, bReset) End If - ucrNudCapacity.SetRCode(clsIfElseRainMaxFunction, bReset) ucrChkEndofSeasonDoy.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) ucrChkEndofSeasonDate.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) @@ -1034,58 +1075,52 @@ Public Class dlgEndOfRainsSeason Private Sub Evaporation() If rdoEndOfSeasons.Checked Then + clsPMaxFunction.RemoveParameterByName("0") + clsPMaxFunction.RemoveParameterByName("0") + clsWBMinEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("value") + clsWBMinEvapOperator.RemoveParameterByName("value") + clsPMaxFunction.RemoveParameterByName("wb") + clsPMaxFunction.RemoveParameterByName("wb") + clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1, bIncludeArgumentName:=False) If rdoValueEvaporation.Checked Then clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) - clsWBMinEvapOperator.RemoveParameterByName("variable") - clsWBMaxEvapOperator.RemoveParameterByName("variable") If ucrChkWB.Checked Then clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) clsWBEvaporationMinFunction.AddParameter("yes", ucrNudCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) clsWBEvaporationMinFunction.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=3, bIncludeArgumentName:=False) clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunction.RemoveParameterByName("0") - clsPMaxFunction.RemoveParameterByName("0") - clsWBMaxEvapOperator.RemoveParameterByName("value") - clsWBMinEvapOperator.RemoveParameterByName("value") - clsPMinWBMaxFunction.RemoveParameterByName("1") - clsPMinWBMinFunction.RemoveParameterByName("1") + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) Else - clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunction.RemoveParameterByName("wb") - clsPMaxFunction.RemoveParameterByName("wb") clsWBMaxEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) clsWBMinEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) - clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) - clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) End If Else ucrReceiverEvaporation.SetMeAsReceiver() - clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction1, iPosition:=1) - clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction1, iPosition:=1) - clsWBMinEvapOperator.RemoveParameterByName("variable") - clsWBMaxEvapOperator.RemoveParameterByName("variable") If ucrChkWB.Checked Then + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction1, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction1, iPosition:=1) clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) clsWBEvaporationMinFunction.AddParameter("yes", ucrNudCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) clsWBEvaporationMinFunction.AddParameter("value", "..3", bIncludeArgumentName:=False, iPosition:=3) clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunction.RemoveParameterByName("0") - clsPMaxFunction.RemoveParameterByName("0") - clsWBMaxEvapOperator.RemoveParameterByName("value") - clsWBMinEvapOperator.RemoveParameterByName("value") - clsPMinWBMaxFunction.RemoveParameterByName("1") - clsPMinWBMinFunction.RemoveParameterByName("1") + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) Else + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction2, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction2, iPosition:=1) clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunction.RemoveParameterByName("wb") - clsPMaxFunction.RemoveParameterByName("wb") - clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) - clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) - clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) - clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) End If End If End If @@ -1098,6 +1133,7 @@ Public Class dlgEndOfRainsSeason Else clsRunCalculation.AddParameter("calc", clsRFunctionParameter:=clsEndSeasonCombinationCalc) clsFirstOrLastFunction = clsFirstDoyFunction + Evaporation() End If End Sub @@ -1160,4 +1196,13 @@ Public Class dlgEndOfRainsSeason Private Sub rdoValueEvaporation_CheckedChanged(sender As Object, e As EventArgs) Handles rdoValueEvaporation.CheckedChanged, rdoVariableEvaporation.CheckedChanged Evaporation() End Sub + + Private Sub ucrNudWBLessThan_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWBLessThan.ControlValueChanged, ucrChkEndofSeasonOccurence.ControlValueChanged, ucrInputEndofSeasonOccurence.ControlValueChanged, ucrChkEndofSeasonDate.ControlValueChanged, ucrInputEndofSeasonDate.ControlValueChanged, ucrChkEndofSeasonDoy.ControlValueChanged, ucrInputSeasonDoy.ControlValueChanged, ucrSelectorForWaterBalance.ControlValueChanged + If Not ucrNudWBLessThan.IsEmpty Then + clsEndSeasonWBConditionOperator.AddParameter("1", ucrNudWBLessThan.GetText(), iPosition:=1) + Else + clsEndSeasonWBConditionOperator.RemoveParameterByName("1") + End If + 'Evaporation() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb index edd151ed5b3..0e33704c4e6 100644 --- a/instat/dlgExportClimaticDefinitions.Designer.vb +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -35,20 +35,15 @@ Partial Class dlgExportClimaticDefinitions Me.lblYear = New System.Windows.Forms.Label() Me.ucrReceiverMonth = New instat.ucrReceiverSingle() Me.ucrReceiverYear = New instat.ucrReceiverSingle() - Me.Label1 = New System.Windows.Forms.Label() Me.ucrChkIncludeSummaryData = New instat.ucrCheck() Me.grpSummaries = New System.Windows.Forms.GroupBox() Me.ucrChkMonthlyTemp = New instat.ucrCheck() - Me.lblMaxTemp = New System.Windows.Forms.Label() Me.lblCropData = New System.Windows.Forms.Label() Me.lblDataByYearMonth = New System.Windows.Forms.Label() Me.lblDataByYear = New System.Windows.Forms.Label() Me.lblRain = New System.Windows.Forms.Label() - Me.lblMinTemp = New System.Windows.Forms.Label() Me.lblData = New System.Windows.Forms.Label() Me.ucrReceiverRain = New instat.ucrReceiverSingle() - Me.ucrReceiverMinTemp = New instat.ucrReceiverSingle() - Me.ucrReceiverMaxTemp = New instat.ucrReceiverSingle() Me.ucrReceiverData = New instat.ucrReceiverSingle() Me.ucrSelectorExportDefinitions = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() @@ -59,27 +54,29 @@ Partial Class dlgExportClimaticDefinitions Me.cmdChooseFile = New System.Windows.Forms.Button() Me.ucrInputTokenPath = New instat.ucrInputTextBox() Me.cmdDefine = New System.Windows.Forms.Button() + Me.lblDefinitionsID = New System.Windows.Forms.Label() + Me.ucrInputDefinitionsID = New instat.ucrInputTextBox() Me.grpSummaries.SuspendLayout() Me.SuspendLayout() ' 'lblStationID ' Me.lblStationID.AutoSize = True - Me.lblStationID.Location = New System.Drawing.Point(501, 194) + Me.lblStationID.Location = New System.Drawing.Point(498, 259) Me.lblStationID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblStationID.Name = "lblStationID" Me.lblStationID.Size = New System.Drawing.Size(85, 20) - Me.lblStationID.TabIndex = 7 + Me.lblStationID.TabIndex = 9 Me.lblStationID.Text = "Station ID:" ' 'lblCountry ' Me.lblCountry.AutoSize = True - Me.lblCountry.Location = New System.Drawing.Point(504, 251) + Me.lblCountry.Location = New System.Drawing.Point(498, 321) Me.lblCountry.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCountry.Name = "lblCountry" Me.lblCountry.Size = New System.Drawing.Size(68, 20) - Me.lblCountry.TabIndex = 9 + Me.lblCountry.TabIndex = 11 Me.lblCountry.Text = "Country:" ' 'ucrInputCountry @@ -88,11 +85,11 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputCountry.AutoSize = True Me.ucrInputCountry.IsMultiline = False Me.ucrInputCountry.IsReadOnly = False - Me.ucrInputCountry.Location = New System.Drawing.Point(501, 274) + Me.ucrInputCountry.Location = New System.Drawing.Point(498, 346) Me.ucrInputCountry.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputCountry.Name = "ucrInputCountry" Me.ucrInputCountry.Size = New System.Drawing.Size(177, 32) - Me.ucrInputCountry.TabIndex = 10 + Me.ucrInputCountry.TabIndex = 12 ' 'ucrInputStationID ' @@ -100,11 +97,11 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputStationID.AutoSize = True Me.ucrInputStationID.IsMultiline = False Me.ucrInputStationID.IsReadOnly = False - Me.ucrInputStationID.Location = New System.Drawing.Point(501, 218) + Me.ucrInputStationID.Location = New System.Drawing.Point(498, 284) Me.ucrInputStationID.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputStationID.Name = "ucrInputStationID" Me.ucrInputStationID.Size = New System.Drawing.Size(177, 32) - Me.ucrInputStationID.TabIndex = 8 + Me.ucrInputStationID.TabIndex = 10 ' 'ucrChkSeasonStartProp ' @@ -160,7 +157,7 @@ Partial Class dlgExportClimaticDefinitions 'lblMonth ' Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(504, 134) + Me.lblMonth.Location = New System.Drawing.Point(498, 136) Me.lblMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMonth.Name = "lblMonth" Me.lblMonth.Size = New System.Drawing.Size(58, 20) @@ -170,7 +167,7 @@ Partial Class dlgExportClimaticDefinitions 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(506, 75) + Me.lblYear.Location = New System.Drawing.Point(498, 75) Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblYear.Name = "lblYear" Me.lblYear.Size = New System.Drawing.Size(47, 20) @@ -181,7 +178,7 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverMonth.AutoSize = True Me.ucrReceiverMonth.frmParent = Me - Me.ucrReceiverMonth.Location = New System.Drawing.Point(498, 160) + Me.ucrReceiverMonth.Location = New System.Drawing.Point(498, 161) Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMonth.Name = "ucrReceiverMonth" Me.ucrReceiverMonth.Selector = Nothing @@ -194,7 +191,7 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(500, 100) + Me.ucrReceiverYear.Location = New System.Drawing.Point(498, 100) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing @@ -203,16 +200,6 @@ Partial Class dlgExportClimaticDefinitions Me.ucrReceiverYear.TabIndex = 4 Me.ucrReceiverYear.ucrSelector = Nothing ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(118, 703) - Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(0, 20) - Me.Label1.TabIndex = 30 - ' 'ucrChkIncludeSummaryData ' Me.ucrChkIncludeSummaryData.AutoSize = True @@ -221,7 +208,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkIncludeSummaryData.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkIncludeSummaryData.Name = "ucrChkIncludeSummaryData" Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(332, 48) - Me.ucrChkIncludeSummaryData.TabIndex = 24 + Me.ucrChkIncludeSummaryData.TabIndex = 26 ' 'grpSummaries ' @@ -236,7 +223,7 @@ Partial Class dlgExportClimaticDefinitions Me.grpSummaries.Name = "grpSummaries" Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.grpSummaries.Size = New System.Drawing.Size(470, 177) - Me.grpSummaries.TabIndex = 23 + Me.grpSummaries.TabIndex = 25 Me.grpSummaries.TabStop = False Me.grpSummaries.Text = "Summaries" ' @@ -250,66 +237,46 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(220, 52) Me.ucrChkMonthlyTemp.TabIndex = 4 ' - 'lblMaxTemp - ' - Me.lblMaxTemp.AutoSize = True - Me.lblMaxTemp.Location = New System.Drawing.Point(504, 635) - Me.lblMaxTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMaxTemp.Name = "lblMaxTemp" - Me.lblMaxTemp.Size = New System.Drawing.Size(86, 20) - Me.lblMaxTemp.TabIndex = 21 - Me.lblMaxTemp.Text = "Max Temp:" - ' 'lblCropData ' Me.lblCropData.AutoSize = True - Me.lblCropData.Location = New System.Drawing.Point(504, 442) + Me.lblCropData.Location = New System.Drawing.Point(498, 505) Me.lblCropData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCropData.Name = "lblCropData" Me.lblCropData.Size = New System.Drawing.Size(86, 20) - Me.lblCropData.TabIndex = 15 + Me.lblCropData.TabIndex = 17 Me.lblCropData.Text = "Crop Data:" ' 'lblDataByYearMonth ' Me.lblDataByYearMonth.AutoSize = True - Me.lblDataByYearMonth.Location = New System.Drawing.Point(500, 377) + Me.lblDataByYearMonth.Location = New System.Drawing.Point(498, 444) Me.lblDataByYearMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDataByYearMonth.Name = "lblDataByYearMonth" Me.lblDataByYearMonth.Size = New System.Drawing.Size(188, 20) - Me.lblDataByYearMonth.TabIndex = 13 + Me.lblDataByYearMonth.TabIndex = 15 Me.lblDataByYearMonth.Text = "Data By Year and Month:" ' 'lblDataByYear ' Me.lblDataByYear.AutoSize = True - Me.lblDataByYear.Location = New System.Drawing.Point(504, 311) + Me.lblDataByYear.Location = New System.Drawing.Point(498, 383) Me.lblDataByYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDataByYear.Name = "lblDataByYear" Me.lblDataByYear.Size = New System.Drawing.Size(108, 20) - Me.lblDataByYear.TabIndex = 11 + Me.lblDataByYear.TabIndex = 13 Me.lblDataByYear.Text = "Data By Year:" ' 'lblRain ' Me.lblRain.AutoSize = True - Me.lblRain.Location = New System.Drawing.Point(504, 505) + Me.lblRain.Location = New System.Drawing.Point(498, 566) Me.lblRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRain.Name = "lblRain" Me.lblRain.Size = New System.Drawing.Size(46, 20) - Me.lblRain.TabIndex = 17 + Me.lblRain.TabIndex = 19 Me.lblRain.Text = "Rain:" ' - 'lblMinTemp - ' - Me.lblMinTemp.AutoSize = True - Me.lblMinTemp.Location = New System.Drawing.Point(504, 571) - Me.lblMinTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMinTemp.Name = "lblMinTemp" - Me.lblMinTemp.Size = New System.Drawing.Size(82, 20) - Me.lblMinTemp.TabIndex = 19 - Me.lblMinTemp.Text = "Min Temp:" - ' 'lblData ' Me.lblData.AutoSize = True @@ -324,46 +291,20 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverRain.AutoSize = True Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(501, 531) + Me.ucrReceiverRain.Location = New System.Drawing.Point(498, 591) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing Me.ucrReceiverRain.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverRain.strNcFilePath = "" - Me.ucrReceiverRain.TabIndex = 18 + Me.ucrReceiverRain.TabIndex = 20 Me.ucrReceiverRain.ucrSelector = Nothing ' - 'ucrReceiverMinTemp - ' - Me.ucrReceiverMinTemp.AutoSize = True - Me.ucrReceiverMinTemp.frmParent = Me - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(501, 597) - Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" - Me.ucrReceiverMinTemp.Selector = Nothing - Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(180, 31) - Me.ucrReceiverMinTemp.strNcFilePath = "" - Me.ucrReceiverMinTemp.TabIndex = 20 - Me.ucrReceiverMinTemp.ucrSelector = Nothing - ' - 'ucrReceiverMaxTemp - ' - Me.ucrReceiverMaxTemp.AutoSize = True - Me.ucrReceiverMaxTemp.frmParent = Me - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(501, 663) - Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" - Me.ucrReceiverMaxTemp.Selector = Nothing - Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(180, 31) - Me.ucrReceiverMaxTemp.strNcFilePath = "" - Me.ucrReceiverMaxTemp.TabIndex = 22 - Me.ucrReceiverMaxTemp.ucrSelector = Nothing - ' 'ucrReceiverData ' Me.ucrReceiverData.AutoSize = True Me.ucrReceiverData.frmParent = Me - Me.ucrReceiverData.Location = New System.Drawing.Point(495, 40) + Me.ucrReceiverData.Location = New System.Drawing.Point(498, 39) Me.ucrReceiverData.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverData.Name = "ucrReceiverData" Me.ucrReceiverData.Selector = Nothing @@ -387,70 +328,70 @@ Partial Class dlgExportClimaticDefinitions 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(6, 705) + Me.ucrBase.Location = New System.Drawing.Point(6, 684) Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(615, 92) - Me.ucrBase.TabIndex = 29 + Me.ucrBase.TabIndex = 31 ' 'ucrReceiverDataYear ' Me.ucrReceiverDataYear.AutoSize = True Me.ucrReceiverDataYear.frmParent = Me - Me.ucrReceiverDataYear.Location = New System.Drawing.Point(501, 337) + Me.ucrReceiverDataYear.Location = New System.Drawing.Point(498, 408) Me.ucrReceiverDataYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYear.Name = "ucrReceiverDataYear" Me.ucrReceiverDataYear.Selector = Nothing Me.ucrReceiverDataYear.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverDataYear.strNcFilePath = "" - Me.ucrReceiverDataYear.TabIndex = 12 + Me.ucrReceiverDataYear.TabIndex = 14 Me.ucrReceiverDataYear.ucrSelector = Nothing ' 'ucrReceiverDataYearMonth ' Me.ucrReceiverDataYearMonth.AutoSize = True Me.ucrReceiverDataYearMonth.frmParent = Me - Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(501, 403) + Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(498, 469) Me.ucrReceiverDataYearMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYearMonth.Name = "ucrReceiverDataYearMonth" Me.ucrReceiverDataYearMonth.Selector = Nothing Me.ucrReceiverDataYearMonth.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverDataYearMonth.strNcFilePath = "" - Me.ucrReceiverDataYearMonth.TabIndex = 14 + Me.ucrReceiverDataYearMonth.TabIndex = 16 Me.ucrReceiverDataYearMonth.ucrSelector = Nothing ' 'ucrReceiverCropData ' Me.ucrReceiverCropData.AutoSize = True Me.ucrReceiverCropData.frmParent = Me - Me.ucrReceiverCropData.Location = New System.Drawing.Point(501, 466) + Me.ucrReceiverCropData.Location = New System.Drawing.Point(498, 530) Me.ucrReceiverCropData.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCropData.Name = "ucrReceiverCropData" Me.ucrReceiverCropData.Selector = Nothing Me.ucrReceiverCropData.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverCropData.strNcFilePath = "" - Me.ucrReceiverCropData.TabIndex = 16 + Me.ucrReceiverCropData.TabIndex = 18 Me.ucrReceiverCropData.ucrSelector = Nothing ' 'lblExport ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(10, 603) + Me.lblExport.Location = New System.Drawing.Point(14, 645) Me.lblExport.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblExport.Name = "lblExport" Me.lblExport.Size = New System.Drawing.Size(57, 20) - Me.lblExport.TabIndex = 26 + Me.lblExport.TabIndex = 28 Me.lblExport.Text = "Token:" ' 'cmdChooseFile ' Me.cmdChooseFile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChooseFile.Location = New System.Drawing.Point(380, 595) + Me.cmdChooseFile.Location = New System.Drawing.Point(384, 638) Me.cmdChooseFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cmdChooseFile.Name = "cmdChooseFile" Me.cmdChooseFile.Size = New System.Drawing.Size(120, 35) - Me.cmdChooseFile.TabIndex = 28 + Me.cmdChooseFile.TabIndex = 30 Me.cmdChooseFile.Text = "Browse" Me.cmdChooseFile.UseVisualStyleBackColor = True ' @@ -460,11 +401,11 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputTokenPath.AutoSize = True Me.ucrInputTokenPath.IsMultiline = False Me.ucrInputTokenPath.IsReadOnly = False - Me.ucrInputTokenPath.Location = New System.Drawing.Point(100, 598) + Me.ucrInputTokenPath.Location = New System.Drawing.Point(84, 641) Me.ucrInputTokenPath.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) Me.ucrInputTokenPath.Name = "ucrInputTokenPath" - Me.ucrInputTokenPath.Size = New System.Drawing.Size(273, 32) - Me.ucrInputTokenPath.TabIndex = 27 + Me.ucrInputTokenPath.Size = New System.Drawing.Size(287, 32) + Me.ucrInputTokenPath.TabIndex = 29 ' 'cmdDefine ' @@ -473,16 +414,40 @@ Partial Class dlgExportClimaticDefinitions Me.cmdDefine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cmdDefine.Name = "cmdDefine" Me.cmdDefine.Size = New System.Drawing.Size(120, 45) - Me.cmdDefine.TabIndex = 25 + Me.cmdDefine.TabIndex = 27 Me.cmdDefine.Text = "Define" Me.cmdDefine.UseVisualStyleBackColor = True ' + 'lblDefinitionsID + ' + Me.lblDefinitionsID.AutoSize = True + Me.lblDefinitionsID.Location = New System.Drawing.Point(503, 198) + Me.lblDefinitionsID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDefinitionsID.Name = "lblDefinitionsID" + Me.lblDefinitionsID.Size = New System.Drawing.Size(109, 20) + Me.lblDefinitionsID.TabIndex = 7 + Me.lblDefinitionsID.Text = "Definitions ID:" + ' + 'ucrInputDefinitionsID + ' + Me.ucrInputDefinitionsID.AddQuotesIfUnrecognised = True + Me.ucrInputDefinitionsID.AutoSize = True + Me.ucrInputDefinitionsID.IsMultiline = False + Me.ucrInputDefinitionsID.IsReadOnly = False + Me.ucrInputDefinitionsID.Location = New System.Drawing.Point(498, 222) + Me.ucrInputDefinitionsID.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputDefinitionsID.Name = "ucrInputDefinitionsID" + Me.ucrInputDefinitionsID.Size = New System.Drawing.Size(177, 32) + Me.ucrInputDefinitionsID.TabIndex = 8 + ' 'dlgExportClimaticDefinitions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(682, 811) + Me.ClientSize = New System.Drawing.Size(688, 772) + Me.Controls.Add(Me.lblDefinitionsID) + Me.Controls.Add(Me.ucrInputDefinitionsID) Me.Controls.Add(Me.cmdDefine) Me.Controls.Add(Me.lblExport) Me.Controls.Add(Me.cmdChooseFile) @@ -495,19 +460,14 @@ Partial Class dlgExportClimaticDefinitions Me.Controls.Add(Me.lblYear) Me.Controls.Add(Me.ucrReceiverMonth) Me.Controls.Add(Me.ucrReceiverYear) - Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrChkIncludeSummaryData) Me.Controls.Add(Me.grpSummaries) - Me.Controls.Add(Me.lblMaxTemp) Me.Controls.Add(Me.lblCropData) Me.Controls.Add(Me.lblDataByYearMonth) Me.Controls.Add(Me.lblDataByYear) Me.Controls.Add(Me.lblRain) - Me.Controls.Add(Me.lblMinTemp) Me.Controls.Add(Me.lblData) Me.Controls.Add(Me.ucrReceiverRain) - Me.Controls.Add(Me.ucrReceiverMinTemp) - Me.Controls.Add(Me.ucrReceiverMaxTemp) Me.Controls.Add(Me.ucrReceiverData) Me.Controls.Add(Me.ucrSelectorExportDefinitions) Me.Controls.Add(Me.ucrBase) @@ -541,20 +501,15 @@ Partial Class dlgExportClimaticDefinitions Friend WithEvents lblYear As Label Friend WithEvents ucrReceiverMonth As ucrReceiverSingle Friend WithEvents ucrReceiverYear As ucrReceiverSingle - Friend WithEvents Label1 As Label Friend WithEvents ucrChkIncludeSummaryData As ucrCheck Friend WithEvents grpSummaries As GroupBox Friend WithEvents ucrChkMonthlyTemp As ucrCheck - Friend WithEvents lblMaxTemp As Label Friend WithEvents lblCropData As Label Friend WithEvents lblDataByYearMonth As Label Friend WithEvents lblDataByYear As Label Friend WithEvents lblRain As Label - Friend WithEvents lblMinTemp As Label Friend WithEvents lblData As Label Friend WithEvents ucrReceiverRain As ucrReceiverSingle - Friend WithEvents ucrReceiverMinTemp As ucrReceiverSingle - Friend WithEvents ucrReceiverMaxTemp As ucrReceiverSingle Friend WithEvents ucrReceiverData As ucrReceiverSingle Friend WithEvents ucrSelectorExportDefinitions As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrBase As ucrButtons @@ -565,4 +520,6 @@ Partial Class dlgExportClimaticDefinitions Friend WithEvents cmdChooseFile As Button Friend WithEvents ucrInputTokenPath As ucrInputTextBox Friend WithEvents cmdDefine As Button + Friend WithEvents lblDefinitionsID As Label + Friend WithEvents ucrInputDefinitionsID As ucrInputTextBox End Class diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 0c1638dff41..76f0e71db2c 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -68,16 +68,6 @@ Public Class dlgExportClimaticDefinitions ucrReceiverCropData.strSelectorHeading = "Data Sets" ucrReceiverCropData.SetLinkedDisplayControl(lblCropData) - ucrReceiverMinTemp.SetParameter(New RParameter("tmin", 4)) - ucrReceiverMinTemp.Selector = ucrSelectorExportDefinitions - ucrReceiverMinTemp.SetParameterIsString() - ucrReceiverMinTemp.SetLinkedDisplayControl(lblMinTemp) - - ucrReceiverMaxTemp.SetParameter(New RParameter("tmax", 5)) - ucrReceiverMaxTemp.Selector = ucrSelectorExportDefinitions - ucrReceiverMaxTemp.SetParameterIsString() - ucrReceiverMaxTemp.SetLinkedDisplayControl(lblMaxTemp) - ucrReceiverRain.SetParameter(New RParameter("rain", 6)) ucrReceiverRain.Selector = ucrSelectorExportDefinitions ucrReceiverRain.SetParameterIsString() @@ -123,8 +113,8 @@ Public Class dlgExportClimaticDefinitions ucrChkIncludeSummaryData.SetRDefault("FALSE") ucrInputStationID.SetParameter(New RParameter("station_id", 18)) - - ucrInputCountry.SetParameter(New RParameter("country", 19)) + ucrInputDefinitionsID.SetParameter(New RParameter("definitions_id", 19)) + ucrInputCountry.SetParameter(New RParameter("country", 20)) ucrInputTokenPath.SetParameter(New RParameter("filename", 0)) @@ -189,8 +179,6 @@ Public Class dlgExportClimaticDefinitions ucrReceiverData.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverDataYear.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverDataYearMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) - ucrReceiverMaxTemp.SetRCode(clsExportRinstatToBucketFunction, bReset) - ucrReceiverMinTemp.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverRain.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverYear.SetRCode(clsExportRinstatToBucketFunction, bReset) @@ -198,6 +186,7 @@ Public Class dlgExportClimaticDefinitions ucrInputTokenPath.SetRCode(ClsGcsAuthFileFunction, bReset) ucrInputStationID.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrInputDefinitionsID.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrInputCountry.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrChkIncludeSummaryData.SetRCode(clsExportRinstatToBucketFunction, bReset) If bReset Then @@ -214,10 +203,10 @@ Public Class dlgExportClimaticDefinitions Private Sub TestOkEnabled() If Not ucrReceiverData.IsEmpty AndAlso - Not ucrReceiverMonth.IsEmpty AndAlso Not ucrReceiverYear.IsEmpty AndAlso Not ucrInputCountry.IsEmpty AndAlso Not ucrInputStationID.IsEmpty AndAlso + Not ucrInputDefinitionsID.IsEmpty AndAlso Not ucrInputTokenPath.IsEmpty Then If (ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked) AndAlso @@ -226,18 +215,13 @@ Public Class dlgExportClimaticDefinitions ElseIf ucrChkAnnualRainfall.Checked AndAlso Not ucrReceiverRain.IsEmpty Then ucrBase.OKEnabled(True) - ElseIf (ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso - Not ucrReceiverMinTemp.IsEmpty Then - ucrBase.OKEnabled(True) ElseIf (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked) AndAlso Not ucrReceiverDataYear.IsEmpty Then ucrBase.OKEnabled(True) ElseIf ucrChkMonthlyTemp.Checked AndAlso + Not ucrReceiverMonth.IsEmpty AndAlso Not ucrReceiverDataYearMonth.IsEmpty Then ucrBase.OKEnabled(True) - ElseIf (ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso - Not ucrReceiverMaxTemp.IsEmpty Then - ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) End If @@ -335,7 +319,7 @@ Public Class dlgExportClimaticDefinitions Private Sub ucrInputCountry_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCountry.ControlValueChanged If Not ucrInputCountry.IsEmpty Then - clsExportRinstatToBucketFunction.AddParameter("country", Chr(34) & ucrInputCountry.GetText & Chr(34), iPosition:=19) + clsExportRinstatToBucketFunction.AddParameter("country", Chr(34) & ucrInputCountry.GetText & Chr(34), iPosition:=20) Else clsExportRinstatToBucketFunction.RemoveParameterByName("country") End If @@ -349,14 +333,19 @@ Public Class dlgExportClimaticDefinitions End If End Sub + Private Sub ucrInputDefinitionsID_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputDefinitionsID.ControlValueChanged + If Not ucrInputDefinitionsID.IsEmpty Then + clsExportRinstatToBucketFunction.AddParameter("definitions_id", Chr(34) & ucrInputDefinitionsID.GetText & Chr(34), iPosition:=19) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("definitions_id") + End If + End Sub + Private Sub EnableDisableDefineButton() - cmdDefine.Enabled = ucrChkIncludeSummaryData.Checked AndAlso (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked OrElse ucrChkCropSuccessProp.Checked OrElse ucrChkExtremes.Checked OrElse ucrChkMonthlyTemp.Checked OrElse ucrChkSeasonStartProp.Checked) ucrReceiverDataYearMonth.Visible = ucrChkMonthlyTemp.Checked ucrReceiverDataYear.Visible = ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked ucrReceiverRain.Visible = ucrChkAnnualRainfall.Checked ucrReceiverCropData.Visible = ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked - ucrReceiverMaxTemp.Visible = ucrChkMonthlyTemp.Checked OrElse ucrChkAnnualTemp.Checked - ucrReceiverMinTemp.Visible = ucrChkMonthlyTemp.Checked OrElse ucrChkAnnualTemp.Checked End Sub @@ -378,9 +367,8 @@ Public Class dlgExportClimaticDefinitions End Sub - Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, - ucrReceiverMaxTemp.ControlContentsChanged, ucrReceiverMinTemp.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, - ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputStationID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, + Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, + ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputStationID.ControlContentsChanged, ucrInputDefinitionsID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, ucrChkMonthlyTemp.ControlContentsChanged, ucrChkCropSuccessProp.ControlContentsChanged, ucrChkAnnualTemp.ControlContentsChanged, ucrChkAnnualRainfall.ControlContentsChanged, ucrInputTokenPath.ControlContentsChanged, ucrSelectorExportDefinitions.ControlContentsChanged TestOkEnabled() End Sub diff --git a/instat/dlgLinePlot.designer.vb b/instat/dlgLinePlot.designer.vb index e265e1421d0..855b50854a0 100644 --- a/instat/dlgLinePlot.designer.vb +++ b/instat/dlgLinePlot.designer.vb @@ -147,6 +147,7 @@ Partial Class dlgLinePlot Me.lblFacetBy = New System.Windows.Forms.Label() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrChkLegend = New instat.ucrCheck() + Me.ucrChkAddLineLineRange = New instat.ucrCheck() Me.grpSmoothOptions.SuspendLayout() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() @@ -1303,11 +1304,21 @@ Partial Class dlgLinePlot Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) Me.ucrChkLegend.TabIndex = 82 ' + 'ucrChkAddLineLineRange + ' + Me.ucrChkAddLineLineRange.AutoSize = True + Me.ucrChkAddLineLineRange.Checked = False + Me.ucrChkAddLineLineRange.Location = New System.Drawing.Point(133, 337) + Me.ucrChkAddLineLineRange.Name = "ucrChkAddLineLineRange" + Me.ucrChkAddLineLineRange.Size = New System.Drawing.Size(77, 24) + Me.ucrChkAddLineLineRange.TabIndex = 84 + ' 'dlgLinePlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.ClientSize = New System.Drawing.Size(423, 563) + Me.Controls.Add(Me.ucrChkAddLineLineRange) Me.Controls.Add(Me.ucrInputStation) Me.Controls.Add(Me.ucr1stFactorReceiver) Me.Controls.Add(Me.lblFacetBy) @@ -1315,7 +1326,6 @@ Partial Class dlgLinePlot Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.rdoArea) Me.Controls.Add(Me.lblGroupLine) - Me.Controls.Add(Me.ucrReceiverGroup) Me.Controls.Add(Me.rdoErrorbar) Me.Controls.Add(Me.rdoPointrange) Me.Controls.Add(Me.rdoRibbon) @@ -1393,6 +1403,7 @@ Partial Class dlgLinePlot Me.Controls.Add(Me.ucrPnlStepOrPath) Me.Controls.Add(Me.lblSlopeY) Me.Controls.Add(Me.ucrPnlLinerangeOptions) + Me.Controls.Add(Me.ucrReceiverGroup) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -1515,4 +1526,5 @@ Partial Class dlgLinePlot Friend WithEvents lblFacetBy As Label Friend WithEvents ucrInputLegendPosition As ucrInputComboBox Friend WithEvents ucrChkLegend As ucrCheck + Friend WithEvents ucrChkAddLineLineRange As ucrCheck End Class diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 7f92eac8db7..b5d457c0fc9 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -18,7 +18,6 @@ Imports instat.Translations Public Class dlgLinePlot Private clsRggplotFunction As New RFunction - Private clsOptionsFunction As New RFunction Private clsRaesFunction As New RFunction Private clsBaseOperator As New ROperator Private bFirstLoad As Boolean = True @@ -42,7 +41,7 @@ Public Class dlgLinePlot Private clsLocalRaesFunction As New RFunction Private bResetLineLayerSubdialog As Boolean = True Private clsGeomSmoothFunc As New RFunction - Private clsGeomSmoothParameter As New RParameter + Private clsGeomLineFunc As New RFunction Private clsCoordPolarFunction As New RFunction Private clsCoordPolarStartOperator As New ROperator Private clsXScaleDateFunction As New RFunction @@ -62,6 +61,7 @@ Public Class dlgLinePlot Private clsGeomCrossbarFunction As New RFunction Private clsGeomErrorbarFunction As New RFunction Private clsGeomPointrangeFunction As New RFunction + Private clsDummyFunction As New RFunction Private clsFacetFunction As New RFunction Private clsFacetVariablesOperator As New ROperator @@ -79,7 +79,7 @@ Public Class dlgLinePlot Private bUpdatingParameters As Boolean = False 'Parameter names for geoms - Private strFirstParameterName As String = "geomfunc" + Private strFirstParameterName As String = "geom_line" Private strgeomSmoothParameterName As String = "geom_smooth" Private strGeomParameterNames() As String = {strFirstParameterName, strgeomSmoothParameterName} @@ -100,8 +100,6 @@ Public Class dlgLinePlot Private Sub InitialiseDialog() Dim clsGeomPointFunc As New RFunction Dim clsGeomPointParam As New RParameter - Dim clsGeomLineFunction As New RFunction - Dim clsGeomLineParameter As New RParameter Dim dctMethodOptions As New Dictionary(Of String, String) Dim dctFamilyOptions As New Dictionary(Of String, String) Dim dctColourOptions As New Dictionary(Of String, String) @@ -188,24 +186,12 @@ Public Class dlgLinePlot ucrChkAddPoints.SetText("Add Points") ucrChkAddPoints.SetParameter(clsGeomPointParam, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - clsGeomLineFunction.SetPackageName("ggplot2") - clsGeomLineFunction.SetRCommand("geom_line") - clsGeomLineParameter.SetArgumentName("geom_line") - clsGeomLineParameter.SetArgument(clsGeomLineFunction) - clsGeomLineParameter.Position = 4 ucrChkAddLine.SetText("Add Line") - ucrChkAddLine.SetParameter(clsGeomLineParameter, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - clsGeomSmoothFunc.SetPackageName("ggplot2") - clsGeomSmoothFunc.SetRCommand("geom_smooth") - clsGeomSmoothFunc.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) - clsGeomSmoothFunc.AddParameter("se", "FALSE", iPosition:=1) - clsGeomSmoothParameter.SetArgumentName(strgeomSmoothParameterName) - clsGeomSmoothParameter.SetArgument(clsGeomSmoothFunc) + ucrChkAddLineLineRange.SetText("Add Line") + ucrChkLineofBestFit.SetText("Add Line of Best Fit") ucrChkLineofBestFit.AddToLinkedControls(ucrChkWithSE, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineofBestFit.SetParameter(clsGeomSmoothParameter, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - ucrChkWithSE.SetText("Add SE") ucrChkWithSE.SetParameter(New RParameter("se", 1)) @@ -255,11 +241,11 @@ Public Class dlgLinePlot ucrPnlOptions.AddRadioButton(rdoDumbbell) ucrPnlOptions.AddRadioButton(rdoSlope) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoLine, strFirstParameterName, {"geom_line", "geom_area", "geom_path", "geom_step"}) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoSmoothing, strFirstParameterName, {"geom_smooth"}) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoLinerange, strFirstParameterName, {"geom_linerange", "geom_ribbon", "geom_pointrange", "geom_crossbar", "geom_errorbar"}) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoDumbbell, "dumbbellplot", {"geom_dumbbell"}) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoSlope, "slopeplot", {"slopegraph", "slopegraph_theme"}) + ucrPnlOptions.AddParameterValuesCondition(rdoLine, "check", "line") + ucrPnlOptions.AddParameterValuesCondition(rdoSmoothing, "check", "smooth") + ucrPnlOptions.AddParameterValuesCondition(rdoLinerange, "check", "Linerange") + ucrPnlOptions.AddParameterValuesCondition(rdoDumbbell, "check", "dumbbellplot") + ucrPnlOptions.AddParameterValuesCondition(rdoSlope, "check", "slopeplot") ucrInputMethod.SetParameter(New RParameter("method", 3)) dctMethodOptions.Add("loess", Chr(34) & "loess" & Chr(34)) @@ -448,7 +434,7 @@ Public Class dlgLinePlot ucrPnlOptions.AddToLinkedControls({ucrReceiverX}, {rdoLine, rdoDumbbell, rdoSmoothing, rdoLinerange}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrVariablesAsFactorForLinePlot}, {rdoLine, rdoSmoothing}, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrReceiverSlopeX, ucrReceiverSlopeColour, ucrChkSlopeLabelOptions, ucrChkSlopeTextOptions, ucrChkSlopeLineOptions, ucrChkSlopeLegend}, {rdoSlope}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlOptions.AddToLinkedControls({ucrReceiverYMax, ucrReceiverYMin, ucrChkRibbon}, {rdoLinerange}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrReceiverYMax, ucrChkAddLineLineRange, ucrReceiverYMin, ucrChkRibbon}, {rdoLinerange}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkDumbbellColour.AddToLinkedControls({ucrInputDumbbellX}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Orange") ucrChkDumbbellColour.AddToLinkedControls({ucrInputDumbbellXEnd}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Blue") ucrChkDumbbellColour.AddToLinkedControls({ucrInputDumbbellLine}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Black") @@ -497,7 +483,6 @@ Public Class dlgLinePlot Private Sub SetDefaults() clsRggplotFunction = New RFunction - clsOptionsFunction = New RFunction clsRaesFunction = New RFunction clsBaseOperator = New ROperator clsListFunction = New RFunction @@ -518,6 +503,7 @@ Public Class dlgLinePlot clsGeomPointrangeFunction = New RFunction clsGeomRibbonFunction = New RFunction clsFacetFunction = New RFunction + clsDummyFunction = New RFunction clsFacetVariablesOperator = New ROperator clsFacetRowOp = New ROperator clsFacetColOp = New ROperator @@ -535,13 +521,14 @@ Public Class dlgLinePlot bResetLineLayerSubdialog = True rdoArea.Checked = True rdoRibbon.Checked = True - ucrReceiverGroup.Visible = False ucrInputFormula.SetText("y ~ x") + clsDummyFunction.AddParameter("check", "line", iPosition:=0) + clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsOptionsFunction, iPosition:=2) + clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsGeomLineFunction, iPosition:=1) clsRggplotFunction.SetPackageName("ggplot2") clsRggplotFunction.SetRCommand("ggplot") @@ -550,15 +537,21 @@ Public Class dlgLinePlot clsRaesFunction.SetPackageName("ggplot2") clsRaesFunction.SetRCommand("aes") - clsAesLinerangeFunction.SetRCommand("aes") + clsGeomLineFunction.SetPackageName("ggplot2") + clsGeomLineFunction.SetRCommand("geom_line") - clsOptionsFunction.SetPackageName("ggplot2") - clsOptionsFunction.SetRCommand("geom_line") - clsOptionsFunction.AddParameter("se", "FALSE", iPosition:=1) + clsAesLinerangeFunction.SetRCommand("aes") clsDumbbellFunction.SetPackageName("ggalt") clsDumbbellFunction.SetRCommand("geom_dumbbell") + clsGeomLineFunc.SetPackageName("ggplot2") + clsGeomLineFunc.SetRCommand("geom_line") + + clsGeomSmoothFunc.SetPackageName("ggplot2") + clsGeomSmoothFunc.SetRCommand("geom_smooth") + clsGeomSmoothFunc.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) + clsGgSlopeFunction.SetRCommand("slopegraph") clsGgSlopeFunction.AddParameter("data", clsRFunctionParameter:=ucrLinePlotSelector.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) @@ -600,22 +593,14 @@ Public Class dlgLinePlot clsListFunction.SetRCommand("list") - clsGeomLineFunction.SetPackageName("ggplot2") - clsGeomLineFunction.SetRCommand("geom_line") - clsGeomLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34)) - clsGeomLineFunction.AddParameter("size", "0.8") - clsPathFunction.SetPackageName("ggplot2") clsPathFunction.SetRCommand("geom_path") - clsPathFunction.AddParameter("linemitre", "10") clsGeomStepFunction.SetPackageName("ggplot2") clsGeomStepFunction.SetRCommand("geom_step") clsGeomSmoothFunction.SetPackageName("ggplot2") clsGeomSmoothFunction.SetRCommand("geom_smooth") - clsGeomSmoothFunction.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) - clsGeomSmoothFunction.AddParameter("size", "1") clsGeomDumbbellFunction.SetPackageName("ggplot2") clsGeomDumbbellFunction.SetRCommand("geom_dumbbell") @@ -645,10 +630,10 @@ Public Class dlgLinePlot clsGeomPointrangeFunction.SetPackageName("ggplot2") clsGeomPointrangeFunction.SetRCommand("geom_pointrange") - clsGeomSmoothFunc.AddParameter("se", "FALSE", iPosition:=1) clsBaseOperator.RemoveParameterByName("geom_point") clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + SetGroupParam() End Sub Public Sub SetRCodeForControls(bReset As Boolean) @@ -664,17 +649,14 @@ Public Class dlgLinePlot ucrVariablesAsFactorForLinePlot.SetRCode(clsRaesFunction, bReset) ucrFactorOptionalReceiver.SetRCode(clsRaesFunction, bReset) ucrSave.SetRCode(clsBaseOperator, bReset) - ucrChkLineofBestFit.SetRCode(clsBaseOperator, bReset) ucrChkAddPoints.SetRCode(clsBaseOperator, bReset) ucrChkAddLine.SetRCode(clsBaseOperator, bReset) ucrChkWithSE.SetRCode(clsGeomSmoothFunc, bReset) - ucrChkAddSE.SetRCode(clsOptionsFunction, bReset) + ucrChkAddSE.SetRCode(clsGeomSmoothFunction, bReset) ucrReceiverYMax.SetRCode(clsAesLinerangeFunction, bReset) ucrReceiverYMin.SetRCode(clsAesLinerangeFunction, bReset) - ucrChkPathOrStep.SetRCode(clsOptionsFunction, bReset) - ucrPnlOptions.SetRCode(ucrBase.clsRsyntax.clsBaseOperator, bReset) - ucrInputMethod.SetRCode(clsOptionsFunction, bReset) - ucrNudSpan.SetRCode(clsOptionsFunction, bReset) + ucrInputMethod.SetRCode(clsGeomSmoothFunction, bReset) + ucrNudSpan.SetRCode(clsGeomSmoothFunction, bReset) ucrFamilyInput.SetRCode(clsListFunction, bReset) ucrChkFormula.SetRCode(clsBaseOperator, bReset) ucrChkDumbbellColour.SetRCode(clsDumbbellFunction, bReset) @@ -685,8 +667,13 @@ Public Class dlgLinePlot ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then - ucrChkRibbon.SetRCode(clsOptionsFunction, bReset) + ucrChkRibbon.SetRCode(clsBaseOperator, bReset) + ucrChkPathOrStep.SetRCode(clsBaseOperator, bReset) + ucrPnlOptions.SetRCode(clsDummyFunction, bReset) + ucrChkLineofBestFit.SetRCode(clsBaseOperator, bReset) + ucrChkAddLineLineRange.SetRCode(clsBaseOperator, bReset) End If + SetGroupParam() End Sub Private Sub TestOkEnabled() @@ -750,13 +737,13 @@ Public Class dlgLinePlot End Sub Private Sub ucrReceiverX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged, - ucrFactorOptionalReceiver.ControlValueChanged, ucrPnlOptions.ControlValueChanged, ucrReceiverGroup.ControlValueChanged + ucrFactorOptionalReceiver.ControlValueChanged, ucrReceiverGroup.ControlValueChanged SetGroupParam() End Sub Private Sub SetGroupParam() + ucrReceiverGroup.Visible = False If rdoLine.Checked OrElse rdoSmoothing.Checked OrElse rdoLinerange.Checked Then - ucrReceiverGroup.Visible = False If (Not ucrReceiverX.IsEmpty AndAlso ucrReceiverX.strCurrDataType.Contains("factor")) AndAlso ucrFactorOptionalReceiver.IsEmpty Then clsRaesFunction.AddParameter("group", "1", iPosition:=3) ucrReceiverGroup.Visible = False @@ -769,6 +756,7 @@ Public Class dlgLinePlot clsRaesFunction.RemoveParameterByName("group") End If Else + ucrReceiverGroup.Visible = False clsRaesFunction.RemoveParameterByName("group") End If End Sub @@ -776,92 +764,44 @@ Public Class dlgLinePlot Private Sub SetGraphPrefixAndRcommand() ucrVariablesAsFactorForLinePlot.SetMeAsReceiver() cmdOptions.Visible = True - clsBaseOperator.RemoveParameterByName("slopeplot") - clsBaseOperator.RemoveParameterByName("slopetheme") + clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_smooth1") clsBaseOperator.RemoveParameterByName("dumbbellplot") - clsOptionsFunction.RemoveParameterByName("stat") - clsOptionsFunction.RemoveParameterByName("position") - clsOptionsFunction.RemoveParameterByName("aes") + clsBaseOperator.RemoveParameterByName("slopeplot") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsOptionsFunction, iPosition:=1) - clsOptionsFunction.SetPackageName("ggplot2") If rdoLine.Checked Then - If ucrChkPathOrStep.Checked Then - If rdoArea.Checked Then - ucrSave.SetPrefix("area_plot") - clsRaesFunction.RemoveParameterByName("colour") - clsRaesFunction.AddParameter("fill", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) - clsOptionsFunction.SetRCommand("geom_area") - ElseIf rdoStep.Checked Then - ucrSave.SetPrefix("step_plot") - clsRaesFunction.RemoveParameterByName("fill") - clsRaesFunction.AddParameter("colour", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) - clsOptionsFunction.SetRCommand("geom_step") - Else - ucrSave.SetPrefix("path_plot") - clsRaesFunction.RemoveParameterByName("fill") - clsRaesFunction.AddParameter("colour", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) - clsOptionsFunction.SetRCommand("geom_path") - End If - Else - ucrSave.SetPrefix("line_plot") - clsRaesFunction.RemoveParameterByName("fill") - clsOptionsFunction.SetRCommand("geom_line") - End If + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=1) ElseIf rdoSmoothing.Checked Then - clsRaesFunction.RemoveParameterByName("fill") ucrSave.SetPrefix("smooth") - clsOptionsFunction.SetRCommand("geom_smooth") + clsBaseOperator.AddParameter("geom_smooth1", clsRFunctionParameter:=clsGeomSmoothFunction, iPosition:=1) ElseIf rdoLinerange.Checked Then ucrReceiverSlopeY.SetMeAsReceiver() - clsRaesFunction.RemoveParameterByName("fill") - clsOptionsFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) - clsOptionsFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) - clsOptionsFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) - If ucrChkRibbon.Checked Then - If rdoRibbon.Checked Then - ucrSave.SetPrefix("ribbon") - clsOptionsFunction.SetRCommand("geom_ribbon") - ElseIf rdoPointrange.Checked Then - ucrSave.SetPrefix("pointrange") - clsOptionsFunction.SetRCommand("geom_pointrange") - ElseIf rdoCrossbar.Checked Then - ucrSave.SetPrefix("crossbar") - clsOptionsFunction.SetRCommand("geom_crossbar") - Else - ucrSave.SetPrefix("errorbar") - clsOptionsFunction.SetRCommand("geom_errorbar") - End If - Else - ucrSave.SetPrefix("linerange") - clsOptionsFunction.SetRCommand("geom_linerange") - End If ElseIf rdoDumbbell.Checked Then ucrReceiverSlopeY.SetMeAsReceiver() - clsRaesFunction.RemoveParameterByName("fill") ucrSave.SetPrefix("dumbbell") - clsBaseOperator.RemoveParameterByName(strFirstParameterName) clsBaseOperator.AddParameter("dumbbellplot", clsRFunctionParameter:=clsDumbbellFunction, iPosition:=1) ElseIf rdoSlope.Checked Then ucrReceiverSlopeY.SetMeAsReceiver() - clsRaesFunction.RemoveParameterByName("fill") cmdOptions.Visible = False ucrSave.SetPrefix("slope") clsBaseOperator.RemoveParameterByName("ggplot") clsBaseOperator.RemoveParameterByName(strFirstParameterName) clsBaseOperator.AddParameter("slopeplot", clsRFunctionParameter:=clsGgSlopeFunction, iPosition:=0) - If ucrChkSlopeLegend.Checked Then - clsBaseOperator.RemoveParameterByName("slopetheme") - Else - clsBaseOperator.AddParameter("slopetheme", clsRFunctionParameter:=clsSlopeThemeFunction, iPosition:=-1) - End If End If End Sub - Private Sub ucrChkPathOrStep_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPathOrStep.ControlValueChanged, - ucrPnlStepOrPath.ControlValueChanged, ucrPnlOptions.ControlValueChanged, ucrChkSlopeLegend.ControlValueChanged, - ucrPnlLinerangeOptions.ControlValueChanged, ucrChkRibbon.ControlValueChanged, ucrFactorOptionalReceiver.ControlValueChanged + Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrFactorOptionalReceiver.ControlValueChanged SetGraphPrefixAndRcommand() + AddRemoveFormula() + AddRemoveGeomLine() + AddRemoveLineRange() + AddRemoveSlopeGraph() + AddRemoveMethodArgs() + AddRemoveLine() + AddRemoveSE() + AddRemoveBestFit() + SetGroupParam() + AddRemoveLineOnLineRange() End Sub Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrReceiverXEnd.ControlContentsChanged, @@ -871,22 +811,38 @@ Public Class dlgLinePlot TestOkEnabled() End Sub - Private Sub ucrInputMethod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputMethod.ControlValueChanged - If ucrInputMethod.GetText = "glm" OrElse ucrInputMethod.GetText = "gam" Then - clsOptionsFunction.AddParameter("method.args", clsRFunctionParameter:=clsListFunction, iPosition:=2) + Private Sub AddRemoveMethodArgs() + If rdoSmoothing.Checked Then + If ucrInputMethod.GetText = "glm" OrElse ucrInputMethod.GetText = "gam" Then + clsGeomSmoothFunction.AddParameter("method.args", clsRFunctionParameter:=clsListFunction, iPosition:=2) + Else + clsGeomSmoothFunction.RemoveParameterByName("method.args") + End If Else - clsOptionsFunction.RemoveParameterByName("method.args") + clsGeomSmoothFunction.RemoveParameterByName("method.args") End If End Sub - Private Sub ucrInputFormula_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFormula.ControlValueChanged, ucrChkFormula.ControlValueChanged - If ucrChkFormula.Checked AndAlso ucrInputFormula.GetText <> "" Then - clsOptionsFunction.AddParameter("formula", ucrInputFormula.GetText, iPosition:=1) + Private Sub ucrInputMethod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputMethod.ControlValueChanged + AddRemoveMethodArgs() + End Sub + + Private Sub AddRemoveFormula() + If rdoSmoothing.Checked Then + If ucrChkFormula.Checked AndAlso ucrInputFormula.GetText <> "" Then + clsGeomSmoothFunction.AddParameter("formula", ucrInputFormula.GetText, iPosition:=1) + Else + clsGeomSmoothFunction.RemoveParameterByName("formula") + End If Else - clsOptionsFunction.RemoveParameterByName("formula") + clsGeomSmoothFunction.RemoveParameterByName("formula") End If End Sub + Private Sub ucrInputFormula_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFormula.ControlValueChanged, ucrChkFormula.ControlValueChanged + AddRemoveFormula() + End Sub + Private Sub AddRemoveTheme() If clsThemeFunction.iParameterCount > 0 Then clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) @@ -919,10 +875,14 @@ Public Class dlgLinePlot End Sub Private Sub LineOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LineOptionsToolStripMenuItem.Click + clsGeomLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34)) + clsGeomLineFunction.AddParameter("size", "0.8") openSdgLayerOptions(clsGeomLineFunction) End Sub Private Sub SmoothOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SmoothOptionsToolStripMenuItem.Click + clsGeomSmoothFunction.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) + clsGeomSmoothFunction.AddParameter("size", "1") openSdgLayerOptions(clsGeomSmoothFunction) End Sub @@ -931,6 +891,7 @@ Public Class dlgLinePlot End Sub Private Sub PathOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PathOptionsToolStripMenuItem.Click + clsPathFunction.AddParameter("linemitre", "10") openSdgLayerOptions(clsPathFunction) End Sub @@ -1114,4 +1075,202 @@ Public Class dlgLinePlot AutoFacetStation() SetPipeAssignTo() End Sub + + Private Sub AddRemoveGeomLine() + If rdoLine.Checked Then + ucrSave.SetPrefix("line_plot") + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=1) + If ucrChkPathOrStep.Checked Then + clsBaseOperator.RemoveParameterByName("geom_area") + clsBaseOperator.RemoveParameterByName("geom_step") + clsBaseOperator.RemoveParameterByName("geom_path") + clsBaseOperator.RemoveParameterByName("geom_line") + clsRaesFunction.RemoveParameterByName("fill") + clsRaesFunction.RemoveParameterByName("colour") + If rdoArea.Checked Then + ucrSave.SetPrefix("area_plot") + clsRaesFunction.AddParameter("fill", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction, iPosition:=1) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_area", clsRFunctionParameter:=clsGeomAreaFunction, iPosition:=1) + ElseIf rdoStep.Checked Then + ucrSave.SetPrefix("step_plot") + clsRaesFunction.AddParameter("colour", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction, iPosition:=1) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_step", clsRFunctionParameter:=clsGeomStepFunction, iPosition:=1) + Else + ucrSave.SetPrefix("path_plot") + clsRaesFunction.AddParameter("colour", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction, iPosition:=1) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_path", clsRFunctionParameter:=clsPathFunction, iPosition:=1) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_area") + clsBaseOperator.RemoveParameterByName("geom_step") + clsBaseOperator.RemoveParameterByName("geom_path") + ucrSave.SetPrefix("line_plot") + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=1) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_area") + clsBaseOperator.RemoveParameterByName("geom_step") + clsBaseOperator.RemoveParameterByName("geom_path") + clsBaseOperator.RemoveParameterByName("geom_line") + End If + End Sub + + Private Sub ucrChkPathOrStep_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPathOrStep.ControlValueChanged, ucrPnlStepOrPath.ControlValueChanged + AddRemoveGeomLine() + End Sub + + Private Sub AddRemoveLineRange() + If rdoLinerange.Checked Then + ucrSave.SetPrefix("linerange") + clsGeomLinerangeFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomLinerangeFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomLinerangeFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_linerange", clsRFunctionParameter:=clsGeomLinerangeFunction, iPosition:=1) + If ucrChkRibbon.Checked Then + clsBaseOperator.RemoveParameterByName("geom_linerange") + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("geom_pointrange") + clsBaseOperator.RemoveParameterByName("geom_crossbar") + clsBaseOperator.RemoveParameterByName("geom_errorbar") + If rdoRibbon.Checked Then + ucrSave.SetPrefix("ribbon") + clsRaesFunction.AddParameter("colour", Chr(34) & "grey" & Chr(34), iPosition:=2) + clsGeomRibbonFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomRibbonFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomRibbonFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) + ElseIf rdoPointrange.Checked Then + ucrSave.SetPrefix("pointrange") + clsGeomPointrangeFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomPointrangeFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomPointrangeFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_pointrange", clsRFunctionParameter:=clsGeomPointrangeFunction, iPosition:=1) + ElseIf rdoCrossbar.Checked Then + ucrSave.SetPrefix("crossbar") + clsGeomCrossbarFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomCrossbarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomCrossbarFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_crossbar", clsRFunctionParameter:=clsGeomCrossbarFunction, iPosition:=1) + Else + ucrSave.SetPrefix("errorbar") + clsGeomErrorbarFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomErrorbarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomErrorbarFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_errorbar", clsRFunctionParameter:=clsGeomErrorbarFunction, iPosition:=1) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("geom_pointrange") + clsBaseOperator.RemoveParameterByName("geom_crossbar") + clsBaseOperator.RemoveParameterByName("geom_errorbar") + ucrSave.SetPrefix("linerange") + clsGeomLinerangeFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomLinerangeFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomLinerangeFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_linerange", clsRFunctionParameter:=clsGeomLinerangeFunction, iPosition:=1) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_linerange") + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("geom_pointrange") + clsBaseOperator.RemoveParameterByName("geom_crossbar") + clsBaseOperator.RemoveParameterByName("geom_errorbar") + End If + End Sub + + Private Sub ucrChkRibbon_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkRibbon.ControlValueChanged, ucrPnlLinerangeOptions.ControlValueChanged + AddRemoveLineRange() + End Sub + + Private Sub AddRemoveSlopeGraph() + If rdoSlope.Checked Then + If ucrChkSlopeLegend.Checked Then + clsBaseOperator.RemoveParameterByName("slopetheme") + Else + clsBaseOperator.AddParameter("slopetheme", clsRFunctionParameter:=clsSlopeThemeFunction, iPosition:=-1) + End If + Else + clsBaseOperator.RemoveParameterByName("slopetheme") + End If + End Sub + + Private Sub ucrChkSlopeLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSlopeLegend.ControlValueChanged + AddRemoveSlopeGraph() + End Sub + + Private Sub AddRemoveLine() + If rdoSmoothing.Checked Then + If ucrChkAddLine.Checked Then + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunc, iPosition:=4, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("geom_line1") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_line1") + End If + End Sub + + Private Sub AddRemoveLineOnLineRange() + If rdoLinerange.Checked Then + If ucrChkAddLineLineRange.Checked Then + clsBaseOperator.AddParameter("geom_line2", clsRFunctionParameter:=clsGeomLineFunc, iPosition:=4, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("geom_line2") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_line2") + End If + End Sub + + Private Sub ucrChkAddLine_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddLine.ControlValueChanged + AddRemoveLine() + End Sub + + Private Sub AddRemoveSE() + If rdoSmoothing.Checked Then + clsBaseOperator.AddParameter("geom_smooth1", clsRFunctionParameter:=clsGeomSmoothFunction, iPosition:=1, bIncludeArgumentName:=False) + If ucrChkAddSE.Checked Then + clsGeomSmoothFunction.AddParameter("se", "TRUE", iPosition:=0) + Else + clsGeomSmoothFunction.AddParameter("se", "FALSE", iPosition:=0) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_smooth1") + End If + End Sub + + Private Sub ucrChkAddSE_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddSE.ControlValueChanged + AddRemoveSE() + End Sub + + Private Sub AddRemoveBestFit() + If rdoLine.Checked Then + If ucrChkLineofBestFit.Checked Then + clsBaseOperator.AddParameter("geom_smooth", clsRFunctionParameter:=clsGeomSmoothFunc, iPosition:=2) + If ucrChkWithSE.Checked Then + clsGeomSmoothFunc.AddParameter("se", "TRUE", iPosition:=0) + Else + clsGeomSmoothFunc.AddParameter("se", "FALSE", iPosition:=0) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_smooth") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_smooth") + End If + End Sub + + Private Sub ucrChkLineofBestFit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLineofBestFit.ControlValueChanged, ucrChkWithSE.ControlValueChanged + AddRemoveBestFit() + End Sub + + Private Sub ucrChkAddLineLineRange_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddLineLineRange.ControlValueChanged + AddRemoveLineOnLineRange() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgMakeDate.vb b/instat/dlgMakeDate.vb index 156cb7864a0..44d4c52cc9d 100644 --- a/instat/dlgMakeDate.vb +++ b/instat/dlgMakeDate.vb @@ -180,7 +180,7 @@ Public Class dlgMakeDate ucrSaveDate.SetPrefix("date") ucrSaveDate.SetSaveTypeAsColumn() ucrSaveDate.SetDataFrameSelector(ucrSelectorMakeDate.ucrAvailableDataFrames) - ucrSaveDate.SetLabelText("Save Date:") + ucrSaveDate.SetLabelText("Store Date:") ucrSaveDate.SetIsComboBox() diff --git a/instat/dlgOneVariableGraph.vb b/instat/dlgOneVariableGraph.vb index c0bd47d6472..cfe8199758b 100644 --- a/instat/dlgOneVariableGraph.vb +++ b/instat/dlgOneVariableGraph.vb @@ -74,7 +74,7 @@ Public Class dlgOneVariableGraph ucrSaveGraph.SetPrefix("one_var") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorOneVarGraph.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index d2fbe9ad3fb..325e6d92621 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -384,19 +384,19 @@ Public Class dlgOneVariableSummarise ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveSummary.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveSummary.SetAssignToIfUncheckedValue("last_table") - ucrSaveSummary.SetCheckBoxText("Save Table") + ucrSaveSummary.SetCheckBoxText("Store Table") ElseIf rdoDefault.Checked Then clsDummyFunction.AddParameter("checked_radio", "defaults", iPosition:=0) ucrBase.clsRsyntax.SetBaseRFunction(clsSummaryFunction) ucrSaveSummary.SetSaveType(RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveSummary.SetAssignToIfUncheckedValue("last_summary") - ucrSaveSummary.SetCheckBoxText("Save Summary") + ucrSaveSummary.SetCheckBoxText("Store Summary") ElseIf rdoSkim.Checked Then clsDummyFunction.AddParameter("checked_radio", "skim", iPosition:=0) ucrBase.clsRsyntax.SetBaseRFunction(clsSkimrFunction) ucrSaveSummary.SetSaveType(RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveSummary.SetAssignToIfUncheckedValue("last_summary") - ucrSaveSummary.SetCheckBoxText("Save Summary") + ucrSaveSummary.SetCheckBoxText("Store Summary") End If cmdSummaries.Visible = rdoCustomised.Checked cmdFormatTable.Visible = rdoCustomised.Checked diff --git a/instat/dlgOneWayFrequencies.vb b/instat/dlgOneWayFrequencies.vb index 71696613278..a4a08b5d66c 100644 --- a/instat/dlgOneWayFrequencies.vb +++ b/instat/dlgOneWayFrequencies.vb @@ -310,7 +310,7 @@ Public Class dlgOneWayFrequencies If rdoTableAsOutput.Checked Then ucrSaveFreq.SetSaveType(strRObjectType:=RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveFreq.SetPrefix("freq_summary") - ucrSaveFreq.SetCheckBoxText("Save Summary") + ucrSaveFreq.SetCheckBoxText("Store Summary") ucrSaveFreq.SetAssignToIfUncheckedValue("last_summary") 'restore assign to @@ -323,7 +323,7 @@ Public Class dlgOneWayFrequencies ucrBase.clsRsyntax.SetBaseRFunction(clsTableSjMiscFrqRFunction) Else ucrSaveFreq.SetPrefix("one_way_freq") - ucrSaveFreq.SetCheckBoxText("Save Data Frame") + ucrSaveFreq.SetCheckBoxText("Store Data Frame") ucrSaveFreq.SetSaveType(strRObjectType:=RObjectTypeLabel.Dataframe) ucrSaveFreq.SetAssignToIfUncheckedValue("one_way_freq") @@ -334,7 +334,7 @@ Public Class dlgOneWayFrequencies End If ElseIf rdoFrqGraph.Checked Then ucrSaveFreq.SetSaveType(strRObjectType:=RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) - ucrSaveFreq.SetCheckBoxText("Save Graph") + ucrSaveFreq.SetCheckBoxText("Store Graph") ucrSaveFreq.SetPrefix("freq_graph") ucrSaveFreq.SetAssignToIfUncheckedValue("last_graph") @@ -355,7 +355,7 @@ Public Class dlgOneWayFrequencies ElseIf rdoFrqStemLeaf.Checked Then ucrSaveFreq.SetSaveType(strRObjectType:=RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveFreq.SetPrefix("freq_summary") - ucrSaveFreq.SetCheckBoxText("Save Summary") + ucrSaveFreq.SetCheckBoxText("Store Summary") ucrSaveFreq.SetAssignToIfUncheckedValue("last_summary") clsStemLeafNoQuotesRFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary", diff --git a/instat/dlgPrincipalComponentAnalysis.vb b/instat/dlgPrincipalComponentAnalysis.vb index 72c94e4f904..401d2927796 100644 --- a/instat/dlgPrincipalComponentAnalysis.vb +++ b/instat/dlgPrincipalComponentAnalysis.vb @@ -19,13 +19,14 @@ Public Class dlgPrincipalComponentAnalysis Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private bResetSubdialog As Boolean = False - Private clsPCAFunction, clsWhichQuantiSupFunction, clsWhichQualiSupFunction, clsColNamesQuantFunction, clsColNamesQualiFunction, clsSummaryFunction, clsGetColumnsFunction, clsCbindUniqueFunction, clsBindFunction As New RFunction + Private bResettingDialogue As Boolean = False + Private lstEditedVariables As New List(Of String) + Private clsPCAFunction, clsPCASummaryFuction, clsMatchFunction, clsMatch2Function, clsNamesFunction, clsSummaryFunction, clsGetColumnsFunction As New RFunction Private clsREigenValues, clsREigenVectors, clsRRotation, clsRRotationCoord, clsRRotationEig, clsDummyFunction As New RFunction Private clsRScreePlotFunction, clsRThemeMinimal, clsRVariablesPlotFunction, clsRVariablesPlotTheme, clsRIndividualsPlotFunction, clsRIndividualsPlotTheme, clsRBiplotFunction, clsRBiplotTheme, clsRBarPlotFunction As New RFunction Private clsRFactor, clsRMelt, clsRBarPlotGeom, clsRBarPlotAes, clsRBarPlotFacet, clsRVariablesPlotFunctionValue, clsRIndividualsFunctionValue, clsRBiplotFunctionValue As New RFunction Private clsRScreePlot, clsRVariablesPlot, clsRIndividualsPlot, clsRBiplot As New RSyntax - Private clsVars1ColumnsFunction, clsVars2ColumnsFunction As ROperator - Private clsRBarPlot, clsRBarPlot0, clsBaseOperator, clsBinaryQuantiSupOperator, clsBinaryQualitySupOperator As New ROperator + Private clsRBarPlot, clsRBarPlot0, clsBaseOperator As New ROperator ' call all classes in the sub dialog Private Sub dlgPrincipalComponentAnalysis_oad(sender As Object, e As EventArgs) Handles MyBase.Load @@ -45,7 +46,7 @@ Public Class dlgPrincipalComponentAnalysis Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 422 ucrSelectorPCA.SetParameter(New RParameter("data_name", 0)) - ucrSelectorPCA.SetParameterIsString() + ucrSelectorPCA.SetParameterIsrfunction() ucrBase.clsRsyntax.iCallType = 2 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False @@ -55,16 +56,15 @@ Public Class dlgPrincipalComponentAnalysis ucrReceiverMultiplePCA.Selector = ucrSelectorPCA ucrReceiverMultiplePCA.SetDataType("numeric", bStrict:=True) ucrReceiverMultiplePCA.SetMeAsReceiver() - ucrReceiverMultiplePCA.bExcludeFromSelector = True - ucrReceiverSuppNumeric.SetParameter(New RParameter("right", 1)) + ucrReceiverSuppNumeric.SetParameter(New RParameter("right", 1, bNewIncludeArgumentName:=False)) ucrReceiverSuppNumeric.SetParameterIsString() ucrReceiverSuppNumeric.Selector = ucrSelectorPCA ucrReceiverSuppNumeric.SetDataType("numeric") ucrReceiverSuppNumeric.SetLinkedDisplayControl(lblSupplNumeric) ucrReceiverSuppNumeric.bExcludeFromSelector = True - ucrReceiverSupplFactors.SetParameter(New RParameter("right", 1)) + ucrReceiverSupplFactors.SetParameter(New RParameter("right", 1, bNewIncludeArgumentName:=False)) ucrReceiverSupplFactors.SetParameterIsString() ucrReceiverSupplFactors.Selector = ucrSelectorPCA ucrReceiverSupplFactors.SetDataType("factor") @@ -92,10 +92,12 @@ Public Class dlgPrincipalComponentAnalysis ucrSaveResult.SetCheckBoxText("Save Result") ucrSaveResult.SetIsComboBox() ucrSaveResult.SetAssignToIfUncheckedValue("last_model") + End Sub Private Sub SetDefaults() clsPCAFunction = New RFunction + clsPCASummaryFuction = New RFunction clsREigenVectors = New RFunction clsREigenValues = New RFunction clsRRotation = New RFunction @@ -125,18 +127,11 @@ Public Class dlgPrincipalComponentAnalysis clsRIndividualsFunctionValue = New RFunction clsRBiplotFunctionValue = New RFunction clsDummyFunction = New RFunction - clsColNamesQuantFunction = New RFunction - clsColNamesQualiFunction = New RFunction clsSummaryFunction = New RFunction clsGetColumnsFunction = New RFunction - clsCbindUniqueFunction = New RFunction - clsBindFunction = New RFunction - clsWhichQuantiSupFunction = New RFunction - clsWhichQualiSupFunction = New RFunction - clsVars1ColumnsFunction = New ROperator - clsVars2ColumnsFunction = New ROperator - clsBinaryQuantiSupOperator = New ROperator - clsBinaryQualitySupOperator = New ROperator + clsNamesFunction = New RFunction + clsMatchFunction = New RFunction + clsMatch2Function = New RFunction ' package name, r command and defaults for sdg @@ -146,50 +141,9 @@ Public Class dlgPrincipalComponentAnalysis clsDummyFunction.AddParameter("checked", "FALSE", iPosition:=0) clsDummyFunction.AddParameter("value1", "FALSE", iPosition:=1) - clsWhichQuantiSupFunction.SetRCommand("which") - clsWhichQuantiSupFunction.AddParameter("x", clsROperatorParameter:=clsBinaryQuantiSupOperator, bIncludeArgumentName:=False, iPosition:=1) - clsWhichQuantiSupFunction.SetAssignTo("col_1") - - clsWhichQualiSupFunction.SetRCommand("which") - clsWhichQualiSupFunction.AddParameter("x", clsROperatorParameter:=clsBinaryQualitySupOperator, bIncludeArgumentName:=False, iPosition:=1) - clsWhichQualiSupFunction.SetAssignTo("col_2") - - clsColNamesQuantFunction.SetRCommand("colnames") - clsColNamesQuantFunction.AddParameter("x", clsRFunctionParameter:=clsBindFunction, iPosition:=0) - - clsColNamesQualiFunction.SetRCommand("colnames") - clsColNamesQualiFunction.AddParameter("x", clsRFunctionParameter:=clsCbindUniqueFunction, iPosition:=0) - - clsSummaryFunction.SetRCommand("summary") - clsSummaryFunction.AddParameter("object", clsRFunctionParameter:=clsPCAFunction, iPosition:=0) - - clsBinaryQuantiSupOperator.SetOperation("%in%") - clsBinaryQuantiSupOperator.AddParameter("left", clsRFunctionParameter:=clsColNamesQuantFunction, iPosition:=0) - - clsBinaryQualitySupOperator.SetOperation("%in%") - clsBinaryQualitySupOperator.AddParameter("left", clsRFunctionParameter:=clsColNamesQualiFunction, iPosition:=0) - clsGetColumnsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsGetColumnsFunction.SetAssignTo("col_data") - clsCbindUniqueFunction.SetRCommand("cbind_unique") - clsCbindUniqueFunction.AddParameter("x", clsRFunctionParameter:=clsGetColumnsFunction, iPosition:=0) - clsCbindUniqueFunction.AddParameter("y", clsRFunctionParameter:=ucrSelectorPCA.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=1) - clsCbindUniqueFunction.SetAssignTo("col_data") - clsCbindUniqueFunction.AddParameter("cols", clsROperatorParameter:=clsVars2ColumnsFunction, iPosition:=2) - - clsBindFunction.SetRCommand("cbind_unique") - clsBindFunction.AddParameter("x", clsRFunctionParameter:=clsGetColumnsFunction, iPosition:=0) - clsBindFunction.AddParameter("y", clsRFunctionParameter:=ucrSelectorPCA.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=1) - clsBindFunction.SetAssignTo("col_data") - clsBindFunction.AddParameter("cols", clsROperatorParameter:=clsVars1ColumnsFunction, iPosition:=2) - - clsVars1ColumnsFunction.SetOperation("", bBracketsTemp:=False) - clsVars1ColumnsFunction.SetAssignTo("var_1") - - clsVars2ColumnsFunction.SetOperation("", bBracketsTemp:=False) - clsVars2ColumnsFunction.SetAssignTo("var_2") - clsPCAFunction.SetPackageName("FactoMineR") clsPCAFunction.SetRCommand("PCA") clsPCAFunction.AddParameter("X", clsRFunctionParameter:=clsGetColumnsFunction, iPosition:=1) @@ -202,6 +156,24 @@ Public Class dlgPrincipalComponentAnalysis clsREigenValues.AddParameter("value1", Chr(34) & "eig" & Chr(34)) clsREigenValues.iCallType = 2 + clsMatchFunction.SetRCommand("match") + clsMatchFunction.SetAssignTo("quan_columns") + + clsMatch2Function.SetRCommand("match") + clsMatch2Function.SetAssignTo("qual_columns") + + clsNamesFunction.SetRCommand("names") + + clsPCASummaryFuction.SetPackageName("FactoMineR") + clsPCASummaryFuction.SetRCommand("PCA") + clsPCASummaryFuction.AddParameter("X", "col_data") + clsPCASummaryFuction.AddParameter("ncp", 2) + clsPCASummaryFuction.AddParameter("graph", "FALSE") + + clsSummaryFunction.SetRCommand("summary") + clsSummaryFunction.AddParameter("object", clsRFunctionParameter:=clsPCASummaryFuction, iPosition:=0) + clsSummaryFunction.iCallType = 2 + clsREigenVectors.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_from_model") clsREigenVectors.AddParameter("value1", Chr(34) & "ind" & Chr(34)) clsREigenVectors.AddParameter("value2", Chr(34) & "coord" & Chr(34)) @@ -218,8 +190,13 @@ Public Class dlgPrincipalComponentAnalysis clsBaseOperator.SetOperation("+") clsRScreePlotFunction.SetPackageName("factoextra") clsRScreePlotFunction.SetRCommand("fviz_screeplot") - clsRScreePlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCAFunction) + clsRScreePlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCASummaryFuction) clsRScreePlotFunction.iCallType = 3 + clsRScreePlotFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorPCA.strCurrentDataFrame, + strObjectName:="last_graph") clsRThemeMinimal.SetPackageName("ggplot2") clsRThemeMinimal.SetRCommand("theme_minimal") @@ -227,32 +204,47 @@ Public Class dlgPrincipalComponentAnalysis ' Variables Function clsRVariablesPlotFunction.SetPackageName("factoextra") clsRVariablesPlotFunction.SetRCommand("fviz_pca_var") - clsRVariablesPlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCAFunction) + clsRVariablesPlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCASummaryFuction) clsRVariablesPlotFunctionValue.SetRCommand("c") clsRVariablesPlotFunctionValue.AddParameter("first_dim", 1, bIncludeArgumentName:=False, iPosition:=0) clsRVariablesPlotFunctionValue.AddParameter("second_dim", 2, bIncludeArgumentName:=False, iPosition:=1) clsRVariablesPlotFunction.AddParameter("axes", clsRFunctionParameter:=clsRVariablesPlotFunctionValue, iPosition:=1) clsRVariablesPlotFunction.iCallType = 3 + clsRVariablesPlotFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorPCA.strCurrentDataFrame, + strObjectName:="last_graph") ' Individual Plot clsRIndividualsPlotFunction.SetPackageName("factoextra") clsRIndividualsPlotFunction.SetRCommand("fviz_pca_ind") - clsRIndividualsPlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCAFunction) + clsRIndividualsPlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCASummaryFuction) clsRIndividualsFunctionValue.SetRCommand("c") clsRIndividualsFunctionValue.AddParameter("first_dim", 1, bIncludeArgumentName:=False, iPosition:=0) clsRIndividualsFunctionValue.AddParameter("second_dim", 2, bIncludeArgumentName:=False, iPosition:=1) clsRIndividualsPlotFunction.AddParameter("axes", clsRFunctionParameter:=clsRIndividualsFunctionValue, iPosition:=1) clsRIndividualsPlotFunction.iCallType = 3 + clsRIndividualsPlotFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorPCA.strCurrentDataFrame, + strObjectName:="last_graph") ' Biplot clsRBiplotFunction.SetPackageName("factoextra") clsRBiplotFunction.SetRCommand("fviz_pca_biplot") - clsRBiplotFunction.AddParameter("X", clsRFunctionParameter:=clsPCAFunction) + clsRBiplotFunction.AddParameter("X", clsRFunctionParameter:=clsPCASummaryFuction) clsRBiplotFunctionValue.SetRCommand("c") clsRBiplotFunctionValue.AddParameter("first_dim", 1, bIncludeArgumentName:=False, iPosition:=0) clsRBiplotFunctionValue.AddParameter("second_dim", 2, bIncludeArgumentName:=False, iPosition:=1) clsRBiplotFunction.AddParameter("axes", clsRFunctionParameter:=clsRBiplotFunctionValue, iPosition:=1) clsRBiplotFunction.iCallType = 3 + clsRBiplotFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorPCA.strCurrentDataFrame, + strObjectName:="last_graph") ' Barplot clsRBarPlot0.SetOperation("+") @@ -284,19 +276,12 @@ Public Class dlgPrincipalComponentAnalysis clsRBarPlot.AddParameter(clsRFunctionParameter:=clsRBarPlotFacet) clsRScreePlotFunction.AddParameter("choice", Chr(34) & "variance" & Chr(34)) clsBaseOperator.AddParameter("plot", clsRFunctionParameter:=clsRScreePlotFunction, iPosition:=0) - clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsRThemeMinimal, iPosition:=1) clsBaseOperator.iCallType = 3 - clsRScreePlotFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - clsRVariablesPlotFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - clsRIndividualsPlotFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - clsRBiplotFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - ucrBase.clsRsyntax.ClearCodes() - ucrBase.clsRsyntax.SetBaseRFunction(clsSummaryFunction) - ucrBase.clsRsyntax.AddToAfterCodes(clsREigenValues, iPosition:=1) - ucrBase.clsRsyntax.AddToAfterCodes(clsBaseOperator, iPosition:=4) - ModelName() + ucrBase.clsRsyntax.SetBaseRFunction(clsPCAFunction) + ucrBase.clsRsyntax.AddToAfterCodes(clsSummaryFunction, iPosition:=0) + ucrBase.clsRsyntax.AddToAfterCodes(clsBaseOperator, iPosition:=1) bResetSubdialog = True End Sub @@ -304,16 +289,16 @@ Public Class dlgPrincipalComponentAnalysis ucrSelectorPCA.AddAdditionalCodeParameterPair(clsREigenVectors, ucrSelectorPCA.GetParameter, iAdditionalPairNo:=1) ucrSelectorPCA.AddAdditionalCodeParameterPair(clsRRotationCoord, ucrSelectorPCA.GetParameter, iAdditionalPairNo:=2) ucrSelectorPCA.AddAdditionalCodeParameterPair(clsRRotationEig, ucrSelectorPCA.GetParameter, iAdditionalPairNo:=3) - ucrSelectorPCA.AddAdditionalCodeParameterPair(clsGetColumnsFunction, ucrSelectorPCA.GetParameter, iAdditionalPairNo:=4) - ucrSelectorPCA.SetRCode(clsREigenValues, bReset) - ucrReceiverMultiplePCA.SetRCode(clsGetColumnsFunction, bReset) - ucrReceiverSuppNumeric.SetRCode(clsBinaryQuantiSupOperator, bReset) - ucrReceiverSupplFactors.SetRCode(clsBinaryQualitySupOperator, bReset) + ucrSelectorPCA.SetRCode(clsGetColumnsFunction, bReset) ucrSaveResult.SetRCode(clsPCAFunction, bReset) ucrChkScaleData.SetRCode(clsPCAFunction, bReset) ucrChkExtraVariables.SetRCode(clsDummyFunction, bReset) ucrNudNumberOfComp.SetRCode(clsPCAFunction, bReset) + If bReset Then + ucrReceiverSuppNumeric.SetRCode(clsMatchFunction, bReset) + ucrReceiverSupplFactors.SetRCode(clsMatch2Function, bReset) + End If End Sub Private Sub TestOKEnabled() ' add in if the sdg has a clear nud, etc @@ -339,25 +324,11 @@ Public Class dlgPrincipalComponentAnalysis End Sub Private Sub cmdPCAOptions_Click(sender As Object, e As EventArgs) Handles cmdPCAOptions.Click - sdgPrincipalComponentAnalysis.SetRFunction(ucrBase.clsRsyntax, clsREigenValues, clsDummyFunction, clsREigenVectors, clsRRotation, clsRScreePlotFunction, clsRVariablesPlotFunction, clsRIndividualsPlotFunction, clsRBiplotFunction, clsRBarPlotFunction, clsRVariablesPlotFunctionValue, clsRIndividualsFunctionValue, clsRBiplotFunctionValue, clsRFactor, clsBaseOperator, clsRThemeMinimal, bResetSubdialog) + sdgPrincipalComponentAnalysis.SetRFunction(ucrBase.clsRsyntax, clsRRotation, clsRScreePlotFunction, clsRVariablesPlotFunction, clsRIndividualsPlotFunction, clsRBiplotFunction, clsRBarPlotFunction, clsRVariablesPlotFunctionValue, clsRIndividualsFunctionValue, clsRBiplotFunctionValue, clsRFactor, clsBaseOperator, clsRThemeMinimal, bResetSubdialog) bResetSubdialog = False sdgPrincipalComponentAnalysis.ShowDialog() End Sub - Private Sub ModelName() - If ucrSaveResult.ucrChkSave.Checked Then - clsREigenValues.AddParameter("model_name", Chr(34) & ucrSaveResult.GetText & Chr(34)) - clsREigenVectors.AddParameter("model_name", Chr(34) & ucrSaveResult.GetText & Chr(34)) - clsRRotationCoord.AddParameter("model_name", Chr(34) & ucrSaveResult.GetText & Chr(34)) - clsRRotationEig.AddParameter("model_name", Chr(34) & ucrSaveResult.GetText & Chr(34)) - Else - clsREigenValues.AddParameter("model_name", Chr(34) & "last_model" & Chr(34)) - clsREigenVectors.AddParameter("model_name", Chr(34) & "last_model" & Chr(34)) - clsRRotationCoord.AddParameter("model_name", Chr(34) & "last_model" & Chr(34)) - clsRRotationEig.AddParameter("model_name", Chr(34) & "last_model" & Chr(34)) - End If - End Sub - Private Sub ucrReceiverMultiplePCA_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultiplePCA.ControlValueChanged, ucrChkExtraVariables.ControlValueChanged If ucrReceiverMultiplePCA.IsEmpty Then ucrNudNumberOfComp.Minimum = 0 @@ -372,16 +343,23 @@ Public Class dlgPrincipalComponentAnalysis ucrNudNumberOfComp.Value = ucrReceiverMultiplePCA.lstSelectedVariables.Items.Count End If End If + If ucrReceiverMultiplePCA.IsEmpty AndAlso lstEditedVariables.Count > 0 Then + UpdateSelector() + ucrReceiverMultiplePCA.SetMeAsReceiver() + End If + If ucrReceiverMultiplePCA.IsEmpty Then + ucrReceiverSuppNumeric.Clear() + End If + GetColumns() End Sub Private Sub ucrSelectorPCA_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorPCA.ControlValueChanged clsRRotationEig.AddParameter("data_name", Chr(34) & ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34)) + clsGetColumnsFunction.AddParameter("data_name", Chr(34) & ucrSelectorPCA.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0) clsPCAFunction.AddParameter("X", clsRFunctionParameter:=clsGetColumnsFunction, iPosition:=0) - ModelName() - End Sub - - Private Sub ucrSaveResult_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSaveResult.ControlValueChanged - ModelName() + clsNamesFunction.AddParameter("names", "col_data", iPosition:=0, bIncludeArgumentName:=False) + clsMatchFunction.AddParameter("data", clsRFunctionParameter:=clsNamesFunction, iPosition:=1, bIncludeArgumentName:=False) + clsMatch2Function.AddParameter("data1", clsRFunctionParameter:=clsNamesFunction, iPosition:=1, bIncludeArgumentName:=False) End Sub Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveResult.ControlContentsChanged, ucrReceiverMultiplePCA.ControlContentsChanged, ucrNudNumberOfComp.ControlContentsChanged, @@ -391,17 +369,19 @@ Public Class dlgPrincipalComponentAnalysis Private Sub ucrChkExtraVariables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkExtraVariables.ControlValueChanged, ucrReceiverSupplFactors.ControlValueChanged, ucrReceiverSuppNumeric.ControlValueChanged If ucrChkExtraVariables.Checked AndAlso Not ucrReceiverSuppNumeric.IsEmpty Then - clsPCAFunction.AddParameter("quanti.sup", clsRFunctionParameter:=clsWhichQuantiSupFunction, iPosition:=4) - clsVars1ColumnsFunction.AddParameter("cols", ucrReceiverSuppNumeric.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + clsPCAFunction.AddParameter("quanti.sup", clsRFunctionParameter:=clsMatchFunction, iPosition:=4) + clsPCASummaryFuction.AddParameter("quanti.sup", "quan_columns", iPosition:=4) Else clsPCAFunction.RemoveParameterByName("quanti.sup") + clsPCASummaryFuction.RemoveParameterByName("quanti.sup") End If If ucrChkExtraVariables.Checked AndAlso Not ucrReceiverSupplFactors.IsEmpty Then - clsPCAFunction.AddParameter("quali.sup", clsRFunctionParameter:=clsWhichQualiSupFunction, iPosition:=5) - clsVars2ColumnsFunction.AddParameter("cols", ucrReceiverSupplFactors.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + clsPCAFunction.AddParameter("quali.sup", clsRFunctionParameter:=clsMatch2Function, iPosition:=5) + clsPCASummaryFuction.AddParameter("quali.sup", "qual_columns", iPosition:=5) Else clsPCAFunction.RemoveParameterByName("quali.sup") + clsPCASummaryFuction.RemoveParameterByName("quali.sup") End If If ucrChkExtraVariables.Checked Then ucrReceiverMultiplePCA.RemoveExcludedMetadataProperty("class") @@ -409,5 +389,65 @@ Public Class dlgPrincipalComponentAnalysis ucrReceiverMultiplePCA.SetDataType("numeric") ucrReceiverMultiplePCA.SetMeAsReceiver() End If + GetColumns() + End Sub + + Private Sub GetColumns() + If ucrChkExtraVariables.Checked Then + Dim lstVariables As List(Of String) = ucrReceiverMultiplePCA.GetVariableNamesAsList() + + If Not ucrReceiverMultiplePCA.IsEmpty AndAlso (Not ucrReceiverSuppNumeric.IsEmpty OrElse Not ucrReceiverSupplFactors.IsEmpty) Then + lstVariables.AddRange(ucrReceiverSuppNumeric.GetVariableNamesAsList()) + lstVariables.AddRange(ucrReceiverSupplFactors.GetVariableNamesAsList()) + End If + + clsGetColumnsFunction.AddParameter("col_names", frmMain.clsRLink.GetListAsRString(lstVariables, bWithQuotes:=True), iPosition:=1) + Else + clsGetColumnsFunction.AddParameter("col_names", ucrReceiverMultiplePCA.GetVariableNames) + End If + + End Sub + + Private Sub UpdateSelector() + ClearSelector() + If bResettingDialogue Then + For i = 0 To lstEditedVariables.Count - 1 + ucrSelectorPCA.lstAvailableVariable.Items.Add(lstEditedVariables.Item(i)) + ucrSelectorPCA.lstAvailableVariable.Items(i).Tag = ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text + Next + End If + End Sub + + Private Sub ClearSelector() + ucrSelectorPCA.lstAvailableVariable.Clear() + ucrSelectorPCA.lstAvailableVariable.Groups.Clear() + ucrSelectorPCA.lstAvailableVariable.Columns.Add("Variables") + End Sub + + Private Sub ucrReceiverSuppNumeric_Enter(sender As Object, e As EventArgs) Handles ucrReceiverSuppNumeric.Enter + If Not ucrReceiverMultiplePCA.IsEmpty Then + Dim arrItems As String() = ucrReceiverMultiplePCA.GetVariableNamesList(False) + + For Each item As ListViewItem In ucrSelectorPCA.lstAvailableVariable.Items + If arrItems.Contains(item.Text) Then + ucrSelectorPCA.lstAvailableVariable.Items.Remove(item) + End If + Next + End If + End Sub + + Private Sub ucrSelectorPCA_DataFrameChanged() Handles ucrSelectorPCA.DataFrameChanged + If Not bResettingDialogue Then + If ucrSelectorPCA.lstAvailableVariable.Items.Count > 0 Then + lstEditedVariables.Clear() + lstEditedVariables = ucrSelectorPCA.lstAvailableVariable.Items.Cast(Of ListViewItem)().Select(Function(item) item.Text).ToList() + End If + End If + End Sub + + Private Sub ucrReceiverMultiplePCA_Enter(sender As Object, e As EventArgs) Handles ucrReceiverMultiplePCA.Enter + bResettingDialogue = True + UpdateSelector() + bResettingDialogue = False End Sub End Class \ No newline at end of file diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 0310ca32fe0..04038bc8f78 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -65,16 +65,16 @@ Public Class dlgRandomSplit ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrChkTest.SetText("Save Test to") + ucrChkTest.SetText("Store Test to") ucrChkTest.AddToLinkedControls(ucrSaveTestingData, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrSaveTrainingData.SetLabelText("Save Train to:") + ucrSaveTrainingData.SetLabelText("Store Train to:") ucrSaveTrainingData.SetSaveTypeAsDataFrame() ucrSaveTrainingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTrainingData.SetPrefix("training_data") ucrSaveTrainingData.SetIsComboBox() - ucrSaveTestingData.SetLabelText("Save Test to:") + ucrSaveTestingData.SetLabelText("Store Test to:") ucrSaveTestingData.SetSaveTypeAsDataFrame() ucrSaveTestingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTestingData.SetPrefix("testing_data") diff --git a/instat/dlgRenameObjects.vb b/instat/dlgRenameObjects.vb index 87bd7bc2e6d..450a55dc0a9 100644 --- a/instat/dlgRenameObjects.vb +++ b/instat/dlgRenameObjects.vb @@ -51,6 +51,7 @@ Public Class dlgRenameObjects dctTypes.Add("Filters", Chr(34) & "filter" & Chr(34)) dctTypes.Add("Column selections", Chr(34) & "column_selection" & Chr(34)) dctTypes.Add("Calculations", Chr(34) & "calculation" & Chr(34)) + dctTypes.Add("Scalars", Chr(34) & "scalar" & Chr(34)) ucrInputType.SetItems(dctTypes) ucrInputType.SetDropDownStyleAsNonEditable() @@ -89,7 +90,6 @@ Public Class dlgRenameObjects End If End Sub - Private Sub CoreControls_ContentsChanged() Handles ucrInputNewName.ControlContentsChanged, ucrSelectorForRenameObject.ControlContentsChanged, ucrReceiverCurrentName.ControlContentsChanged TestOKEnabled() End Sub @@ -108,13 +108,9 @@ Public Class dlgRenameObjects End If End Sub - - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeforControls(True) TestOKEnabled() End Sub - - End Class \ No newline at end of file diff --git a/instat/dlgReorderLevels.vb b/instat/dlgReorderLevels.vb index dfc8f53c3ae..074b77da292 100644 --- a/instat/dlgReorderLevels.vb +++ b/instat/dlgReorderLevels.vb @@ -144,7 +144,7 @@ Public Class dlgReorderLevels ucrSaveResults.SetPrefix("new_column") ucrSaveResults.SetSaveTypeAsColumn() ucrSaveResults.SetDataFrameSelector(ucrSelectorFactorLevelsToReorder.ucrAvailableDataFrames) - ucrSaveResults.SetLabelText("Save As:") + ucrSaveResults.SetLabelText("Store As:") ucrSaveResults.SetIsComboBox() End Sub diff --git a/instat/dlgRestrict.Designer.vb b/instat/dlgRestrict.Designer.vb index 3030445e05c..f46a69236e6 100644 --- a/instat/dlgRestrict.Designer.vb +++ b/instat/dlgRestrict.Designer.vb @@ -57,10 +57,9 @@ Partial Class dlgRestrict ' 'cmdDefineNewFilter ' - Me.cmdDefineNewFilter.Location = New System.Drawing.Point(311, 110) - Me.cmdDefineNewFilter.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDefineNewFilter.Location = New System.Drawing.Point(249, 88) Me.cmdDefineNewFilter.Name = "cmdDefineNewFilter" - Me.cmdDefineNewFilter.Size = New System.Drawing.Size(161, 38) + Me.cmdDefineNewFilter.Size = New System.Drawing.Size(129, 30) Me.cmdDefineNewFilter.TabIndex = 3 Me.cmdDefineNewFilter.Tag = "Define_New_Filter" Me.cmdDefineNewFilter.Text = "Define New Filter" @@ -69,19 +68,17 @@ Partial Class dlgRestrict 'lblFilter ' Me.lblFilter.AutoSize = True - Me.lblFilter.Location = New System.Drawing.Point(311, 56) - Me.lblFilter.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFilter.Location = New System.Drawing.Point(249, 45) Me.lblFilter.Name = "lblFilter" - Me.lblFilter.Size = New System.Drawing.Size(70, 16) + Me.lblFilter.Size = New System.Drawing.Size(57, 13) Me.lblFilter.TabIndex = 1 Me.lblFilter.Text = "Filter rows:" ' 'lblFilterPreview ' - Me.lblFilterPreview.Location = New System.Drawing.Point(12, 356) - Me.lblFilterPreview.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFilterPreview.Location = New System.Drawing.Point(10, 285) Me.lblFilterPreview.Name = "lblFilterPreview" - Me.lblFilterPreview.Size = New System.Drawing.Size(148, 28) + Me.lblFilterPreview.Size = New System.Drawing.Size(118, 22) Me.lblFilterPreview.TabIndex = 6 Me.lblFilterPreview.Text = "Filter Preview:" ' @@ -90,11 +87,9 @@ Partial Class dlgRestrict Me.grpApplyOptions.Controls.Add(Me.rdoSavefilter) Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsSubset) Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsFilter) - Me.grpApplyOptions.Location = New System.Drawing.Point(12, 246) - Me.grpApplyOptions.Margin = New System.Windows.Forms.Padding(4) + Me.grpApplyOptions.Location = New System.Drawing.Point(10, 197) Me.grpApplyOptions.Name = "grpApplyOptions" - Me.grpApplyOptions.Padding = New System.Windows.Forms.Padding(4) - Me.grpApplyOptions.Size = New System.Drawing.Size(495, 66) + Me.grpApplyOptions.Size = New System.Drawing.Size(396, 53) Me.grpApplyOptions.TabIndex = 4 Me.grpApplyOptions.TabStop = False Me.grpApplyOptions.Text = "Apply" @@ -102,21 +97,20 @@ Partial Class dlgRestrict 'rdoSavefilter ' Me.rdoSavefilter.AutoSize = True - Me.rdoSavefilter.Location = New System.Drawing.Point(377, 24) + Me.rdoSavefilter.Location = New System.Drawing.Point(302, 19) Me.rdoSavefilter.Margin = New System.Windows.Forms.Padding(2) Me.rdoSavefilter.Name = "rdoSavefilter" - Me.rdoSavefilter.Size = New System.Drawing.Size(92, 20) + Me.rdoSavefilter.Size = New System.Drawing.Size(75, 17) Me.rdoSavefilter.TabIndex = 4 Me.rdoSavefilter.TabStop = True - Me.rdoSavefilter.Text = "Save Filter" + Me.rdoSavefilter.Text = "Store Filter" Me.rdoSavefilter.UseVisualStyleBackColor = True ' 'rdoApplyAsSubset ' - Me.rdoApplyAsSubset.Location = New System.Drawing.Point(200, 24) - Me.rdoApplyAsSubset.Margin = New System.Windows.Forms.Padding(4) + Me.rdoApplyAsSubset.Location = New System.Drawing.Point(160, 19) Me.rdoApplyAsSubset.Name = "rdoApplyAsSubset" - Me.rdoApplyAsSubset.Size = New System.Drawing.Size(153, 21) + Me.rdoApplyAsSubset.Size = New System.Drawing.Size(122, 17) Me.rdoApplyAsSubset.TabIndex = 1 Me.rdoApplyAsSubset.TabStop = True Me.rdoApplyAsSubset.Text = "As Subset" @@ -124,10 +118,9 @@ Partial Class dlgRestrict ' 'rdoApplyAsFilter ' - Me.rdoApplyAsFilter.Location = New System.Drawing.Point(8, 26) - Me.rdoApplyAsFilter.Margin = New System.Windows.Forms.Padding(4) + Me.rdoApplyAsFilter.Location = New System.Drawing.Point(6, 21) Me.rdoApplyAsFilter.Name = "rdoApplyAsFilter" - Me.rdoApplyAsFilter.Size = New System.Drawing.Size(164, 21) + Me.rdoApplyAsFilter.Size = New System.Drawing.Size(131, 17) Me.rdoApplyAsFilter.TabIndex = 0 Me.rdoApplyAsFilter.TabStop = True Me.rdoApplyAsFilter.Text = "As Filter" @@ -137,10 +130,9 @@ Partial Class dlgRestrict ' Me.cmdEditFilter.Enabled = False Me.cmdEditFilter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEditFilter.Location = New System.Drawing.Point(311, 209) - Me.cmdEditFilter.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEditFilter.Location = New System.Drawing.Point(249, 167) Me.cmdEditFilter.Name = "cmdEditFilter" - Me.cmdEditFilter.Size = New System.Drawing.Size(161, 29) + Me.cmdEditFilter.Size = New System.Drawing.Size(129, 23) Me.cmdEditFilter.TabIndex = 9 Me.cmdEditFilter.Tag = "Define_New_Filter" Me.cmdEditFilter.Text = "Edit Filter" @@ -149,10 +141,9 @@ Partial Class dlgRestrict 'cmdFilterFromFactors ' Me.cmdFilterFromFactors.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFilterFromFactors.Location = New System.Drawing.Point(311, 154) - Me.cmdFilterFromFactors.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFilterFromFactors.Location = New System.Drawing.Point(249, 123) Me.cmdFilterFromFactors.Name = "cmdFilterFromFactors" - Me.cmdFilterFromFactors.Size = New System.Drawing.Size(161, 48) + Me.cmdFilterFromFactors.Size = New System.Drawing.Size(129, 38) Me.cmdFilterFromFactors.TabIndex = 10 Me.cmdFilterFromFactors.Tag = "Define_New_Filter" Me.cmdFilterFromFactors.Text = "Filter From Factors" @@ -164,21 +155,21 @@ Partial Class dlgRestrict Me.ucrInputFilterPreview.AutoSize = True Me.ucrInputFilterPreview.IsMultiline = True Me.ucrInputFilterPreview.IsReadOnly = False - Me.ucrInputFilterPreview.Location = New System.Drawing.Point(161, 355) - Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(8) + Me.ucrInputFilterPreview.Location = New System.Drawing.Point(129, 284) + Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" - Me.ucrInputFilterPreview.Size = New System.Drawing.Size(346, 54) + Me.ucrInputFilterPreview.Size = New System.Drawing.Size(277, 43) Me.ucrInputFilterPreview.TabIndex = 7 ' 'ucrReceiverFilter ' Me.ucrReceiverFilter.AutoSize = True Me.ucrReceiverFilter.frmParent = Me - Me.ucrReceiverFilter.Location = New System.Drawing.Point(312, 75) + Me.ucrReceiverFilter.Location = New System.Drawing.Point(250, 60) Me.ucrReceiverFilter.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFilter.Name = "ucrReceiverFilter" Me.ucrReceiverFilter.Selector = Nothing - Me.ucrReceiverFilter.Size = New System.Drawing.Size(161, 25) + Me.ucrReceiverFilter.Size = New System.Drawing.Size(129, 20) Me.ucrReceiverFilter.strNcFilePath = "" Me.ucrReceiverFilter.TabIndex = 2 Me.ucrReceiverFilter.ucrSelector = Nothing @@ -189,37 +180,37 @@ Partial Class dlgRestrict Me.ucrSelectorFilter.bDropUnusedFilterLevels = False Me.ucrSelectorFilter.bShowHiddenColumns = False Me.ucrSelectorFilter.bUseCurrentFilter = True - Me.ucrSelectorFilter.Location = New System.Drawing.Point(12, 12) + Me.ucrSelectorFilter.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorFilter.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorFilter.Name = "ucrSelectorFilter" - Me.ucrSelectorFilter.Size = New System.Drawing.Size(267, 229) + Me.ucrSelectorFilter.Size = New System.Drawing.Size(214, 183) Me.ucrSelectorFilter.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 416) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(5) + Me.ucrBase.Location = New System.Drawing.Point(10, 333) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(511, 65) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 8 ' 'ucrNewDataFrameName ' Me.ucrNewDataFrameName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrNewDataFrameName.Location = New System.Drawing.Point(12, 318) - Me.ucrNewDataFrameName.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) + Me.ucrNewDataFrameName.Location = New System.Drawing.Point(10, 254) + Me.ucrNewDataFrameName.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrNewDataFrameName.Name = "ucrNewDataFrameName" - Me.ucrNewDataFrameName.Size = New System.Drawing.Size(460, 30) + Me.ucrNewDataFrameName.Size = New System.Drawing.Size(368, 24) Me.ucrNewDataFrameName.TabIndex = 5 ' 'dlgRestrict ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(522, 485) + Me.ClientSize = New System.Drawing.Size(418, 388) Me.Controls.Add(Me.cmdFilterFromFactors) Me.Controls.Add(Me.cmdEditFilter) Me.Controls.Add(Me.grpApplyOptions) @@ -232,7 +223,6 @@ Partial Class dlgRestrict Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrNewDataFrameName) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgRestrict" diff --git a/instat/dlgScatterPlot.Designer.vb b/instat/dlgScatterPlot.Designer.vb index 1378732baa4..a5b150dfba8 100644 --- a/instat/dlgScatterPlot.Designer.vb +++ b/instat/dlgScatterPlot.Designer.vb @@ -53,42 +53,42 @@ Partial Class dlgScatterPlot Me.toolStripMenuItemJitterOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemCountOptions = New System.Windows.Forms.ToolStripMenuItem() Me.grpGeom = New System.Windows.Forms.GroupBox() - Me.lblPosition = New System.Windows.Forms.Label() - Me.lblLegend = New System.Windows.Forms.Label() - Me.lblPointsize = New System.Windows.Forms.Label() - Me.lblShape = New System.Windows.Forms.Label() Me.rdoCount = New System.Windows.Forms.RadioButton() Me.rdoPoint = New System.Windows.Forms.RadioButton() Me.lblHeith = New System.Windows.Forms.Label() Me.lblWidth = New System.Windows.Forms.Label() Me.rdoJitter = New System.Windows.Forms.RadioButton() Me.lblFacetBy = New System.Windows.Forms.Label() + Me.grpAdd = New System.Windows.Forms.GroupBox() + Me.ucrChkLineofBestFit = New instat.ucrCheck() + Me.ucrChkAddSidePlot = New instat.ucrCheck() + Me.ucrChkAddRugPlot = New instat.ucrCheck() + Me.ucrNudSize = New instat.ucrNud() + Me.ucrInputSides = New instat.ucrInputComboBox() + Me.ucrChkWithSE = New instat.ucrCheck() Me.ucrInputStation = New instat.ucrInputComboBox() Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrChkLegend = New instat.ucrCheck() + Me.ucrNudPointsize = New instat.ucrNud() + Me.ucrChkColour = New instat.ucrCheck() + Me.ucrChkPosition = New instat.ucrCheck() + Me.ucrChkSize = New instat.ucrCheck() + Me.ucrChkShape = New instat.ucrCheck() Me.ucrInputPosition = New instat.ucrInputComboBox() - Me.ucrInputLegend = New instat.ucrInputComboBox() + Me.ucrInputColour = New instat.ucrInputComboBox() Me.ucrInputShape = New instat.ucrInputComboBox() - Me.ucrNudPointsize = New instat.ucrNud() Me.ucrNudHeigth = New instat.ucrNud() Me.ucrNudWidth = New instat.ucrNud() Me.ucrPnlGeoms = New instat.UcrPanel() Me.cmdOptions = New instat.ucrSplitButton() - Me.ucrInputSides = New instat.ucrInputComboBox() - Me.ucrNudSize = New instat.ucrNud() - Me.ucrChkAddRugPlot = New instat.ucrCheck() Me.ucrReceiverLabel = New instat.ucrReceiverSingle() - Me.ucrChkWithSE = New instat.ucrCheck() - Me.ucrChkLineofBestFit = New instat.ucrCheck() Me.ucrSaveScatterPlot = New instat.ucrSave() Me.ucrSelectorForScatter = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrVariablesAsFactorForScatter = New instat.ucrVariablesAsFactor() Me.ucrFactorOptionalReceiver = New instat.ucrReceiverSingle() Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrBase = New instat.ucrButtons() - Me.ucrChkAddSidePlot = New instat.ucrCheck() - Me.grpAdd = New System.Windows.Forms.GroupBox() Me.contextMenuStripOptions.SuspendLayout() Me.grpGeom.SuspendLayout() Me.grpAdd.SuspendLayout() @@ -195,14 +195,14 @@ Partial Class dlgScatterPlot ' 'grpGeom ' + Me.grpGeom.Controls.Add(Me.ucrInputColour) Me.grpGeom.Controls.Add(Me.ucrInputPosition) - Me.grpGeom.Controls.Add(Me.lblPosition) - Me.grpGeom.Controls.Add(Me.ucrInputLegend) - Me.grpGeom.Controls.Add(Me.lblLegend) - Me.grpGeom.Controls.Add(Me.ucrInputShape) - Me.grpGeom.Controls.Add(Me.lblPointsize) Me.grpGeom.Controls.Add(Me.ucrNudPointsize) - Me.grpGeom.Controls.Add(Me.lblShape) + Me.grpGeom.Controls.Add(Me.ucrChkColour) + Me.grpGeom.Controls.Add(Me.ucrChkPosition) + Me.grpGeom.Controls.Add(Me.ucrChkSize) + Me.grpGeom.Controls.Add(Me.ucrChkShape) + Me.grpGeom.Controls.Add(Me.ucrInputShape) Me.grpGeom.Controls.Add(Me.rdoCount) Me.grpGeom.Controls.Add(Me.rdoPoint) Me.grpGeom.Controls.Add(Me.lblHeith) @@ -213,51 +213,15 @@ Partial Class dlgScatterPlot Me.grpGeom.Controls.Add(Me.ucrPnlGeoms) Me.grpGeom.Location = New System.Drawing.Point(9, 337) Me.grpGeom.Name = "grpGeom" - Me.grpGeom.Size = New System.Drawing.Size(457, 109) + Me.grpGeom.Size = New System.Drawing.Size(449, 110) Me.grpGeom.TabIndex = 23 Me.grpGeom.TabStop = False Me.grpGeom.Text = "Geom" ' - 'lblPosition - ' - Me.lblPosition.AutoSize = True - Me.lblPosition.Location = New System.Drawing.Point(195, 50) - Me.lblPosition.Name = "lblPosition" - Me.lblPosition.Size = New System.Drawing.Size(47, 13) - Me.lblPosition.TabIndex = 38 - Me.lblPosition.Text = "Position:" - ' - 'lblLegend - ' - Me.lblLegend.AutoSize = True - Me.lblLegend.Location = New System.Drawing.Point(59, 50) - Me.lblLegend.Name = "lblLegend" - Me.lblLegend.Size = New System.Drawing.Size(46, 13) - Me.lblLegend.TabIndex = 36 - Me.lblLegend.Text = "Legend:" - ' - 'lblPointsize - ' - Me.lblPointsize.AutoSize = True - Me.lblPointsize.Location = New System.Drawing.Point(59, 21) - Me.lblPointsize.Name = "lblPointsize" - Me.lblPointsize.Size = New System.Drawing.Size(30, 13) - Me.lblPointsize.TabIndex = 33 - Me.lblPointsize.Text = "Size:" - ' - 'lblShape - ' - Me.lblShape.AutoSize = True - Me.lblShape.Location = New System.Drawing.Point(186, 21) - Me.lblShape.Name = "lblShape" - Me.lblShape.Size = New System.Drawing.Size(41, 13) - Me.lblShape.TabIndex = 31 - Me.lblShape.Text = "Shape:" - ' 'rdoCount ' Me.rdoCount.AutoSize = True - Me.rdoCount.Location = New System.Drawing.Point(4, 46) + Me.rdoCount.Location = New System.Drawing.Point(10, 48) Me.rdoCount.Name = "rdoCount" Me.rdoCount.Size = New System.Drawing.Size(53, 17) Me.rdoCount.TabIndex = 30 @@ -268,7 +232,7 @@ Partial Class dlgScatterPlot 'rdoPoint ' Me.rdoPoint.AutoSize = True - Me.rdoPoint.Location = New System.Drawing.Point(4, 20) + Me.rdoPoint.Location = New System.Drawing.Point(10, 19) Me.rdoPoint.Name = "rdoPoint" Me.rdoPoint.Size = New System.Drawing.Size(49, 17) Me.rdoPoint.TabIndex = 29 @@ -279,7 +243,7 @@ Partial Class dlgScatterPlot 'lblHeith ' Me.lblHeith.AutoSize = True - Me.lblHeith.Location = New System.Drawing.Point(180, 73) + Me.lblHeith.Location = New System.Drawing.Point(189, 81) Me.lblHeith.Name = "lblHeith" Me.lblHeith.Size = New System.Drawing.Size(41, 13) Me.lblHeith.TabIndex = 27 @@ -288,7 +252,7 @@ Partial Class dlgScatterPlot 'lblWidth ' Me.lblWidth.AutoSize = True - Me.lblWidth.Location = New System.Drawing.Point(60, 73) + Me.lblWidth.Location = New System.Drawing.Point(76, 81) Me.lblWidth.Name = "lblWidth" Me.lblWidth.Size = New System.Drawing.Size(38, 13) Me.lblWidth.TabIndex = 25 @@ -297,7 +261,7 @@ Partial Class dlgScatterPlot 'rdoJitter ' Me.rdoJitter.AutoSize = True - Me.rdoJitter.Location = New System.Drawing.Point(4, 71) + Me.rdoJitter.Location = New System.Drawing.Point(10, 77) Me.rdoJitter.Name = "rdoJitter" Me.rdoJitter.Size = New System.Drawing.Size(47, 17) Me.rdoJitter.TabIndex = 24 @@ -316,6 +280,83 @@ Partial Class dlgScatterPlot Me.lblFacetBy.Tag = "" Me.lblFacetBy.Text = "Facet By:" ' + 'grpAdd + ' + Me.grpAdd.Controls.Add(Me.ucrChkLineofBestFit) + Me.grpAdd.Controls.Add(Me.ucrChkAddSidePlot) + Me.grpAdd.Controls.Add(Me.ucrChkAddRugPlot) + Me.grpAdd.Controls.Add(Me.lblSides) + Me.grpAdd.Controls.Add(Me.ucrNudSize) + Me.grpAdd.Controls.Add(Me.lblSize) + Me.grpAdd.Controls.Add(Me.ucrInputSides) + Me.grpAdd.Controls.Add(Me.ucrChkWithSE) + Me.grpAdd.Location = New System.Drawing.Point(9, 227) + Me.grpAdd.Name = "grpAdd" + Me.grpAdd.Size = New System.Drawing.Size(336, 95) + Me.grpAdd.TabIndex = 81 + Me.grpAdd.TabStop = False + Me.grpAdd.Text = "Add" + ' + 'ucrChkLineofBestFit + ' + Me.ucrChkLineofBestFit.AutoSize = True + Me.ucrChkLineofBestFit.Checked = False + Me.ucrChkLineofBestFit.Location = New System.Drawing.Point(6, 16) + Me.ucrChkLineofBestFit.Name = "ucrChkLineofBestFit" + Me.ucrChkLineofBestFit.Size = New System.Drawing.Size(173, 24) + Me.ucrChkLineofBestFit.TabIndex = 9 + ' + 'ucrChkAddSidePlot + ' + Me.ucrChkAddSidePlot.AutoSize = True + Me.ucrChkAddSidePlot.Checked = False + Me.ucrChkAddSidePlot.Location = New System.Drawing.Point(6, 59) + Me.ucrChkAddSidePlot.Name = "ucrChkAddSidePlot" + Me.ucrChkAddSidePlot.Size = New System.Drawing.Size(134, 23) + Me.ucrChkAddSidePlot.TabIndex = 80 + ' + 'ucrChkAddRugPlot + ' + Me.ucrChkAddRugPlot.AutoSize = True + Me.ucrChkAddRugPlot.Checked = False + Me.ucrChkAddRugPlot.Location = New System.Drawing.Point(6, 38) + Me.ucrChkAddRugPlot.Name = "ucrChkAddRugPlot" + Me.ucrChkAddRugPlot.Size = New System.Drawing.Size(108, 23) + Me.ucrChkAddRugPlot.TabIndex = 11 + ' + 'ucrNudSize + ' + Me.ucrNudSize.AutoSize = True + Me.ucrNudSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSize.Location = New System.Drawing.Point(150, 41) + Me.ucrNudSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSize.Name = "ucrNudSize" + Me.ucrNudSize.Size = New System.Drawing.Size(45, 20) + Me.ucrNudSize.TabIndex = 13 + Me.ucrNudSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputSides + ' + Me.ucrInputSides.AddQuotesIfUnrecognised = True + Me.ucrInputSides.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputSides.GetSetSelectedIndex = -1 + Me.ucrInputSides.IsReadOnly = False + Me.ucrInputSides.Location = New System.Drawing.Point(236, 40) + Me.ucrInputSides.Name = "ucrInputSides" + Me.ucrInputSides.Size = New System.Drawing.Size(94, 21) + Me.ucrInputSides.TabIndex = 15 + ' + 'ucrChkWithSE + ' + Me.ucrChkWithSE.AutoSize = True + Me.ucrChkWithSE.Checked = False + Me.ucrChkWithSE.Location = New System.Drawing.Point(186, 17) + Me.ucrChkWithSE.Name = "ucrChkWithSE" + Me.ucrChkWithSE.Size = New System.Drawing.Size(133, 23) + Me.ucrChkWithSE.TabIndex = 10 + ' 'ucrInputStation ' Me.ucrInputStation.AddQuotesIfUnrecognised = True @@ -360,27 +401,76 @@ Partial Class dlgScatterPlot Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) Me.ucrChkLegend.TabIndex = 77 ' + 'ucrNudPointsize + ' + Me.ucrNudPointsize.AutoSize = True + Me.ucrNudPointsize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPointsize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudPointsize.Location = New System.Drawing.Point(174, 18) + Me.ucrNudPointsize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudPointsize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPointsize.Name = "ucrNudPointsize" + Me.ucrNudPointsize.Size = New System.Drawing.Size(45, 20) + Me.ucrNudPointsize.TabIndex = 34 + Me.ucrNudPointsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkColour + ' + Me.ucrChkColour.AutoSize = True + Me.ucrChkColour.Checked = False + Me.ucrChkColour.Location = New System.Drawing.Point(98, 48) + Me.ucrChkColour.Name = "ucrChkColour" + Me.ucrChkColour.Size = New System.Drawing.Size(114, 23) + Me.ucrChkColour.TabIndex = 84 + ' + 'ucrChkPosition + ' + Me.ucrChkPosition.AutoSize = True + Me.ucrChkPosition.Checked = False + Me.ucrChkPosition.Location = New System.Drawing.Point(257, 48) + Me.ucrChkPosition.Name = "ucrChkPosition" + Me.ucrChkPosition.Size = New System.Drawing.Size(79, 23) + Me.ucrChkPosition.TabIndex = 83 + ' + 'ucrChkSize + ' + Me.ucrChkSize.AutoSize = True + Me.ucrChkSize.Checked = False + Me.ucrChkSize.Location = New System.Drawing.Point(98, 19) + Me.ucrChkSize.Name = "ucrChkSize" + Me.ucrChkSize.Size = New System.Drawing.Size(77, 23) + Me.ucrChkSize.TabIndex = 82 + ' + 'ucrChkShape + ' + Me.ucrChkShape.AutoSize = True + Me.ucrChkShape.Checked = False + Me.ucrChkShape.Location = New System.Drawing.Point(250, 20) + Me.ucrChkShape.Name = "ucrChkShape" + Me.ucrChkShape.Size = New System.Drawing.Size(79, 23) + Me.ucrChkShape.TabIndex = 81 + ' 'ucrInputPosition ' Me.ucrInputPosition.AddQuotesIfUnrecognised = True Me.ucrInputPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputPosition.GetSetSelectedIndex = -1 Me.ucrInputPosition.IsReadOnly = False - Me.ucrInputPosition.Location = New System.Drawing.Point(240, 44) + Me.ucrInputPosition.Location = New System.Drawing.Point(329, 48) Me.ucrInputPosition.Name = "ucrInputPosition" - Me.ucrInputPosition.Size = New System.Drawing.Size(83, 21) + Me.ucrInputPosition.Size = New System.Drawing.Size(95, 21) Me.ucrInputPosition.TabIndex = 39 ' - 'ucrInputLegend + 'ucrInputColour ' - Me.ucrInputLegend.AddQuotesIfUnrecognised = True - Me.ucrInputLegend.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputLegend.GetSetSelectedIndex = -1 - Me.ucrInputLegend.IsReadOnly = False - Me.ucrInputLegend.Location = New System.Drawing.Point(111, 44) - Me.ucrInputLegend.Name = "ucrInputLegend" - Me.ucrInputLegend.Size = New System.Drawing.Size(61, 21) - Me.ucrInputLegend.TabIndex = 37 + Me.ucrInputColour.AddQuotesIfUnrecognised = True + Me.ucrInputColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputColour.GetSetSelectedIndex = -1 + Me.ucrInputColour.IsReadOnly = False + Me.ucrInputColour.Location = New System.Drawing.Point(176, 48) + Me.ucrInputColour.Name = "ucrInputColour" + Me.ucrInputColour.Size = New System.Drawing.Size(61, 21) + Me.ucrInputColour.TabIndex = 37 ' 'ucrInputShape ' @@ -388,30 +478,17 @@ Partial Class dlgScatterPlot Me.ucrInputShape.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputShape.GetSetSelectedIndex = -1 Me.ucrInputShape.IsReadOnly = False - Me.ucrInputShape.Location = New System.Drawing.Point(227, 16) + Me.ucrInputShape.Location = New System.Drawing.Point(329, 19) Me.ucrInputShape.Name = "ucrInputShape" Me.ucrInputShape.Size = New System.Drawing.Size(96, 21) Me.ucrInputShape.TabIndex = 35 ' - 'ucrNudPointsize - ' - Me.ucrNudPointsize.AutoSize = True - Me.ucrNudPointsize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudPointsize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPointsize.Location = New System.Drawing.Point(113, 17) - Me.ucrNudPointsize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudPointsize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudPointsize.Name = "ucrNudPointsize" - Me.ucrNudPointsize.Size = New System.Drawing.Size(45, 20) - Me.ucrNudPointsize.TabIndex = 34 - Me.ucrNudPointsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'ucrNudHeigth ' Me.ucrNudHeigth.AutoSize = True Me.ucrNudHeigth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHeigth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHeigth.Location = New System.Drawing.Point(227, 71) + Me.ucrNudHeigth.Location = New System.Drawing.Point(236, 77) Me.ucrNudHeigth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudHeigth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHeigth.Name = "ucrNudHeigth" @@ -424,7 +501,7 @@ Partial Class dlgScatterPlot Me.ucrNudWidth.AutoSize = True Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWidth.Location = New System.Drawing.Point(113, 71) + Me.ucrNudWidth.Location = New System.Drawing.Point(123, 77) Me.ucrNudWidth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWidth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWidth.Name = "ucrNudWidth" @@ -437,7 +514,7 @@ Partial Class dlgScatterPlot Me.ucrPnlGeoms.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlGeoms.Location = New System.Drawing.Point(2, 14) Me.ucrPnlGeoms.Name = "ucrPnlGeoms" - Me.ucrPnlGeoms.Size = New System.Drawing.Size(321, 89) + Me.ucrPnlGeoms.Size = New System.Drawing.Size(433, 89) Me.ucrPnlGeoms.TabIndex = 24 ' 'cmdOptions @@ -453,39 +530,6 @@ Partial Class dlgScatterPlot Me.cmdOptions.Text = "Plot Options" Me.cmdOptions.UseVisualStyleBackColor = True ' - 'ucrInputSides - ' - Me.ucrInputSides.AddQuotesIfUnrecognised = True - Me.ucrInputSides.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputSides.GetSetSelectedIndex = -1 - Me.ucrInputSides.IsReadOnly = False - Me.ucrInputSides.Location = New System.Drawing.Point(236, 40) - Me.ucrInputSides.Name = "ucrInputSides" - Me.ucrInputSides.Size = New System.Drawing.Size(94, 21) - Me.ucrInputSides.TabIndex = 15 - ' - 'ucrNudSize - ' - Me.ucrNudSize.AutoSize = True - Me.ucrNudSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSize.Location = New System.Drawing.Point(150, 41) - Me.ucrNudSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSize.Name = "ucrNudSize" - Me.ucrNudSize.Size = New System.Drawing.Size(45, 20) - Me.ucrNudSize.TabIndex = 13 - Me.ucrNudSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkAddRugPlot - ' - Me.ucrChkAddRugPlot.AutoSize = True - Me.ucrChkAddRugPlot.Checked = False - Me.ucrChkAddRugPlot.Location = New System.Drawing.Point(6, 38) - Me.ucrChkAddRugPlot.Name = "ucrChkAddRugPlot" - Me.ucrChkAddRugPlot.Size = New System.Drawing.Size(108, 23) - Me.ucrChkAddRugPlot.TabIndex = 11 - ' 'ucrReceiverLabel ' Me.ucrReceiverLabel.AutoSize = True @@ -499,24 +543,6 @@ Partial Class dlgScatterPlot Me.ucrReceiverLabel.TabIndex = 7 Me.ucrReceiverLabel.ucrSelector = Nothing ' - 'ucrChkWithSE - ' - Me.ucrChkWithSE.AutoSize = True - Me.ucrChkWithSE.Checked = False - Me.ucrChkWithSE.Location = New System.Drawing.Point(186, 17) - Me.ucrChkWithSE.Name = "ucrChkWithSE" - Me.ucrChkWithSE.Size = New System.Drawing.Size(133, 23) - Me.ucrChkWithSE.TabIndex = 10 - ' - 'ucrChkLineofBestFit - ' - Me.ucrChkLineofBestFit.AutoSize = True - Me.ucrChkLineofBestFit.Checked = False - Me.ucrChkLineofBestFit.Location = New System.Drawing.Point(6, 16) - Me.ucrChkLineofBestFit.Name = "ucrChkLineofBestFit" - Me.ucrChkLineofBestFit.Size = New System.Drawing.Size(173, 24) - Me.ucrChkLineofBestFit.TabIndex = 9 - ' 'ucrSaveScatterPlot ' Me.ucrSaveScatterPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -586,32 +612,6 @@ Partial Class dlgScatterPlot Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 17 ' - 'ucrChkAddSidePlot - ' - Me.ucrChkAddSidePlot.AutoSize = True - Me.ucrChkAddSidePlot.Checked = False - Me.ucrChkAddSidePlot.Location = New System.Drawing.Point(6, 67) - Me.ucrChkAddSidePlot.Name = "ucrChkAddSidePlot" - Me.ucrChkAddSidePlot.Size = New System.Drawing.Size(134, 23) - Me.ucrChkAddSidePlot.TabIndex = 80 - ' - 'grpAdd - ' - Me.grpAdd.Controls.Add(Me.ucrChkLineofBestFit) - Me.grpAdd.Controls.Add(Me.ucrChkAddSidePlot) - Me.grpAdd.Controls.Add(Me.ucrChkAddRugPlot) - Me.grpAdd.Controls.Add(Me.lblSides) - Me.grpAdd.Controls.Add(Me.ucrNudSize) - Me.grpAdd.Controls.Add(Me.lblSize) - Me.grpAdd.Controls.Add(Me.ucrInputSides) - Me.grpAdd.Controls.Add(Me.ucrChkWithSE) - Me.grpAdd.Location = New System.Drawing.Point(9, 227) - Me.grpAdd.Name = "grpAdd" - Me.grpAdd.Size = New System.Drawing.Size(336, 95) - Me.grpAdd.TabIndex = 81 - Me.grpAdd.TabStop = False - Me.grpAdd.Text = "Add" - ' 'dlgScatterPlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -687,14 +687,10 @@ Partial Class dlgScatterPlot Friend WithEvents rdoCount As RadioButton Friend WithEvents rdoPoint As RadioButton Friend WithEvents toolStripMenuItemCountOptions As ToolStripMenuItem - Friend WithEvents lblPointsize As Label Friend WithEvents ucrNudPointsize As ucrNud - Friend WithEvents lblShape As Label Friend WithEvents ucrInputShape As ucrInputComboBox Friend WithEvents ucrInputPosition As ucrInputComboBox - Friend WithEvents lblPosition As Label - Friend WithEvents ucrInputLegend As ucrInputComboBox - Friend WithEvents lblLegend As Label + Friend WithEvents ucrInputColour As ucrInputComboBox Friend WithEvents ucrInputStation As ucrInputComboBox Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle Friend WithEvents lblFacetBy As Label @@ -702,4 +698,8 @@ Partial Class dlgScatterPlot Friend WithEvents ucrChkLegend As ucrCheck Friend WithEvents ucrChkAddSidePlot As ucrCheck Friend WithEvents grpAdd As GroupBox + Friend WithEvents ucrChkSize As ucrCheck + Friend WithEvents ucrChkShape As ucrCheck + Friend WithEvents ucrChkColour As ucrCheck + Friend WithEvents ucrChkPosition As ucrCheck End Class diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb index ed138c90efe..917b9a763ad 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -68,6 +68,8 @@ Public Class dlgScatterPlot Private strGeomJitterParameterName As String = "geom_jitter" Private strGeomCountParameterName As String = "geom_count" Private strGeomParameterNames() As String = {strFirstParameterName, strGeomJitterParameterName, strGeomCountParameterName, strGeomSmoothParameterName, strGeomTextRepelParameterName} + Private strPickColour As String = "Pick Colour..." + Private dlgColour As New ColorDialog Private Sub dlgScatterPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -144,6 +146,26 @@ Public Class dlgScatterPlot ucrChkAddSidePlot.SetText("Side Plot") ucrChkAddSidePlot.Enabled = False + ucrChkSize.SetText("Size") + ucrChkSize.AddParameterPresentCondition(True, "geom_point") + ucrChkSize.AddParameterPresentCondition(False, "geom_point", False) + ucrChkSize.AddToLinkedControls({ucrNudPointsize}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkShape.SetText("Shape") + ucrChkShape.AddParameterPresentCondition(True, "geom_point") + ucrChkShape.AddParameterPresentCondition(False, "geom_point", False) + ucrChkShape.AddToLinkedControls({ucrInputShape}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkColour.SetText("Colour") + ucrChkColour.AddParameterPresentCondition(True, "geom_count") + ucrChkColour.AddParameterPresentCondition(False, "geom_count", False) + ucrChkColour.AddToLinkedControls({ucrInputColour}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkPosition.SetText("Position") + ucrChkPosition.AddParameterPresentCondition(True, "geom_count") + ucrChkPosition.AddParameterPresentCondition(False, "geom_count", False) + ucrChkPosition.AddToLinkedControls({ucrInputPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlGeoms.AddRadioButton(rdoJitter) ucrPnlGeoms.AddRadioButton(rdoPoint) ucrPnlGeoms.AddRadioButton(rdoCount) @@ -152,9 +174,10 @@ Public Class dlgScatterPlot ucrPnlGeoms.AddParameterValuesCondition(rdoCount, "checked", "geom_count") ucrPnlGeoms.AddParameterValuesCondition(rdoJitter, "checked", "geom_jitter") ucrPnlGeoms.AddToLinkedControls({ucrNudWidth, ucrNudHeigth}, {rdoJitter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.40") - ucrPnlGeoms.AddToLinkedControls({ucrNudPointsize, ucrInputShape}, {rdoPoint}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlGeoms.AddToLinkedControls(ucrInputPosition, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="identity") - ucrPnlGeoms.AddToLinkedControls(ucrInputLegend, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="NA") + ucrPnlGeoms.AddToLinkedControls({ucrNudPointsize, ucrChkSize, ucrInputShape, ucrChkShape}, {rdoPoint}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlGeoms.AddToLinkedControls({ucrInputPosition}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="identity") + ucrPnlGeoms.AddToLinkedControls({ucrInputColour}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Black") + ucrPnlGeoms.AddToLinkedControls({ucrChkPosition, ucrChkColour}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSaveScatterPlot.SetPrefix("scatter_plot") ucrSaveScatterPlot.SetSaveType(strRObjectType:=RObjectTypeLabel.Graph, @@ -221,10 +244,10 @@ Public Class dlgScatterPlot ucrInputPosition.SetItems({"identity", "stack", "dodge", "jitter", "fill", "position_dodge", "position_jitter(width=0.2,height=0.0)"}) ucrInputPosition.SetDropDownStyleAsNonEditable() - ucrInputLegend.SetParameter(New RParameter("show.legend", 11)) - ucrInputLegend.SetItems({"NA", "TRUE", "FALSE"}) - ucrInputLegend.SetDropDownStyleAsNonEditable() - ucrInputLegend.AddQuotesIfUnrecognised = False + ucrInputColour.SetParameter(New RParameter("colour", 11)) + ucrInputColour.SetItems({"NULL", strPickColour, "Black", "White", "Blue", "Red", "Yellow", "Purple", "Green", "Orange", "Grey", "Brown", "Pink"}) + ucrInputColour.SetDropDownStyleAsNonEditable() + ucrInputColour.AddQuotesIfUnrecognised = True ucrInputSides.SetParameter(New RParameter("sides", 1)) dctSidesOptions.Add("Bottom and left", Chr(34) & "bl" & Chr(34)) @@ -275,11 +298,8 @@ Public Class dlgScatterPlot ucrNudSize.SetLinkedDisplayControl(lblSize) ucrNudWidth.SetLinkedDisplayControl(lblWidth) ucrNudHeigth.SetLinkedDisplayControl(lblHeith) - ucrInputShape.SetLinkedDisplayControl(lblShape) - ucrNudPointsize.SetLinkedDisplayControl(lblPointsize) ucrInputSides.SetLinkedDisplayControl(lblSides) - ucrInputPosition.SetLinkedDisplayControl(lblPosition) - ucrInputLegend.SetLinkedDisplayControl(lblLegend) + End Sub Private Sub SetDefaults() @@ -423,7 +443,7 @@ Public Class dlgScatterPlot ucrInputSides.SetRCode(clsGeomRugFunction, bReset) ucrInputShape.SetRCode(clsRScatterGeomFunction, bReset) ucrNudPointsize.SetRCode(clsRScatterGeomFunction, bReset) - ucrInputLegend.SetRCode(clsCountGeomFunction, bReset) + ucrInputColour.SetRCode(clsCountGeomFunction, bReset) ucrInputPosition.SetRCode(clsCountGeomFunction, bReset) ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) @@ -566,7 +586,7 @@ Public Class dlgScatterPlot toolStripMenuItemTextrepelOptions.Enabled = Not ucrReceiverLabel.IsEmpty End Sub - Private Sub ucrPnlGeoms_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlGeoms.ControlValueChanged, ucrNudHeigth.ControlValueChanged, ucrNudWidth.ControlValueChanged, ucrInputLegend.ControlValueChanged, ucrInputPosition.ControlValueChanged, ucrInputShape.ControlValueChanged, ucrNudPointsize.ControlValueChanged + Private Sub ucrPnlGeoms_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlGeoms.ControlValueChanged, ucrNudHeigth.ControlValueChanged, ucrNudWidth.ControlValueChanged, ucrInputColour.ControlValueChanged, ucrInputPosition.ControlValueChanged, ucrInputShape.ControlValueChanged, ucrNudPointsize.ControlValueChanged If rdoJitter.Checked Then clsGeomJitterFunction.AddParameter("width", ucrNudWidth.GetText, iPosition:=0) clsGeomJitterFunction.AddParameter("height", ucrNudHeigth.GetText, iPosition:=1) @@ -579,6 +599,7 @@ Public Class dlgScatterPlot clsBaseOperator.RemoveParameterByName(strGeomCountParameterName) ElseIf rdoCount.Checked Then ChangePositionCount() + ChangeCountColour() clsBaseOperator.AddParameter(strGeomCountParameterName, clsRFunctionParameter:=clsCountGeomFunction, iPosition:=2) clsBaseOperator.RemoveParameterByName(strGeomJitterParameterName) clsBaseOperator.RemoveParameterByName(strFirstParameterName) @@ -595,6 +616,15 @@ Public Class dlgScatterPlot End If End Sub + Private Sub ChangeCountColour() + If ucrChkColour.Checked Then + clsCountGeomFunction.AddParameter("colour", Chr(34) & ucrInputColour.GetText & Chr(34), iPosition:=11) + Else + clsCountGeomFunction.RemoveParameterByName("colour") + End If + + End Sub + Private Sub AutoFacetStation() Dim currentReceiver As ucrReceiver = ucrSelectorForScatter.CurrentReceiver @@ -782,7 +812,34 @@ Public Class dlgScatterPlot End If End Sub - Private Sub ucrFactorOptionalReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrFactorOptionalReceiver.ControlValueChanged - AddRemoveGroupAesVar() + Private Sub ucrChkSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSize.ControlValueChanged, ucrNudPointsize.ControlValueChanged + If ucrChkSize.Checked AndAlso (Not ucrNudPointsize.IsEmpty) Then + clsRScatterGeomFunction.AddParameter("size", ucrNudPointsize.GetText, iPosition:=0) + Else + clsRScatterGeomFunction.RemoveParameterByName("size") + End If + End Sub + + Private Sub ucrInputColour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputColour.ControlValueChanged + Dim strColourItem As String + Dim clrTemp As Color + + If ucrInputColour.GetText() = strPickColour Then + Try + If dlgColour.ShowDialog() = DialogResult.OK Then + clrTemp = dlgColour.Color + 'first two character from Hex are fixed as FF for VB use, not part of colour value + 'ggplot requires # in front of Hex colour values + strColourItem = "#" & Hex(clrTemp.ToArgb).Substring(2, 6) + 'First item is NULL and needs to be changed before setting text otherwise value will not show in combobox + ucrInputColour.cboInput.Items.Item(0) = strColourItem + ucrInputColour.SetName(strColourItem) + Else + ucrInputColour.SetName("NULL") + End If + Catch ex As Exception + dlgColour.Dispose() + End Try + End If End Sub End Class diff --git a/instat/dlgSelect.Designer.vb b/instat/dlgSelect.Designer.vb index 3f679d4dff8..c31cfdfd7a3 100644 --- a/instat/dlgSelect.Designer.vb +++ b/instat/dlgSelect.Designer.vb @@ -66,9 +66,11 @@ Partial Class dlgSelect Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsSubset) Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsSelect) Me.grpApplyOptions.Controls.Add(Me.ucrPnlApplyOptions) - Me.grpApplyOptions.Location = New System.Drawing.Point(13, 258) + Me.grpApplyOptions.Location = New System.Drawing.Point(10, 206) + Me.grpApplyOptions.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.grpApplyOptions.Name = "grpApplyOptions" - Me.grpApplyOptions.Size = New System.Drawing.Size(267, 126) + Me.grpApplyOptions.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpApplyOptions.Size = New System.Drawing.Size(214, 101) Me.grpApplyOptions.TabIndex = 4 Me.grpApplyOptions.TabStop = False Me.grpApplyOptions.Text = "Apply" @@ -76,22 +78,23 @@ Partial Class dlgSelect 'rdoApplySave ' Me.rdoApplySave.AutoSize = True - Me.rdoApplySave.Location = New System.Drawing.Point(9, 88) - Me.rdoApplySave.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.rdoApplySave.Location = New System.Drawing.Point(7, 70) + Me.rdoApplySave.Margin = New System.Windows.Forms.Padding(2) Me.rdoApplySave.Name = "rdoApplySave" - Me.rdoApplySave.Size = New System.Drawing.Size(101, 20) + Me.rdoApplySave.Size = New System.Drawing.Size(83, 17) Me.rdoApplySave.TabIndex = 3 Me.rdoApplySave.TabStop = True - Me.rdoApplySave.Text = "Save Select" + Me.rdoApplySave.Text = "Store Select" Me.rdoApplySave.UseVisualStyleBackColor = True ' 'rdoApplyAsSubset ' Me.rdoApplyAsSubset.AutoSize = True Me.rdoApplyAsSubset.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoApplyAsSubset.Location = New System.Drawing.Point(9, 59) + Me.rdoApplyAsSubset.Location = New System.Drawing.Point(7, 47) + Me.rdoApplyAsSubset.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.rdoApplyAsSubset.Name = "rdoApplyAsSubset" - Me.rdoApplyAsSubset.Size = New System.Drawing.Size(89, 20) + Me.rdoApplyAsSubset.Size = New System.Drawing.Size(73, 17) Me.rdoApplyAsSubset.TabIndex = 1 Me.rdoApplyAsSubset.TabStop = True Me.rdoApplyAsSubset.Text = "As Subset" @@ -101,9 +104,10 @@ Partial Class dlgSelect ' Me.rdoApplyAsSelect.AutoSize = True Me.rdoApplyAsSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoApplyAsSelect.Location = New System.Drawing.Point(9, 30) + Me.rdoApplyAsSelect.Location = New System.Drawing.Point(7, 24) + Me.rdoApplyAsSelect.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.rdoApplyAsSelect.Name = "rdoApplyAsSelect" - Me.rdoApplyAsSelect.Size = New System.Drawing.Size(156, 20) + Me.rdoApplyAsSelect.Size = New System.Drawing.Size(125, 17) Me.rdoApplyAsSelect.TabIndex = 0 Me.rdoApplyAsSelect.TabStop = True Me.rdoApplyAsSelect.Text = "As Selected Columns" @@ -112,10 +116,10 @@ Partial Class dlgSelect 'ucrPnlApplyOptions ' Me.ucrPnlApplyOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlApplyOptions.Location = New System.Drawing.Point(5, 21) - Me.ucrPnlApplyOptions.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrPnlApplyOptions.Location = New System.Drawing.Point(4, 17) + Me.ucrPnlApplyOptions.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrPnlApplyOptions.Name = "ucrPnlApplyOptions" - Me.ucrPnlApplyOptions.Size = New System.Drawing.Size(241, 95) + Me.ucrPnlApplyOptions.Size = New System.Drawing.Size(193, 76) Me.ucrPnlApplyOptions.TabIndex = 2 ' 'grpOptions @@ -123,11 +127,11 @@ Partial Class dlgSelect Me.grpOptions.Controls.Add(Me.ucrChkDialogue) Me.grpOptions.Controls.Add(Me.ucrChkMetaData) Me.grpOptions.Controls.Add(Me.ucrChkDataframe) - Me.grpOptions.Location = New System.Drawing.Point(286, 258) - Me.grpOptions.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpOptions.Location = New System.Drawing.Point(229, 206) + Me.grpOptions.Margin = New System.Windows.Forms.Padding(2) Me.grpOptions.Name = "grpOptions" - Me.grpOptions.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) - Me.grpOptions.Size = New System.Drawing.Size(241, 126) + Me.grpOptions.Padding = New System.Windows.Forms.Padding(2) + Me.grpOptions.Size = New System.Drawing.Size(193, 101) Me.grpOptions.TabIndex = 3 Me.grpOptions.TabStop = False Me.grpOptions.Text = "Apply To:" @@ -136,48 +140,50 @@ Partial Class dlgSelect ' Me.ucrChkDialogue.AutoSize = True Me.ucrChkDialogue.Checked = False - Me.ucrChkDialogue.Location = New System.Drawing.Point(12, 88) - Me.ucrChkDialogue.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) + Me.ucrChkDialogue.Location = New System.Drawing.Point(10, 70) + Me.ucrChkDialogue.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrChkDialogue.Name = "ucrChkDialogue" - Me.ucrChkDialogue.Size = New System.Drawing.Size(221, 29) + Me.ucrChkDialogue.Size = New System.Drawing.Size(177, 23) Me.ucrChkDialogue.TabIndex = 2 ' 'ucrChkMetaData ' Me.ucrChkMetaData.AutoSize = True Me.ucrChkMetaData.Checked = False - Me.ucrChkMetaData.Location = New System.Drawing.Point(12, 53) - Me.ucrChkMetaData.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) + Me.ucrChkMetaData.Location = New System.Drawing.Point(10, 42) + Me.ucrChkMetaData.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrChkMetaData.Name = "ucrChkMetaData" - Me.ucrChkMetaData.Size = New System.Drawing.Size(221, 29) + Me.ucrChkMetaData.Size = New System.Drawing.Size(177, 23) Me.ucrChkMetaData.TabIndex = 1 ' 'ucrChkDataframe ' Me.ucrChkDataframe.AutoSize = True Me.ucrChkDataframe.Checked = False - Me.ucrChkDataframe.Location = New System.Drawing.Point(12, 22) - Me.ucrChkDataframe.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) + Me.ucrChkDataframe.Location = New System.Drawing.Point(10, 18) + Me.ucrChkDataframe.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrChkDataframe.Name = "ucrChkDataframe" - Me.ucrChkDataframe.Size = New System.Drawing.Size(221, 29) + Me.ucrChkDataframe.Size = New System.Drawing.Size(177, 23) Me.ucrChkDataframe.TabIndex = 0 ' 'lblSelection ' Me.lblSelection.AutoSize = True Me.lblSelection.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSelection.Location = New System.Drawing.Point(312, 68) + Me.lblSelection.Location = New System.Drawing.Point(250, 54) + Me.lblSelection.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblSelection.Name = "lblSelection" - Me.lblSelection.Size = New System.Drawing.Size(66, 16) + Me.lblSelection.Size = New System.Drawing.Size(54, 13) Me.lblSelection.TabIndex = 1 Me.lblSelection.Text = "Selection:" ' 'cmdDefineNewSelect ' Me.cmdDefineNewSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDefineNewSelect.Location = New System.Drawing.Point(312, 122) + Me.cmdDefineNewSelect.Location = New System.Drawing.Point(250, 98) + Me.cmdDefineNewSelect.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdDefineNewSelect.Name = "cmdDefineNewSelect" - Me.cmdDefineNewSelect.Size = New System.Drawing.Size(197, 38) + Me.cmdDefineNewSelect.Size = New System.Drawing.Size(158, 30) Me.cmdDefineNewSelect.TabIndex = 3 Me.cmdDefineNewSelect.Tag = "" Me.cmdDefineNewSelect.Text = "Define New Selection" @@ -186,9 +192,10 @@ Partial Class dlgSelect 'lblFilterPreview ' Me.lblFilterPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFilterPreview.Location = New System.Drawing.Point(13, 466) + Me.lblFilterPreview.Location = New System.Drawing.Point(10, 373) + Me.lblFilterPreview.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblFilterPreview.Name = "lblFilterPreview" - Me.lblFilterPreview.Size = New System.Drawing.Size(178, 28) + Me.lblFilterPreview.Size = New System.Drawing.Size(142, 22) Me.lblFilterPreview.TabIndex = 7 Me.lblFilterPreview.Text = "Selection Preview:" Me.lblFilterPreview.Visible = False @@ -196,9 +203,10 @@ Partial Class dlgSelect 'lblNewDataFrameName ' Me.lblNewDataFrameName.AutoSize = True - Me.lblNewDataFrameName.Location = New System.Drawing.Point(27, 428) + Me.lblNewDataFrameName.Location = New System.Drawing.Point(22, 342) + Me.lblNewDataFrameName.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblNewDataFrameName.Name = "lblNewDataFrameName" - Me.lblNewDataFrameName.Size = New System.Drawing.Size(151, 16) + Me.lblNewDataFrameName.Size = New System.Drawing.Size(121, 13) Me.lblNewDataFrameName.TabIndex = 5 Me.lblNewDataFrameName.Text = "New Data Frame Name:" ' @@ -208,10 +216,10 @@ Partial Class dlgSelect Me.ucrInputNewDataFrameName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputNewDataFrameName.GetSetSelectedIndex = -1 Me.ucrInputNewDataFrameName.IsReadOnly = False - Me.ucrInputNewDataFrameName.Location = New System.Drawing.Point(182, 422) - Me.ucrInputNewDataFrameName.Margin = New System.Windows.Forms.Padding(12, 12, 12, 12) + Me.ucrInputNewDataFrameName.Location = New System.Drawing.Point(146, 338) + Me.ucrInputNewDataFrameName.Margin = New System.Windows.Forms.Padding(10, 10, 10, 10) Me.ucrInputNewDataFrameName.Name = "ucrInputNewDataFrameName" - Me.ucrInputNewDataFrameName.Size = New System.Drawing.Size(172, 27) + Me.ucrInputNewDataFrameName.Size = New System.Drawing.Size(138, 22) Me.ucrInputNewDataFrameName.TabIndex = 6 ' 'ucrInputSelectPreview @@ -220,10 +228,10 @@ Partial Class dlgSelect Me.ucrInputSelectPreview.AutoSize = True Me.ucrInputSelectPreview.IsMultiline = True Me.ucrInputSelectPreview.IsReadOnly = False - Me.ucrInputSelectPreview.Location = New System.Drawing.Point(200, 455) - Me.ucrInputSelectPreview.Margin = New System.Windows.Forms.Padding(12, 12, 12, 12) + Me.ucrInputSelectPreview.Location = New System.Drawing.Point(160, 364) + Me.ucrInputSelectPreview.Margin = New System.Windows.Forms.Padding(10, 10, 10, 10) Me.ucrInputSelectPreview.Name = "ucrInputSelectPreview" - Me.ucrInputSelectPreview.Size = New System.Drawing.Size(318, 53) + Me.ucrInputSelectPreview.Size = New System.Drawing.Size(254, 42) Me.ucrInputSelectPreview.TabIndex = 8 Me.ucrInputSelectPreview.Visible = False ' @@ -231,11 +239,11 @@ Partial Class dlgSelect ' Me.ucrReceiverSelect.AutoSize = True Me.ucrReceiverSelect.frmParent = Me - Me.ucrReceiverSelect.Location = New System.Drawing.Point(313, 88) + Me.ucrReceiverSelect.Location = New System.Drawing.Point(250, 70) Me.ucrReceiverSelect.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSelect.Name = "ucrReceiverSelect" Me.ucrReceiverSelect.Selector = Nothing - Me.ucrReceiverSelect.Size = New System.Drawing.Size(195, 25) + Me.ucrReceiverSelect.Size = New System.Drawing.Size(156, 20) Me.ucrReceiverSelect.strNcFilePath = "" Me.ucrReceiverSelect.TabIndex = 2 Me.ucrReceiverSelect.ucrSelector = Nothing @@ -246,28 +254,28 @@ Partial Class dlgSelect Me.ucrSelectorForSelectColumns.bDropUnusedFilterLevels = False Me.ucrSelectorForSelectColumns.bShowHiddenColumns = False Me.ucrSelectorForSelectColumns.bUseCurrentFilter = True - Me.ucrSelectorForSelectColumns.Location = New System.Drawing.Point(13, 25) + Me.ucrSelectorForSelectColumns.Location = New System.Drawing.Point(10, 20) Me.ucrSelectorForSelectColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForSelectColumns.Name = "ucrSelectorForSelectColumns" - Me.ucrSelectorForSelectColumns.Size = New System.Drawing.Size(267, 228) + Me.ucrSelectorForSelectColumns.Size = New System.Drawing.Size(214, 183) Me.ucrSelectorForSelectColumns.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(13, 516) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) + Me.ucrBase.Location = New System.Drawing.Point(10, 413) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(511, 65) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 ' 'dlgSelect ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(537, 588) + Me.ClientSize = New System.Drawing.Size(430, 470) Me.Controls.Add(Me.grpOptions) Me.Controls.Add(Me.ucrInputNewDataFrameName) Me.Controls.Add(Me.lblNewDataFrameName) @@ -280,6 +288,7 @@ Partial Class dlgSelect Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpApplyOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgSelect" diff --git a/instat/dlgThreeVariablePivotTable.vb b/instat/dlgThreeVariablePivotTable.vb index eab53f5aee1..daf52c6c197 100644 --- a/instat/dlgThreeVariablePivotTable.vb +++ b/instat/dlgThreeVariablePivotTable.vb @@ -118,7 +118,7 @@ Public Class dlgThreeVariablePivotTable ucrSavePivot.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSavePivot.SetDataFrameSelector(ucrSelectorPivot.ucrAvailableDataFrames) ucrSavePivot.SetIsComboBox() - ucrSavePivot.SetCheckBoxText("Save Table") + ucrSavePivot.SetCheckBoxText("Store Table") ucrSavePivot.SetAssignToIfUncheckedValue("last_table") End Sub diff --git a/instat/dlgTransformClimatic.resx b/instat/dlgTransformClimatic.resx index 7df82c09ec8..f29598120cd 100644 --- a/instat/dlgTransformClimatic.resx +++ b/instat/dlgTransformClimatic.resx @@ -2248,7 +2248,7 @@ 28 - 9, 254 + 9, 248 428, 151 diff --git a/instat/dlgTransformClimatic.vb b/instat/dlgTransformClimatic.vb index d4b2ae83e7f..ca2690e2c39 100644 --- a/instat/dlgTransformClimatic.vb +++ b/instat/dlgTransformClimatic.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class dlgTransformClimatic Private bFirstload As Boolean = True Private bReset As Boolean = True - Private clsRTransform, clsOverallTransformFunction, clsTransformManipulationsFunc, clsGroupByYear, clsGroupByStation, clsReplaceNAasElement, clsRTransformCountSpellSub As New RFunction + Private clsRTransform, clsAsNumericFunction, clsWaterBalanceFunction, clsOverallTransformFunction, clsTransformManipulationsFunc, clsGroupByYear, clsGroupByStation, clsReplaceNAasElement, clsRTransformCountSpellSub As New RFunction Private clsTransformCheck As New RFunction 'dummy @@ -34,9 +34,59 @@ Public Class dlgTransformClimatic Private clsRRaindayAndOperator, clsRRaindayOrOperator, clsRRaindayUpperOperator, clsRRaindayLowerOperator As New ROperator Private clsGreaterThanOperator, clsLessThanOperator As New ROperator - ' Water Balance - Private clsPMinFunctionMax, clsPMaxFunctionMax, clsRWaterBalanceFunction, clsTailFunction, clsWBEvaporation As New RFunction - Private clsPMaxOperatorMax, clsReduceOpEvapValue, clsWBOperator As New ROperator + ' Water Balance Min + Private clsEndSeasonWBMinCalc As New RFunction + Private clsEndSeasonWBMinCalcSubCalcsList As New RFunction + Private clsReduceWBMinFunction As New RFunction + Private clsReduceWBMinFunction1 As New RFunction + Private clsWBMinEvapOperator As New ROperator + Private clsWBEvaporationMinFunction As New RFunction + Private clsReduceWBMinFunction2 As New RFunction + Private clsEndSeasonRainMinCalc As New RFunction + Private clsPMinWBMinFunction As New RFunction + Private clsWBMinTailFunction1 As New RFunction + Private clsWBMinTailFunction As New RFunction + Private clsWBMinTailFunction2 As New RFunction + Private clsEndSeasonIsNaRain As New RFunction + Private clsEndSeasonConditionsOperator As New ROperator + Private clsEndSeasonCombinationCalc As New RFunction + Private clsEndSeasonCombinationSubCalcList As New RFunction + Private clsEndSeasonFirstDoySummaryCalc As New RFunction + Private clsGroupByStationYearCalc As New RFunction + Private clsDoyFilterOperator As New ROperator + Private clsDayFromOperator As New ROperator + Private clsDayToOperator As New ROperator + Private clsDoyFilterCalcFromConvert As New RFunction + Private clsDoyFilterCalcFromList As New RFunction + Private clsEndSeasonConditionsFilterSubCalcsList As New RFunction + Private clsEndSeasonWBCalc As New RFunction + Private clsEndSeasonWBCalcSubCalcsList As New RFunction + Private clsRoundFunction As New RFunction + Private clsEndSeasonWBConditionOperator As New ROperator + Private clsIfElseWBFunction As New RFunction + Private clsWBOperator As New ROperator + Private clsWBMinMaxOperator As New ROperator + Private clsIfElseRainMaxFunction As New RFunction + Private clsMinusMinOperator As New ROperator + Private clsMinusMaxOperator As New ROperator + Private clsEndSeasonRainMaxCalc As New RFunction + Private clsWBMaxTailFunction2 As New RFunction + Private clsWBMaxTailFunction As New RFunction + Private clsGroupByStationCalc As New RFunction + + ' Water Balance max + Private clsEndSeasonWBMaxCalc As New RFunction + Private clsEndSeasonWBMaxCalcSubCalcsList As New RFunction + Private clsReduceWBMaxFunction As New RFunction + Private clsPMinWBMaxFunction As New RFunction + Private clsReduceWBMaxFunction1 As New RFunction + Private clsWBMaxEvapOperator As New ROperator + Private clsPMaxFunction As New RFunction + Private clsWBOperator1 As New ROperator + Private clsWBMaxTailFunction1 As New RFunction + Private clsReduceWBMaxFunction2 As New RFunction + Private clsIfElseRainMinFunction As New RFunction + Private clsDoyFilterCalc As New RFunction 'Degree Private clsDiurnalRangeOperator, clsTMeanAddOperator, clsTMeanDivideOperator As New ROperator @@ -49,6 +99,12 @@ Public Class dlgTransformClimatic Private strCurrDataName As String = "" Private strRainDay As String = "rain_day" + Private strRainMin As String = "rain_min" + Private strRainMax As String = "rain_max" + Private strWBMin As String = "wb_min" + Private strWBMax As String = "wb_max" + Private strWB As String = "wb" + Private strEvapReplaceNA As String = "evap_NA_as_value" 'TODO:This will be useful when we want to resize dialog at different instances! 'Private iReceiverMaxY As Integer @@ -89,20 +145,18 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddRadioButton(rdoWaterBalance) ucrPnlTransform.AddRadioButton(rdoDegree) - ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoCumulative, "function_exp", {"cumsum", "cummin", "cummax"}) - ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoCount, "function_exp", "rollapply") - ucrPnlTransform.AddParameterPresentCondition(rdoCount, "sub_calculations", True) - ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoMoving, "function_exp", {"rollapply", "movingFun"}) - ucrPnlTransform.AddParameterPresentCondition(rdoMoving, "sub_calculations", False) - ucrPnlTransform.AddParameterIsStringCondition(rdoSpell, "function_exp") - ucrPnlTransform.AddFunctionNamesCondition(rdoMultSpells, "rollapply") - ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoWaterBalance, "function_exp", "Reduce") - ucrPnlTransform.AddParameterIsROperatorCondition(rdoDegree, "function_exp") + ucrPnlTransform.AddParameterValuesCondition(rdoCumulative, "checked", "cumsum") + ucrPnlTransform.AddParameterValuesCondition(rdoCount, "checked", "rollapply") + ucrPnlTransform.AddParameterValuesCondition(rdoMoving, "checked", "moving") + ucrPnlTransform.AddParameterValuesCondition(rdoSpell, "checked", "spell") + ucrPnlTransform.AddParameterValuesCondition(rdoMultSpells, "checked", "spells") + ucrPnlTransform.AddParameterValuesCondition(rdoWaterBalance, "checked", "Reduce") + ucrPnlTransform.AddParameterValuesCondition(rdoDegree, "checked", "degree") ucrPnlEvap.AddRadioButton(rdoEvapValue) ucrPnlEvap.AddRadioButton(rdoEvapVariable) - ucrPnlEvap.AddParameterPresentCondition(rdoEvapValue, "evaporation.value") - ucrPnlEvap.AddParameterPresentCondition(rdoEvapVariable, "evaporation.value", False) + ucrPnlEvap.AddParameterValuesCondition(rdoEvapValue, "evaporation.value", "value") + ucrPnlEvap.AddParameterValuesCondition(rdoEvapVariable, "evaporation.value", "variable") ucrPnlDegree.AddRadioButton(rdoTMean) ucrPnlDegree.AddRadioButton(rdoHeatingDegreeDays) @@ -110,11 +164,11 @@ Public Class dlgTransformClimatic ucrPnlDegree.AddRadioButton(rdoDiurnalRange) ucrPnlDegree.AddRadioButton(rdoModifiedGDD) - ucrPnlDegree.AddParameterValuesCondition(rdoModifiedGDD, "checked", "mgdd") - ucrPnlDegree.AddParameterValuesCondition(rdoDiurnalRange, "checked", "diurnal") - ucrPnlDegree.AddParameterValuesCondition(rdoTMean, "checked", "mean") - ucrPnlDegree.AddParameterValuesCondition(rdoHeatingDegreeDays, "checked", "hdd") - ucrPnlDegree.AddParameterValuesCondition(rdoGrowingDegreeDays, "checked", "gdd") + ucrPnlDegree.AddParameterValuesCondition(rdoModifiedGDD, "check", "mgdd") + ucrPnlDegree.AddParameterValuesCondition(rdoDiurnalRange, "check", "diurnal") + ucrPnlDegree.AddParameterValuesCondition(rdoTMean, "check", "mean") + ucrPnlDegree.AddParameterValuesCondition(rdoHeatingDegreeDays, "check", "hdd") + ucrPnlDegree.AddParameterValuesCondition(rdoGrowingDegreeDays, "check", "gdd") ttRdoRange.SetToolTip(rdoDiurnalRange, "Diurnal Range is the difference between Tmax And Tmin, (Tmax - Tmin)") ttRdoTMean.SetToolTip(rdoTMean, "Tmean is the average daily temperature, (Tmax + Tmin)/2") @@ -153,12 +207,10 @@ Public Class dlgTransformClimatic ucrReceiverData.SetIncludedDataTypes({"numeric"}) ucrReceiverData.SetLinkedDisplayControl(lblData) + ucrReceiverEvap.SetParameter(New RParameter("x", 0)) ucrReceiverEvap.Selector = ucrSelectorTransform - ucrReceiverEvap.SetParameter(New RParameter("right", 1, bNewIncludeArgumentName:=False)) ucrReceiverEvap.SetParameterIsString() ucrReceiverEvap.bWithQuotes = False - ucrReceiverEvap.strSelectorHeading = "Numerics" - ucrReceiverEvap.SetIncludedDataTypes({"numeric"}) ucrReceiverTMin.Selector = ucrSelectorTransform ucrReceiverTMin.SetParameter(New RParameter("tmin", 1)) @@ -226,11 +278,11 @@ Public Class dlgTransformClimatic ucrChkCircular.SetText("Circular") ucrChkCircular.SetLinkedDisplayControl(lblPosition) - ucrChkWB.SetParameter(New RParameter("WB_evap")) - ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkWB.AddParameterPresentCondition(True, "WB_evap", True) + ucrChkWB.AddParameterPresentCondition(False, "WB_evap", False) ucrChkWB.SetText("Reducing") - ucrNudWB.SetParameter(New RParameter("WB_evap_value", 2)) + ucrNudWB.SetParameter(New RParameter("WB_evap_value", 2, False)) ucrNudWB.SetMinMax(0, 1) ucrNudWB.Increment = 0.01 ucrNudWB.DecimalPlaces = 2 @@ -255,6 +307,7 @@ Public Class dlgTransformClimatic ucrInputSpellLower.SetItems(dctInputLowerSpell) ucrInputSpellLower.AddQuotesIfUnrecognised = False ucrInputSpellLower.SetLinkedDisplayControl(lblCondition) + ucrInputSpellLower.SetRDefault("0.85") ucrInputSpellUpper.SetParameter(New RParameter("max", 1)) ucrInputSpellUpper.SetValidationTypeAsNumeric() @@ -267,14 +320,15 @@ Public Class dlgTransformClimatic ucrNudMultSpells.SetLinkedDisplayControl(lblRowsMultSpells) ' Water Balance - ucrNudWBCapacity.SetParameter(New RParameter("capacity", 1), False) + ucrNudWBCapacity.SetParameter(New RParameter("yes", 1)) ucrNudWBCapacity.SetMinMax(1, Integer.MaxValue) ucrNudWBCapacity.Increment = 10 ucrNudWBCapacity.SetLinkedDisplayControl(lblWBCapacity) - ucrInputEvaporation.SetParameter(New RParameter("evaporation.value", 1, False)) + ucrInputEvaporation.SetParameter(New RParameter("value", 1, bNewIncludeArgumentName:=False)) ucrInputEvaporation.SetValidationTypeAsNumeric() ucrInputEvaporation.AddQuotesIfUnrecognised = False + ucrInputEvaporation.SetRDefault("5") 'Degree ucrChkUseMaxMin.SetText("Use Max and Min") @@ -314,7 +368,7 @@ Public Class dlgTransformClimatic 'makes the ucrSave control to position new column after selected column ucrSaveColumn.setLinkedReceiver(ucrReceiverData) - ucrPnlEvap.AddToLinkedControls(ucrInputEvaporation, {rdoEvapValue}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlEvap.AddToLinkedControls(ucrInputEvaporation, {rdoEvapValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlEvap.AddToLinkedControls(ucrReceiverEvap, {rdoEvapVariable}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEvap.SetLinkedDisplayControl(lblWBEvaporation) @@ -333,7 +387,7 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddToLinkedControls(ucrChkCircular, {rdoMoving}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls(ucrNudMultSpells, {rdoMultSpells}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=21) ucrPnlTransform.AddToLinkedControls(ucrPnlEvap, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlTransform.AddToLinkedControls(ucrNudWBCapacity, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=60) + ucrPnlTransform.AddToLinkedControls(ucrNudWBCapacity, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=100) ucrPnlTransform.AddToLinkedControls(ucrChkGroupByYear, {rdoCount, rdoMoving, rdoSpell, rdoMultSpells, rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls({ucrReceiverYear, ucrReceiverData, ucrChkOptions}, {rdoCumulative, rdoCount, rdoMoving, rdoMultSpells, rdoSpell, rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls({ucrChkUseMaxMin, ucrPnlDegree}, {rdoDegree}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -342,7 +396,7 @@ Public Class dlgTransformClimatic ucrChkCircular.AddToLinkedControls(ucrInputPosition, {False}, bNewLinkedHideIfParameterMissing:=True) ucrInputCondition.AddToLinkedControls(ucrInputSpellUpper, {"<=", "Between", "Outer"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrInputCondition.AddToLinkedControls(ucrInputSpellLower, {"Between", "Outer", ">="}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.85) + ucrInputCondition.AddToLinkedControls(ucrInputSpellLower, {"Between", "Outer", ">="}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrReceiverYear.SetLinkedDisplayControl(lblYear) 'Temporary fix: ucrChkOptions is only used in linking ucrChkOptions.SetLinkedDisplayControl(grpTransform) @@ -352,6 +406,7 @@ Public Class dlgTransformClimatic Private Sub SetDefaults() clsRTransform = New RFunction clsOverallTransformFunction = New RFunction + clsWaterBalanceFunction = New RFunction clsTransformManipulationsFunc = New RFunction clsRTransformCountSpellSub = New RFunction @@ -365,9 +420,6 @@ Public Class dlgTransformClimatic clsRasterFuction = New RFunction clsReplaceNAasElement = New RFunction clsRCountFunction = New RFunction - clsRWaterBalanceFunction = New RFunction - clsWBEvaporation = New RFunction - clsTailFunction = New RFunction clsRRaindayMatch = New RFunction clsRRaindayAndOperator = New ROperator clsRRaindayOrOperator = New ROperator @@ -393,18 +445,62 @@ Public Class dlgTransformClimatic clsMeanAddOperator = New ROperator clsMeanDivideByOperator = New ROperator - clsPMinFunctionMax = New RFunction - clsPMaxFunctionMax = New RFunction - clsPMaxOperatorMax = New ROperator - clsWBOperator = New ROperator - clsGroupByYear.Clear() - clsReduceOpEvapValue.Clear() clsGreaterThanOperator.Clear() clsLessThanOperator.Clear() ucrSelectorTransform.Reset() ucrReceiverData.SetMeAsReceiver() + clsEndSeasonFirstDoySummaryCalc.Clear() + + clsGroupByStationYearCalc.Clear() + clsGroupByStationCalc.Clear() + clsEndSeasonWBCalc.Clear() + + ' Water Balance min + clsEndSeasonRainMinCalc.Clear() + clsEndSeasonWBMinCalc.Clear() + clsEndSeasonWBMinCalcSubCalcsList.Clear() + clsReduceWBMinFunction.Clear() + clsReduceWBMinFunction1.Clear() + clsWBMinEvapOperator.Clear() + clsWBEvaporationMinFunction.Clear() + clsPMaxFunction.Clear() + clsPMinWBMinFunction.Clear() + clsWBMinTailFunction.Clear() + clsWBMinTailFunction1.Clear() + clsWBMinTailFunction2.Clear() + clsIfElseRainMinFunction.Clear() + clsEndSeasonConditionsFilterSubCalcsList.Clear() + clsEndSeasonWBConditionOperator.Clear() + clsIfElseWBFunction.Clear() + clsRoundFunction.Clear() + clsWBMinMaxOperator.Clear() + clsEndSeasonRainMaxCalc.Clear() + clsWBMaxTailFunction2.Clear() + clsWBMaxTailFunction.Clear() + + ' Water Balance max + clsEndSeasonWBMaxCalc.Clear() + clsEndSeasonWBMaxCalcSubCalcsList.Clear() + clsReduceWBMaxFunction.Clear() + clsReduceWBMaxFunction1.Clear() + clsWBMaxEvapOperator.Clear() + clsWBOperator1.Clear() + clsWBMaxTailFunction1.Clear() + clsPMinWBMaxFunction.Clear() + clsEndSeasonWBCalcSubCalcsList.Clear() + clsReduceWBMaxFunction2.Clear() + clsReduceWBMinFunction2.Clear() + clsEndSeasonConditionsOperator.Clear() + clsEndSeasonCombinationCalc.Clear() + clsDoyFilterCalc.Clear() + clsDoyFilterOperator.Clear() + clsDayFromOperator.Clear() + clsDayToOperator.Clear() + clsDoyFilterCalcFromConvert.Clear() + clsDoyFilterCalcFromList.Clear() + ' Count and Spells: Rainday clsRRainday.SetRCommand("instat_calculation$new") clsRRainday.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) @@ -483,41 +579,227 @@ Public Class dlgTransformClimatic clsRasterFuction.AddParameter("na.rm", "TRUE", iPosition:=5) clsRasterFuction.bToScriptAsRString = True - ' Water Balance - clsRWaterBalanceFunction.bToScriptAsRString = True - clsRWaterBalanceFunction.SetRCommand("Reduce") - clsRWaterBalanceFunction.AddParameter("x", clsRFunctionParameter:=clsPMinFunctionMax, iPosition:=0, bIncludeArgumentName:=False) - clsPMinFunctionMax.SetRCommand("function(x, y) pmin") - clsPMinFunctionMax.AddParameter("pmax", clsRFunctionParameter:=clsPMaxFunctionMax, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunctionMax.SetRCommand("pmax") - clsPMaxFunctionMax.AddParameter("calculation", clsROperatorParameter:=clsPMaxOperatorMax, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxOperatorMax.SetOperation("-") - clsPMaxOperatorMax.AddParameter("first", "x + y", iPosition:=0) - clsPMaxOperatorMax.AddParameter("evaporation.value", 5, iPosition:=1) - clsPMaxFunctionMax.AddParameter("0", 0, iPosition:=1, bIncludeArgumentName:=False) - clsPMinFunctionMax.AddParameter("capacity", 60, iPosition:=1, bIncludeArgumentName:=False) - clsRWaterBalanceFunction.AddParameter("replace_na", iPosition:=1, bIncludeArgumentName:=False) - clsRWaterBalanceFunction.AddParameter("accumulate", "TRUE", iPosition:=2) - - clsWBOperator.SetOperation("-") - clsWBOperator.AddParameter("left", "x + y", iPosition:=0) - clsWBOperator.AddParameter("right", clsRFunctionParameter:=clsWBEvaporation, iPosition:=1) - clsWBOperator.bSpaceAroundOperation = True - clsWBOperator.bBrackets = False - - clsReduceOpEvapValue.SetOperation("-") - - clsWBEvaporation.SetRCommand("WB_evaporation") - clsWBEvaporation.AddParameter("water_balance", "x", iPosition:=0, bIncludeArgumentName:=False) - clsWBEvaporation.AddParameter("WB_evap_value", 0.5, iPosition:=1, bIncludeArgumentName:=False) - clsWBEvaporation.AddParameter("capacity", 60, iPosition:=2, bIncludeArgumentName:=False) - clsWBEvaporation.AddParameter("evaporation_value", 5, iPosition:=3, bIncludeArgumentName:=False) - clsWBEvaporation.AddParameter("rain", "rain", iPosition:=4, bIncludeArgumentName:=False) - - clsTailFunction.SetPackageName("utils") - clsTailFunction.SetRCommand("tail") - clsTailFunction.AddParameter("x", "rain", iPosition:=0) - clsTailFunction.AddParameter("n", "-1", iPosition:=1) + clsGroupByStationCalc.SetRCommand("instat_calculation$new") + clsGroupByStationCalc.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0) + clsGroupByStationCalc.SetAssignTo("grouping_by_station") + + clsGroupByStationYearCalc.SetRCommand("instat_calculation$new") + clsGroupByStationYearCalc.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0) + clsGroupByStationYearCalc.SetAssignTo("grouping_by_station_year") + + clsEndSeasonCombinationSubCalcList.SetRCommand("list") + clsEndSeasonCombinationSubCalcList.AddParameter("sub1", clsRFunctionParameter:=clsEndSeasonFirstDoySummaryCalc, bIncludeArgumentName:=False, iPosition:=0) + + clsDoyFilterOperator.SetOperation("&") + clsDoyFilterOperator.AddParameter("from_operator", clsROperatorParameter:=clsDayFromOperator, iPosition:=0) + clsDoyFilterOperator.AddParameter("to_operator", clsROperatorParameter:=clsDayToOperator, iPosition:=1) + clsDoyFilterOperator.bBrackets = False + clsDoyFilterOperator.bToScriptAsRString = True + + clsDayFromOperator.SetOperation(">=") + clsDayFromOperator.AddParameter("from", 1, iPosition:=1) + + clsDayToOperator.SetOperation("<=") + clsDayToOperator.AddParameter("to", 366, iPosition:=1) + + clsDoyFilterCalcFromConvert.SetRCommand("calc_from_convert") + clsDoyFilterCalcFromConvert.AddParameter("x", clsRFunctionParameter:=clsDoyFilterCalcFromList, iPosition:=0) + + clsDoyFilterCalcFromList.SetRCommand("list") + + clsEndSeasonIsNaRain.SetRCommand("is.na") + + clsEndSeasonConditionsFilterSubCalcsList.SetRCommand("list") + clsEndSeasonConditionsFilterSubCalcsList.AddParameter("sub1", clsRFunctionParameter:=clsEndSeasonWBCalc, iPosition:=0, bIncludeArgumentName:=False) + + clsEndSeasonConditionsOperator.bToScriptAsRString = True + clsEndSeasonConditionsOperator.SetOperation("|") + clsEndSeasonConditionsOperator.AddParameter("0", clsROperatorParameter:=clsEndSeasonWBConditionOperator, iPosition:=0) + clsEndSeasonConditionsOperator.AddParameter("1", clsRFunctionParameter:=clsEndSeasonIsNaRain, iPosition:=1) + + clsEndSeasonWBConditionOperator.SetOperation("<=") + clsEndSeasonWBConditionOperator.AddParameter("0", strWB, iPosition:=0) + clsEndSeasonWBConditionOperator.AddParameter("1", "0.5", iPosition:=1) + + clsEndSeasonWBCalc.SetRCommand("instat_calculation$new") + clsEndSeasonWBCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonWBCalc.AddParameter("function_exp", clsRFunctionParameter:=clsRoundFunction, iPosition:=1) + clsEndSeasonWBCalc.AddParameter("save", "2", iPosition:=2) + clsEndSeasonWBCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBCalcSubCalcsList, iPosition:=5) + clsEndSeasonWBCalc.SetAssignTo(strWB) + + clsIfElseWBFunction.SetRCommand("ifelse") + clsIfElseWBFunction.AddParameter("test", clsROperatorParameter:=clsWBOperator, iPosition:=0) + clsIfElseWBFunction.AddParameter("yes", "NA", iPosition:=1) + clsIfElseWBFunction.AddParameter("no", strWBMin, iPosition:=2) + + clsRoundFunction.bToScriptAsRString = True + clsRoundFunction.SetRCommand("round") + clsRoundFunction.AddParameter("x", clsRFunctionParameter:=clsIfElseWBFunction, bIncludeArgumentName:=False, iPosition:=0) + clsRoundFunction.AddParameter("y", "1", iPosition:=1, bIncludeArgumentName:=False) + + clsWBOperator.SetOperation("|") + clsWBOperator.AddParameter("0", clsROperatorParameter:=clsWBMinMaxOperator, iPosition:=0) + clsWBOperator.AddParameter("1", clsRFunctionParameter:=clsEndSeasonIsNaRain, iPosition:=1) + + clsWBMinMaxOperator.SetOperation("!=") + clsWBMinMaxOperator.AddParameter("0", strWBMin, iPosition:=0) + clsWBMinMaxOperator.AddParameter("1", strWBMax, iPosition:=1) + + clsWBOperator1.SetOperation("-") + clsWBOperator1.AddParameter("left", "..1 + ..2", iPosition:=0) + clsWBOperator1.AddParameter("right", clsRFunctionParameter:=clsWBEvaporationMinFunction, iPosition:=1) + clsWBOperator1.bSpaceAroundOperation = True + clsWBOperator1.bBrackets = False + + clsWBEvaporationMinFunction.SetRCommand("WB_evaporation") + clsWBEvaporationMinFunction.AddParameter("water_balance", "..1", iPosition:=0, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("y", "..2", iPosition:=4, bIncludeArgumentName:=False) + + clsPMaxFunction.SetRCommand("pmax") + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.AddParameter("1", "0", bIncludeArgumentName:=False) + + clsIfElseRainMaxFunction.bToScriptAsRString = True + clsIfElseRainMaxFunction.SetRCommand("ifelse") + clsIfElseRainMaxFunction.AddParameter("test", clsRFunctionParameter:=clsEndSeasonIsNaRain, iPosition:=0) + clsIfElseRainMaxFunction.AddParameter("yes", 100, iPosition:=0) + + ' Water Balance min + clsEndSeasonWBMinCalc.SetRCommand("instat_calculation$new") + clsEndSeasonWBMinCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("result_name", Chr(34) & strWBMin & Chr(34), iPosition:=2) + clsEndSeasonWBMinCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBMinCalcSubCalcsList, iPosition:=3) + clsEndSeasonWBMinCalc.SetAssignTo(strWBMin) + + clsEndSeasonRainMinCalc.SetRCommand("instat_calculation$new") + clsEndSeasonRainMinCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonRainMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsIfElseRainMinFunction, iPosition:=1) + clsEndSeasonRainMinCalc.AddParameter("result_name", Chr(34) & strRainMin & Chr(34), iPosition:=2) + clsEndSeasonRainMinCalc.SetAssignTo(strRainMin) + + clsIfElseRainMinFunction.bToScriptAsRString = True + clsIfElseRainMinFunction.SetRCommand("ifelse") + clsIfElseRainMinFunction.AddParameter("test", clsRFunctionParameter:=clsEndSeasonIsNaRain, iPosition:=0) + clsIfElseRainMinFunction.AddParameter("yes", "0", iPosition:=1) + + clsEndSeasonWBMinCalcSubCalcsList.SetRCommand("list") + clsEndSeasonWBMinCalcSubCalcsList.AddParameter("0", strRainMin, iPosition:=0, bIncludeArgumentName:=False) + + clsReduceWBMinFunction.bToScriptAsRString = True + clsReduceWBMinFunction.SetPackageName("purrr") + clsReduceWBMinFunction.SetRCommand("accumulate") + clsReduceWBMinFunction.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) + clsReduceWBMinFunction.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMinFunction1.bToScriptAsRString = True + clsReduceWBMinFunction1.SetPackageName("purrr") + clsReduceWBMinFunction1.SetRCommand("accumulate2") + clsReduceWBMinFunction1.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) + clsReduceWBMinFunction1.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMinFunction2.bToScriptAsRString = True + clsReduceWBMinFunction2.SetPackageName("purrr") + clsReduceWBMinFunction2.SetRCommand("accumulate") + clsReduceWBMinFunction2.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction2.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction2, iPosition:=1) + clsReduceWBMinFunction2.AddParameter(".init", "0", iPosition:=2) + + clsAsNumericFunction = New RFunction + clsAsNumericFunction.SetRCommand("as.numeric") + clsAsNumericFunction.AddParameter("x", ucrReceiverEvap.GetVariableNames(), iPosition:=0, bIncludeArgumentName:=False) + + clsMinusMinOperator = New ROperator + clsMinusMinOperator.SetOperation("-") + clsMinusMinOperator.AddParameter("left", strRainMin, iPosition:=0, bIncludeArgumentName:=False) + clsMinusMinOperator.AddParameter("right", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMinTailFunction2.SetRCommand("tail") + clsWBMinTailFunction2.AddParameter("x", clsROperatorParameter:=clsMinusMinOperator, iPosition:=0, bIncludeArgumentName:=False) + clsWBMinTailFunction2.AddParameter("n", "-1", iPosition:=1) + + clsPMinWBMinFunction.SetRCommand(" ~ pmin") + + clsEndSeasonWBCalcSubCalcsList.SetRCommand("list") + clsEndSeasonWBCalcSubCalcsList.AddParameter("0", strWBMin, iPosition:=0, bIncludeArgumentName:=False) + clsEndSeasonWBCalcSubCalcsList.AddParameter("1", strWBMax, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMinTailFunction.SetRCommand("tail") + clsWBMinTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMinEvapOperator, iPosition:=0) + clsWBMinTailFunction.AddParameter("n", "-1", iPosition:=1) + + clsWBMinTailFunction1.SetRCommand("tail") + clsWBMinTailFunction1.AddParameter("x", ucrReceiverEvap.GetVariableNames(False), iPosition:=0) + clsWBMinTailFunction1.AddParameter("n", "-1", iPosition:=1) + + clsWBMinEvapOperator.SetOperation("-") + clsWBMinEvapOperator.AddParameter("0", strRainMin, iPosition:=0) + clsWBMinEvapOperator.AddParameter("value", "5", iPosition:=1) + + ' Water Balance max + clsEndSeasonWBMaxCalc.SetRCommand("instat_calculation$new") + clsEndSeasonWBMaxCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) + clsEndSeasonWBMaxCalc.AddParameter("result_name", Chr(34) & strWBMax & Chr(34), iPosition:=2) + clsEndSeasonWBMaxCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBMaxCalcSubCalcsList, iPosition:=3) + clsEndSeasonWBMaxCalc.SetAssignTo(strWBMax) + + clsEndSeasonRainMaxCalc.SetRCommand("instat_calculation$new") + clsEndSeasonRainMaxCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonRainMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsIfElseRainMaxFunction, iPosition:=1) + clsEndSeasonRainMaxCalc.AddParameter("result_name", Chr(34) & strRainMax & Chr(34), iPosition:=2) + clsEndSeasonRainMaxCalc.SetAssignTo(strRainMax) + + clsEndSeasonWBMaxCalcSubCalcsList.SetRCommand("list") + clsEndSeasonWBMaxCalcSubCalcsList.AddParameter("0", strRainMax, iPosition:=0, bIncludeArgumentName:=False) + + clsMinusMaxOperator = New ROperator + clsMinusMaxOperator.SetOperation("-") + clsMinusMaxOperator.AddParameter("left", strRainMax, iPosition:=0, bIncludeArgumentName:=False) + clsMinusMaxOperator.AddParameter("right", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMaxTailFunction2.SetRCommand("tail") + clsWBMaxTailFunction2.AddParameter("x", clsROperatorParameter:=clsMinusMaxOperator, iPosition:=0) + clsWBMaxTailFunction2.AddParameter("n", "-1", iPosition:=1) + + clsReduceWBMaxFunction.bToScriptAsRString = True + clsReduceWBMaxFunction.SetPackageName("purrr") + clsReduceWBMaxFunction.SetRCommand("accumulate") + clsReduceWBMaxFunction.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) + clsReduceWBMaxFunction.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMaxFunction1.bToScriptAsRString = True + clsReduceWBMaxFunction1.SetPackageName("purrr") + clsReduceWBMaxFunction1.SetRCommand("accumulate2") + clsReduceWBMaxFunction1.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMaxFunction2.bToScriptAsRString = True + clsReduceWBMaxFunction2.SetPackageName("purrr") + clsReduceWBMaxFunction2.SetRCommand("accumulate") + clsReduceWBMaxFunction2.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction2.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction2, iPosition:=1) + clsReduceWBMaxFunction2.AddParameter(".init", "0", iPosition:=2) + + clsPMinWBMaxFunction.SetRCommand(" ~ pmin") + + clsWBMaxTailFunction.SetRCommand("tail") + clsWBMaxTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMaxEvapOperator, iPosition:=0) + clsWBMaxTailFunction.AddParameter("n", "-1", iPosition:=1) + + clsWBMaxTailFunction1.SetRCommand("tail") + clsWBMaxTailFunction1.AddParameter("x", ucrReceiverEvap.GetVariableNames(False), iPosition:=0) + clsWBMaxTailFunction1.AddParameter("n", "-1", iPosition:=1) + + clsWBMaxEvapOperator.SetOperation("-") + clsWBMaxEvapOperator.AddParameter("0", strRainMax, iPosition:=0) + clsWBMaxEvapOperator.AddParameter("value", "5", iPosition:=1) + ' Degree clsDiurnalRangeOperator.SetOperation("-") clsDiurnalRangeOperator.bToScriptAsRString = True @@ -593,7 +875,9 @@ Public Class dlgTransformClimatic clsModifiedGDDOperator.AddParameter("y", clsRFunctionParameter:=clsLogicalMgddRFunction, iPosition:=1, bIncludeArgumentName:=False) clsModifiedGDDOperator.bToScriptAsRString = True - clsDummyFunction.AddParameter("checked", "diurnal", iPosition:=0) + clsDummyFunction.AddParameter("check", "diurnal", iPosition:=0) + clsDummyFunction.AddParameter("evaporation.value", "value", iPosition:=1) + clsDummyFunction.AddParameter("checked", "rollapply", iPosition:=2) ' Group options clsGroupByYear.SetRCommand("instat_calculation$new") @@ -636,13 +920,14 @@ Public Class dlgTransformClimatic ucrReceiverData.AddAdditionalCodeParameterPair(clsReplaceNAasElement, New RParameter("element", 0, False), iAdditionalPairNo:=2) ucrReceiverData.AddAdditionalCodeParameterPair(clsRRaindayUpperOperator, New RParameter("rain", 0), iAdditionalPairNo:=3) ucrReceiverData.AddAdditionalCodeParameterPair(clsRRaindayLowerOperator, New RParameter("rain", 0), iAdditionalPairNo:=4) - ucrReceiverData.AddAdditionalCodeParameterPair(clsRWaterBalanceFunction, New RParameter("replace_na", 1, False), iAdditionalPairNo:=5) - ucrReceiverData.AddAdditionalCodeParameterPair(clsReduceOpEvapValue, New RParameter("left", 0, False), iAdditionalPairNo:=6) - ucrReceiverData.AddAdditionalCodeParameterPair(clsGreaterThanOperator, New RParameter("rain", 0), iAdditionalPairNo:=7) - ucrReceiverData.AddAdditionalCodeParameterPair(clsLessThanOperator, New RParameter("rain", 0), iAdditionalPairNo:=8) - ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeSum, New RParameter("x", 0, False), iAdditionalPairNo:=9) - ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeMaximum, New RParameter("x", 0, False), iAdditionalPairNo:=10) - ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeMinimum, New RParameter("x", 0, False), iAdditionalPairNo:=11) + ucrReceiverData.AddAdditionalCodeParameterPair(clsIfElseRainMinFunction, New RParameter("no", 2), iAdditionalPairNo:=5) + ucrReceiverData.AddAdditionalCodeParameterPair(clsGreaterThanOperator, New RParameter("rain", 0), iAdditionalPairNo:=6) + ucrReceiverData.AddAdditionalCodeParameterPair(clsLessThanOperator, New RParameter("rain", 0), iAdditionalPairNo:=7) + ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeSum, New RParameter("x", 0, False), iAdditionalPairNo:=8) + ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeMaximum, New RParameter("x", 0, False), iAdditionalPairNo:=9) + ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeMinimum, New RParameter("x", 0, False), iAdditionalPairNo:=10) + ucrReceiverData.AddAdditionalCodeParameterPair(clsEndSeasonIsNaRain, New RParameter("x", 0), iAdditionalPairNo:=11) + ucrReceiverData.AddAdditionalCodeParameterPair(clsIfElseRainMaxFunction, New RParameter("no", 2), iAdditionalPairNo:=12) ucrNudSumOver.AddAdditionalCodeParameterPair(clsRasterFuction, New RParameter("n", 1), iAdditionalPairNo:=1) ucrInputSum.AddAdditionalCodeParameterPair(clsRasterFuction, New RParameter("fun", 2), iAdditionalPairNo:=1) ucrInputSpellUpper.AddAdditionalCodeParameterPair(clsGreaterThanOperator, New RParameter("max", 1), iAdditionalPairNo:=1) @@ -659,8 +944,9 @@ Public Class dlgTransformClimatic ucrNudMgdd.AddAdditionalCodeParameterPair(clsModifiedLogicOperator, New RParameter("baseline", ucrNudMgdd.GetText, 1), iAdditionalPairNo:=1) ucrReceiverTMax.AddAdditionalCodeParameterPair(clsMeanAddOperator, New RParameter("tmax", 0), iAdditionalPairNo:=2) ucrReceiverTMin.AddAdditionalCodeParameterPair(clsMeanAddOperator, New RParameter("tmin", 1), iAdditionalPairNo:=2) - - ucrPnlTransform.SetRCode(clsTransformCheck, bReset) + ucrInputEvaporation.AddAdditionalCodeParameterPair(clsWBMaxEvapOperator, New RParameter("value", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrReceiverEvap.AddAdditionalCodeParameterPair(clsWBMaxTailFunction1, New RParameter("x", 0), iAdditionalPairNo:=1) + ucrReceiverEvap.AddAdditionalCodeParameterPair(clsAsNumericFunction, New RParameter("x", 0), iAdditionalPairNo:=2) ' Moving ucrNudSumOver.SetRCode(clsRMovingFunction, bReset) @@ -679,10 +965,7 @@ Public Class dlgTransformClimatic ucrInputSpellUpper.SetRCode(clsRRaindayUpperOperator, bReset) ' Water Balance - ucrPnlEvap.SetRCode(clsPMaxOperatorMax, bReset) - ucrReceiverEvap.SetRCode(clsReduceOpEvapValue, bReset) - ucrNudWBCapacity.SetRCode(clsPMinFunctionMax, bReset) - ucrNudWB.SetRCode(clsWBOperator, bReset) + ucrReceiverEvap.SetRCode(clsWBMinTailFunction1, bReset) 'Degree ucrReceiverTMin.SetRCode(clsDiurnalRangeOperator, bReset) @@ -696,7 +979,11 @@ Public Class dlgTransformClimatic ucrSaveColumn.SetRCode(clsRTransform, bReset) If bReset Then - ucrInputEvaporation.SetRCode(clsPMaxOperatorMax, bReset) + ucrChkGroupByYear.SetRCode(clsTransformManipulationsFunc, bReset) + ucrInputEvaporation.SetRCode(clsWBMinEvapOperator, bReset) + ucrPnlEvap.SetRCode(clsDummyFunction, bReset) + ucrPnlTransform.SetRCode(clsDummyFunction, bReset) + ucrPnlDegree.SetRCode(clsDummyFunction, bReset) End If End Sub @@ -769,7 +1056,7 @@ Public Class dlgTransformClimatic End Select End Sub - Private Sub ucrPnlTransform_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlTransform.ControlValueChanged, ucrPnlDegree.ControlValueChanged + Private Sub ucrPnlTransform_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlTransform.ControlValueChanged, ucrPnlDegree.ControlValueChanged ', ucrPnlEvap.ControlValueChanged If rdoCumulative.Checked Then CumulativeFunctions() clsRTransform.RemoveParameterByName("sub_calculations") @@ -794,23 +1081,31 @@ Public Class dlgTransformClimatic clsRTransform.RemoveParameterByName("calculated_from") clsTransformCheck = clsRollConsecutiveSumFunction ElseIf rdoWaterBalance.Checked Then - clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsRWaterBalanceFunction, iPosition:=1) + clsWaterBalanceFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$run_instat_calculation") + clsWaterBalanceFunction.AddParameter("calc", strWB, iPosition:=0) + clsWaterBalanceFunction.AddParameter("display", "FALSE", iPosition:=1) + ucrBase.clsRsyntax.SetBaseRFunction(clsWaterBalanceFunction) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonRainMinCalc, iPosition:=0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonWBMinCalc, iPosition:=1) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonRainMaxCalc, iPosition:=2) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonWBMaxCalc, iPosition:=3) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonWBCalc, iPosition:=4) clsRTransform.RemoveParameterByName("sub_calculations") - clsTransformCheck = clsRTransform + ReduceWaterBalance() ElseIf rdoDegree.Checked Then DegreeFunctions() clsRTransform.RemoveParameterByName("sub_calculations") clsTransformCheck = clsRTransform End If - ReduceWaterBalance() - 'Evaporation() AddCalculate() + AutoFill() SetAssignName() GroupByStation() GroupByYear() SetAsReceiver() ChangeFunctions() AddRemoveMeanOperator() + ShowGroups() End Sub Private Sub DegreeFunctions() @@ -933,24 +1228,29 @@ Public Class dlgTransformClimatic ReduceWaterBalance() ChangeFunctions() AddCalculate() + AutoFill() + RainfallChange() End Sub Private Sub ucrInputSpellLower_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSpellUpper.ControlValueChanged, ucrInputCondition.ControlValueChanged InputConditionOptions() End Sub - Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged, ucrReceiverEvap.ControlValueChanged + Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged RainDays() ReduceWaterBalance() + RainfallChange() End Sub Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged GroupByStation() + ReduceWaterBalance() End Sub Private Sub ucrReceiverYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlValueChanged GroupByYear() CheckGroupByYearEnabled() + ReduceWaterBalance() End Sub Private Sub ucrInputSum_ControlValueChanged(ucrchangedControl As ucrCore) Handles ucrInputSum.ControlValueChanged @@ -960,6 +1260,7 @@ Public Class dlgTransformClimatic Private Sub ucrChkGroupByYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkGroupByYear.ControlValueChanged GroupByYear() CheckGroupByYearEnabled() + ReduceWaterBalance() End Sub Private Sub ucrInputEvaporation_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputEvaporation.ControlContentsChanged, ucrPnlEvap.ControlContentsChanged @@ -1053,6 +1354,7 @@ Public Class dlgTransformClimatic Private Sub ucrSaveColumn_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSaveColumn.ControlValueChanged 'change the parameter values + clsEndSeasonWBCalc.AddParameter("result_name", Chr(34) & ucrSaveColumn.GetText() & Chr(34), iPosition:=2) clsRTransform.AddParameter(strParameterName:="result_name", strParameterValue:=Chr(34) & ucrSaveColumn.GetText & Chr(34), iPosition:=2) End Sub @@ -1094,33 +1396,36 @@ Public Class dlgTransformClimatic AddRemoveMeanOperator() AddCalculate() End Sub - Private Sub ReduceWaterBalance() + + Private Sub ShowGroups() + If rdoDegree.Checked Then + grpTransform.Hide() + grpDegree.Show() + Else + grpDegree.Hide() + grpTransform.Show() + End If + End Sub + + Private Sub AutoFill() If rdoWaterBalance.Checked Then - If rdoEvapValue.Checked Then - clsRTransform.RemoveParameterByName("calculated_from") - ucrReceiverData.SetMeAsReceiver() - clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")") - If ucrChkWB.Checked Then - clsPMaxFunctionMax.AddParameter("0", 0, iPosition:=1, bIncludeArgumentName:=False) - clsPMaxOperatorMax.AddParameter("wb", clsROperatorParameter:=clsWBOperator, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxOperatorMax.RemoveParameterByName("first") - clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") - clsRWaterBalanceFunction.AddParameter("replace_na", clsRFunctionParameter:=clsTailFunction, iPosition:=2, bIncludeArgumentName:=False) - clsRWaterBalanceFunction.AddParameter("init", "0", iPosition:=3, bIncludeArgumentName:=False) - Else - clsPMaxOperatorMax.AddParameter("evaporation.value", 5, iPosition:=1, bIncludeArgumentName:=False) - clsPMaxFunctionMax.RemoveParameterByName("wb") - End If + Dim strDataFrame As String + Dim strRainCol As String - ElseIf rdoEvapVariable.Checked Then - ucrReceiverEvap.SetMeAsReceiver() - clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ", " & strCurrDataName & "=" & ucrReceiverEvap.GetVariableNames & ")") - clsRWaterBalanceFunction.AddParameter("replace_na", clsROperatorParameter:=clsReduceOpEvapValue, iPosition:=1, bIncludeArgumentName:=False) - clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") + strDataFrame = ucrSelectorTransform.ucrAvailableDataFrames.cboAvailableDataFrames.Text + strRainCol = frmMain.clsRLink.GetClimaticColumnOfType(strDataFrame, "rain_label") + + If strRainCol <> "" Then + ucrReceiverData.Add(strRainCol, strDataFrame) End If End If End Sub + Private Sub RainfallChange() + clsEndSeasonRainMinCalc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")", iPosition:=3) + clsEndSeasonRainMaxCalc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")", iPosition:=3) + End Sub + Private Sub ucrChkWB_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkWB.ControlValueChanged ReduceWaterBalance() End Sub @@ -1128,4 +1433,84 @@ Public Class dlgTransformClimatic Private Sub rdoEvapValue_CheckedChanged(sender As Object, e As EventArgs) Handles rdoEvapValue.CheckedChanged, rdoEvapVariable.CheckedChanged ReduceWaterBalance() End Sub + + Private Sub ucrInputEvaporation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputEvaporation.ControlValueChanged, ucrReceiverEvap.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ucrReceiverDate_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ucrNudWB_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWB.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ucrSelectorTransform_DataFrameChanged() Handles ucrSelectorTransform.DataFrameChanged + clsDoyFilterCalcFromList.ClearParameters() + AutoFill() + TestOkEnabled() + End Sub + + Private Sub ucrPnlEvap_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlEvap.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ucrNudWBCapacity_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWBCapacity.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ReduceWaterBalance() + If rdoWaterBalance.Checked Then + clsPMaxFunction.RemoveParameterByName("0") + clsPMaxFunction.RemoveParameterByName("0") + clsWBMinEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("value") + clsWBMinEvapOperator.RemoveParameterByName("value") + clsPMaxFunction.RemoveParameterByName("wb") + clsPMaxFunction.RemoveParameterByName("wb") + clsEndSeasonWBCalc.AddParameter("adjacent_column", ucrReceiverData.GetVariableNames(), iPosition:=3) + clsPMinWBMaxFunction.AddParameter("1", ucrNudWBCapacity.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("1", ucrNudWBCapacity.GetText(), iPosition:=1, bIncludeArgumentName:=False) + If rdoEvapValue.Checked Then + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) + If ucrChkWB.Checked Then + clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("yes", ucrNudWBCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=3, bIncludeArgumentName:=False) + clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + Else + clsWBMaxEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) + clsWBMinEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + End If + Else + ucrReceiverEvap.SetMeAsReceiver() + If ucrChkWB.Checked Then + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction1, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction1, iPosition:=1) + clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("yes", ucrNudWBCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("value", "..3", bIncludeArgumentName:=False, iPosition:=3) + clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) + clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + Else + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction2, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction2, iPosition:=1) + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + End If + End If + End If + End Sub End Class \ No newline at end of file diff --git a/instat/dlgView.vb b/instat/dlgView.vb index 821b42c2029..c326c69f397 100644 --- a/instat/dlgView.vb +++ b/instat/dlgView.vb @@ -101,7 +101,7 @@ Public Class dlgView ucrNudNumberRows.Minimum = 1 ucrNudNumberRows.SetLinkedDisplayControl(lblNumberofRows) - ucrSaveData.SetCheckBoxText("Save Data") + ucrSaveData.SetCheckBoxText("Store Data") ucrSaveData.SetPrefix("last_table") ucrSaveData.SetDataFrameSelector(ucrSelectorForView.ucrAvailableDataFrames) ucrSaveData.setLinkedReceiver(ucrReceiverView) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 505d6e20748..cb9da0dc3ac 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -156,7 +156,7 @@ Public Class dlgVisualizeData ucrPnlSelectData.AddToLinkedControls(ucrReceiverVisualizeData, {rdoSelectedColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSaveGraph.SetIsComboBox() - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorVisualizeData.ucrAvailableDataFrames) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/frmMain.vb b/instat/frmMain.vb index c8d4db5f30c..76164072126 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -586,7 +586,7 @@ Public Class frmMain End If End Sub - Private Sub UpdateSwapDataAndScript() + Public Sub UpdateSwapDataAndScript() If mnuViewSwapDataAndScript.Checked Then splDataOutput.Panel1.Controls.Add(ucrScriptWindow) splExtraWindows.Panel2.Controls.Add(ucrDataViewer) diff --git a/instat/sdgDefineAnnualRainfall.Designer.vb b/instat/sdgDefineAnnualRainfall.Designer.vb index e03002e434a..91bb5b1cb29 100644 --- a/instat/sdgDefineAnnualRainfall.Designer.vb +++ b/instat/sdgDefineAnnualRainfall.Designer.vb @@ -22,48 +22,20 @@ Partial Class sdgDefineAnnualRainfall 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrReceiverPlantingDayCondition = New instat.ucrReceiverSingle() - Me.lblMinMinAnnual = New System.Windows.Forms.Label() - Me.ucrReceiverMinMinAnnual = New instat.ucrReceiverSingle() - Me.lblMeanAnnualTemp = New System.Windows.Forms.Label() - Me.lblMaxMinAnnual = New System.Windows.Forms.Label() - Me.lblAnnualTempYear = New System.Windows.Forms.Label() - Me.lblAnnualTempStation = New System.Windows.Forms.Label() - Me.lblMaxMaxAnnual = New System.Windows.Forms.Label() - Me.ucrSelecetorMonthlyTemp = New instat.ucrSelectorByDataFrame() - Me.lblMinMaxAnnual = New System.Windows.Forms.Label() - Me.lblMeanMaxAnnual = New System.Windows.Forms.Label() - Me.ucrReceiverMaxMaxAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverMeanMaxAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverMinMaxAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverMaxMinAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverMeanAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverAnnualTempYr = New instat.ucrReceiverSingle() - Me.ucrReceiverAnnualTempStation = New instat.ucrReceiverSingle() - Me.tbAnnualTempSummaries = New System.Windows.Forms.TabPage() - Me.ucrSelectorAnnualTemp = New instat.ucrSelectorByDataFrame() - Me.lblPlantingDayCond = New System.Windows.Forms.Label() - Me.tbMonthlyTemp = New System.Windows.Forms.TabPage() - Me.lblMonth = New System.Windows.Forms.Label() - Me.ucrReceiverMonthMonthly = New instat.ucrReceiverSingle() - Me.lblMinMInMonthly = New System.Windows.Forms.Label() - Me.ucrReceiverMinMinMonthly = New instat.ucrReceiverSingle() - Me.lblMeanMinMonthly = New System.Windows.Forms.Label() - Me.lblMaxMinMonthly = New System.Windows.Forms.Label() - Me.lblYearMonthTemp = New System.Windows.Forms.Label() - Me.lblStationMonthTemp = New System.Windows.Forms.Label() - Me.lblMaxMaxMonthly = New System.Windows.Forms.Label() - Me.lblMinMaxMonthly = New System.Windows.Forms.Label() - Me.lblMeanMaxMonthly = New System.Windows.Forms.Label() - Me.ucrReceiverMaxMaxMonthly = New instat.ucrReceiverSingle() - Me.ucrReceiverMeanmaxMonthly = New instat.ucrReceiverSingle() - Me.ucrReceiverMinMaxMonthly = New instat.ucrReceiverSingle() Me.ucrReceiverMaxMinMonthly = New instat.ucrReceiverSingle() - Me.ucrReceiverMeanminMontly = New instat.ucrReceiverSingle() Me.ucrReceiverYearMonthly = New instat.ucrReceiverSingle() Me.ucrReceiverMonthlyTemp = New instat.ucrReceiverSingle() - Me.ucrBase = New instat.ucrButtonsSubdialogue() + Me.ucrSelecetorMonthlyTemp = New instat.ucrSelectorByDataFrame() Me.lblSeasonPlantingDay = New System.Windows.Forms.Label() + Me.ucrSelectorSeasonStartProp = New instat.ucrSelectorByDataFrame() + Me.tbSummaries = New System.Windows.Forms.TabControl() + Me.tbAnnualRainfall = New System.Windows.Forms.TabPage() + Me.lblStartRainStatus = New System.Windows.Forms.Label() + Me.ucrReceiverStartRainStatus = New instat.ucrReceiverSingle() + Me.lblEndRainStatus = New System.Windows.Forms.Label() + Me.ucrReceiverEndRainStatus = New instat.ucrReceiverSingle() + Me.lblEndSeasonStatus = New System.Windows.Forms.Label() + Me.ucrReceiverEndSeasonStatus = New instat.ucrReceiverSingle() Me.lblRainyDaysYear = New System.Windows.Forms.Label() Me.ucrReceiverRainDaysYear = New instat.ucrReceiverSingle() Me.lblNoRainDaysSeason = New System.Windows.Forms.Label() @@ -85,8 +57,6 @@ Partial Class sdgDefineAnnualRainfall Me.ucrReceiverEndSeasonDate = New instat.ucrReceiverSingle() Me.ucrReceiverEndSeasonDOY = New instat.ucrReceiverSingle() Me.ucrReceiverEndRainsDOY = New instat.ucrReceiverSingle() - Me.tbSummaries = New System.Windows.Forms.TabControl() - Me.tbAnnualRainfall = New System.Windows.Forms.TabPage() Me.ucrReceiverEndRainsDate = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonalLength = New instat.ucrReceiverSingle() Me.ucrReceiverRainDaysSeason = New instat.ucrReceiverSingle() @@ -95,110 +65,105 @@ Partial Class sdgDefineAnnualRainfall Me.ucrSelectorDefineAnnualRain = New instat.ucrSelectorByDataFrame() Me.tbCropSuccessProp = New System.Windows.Forms.TabPage() Me.lblPlantingLength = New System.Windows.Forms.Label() - Me.ucrReceiverPlantingLenghth = New instat.ucrReceiverSingle() Me.lblPlantingDay = New System.Windows.Forms.Label() Me.lblProbSuccess = New System.Windows.Forms.Label() Me.lblTotalRain = New System.Windows.Forms.Label() Me.lblCropStation = New System.Windows.Forms.Label() + Me.ucrReceiverPlantingLenghth = New instat.ucrReceiverSingle() Me.ucrReceiverPropSuccess = New instat.ucrReceiverSingle() Me.ucrReceiverPlantingDay = New instat.ucrReceiverSingle() Me.ucrReceiverTotalRain = New instat.ucrReceiverSingle() Me.ucrReceiverStationCrop = New instat.ucrReceiverSingle() Me.ucrSelectorCropProp = New instat.ucrSelectorByDataFrame() Me.tbSeasonStartProb = New System.Windows.Forms.TabPage() + Me.lblPlantingDayCond = New System.Windows.Forms.Label() Me.lblSeasonYear = New System.Windows.Forms.Label() Me.lblStationSeasonProb = New System.Windows.Forms.Label() + Me.ucrReceiverPlantingDayCondition = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonPlantingDay = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonYear = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonStationProb = New instat.ucrReceiverSingle() - Me.ucrSelectorSeasonStartProp = New instat.ucrSelectorByDataFrame() - Me.tbAnnualTempSummaries.SuspendLayout() - Me.tbMonthlyTemp.SuspendLayout() + Me.tbAnnualTempSummaries = New System.Windows.Forms.TabPage() + Me.lblMinMinAnnual = New System.Windows.Forms.Label() + Me.lblMeanAnnualTemp = New System.Windows.Forms.Label() + Me.lblMaxMinAnnual = New System.Windows.Forms.Label() + Me.lblAnnualTempYear = New System.Windows.Forms.Label() + Me.lblAnnualTempStation = New System.Windows.Forms.Label() + Me.lblMaxMaxAnnual = New System.Windows.Forms.Label() + Me.lblMinMaxAnnual = New System.Windows.Forms.Label() + Me.lblMeanMaxAnnual = New System.Windows.Forms.Label() + Me.ucrReceiverMinMinAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMinAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualTempYr = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualTempStation = New instat.ucrReceiverSingle() + Me.ucrSelectorAnnualTemp = New instat.ucrSelectorByDataFrame() + Me.tbMonthlyTemp = New System.Windows.Forms.TabPage() + Me.lblMonth = New System.Windows.Forms.Label() + Me.lblMinMInMonthly = New System.Windows.Forms.Label() + Me.lblMeanMinMonthly = New System.Windows.Forms.Label() + Me.lblMaxMinMonthly = New System.Windows.Forms.Label() + Me.lblYearMonthTemp = New System.Windows.Forms.Label() + Me.lblStationMonthTemp = New System.Windows.Forms.Label() + Me.lblMaxMaxMonthly = New System.Windows.Forms.Label() + Me.lblMinMaxMonthly = New System.Windows.Forms.Label() + Me.lblMeanMaxMonthly = New System.Windows.Forms.Label() + Me.ucrReceiverMonthMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMinMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanmaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanminMontly = New instat.ucrReceiverSingle() + Me.ucrBase = New instat.ucrButtonsSubdialogue() Me.tbSummaries.SuspendLayout() Me.tbAnnualRainfall.SuspendLayout() Me.tbCropSuccessProp.SuspendLayout() Me.tbSeasonStartProb.SuspendLayout() + Me.tbAnnualTempSummaries.SuspendLayout() + Me.tbMonthlyTemp.SuspendLayout() Me.SuspendLayout() ' - 'ucrReceiverPlantingDayCondition - ' - Me.ucrReceiverPlantingDayCondition.AutoSize = True - Me.ucrReceiverPlantingDayCondition.frmParent = Nothing - Me.ucrReceiverPlantingDayCondition.Location = New System.Drawing.Point(252, 155) - Me.ucrReceiverPlantingDayCondition.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverPlantingDayCondition.Name = "ucrReceiverPlantingDayCondition" - Me.ucrReceiverPlantingDayCondition.Selector = Nothing - Me.ucrReceiverPlantingDayCondition.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverPlantingDayCondition.strNcFilePath = "" - Me.ucrReceiverPlantingDayCondition.TabIndex = 8 - Me.ucrReceiverPlantingDayCondition.ucrSelector = Nothing - ' - 'lblMinMinAnnual - ' - Me.lblMinMinAnnual.AutoSize = True - Me.lblMinMinAnnual.Location = New System.Drawing.Point(249, 135) - Me.lblMinMinAnnual.Name = "lblMinMinAnnual" - Me.lblMinMinAnnual.Size = New System.Drawing.Size(98, 13) - Me.lblMinMinAnnual.TabIndex = 7 - Me.lblMinMinAnnual.Text = "Min Minimum Temp" - ' - 'ucrReceiverMinMinAnnual - ' - Me.ucrReceiverMinMinAnnual.AutoSize = True - Me.ucrReceiverMinMinAnnual.frmParent = Nothing - Me.ucrReceiverMinMinAnnual.Location = New System.Drawing.Point(250, 151) - Me.ucrReceiverMinMinAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinMinAnnual.Name = "ucrReceiverMinMinAnnual" - Me.ucrReceiverMinMinAnnual.Selector = Nothing - Me.ucrReceiverMinMinAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMinMinAnnual.strNcFilePath = "" - Me.ucrReceiverMinMinAnnual.TabIndex = 8 - Me.ucrReceiverMinMinAnnual.ucrSelector = Nothing - ' - 'lblMeanAnnualTemp - ' - Me.lblMeanAnnualTemp.AutoSize = True - Me.lblMeanAnnualTemp.Location = New System.Drawing.Point(245, 93) - Me.lblMeanAnnualTemp.Name = "lblMeanAnnualTemp" - Me.lblMeanAnnualTemp.Size = New System.Drawing.Size(108, 13) - Me.lblMeanAnnualTemp.TabIndex = 5 - Me.lblMeanAnnualTemp.Text = "Mean Minimum Temp" - ' - 'lblMaxMinAnnual - ' - Me.lblMaxMinAnnual.AutoSize = True - Me.lblMaxMinAnnual.Location = New System.Drawing.Point(251, 174) - Me.lblMaxMinAnnual.Name = "lblMaxMinAnnual" - Me.lblMaxMinAnnual.Size = New System.Drawing.Size(101, 13) - Me.lblMaxMinAnnual.TabIndex = 9 - Me.lblMaxMinAnnual.Text = "Max Minimum Temp" - ' - 'lblAnnualTempYear + 'ucrReceiverMaxMinMonthly ' - Me.lblAnnualTempYear.AutoSize = True - Me.lblAnnualTempYear.Location = New System.Drawing.Point(249, 52) - Me.lblAnnualTempYear.Name = "lblAnnualTempYear" - Me.lblAnnualTempYear.Size = New System.Drawing.Size(32, 13) - Me.lblAnnualTempYear.TabIndex = 3 - Me.lblAnnualTempYear.Text = "Year:" + Me.ucrReceiverMaxMinMonthly.AutoSize = True + Me.ucrReceiverMaxMinMonthly.frmParent = Nothing + Me.ucrReceiverMaxMinMonthly.Location = New System.Drawing.Point(372, 366) + Me.ucrReceiverMaxMinMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMinMonthly.Name = "ucrReceiverMaxMinMonthly" + Me.ucrReceiverMaxMinMonthly.Selector = Nothing + Me.ucrReceiverMaxMinMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMinMonthly.strNcFilePath = "" + Me.ucrReceiverMaxMinMonthly.TabIndex = 12 + Me.ucrReceiverMaxMinMonthly.ucrSelector = Nothing ' - 'lblAnnualTempStation + 'ucrReceiverYearMonthly ' - Me.lblAnnualTempStation.AutoSize = True - Me.lblAnnualTempStation.Location = New System.Drawing.Point(248, 9) - Me.lblAnnualTempStation.Name = "lblAnnualTempStation" - Me.lblAnnualTempStation.Size = New System.Drawing.Size(43, 13) - Me.lblAnnualTempStation.TabIndex = 1 - Me.lblAnnualTempStation.Text = "Station:" + Me.ucrReceiverYearMonthly.AutoSize = True + Me.ucrReceiverYearMonthly.frmParent = Nothing + Me.ucrReceiverYearMonthly.Location = New System.Drawing.Point(369, 109) + Me.ucrReceiverYearMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYearMonthly.Name = "ucrReceiverYearMonthly" + Me.ucrReceiverYearMonthly.Selector = Nothing + Me.ucrReceiverYearMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverYearMonthly.strNcFilePath = "" + Me.ucrReceiverYearMonthly.TabIndex = 4 + Me.ucrReceiverYearMonthly.ucrSelector = Nothing ' - 'lblMaxMaxAnnual + 'ucrReceiverMonthlyTemp ' - Me.lblMaxMaxAnnual.AutoSize = True - Me.lblMaxMaxAnnual.Location = New System.Drawing.Point(255, 295) - Me.lblMaxMaxAnnual.Name = "lblMaxMaxAnnual" - Me.lblMaxMaxAnnual.Size = New System.Drawing.Size(104, 13) - Me.lblMaxMaxAnnual.TabIndex = 15 - Me.lblMaxMaxAnnual.Text = "Max Maximum Temp" + Me.ucrReceiverMonthlyTemp.AutoSize = True + Me.ucrReceiverMonthlyTemp.frmParent = Nothing + Me.ucrReceiverMonthlyTemp.Location = New System.Drawing.Point(368, 49) + Me.ucrReceiverMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthlyTemp.Name = "ucrReceiverMonthlyTemp" + Me.ucrReceiverMonthlyTemp.Selector = Nothing + Me.ucrReceiverMonthlyTemp.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMonthlyTemp.strNcFilePath = "" + Me.ucrReceiverMonthlyTemp.TabIndex = 2 + Me.ucrReceiverMonthlyTemp.ucrSelector = Nothing ' 'ucrSelecetorMonthlyTemp ' @@ -206,1010 +171,1169 @@ Partial Class sdgDefineAnnualRainfall Me.ucrSelecetorMonthlyTemp.bDropUnusedFilterLevels = False Me.ucrSelecetorMonthlyTemp.bShowHiddenColumns = False Me.ucrSelecetorMonthlyTemp.bUseCurrentFilter = True - Me.ucrSelecetorMonthlyTemp.Location = New System.Drawing.Point(10, 12) + Me.ucrSelecetorMonthlyTemp.Location = New System.Drawing.Point(15, 18) Me.ucrSelecetorMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelecetorMonthlyTemp.Name = "ucrSelecetorMonthlyTemp" - Me.ucrSelecetorMonthlyTemp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelecetorMonthlyTemp.Size = New System.Drawing.Size(339, 412) Me.ucrSelecetorMonthlyTemp.TabIndex = 0 ' - 'lblMinMaxAnnual + 'lblSeasonPlantingDay ' - Me.lblMinMaxAnnual.AutoSize = True - Me.lblMinMaxAnnual.Location = New System.Drawing.Point(254, 253) - Me.lblMinMaxAnnual.Name = "lblMinMaxAnnual" - Me.lblMinMaxAnnual.Size = New System.Drawing.Size(104, 13) - Me.lblMinMaxAnnual.TabIndex = 13 - Me.lblMinMaxAnnual.Text = "Min Maximum Temp:" + Me.lblSeasonPlantingDay.AutoSize = True + Me.lblSeasonPlantingDay.Location = New System.Drawing.Point(370, 149) + Me.lblSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonPlantingDay.Name = "lblSeasonPlantingDay" + Me.lblSeasonPlantingDay.Size = New System.Drawing.Size(102, 20) + Me.lblSeasonPlantingDay.TabIndex = 5 + Me.lblSeasonPlantingDay.Text = "Planting Day:" ' - 'lblMeanMaxAnnual + 'ucrSelectorSeasonStartProp ' - Me.lblMeanMaxAnnual.AutoSize = True - Me.lblMeanMaxAnnual.Location = New System.Drawing.Point(254, 214) - Me.lblMeanMaxAnnual.Name = "lblMeanMaxAnnual" - Me.lblMeanMaxAnnual.Size = New System.Drawing.Size(111, 13) - Me.lblMeanMaxAnnual.TabIndex = 11 - Me.lblMeanMaxAnnual.Text = "Mean Maximum Temp" + Me.ucrSelectorSeasonStartProp.AutoSize = True + Me.ucrSelectorSeasonStartProp.bDropUnusedFilterLevels = False + Me.ucrSelectorSeasonStartProp.bShowHiddenColumns = False + Me.ucrSelectorSeasonStartProp.bUseCurrentFilter = True + Me.ucrSelectorSeasonStartProp.Location = New System.Drawing.Point(20, 15) + Me.ucrSelectorSeasonStartProp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorSeasonStartProp.Name = "ucrSelectorSeasonStartProp" + Me.ucrSelectorSeasonStartProp.Size = New System.Drawing.Size(339, 412) + Me.ucrSelectorSeasonStartProp.TabIndex = 0 ' - 'ucrReceiverMaxMaxAnnual + 'tbSummaries ' - Me.ucrReceiverMaxMaxAnnual.AutoSize = True - Me.ucrReceiverMaxMaxAnnual.frmParent = Nothing - Me.ucrReceiverMaxMaxAnnual.Location = New System.Drawing.Point(254, 308) - Me.ucrReceiverMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxMaxAnnual.Name = "ucrReceiverMaxMaxAnnual" - Me.ucrReceiverMaxMaxAnnual.Selector = Nothing - Me.ucrReceiverMaxMaxAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMaxMaxAnnual.strNcFilePath = "" - Me.ucrReceiverMaxMaxAnnual.TabIndex = 16 - Me.ucrReceiverMaxMaxAnnual.ucrSelector = Nothing + Me.tbSummaries.Controls.Add(Me.tbAnnualRainfall) + Me.tbSummaries.Controls.Add(Me.tbCropSuccessProp) + Me.tbSummaries.Controls.Add(Me.tbSeasonStartProb) + Me.tbSummaries.Controls.Add(Me.tbAnnualTempSummaries) + Me.tbSummaries.Controls.Add(Me.tbMonthlyTemp) + Me.tbSummaries.Location = New System.Drawing.Point(18, 21) + Me.tbSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbSummaries.Name = "tbSummaries" + Me.tbSummaries.SelectedIndex = 0 + Me.tbSummaries.Size = New System.Drawing.Size(784, 728) + Me.tbSummaries.TabIndex = 34 ' - 'ucrReceiverMeanMaxAnnual + 'tbAnnualRainfall ' - Me.ucrReceiverMeanMaxAnnual.AutoSize = True - Me.ucrReceiverMeanMaxAnnual.frmParent = Nothing - Me.ucrReceiverMeanMaxAnnual.Location = New System.Drawing.Point(253, 231) - Me.ucrReceiverMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMeanMaxAnnual.Name = "ucrReceiverMeanMaxAnnual" - Me.ucrReceiverMeanMaxAnnual.Selector = Nothing - Me.ucrReceiverMeanMaxAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMeanMaxAnnual.strNcFilePath = "" - Me.ucrReceiverMeanMaxAnnual.TabIndex = 12 - Me.ucrReceiverMeanMaxAnnual.ucrSelector = Nothing + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainStatus) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainStatus) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainStatus) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainStatus) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonStatus) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonStatus) + Me.tbAnnualRainfall.Controls.Add(Me.lblRainyDaysYear) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysYear) + Me.tbAnnualRainfall.Controls.Add(Me.lblNoRainDaysSeason) + Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalLength) + Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalRain) + Me.tbAnnualRainfall.Controls.Add(Me.lblAnnualRain) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainsDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblYear) + Me.tbAnnualRainfall.Controls.Add(Me.lblStation) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverYear) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStation) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalLength) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysSeason) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalRain) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverAnnualRain) + Me.tbAnnualRainfall.Controls.Add(Me.ucrSelectorDefineAnnualRain) + Me.tbAnnualRainfall.Location = New System.Drawing.Point(4, 29) + Me.tbAnnualRainfall.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbAnnualRainfall.Name = "tbAnnualRainfall" + Me.tbAnnualRainfall.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbAnnualRainfall.Size = New System.Drawing.Size(776, 695) + Me.tbAnnualRainfall.TabIndex = 0 + Me.tbAnnualRainfall.Text = "Annual Rainfall" + Me.tbAnnualRainfall.UseVisualStyleBackColor = True ' - 'ucrReceiverMinMaxAnnual + 'lblStartRainStatus + ' + Me.lblStartRainStatus.AutoSize = True + Me.lblStartRainStatus.Location = New System.Drawing.Point(398, 501) + Me.lblStartRainStatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStartRainStatus.Name = "lblStartRainStatus" + Me.lblStartRainStatus.Size = New System.Drawing.Size(144, 20) + Me.lblStartRainStatus.TabIndex = 27 + Me.lblStartRainStatus.Text = "Start Rains Status:" + ' + 'ucrReceiverStartRainStatus + ' + Me.ucrReceiverStartRainStatus.AutoSize = True + Me.ucrReceiverStartRainStatus.frmParent = Nothing + Me.ucrReceiverStartRainStatus.Location = New System.Drawing.Point(392, 527) + Me.ucrReceiverStartRainStatus.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainStatus.Name = "ucrReceiverStartRainStatus" + Me.ucrReceiverStartRainStatus.Selector = Nothing + Me.ucrReceiverStartRainStatus.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStartRainStatus.strNcFilePath = "" + Me.ucrReceiverStartRainStatus.TabIndex = 28 + Me.ucrReceiverStartRainStatus.ucrSelector = Nothing + ' + 'lblEndRainStatus + ' + Me.lblEndRainStatus.AutoSize = True + Me.lblEndRainStatus.Location = New System.Drawing.Point(396, 565) + Me.lblEndRainStatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndRainStatus.Name = "lblEndRainStatus" + Me.lblEndRainStatus.Size = New System.Drawing.Size(138, 20) + Me.lblEndRainStatus.TabIndex = 29 + Me.lblEndRainStatus.Text = "End Rains Status:" + ' + 'ucrReceiverEndRainStatus + ' + Me.ucrReceiverEndRainStatus.AutoSize = True + Me.ucrReceiverEndRainStatus.frmParent = Nothing + Me.ucrReceiverEndRainStatus.Location = New System.Drawing.Point(392, 590) + Me.ucrReceiverEndRainStatus.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainStatus.Name = "ucrReceiverEndRainStatus" + Me.ucrReceiverEndRainStatus.Selector = Nothing + Me.ucrReceiverEndRainStatus.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndRainStatus.strNcFilePath = "" + Me.ucrReceiverEndRainStatus.TabIndex = 30 + Me.ucrReceiverEndRainStatus.ucrSelector = Nothing + ' + 'lblEndSeasonStatus + ' + Me.lblEndSeasonStatus.AutoSize = True + Me.lblEndSeasonStatus.Location = New System.Drawing.Point(396, 627) + Me.lblEndSeasonStatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndSeasonStatus.Name = "lblEndSeasonStatus" + Me.lblEndSeasonStatus.Size = New System.Drawing.Size(152, 20) + Me.lblEndSeasonStatus.TabIndex = 31 + Me.lblEndSeasonStatus.Text = "End Season Status:" + ' + 'ucrReceiverEndSeasonStatus + ' + Me.ucrReceiverEndSeasonStatus.AutoSize = True + Me.ucrReceiverEndSeasonStatus.frmParent = Nothing + Me.ucrReceiverEndSeasonStatus.Location = New System.Drawing.Point(392, 649) + Me.ucrReceiverEndSeasonStatus.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonStatus.Name = "ucrReceiverEndSeasonStatus" + Me.ucrReceiverEndSeasonStatus.Selector = Nothing + Me.ucrReceiverEndSeasonStatus.Size = New System.Drawing.Size(180, 39) + Me.ucrReceiverEndSeasonStatus.strNcFilePath = "" + Me.ucrReceiverEndSeasonStatus.TabIndex = 32 + Me.ucrReceiverEndSeasonStatus.ucrSelector = Nothing ' - Me.ucrReceiverMinMaxAnnual.AutoSize = True - Me.ucrReceiverMinMaxAnnual.frmParent = Nothing - Me.ucrReceiverMinMaxAnnual.Location = New System.Drawing.Point(251, 271) - Me.ucrReceiverMinMaxAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinMaxAnnual.Name = "ucrReceiverMinMaxAnnual" - Me.ucrReceiverMinMaxAnnual.Selector = Nothing - Me.ucrReceiverMinMaxAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMinMaxAnnual.strNcFilePath = "" - Me.ucrReceiverMinMaxAnnual.TabIndex = 14 - Me.ucrReceiverMinMaxAnnual.ucrSelector = Nothing - ' - 'ucrReceiverMaxMinAnnual + 'lblRainyDaysYear ' - Me.ucrReceiverMaxMinAnnual.AutoSize = True - Me.ucrReceiverMaxMinAnnual.frmParent = Nothing - Me.ucrReceiverMaxMinAnnual.Location = New System.Drawing.Point(249, 192) - Me.ucrReceiverMaxMinAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxMinAnnual.Name = "ucrReceiverMaxMinAnnual" - Me.ucrReceiverMaxMinAnnual.Selector = Nothing - Me.ucrReceiverMaxMinAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMaxMinAnnual.strNcFilePath = "" - Me.ucrReceiverMaxMinAnnual.TabIndex = 10 - Me.ucrReceiverMaxMinAnnual.ucrSelector = Nothing + Me.lblRainyDaysYear.AutoSize = True + Me.lblRainyDaysYear.Location = New System.Drawing.Point(396, 132) + Me.lblRainyDaysYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblRainyDaysYear.Name = "lblRainyDaysYear" + Me.lblRainyDaysYear.Size = New System.Drawing.Size(151, 20) + Me.lblRainyDaysYear.TabIndex = 15 + Me.lblRainyDaysYear.Text = " Rainy Days in Year:" ' - 'ucrReceiverMeanAnnual + 'ucrReceiverRainDaysYear ' - Me.ucrReceiverMeanAnnual.AutoSize = True - Me.ucrReceiverMeanAnnual.frmParent = Nothing - Me.ucrReceiverMeanAnnual.Location = New System.Drawing.Point(248, 112) - Me.ucrReceiverMeanAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMeanAnnual.Name = "ucrReceiverMeanAnnual" - Me.ucrReceiverMeanAnnual.Selector = Nothing - Me.ucrReceiverMeanAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMeanAnnual.strNcFilePath = "" - Me.ucrReceiverMeanAnnual.TabIndex = 6 - Me.ucrReceiverMeanAnnual.ucrSelector = Nothing + Me.ucrReceiverRainDaysYear.AutoSize = True + Me.ucrReceiverRainDaysYear.frmParent = Nothing + Me.ucrReceiverRainDaysYear.Location = New System.Drawing.Point(392, 156) + Me.ucrReceiverRainDaysYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainDaysYear.Name = "ucrReceiverRainDaysYear" + Me.ucrReceiverRainDaysYear.Selector = Nothing + Me.ucrReceiverRainDaysYear.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverRainDaysYear.strNcFilePath = "" + Me.ucrReceiverRainDaysYear.TabIndex = 16 + Me.ucrReceiverRainDaysYear.ucrSelector = Nothing ' - 'ucrReceiverAnnualTempYr + 'lblNoRainDaysSeason ' - Me.ucrReceiverAnnualTempYr.AutoSize = True - Me.ucrReceiverAnnualTempYr.frmParent = Nothing - Me.ucrReceiverAnnualTempYr.Location = New System.Drawing.Point(247, 69) - Me.ucrReceiverAnnualTempYr.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverAnnualTempYr.Name = "ucrReceiverAnnualTempYr" - Me.ucrReceiverAnnualTempYr.Selector = Nothing - Me.ucrReceiverAnnualTempYr.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverAnnualTempYr.strNcFilePath = "" - Me.ucrReceiverAnnualTempYr.TabIndex = 4 - Me.ucrReceiverAnnualTempYr.ucrSelector = Nothing + Me.lblNoRainDaysSeason.AutoSize = True + Me.lblNoRainDaysSeason.Location = New System.Drawing.Point(396, 63) + Me.lblNoRainDaysSeason.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblNoRainDaysSeason.Name = "lblNoRainDaysSeason" + Me.lblNoRainDaysSeason.Size = New System.Drawing.Size(172, 20) + Me.lblNoRainDaysSeason.TabIndex = 13 + Me.lblNoRainDaysSeason.Text = " Rainy Days in Season:" ' - 'ucrReceiverAnnualTempStation + 'lblSeasonalLength ' - Me.ucrReceiverAnnualTempStation.AutoSize = True - Me.ucrReceiverAnnualTempStation.frmParent = Nothing - Me.ucrReceiverAnnualTempStation.Location = New System.Drawing.Point(246, 26) - Me.ucrReceiverAnnualTempStation.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverAnnualTempStation.Name = "ucrReceiverAnnualTempStation" - Me.ucrReceiverAnnualTempStation.Selector = Nothing - Me.ucrReceiverAnnualTempStation.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverAnnualTempStation.strNcFilePath = "" - Me.ucrReceiverAnnualTempStation.TabIndex = 2 - Me.ucrReceiverAnnualTempStation.ucrSelector = Nothing + Me.lblSeasonalLength.AutoSize = True + Me.lblSeasonalLength.Location = New System.Drawing.Point(396, 191) + Me.lblSeasonalLength.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonalLength.Name = "lblSeasonalLength" + Me.lblSeasonalLength.Size = New System.Drawing.Size(134, 20) + Me.lblSeasonalLength.TabIndex = 17 + Me.lblSeasonalLength.Text = "Seasonal Length:" ' - 'tbAnnualTempSummaries + 'lblSeasonalRain ' - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanAnnualTemp) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempYear) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempStation) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempYr) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempStation) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrSelectorAnnualTemp) - Me.tbAnnualTempSummaries.Location = New System.Drawing.Point(4, 22) - Me.tbAnnualTempSummaries.Name = "tbAnnualTempSummaries" - Me.tbAnnualTempSummaries.Padding = New System.Windows.Forms.Padding(3) - Me.tbAnnualTempSummaries.Size = New System.Drawing.Size(515, 404) - Me.tbAnnualTempSummaries.TabIndex = 3 - Me.tbAnnualTempSummaries.Text = "Annual Temperature" - Me.tbAnnualTempSummaries.UseVisualStyleBackColor = True + Me.lblSeasonalRain.AutoSize = True + Me.lblSeasonalRain.Location = New System.Drawing.Point(18, 615) + Me.lblSeasonalRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonalRain.Name = "lblSeasonalRain" + Me.lblSeasonalRain.Size = New System.Drawing.Size(117, 20) + Me.lblSeasonalRain.TabIndex = 11 + Me.lblSeasonalRain.Text = "Seasonal Rain:" ' - 'ucrSelectorAnnualTemp + 'lblAnnualRain ' - Me.ucrSelectorAnnualTemp.AutoSize = True - Me.ucrSelectorAnnualTemp.bDropUnusedFilterLevels = False - Me.ucrSelectorAnnualTemp.bShowHiddenColumns = False - Me.ucrSelectorAnnualTemp.bUseCurrentFilter = True - Me.ucrSelectorAnnualTemp.Location = New System.Drawing.Point(11, 6) - Me.ucrSelectorAnnualTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorAnnualTemp.Name = "ucrSelectorAnnualTemp" - Me.ucrSelectorAnnualTemp.Size = New System.Drawing.Size(151, 185) - Me.ucrSelectorAnnualTemp.TabIndex = 0 + Me.lblAnnualRain.AutoSize = True + Me.lblAnnualRain.Location = New System.Drawing.Point(19, 547) + Me.lblAnnualRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAnnualRain.Name = "lblAnnualRain" + Me.lblAnnualRain.Size = New System.Drawing.Size(100, 20) + Me.lblAnnualRain.TabIndex = 9 + Me.lblAnnualRain.Text = "Annual Rain:" ' - 'lblPlantingDayCond + 'lblEndSeasonDate ' - Me.lblPlantingDayCond.AutoSize = True - Me.lblPlantingDayCond.Location = New System.Drawing.Point(254, 139) - Me.lblPlantingDayCond.Name = "lblPlantingDayCond" - Me.lblPlantingDayCond.Size = New System.Drawing.Size(117, 13) - Me.lblPlantingDayCond.TabIndex = 7 - Me.lblPlantingDayCond.Text = "Planting Day Condition:" + Me.lblEndSeasonDate.AutoSize = True + Me.lblEndSeasonDate.Location = New System.Drawing.Point(396, 439) + Me.lblEndSeasonDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndSeasonDate.Name = "lblEndSeasonDate" + Me.lblEndSeasonDate.Size = New System.Drawing.Size(146, 20) + Me.lblEndSeasonDate.TabIndex = 25 + Me.lblEndSeasonDate.Text = "End Season(Date):" ' - 'tbMonthlyTemp + 'lblEndSeasonDOY ' - Me.tbMonthlyTemp.Controls.Add(Me.lblMonth) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMinMInMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblYearMonthTemp) - Me.tbMonthlyTemp.Controls.Add(Me.lblStationMonthTemp) - Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMinMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanmaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanminMontly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverYearMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthlyTemp) - Me.tbMonthlyTemp.Controls.Add(Me.ucrSelecetorMonthlyTemp) - Me.tbMonthlyTemp.Location = New System.Drawing.Point(4, 22) - Me.tbMonthlyTemp.Name = "tbMonthlyTemp" - Me.tbMonthlyTemp.Padding = New System.Windows.Forms.Padding(3) - Me.tbMonthlyTemp.Size = New System.Drawing.Size(515, 404) - Me.tbMonthlyTemp.TabIndex = 4 - Me.tbMonthlyTemp.Text = "Monthly Temperature" - Me.tbMonthlyTemp.UseVisualStyleBackColor = True + Me.lblEndSeasonDOY.AutoSize = True + Me.lblEndSeasonDOY.Location = New System.Drawing.Point(396, 384) + Me.lblEndSeasonDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndSeasonDOY.Name = "lblEndSeasonDOY" + Me.lblEndSeasonDOY.Size = New System.Drawing.Size(146, 20) + Me.lblEndSeasonDOY.TabIndex = 23 + Me.lblEndSeasonDOY.Text = "End Season(DOY):" ' - 'lblMonth + 'lblEndRainDate ' - Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(247, 95) - Me.lblMonth.Name = "lblMonth" - Me.lblMonth.Size = New System.Drawing.Size(40, 13) - Me.lblMonth.TabIndex = 5 - Me.lblMonth.Text = "Month:" + Me.lblEndRainDate.AutoSize = True + Me.lblEndRainDate.Location = New System.Drawing.Point(396, 318) + Me.lblEndRainDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndRainDate.Name = "lblEndRainDate" + Me.lblEndRainDate.Size = New System.Drawing.Size(124, 20) + Me.lblEndRainDate.TabIndex = 21 + Me.lblEndRainDate.Text = "End Rain(Date):" ' - 'ucrReceiverMonthMonthly + 'lblEndRainsDOY ' - Me.ucrReceiverMonthMonthly.AutoSize = True - Me.ucrReceiverMonthMonthly.frmParent = Nothing - Me.ucrReceiverMonthMonthly.Location = New System.Drawing.Point(245, 112) - Me.ucrReceiverMonthMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMonthMonthly.Name = "ucrReceiverMonthMonthly" - Me.ucrReceiverMonthMonthly.Selector = Nothing - Me.ucrReceiverMonthMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMonthMonthly.strNcFilePath = "" - Me.ucrReceiverMonthMonthly.TabIndex = 6 - Me.ucrReceiverMonthMonthly.ucrSelector = Nothing + Me.lblEndRainsDOY.AutoSize = True + Me.lblEndRainsDOY.Location = New System.Drawing.Point(396, 257) + Me.lblEndRainsDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndRainsDOY.Name = "lblEndRainsDOY" + Me.lblEndRainsDOY.Size = New System.Drawing.Size(124, 20) + Me.lblEndRainsDOY.TabIndex = 19 + Me.lblEndRainsDOY.Text = "End Rain(DOY):" ' - 'lblMinMInMonthly + 'lblStartRainDate ' - Me.lblMinMInMonthly.AutoSize = True - Me.lblMinMInMonthly.Location = New System.Drawing.Point(248, 181) - Me.lblMinMInMonthly.Name = "lblMinMInMonthly" - Me.lblMinMInMonthly.Size = New System.Drawing.Size(98, 13) - Me.lblMinMInMonthly.TabIndex = 9 - Me.lblMinMInMonthly.Text = "Min Minimum Temp" + Me.lblStartRainDate.AutoSize = True + Me.lblStartRainDate.Location = New System.Drawing.Point(16, 486) + Me.lblStartRainDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStartRainDate.Name = "lblStartRainDate" + Me.lblStartRainDate.Size = New System.Drawing.Size(130, 20) + Me.lblStartRainDate.TabIndex = 7 + Me.lblStartRainDate.Text = "Start Rain(Date):" ' - 'ucrReceiverMinMinMonthly + 'lblStartRainDOY ' - Me.ucrReceiverMinMinMonthly.AutoSize = True - Me.ucrReceiverMinMinMonthly.frmParent = Nothing - Me.ucrReceiverMinMinMonthly.Location = New System.Drawing.Point(249, 197) - Me.ucrReceiverMinMinMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinMinMonthly.Name = "ucrReceiverMinMinMonthly" - Me.ucrReceiverMinMinMonthly.Selector = Nothing - Me.ucrReceiverMinMinMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMinMinMonthly.strNcFilePath = "" - Me.ucrReceiverMinMinMonthly.TabIndex = 10 - Me.ucrReceiverMinMinMonthly.ucrSelector = Nothing + Me.lblStartRainDOY.AutoSize = True + Me.lblStartRainDOY.Location = New System.Drawing.Point(18, 422) + Me.lblStartRainDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStartRainDOY.Name = "lblStartRainDOY" + Me.lblStartRainDOY.Size = New System.Drawing.Size(130, 20) + Me.lblStartRainDOY.TabIndex = 5 + Me.lblStartRainDOY.Text = "Start Rain(DOY):" ' - 'lblMeanMinMonthly + 'lblYear ' - Me.lblMeanMinMonthly.AutoSize = True - Me.lblMeanMinMonthly.Location = New System.Drawing.Point(244, 139) - Me.lblMeanMinMonthly.Name = "lblMeanMinMonthly" - Me.lblMeanMinMonthly.Size = New System.Drawing.Size(108, 13) - Me.lblMeanMinMonthly.TabIndex = 7 - Me.lblMeanMinMonthly.Text = "Mean Minimum Temp" + Me.lblYear.AutoSize = True + Me.lblYear.Location = New System.Drawing.Point(21, 355) + Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(47, 20) + Me.lblYear.TabIndex = 3 + Me.lblYear.Text = "Year:" ' - 'lblMaxMinMonthly + 'lblStation ' - Me.lblMaxMinMonthly.AutoSize = True - Me.lblMaxMinMonthly.Location = New System.Drawing.Point(250, 220) - Me.lblMaxMinMonthly.Name = "lblMaxMinMonthly" - Me.lblMaxMinMonthly.Size = New System.Drawing.Size(101, 13) - Me.lblMaxMinMonthly.TabIndex = 11 - Me.lblMaxMinMonthly.Text = "Max Minimum Temp" + Me.lblStation.AutoSize = True + Me.lblStation.Location = New System.Drawing.Point(22, 288) + Me.lblStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStation.Name = "lblStation" + Me.lblStation.Size = New System.Drawing.Size(64, 20) + Me.lblStation.TabIndex = 1 + Me.lblStation.Text = "Station:" ' - 'lblYearMonthTemp + 'ucrReceiverStartRainDate ' - Me.lblYearMonthTemp.AutoSize = True - Me.lblYearMonthTemp.Location = New System.Drawing.Point(248, 54) - Me.lblYearMonthTemp.Name = "lblYearMonthTemp" - Me.lblYearMonthTemp.Size = New System.Drawing.Size(32, 13) - Me.lblYearMonthTemp.TabIndex = 3 - Me.lblYearMonthTemp.Text = "Year:" + Me.ucrReceiverStartRainDate.AutoSize = True + Me.ucrReceiverStartRainDate.frmParent = Nothing + Me.ucrReceiverStartRainDate.Location = New System.Drawing.Point(14, 513) + Me.ucrReceiverStartRainDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDate.Name = "ucrReceiverStartRainDate" + Me.ucrReceiverStartRainDate.Selector = Nothing + Me.ucrReceiverStartRainDate.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStartRainDate.strNcFilePath = "" + Me.ucrReceiverStartRainDate.TabIndex = 8 + Me.ucrReceiverStartRainDate.ucrSelector = Nothing ' - 'lblStationMonthTemp + 'ucrReceiverStartRainDOY ' - Me.lblStationMonthTemp.AutoSize = True - Me.lblStationMonthTemp.Location = New System.Drawing.Point(247, 15) - Me.lblStationMonthTemp.Name = "lblStationMonthTemp" - Me.lblStationMonthTemp.Size = New System.Drawing.Size(43, 13) - Me.lblStationMonthTemp.TabIndex = 1 - Me.lblStationMonthTemp.Text = "Station:" + Me.ucrReceiverStartRainDOY.AutoSize = True + Me.ucrReceiverStartRainDOY.frmParent = Nothing + Me.ucrReceiverStartRainDOY.Location = New System.Drawing.Point(14, 449) + Me.ucrReceiverStartRainDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDOY.Name = "ucrReceiverStartRainDOY" + Me.ucrReceiverStartRainDOY.Selector = Nothing + Me.ucrReceiverStartRainDOY.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStartRainDOY.strNcFilePath = "" + Me.ucrReceiverStartRainDOY.TabIndex = 6 + Me.ucrReceiverStartRainDOY.ucrSelector = Nothing ' - 'lblMaxMaxMonthly + 'ucrReceiverYear ' - Me.lblMaxMaxMonthly.AutoSize = True - Me.lblMaxMaxMonthly.Location = New System.Drawing.Point(254, 341) - Me.lblMaxMaxMonthly.Name = "lblMaxMaxMonthly" - Me.lblMaxMaxMonthly.Size = New System.Drawing.Size(104, 13) - Me.lblMaxMaxMonthly.TabIndex = 17 - Me.lblMaxMaxMonthly.Text = "Max Maximum Temp" + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Nothing + Me.ucrReceiverYear.Location = New System.Drawing.Point(14, 382) + Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 4 + Me.ucrReceiverYear.ucrSelector = Nothing ' - 'lblMinMaxMonthly + 'ucrReceiverStation ' - Me.lblMinMaxMonthly.AutoSize = True - Me.lblMinMaxMonthly.Location = New System.Drawing.Point(253, 299) - Me.lblMinMaxMonthly.Name = "lblMinMaxMonthly" - Me.lblMinMaxMonthly.Size = New System.Drawing.Size(104, 13) - Me.lblMinMaxMonthly.TabIndex = 15 - Me.lblMinMaxMonthly.Text = "Min Maximum Temp:" + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Nothing + Me.ucrReceiverStation.Location = New System.Drawing.Point(16, 314) + Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 2 + Me.ucrReceiverStation.ucrSelector = Nothing ' - 'lblMeanMaxMonthly + 'ucrReceiverEndSeasonDate ' - Me.lblMeanMaxMonthly.AutoSize = True - Me.lblMeanMaxMonthly.Location = New System.Drawing.Point(253, 260) - Me.lblMeanMaxMonthly.Name = "lblMeanMaxMonthly" - Me.lblMeanMaxMonthly.Size = New System.Drawing.Size(111, 13) - Me.lblMeanMaxMonthly.TabIndex = 13 - Me.lblMeanMaxMonthly.Text = "Mean Maximum Temp" - ' - 'ucrReceiverMaxMaxMonthly + Me.ucrReceiverEndSeasonDate.AutoSize = True + Me.ucrReceiverEndSeasonDate.frmParent = Nothing + Me.ucrReceiverEndSeasonDate.Location = New System.Drawing.Point(392, 465) + Me.ucrReceiverEndSeasonDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonDate.Name = "ucrReceiverEndSeasonDate" + Me.ucrReceiverEndSeasonDate.Selector = Nothing + Me.ucrReceiverEndSeasonDate.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndSeasonDate.strNcFilePath = "" + Me.ucrReceiverEndSeasonDate.TabIndex = 26 + Me.ucrReceiverEndSeasonDate.ucrSelector = Nothing ' - Me.ucrReceiverMaxMaxMonthly.AutoSize = True - Me.ucrReceiverMaxMaxMonthly.frmParent = Nothing - Me.ucrReceiverMaxMaxMonthly.Location = New System.Drawing.Point(253, 354) - Me.ucrReceiverMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxMaxMonthly.Name = "ucrReceiverMaxMaxMonthly" - Me.ucrReceiverMaxMaxMonthly.Selector = Nothing - Me.ucrReceiverMaxMaxMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMaxMaxMonthly.strNcFilePath = "" - Me.ucrReceiverMaxMaxMonthly.TabIndex = 18 - Me.ucrReceiverMaxMaxMonthly.ucrSelector = Nothing + 'ucrReceiverEndSeasonDOY ' - 'ucrReceiverMeanmaxMonthly + Me.ucrReceiverEndSeasonDOY.AutoSize = True + Me.ucrReceiverEndSeasonDOY.frmParent = Nothing + Me.ucrReceiverEndSeasonDOY.Location = New System.Drawing.Point(392, 404) + Me.ucrReceiverEndSeasonDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonDOY.Name = "ucrReceiverEndSeasonDOY" + Me.ucrReceiverEndSeasonDOY.Selector = Nothing + Me.ucrReceiverEndSeasonDOY.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndSeasonDOY.strNcFilePath = "" + Me.ucrReceiverEndSeasonDOY.TabIndex = 24 + Me.ucrReceiverEndSeasonDOY.ucrSelector = Nothing ' - Me.ucrReceiverMeanmaxMonthly.AutoSize = True - Me.ucrReceiverMeanmaxMonthly.frmParent = Nothing - Me.ucrReceiverMeanmaxMonthly.Location = New System.Drawing.Point(252, 277) - Me.ucrReceiverMeanmaxMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMeanmaxMonthly.Name = "ucrReceiverMeanmaxMonthly" - Me.ucrReceiverMeanmaxMonthly.Selector = Nothing - Me.ucrReceiverMeanmaxMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMeanmaxMonthly.strNcFilePath = "" - Me.ucrReceiverMeanmaxMonthly.TabIndex = 14 - Me.ucrReceiverMeanmaxMonthly.ucrSelector = Nothing + 'ucrReceiverEndRainsDOY ' - 'ucrReceiverMinMaxMonthly + Me.ucrReceiverEndRainsDOY.AutoSize = True + Me.ucrReceiverEndRainsDOY.frmParent = Nothing + Me.ucrReceiverEndRainsDOY.Location = New System.Drawing.Point(392, 283) + Me.ucrReceiverEndRainsDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainsDOY.Name = "ucrReceiverEndRainsDOY" + Me.ucrReceiverEndRainsDOY.Selector = Nothing + Me.ucrReceiverEndRainsDOY.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndRainsDOY.strNcFilePath = "" + Me.ucrReceiverEndRainsDOY.TabIndex = 20 + Me.ucrReceiverEndRainsDOY.ucrSelector = Nothing ' - Me.ucrReceiverMinMaxMonthly.AutoSize = True - Me.ucrReceiverMinMaxMonthly.frmParent = Nothing - Me.ucrReceiverMinMaxMonthly.Location = New System.Drawing.Point(250, 317) - Me.ucrReceiverMinMaxMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinMaxMonthly.Name = "ucrReceiverMinMaxMonthly" - Me.ucrReceiverMinMaxMonthly.Selector = Nothing - Me.ucrReceiverMinMaxMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMinMaxMonthly.strNcFilePath = "" - Me.ucrReceiverMinMaxMonthly.TabIndex = 16 - Me.ucrReceiverMinMaxMonthly.ucrSelector = Nothing + 'ucrReceiverEndRainsDate ' - 'ucrReceiverMaxMinMonthly + Me.ucrReceiverEndRainsDate.AutoSize = True + Me.ucrReceiverEndRainsDate.frmParent = Nothing + Me.ucrReceiverEndRainsDate.Location = New System.Drawing.Point(392, 346) + Me.ucrReceiverEndRainsDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainsDate.Name = "ucrReceiverEndRainsDate" + Me.ucrReceiverEndRainsDate.Selector = Nothing + Me.ucrReceiverEndRainsDate.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndRainsDate.strNcFilePath = "" + Me.ucrReceiverEndRainsDate.TabIndex = 22 + Me.ucrReceiverEndRainsDate.ucrSelector = Nothing ' - Me.ucrReceiverMaxMinMonthly.AutoSize = True - Me.ucrReceiverMaxMinMonthly.frmParent = Nothing - Me.ucrReceiverMaxMinMonthly.Location = New System.Drawing.Point(248, 238) - Me.ucrReceiverMaxMinMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxMinMonthly.Name = "ucrReceiverMaxMinMonthly" - Me.ucrReceiverMaxMinMonthly.Selector = Nothing - Me.ucrReceiverMaxMinMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMaxMinMonthly.strNcFilePath = "" - Me.ucrReceiverMaxMinMonthly.TabIndex = 12 - Me.ucrReceiverMaxMinMonthly.ucrSelector = Nothing + 'ucrReceiverSeasonalLength ' - 'ucrReceiverMeanminMontly + Me.ucrReceiverSeasonalLength.AutoSize = True + Me.ucrReceiverSeasonalLength.frmParent = Nothing + Me.ucrReceiverSeasonalLength.Location = New System.Drawing.Point(392, 218) + Me.ucrReceiverSeasonalLength.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonalLength.Name = "ucrReceiverSeasonalLength" + Me.ucrReceiverSeasonalLength.Selector = Nothing + Me.ucrReceiverSeasonalLength.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonalLength.strNcFilePath = "" + Me.ucrReceiverSeasonalLength.TabIndex = 18 + Me.ucrReceiverSeasonalLength.ucrSelector = Nothing ' - Me.ucrReceiverMeanminMontly.AutoSize = True - Me.ucrReceiverMeanminMontly.frmParent = Nothing - Me.ucrReceiverMeanminMontly.Location = New System.Drawing.Point(247, 158) - Me.ucrReceiverMeanminMontly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMeanminMontly.Name = "ucrReceiverMeanminMontly" - Me.ucrReceiverMeanminMontly.Selector = Nothing - Me.ucrReceiverMeanminMontly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMeanminMontly.strNcFilePath = "" - Me.ucrReceiverMeanminMontly.TabIndex = 8 - Me.ucrReceiverMeanminMontly.ucrSelector = Nothing + 'ucrReceiverRainDaysSeason ' - 'ucrReceiverYearMonthly + Me.ucrReceiverRainDaysSeason.AutoSize = True + Me.ucrReceiverRainDaysSeason.frmParent = Nothing + Me.ucrReceiverRainDaysSeason.Location = New System.Drawing.Point(392, 90) + Me.ucrReceiverRainDaysSeason.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainDaysSeason.Name = "ucrReceiverRainDaysSeason" + Me.ucrReceiverRainDaysSeason.Selector = Nothing + Me.ucrReceiverRainDaysSeason.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverRainDaysSeason.strNcFilePath = "" + Me.ucrReceiverRainDaysSeason.TabIndex = 14 + Me.ucrReceiverRainDaysSeason.ucrSelector = Nothing ' - Me.ucrReceiverYearMonthly.AutoSize = True - Me.ucrReceiverYearMonthly.frmParent = Nothing - Me.ucrReceiverYearMonthly.Location = New System.Drawing.Point(246, 71) - Me.ucrReceiverYearMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYearMonthly.Name = "ucrReceiverYearMonthly" - Me.ucrReceiverYearMonthly.Selector = Nothing - Me.ucrReceiverYearMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverYearMonthly.strNcFilePath = "" - Me.ucrReceiverYearMonthly.TabIndex = 4 - Me.ucrReceiverYearMonthly.ucrSelector = Nothing + 'ucrReceiverSeasonalRain ' - 'ucrReceiverMonthlyTemp + Me.ucrReceiverSeasonalRain.AutoSize = True + Me.ucrReceiverSeasonalRain.frmParent = Nothing + Me.ucrReceiverSeasonalRain.Location = New System.Drawing.Point(14, 641) + Me.ucrReceiverSeasonalRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonalRain.Name = "ucrReceiverSeasonalRain" + Me.ucrReceiverSeasonalRain.Selector = Nothing + Me.ucrReceiverSeasonalRain.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonalRain.strNcFilePath = "" + Me.ucrReceiverSeasonalRain.TabIndex = 12 + Me.ucrReceiverSeasonalRain.ucrSelector = Nothing ' - Me.ucrReceiverMonthlyTemp.AutoSize = True - Me.ucrReceiverMonthlyTemp.frmParent = Nothing - Me.ucrReceiverMonthlyTemp.Location = New System.Drawing.Point(245, 32) - Me.ucrReceiverMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMonthlyTemp.Name = "ucrReceiverMonthlyTemp" - Me.ucrReceiverMonthlyTemp.Selector = Nothing - Me.ucrReceiverMonthlyTemp.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMonthlyTemp.strNcFilePath = "" - Me.ucrReceiverMonthlyTemp.TabIndex = 2 - Me.ucrReceiverMonthlyTemp.ucrSelector = Nothing + 'ucrReceiverAnnualRain ' - 'ucrBase + Me.ucrReceiverAnnualRain.AutoSize = True + Me.ucrReceiverAnnualRain.frmParent = Nothing + Me.ucrReceiverAnnualRain.Location = New System.Drawing.Point(16, 573) + Me.ucrReceiverAnnualRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualRain.Name = "ucrReceiverAnnualRain" + Me.ucrReceiverAnnualRain.Selector = Nothing + Me.ucrReceiverAnnualRain.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverAnnualRain.strNcFilePath = "" + Me.ucrReceiverAnnualRain.TabIndex = 10 + Me.ucrReceiverAnnualRain.ucrSelector = Nothing ' - Me.ucrBase.AutoSize = True - Me.ucrBase.Location = New System.Drawing.Point(157, 455) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(224, 30) - Me.ucrBase.TabIndex = 1 + 'ucrSelectorDefineAnnualRain ' - 'lblSeasonPlantingDay + Me.ucrSelectorDefineAnnualRain.AutoSize = True + Me.ucrSelectorDefineAnnualRain.bDropUnusedFilterLevels = False + Me.ucrSelectorDefineAnnualRain.bShowHiddenColumns = False + Me.ucrSelectorDefineAnnualRain.bUseCurrentFilter = True + Me.ucrSelectorDefineAnnualRain.Location = New System.Drawing.Point(10, 7) + Me.ucrSelectorDefineAnnualRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDefineAnnualRain.Name = "ucrSelectorDefineAnnualRain" + Me.ucrSelectorDefineAnnualRain.Size = New System.Drawing.Size(339, 293) + Me.ucrSelectorDefineAnnualRain.TabIndex = 0 ' - Me.lblSeasonPlantingDay.AutoSize = True - Me.lblSeasonPlantingDay.Location = New System.Drawing.Point(247, 97) - Me.lblSeasonPlantingDay.Name = "lblSeasonPlantingDay" - Me.lblSeasonPlantingDay.Size = New System.Drawing.Size(70, 13) - Me.lblSeasonPlantingDay.TabIndex = 5 - Me.lblSeasonPlantingDay.Text = "Planting Day:" + 'tbCropSuccessProp ' - 'lblRainyDaysYear + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingLength) + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.lblProbSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.lblTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.lblCropStation) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingLenghth) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPropSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverStationCrop) + Me.tbCropSuccessProp.Controls.Add(Me.ucrSelectorCropProp) + Me.tbCropSuccessProp.Location = New System.Drawing.Point(4, 29) + Me.tbCropSuccessProp.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbCropSuccessProp.Name = "tbCropSuccessProp" + Me.tbCropSuccessProp.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbCropSuccessProp.Size = New System.Drawing.Size(776, 695) + Me.tbCropSuccessProp.TabIndex = 1 + Me.tbCropSuccessProp.Text = "Crop Success Prop" + Me.tbCropSuccessProp.UseVisualStyleBackColor = True ' - Me.lblRainyDaysYear.AutoSize = True - Me.lblRainyDaysYear.Location = New System.Drawing.Point(248, 137) - Me.lblRainyDaysYear.Name = "lblRainyDaysYear" - Me.lblRainyDaysYear.Size = New System.Drawing.Size(103, 13) - Me.lblRainyDaysYear.TabIndex = 7 - Me.lblRainyDaysYear.Text = " Rainy Days in Year:" + 'lblPlantingLength ' - 'ucrReceiverRainDaysYear + Me.lblPlantingLength.AutoSize = True + Me.lblPlantingLength.Location = New System.Drawing.Point(378, 211) + Me.lblPlantingLength.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblPlantingLength.Name = "lblPlantingLength" + Me.lblPlantingLength.Size = New System.Drawing.Size(124, 20) + Me.lblPlantingLength.TabIndex = 7 + Me.lblPlantingLength.Text = "Planting Length:" ' - Me.ucrReceiverRainDaysYear.AutoSize = True - Me.ucrReceiverRainDaysYear.frmParent = Nothing - Me.ucrReceiverRainDaysYear.Location = New System.Drawing.Point(246, 153) - Me.ucrReceiverRainDaysYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRainDaysYear.Name = "ucrReceiverRainDaysYear" - Me.ucrReceiverRainDaysYear.Selector = Nothing - Me.ucrReceiverRainDaysYear.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverRainDaysYear.strNcFilePath = "" - Me.ucrReceiverRainDaysYear.TabIndex = 8 - Me.ucrReceiverRainDaysYear.ucrSelector = Nothing + 'lblPlantingDay ' - 'lblNoRainDaysSeason + Me.lblPlantingDay.AutoSize = True + Me.lblPlantingDay.Location = New System.Drawing.Point(368, 146) + Me.lblPlantingDay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblPlantingDay.Name = "lblPlantingDay" + Me.lblPlantingDay.Size = New System.Drawing.Size(102, 20) + Me.lblPlantingDay.TabIndex = 5 + Me.lblPlantingDay.Text = "Planting Day:" ' - Me.lblNoRainDaysSeason.AutoSize = True - Me.lblNoRainDaysSeason.Location = New System.Drawing.Point(241, 95) - Me.lblNoRainDaysSeason.Name = "lblNoRainDaysSeason" - Me.lblNoRainDaysSeason.Size = New System.Drawing.Size(117, 13) - Me.lblNoRainDaysSeason.TabIndex = 5 - Me.lblNoRainDaysSeason.Text = " Rainy Days in Season:" + 'lblProbSuccess ' - 'lblSeasonalLength + Me.lblProbSuccess.AutoSize = True + Me.lblProbSuccess.Location = New System.Drawing.Point(376, 271) + Me.lblProbSuccess.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblProbSuccess.Name = "lblProbSuccess" + Me.lblProbSuccess.Size = New System.Drawing.Size(173, 20) + Me.lblProbSuccess.TabIndex = 9 + Me.lblProbSuccess.Text = "Proportion of Success :" ' - Me.lblSeasonalLength.AutoSize = True - Me.lblSeasonalLength.Location = New System.Drawing.Point(247, 176) - Me.lblSeasonalLength.Name = "lblSeasonalLength" - Me.lblSeasonalLength.Size = New System.Drawing.Size(90, 13) - Me.lblSeasonalLength.TabIndex = 9 - Me.lblSeasonalLength.Text = "Seasonal Length:" + 'lblTotalRain ' - 'lblSeasonalRain + Me.lblTotalRain.AutoSize = True + Me.lblTotalRain.Location = New System.Drawing.Point(374, 83) + Me.lblTotalRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblTotalRain.Name = "lblTotalRain" + Me.lblTotalRain.Size = New System.Drawing.Size(85, 20) + Me.lblTotalRain.TabIndex = 3 + Me.lblTotalRain.Text = "Total Rain:" ' - Me.lblSeasonalRain.AutoSize = True - Me.lblSeasonalRain.Location = New System.Drawing.Point(245, 54) - Me.lblSeasonalRain.Name = "lblSeasonalRain" - Me.lblSeasonalRain.Size = New System.Drawing.Size(79, 13) - Me.lblSeasonalRain.TabIndex = 3 - Me.lblSeasonalRain.Text = "Seasonal Rain:" + 'lblCropStation ' - 'lblAnnualRain + Me.lblCropStation.AutoSize = True + Me.lblCropStation.Location = New System.Drawing.Point(372, 17) + Me.lblCropStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCropStation.Name = "lblCropStation" + Me.lblCropStation.Size = New System.Drawing.Size(64, 20) + Me.lblCropStation.TabIndex = 1 + Me.lblCropStation.Text = "Station:" ' - Me.lblAnnualRain.AutoSize = True - Me.lblAnnualRain.Location = New System.Drawing.Point(244, 11) - Me.lblAnnualRain.Name = "lblAnnualRain" - Me.lblAnnualRain.Size = New System.Drawing.Size(68, 13) - Me.lblAnnualRain.TabIndex = 1 - Me.lblAnnualRain.Text = "Annual Rain:" + 'ucrReceiverPlantingLenghth ' - 'lblEndSeasonDate + Me.ucrReceiverPlantingLenghth.AutoSize = True + Me.ucrReceiverPlantingLenghth.frmParent = Nothing + Me.ucrReceiverPlantingLenghth.Location = New System.Drawing.Point(375, 235) + Me.ucrReceiverPlantingLenghth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingLenghth.Name = "ucrReceiverPlantingLenghth" + Me.ucrReceiverPlantingLenghth.Selector = Nothing + Me.ucrReceiverPlantingLenghth.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPlantingLenghth.strNcFilePath = "" + Me.ucrReceiverPlantingLenghth.TabIndex = 8 + Me.ucrReceiverPlantingLenghth.ucrSelector = Nothing ' - Me.lblEndSeasonDate.AutoSize = True - Me.lblEndSeasonDate.Location = New System.Drawing.Point(250, 331) - Me.lblEndSeasonDate.Name = "lblEndSeasonDate" - Me.lblEndSeasonDate.Size = New System.Drawing.Size(97, 13) - Me.lblEndSeasonDate.TabIndex = 17 - Me.lblEndSeasonDate.Text = "End Season(Date):" + 'ucrReceiverPropSuccess ' - 'lblEndSeasonDOY + Me.ucrReceiverPropSuccess.AutoSize = True + Me.ucrReceiverPropSuccess.frmParent = Nothing + Me.ucrReceiverPropSuccess.Location = New System.Drawing.Point(374, 298) + Me.ucrReceiverPropSuccess.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPropSuccess.Name = "ucrReceiverPropSuccess" + Me.ucrReceiverPropSuccess.Selector = Nothing + Me.ucrReceiverPropSuccess.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPropSuccess.strNcFilePath = "" + Me.ucrReceiverPropSuccess.TabIndex = 10 + Me.ucrReceiverPropSuccess.ucrSelector = Nothing ' - Me.lblEndSeasonDOY.AutoSize = True - Me.lblEndSeasonDOY.Location = New System.Drawing.Point(251, 297) - Me.lblEndSeasonDOY.Name = "lblEndSeasonDOY" - Me.lblEndSeasonDOY.Size = New System.Drawing.Size(97, 13) - Me.lblEndSeasonDOY.TabIndex = 15 - Me.lblEndSeasonDOY.Text = "End Season(DOY):" + 'ucrReceiverPlantingDay ' - 'lblEndRainDate + Me.ucrReceiverPlantingDay.AutoSize = True + Me.ucrReceiverPlantingDay.frmParent = Nothing + Me.ucrReceiverPlantingDay.Location = New System.Drawing.Point(372, 175) + Me.ucrReceiverPlantingDay.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingDay.Name = "ucrReceiverPlantingDay" + Me.ucrReceiverPlantingDay.Selector = Nothing + Me.ucrReceiverPlantingDay.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPlantingDay.strNcFilePath = "" + Me.ucrReceiverPlantingDay.TabIndex = 6 + Me.ucrReceiverPlantingDay.ucrSelector = Nothing ' - Me.lblEndRainDate.AutoSize = True - Me.lblEndRainDate.Location = New System.Drawing.Point(250, 255) - Me.lblEndRainDate.Name = "lblEndRainDate" - Me.lblEndRainDate.Size = New System.Drawing.Size(83, 13) - Me.lblEndRainDate.TabIndex = 13 - Me.lblEndRainDate.Text = "End Rain(Date):" + 'ucrReceiverTotalRain ' - 'lblEndRainsDOY + Me.ucrReceiverTotalRain.AutoSize = True + Me.ucrReceiverTotalRain.frmParent = Nothing + Me.ucrReceiverTotalRain.Location = New System.Drawing.Point(370, 109) + Me.ucrReceiverTotalRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverTotalRain.Name = "ucrReceiverTotalRain" + Me.ucrReceiverTotalRain.Selector = Nothing + Me.ucrReceiverTotalRain.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverTotalRain.strNcFilePath = "" + Me.ucrReceiverTotalRain.TabIndex = 4 + Me.ucrReceiverTotalRain.ucrSelector = Nothing ' - Me.lblEndRainsDOY.AutoSize = True - Me.lblEndRainsDOY.Location = New System.Drawing.Point(250, 216) - Me.lblEndRainsDOY.Name = "lblEndRainsDOY" - Me.lblEndRainsDOY.Size = New System.Drawing.Size(83, 13) - Me.lblEndRainsDOY.TabIndex = 11 - Me.lblEndRainsDOY.Text = "End Rain(DOY):" + 'ucrReceiverStationCrop ' - 'lblStartRainDate + Me.ucrReceiverStationCrop.AutoSize = True + Me.ucrReceiverStationCrop.frmParent = Nothing + Me.ucrReceiverStationCrop.Location = New System.Drawing.Point(369, 43) + Me.ucrReceiverStationCrop.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStationCrop.Name = "ucrReceiverStationCrop" + Me.ucrReceiverStationCrop.Selector = Nothing + Me.ucrReceiverStationCrop.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStationCrop.strNcFilePath = "" + Me.ucrReceiverStationCrop.TabIndex = 2 + Me.ucrReceiverStationCrop.ucrSelector = Nothing ' - Me.lblStartRainDate.AutoSize = True - Me.lblStartRainDate.Location = New System.Drawing.Point(11, 326) - Me.lblStartRainDate.Name = "lblStartRainDate" - Me.lblStartRainDate.Size = New System.Drawing.Size(86, 13) - Me.lblStartRainDate.TabIndex = 25 - Me.lblStartRainDate.Text = "Start Rain(Date):" + 'ucrSelectorCropProp ' - 'lblStartRainDOY + Me.ucrSelectorCropProp.AutoSize = True + Me.ucrSelectorCropProp.bDropUnusedFilterLevels = False + Me.ucrSelectorCropProp.bShowHiddenColumns = False + Me.ucrSelectorCropProp.bUseCurrentFilter = True + Me.ucrSelectorCropProp.Location = New System.Drawing.Point(16, 12) + Me.ucrSelectorCropProp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCropProp.Name = "ucrSelectorCropProp" + Me.ucrSelectorCropProp.Size = New System.Drawing.Size(339, 412) + Me.ucrSelectorCropProp.TabIndex = 0 ' - Me.lblStartRainDOY.AutoSize = True - Me.lblStartRainDOY.Location = New System.Drawing.Point(12, 285) - Me.lblStartRainDOY.Name = "lblStartRainDOY" - Me.lblStartRainDOY.Size = New System.Drawing.Size(86, 13) - Me.lblStartRainDOY.TabIndex = 23 - Me.lblStartRainDOY.Text = "Start Rain(DOY):" + 'tbSeasonStartProb ' - 'lblYear + Me.tbSeasonStartProb.Controls.Add(Me.lblPlantingDayCond) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.lblStationSeasonProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverPlantingDayCondition) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonStationProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrSelectorSeasonStartProp) + Me.tbSeasonStartProb.Location = New System.Drawing.Point(4, 29) + Me.tbSeasonStartProb.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbSeasonStartProb.Name = "tbSeasonStartProb" + Me.tbSeasonStartProb.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbSeasonStartProb.Size = New System.Drawing.Size(776, 695) + Me.tbSeasonStartProb.TabIndex = 2 + Me.tbSeasonStartProb.Text = "Season Start Prob" + Me.tbSeasonStartProb.UseVisualStyleBackColor = True ' - Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(14, 239) - Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(32, 13) - Me.lblYear.TabIndex = 21 - Me.lblYear.Text = "Year:" + 'lblPlantingDayCond ' - 'lblStation + Me.lblPlantingDayCond.AutoSize = True + Me.lblPlantingDayCond.Location = New System.Drawing.Point(381, 214) + Me.lblPlantingDayCond.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblPlantingDayCond.Name = "lblPlantingDayCond" + Me.lblPlantingDayCond.Size = New System.Drawing.Size(173, 20) + Me.lblPlantingDayCond.TabIndex = 7 + Me.lblPlantingDayCond.Text = "Planting Day Condition:" ' - Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(15, 198) - Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(43, 13) - Me.lblStation.TabIndex = 19 - Me.lblStation.Text = "Station:" + 'lblSeasonYear ' - 'ucrReceiverStartRainDate + Me.lblSeasonYear.AutoSize = True + Me.lblSeasonYear.Location = New System.Drawing.Point(376, 86) + Me.lblSeasonYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonYear.Name = "lblSeasonYear" + Me.lblSeasonYear.Size = New System.Drawing.Size(47, 20) + Me.lblSeasonYear.TabIndex = 3 + Me.lblSeasonYear.Text = "Year:" ' - Me.ucrReceiverStartRainDate.AutoSize = True - Me.ucrReceiverStartRainDate.frmParent = Nothing - Me.ucrReceiverStartRainDate.Location = New System.Drawing.Point(9, 344) - Me.ucrReceiverStartRainDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStartRainDate.Name = "ucrReceiverStartRainDate" - Me.ucrReceiverStartRainDate.Selector = Nothing - Me.ucrReceiverStartRainDate.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverStartRainDate.strNcFilePath = "" - Me.ucrReceiverStartRainDate.TabIndex = 26 - Me.ucrReceiverStartRainDate.ucrSelector = Nothing + 'lblStationSeasonProb ' - 'ucrReceiverStartRainDOY + Me.lblStationSeasonProb.AutoSize = True + Me.lblStationSeasonProb.Location = New System.Drawing.Point(375, 20) + Me.lblStationSeasonProb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStationSeasonProb.Name = "lblStationSeasonProb" + Me.lblStationSeasonProb.Size = New System.Drawing.Size(64, 20) + Me.lblStationSeasonProb.TabIndex = 1 + Me.lblStationSeasonProb.Text = "Station:" ' - Me.ucrReceiverStartRainDOY.AutoSize = True - Me.ucrReceiverStartRainDOY.frmParent = Nothing - Me.ucrReceiverStartRainDOY.Location = New System.Drawing.Point(9, 302) - Me.ucrReceiverStartRainDOY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStartRainDOY.Name = "ucrReceiverStartRainDOY" - Me.ucrReceiverStartRainDOY.Selector = Nothing - Me.ucrReceiverStartRainDOY.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverStartRainDOY.strNcFilePath = "" - Me.ucrReceiverStartRainDOY.TabIndex = 24 - Me.ucrReceiverStartRainDOY.ucrSelector = Nothing + 'ucrReceiverPlantingDayCondition ' - 'ucrReceiverYear + Me.ucrReceiverPlantingDayCondition.AutoSize = True + Me.ucrReceiverPlantingDayCondition.frmParent = Nothing + Me.ucrReceiverPlantingDayCondition.Location = New System.Drawing.Point(378, 238) + Me.ucrReceiverPlantingDayCondition.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingDayCondition.Name = "ucrReceiverPlantingDayCondition" + Me.ucrReceiverPlantingDayCondition.Selector = Nothing + Me.ucrReceiverPlantingDayCondition.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPlantingDayCondition.strNcFilePath = "" + Me.ucrReceiverPlantingDayCondition.TabIndex = 8 + Me.ucrReceiverPlantingDayCondition.ucrSelector = Nothing ' - Me.ucrReceiverYear.AutoSize = True - Me.ucrReceiverYear.frmParent = Nothing - Me.ucrReceiverYear.Location = New System.Drawing.Point(9, 258) - Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYear.Name = "ucrReceiverYear" - Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 22 - Me.ucrReceiverYear.ucrSelector = Nothing + 'ucrReceiverSeasonPlantingDay ' - 'ucrReceiverStation + Me.ucrReceiverSeasonPlantingDay.AutoSize = True + Me.ucrReceiverSeasonPlantingDay.frmParent = Nothing + Me.ucrReceiverSeasonPlantingDay.Location = New System.Drawing.Point(375, 178) + Me.ucrReceiverSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonPlantingDay.Name = "ucrReceiverSeasonPlantingDay" + Me.ucrReceiverSeasonPlantingDay.Selector = Nothing + Me.ucrReceiverSeasonPlantingDay.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonPlantingDay.strNcFilePath = "" + Me.ucrReceiverSeasonPlantingDay.TabIndex = 6 + Me.ucrReceiverSeasonPlantingDay.ucrSelector = Nothing ' - Me.ucrReceiverStation.AutoSize = True - Me.ucrReceiverStation.frmParent = Nothing - Me.ucrReceiverStation.Location = New System.Drawing.Point(11, 215) - Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStation.Name = "ucrReceiverStation" - Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 20 - Me.ucrReceiverStation.ucrSelector = Nothing + 'ucrReceiverSeasonYear ' - 'ucrReceiverEndSeasonDate + Me.ucrReceiverSeasonYear.AutoSize = True + Me.ucrReceiverSeasonYear.frmParent = Nothing + Me.ucrReceiverSeasonYear.Location = New System.Drawing.Point(374, 112) + Me.ucrReceiverSeasonYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonYear.Name = "ucrReceiverSeasonYear" + Me.ucrReceiverSeasonYear.Selector = Nothing + Me.ucrReceiverSeasonYear.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonYear.strNcFilePath = "" + Me.ucrReceiverSeasonYear.TabIndex = 4 + Me.ucrReceiverSeasonYear.ucrSelector = Nothing ' - Me.ucrReceiverEndSeasonDate.AutoSize = True - Me.ucrReceiverEndSeasonDate.frmParent = Nothing - Me.ucrReceiverEndSeasonDate.Location = New System.Drawing.Point(246, 348) - Me.ucrReceiverEndSeasonDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndSeasonDate.Name = "ucrReceiverEndSeasonDate" - Me.ucrReceiverEndSeasonDate.Selector = Nothing - Me.ucrReceiverEndSeasonDate.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverEndSeasonDate.strNcFilePath = "" - Me.ucrReceiverEndSeasonDate.TabIndex = 18 - Me.ucrReceiverEndSeasonDate.ucrSelector = Nothing + 'ucrReceiverSeasonStationProb ' - 'ucrReceiverEndSeasonDOY + Me.ucrReceiverSeasonStationProb.AutoSize = True + Me.ucrReceiverSeasonStationProb.frmParent = Nothing + Me.ucrReceiverSeasonStationProb.Location = New System.Drawing.Point(372, 46) + Me.ucrReceiverSeasonStationProb.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonStationProb.Name = "ucrReceiverSeasonStationProb" + Me.ucrReceiverSeasonStationProb.Selector = Nothing + Me.ucrReceiverSeasonStationProb.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonStationProb.strNcFilePath = "" + Me.ucrReceiverSeasonStationProb.TabIndex = 2 + Me.ucrReceiverSeasonStationProb.ucrSelector = Nothing ' - Me.ucrReceiverEndSeasonDOY.AutoSize = True - Me.ucrReceiverEndSeasonDOY.frmParent = Nothing - Me.ucrReceiverEndSeasonDOY.Location = New System.Drawing.Point(250, 310) - Me.ucrReceiverEndSeasonDOY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndSeasonDOY.Name = "ucrReceiverEndSeasonDOY" - Me.ucrReceiverEndSeasonDOY.Selector = Nothing - Me.ucrReceiverEndSeasonDOY.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverEndSeasonDOY.strNcFilePath = "" - Me.ucrReceiverEndSeasonDOY.TabIndex = 16 - Me.ucrReceiverEndSeasonDOY.ucrSelector = Nothing + 'tbAnnualTempSummaries ' - 'ucrReceiverEndRainsDOY + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanAnnualTemp) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempYear) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempYr) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrSelectorAnnualTemp) + Me.tbAnnualTempSummaries.Location = New System.Drawing.Point(4, 29) + Me.tbAnnualTempSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbAnnualTempSummaries.Name = "tbAnnualTempSummaries" + Me.tbAnnualTempSummaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbAnnualTempSummaries.Size = New System.Drawing.Size(776, 695) + Me.tbAnnualTempSummaries.TabIndex = 3 + Me.tbAnnualTempSummaries.Text = "Annual Temperature" + Me.tbAnnualTempSummaries.UseVisualStyleBackColor = True ' - Me.ucrReceiverEndRainsDOY.AutoSize = True - Me.ucrReceiverEndRainsDOY.frmParent = Nothing - Me.ucrReceiverEndRainsDOY.Location = New System.Drawing.Point(249, 233) - Me.ucrReceiverEndRainsDOY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndRainsDOY.Name = "ucrReceiverEndRainsDOY" - Me.ucrReceiverEndRainsDOY.Selector = Nothing - Me.ucrReceiverEndRainsDOY.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverEndRainsDOY.strNcFilePath = "" - Me.ucrReceiverEndRainsDOY.TabIndex = 12 - Me.ucrReceiverEndRainsDOY.ucrSelector = Nothing + 'lblMinMinAnnual ' - 'tbSummaries + Me.lblMinMinAnnual.AutoSize = True + Me.lblMinMinAnnual.Location = New System.Drawing.Point(374, 208) + Me.lblMinMinAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinMinAnnual.Name = "lblMinMinAnnual" + Me.lblMinMinAnnual.Size = New System.Drawing.Size(145, 20) + Me.lblMinMinAnnual.TabIndex = 7 + Me.lblMinMinAnnual.Text = "Min Minimum Temp" ' - Me.tbSummaries.Controls.Add(Me.tbAnnualRainfall) - Me.tbSummaries.Controls.Add(Me.tbCropSuccessProp) - Me.tbSummaries.Controls.Add(Me.tbSeasonStartProb) - Me.tbSummaries.Controls.Add(Me.tbAnnualTempSummaries) - Me.tbSummaries.Controls.Add(Me.tbMonthlyTemp) - Me.tbSummaries.Location = New System.Drawing.Point(12, 17) - Me.tbSummaries.Name = "tbSummaries" - Me.tbSummaries.SelectedIndex = 0 - Me.tbSummaries.Size = New System.Drawing.Size(523, 430) - Me.tbSummaries.TabIndex = 7 + 'lblMeanAnnualTemp ' - 'tbAnnualRainfall + Me.lblMeanAnnualTemp.AutoSize = True + Me.lblMeanAnnualTemp.Location = New System.Drawing.Point(368, 143) + Me.lblMeanAnnualTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMeanAnnualTemp.Name = "lblMeanAnnualTemp" + Me.lblMeanAnnualTemp.Size = New System.Drawing.Size(160, 20) + Me.lblMeanAnnualTemp.TabIndex = 5 + Me.lblMeanAnnualTemp.Text = "Mean Minimum Temp" ' - Me.tbAnnualRainfall.Controls.Add(Me.lblRainyDaysYear) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysYear) - Me.tbAnnualRainfall.Controls.Add(Me.lblNoRainDaysSeason) - Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalLength) - Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalRain) - Me.tbAnnualRainfall.Controls.Add(Me.lblAnnualRain) - Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDate) - Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDOY) - Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainDate) - Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainsDOY) - Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDate) - Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDOY) - Me.tbAnnualRainfall.Controls.Add(Me.lblYear) - Me.tbAnnualRainfall.Controls.Add(Me.lblStation) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDate) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDOY) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverYear) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStation) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDate) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDOY) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDOY) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDate) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalLength) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysSeason) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalRain) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverAnnualRain) - Me.tbAnnualRainfall.Controls.Add(Me.ucrSelectorDefineAnnualRain) - Me.tbAnnualRainfall.Location = New System.Drawing.Point(4, 22) - Me.tbAnnualRainfall.Name = "tbAnnualRainfall" - Me.tbAnnualRainfall.Padding = New System.Windows.Forms.Padding(3) - Me.tbAnnualRainfall.Size = New System.Drawing.Size(515, 404) - Me.tbAnnualRainfall.TabIndex = 0 - Me.tbAnnualRainfall.Text = "Annual Rainfall" - Me.tbAnnualRainfall.UseVisualStyleBackColor = True + 'lblMaxMinAnnual ' - 'ucrReceiverEndRainsDate + Me.lblMaxMinAnnual.AutoSize = True + Me.lblMaxMinAnnual.Location = New System.Drawing.Point(376, 268) + Me.lblMaxMinAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxMinAnnual.Name = "lblMaxMinAnnual" + Me.lblMaxMinAnnual.Size = New System.Drawing.Size(149, 20) + Me.lblMaxMinAnnual.TabIndex = 9 + Me.lblMaxMinAnnual.Text = "Max Minimum Temp" ' - Me.ucrReceiverEndRainsDate.AutoSize = True - Me.ucrReceiverEndRainsDate.frmParent = Nothing - Me.ucrReceiverEndRainsDate.Location = New System.Drawing.Point(247, 273) - Me.ucrReceiverEndRainsDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndRainsDate.Name = "ucrReceiverEndRainsDate" - Me.ucrReceiverEndRainsDate.Selector = Nothing - Me.ucrReceiverEndRainsDate.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverEndRainsDate.strNcFilePath = "" - Me.ucrReceiverEndRainsDate.TabIndex = 14 - Me.ucrReceiverEndRainsDate.ucrSelector = Nothing + 'lblAnnualTempYear ' - 'ucrReceiverSeasonalLength + Me.lblAnnualTempYear.AutoSize = True + Me.lblAnnualTempYear.Location = New System.Drawing.Point(374, 80) + Me.lblAnnualTempYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAnnualTempYear.Name = "lblAnnualTempYear" + Me.lblAnnualTempYear.Size = New System.Drawing.Size(47, 20) + Me.lblAnnualTempYear.TabIndex = 3 + Me.lblAnnualTempYear.Text = "Year:" ' - Me.ucrReceiverSeasonalLength.AutoSize = True - Me.ucrReceiverSeasonalLength.frmParent = Nothing - Me.ucrReceiverSeasonalLength.Location = New System.Drawing.Point(245, 194) - Me.ucrReceiverSeasonalLength.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonalLength.Name = "ucrReceiverSeasonalLength" - Me.ucrReceiverSeasonalLength.Selector = Nothing - Me.ucrReceiverSeasonalLength.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonalLength.strNcFilePath = "" - Me.ucrReceiverSeasonalLength.TabIndex = 10 - Me.ucrReceiverSeasonalLength.ucrSelector = Nothing + 'lblAnnualTempStation ' - 'ucrReceiverRainDaysSeason + Me.lblAnnualTempStation.AutoSize = True + Me.lblAnnualTempStation.Location = New System.Drawing.Point(372, 14) + Me.lblAnnualTempStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAnnualTempStation.Name = "lblAnnualTempStation" + Me.lblAnnualTempStation.Size = New System.Drawing.Size(64, 20) + Me.lblAnnualTempStation.TabIndex = 1 + Me.lblAnnualTempStation.Text = "Station:" ' - Me.ucrReceiverRainDaysSeason.AutoSize = True - Me.ucrReceiverRainDaysSeason.frmParent = Nothing - Me.ucrReceiverRainDaysSeason.Location = New System.Drawing.Point(244, 114) - Me.ucrReceiverRainDaysSeason.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRainDaysSeason.Name = "ucrReceiverRainDaysSeason" - Me.ucrReceiverRainDaysSeason.Selector = Nothing - Me.ucrReceiverRainDaysSeason.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverRainDaysSeason.strNcFilePath = "" - Me.ucrReceiverRainDaysSeason.TabIndex = 6 - Me.ucrReceiverRainDaysSeason.ucrSelector = Nothing + 'lblMaxMaxAnnual ' - 'ucrReceiverSeasonalRain + Me.lblMaxMaxAnnual.AutoSize = True + Me.lblMaxMaxAnnual.Location = New System.Drawing.Point(382, 454) + Me.lblMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxMaxAnnual.Name = "lblMaxMaxAnnual" + Me.lblMaxMaxAnnual.Size = New System.Drawing.Size(153, 20) + Me.lblMaxMaxAnnual.TabIndex = 15 + Me.lblMaxMaxAnnual.Text = "Max Maximum Temp" ' - Me.ucrReceiverSeasonalRain.AutoSize = True - Me.ucrReceiverSeasonalRain.frmParent = Nothing - Me.ucrReceiverSeasonalRain.Location = New System.Drawing.Point(243, 71) - Me.ucrReceiverSeasonalRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonalRain.Name = "ucrReceiverSeasonalRain" - Me.ucrReceiverSeasonalRain.Selector = Nothing - Me.ucrReceiverSeasonalRain.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonalRain.strNcFilePath = "" - Me.ucrReceiverSeasonalRain.TabIndex = 4 - Me.ucrReceiverSeasonalRain.ucrSelector = Nothing + 'lblMinMaxAnnual ' - 'ucrReceiverAnnualRain + Me.lblMinMaxAnnual.AutoSize = True + Me.lblMinMaxAnnual.Location = New System.Drawing.Point(381, 389) + Me.lblMinMaxAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinMaxAnnual.Name = "lblMinMaxAnnual" + Me.lblMinMaxAnnual.Size = New System.Drawing.Size(153, 20) + Me.lblMinMaxAnnual.TabIndex = 13 + Me.lblMinMaxAnnual.Text = "Min Maximum Temp:" ' - Me.ucrReceiverAnnualRain.AutoSize = True - Me.ucrReceiverAnnualRain.frmParent = Nothing - Me.ucrReceiverAnnualRain.Location = New System.Drawing.Point(242, 28) - Me.ucrReceiverAnnualRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverAnnualRain.Name = "ucrReceiverAnnualRain" - Me.ucrReceiverAnnualRain.Selector = Nothing - Me.ucrReceiverAnnualRain.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverAnnualRain.strNcFilePath = "" - Me.ucrReceiverAnnualRain.TabIndex = 2 - Me.ucrReceiverAnnualRain.ucrSelector = Nothing + 'lblMeanMaxAnnual ' - 'ucrSelectorDefineAnnualRain + Me.lblMeanMaxAnnual.AutoSize = True + Me.lblMeanMaxAnnual.Location = New System.Drawing.Point(381, 329) + Me.lblMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMeanMaxAnnual.Name = "lblMeanMaxAnnual" + Me.lblMeanMaxAnnual.Size = New System.Drawing.Size(164, 20) + Me.lblMeanMaxAnnual.TabIndex = 11 + Me.lblMeanMaxAnnual.Text = "Mean Maximum Temp" ' - Me.ucrSelectorDefineAnnualRain.AutoSize = True - Me.ucrSelectorDefineAnnualRain.bDropUnusedFilterLevels = False - Me.ucrSelectorDefineAnnualRain.bShowHiddenColumns = False - Me.ucrSelectorDefineAnnualRain.bUseCurrentFilter = True - Me.ucrSelectorDefineAnnualRain.Location = New System.Drawing.Point(7, 8) - Me.ucrSelectorDefineAnnualRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorDefineAnnualRain.Name = "ucrSelectorDefineAnnualRain" - Me.ucrSelectorDefineAnnualRain.Size = New System.Drawing.Size(151, 185) - Me.ucrSelectorDefineAnnualRain.TabIndex = 0 + 'ucrReceiverMinMinAnnual ' - 'tbCropSuccessProp + Me.ucrReceiverMinMinAnnual.AutoSize = True + Me.ucrReceiverMinMinAnnual.frmParent = Nothing + Me.ucrReceiverMinMinAnnual.Location = New System.Drawing.Point(375, 232) + Me.ucrReceiverMinMinAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMinAnnual.Name = "ucrReceiverMinMinAnnual" + Me.ucrReceiverMinMinAnnual.Selector = Nothing + Me.ucrReceiverMinMinAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMinAnnual.strNcFilePath = "" + Me.ucrReceiverMinMinAnnual.TabIndex = 8 + Me.ucrReceiverMinMinAnnual.ucrSelector = Nothing ' - Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingLength) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingLenghth) - Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingDay) - Me.tbCropSuccessProp.Controls.Add(Me.lblProbSuccess) - Me.tbCropSuccessProp.Controls.Add(Me.lblTotalRain) - Me.tbCropSuccessProp.Controls.Add(Me.lblCropStation) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPropSuccess) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingDay) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverTotalRain) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverStationCrop) - Me.tbCropSuccessProp.Controls.Add(Me.ucrSelectorCropProp) - Me.tbCropSuccessProp.Location = New System.Drawing.Point(4, 22) - Me.tbCropSuccessProp.Name = "tbCropSuccessProp" - Me.tbCropSuccessProp.Padding = New System.Windows.Forms.Padding(3) - Me.tbCropSuccessProp.Size = New System.Drawing.Size(515, 404) - Me.tbCropSuccessProp.TabIndex = 1 - Me.tbCropSuccessProp.Text = "Crop Success Prop" - Me.tbCropSuccessProp.UseVisualStyleBackColor = True + 'ucrReceiverMaxMaxAnnual ' - 'lblPlantingLength + Me.ucrReceiverMaxMaxAnnual.AutoSize = True + Me.ucrReceiverMaxMaxAnnual.frmParent = Nothing + Me.ucrReceiverMaxMaxAnnual.Location = New System.Drawing.Point(381, 474) + Me.ucrReceiverMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMaxAnnual.Name = "ucrReceiverMaxMaxAnnual" + Me.ucrReceiverMaxMaxAnnual.Selector = Nothing + Me.ucrReceiverMaxMaxAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMaxMaxAnnual.TabIndex = 16 + Me.ucrReceiverMaxMaxAnnual.ucrSelector = Nothing ' - Me.lblPlantingLength.AutoSize = True - Me.lblPlantingLength.Location = New System.Drawing.Point(252, 137) - Me.lblPlantingLength.Name = "lblPlantingLength" - Me.lblPlantingLength.Size = New System.Drawing.Size(84, 13) - Me.lblPlantingLength.TabIndex = 7 - Me.lblPlantingLength.Text = "Planting Length:" + 'ucrReceiverMeanMaxAnnual ' - 'ucrReceiverPlantingLenghth + Me.ucrReceiverMeanMaxAnnual.AutoSize = True + Me.ucrReceiverMeanMaxAnnual.frmParent = Nothing + Me.ucrReceiverMeanMaxAnnual.Location = New System.Drawing.Point(380, 355) + Me.ucrReceiverMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanMaxAnnual.Name = "ucrReceiverMeanMaxAnnual" + Me.ucrReceiverMeanMaxAnnual.Selector = Nothing + Me.ucrReceiverMeanMaxAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMeanMaxAnnual.TabIndex = 12 + Me.ucrReceiverMeanMaxAnnual.ucrSelector = Nothing ' - Me.ucrReceiverPlantingLenghth.AutoSize = True - Me.ucrReceiverPlantingLenghth.frmParent = Nothing - Me.ucrReceiverPlantingLenghth.Location = New System.Drawing.Point(250, 153) - Me.ucrReceiverPlantingLenghth.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverPlantingLenghth.Name = "ucrReceiverPlantingLenghth" - Me.ucrReceiverPlantingLenghth.Selector = Nothing - Me.ucrReceiverPlantingLenghth.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverPlantingLenghth.strNcFilePath = "" - Me.ucrReceiverPlantingLenghth.TabIndex = 8 - Me.ucrReceiverPlantingLenghth.ucrSelector = Nothing + 'ucrReceiverMinMaxAnnual ' - 'lblPlantingDay + Me.ucrReceiverMinMaxAnnual.AutoSize = True + Me.ucrReceiverMinMaxAnnual.frmParent = Nothing + Me.ucrReceiverMinMaxAnnual.Location = New System.Drawing.Point(376, 417) + Me.ucrReceiverMinMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMaxAnnual.Name = "ucrReceiverMinMaxAnnual" + Me.ucrReceiverMinMaxAnnual.Selector = Nothing + Me.ucrReceiverMinMaxAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMinMaxAnnual.TabIndex = 14 + Me.ucrReceiverMinMaxAnnual.ucrSelector = Nothing ' - Me.lblPlantingDay.AutoSize = True - Me.lblPlantingDay.Location = New System.Drawing.Point(245, 95) - Me.lblPlantingDay.Name = "lblPlantingDay" - Me.lblPlantingDay.Size = New System.Drawing.Size(70, 13) - Me.lblPlantingDay.TabIndex = 5 - Me.lblPlantingDay.Text = "Planting Day:" + 'ucrReceiverMaxMinAnnual ' - 'lblProbSuccess + Me.ucrReceiverMaxMinAnnual.AutoSize = True + Me.ucrReceiverMaxMinAnnual.frmParent = Nothing + Me.ucrReceiverMaxMinAnnual.Location = New System.Drawing.Point(374, 295) + Me.ucrReceiverMaxMinAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMinAnnual.Name = "ucrReceiverMaxMinAnnual" + Me.ucrReceiverMaxMinAnnual.Selector = Nothing + Me.ucrReceiverMaxMinAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMinAnnual.strNcFilePath = "" + Me.ucrReceiverMaxMinAnnual.TabIndex = 10 + Me.ucrReceiverMaxMinAnnual.ucrSelector = Nothing ' - Me.lblProbSuccess.AutoSize = True - Me.lblProbSuccess.Location = New System.Drawing.Point(251, 176) - Me.lblProbSuccess.Name = "lblProbSuccess" - Me.lblProbSuccess.Size = New System.Drawing.Size(117, 13) - Me.lblProbSuccess.TabIndex = 9 - Me.lblProbSuccess.Text = "Proportion of Success :" + 'ucrReceiverMeanAnnual ' - 'lblTotalRain + Me.ucrReceiverMeanAnnual.AutoSize = True + Me.ucrReceiverMeanAnnual.frmParent = Nothing + Me.ucrReceiverMeanAnnual.Location = New System.Drawing.Point(372, 172) + Me.ucrReceiverMeanAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanAnnual.Name = "ucrReceiverMeanAnnual" + Me.ucrReceiverMeanAnnual.Selector = Nothing + Me.ucrReceiverMeanAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanAnnual.strNcFilePath = "" + Me.ucrReceiverMeanAnnual.TabIndex = 6 + Me.ucrReceiverMeanAnnual.ucrSelector = Nothing ' - Me.lblTotalRain.AutoSize = True - Me.lblTotalRain.Location = New System.Drawing.Point(249, 54) - Me.lblTotalRain.Name = "lblTotalRain" - Me.lblTotalRain.Size = New System.Drawing.Size(59, 13) - Me.lblTotalRain.TabIndex = 3 - Me.lblTotalRain.Text = "Total Rain:" + 'ucrReceiverAnnualTempYr ' - 'lblCropStation + Me.ucrReceiverAnnualTempYr.AutoSize = True + Me.ucrReceiverAnnualTempYr.frmParent = Nothing + Me.ucrReceiverAnnualTempYr.Location = New System.Drawing.Point(370, 106) + Me.ucrReceiverAnnualTempYr.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualTempYr.Name = "ucrReceiverAnnualTempYr" + Me.ucrReceiverAnnualTempYr.Selector = Nothing + Me.ucrReceiverAnnualTempYr.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverAnnualTempYr.strNcFilePath = "" + Me.ucrReceiverAnnualTempYr.TabIndex = 4 + Me.ucrReceiverAnnualTempYr.ucrSelector = Nothing ' - Me.lblCropStation.AutoSize = True - Me.lblCropStation.Location = New System.Drawing.Point(248, 11) - Me.lblCropStation.Name = "lblCropStation" - Me.lblCropStation.Size = New System.Drawing.Size(43, 13) - Me.lblCropStation.TabIndex = 1 - Me.lblCropStation.Text = "Station:" + 'ucrReceiverAnnualTempStation ' - 'ucrReceiverPropSuccess + Me.ucrReceiverAnnualTempStation.AutoSize = True + Me.ucrReceiverAnnualTempStation.frmParent = Nothing + Me.ucrReceiverAnnualTempStation.Location = New System.Drawing.Point(369, 40) + Me.ucrReceiverAnnualTempStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualTempStation.Name = "ucrReceiverAnnualTempStation" + Me.ucrReceiverAnnualTempStation.Selector = Nothing + Me.ucrReceiverAnnualTempStation.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverAnnualTempStation.strNcFilePath = "" + Me.ucrReceiverAnnualTempStation.TabIndex = 2 + Me.ucrReceiverAnnualTempStation.ucrSelector = Nothing ' - Me.ucrReceiverPropSuccess.AutoSize = True - Me.ucrReceiverPropSuccess.frmParent = Nothing - Me.ucrReceiverPropSuccess.Location = New System.Drawing.Point(249, 194) - Me.ucrReceiverPropSuccess.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverPropSuccess.Name = "ucrReceiverPropSuccess" - Me.ucrReceiverPropSuccess.Selector = Nothing - Me.ucrReceiverPropSuccess.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverPropSuccess.strNcFilePath = "" - Me.ucrReceiverPropSuccess.TabIndex = 10 - Me.ucrReceiverPropSuccess.ucrSelector = Nothing + 'ucrSelectorAnnualTemp ' - 'ucrReceiverPlantingDay + Me.ucrSelectorAnnualTemp.AutoSize = True + Me.ucrSelectorAnnualTemp.bDropUnusedFilterLevels = False + Me.ucrSelectorAnnualTemp.bShowHiddenColumns = False + Me.ucrSelectorAnnualTemp.bUseCurrentFilter = True + Me.ucrSelectorAnnualTemp.Location = New System.Drawing.Point(16, 9) + Me.ucrSelectorAnnualTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorAnnualTemp.Name = "ucrSelectorAnnualTemp" + Me.ucrSelectorAnnualTemp.Size = New System.Drawing.Size(339, 412) + Me.ucrSelectorAnnualTemp.TabIndex = 0 ' - Me.ucrReceiverPlantingDay.AutoSize = True - Me.ucrReceiverPlantingDay.frmParent = Nothing - Me.ucrReceiverPlantingDay.Location = New System.Drawing.Point(248, 114) - Me.ucrReceiverPlantingDay.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverPlantingDay.Name = "ucrReceiverPlantingDay" - Me.ucrReceiverPlantingDay.Selector = Nothing - Me.ucrReceiverPlantingDay.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverPlantingDay.strNcFilePath = "" - Me.ucrReceiverPlantingDay.TabIndex = 6 - Me.ucrReceiverPlantingDay.ucrSelector = Nothing + 'tbMonthlyTemp + ' + Me.tbMonthlyTemp.Controls.Add(Me.lblMonth) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMInMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblYearMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblStationMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanmaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanminMontly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverYearMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthlyTemp) + Me.tbMonthlyTemp.Controls.Add(Me.ucrSelecetorMonthlyTemp) + Me.tbMonthlyTemp.Location = New System.Drawing.Point(4, 29) + Me.tbMonthlyTemp.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbMonthlyTemp.Name = "tbMonthlyTemp" + Me.tbMonthlyTemp.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbMonthlyTemp.Size = New System.Drawing.Size(776, 695) + Me.tbMonthlyTemp.TabIndex = 4 + Me.tbMonthlyTemp.Text = "Monthly Temperature" + Me.tbMonthlyTemp.UseVisualStyleBackColor = True + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(370, 146) + Me.lblMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(58, 20) + Me.lblMonth.TabIndex = 5 + Me.lblMonth.Text = "Month:" + ' + 'lblMinMInMonthly + ' + Me.lblMinMInMonthly.AutoSize = True + Me.lblMinMInMonthly.Location = New System.Drawing.Point(372, 278) + Me.lblMinMInMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinMInMonthly.Name = "lblMinMInMonthly" + Me.lblMinMInMonthly.Size = New System.Drawing.Size(145, 20) + Me.lblMinMInMonthly.TabIndex = 9 + Me.lblMinMInMonthly.Text = "Min Minimum Temp" + ' + 'lblMeanMinMonthly + ' + Me.lblMeanMinMonthly.AutoSize = True + Me.lblMeanMinMonthly.Location = New System.Drawing.Point(366, 214) + Me.lblMeanMinMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMeanMinMonthly.Name = "lblMeanMinMonthly" + Me.lblMeanMinMonthly.Size = New System.Drawing.Size(160, 20) + Me.lblMeanMinMonthly.TabIndex = 7 + Me.lblMeanMinMonthly.Text = "Mean Minimum Temp" + ' + 'lblMaxMinMonthly + ' + Me.lblMaxMinMonthly.AutoSize = True + Me.lblMaxMinMonthly.Location = New System.Drawing.Point(375, 338) + Me.lblMaxMinMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxMinMonthly.Name = "lblMaxMinMonthly" + Me.lblMaxMinMonthly.Size = New System.Drawing.Size(149, 20) + Me.lblMaxMinMonthly.TabIndex = 11 + Me.lblMaxMinMonthly.Text = "Max Minimum Temp" + ' + 'lblYearMonthTemp + ' + Me.lblYearMonthTemp.AutoSize = True + Me.lblYearMonthTemp.Location = New System.Drawing.Point(372, 83) + Me.lblYearMonthTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblYearMonthTemp.Name = "lblYearMonthTemp" + Me.lblYearMonthTemp.Size = New System.Drawing.Size(47, 20) + Me.lblYearMonthTemp.TabIndex = 3 + Me.lblYearMonthTemp.Text = "Year:" + ' + 'lblStationMonthTemp ' - 'ucrReceiverTotalRain + Me.lblStationMonthTemp.AutoSize = True + Me.lblStationMonthTemp.Location = New System.Drawing.Point(370, 23) + Me.lblStationMonthTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStationMonthTemp.Name = "lblStationMonthTemp" + Me.lblStationMonthTemp.Size = New System.Drawing.Size(64, 20) + Me.lblStationMonthTemp.TabIndex = 1 + Me.lblStationMonthTemp.Text = "Station:" ' - Me.ucrReceiverTotalRain.AutoSize = True - Me.ucrReceiverTotalRain.frmParent = Nothing - Me.ucrReceiverTotalRain.Location = New System.Drawing.Point(247, 71) - Me.ucrReceiverTotalRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverTotalRain.Name = "ucrReceiverTotalRain" - Me.ucrReceiverTotalRain.Selector = Nothing - Me.ucrReceiverTotalRain.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverTotalRain.strNcFilePath = "" - Me.ucrReceiverTotalRain.TabIndex = 4 - Me.ucrReceiverTotalRain.ucrSelector = Nothing + 'lblMaxMaxMonthly ' - 'ucrReceiverStationCrop + Me.lblMaxMaxMonthly.AutoSize = True + Me.lblMaxMaxMonthly.Location = New System.Drawing.Point(381, 525) + Me.lblMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxMaxMonthly.Name = "lblMaxMaxMonthly" + Me.lblMaxMaxMonthly.Size = New System.Drawing.Size(153, 20) + Me.lblMaxMaxMonthly.TabIndex = 17 + Me.lblMaxMaxMonthly.Text = "Max Maximum Temp" ' - Me.ucrReceiverStationCrop.AutoSize = True - Me.ucrReceiverStationCrop.frmParent = Nothing - Me.ucrReceiverStationCrop.Location = New System.Drawing.Point(246, 28) - Me.ucrReceiverStationCrop.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStationCrop.Name = "ucrReceiverStationCrop" - Me.ucrReceiverStationCrop.Selector = Nothing - Me.ucrReceiverStationCrop.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverStationCrop.strNcFilePath = "" - Me.ucrReceiverStationCrop.TabIndex = 2 - Me.ucrReceiverStationCrop.ucrSelector = Nothing + 'lblMinMaxMonthly ' - 'ucrSelectorCropProp + Me.lblMinMaxMonthly.AutoSize = True + Me.lblMinMaxMonthly.Location = New System.Drawing.Point(380, 460) + Me.lblMinMaxMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinMaxMonthly.Name = "lblMinMaxMonthly" + Me.lblMinMaxMonthly.Size = New System.Drawing.Size(153, 20) + Me.lblMinMaxMonthly.TabIndex = 15 + Me.lblMinMaxMonthly.Text = "Min Maximum Temp:" ' - Me.ucrSelectorCropProp.AutoSize = True - Me.ucrSelectorCropProp.bDropUnusedFilterLevels = False - Me.ucrSelectorCropProp.bShowHiddenColumns = False - Me.ucrSelectorCropProp.bUseCurrentFilter = True - Me.ucrSelectorCropProp.Location = New System.Drawing.Point(11, 8) - Me.ucrSelectorCropProp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCropProp.Name = "ucrSelectorCropProp" - Me.ucrSelectorCropProp.Size = New System.Drawing.Size(151, 185) - Me.ucrSelectorCropProp.TabIndex = 0 + 'lblMeanMaxMonthly ' - 'tbSeasonStartProb + Me.lblMeanMaxMonthly.AutoSize = True + Me.lblMeanMaxMonthly.Location = New System.Drawing.Point(380, 400) + Me.lblMeanMaxMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMeanMaxMonthly.Name = "lblMeanMaxMonthly" + Me.lblMeanMaxMonthly.Size = New System.Drawing.Size(164, 20) + Me.lblMeanMaxMonthly.TabIndex = 13 + Me.lblMeanMaxMonthly.Text = "Mean Maximum Temp" ' - Me.tbSeasonStartProb.Controls.Add(Me.lblPlantingDayCond) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverPlantingDayCondition) - Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonPlantingDay) - Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonYear) - Me.tbSeasonStartProb.Controls.Add(Me.lblStationSeasonProb) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonPlantingDay) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonYear) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonStationProb) - Me.tbSeasonStartProb.Controls.Add(Me.ucrSelectorSeasonStartProp) - Me.tbSeasonStartProb.Location = New System.Drawing.Point(4, 22) - Me.tbSeasonStartProb.Name = "tbSeasonStartProb" - Me.tbSeasonStartProb.Padding = New System.Windows.Forms.Padding(3) - Me.tbSeasonStartProb.Size = New System.Drawing.Size(515, 404) - Me.tbSeasonStartProb.TabIndex = 2 - Me.tbSeasonStartProb.Text = "Season Start Prob" - Me.tbSeasonStartProb.UseVisualStyleBackColor = True + 'ucrReceiverMonthMonthly ' - 'lblSeasonYear + Me.ucrReceiverMonthMonthly.AutoSize = True + Me.ucrReceiverMonthMonthly.frmParent = Nothing + Me.ucrReceiverMonthMonthly.Location = New System.Drawing.Point(368, 172) + Me.ucrReceiverMonthMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthMonthly.Name = "ucrReceiverMonthMonthly" + Me.ucrReceiverMonthMonthly.Selector = Nothing + Me.ucrReceiverMonthMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMonthMonthly.strNcFilePath = "" + Me.ucrReceiverMonthMonthly.TabIndex = 6 + Me.ucrReceiverMonthMonthly.ucrSelector = Nothing ' - Me.lblSeasonYear.AutoSize = True - Me.lblSeasonYear.Location = New System.Drawing.Point(251, 56) - Me.lblSeasonYear.Name = "lblSeasonYear" - Me.lblSeasonYear.Size = New System.Drawing.Size(32, 13) - Me.lblSeasonYear.TabIndex = 3 - Me.lblSeasonYear.Text = "Year:" + 'ucrReceiverMinMinMonthly ' - 'lblStationSeasonProb + Me.ucrReceiverMinMinMonthly.AutoSize = True + Me.ucrReceiverMinMinMonthly.frmParent = Nothing + Me.ucrReceiverMinMinMonthly.Location = New System.Drawing.Point(374, 303) + Me.ucrReceiverMinMinMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMinMonthly.Name = "ucrReceiverMinMinMonthly" + Me.ucrReceiverMinMinMonthly.Selector = Nothing + Me.ucrReceiverMinMinMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMinMonthly.strNcFilePath = "" + Me.ucrReceiverMinMinMonthly.TabIndex = 10 + Me.ucrReceiverMinMinMonthly.ucrSelector = Nothing ' - Me.lblStationSeasonProb.AutoSize = True - Me.lblStationSeasonProb.Location = New System.Drawing.Point(250, 13) - Me.lblStationSeasonProb.Name = "lblStationSeasonProb" - Me.lblStationSeasonProb.Size = New System.Drawing.Size(43, 13) - Me.lblStationSeasonProb.TabIndex = 1 - Me.lblStationSeasonProb.Text = "Station:" + 'ucrReceiverMaxMaxMonthly ' - 'ucrReceiverSeasonPlantingDay + Me.ucrReceiverMaxMaxMonthly.AutoSize = True + Me.ucrReceiverMaxMaxMonthly.frmParent = Nothing + Me.ucrReceiverMaxMaxMonthly.Location = New System.Drawing.Point(380, 545) + Me.ucrReceiverMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMaxMonthly.Name = "ucrReceiverMaxMaxMonthly" + Me.ucrReceiverMaxMaxMonthly.Selector = Nothing + Me.ucrReceiverMaxMaxMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMaxMonthly.strNcFilePath = "" + Me.ucrReceiverMaxMaxMonthly.TabIndex = 18 + Me.ucrReceiverMaxMaxMonthly.ucrSelector = Nothing ' - Me.ucrReceiverSeasonPlantingDay.AutoSize = True - Me.ucrReceiverSeasonPlantingDay.frmParent = Nothing - Me.ucrReceiverSeasonPlantingDay.Location = New System.Drawing.Point(250, 116) - Me.ucrReceiverSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonPlantingDay.Name = "ucrReceiverSeasonPlantingDay" - Me.ucrReceiverSeasonPlantingDay.Selector = Nothing - Me.ucrReceiverSeasonPlantingDay.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonPlantingDay.strNcFilePath = "" - Me.ucrReceiverSeasonPlantingDay.TabIndex = 6 - Me.ucrReceiverSeasonPlantingDay.ucrSelector = Nothing + 'ucrReceiverMeanmaxMonthly ' - 'ucrReceiverSeasonYear + Me.ucrReceiverMeanmaxMonthly.AutoSize = True + Me.ucrReceiverMeanmaxMonthly.frmParent = Nothing + Me.ucrReceiverMeanmaxMonthly.Location = New System.Drawing.Point(378, 426) + Me.ucrReceiverMeanmaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanmaxMonthly.Name = "ucrReceiverMeanmaxMonthly" + Me.ucrReceiverMeanmaxMonthly.Selector = Nothing + Me.ucrReceiverMeanmaxMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanmaxMonthly.strNcFilePath = "" + Me.ucrReceiverMeanmaxMonthly.TabIndex = 14 + Me.ucrReceiverMeanmaxMonthly.ucrSelector = Nothing ' - Me.ucrReceiverSeasonYear.AutoSize = True - Me.ucrReceiverSeasonYear.frmParent = Nothing - Me.ucrReceiverSeasonYear.Location = New System.Drawing.Point(249, 73) - Me.ucrReceiverSeasonYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonYear.Name = "ucrReceiverSeasonYear" - Me.ucrReceiverSeasonYear.Selector = Nothing - Me.ucrReceiverSeasonYear.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonYear.strNcFilePath = "" - Me.ucrReceiverSeasonYear.TabIndex = 4 - Me.ucrReceiverSeasonYear.ucrSelector = Nothing + 'ucrReceiverMinMaxMonthly ' - 'ucrReceiverSeasonStationProb + Me.ucrReceiverMinMaxMonthly.AutoSize = True + Me.ucrReceiverMinMaxMonthly.frmParent = Nothing + Me.ucrReceiverMinMaxMonthly.Location = New System.Drawing.Point(375, 488) + Me.ucrReceiverMinMaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMaxMonthly.Name = "ucrReceiverMinMaxMonthly" + Me.ucrReceiverMinMaxMonthly.Selector = Nothing + Me.ucrReceiverMinMaxMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMaxMonthly.strNcFilePath = "" + Me.ucrReceiverMinMaxMonthly.TabIndex = 16 + Me.ucrReceiverMinMaxMonthly.ucrSelector = Nothing ' - Me.ucrReceiverSeasonStationProb.AutoSize = True - Me.ucrReceiverSeasonStationProb.frmParent = Nothing - Me.ucrReceiverSeasonStationProb.Location = New System.Drawing.Point(248, 30) - Me.ucrReceiverSeasonStationProb.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonStationProb.Name = "ucrReceiverSeasonStationProb" - Me.ucrReceiverSeasonStationProb.Selector = Nothing - Me.ucrReceiverSeasonStationProb.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonStationProb.strNcFilePath = "" - Me.ucrReceiverSeasonStationProb.TabIndex = 2 - Me.ucrReceiverSeasonStationProb.ucrSelector = Nothing + 'ucrReceiverMeanminMontly ' - 'ucrSelectorSeasonStartProp + Me.ucrReceiverMeanminMontly.AutoSize = True + Me.ucrReceiverMeanminMontly.frmParent = Nothing + Me.ucrReceiverMeanminMontly.Location = New System.Drawing.Point(370, 243) + Me.ucrReceiverMeanminMontly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanminMontly.Name = "ucrReceiverMeanminMontly" + Me.ucrReceiverMeanminMontly.Selector = Nothing + Me.ucrReceiverMeanminMontly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanminMontly.strNcFilePath = "" + Me.ucrReceiverMeanminMontly.TabIndex = 8 + Me.ucrReceiverMeanminMontly.ucrSelector = Nothing ' - Me.ucrSelectorSeasonStartProp.AutoSize = True - Me.ucrSelectorSeasonStartProp.bDropUnusedFilterLevels = False - Me.ucrSelectorSeasonStartProp.bShowHiddenColumns = False - Me.ucrSelectorSeasonStartProp.bUseCurrentFilter = True - Me.ucrSelectorSeasonStartProp.Location = New System.Drawing.Point(13, 10) - Me.ucrSelectorSeasonStartProp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorSeasonStartProp.Name = "ucrSelectorSeasonStartProp" - Me.ucrSelectorSeasonStartProp.Size = New System.Drawing.Size(151, 185) - Me.ucrSelectorSeasonStartProp.TabIndex = 0 + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.Location = New System.Drawing.Point(236, 751) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(336, 46) + Me.ucrBase.TabIndex = 35 ' 'sdgDefineAnnualRainfall ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(547, 503) - Me.Controls.Add(Me.ucrBase) + Me.AutoSize = True + Me.ClientSize = New System.Drawing.Size(820, 819) Me.Controls.Add(Me.tbSummaries) + Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgDefineAnnualRainfall" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Define Elements" - Me.tbAnnualTempSummaries.ResumeLayout(False) - Me.tbAnnualTempSummaries.PerformLayout() - Me.tbMonthlyTemp.ResumeLayout(False) - Me.tbMonthlyTemp.PerformLayout() Me.tbSummaries.ResumeLayout(False) Me.tbAnnualRainfall.ResumeLayout(False) Me.tbAnnualRainfall.PerformLayout() @@ -1217,53 +1341,29 @@ Partial Class sdgDefineAnnualRainfall Me.tbCropSuccessProp.PerformLayout() Me.tbSeasonStartProb.ResumeLayout(False) Me.tbSeasonStartProb.PerformLayout() + Me.tbAnnualTempSummaries.ResumeLayout(False) + Me.tbAnnualTempSummaries.PerformLayout() + Me.tbMonthlyTemp.ResumeLayout(False) + Me.tbMonthlyTemp.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents ucrReceiverPlantingDayCondition As ucrReceiverSingle - Friend WithEvents lblMinMinAnnual As Label - Friend WithEvents ucrReceiverMinMinAnnual As ucrReceiverSingle - Friend WithEvents lblMeanAnnualTemp As Label - Friend WithEvents lblMaxMinAnnual As Label - Friend WithEvents lblAnnualTempYear As Label - Friend WithEvents lblAnnualTempStation As Label - Friend WithEvents lblMaxMaxAnnual As Label - Friend WithEvents ucrSelecetorMonthlyTemp As ucrSelectorByDataFrame - Friend WithEvents lblMinMaxAnnual As Label - Friend WithEvents lblMeanMaxAnnual As Label - Friend WithEvents ucrReceiverMaxMaxAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverMeanMaxAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverMinMaxAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverMaxMinAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverMeanAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverAnnualTempYr As ucrReceiverSingle - Friend WithEvents ucrReceiverAnnualTempStation As ucrReceiverSingle - Friend WithEvents tbAnnualTempSummaries As TabPage - Friend WithEvents ucrSelectorAnnualTemp As ucrSelectorByDataFrame - Friend WithEvents lblPlantingDayCond As Label - Friend WithEvents tbMonthlyTemp As TabPage - Friend WithEvents lblMonth As Label - Friend WithEvents ucrReceiverMonthMonthly As ucrReceiverSingle - Friend WithEvents lblMinMInMonthly As Label - Friend WithEvents ucrReceiverMinMinMonthly As ucrReceiverSingle - Friend WithEvents lblMeanMinMonthly As Label - Friend WithEvents lblMaxMinMonthly As Label - Friend WithEvents lblYearMonthTemp As Label - Friend WithEvents lblStationMonthTemp As Label - Friend WithEvents lblMaxMaxMonthly As Label - Friend WithEvents lblMinMaxMonthly As Label - Friend WithEvents lblMeanMaxMonthly As Label - Friend WithEvents ucrReceiverMaxMaxMonthly As ucrReceiverSingle - Friend WithEvents ucrReceiverMeanmaxMonthly As ucrReceiverSingle - Friend WithEvents ucrReceiverMinMaxMonthly As ucrReceiverSingle Friend WithEvents ucrReceiverMaxMinMonthly As ucrReceiverSingle - Friend WithEvents ucrReceiverMeanminMontly As ucrReceiverSingle Friend WithEvents ucrReceiverYearMonthly As ucrReceiverSingle Friend WithEvents ucrReceiverMonthlyTemp As ucrReceiverSingle - Friend WithEvents ucrBase As ucrButtonsSubdialogue + Friend WithEvents ucrSelecetorMonthlyTemp As ucrSelectorByDataFrame Friend WithEvents lblSeasonPlantingDay As Label + Friend WithEvents ucrSelectorSeasonStartProp As ucrSelectorByDataFrame + Friend WithEvents tbSummaries As TabControl + Friend WithEvents tbAnnualRainfall As TabPage + Friend WithEvents lblStartRainStatus As Label + Friend WithEvents ucrReceiverStartRainStatus As ucrReceiverSingle + Friend WithEvents lblEndRainStatus As Label + Friend WithEvents ucrReceiverEndRainStatus As ucrReceiverSingle + Friend WithEvents lblEndSeasonStatus As Label + Friend WithEvents ucrReceiverEndSeasonStatus As ucrReceiverSingle Friend WithEvents lblRainyDaysYear As Label Friend WithEvents ucrReceiverRainDaysYear As ucrReceiverSingle Friend WithEvents lblNoRainDaysSeason As Label @@ -1285,8 +1385,6 @@ Partial Class sdgDefineAnnualRainfall Friend WithEvents ucrReceiverEndSeasonDate As ucrReceiverSingle Friend WithEvents ucrReceiverEndSeasonDOY As ucrReceiverSingle Friend WithEvents ucrReceiverEndRainsDOY As ucrReceiverSingle - Friend WithEvents tbSummaries As TabControl - Friend WithEvents tbAnnualRainfall As TabPage Friend WithEvents ucrReceiverEndRainsDate As ucrReceiverSingle Friend WithEvents ucrReceiverSeasonalLength As ucrReceiverSingle Friend WithEvents ucrReceiverRainDaysSeason As ucrReceiverSingle @@ -1295,21 +1393,57 @@ Partial Class sdgDefineAnnualRainfall Friend WithEvents ucrSelectorDefineAnnualRain As ucrSelectorByDataFrame Friend WithEvents tbCropSuccessProp As TabPage Friend WithEvents lblPlantingLength As Label - Friend WithEvents ucrReceiverPlantingLenghth As ucrReceiverSingle Friend WithEvents lblPlantingDay As Label Friend WithEvents lblProbSuccess As Label Friend WithEvents lblTotalRain As Label Friend WithEvents lblCropStation As Label + Friend WithEvents ucrReceiverPlantingLenghth As ucrReceiverSingle Friend WithEvents ucrReceiverPropSuccess As ucrReceiverSingle Friend WithEvents ucrReceiverPlantingDay As ucrReceiverSingle Friend WithEvents ucrReceiverTotalRain As ucrReceiverSingle Friend WithEvents ucrReceiverStationCrop As ucrReceiverSingle Friend WithEvents ucrSelectorCropProp As ucrSelectorByDataFrame Friend WithEvents tbSeasonStartProb As TabPage + Friend WithEvents lblPlantingDayCond As Label Friend WithEvents lblSeasonYear As Label Friend WithEvents lblStationSeasonProb As Label + Friend WithEvents ucrReceiverPlantingDayCondition As ucrReceiverSingle Friend WithEvents ucrReceiverSeasonPlantingDay As ucrReceiverSingle Friend WithEvents ucrReceiverSeasonYear As ucrReceiverSingle Friend WithEvents ucrReceiverSeasonStationProb As ucrReceiverSingle - Friend WithEvents ucrSelectorSeasonStartProp As ucrSelectorByDataFrame + Friend WithEvents tbAnnualTempSummaries As TabPage + Friend WithEvents lblMinMinAnnual As Label + Friend WithEvents lblMeanAnnualTemp As Label + Friend WithEvents lblMaxMinAnnual As Label + Friend WithEvents lblAnnualTempYear As Label + Friend WithEvents lblAnnualTempStation As Label + Friend WithEvents lblMaxMaxAnnual As Label + Friend WithEvents lblMinMaxAnnual As Label + Friend WithEvents lblMeanMaxAnnual As Label + Friend WithEvents ucrReceiverMinMinAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMinAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualTempYr As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualTempStation As ucrReceiverSingle + Friend WithEvents ucrSelectorAnnualTemp As ucrSelectorByDataFrame + Friend WithEvents tbMonthlyTemp As TabPage + Friend WithEvents lblMonth As Label + Friend WithEvents lblMinMInMonthly As Label + Friend WithEvents lblMeanMinMonthly As Label + Friend WithEvents lblMaxMinMonthly As Label + Friend WithEvents lblYearMonthTemp As Label + Friend WithEvents lblStationMonthTemp As Label + Friend WithEvents lblMaxMaxMonthly As Label + Friend WithEvents lblMinMaxMonthly As Label + Friend WithEvents lblMeanMaxMonthly As Label + Friend WithEvents ucrReceiverMonthMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMinMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanmaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanminMontly As ucrReceiverSingle + Friend WithEvents ucrBase As ucrButtonsSubdialogue End Class diff --git a/instat/sdgDefineAnnualRainfall.vb b/instat/sdgDefineAnnualRainfall.vb index f5b9c623b36..70ddf23afb4 100644 --- a/instat/sdgDefineAnnualRainfall.vb +++ b/instat/sdgDefineAnnualRainfall.vb @@ -93,6 +93,18 @@ Public Class sdgDefineAnnualRainfall ucrReceiverAnnualRain.Selector = ucrSelectorDefineAnnualRain ucrReceiverAnnualRain.SetParameterIsString() + ucrReceiverStartRainStatus.SetParameter(New RParameter("start_rains_status_column", 14)) + ucrReceiverStartRainStatus.Selector = ucrSelectorDefineAnnualRain + ucrReceiverStartRainStatus.SetParameterIsString() + + ucrReceiverEndRainStatus.SetParameter(New RParameter("end_rains_status_column", 15)) + ucrReceiverEndRainStatus.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndRainStatus.SetParameterIsString() + + ucrReceiverEndSeasonStatus.SetParameter(New RParameter("end_season_status_column", 16)) + ucrReceiverEndSeasonStatus.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndSeasonStatus.SetParameterIsString() + ucrReceiverStationCrop.SetParameter(New RParameter("station_col", 1)) ucrReceiverStationCrop.Selector = ucrSelectorCropProp ucrReceiverStationCrop.SetParameterIsString() @@ -122,12 +134,10 @@ Public Class sdgDefineAnnualRainfall ucrReceiverSeasonYear.Selector = ucrSelectorSeasonStartProp ucrReceiverSeasonYear.SetParameterIsString() - ucrReceiverSeasonPlantingDay.SetParameter(New RParameter("plant_day_col", 3)) ucrReceiverSeasonPlantingDay.Selector = ucrSelectorSeasonStartProp ucrReceiverSeasonPlantingDay.SetParameterIsString() - ucrReceiverPlantingDayCondition.SetParameter(New RParameter("plant_day_cond_col", 5)) ucrReceiverPlantingDayCondition.Selector = ucrSelectorSeasonStartProp ucrReceiverPlantingDayCondition.SetParameterIsString() @@ -178,7 +188,6 @@ Public Class sdgDefineAnnualRainfall ucrReceiverMonthMonthly.Selector = ucrSelecetorMonthlyTemp ucrReceiverMonthMonthly.SetParameterIsString() - ucrReceiverMeanminMontly.SetParameter(New RParameter("mean_tmin_col", 4)) ucrReceiverMeanminMontly.Selector = ucrSelecetorMonthlyTemp ucrReceiverMeanminMontly.SetParameterIsString() @@ -230,6 +239,9 @@ Public Class sdgDefineAnnualRainfall ucrReceiverStation.SetRCode(clsReforMattAnnualSummariesFunction, bReset) ucrReceiverYear.SetRCode(clsReforMattAnnualSummariesFunction, bReset) ucrSelectorDefineAnnualRain.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverStartRainStatus.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverEndRainStatus.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverEndSeasonStatus.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverStationCrop.SetRCode(clsReformatCropSuccessFunction, bReset) ucrReceiverTotalRain.SetRCode(clsReformatCropSuccessFunction, bReset) @@ -274,8 +286,17 @@ Public Class sdgDefineAnnualRainfall ucrReceiverEndSeasonDate.IsEmpty AndAlso ucrReceiverEndSeasonDOY.IsEmpty AndAlso ucrReceiverRainDaysSeason.IsEmpty AndAlso ucrReceiverRainDaysYear.IsEmpty AndAlso ucrReceiverStartRainDate.IsEmpty AndAlso ucrReceiverStartRainDOY.IsEmpty AndAlso ucrReceiverStation.IsEmpty AndAlso ucrReceiverYear.IsEmpty) Then clsExportRinstatToBucketFunction.AddParameter("annual_rainfall_data", clsRFunctionParameter:=clsReforMattAnnualSummariesFunction, iPosition:=1) + clsExportRinstatToBucketFunction.AddParameter("start_rains", "start_rains_column", iPosition:=2, bIncludeArgumentName:=False) + clsExportRinstatToBucketFunction.AddParameter("end_rains", "end_rains_column", iPosition:=3, bIncludeArgumentName:=False) + clsExportRinstatToBucketFunction.AddParameter("end_season_rains", "end_season_column", iPosition:=4, bIncludeArgumentName:=False) + clsExportRinstatToBucketFunction.AddParameter("seasonal_rains", "seasonal_length_column", iPosition:=5, bIncludeArgumentName:=False) + Else clsExportRinstatToBucketFunction.RemoveParameterByName("annual_rainfall_data") + clsExportRinstatToBucketFunction.RemoveParameterByName("start_rains") + clsExportRinstatToBucketFunction.RemoveParameterByName("end_rains") + clsExportRinstatToBucketFunction.RemoveParameterByName("end_season_rains") + clsExportRinstatToBucketFunction.RemoveParameterByName("seasonal_rains") End If End Sub @@ -283,7 +304,7 @@ Public Class sdgDefineAnnualRainfall ucrReceiverPropSuccess.ControlValueChanged If Not (ucrReceiverStationCrop.IsEmpty AndAlso ucrReceiverTotalRain.IsEmpty AndAlso ucrReceiverPlantingDay.IsEmpty AndAlso ucrReceiverPlantingLenghth.IsEmpty AndAlso ucrReceiverPropSuccess.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("crop_success_data", clsRFunctionParameter:=clsReformatCropSuccessFunction, iPosition:=2) + clsExportRinstatToBucketFunction.AddParameter("crop_success_data", clsRFunctionParameter:=clsReformatCropSuccessFunction, iPosition:=6) Else clsExportRinstatToBucketFunction.RemoveParameterByName("crop_success_data") End If @@ -292,7 +313,7 @@ Public Class sdgDefineAnnualRainfall Private Sub ucrReceiverSeasonStationProb_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSeasonStationProb.ControlValueChanged, ucrReceiverSeasonPlantingDay.ControlValueChanged, ucrReceiverPlantingDayCondition.ControlValueChanged, ucrReceiverSeasonYear.ControlValueChanged If Not (ucrReceiverSeasonStationProb.IsEmpty AndAlso ucrReceiverSeasonPlantingDay.IsEmpty AndAlso ucrReceiverPlantingDayCondition.IsEmpty AndAlso ucrReceiverSeasonYear.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("season_start_data", clsRFunctionParameter:=clsReformatSeasonStartFunction, iPosition:=3) + clsExportRinstatToBucketFunction.AddParameter("season_start_data", clsRFunctionParameter:=clsReformatSeasonStartFunction, iPosition:=7) Else clsExportRinstatToBucketFunction.RemoveParameterByName("season_start_data") End If @@ -301,16 +322,27 @@ Public Class sdgDefineAnnualRainfall Private Sub ucrReceiverAnnualTempStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAnnualTempStation.ControlValueChanged, ucrReceiverAnnualTempYr.ControlValueChanged, ucrReceiverMaxMaxAnnual.ControlValueChanged, ucrReceiverMaxMinAnnual.ControlValueChanged, ucrReceiverMeanAnnual.ControlValueChanged, ucrReceiverMeanMaxAnnual.ControlValueChanged, ucrReceiverMinMaxAnnual.ControlValueChanged, ucrReceiverMinMinAnnual.ControlValueChanged If Not (ucrReceiverAnnualTempStation.IsEmpty AndAlso ucrReceiverAnnualTempYr.IsEmpty AndAlso ucrReceiverMaxMaxAnnual.IsEmpty AndAlso ucrReceiverMaxMinAnnual.IsEmpty AndAlso ucrReceiverMeanAnnual.IsEmpty AndAlso ucrReceiverMeanMaxAnnual.IsEmpty AndAlso ucrReceiverMinMaxAnnual.IsEmpty AndAlso ucrReceiverMinMinAnnual.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("annual_temperature_data", clsRFunctionParameter:=clsReformatTempSummariesFunction, iPosition:=4) + clsExportRinstatToBucketFunction.AddParameter("annual_temperature_data", clsRFunctionParameter:=clsReformatTempSummariesFunction, iPosition:=8) + clsExportRinstatToBucketFunction.AddParameter("min_tmax", "min_tmax_column", iPosition:=9, bIncludeArgumentName:=False) + clsExportRinstatToBucketFunction.AddParameter("min_tmax_col", "max_tmax_column", iPosition:=10, bIncludeArgumentName:=False) + clsExportRinstatToBucketFunction.AddParameter("mean_tmax", "mean_tmax_column", iPosition:=11, bIncludeArgumentName:=False) + clsExportRinstatToBucketFunction.AddParameter("min_tmin", "min_tmin_column", iPosition:=12, bIncludeArgumentName:=False) + clsExportRinstatToBucketFunction.AddParameter("min_tmin_col", "max_tmin_column", iPosition:=13, bIncludeArgumentName:=False) + clsExportRinstatToBucketFunction.AddParameter("mean_tmin", "mean_tmin_column", iPosition:=14, bIncludeArgumentName:=False) Else - clsExportRinstatToBucketFunction.RemoveParameterByName("annual_temperature_data") + clsExportRinstatToBucketFunction.RemoveParameterByName("min_tmax") + clsExportRinstatToBucketFunction.RemoveParameterByName("min_tmax_col") + clsExportRinstatToBucketFunction.RemoveParameterByName("mean_tmax") + clsExportRinstatToBucketFunction.RemoveParameterByName("min_tmin") + clsExportRinstatToBucketFunction.RemoveParameterByName("min_tmin_col") + clsExportRinstatToBucketFunction.RemoveParameterByName("mean_tmin") End If End Sub Private Sub ucrReceiverMonthlyTemp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthlyTemp.ControlValueChanged, ucrReceiverYearMonthly.ControlValueChanged, ucrReceiverMonthMonthly.ControlValueChanged, ucrReceiverMeanmaxMonthly.ControlValueChanged, ucrReceiverMeanminMontly.ControlValueChanged, ucrReceiverMinMaxMonthly.ControlValueChanged, ucrReceiverMinMinMonthly.ControlValueChanged, ucrReceiverMaxMinMonthly.ControlValueChanged, ucrReceiverMaxMaxMonthly.ControlValueChanged If Not (ucrReceiverMonthlyTemp.IsEmpty AndAlso ucrReceiverYearMonthly.IsEmpty AndAlso ucrReceiverMonthMonthly.IsEmpty AndAlso ucrReceiverMeanmaxMonthly.IsEmpty AndAlso ucrReceiverMeanminMontly.IsEmpty AndAlso ucrReceiverMinMaxMonthly.IsEmpty AndAlso ucrReceiverMinMinMonthly.IsEmpty AndAlso ucrReceiverMaxMinMonthly.IsEmpty AndAlso ucrReceiverMaxMaxMonthly.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("monthly_temperature_data", clsRFunctionParameter:=clsReformatMonthlyTempSummaries, iPosition:=5) + clsExportRinstatToBucketFunction.AddParameter("monthly_temperature_data", clsRFunctionParameter:=clsReformatMonthlyTempSummaries, iPosition:=15) Else clsExportRinstatToBucketFunction.RemoveParameterByName("monthly_temperature_data") End If diff --git a/instat/sdgPrincipalComponentAnalysis.Designer.vb b/instat/sdgPrincipalComponentAnalysis.Designer.vb index b3292d06607..8a3919b5d30 100644 --- a/instat/sdgPrincipalComponentAnalysis.Designer.vb +++ b/instat/sdgPrincipalComponentAnalysis.Designer.vb @@ -38,9 +38,6 @@ Partial Class sdgPrincipalComponentAnalysis Private Sub InitializeComponent() Me.tbRegOptions = New System.Windows.Forms.TabControl() - Me.tbDisplay = New System.Windows.Forms.TabPage() - Me.ucrChkEigenvectors = New instat.ucrCheck() - Me.ucrChkEigenvalues = New instat.ucrCheck() Me.tbGraphics = New System.Windows.Forms.TabPage() Me.rdoBarPlot = New System.Windows.Forms.RadioButton() Me.rdoIndividualsPlot = New System.Windows.Forms.RadioButton() @@ -80,7 +77,6 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrSaveGraph = New instat.ucrSave() Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() Me.tbRegOptions.SuspendLayout() - Me.tbDisplay.SuspendLayout() Me.tbGraphics.SuspendLayout() Me.grpScree.SuspendLayout() Me.grpVariablePlot.SuspendLayout() @@ -91,46 +87,15 @@ Partial Class sdgPrincipalComponentAnalysis ' 'tbRegOptions ' - Me.tbRegOptions.Controls.Add(Me.tbDisplay) Me.tbRegOptions.Controls.Add(Me.tbGraphics) Me.tbRegOptions.Controls.Add(Me.tbSave) - Me.tbRegOptions.Location = New System.Drawing.Point(6, 7) + Me.tbRegOptions.Location = New System.Drawing.Point(9, 10) + Me.tbRegOptions.Margin = New System.Windows.Forms.Padding(4) Me.tbRegOptions.Name = "tbRegOptions" Me.tbRegOptions.SelectedIndex = 0 - Me.tbRegOptions.Size = New System.Drawing.Size(411, 372) + Me.tbRegOptions.Size = New System.Drawing.Size(616, 558) Me.tbRegOptions.TabIndex = 0 ' - 'tbDisplay - ' - Me.tbDisplay.Controls.Add(Me.ucrChkEigenvectors) - Me.tbDisplay.Controls.Add(Me.ucrChkEigenvalues) - Me.tbDisplay.Location = New System.Drawing.Point(4, 22) - Me.tbDisplay.Name = "tbDisplay" - Me.tbDisplay.Padding = New System.Windows.Forms.Padding(3) - Me.tbDisplay.Size = New System.Drawing.Size(403, 346) - Me.tbDisplay.TabIndex = 0 - Me.tbDisplay.Tag = "Display" - Me.tbDisplay.Text = "Display" - Me.tbDisplay.UseVisualStyleBackColor = True - ' - 'ucrChkEigenvectors - ' - Me.ucrChkEigenvectors.AutoSize = True - Me.ucrChkEigenvectors.Checked = False - Me.ucrChkEigenvectors.Location = New System.Drawing.Point(10, 40) - Me.ucrChkEigenvectors.Name = "ucrChkEigenvectors" - Me.ucrChkEigenvectors.Size = New System.Drawing.Size(361, 23) - Me.ucrChkEigenvectors.TabIndex = 4 - ' - 'ucrChkEigenvalues - ' - Me.ucrChkEigenvalues.AutoSize = True - Me.ucrChkEigenvalues.Checked = False - Me.ucrChkEigenvalues.Location = New System.Drawing.Point(10, 14) - Me.ucrChkEigenvalues.Name = "ucrChkEigenvalues" - Me.ucrChkEigenvalues.Size = New System.Drawing.Size(361, 23) - Me.ucrChkEigenvalues.TabIndex = 3 - ' 'tbGraphics ' Me.tbGraphics.Controls.Add(Me.rdoBarPlot) @@ -140,10 +105,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.tbGraphics.Controls.Add(Me.rdoVariablesPlot) Me.tbGraphics.Controls.Add(Me.rdoScreePlot) Me.tbGraphics.Controls.Add(Me.ucrPnlGraphics) - Me.tbGraphics.Location = New System.Drawing.Point(4, 22) + Me.tbGraphics.Location = New System.Drawing.Point(4, 29) + Me.tbGraphics.Margin = New System.Windows.Forms.Padding(4) Me.tbGraphics.Name = "tbGraphics" - Me.tbGraphics.Padding = New System.Windows.Forms.Padding(3) - Me.tbGraphics.Size = New System.Drawing.Size(403, 346) + Me.tbGraphics.Padding = New System.Windows.Forms.Padding(4) + Me.tbGraphics.Size = New System.Drawing.Size(608, 525) Me.tbGraphics.TabIndex = 1 Me.tbGraphics.Tag = "Graphics" Me.tbGraphics.Text = "Graphics" @@ -152,9 +118,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBarPlot ' Me.rdoBarPlot.AutoSize = True - Me.rdoBarPlot.Location = New System.Drawing.Point(10, 106) + Me.rdoBarPlot.Location = New System.Drawing.Point(15, 159) + Me.rdoBarPlot.Margin = New System.Windows.Forms.Padding(4) Me.rdoBarPlot.Name = "rdoBarPlot" - Me.rdoBarPlot.Size = New System.Drawing.Size(61, 17) + Me.rdoBarPlot.Size = New System.Drawing.Size(89, 24) Me.rdoBarPlot.TabIndex = 5 Me.rdoBarPlot.Tag = "Bar plot" Me.rdoBarPlot.Text = "Bar plot" @@ -163,9 +130,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoIndividualsPlot ' Me.rdoIndividualsPlot.AutoSize = True - Me.rdoIndividualsPlot.Location = New System.Drawing.Point(10, 60) + Me.rdoIndividualsPlot.Location = New System.Drawing.Point(15, 90) + Me.rdoIndividualsPlot.Margin = New System.Windows.Forms.Padding(4) Me.rdoIndividualsPlot.Name = "rdoIndividualsPlot" - Me.rdoIndividualsPlot.Size = New System.Drawing.Size(96, 17) + Me.rdoIndividualsPlot.Size = New System.Drawing.Size(139, 24) Me.rdoIndividualsPlot.TabIndex = 3 Me.rdoIndividualsPlot.Tag = "Individuals_Plot" Me.rdoIndividualsPlot.Text = "Individuals Plot" @@ -188,9 +156,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.grpScree.Controls.Add(Me.ucrInputLabel2) Me.grpScree.Controls.Add(Me.ucrInputLabel1) Me.grpScree.Controls.Add(Me.ucrSelectorFactor) - Me.grpScree.Location = New System.Drawing.Point(8, 131) + Me.grpScree.Location = New System.Drawing.Point(12, 196) + Me.grpScree.Margin = New System.Windows.Forms.Padding(4) Me.grpScree.Name = "grpScree" - Me.grpScree.Size = New System.Drawing.Size(387, 208) + Me.grpScree.Padding = New System.Windows.Forms.Padding(4) + Me.grpScree.Size = New System.Drawing.Size(580, 312) Me.grpScree.TabIndex = 0 Me.grpScree.TabStop = False Me.grpScree.Text = "Plot Options" @@ -199,11 +169,11 @@ Partial Class sdgPrincipalComponentAnalysis ' Me.ucrReceiverFactor.AutoSize = True Me.ucrReceiverFactor.frmParent = Nothing - Me.ucrReceiverFactor.Location = New System.Drawing.Point(233, 69) + Me.ucrReceiverFactor.Location = New System.Drawing.Point(350, 104) Me.ucrReceiverFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFactor.Name = "ucrReceiverFactor" Me.ucrReceiverFactor.Selector = Nothing - Me.ucrReceiverFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverFactor.strNcFilePath = "" Me.ucrReceiverFactor.TabIndex = 4 Me.ucrReceiverFactor.ucrSelector = Nothing @@ -211,9 +181,10 @@ Partial Class sdgPrincipalComponentAnalysis 'lblFactorVariable ' Me.lblFactorVariable.AutoSize = True - Me.lblFactorVariable.Location = New System.Drawing.Point(232, 54) + Me.lblFactorVariable.Location = New System.Drawing.Point(348, 81) + Me.lblFactorVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFactorVariable.Name = "lblFactorVariable" - Me.lblFactorVariable.Size = New System.Drawing.Size(81, 13) + Me.lblFactorVariable.Size = New System.Drawing.Size(121, 20) Me.lblFactorVariable.TabIndex = 5 Me.lblFactorVariable.Tag = "Factor_Variable" Me.lblFactorVariable.Text = "Factor Variable:" @@ -224,9 +195,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.grpVariablePlot.Controls.Add(Me.rdoArrow) Me.grpVariablePlot.Controls.Add(Me.rdoBothVariables) Me.grpVariablePlot.Controls.Add(Me.ucrPnlVariablesPlot) - Me.grpVariablePlot.Location = New System.Drawing.Point(6, 19) + Me.grpVariablePlot.Location = New System.Drawing.Point(9, 28) + Me.grpVariablePlot.Margin = New System.Windows.Forms.Padding(4) Me.grpVariablePlot.Name = "grpVariablePlot" - Me.grpVariablePlot.Size = New System.Drawing.Size(138, 93) + Me.grpVariablePlot.Padding = New System.Windows.Forms.Padding(4) + Me.grpVariablePlot.Size = New System.Drawing.Size(207, 140) Me.grpVariablePlot.TabIndex = 2 Me.grpVariablePlot.TabStop = False Me.grpVariablePlot.Text = "Geom" @@ -234,9 +207,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoTextVariables ' Me.rdoTextVariables.AutoSize = True - Me.rdoTextVariables.Location = New System.Drawing.Point(14, 42) + Me.rdoTextVariables.Location = New System.Drawing.Point(21, 63) + Me.rdoTextVariables.Margin = New System.Windows.Forms.Padding(4) Me.rdoTextVariables.Name = "rdoTextVariables" - Me.rdoTextVariables.Size = New System.Drawing.Size(46, 17) + Me.rdoTextVariables.Size = New System.Drawing.Size(64, 24) Me.rdoTextVariables.TabIndex = 2 Me.rdoTextVariables.TabStop = True Me.rdoTextVariables.Text = "Text" @@ -245,9 +219,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoArrow ' Me.rdoArrow.AutoSize = True - Me.rdoArrow.Location = New System.Drawing.Point(14, 19) + Me.rdoArrow.Location = New System.Drawing.Point(21, 28) + Me.rdoArrow.Margin = New System.Windows.Forms.Padding(4) Me.rdoArrow.Name = "rdoArrow" - Me.rdoArrow.Size = New System.Drawing.Size(52, 17) + Me.rdoArrow.Size = New System.Drawing.Size(75, 24) Me.rdoArrow.TabIndex = 1 Me.rdoArrow.TabStop = True Me.rdoArrow.Text = "Arrow" @@ -256,9 +231,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBothVariables ' Me.rdoBothVariables.AutoSize = True - Me.rdoBothVariables.Location = New System.Drawing.Point(14, 65) + Me.rdoBothVariables.Location = New System.Drawing.Point(21, 98) + Me.rdoBothVariables.Margin = New System.Windows.Forms.Padding(4) Me.rdoBothVariables.Name = "rdoBothVariables" - Me.rdoBothVariables.Size = New System.Drawing.Size(47, 17) + Me.rdoBothVariables.Size = New System.Drawing.Size(68, 24) Me.rdoBothVariables.TabIndex = 3 Me.rdoBothVariables.TabStop = True Me.rdoBothVariables.Text = "Both" @@ -267,17 +243,19 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrPnlVariablesPlot ' Me.ucrPnlVariablesPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlVariablesPlot.Location = New System.Drawing.Point(7, 17) + Me.ucrPnlVariablesPlot.Location = New System.Drawing.Point(10, 26) + Me.ucrPnlVariablesPlot.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlVariablesPlot.Name = "ucrPnlVariablesPlot" - Me.ucrPnlVariablesPlot.Size = New System.Drawing.Size(103, 70) + Me.ucrPnlVariablesPlot.Size = New System.Drawing.Size(154, 105) Me.ucrPnlVariablesPlot.TabIndex = 0 ' 'lblLabel ' Me.lblLabel.AutoSize = True - Me.lblLabel.Location = New System.Drawing.Point(6, 154) + Me.lblLabel.Location = New System.Drawing.Point(9, 231) + Me.lblLabel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblLabel.Name = "lblLabel" - Me.lblLabel.Size = New System.Drawing.Size(36, 13) + Me.lblLabel.Size = New System.Drawing.Size(52, 20) Me.lblLabel.TabIndex = 13 Me.lblLabel.Text = "Label:" ' @@ -287,9 +265,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.GrpIndividualPlot.Controls.Add(Me.rdoPoint) Me.GrpIndividualPlot.Controls.Add(Me.rdoBothIndividual) Me.GrpIndividualPlot.Controls.Add(Me.ucrPnlIndividualPlot) - Me.GrpIndividualPlot.Location = New System.Drawing.Point(6, 19) + Me.GrpIndividualPlot.Location = New System.Drawing.Point(9, 28) + Me.GrpIndividualPlot.Margin = New System.Windows.Forms.Padding(4) Me.GrpIndividualPlot.Name = "GrpIndividualPlot" - Me.GrpIndividualPlot.Size = New System.Drawing.Size(138, 93) + Me.GrpIndividualPlot.Padding = New System.Windows.Forms.Padding(4) + Me.GrpIndividualPlot.Size = New System.Drawing.Size(207, 140) Me.GrpIndividualPlot.TabIndex = 1 Me.GrpIndividualPlot.TabStop = False Me.GrpIndividualPlot.Text = "Geom" @@ -297,9 +277,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoTextIndividual ' Me.rdoTextIndividual.AutoSize = True - Me.rdoTextIndividual.Location = New System.Drawing.Point(14, 42) + Me.rdoTextIndividual.Location = New System.Drawing.Point(21, 63) + Me.rdoTextIndividual.Margin = New System.Windows.Forms.Padding(4) Me.rdoTextIndividual.Name = "rdoTextIndividual" - Me.rdoTextIndividual.Size = New System.Drawing.Size(46, 17) + Me.rdoTextIndividual.Size = New System.Drawing.Size(64, 24) Me.rdoTextIndividual.TabIndex = 2 Me.rdoTextIndividual.TabStop = True Me.rdoTextIndividual.Text = "Text" @@ -308,9 +289,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoPoint ' Me.rdoPoint.AutoSize = True - Me.rdoPoint.Location = New System.Drawing.Point(14, 19) + Me.rdoPoint.Location = New System.Drawing.Point(21, 28) + Me.rdoPoint.Margin = New System.Windows.Forms.Padding(4) Me.rdoPoint.Name = "rdoPoint" - Me.rdoPoint.Size = New System.Drawing.Size(49, 17) + Me.rdoPoint.Size = New System.Drawing.Size(70, 24) Me.rdoPoint.TabIndex = 1 Me.rdoPoint.TabStop = True Me.rdoPoint.Text = "Point" @@ -319,9 +301,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBothIndividual ' Me.rdoBothIndividual.AutoSize = True - Me.rdoBothIndividual.Location = New System.Drawing.Point(14, 65) + Me.rdoBothIndividual.Location = New System.Drawing.Point(21, 98) + Me.rdoBothIndividual.Margin = New System.Windows.Forms.Padding(4) Me.rdoBothIndividual.Name = "rdoBothIndividual" - Me.rdoBothIndividual.Size = New System.Drawing.Size(47, 17) + Me.rdoBothIndividual.Size = New System.Drawing.Size(68, 24) Me.rdoBothIndividual.TabIndex = 3 Me.rdoBothIndividual.TabStop = True Me.rdoBothIndividual.Text = "Both" @@ -330,17 +313,19 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrPnlIndividualPlot ' Me.ucrPnlIndividualPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlIndividualPlot.Location = New System.Drawing.Point(9, 18) + Me.ucrPnlIndividualPlot.Location = New System.Drawing.Point(14, 27) + Me.ucrPnlIndividualPlot.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlIndividualPlot.Name = "ucrPnlIndividualPlot" - Me.ucrPnlIndividualPlot.Size = New System.Drawing.Size(88, 69) + Me.ucrPnlIndividualPlot.Size = New System.Drawing.Size(132, 104) Me.ucrPnlIndividualPlot.TabIndex = 0 ' 'lblChoice ' Me.lblChoice.AutoSize = True - Me.lblChoice.Location = New System.Drawing.Point(6, 154) + Me.lblChoice.Location = New System.Drawing.Point(9, 231) + Me.lblChoice.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblChoice.Name = "lblChoice" - Me.lblChoice.Size = New System.Drawing.Size(43, 13) + Me.lblChoice.Size = New System.Drawing.Size(62, 20) Me.lblChoice.TabIndex = 11 Me.lblChoice.Text = "Choice:" ' @@ -348,9 +333,10 @@ Partial Class sdgPrincipalComponentAnalysis ' Me.ucrChkIncludePercentage.AutoSize = True Me.ucrChkIncludePercentage.Checked = False - Me.ucrChkIncludePercentage.Location = New System.Drawing.Point(6, 122) + Me.ucrChkIncludePercentage.Location = New System.Drawing.Point(9, 183) + Me.ucrChkIncludePercentage.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkIncludePercentage.Name = "ucrChkIncludePercentage" - Me.ucrChkIncludePercentage.Size = New System.Drawing.Size(158, 23) + Me.ucrChkIncludePercentage.Size = New System.Drawing.Size(237, 34) Me.ucrChkIncludePercentage.TabIndex = 6 ' 'ucrNudDim2 @@ -358,11 +344,12 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrNudDim2.AutoSize = True Me.ucrNudDim2.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDim2.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDim2.Location = New System.Drawing.Point(235, 122) + Me.ucrNudDim2.Location = New System.Drawing.Point(352, 183) + Me.ucrNudDim2.Margin = New System.Windows.Forms.Padding(9) Me.ucrNudDim2.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudDim2.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDim2.Name = "ucrNudDim2" - Me.ucrNudDim2.Size = New System.Drawing.Size(50, 20) + Me.ucrNudDim2.Size = New System.Drawing.Size(75, 30) Me.ucrNudDim2.TabIndex = 10 Me.ucrNudDim2.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -371,11 +358,12 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrNudDim1.AutoSize = True Me.ucrNudDim1.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDim1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDim1.Location = New System.Drawing.Point(170, 122) + Me.ucrNudDim1.Location = New System.Drawing.Point(255, 183) + Me.ucrNudDim1.Margin = New System.Windows.Forms.Padding(9) Me.ucrNudDim1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudDim1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDim1.Name = "ucrNudDim1" - Me.ucrNudDim1.Size = New System.Drawing.Size(50, 20) + Me.ucrNudDim1.Size = New System.Drawing.Size(75, 30) Me.ucrNudDim1.TabIndex = 8 Me.ucrNudDim1.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -385,9 +373,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.grpGeom.Controls.Add(Me.rdoLine) Me.grpGeom.Controls.Add(Me.rdoBothScree) Me.grpGeom.Controls.Add(Me.ucrPnlScreePlot) - Me.grpGeom.Location = New System.Drawing.Point(6, 19) + Me.grpGeom.Location = New System.Drawing.Point(9, 28) + Me.grpGeom.Margin = New System.Windows.Forms.Padding(4) Me.grpGeom.Name = "grpGeom" - Me.grpGeom.Size = New System.Drawing.Size(138, 93) + Me.grpGeom.Padding = New System.Windows.Forms.Padding(4) + Me.grpGeom.Size = New System.Drawing.Size(207, 140) Me.grpGeom.TabIndex = 0 Me.grpGeom.TabStop = False Me.grpGeom.Tag = "Geom" @@ -396,9 +386,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBar ' Me.rdoBar.AutoSize = True - Me.rdoBar.Location = New System.Drawing.Point(14, 19) + Me.rdoBar.Location = New System.Drawing.Point(21, 28) + Me.rdoBar.Margin = New System.Windows.Forms.Padding(4) Me.rdoBar.Name = "rdoBar" - Me.rdoBar.Size = New System.Drawing.Size(41, 17) + Me.rdoBar.Size = New System.Drawing.Size(59, 24) Me.rdoBar.TabIndex = 1 Me.rdoBar.TabStop = True Me.rdoBar.Text = "Bar" @@ -407,9 +398,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoLine ' Me.rdoLine.AutoSize = True - Me.rdoLine.Location = New System.Drawing.Point(14, 42) + Me.rdoLine.Location = New System.Drawing.Point(21, 63) + Me.rdoLine.Margin = New System.Windows.Forms.Padding(4) Me.rdoLine.Name = "rdoLine" - Me.rdoLine.Size = New System.Drawing.Size(45, 17) + Me.rdoLine.Size = New System.Drawing.Size(64, 24) Me.rdoLine.TabIndex = 2 Me.rdoLine.TabStop = True Me.rdoLine.Text = "Line" @@ -418,9 +410,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBothScree ' Me.rdoBothScree.AutoSize = True - Me.rdoBothScree.Location = New System.Drawing.Point(14, 65) + Me.rdoBothScree.Location = New System.Drawing.Point(21, 98) + Me.rdoBothScree.Margin = New System.Windows.Forms.Padding(4) Me.rdoBothScree.Name = "rdoBothScree" - Me.rdoBothScree.Size = New System.Drawing.Size(47, 17) + Me.rdoBothScree.Size = New System.Drawing.Size(68, 24) Me.rdoBothScree.TabIndex = 3 Me.rdoBothScree.TabStop = True Me.rdoBothScree.Text = "Both" @@ -429,26 +422,29 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrPnlScreePlot ' Me.ucrPnlScreePlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlScreePlot.Location = New System.Drawing.Point(6, 19) + Me.ucrPnlScreePlot.Location = New System.Drawing.Point(9, 28) + Me.ucrPnlScreePlot.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlScreePlot.Name = "ucrPnlScreePlot" - Me.ucrPnlScreePlot.Size = New System.Drawing.Size(84, 63) + Me.ucrPnlScreePlot.Size = New System.Drawing.Size(126, 94) Me.ucrPnlScreePlot.TabIndex = 0 ' 'lblChoiceScree ' Me.lblChoiceScree.AutoSize = True - Me.lblChoiceScree.Location = New System.Drawing.Point(13, 129) + Me.lblChoiceScree.Location = New System.Drawing.Point(20, 194) + Me.lblChoiceScree.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblChoiceScree.Name = "lblChoiceScree" - Me.lblChoiceScree.Size = New System.Drawing.Size(0, 13) + Me.lblChoiceScree.Size = New System.Drawing.Size(0, 20) Me.lblChoiceScree.TabIndex = 8 Me.lblChoiceScree.Tag = "Choice:" ' 'lblDim ' Me.lblDim.AutoSize = True - Me.lblDim.Location = New System.Drawing.Point(6, 125) + Me.lblDim.Location = New System.Drawing.Point(9, 188) + Me.lblDim.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDim.Name = "lblDim" - Me.lblDim.Size = New System.Drawing.Size(97, 13) + Me.lblDim.Size = New System.Drawing.Size(145, 20) Me.lblDim.TabIndex = 7 Me.lblDim.Text = "Dimensions to Plot:" ' @@ -458,9 +454,10 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrInputLabel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLabel2.GetSetSelectedIndex = -1 Me.ucrInputLabel2.IsReadOnly = False - Me.ucrInputLabel2.Location = New System.Drawing.Point(83, 148) + Me.ucrInputLabel2.Location = New System.Drawing.Point(124, 222) + Me.ucrInputLabel2.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputLabel2.Name = "ucrInputLabel2" - Me.ucrInputLabel2.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLabel2.Size = New System.Drawing.Size(206, 32) Me.ucrInputLabel2.TabIndex = 14 ' 'ucrInputLabel1 @@ -469,9 +466,10 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrInputLabel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLabel1.GetSetSelectedIndex = -1 Me.ucrInputLabel1.IsReadOnly = False - Me.ucrInputLabel1.Location = New System.Drawing.Point(83, 148) + Me.ucrInputLabel1.Location = New System.Drawing.Point(124, 222) + Me.ucrInputLabel1.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputLabel1.Name = "ucrInputLabel1" - Me.ucrInputLabel1.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLabel1.Size = New System.Drawing.Size(206, 32) Me.ucrInputLabel1.TabIndex = 12 ' 'ucrSelectorFactor @@ -480,18 +478,19 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrSelectorFactor.bDropUnusedFilterLevels = False Me.ucrSelectorFactor.bShowHiddenColumns = False Me.ucrSelectorFactor.bUseCurrentFilter = True - Me.ucrSelectorFactor.Location = New System.Drawing.Point(5, 19) + Me.ucrSelectorFactor.Location = New System.Drawing.Point(8, 28) Me.ucrSelectorFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorFactor.Name = "ucrSelectorFactor" - Me.ucrSelectorFactor.Size = New System.Drawing.Size(224, 183) + Me.ucrSelectorFactor.Size = New System.Drawing.Size(480, 411) Me.ucrSelectorFactor.TabIndex = 3 ' 'rdoBiplot ' Me.rdoBiplot.AutoSize = True - Me.rdoBiplot.Location = New System.Drawing.Point(10, 83) + Me.rdoBiplot.Location = New System.Drawing.Point(15, 124) + Me.rdoBiplot.Margin = New System.Windows.Forms.Padding(4) Me.rdoBiplot.Name = "rdoBiplot" - Me.rdoBiplot.Size = New System.Drawing.Size(51, 17) + Me.rdoBiplot.Size = New System.Drawing.Size(74, 24) Me.rdoBiplot.TabIndex = 4 Me.rdoBiplot.Tag = "Biplot" Me.rdoBiplot.Text = "Biplot" @@ -500,9 +499,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoVariablesPlot ' Me.rdoVariablesPlot.AutoSize = True - Me.rdoVariablesPlot.Location = New System.Drawing.Point(10, 37) + Me.rdoVariablesPlot.Location = New System.Drawing.Point(15, 56) + Me.rdoVariablesPlot.Margin = New System.Windows.Forms.Padding(4) Me.rdoVariablesPlot.Name = "rdoVariablesPlot" - Me.rdoVariablesPlot.Size = New System.Drawing.Size(89, 17) + Me.rdoVariablesPlot.Size = New System.Drawing.Size(131, 24) Me.rdoVariablesPlot.TabIndex = 2 Me.rdoVariablesPlot.Tag = "Variables_Plot" Me.rdoVariablesPlot.Text = "Variables Plot" @@ -511,9 +511,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoScreePlot ' Me.rdoScreePlot.AutoSize = True - Me.rdoScreePlot.Location = New System.Drawing.Point(10, 14) + Me.rdoScreePlot.Location = New System.Drawing.Point(15, 21) + Me.rdoScreePlot.Margin = New System.Windows.Forms.Padding(4) Me.rdoScreePlot.Name = "rdoScreePlot" - Me.rdoScreePlot.Size = New System.Drawing.Size(74, 17) + Me.rdoScreePlot.Size = New System.Drawing.Size(107, 24) Me.rdoScreePlot.TabIndex = 1 Me.rdoScreePlot.Tag = "Scree_Plot" Me.rdoScreePlot.Text = "Scree Plot" @@ -522,18 +523,20 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrPnlGraphics ' Me.ucrPnlGraphics.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGraphics.Location = New System.Drawing.Point(6, 14) + Me.ucrPnlGraphics.Location = New System.Drawing.Point(9, 21) + Me.ucrPnlGraphics.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlGraphics.Name = "ucrPnlGraphics" - Me.ucrPnlGraphics.Size = New System.Drawing.Size(389, 120) + Me.ucrPnlGraphics.Size = New System.Drawing.Size(584, 180) Me.ucrPnlGraphics.TabIndex = 0 ' 'tbSave ' Me.tbSave.Controls.Add(Me.ucrSaveGraph) - Me.tbSave.Location = New System.Drawing.Point(4, 22) + Me.tbSave.Location = New System.Drawing.Point(4, 29) + Me.tbSave.Margin = New System.Windows.Forms.Padding(4) Me.tbSave.Name = "tbSave" - Me.tbSave.Padding = New System.Windows.Forms.Padding(3) - Me.tbSave.Size = New System.Drawing.Size(403, 346) + Me.tbSave.Padding = New System.Windows.Forms.Padding(4) + Me.tbSave.Size = New System.Drawing.Size(608, 525) Me.tbSave.TabIndex = 2 Me.tbSave.Tag = "Save" Me.tbSave.Text = "Save" @@ -542,29 +545,31 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrSaveGraph ' Me.ucrSaveGraph.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveGraph.Location = New System.Drawing.Point(5, 11) - Me.ucrSaveGraph.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveGraph.Location = New System.Drawing.Point(8, 16) + Me.ucrSaveGraph.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveGraph.Name = "ucrSaveGraph" - Me.ucrSaveGraph.Size = New System.Drawing.Size(346, 24) + Me.ucrSaveGraph.Size = New System.Drawing.Size(519, 36) Me.ucrSaveGraph.TabIndex = 15 ' 'ucrSdgButtons ' Me.ucrSdgButtons.AutoSize = True - Me.ucrSdgButtons.Location = New System.Drawing.Point(97, 385) + Me.ucrSdgButtons.Location = New System.Drawing.Point(146, 578) + Me.ucrSdgButtons.Margin = New System.Windows.Forms.Padding(6) Me.ucrSdgButtons.Name = "ucrSdgButtons" - Me.ucrSdgButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgButtons.Size = New System.Drawing.Size(336, 45) Me.ucrSdgButtons.TabIndex = 1 ' 'sdgPrincipalComponentAnalysis ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(422, 419) + Me.ClientSize = New System.Drawing.Size(633, 628) Me.Controls.Add(Me.tbRegOptions) Me.Controls.Add(Me.ucrSdgButtons) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgPrincipalComponentAnalysis" @@ -572,8 +577,6 @@ Partial Class sdgPrincipalComponentAnalysis Me.Tag = "PCA_Options" Me.Text = "PCA Options" Me.tbRegOptions.ResumeLayout(False) - Me.tbDisplay.ResumeLayout(False) - Me.tbDisplay.PerformLayout() Me.tbGraphics.ResumeLayout(False) Me.tbGraphics.PerformLayout() Me.grpScree.ResumeLayout(False) @@ -592,7 +595,6 @@ Partial Class sdgPrincipalComponentAnalysis Friend WithEvents ucrSdgButtons As ucrButtonsSubdialogue Friend WithEvents tbRegOptions As TabControl - Friend WithEvents tbDisplay As TabPage Friend WithEvents tbGraphics As TabPage Friend WithEvents tbSave As TabPage Friend WithEvents rdoIndividualsPlot As RadioButton @@ -611,8 +613,6 @@ Partial Class sdgPrincipalComponentAnalysis Friend WithEvents ucrReceiverFactor As ucrReceiverSingle Friend WithEvents grpScree As GroupBox Friend WithEvents ucrInputLabel1 As ucrInputComboBox - Friend WithEvents ucrChkEigenvectors As ucrCheck - Friend WithEvents ucrChkEigenvalues As ucrCheck Friend WithEvents ucrNudDim2 As ucrNud Friend WithEvents ucrNudDim1 As ucrNud Friend WithEvents ucrPnlScreePlot As UcrPanel diff --git a/instat/sdgPrincipalComponentAnalysis.vb b/instat/sdgPrincipalComponentAnalysis.vb index 88ee7a111ef..b69bc650010 100644 --- a/instat/sdgPrincipalComponentAnalysis.vb +++ b/instat/sdgPrincipalComponentAnalysis.vb @@ -16,7 +16,6 @@ Imports instat.Translations Public Class sdgPrincipalComponentAnalysis Private bControlsInitialised As Boolean = False - Private clsREigenValues, clsDummyFunction, clsREigenVectors As New RFunction Public bFirstLoad As Boolean = True ' to do: @@ -35,17 +34,6 @@ Public Class sdgPrincipalComponentAnalysis Dim dctLabelOptionsChoice As New Dictionary(Of String, String) Dim dctOptionsForLabel As New Dictionary(Of String, String) - ucrChkEigenvalues.SetParameter(New RParameter("value1", 2)) - ucrChkEigenvalues.SetText("Eigenvalues") - ucrChkEigenvalues.SetValueIfChecked(Chr(34) & "eig" & Chr(34)) - ucrChkEigenvalues.AddParameterPresentCondition(True, "value1") - ucrChkEigenvalues.AddParameterPresentCondition(False, "value1", False) - - ucrChkEigenvectors.SetParameter(New RParameter("value1", 2)) - ucrChkEigenvectors.SetText("Eigenvectors") - ucrChkEigenvectors.SetValueIfChecked(Chr(34) & "ind" & Chr(34)) - ucrChkEigenvectors.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrNudDim1.SetParameter(New RParameter("first_dim", 0, bNewIncludeArgumentName:=False)) ucrNudDim1.SetMinMax(1, 2) 'temp fix to prevent clearing value @@ -147,14 +135,11 @@ Public Class sdgPrincipalComponentAnalysis rdoBarPlot.Enabled = False End Sub - Public Sub SetRFunction(clsNewRsyntax As RSyntax, clsNewREigenValues As RFunction, clsNewDummyFunction As RFunction, clsNewREigenVectors As RFunction, clsNewRRotation As RFunction, clsNewScreePlotFunction As RFunction, clsNewVariablesPlotFunction As RFunction, clsNewIndividualsPlotFunction As RFunction, clsNewBiplotFunction As RFunction, clsNewBarPlotFunction As RFunction, clsNewVariablesPlotFunctionValue As RFunction, clsNewIndividualsPlotFunctionValue As RFunction, clsNewBiplotFunctionValue As RFunction, clsNewRFactor As RFunction, clsNewBaseOperator As ROperator, clsNewRThemeMinimal As RFunction, Optional bReset As Boolean = False) + Public Sub SetRFunction(clsNewRsyntax As RSyntax, clsNewRRotation As RFunction, clsNewScreePlotFunction As RFunction, clsNewVariablesPlotFunction As RFunction, clsNewIndividualsPlotFunction As RFunction, clsNewBiplotFunction As RFunction, clsNewBarPlotFunction As RFunction, clsNewVariablesPlotFunctionValue As RFunction, clsNewIndividualsPlotFunctionValue As RFunction, clsNewBiplotFunctionValue As RFunction, clsNewRFactor As RFunction, clsNewBaseOperator As ROperator, clsNewRThemeMinimal As RFunction, Optional bReset As Boolean = False) If Not bControlsInitialised Then InitialiseControls() End If clsRsyntax = clsNewRsyntax - clsREigenValues = clsNewREigenValues - clsDummyFunction = clsNewDummyFunction - clsREigenVectors = clsNewREigenVectors clsRScreePlotFunction = clsNewScreePlotFunction clsRVariablesPlotFunction = clsNewVariablesPlotFunction clsRIndividualsPlotFunction = clsNewIndividualsPlotFunction @@ -185,8 +170,6 @@ Public Class sdgPrincipalComponentAnalysis ucrInputLabel2.SetRCode(clsRVariablesPlotFunction, bReset, bCloneIfNeeded:=True) ucrReceiverFactor.SetRCode(clsRFactor, bReset, bCloneIfNeeded:=True) ucrChkIncludePercentage.SetRCode(clsRScreePlotFunction, bReset, bCloneIfNeeded:=True) - ucrChkEigenvalues.SetRCode(clsREigenValues, bReset, bCloneIfNeeded:=True) - ucrChkEigenvectors.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) ucrPnlGraphics.SetRCode(clsBaseOperator, bReset) ucrPnlScreePlot.SetRCode(clsRScreePlotFunction, bReset, bCloneIfNeeded:=True) @@ -199,26 +182,6 @@ Public Class sdgPrincipalComponentAnalysis End If End Sub - Private Sub ucrChkEigenvalues_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkEigenvalues.ControlValueChanged - If ucrChkEigenvalues.Checked Then - clsRsyntax.AddToAfterCodes(clsREigenValues, iPosition:=1) - Else - clsRsyntax.RemoveFromAfterCodes(clsREigenValues) - End If - End Sub - - Private Sub ucrChkEigenvectors_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkEigenvectors.ControlValueChanged - If ucrChkEigenvectors.Checked Then - clsRsyntax.AddToAfterCodes(clsREigenVectors, iPosition:=2) - clsDummyFunction.AddParameter("value1", "TRUE", iPosition:=1) - - Else - clsDummyFunction.AddParameter("value1", "FALSE", iPosition:=1) - clsRsyntax.RemoveFromAfterCodes(clsREigenVectors) - - End If - End Sub - 'This is here because when you reopen the subdialog the groupboxes are not visible.Don't know why linking isn't working on reopen. Private Sub Visibility() If rdoScreePlot.Checked Then diff --git a/instat/sdgSaveColumnPosition.Designer.vb b/instat/sdgSaveColumnPosition.Designer.vb index 8d4d1004c0d..47dcc8a061f 100644 --- a/instat/sdgSaveColumnPosition.Designer.vb +++ b/instat/sdgSaveColumnPosition.Designer.vb @@ -175,7 +175,7 @@ Partial Class sdgSaveColumnPosition Me.MinimizeBox = False Me.Name = "sdgSaveColumnPosition" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Save Column Position" + Me.Text = "Column Position" Me.grpColumnPosition.ResumeLayout(False) Me.grpColumnPosition.PerformLayout() Me.ResumeLayout(False) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index bd9af123a80..5de19edc94f 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), keys = list(), comments = list(), keep_attributes = TRUE) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE) { # Set up the data object self$set_data(data, messages) @@ -28,6 +28,7 @@ DataSheet <- R6::R6Class("DataSheet", #self$update_variables_metadata() self$set_objects(objects) self$set_calculations(calculations) + self$set_scalars(scalars) self$set_keys(keys) self$set_comments(comments) @@ -60,6 +61,7 @@ DataSheet <- R6::R6Class("DataSheet", keys = list(), comments = list(), calculations = list(), + scalars = list(), changes = list(), .current_filter = list(), .current_column_selection = list(), @@ -232,6 +234,13 @@ DataSheet$set("public", "set_calculations", function(new_calculations) { } ) +DataSheet$set("public", "set_scalars", function(new_scalars) { + if(!is.list(new_scalars)) stop("scalars must be of type: list") + self$append_to_changes(list(Set_property, "scalars")) + private$scalars <- new_scalars +} +) + DataSheet$set("public", "set_keys", function(new_keys) { if(!is.list(new_keys)) stop("new_keys must be of type: list") self$append_to_changes(list(Set_property, "keys")) @@ -622,6 +631,39 @@ DataSheet$set("public", "get_calculation_names", function(as_list = FALSE, exclu } ) +DataSheet$set("public", "get_scalars", function() { + out <- + private$scalars[self$get_scalar_names()] + return(out) +} +) + +DataSheet$set("public", "get_scalar_names", function(as_list = FALSE, excluded_items = c(),...) { + out <- get_data_book_scalar_names(scalar_list = private$scalars, + as_list = as_list, + list_label= self$get_metadata(data_name_label) ) + return(out) +} +) + +DataSheet$set("public", "get_scalar_value", function(scalar_name) { + if(missing(scalar_name)) stop(stop("scalar_name must be specified.")) + return(private$scalars[[scalar_name]]) +} +) + +DataSheet$set("public", "add_scalar", function(scalar_name = "", scalar_value) { + if(missing(scalar_name)) scalar_name <- next_default_item("scalar", names(private$scalars)) + if(scalar_name %in% names(private$scalars)) warning("A scalar called", scalar_name, "already exists. It will be replaced.") + private$scalars[[scalar_name]] <- scalar_value + self$append_to_metadata(scalar, private$scalars) + self$append_to_changes(list(Added_scalar, scalar_name)) + cat(paste("Scalar name: ", scalar_name), + paste("Value: ", private$scalars[[scalar_name]]), + sep = "\n") +} +) + DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, use_col_name_as_prefix = FALSE, hidden = FALSE, before, adjacent_column = "", num_cols, require_correct_length = TRUE, keep_existing_position = TRUE) { # Column name must be character if(!is.character(col_name)) stop("Column name must be of type: character") @@ -2175,11 +2217,12 @@ DataSheet$set("public", "get_object", function(object_name) { ) DataSheet$set("public", "rename_object", function(object_name, new_name, object_type = "object") { - if(!object_type %in% c("object", "filter", "calculation", "graph", "table","model","structure","summary", "column_selection")) stop(object_type, " must be either object (graph, table or model), filter, column_selection or a calculation.") + if(!object_type %in% c("object", "filter", "calculation", "graph", "table","model","structure","summary", "column_selection", "scalar")) stop(object_type, " must be either object (graph, table or model), filter, column selection, calculation or scalar.") + #Temp fix:: added graph, table and model so as to distinguish this when implementing it in the dialog. Otherwise they remain as objects if (object_type %in% c("object", "graph", "table","model","structure","summary")){ - + if(!object_name %in% names(private$objects)) stop(object_name, " not found in objects list") if(new_name %in% names(private$objects)) stop(new_name, " is already an object name. Cannot rename ", object_name, " to ", new_name) names(private$objects)[names(private$objects) == object_name] <- new_name @@ -2202,31 +2245,41 @@ DataSheet$set("public", "rename_object", function(object_name, new_name, object_ if(".everything" == object_name) stop("Renaming .everything is not allowed.") names(private$column_selections)[names(private$column_selections) == object_name] <- new_name if(private$.current_column_selection$name == object_name){private$.current_column_selection$name <- new_name} - } + } else if (object_type == "scalar") { + if(!object_name %in% names(private$scalars)) stop(object_name, " not found in calculations list") + if(new_name %in% names(private$scalars)) stop(new_name, " is already a calculation name. Cannot rename ", object_name, " to ", new_name) + names(private$scalars)[names(private$scalars) == object_name] <- new_name + self$append_to_metadata(scalar, private$scalars) + } } ) DataSheet$set("public", "delete_objects", function(data_name, object_names, object_type = "object") { - if(!object_type %in% c("object", "graph", "table","model","structure","summary","filter", "calculation", "column_selection")) stop(object_type, " must be either object (graph, table or model), filter, column selection or a calculation.") + if(!object_type %in% c("object", "graph", "table","model","structure","summary","filter", "calculation", "column_selection", "scalar")) stop(object_type, " must be either object (graph, table or model), filter, column selection, calculation or scala.") + if(any(object_type %in% c("object", "graph", "table","model","structure","summary"))){ - - if(!all(object_names %in% names(private$objects))) stop("Not all object_names found in overall objects list.") - private$objects[names(private$objects) %in% object_names] <- NULL - }else if(object_type == "filter"){ - if(!all(object_names %in% names(private$filters))) stop(object_names, " not found in filters list.") - if("no_filter" %in% object_names) stop("no_filter cannot be deleted.") - if(any(private$.current_filter$name %in% object_names))stop(private$.current_filter$name, " is currently in use and cannot be deleted.") - private$filters[names(private$filters) %in% object_names] <- NULL - }else if(object_type == "calculation"){ - if(!object_names %in% names(private$calculations)) stop(object_names, " not found in calculations list.") - private$calculations[names(private$calculations) %in% object_names] <- NULL - }else if(object_type == "column_selection"){ - if(!all(object_names %in% names(private$column_selections))) stop(object_names, " not found in column selections list.") - if(".everything" %in% object_names) stop(".everything cannot be deleted.") - if(any(private$.current_column_selection$name %in% object_names))stop(private$.current_column_selection$name, " is currently in use and cannot be deleted.") - private$column_selections[names(private$column_selections) %in% object_names] <- NULL - } + + if(!all(object_names %in% names(private$objects))) stop("Not all object_names found in overall objects list.") + private$objects[names(private$objects) %in% object_names] <- NULL + }else if(object_type == "filter"){ + if(!all(object_names %in% names(private$filters))) stop(object_names, " not found in filters list.") + if("no_filter" %in% object_names) stop("no_filter cannot be deleted.") + if(any(private$.current_filter$name %in% object_names))stop(private$.current_filter$name, " is currently in use and cannot be deleted.") + private$filters[names(private$filters) %in% object_names] <- NULL + }else if(object_type == "calculation"){ + if(!object_names %in% names(private$calculations)) stop(object_names, " not found in calculations list.") + private$calculations[names(private$calculations) %in% object_names] <- NULL + }else if(object_type == "scalar"){ + if(!object_names %in% names(private$scalars)) stop(object_names, " not found in scalars list.") + private$scalars[names(private$scalars) %in% object_names] <- NULL + self$append_to_metadata(scalar, private$scalars) + }else if(object_type == "column_selection"){ + if(!all(object_names %in% names(private$column_selections))) stop(object_names, " not found in column selections list.") + if(".everything" %in% object_names) stop(".everything cannot be deleted.") + if(any(private$.current_column_selection$name %in% object_names))stop(private$.current_column_selection$name, " is currently in use and cannot be deleted.") + private$column_selections[names(private$column_selections) %in% object_names] <- NULL + } if(!is.null(private$.last_graph) && length(private$.last_graph) == 2 && private$.last_graph[1] == data_name && private$.last_graph[2] %in% object_names) { private$.last_graph <- NULL } diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index a8110495aad..29363b88365 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -10,6 +10,7 @@ DataBook <- R6::R6Class("DataBook", { self$set_meta(instat_obj_metadata) self$set_objects(list()) + self$set_scalars(list()) if (missing(data_tables) || length(data_tables) == 0) { self$set_data_objects(list()) @@ -29,6 +30,7 @@ DataBook <- R6::R6Class("DataBook", .data_sheets = list(), .metadata = list(), .objects = list(), + .scalars = list(), .links = list(), .data_sheets_changed = FALSE, .database_connection = NULL, @@ -229,13 +231,15 @@ DataBook$set("public", "import_RDS", function(data_RDS, } ) -DataBook$set("public", "clone_data_object", function(curr_data_object, include_objects = TRUE, include_metadata = TRUE, include_logs = TRUE, include_filters = TRUE, include_column_selections = TRUE, include_calculations = TRUE, include_comments = TRUE, ...) { +DataBook$set("public", "clone_data_object", function(curr_data_object, include_objects = TRUE, include_metadata = TRUE, include_logs = TRUE, include_filters = TRUE, include_column_selections = TRUE, include_calculations = TRUE, include_comments = TRUE, include_scalars = TRUE, ...) { curr_names <- names(curr_data_object) if("get_data_frame" %in% curr_names) new_data <- curr_data_object$get_data_frame(use_current_filter = FALSE) else stop("Cannot import data. No 'get_data_frame' method.") if("get_metadata" %in% curr_names) new_data_name <- curr_data_object$get_metadata(data_name_label) if(include_objects && "get_objects" %in% curr_names) new_objects <- curr_data_object$get_objects() else new_objects <- list() + if(include_scalars && "get_scalars" %in% curr_names) new_scalars <- curr_data_object$get_scalars() + else new_scalars <- list() if(include_filters && "get_filter" %in% curr_names) { new_filters <- lapply(curr_data_object$get_filter(), function(x) x$data_clone()) new_filters <- lapply(new_filters, function(x) check_filter(x)) @@ -249,7 +253,7 @@ DataBook$set("public", "clone_data_object", function(curr_data_object, include_o if("get_keys" %in% curr_names) new_keys <- curr_data_object$get_keys() else new_keys <- list() - new_data_object <- DataSheet$new(data = new_data, data_name = new_data_name, filters = new_filters, column_selections = new_column_selections, objects = new_objects, calculations = new_calculations, keys = new_keys, comments = new_comments, keep_attributes = include_metadata) + new_data_object <- DataSheet$new(data = new_data, data_name = new_data_name, filters = new_filters, column_selections = new_column_selections, objects = new_objects, calculations = new_calculations, scalars = new_scalars, keys = new_keys, comments = new_comments, keep_attributes = include_metadata) if(include_logs && "get_changes" %in% curr_names) { new_changes <- curr_data_object$get_changes() } @@ -312,6 +316,12 @@ DataBook$set("public", "set_objects", function(new_objects) { } ) +DataBook$set("public", "set_scalars", function(new_scalars) { + if(!is.list(new_scalars)) stop("new_scalars must be of type: list") + private$.scalars <- new_scalars +} +) + DataBook$set("public", "append_data_object", function(name, obj, add_to_graph_book = TRUE) { if(!is.character(name)) stop("name must be a character") # obj could be of old class type 'data_object' @@ -402,8 +412,15 @@ DataBook$set("public", "get_combined_metadata", function(convert_to_character = i = 1 for (curr_obj in private$.data_sheets) { templist = curr_obj$get_metadata() - for (j in (1:length(templist))) { - if(length(templist[[j]]) > 1 || is.list(templist[[j]])) templist[[j]] <- paste(as.character(templist[[j]]), collapse = ",") + for (j in seq_along(templist)) { + if (is.list(templist[[j]]) || length(templist[[j]]) > 1) { + if (length(templist[[j]]) > 0) { + templist[[j]] <- + paste(names(templist[[j]]), " = ", templist[[j]], collapse = ", ") + } else { + next + } + } retlist[i, names(templist[j])] = templist[[j]] } if(all(c(data_name_label, label_label, row_count_label, column_count_label, @@ -488,6 +505,57 @@ DataBook$set("public", "get_calculation_names", function(data_name, as_list = FA } ) + +DataBook$set("public", "get_scalars", function(data_name) { + if(is.null(data_name) || identical(data_name, overall_label)) { + out <- private$.scalars[self$get_scalar_names(data_name = data_name)] + }else { + out <- self$get_data_objects(data_name)$get_scalars() + } + return(out) + +} +) + +DataBook$set("public", "get_scalar_names", function(data_name, + as_list = FALSE, + excluded_items = c(),...) { + if (is.null(data_name) || identical(data_name, overall_label)) { + out <- + get_data_book_scalar_names( + scalar_list = private$.scalars, + as_list = as_list, + list_label = overall_label + ) + } else{ + out <- + self$get_data_objects(data_name)$get_scalar_names(as_list = as_list, excluded_items = excluded_items) + } + + return(out) +}) + +DataBook$set("public", "get_scalar_value", function(data_name, scalar_name) { + self$get_data_objects(data_name)$get_scalar_value(scalar_name) +} +) + +DataBook$set("public", "add_scalar", function(data_name, scalar_name = "", scalar_value) { + if (is.null(data_name) || identical(data_name, overall_label)) { + if (missing(scalar_name)) + scalar_name <- next_default_item("scalar", names(private$.scalars)) + if (scalar_name %in% names(private$.scalars)) + warning("A scalar called ", + scalar_name, + " already exists. It will be replaced.") + + #add the scalar + private$.scalars[[scalar_name]] <- scalar_value + } else{ + self$get_data_objects(data_name)$add_scalar(scalar_name, scalar_value) + } +}) + DataBook$set("public", "dataframe_count", function() { return(length(private$.data_sheets)) } diff --git a/instat/static/InstatObject/R/labels_and_defaults.R b/instat/static/InstatObject/R/labels_and_defaults.R index 20e73817247..1bdab8a0ba3 100644 --- a/instat/static/InstatObject/R/labels_and_defaults.R +++ b/instat/static/InstatObject/R/labels_and_defaults.R @@ -6,6 +6,7 @@ Renamed_col="Renamed column" Removed_col="Removed column" Added_metadata="Added metadata" Added_object="Added object" +Added_scalar= "Added scalar" Added_variables_metadata="Added variables metadata" Added_filter="Added filter" Added_column_selection="Added column selection" @@ -29,6 +30,7 @@ key_label="key" row_count_label="Rows" column_count_label="Columns" is_linkable="Is_Linkable" +scalar= "scalars" #variables_metadata labels label_label="label" diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index ef38345ed0c..83c7eaa8091 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2869,6 +2869,24 @@ get_data_book_output_object_names <- function(output_object_list, } +get_data_book_scalar_names <- function(scalar_list, + excluded_items = c(), + as_list = FALSE, + list_label = NULL){ + out = names(scalar_list) + if(length(excluded_items) > 0) { + ex_ind = which(out %in% excluded_items) + if(length(ex_ind) != length(excluded_items)) warning("Some of the excluded_items were not found in the list of calculations") + if(length(ex_ind) > 0) out = out[-ex_ind] + } + if(!as_list) { + return(out) + } + lst = list() + lst[[list_label]] <- out + return(lst) +} + get_vignette <- function (package = NULL, lib.loc = NULL, all = TRUE) { oneLink <- function(s) { diff --git a/instat/translations/en/r_instat_not_menus.json b/instat/translations/en/r_instat_not_menus.json index 8431444dda8..aaf184aaa52 100644 --- a/instat/translations/en/r_instat_not_menus.json +++ b/instat/translations/en/r_instat_not_menus.json @@ -3648,22 +3648,22 @@ "Save As": "Save As", "Save As Data Frame": "Save As Data Frame", "Save As Table": "Save As Table", - "Save As:": "Save As:", + "Store As:": "Store As:", "Save Backup Data...": "Save Backup Data...", "Save Backup Internal Log...": "Save Backup Internal Log...", "Save Backup Log...": "Save Backup Log...", "Save Bootstrap": "Save Bootstrap", "Save Calculation Only": "Save Calculation Only", "Save Calculation and Result": "Save Calculation and Result", - "Save Column Position": "Save Column Position", + "Column Position": "Column Position", "Save Current Options...": "Save Current Options...", - "Save Data": "Save Data", + "Store Data": "Store Data", "Save Data As": "Save Data As", "Save Data As...": "Save Data As...", - "Save Data Frame": "Save Data Frame", + "Store Data Frame": "Store Data Frame", "Save Data:": "Save Data:", "Save Dataframe": "Save Dataframe", - "Save Date:": "Save Date:", + "Store Date:": "Store Date:", "Save Details": "Save Details", "Save Downloaded File To:": "Save Downloaded File To:", "Save Downloaded File to:": "Save Downloaded File to:", @@ -3671,7 +3671,7 @@ "Save Estimate": "Save Estimate", "Save File As:": "Save File As:", "Save Fit": "Save Fit", - "Save Graph": "Save Graph", + "Store Graph": "Store Graph", "Save Graph Result:": "Save Graph Result:", "Save Graph:": "Save Graph:", "Save Index into:": "Save Index into:", @@ -3688,15 +3688,15 @@ "Save Output": "Save Output", "Save Output As...": "Save Output As...", "Save Plot": "Save Plot", - "Save Result": "Save Result", + "Store Result": "Store Result", "Save Result ": "Save Result ", - "Save Result:": "Save Result:", + "Store Result:": "Store Result:", "Save Results": "Save Results", "Save Script": "Save Script", "Save Script As...": "Save Script As...", "Save Script...": "Save Script...", - "Save Summary": "Save Summary", - "Save Table": "Save Table", + "Store Summary": "Store Summary", + "Store Table": "Store Table", "Save Test": "Save Test", "Save Test Object:": "Save Test Object:", "Save Treemap": "Save Treemap", @@ -3704,7 +3704,7 @@ "Save estimates in": "Save estimates in", "Save file to log folder and open file in external editor.": "Save file to log folder and open file in external editor.", "Save file(s) to:": "Save file(s) to:", - "Save result for second column:": "Save result for second column:", + "Store result for second column:": "Store result for second column:", "Save test object": "Save test object", "Save the script in the current tab to a file.": "Save the script in the current tab to a file.", "Save values": "Save values", @@ -5943,5 +5943,7 @@ "winner_name": "winner_name", "word": "word", "wrappednormal": "wrappednormal", - "zoo": "zoo" + "zoo": "zoo", + "Store Test to": "Store Test to", + "Store Train to:": "Store Train to:" } \ No newline at end of file diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 8cfa1d7f5a3..47b59844abf 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index 681ec4047d7..8204a942458 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -565,13 +565,9 @@ Public Class ucrAxes ucrPnlSecondAxisTitle.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrChkSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrInputSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + ucrPnlScales.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) End If - 'scales functions - ucrPnlScales.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) - ucrInputLowerLimit.SetRCode(clsLimitsFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) - ucrInputUpperLimit.SetRCode(clsLimitsFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) - ucrInputPosition.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrChkPosition.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) @@ -782,7 +778,20 @@ Public Class ucrAxes End Sub Private Sub ucrPnlScales_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlScales.ControlValueChanged, ucrInputLowerLimit.ControlValueChanged, ucrInputUpperLimit.ControlValueChanged - If rdoScalesCustom.Checked AndAlso (Not ucrInputLowerLimit.IsEmpty AndAlso Not ucrInputUpperLimit.IsEmpty) Then + If rdoScalesCustom.Checked Then + Dim xValue As String = "NA" + Dim yValue As String = "NA" + + If Not ucrInputLowerLimit.IsEmpty Then + xValue = ucrInputLowerLimit.GetText() + End If + + If Not ucrInputUpperLimit.IsEmpty Then + yValue = ucrInputUpperLimit.GetText() + End If + + clsLimitsFunction.AddParameter("x", xValue, iPosition:=0, bIncludeArgumentName:=False) + clsLimitsFunction.AddParameter("y", yValue, iPosition:=1, bIncludeArgumentName:=False) clsXYScaleContinuousFunction.AddParameter("limits", clsRFunctionParameter:=clsLimitsFunction) Else clsXYScaleContinuousFunction.RemoveParameterByName("limits") diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 5c2087b6d34..7ba01a9a26f 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -385,12 +385,15 @@ Partial Class ucrCalculator Me.cmdBeta = New System.Windows.Forms.Button() Me.cmdDigamma = New System.Windows.Forms.Button() Me.grpTransform = New System.Windows.Forms.GroupBox() + Me.cmdRank = New System.Windows.Forms.Button() + Me.cmdRescale = New System.Windows.Forms.Button() Me.cmdScale = New System.Windows.Forms.Button() Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MASSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ScalesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZooToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdRev = New System.Windows.Forms.Button() Me.cmdMovProd = New System.Windows.Forms.Button() @@ -661,6 +664,7 @@ Partial Class ucrCalculator Me.cmdRoots = New System.Windows.Forms.Button() Me.cmdPolynomial = New System.Windows.Forms.Button() Me.cmdOrigin = New System.Windows.Forms.Button() + Me.ucrChkStoreScalar = New System.Windows.Forms.CheckBox() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -704,10 +708,9 @@ Partial Class ucrCalculator ' Me.lblExpression.AutoSize = True Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExpression.Location = New System.Drawing.Point(6, 10) - Me.lblExpression.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblExpression.Location = New System.Drawing.Point(9, 15) Me.lblExpression.Name = "lblExpression" - Me.lblExpression.Size = New System.Drawing.Size(61, 13) + Me.lblExpression.Size = New System.Drawing.Size(91, 20) Me.lblExpression.TabIndex = 119 Me.lblExpression.Tag = "Expression" Me.lblExpression.Text = "Expression:" @@ -716,10 +719,9 @@ Partial Class ucrCalculator ' Me.chkShowParameters.AutoSize = True Me.chkShowParameters.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.chkShowParameters.Location = New System.Drawing.Point(70, 42) - Me.chkShowParameters.Margin = New System.Windows.Forms.Padding(2) + Me.chkShowParameters.Location = New System.Drawing.Point(105, 63) Me.chkShowParameters.Name = "chkShowParameters" - Me.chkShowParameters.Size = New System.Drawing.Size(109, 17) + Me.chkShowParameters.Size = New System.Drawing.Size(161, 24) Me.chkShowParameters.TabIndex = 181 Me.chkShowParameters.Text = "Show Parameters" Me.chkShowParameters.UseVisualStyleBackColor = True @@ -745,11 +747,9 @@ Partial Class ucrCalculator Me.grpBasic.Controls.Add(Me.cmd2) Me.grpBasic.Controls.Add(Me.cmd0) Me.grpBasic.Controls.Add(Me.cmd1) - Me.grpBasic.Location = New System.Drawing.Point(222, 70) - Me.grpBasic.Margin = New System.Windows.Forms.Padding(2) + Me.grpBasic.Location = New System.Drawing.Point(333, 105) Me.grpBasic.Name = "grpBasic" - Me.grpBasic.Padding = New System.Windows.Forms.Padding(2) - Me.grpBasic.Size = New System.Drawing.Size(206, 134) + Me.grpBasic.Size = New System.Drawing.Size(309, 201) Me.grpBasic.TabIndex = 179 Me.grpBasic.TabStop = False Me.grpBasic.Text = "Basic" @@ -757,10 +757,9 @@ Partial Class ucrCalculator 'cmdClear ' Me.cmdClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClear.Location = New System.Drawing.Point(150, 72) - Me.cmdClear.Margin = New System.Windows.Forms.Padding(2) + Me.cmdClear.Location = New System.Drawing.Point(225, 108) Me.cmdClear.Name = "cmdClear" - Me.cmdClear.Size = New System.Drawing.Size(50, 58) + Me.cmdClear.Size = New System.Drawing.Size(75, 87) Me.cmdClear.TabIndex = 190 Me.cmdClear.Text = "Clear" Me.cmdClear.UseVisualStyleBackColor = True @@ -769,10 +768,9 @@ Partial Class ucrCalculator ' Me.cmdComma.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdComma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComma.Location = New System.Drawing.Point(2, 101) - Me.cmdComma.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComma.Location = New System.Drawing.Point(3, 152) Me.cmdComma.Name = "cmdComma" - Me.cmdComma.Size = New System.Drawing.Size(38, 30) + Me.cmdComma.Size = New System.Drawing.Size(57, 45) Me.cmdComma.TabIndex = 138 Me.cmdComma.Text = "," Me.cmdComma.UseVisualStyleBackColor = True @@ -780,10 +778,9 @@ Partial Class ucrCalculator 'cmdBrackets ' Me.cmdBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrackets.Location = New System.Drawing.Point(76, 101) - Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2) + Me.cmdBrackets.Location = New System.Drawing.Point(114, 152) Me.cmdBrackets.Name = "cmdBrackets" - Me.cmdBrackets.Size = New System.Drawing.Size(38, 30) + Me.cmdBrackets.Size = New System.Drawing.Size(57, 45) Me.cmdBrackets.TabIndex = 136 Me.cmdBrackets.Text = "( )" Me.cmdBrackets.UseVisualStyleBackColor = True @@ -792,10 +789,9 @@ Partial Class ucrCalculator ' Me.cmdPower.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdPower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPower.Location = New System.Drawing.Point(150, 43) - Me.cmdPower.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPower.Location = New System.Drawing.Point(225, 64) Me.cmdPower.Name = "cmdPower" - Me.cmdPower.Size = New System.Drawing.Size(50, 30) + Me.cmdPower.Size = New System.Drawing.Size(75, 45) Me.cmdPower.TabIndex = 133 Me.cmdPower.Text = "^" Me.cmdPower.UseVisualStyleBackColor = True @@ -804,10 +800,9 @@ Partial Class ucrCalculator ' Me.cmdDivide.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdDivide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDivide.Location = New System.Drawing.Point(113, 14) - Me.cmdDivide.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDivide.Location = New System.Drawing.Point(170, 21) Me.cmdDivide.Name = "cmdDivide" - Me.cmdDivide.Size = New System.Drawing.Size(38, 30) + Me.cmdDivide.Size = New System.Drawing.Size(57, 45) Me.cmdDivide.TabIndex = 131 Me.cmdDivide.Text = "/" Me.cmdDivide.UseVisualStyleBackColor = True @@ -816,10 +811,9 @@ Partial Class ucrCalculator ' Me.cmdPlus.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdPlus.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlus.Location = New System.Drawing.Point(113, 101) - Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPlus.Location = New System.Drawing.Point(170, 152) Me.cmdPlus.Name = "cmdPlus" - Me.cmdPlus.Size = New System.Drawing.Size(38, 29) + Me.cmdPlus.Size = New System.Drawing.Size(57, 44) Me.cmdPlus.TabIndex = 130 Me.cmdPlus.Text = "+" Me.cmdPlus.UseVisualStyleBackColor = True @@ -828,10 +822,9 @@ Partial Class ucrCalculator ' Me.cmdMinus.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdMinus.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMinus.Location = New System.Drawing.Point(113, 72) - Me.cmdMinus.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMinus.Location = New System.Drawing.Point(170, 108) Me.cmdMinus.Name = "cmdMinus" - Me.cmdMinus.Size = New System.Drawing.Size(38, 30) + Me.cmdMinus.Size = New System.Drawing.Size(57, 45) Me.cmdMinus.TabIndex = 129 Me.cmdMinus.Text = "-" Me.cmdMinus.UseVisualStyleBackColor = True @@ -840,10 +833,9 @@ Partial Class ucrCalculator ' Me.cmdMultiply.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdMultiply.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMultiply.Location = New System.Drawing.Point(113, 43) - Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMultiply.Location = New System.Drawing.Point(170, 64) Me.cmdMultiply.Name = "cmdMultiply" - Me.cmdMultiply.Size = New System.Drawing.Size(38, 30) + Me.cmdMultiply.Size = New System.Drawing.Size(57, 45) Me.cmdMultiply.TabIndex = 128 Me.cmdMultiply.Text = "*" Me.cmdMultiply.UseVisualStyleBackColor = True @@ -852,10 +844,9 @@ Partial Class ucrCalculator ' Me.cmdDot.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.cmdDot.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDot.Location = New System.Drawing.Point(150, 14) - Me.cmdDot.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDot.Location = New System.Drawing.Point(225, 21) Me.cmdDot.Name = "cmdDot" - Me.cmdDot.Size = New System.Drawing.Size(50, 30) + Me.cmdDot.Size = New System.Drawing.Size(75, 45) Me.cmdDot.TabIndex = 127 Me.cmdDot.Text = "." Me.cmdDot.UseVisualStyleBackColor = True @@ -863,10 +854,9 @@ Partial Class ucrCalculator 'cmd9 ' Me.cmd9.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd9.Location = New System.Drawing.Point(76, 14) - Me.cmd9.Margin = New System.Windows.Forms.Padding(2) + Me.cmd9.Location = New System.Drawing.Point(114, 21) Me.cmd9.Name = "cmd9" - Me.cmd9.Size = New System.Drawing.Size(38, 30) + Me.cmd9.Size = New System.Drawing.Size(57, 45) Me.cmd9.TabIndex = 126 Me.cmd9.Text = "9" Me.cmd9.UseVisualStyleBackColor = True @@ -874,10 +864,9 @@ Partial Class ucrCalculator 'cmd8 ' Me.cmd8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd8.Location = New System.Drawing.Point(39, 14) - Me.cmd8.Margin = New System.Windows.Forms.Padding(2) + Me.cmd8.Location = New System.Drawing.Point(58, 21) Me.cmd8.Name = "cmd8" - Me.cmd8.Size = New System.Drawing.Size(38, 30) + Me.cmd8.Size = New System.Drawing.Size(57, 45) Me.cmd8.TabIndex = 125 Me.cmd8.Text = "8" Me.cmd8.UseVisualStyleBackColor = True @@ -885,10 +874,9 @@ Partial Class ucrCalculator 'cmd7 ' Me.cmd7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd7.Location = New System.Drawing.Point(2, 14) - Me.cmd7.Margin = New System.Windows.Forms.Padding(2) + Me.cmd7.Location = New System.Drawing.Point(3, 21) Me.cmd7.Name = "cmd7" - Me.cmd7.Size = New System.Drawing.Size(38, 30) + Me.cmd7.Size = New System.Drawing.Size(57, 45) Me.cmd7.TabIndex = 124 Me.cmd7.Text = "7" Me.cmd7.UseVisualStyleBackColor = True @@ -896,10 +884,9 @@ Partial Class ucrCalculator 'cmd6 ' Me.cmd6.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd6.Location = New System.Drawing.Point(76, 43) - Me.cmd6.Margin = New System.Windows.Forms.Padding(2) + Me.cmd6.Location = New System.Drawing.Point(114, 64) Me.cmd6.Name = "cmd6" - Me.cmd6.Size = New System.Drawing.Size(38, 30) + Me.cmd6.Size = New System.Drawing.Size(57, 45) Me.cmd6.TabIndex = 123 Me.cmd6.Text = "6" Me.cmd6.UseVisualStyleBackColor = True @@ -907,10 +894,9 @@ Partial Class ucrCalculator 'cmd5 ' Me.cmd5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd5.Location = New System.Drawing.Point(39, 43) - Me.cmd5.Margin = New System.Windows.Forms.Padding(2) + Me.cmd5.Location = New System.Drawing.Point(58, 64) Me.cmd5.Name = "cmd5" - Me.cmd5.Size = New System.Drawing.Size(38, 30) + Me.cmd5.Size = New System.Drawing.Size(57, 45) Me.cmd5.TabIndex = 122 Me.cmd5.Text = "5" Me.cmd5.UseVisualStyleBackColor = True @@ -918,10 +904,9 @@ Partial Class ucrCalculator 'cmd4 ' Me.cmd4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd4.Location = New System.Drawing.Point(2, 43) - Me.cmd4.Margin = New System.Windows.Forms.Padding(2) + Me.cmd4.Location = New System.Drawing.Point(3, 64) Me.cmd4.Name = "cmd4" - Me.cmd4.Size = New System.Drawing.Size(38, 30) + Me.cmd4.Size = New System.Drawing.Size(57, 45) Me.cmd4.TabIndex = 121 Me.cmd4.Text = "4" Me.cmd4.UseVisualStyleBackColor = True @@ -929,10 +914,9 @@ Partial Class ucrCalculator 'cmd3 ' Me.cmd3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd3.Location = New System.Drawing.Point(76, 72) - Me.cmd3.Margin = New System.Windows.Forms.Padding(2) + Me.cmd3.Location = New System.Drawing.Point(114, 108) Me.cmd3.Name = "cmd3" - Me.cmd3.Size = New System.Drawing.Size(38, 30) + Me.cmd3.Size = New System.Drawing.Size(57, 45) Me.cmd3.TabIndex = 120 Me.cmd3.Text = "3" Me.cmd3.UseVisualStyleBackColor = True @@ -940,10 +924,9 @@ Partial Class ucrCalculator 'cmd2 ' Me.cmd2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd2.Location = New System.Drawing.Point(39, 72) - Me.cmd2.Margin = New System.Windows.Forms.Padding(2) + Me.cmd2.Location = New System.Drawing.Point(58, 108) Me.cmd2.Name = "cmd2" - Me.cmd2.Size = New System.Drawing.Size(38, 30) + Me.cmd2.Size = New System.Drawing.Size(57, 45) Me.cmd2.TabIndex = 119 Me.cmd2.Text = "2" Me.cmd2.UseVisualStyleBackColor = True @@ -951,10 +934,9 @@ Partial Class ucrCalculator 'cmd0 ' Me.cmd0.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd0.Location = New System.Drawing.Point(39, 101) - Me.cmd0.Margin = New System.Windows.Forms.Padding(2) + Me.cmd0.Location = New System.Drawing.Point(58, 152) Me.cmd0.Name = "cmd0" - Me.cmd0.Size = New System.Drawing.Size(38, 30) + Me.cmd0.Size = New System.Drawing.Size(57, 45) Me.cmd0.TabIndex = 118 Me.cmd0.Text = "0" Me.cmd0.UseVisualStyleBackColor = True @@ -962,10 +944,9 @@ Partial Class ucrCalculator 'cmd1 ' Me.cmd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd1.Location = New System.Drawing.Point(2, 72) - Me.cmd1.Margin = New System.Windows.Forms.Padding(2) + Me.cmd1.Location = New System.Drawing.Point(3, 108) Me.cmd1.Name = "cmd1" - Me.cmd1.Size = New System.Drawing.Size(38, 30) + Me.cmd1.Size = New System.Drawing.Size(57, 45) Me.cmd1.TabIndex = 117 Me.cmd1.Text = "1" Me.cmd1.UseVisualStyleBackColor = True @@ -997,12 +978,10 @@ Partial Class ucrCalculator Me.grpDates.Controls.Add(Me.cmdYmd) Me.grpDates.Controls.Add(Me.cmdLeap) Me.grpDates.Controls.Add(Me.cmdRHelp) - Me.grpDates.Location = New System.Drawing.Point(434, 62) - Me.grpDates.Margin = New System.Windows.Forms.Padding(2) + Me.grpDates.Location = New System.Drawing.Point(651, 93) Me.grpDates.Name = "grpDates" - Me.grpDates.Padding = New System.Windows.Forms.Padding(2) Me.grpDates.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.grpDates.Size = New System.Drawing.Size(252, 233) + Me.grpDates.Size = New System.Drawing.Size(378, 350) Me.grpDates.TabIndex = 188 Me.grpDates.TabStop = False Me.grpDates.Text = "Dates/Times" @@ -1010,10 +989,9 @@ Partial Class ucrCalculator 'cmdYmdHms ' Me.cmdYmdHms.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmdHms.Location = New System.Drawing.Point(5, 73) - Me.cmdYmdHms.Margin = New System.Windows.Forms.Padding(2) + Me.cmdYmdHms.Location = New System.Drawing.Point(8, 110) Me.cmdYmdHms.Name = "cmdYmdHms" - Me.cmdYmdHms.Size = New System.Drawing.Size(60, 30) + Me.cmdYmdHms.Size = New System.Drawing.Size(90, 45) Me.cmdYmdHms.TabIndex = 242 Me.cmdYmdHms.Text = "ymd.hms" Me.cmdYmdHms.UseVisualStyleBackColor = True @@ -1021,10 +999,9 @@ Partial Class ucrCalculator 'cmdYmdHm ' Me.cmdYmdHm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmdHm.Location = New System.Drawing.Point(64, 73) - Me.cmdYmdHm.Margin = New System.Windows.Forms.Padding(2) + Me.cmdYmdHm.Location = New System.Drawing.Point(96, 110) Me.cmdYmdHm.Name = "cmdYmdHm" - Me.cmdYmdHm.Size = New System.Drawing.Size(60, 30) + Me.cmdYmdHm.Size = New System.Drawing.Size(90, 45) Me.cmdYmdHm.TabIndex = 241 Me.cmdYmdHm.Text = "ymd.hm" Me.cmdYmdHm.UseVisualStyleBackColor = True @@ -1032,10 +1009,9 @@ Partial Class ucrCalculator 'cmdAsDate ' Me.cmdAsDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsDate.Location = New System.Drawing.Point(64, 15) - Me.cmdAsDate.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAsDate.Location = New System.Drawing.Point(96, 22) Me.cmdAsDate.Name = "cmdAsDate" - Me.cmdAsDate.Size = New System.Drawing.Size(60, 30) + Me.cmdAsDate.Size = New System.Drawing.Size(90, 45) Me.cmdAsDate.TabIndex = 240 Me.cmdAsDate.Text = "as.date" Me.cmdAsDate.UseVisualStyleBackColor = True @@ -1043,10 +1019,9 @@ Partial Class ucrCalculator 'cmdAsTime ' Me.cmdAsTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsTime.Location = New System.Drawing.Point(191, 44) - Me.cmdAsTime.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAsTime.Location = New System.Drawing.Point(286, 66) Me.cmdAsTime.Name = "cmdAsTime" - Me.cmdAsTime.Size = New System.Drawing.Size(60, 30) + Me.cmdAsTime.Size = New System.Drawing.Size(90, 45) Me.cmdAsTime.TabIndex = 239 Me.cmdAsTime.Text = "as.time" Me.cmdAsTime.UseVisualStyleBackColor = True @@ -1054,10 +1029,9 @@ Partial Class ucrCalculator 'cmdYmdH ' Me.cmdYmdH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmdH.Location = New System.Drawing.Point(123, 73) - Me.cmdYmdH.Margin = New System.Windows.Forms.Padding(2) + Me.cmdYmdH.Location = New System.Drawing.Point(184, 110) Me.cmdYmdH.Name = "cmdYmdH" - Me.cmdYmdH.Size = New System.Drawing.Size(69, 30) + Me.cmdYmdH.Size = New System.Drawing.Size(104, 45) Me.cmdYmdH.TabIndex = 238 Me.cmdYmdH.Text = "ymd.h" Me.cmdYmdH.UseVisualStyleBackColor = True @@ -1065,10 +1039,9 @@ Partial Class ucrCalculator 'cmdPm ' Me.cmdPm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPm.Location = New System.Drawing.Point(5, 160) - Me.cmdPm.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPm.Location = New System.Drawing.Point(8, 240) Me.cmdPm.Name = "cmdPm" - Me.cmdPm.Size = New System.Drawing.Size(60, 30) + Me.cmdPm.Size = New System.Drawing.Size(90, 45) Me.cmdPm.TabIndex = 237 Me.cmdPm.Text = "pm" Me.cmdPm.UseVisualStyleBackColor = True @@ -1076,10 +1049,9 @@ Partial Class ucrCalculator 'cmdTime ' Me.cmdTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTime.Location = New System.Drawing.Point(191, 15) - Me.cmdTime.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTime.Location = New System.Drawing.Point(286, 22) Me.cmdTime.Name = "cmdTime" - Me.cmdTime.Size = New System.Drawing.Size(60, 30) + Me.cmdTime.Size = New System.Drawing.Size(90, 45) Me.cmdTime.TabIndex = 236 Me.cmdTime.Text = "time" Me.cmdTime.UseVisualStyleBackColor = True @@ -1087,10 +1059,9 @@ Partial Class ucrCalculator 'cmdDateTime ' Me.cmdDateTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDateTime.Location = New System.Drawing.Point(123, 15) - Me.cmdDateTime.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDateTime.Location = New System.Drawing.Point(184, 22) Me.cmdDateTime.Name = "cmdDateTime" - Me.cmdDateTime.Size = New System.Drawing.Size(69, 30) + Me.cmdDateTime.Size = New System.Drawing.Size(104, 45) Me.cmdDateTime.TabIndex = 235 Me.cmdDateTime.Text = "as.datetime" Me.cmdDateTime.UseVisualStyleBackColor = True @@ -1098,10 +1069,9 @@ Partial Class ucrCalculator 'cmdQuarter ' Me.cmdQuarter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuarter.Location = New System.Drawing.Point(64, 102) - Me.cmdQuarter.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQuarter.Location = New System.Drawing.Point(96, 153) Me.cmdQuarter.Name = "cmdQuarter" - Me.cmdQuarter.Size = New System.Drawing.Size(60, 30) + Me.cmdQuarter.Size = New System.Drawing.Size(90, 45) Me.cmdQuarter.TabIndex = 234 Me.cmdQuarter.Text = "quarter" Me.cmdQuarter.UseVisualStyleBackColor = True @@ -1109,10 +1079,9 @@ Partial Class ucrCalculator 'cmdD_In_M ' Me.cmdD_In_M.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdD_In_M.Location = New System.Drawing.Point(123, 131) - Me.cmdD_In_M.Margin = New System.Windows.Forms.Padding(2) + Me.cmdD_In_M.Location = New System.Drawing.Point(184, 196) Me.cmdD_In_M.Name = "cmdD_In_M" - Me.cmdD_In_M.Size = New System.Drawing.Size(69, 30) + Me.cmdD_In_M.Size = New System.Drawing.Size(104, 45) Me.cmdD_In_M.TabIndex = 233 Me.cmdD_In_M.Text = "d_in_m" Me.cmdD_In_M.UseVisualStyleBackColor = True @@ -1120,10 +1089,9 @@ Partial Class ucrCalculator 'cmdAm ' Me.cmdAm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAm.Location = New System.Drawing.Point(191, 131) - Me.cmdAm.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAm.Location = New System.Drawing.Point(286, 196) Me.cmdAm.Name = "cmdAm" - Me.cmdAm.Size = New System.Drawing.Size(60, 30) + Me.cmdAm.Size = New System.Drawing.Size(90, 45) Me.cmdAm.TabIndex = 232 Me.cmdAm.Text = "am" Me.cmdAm.UseVisualStyleBackColor = True @@ -1131,10 +1099,9 @@ Partial Class ucrCalculator 'cmdSec ' Me.cmdSec.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSec.Location = New System.Drawing.Point(191, 160) - Me.cmdSec.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSec.Location = New System.Drawing.Point(286, 240) Me.cmdSec.Name = "cmdSec" - Me.cmdSec.Size = New System.Drawing.Size(60, 30) + Me.cmdSec.Size = New System.Drawing.Size(90, 45) Me.cmdSec.TabIndex = 231 Me.cmdSec.Text = "sec" Me.cmdSec.UseVisualStyleBackColor = True @@ -1142,10 +1109,9 @@ Partial Class ucrCalculator 'cmdHour ' Me.cmdHour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHour.Location = New System.Drawing.Point(64, 160) - Me.cmdHour.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHour.Location = New System.Drawing.Point(96, 240) Me.cmdHour.Name = "cmdHour" - Me.cmdHour.Size = New System.Drawing.Size(60, 30) + Me.cmdHour.Size = New System.Drawing.Size(90, 45) Me.cmdHour.TabIndex = 230 Me.cmdHour.Text = "hour" Me.cmdHour.UseVisualStyleBackColor = True @@ -1153,10 +1119,9 @@ Partial Class ucrCalculator 'cmdMinutes ' Me.cmdMinutes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMinutes.Location = New System.Drawing.Point(123, 160) - Me.cmdMinutes.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMinutes.Location = New System.Drawing.Point(184, 240) Me.cmdMinutes.Name = "cmdMinutes" - Me.cmdMinutes.Size = New System.Drawing.Size(69, 30) + Me.cmdMinutes.Size = New System.Drawing.Size(104, 45) Me.cmdMinutes.TabIndex = 229 Me.cmdMinutes.Text = "min" Me.cmdMinutes.UseVisualStyleBackColor = True @@ -1164,10 +1129,9 @@ Partial Class ucrCalculator 'cmdDmy ' Me.cmdDmy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDmy.Location = New System.Drawing.Point(64, 44) - Me.cmdDmy.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDmy.Location = New System.Drawing.Point(96, 66) Me.cmdDmy.Name = "cmdDmy" - Me.cmdDmy.Size = New System.Drawing.Size(60, 30) + Me.cmdDmy.Size = New System.Drawing.Size(90, 45) Me.cmdDmy.TabIndex = 228 Me.cmdDmy.Tag = "dmy" Me.cmdDmy.Text = "dmy" @@ -1176,10 +1140,9 @@ Partial Class ucrCalculator 'cmdDay ' Me.cmdDay.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDay.Location = New System.Drawing.Point(191, 102) - Me.cmdDay.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDay.Location = New System.Drawing.Point(286, 153) Me.cmdDay.Name = "cmdDay" - Me.cmdDay.Size = New System.Drawing.Size(60, 30) + Me.cmdDay.Size = New System.Drawing.Size(90, 45) Me.cmdDay.TabIndex = 227 Me.cmdDay.Text = "day" Me.cmdDay.UseVisualStyleBackColor = True @@ -1187,11 +1150,10 @@ Partial Class ucrCalculator 'cmdMonth ' Me.cmdMonth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMonth.Location = New System.Drawing.Point(123, 102) - Me.cmdMonth.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMonth.Location = New System.Drawing.Point(184, 153) Me.cmdMonth.Name = "cmdMonth" Me.cmdMonth.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.cmdMonth.Size = New System.Drawing.Size(69, 30) + Me.cmdMonth.Size = New System.Drawing.Size(104, 45) Me.cmdMonth.TabIndex = 226 Me.cmdMonth.Text = "month" Me.cmdMonth.UseVisualStyleBackColor = True @@ -1199,10 +1161,9 @@ Partial Class ucrCalculator 'cmdYear ' Me.cmdYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYear.Location = New System.Drawing.Point(5, 102) - Me.cmdYear.Margin = New System.Windows.Forms.Padding(2) + Me.cmdYear.Location = New System.Drawing.Point(8, 153) Me.cmdYear.Name = "cmdYear" - Me.cmdYear.Size = New System.Drawing.Size(60, 30) + Me.cmdYear.Size = New System.Drawing.Size(90, 45) Me.cmdYear.TabIndex = 225 Me.cmdYear.Text = "year" Me.cmdYear.UseVisualStyleBackColor = True @@ -1210,10 +1171,9 @@ Partial Class ucrCalculator 'cmdDate ' Me.cmdDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDate.Location = New System.Drawing.Point(5, 15) - Me.cmdDate.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDate.Location = New System.Drawing.Point(8, 22) Me.cmdDate.Name = "cmdDate" - Me.cmdDate.Size = New System.Drawing.Size(60, 30) + Me.cmdDate.Size = New System.Drawing.Size(90, 45) Me.cmdDate.TabIndex = 224 Me.cmdDate.Text = "date" Me.cmdDate.UseVisualStyleBackColor = True @@ -1221,10 +1181,9 @@ Partial Class ucrCalculator 'cmdYday ' Me.cmdYday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYday.Location = New System.Drawing.Point(5, 131) - Me.cmdYday.Margin = New System.Windows.Forms.Padding(2) + Me.cmdYday.Location = New System.Drawing.Point(8, 196) Me.cmdYday.Name = "cmdYday" - Me.cmdYday.Size = New System.Drawing.Size(60, 30) + Me.cmdYday.Size = New System.Drawing.Size(90, 45) Me.cmdYday.TabIndex = 223 Me.cmdYday.Text = "yday" Me.cmdYday.UseVisualStyleBackColor = True @@ -1232,10 +1191,9 @@ Partial Class ucrCalculator 'cmdWday ' Me.cmdWday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWday.Location = New System.Drawing.Point(64, 131) - Me.cmdWday.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWday.Location = New System.Drawing.Point(96, 196) Me.cmdWday.Name = "cmdWday" - Me.cmdWday.Size = New System.Drawing.Size(60, 30) + Me.cmdWday.Size = New System.Drawing.Size(90, 45) Me.cmdWday.TabIndex = 222 Me.cmdWday.Text = "wday" Me.cmdWday.UseVisualStyleBackColor = True @@ -1243,10 +1201,9 @@ Partial Class ucrCalculator 'cmdMdy ' Me.cmdMdy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMdy.Location = New System.Drawing.Point(123, 44) - Me.cmdMdy.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMdy.Location = New System.Drawing.Point(184, 66) Me.cmdMdy.Name = "cmdMdy" - Me.cmdMdy.Size = New System.Drawing.Size(69, 30) + Me.cmdMdy.Size = New System.Drawing.Size(104, 45) Me.cmdMdy.TabIndex = 221 Me.cmdMdy.Text = "mdy" Me.cmdMdy.UseVisualStyleBackColor = True @@ -1254,10 +1211,9 @@ Partial Class ucrCalculator 'cmdYmd ' Me.cmdYmd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmd.Location = New System.Drawing.Point(5, 44) - Me.cmdYmd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdYmd.Location = New System.Drawing.Point(8, 66) Me.cmdYmd.Name = "cmdYmd" - Me.cmdYmd.Size = New System.Drawing.Size(60, 30) + Me.cmdYmd.Size = New System.Drawing.Size(90, 45) Me.cmdYmd.TabIndex = 220 Me.cmdYmd.Text = "ymd" Me.cmdYmd.UseVisualStyleBackColor = True @@ -1265,10 +1221,9 @@ Partial Class ucrCalculator 'cmdLeap ' Me.cmdLeap.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLeap.Location = New System.Drawing.Point(191, 73) - Me.cmdLeap.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLeap.Location = New System.Drawing.Point(286, 110) Me.cmdLeap.Name = "cmdLeap" - Me.cmdLeap.Size = New System.Drawing.Size(60, 30) + Me.cmdLeap.Size = New System.Drawing.Size(90, 45) Me.cmdLeap.TabIndex = 219 Me.cmdLeap.Text = "leap" Me.cmdLeap.UseVisualStyleBackColor = True @@ -1277,10 +1232,9 @@ Partial Class ucrCalculator ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(157, 193) - Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRHelp.Location = New System.Drawing.Point(242, 284) Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdRHelp.Size = New System.Drawing.Size(135, 45) Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate Me.cmdRHelp.TabIndex = 212 Me.cmdRHelp.Text = "R Help" @@ -1291,18 +1245,18 @@ Partial Class ucrCalculator Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripDate.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateLubridateToolStripMenuItem, Me.DateHmsToolStripMenuItem}) Me.ContextMenuStripDate.Name = "ContextMenuStrip1" - Me.ContextMenuStripDate.Size = New System.Drawing.Size(122, 48) + Me.ContextMenuStripDate.Size = New System.Drawing.Size(155, 68) ' 'DateLubridateToolStripMenuItem ' Me.DateLubridateToolStripMenuItem.Name = "DateLubridateToolStripMenuItem" - Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(121, 22) + Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(154, 32) Me.DateLubridateToolStripMenuItem.Text = "lubridate" ' 'DateHmsToolStripMenuItem ' Me.DateHmsToolStripMenuItem.Name = "DateHmsToolStripMenuItem" - Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(121, 22) + Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(154, 32) Me.DateHmsToolStripMenuItem.Text = "hms" ' 'ContextMenuStripComplex @@ -1310,12 +1264,12 @@ Partial Class ucrCalculator Me.ContextMenuStripComplex.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripComplex.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ComplexBaseToolStripMenuItem}) Me.ContextMenuStripComplex.Name = "ContextMenuStrip1" - Me.ContextMenuStripComplex.Size = New System.Drawing.Size(99, 26) + Me.ContextMenuStripComplex.Size = New System.Drawing.Size(122, 36) ' 'ComplexBaseToolStripMenuItem ' Me.ComplexBaseToolStripMenuItem.Name = "ComplexBaseToolStripMenuItem" - Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(98, 22) + Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(121, 32) Me.ComplexBaseToolStripMenuItem.Text = "base" ' 'grpInteger @@ -1365,11 +1319,9 @@ Partial Class ucrCalculator Me.grpInteger.Controls.Add(Me.cmdFactorial) Me.grpInteger.Controls.Add(Me.cmdIsPrime) Me.grpInteger.Controls.Add(Me.cmdBigZ) - Me.grpInteger.Location = New System.Drawing.Point(434, 62) - Me.grpInteger.Margin = New System.Windows.Forms.Padding(2) + Me.grpInteger.Location = New System.Drawing.Point(651, 93) Me.grpInteger.Name = "grpInteger" - Me.grpInteger.Padding = New System.Windows.Forms.Padding(2) - Me.grpInteger.Size = New System.Drawing.Size(308, 318) + Me.grpInteger.Size = New System.Drawing.Size(462, 477) Me.grpInteger.TabIndex = 183 Me.grpInteger.TabStop = False Me.grpInteger.Text = "Integer" @@ -1377,10 +1329,9 @@ Partial Class ucrCalculator 'cmdPrimorial ' Me.cmdPrimorial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPrimorial.Location = New System.Drawing.Point(221, 181) - Me.cmdPrimorial.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPrimorial.Location = New System.Drawing.Point(332, 272) Me.cmdPrimorial.Name = "cmdPrimorial" - Me.cmdPrimorial.Size = New System.Drawing.Size(74, 22) + Me.cmdPrimorial.Size = New System.Drawing.Size(111, 33) Me.cmdPrimorial.TabIndex = 47 Me.cmdPrimorial.Text = "primorial" Me.cmdPrimorial.UseVisualStyleBackColor = True @@ -1388,30 +1339,27 @@ Partial Class ucrCalculator 'cmdFactorize2 ' Me.cmdFactorize2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFactorize2.Location = New System.Drawing.Point(148, 39) - Me.cmdFactorize2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFactorize2.Location = New System.Drawing.Point(222, 58) Me.cmdFactorize2.Name = "cmdFactorize2" - Me.cmdFactorize2.Size = New System.Drawing.Size(74, 22) + Me.cmdFactorize2.Size = New System.Drawing.Size(111, 33) Me.cmdFactorize2.TabIndex = 46 Me.cmdFactorize2.Text = "factorize2" Me.cmdFactorize2.UseVisualStyleBackColor = True ' 'cmdLucas ' - Me.cmdLucas.Location = New System.Drawing.Point(75, 60) - Me.cmdLucas.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLucas.Location = New System.Drawing.Point(112, 90) Me.cmdLucas.Name = "cmdLucas" - Me.cmdLucas.Size = New System.Drawing.Size(74, 22) + Me.cmdLucas.Size = New System.Drawing.Size(111, 33) Me.cmdLucas.TabIndex = 45 Me.cmdLucas.Text = "lucas" Me.cmdLucas.UseVisualStyleBackColor = True ' 'cmdFactorize ' - Me.cmdFactorize.Location = New System.Drawing.Point(75, 39) - Me.cmdFactorize.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFactorize.Location = New System.Drawing.Point(112, 58) Me.cmdFactorize.Name = "cmdFactorize" - Me.cmdFactorize.Size = New System.Drawing.Size(74, 22) + Me.cmdFactorize.Size = New System.Drawing.Size(111, 33) Me.cmdFactorize.TabIndex = 44 Me.cmdFactorize.Text = "factorize" Me.cmdFactorize.UseVisualStyleBackColor = True @@ -1419,10 +1367,9 @@ Partial Class ucrCalculator 'cmdSquare ' Me.cmdSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSquare.Location = New System.Drawing.Point(221, 256) - Me.cmdSquare.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSquare.Location = New System.Drawing.Point(332, 384) Me.cmdSquare.Name = "cmdSquare" - Me.cmdSquare.Size = New System.Drawing.Size(74, 22) + Me.cmdSquare.Size = New System.Drawing.Size(111, 33) Me.cmdSquare.TabIndex = 43 Me.cmdSquare.Text = "square" Me.cmdSquare.UseVisualStyleBackColor = True @@ -1430,10 +1377,9 @@ Partial Class ucrCalculator 'cmdTriangle ' Me.cmdTriangle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriangle.Location = New System.Drawing.Point(148, 256) - Me.cmdTriangle.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTriangle.Location = New System.Drawing.Point(222, 384) Me.cmdTriangle.Name = "cmdTriangle" - Me.cmdTriangle.Size = New System.Drawing.Size(74, 22) + Me.cmdTriangle.Size = New System.Drawing.Size(111, 33) Me.cmdTriangle.TabIndex = 42 Me.cmdTriangle.Text = "triangle" Me.cmdTriangle.UseVisualStyleBackColor = True @@ -1441,10 +1387,9 @@ Partial Class ucrCalculator 'cmdPadovan ' Me.cmdPadovan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPadovan.Location = New System.Drawing.Point(75, 256) - Me.cmdPadovan.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPadovan.Location = New System.Drawing.Point(112, 384) Me.cmdPadovan.Name = "cmdPadovan" - Me.cmdPadovan.Size = New System.Drawing.Size(74, 22) + Me.cmdPadovan.Size = New System.Drawing.Size(111, 33) Me.cmdPadovan.TabIndex = 41 Me.cmdPadovan.Text = "padovan" Me.cmdPadovan.UseVisualStyleBackColor = True @@ -1452,10 +1397,9 @@ Partial Class ucrCalculator 'cmdAchilles ' Me.cmdAchilles.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAchilles.Location = New System.Drawing.Point(2, 256) - Me.cmdAchilles.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAchilles.Location = New System.Drawing.Point(3, 384) Me.cmdAchilles.Name = "cmdAchilles" - Me.cmdAchilles.Size = New System.Drawing.Size(74, 22) + Me.cmdAchilles.Size = New System.Drawing.Size(111, 33) Me.cmdAchilles.TabIndex = 40 Me.cmdAchilles.Text = "achilles" Me.cmdAchilles.UseVisualStyleBackColor = True @@ -1463,10 +1407,9 @@ Partial Class ucrCalculator 'cmdHappy ' Me.cmdHappy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHappy.Location = New System.Drawing.Point(221, 235) - Me.cmdHappy.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHappy.Location = New System.Drawing.Point(332, 352) Me.cmdHappy.Name = "cmdHappy" - Me.cmdHappy.Size = New System.Drawing.Size(74, 22) + Me.cmdHappy.Size = New System.Drawing.Size(111, 33) Me.cmdHappy.TabIndex = 39 Me.cmdHappy.Text = "happy" Me.cmdHappy.UseVisualStyleBackColor = True @@ -1474,10 +1417,9 @@ Partial Class ucrCalculator 'cmdUgly ' Me.cmdUgly.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdUgly.Location = New System.Drawing.Point(148, 235) - Me.cmdUgly.Margin = New System.Windows.Forms.Padding(2) + Me.cmdUgly.Location = New System.Drawing.Point(222, 352) Me.cmdUgly.Name = "cmdUgly" - Me.cmdUgly.Size = New System.Drawing.Size(74, 22) + Me.cmdUgly.Size = New System.Drawing.Size(111, 33) Me.cmdUgly.TabIndex = 38 Me.cmdUgly.Text = "ugly" Me.cmdUgly.UseVisualStyleBackColor = True @@ -1485,10 +1427,9 @@ Partial Class ucrCalculator 'cmdPowerful ' Me.cmdPowerful.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPowerful.Location = New System.Drawing.Point(75, 235) - Me.cmdPowerful.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPowerful.Location = New System.Drawing.Point(112, 352) Me.cmdPowerful.Name = "cmdPowerful" - Me.cmdPowerful.Size = New System.Drawing.Size(74, 22) + Me.cmdPowerful.Size = New System.Drawing.Size(111, 33) Me.cmdPowerful.TabIndex = 37 Me.cmdPowerful.Text = "powerful" Me.cmdPowerful.UseVisualStyleBackColor = True @@ -1496,10 +1437,9 @@ Partial Class ucrCalculator 'cmdFrugal ' Me.cmdFrugal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFrugal.Location = New System.Drawing.Point(2, 235) - Me.cmdFrugal.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFrugal.Location = New System.Drawing.Point(3, 352) Me.cmdFrugal.Name = "cmdFrugal" - Me.cmdFrugal.Size = New System.Drawing.Size(74, 22) + Me.cmdFrugal.Size = New System.Drawing.Size(111, 33) Me.cmdFrugal.TabIndex = 36 Me.cmdFrugal.Text = "frugal" Me.cmdFrugal.UseVisualStyleBackColor = True @@ -1507,10 +1447,9 @@ Partial Class ucrCalculator 'cmdPerfect ' Me.cmdPerfect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPerfect.Location = New System.Drawing.Point(221, 214) - Me.cmdPerfect.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPerfect.Location = New System.Drawing.Point(332, 321) Me.cmdPerfect.Name = "cmdPerfect" - Me.cmdPerfect.Size = New System.Drawing.Size(74, 22) + Me.cmdPerfect.Size = New System.Drawing.Size(111, 33) Me.cmdPerfect.TabIndex = 35 Me.cmdPerfect.Text = "perfect" Me.cmdPerfect.UseVisualStyleBackColor = True @@ -1518,10 +1457,9 @@ Partial Class ucrCalculator 'cmdAbundant ' Me.cmdAbundant.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAbundant.Location = New System.Drawing.Point(148, 214) - Me.cmdAbundant.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAbundant.Location = New System.Drawing.Point(222, 321) Me.cmdAbundant.Name = "cmdAbundant" - Me.cmdAbundant.Size = New System.Drawing.Size(74, 22) + Me.cmdAbundant.Size = New System.Drawing.Size(111, 33) Me.cmdAbundant.TabIndex = 34 Me.cmdAbundant.Text = "abundant" Me.cmdAbundant.UseVisualStyleBackColor = True @@ -1529,10 +1467,9 @@ Partial Class ucrCalculator 'cmdCatalan ' Me.cmdCatalan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCatalan.Location = New System.Drawing.Point(75, 214) - Me.cmdCatalan.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCatalan.Location = New System.Drawing.Point(112, 321) Me.cmdCatalan.Name = "cmdCatalan" - Me.cmdCatalan.Size = New System.Drawing.Size(74, 22) + Me.cmdCatalan.Size = New System.Drawing.Size(111, 33) Me.cmdCatalan.TabIndex = 33 Me.cmdCatalan.Text = " catalan" Me.cmdCatalan.UseVisualStyleBackColor = True @@ -1540,10 +1477,9 @@ Partial Class ucrCalculator 'cmdPalindrome ' Me.cmdPalindrome.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPalindrome.Location = New System.Drawing.Point(2, 214) - Me.cmdPalindrome.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPalindrome.Location = New System.Drawing.Point(3, 321) Me.cmdPalindrome.Name = "cmdPalindrome" - Me.cmdPalindrome.Size = New System.Drawing.Size(74, 22) + Me.cmdPalindrome.Size = New System.Drawing.Size(111, 33) Me.cmdPalindrome.TabIndex = 32 Me.cmdPalindrome.Text = "palindrome" Me.cmdPalindrome.UseVisualStyleBackColor = True @@ -1551,10 +1487,9 @@ Partial Class ucrCalculator 'cmdRoman ' Me.cmdRoman.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRoman.Location = New System.Drawing.Point(148, 102) - Me.cmdRoman.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRoman.Location = New System.Drawing.Point(222, 153) Me.cmdRoman.Name = "cmdRoman" - Me.cmdRoman.Size = New System.Drawing.Size(74, 22) + Me.cmdRoman.Size = New System.Drawing.Size(111, 33) Me.cmdRoman.TabIndex = 31 Me.cmdRoman.Text = "roman" Me.cmdRoman.UseVisualStyleBackColor = True @@ -1562,10 +1497,9 @@ Partial Class ucrCalculator 'cmdHexmode ' Me.cmdHexmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHexmode.Location = New System.Drawing.Point(221, 81) - Me.cmdHexmode.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHexmode.Location = New System.Drawing.Point(332, 122) Me.cmdHexmode.Name = "cmdHexmode" - Me.cmdHexmode.Size = New System.Drawing.Size(74, 22) + Me.cmdHexmode.Size = New System.Drawing.Size(111, 33) Me.cmdHexmode.TabIndex = 30 Me.cmdHexmode.Text = "hexmode" Me.cmdHexmode.UseVisualStyleBackColor = True @@ -1573,10 +1507,9 @@ Partial Class ucrCalculator 'cmdOctmode ' Me.cmdOctmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctmode.Location = New System.Drawing.Point(148, 81) - Me.cmdOctmode.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOctmode.Location = New System.Drawing.Point(222, 122) Me.cmdOctmode.Name = "cmdOctmode" - Me.cmdOctmode.Size = New System.Drawing.Size(74, 22) + Me.cmdOctmode.Size = New System.Drawing.Size(111, 33) Me.cmdOctmode.TabIndex = 29 Me.cmdOctmode.Text = "octmode" Me.cmdOctmode.UseVisualStyleBackColor = True @@ -1584,10 +1517,9 @@ Partial Class ucrCalculator 'cmdKTuple ' Me.cmdKTuple.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdKTuple.Location = New System.Drawing.Point(148, 181) - Me.cmdKTuple.Margin = New System.Windows.Forms.Padding(2) + Me.cmdKTuple.Location = New System.Drawing.Point(222, 272) Me.cmdKTuple.Name = "cmdKTuple" - Me.cmdKTuple.Size = New System.Drawing.Size(74, 22) + Me.cmdKTuple.Size = New System.Drawing.Size(111, 33) Me.cmdKTuple.TabIndex = 28 Me.cmdKTuple.Text = "k-tuple" Me.cmdKTuple.UseVisualStyleBackColor = True @@ -1595,10 +1527,9 @@ Partial Class ucrCalculator 'cmdTriplets ' Me.cmdTriplets.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriplets.Location = New System.Drawing.Point(75, 181) - Me.cmdTriplets.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTriplets.Location = New System.Drawing.Point(112, 272) Me.cmdTriplets.Name = "cmdTriplets" - Me.cmdTriplets.Size = New System.Drawing.Size(74, 22) + Me.cmdTriplets.Size = New System.Drawing.Size(111, 33) Me.cmdTriplets.TabIndex = 27 Me.cmdTriplets.Text = "triplets" Me.cmdTriplets.UseVisualStyleBackColor = True @@ -1606,10 +1537,9 @@ Partial Class ucrCalculator 'cmdThird ' Me.cmdThird.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdThird.Location = New System.Drawing.Point(2, 181) - Me.cmdThird.Margin = New System.Windows.Forms.Padding(2) + Me.cmdThird.Location = New System.Drawing.Point(3, 272) Me.cmdThird.Name = "cmdThird" - Me.cmdThird.Size = New System.Drawing.Size(74, 22) + Me.cmdThird.Size = New System.Drawing.Size(111, 33) Me.cmdThird.TabIndex = 26 Me.cmdThird.Text = "third" Me.cmdThird.UseVisualStyleBackColor = True @@ -1617,10 +1547,9 @@ Partial Class ucrCalculator 'cmdSexy ' Me.cmdSexy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSexy.Location = New System.Drawing.Point(221, 160) - Me.cmdSexy.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSexy.Location = New System.Drawing.Point(332, 240) Me.cmdSexy.Name = "cmdSexy" - Me.cmdSexy.Size = New System.Drawing.Size(74, 22) + Me.cmdSexy.Size = New System.Drawing.Size(111, 33) Me.cmdSexy.TabIndex = 25 Me.cmdSexy.Text = "sexy" Me.cmdSexy.UseVisualStyleBackColor = True @@ -1628,10 +1557,9 @@ Partial Class ucrCalculator 'cmdCousin ' Me.cmdCousin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCousin.Location = New System.Drawing.Point(148, 160) - Me.cmdCousin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCousin.Location = New System.Drawing.Point(222, 240) Me.cmdCousin.Name = "cmdCousin" - Me.cmdCousin.Size = New System.Drawing.Size(74, 22) + Me.cmdCousin.Size = New System.Drawing.Size(111, 33) Me.cmdCousin.TabIndex = 24 Me.cmdCousin.Text = "cousin" Me.cmdCousin.UseVisualStyleBackColor = True @@ -1639,10 +1567,9 @@ Partial Class ucrCalculator 'cmdTwin ' Me.cmdTwin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTwin.Location = New System.Drawing.Point(75, 160) - Me.cmdTwin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTwin.Location = New System.Drawing.Point(112, 240) Me.cmdTwin.Name = "cmdTwin" - Me.cmdTwin.Size = New System.Drawing.Size(74, 22) + Me.cmdTwin.Size = New System.Drawing.Size(111, 33) Me.cmdTwin.TabIndex = 23 Me.cmdTwin.Text = "twin" Me.cmdTwin.UseVisualStyleBackColor = True @@ -1650,10 +1577,9 @@ Partial Class ucrCalculator 'cmdPhi ' Me.cmdPhi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPhi.Location = New System.Drawing.Point(75, 102) - Me.cmdPhi.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPhi.Location = New System.Drawing.Point(112, 153) Me.cmdPhi.Name = "cmdPhi" - Me.cmdPhi.Size = New System.Drawing.Size(74, 22) + Me.cmdPhi.Size = New System.Drawing.Size(111, 33) Me.cmdPhi.TabIndex = 22 Me.cmdPhi.Text = "phi" Me.cmdPhi.UseVisualStyleBackColor = True @@ -1661,10 +1587,9 @@ Partial Class ucrCalculator 'cmdCoprime ' Me.cmdCoprime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCoprime.Location = New System.Drawing.Point(2, 160) - Me.cmdCoprime.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCoprime.Location = New System.Drawing.Point(3, 240) Me.cmdCoprime.Name = "cmdCoprime" - Me.cmdCoprime.Size = New System.Drawing.Size(74, 22) + Me.cmdCoprime.Size = New System.Drawing.Size(111, 33) Me.cmdCoprime.TabIndex = 21 Me.cmdCoprime.Text = "coprime" Me.cmdCoprime.UseVisualStyleBackColor = True @@ -1672,10 +1597,9 @@ Partial Class ucrCalculator 'cmdSCM ' Me.cmdSCM.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSCM.Location = New System.Drawing.Point(2, 102) - Me.cmdSCM.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSCM.Location = New System.Drawing.Point(3, 153) Me.cmdSCM.Name = "cmdSCM" - Me.cmdSCM.Size = New System.Drawing.Size(74, 22) + Me.cmdSCM.Size = New System.Drawing.Size(111, 33) Me.cmdSCM.TabIndex = 20 Me.cmdSCM.Text = "scm" Me.cmdSCM.UseVisualStyleBackColor = True @@ -1683,10 +1607,9 @@ Partial Class ucrCalculator 'cmdGCD ' Me.cmdGCD.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGCD.Location = New System.Drawing.Point(221, 102) - Me.cmdGCD.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGCD.Location = New System.Drawing.Point(332, 153) Me.cmdGCD.Name = "cmdGCD" - Me.cmdGCD.Size = New System.Drawing.Size(74, 22) + Me.cmdGCD.Size = New System.Drawing.Size(111, 33) Me.cmdGCD.TabIndex = 19 Me.cmdGCD.Text = "gcd" Me.cmdGCD.UseVisualStyleBackColor = True @@ -1694,20 +1617,18 @@ Partial Class ucrCalculator 'cmdGeneratePrimes ' Me.cmdGeneratePrimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 139) - Me.cmdGeneratePrimes.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGeneratePrimes.Location = New System.Drawing.Point(3, 208) Me.cmdGeneratePrimes.Name = "cmdGeneratePrimes" - Me.cmdGeneratePrimes.Size = New System.Drawing.Size(74, 22) + Me.cmdGeneratePrimes.Size = New System.Drawing.Size(111, 33) Me.cmdGeneratePrimes.TabIndex = 18 Me.cmdGeneratePrimes.Text = "primes" Me.cmdGeneratePrimes.UseVisualStyleBackColor = True ' 'cmdNthPrime ' - Me.cmdNthPrime.Location = New System.Drawing.Point(75, 139) - Me.cmdNthPrime.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNthPrime.Location = New System.Drawing.Point(112, 208) Me.cmdNthPrime.Name = "cmdNthPrime" - Me.cmdNthPrime.Size = New System.Drawing.Size(74, 22) + Me.cmdNthPrime.Size = New System.Drawing.Size(111, 33) Me.cmdNthPrime.TabIndex = 17 Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True @@ -1716,10 +1637,9 @@ Partial Class ucrCalculator ' Me.cmdIntegerRHelp.AutoSize = True Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(205, 283) - Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(308, 416) Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(135, 45) Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger Me.cmdIntegerRHelp.TabIndex = 16 Me.cmdIntegerRHelp.Text = "R Help" @@ -1730,57 +1650,56 @@ Partial Class ucrCalculator Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripInteger.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GmpToolStripMenuItem, Me.DescToolsToolStripMenuItem, Me.RutilsToolStripMenuItem, Me.PrimesToolStripMenuItem, Me.ZseqToolStripMenuItem, Me.UtilsToolStripMenuItem, Me.ConfdesignToolStripMenuItem}) Me.ContextMenuStripInteger.Name = "ContextMenuStripInteger" - Me.ContextMenuStripInteger.Size = New System.Drawing.Size(139, 158) + Me.ContextMenuStripInteger.Size = New System.Drawing.Size(180, 228) ' 'GmpToolStripMenuItem ' Me.GmpToolStripMenuItem.Name = "GmpToolStripMenuItem" - Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(138, 22) + Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(179, 32) Me.GmpToolStripMenuItem.Text = "Gmp" ' 'DescToolsToolStripMenuItem ' Me.DescToolsToolStripMenuItem.Name = "DescToolsToolStripMenuItem" - Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(138, 22) + Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(179, 32) Me.DescToolsToolStripMenuItem.Text = "DescTools" ' 'RutilsToolStripMenuItem ' Me.RutilsToolStripMenuItem.Name = "RutilsToolStripMenuItem" - Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(138, 22) + Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(179, 32) Me.RutilsToolStripMenuItem.Text = "R.utils" ' 'PrimesToolStripMenuItem ' Me.PrimesToolStripMenuItem.Name = "PrimesToolStripMenuItem" - Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(138, 22) + Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(179, 32) Me.PrimesToolStripMenuItem.Text = "Primes" ' 'ZseqToolStripMenuItem ' Me.ZseqToolStripMenuItem.Name = "ZseqToolStripMenuItem" - Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(138, 22) + Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(179, 32) Me.ZseqToolStripMenuItem.Text = "Zseq" ' 'UtilsToolStripMenuItem ' Me.UtilsToolStripMenuItem.Name = "UtilsToolStripMenuItem" - Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(138, 22) + Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(179, 32) Me.UtilsToolStripMenuItem.Text = "R Utils" ' 'ConfdesignToolStripMenuItem ' Me.ConfdesignToolStripMenuItem.Name = "ConfdesignToolStripMenuItem" - Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(138, 22) + Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(179, 32) Me.ConfdesignToolStripMenuItem.Text = "Conf.design" ' 'cmdHex ' Me.cmdHex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHex.Location = New System.Drawing.Point(75, 81) - Me.cmdHex.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHex.Location = New System.Drawing.Point(112, 122) Me.cmdHex.Name = "cmdHex" - Me.cmdHex.Size = New System.Drawing.Size(74, 22) + Me.cmdHex.Size = New System.Drawing.Size(111, 33) Me.cmdHex.TabIndex = 15 Me.cmdHex.Text = "hex" Me.cmdHex.UseVisualStyleBackColor = True @@ -1788,10 +1707,9 @@ Partial Class ucrCalculator 'cmdOctal ' Me.cmdOctal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctal.Location = New System.Drawing.Point(2, 81) - Me.cmdOctal.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOctal.Location = New System.Drawing.Point(3, 122) Me.cmdOctal.Name = "cmdOctal" - Me.cmdOctal.Size = New System.Drawing.Size(74, 22) + Me.cmdOctal.Size = New System.Drawing.Size(111, 33) Me.cmdOctal.TabIndex = 14 Me.cmdOctal.Text = "octal" Me.cmdOctal.UseVisualStyleBackColor = True @@ -1799,10 +1717,9 @@ Partial Class ucrCalculator 'cmdBinary ' Me.cmdBinary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBinary.Location = New System.Drawing.Point(221, 60) - Me.cmdBinary.Margin = New System.Windows.Forms.Padding(2) + Me.cmdBinary.Location = New System.Drawing.Point(332, 90) Me.cmdBinary.Name = "cmdBinary" - Me.cmdBinary.Size = New System.Drawing.Size(74, 22) + Me.cmdBinary.Size = New System.Drawing.Size(111, 33) Me.cmdBinary.TabIndex = 13 Me.cmdBinary.Text = "binary" Me.cmdBinary.UseVisualStyleBackColor = True @@ -1810,20 +1727,18 @@ Partial Class ucrCalculator 'cmdBigQ ' Me.cmdBigQ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigQ.Location = New System.Drawing.Point(75, 18) - Me.cmdBigQ.Margin = New System.Windows.Forms.Padding(2) + Me.cmdBigQ.Location = New System.Drawing.Point(112, 27) Me.cmdBigQ.Name = "cmdBigQ" - Me.cmdBigQ.Size = New System.Drawing.Size(74, 22) + Me.cmdBigQ.Size = New System.Drawing.Size(111, 33) Me.cmdBigQ.TabIndex = 12 Me.cmdBigQ.Text = "bigq" Me.cmdBigQ.UseVisualStyleBackColor = True ' 'cmdDigitSum ' - Me.cmdDigitSum.Location = New System.Drawing.Point(221, 39) - Me.cmdDigitSum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigitSum.Location = New System.Drawing.Point(332, 58) Me.cmdDigitSum.Name = "cmdDigitSum" - Me.cmdDigitSum.Size = New System.Drawing.Size(74, 22) + Me.cmdDigitSum.Size = New System.Drawing.Size(111, 33) Me.cmdDigitSum.TabIndex = 10 Me.cmdDigitSum.Text = "digitsum" Me.cmdDigitSum.UseVisualStyleBackColor = True @@ -1831,60 +1746,54 @@ Partial Class ucrCalculator 'cmdRankPercent ' Me.cmdRankPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRankPercent.Location = New System.Drawing.Point(148, 60) - Me.cmdRankPercent.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRankPercent.Location = New System.Drawing.Point(222, 90) Me.cmdRankPercent.Name = "cmdRankPercent" - Me.cmdRankPercent.Size = New System.Drawing.Size(74, 22) + Me.cmdRankPercent.Size = New System.Drawing.Size(111, 33) Me.cmdRankPercent.TabIndex = 9 Me.cmdRankPercent.Text = "percentrank" Me.cmdRankPercent.UseVisualStyleBackColor = True ' 'cmdDivisors ' - Me.cmdDivisors.Location = New System.Drawing.Point(2, 39) - Me.cmdDivisors.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDivisors.Location = New System.Drawing.Point(3, 58) Me.cmdDivisors.Name = "cmdDivisors" - Me.cmdDivisors.Size = New System.Drawing.Size(74, 22) + Me.cmdDivisors.Size = New System.Drawing.Size(111, 33) Me.cmdDivisors.TabIndex = 8 Me.cmdDivisors.Text = "divisors" Me.cmdDivisors.UseVisualStyleBackColor = True ' 'cmdFibonacci ' - Me.cmdFibonacci.Location = New System.Drawing.Point(2, 60) - Me.cmdFibonacci.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFibonacci.Location = New System.Drawing.Point(3, 90) Me.cmdFibonacci.Name = "cmdFibonacci" - Me.cmdFibonacci.Size = New System.Drawing.Size(74, 22) + Me.cmdFibonacci.Size = New System.Drawing.Size(111, 33) Me.cmdFibonacci.TabIndex = 7 Me.cmdFibonacci.Text = "fibonacci" Me.cmdFibonacci.UseVisualStyleBackColor = True ' 'cmdNextPrime ' - Me.cmdNextPrime.Location = New System.Drawing.Point(148, 139) - Me.cmdNextPrime.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNextPrime.Location = New System.Drawing.Point(222, 208) Me.cmdNextPrime.Name = "cmdNextPrime" - Me.cmdNextPrime.Size = New System.Drawing.Size(74, 22) + Me.cmdNextPrime.Size = New System.Drawing.Size(111, 33) Me.cmdNextPrime.TabIndex = 5 Me.cmdNextPrime.Text = "next prime" Me.cmdNextPrime.UseVisualStyleBackColor = True ' 'cmdChoosez ' - Me.cmdChoosez.Location = New System.Drawing.Point(221, 18) - Me.cmdChoosez.Margin = New System.Windows.Forms.Padding(2) + Me.cmdChoosez.Location = New System.Drawing.Point(332, 27) Me.cmdChoosez.Name = "cmdChoosez" - Me.cmdChoosez.Size = New System.Drawing.Size(74, 22) + Me.cmdChoosez.Size = New System.Drawing.Size(111, 33) Me.cmdChoosez.TabIndex = 4 Me.cmdChoosez.Text = "choose" Me.cmdChoosez.UseVisualStyleBackColor = True ' 'cmdFactorial ' - Me.cmdFactorial.Location = New System.Drawing.Point(148, 18) - Me.cmdFactorial.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFactorial.Location = New System.Drawing.Point(222, 27) Me.cmdFactorial.Name = "cmdFactorial" - Me.cmdFactorial.Size = New System.Drawing.Size(74, 22) + Me.cmdFactorial.Size = New System.Drawing.Size(111, 33) Me.cmdFactorial.TabIndex = 2 Me.cmdFactorial.Text = "factorial" Me.cmdFactorial.UseVisualStyleBackColor = True @@ -1892,10 +1801,9 @@ Partial Class ucrCalculator 'cmdIsPrime ' Me.cmdIsPrime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdIsPrime.Location = New System.Drawing.Point(221, 139) - Me.cmdIsPrime.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIsPrime.Location = New System.Drawing.Point(332, 208) Me.cmdIsPrime.Name = "cmdIsPrime" - Me.cmdIsPrime.Size = New System.Drawing.Size(74, 22) + Me.cmdIsPrime.Size = New System.Drawing.Size(111, 33) Me.cmdIsPrime.TabIndex = 1 Me.cmdIsPrime.Text = "is_prime" Me.cmdIsPrime.UseVisualStyleBackColor = True @@ -1903,10 +1811,9 @@ Partial Class ucrCalculator 'cmdBigZ ' Me.cmdBigZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigZ.Location = New System.Drawing.Point(2, 18) - Me.cmdBigZ.Margin = New System.Windows.Forms.Padding(2) + Me.cmdBigZ.Location = New System.Drawing.Point(3, 27) Me.cmdBigZ.Name = "cmdBigZ" - Me.cmdBigZ.Size = New System.Drawing.Size(74, 22) + Me.cmdBigZ.Size = New System.Drawing.Size(111, 33) Me.cmdBigZ.TabIndex = 0 Me.cmdBigZ.Text = "bigz" Me.cmdBigZ.UseVisualStyleBackColor = True @@ -1934,11 +1841,9 @@ Partial Class ucrCalculator Me.grpFactor.Controls.Add(Me.cmdLabelled) Me.grpFactor.Controls.Add(Me.cmdFactor) Me.grpFactor.Controls.Add(Me.cmdAnon) - Me.grpFactor.Location = New System.Drawing.Point(434, 62) - Me.grpFactor.Margin = New System.Windows.Forms.Padding(2) + Me.grpFactor.Location = New System.Drawing.Point(651, 93) Me.grpFactor.Name = "grpFactor" - Me.grpFactor.Padding = New System.Windows.Forms.Padding(2) - Me.grpFactor.Size = New System.Drawing.Size(248, 208) + Me.grpFactor.Size = New System.Drawing.Size(372, 312) Me.grpFactor.TabIndex = 191 Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" @@ -1947,10 +1852,9 @@ Partial Class ucrCalculator ' Me.cmdTransformHelp.AutoSize = True Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 172) - Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformHelp.Location = New System.Drawing.Point(225, 256) Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformHelp.Size = New System.Drawing.Size(135, 45) Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor Me.cmdTransformHelp.TabIndex = 212 Me.cmdTransformHelp.Text = "R Help" @@ -1961,21 +1865,20 @@ Partial Class ucrCalculator Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripFactor.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FactorForcatsToolStripMenuItem}) Me.ContextMenuStripFactor.Name = "ContextMenuStrip1" - Me.ContextMenuStripFactor.Size = New System.Drawing.Size(111, 26) + Me.ContextMenuStripFactor.Size = New System.Drawing.Size(139, 36) ' 'FactorForcatsToolStripMenuItem ' Me.FactorForcatsToolStripMenuItem.Name = "FactorForcatsToolStripMenuItem" - Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(110, 22) + Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(138, 32) Me.FactorForcatsToolStripMenuItem.Text = "forcats" ' 'cmdShuffle ' Me.cmdShuffle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShuffle.Location = New System.Drawing.Point(181, 140) - Me.cmdShuffle.Margin = New System.Windows.Forms.Padding(2) + Me.cmdShuffle.Location = New System.Drawing.Point(272, 210) Me.cmdShuffle.Name = "cmdShuffle" - Me.cmdShuffle.Size = New System.Drawing.Size(60, 32) + Me.cmdShuffle.Size = New System.Drawing.Size(90, 48) Me.cmdShuffle.TabIndex = 210 Me.cmdShuffle.Text = "shuffle" Me.cmdShuffle.UseVisualStyleBackColor = True @@ -1983,10 +1886,9 @@ Partial Class ucrCalculator 'cmdShift ' Me.cmdShift.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShift.Location = New System.Drawing.Point(122, 140) - Me.cmdShift.Margin = New System.Windows.Forms.Padding(2) + Me.cmdShift.Location = New System.Drawing.Point(183, 210) Me.cmdShift.Name = "cmdShift" - Me.cmdShift.Size = New System.Drawing.Size(60, 32) + Me.cmdShift.Size = New System.Drawing.Size(90, 48) Me.cmdShift.TabIndex = 209 Me.cmdShift.Text = "shift" Me.cmdShift.UseVisualStyleBackColor = True @@ -1994,10 +1896,9 @@ Partial Class ucrCalculator 'cmdReverse ' Me.cmdReverse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverse.Location = New System.Drawing.Point(63, 140) - Me.cmdReverse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdReverse.Location = New System.Drawing.Point(94, 210) Me.cmdReverse.Name = "cmdReverse" - Me.cmdReverse.Size = New System.Drawing.Size(60, 32) + Me.cmdReverse.Size = New System.Drawing.Size(90, 48) Me.cmdReverse.TabIndex = 208 Me.cmdReverse.Text = "reverse" Me.cmdReverse.UseVisualStyleBackColor = True @@ -2005,10 +1906,9 @@ Partial Class ucrCalculator 'cmdReorder ' Me.cmdReorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReorder.Location = New System.Drawing.Point(4, 140) - Me.cmdReorder.Margin = New System.Windows.Forms.Padding(2) + Me.cmdReorder.Location = New System.Drawing.Point(6, 210) Me.cmdReorder.Name = "cmdReorder" - Me.cmdReorder.Size = New System.Drawing.Size(60, 32) + Me.cmdReorder.Size = New System.Drawing.Size(90, 48) Me.cmdReorder.TabIndex = 207 Me.cmdReorder.Text = "reorder" Me.cmdReorder.UseVisualStyleBackColor = True @@ -2016,10 +1916,9 @@ Partial Class ucrCalculator 'cmdRelevel ' Me.cmdRelevel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRelevel.Location = New System.Drawing.Point(181, 109) - Me.cmdRelevel.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRelevel.Location = New System.Drawing.Point(272, 164) Me.cmdRelevel.Name = "cmdRelevel" - Me.cmdRelevel.Size = New System.Drawing.Size(60, 32) + Me.cmdRelevel.Size = New System.Drawing.Size(90, 48) Me.cmdRelevel.TabIndex = 206 Me.cmdRelevel.Text = "relevel" Me.cmdRelevel.UseVisualStyleBackColor = True @@ -2027,10 +1926,9 @@ Partial Class ucrCalculator 'cmdRecode ' Me.cmdRecode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRecode.Location = New System.Drawing.Point(122, 109) - Me.cmdRecode.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRecode.Location = New System.Drawing.Point(183, 164) Me.cmdRecode.Name = "cmdRecode" - Me.cmdRecode.Size = New System.Drawing.Size(60, 32) + Me.cmdRecode.Size = New System.Drawing.Size(90, 48) Me.cmdRecode.TabIndex = 205 Me.cmdRecode.Text = "recode" Me.cmdRecode.UseVisualStyleBackColor = True @@ -2038,10 +1936,9 @@ Partial Class ucrCalculator 'cmdOther ' Me.cmdOther.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOther.Location = New System.Drawing.Point(63, 109) - Me.cmdOther.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOther.Location = New System.Drawing.Point(94, 164) Me.cmdOther.Name = "cmdOther" - Me.cmdOther.Size = New System.Drawing.Size(60, 32) + Me.cmdOther.Size = New System.Drawing.Size(90, 48) Me.cmdOther.TabIndex = 204 Me.cmdOther.Text = "other" Me.cmdOther.UseVisualStyleBackColor = True @@ -2049,10 +1946,9 @@ Partial Class ucrCalculator 'cmdFmatch ' Me.cmdFmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFmatch.Location = New System.Drawing.Point(4, 109) - Me.cmdFmatch.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFmatch.Location = New System.Drawing.Point(6, 164) Me.cmdFmatch.Name = "cmdFmatch" - Me.cmdFmatch.Size = New System.Drawing.Size(60, 32) + Me.cmdFmatch.Size = New System.Drawing.Size(90, 48) Me.cmdFmatch.TabIndex = 203 Me.cmdFmatch.Text = "match" Me.cmdFmatch.UseVisualStyleBackColor = True @@ -2060,10 +1956,9 @@ Partial Class ucrCalculator 'cmdLump ' Me.cmdLump.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLump.Location = New System.Drawing.Point(181, 78) - Me.cmdLump.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLump.Location = New System.Drawing.Point(272, 117) Me.cmdLump.Name = "cmdLump" - Me.cmdLump.Size = New System.Drawing.Size(60, 32) + Me.cmdLump.Size = New System.Drawing.Size(90, 48) Me.cmdLump.TabIndex = 202 Me.cmdLump.Text = "lump" Me.cmdLump.UseVisualStyleBackColor = True @@ -2071,10 +1966,9 @@ Partial Class ucrCalculator 'cmdInseq ' Me.cmdInseq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInseq.Location = New System.Drawing.Point(122, 78) - Me.cmdInseq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdInseq.Location = New System.Drawing.Point(183, 117) Me.cmdInseq.Name = "cmdInseq" - Me.cmdInseq.Size = New System.Drawing.Size(60, 32) + Me.cmdInseq.Size = New System.Drawing.Size(90, 48) Me.cmdInseq.TabIndex = 201 Me.cmdInseq.Text = "inseq" Me.cmdInseq.UseVisualStyleBackColor = True @@ -2082,10 +1976,9 @@ Partial Class ucrCalculator 'cmdInfreq ' Me.cmdInfreq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInfreq.Location = New System.Drawing.Point(63, 78) - Me.cmdInfreq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdInfreq.Location = New System.Drawing.Point(94, 117) Me.cmdInfreq.Name = "cmdInfreq" - Me.cmdInfreq.Size = New System.Drawing.Size(60, 32) + Me.cmdInfreq.Size = New System.Drawing.Size(90, 48) Me.cmdInfreq.TabIndex = 200 Me.cmdInfreq.Text = "infreq" Me.cmdInfreq.UseVisualStyleBackColor = True @@ -2093,10 +1986,9 @@ Partial Class ucrCalculator 'cmdInorder ' Me.cmdInorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInorder.Location = New System.Drawing.Point(4, 78) - Me.cmdInorder.Margin = New System.Windows.Forms.Padding(2) + Me.cmdInorder.Location = New System.Drawing.Point(6, 117) Me.cmdInorder.Name = "cmdInorder" - Me.cmdInorder.Size = New System.Drawing.Size(60, 32) + Me.cmdInorder.Size = New System.Drawing.Size(90, 48) Me.cmdInorder.TabIndex = 199 Me.cmdInorder.Text = "inorder" Me.cmdInorder.UseVisualStyleBackColor = True @@ -2104,10 +1996,9 @@ Partial Class ucrCalculator 'cmdAdd_na ' Me.cmdAdd_na.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAdd_na.Location = New System.Drawing.Point(181, 47) - Me.cmdAdd_na.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAdd_na.Location = New System.Drawing.Point(272, 70) Me.cmdAdd_na.Name = "cmdAdd_na" - Me.cmdAdd_na.Size = New System.Drawing.Size(60, 32) + Me.cmdAdd_na.Size = New System.Drawing.Size(90, 48) Me.cmdAdd_na.TabIndex = 198 Me.cmdAdd_na.Text = "add_na" Me.cmdAdd_na.UseVisualStyleBackColor = True @@ -2115,10 +2006,9 @@ Partial Class ucrCalculator 'cmdExpand ' Me.cmdExpand.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExpand.Location = New System.Drawing.Point(122, 47) - Me.cmdExpand.Margin = New System.Windows.Forms.Padding(2) + Me.cmdExpand.Location = New System.Drawing.Point(183, 70) Me.cmdExpand.Name = "cmdExpand" - Me.cmdExpand.Size = New System.Drawing.Size(60, 32) + Me.cmdExpand.Size = New System.Drawing.Size(90, 48) Me.cmdExpand.TabIndex = 197 Me.cmdExpand.Text = "expand" Me.cmdExpand.UseVisualStyleBackColor = True @@ -2126,10 +2016,9 @@ Partial Class ucrCalculator 'cmdDrop ' Me.cmdDrop.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDrop.Location = New System.Drawing.Point(63, 47) - Me.cmdDrop.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDrop.Location = New System.Drawing.Point(94, 70) Me.cmdDrop.Name = "cmdDrop" - Me.cmdDrop.Size = New System.Drawing.Size(60, 32) + Me.cmdDrop.Size = New System.Drawing.Size(90, 48) Me.cmdDrop.TabIndex = 196 Me.cmdDrop.Text = "drop" Me.cmdDrop.UseVisualStyleBackColor = True @@ -2137,10 +2026,9 @@ Partial Class ucrCalculator 'cmdCross ' Me.cmdCross.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCross.Location = New System.Drawing.Point(4, 47) - Me.cmdCross.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCross.Location = New System.Drawing.Point(6, 70) Me.cmdCross.Name = "cmdCross" - Me.cmdCross.Size = New System.Drawing.Size(60, 32) + Me.cmdCross.Size = New System.Drawing.Size(90, 48) Me.cmdCross.TabIndex = 195 Me.cmdCross.Text = "cross" Me.cmdCross.UseVisualStyleBackColor = True @@ -2148,10 +2036,9 @@ Partial Class ucrCalculator 'cmdCollapse ' Me.cmdCollapse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollapse.Location = New System.Drawing.Point(181, 16) - Me.cmdCollapse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCollapse.Location = New System.Drawing.Point(272, 24) Me.cmdCollapse.Name = "cmdCollapse" - Me.cmdCollapse.Size = New System.Drawing.Size(60, 32) + Me.cmdCollapse.Size = New System.Drawing.Size(90, 48) Me.cmdCollapse.TabIndex = 194 Me.cmdCollapse.Text = "collapse" Me.cmdCollapse.UseVisualStyleBackColor = True @@ -2159,10 +2046,9 @@ Partial Class ucrCalculator 'cmdLabelled ' Me.cmdLabelled.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLabelled.Location = New System.Drawing.Point(122, 16) - Me.cmdLabelled.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLabelled.Location = New System.Drawing.Point(183, 24) Me.cmdLabelled.Name = "cmdLabelled" - Me.cmdLabelled.Size = New System.Drawing.Size(60, 32) + Me.cmdLabelled.Size = New System.Drawing.Size(90, 48) Me.cmdLabelled.TabIndex = 193 Me.cmdLabelled.Text = "labelled " Me.cmdLabelled.UseVisualStyleBackColor = True @@ -2170,10 +2056,9 @@ Partial Class ucrCalculator 'cmdFactor ' Me.cmdFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFactor.Location = New System.Drawing.Point(4, 16) - Me.cmdFactor.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFactor.Location = New System.Drawing.Point(6, 24) Me.cmdFactor.Name = "cmdFactor" - Me.cmdFactor.Size = New System.Drawing.Size(60, 32) + Me.cmdFactor.Size = New System.Drawing.Size(90, 48) Me.cmdFactor.TabIndex = 191 Me.cmdFactor.Text = "factor" Me.cmdFactor.UseVisualStyleBackColor = True @@ -2181,10 +2066,9 @@ Partial Class ucrCalculator 'cmdAnon ' Me.cmdAnon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnon.Location = New System.Drawing.Point(63, 16) - Me.cmdAnon.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAnon.Location = New System.Drawing.Point(94, 24) Me.cmdAnon.Name = "cmdAnon" - Me.cmdAnon.Size = New System.Drawing.Size(60, 32) + Me.cmdAnon.Size = New System.Drawing.Size(90, 48) Me.cmdAnon.TabIndex = 192 Me.cmdAnon.Text = "anon" Me.cmdAnon.UseVisualStyleBackColor = True @@ -2213,11 +2097,9 @@ Partial Class ucrCalculator Me.grpHydroGOF.Controls.Add(Me.cmdD) Me.grpHydroGOF.Controls.Add(Me.cmdCp) Me.grpHydroGOF.Controls.Add(Me.cmdBr2) - Me.grpHydroGOF.Location = New System.Drawing.Point(434, 62) - Me.grpHydroGOF.Margin = New System.Windows.Forms.Padding(2) + Me.grpHydroGOF.Location = New System.Drawing.Point(651, 93) Me.grpHydroGOF.Name = "grpHydroGOF" - Me.grpHydroGOF.Padding = New System.Windows.Forms.Padding(2) - Me.grpHydroGOF.Size = New System.Drawing.Size(182, 270) + Me.grpHydroGOF.Size = New System.Drawing.Size(273, 405) Me.grpHydroGOF.TabIndex = 195 Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "Goodness of Fit" @@ -2226,10 +2108,9 @@ Partial Class ucrCalculator ' Me.cmdHydroHelp.AutoSize = True Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(91, 236) - Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHydroHelp.Location = New System.Drawing.Point(136, 354) Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdHydroHelp.Size = New System.Drawing.Size(129, 45) Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF Me.cmdHydroHelp.TabIndex = 212 Me.cmdHydroHelp.Text = "R Help" @@ -2240,21 +2121,20 @@ Partial Class ucrCalculator Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripHydroGOF.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.HydroGOFToolStripMenuItem}) Me.ContextMenuStripHydroGOF.Name = "ContextMenuStrip1" - Me.ContextMenuStripHydroGOF.Size = New System.Drawing.Size(129, 26) + Me.ContextMenuStripHydroGOF.Size = New System.Drawing.Size(167, 36) ' 'HydroGOFToolStripMenuItem ' Me.HydroGOFToolStripMenuItem.Name = "HydroGOFToolStripMenuItem" - Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(128, 22) + Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(166, 32) Me.HydroGOFToolStripMenuItem.Text = "hydroGOF" ' 'cmdVE ' Me.cmdVE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVE.Location = New System.Drawing.Point(120, 202) - Me.cmdVE.Margin = New System.Windows.Forms.Padding(2) + Me.cmdVE.Location = New System.Drawing.Point(180, 303) Me.cmdVE.Name = "cmdVE" - Me.cmdVE.Size = New System.Drawing.Size(60, 32) + Me.cmdVE.Size = New System.Drawing.Size(90, 48) Me.cmdVE.TabIndex = 20 Me.cmdVE.Text = "VE" Me.cmdVE.UseVisualStyleBackColor = True @@ -2262,10 +2142,9 @@ Partial Class ucrCalculator 'cmdSsq ' Me.cmdSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSsq.Location = New System.Drawing.Point(61, 202) - Me.cmdSsq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSsq.Location = New System.Drawing.Point(92, 303) Me.cmdSsq.Name = "cmdSsq" - Me.cmdSsq.Size = New System.Drawing.Size(60, 32) + Me.cmdSsq.Size = New System.Drawing.Size(90, 48) Me.cmdSsq.TabIndex = 19 Me.cmdSsq.Text = "ssq" Me.cmdSsq.UseVisualStyleBackColor = True @@ -2273,10 +2152,9 @@ Partial Class ucrCalculator 'cmdRsr ' Me.cmdRsr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRsr.Location = New System.Drawing.Point(2, 202) - Me.cmdRsr.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRsr.Location = New System.Drawing.Point(3, 303) Me.cmdRsr.Name = "cmdRsr" - Me.cmdRsr.Size = New System.Drawing.Size(60, 32) + Me.cmdRsr.Size = New System.Drawing.Size(90, 48) Me.cmdRsr.TabIndex = 18 Me.cmdRsr.Text = "rsr" Me.cmdRsr.UseVisualStyleBackColor = True @@ -2284,10 +2162,9 @@ Partial Class ucrCalculator 'cmdRSD ' Me.cmdRSD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRSD.Location = New System.Drawing.Point(120, 171) - Me.cmdRSD.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRSD.Location = New System.Drawing.Point(180, 256) Me.cmdRSD.Name = "cmdRSD" - Me.cmdRSD.Size = New System.Drawing.Size(60, 32) + Me.cmdRSD.Size = New System.Drawing.Size(90, 48) Me.cmdRSD.TabIndex = 17 Me.cmdRSD.Text = "rSD" Me.cmdRSD.UseVisualStyleBackColor = True @@ -2295,10 +2172,9 @@ Partial Class ucrCalculator 'cmdRPearson ' Me.cmdRPearson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRPearson.Location = New System.Drawing.Point(61, 171) - Me.cmdRPearson.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRPearson.Location = New System.Drawing.Point(92, 256) Me.cmdRPearson.Name = "cmdRPearson" - Me.cmdRPearson.Size = New System.Drawing.Size(60, 32) + Me.cmdRPearson.Size = New System.Drawing.Size(90, 48) Me.cmdRPearson.TabIndex = 16 Me.cmdRPearson.Text = "rPearson" Me.cmdRPearson.UseVisualStyleBackColor = True @@ -2306,10 +2182,9 @@ Partial Class ucrCalculator 'cmdRNSE ' Me.cmdRNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRNSE.Location = New System.Drawing.Point(2, 171) - Me.cmdRNSE.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRNSE.Location = New System.Drawing.Point(3, 256) Me.cmdRNSE.Name = "cmdRNSE" - Me.cmdRNSE.Size = New System.Drawing.Size(60, 32) + Me.cmdRNSE.Size = New System.Drawing.Size(90, 48) Me.cmdRNSE.TabIndex = 15 Me.cmdRNSE.Text = "rNSE" Me.cmdRNSE.UseVisualStyleBackColor = True @@ -2317,10 +2192,9 @@ Partial Class ucrCalculator 'cmdRmse ' Me.cmdRmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRmse.Location = New System.Drawing.Point(120, 140) - Me.cmdRmse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRmse.Location = New System.Drawing.Point(180, 210) Me.cmdRmse.Name = "cmdRmse" - Me.cmdRmse.Size = New System.Drawing.Size(60, 32) + Me.cmdRmse.Size = New System.Drawing.Size(90, 48) Me.cmdRmse.TabIndex = 14 Me.cmdRmse.Text = "rmse" Me.cmdRmse.UseVisualStyleBackColor = True @@ -2328,10 +2202,9 @@ Partial Class ucrCalculator 'cmdRd ' Me.cmdRd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRd.Location = New System.Drawing.Point(61, 140) - Me.cmdRd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRd.Location = New System.Drawing.Point(92, 210) Me.cmdRd.Name = "cmdRd" - Me.cmdRd.Size = New System.Drawing.Size(60, 32) + Me.cmdRd.Size = New System.Drawing.Size(90, 48) Me.cmdRd.TabIndex = 13 Me.cmdRd.Text = "rd" Me.cmdRd.UseVisualStyleBackColor = True @@ -2339,10 +2212,9 @@ Partial Class ucrCalculator 'cmdPbiasfdc ' Me.cmdPbiasfdc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbiasfdc.Location = New System.Drawing.Point(2, 140) - Me.cmdPbiasfdc.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPbiasfdc.Location = New System.Drawing.Point(3, 210) Me.cmdPbiasfdc.Name = "cmdPbiasfdc" - Me.cmdPbiasfdc.Size = New System.Drawing.Size(60, 32) + Me.cmdPbiasfdc.Size = New System.Drawing.Size(90, 48) Me.cmdPbiasfdc.TabIndex = 12 Me.cmdPbiasfdc.Text = "pbiasfdc" Me.cmdPbiasfdc.UseVisualStyleBackColor = True @@ -2350,10 +2222,9 @@ Partial Class ucrCalculator 'cmdPbias ' Me.cmdPbias.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbias.Location = New System.Drawing.Point(120, 109) - Me.cmdPbias.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPbias.Location = New System.Drawing.Point(180, 164) Me.cmdPbias.Name = "cmdPbias" - Me.cmdPbias.Size = New System.Drawing.Size(60, 32) + Me.cmdPbias.Size = New System.Drawing.Size(90, 48) Me.cmdPbias.TabIndex = 11 Me.cmdPbias.Text = "pbias" Me.cmdPbias.UseVisualStyleBackColor = True @@ -2361,10 +2232,9 @@ Partial Class ucrCalculator 'cmdNSE ' Me.cmdNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNSE.Location = New System.Drawing.Point(61, 109) - Me.cmdNSE.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNSE.Location = New System.Drawing.Point(92, 164) Me.cmdNSE.Name = "cmdNSE" - Me.cmdNSE.Size = New System.Drawing.Size(60, 32) + Me.cmdNSE.Size = New System.Drawing.Size(90, 48) Me.cmdNSE.TabIndex = 10 Me.cmdNSE.Text = "NSE" Me.cmdNSE.UseVisualStyleBackColor = True @@ -2372,10 +2242,9 @@ Partial Class ucrCalculator 'cmdNrmse ' Me.cmdNrmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNrmse.Location = New System.Drawing.Point(2, 109) - Me.cmdNrmse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNrmse.Location = New System.Drawing.Point(3, 164) Me.cmdNrmse.Name = "cmdNrmse" - Me.cmdNrmse.Size = New System.Drawing.Size(60, 32) + Me.cmdNrmse.Size = New System.Drawing.Size(90, 48) Me.cmdNrmse.TabIndex = 9 Me.cmdNrmse.Text = "nrmse" Me.cmdNrmse.UseVisualStyleBackColor = True @@ -2383,10 +2252,9 @@ Partial Class ucrCalculator 'cmdMse ' Me.cmdMse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMse.Location = New System.Drawing.Point(120, 78) - Me.cmdMse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMse.Location = New System.Drawing.Point(180, 117) Me.cmdMse.Name = "cmdMse" - Me.cmdMse.Size = New System.Drawing.Size(60, 32) + Me.cmdMse.Size = New System.Drawing.Size(90, 48) Me.cmdMse.TabIndex = 8 Me.cmdMse.Text = "mse" Me.cmdMse.UseVisualStyleBackColor = True @@ -2394,10 +2262,9 @@ Partial Class ucrCalculator 'cmdmNSE ' Me.cmdmNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmNSE.Location = New System.Drawing.Point(61, 78) - Me.cmdmNSE.Margin = New System.Windows.Forms.Padding(2) + Me.cmdmNSE.Location = New System.Drawing.Point(92, 117) Me.cmdmNSE.Name = "cmdmNSE" - Me.cmdmNSE.Size = New System.Drawing.Size(60, 32) + Me.cmdmNSE.Size = New System.Drawing.Size(90, 48) Me.cmdmNSE.TabIndex = 7 Me.cmdmNSE.Text = "mNSE" Me.cmdmNSE.UseVisualStyleBackColor = True @@ -2405,10 +2272,9 @@ Partial Class ucrCalculator 'cmdMe ' Me.cmdMe.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMe.Location = New System.Drawing.Point(2, 78) - Me.cmdMe.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMe.Location = New System.Drawing.Point(3, 117) Me.cmdMe.Name = "cmdMe" - Me.cmdMe.Size = New System.Drawing.Size(60, 32) + Me.cmdMe.Size = New System.Drawing.Size(90, 48) Me.cmdMe.TabIndex = 6 Me.cmdMe.Text = "me" Me.cmdMe.UseVisualStyleBackColor = True @@ -2416,10 +2282,9 @@ Partial Class ucrCalculator 'cmdMd ' Me.cmdMd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMd.Location = New System.Drawing.Point(120, 47) - Me.cmdMd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMd.Location = New System.Drawing.Point(180, 70) Me.cmdMd.Name = "cmdMd" - Me.cmdMd.Size = New System.Drawing.Size(60, 32) + Me.cmdMd.Size = New System.Drawing.Size(90, 48) Me.cmdMd.TabIndex = 5 Me.cmdMd.Text = "md" Me.cmdMd.UseVisualStyleBackColor = True @@ -2427,10 +2292,9 @@ Partial Class ucrCalculator 'cmdMae ' Me.cmdMae.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMae.Location = New System.Drawing.Point(61, 47) - Me.cmdMae.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMae.Location = New System.Drawing.Point(92, 70) Me.cmdMae.Name = "cmdMae" - Me.cmdMae.Size = New System.Drawing.Size(60, 32) + Me.cmdMae.Size = New System.Drawing.Size(90, 48) Me.cmdMae.TabIndex = 4 Me.cmdMae.Text = "mae" Me.cmdMae.UseVisualStyleBackColor = True @@ -2438,10 +2302,9 @@ Partial Class ucrCalculator 'cmdKGE ' Me.cmdKGE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKGE.Location = New System.Drawing.Point(2, 47) - Me.cmdKGE.Margin = New System.Windows.Forms.Padding(2) + Me.cmdKGE.Location = New System.Drawing.Point(3, 70) Me.cmdKGE.Name = "cmdKGE" - Me.cmdKGE.Size = New System.Drawing.Size(60, 32) + Me.cmdKGE.Size = New System.Drawing.Size(90, 48) Me.cmdKGE.TabIndex = 3 Me.cmdKGE.Text = "KGE" Me.cmdKGE.UseVisualStyleBackColor = True @@ -2449,10 +2312,9 @@ Partial Class ucrCalculator 'cmdD ' Me.cmdD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdD.Location = New System.Drawing.Point(120, 16) - Me.cmdD.Margin = New System.Windows.Forms.Padding(2) + Me.cmdD.Location = New System.Drawing.Point(180, 24) Me.cmdD.Name = "cmdD" - Me.cmdD.Size = New System.Drawing.Size(60, 32) + Me.cmdD.Size = New System.Drawing.Size(90, 48) Me.cmdD.TabIndex = 2 Me.cmdD.Text = "d" Me.cmdD.UseVisualStyleBackColor = True @@ -2460,10 +2322,9 @@ Partial Class ucrCalculator 'cmdCp ' Me.cmdCp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCp.Location = New System.Drawing.Point(61, 16) - Me.cmdCp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCp.Location = New System.Drawing.Point(92, 24) Me.cmdCp.Name = "cmdCp" - Me.cmdCp.Size = New System.Drawing.Size(60, 32) + Me.cmdCp.Size = New System.Drawing.Size(90, 48) Me.cmdCp.TabIndex = 1 Me.cmdCp.Text = "cp" Me.cmdCp.UseVisualStyleBackColor = True @@ -2471,10 +2332,9 @@ Partial Class ucrCalculator 'cmdBr2 ' Me.cmdBr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBr2.Location = New System.Drawing.Point(2, 16) - Me.cmdBr2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdBr2.Location = New System.Drawing.Point(3, 24) Me.cmdBr2.Name = "cmdBr2" - Me.cmdBr2.Size = New System.Drawing.Size(60, 32) + Me.cmdBr2.Size = New System.Drawing.Size(90, 48) Me.cmdBr2.TabIndex = 0 Me.cmdBr2.Text = "br2" Me.cmdBr2.UseVisualStyleBackColor = True @@ -2536,11 +2396,9 @@ Partial Class ucrCalculator Me.grpWakefield.Controls.Add(Me.cmdHair) Me.grpWakefield.Controls.Add(Me.cmdGroup) Me.grpWakefield.Controls.Add(Me.cmdGrade) - Me.grpWakefield.Location = New System.Drawing.Point(434, 62) - Me.grpWakefield.Margin = New System.Windows.Forms.Padding(2) + Me.grpWakefield.Location = New System.Drawing.Point(651, 93) Me.grpWakefield.Name = "grpWakefield" - Me.grpWakefield.Padding = New System.Windows.Forms.Padding(2) - Me.grpWakefield.Size = New System.Drawing.Size(434, 346) + Me.grpWakefield.Size = New System.Drawing.Size(651, 519) Me.grpWakefield.TabIndex = 191 Me.grpWakefield.TabStop = False Me.grpWakefield.Text = "Wakefield" @@ -2549,10 +2407,9 @@ Partial Class ucrCalculator ' Me.cmdLikert7.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLikert7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLikert7.Location = New System.Drawing.Point(346, 304) - Me.cmdLikert7.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLikert7.Location = New System.Drawing.Point(519, 456) Me.cmdLikert7.Name = "cmdLikert7" - Me.cmdLikert7.Size = New System.Drawing.Size(86, 30) + Me.cmdLikert7.Size = New System.Drawing.Size(129, 45) Me.cmdLikert7.TabIndex = 54 Me.cmdLikert7.Text = "likert7 (O.F)" Me.cmdLikert7.UseVisualStyleBackColor = True @@ -2561,10 +2418,9 @@ Partial Class ucrCalculator ' Me.cmdWakefield_Year.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefield_Year.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Year.Location = New System.Drawing.Point(261, 304) - Me.cmdWakefield_Year.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWakefield_Year.Location = New System.Drawing.Point(392, 456) Me.cmdWakefield_Year.Name = "cmdWakefield_Year" - Me.cmdWakefield_Year.Size = New System.Drawing.Size(86, 30) + Me.cmdWakefield_Year.Size = New System.Drawing.Size(129, 45) Me.cmdWakefield_Year.TabIndex = 53 Me.cmdWakefield_Year.Text = "year" Me.cmdWakefield_Year.UseVisualStyleBackColor = True @@ -2573,10 +2429,9 @@ Partial Class ucrCalculator ' Me.cmdValid.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdValid.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdValid.Location = New System.Drawing.Point(176, 304) - Me.cmdValid.Margin = New System.Windows.Forms.Padding(2) + Me.cmdValid.Location = New System.Drawing.Point(264, 456) Me.cmdValid.Name = "cmdValid" - Me.cmdValid.Size = New System.Drawing.Size(86, 30) + Me.cmdValid.Size = New System.Drawing.Size(129, 45) Me.cmdValid.TabIndex = 52 Me.cmdValid.Text = "valid (L)" Me.cmdValid.UseVisualStyleBackColor = True @@ -2585,10 +2440,9 @@ Partial Class ucrCalculator ' Me.cmdWakefieldUpper.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldUpper.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldUpper.Location = New System.Drawing.Point(91, 304) - Me.cmdWakefieldUpper.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWakefieldUpper.Location = New System.Drawing.Point(136, 456) Me.cmdWakefieldUpper.Name = "cmdWakefieldUpper" - Me.cmdWakefieldUpper.Size = New System.Drawing.Size(86, 30) + Me.cmdWakefieldUpper.Size = New System.Drawing.Size(129, 45) Me.cmdWakefieldUpper.TabIndex = 51 Me.cmdWakefieldUpper.Text = "upper (F)" Me.cmdWakefieldUpper.UseVisualStyleBackColor = True @@ -2597,10 +2451,9 @@ Partial Class ucrCalculator ' Me.cmdString.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdString.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdString.Location = New System.Drawing.Point(6, 304) - Me.cmdString.Margin = New System.Windows.Forms.Padding(2) + Me.cmdString.Location = New System.Drawing.Point(9, 456) Me.cmdString.Name = "cmdString" - Me.cmdString.Size = New System.Drawing.Size(86, 30) + Me.cmdString.Size = New System.Drawing.Size(129, 45) Me.cmdString.TabIndex = 50 Me.cmdString.Text = "string (C)" Me.cmdString.UseVisualStyleBackColor = True @@ -2609,10 +2462,9 @@ Partial Class ucrCalculator ' Me.cmdState.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdState.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdState.Location = New System.Drawing.Point(346, 275) - Me.cmdState.Margin = New System.Windows.Forms.Padding(2) + Me.cmdState.Location = New System.Drawing.Point(519, 412) Me.cmdState.Name = "cmdState" - Me.cmdState.Size = New System.Drawing.Size(86, 30) + Me.cmdState.Size = New System.Drawing.Size(129, 45) Me.cmdState.TabIndex = 49 Me.cmdState.Text = "state (F)" Me.cmdState.UseVisualStyleBackColor = True @@ -2621,10 +2473,9 @@ Partial Class ucrCalculator ' Me.cmdSpeed.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpeed.Location = New System.Drawing.Point(261, 275) - Me.cmdSpeed.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSpeed.Location = New System.Drawing.Point(392, 412) Me.cmdSpeed.Name = "cmdSpeed" - Me.cmdSpeed.Size = New System.Drawing.Size(86, 30) + Me.cmdSpeed.Size = New System.Drawing.Size(129, 45) Me.cmdSpeed.TabIndex = 48 Me.cmdSpeed.Text = "speed" Me.cmdSpeed.UseVisualStyleBackColor = True @@ -2633,10 +2484,9 @@ Partial Class ucrCalculator ' Me.cmdSmokes.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSmokes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSmokes.Location = New System.Drawing.Point(176, 275) - Me.cmdSmokes.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSmokes.Location = New System.Drawing.Point(264, 412) Me.cmdSmokes.Name = "cmdSmokes" - Me.cmdSmokes.Size = New System.Drawing.Size(86, 30) + Me.cmdSmokes.Size = New System.Drawing.Size(129, 45) Me.cmdSmokes.TabIndex = 47 Me.cmdSmokes.Text = "smokes (L)" Me.cmdSmokes.UseVisualStyleBackColor = True @@ -2645,10 +2495,9 @@ Partial Class ucrCalculator ' Me.cmdWakefieldTimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldTimes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldTimes.Location = New System.Drawing.Point(91, 275) - Me.cmdWakefieldTimes.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWakefieldTimes.Location = New System.Drawing.Point(136, 412) Me.cmdWakefieldTimes.Name = "cmdWakefieldTimes" - Me.cmdWakefieldTimes.Size = New System.Drawing.Size(86, 30) + Me.cmdWakefieldTimes.Size = New System.Drawing.Size(129, 45) Me.cmdWakefieldTimes.TabIndex = 46 Me.cmdWakefieldTimes.Text = "times (T)" Me.cmdWakefieldTimes.UseVisualStyleBackColor = True @@ -2657,10 +2506,9 @@ Partial Class ucrCalculator ' Me.cmdSex_Inclusive.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSex_Inclusive.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSex_Inclusive.Location = New System.Drawing.Point(6, 275) - Me.cmdSex_Inclusive.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSex_Inclusive.Location = New System.Drawing.Point(9, 412) Me.cmdSex_Inclusive.Name = "cmdSex_Inclusive" - Me.cmdSex_Inclusive.Size = New System.Drawing.Size(86, 30) + Me.cmdSex_Inclusive.Size = New System.Drawing.Size(129, 45) Me.cmdSex_Inclusive.TabIndex = 45 Me.cmdSex_Inclusive.Text = "sex_inclusive (F)" Me.cmdSex_Inclusive.UseVisualStyleBackColor = True @@ -2669,10 +2517,9 @@ Partial Class ucrCalculator ' Me.cmdGender.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGender.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGender.Location = New System.Drawing.Point(346, 246) - Me.cmdGender.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGender.Location = New System.Drawing.Point(519, 369) Me.cmdGender.Name = "cmdGender" - Me.cmdGender.Size = New System.Drawing.Size(86, 30) + Me.cmdGender.Size = New System.Drawing.Size(129, 45) Me.cmdGender.TabIndex = 44 Me.cmdGender.Text = "gender (F)" Me.cmdGender.UseVisualStyleBackColor = True @@ -2681,10 +2528,9 @@ Partial Class ucrCalculator ' Me.cmdSentence.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSentence.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSentence.Location = New System.Drawing.Point(261, 246) - Me.cmdSentence.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSentence.Location = New System.Drawing.Point(392, 369) Me.cmdSentence.Name = "cmdSentence" - Me.cmdSentence.Size = New System.Drawing.Size(86, 30) + Me.cmdSentence.Size = New System.Drawing.Size(129, 45) Me.cmdSentence.TabIndex = 43 Me.cmdSentence.Text = "sentence (C)" Me.cmdSentence.UseVisualStyleBackColor = True @@ -2693,10 +2539,9 @@ Partial Class ucrCalculator ' Me.cmdSat.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSat.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSat.Location = New System.Drawing.Point(176, 246) - Me.cmdSat.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSat.Location = New System.Drawing.Point(264, 369) Me.cmdSat.Name = "cmdSat" - Me.cmdSat.Size = New System.Drawing.Size(86, 30) + Me.cmdSat.Size = New System.Drawing.Size(129, 45) Me.cmdSat.TabIndex = 42 Me.cmdSat.Text = "sat" Me.cmdSat.UseVisualStyleBackColor = True @@ -2705,10 +2550,9 @@ Partial Class ucrCalculator ' Me.cmdReligion.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdReligion.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReligion.Location = New System.Drawing.Point(91, 246) - Me.cmdReligion.Margin = New System.Windows.Forms.Padding(2) + Me.cmdReligion.Location = New System.Drawing.Point(136, 369) Me.cmdReligion.Name = "cmdReligion" - Me.cmdReligion.Size = New System.Drawing.Size(86, 30) + Me.cmdReligion.Size = New System.Drawing.Size(129, 45) Me.cmdReligion.TabIndex = 41 Me.cmdReligion.Text = "religion (F)" Me.cmdReligion.UseVisualStyleBackColor = True @@ -2717,10 +2561,9 @@ Partial Class ucrCalculator ' Me.cmdRace.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdRace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRace.Location = New System.Drawing.Point(6, 246) - Me.cmdRace.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRace.Location = New System.Drawing.Point(9, 369) Me.cmdRace.Name = "cmdRace" - Me.cmdRace.Size = New System.Drawing.Size(86, 30) + Me.cmdRace.Size = New System.Drawing.Size(129, 45) Me.cmdRace.TabIndex = 40 Me.cmdRace.Text = "race (F)" Me.cmdRace.UseVisualStyleBackColor = True @@ -2729,10 +2572,9 @@ Partial Class ucrCalculator ' Me.cmdPolitical.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPolitical.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPolitical.Location = New System.Drawing.Point(346, 217) - Me.cmdPolitical.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPolitical.Location = New System.Drawing.Point(519, 326) Me.cmdPolitical.Name = "cmdPolitical" - Me.cmdPolitical.Size = New System.Drawing.Size(86, 30) + Me.cmdPolitical.Size = New System.Drawing.Size(129, 45) Me.cmdPolitical.TabIndex = 39 Me.cmdPolitical.Text = "political (F)" Me.cmdPolitical.UseVisualStyleBackColor = True @@ -2741,10 +2583,9 @@ Partial Class ucrCalculator ' Me.cmdNormal.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdNormal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNormal.Location = New System.Drawing.Point(261, 217) - Me.cmdNormal.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNormal.Location = New System.Drawing.Point(392, 326) Me.cmdNormal.Name = "cmdNormal" - Me.cmdNormal.Size = New System.Drawing.Size(86, 30) + Me.cmdNormal.Size = New System.Drawing.Size(129, 45) Me.cmdNormal.TabIndex = 38 Me.cmdNormal.Text = "normal" Me.cmdNormal.UseVisualStyleBackColor = True @@ -2753,10 +2594,9 @@ Partial Class ucrCalculator ' Me.cmdName.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdName.Location = New System.Drawing.Point(176, 217) - Me.cmdName.Margin = New System.Windows.Forms.Padding(2) + Me.cmdName.Location = New System.Drawing.Point(264, 326) Me.cmdName.Name = "cmdName" - Me.cmdName.Size = New System.Drawing.Size(86, 30) + Me.cmdName.Size = New System.Drawing.Size(129, 45) Me.cmdName.TabIndex = 37 Me.cmdName.Text = "name (C)" Me.cmdName.UseVisualStyleBackColor = True @@ -2765,10 +2605,9 @@ Partial Class ucrCalculator ' Me.cmdWakefield_Month.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefield_Month.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Month.Location = New System.Drawing.Point(91, 217) - Me.cmdWakefield_Month.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWakefield_Month.Location = New System.Drawing.Point(136, 326) Me.cmdWakefield_Month.Name = "cmdWakefield_Month" - Me.cmdWakefield_Month.Size = New System.Drawing.Size(86, 30) + Me.cmdWakefield_Month.Size = New System.Drawing.Size(129, 45) Me.cmdWakefield_Month.TabIndex = 36 Me.cmdWakefield_Month.Text = "month (F)" Me.cmdWakefield_Month.UseVisualStyleBackColor = True @@ -2777,10 +2616,9 @@ Partial Class ucrCalculator ' Me.cmdMilitary.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMilitary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMilitary.Location = New System.Drawing.Point(6, 217) - Me.cmdMilitary.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMilitary.Location = New System.Drawing.Point(9, 326) Me.cmdMilitary.Name = "cmdMilitary" - Me.cmdMilitary.Size = New System.Drawing.Size(86, 30) + Me.cmdMilitary.Size = New System.Drawing.Size(129, 45) Me.cmdMilitary.TabIndex = 35 Me.cmdMilitary.Text = "military (F)" Me.cmdMilitary.UseVisualStyleBackColor = True @@ -2789,10 +2627,9 @@ Partial Class ucrCalculator ' Me.cmdMarital.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMarital.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMarital.Location = New System.Drawing.Point(346, 188) - Me.cmdMarital.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMarital.Location = New System.Drawing.Point(519, 282) Me.cmdMarital.Name = "cmdMarital" - Me.cmdMarital.Size = New System.Drawing.Size(86, 30) + Me.cmdMarital.Size = New System.Drawing.Size(129, 45) Me.cmdMarital.TabIndex = 34 Me.cmdMarital.Text = "marital (F)" Me.cmdMarital.UseVisualStyleBackColor = True @@ -2801,10 +2638,9 @@ Partial Class ucrCalculator ' Me.cmdLorem_ipsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLorem_ipsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLorem_ipsum.Location = New System.Drawing.Point(261, 188) - Me.cmdLorem_ipsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLorem_ipsum.Location = New System.Drawing.Point(392, 282) Me.cmdLorem_ipsum.Name = "cmdLorem_ipsum" - Me.cmdLorem_ipsum.Size = New System.Drawing.Size(86, 30) + Me.cmdLorem_ipsum.Size = New System.Drawing.Size(129, 45) Me.cmdLorem_ipsum.TabIndex = 33 Me.cmdLorem_ipsum.Text = "lorem_ipsum (C)" Me.cmdLorem_ipsum.UseVisualStyleBackColor = True @@ -2813,10 +2649,9 @@ Partial Class ucrCalculator ' Me.cmdLikert.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLikert.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLikert.Location = New System.Drawing.Point(176, 188) - Me.cmdLikert.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLikert.Location = New System.Drawing.Point(264, 282) Me.cmdLikert.Name = "cmdLikert" - Me.cmdLikert.Size = New System.Drawing.Size(86, 30) + Me.cmdLikert.Size = New System.Drawing.Size(129, 45) Me.cmdLikert.TabIndex = 32 Me.cmdLikert.Text = "likert (O.F)" Me.cmdLikert.UseVisualStyleBackColor = True @@ -2825,10 +2660,9 @@ Partial Class ucrCalculator ' Me.cmdGpa.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGpa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGpa.Location = New System.Drawing.Point(91, 188) - Me.cmdGpa.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGpa.Location = New System.Drawing.Point(136, 282) Me.cmdGpa.Name = "cmdGpa" - Me.cmdGpa.Size = New System.Drawing.Size(86, 30) + Me.cmdGpa.Size = New System.Drawing.Size(129, 45) Me.cmdGpa.TabIndex = 31 Me.cmdGpa.Text = "gpa" Me.cmdGpa.UseVisualStyleBackColor = True @@ -2837,10 +2671,9 @@ Partial Class ucrCalculator ' Me.cmdWakefieldMinute.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldMinute.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldMinute.Location = New System.Drawing.Point(6, 188) - Me.cmdWakefieldMinute.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWakefieldMinute.Location = New System.Drawing.Point(9, 282) Me.cmdWakefieldMinute.Name = "cmdWakefieldMinute" - Me.cmdWakefieldMinute.Size = New System.Drawing.Size(86, 30) + Me.cmdWakefieldMinute.Size = New System.Drawing.Size(129, 45) Me.cmdWakefieldMinute.TabIndex = 30 Me.cmdWakefieldMinute.Text = "minute (T)" Me.cmdWakefieldMinute.UseVisualStyleBackColor = True @@ -2849,10 +2682,9 @@ Partial Class ucrCalculator ' Me.cmdMath.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdMath.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMath.Location = New System.Drawing.Point(346, 159) - Me.cmdMath.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMath.Location = New System.Drawing.Point(519, 238) Me.cmdMath.Name = "cmdMath" - Me.cmdMath.Size = New System.Drawing.Size(86, 30) + Me.cmdMath.Size = New System.Drawing.Size(129, 45) Me.cmdMath.TabIndex = 29 Me.cmdMath.Text = "math" Me.cmdMath.UseVisualStyleBackColor = True @@ -2861,10 +2693,9 @@ Partial Class ucrCalculator ' Me.cmdWakefieldLower.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldLower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldLower.Location = New System.Drawing.Point(261, 159) - Me.cmdWakefieldLower.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWakefieldLower.Location = New System.Drawing.Point(392, 238) Me.cmdWakefieldLower.Name = "cmdWakefieldLower" - Me.cmdWakefieldLower.Size = New System.Drawing.Size(86, 30) + Me.cmdWakefieldLower.Size = New System.Drawing.Size(129, 45) Me.cmdWakefieldLower.TabIndex = 28 Me.cmdWakefieldLower.Text = "lower(F)" Me.cmdWakefieldLower.UseVisualStyleBackColor = True @@ -2873,10 +2704,9 @@ Partial Class ucrCalculator ' Me.cmdLanguage.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLanguage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLanguage.Location = New System.Drawing.Point(176, 159) - Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLanguage.Location = New System.Drawing.Point(264, 238) Me.cmdLanguage.Name = "cmdLanguage" - Me.cmdLanguage.Size = New System.Drawing.Size(86, 30) + Me.cmdLanguage.Size = New System.Drawing.Size(129, 45) Me.cmdLanguage.TabIndex = 27 Me.cmdLanguage.Text = "language (F)" Me.cmdLanguage.UseVisualStyleBackColor = True @@ -2885,10 +2715,9 @@ Partial Class ucrCalculator ' Me.cmdIq.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdIq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIq.Location = New System.Drawing.Point(91, 159) - Me.cmdIq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIq.Location = New System.Drawing.Point(136, 238) Me.cmdIq.Name = "cmdIq" - Me.cmdIq.Size = New System.Drawing.Size(86, 30) + Me.cmdIq.Size = New System.Drawing.Size(129, 45) Me.cmdIq.TabIndex = 26 Me.cmdIq.Text = "iq" Me.cmdIq.UseVisualStyleBackColor = True @@ -2897,10 +2726,9 @@ Partial Class ucrCalculator ' Me.cmdid.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdid.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdid.Location = New System.Drawing.Point(6, 159) - Me.cmdid.Margin = New System.Windows.Forms.Padding(2) + Me.cmdid.Location = New System.Drawing.Point(9, 238) Me.cmdid.Name = "cmdid" - Me.cmdid.Size = New System.Drawing.Size(86, 30) + Me.cmdid.Size = New System.Drawing.Size(129, 45) Me.cmdid.TabIndex = 25 Me.cmdid.Text = "id (C)" Me.cmdid.UseVisualStyleBackColor = True @@ -2909,10 +2737,9 @@ Partial Class ucrCalculator ' Me.cmdGrade_Level.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade_Level.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade_Level.Location = New System.Drawing.Point(346, 101) - Me.cmdGrade_Level.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGrade_Level.Location = New System.Drawing.Point(519, 152) Me.cmdGrade_Level.Name = "cmdGrade_Level" - Me.cmdGrade_Level.Size = New System.Drawing.Size(86, 30) + Me.cmdGrade_Level.Size = New System.Drawing.Size(129, 45) Me.cmdGrade_Level.TabIndex = 19 Me.cmdGrade_Level.Text = "grade_level (F)" Me.cmdGrade_Level.UseVisualStyleBackColor = True @@ -2921,10 +2748,9 @@ Partial Class ucrCalculator ' Me.cmdEye.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEye.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEye.Location = New System.Drawing.Point(261, 101) - Me.cmdEye.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEye.Location = New System.Drawing.Point(392, 152) Me.cmdEye.Name = "cmdEye" - Me.cmdEye.Size = New System.Drawing.Size(86, 30) + Me.cmdEye.Size = New System.Drawing.Size(129, 45) Me.cmdEye.TabIndex = 18 Me.cmdEye.Text = "eye (F)" Me.cmdEye.UseVisualStyleBackColor = True @@ -2933,10 +2759,9 @@ Partial Class ucrCalculator ' Me.cmdEmployment.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEmployment.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEmployment.Location = New System.Drawing.Point(176, 101) - Me.cmdEmployment.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEmployment.Location = New System.Drawing.Point(264, 152) Me.cmdEmployment.Name = "cmdEmployment" - Me.cmdEmployment.Size = New System.Drawing.Size(86, 30) + Me.cmdEmployment.Size = New System.Drawing.Size(129, 45) Me.cmdEmployment.TabIndex = 17 Me.cmdEmployment.Text = "employment (F)" Me.cmdEmployment.UseVisualStyleBackColor = True @@ -2945,10 +2770,9 @@ Partial Class ucrCalculator ' Me.cmdEducation.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEducation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEducation.Location = New System.Drawing.Point(91, 101) - Me.cmdEducation.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEducation.Location = New System.Drawing.Point(136, 152) Me.cmdEducation.Name = "cmdEducation" - Me.cmdEducation.Size = New System.Drawing.Size(86, 30) + Me.cmdEducation.Size = New System.Drawing.Size(129, 45) Me.cmdEducation.TabIndex = 16 Me.cmdEducation.Text = "education (F)" Me.cmdEducation.UseVisualStyleBackColor = True @@ -2957,10 +2781,9 @@ Partial Class ucrCalculator ' Me.cmdDummy.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDummy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDummy.Location = New System.Drawing.Point(6, 101) - Me.cmdDummy.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDummy.Location = New System.Drawing.Point(9, 152) Me.cmdDummy.Name = "cmdDummy" - Me.cmdDummy.Size = New System.Drawing.Size(86, 30) + Me.cmdDummy.Size = New System.Drawing.Size(129, 45) Me.cmdDummy.TabIndex = 15 Me.cmdDummy.Text = "dummy" Me.cmdDummy.UseVisualStyleBackColor = True @@ -2969,10 +2792,9 @@ Partial Class ucrCalculator ' Me.cmdDob.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDob.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDob.Location = New System.Drawing.Point(346, 72) - Me.cmdDob.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDob.Location = New System.Drawing.Point(519, 108) Me.cmdDob.Name = "cmdDob" - Me.cmdDob.Size = New System.Drawing.Size(86, 30) + Me.cmdDob.Size = New System.Drawing.Size(129, 45) Me.cmdDob.TabIndex = 14 Me.cmdDob.Text = "dob (D)" Me.cmdDob.UseVisualStyleBackColor = True @@ -2981,10 +2803,9 @@ Partial Class ucrCalculator ' Me.cmdDna.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDna.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDna.Location = New System.Drawing.Point(261, 72) - Me.cmdDna.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDna.Location = New System.Drawing.Point(392, 108) Me.cmdDna.Name = "cmdDna" - Me.cmdDna.Size = New System.Drawing.Size(86, 30) + Me.cmdDna.Size = New System.Drawing.Size(129, 45) Me.cmdDna.TabIndex = 13 Me.cmdDna.Text = "dna (F)" Me.cmdDna.UseVisualStyleBackColor = True @@ -2993,10 +2814,9 @@ Partial Class ucrCalculator ' Me.cmdDice.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDice.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDice.Location = New System.Drawing.Point(176, 72) - Me.cmdDice.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDice.Location = New System.Drawing.Point(264, 108) Me.cmdDice.Name = "cmdDice" - Me.cmdDice.Size = New System.Drawing.Size(86, 30) + Me.cmdDice.Size = New System.Drawing.Size(129, 45) Me.cmdDice.TabIndex = 12 Me.cmdDice.Text = "dice" Me.cmdDice.UseVisualStyleBackColor = True @@ -3005,10 +2825,9 @@ Partial Class ucrCalculator ' Me.cmdGrade_Letter.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade_Letter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade_Letter.Location = New System.Drawing.Point(91, 72) - Me.cmdGrade_Letter.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGrade_Letter.Location = New System.Drawing.Point(136, 108) Me.cmdGrade_Letter.Name = "cmdGrade_Letter" - Me.cmdGrade_Letter.Size = New System.Drawing.Size(86, 30) + Me.cmdGrade_Letter.Size = New System.Drawing.Size(129, 45) Me.cmdGrade_Letter.TabIndex = 11 Me.cmdGrade_Letter.Text = "grade_letter(F)" Me.cmdGrade_Letter.UseVisualStyleBackColor = True @@ -3017,10 +2836,9 @@ Partial Class ucrCalculator ' Me.cmdDeath.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDeath.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDeath.Location = New System.Drawing.Point(6, 72) - Me.cmdDeath.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDeath.Location = New System.Drawing.Point(9, 108) Me.cmdDeath.Name = "cmdDeath" - Me.cmdDeath.Size = New System.Drawing.Size(86, 30) + Me.cmdDeath.Size = New System.Drawing.Size(129, 45) Me.cmdDeath.TabIndex = 10 Me.cmdDeath.Text = "death (L)" Me.cmdDeath.UseVisualStyleBackColor = True @@ -3029,10 +2847,9 @@ Partial Class ucrCalculator ' Me.cmdWakefieldDates.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldDates.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldDates.Location = New System.Drawing.Point(346, 43) - Me.cmdWakefieldDates.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWakefieldDates.Location = New System.Drawing.Point(519, 64) Me.cmdWakefieldDates.Name = "cmdWakefieldDates" - Me.cmdWakefieldDates.Size = New System.Drawing.Size(86, 30) + Me.cmdWakefieldDates.Size = New System.Drawing.Size(129, 45) Me.cmdWakefieldDates.TabIndex = 9 Me.cmdWakefieldDates.Text = "dates (D)" Me.cmdWakefieldDates.UseVisualStyleBackColor = True @@ -3041,10 +2858,9 @@ Partial Class ucrCalculator ' Me.cmdPrimary.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPrimary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPrimary.Location = New System.Drawing.Point(261, 43) - Me.cmdPrimary.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPrimary.Location = New System.Drawing.Point(392, 64) Me.cmdPrimary.Name = "cmdPrimary" - Me.cmdPrimary.Size = New System.Drawing.Size(86, 30) + Me.cmdPrimary.Size = New System.Drawing.Size(129, 45) Me.cmdPrimary.TabIndex = 8 Me.cmdPrimary.Text = "primary (F)" Me.cmdPrimary.UseVisualStyleBackColor = True @@ -3053,10 +2869,9 @@ Partial Class ucrCalculator ' Me.cmdColor.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdColor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColor.Location = New System.Drawing.Point(176, 43) - Me.cmdColor.Margin = New System.Windows.Forms.Padding(2) + Me.cmdColor.Location = New System.Drawing.Point(264, 64) Me.cmdColor.Name = "cmdColor" - Me.cmdColor.Size = New System.Drawing.Size(86, 30) + Me.cmdColor.Size = New System.Drawing.Size(129, 45) Me.cmdColor.TabIndex = 7 Me.cmdColor.Text = "color (F)" Me.cmdColor.UseVisualStyleBackColor = True @@ -3065,10 +2880,9 @@ Partial Class ucrCalculator ' Me.cmdCoin.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdCoin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoin.Location = New System.Drawing.Point(91, 43) - Me.cmdCoin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCoin.Location = New System.Drawing.Point(136, 64) Me.cmdCoin.Name = "cmdCoin" - Me.cmdCoin.Size = New System.Drawing.Size(86, 30) + Me.cmdCoin.Size = New System.Drawing.Size(129, 45) Me.cmdCoin.TabIndex = 6 Me.cmdCoin.Text = "coin (F)" Me.cmdCoin.UseVisualStyleBackColor = True @@ -3077,10 +2891,9 @@ Partial Class ucrCalculator ' Me.cmdChildren.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdChildren.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChildren.Location = New System.Drawing.Point(6, 43) - Me.cmdChildren.Margin = New System.Windows.Forms.Padding(2) + Me.cmdChildren.Location = New System.Drawing.Point(9, 64) Me.cmdChildren.Name = "cmdChildren" - Me.cmdChildren.Size = New System.Drawing.Size(86, 30) + Me.cmdChildren.Size = New System.Drawing.Size(129, 45) Me.cmdChildren.TabIndex = 5 Me.cmdChildren.Text = "children" Me.cmdChildren.UseVisualStyleBackColor = True @@ -3089,10 +2902,9 @@ Partial Class ucrCalculator ' Me.cmdCar.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdCar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCar.Location = New System.Drawing.Point(346, 14) - Me.cmdCar.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCar.Location = New System.Drawing.Point(519, 21) Me.cmdCar.Name = "cmdCar" - Me.cmdCar.Size = New System.Drawing.Size(86, 30) + Me.cmdCar.Size = New System.Drawing.Size(129, 45) Me.cmdCar.TabIndex = 4 Me.cmdCar.Text = "car (F)" Me.cmdCar.UseVisualStyleBackColor = True @@ -3101,10 +2913,9 @@ Partial Class ucrCalculator ' Me.cmdAnswer.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAnswer.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnswer.Location = New System.Drawing.Point(261, 14) - Me.cmdAnswer.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAnswer.Location = New System.Drawing.Point(392, 21) Me.cmdAnswer.Name = "cmdAnswer" - Me.cmdAnswer.Size = New System.Drawing.Size(86, 30) + Me.cmdAnswer.Size = New System.Drawing.Size(129, 45) Me.cmdAnswer.TabIndex = 3 Me.cmdAnswer.Text = "answer (F)" Me.cmdAnswer.UseVisualStyleBackColor = True @@ -3113,10 +2924,9 @@ Partial Class ucrCalculator ' Me.cmdPet.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdPet.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPet.Location = New System.Drawing.Point(176, 14) - Me.cmdPet.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPet.Location = New System.Drawing.Point(264, 21) Me.cmdPet.Name = "cmdPet" - Me.cmdPet.Size = New System.Drawing.Size(86, 30) + Me.cmdPet.Size = New System.Drawing.Size(129, 45) Me.cmdPet.TabIndex = 2 Me.cmdPet.Text = "pet (F)" Me.cmdPet.UseVisualStyleBackColor = True @@ -3125,10 +2935,9 @@ Partial Class ucrCalculator ' Me.cmdAnimal.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAnimal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnimal.Location = New System.Drawing.Point(91, 14) - Me.cmdAnimal.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAnimal.Location = New System.Drawing.Point(136, 21) Me.cmdAnimal.Name = "cmdAnimal" - Me.cmdAnimal.Size = New System.Drawing.Size(86, 30) + Me.cmdAnimal.Size = New System.Drawing.Size(129, 45) Me.cmdAnimal.TabIndex = 1 Me.cmdAnimal.Text = "animal (F)" Me.cmdAnimal.UseVisualStyleBackColor = True @@ -3137,10 +2946,9 @@ Partial Class ucrCalculator ' Me.cmdAge.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdAge.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAge.Location = New System.Drawing.Point(6, 14) - Me.cmdAge.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAge.Location = New System.Drawing.Point(9, 21) Me.cmdAge.Name = "cmdAge" - Me.cmdAge.Size = New System.Drawing.Size(86, 30) + Me.cmdAge.Size = New System.Drawing.Size(129, 45) Me.cmdAge.TabIndex = 0 Me.cmdAge.Text = "age" Me.cmdAge.UseVisualStyleBackColor = True @@ -3149,10 +2957,9 @@ Partial Class ucrCalculator ' Me.cmdIncome.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdIncome.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIncome.Location = New System.Drawing.Point(346, 130) - Me.cmdIncome.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIncome.Location = New System.Drawing.Point(519, 195) Me.cmdIncome.Name = "cmdIncome" - Me.cmdIncome.Size = New System.Drawing.Size(86, 30) + Me.cmdIncome.Size = New System.Drawing.Size(129, 45) Me.cmdIncome.TabIndex = 24 Me.cmdIncome.Text = "income" Me.cmdIncome.UseVisualStyleBackColor = True @@ -3161,10 +2968,9 @@ Partial Class ucrCalculator ' Me.cmdHeight.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdHeight.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHeight.Location = New System.Drawing.Point(261, 130) - Me.cmdHeight.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHeight.Location = New System.Drawing.Point(392, 195) Me.cmdHeight.Name = "cmdHeight" - Me.cmdHeight.Size = New System.Drawing.Size(86, 30) + Me.cmdHeight.Size = New System.Drawing.Size(129, 45) Me.cmdHeight.TabIndex = 23 Me.cmdHeight.Text = "height" Me.cmdHeight.UseVisualStyleBackColor = True @@ -3173,10 +2979,9 @@ Partial Class ucrCalculator ' Me.cmdHair.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdHair.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHair.Location = New System.Drawing.Point(176, 130) - Me.cmdHair.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHair.Location = New System.Drawing.Point(264, 195) Me.cmdHair.Name = "cmdHair" - Me.cmdHair.Size = New System.Drawing.Size(86, 30) + Me.cmdHair.Size = New System.Drawing.Size(129, 45) Me.cmdHair.TabIndex = 22 Me.cmdHair.Text = "hair (F)" Me.cmdHair.UseVisualStyleBackColor = True @@ -3185,10 +2990,9 @@ Partial Class ucrCalculator ' Me.cmdGroup.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGroup.Location = New System.Drawing.Point(91, 130) - Me.cmdGroup.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGroup.Location = New System.Drawing.Point(136, 195) Me.cmdGroup.Name = "cmdGroup" - Me.cmdGroup.Size = New System.Drawing.Size(86, 30) + Me.cmdGroup.Size = New System.Drawing.Size(129, 45) Me.cmdGroup.TabIndex = 21 Me.cmdGroup.Text = "group (F)" Me.cmdGroup.UseVisualStyleBackColor = True @@ -3197,10 +3001,9 @@ Partial Class ucrCalculator ' Me.cmdGrade.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade.Location = New System.Drawing.Point(6, 130) - Me.cmdGrade.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGrade.Location = New System.Drawing.Point(9, 195) Me.cmdGrade.Name = "cmdGrade" - Me.cmdGrade.Size = New System.Drawing.Size(86, 30) + Me.cmdGrade.Size = New System.Drawing.Size(129, 45) Me.cmdGrade.TabIndex = 20 Me.cmdGrade.Text = "grade" Me.cmdGrade.UseVisualStyleBackColor = True @@ -3231,11 +3034,9 @@ Partial Class ucrCalculator Me.grpMaths.Controls.Add(Me.cmdAcos) Me.grpMaths.Controls.Add(Me.cmdCos) Me.grpMaths.Controls.Add(Me.cmdSqrt) - Me.grpMaths.Location = New System.Drawing.Point(434, 62) - Me.grpMaths.Margin = New System.Windows.Forms.Padding(2) + Me.grpMaths.Location = New System.Drawing.Point(651, 93) Me.grpMaths.Name = "grpMaths" - Me.grpMaths.Padding = New System.Windows.Forms.Padding(2) - Me.grpMaths.Size = New System.Drawing.Size(256, 164) + Me.grpMaths.Size = New System.Drawing.Size(384, 246) Me.grpMaths.TabIndex = 184 Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" @@ -3244,10 +3045,9 @@ Partial Class ucrCalculator ' Me.cmdMathsHelp.AutoSize = True Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) - Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMathsHelp.Location = New System.Drawing.Point(244, 195) Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdMathsHelp.Size = New System.Drawing.Size(129, 45) Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths Me.cmdMathsHelp.TabIndex = 211 Me.cmdMathsHelp.Text = "R Help" @@ -3258,39 +3058,38 @@ Partial Class ucrCalculator Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsBaseStripMenuItem, Me.MathsStatsStripMenuItem, Me.MathsCarToolStripMenuItem, Me.MathsCircularToolStripMenuItem}) Me.ContextMenuStripMaths.Name = "ContextMenuStrip1" - Me.ContextMenuStripMaths.Size = New System.Drawing.Size(114, 92) + Me.ContextMenuStripMaths.Size = New System.Drawing.Size(140, 132) ' 'MathsBaseStripMenuItem ' Me.MathsBaseStripMenuItem.Name = "MathsBaseStripMenuItem" - Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(113, 22) + Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(139, 32) Me.MathsBaseStripMenuItem.Text = "base" ' 'MathsStatsStripMenuItem ' Me.MathsStatsStripMenuItem.Name = "MathsStatsStripMenuItem" - Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(113, 22) + Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(139, 32) Me.MathsStatsStripMenuItem.Text = "stats" ' 'MathsCarToolStripMenuItem ' Me.MathsCarToolStripMenuItem.Name = "MathsCarToolStripMenuItem" - Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(113, 22) + Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(139, 32) Me.MathsCarToolStripMenuItem.Text = "car" ' 'MathsCircularToolStripMenuItem ' Me.MathsCircularToolStripMenuItem.Name = "MathsCircularToolStripMenuItem" - Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(113, 22) + Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(139, 32) Me.MathsCircularToolStripMenuItem.Text = "circular" ' 'cmdAtan2 ' Me.cmdAtan2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan2.Location = New System.Drawing.Point(100, 130) - Me.cmdAtan2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAtan2.Location = New System.Drawing.Point(150, 195) Me.cmdAtan2.Name = "cmdAtan2" - Me.cmdAtan2.Size = New System.Drawing.Size(50, 30) + Me.cmdAtan2.Size = New System.Drawing.Size(75, 45) Me.cmdAtan2.TabIndex = 151 Me.cmdAtan2.Text = "atan2" Me.cmdAtan2.UseVisualStyleBackColor = True @@ -3298,10 +3097,9 @@ Partial Class ucrCalculator 'cmdLogistic ' Me.cmdLogistic.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogistic.Location = New System.Drawing.Point(51, 130) - Me.cmdLogistic.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLogistic.Location = New System.Drawing.Point(76, 195) Me.cmdLogistic.Name = "cmdLogistic" - Me.cmdLogistic.Size = New System.Drawing.Size(50, 30) + Me.cmdLogistic.Size = New System.Drawing.Size(75, 45) Me.cmdLogistic.TabIndex = 149 Me.cmdLogistic.Text = "logistic" Me.cmdLogistic.UseVisualStyleBackColor = True @@ -3309,10 +3107,9 @@ Partial Class ucrCalculator 'cmdLogit ' Me.cmdLogit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogit.Location = New System.Drawing.Point(2, 130) - Me.cmdLogit.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLogit.Location = New System.Drawing.Point(3, 195) Me.cmdLogit.Name = "cmdLogit" - Me.cmdLogit.Size = New System.Drawing.Size(50, 30) + Me.cmdLogit.Size = New System.Drawing.Size(75, 45) Me.cmdLogit.TabIndex = 148 Me.cmdLogit.Text = "logit" Me.cmdLogit.UseVisualStyleBackColor = True @@ -3320,10 +3117,9 @@ Partial Class ucrCalculator 'cmdSign ' Me.cmdSign.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSign.Location = New System.Drawing.Point(199, 101) - Me.cmdSign.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSign.Location = New System.Drawing.Point(298, 152) Me.cmdSign.Name = "cmdSign" - Me.cmdSign.Size = New System.Drawing.Size(50, 30) + Me.cmdSign.Size = New System.Drawing.Size(75, 45) Me.cmdSign.TabIndex = 147 Me.cmdSign.Text = "sign" Me.cmdSign.UseVisualStyleBackColor = True @@ -3332,10 +3128,9 @@ Partial Class ucrCalculator ' Me.cmdRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRound.Location = New System.Drawing.Point(150, 101) - Me.cmdRound.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRound.Location = New System.Drawing.Point(225, 152) Me.cmdRound.Name = "cmdRound" - Me.cmdRound.Size = New System.Drawing.Size(50, 30) + Me.cmdRound.Size = New System.Drawing.Size(75, 45) Me.cmdRound.TabIndex = 146 Me.cmdRound.Text = "round" Me.cmdRound.UseVisualStyleBackColor = True @@ -3344,10 +3139,9 @@ Partial Class ucrCalculator ' Me.cmdSiginf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSiginf.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSiginf.Location = New System.Drawing.Point(100, 101) - Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSiginf.Location = New System.Drawing.Point(150, 152) Me.cmdSiginf.Name = "cmdSiginf" - Me.cmdSiginf.Size = New System.Drawing.Size(50, 30) + Me.cmdSiginf.Size = New System.Drawing.Size(75, 45) Me.cmdSiginf.TabIndex = 145 Me.cmdSiginf.Text = "siginf" Me.cmdSiginf.UseVisualStyleBackColor = True @@ -3355,10 +3149,9 @@ Partial Class ucrCalculator 'cmdAbs ' Me.cmdAbs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAbs.Location = New System.Drawing.Point(51, 101) - Me.cmdAbs.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAbs.Location = New System.Drawing.Point(76, 152) Me.cmdAbs.Name = "cmdAbs" - Me.cmdAbs.Size = New System.Drawing.Size(50, 30) + Me.cmdAbs.Size = New System.Drawing.Size(75, 45) Me.cmdAbs.TabIndex = 144 Me.cmdAbs.Text = "abs" Me.cmdAbs.UseVisualStyleBackColor = True @@ -3366,10 +3159,9 @@ Partial Class ucrCalculator 'cmdExp ' Me.cmdExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExp.Location = New System.Drawing.Point(2, 101) - Me.cmdExp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdExp.Location = New System.Drawing.Point(3, 152) Me.cmdExp.Name = "cmdExp" - Me.cmdExp.Size = New System.Drawing.Size(50, 30) + Me.cmdExp.Size = New System.Drawing.Size(75, 45) Me.cmdExp.TabIndex = 143 Me.cmdExp.Text = "exp" Me.cmdExp.UseVisualStyleBackColor = True @@ -3377,10 +3169,9 @@ Partial Class ucrCalculator 'cmdDeg ' Me.cmdDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDeg.Location = New System.Drawing.Point(199, 72) - Me.cmdDeg.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDeg.Location = New System.Drawing.Point(298, 108) Me.cmdDeg.Name = "cmdDeg" - Me.cmdDeg.Size = New System.Drawing.Size(50, 30) + Me.cmdDeg.Size = New System.Drawing.Size(75, 45) Me.cmdDeg.TabIndex = 142 Me.cmdDeg.Text = "deg" Me.cmdDeg.UseVisualStyleBackColor = True @@ -3389,10 +3180,9 @@ Partial Class ucrCalculator ' Me.cmdTrunc.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrunc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrunc.Location = New System.Drawing.Point(150, 72) - Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTrunc.Location = New System.Drawing.Point(225, 108) Me.cmdTrunc.Name = "cmdTrunc" - Me.cmdTrunc.Size = New System.Drawing.Size(50, 30) + Me.cmdTrunc.Size = New System.Drawing.Size(75, 45) Me.cmdTrunc.TabIndex = 141 Me.cmdTrunc.Text = "trunc" Me.cmdTrunc.UseVisualStyleBackColor = True @@ -3400,10 +3190,9 @@ Partial Class ucrCalculator 'cmdAtan ' Me.cmdAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan.Location = New System.Drawing.Point(100, 72) - Me.cmdAtan.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAtan.Location = New System.Drawing.Point(150, 108) Me.cmdAtan.Name = "cmdAtan" - Me.cmdAtan.Size = New System.Drawing.Size(50, 30) + Me.cmdAtan.Size = New System.Drawing.Size(75, 45) Me.cmdAtan.TabIndex = 140 Me.cmdAtan.Text = "atan" Me.cmdAtan.UseVisualStyleBackColor = True @@ -3411,10 +3200,9 @@ Partial Class ucrCalculator 'cmdTan ' Me.cmdTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTan.Location = New System.Drawing.Point(51, 72) - Me.cmdTan.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTan.Location = New System.Drawing.Point(76, 108) Me.cmdTan.Name = "cmdTan" - Me.cmdTan.Size = New System.Drawing.Size(50, 30) + Me.cmdTan.Size = New System.Drawing.Size(75, 45) Me.cmdTan.TabIndex = 139 Me.cmdTan.Text = "tan" Me.cmdTan.UseVisualStyleBackColor = True @@ -3423,10 +3211,9 @@ Partial Class ucrCalculator ' Me.cmdLogTen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLogTen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogTen.Location = New System.Drawing.Point(2, 72) - Me.cmdLogTen.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLogTen.Location = New System.Drawing.Point(3, 108) Me.cmdLogTen.Name = "cmdLogTen" - Me.cmdLogTen.Size = New System.Drawing.Size(50, 30) + Me.cmdLogTen.Size = New System.Drawing.Size(75, 45) Me.cmdLogTen.TabIndex = 138 Me.cmdLogTen.Text = "log10" Me.cmdLogTen.UseVisualStyleBackColor = True @@ -3434,10 +3221,9 @@ Partial Class ucrCalculator 'cmdRad ' Me.cmdRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRad.Location = New System.Drawing.Point(199, 43) - Me.cmdRad.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRad.Location = New System.Drawing.Point(298, 64) Me.cmdRad.Name = "cmdRad" - Me.cmdRad.Size = New System.Drawing.Size(50, 30) + Me.cmdRad.Size = New System.Drawing.Size(75, 45) Me.cmdRad.TabIndex = 137 Me.cmdRad.Text = "rad" Me.cmdRad.UseVisualStyleBackColor = True @@ -3446,10 +3232,9 @@ Partial Class ucrCalculator ' Me.cmdFloor.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFloor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFloor.Location = New System.Drawing.Point(150, 43) - Me.cmdFloor.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFloor.Location = New System.Drawing.Point(225, 64) Me.cmdFloor.Name = "cmdFloor" - Me.cmdFloor.Size = New System.Drawing.Size(50, 30) + Me.cmdFloor.Size = New System.Drawing.Size(75, 45) Me.cmdFloor.TabIndex = 136 Me.cmdFloor.Text = "floor" Me.cmdFloor.UseVisualStyleBackColor = True @@ -3457,10 +3242,9 @@ Partial Class ucrCalculator 'cmdAsin ' Me.cmdAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsin.Location = New System.Drawing.Point(100, 43) - Me.cmdAsin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAsin.Location = New System.Drawing.Point(150, 64) Me.cmdAsin.Name = "cmdAsin" - Me.cmdAsin.Size = New System.Drawing.Size(50, 30) + Me.cmdAsin.Size = New System.Drawing.Size(75, 45) Me.cmdAsin.TabIndex = 135 Me.cmdAsin.Text = "asin" Me.cmdAsin.UseVisualStyleBackColor = True @@ -3468,10 +3252,9 @@ Partial Class ucrCalculator 'cmdSin ' Me.cmdSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSin.Location = New System.Drawing.Point(51, 43) - Me.cmdSin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSin.Location = New System.Drawing.Point(76, 64) Me.cmdSin.Name = "cmdSin" - Me.cmdSin.Size = New System.Drawing.Size(50, 30) + Me.cmdSin.Size = New System.Drawing.Size(75, 45) Me.cmdSin.TabIndex = 134 Me.cmdSin.Text = "sin" Me.cmdSin.UseVisualStyleBackColor = True @@ -3479,10 +3262,9 @@ Partial Class ucrCalculator 'cmdLog ' Me.cmdLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLog.Location = New System.Drawing.Point(2, 43) - Me.cmdLog.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLog.Location = New System.Drawing.Point(3, 64) Me.cmdLog.Name = "cmdLog" - Me.cmdLog.Size = New System.Drawing.Size(50, 30) + Me.cmdLog.Size = New System.Drawing.Size(75, 45) Me.cmdLog.TabIndex = 133 Me.cmdLog.Text = "log" Me.cmdLog.UseVisualStyleBackColor = True @@ -3490,10 +3272,9 @@ Partial Class ucrCalculator 'cmdPi ' Me.cmdPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPi.Location = New System.Drawing.Point(199, 14) - Me.cmdPi.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPi.Location = New System.Drawing.Point(298, 21) Me.cmdPi.Name = "cmdPi" - Me.cmdPi.Size = New System.Drawing.Size(50, 30) + Me.cmdPi.Size = New System.Drawing.Size(75, 45) Me.cmdPi.TabIndex = 132 Me.cmdPi.Text = "pi" Me.cmdPi.UseVisualStyleBackColor = True @@ -3502,10 +3283,9 @@ Partial Class ucrCalculator ' Me.cmdCeiling.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCeiling.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCeiling.Location = New System.Drawing.Point(150, 14) - Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCeiling.Location = New System.Drawing.Point(225, 21) Me.cmdCeiling.Name = "cmdCeiling" - Me.cmdCeiling.Size = New System.Drawing.Size(50, 30) + Me.cmdCeiling.Size = New System.Drawing.Size(75, 45) Me.cmdCeiling.TabIndex = 131 Me.cmdCeiling.Text = "ceiling" Me.cmdCeiling.UseVisualStyleBackColor = True @@ -3513,10 +3293,9 @@ Partial Class ucrCalculator 'cmdAcos ' Me.cmdAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAcos.Location = New System.Drawing.Point(100, 14) - Me.cmdAcos.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAcos.Location = New System.Drawing.Point(150, 21) Me.cmdAcos.Name = "cmdAcos" - Me.cmdAcos.Size = New System.Drawing.Size(50, 30) + Me.cmdAcos.Size = New System.Drawing.Size(75, 45) Me.cmdAcos.TabIndex = 130 Me.cmdAcos.Text = "acos" Me.cmdAcos.UseVisualStyleBackColor = True @@ -3524,10 +3303,9 @@ Partial Class ucrCalculator 'cmdCos ' Me.cmdCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCos.Location = New System.Drawing.Point(51, 14) - Me.cmdCos.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCos.Location = New System.Drawing.Point(76, 21) Me.cmdCos.Name = "cmdCos" - Me.cmdCos.Size = New System.Drawing.Size(50, 30) + Me.cmdCos.Size = New System.Drawing.Size(75, 45) Me.cmdCos.TabIndex = 129 Me.cmdCos.Text = "cos" Me.cmdCos.UseVisualStyleBackColor = True @@ -3535,10 +3313,9 @@ Partial Class ucrCalculator 'cmdSqrt ' Me.cmdSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSqrt.Location = New System.Drawing.Point(2, 14) - Me.cmdSqrt.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSqrt.Location = New System.Drawing.Point(3, 21) Me.cmdSqrt.Name = "cmdSqrt" - Me.cmdSqrt.Size = New System.Drawing.Size(50, 30) + Me.cmdSqrt.Size = New System.Drawing.Size(75, 45) Me.cmdSqrt.TabIndex = 128 Me.cmdSqrt.Text = "sqrt" Me.cmdSqrt.UseVisualStyleBackColor = True @@ -3579,11 +3356,9 @@ Partial Class ucrCalculator Me.grpSummary.Controls.Add(Me.cmdVar) Me.grpSummary.Controls.Add(Me.grpFrequencies) Me.grpSummary.Controls.Add(Me.cmdMin) - Me.grpSummary.Location = New System.Drawing.Point(434, 62) - Me.grpSummary.Margin = New System.Windows.Forms.Padding(2) + Me.grpSummary.Location = New System.Drawing.Point(651, 93) Me.grpSummary.Name = "grpSummary" - Me.grpSummary.Padding = New System.Windows.Forms.Padding(2) - Me.grpSummary.Size = New System.Drawing.Size(295, 337) + Me.grpSummary.Size = New System.Drawing.Size(442, 506) Me.grpSummary.TabIndex = 185 Me.grpSummary.TabStop = False Me.grpSummary.Text = "Summary" @@ -3592,10 +3367,9 @@ Partial Class ucrCalculator ' Me.cmdwheremin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdwheremin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwheremin.Location = New System.Drawing.Point(215, 159) - Me.cmdwheremin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdwheremin.Location = New System.Drawing.Point(322, 238) Me.cmdwheremin.Name = "cmdwheremin" - Me.cmdwheremin.Size = New System.Drawing.Size(70, 30) + Me.cmdwheremin.Size = New System.Drawing.Size(105, 45) Me.cmdwheremin.TabIndex = 193 Me.cmdwheremin.Text = "where.min" Me.cmdwheremin.UseVisualStyleBackColor = True @@ -3603,10 +3377,9 @@ Partial Class ucrCalculator 'cmdwhichmax ' Me.cmdwhichmax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhichmax.Location = New System.Drawing.Point(2, 159) - Me.cmdwhichmax.Margin = New System.Windows.Forms.Padding(2) + Me.cmdwhichmax.Location = New System.Drawing.Point(3, 238) Me.cmdwhichmax.Name = "cmdwhichmax" - Me.cmdwhichmax.Size = New System.Drawing.Size(72, 30) + Me.cmdwhichmax.Size = New System.Drawing.Size(108, 45) Me.cmdwhichmax.TabIndex = 192 Me.cmdwhichmax.Text = "which.max" Me.cmdwhichmax.UseVisualStyleBackColor = True @@ -3614,10 +3387,9 @@ Partial Class ucrCalculator 'cmdwheremax ' Me.cmdwheremax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwheremax.Location = New System.Drawing.Point(73, 159) - Me.cmdwheremax.Margin = New System.Windows.Forms.Padding(2) + Me.cmdwheremax.Location = New System.Drawing.Point(110, 238) Me.cmdwheremax.Name = "cmdwheremax" - Me.cmdwheremax.Size = New System.Drawing.Size(72, 30) + Me.cmdwheremax.Size = New System.Drawing.Size(108, 45) Me.cmdwheremax.TabIndex = 191 Me.cmdwheremax.Text = "where.max" Me.cmdwheremax.UseVisualStyleBackColor = True @@ -3626,10 +3398,9 @@ Partial Class ucrCalculator ' Me.cmdwhichmin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdwhichmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhichmin.Location = New System.Drawing.Point(144, 159) - Me.cmdwhichmin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdwhichmin.Location = New System.Drawing.Point(216, 238) Me.cmdwhichmin.Name = "cmdwhichmin" - Me.cmdwhichmin.Size = New System.Drawing.Size(72, 30) + Me.cmdwhichmin.Size = New System.Drawing.Size(108, 45) Me.cmdwhichmin.TabIndex = 190 Me.cmdwhichmin.Text = "which.min" Me.cmdwhichmin.UseVisualStyleBackColor = True @@ -3638,10 +3409,9 @@ Partial Class ucrCalculator ' Me.cmdSummaryRHelp.AutoSize = True Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(194, 189) - Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(291, 284) Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(135, 45) Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary Me.cmdSummaryRHelp.TabIndex = 185 Me.cmdSummaryRHelp.Text = "R Help" @@ -3652,52 +3422,51 @@ Partial Class ucrCalculator Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripSummary.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem1, Me.StatsToolStripMenuItem, Me.StatipToolStripMenuItem, Me.E1071ToolStripMenuItem, Me.RobustbaseToolStripMenuItem, Me.RasterToolStripMenuItem}) Me.ContextMenuStripSummary.Name = "ContextMenuStripSummary" - Me.ContextMenuStripSummary.Size = New System.Drawing.Size(136, 136) + Me.ContextMenuStripSummary.Size = New System.Drawing.Size(178, 196) ' 'BaseToolStripMenuItem1 ' Me.BaseToolStripMenuItem1.Name = "BaseToolStripMenuItem1" - Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(135, 22) + Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(177, 32) Me.BaseToolStripMenuItem1.Text = "Base" ' 'StatsToolStripMenuItem ' Me.StatsToolStripMenuItem.Name = "StatsToolStripMenuItem" - Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(135, 22) + Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(177, 32) Me.StatsToolStripMenuItem.Text = "Stats" ' 'StatipToolStripMenuItem ' Me.StatipToolStripMenuItem.Name = "StatipToolStripMenuItem" - Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(135, 22) + Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(177, 32) Me.StatipToolStripMenuItem.Text = "Statip" ' 'E1071ToolStripMenuItem ' Me.E1071ToolStripMenuItem.Name = "E1071ToolStripMenuItem" - Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(135, 22) + Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(177, 32) Me.E1071ToolStripMenuItem.Text = "e1071" ' 'RobustbaseToolStripMenuItem ' Me.RobustbaseToolStripMenuItem.Name = "RobustbaseToolStripMenuItem" - Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(135, 22) + Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(177, 32) Me.RobustbaseToolStripMenuItem.Text = "Robustbase" ' 'RasterToolStripMenuItem ' Me.RasterToolStripMenuItem.Name = "RasterToolStripMenuItem" - Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(135, 22) + Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(177, 32) Me.RasterToolStripMenuItem.Text = "Raster" ' 'cmdKurtosis ' Me.cmdKurtosis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdKurtosis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKurtosis.Location = New System.Drawing.Point(228, 101) - Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(2) + Me.cmdKurtosis.Location = New System.Drawing.Point(342, 152) Me.cmdKurtosis.Name = "cmdKurtosis" - Me.cmdKurtosis.Size = New System.Drawing.Size(56, 30) + Me.cmdKurtosis.Size = New System.Drawing.Size(84, 45) Me.cmdKurtosis.TabIndex = 182 Me.cmdKurtosis.Text = "kurtosis" Me.cmdKurtosis.UseVisualStyleBackColor = True @@ -3705,10 +3474,9 @@ Partial Class ucrCalculator 'cmdMode1 ' Me.cmdMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode1.Location = New System.Drawing.Point(228, 43) - Me.cmdMode1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMode1.Location = New System.Drawing.Point(342, 64) Me.cmdMode1.Name = "cmdMode1" - Me.cmdMode1.Size = New System.Drawing.Size(56, 30) + Me.cmdMode1.Size = New System.Drawing.Size(84, 45) Me.cmdMode1.TabIndex = 180 Me.cmdMode1.Text = "mode1" Me.cmdMode1.UseVisualStyleBackColor = True @@ -3716,10 +3484,9 @@ Partial Class ucrCalculator 'cmdMode ' Me.cmdMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode.Location = New System.Drawing.Point(173, 43) - Me.cmdMode.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMode.Location = New System.Drawing.Point(260, 64) Me.cmdMode.Name = "cmdMode" - Me.cmdMode.Size = New System.Drawing.Size(56, 30) + Me.cmdMode.Size = New System.Drawing.Size(84, 45) Me.cmdMode.TabIndex = 179 Me.cmdMode.Text = "mode" Me.cmdMode.UseVisualStyleBackColor = True @@ -3727,10 +3494,9 @@ Partial Class ucrCalculator 'cmdFirst ' Me.cmdFirst.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFirst.Location = New System.Drawing.Point(118, 130) - Me.cmdFirst.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFirst.Location = New System.Drawing.Point(177, 195) Me.cmdFirst.Name = "cmdFirst" - Me.cmdFirst.Size = New System.Drawing.Size(56, 30) + Me.cmdFirst.Size = New System.Drawing.Size(84, 45) Me.cmdFirst.TabIndex = 178 Me.cmdFirst.Text = "first" Me.cmdFirst.UseVisualStyleBackColor = True @@ -3738,10 +3504,9 @@ Partial Class ucrCalculator 'cmdLast ' Me.cmdLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLast.Location = New System.Drawing.Point(173, 130) - Me.cmdLast.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLast.Location = New System.Drawing.Point(260, 195) Me.cmdLast.Name = "cmdLast" - Me.cmdLast.Size = New System.Drawing.Size(56, 30) + Me.cmdLast.Size = New System.Drawing.Size(84, 45) Me.cmdLast.TabIndex = 177 Me.cmdLast.Text = "last" Me.cmdLast.UseVisualStyleBackColor = True @@ -3749,10 +3514,9 @@ Partial Class ucrCalculator 'cmdnth ' Me.cmdnth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnth.Location = New System.Drawing.Point(228, 130) - Me.cmdnth.Margin = New System.Windows.Forms.Padding(2) + Me.cmdnth.Location = New System.Drawing.Point(342, 195) Me.cmdnth.Name = "cmdnth" - Me.cmdnth.Size = New System.Drawing.Size(56, 30) + Me.cmdnth.Size = New System.Drawing.Size(84, 45) Me.cmdnth.TabIndex = 176 Me.cmdnth.Text = "nth" Me.cmdnth.UseVisualStyleBackColor = True @@ -3760,10 +3524,9 @@ Partial Class ucrCalculator 'cmdCor ' Me.cmdCor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCor.Location = New System.Drawing.Point(2, 188) - Me.cmdCor.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCor.Location = New System.Drawing.Point(3, 282) Me.cmdCor.Name = "cmdCor" - Me.cmdCor.Size = New System.Drawing.Size(62, 30) + Me.cmdCor.Size = New System.Drawing.Size(93, 45) Me.cmdCor.TabIndex = 175 Me.cmdCor.Text = "cor" Me.cmdCor.UseVisualStyleBackColor = True @@ -3771,10 +3534,9 @@ Partial Class ucrCalculator 'cmdCov ' Me.cmdCov.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCov.Location = New System.Drawing.Point(63, 188) - Me.cmdCov.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCov.Location = New System.Drawing.Point(94, 282) Me.cmdCov.Name = "cmdCov" - Me.cmdCov.Size = New System.Drawing.Size(56, 30) + Me.cmdCov.Size = New System.Drawing.Size(84, 45) Me.cmdCov.TabIndex = 174 Me.cmdCov.Text = "cov" Me.cmdCov.UseVisualStyleBackColor = True @@ -3783,10 +3545,9 @@ Partial Class ucrCalculator ' Me.cmdMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMad.Location = New System.Drawing.Point(173, 72) - Me.cmdMad.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMad.Location = New System.Drawing.Point(260, 108) Me.cmdMad.Name = "cmdMad" - Me.cmdMad.Size = New System.Drawing.Size(56, 30) + Me.cmdMad.Size = New System.Drawing.Size(84, 45) Me.cmdMad.TabIndex = 173 Me.cmdMad.Text = "mad" Me.cmdMad.UseVisualStyleBackColor = True @@ -3795,10 +3556,9 @@ Partial Class ucrCalculator ' Me.cmdMc.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMc.Location = New System.Drawing.Point(118, 101) - Me.cmdMc.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMc.Location = New System.Drawing.Point(177, 152) Me.cmdMc.Name = "cmdMc" - Me.cmdMc.Size = New System.Drawing.Size(56, 30) + Me.cmdMc.Size = New System.Drawing.Size(84, 45) Me.cmdMc.TabIndex = 172 Me.cmdMc.Text = "mc" Me.cmdMc.UseVisualStyleBackColor = True @@ -3807,10 +3567,9 @@ Partial Class ucrCalculator ' Me.cmdPropn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPropn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPropn.Location = New System.Drawing.Point(63, 130) - Me.cmdPropn.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPropn.Location = New System.Drawing.Point(94, 195) Me.cmdPropn.Name = "cmdPropn" - Me.cmdPropn.Size = New System.Drawing.Size(56, 30) + Me.cmdPropn.Size = New System.Drawing.Size(84, 45) Me.cmdPropn.TabIndex = 171 Me.cmdPropn.Text = "propn" Me.cmdPropn.UseVisualStyleBackColor = True @@ -3819,10 +3578,9 @@ Partial Class ucrCalculator ' Me.cmdCv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCv.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCv.Location = New System.Drawing.Point(63, 101) - Me.cmdCv.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCv.Location = New System.Drawing.Point(94, 152) Me.cmdCv.Name = "cmdCv" - Me.cmdCv.Size = New System.Drawing.Size(56, 30) + Me.cmdCv.Size = New System.Drawing.Size(84, 45) Me.cmdCv.TabIndex = 170 Me.cmdCv.Text = "cv" Me.cmdCv.UseVisualStyleBackColor = True @@ -3831,10 +3589,9 @@ Partial Class ucrCalculator ' Me.cmdSkew.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSkew.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSkew.Location = New System.Drawing.Point(173, 101) - Me.cmdSkew.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSkew.Location = New System.Drawing.Point(260, 152) Me.cmdSkew.Name = "cmdSkew" - Me.cmdSkew.Size = New System.Drawing.Size(56, 30) + Me.cmdSkew.Size = New System.Drawing.Size(84, 45) Me.cmdSkew.TabIndex = 169 Me.cmdSkew.Text = "skew" Me.cmdSkew.UseVisualStyleBackColor = True @@ -3843,10 +3600,9 @@ Partial Class ucrCalculator ' Me.cmdAnyDup.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdAnyDup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnyDup.Location = New System.Drawing.Point(2, 130) - Me.cmdAnyDup.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAnyDup.Location = New System.Drawing.Point(3, 195) Me.cmdAnyDup.Name = "cmdAnyDup" - Me.cmdAnyDup.Size = New System.Drawing.Size(62, 30) + Me.cmdAnyDup.Size = New System.Drawing.Size(93, 45) Me.cmdAnyDup.TabIndex = 168 Me.cmdAnyDup.Text = "anyDup" Me.cmdAnyDup.UseVisualStyleBackColor = True @@ -3854,10 +3610,9 @@ Partial Class ucrCalculator 'cmdDistinct ' Me.cmdDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDistinct.Location = New System.Drawing.Point(2, 101) - Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDistinct.Location = New System.Drawing.Point(3, 152) Me.cmdDistinct.Name = "cmdDistinct" - Me.cmdDistinct.Size = New System.Drawing.Size(62, 30) + Me.cmdDistinct.Size = New System.Drawing.Size(93, 45) Me.cmdDistinct.TabIndex = 167 Me.cmdDistinct.Text = "distinct" Me.cmdDistinct.UseVisualStyleBackColor = True @@ -3865,10 +3620,9 @@ Partial Class ucrCalculator 'cmdNonMiss ' Me.cmdNonMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNonMiss.Location = New System.Drawing.Point(2, 72) - Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNonMiss.Location = New System.Drawing.Point(3, 108) Me.cmdNonMiss.Name = "cmdNonMiss" - Me.cmdNonMiss.Size = New System.Drawing.Size(62, 30) + Me.cmdNonMiss.Size = New System.Drawing.Size(93, 45) Me.cmdNonMiss.TabIndex = 166 Me.cmdNonMiss.Text = "non miss" Me.cmdNonMiss.UseVisualStyleBackColor = True @@ -3877,10 +3631,9 @@ Partial Class ucrCalculator ' Me.cmdIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIQR.Location = New System.Drawing.Point(228, 72) - Me.cmdIQR.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIQR.Location = New System.Drawing.Point(342, 108) Me.cmdIQR.Name = "cmdIQR" - Me.cmdIQR.Size = New System.Drawing.Size(56, 30) + Me.cmdIQR.Size = New System.Drawing.Size(84, 45) Me.cmdIQR.TabIndex = 165 Me.cmdIQR.Text = "IQR" Me.cmdIQR.UseVisualStyleBackColor = True @@ -3889,10 +3642,9 @@ Partial Class ucrCalculator ' Me.cmdQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuantile.Location = New System.Drawing.Point(118, 188) - Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQuantile.Location = New System.Drawing.Point(177, 282) Me.cmdQuantile.Name = "cmdQuantile" - Me.cmdQuantile.Size = New System.Drawing.Size(56, 30) + Me.cmdQuantile.Size = New System.Drawing.Size(84, 45) Me.cmdQuantile.TabIndex = 164 Me.cmdQuantile.Text = "quantile" Me.cmdQuantile.UseVisualStyleBackColor = True @@ -3901,10 +3653,9 @@ Partial Class ucrCalculator ' Me.cmdRange.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRange.Location = New System.Drawing.Point(228, 14) - Me.cmdRange.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRange.Location = New System.Drawing.Point(342, 21) Me.cmdRange.Name = "cmdRange" - Me.cmdRange.Size = New System.Drawing.Size(56, 30) + Me.cmdRange.Size = New System.Drawing.Size(84, 45) Me.cmdRange.TabIndex = 163 Me.cmdRange.Text = "range" Me.cmdRange.UseVisualStyleBackColor = True @@ -3912,10 +3663,9 @@ Partial Class ucrCalculator 'cmdSd ' Me.cmdSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSd.Location = New System.Drawing.Point(118, 72) - Me.cmdSd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSd.Location = New System.Drawing.Point(177, 108) Me.cmdSd.Name = "cmdSd" - Me.cmdSd.Size = New System.Drawing.Size(56, 30) + Me.cmdSd.Size = New System.Drawing.Size(84, 45) Me.cmdSd.TabIndex = 160 Me.cmdSd.Text = "sd" Me.cmdSd.UseVisualStyleBackColor = True @@ -3924,10 +3674,9 @@ Partial Class ucrCalculator ' Me.cmdMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMedian.Location = New System.Drawing.Point(118, 43) - Me.cmdMedian.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMedian.Location = New System.Drawing.Point(177, 64) Me.cmdMedian.Name = "cmdMedian" - Me.cmdMedian.Size = New System.Drawing.Size(56, 30) + Me.cmdMedian.Size = New System.Drawing.Size(84, 45) Me.cmdMedian.TabIndex = 158 Me.cmdMedian.Text = "median" Me.cmdMedian.UseVisualStyleBackColor = True @@ -3935,10 +3684,9 @@ Partial Class ucrCalculator 'cmdMax ' Me.cmdMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMax.Location = New System.Drawing.Point(173, 14) - Me.cmdMax.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMax.Location = New System.Drawing.Point(260, 21) Me.cmdMax.Name = "cmdMax" - Me.cmdMax.Size = New System.Drawing.Size(56, 30) + Me.cmdMax.Size = New System.Drawing.Size(84, 45) Me.cmdMax.TabIndex = 154 Me.cmdMax.Text = "max" Me.cmdMax.UseVisualStyleBackColor = True @@ -3947,10 +3695,9 @@ Partial Class ucrCalculator ' Me.cmdMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMean.Location = New System.Drawing.Point(63, 43) - Me.cmdMean.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMean.Location = New System.Drawing.Point(94, 64) Me.cmdMean.Name = "cmdMean" - Me.cmdMean.Size = New System.Drawing.Size(56, 30) + Me.cmdMean.Size = New System.Drawing.Size(84, 45) Me.cmdMean.TabIndex = 153 Me.cmdMean.Text = "mean" Me.cmdMean.UseVisualStyleBackColor = True @@ -3958,10 +3705,9 @@ Partial Class ucrCalculator 'cmdMiss ' Me.cmdMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMiss.Location = New System.Drawing.Point(2, 43) - Me.cmdMiss.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMiss.Location = New System.Drawing.Point(3, 64) Me.cmdMiss.Name = "cmdMiss" - Me.cmdMiss.Size = New System.Drawing.Size(62, 30) + Me.cmdMiss.Size = New System.Drawing.Size(93, 45) Me.cmdMiss.TabIndex = 149 Me.cmdMiss.Text = "miss" Me.cmdMiss.UseVisualStyleBackColor = True @@ -3970,10 +3716,9 @@ Partial Class ucrCalculator ' Me.cmdLength.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLength.Location = New System.Drawing.Point(2, 14) - Me.cmdLength.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLength.Location = New System.Drawing.Point(3, 21) Me.cmdLength.Name = "cmdLength" - Me.cmdLength.Size = New System.Drawing.Size(62, 30) + Me.cmdLength.Size = New System.Drawing.Size(93, 45) Me.cmdLength.TabIndex = 148 Me.cmdLength.Text = "length" Me.cmdLength.UseVisualStyleBackColor = True @@ -3981,10 +3726,9 @@ Partial Class ucrCalculator 'cmdSum ' Me.cmdSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSum.Location = New System.Drawing.Point(63, 14) - Me.cmdSum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSum.Location = New System.Drawing.Point(94, 21) Me.cmdSum.Name = "cmdSum" - Me.cmdSum.Size = New System.Drawing.Size(56, 30) + Me.cmdSum.Size = New System.Drawing.Size(84, 45) Me.cmdSum.TabIndex = 150 Me.cmdSum.Text = "sum" Me.cmdSum.UseVisualStyleBackColor = True @@ -3992,10 +3736,9 @@ Partial Class ucrCalculator 'cmdVar ' Me.cmdVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVar.Location = New System.Drawing.Point(63, 72) - Me.cmdVar.Margin = New System.Windows.Forms.Padding(2) + Me.cmdVar.Location = New System.Drawing.Point(94, 108) Me.cmdVar.Name = "cmdVar" - Me.cmdVar.Size = New System.Drawing.Size(56, 30) + Me.cmdVar.Size = New System.Drawing.Size(84, 45) Me.cmdVar.TabIndex = 159 Me.cmdVar.Text = "var" Me.cmdVar.UseVisualStyleBackColor = True @@ -4017,11 +3760,9 @@ Partial Class ucrCalculator Me.grpFrequencies.Controls.Add(Me.cmdFreqMin) Me.grpFrequencies.Controls.Add(Me.cmdFreqSum) Me.grpFrequencies.Controls.Add(Me.cmdFreqLength) - Me.grpFrequencies.Location = New System.Drawing.Point(2, 226) - Me.grpFrequencies.Margin = New System.Windows.Forms.Padding(2) + Me.grpFrequencies.Location = New System.Drawing.Point(3, 339) Me.grpFrequencies.Name = "grpFrequencies" - Me.grpFrequencies.Padding = New System.Windows.Forms.Padding(2) - Me.grpFrequencies.Size = New System.Drawing.Size(286, 106) + Me.grpFrequencies.Size = New System.Drawing.Size(429, 159) Me.grpFrequencies.TabIndex = 184 Me.grpFrequencies.TabStop = False Me.grpFrequencies.Text = "Frequencies" @@ -4030,10 +3771,9 @@ Partial Class ucrCalculator ' Me.cmdFreqQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqQuantile.Location = New System.Drawing.Point(228, 72) - Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqQuantile.Location = New System.Drawing.Point(342, 108) Me.cmdFreqQuantile.Name = "cmdFreqQuantile" - Me.cmdFreqQuantile.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqQuantile.Size = New System.Drawing.Size(87, 45) Me.cmdFreqQuantile.TabIndex = 186 Me.cmdFreqQuantile.Text = "quantile" Me.cmdFreqQuantile.UseVisualStyleBackColor = True @@ -4042,10 +3782,9 @@ Partial Class ucrCalculator ' Me.cmdFreqPropn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqPropn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqPropn.Location = New System.Drawing.Point(171, 72) - Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqPropn.Location = New System.Drawing.Point(256, 108) Me.cmdFreqPropn.Name = "cmdFreqPropn" - Me.cmdFreqPropn.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqPropn.Size = New System.Drawing.Size(87, 45) Me.cmdFreqPropn.TabIndex = 185 Me.cmdFreqPropn.Text = "propn" Me.cmdFreqPropn.UseVisualStyleBackColor = True @@ -4054,10 +3793,9 @@ Partial Class ucrCalculator ' Me.cmdFreqDistinct.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqDistinct.Location = New System.Drawing.Point(114, 72) - Me.cmdFreqDistinct.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqDistinct.Location = New System.Drawing.Point(171, 108) Me.cmdFreqDistinct.Name = "cmdFreqDistinct" - Me.cmdFreqDistinct.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqDistinct.Size = New System.Drawing.Size(87, 45) Me.cmdFreqDistinct.TabIndex = 184 Me.cmdFreqDistinct.Text = "distinct" Me.cmdFreqDistinct.UseVisualStyleBackColor = True @@ -4066,10 +3804,9 @@ Partial Class ucrCalculator ' Me.cmdFreqIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqIQR.Location = New System.Drawing.Point(57, 72) - Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqIQR.Location = New System.Drawing.Point(86, 108) Me.cmdFreqIQR.Name = "cmdFreqIQR" - Me.cmdFreqIQR.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqIQR.Size = New System.Drawing.Size(87, 45) Me.cmdFreqIQR.TabIndex = 183 Me.cmdFreqIQR.Text = "IQR" Me.cmdFreqIQR.UseVisualStyleBackColor = True @@ -4078,10 +3815,9 @@ Partial Class ucrCalculator ' Me.cmdFreqMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMedian.Location = New System.Drawing.Point(114, 43) - Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqMedian.Location = New System.Drawing.Point(171, 64) Me.cmdFreqMedian.Name = "cmdFreqMedian" - Me.cmdFreqMedian.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqMedian.Size = New System.Drawing.Size(87, 45) Me.cmdFreqMedian.TabIndex = 182 Me.cmdFreqMedian.Text = "median" Me.cmdFreqMedian.UseVisualStyleBackColor = True @@ -4090,10 +3826,9 @@ Partial Class ucrCalculator ' Me.cmdFreqSd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqSd.Location = New System.Drawing.Point(228, 43) - Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqSd.Location = New System.Drawing.Point(342, 64) Me.cmdFreqSd.Name = "cmdFreqSd" - Me.cmdFreqSd.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqSd.Size = New System.Drawing.Size(87, 45) Me.cmdFreqSd.TabIndex = 181 Me.cmdFreqSd.Text = "sd" Me.cmdFreqSd.UseVisualStyleBackColor = True @@ -4102,10 +3837,9 @@ Partial Class ucrCalculator ' Me.cmdFreqVar.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqVar.Location = New System.Drawing.Point(171, 43) - Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqVar.Location = New System.Drawing.Point(256, 64) Me.cmdFreqVar.Name = "cmdFreqVar" - Me.cmdFreqVar.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqVar.Size = New System.Drawing.Size(87, 45) Me.cmdFreqVar.TabIndex = 180 Me.cmdFreqVar.Text = "var" Me.cmdFreqVar.UseVisualStyleBackColor = True @@ -4114,10 +3848,9 @@ Partial Class ucrCalculator ' Me.cmdFreqMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMean.Location = New System.Drawing.Point(57, 43) - Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqMean.Location = New System.Drawing.Point(86, 64) Me.cmdFreqMean.Name = "cmdFreqMean" - Me.cmdFreqMean.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqMean.Size = New System.Drawing.Size(87, 45) Me.cmdFreqMean.TabIndex = 179 Me.cmdFreqMean.Text = "mean" Me.cmdFreqMean.UseVisualStyleBackColor = True @@ -4126,10 +3859,9 @@ Partial Class ucrCalculator ' Me.cmdFreqMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMad.Location = New System.Drawing.Point(0, 72) - Me.cmdFreqMad.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqMad.Location = New System.Drawing.Point(0, 108) Me.cmdFreqMad.Name = "cmdFreqMad" - Me.cmdFreqMad.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqMad.Size = New System.Drawing.Size(87, 45) Me.cmdFreqMad.TabIndex = 178 Me.cmdFreqMad.Text = "mad" Me.cmdFreqMad.UseVisualStyleBackColor = True @@ -4138,10 +3870,9 @@ Partial Class ucrCalculator ' Me.cmdFreqMiss.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 43) - Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 64) Me.cmdFreqMiss.Name = "cmdFreqMiss" - Me.cmdFreqMiss.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqMiss.Size = New System.Drawing.Size(87, 45) Me.cmdFreqMiss.TabIndex = 177 Me.cmdFreqMiss.Text = "miss" Me.cmdFreqMiss.UseVisualStyleBackColor = True @@ -4150,10 +3881,9 @@ Partial Class ucrCalculator ' Me.cmdFreqMode1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMode1.Location = New System.Drawing.Point(228, 14) - Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqMode1.Location = New System.Drawing.Point(342, 21) Me.cmdFreqMode1.Name = "cmdFreqMode1" - Me.cmdFreqMode1.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqMode1.Size = New System.Drawing.Size(87, 45) Me.cmdFreqMode1.TabIndex = 176 Me.cmdFreqMode1.Text = "mode1" Me.cmdFreqMode1.UseVisualStyleBackColor = True @@ -4162,10 +3892,9 @@ Partial Class ucrCalculator ' Me.cmdFreqMax.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMax.Location = New System.Drawing.Point(171, 14) - Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqMax.Location = New System.Drawing.Point(256, 21) Me.cmdFreqMax.Name = "cmdFreqMax" - Me.cmdFreqMax.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqMax.Size = New System.Drawing.Size(87, 45) Me.cmdFreqMax.TabIndex = 175 Me.cmdFreqMax.Text = "max" Me.cmdFreqMax.UseVisualStyleBackColor = True @@ -4174,10 +3903,9 @@ Partial Class ucrCalculator ' Me.cmdFreqMin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqMin.Location = New System.Drawing.Point(114, 14) - Me.cmdFreqMin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqMin.Location = New System.Drawing.Point(171, 21) Me.cmdFreqMin.Name = "cmdFreqMin" - Me.cmdFreqMin.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqMin.Size = New System.Drawing.Size(87, 45) Me.cmdFreqMin.TabIndex = 174 Me.cmdFreqMin.Text = "min" Me.cmdFreqMin.UseVisualStyleBackColor = True @@ -4186,10 +3914,9 @@ Partial Class ucrCalculator ' Me.cmdFreqSum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqSum.Location = New System.Drawing.Point(57, 14) - Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqSum.Location = New System.Drawing.Point(86, 21) Me.cmdFreqSum.Name = "cmdFreqSum" - Me.cmdFreqSum.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqSum.Size = New System.Drawing.Size(87, 45) Me.cmdFreqSum.TabIndex = 173 Me.cmdFreqSum.Text = "sum" Me.cmdFreqSum.UseVisualStyleBackColor = True @@ -4198,10 +3925,9 @@ Partial Class ucrCalculator ' Me.cmdFreqLength.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFreqLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFreqLength.Location = New System.Drawing.Point(0, 14) - Me.cmdFreqLength.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFreqLength.Location = New System.Drawing.Point(0, 21) Me.cmdFreqLength.Name = "cmdFreqLength" - Me.cmdFreqLength.Size = New System.Drawing.Size(58, 30) + Me.cmdFreqLength.Size = New System.Drawing.Size(87, 45) Me.cmdFreqLength.TabIndex = 172 Me.cmdFreqLength.Text = "length" Me.cmdFreqLength.UseVisualStyleBackColor = True @@ -4209,10 +3935,9 @@ Partial Class ucrCalculator 'cmdMin ' Me.cmdMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMin.Location = New System.Drawing.Point(118, 14) - Me.cmdMin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMin.Location = New System.Drawing.Point(177, 21) Me.cmdMin.Name = "cmdMin" - Me.cmdMin.Size = New System.Drawing.Size(56, 30) + Me.cmdMin.Size = New System.Drawing.Size(84, 45) Me.cmdMin.TabIndex = 155 Me.cmdMin.Text = "min" Me.cmdMin.UseVisualStyleBackColor = True @@ -4251,11 +3976,9 @@ Partial Class ucrCalculator Me.grpProbabilty.Controls.Add(Me.cmdTrigamma) Me.grpProbabilty.Controls.Add(Me.cmdBeta) Me.grpProbabilty.Controls.Add(Me.cmdDigamma) - Me.grpProbabilty.Location = New System.Drawing.Point(434, 62) - Me.grpProbabilty.Margin = New System.Windows.Forms.Padding(2) + Me.grpProbabilty.Location = New System.Drawing.Point(651, 93) Me.grpProbabilty.Name = "grpProbabilty" - Me.grpProbabilty.Padding = New System.Windows.Forms.Padding(2) - Me.grpProbabilty.Size = New System.Drawing.Size(316, 322) + Me.grpProbabilty.Size = New System.Drawing.Size(474, 471) Me.grpProbabilty.TabIndex = 187 Me.grpProbabilty.TabStop = False Me.grpProbabilty.Text = "Probability" @@ -4264,10 +3987,9 @@ Partial Class ucrCalculator ' Me.cmdProbRHelp.AutoSize = True Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 190) - Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdProbRHelp.Location = New System.Drawing.Point(333, 282) Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdProbRHelp.Size = New System.Drawing.Size(129, 45) Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability Me.cmdProbRHelp.TabIndex = 212 Me.cmdProbRHelp.Text = "R Help" @@ -4278,18 +4000,18 @@ Partial Class ucrCalculator Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripProbability.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ProbStatsToolStripMenuItem, Me.ProbBaseToolStripMenuItem}) Me.ContextMenuStripProbability.Name = "ContextMenuStrip1" - Me.ContextMenuStripProbability.Size = New System.Drawing.Size(99, 48) + Me.ContextMenuStripProbability.Size = New System.Drawing.Size(122, 68) ' 'ProbStatsToolStripMenuItem ' Me.ProbStatsToolStripMenuItem.Name = "ProbStatsToolStripMenuItem" - Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(98, 22) + Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(121, 32) Me.ProbStatsToolStripMenuItem.Text = "stats" ' 'ProbBaseToolStripMenuItem ' Me.ProbBaseToolStripMenuItem.Name = "ProbBaseToolStripMenuItem" - Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(98, 22) + Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(121, 32) Me.ProbBaseToolStripMenuItem.Text = "base" ' 'grpRandom @@ -4304,11 +4026,9 @@ Partial Class ucrCalculator Me.grpRandom.Controls.Add(Me.cmduni_integer) Me.grpRandom.Controls.Add(Me.cmdRan_normal) Me.grpRandom.Controls.Add(Me.cmduniform) - Me.grpRandom.Location = New System.Drawing.Point(6, 226) - Me.grpRandom.Margin = New System.Windows.Forms.Padding(2) + Me.grpRandom.Location = New System.Drawing.Point(9, 334) Me.grpRandom.Name = "grpRandom" - Me.grpRandom.Padding = New System.Windows.Forms.Padding(2) - Me.grpRandom.Size = New System.Drawing.Size(306, 84) + Me.grpRandom.Size = New System.Drawing.Size(459, 126) Me.grpRandom.TabIndex = 199 Me.grpRandom.TabStop = False Me.grpRandom.Text = "Random Samples" @@ -4317,10 +4037,9 @@ Partial Class ucrCalculator ' Me.cmdnbinomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdnbinomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnbinomial.Location = New System.Drawing.Point(116, 43) - Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(2) + Me.cmdnbinomial.Location = New System.Drawing.Point(174, 64) Me.cmdnbinomial.Name = "cmdnbinomial" - Me.cmdnbinomial.Size = New System.Drawing.Size(72, 30) + Me.cmdnbinomial.Size = New System.Drawing.Size(108, 45) Me.cmdnbinomial.TabIndex = 182 Me.cmdnbinomial.Text = "nbinomial" Me.cmdnbinomial.UseVisualStyleBackColor = True @@ -4329,10 +4048,9 @@ Partial Class ucrCalculator ' Me.cmdRan_sample.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_sample.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_sample.Location = New System.Drawing.Point(244, 43) - Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRan_sample.Location = New System.Drawing.Point(366, 64) Me.cmdRan_sample.Name = "cmdRan_sample" - Me.cmdRan_sample.Size = New System.Drawing.Size(58, 30) + Me.cmdRan_sample.Size = New System.Drawing.Size(87, 45) Me.cmdRan_sample.TabIndex = 181 Me.cmdRan_sample.Text = "sample" Me.cmdRan_sample.UseVisualStyleBackColor = True @@ -4341,10 +4059,9 @@ Partial Class ucrCalculator ' Me.cmdRan_beta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_beta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_beta.Location = New System.Drawing.Point(187, 43) - Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRan_beta.Location = New System.Drawing.Point(280, 64) Me.cmdRan_beta.Name = "cmdRan_beta" - Me.cmdRan_beta.Size = New System.Drawing.Size(58, 30) + Me.cmdRan_beta.Size = New System.Drawing.Size(87, 45) Me.cmdRan_beta.TabIndex = 180 Me.cmdRan_beta.Text = "beta" Me.cmdRan_beta.UseVisualStyleBackColor = True @@ -4353,10 +4070,9 @@ Partial Class ucrCalculator ' Me.cmdRan_gamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_gamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_gamma.Location = New System.Drawing.Point(59, 43) - Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRan_gamma.Location = New System.Drawing.Point(88, 64) Me.cmdRan_gamma.Name = "cmdRan_gamma" - Me.cmdRan_gamma.Size = New System.Drawing.Size(58, 30) + Me.cmdRan_gamma.Size = New System.Drawing.Size(87, 45) Me.cmdRan_gamma.TabIndex = 179 Me.cmdRan_gamma.Text = "gamma" Me.cmdRan_gamma.UseVisualStyleBackColor = True @@ -4365,10 +4081,9 @@ Partial Class ucrCalculator ' Me.cmdpoisson.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdpoisson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdpoisson.Location = New System.Drawing.Point(2, 43) - Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(2) + Me.cmdpoisson.Location = New System.Drawing.Point(3, 64) Me.cmdpoisson.Name = "cmdpoisson" - Me.cmdpoisson.Size = New System.Drawing.Size(58, 30) + Me.cmdpoisson.Size = New System.Drawing.Size(87, 45) Me.cmdpoisson.TabIndex = 177 Me.cmdpoisson.Text = "poisson" Me.cmdpoisson.UseVisualStyleBackColor = True @@ -4377,10 +4092,9 @@ Partial Class ucrCalculator ' Me.cmdbinomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdbinomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbinomial.Location = New System.Drawing.Point(244, 14) - Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(2) + Me.cmdbinomial.Location = New System.Drawing.Point(366, 21) Me.cmdbinomial.Name = "cmdbinomial" - Me.cmdbinomial.Size = New System.Drawing.Size(58, 30) + Me.cmdbinomial.Size = New System.Drawing.Size(87, 45) Me.cmdbinomial.TabIndex = 176 Me.cmdbinomial.Text = "binomial" Me.cmdbinomial.UseVisualStyleBackColor = True @@ -4389,10 +4103,9 @@ Partial Class ucrCalculator ' Me.cmdbernoulli.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdbernoulli.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbernoulli.Location = New System.Drawing.Point(187, 14) - Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(2) + Me.cmdbernoulli.Location = New System.Drawing.Point(280, 21) Me.cmdbernoulli.Name = "cmdbernoulli" - Me.cmdbernoulli.Size = New System.Drawing.Size(58, 30) + Me.cmdbernoulli.Size = New System.Drawing.Size(87, 45) Me.cmdbernoulli.TabIndex = 175 Me.cmdbernoulli.Text = "bernoulli" Me.cmdbernoulli.UseVisualStyleBackColor = True @@ -4401,10 +4114,9 @@ Partial Class ucrCalculator ' Me.cmduni_integer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmduni_integer.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmduni_integer.Location = New System.Drawing.Point(116, 14) - Me.cmduni_integer.Margin = New System.Windows.Forms.Padding(2) + Me.cmduni_integer.Location = New System.Drawing.Point(174, 21) Me.cmduni_integer.Name = "cmduni_integer" - Me.cmduni_integer.Size = New System.Drawing.Size(72, 30) + Me.cmduni_integer.Size = New System.Drawing.Size(108, 45) Me.cmduni_integer.TabIndex = 174 Me.cmduni_integer.Text = "uni_integer" Me.cmduni_integer.UseVisualStyleBackColor = True @@ -4413,10 +4125,9 @@ Partial Class ucrCalculator ' Me.cmdRan_normal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRan_normal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRan_normal.Location = New System.Drawing.Point(59, 14) - Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRan_normal.Location = New System.Drawing.Point(88, 21) Me.cmdRan_normal.Name = "cmdRan_normal" - Me.cmdRan_normal.Size = New System.Drawing.Size(58, 30) + Me.cmdRan_normal.Size = New System.Drawing.Size(87, 45) Me.cmdRan_normal.TabIndex = 173 Me.cmdRan_normal.Text = "normal" Me.cmdRan_normal.UseVisualStyleBackColor = True @@ -4425,10 +4136,9 @@ Partial Class ucrCalculator ' Me.cmduniform.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmduniform.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmduniform.Location = New System.Drawing.Point(2, 14) - Me.cmduniform.Margin = New System.Windows.Forms.Padding(2) + Me.cmduniform.Location = New System.Drawing.Point(3, 21) Me.cmduniform.Name = "cmduniform" - Me.cmduniform.Size = New System.Drawing.Size(58, 30) + Me.cmduniform.Size = New System.Drawing.Size(87, 45) Me.cmduniform.TabIndex = 172 Me.cmduniform.Text = "uniform" Me.cmduniform.UseVisualStyleBackColor = True @@ -4437,10 +4147,9 @@ Partial Class ucrCalculator ' Me.cmdQnbin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQnbin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQnbin.Location = New System.Drawing.Point(246, 101) - Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQnbin.Location = New System.Drawing.Point(369, 152) Me.cmdQnbin.Name = "cmdQnbin" - Me.cmdQnbin.Size = New System.Drawing.Size(62, 30) + Me.cmdQnbin.Size = New System.Drawing.Size(93, 45) Me.cmdQnbin.TabIndex = 176 Me.cmdQnbin.Text = "qnbin" Me.cmdQnbin.UseVisualStyleBackColor = True @@ -4449,10 +4158,9 @@ Partial Class ucrCalculator ' Me.cmdQpois.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQpois.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQpois.Location = New System.Drawing.Point(185, 101) - Me.cmdQpois.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQpois.Location = New System.Drawing.Point(278, 152) Me.cmdQpois.Name = "cmdQpois" - Me.cmdQpois.Size = New System.Drawing.Size(62, 30) + Me.cmdQpois.Size = New System.Drawing.Size(93, 45) Me.cmdQpois.TabIndex = 175 Me.cmdQpois.Text = "qpois" Me.cmdQpois.UseVisualStyleBackColor = True @@ -4461,10 +4169,9 @@ Partial Class ucrCalculator ' Me.cmdQbinom.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbinom.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbinom.Location = New System.Drawing.Point(124, 101) - Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQbinom.Location = New System.Drawing.Point(186, 152) Me.cmdQbinom.Name = "cmdQbinom" - Me.cmdQbinom.Size = New System.Drawing.Size(62, 30) + Me.cmdQbinom.Size = New System.Drawing.Size(93, 45) Me.cmdQbinom.TabIndex = 174 Me.cmdQbinom.Text = "qbinom" Me.cmdQbinom.UseVisualStyleBackColor = True @@ -4473,10 +4180,9 @@ Partial Class ucrCalculator ' Me.cmdQbirth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbirth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbirth.Location = New System.Drawing.Point(63, 101) - Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQbirth.Location = New System.Drawing.Point(94, 152) Me.cmdQbirth.Name = "cmdQbirth" - Me.cmdQbirth.Size = New System.Drawing.Size(62, 30) + Me.cmdQbirth.Size = New System.Drawing.Size(93, 45) Me.cmdQbirth.TabIndex = 173 Me.cmdQbirth.Text = "qbirth" Me.cmdQbirth.UseVisualStyleBackColor = True @@ -4485,10 +4191,9 @@ Partial Class ucrCalculator ' Me.cmdQbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQbeta.Location = New System.Drawing.Point(2, 101) - Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQbeta.Location = New System.Drawing.Point(3, 152) Me.cmdQbeta.Name = "cmdQbeta" - Me.cmdQbeta.Size = New System.Drawing.Size(62, 30) + Me.cmdQbeta.Size = New System.Drawing.Size(93, 45) Me.cmdQbeta.TabIndex = 172 Me.cmdQbeta.Text = "qbeta" Me.cmdQbeta.UseVisualStyleBackColor = True @@ -4497,10 +4202,9 @@ Partial Class ucrCalculator ' Me.cmdPnbin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPnbin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPnbin.Location = New System.Drawing.Point(246, 72) - Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPnbin.Location = New System.Drawing.Point(369, 108) Me.cmdPnbin.Name = "cmdPnbin" - Me.cmdPnbin.Size = New System.Drawing.Size(62, 30) + Me.cmdPnbin.Size = New System.Drawing.Size(93, 45) Me.cmdPnbin.TabIndex = 171 Me.cmdPnbin.Text = "pnbin" Me.cmdPnbin.UseVisualStyleBackColor = True @@ -4509,10 +4213,9 @@ Partial Class ucrCalculator ' Me.cmdPpois.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPpois.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPpois.Location = New System.Drawing.Point(185, 72) - Me.cmdPpois.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPpois.Location = New System.Drawing.Point(278, 108) Me.cmdPpois.Name = "cmdPpois" - Me.cmdPpois.Size = New System.Drawing.Size(62, 30) + Me.cmdPpois.Size = New System.Drawing.Size(93, 45) Me.cmdPpois.TabIndex = 170 Me.cmdPpois.Text = "ppois" Me.cmdPpois.UseVisualStyleBackColor = True @@ -4521,10 +4224,9 @@ Partial Class ucrCalculator ' Me.cmdPbinom.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbinom.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbinom.Location = New System.Drawing.Point(124, 72) - Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPbinom.Location = New System.Drawing.Point(186, 108) Me.cmdPbinom.Name = "cmdPbinom" - Me.cmdPbinom.Size = New System.Drawing.Size(62, 30) + Me.cmdPbinom.Size = New System.Drawing.Size(93, 45) Me.cmdPbinom.TabIndex = 169 Me.cmdPbinom.Text = "pbinom" Me.cmdPbinom.UseVisualStyleBackColor = True @@ -4533,10 +4235,9 @@ Partial Class ucrCalculator ' Me.cmdPbirth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbirth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbirth.Location = New System.Drawing.Point(63, 72) - Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPbirth.Location = New System.Drawing.Point(94, 108) Me.cmdPbirth.Name = "cmdPbirth" - Me.cmdPbirth.Size = New System.Drawing.Size(62, 30) + Me.cmdPbirth.Size = New System.Drawing.Size(93, 45) Me.cmdPbirth.TabIndex = 168 Me.cmdPbirth.Text = "pbirth" Me.cmdPbirth.UseVisualStyleBackColor = True @@ -4545,10 +4246,9 @@ Partial Class ucrCalculator ' Me.cmdPbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbeta.Location = New System.Drawing.Point(2, 72) - Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPbeta.Location = New System.Drawing.Point(3, 108) Me.cmdPbeta.Name = "cmdPbeta" - Me.cmdPbeta.Size = New System.Drawing.Size(62, 30) + Me.cmdPbeta.Size = New System.Drawing.Size(93, 45) Me.cmdPbeta.TabIndex = 167 Me.cmdPbeta.Text = "pbeta" Me.cmdPbeta.UseVisualStyleBackColor = True @@ -4557,10 +4257,9 @@ Partial Class ucrCalculator ' Me.cmdQgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQgamma.Location = New System.Drawing.Point(246, 43) - Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQgamma.Location = New System.Drawing.Point(369, 64) Me.cmdQgamma.Name = "cmdQgamma" - Me.cmdQgamma.Size = New System.Drawing.Size(62, 30) + Me.cmdQgamma.Size = New System.Drawing.Size(93, 45) Me.cmdQgamma.TabIndex = 166 Me.cmdQgamma.Text = "qgamma" Me.cmdQgamma.UseVisualStyleBackColor = True @@ -4569,10 +4268,9 @@ Partial Class ucrCalculator ' Me.cmdPgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPgamma.Location = New System.Drawing.Point(246, 14) - Me.cmdPgamma.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPgamma.Location = New System.Drawing.Point(369, 21) Me.cmdPgamma.Name = "cmdPgamma" - Me.cmdPgamma.Size = New System.Drawing.Size(62, 30) + Me.cmdPgamma.Size = New System.Drawing.Size(93, 45) Me.cmdPgamma.TabIndex = 165 Me.cmdPgamma.Text = "pgamma" Me.cmdPgamma.UseVisualStyleBackColor = True @@ -4581,10 +4279,9 @@ Partial Class ucrCalculator ' Me.cmdGamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdGamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGamma.Location = New System.Drawing.Point(185, 130) - Me.cmdGamma.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGamma.Location = New System.Drawing.Point(278, 195) Me.cmdGamma.Name = "cmdGamma" - Me.cmdGamma.Size = New System.Drawing.Size(62, 30) + Me.cmdGamma.Size = New System.Drawing.Size(93, 45) Me.cmdGamma.TabIndex = 163 Me.cmdGamma.Tag = "" Me.cmdGamma.Text = "gamma" @@ -4594,10 +4291,9 @@ Partial Class ucrCalculator ' Me.cmdLbeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLbeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLbeta.Location = New System.Drawing.Point(124, 159) - Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLbeta.Location = New System.Drawing.Point(186, 238) Me.cmdLbeta.Name = "cmdLbeta" - Me.cmdLbeta.Size = New System.Drawing.Size(62, 30) + Me.cmdLbeta.Size = New System.Drawing.Size(93, 45) Me.cmdLbeta.TabIndex = 159 Me.cmdLbeta.Text = "lbeta" Me.cmdLbeta.UseVisualStyleBackColor = True @@ -4606,10 +4302,9 @@ Partial Class ucrCalculator ' Me.cmdqF.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdqF.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdqF.Location = New System.Drawing.Point(185, 43) - Me.cmdqF.Margin = New System.Windows.Forms.Padding(2) + Me.cmdqF.Location = New System.Drawing.Point(278, 64) Me.cmdqF.Name = "cmdqF" - Me.cmdqF.Size = New System.Drawing.Size(62, 30) + Me.cmdqF.Size = New System.Drawing.Size(93, 45) Me.cmdqF.TabIndex = 162 Me.cmdqF.Text = "qf" Me.cmdqF.UseVisualStyleBackColor = True @@ -4618,10 +4313,9 @@ Partial Class ucrCalculator ' Me.cmdFact.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFact.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFact.Location = New System.Drawing.Point(2, 130) - Me.cmdFact.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFact.Location = New System.Drawing.Point(3, 195) Me.cmdFact.Name = "cmdFact" - Me.cmdFact.Size = New System.Drawing.Size(62, 30) + Me.cmdFact.Size = New System.Drawing.Size(93, 45) Me.cmdFact.TabIndex = 154 Me.cmdFact.Text = "fact" Me.cmdFact.UseVisualStyleBackColor = True @@ -4630,10 +4324,9 @@ Partial Class ucrCalculator ' Me.cmdChoose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdChoose.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChoose.Location = New System.Drawing.Point(63, 130) - Me.cmdChoose.Margin = New System.Windows.Forms.Padding(2) + Me.cmdChoose.Location = New System.Drawing.Point(94, 195) Me.cmdChoose.Name = "cmdChoose" - Me.cmdChoose.Size = New System.Drawing.Size(62, 30) + Me.cmdChoose.Size = New System.Drawing.Size(93, 45) Me.cmdChoose.TabIndex = 161 Me.cmdChoose.Text = "choose" Me.cmdChoose.UseVisualStyleBackColor = True @@ -4642,10 +4335,9 @@ Partial Class ucrCalculator ' Me.cmdPf.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPf.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPf.Location = New System.Drawing.Point(185, 14) - Me.cmdPf.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPf.Location = New System.Drawing.Point(278, 21) Me.cmdPf.Name = "cmdPf" - Me.cmdPf.Size = New System.Drawing.Size(62, 30) + Me.cmdPf.Size = New System.Drawing.Size(93, 45) Me.cmdPf.TabIndex = 156 Me.cmdPf.Text = "pf" Me.cmdPf.UseVisualStyleBackColor = True @@ -4654,10 +4346,9 @@ Partial Class ucrCalculator ' Me.cmdPChisq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPChisq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPChisq.Location = New System.Drawing.Point(124, 14) - Me.cmdPChisq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPChisq.Location = New System.Drawing.Point(186, 21) Me.cmdPChisq.Name = "cmdPChisq" - Me.cmdPChisq.Size = New System.Drawing.Size(62, 30) + Me.cmdPChisq.Size = New System.Drawing.Size(93, 45) Me.cmdPChisq.TabIndex = 155 Me.cmdPChisq.Text = "pchisq" Me.cmdPChisq.UseVisualStyleBackColor = True @@ -4666,10 +4357,9 @@ Partial Class ucrCalculator ' Me.cmdLgamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLgamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLgamma.Location = New System.Drawing.Point(185, 159) - Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLgamma.Location = New System.Drawing.Point(278, 238) Me.cmdLgamma.Name = "cmdLgamma" - Me.cmdLgamma.Size = New System.Drawing.Size(62, 30) + Me.cmdLgamma.Size = New System.Drawing.Size(93, 45) Me.cmdLgamma.TabIndex = 152 Me.cmdLgamma.Text = "lgamma" Me.cmdLgamma.UseVisualStyleBackColor = True @@ -4678,10 +4368,9 @@ Partial Class ucrCalculator ' Me.cmdPnorm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPnorm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPnorm.Location = New System.Drawing.Point(2, 14) - Me.cmdPnorm.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPnorm.Location = New System.Drawing.Point(3, 21) Me.cmdPnorm.Name = "cmdPnorm" - Me.cmdPnorm.Size = New System.Drawing.Size(62, 30) + Me.cmdPnorm.Size = New System.Drawing.Size(93, 45) Me.cmdPnorm.TabIndex = 148 Me.cmdPnorm.Text = "pnorm" Me.cmdPnorm.UseVisualStyleBackColor = True @@ -4690,10 +4379,9 @@ Partial Class ucrCalculator ' Me.cmdQchisq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQchisq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQchisq.Location = New System.Drawing.Point(124, 43) - Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQchisq.Location = New System.Drawing.Point(186, 64) Me.cmdQchisq.Name = "cmdQchisq" - Me.cmdQchisq.Size = New System.Drawing.Size(62, 30) + Me.cmdQchisq.Size = New System.Drawing.Size(93, 45) Me.cmdQchisq.TabIndex = 160 Me.cmdQchisq.Text = "qchisq" Me.cmdQchisq.UseVisualStyleBackColor = True @@ -4702,10 +4390,9 @@ Partial Class ucrCalculator ' Me.cmdQt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQt.Location = New System.Drawing.Point(63, 43) - Me.cmdQt.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQt.Location = New System.Drawing.Point(94, 64) Me.cmdQt.Name = "cmdQt" - Me.cmdQt.Size = New System.Drawing.Size(62, 30) + Me.cmdQt.Size = New System.Drawing.Size(93, 45) Me.cmdQt.TabIndex = 158 Me.cmdQt.Text = "qt" Me.cmdQt.UseVisualStyleBackColor = True @@ -4714,10 +4401,9 @@ Partial Class ucrCalculator ' Me.cmdQnorm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdQnorm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQnorm.Location = New System.Drawing.Point(2, 43) - Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQnorm.Location = New System.Drawing.Point(3, 64) Me.cmdQnorm.Name = "cmdQnorm" - Me.cmdQnorm.Size = New System.Drawing.Size(62, 30) + Me.cmdQnorm.Size = New System.Drawing.Size(93, 45) Me.cmdQnorm.TabIndex = 157 Me.cmdQnorm.Text = "qnorm" Me.cmdQnorm.UseVisualStyleBackColor = True @@ -4726,10 +4412,9 @@ Partial Class ucrCalculator ' Me.cmdPt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPt.Location = New System.Drawing.Point(63, 14) - Me.cmdPt.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPt.Location = New System.Drawing.Point(94, 21) Me.cmdPt.Name = "cmdPt" - Me.cmdPt.Size = New System.Drawing.Size(62, 30) + Me.cmdPt.Size = New System.Drawing.Size(93, 45) Me.cmdPt.TabIndex = 153 Me.cmdPt.Text = "pt" Me.cmdPt.UseVisualStyleBackColor = True @@ -4738,10 +4423,9 @@ Partial Class ucrCalculator ' Me.cmdLchoose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLchoose.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLchoose.Location = New System.Drawing.Point(63, 159) - Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLchoose.Location = New System.Drawing.Point(94, 238) Me.cmdLchoose.Name = "cmdLchoose" - Me.cmdLchoose.Size = New System.Drawing.Size(62, 30) + Me.cmdLchoose.Size = New System.Drawing.Size(93, 45) Me.cmdLchoose.TabIndex = 151 Me.cmdLchoose.Text = "lchoose" Me.cmdLchoose.UseVisualStyleBackColor = True @@ -4750,10 +4434,9 @@ Partial Class ucrCalculator ' Me.cmdLfact.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLfact.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLfact.Location = New System.Drawing.Point(2, 159) - Me.cmdLfact.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLfact.Location = New System.Drawing.Point(3, 238) Me.cmdLfact.Name = "cmdLfact" - Me.cmdLfact.Size = New System.Drawing.Size(62, 30) + Me.cmdLfact.Size = New System.Drawing.Size(93, 45) Me.cmdLfact.TabIndex = 150 Me.cmdLfact.Text = "lfact" Me.cmdLfact.UseVisualStyleBackColor = True @@ -4762,10 +4445,9 @@ Partial Class ucrCalculator ' Me.cmdTrigamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrigamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrigamma.Location = New System.Drawing.Point(246, 159) - Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTrigamma.Location = New System.Drawing.Point(369, 238) Me.cmdTrigamma.Name = "cmdTrigamma" - Me.cmdTrigamma.Size = New System.Drawing.Size(62, 30) + Me.cmdTrigamma.Size = New System.Drawing.Size(93, 45) Me.cmdTrigamma.TabIndex = 149 Me.cmdTrigamma.Text = "trigamma" Me.cmdTrigamma.UseVisualStyleBackColor = True @@ -4774,10 +4456,9 @@ Partial Class ucrCalculator ' Me.cmdBeta.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdBeta.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBeta.Location = New System.Drawing.Point(124, 130) - Me.cmdBeta.Margin = New System.Windows.Forms.Padding(2) + Me.cmdBeta.Location = New System.Drawing.Point(186, 195) Me.cmdBeta.Name = "cmdBeta" - Me.cmdBeta.Size = New System.Drawing.Size(62, 30) + Me.cmdBeta.Size = New System.Drawing.Size(93, 45) Me.cmdBeta.TabIndex = 149 Me.cmdBeta.Text = "beta" Me.cmdBeta.UseVisualStyleBackColor = True @@ -4786,16 +4467,17 @@ Partial Class ucrCalculator ' Me.cmdDigamma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdDigamma.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigamma.Location = New System.Drawing.Point(246, 130) - Me.cmdDigamma.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigamma.Location = New System.Drawing.Point(369, 195) Me.cmdDigamma.Name = "cmdDigamma" - Me.cmdDigamma.Size = New System.Drawing.Size(62, 30) + Me.cmdDigamma.Size = New System.Drawing.Size(93, 45) Me.cmdDigamma.TabIndex = 164 Me.cmdDigamma.Text = "digamma" Me.cmdDigamma.UseVisualStyleBackColor = True ' 'grpTransform ' + Me.grpTransform.Controls.Add(Me.cmdRank) + Me.grpTransform.Controls.Add(Me.cmdRescale) Me.grpTransform.Controls.Add(Me.cmdScale) Me.grpTransform.Controls.Add(Me.cmdTransformRHelp) Me.grpTransform.Controls.Add(Me.cmdRev) @@ -4826,22 +4508,39 @@ Partial Class ucrCalculator Me.grpTransform.Controls.Add(Me.cmdPMax) Me.grpTransform.Controls.Add(Me.cmdLag) Me.grpTransform.Controls.Add(Me.cmdLead) - Me.grpTransform.Location = New System.Drawing.Point(434, 62) - Me.grpTransform.Margin = New System.Windows.Forms.Padding(2) + Me.grpTransform.Location = New System.Drawing.Point(651, 93) Me.grpTransform.Name = "grpTransform" - Me.grpTransform.Padding = New System.Windows.Forms.Padding(2) - Me.grpTransform.Size = New System.Drawing.Size(310, 225) + Me.grpTransform.Size = New System.Drawing.Size(465, 338) Me.grpTransform.TabIndex = 189 Me.grpTransform.TabStop = False Me.grpTransform.Text = "Transform" ' + 'cmdRank + ' + Me.cmdRank.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdRank.Location = New System.Drawing.Point(3, 195) + Me.cmdRank.Name = "cmdRank" + Me.cmdRank.Size = New System.Drawing.Size(93, 45) + Me.cmdRank.TabIndex = 207 + Me.cmdRank.Text = "rank" + Me.cmdRank.UseVisualStyleBackColor = True + ' + 'cmdRescale + ' + Me.cmdRescale.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdRescale.Location = New System.Drawing.Point(3, 282) + Me.cmdRescale.Name = "cmdRescale" + Me.cmdRescale.Size = New System.Drawing.Size(93, 45) + Me.cmdRescale.TabIndex = 206 + Me.cmdRescale.Text = "rescale" + Me.cmdRescale.UseVisualStyleBackColor = True + ' 'cmdScale ' Me.cmdScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdScale.Location = New System.Drawing.Point(2, 130) - Me.cmdScale.Margin = New System.Windows.Forms.Padding(2) + Me.cmdScale.Location = New System.Drawing.Point(3, 238) Me.cmdScale.Name = "cmdScale" - Me.cmdScale.Size = New System.Drawing.Size(62, 30) + Me.cmdScale.Size = New System.Drawing.Size(93, 45) Me.cmdScale.TabIndex = 205 Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True @@ -4850,10 +4549,9 @@ Partial Class ucrCalculator ' Me.cmdTransformRHelp.AutoSize = True Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(218, 188) - Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformRHelp.Location = New System.Drawing.Point(327, 282) Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformRHelp.Size = New System.Drawing.Size(135, 45) Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform Me.cmdTransformRHelp.TabIndex = 204 Me.cmdTransformRHelp.Text = "R Help" @@ -4862,52 +4560,56 @@ Partial Class ucrCalculator 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.ContextMenuStripTransform.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem, Me.DplyrToolStripMenuItem, Me.MASSToolStripMenuItem, Me.ZooToolStripMenuItem}) + Me.ContextMenuStripTransform.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem, Me.DplyrToolStripMenuItem, Me.MASSToolStripMenuItem, Me.ScalesToolStripMenuItem, Me.ZooToolStripMenuItem}) Me.ContextMenuStripTransform.Name = "ContextMenuStrip1" - Me.ContextMenuStripTransform.Size = New System.Drawing.Size(106, 92) + Me.ContextMenuStripTransform.Size = New System.Drawing.Size(133, 164) ' 'BaseToolStripMenuItem ' Me.BaseToolStripMenuItem.Name = "BaseToolStripMenuItem" - Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(105, 22) + Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(132, 32) Me.BaseToolStripMenuItem.Text = "base" ' 'DplyrToolStripMenuItem ' Me.DplyrToolStripMenuItem.Name = "DplyrToolStripMenuItem" - Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(105, 22) + Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(132, 32) Me.DplyrToolStripMenuItem.Text = "dplyr" ' 'MASSToolStripMenuItem ' Me.MASSToolStripMenuItem.Name = "MASSToolStripMenuItem" - Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(105, 22) + Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(132, 32) Me.MASSToolStripMenuItem.Text = "MASS" ' + 'ScalesToolStripMenuItem + ' + Me.ScalesToolStripMenuItem.Name = "ScalesToolStripMenuItem" + Me.ScalesToolStripMenuItem.Size = New System.Drawing.Size(132, 32) + Me.ScalesToolStripMenuItem.Text = "scales" + ' 'ZooToolStripMenuItem ' Me.ZooToolStripMenuItem.Name = "ZooToolStripMenuItem" - Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(105, 22) + Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(132, 32) Me.ZooToolStripMenuItem.Text = "zoo" ' 'cmdRev ' Me.cmdRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRev.Location = New System.Drawing.Point(124, 101) - Me.cmdRev.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRev.Location = New System.Drawing.Point(186, 152) Me.cmdRev.Name = "cmdRev" - Me.cmdRev.Size = New System.Drawing.Size(62, 30) + Me.cmdRev.Size = New System.Drawing.Size(93, 45) Me.cmdRev.TabIndex = 203 - Me.cmdRev.Text = "rev" + Me.cmdRev.Text = "reverse" Me.cmdRev.UseVisualStyleBackColor = True ' 'cmdMovProd ' Me.cmdMovProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovProd.Location = New System.Drawing.Point(124, 72) - Me.cmdMovProd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMovProd.Location = New System.Drawing.Point(186, 108) Me.cmdMovProd.Name = "cmdMovProd" - Me.cmdMovProd.Size = New System.Drawing.Size(62, 30) + Me.cmdMovProd.Size = New System.Drawing.Size(93, 45) Me.cmdMovProd.TabIndex = 202 Me.cmdMovProd.Text = "movprod" Me.cmdMovProd.UseVisualStyleBackColor = True @@ -4915,10 +4617,9 @@ Partial Class ucrCalculator 'cmdCumProd ' Me.cmdCumProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumProd.Location = New System.Drawing.Point(124, 43) - Me.cmdCumProd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCumProd.Location = New System.Drawing.Point(186, 64) Me.cmdCumProd.Name = "cmdCumProd" - Me.cmdCumProd.Size = New System.Drawing.Size(62, 30) + Me.cmdCumProd.Size = New System.Drawing.Size(93, 45) Me.cmdCumProd.TabIndex = 201 Me.cmdCumProd.Text = "cumprod" Me.cmdCumProd.UseVisualStyleBackColor = True @@ -4926,10 +4627,9 @@ Partial Class ucrCalculator 'cmdSortF ' Me.cmdSortF.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSortF.Location = New System.Drawing.Point(2, 14) - Me.cmdSortF.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSortF.Location = New System.Drawing.Point(3, 21) Me.cmdSortF.Name = "cmdSortF" - Me.cmdSortF.Size = New System.Drawing.Size(62, 30) + Me.cmdSortF.Size = New System.Drawing.Size(93, 45) Me.cmdSortF.TabIndex = 198 Me.cmdSortF.Text = "sort" Me.cmdSortF.UseVisualStyleBackColor = True @@ -4937,10 +4637,9 @@ Partial Class ucrCalculator 'cmdNasplin ' Me.cmdNasplin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNasplin.Location = New System.Drawing.Point(240, 159) - Me.cmdNasplin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNasplin.Location = New System.Drawing.Point(369, 238) Me.cmdNasplin.Name = "cmdNasplin" - Me.cmdNasplin.Size = New System.Drawing.Size(68, 30) + Me.cmdNasplin.Size = New System.Drawing.Size(93, 45) Me.cmdNasplin.TabIndex = 197 Me.cmdNasplin.Text = "nasplin" Me.cmdNasplin.UseVisualStyleBackColor = True @@ -4948,10 +4647,9 @@ Partial Class ucrCalculator 'cmdNaapprox ' Me.cmdNaapprox.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaapprox.Location = New System.Drawing.Point(162, 159) - Me.cmdNaapprox.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNaapprox.Location = New System.Drawing.Point(278, 238) Me.cmdNaapprox.Name = "cmdNaapprox" - Me.cmdNaapprox.Size = New System.Drawing.Size(79, 30) + Me.cmdNaapprox.Size = New System.Drawing.Size(93, 45) Me.cmdNaapprox.TabIndex = 196 Me.cmdNaapprox.Text = "naapprox" Me.cmdNaapprox.UseVisualStyleBackColor = True @@ -4959,10 +4657,9 @@ Partial Class ucrCalculator 'cmdNaest ' Me.cmdNaest.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaest.Location = New System.Drawing.Point(80, 159) - Me.cmdNaest.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNaest.Location = New System.Drawing.Point(186, 238) Me.cmdNaest.Name = "cmdNaest" - Me.cmdNaest.Size = New System.Drawing.Size(83, 30) + Me.cmdNaest.Size = New System.Drawing.Size(93, 45) Me.cmdNaest.TabIndex = 195 Me.cmdNaest.Text = "naest" Me.cmdNaest.UseVisualStyleBackColor = True @@ -4970,10 +4667,9 @@ Partial Class ucrCalculator 'cmdNafill ' Me.cmdNafill.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNafill.Location = New System.Drawing.Point(2, 159) - Me.cmdNafill.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNafill.Location = New System.Drawing.Point(94, 238) Me.cmdNafill.Name = "cmdNafill" - Me.cmdNafill.Size = New System.Drawing.Size(79, 30) + Me.cmdNafill.Size = New System.Drawing.Size(93, 45) Me.cmdNafill.TabIndex = 194 Me.cmdNafill.Text = "nafill" Me.cmdNafill.UseVisualStyleBackColor = True @@ -4981,10 +4677,9 @@ Partial Class ucrCalculator 'cmdMovmin ' Me.cmdMovmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovmin.Location = New System.Drawing.Point(246, 72) - Me.cmdMovmin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMovmin.Location = New System.Drawing.Point(369, 108) Me.cmdMovmin.Name = "cmdMovmin" - Me.cmdMovmin.Size = New System.Drawing.Size(62, 30) + Me.cmdMovmin.Size = New System.Drawing.Size(93, 45) Me.cmdMovmin.TabIndex = 193 Me.cmdMovmin.Text = "movmin" Me.cmdMovmin.UseVisualStyleBackColor = True @@ -4992,10 +4687,9 @@ Partial Class ucrCalculator 'cmdRowRank ' Me.cmdRowRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRowRank.Location = New System.Drawing.Point(63, 130) - Me.cmdRowRank.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRowRank.Location = New System.Drawing.Point(94, 195) Me.cmdRowRank.Name = "cmdRowRank" - Me.cmdRowRank.Size = New System.Drawing.Size(62, 30) + Me.cmdRowRank.Size = New System.Drawing.Size(93, 45) Me.cmdRowRank.TabIndex = 192 Me.cmdRowRank.Text = "r_rank" Me.cmdRowRank.UseVisualStyleBackColor = True @@ -5003,10 +4697,9 @@ Partial Class ucrCalculator 'cmdDiff ' Me.cmdDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDiff.Location = New System.Drawing.Point(63, 101) - Me.cmdDiff.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDiff.Location = New System.Drawing.Point(94, 152) Me.cmdDiff.Name = "cmdDiff" - Me.cmdDiff.Size = New System.Drawing.Size(62, 30) + Me.cmdDiff.Size = New System.Drawing.Size(93, 45) Me.cmdDiff.TabIndex = 191 Me.cmdDiff.Text = "diff" Me.cmdDiff.UseVisualStyleBackColor = True @@ -5014,10 +4707,9 @@ Partial Class ucrCalculator 'cmdCumdist ' Me.cmdCumdist.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumdist.Location = New System.Drawing.Point(246, 101) - Me.cmdCumdist.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCumdist.Location = New System.Drawing.Point(369, 152) Me.cmdCumdist.Name = "cmdCumdist" - Me.cmdCumdist.Size = New System.Drawing.Size(62, 30) + Me.cmdCumdist.Size = New System.Drawing.Size(93, 45) Me.cmdCumdist.TabIndex = 190 Me.cmdCumdist.Text = "cumdist" Me.cmdCumdist.UseVisualStyleBackColor = True @@ -5025,10 +4717,9 @@ Partial Class ucrCalculator 'cmdMovMean ' Me.cmdMovMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMean.Location = New System.Drawing.Point(185, 72) - Me.cmdMovMean.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMovMean.Location = New System.Drawing.Point(278, 108) Me.cmdMovMean.Name = "cmdMovMean" - Me.cmdMovMean.Size = New System.Drawing.Size(62, 30) + Me.cmdMovMean.Size = New System.Drawing.Size(93, 45) Me.cmdMovMean.TabIndex = 189 Me.cmdMovMean.Text = "movmean" Me.cmdMovMean.UseVisualStyleBackColor = True @@ -5036,10 +4727,9 @@ Partial Class ucrCalculator 'cmdCumMean ' Me.cmdCumMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMean.Location = New System.Drawing.Point(185, 43) - Me.cmdCumMean.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCumMean.Location = New System.Drawing.Point(278, 64) Me.cmdCumMean.Name = "cmdCumMean" - Me.cmdCumMean.Size = New System.Drawing.Size(62, 30) + Me.cmdCumMean.Size = New System.Drawing.Size(93, 45) Me.cmdCumMean.TabIndex = 188 Me.cmdCumMean.Text = "cummean" Me.cmdCumMean.UseVisualStyleBackColor = True @@ -5047,10 +4737,9 @@ Partial Class ucrCalculator 'cmdNtile ' Me.cmdNtile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNtile.Location = New System.Drawing.Point(185, 101) - Me.cmdNtile.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNtile.Location = New System.Drawing.Point(278, 152) Me.cmdNtile.Name = "cmdNtile" - Me.cmdNtile.Size = New System.Drawing.Size(62, 30) + Me.cmdNtile.Size = New System.Drawing.Size(93, 45) Me.cmdNtile.TabIndex = 187 Me.cmdNtile.Text = "ntile" Me.cmdNtile.UseVisualStyleBackColor = True @@ -5058,10 +4747,9 @@ Partial Class ucrCalculator 'cmMovMed ' Me.cmMovMed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmMovMed.Location = New System.Drawing.Point(2, 101) - Me.cmMovMed.Margin = New System.Windows.Forms.Padding(2) + Me.cmMovMed.Location = New System.Drawing.Point(3, 152) Me.cmMovMed.Name = "cmMovMed" - Me.cmMovMed.Size = New System.Drawing.Size(62, 30) + Me.cmMovMed.Size = New System.Drawing.Size(93, 45) Me.cmMovMed.TabIndex = 186 Me.cmMovMed.Text = "movmed" Me.cmMovMed.UseVisualStyleBackColor = True @@ -5069,10 +4757,9 @@ Partial Class ucrCalculator 'cmdMRank ' Me.cmdMRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMRank.Location = New System.Drawing.Point(246, 130) - Me.cmdMRank.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMRank.Location = New System.Drawing.Point(186, 195) Me.cmdMRank.Name = "cmdMRank" - Me.cmdMRank.Size = New System.Drawing.Size(62, 30) + Me.cmdMRank.Size = New System.Drawing.Size(93, 45) Me.cmdMRank.TabIndex = 185 Me.cmdMRank.Text = "m_rank" Me.cmdMRank.UseVisualStyleBackColor = True @@ -5080,10 +4767,9 @@ Partial Class ucrCalculator 'cmdDRank ' Me.cmdDRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDRank.Location = New System.Drawing.Point(185, 130) - Me.cmdDRank.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDRank.Location = New System.Drawing.Point(278, 195) Me.cmdDRank.Name = "cmdDRank" - Me.cmdDRank.Size = New System.Drawing.Size(62, 30) + Me.cmdDRank.Size = New System.Drawing.Size(93, 45) Me.cmdDRank.TabIndex = 184 Me.cmdDRank.Text = "d_rank" Me.cmdDRank.UseVisualStyleBackColor = True @@ -5091,10 +4777,9 @@ Partial Class ucrCalculator 'cmdMovMax ' Me.cmdMovMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMax.Location = New System.Drawing.Point(2, 72) - Me.cmdMovMax.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMovMax.Location = New System.Drawing.Point(3, 108) Me.cmdMovMax.Name = "cmdMovMax" - Me.cmdMovMax.Size = New System.Drawing.Size(62, 30) + Me.cmdMovMax.Size = New System.Drawing.Size(93, 45) Me.cmdMovMax.TabIndex = 183 Me.cmdMovMax.Text = "movmax" Me.cmdMovMax.UseVisualStyleBackColor = True @@ -5102,10 +4787,9 @@ Partial Class ucrCalculator 'cmdMovSum ' Me.cmdMovSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovSum.Location = New System.Drawing.Point(63, 72) - Me.cmdMovSum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMovSum.Location = New System.Drawing.Point(94, 108) Me.cmdMovSum.Name = "cmdMovSum" - Me.cmdMovSum.Size = New System.Drawing.Size(62, 30) + Me.cmdMovSum.Size = New System.Drawing.Size(93, 45) Me.cmdMovSum.TabIndex = 182 Me.cmdMovSum.Text = "movsum" Me.cmdMovSum.UseVisualStyleBackColor = True @@ -5114,10 +4798,9 @@ Partial Class ucrCalculator ' Me.cmdPercentRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPercentRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPercentRank.Location = New System.Drawing.Point(124, 130) - Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPercentRank.Location = New System.Drawing.Point(369, 195) Me.cmdPercentRank.Name = "cmdPercentRank" - Me.cmdPercentRank.Size = New System.Drawing.Size(62, 30) + Me.cmdPercentRank.Size = New System.Drawing.Size(93, 45) Me.cmdPercentRank.TabIndex = 181 Me.cmdPercentRank.Text = "% rank" Me.cmdPercentRank.UseVisualStyleBackColor = True @@ -5125,10 +4808,9 @@ Partial Class ucrCalculator 'cmdCumSum ' Me.cmdCumSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumSum.Location = New System.Drawing.Point(63, 43) - Me.cmdCumSum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCumSum.Location = New System.Drawing.Point(94, 64) Me.cmdCumSum.Name = "cmdCumSum" - Me.cmdCumSum.Size = New System.Drawing.Size(62, 30) + Me.cmdCumSum.Size = New System.Drawing.Size(93, 45) Me.cmdCumSum.TabIndex = 180 Me.cmdCumSum.Text = "cumsum" Me.cmdCumSum.UseVisualStyleBackColor = True @@ -5136,10 +4818,9 @@ Partial Class ucrCalculator 'cmdCumMin ' Me.cmdCumMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMin.Location = New System.Drawing.Point(246, 43) - Me.cmdCumMin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCumMin.Location = New System.Drawing.Point(369, 64) Me.cmdCumMin.Name = "cmdCumMin" - Me.cmdCumMin.Size = New System.Drawing.Size(62, 30) + Me.cmdCumMin.Size = New System.Drawing.Size(93, 45) Me.cmdCumMin.TabIndex = 179 Me.cmdCumMin.Text = "cummin" Me.cmdCumMin.UseVisualStyleBackColor = True @@ -5147,10 +4828,9 @@ Partial Class ucrCalculator 'cmdCumMax ' Me.cmdCumMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMax.Location = New System.Drawing.Point(2, 43) - Me.cmdCumMax.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCumMax.Location = New System.Drawing.Point(3, 64) Me.cmdCumMax.Name = "cmdCumMax" - Me.cmdCumMax.Size = New System.Drawing.Size(62, 30) + Me.cmdCumMax.Size = New System.Drawing.Size(93, 45) Me.cmdCumMax.TabIndex = 178 Me.cmdCumMax.Text = "cummax" Me.cmdCumMax.UseVisualStyleBackColor = True @@ -5158,10 +4838,9 @@ Partial Class ucrCalculator 'cmdPMin ' Me.cmdPMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMin.Location = New System.Drawing.Point(246, 14) - Me.cmdPMin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPMin.Location = New System.Drawing.Point(369, 21) Me.cmdPMin.Name = "cmdPMin" - Me.cmdPMin.Size = New System.Drawing.Size(62, 30) + Me.cmdPMin.Size = New System.Drawing.Size(93, 45) Me.cmdPMin.TabIndex = 177 Me.cmdPMin.Text = "pmin" Me.cmdPMin.UseVisualStyleBackColor = True @@ -5169,10 +4848,9 @@ Partial Class ucrCalculator 'cmdPMax ' Me.cmdPMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMax.Location = New System.Drawing.Point(185, 14) - Me.cmdPMax.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPMax.Location = New System.Drawing.Point(278, 21) Me.cmdPMax.Name = "cmdPMax" - Me.cmdPMax.Size = New System.Drawing.Size(62, 30) + Me.cmdPMax.Size = New System.Drawing.Size(93, 45) Me.cmdPMax.TabIndex = 176 Me.cmdPMax.Text = "pmax" Me.cmdPMax.UseVisualStyleBackColor = True @@ -5180,10 +4858,9 @@ Partial Class ucrCalculator 'cmdLag ' Me.cmdLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLag.Location = New System.Drawing.Point(63, 14) - Me.cmdLag.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLag.Location = New System.Drawing.Point(94, 21) Me.cmdLag.Name = "cmdLag" - Me.cmdLag.Size = New System.Drawing.Size(62, 30) + Me.cmdLag.Size = New System.Drawing.Size(93, 45) Me.cmdLag.TabIndex = 174 Me.cmdLag.Text = "lag" Me.cmdLag.UseVisualStyleBackColor = True @@ -5191,10 +4868,9 @@ Partial Class ucrCalculator 'cmdLead ' Me.cmdLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLead.Location = New System.Drawing.Point(124, 14) - Me.cmdLead.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLead.Location = New System.Drawing.Point(186, 21) Me.cmdLead.Name = "cmdLead" - Me.cmdLead.Size = New System.Drawing.Size(62, 30) + Me.cmdLead.Size = New System.Drawing.Size(93, 45) Me.cmdLead.TabIndex = 175 Me.cmdLead.Text = "lead" Me.cmdLead.UseVisualStyleBackColor = True @@ -5236,11 +4912,9 @@ Partial Class ucrCalculator Me.grpLogical.Controls.Add(Me.cmdNot) Me.grpLogical.Controls.Add(Me.cmdNotEqualsTo) Me.grpLogical.Controls.Add(Me.cmdEquivalent) - Me.grpLogical.Location = New System.Drawing.Point(434, 62) - Me.grpLogical.Margin = New System.Windows.Forms.Padding(2) + Me.grpLogical.Location = New System.Drawing.Point(651, 93) Me.grpLogical.Name = "grpLogical" - Me.grpLogical.Padding = New System.Windows.Forms.Padding(2) - Me.grpLogical.Size = New System.Drawing.Size(258, 256) + Me.grpLogical.Size = New System.Drawing.Size(387, 384) Me.grpLogical.TabIndex = 183 Me.grpLogical.TabStop = False Me.grpLogical.Text = "Logical and Symbols" @@ -5248,10 +4922,10 @@ Partial Class ucrCalculator 'cmdnumeric ' Me.cmdnumeric.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnumeric.Location = New System.Drawing.Point(191, 188) - Me.cmdnumeric.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdnumeric.Location = New System.Drawing.Point(286, 282) + Me.cmdnumeric.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdnumeric.Name = "cmdnumeric" - Me.cmdnumeric.Size = New System.Drawing.Size(62, 30) + Me.cmdnumeric.Size = New System.Drawing.Size(93, 45) Me.cmdnumeric.TabIndex = 216 Me.cmdnumeric.Text = "numeric" Me.cmdnumeric.UseVisualStyleBackColor = True @@ -5260,10 +4934,10 @@ Partial Class ucrCalculator ' Me.cmdCalcRepelicationFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCalcRepelicationFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcRepelicationFunction.Location = New System.Drawing.Point(4, 188) - Me.cmdCalcRepelicationFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCalcRepelicationFunction.Location = New System.Drawing.Point(6, 282) + Me.cmdCalcRepelicationFunction.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdCalcRepelicationFunction.Name = "cmdCalcRepelicationFunction" - Me.cmdCalcRepelicationFunction.Size = New System.Drawing.Size(62, 30) + Me.cmdCalcRepelicationFunction.Size = New System.Drawing.Size(93, 45) Me.cmdCalcRepelicationFunction.TabIndex = 215 Me.cmdCalcRepelicationFunction.Text = "rep" Me.cmdCalcRepelicationFunction.UseVisualStyleBackColor = True @@ -5272,10 +4946,10 @@ Partial Class ucrCalculator ' Me.cmdCalcSequenceFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCalcSequenceFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcSequenceFunction.Location = New System.Drawing.Point(65, 188) - Me.cmdCalcSequenceFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCalcSequenceFunction.Location = New System.Drawing.Point(98, 282) + Me.cmdCalcSequenceFunction.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdCalcSequenceFunction.Name = "cmdCalcSequenceFunction" - Me.cmdCalcSequenceFunction.Size = New System.Drawing.Size(62, 30) + Me.cmdCalcSequenceFunction.Size = New System.Drawing.Size(93, 45) Me.cmdCalcSequenceFunction.TabIndex = 214 Me.cmdCalcSequenceFunction.Tag = "Del" Me.cmdCalcSequenceFunction.Text = "seq" @@ -5284,10 +4958,10 @@ Partial Class ucrCalculator 'cmdCalcConcantenateFunction ' Me.cmdCalcConcantenateFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcConcantenateFunction.Location = New System.Drawing.Point(126, 188) - Me.cmdCalcConcantenateFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCalcConcantenateFunction.Location = New System.Drawing.Point(189, 282) + Me.cmdCalcConcantenateFunction.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdCalcConcantenateFunction.Name = "cmdCalcConcantenateFunction" - Me.cmdCalcConcantenateFunction.Size = New System.Drawing.Size(66, 30) + Me.cmdCalcConcantenateFunction.Size = New System.Drawing.Size(99, 45) Me.cmdCalcConcantenateFunction.TabIndex = 213 Me.cmdCalcConcantenateFunction.Text = "c( )" Me.cmdCalcConcantenateFunction.UseVisualStyleBackColor = True @@ -5296,10 +4970,9 @@ Partial Class ucrCalculator ' Me.cmdLogicalHelp.AutoSize = True Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(165, 218) - Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLogicalHelp.Location = New System.Drawing.Point(248, 327) Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdLogicalHelp.Size = New System.Drawing.Size(129, 45) Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical Me.cmdLogicalHelp.TabIndex = 212 Me.cmdLogicalHelp.Text = "R Help" @@ -5310,27 +4983,26 @@ Partial Class ucrCalculator Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripLogical.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LogBaseToolStripMenuItem, Me.LogDplyrToolStripMenuItem}) Me.ContextMenuStripLogical.Name = "ContextMenuStrip1" - Me.ContextMenuStripLogical.Size = New System.Drawing.Size(102, 48) + Me.ContextMenuStripLogical.Size = New System.Drawing.Size(126, 68) ' 'LogBaseToolStripMenuItem ' Me.LogBaseToolStripMenuItem.Name = "LogBaseToolStripMenuItem" - Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(101, 22) + Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(125, 32) Me.LogBaseToolStripMenuItem.Text = "base" ' 'LogDplyrToolStripMenuItem ' Me.LogDplyrToolStripMenuItem.Name = "LogDplyrToolStripMenuItem" - Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(101, 22) + Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(125, 32) Me.LogDplyrToolStripMenuItem.Text = "dplyr" ' 'cmdFalse ' Me.cmdFalse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFalse.Location = New System.Drawing.Point(199, 43) - Me.cmdFalse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFalse.Location = New System.Drawing.Point(298, 64) Me.cmdFalse.Name = "cmdFalse" - Me.cmdFalse.Size = New System.Drawing.Size(52, 30) + Me.cmdFalse.Size = New System.Drawing.Size(81, 45) Me.cmdFalse.TabIndex = 207 Me.cmdFalse.Text = "FALSE" Me.cmdFalse.UseVisualStyleBackColor = True @@ -5338,10 +5010,9 @@ Partial Class ucrCalculator 'cmdTrue ' Me.cmdTrue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrue.Location = New System.Drawing.Point(199, 14) - Me.cmdTrue.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTrue.Location = New System.Drawing.Point(298, 21) Me.cmdTrue.Name = "cmdTrue" - Me.cmdTrue.Size = New System.Drawing.Size(52, 30) + Me.cmdTrue.Size = New System.Drawing.Size(81, 45) Me.cmdTrue.TabIndex = 206 Me.cmdTrue.Text = "TRUE" Me.cmdTrue.UseVisualStyleBackColor = True @@ -5349,10 +5020,9 @@ Partial Class ucrCalculator 'cmdTilde ' Me.cmdTilde.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTilde.Location = New System.Drawing.Point(125, 72) - Me.cmdTilde.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTilde.Location = New System.Drawing.Point(188, 108) Me.cmdTilde.Name = "cmdTilde" - Me.cmdTilde.Size = New System.Drawing.Size(36, 30) + Me.cmdTilde.Size = New System.Drawing.Size(54, 45) Me.cmdTilde.TabIndex = 205 Me.cmdTilde.Text = "~" Me.cmdTilde.UseVisualStyleBackColor = True @@ -5360,10 +5030,9 @@ Partial Class ucrCalculator 'cmdIn ' Me.cmdIn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIn.Location = New System.Drawing.Point(126, 101) - Me.cmdIn.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIn.Location = New System.Drawing.Point(189, 152) Me.cmdIn.Name = "cmdIn" - Me.cmdIn.Size = New System.Drawing.Size(66, 30) + Me.cmdIn.Size = New System.Drawing.Size(99, 45) Me.cmdIn.TabIndex = 204 Me.cmdIn.Text = "%in%" Me.cmdIn.UseVisualStyleBackColor = True @@ -5371,10 +5040,9 @@ Partial Class ucrCalculator 'cmdWhich ' Me.cmdWhich.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWhich.Location = New System.Drawing.Point(191, 101) - Me.cmdWhich.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWhich.Location = New System.Drawing.Point(286, 152) Me.cmdWhich.Name = "cmdWhich" - Me.cmdWhich.Size = New System.Drawing.Size(62, 30) + Me.cmdWhich.Size = New System.Drawing.Size(93, 45) Me.cmdWhich.TabIndex = 203 Me.cmdWhich.Text = "which" Me.cmdWhich.UseVisualStyleBackColor = True @@ -5382,10 +5050,9 @@ Partial Class ucrCalculator 'cmdNA ' Me.cmdNA.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNA.Location = New System.Drawing.Point(160, 43) - Me.cmdNA.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNA.Location = New System.Drawing.Point(240, 64) Me.cmdNA.Name = "cmdNA" - Me.cmdNA.Size = New System.Drawing.Size(40, 30) + Me.cmdNA.Size = New System.Drawing.Size(60, 45) Me.cmdNA.TabIndex = 202 Me.cmdNA.Text = "NA" Me.cmdNA.UseVisualStyleBackColor = True @@ -5393,10 +5060,9 @@ Partial Class ucrCalculator 'cmdNear ' Me.cmdNear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNear.Location = New System.Drawing.Point(191, 159) - Me.cmdNear.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNear.Location = New System.Drawing.Point(286, 238) Me.cmdNear.Name = "cmdNear" - Me.cmdNear.Size = New System.Drawing.Size(62, 30) + Me.cmdNear.Size = New System.Drawing.Size(93, 45) Me.cmdNear.TabIndex = 201 Me.cmdNear.Text = "near" Me.cmdNear.UseVisualStyleBackColor = True @@ -5404,10 +5070,9 @@ Partial Class ucrCalculator 'cmdBetween ' Me.cmdBetween.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBetween.Location = New System.Drawing.Point(191, 130) - Me.cmdBetween.Margin = New System.Windows.Forms.Padding(2) + Me.cmdBetween.Location = New System.Drawing.Point(286, 195) Me.cmdBetween.Name = "cmdBetween" - Me.cmdBetween.Size = New System.Drawing.Size(62, 30) + Me.cmdBetween.Size = New System.Drawing.Size(93, 45) Me.cmdBetween.TabIndex = 200 Me.cmdBetween.Text = "between" Me.cmdBetween.UseVisualStyleBackColor = True @@ -5415,10 +5080,9 @@ Partial Class ucrCalculator 'cmdIsNa ' Me.cmdIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIsNa.Location = New System.Drawing.Point(4, 159) - Me.cmdIsNa.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIsNa.Location = New System.Drawing.Point(6, 238) Me.cmdIsNa.Name = "cmdIsNa" - Me.cmdIsNa.Size = New System.Drawing.Size(62, 30) + Me.cmdIsNa.Size = New System.Drawing.Size(93, 45) Me.cmdIsNa.TabIndex = 195 Me.cmdIsNa.Text = "is.na" Me.cmdIsNa.UseVisualStyleBackColor = True @@ -5426,10 +5090,9 @@ Partial Class ucrCalculator 'cmdNotIsNa ' Me.cmdNotIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotIsNa.Location = New System.Drawing.Point(65, 159) - Me.cmdNotIsNa.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNotIsNa.Location = New System.Drawing.Point(98, 238) Me.cmdNotIsNa.Name = "cmdNotIsNa" - Me.cmdNotIsNa.Size = New System.Drawing.Size(62, 30) + Me.cmdNotIsNa.Size = New System.Drawing.Size(93, 45) Me.cmdNotIsNa.TabIndex = 194 Me.cmdNotIsNa.Text = "!is.na" Me.cmdNotIsNa.UseVisualStyleBackColor = True @@ -5437,10 +5100,9 @@ Partial Class ucrCalculator 'cmdDuplicate ' Me.cmdDuplicate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDuplicate.Location = New System.Drawing.Point(126, 159) - Me.cmdDuplicate.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDuplicate.Location = New System.Drawing.Point(189, 238) Me.cmdDuplicate.Name = "cmdDuplicate" - Me.cmdDuplicate.Size = New System.Drawing.Size(66, 30) + Me.cmdDuplicate.Size = New System.Drawing.Size(99, 45) Me.cmdDuplicate.TabIndex = 193 Me.cmdDuplicate.Text = "duplicated" Me.cmdDuplicate.UseVisualStyleBackColor = True @@ -5448,10 +5110,9 @@ Partial Class ucrCalculator 'cmdIfelse ' Me.cmdIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIfelse.Location = New System.Drawing.Point(4, 130) - Me.cmdIfelse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIfelse.Location = New System.Drawing.Point(6, 195) Me.cmdIfelse.Name = "cmdIfelse" - Me.cmdIfelse.Size = New System.Drawing.Size(62, 30) + Me.cmdIfelse.Size = New System.Drawing.Size(93, 45) Me.cmdIfelse.TabIndex = 192 Me.cmdIfelse.Text = "ifelse" Me.cmdIfelse.UseVisualStyleBackColor = True @@ -5459,10 +5120,9 @@ Partial Class ucrCalculator 'cmdmatch ' Me.cmdmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmatch.Location = New System.Drawing.Point(65, 130) - Me.cmdmatch.Margin = New System.Windows.Forms.Padding(2) + Me.cmdmatch.Location = New System.Drawing.Point(98, 195) Me.cmdmatch.Name = "cmdmatch" - Me.cmdmatch.Size = New System.Drawing.Size(62, 30) + Me.cmdmatch.Size = New System.Drawing.Size(93, 45) Me.cmdmatch.TabIndex = 191 Me.cmdmatch.Text = "match" Me.cmdmatch.UseVisualStyleBackColor = True @@ -5470,10 +5130,9 @@ Partial Class ucrCalculator 'cmdwhen ' Me.cmdwhen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhen.Location = New System.Drawing.Point(126, 130) - Me.cmdwhen.Margin = New System.Windows.Forms.Padding(2) + Me.cmdwhen.Location = New System.Drawing.Point(189, 195) Me.cmdwhen.Name = "cmdwhen" - Me.cmdwhen.Size = New System.Drawing.Size(66, 30) + Me.cmdwhen.Size = New System.Drawing.Size(99, 45) Me.cmdwhen.TabIndex = 190 Me.cmdwhen.Text = "when" Me.cmdwhen.UseVisualStyleBackColor = True @@ -5481,10 +5140,9 @@ Partial Class ucrCalculator 'cmdOpeningBracket ' Me.cmdOpeningBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpeningBracket.Location = New System.Drawing.Point(160, 72) - Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOpeningBracket.Location = New System.Drawing.Point(240, 108) Me.cmdOpeningBracket.Name = "cmdOpeningBracket" - Me.cmdOpeningBracket.Size = New System.Drawing.Size(40, 30) + Me.cmdOpeningBracket.Size = New System.Drawing.Size(60, 45) Me.cmdOpeningBracket.TabIndex = 139 Me.cmdOpeningBracket.Text = "(" Me.cmdOpeningBracket.UseVisualStyleBackColor = True @@ -5493,10 +5151,9 @@ Partial Class ucrCalculator ' Me.cmdColon.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!) Me.cmdColon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColon.Location = New System.Drawing.Point(41, 72) - Me.cmdColon.Margin = New System.Windows.Forms.Padding(2) + Me.cmdColon.Location = New System.Drawing.Point(62, 108) Me.cmdColon.Name = "cmdColon" - Me.cmdColon.Size = New System.Drawing.Size(40, 30) + Me.cmdColon.Size = New System.Drawing.Size(60, 45) Me.cmdColon.TabIndex = 139 Me.cmdColon.Text = ":" Me.cmdColon.UseVisualStyleBackColor = True @@ -5504,10 +5161,9 @@ Partial Class ucrCalculator 'cmdGreaterOrEqualsTo ' Me.cmdGreaterOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(125, 14) - Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(188, 21) Me.cmdGreaterOrEqualsTo.Name = "cmdGreaterOrEqualsTo" - Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(36, 30) + Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(54, 45) Me.cmdGreaterOrEqualsTo.TabIndex = 138 Me.cmdGreaterOrEqualsTo.Text = ">=" Me.cmdGreaterOrEqualsTo.UseVisualStyleBackColor = True @@ -5515,10 +5171,9 @@ Partial Class ucrCalculator 'cmdClossingBracket ' Me.cmdClossingBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClossingBracket.Location = New System.Drawing.Point(199, 72) - Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(2) + Me.cmdClossingBracket.Location = New System.Drawing.Point(298, 108) Me.cmdClossingBracket.Name = "cmdClossingBracket" - Me.cmdClossingBracket.Size = New System.Drawing.Size(52, 30) + Me.cmdClossingBracket.Size = New System.Drawing.Size(81, 45) Me.cmdClossingBracket.TabIndex = 137 Me.cmdClossingBracket.Tag = "" Me.cmdClossingBracket.Text = ")" @@ -5528,10 +5183,9 @@ Partial Class ucrCalculator ' Me.cmdAnd.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!) Me.cmdAnd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnd.Location = New System.Drawing.Point(125, 43) - Me.cmdAnd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAnd.Location = New System.Drawing.Point(188, 64) Me.cmdAnd.Name = "cmdAnd" - Me.cmdAnd.Size = New System.Drawing.Size(36, 30) + Me.cmdAnd.Size = New System.Drawing.Size(54, 45) Me.cmdAnd.TabIndex = 137 Me.cmdAnd.Tag = "And" Me.cmdAnd.Text = "&&" @@ -5541,10 +5195,9 @@ Partial Class ucrCalculator ' Me.cmdQuotes.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdQuotes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuotes.Location = New System.Drawing.Point(160, 14) - Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2) + Me.cmdQuotes.Location = New System.Drawing.Point(240, 21) Me.cmdQuotes.Name = "cmdQuotes" - Me.cmdQuotes.Size = New System.Drawing.Size(40, 30) + Me.cmdQuotes.Size = New System.Drawing.Size(60, 45) Me.cmdQuotes.TabIndex = 135 Me.cmdQuotes.Text = """ """ Me.cmdQuotes.UseVisualStyleBackColor = True @@ -5552,10 +5205,9 @@ Partial Class ucrCalculator 'cmdSquareBrackets ' Me.cmdSquareBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSquareBrackets.Location = New System.Drawing.Point(80, 72) - Me.cmdSquareBrackets.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSquareBrackets.Location = New System.Drawing.Point(120, 108) Me.cmdSquareBrackets.Name = "cmdSquareBrackets" - Me.cmdSquareBrackets.Size = New System.Drawing.Size(46, 30) + Me.cmdSquareBrackets.Size = New System.Drawing.Size(69, 45) Me.cmdSquareBrackets.TabIndex = 134 Me.cmdSquareBrackets.Text = "[ ]" Me.cmdSquareBrackets.UseVisualStyleBackColor = True @@ -5563,10 +5215,9 @@ Partial Class ucrCalculator 'cmdIntegerDivision ' Me.cmdIntegerDivision.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIntegerDivision.Location = New System.Drawing.Point(65, 101) - Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIntegerDivision.Location = New System.Drawing.Point(98, 152) Me.cmdIntegerDivision.Name = "cmdIntegerDivision" - Me.cmdIntegerDivision.Size = New System.Drawing.Size(62, 30) + Me.cmdIntegerDivision.Size = New System.Drawing.Size(93, 45) Me.cmdIntegerDivision.TabIndex = 135 Me.cmdIntegerDivision.Text = "div (%/%)" Me.cmdIntegerDivision.UseVisualStyleBackColor = True @@ -5574,10 +5225,9 @@ Partial Class ucrCalculator 'cmdModulas ' Me.cmdModulas.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdModulas.Location = New System.Drawing.Point(4, 101) - Me.cmdModulas.Margin = New System.Windows.Forms.Padding(2) + Me.cmdModulas.Location = New System.Drawing.Point(6, 152) Me.cmdModulas.Name = "cmdModulas" - Me.cmdModulas.Size = New System.Drawing.Size(62, 30) + Me.cmdModulas.Size = New System.Drawing.Size(93, 45) Me.cmdModulas.TabIndex = 134 Me.cmdModulas.Text = "mod (%%)" Me.cmdModulas.UseVisualStyleBackColor = True @@ -5585,10 +5235,9 @@ Partial Class ucrCalculator 'cmdGreater ' Me.cmdGreater.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreater.Location = New System.Drawing.Point(80, 14) - Me.cmdGreater.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGreater.Location = New System.Drawing.Point(120, 21) Me.cmdGreater.Name = "cmdGreater" - Me.cmdGreater.Size = New System.Drawing.Size(46, 30) + Me.cmdGreater.Size = New System.Drawing.Size(69, 45) Me.cmdGreater.TabIndex = 133 Me.cmdGreater.Text = ">" Me.cmdGreater.UseVisualStyleBackColor = True @@ -5596,10 +5245,9 @@ Partial Class ucrCalculator 'cmdLesserOrEqualsTo ' Me.cmdLesserOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(41, 14) - Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(62, 21) Me.cmdLesserOrEqualsTo.Name = "cmdLesserOrEqualsTo" - Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(40, 30) + Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(60, 45) Me.cmdLesserOrEqualsTo.TabIndex = 132 Me.cmdLesserOrEqualsTo.Text = "<=" Me.cmdLesserOrEqualsTo.UseVisualStyleBackColor = True @@ -5607,10 +5255,9 @@ Partial Class ucrCalculator 'cmdLesser ' Me.cmdLesser.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesser.Location = New System.Drawing.Point(4, 14) - Me.cmdLesser.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLesser.Location = New System.Drawing.Point(6, 21) Me.cmdLesser.Name = "cmdLesser" - Me.cmdLesser.Size = New System.Drawing.Size(38, 30) + Me.cmdLesser.Size = New System.Drawing.Size(57, 45) Me.cmdLesser.TabIndex = 131 Me.cmdLesser.Text = "<" Me.cmdLesser.UseVisualStyleBackColor = True @@ -5618,10 +5265,9 @@ Partial Class ucrCalculator 'cmdOr ' Me.cmdOr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr.Location = New System.Drawing.Point(80, 43) - Me.cmdOr.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOr.Location = New System.Drawing.Point(120, 64) Me.cmdOr.Name = "cmdOr" - Me.cmdOr.Size = New System.Drawing.Size(46, 30) + Me.cmdOr.Size = New System.Drawing.Size(69, 45) Me.cmdOr.TabIndex = 130 Me.cmdOr.Text = "|" Me.cmdOr.UseVisualStyleBackColor = True @@ -5630,10 +5276,9 @@ Partial Class ucrCalculator ' Me.cmdNot.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.cmdNot.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot.Location = New System.Drawing.Point(4, 72) - Me.cmdNot.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNot.Location = New System.Drawing.Point(6, 108) Me.cmdNot.Name = "cmdNot" - Me.cmdNot.Size = New System.Drawing.Size(38, 30) + Me.cmdNot.Size = New System.Drawing.Size(57, 45) Me.cmdNot.TabIndex = 129 Me.cmdNot.Text = "!" Me.cmdNot.UseVisualStyleBackColor = True @@ -5641,10 +5286,9 @@ Partial Class ucrCalculator 'cmdNotEqualsTo ' Me.cmdNotEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotEqualsTo.Location = New System.Drawing.Point(41, 43) - Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNotEqualsTo.Location = New System.Drawing.Point(62, 64) Me.cmdNotEqualsTo.Name = "cmdNotEqualsTo" - Me.cmdNotEqualsTo.Size = New System.Drawing.Size(40, 30) + Me.cmdNotEqualsTo.Size = New System.Drawing.Size(60, 45) Me.cmdNotEqualsTo.TabIndex = 128 Me.cmdNotEqualsTo.Text = "!=" Me.cmdNotEqualsTo.UseVisualStyleBackColor = True @@ -5652,10 +5296,9 @@ Partial Class ucrCalculator 'cmdEquivalent ' Me.cmdEquivalent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEquivalent.Location = New System.Drawing.Point(4, 43) - Me.cmdEquivalent.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEquivalent.Location = New System.Drawing.Point(6, 64) Me.cmdEquivalent.Name = "cmdEquivalent" - Me.cmdEquivalent.Size = New System.Drawing.Size(38, 30) + Me.cmdEquivalent.Size = New System.Drawing.Size(57, 45) Me.cmdEquivalent.TabIndex = 127 Me.cmdEquivalent.Text = "==" Me.cmdEquivalent.UseVisualStyleBackColor = True @@ -5690,11 +5333,9 @@ Partial Class ucrCalculator Me.grpTestString.Controls.Add(Me.cmdLocate) Me.grpTestString.Controls.Add(Me.cmdSquishb) Me.grpTestString.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.grpTestString.Location = New System.Drawing.Point(434, 62) - Me.grpTestString.Margin = New System.Windows.Forms.Padding(2) + Me.grpTestString.Location = New System.Drawing.Point(651, 93) Me.grpTestString.Name = "grpTestString" - Me.grpTestString.Padding = New System.Windows.Forms.Padding(2) - Me.grpTestString.Size = New System.Drawing.Size(302, 164) + Me.grpTestString.Size = New System.Drawing.Size(453, 246) Me.grpTestString.TabIndex = 186 Me.grpTestString.TabStop = False Me.grpTestString.Text = "Text/Strings (Character Columns)" @@ -5703,10 +5344,9 @@ Partial Class ucrCalculator ' Me.cmdReverseStr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReverseStr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverseStr.Location = New System.Drawing.Point(245, 101) - Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(2) + Me.cmdReverseStr.Location = New System.Drawing.Point(368, 152) Me.cmdReverseStr.Name = "cmdReverseStr" - Me.cmdReverseStr.Size = New System.Drawing.Size(52, 30) + Me.cmdReverseStr.Size = New System.Drawing.Size(81, 45) Me.cmdReverseStr.TabIndex = 165 Me.cmdReverseStr.Tag = "" Me.cmdReverseStr.Text = "reverse" @@ -5715,10 +5355,9 @@ Partial Class ucrCalculator 'cmdEnds ' Me.cmdEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnds.Location = New System.Drawing.Point(120, 72) - Me.cmdEnds.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEnds.Location = New System.Drawing.Point(180, 108) Me.cmdEnds.Name = "cmdEnds" - Me.cmdEnds.Size = New System.Drawing.Size(60, 30) + Me.cmdEnds.Size = New System.Drawing.Size(90, 45) Me.cmdEnds.TabIndex = 164 Me.cmdEnds.Text = "ends" Me.cmdEnds.UseVisualStyleBackColor = True @@ -5727,10 +5366,9 @@ Partial Class ucrCalculator ' Me.cmdTrunck.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrunck.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrunck.Location = New System.Drawing.Point(247, 130) - Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTrunck.Location = New System.Drawing.Point(370, 195) Me.cmdTrunck.Name = "cmdTrunck" - Me.cmdTrunck.Size = New System.Drawing.Size(52, 30) + Me.cmdTrunck.Size = New System.Drawing.Size(78, 45) Me.cmdTrunck.TabIndex = 163 Me.cmdTrunck.Text = "trunc " Me.cmdTrunck.UseVisualStyleBackColor = True @@ -5739,10 +5377,9 @@ Partial Class ucrCalculator ' Me.cmdLenth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLenth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLenth.Location = New System.Drawing.Point(161, 101) - Me.cmdLenth.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLenth.Location = New System.Drawing.Point(242, 152) Me.cmdLenth.Name = "cmdLenth" - Me.cmdLenth.Size = New System.Drawing.Size(44, 30) + Me.cmdLenth.Size = New System.Drawing.Size(66, 45) Me.cmdLenth.TabIndex = 162 Me.cmdLenth.Text = "length" Me.cmdLenth.UseVisualStyleBackColor = True @@ -5751,10 +5388,9 @@ Partial Class ucrCalculator ' Me.cmdGlue.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdGlue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGlue.Location = New System.Drawing.Point(204, 101) - Me.cmdGlue.Margin = New System.Windows.Forms.Padding(2) + Me.cmdGlue.Location = New System.Drawing.Point(306, 152) Me.cmdGlue.Name = "cmdGlue" - Me.cmdGlue.Size = New System.Drawing.Size(42, 30) + Me.cmdGlue.Size = New System.Drawing.Size(63, 45) Me.cmdGlue.TabIndex = 161 Me.cmdGlue.Text = "glue" Me.cmdGlue.UseVisualStyleBackColor = True @@ -5763,10 +5399,9 @@ Partial Class ucrCalculator ' Me.cmdStarts.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdStarts.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdStarts.Location = New System.Drawing.Point(202, 130) - Me.cmdStarts.Margin = New System.Windows.Forms.Padding(2) + Me.cmdStarts.Location = New System.Drawing.Point(303, 195) Me.cmdStarts.Name = "cmdStarts" - Me.cmdStarts.Size = New System.Drawing.Size(46, 30) + Me.cmdStarts.Size = New System.Drawing.Size(69, 45) Me.cmdStarts.TabIndex = 160 Me.cmdStarts.Tag = "" Me.cmdStarts.Text = "starts" @@ -5776,10 +5411,9 @@ Partial Class ucrCalculator ' Me.cmdReplace2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReplace2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReplace2.Location = New System.Drawing.Point(110, 130) - Me.cmdReplace2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdReplace2.Location = New System.Drawing.Point(165, 195) Me.cmdReplace2.Name = "cmdReplace2" - Me.cmdReplace2.Size = New System.Drawing.Size(60, 30) + Me.cmdReplace2.Size = New System.Drawing.Size(90, 45) Me.cmdReplace2.TabIndex = 159 Me.cmdReplace2.Tag = "" Me.cmdReplace2.Text = "replace2" @@ -5789,10 +5423,9 @@ Partial Class ucrCalculator ' Me.cmdReplace.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReplace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReplace.Location = New System.Drawing.Point(61, 130) - Me.cmdReplace.Margin = New System.Windows.Forms.Padding(2) + Me.cmdReplace.Location = New System.Drawing.Point(92, 195) Me.cmdReplace.Name = "cmdReplace" - Me.cmdReplace.Size = New System.Drawing.Size(50, 30) + Me.cmdReplace.Size = New System.Drawing.Size(75, 45) Me.cmdReplace.TabIndex = 158 Me.cmdReplace.Tag = "" Me.cmdReplace.Text = "replace" @@ -5802,10 +5435,9 @@ Partial Class ucrCalculator ' Me.cmdRemove2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRemove2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRemove2.Location = New System.Drawing.Point(2, 130) - Me.cmdRemove2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRemove2.Location = New System.Drawing.Point(3, 195) Me.cmdRemove2.Name = "cmdRemove2" - Me.cmdRemove2.Size = New System.Drawing.Size(60, 30) + Me.cmdRemove2.Size = New System.Drawing.Size(90, 45) Me.cmdRemove2.TabIndex = 157 Me.cmdRemove2.Tag = "" Me.cmdRemove2.Text = "remove2" @@ -5815,10 +5447,9 @@ Partial Class ucrCalculator ' Me.cmdRemove1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRemove1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRemove1.Location = New System.Drawing.Point(110, 101) - Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRemove1.Location = New System.Drawing.Point(165, 152) Me.cmdRemove1.Name = "cmdRemove1" - Me.cmdRemove1.Size = New System.Drawing.Size(52, 30) + Me.cmdRemove1.Size = New System.Drawing.Size(78, 45) Me.cmdRemove1.TabIndex = 156 Me.cmdRemove1.Tag = "" Me.cmdRemove1.Text = "remove" @@ -5828,10 +5459,9 @@ Partial Class ucrCalculator ' Me.cmdLocate2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLocate2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLocate2.Location = New System.Drawing.Point(61, 101) - Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLocate2.Location = New System.Drawing.Point(92, 152) Me.cmdLocate2.Name = "cmdLocate2" - Me.cmdLocate2.Size = New System.Drawing.Size(50, 30) + Me.cmdLocate2.Size = New System.Drawing.Size(75, 45) Me.cmdLocate2.TabIndex = 155 Me.cmdLocate2.Tag = "" Me.cmdLocate2.Text = "locate2" @@ -5841,10 +5471,9 @@ Partial Class ucrCalculator ' Me.cmdExtract2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdExtract2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExtract2.Location = New System.Drawing.Point(238, 72) - Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdExtract2.Location = New System.Drawing.Point(357, 108) Me.cmdExtract2.Name = "cmdExtract2" - Me.cmdExtract2.Size = New System.Drawing.Size(60, 30) + Me.cmdExtract2.Size = New System.Drawing.Size(92, 45) Me.cmdExtract2.TabIndex = 154 Me.cmdExtract2.Tag = "" Me.cmdExtract2.Text = "extract2" @@ -5854,10 +5483,9 @@ Partial Class ucrCalculator ' Me.cmdEncodeb.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdEncodeb.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEncodeb.Location = New System.Drawing.Point(238, 43) - Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEncodeb.Location = New System.Drawing.Point(357, 64) Me.cmdEncodeb.Name = "cmdEncodeb" - Me.cmdEncodeb.Size = New System.Drawing.Size(60, 30) + Me.cmdEncodeb.Size = New System.Drawing.Size(92, 45) Me.cmdEncodeb.TabIndex = 151 Me.cmdEncodeb.Text = "encode " Me.cmdEncodeb.UseVisualStyleBackColor = True @@ -5866,10 +5494,9 @@ Partial Class ucrCalculator ' Me.cmdSub.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSub.Location = New System.Drawing.Point(169, 130) - Me.cmdSub.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSub.Location = New System.Drawing.Point(254, 195) Me.cmdSub.Name = "cmdSub" - Me.cmdSub.Size = New System.Drawing.Size(34, 30) + Me.cmdSub.Size = New System.Drawing.Size(51, 45) Me.cmdSub.TabIndex = 149 Me.cmdSub.Tag = "" Me.cmdSub.Text = "sub" @@ -5879,10 +5506,9 @@ Partial Class ucrCalculator ' Me.cmdCombine.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCombine.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCombine.Location = New System.Drawing.Point(179, 43) - Me.cmdCombine.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCombine.Location = New System.Drawing.Point(268, 64) Me.cmdCombine.Name = "cmdCombine" - Me.cmdCombine.Size = New System.Drawing.Size(60, 30) + Me.cmdCombine.Size = New System.Drawing.Size(90, 45) Me.cmdCombine.TabIndex = 148 Me.cmdCombine.Text = "combine" Me.cmdCombine.UseVisualStyleBackColor = True @@ -5891,10 +5517,9 @@ Partial Class ucrCalculator ' Me.cmdDetect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdDetect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDetect.Location = New System.Drawing.Point(61, 72) - Me.cmdDetect.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDetect.Location = New System.Drawing.Point(92, 108) Me.cmdDetect.Name = "cmdDetect" - Me.cmdDetect.Size = New System.Drawing.Size(60, 30) + Me.cmdDetect.Size = New System.Drawing.Size(90, 45) Me.cmdDetect.TabIndex = 147 Me.cmdDetect.Tag = "" Me.cmdDetect.Text = "detect" @@ -5904,10 +5529,9 @@ Partial Class ucrCalculator ' Me.cmdTrim.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTrim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrim.Location = New System.Drawing.Point(179, 14) - Me.cmdTrim.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTrim.Location = New System.Drawing.Point(268, 21) Me.cmdTrim.Name = "cmdTrim" - Me.cmdTrim.Size = New System.Drawing.Size(60, 30) + Me.cmdTrim.Size = New System.Drawing.Size(90, 45) Me.cmdTrim.TabIndex = 146 Me.cmdTrim.Text = "trim" Me.cmdTrim.UseVisualStyleBackColor = True @@ -5916,10 +5540,9 @@ Partial Class ucrCalculator ' Me.cmdTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTitle.Location = New System.Drawing.Point(120, 14) - Me.cmdTitle.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTitle.Location = New System.Drawing.Point(180, 21) Me.cmdTitle.Name = "cmdTitle" - Me.cmdTitle.Size = New System.Drawing.Size(60, 30) + Me.cmdTitle.Size = New System.Drawing.Size(90, 45) Me.cmdTitle.TabIndex = 142 Me.cmdTitle.Text = "title" Me.cmdTitle.UseVisualStyleBackColor = True @@ -5928,10 +5551,9 @@ Partial Class ucrCalculator ' Me.cmdLower.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLower.Location = New System.Drawing.Point(61, 14) - Me.cmdLower.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLower.Location = New System.Drawing.Point(92, 21) Me.cmdLower.Name = "cmdLower" - Me.cmdLower.Size = New System.Drawing.Size(60, 30) + Me.cmdLower.Size = New System.Drawing.Size(90, 45) Me.cmdLower.TabIndex = 141 Me.cmdLower.Text = "lower" Me.cmdLower.UseVisualStyleBackColor = True @@ -5940,10 +5562,9 @@ Partial Class ucrCalculator ' Me.cmdUpper.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdUpper.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdUpper.Location = New System.Drawing.Point(2, 14) - Me.cmdUpper.Margin = New System.Windows.Forms.Padding(2) + Me.cmdUpper.Location = New System.Drawing.Point(3, 21) Me.cmdUpper.Name = "cmdUpper" - Me.cmdUpper.Size = New System.Drawing.Size(60, 30) + Me.cmdUpper.Size = New System.Drawing.Size(90, 45) Me.cmdUpper.TabIndex = 140 Me.cmdUpper.Text = "upper" Me.cmdUpper.UseVisualStyleBackColor = True @@ -5952,10 +5573,9 @@ Partial Class ucrCalculator ' Me.cmdSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSort.Location = New System.Drawing.Point(120, 43) - Me.cmdSort.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSort.Location = New System.Drawing.Point(180, 64) Me.cmdSort.Name = "cmdSort" - Me.cmdSort.Size = New System.Drawing.Size(60, 30) + Me.cmdSort.Size = New System.Drawing.Size(90, 45) Me.cmdSort.TabIndex = 139 Me.cmdSort.Text = "sort" Me.cmdSort.UseVisualStyleBackColor = True @@ -5964,10 +5584,9 @@ Partial Class ucrCalculator ' Me.cmdOrder.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdOrder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOrder.Location = New System.Drawing.Point(61, 43) - Me.cmdOrder.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOrder.Location = New System.Drawing.Point(92, 64) Me.cmdOrder.Name = "cmdOrder" - Me.cmdOrder.Size = New System.Drawing.Size(60, 30) + Me.cmdOrder.Size = New System.Drawing.Size(90, 45) Me.cmdOrder.TabIndex = 138 Me.cmdOrder.Text = "order" Me.cmdOrder.UseVisualStyleBackColor = True @@ -5976,10 +5595,9 @@ Partial Class ucrCalculator ' Me.cmdPad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPad.Location = New System.Drawing.Point(2, 43) - Me.cmdPad.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPad.Location = New System.Drawing.Point(3, 64) Me.cmdPad.Name = "cmdPad" - Me.cmdPad.Size = New System.Drawing.Size(60, 30) + Me.cmdPad.Size = New System.Drawing.Size(90, 45) Me.cmdPad.TabIndex = 137 Me.cmdPad.Text = "pad" Me.cmdPad.UseVisualStyleBackColor = True @@ -5988,10 +5606,9 @@ Partial Class ucrCalculator ' Me.cmdExtract.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdExtract.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExtract.Location = New System.Drawing.Point(179, 72) - Me.cmdExtract.Margin = New System.Windows.Forms.Padding(2) + Me.cmdExtract.Location = New System.Drawing.Point(268, 108) Me.cmdExtract.Name = "cmdExtract" - Me.cmdExtract.Size = New System.Drawing.Size(60, 30) + Me.cmdExtract.Size = New System.Drawing.Size(90, 45) Me.cmdExtract.TabIndex = 136 Me.cmdExtract.Text = "extract" Me.cmdExtract.UseVisualStyleBackColor = True @@ -6000,10 +5617,9 @@ Partial Class ucrCalculator ' Me.cmdCountstrings.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCountstrings.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCountstrings.Location = New System.Drawing.Point(2, 72) - Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCountstrings.Location = New System.Drawing.Point(3, 108) Me.cmdCountstrings.Name = "cmdCountstrings" - Me.cmdCountstrings.Size = New System.Drawing.Size(60, 30) + Me.cmdCountstrings.Size = New System.Drawing.Size(90, 45) Me.cmdCountstrings.TabIndex = 134 Me.cmdCountstrings.Text = "count" Me.cmdCountstrings.UseVisualStyleBackColor = True @@ -6012,10 +5628,9 @@ Partial Class ucrCalculator ' Me.cmdLocate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdLocate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLocate.Location = New System.Drawing.Point(2, 101) - Me.cmdLocate.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLocate.Location = New System.Drawing.Point(3, 152) Me.cmdLocate.Name = "cmdLocate" - Me.cmdLocate.Size = New System.Drawing.Size(60, 30) + Me.cmdLocate.Size = New System.Drawing.Size(90, 45) Me.cmdLocate.TabIndex = 133 Me.cmdLocate.Text = "locate" Me.cmdLocate.UseVisualStyleBackColor = True @@ -6024,10 +5639,9 @@ Partial Class ucrCalculator ' Me.cmdSquishb.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSquishb.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSquishb.Location = New System.Drawing.Point(238, 14) - Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSquishb.Location = New System.Drawing.Point(357, 21) Me.cmdSquishb.Name = "cmdSquishb" - Me.cmdSquishb.Size = New System.Drawing.Size(60, 30) + Me.cmdSquishb.Size = New System.Drawing.Size(92, 45) Me.cmdSquishb.TabIndex = 150 Me.cmdSquishb.Text = "squish " Me.cmdSquishb.UseVisualStyleBackColor = True @@ -6057,11 +5671,9 @@ Partial Class ucrCalculator Me.grpCircular.Controls.Add(Me.cmdMedianHL) Me.grpCircular.Controls.Add(Me.cmdCircMedian) Me.grpCircular.Controls.Add(Me.cmdCircMean) - Me.grpCircular.Location = New System.Drawing.Point(434, 62) - Me.grpCircular.Margin = New System.Windows.Forms.Padding(2) + Me.grpCircular.Location = New System.Drawing.Point(651, 93) Me.grpCircular.Name = "grpCircular" - Me.grpCircular.Padding = New System.Windows.Forms.Padding(2) - Me.grpCircular.Size = New System.Drawing.Size(248, 174) + Me.grpCircular.Size = New System.Drawing.Size(372, 261) Me.grpCircular.TabIndex = 192 Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" @@ -6070,10 +5682,9 @@ Partial Class ucrCalculator ' Me.cmdCircularHelp.AutoSize = True Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) - Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircularHelp.Location = New System.Drawing.Point(237, 213) Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdCircularHelp.Size = New System.Drawing.Size(129, 45) Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular Me.cmdCircularHelp.TabIndex = 212 Me.cmdCircularHelp.Text = "R Help" @@ -6084,21 +5695,20 @@ Partial Class ucrCalculator Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripCircular.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CircularToolStripMenuItem}) Me.ContextMenuStripCircular.Name = "ContextMenuStrip1" - Me.ContextMenuStripCircular.Size = New System.Drawing.Size(114, 26) + Me.ContextMenuStripCircular.Size = New System.Drawing.Size(140, 36) ' 'CircularToolStripMenuItem ' Me.CircularToolStripMenuItem.Name = "CircularToolStripMenuItem" - Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(113, 22) + Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(139, 32) Me.CircularToolStripMenuItem.Text = "circular" ' 'cmdCircular ' Me.cmdCircular.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircular.Location = New System.Drawing.Point(2, 18) - Me.cmdCircular.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircular.Location = New System.Drawing.Point(3, 27) Me.cmdCircular.Name = "cmdCircular" - Me.cmdCircular.Size = New System.Drawing.Size(60, 32) + Me.cmdCircular.Size = New System.Drawing.Size(90, 48) Me.cmdCircular.TabIndex = 15 Me.cmdCircular.Text = "circular" Me.cmdCircular.UseVisualStyleBackColor = True @@ -6106,10 +5716,9 @@ Partial Class ucrCalculator 'cmdCircQuantiles ' Me.cmdCircQuantiles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQuantiles.Location = New System.Drawing.Point(120, 80) - Me.cmdCircQuantiles.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircQuantiles.Location = New System.Drawing.Point(180, 120) Me.cmdCircQuantiles.Name = "cmdCircQuantiles" - Me.cmdCircQuantiles.Size = New System.Drawing.Size(60, 32) + Me.cmdCircQuantiles.Size = New System.Drawing.Size(90, 48) Me.cmdCircQuantiles.TabIndex = 13 Me.cmdCircQuantiles.Text = "quantiles" Me.cmdCircQuantiles.UseVisualStyleBackColor = True @@ -6117,10 +5726,9 @@ Partial Class ucrCalculator 'cmdCircMax ' Me.cmdCircMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMax.Location = New System.Drawing.Point(179, 111) - Me.cmdCircMax.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircMax.Location = New System.Drawing.Point(268, 166) Me.cmdCircMax.Name = "cmdCircMax" - Me.cmdCircMax.Size = New System.Drawing.Size(66, 32) + Me.cmdCircMax.Size = New System.Drawing.Size(99, 48) Me.cmdCircMax.TabIndex = 10 Me.cmdCircMax.Text = "max" Me.cmdCircMax.UseVisualStyleBackColor = True @@ -6128,10 +5736,9 @@ Partial Class ucrCalculator 'cmdA1 ' Me.cmdA1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdA1.Location = New System.Drawing.Point(2, 80) - Me.cmdA1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdA1.Location = New System.Drawing.Point(3, 120) Me.cmdA1.Name = "cmdA1" - Me.cmdA1.Size = New System.Drawing.Size(60, 32) + Me.cmdA1.Size = New System.Drawing.Size(90, 48) Me.cmdA1.TabIndex = 8 Me.cmdA1.Text = "A1" Me.cmdA1.UseVisualStyleBackColor = True @@ -6139,10 +5746,9 @@ Partial Class ucrCalculator 'cmdAngVar ' Me.cmdAngVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngVar.Location = New System.Drawing.Point(61, 80) - Me.cmdAngVar.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAngVar.Location = New System.Drawing.Point(92, 120) Me.cmdAngVar.Name = "cmdAngVar" - Me.cmdAngVar.Size = New System.Drawing.Size(60, 32) + Me.cmdAngVar.Size = New System.Drawing.Size(90, 48) Me.cmdAngVar.TabIndex = 6 Me.cmdAngVar.Text = "ang.var" Me.cmdAngVar.UseVisualStyleBackColor = True @@ -6150,10 +5756,9 @@ Partial Class ucrCalculator 'cmdCircRho ' Me.cmdCircRho.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRho.Location = New System.Drawing.Point(179, 80) - Me.cmdCircRho.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircRho.Location = New System.Drawing.Point(268, 120) Me.cmdCircRho.Name = "cmdCircRho" - Me.cmdCircRho.Size = New System.Drawing.Size(66, 32) + Me.cmdCircRho.Size = New System.Drawing.Size(99, 48) Me.cmdCircRho.TabIndex = 14 Me.cmdCircRho.Text = "rho" Me.cmdCircRho.UseVisualStyleBackColor = True @@ -6161,10 +5766,9 @@ Partial Class ucrCalculator 'cmdCircQ3 ' Me.cmdCircQ3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ3.Location = New System.Drawing.Point(120, 111) - Me.cmdCircQ3.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircQ3.Location = New System.Drawing.Point(180, 166) Me.cmdCircQ3.Name = "cmdCircQ3" - Me.cmdCircQ3.Size = New System.Drawing.Size(60, 32) + Me.cmdCircQ3.Size = New System.Drawing.Size(90, 48) Me.cmdCircQ3.TabIndex = 12 Me.cmdCircQ3.Text = "q3" Me.cmdCircQ3.UseVisualStyleBackColor = True @@ -6172,10 +5776,9 @@ Partial Class ucrCalculator 'cmdCircQ1 ' Me.cmdCircQ1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ1.Location = New System.Drawing.Point(61, 111) - Me.cmdCircQ1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircQ1.Location = New System.Drawing.Point(92, 166) Me.cmdCircQ1.Name = "cmdCircQ1" - Me.cmdCircQ1.Size = New System.Drawing.Size(60, 32) + Me.cmdCircQ1.Size = New System.Drawing.Size(90, 48) Me.cmdCircQ1.TabIndex = 11 Me.cmdCircQ1.Text = "q1" Me.cmdCircQ1.UseVisualStyleBackColor = True @@ -6183,10 +5786,9 @@ Partial Class ucrCalculator 'cmdCircMin ' Me.cmdCircMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMin.Location = New System.Drawing.Point(2, 111) - Me.cmdCircMin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircMin.Location = New System.Drawing.Point(3, 166) Me.cmdCircMin.Name = "cmdCircMin" - Me.cmdCircMin.Size = New System.Drawing.Size(60, 32) + Me.cmdCircMin.Size = New System.Drawing.Size(90, 48) Me.cmdCircMin.TabIndex = 9 Me.cmdCircMin.Text = "min" Me.cmdCircMin.UseVisualStyleBackColor = True @@ -6194,10 +5796,9 @@ Partial Class ucrCalculator 'cmdAngDev ' Me.cmdAngDev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngDev.Location = New System.Drawing.Point(120, 49) - Me.cmdAngDev.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAngDev.Location = New System.Drawing.Point(180, 74) Me.cmdAngDev.Name = "cmdAngDev" - Me.cmdAngDev.Size = New System.Drawing.Size(60, 32) + Me.cmdAngDev.Size = New System.Drawing.Size(90, 48) Me.cmdAngDev.TabIndex = 7 Me.cmdAngDev.Text = "ang.dev" Me.cmdAngDev.UseVisualStyleBackColor = True @@ -6205,10 +5806,9 @@ Partial Class ucrCalculator 'cmdCircVar ' Me.cmdCircVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircVar.Location = New System.Drawing.Point(179, 49) - Me.cmdCircVar.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircVar.Location = New System.Drawing.Point(268, 74) Me.cmdCircVar.Name = "cmdCircVar" - Me.cmdCircVar.Size = New System.Drawing.Size(66, 32) + Me.cmdCircVar.Size = New System.Drawing.Size(99, 48) Me.cmdCircVar.TabIndex = 5 Me.cmdCircVar.Text = "var" Me.cmdCircVar.UseVisualStyleBackColor = True @@ -6216,10 +5816,9 @@ Partial Class ucrCalculator 'cmdCircSd ' Me.cmdCircSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircSd.Location = New System.Drawing.Point(61, 49) - Me.cmdCircSd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircSd.Location = New System.Drawing.Point(92, 74) Me.cmdCircSd.Name = "cmdCircSd" - Me.cmdCircSd.Size = New System.Drawing.Size(60, 32) + Me.cmdCircSd.Size = New System.Drawing.Size(90, 48) Me.cmdCircSd.TabIndex = 4 Me.cmdCircSd.Text = "sd" Me.cmdCircSd.UseVisualStyleBackColor = True @@ -6227,10 +5826,9 @@ Partial Class ucrCalculator 'cmdCircRange ' Me.cmdCircRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRange.Location = New System.Drawing.Point(2, 49) - Me.cmdCircRange.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircRange.Location = New System.Drawing.Point(3, 74) Me.cmdCircRange.Name = "cmdCircRange" - Me.cmdCircRange.Size = New System.Drawing.Size(60, 32) + Me.cmdCircRange.Size = New System.Drawing.Size(90, 48) Me.cmdCircRange.TabIndex = 3 Me.cmdCircRange.Text = "range" Me.cmdCircRange.UseVisualStyleBackColor = True @@ -6238,10 +5836,9 @@ Partial Class ucrCalculator 'cmdMedianHL ' Me.cmdMedianHL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMedianHL.Location = New System.Drawing.Point(179, 18) - Me.cmdMedianHL.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMedianHL.Location = New System.Drawing.Point(268, 27) Me.cmdMedianHL.Name = "cmdMedianHL" - Me.cmdMedianHL.Size = New System.Drawing.Size(66, 32) + Me.cmdMedianHL.Size = New System.Drawing.Size(99, 48) Me.cmdMedianHL.TabIndex = 2 Me.cmdMedianHL.Text = "medianHL" Me.cmdMedianHL.UseVisualStyleBackColor = True @@ -6249,10 +5846,9 @@ Partial Class ucrCalculator 'cmdCircMedian ' Me.cmdCircMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMedian.Location = New System.Drawing.Point(120, 18) - Me.cmdCircMedian.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircMedian.Location = New System.Drawing.Point(180, 27) Me.cmdCircMedian.Name = "cmdCircMedian" - Me.cmdCircMedian.Size = New System.Drawing.Size(60, 32) + Me.cmdCircMedian.Size = New System.Drawing.Size(90, 48) Me.cmdCircMedian.TabIndex = 1 Me.cmdCircMedian.Text = "median" Me.cmdCircMedian.UseVisualStyleBackColor = True @@ -6260,10 +5856,9 @@ Partial Class ucrCalculator 'cmdCircMean ' Me.cmdCircMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMean.Location = New System.Drawing.Point(61, 18) - Me.cmdCircMean.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircMean.Location = New System.Drawing.Point(92, 27) Me.cmdCircMean.Name = "cmdCircMean" - Me.cmdCircMean.Size = New System.Drawing.Size(60, 32) + Me.cmdCircMean.Size = New System.Drawing.Size(90, 48) Me.cmdCircMean.TabIndex = 0 Me.cmdCircMean.Text = "mean" Me.cmdCircMean.UseVisualStyleBackColor = True @@ -6274,11 +5869,9 @@ Partial Class ucrCalculator Me.grpModifier.Controls.Add(Me.cmdFixed) Me.grpModifier.Controls.Add(Me.cmdCollate) Me.grpModifier.Controls.Add(Me.cmdBoundary) - Me.grpModifier.Location = New System.Drawing.Point(434, 230) - Me.grpModifier.Margin = New System.Windows.Forms.Padding(2) + Me.grpModifier.Location = New System.Drawing.Point(651, 345) Me.grpModifier.Name = "grpModifier" - Me.grpModifier.Padding = New System.Windows.Forms.Padding(2) - Me.grpModifier.Size = New System.Drawing.Size(256, 54) + Me.grpModifier.Size = New System.Drawing.Size(384, 81) Me.grpModifier.TabIndex = 192 Me.grpModifier.TabStop = False Me.grpModifier.Text = "Modifier" @@ -6286,10 +5879,9 @@ Partial Class ucrCalculator 'cmdRegex ' Me.cmdRegex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRegex.Location = New System.Drawing.Point(185, 14) - Me.cmdRegex.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRegex.Location = New System.Drawing.Point(278, 21) Me.cmdRegex.Name = "cmdRegex" - Me.cmdRegex.Size = New System.Drawing.Size(62, 30) + Me.cmdRegex.Size = New System.Drawing.Size(93, 45) Me.cmdRegex.TabIndex = 3 Me.cmdRegex.Text = "regex" Me.cmdRegex.UseVisualStyleBackColor = True @@ -6297,10 +5889,9 @@ Partial Class ucrCalculator 'cmdFixed ' Me.cmdFixed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFixed.Location = New System.Drawing.Point(124, 14) - Me.cmdFixed.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFixed.Location = New System.Drawing.Point(186, 21) Me.cmdFixed.Name = "cmdFixed" - Me.cmdFixed.Size = New System.Drawing.Size(62, 30) + Me.cmdFixed.Size = New System.Drawing.Size(93, 45) Me.cmdFixed.TabIndex = 2 Me.cmdFixed.Text = "fixed" Me.cmdFixed.UseVisualStyleBackColor = True @@ -6308,10 +5899,9 @@ Partial Class ucrCalculator 'cmdCollate ' Me.cmdCollate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollate.Location = New System.Drawing.Point(63, 14) - Me.cmdCollate.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCollate.Location = New System.Drawing.Point(94, 21) Me.cmdCollate.Name = "cmdCollate" - Me.cmdCollate.Size = New System.Drawing.Size(62, 30) + Me.cmdCollate.Size = New System.Drawing.Size(93, 45) Me.cmdCollate.TabIndex = 1 Me.cmdCollate.Text = "collate" Me.cmdCollate.UseVisualStyleBackColor = True @@ -6319,10 +5909,9 @@ Partial Class ucrCalculator 'cmdBoundary ' Me.cmdBoundary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBoundary.Location = New System.Drawing.Point(2, 14) - Me.cmdBoundary.Margin = New System.Windows.Forms.Padding(2) + Me.cmdBoundary.Location = New System.Drawing.Point(3, 21) Me.cmdBoundary.Name = "cmdBoundary" - Me.cmdBoundary.Size = New System.Drawing.Size(62, 30) + Me.cmdBoundary.Size = New System.Drawing.Size(93, 45) Me.cmdBoundary.TabIndex = 0 Me.cmdBoundary.Text = "boundary" Me.cmdBoundary.UseVisualStyleBackColor = True @@ -6344,11 +5933,9 @@ Partial Class ucrCalculator Me.grpSymbols.Controls.Add(Me.cmdEnd1) Me.grpSymbols.Controls.Add(Me.cmdbegin) Me.grpSymbols.Controls.Add(Me.cmdAny1) - Me.grpSymbols.Location = New System.Drawing.Point(434, 287) - Me.grpSymbols.Margin = New System.Windows.Forms.Padding(2) + Me.grpSymbols.Location = New System.Drawing.Point(651, 430) Me.grpSymbols.Name = "grpSymbols" - Me.grpSymbols.Padding = New System.Windows.Forms.Padding(2) - Me.grpSymbols.Size = New System.Drawing.Size(316, 112) + Me.grpSymbols.Size = New System.Drawing.Size(474, 168) Me.grpSymbols.TabIndex = 193 Me.grpSymbols.TabStop = False Me.grpSymbols.Text = "Symbols" @@ -6356,10 +5943,9 @@ Partial Class ucrCalculator 'cmdOr3 ' Me.cmdOr3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr3.Location = New System.Drawing.Point(124, 45) - Me.cmdOr3.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOr3.Location = New System.Drawing.Point(186, 68) Me.cmdOr3.Name = "cmdOr3" - Me.cmdOr3.Size = New System.Drawing.Size(62, 30) + Me.cmdOr3.Size = New System.Drawing.Size(93, 45) Me.cmdOr3.TabIndex = 16 Me.cmdOr3.Text = "| or" Me.cmdOr3.UseVisualStyleBackColor = True @@ -6367,10 +5953,9 @@ Partial Class ucrCalculator 'cmdEscape ' Me.cmdEscape.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEscape.Location = New System.Drawing.Point(185, 74) - Me.cmdEscape.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEscape.Location = New System.Drawing.Point(278, 111) Me.cmdEscape.Name = "cmdEscape" - Me.cmdEscape.Size = New System.Drawing.Size(62, 30) + Me.cmdEscape.Size = New System.Drawing.Size(93, 45) Me.cmdEscape.TabIndex = 14 Me.cmdEscape.Text = "\\ escape" Me.cmdEscape.UseVisualStyleBackColor = True @@ -6378,10 +5963,9 @@ Partial Class ucrCalculator 'cmdPlusZero ' Me.cmdPlusZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusZero.Location = New System.Drawing.Point(246, 74) - Me.cmdPlusZero.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPlusZero.Location = New System.Drawing.Point(369, 111) Me.cmdPlusZero.Name = "cmdPlusZero" - Me.cmdPlusZero.Size = New System.Drawing.Size(62, 30) + Me.cmdPlusZero.Size = New System.Drawing.Size(93, 45) Me.cmdPlusZero.TabIndex = 15 Me.cmdPlusZero.Text = "- to" Me.cmdPlusZero.UseVisualStyleBackColor = True @@ -6389,10 +5973,9 @@ Partial Class ucrCalculator 'cmdZero ' Me.cmdZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZero.Location = New System.Drawing.Point(124, 74) - Me.cmdZero.Margin = New System.Windows.Forms.Padding(2) + Me.cmdZero.Location = New System.Drawing.Point(186, 111) Me.cmdZero.Name = "cmdZero" - Me.cmdZero.Size = New System.Drawing.Size(62, 30) + Me.cmdZero.Size = New System.Drawing.Size(93, 45) Me.cmdZero.TabIndex = 13 Me.cmdZero.Text = "* 0+" Me.cmdZero.UseVisualStyleBackColor = True @@ -6400,10 +5983,9 @@ Partial Class ucrCalculator 'cmdPlusOne ' Me.cmdPlusOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusOne.Location = New System.Drawing.Point(63, 74) - Me.cmdPlusOne.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPlusOne.Location = New System.Drawing.Point(94, 111) Me.cmdPlusOne.Name = "cmdPlusOne" - Me.cmdPlusOne.Size = New System.Drawing.Size(62, 30) + Me.cmdPlusOne.Size = New System.Drawing.Size(93, 45) Me.cmdPlusOne.TabIndex = 12 Me.cmdPlusOne.Text = "+ 1+" Me.cmdPlusOne.UseVisualStyleBackColor = True @@ -6411,10 +5993,9 @@ Partial Class ucrCalculator 'cmdZeroOrOne ' Me.cmdZeroOrOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZeroOrOne.Location = New System.Drawing.Point(2, 74) - Me.cmdZeroOrOne.Margin = New System.Windows.Forms.Padding(2) + Me.cmdZeroOrOne.Location = New System.Drawing.Point(3, 111) Me.cmdZeroOrOne.Name = "cmdZeroOrOne" - Me.cmdZeroOrOne.Size = New System.Drawing.Size(62, 30) + Me.cmdZeroOrOne.Size = New System.Drawing.Size(93, 45) Me.cmdZeroOrOne.TabIndex = 11 Me.cmdZeroOrOne.Text = "? 0 or 1" Me.cmdZeroOrOne.UseVisualStyleBackColor = True @@ -6422,10 +6003,9 @@ Partial Class ucrCalculator 'cmdNumbers ' Me.cmdNumbers.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNumbers.Location = New System.Drawing.Point(246, 45) - Me.cmdNumbers.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNumbers.Location = New System.Drawing.Point(369, 68) Me.cmdNumbers.Name = "cmdNumbers" - Me.cmdNumbers.Size = New System.Drawing.Size(62, 30) + Me.cmdNumbers.Size = New System.Drawing.Size(93, 45) Me.cmdNumbers.TabIndex = 10 Me.cmdNumbers.Text = "{ m,n } " Me.cmdNumbers.UseVisualStyleBackColor = True @@ -6433,10 +6013,9 @@ Partial Class ucrCalculator 'cmdNot1 ' Me.cmdNot1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot1.Location = New System.Drawing.Point(63, 45) - Me.cmdNot1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNot1.Location = New System.Drawing.Point(94, 68) Me.cmdNot1.Name = "cmdNot1" - Me.cmdNot1.Size = New System.Drawing.Size(62, 30) + Me.cmdNot1.Size = New System.Drawing.Size(93, 45) Me.cmdNot1.TabIndex = 8 Me.cmdNot1.Text = "[^ ] not" Me.cmdNot1.UseVisualStyleBackColor = True @@ -6444,10 +6023,9 @@ Partial Class ucrCalculator 'cmdOr2 ' Me.cmdOr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr2.Location = New System.Drawing.Point(185, 45) - Me.cmdOr2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOr2.Location = New System.Drawing.Point(278, 68) Me.cmdOr2.Name = "cmdOr2" - Me.cmdOr2.Size = New System.Drawing.Size(62, 30) + Me.cmdOr2.Size = New System.Drawing.Size(93, 45) Me.cmdOr2.TabIndex = 9 Me.cmdOr2.Text = "{ n} " Me.cmdOr2.UseVisualStyleBackColor = True @@ -6455,10 +6033,9 @@ Partial Class ucrCalculator 'cmdOr1 ' Me.cmdOr1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr1.Location = New System.Drawing.Point(2, 45) - Me.cmdOr1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOr1.Location = New System.Drawing.Point(3, 68) Me.cmdOr1.Name = "cmdOr1" - Me.cmdOr1.Size = New System.Drawing.Size(62, 30) + Me.cmdOr1.Size = New System.Drawing.Size(93, 45) Me.cmdOr1.TabIndex = 7 Me.cmdOr1.Text = "[ ] or" Me.cmdOr1.UseVisualStyleBackColor = True @@ -6466,10 +6043,9 @@ Partial Class ucrCalculator 'cmdSpace ' Me.cmdSpace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpace.Location = New System.Drawing.Point(246, 16) - Me.cmdSpace.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSpace.Location = New System.Drawing.Point(369, 24) Me.cmdSpace.Name = "cmdSpace" - Me.cmdSpace.Size = New System.Drawing.Size(62, 30) + Me.cmdSpace.Size = New System.Drawing.Size(93, 45) Me.cmdSpace.TabIndex = 6 Me.cmdSpace.Text = "\\s space" Me.cmdSpace.UseVisualStyleBackColor = True @@ -6477,10 +6053,9 @@ Partial Class ucrCalculator 'cmdDigit ' Me.cmdDigit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigit.Location = New System.Drawing.Point(185, 16) - Me.cmdDigit.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigit.Location = New System.Drawing.Point(278, 24) Me.cmdDigit.Name = "cmdDigit" - Me.cmdDigit.Size = New System.Drawing.Size(62, 30) + Me.cmdDigit.Size = New System.Drawing.Size(93, 45) Me.cmdDigit.TabIndex = 5 Me.cmdDigit.Text = "\\d digit" Me.cmdDigit.UseVisualStyleBackColor = True @@ -6488,10 +6063,9 @@ Partial Class ucrCalculator 'cmdEnd1 ' Me.cmdEnd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnd1.Location = New System.Drawing.Point(124, 16) - Me.cmdEnd1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEnd1.Location = New System.Drawing.Point(186, 24) Me.cmdEnd1.Name = "cmdEnd1" - Me.cmdEnd1.Size = New System.Drawing.Size(62, 30) + Me.cmdEnd1.Size = New System.Drawing.Size(93, 45) Me.cmdEnd1.TabIndex = 4 Me.cmdEnd1.Text = "$ end" Me.cmdEnd1.UseVisualStyleBackColor = True @@ -6499,10 +6073,9 @@ Partial Class ucrCalculator 'cmdbegin ' Me.cmdbegin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbegin.Location = New System.Drawing.Point(63, 16) - Me.cmdbegin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdbegin.Location = New System.Drawing.Point(94, 24) Me.cmdbegin.Name = "cmdbegin" - Me.cmdbegin.Size = New System.Drawing.Size(62, 30) + Me.cmdbegin.Size = New System.Drawing.Size(93, 45) Me.cmdbegin.TabIndex = 3 Me.cmdbegin.Text = "^ begin" Me.cmdbegin.UseVisualStyleBackColor = True @@ -6510,10 +6083,9 @@ Partial Class ucrCalculator 'cmdAny1 ' Me.cmdAny1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAny1.Location = New System.Drawing.Point(2, 16) - Me.cmdAny1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAny1.Location = New System.Drawing.Point(3, 24) Me.cmdAny1.Name = "cmdAny1" - Me.cmdAny1.Size = New System.Drawing.Size(62, 30) + Me.cmdAny1.Size = New System.Drawing.Size(93, 45) Me.cmdAny1.TabIndex = 2 Me.cmdAny1.Text = ". any" Me.cmdAny1.UseVisualStyleBackColor = True @@ -6546,11 +6118,9 @@ Partial Class ucrCalculator Me.grpComplex.Controls.Add(Me.cmdImaginary) Me.grpComplex.Controls.Add(Me.cmdReal) Me.grpComplex.Controls.Add(Me.cmdComplex) - Me.grpComplex.Location = New System.Drawing.Point(434, 70) - Me.grpComplex.Margin = New System.Windows.Forms.Padding(2) + Me.grpComplex.Location = New System.Drawing.Point(651, 105) Me.grpComplex.Name = "grpComplex" - Me.grpComplex.Padding = New System.Windows.Forms.Padding(2) - Me.grpComplex.Size = New System.Drawing.Size(288, 226) + Me.grpComplex.Size = New System.Drawing.Size(432, 339) Me.grpComplex.TabIndex = 198 Me.grpComplex.TabStop = False Me.grpComplex.Text = "Complex" @@ -6559,10 +6129,9 @@ Partial Class ucrCalculator ' Me.cmdComplexAsin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAsin.Location = New System.Drawing.Point(24, 105) - Me.cmdComplexAsin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexAsin.Location = New System.Drawing.Point(36, 158) Me.cmdComplexAsin.Name = "cmdComplexAsin" - Me.cmdComplexAsin.Size = New System.Drawing.Size(66, 30) + Me.cmdComplexAsin.Size = New System.Drawing.Size(99, 45) Me.cmdComplexAsin.TabIndex = 217 Me.cmdComplexAsin.Text = "asin" Me.cmdComplexAsin.UseVisualStyleBackColor = True @@ -6571,10 +6140,9 @@ Partial Class ucrCalculator ' Me.cmdComplexAtan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAtan.Location = New System.Drawing.Point(158, 105) - Me.cmdComplexAtan.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexAtan.Location = New System.Drawing.Point(237, 158) Me.cmdComplexAtan.Name = "cmdComplexAtan" - Me.cmdComplexAtan.Size = New System.Drawing.Size(66, 30) + Me.cmdComplexAtan.Size = New System.Drawing.Size(99, 45) Me.cmdComplexAtan.TabIndex = 216 Me.cmdComplexAtan.Text = "atan" Me.cmdComplexAtan.UseVisualStyleBackColor = True @@ -6583,10 +6151,9 @@ Partial Class ucrCalculator ' Me.cmdComplexAcos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAcos.Location = New System.Drawing.Point(89, 105) - Me.cmdComplexAcos.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexAcos.Location = New System.Drawing.Point(134, 158) Me.cmdComplexAcos.Name = "cmdComplexAcos" - Me.cmdComplexAcos.Size = New System.Drawing.Size(70, 30) + Me.cmdComplexAcos.Size = New System.Drawing.Size(105, 45) Me.cmdComplexAcos.TabIndex = 215 Me.cmdComplexAcos.Text = "acos" Me.cmdComplexAcos.UseVisualStyleBackColor = True @@ -6595,10 +6162,9 @@ Partial Class ucrCalculator ' Me.cmdAsComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdAsComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsComplex.Location = New System.Drawing.Point(89, 18) - Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAsComplex.Location = New System.Drawing.Point(134, 27) Me.cmdAsComplex.Name = "cmdAsComplex" - Me.cmdAsComplex.Size = New System.Drawing.Size(70, 30) + Me.cmdAsComplex.Size = New System.Drawing.Size(105, 45) Me.cmdAsComplex.TabIndex = 211 Me.cmdAsComplex.Text = "as.complex" Me.cmdAsComplex.UseVisualStyleBackColor = True @@ -6607,10 +6173,9 @@ Partial Class ucrCalculator ' Me.cmdComplexi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexi.Location = New System.Drawing.Point(24, 192) - Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexi.Location = New System.Drawing.Point(36, 288) Me.cmdComplexi.Name = "cmdComplexi" - Me.cmdComplexi.Size = New System.Drawing.Size(66, 30) + Me.cmdComplexi.Size = New System.Drawing.Size(99, 45) Me.cmdComplexi.TabIndex = 210 Me.cmdComplexi.Text = "i" Me.cmdComplexi.UseVisualStyleBackColor = True @@ -6619,10 +6184,9 @@ Partial Class ucrCalculator ' Me.cmdComplexRHelp.AutoSize = True Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) - Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexRHelp.Location = New System.Drawing.Point(285, 288) Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdComplexRHelp.Size = New System.Drawing.Size(135, 45) Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex Me.cmdComplexRHelp.TabIndex = 209 Me.cmdComplexRHelp.Text = "R Help" @@ -6632,10 +6196,9 @@ Partial Class ucrCalculator ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexTanH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTanH.Location = New System.Drawing.Point(158, 134) - Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexTanH.Location = New System.Drawing.Point(237, 201) Me.cmdComplexTanH.Name = "cmdComplexTanH" - Me.cmdComplexTanH.Size = New System.Drawing.Size(66, 30) + Me.cmdComplexTanH.Size = New System.Drawing.Size(99, 45) Me.cmdComplexTanH.TabIndex = 208 Me.cmdComplexTanH.Text = "tanh" Me.cmdComplexTanH.UseVisualStyleBackColor = True @@ -6644,10 +6207,9 @@ Partial Class ucrCalculator ' Me.cmdComplexTan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexTan.Location = New System.Drawing.Point(158, 76) - Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexTan.Location = New System.Drawing.Point(237, 114) Me.cmdComplexTan.Name = "cmdComplexTan" - Me.cmdComplexTan.Size = New System.Drawing.Size(66, 30) + Me.cmdComplexTan.Size = New System.Drawing.Size(99, 45) Me.cmdComplexTan.TabIndex = 207 Me.cmdComplexTan.Text = "tan" Me.cmdComplexTan.UseVisualStyleBackColor = True @@ -6656,10 +6218,9 @@ Partial Class ucrCalculator ' Me.cmdComplexPi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexPi.Location = New System.Drawing.Point(223, 105) - Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexPi.Location = New System.Drawing.Point(334, 158) Me.cmdComplexPi.Name = "cmdComplexPi" - Me.cmdComplexPi.Size = New System.Drawing.Size(62, 30) + Me.cmdComplexPi.Size = New System.Drawing.Size(94, 45) Me.cmdComplexPi.TabIndex = 206 Me.cmdComplexPi.Text = "pi" Me.cmdComplexPi.UseVisualStyleBackColor = True @@ -6668,10 +6229,9 @@ Partial Class ucrCalculator ' Me.cmdComplexDeg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexDeg.Location = New System.Drawing.Point(223, 76) - Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexDeg.Location = New System.Drawing.Point(334, 114) Me.cmdComplexDeg.Name = "cmdComplexDeg" - Me.cmdComplexDeg.Size = New System.Drawing.Size(63, 30) + Me.cmdComplexDeg.Size = New System.Drawing.Size(94, 45) Me.cmdComplexDeg.TabIndex = 205 Me.cmdComplexDeg.Text = "deg" Me.cmdComplexDeg.UseVisualStyleBackColor = True @@ -6680,10 +6240,9 @@ Partial Class ucrCalculator ' Me.cmdComplexRad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRad.Location = New System.Drawing.Point(223, 47) - Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexRad.Location = New System.Drawing.Point(334, 70) Me.cmdComplexRad.Name = "cmdComplexRad" - Me.cmdComplexRad.Size = New System.Drawing.Size(63, 30) + Me.cmdComplexRad.Size = New System.Drawing.Size(94, 45) Me.cmdComplexRad.TabIndex = 204 Me.cmdComplexRad.Text = "rad" Me.cmdComplexRad.UseVisualStyleBackColor = True @@ -6692,10 +6251,9 @@ Partial Class ucrCalculator ' Me.cmdComplexSignif.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSignif.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSignif.Location = New System.Drawing.Point(158, 163) - Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexSignif.Location = New System.Drawing.Point(237, 244) Me.cmdComplexSignif.Name = "cmdComplexSignif" - Me.cmdComplexSignif.Size = New System.Drawing.Size(66, 30) + Me.cmdComplexSignif.Size = New System.Drawing.Size(99, 45) Me.cmdComplexSignif.TabIndex = 203 Me.cmdComplexSignif.Text = "signif" Me.cmdComplexSignif.UseVisualStyleBackColor = True @@ -6704,10 +6262,9 @@ Partial Class ucrCalculator ' Me.cmdComplexCosH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCosH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCosH.Location = New System.Drawing.Point(89, 134) - Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexCosH.Location = New System.Drawing.Point(134, 201) Me.cmdComplexCosH.Name = "cmdComplexCosH" - Me.cmdComplexCosH.Size = New System.Drawing.Size(70, 30) + Me.cmdComplexCosH.Size = New System.Drawing.Size(105, 45) Me.cmdComplexCosH.TabIndex = 202 Me.cmdComplexCosH.Text = "cosh" Me.cmdComplexCosH.UseVisualStyleBackColor = True @@ -6716,10 +6273,9 @@ Partial Class ucrCalculator ' Me.cmdComplexSinH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSinH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSinH.Location = New System.Drawing.Point(24, 134) - Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexSinH.Location = New System.Drawing.Point(36, 201) Me.cmdComplexSinH.Name = "cmdComplexSinH" - Me.cmdComplexSinH.Size = New System.Drawing.Size(66, 30) + Me.cmdComplexSinH.Size = New System.Drawing.Size(99, 45) Me.cmdComplexSinH.TabIndex = 201 Me.cmdComplexSinH.Text = "sinh" Me.cmdComplexSinH.UseVisualStyleBackColor = True @@ -6728,10 +6284,9 @@ Partial Class ucrCalculator ' Me.cmdComplexCos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexCos.Location = New System.Drawing.Point(89, 76) - Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexCos.Location = New System.Drawing.Point(134, 114) Me.cmdComplexCos.Name = "cmdComplexCos" - Me.cmdComplexCos.Size = New System.Drawing.Size(70, 30) + Me.cmdComplexCos.Size = New System.Drawing.Size(105, 45) Me.cmdComplexCos.TabIndex = 200 Me.cmdComplexCos.Text = "cos" Me.cmdComplexCos.UseVisualStyleBackColor = True @@ -6740,10 +6295,9 @@ Partial Class ucrCalculator ' Me.cmdComplexSin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSin.Location = New System.Drawing.Point(24, 76) - Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexSin.Location = New System.Drawing.Point(36, 114) Me.cmdComplexSin.Name = "cmdComplexSin" - Me.cmdComplexSin.Size = New System.Drawing.Size(66, 30) + Me.cmdComplexSin.Size = New System.Drawing.Size(99, 45) Me.cmdComplexSin.TabIndex = 199 Me.cmdComplexSin.Text = "sin" Me.cmdComplexSin.UseVisualStyleBackColor = True @@ -6752,10 +6306,9 @@ Partial Class ucrCalculator ' Me.cmdComplexExp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexExp.Location = New System.Drawing.Point(223, 134) - Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexExp.Location = New System.Drawing.Point(334, 201) Me.cmdComplexExp.Name = "cmdComplexExp" - Me.cmdComplexExp.Size = New System.Drawing.Size(63, 30) + Me.cmdComplexExp.Size = New System.Drawing.Size(94, 45) Me.cmdComplexExp.TabIndex = 192 Me.cmdComplexExp.Text = "exp" Me.cmdComplexExp.UseVisualStyleBackColor = True @@ -6764,10 +6317,9 @@ Partial Class ucrCalculator ' Me.cmdComplexRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexRound.Location = New System.Drawing.Point(89, 163) - Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexRound.Location = New System.Drawing.Point(134, 244) Me.cmdComplexRound.Name = "cmdComplexRound" - Me.cmdComplexRound.Size = New System.Drawing.Size(70, 30) + Me.cmdComplexRound.Size = New System.Drawing.Size(105, 45) Me.cmdComplexRound.TabIndex = 191 Me.cmdComplexRound.Text = "round" Me.cmdComplexRound.UseVisualStyleBackColor = True @@ -6776,10 +6328,9 @@ Partial Class ucrCalculator ' Me.cmdComplexLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexLog.Location = New System.Drawing.Point(223, 163) - Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexLog.Location = New System.Drawing.Point(334, 244) Me.cmdComplexLog.Name = "cmdComplexLog" - Me.cmdComplexLog.Size = New System.Drawing.Size(63, 30) + Me.cmdComplexLog.Size = New System.Drawing.Size(94, 45) Me.cmdComplexLog.TabIndex = 190 Me.cmdComplexLog.Text = "log" Me.cmdComplexLog.UseVisualStyleBackColor = True @@ -6788,10 +6339,9 @@ Partial Class ucrCalculator ' Me.cmdComplexSqrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexSqrt.Location = New System.Drawing.Point(24, 163) - Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexSqrt.Location = New System.Drawing.Point(36, 244) Me.cmdComplexSqrt.Name = "cmdComplexSqrt" - Me.cmdComplexSqrt.Size = New System.Drawing.Size(66, 30) + Me.cmdComplexSqrt.Size = New System.Drawing.Size(99, 45) Me.cmdComplexSqrt.TabIndex = 189 Me.cmdComplexSqrt.Text = "sqrt" Me.cmdComplexSqrt.UseVisualStyleBackColor = True @@ -6800,10 +6350,9 @@ Partial Class ucrCalculator ' Me.cmdConjugate.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdConjugate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdConjugate.Location = New System.Drawing.Point(158, 47) - Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2) + Me.cmdConjugate.Location = New System.Drawing.Point(237, 70) Me.cmdConjugate.Name = "cmdConjugate" - Me.cmdConjugate.Size = New System.Drawing.Size(66, 30) + Me.cmdConjugate.Size = New System.Drawing.Size(99, 45) Me.cmdConjugate.TabIndex = 188 Me.cmdConjugate.Text = "conjugate" Me.cmdConjugate.UseVisualStyleBackColor = True @@ -6812,10 +6361,9 @@ Partial Class ucrCalculator ' Me.cmdArg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdArg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdArg.Location = New System.Drawing.Point(89, 47) - Me.cmdArg.Margin = New System.Windows.Forms.Padding(2) + Me.cmdArg.Location = New System.Drawing.Point(134, 70) Me.cmdArg.Name = "cmdArg" - Me.cmdArg.Size = New System.Drawing.Size(70, 30) + Me.cmdArg.Size = New System.Drawing.Size(105, 45) Me.cmdArg.TabIndex = 187 Me.cmdArg.Text = "arg" Me.cmdArg.UseVisualStyleBackColor = True @@ -6824,10 +6372,9 @@ Partial Class ucrCalculator ' Me.cmdMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdMod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMod.Location = New System.Drawing.Point(24, 47) - Me.cmdMod.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMod.Location = New System.Drawing.Point(36, 70) Me.cmdMod.Name = "cmdMod" - Me.cmdMod.Size = New System.Drawing.Size(66, 30) + Me.cmdMod.Size = New System.Drawing.Size(99, 45) Me.cmdMod.TabIndex = 186 Me.cmdMod.Text = "mod" Me.cmdMod.UseVisualStyleBackColor = True @@ -6836,10 +6383,9 @@ Partial Class ucrCalculator ' Me.cmdImaginary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdImaginary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdImaginary.Location = New System.Drawing.Point(223, 18) - Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(2) + Me.cmdImaginary.Location = New System.Drawing.Point(334, 27) Me.cmdImaginary.Name = "cmdImaginary" - Me.cmdImaginary.Size = New System.Drawing.Size(63, 30) + Me.cmdImaginary.Size = New System.Drawing.Size(94, 45) Me.cmdImaginary.TabIndex = 185 Me.cmdImaginary.Text = "imaginary" Me.cmdImaginary.UseVisualStyleBackColor = True @@ -6848,10 +6394,9 @@ Partial Class ucrCalculator ' Me.cmdReal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdReal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReal.Location = New System.Drawing.Point(158, 18) - Me.cmdReal.Margin = New System.Windows.Forms.Padding(2) + Me.cmdReal.Location = New System.Drawing.Point(237, 27) Me.cmdReal.Name = "cmdReal" - Me.cmdReal.Size = New System.Drawing.Size(66, 30) + Me.cmdReal.Size = New System.Drawing.Size(99, 45) Me.cmdReal.TabIndex = 177 Me.cmdReal.Text = "real" Me.cmdReal.UseVisualStyleBackColor = True @@ -6860,10 +6405,9 @@ Partial Class ucrCalculator ' Me.cmdComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplex.Location = New System.Drawing.Point(24, 18) - Me.cmdComplex.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplex.Location = New System.Drawing.Point(36, 27) Me.cmdComplex.Name = "cmdComplex" - Me.cmdComplex.Size = New System.Drawing.Size(66, 30) + Me.cmdComplex.Size = New System.Drawing.Size(99, 45) Me.cmdComplex.TabIndex = 176 Me.cmdComplex.Text = "complex" Me.cmdComplex.UseVisualStyleBackColor = True @@ -6873,18 +6417,18 @@ Partial Class ucrCalculator Me.ContextMenuStripTxtString.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripTxtString.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TxTStringrToolStripMenuItem, Me.TxTBaseToolStripMenuItem}) Me.ContextMenuStripTxtString.Name = "ContextMenuStrip1" - Me.ContextMenuStripTxtString.Size = New System.Drawing.Size(110, 48) + Me.ContextMenuStripTxtString.Size = New System.Drawing.Size(137, 68) ' 'TxTStringrToolStripMenuItem ' Me.TxTStringrToolStripMenuItem.Name = "TxTStringrToolStripMenuItem" - Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(109, 22) + Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(136, 32) Me.TxTStringrToolStripMenuItem.Text = "Stringr" ' 'TxTBaseToolStripMenuItem ' Me.TxTBaseToolStripMenuItem.Name = "TxTBaseToolStripMenuItem" - Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 22) + Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(136, 32) Me.TxTBaseToolStripMenuItem.Text = "base" ' 'ContextMenuStripWakefield @@ -6892,12 +6436,12 @@ Partial Class ucrCalculator Me.ContextMenuStripWakefield.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripWakefield.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WakefieldToolStripMenuItem}) Me.ContextMenuStripWakefield.Name = "ContextMenuStrip1" - Me.ContextMenuStripWakefield.Size = New System.Drawing.Size(125, 26) + Me.ContextMenuStripWakefield.Size = New System.Drawing.Size(159, 36) ' 'WakefieldToolStripMenuItem ' Me.WakefieldToolStripMenuItem.Name = "WakefieldToolStripMenuItem" - Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(124, 22) + Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(158, 32) Me.WakefieldToolStripMenuItem.Text = "wakefield" ' 'ContextMenuStripList @@ -6905,24 +6449,24 @@ Partial Class ucrCalculator Me.ContextMenuStripList.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripList.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListBaseToolStripMenuItem, Me.ListStatsToolStripMenuItem, Me.ListStatipToolStripMenuItem}) Me.ContextMenuStripList.Name = "ContextMenuStrip1" - Me.ContextMenuStripList.Size = New System.Drawing.Size(104, 70) + Me.ContextMenuStripList.Size = New System.Drawing.Size(129, 100) ' 'ListBaseToolStripMenuItem ' Me.ListBaseToolStripMenuItem.Name = "ListBaseToolStripMenuItem" - Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(103, 22) + Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(128, 32) Me.ListBaseToolStripMenuItem.Text = "base" ' 'ListStatsToolStripMenuItem ' Me.ListStatsToolStripMenuItem.Name = "ListStatsToolStripMenuItem" - Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(103, 22) + Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(128, 32) Me.ListStatsToolStripMenuItem.Text = "stats" ' 'ListStatipToolStripMenuItem ' Me.ListStatipToolStripMenuItem.Name = "ListStatipToolStripMenuItem" - Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(103, 22) + Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(128, 32) Me.ListStatipToolStripMenuItem.Text = "statip" ' 'grpList @@ -6954,11 +6498,9 @@ Partial Class ucrCalculator Me.grpList.Controls.Add(Me.cmdListSumd) Me.grpList.Controls.Add(Me.cmdListMissing) Me.grpList.Controls.Add(Me.GroupBox1) - Me.grpList.Location = New System.Drawing.Point(438, 52) - Me.grpList.Margin = New System.Windows.Forms.Padding(2) + Me.grpList.Location = New System.Drawing.Point(657, 78) Me.grpList.Name = "grpList" - Me.grpList.Padding = New System.Windows.Forms.Padding(2) - Me.grpList.Size = New System.Drawing.Size(316, 366) + Me.grpList.Size = New System.Drawing.Size(474, 549) Me.grpList.TabIndex = 214 Me.grpList.TabStop = False Me.grpList.Text = "Summary" @@ -6975,11 +6517,9 @@ Partial Class ucrCalculator Me.grpMathBloc.Controls.Add(Me.cmdListMultiply) Me.grpMathBloc.Controls.Add(Me.cmdListSubtract) Me.grpMathBloc.Controls.Add(Me.cmdListAdd) - Me.grpMathBloc.Location = New System.Drawing.Point(2, 162) - Me.grpMathBloc.Margin = New System.Windows.Forms.Padding(2) + Me.grpMathBloc.Location = New System.Drawing.Point(3, 243) Me.grpMathBloc.Name = "grpMathBloc" - Me.grpMathBloc.Padding = New System.Windows.Forms.Padding(2) - Me.grpMathBloc.Size = New System.Drawing.Size(310, 84) + Me.grpMathBloc.Size = New System.Drawing.Size(465, 126) Me.grpMathBloc.TabIndex = 199 Me.grpMathBloc.TabStop = False Me.grpMathBloc.Text = "Maths" @@ -6988,10 +6528,9 @@ Partial Class ucrCalculator ' Me.cmdListSQRT.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSQRT.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSQRT.Location = New System.Drawing.Point(246, 43) - Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSQRT.Location = New System.Drawing.Point(369, 64) Me.cmdListSQRT.Name = "cmdListSQRT" - Me.cmdListSQRT.Size = New System.Drawing.Size(58, 30) + Me.cmdListSQRT.Size = New System.Drawing.Size(87, 45) Me.cmdListSQRT.TabIndex = 181 Me.cmdListSQRT.Text = "sqrt" Me.cmdListSQRT.UseVisualStyleBackColor = True @@ -7000,10 +6539,9 @@ Partial Class ucrCalculator ' Me.cmdListPercent2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListPercent2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListPercent2.Location = New System.Drawing.Point(187, 43) - Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListPercent2.Location = New System.Drawing.Point(280, 64) Me.cmdListPercent2.Name = "cmdListPercent2" - Me.cmdListPercent2.Size = New System.Drawing.Size(60, 30) + Me.cmdListPercent2.Size = New System.Drawing.Size(90, 45) Me.cmdListPercent2.TabIndex = 180 Me.cmdListPercent2.Text = "percent2" Me.cmdListPercent2.UseVisualStyleBackColor = True @@ -7012,10 +6550,9 @@ Partial Class ucrCalculator ' Me.cmdListPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListPercent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListPercent.Location = New System.Drawing.Point(128, 43) - Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListPercent.Location = New System.Drawing.Point(192, 64) Me.cmdListPercent.Name = "cmdListPercent" - Me.cmdListPercent.Size = New System.Drawing.Size(60, 30) + Me.cmdListPercent.Size = New System.Drawing.Size(90, 45) Me.cmdListPercent.TabIndex = 179 Me.cmdListPercent.Text = "percent" Me.cmdListPercent.UseVisualStyleBackColor = True @@ -7024,10 +6561,9 @@ Partial Class ucrCalculator ' Me.cmdListProportion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListProportion.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListProportion.Location = New System.Drawing.Point(59, 43) - Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListProportion.Location = New System.Drawing.Point(88, 64) Me.cmdListProportion.Name = "cmdListProportion" - Me.cmdListProportion.Size = New System.Drawing.Size(70, 30) + Me.cmdListProportion.Size = New System.Drawing.Size(105, 45) Me.cmdListProportion.TabIndex = 178 Me.cmdListProportion.Text = "proportion" Me.cmdListProportion.UseVisualStyleBackColor = True @@ -7036,10 +6572,9 @@ Partial Class ucrCalculator ' Me.cmdListRound.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRound.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRound.Location = New System.Drawing.Point(2, 43) - Me.cmdListRound.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListRound.Location = New System.Drawing.Point(3, 64) Me.cmdListRound.Name = "cmdListRound" - Me.cmdListRound.Size = New System.Drawing.Size(58, 30) + Me.cmdListRound.Size = New System.Drawing.Size(87, 45) Me.cmdListRound.TabIndex = 177 Me.cmdListRound.Text = "round" Me.cmdListRound.UseVisualStyleBackColor = True @@ -7048,10 +6583,9 @@ Partial Class ucrCalculator ' Me.cmdListSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSquare.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSquare.Location = New System.Drawing.Point(246, 14) - Me.cmdListSquare.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSquare.Location = New System.Drawing.Point(369, 21) Me.cmdListSquare.Name = "cmdListSquare" - Me.cmdListSquare.Size = New System.Drawing.Size(58, 30) + Me.cmdListSquare.Size = New System.Drawing.Size(87, 45) Me.cmdListSquare.TabIndex = 176 Me.cmdListSquare.Text = "power (^)" Me.cmdListSquare.UseVisualStyleBackColor = True @@ -7060,10 +6594,9 @@ Partial Class ucrCalculator ' Me.cmdListDivide.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDivide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDivide.Location = New System.Drawing.Point(187, 14) - Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDivide.Location = New System.Drawing.Point(280, 21) Me.cmdListDivide.Name = "cmdListDivide" - Me.cmdListDivide.Size = New System.Drawing.Size(60, 30) + Me.cmdListDivide.Size = New System.Drawing.Size(90, 45) Me.cmdListDivide.TabIndex = 175 Me.cmdListDivide.Text = "divide (/)" Me.cmdListDivide.UseVisualStyleBackColor = True @@ -7072,10 +6605,9 @@ Partial Class ucrCalculator ' Me.cmdListMultiply.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMultiply.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMultiply.Location = New System.Drawing.Point(128, 14) - Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMultiply.Location = New System.Drawing.Point(192, 21) Me.cmdListMultiply.Name = "cmdListMultiply" - Me.cmdListMultiply.Size = New System.Drawing.Size(60, 30) + Me.cmdListMultiply.Size = New System.Drawing.Size(90, 45) Me.cmdListMultiply.TabIndex = 174 Me.cmdListMultiply.Text = "times (*)" Me.cmdListMultiply.UseVisualStyleBackColor = True @@ -7084,10 +6616,9 @@ Partial Class ucrCalculator ' Me.cmdListSubtract.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSubtract.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSubtract.Location = New System.Drawing.Point(59, 14) - Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSubtract.Location = New System.Drawing.Point(88, 21) Me.cmdListSubtract.Name = "cmdListSubtract" - Me.cmdListSubtract.Size = New System.Drawing.Size(70, 30) + Me.cmdListSubtract.Size = New System.Drawing.Size(105, 45) Me.cmdListSubtract.TabIndex = 173 Me.cmdListSubtract.Text = " subtract (-)" Me.cmdListSubtract.UseVisualStyleBackColor = True @@ -7096,10 +6627,9 @@ Partial Class ucrCalculator ' Me.cmdListAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListAdd.Location = New System.Drawing.Point(2, 14) - Me.cmdListAdd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListAdd.Location = New System.Drawing.Point(3, 21) Me.cmdListAdd.Name = "cmdListAdd" - Me.cmdListAdd.Size = New System.Drawing.Size(58, 30) + Me.cmdListAdd.Size = New System.Drawing.Size(87, 45) Me.cmdListAdd.TabIndex = 172 Me.cmdListAdd.Text = "sum (+)" Me.cmdListAdd.UseVisualStyleBackColor = True @@ -7108,10 +6638,9 @@ Partial Class ucrCalculator ' Me.cmdListNth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListNth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListNth.Location = New System.Drawing.Point(246, 101) - Me.cmdListNth.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListNth.Location = New System.Drawing.Point(369, 152) Me.cmdListNth.Name = "cmdListNth" - Me.cmdListNth.Size = New System.Drawing.Size(62, 30) + Me.cmdListNth.Size = New System.Drawing.Size(93, 45) Me.cmdListNth.TabIndex = 176 Me.cmdListNth.Text = "nth" Me.cmdListNth.UseVisualStyleBackColor = True @@ -7120,10 +6649,9 @@ Partial Class ucrCalculator ' Me.cmdListLast.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLast.Location = New System.Drawing.Point(185, 101) - Me.cmdListLast.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListLast.Location = New System.Drawing.Point(278, 152) Me.cmdListLast.Name = "cmdListLast" - Me.cmdListLast.Size = New System.Drawing.Size(62, 30) + Me.cmdListLast.Size = New System.Drawing.Size(93, 45) Me.cmdListLast.TabIndex = 175 Me.cmdListLast.Text = "last" Me.cmdListLast.UseVisualStyleBackColor = True @@ -7132,10 +6660,9 @@ Partial Class ucrCalculator ' Me.cmdListFirst.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListFirst.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListFirst.Location = New System.Drawing.Point(124, 101) - Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListFirst.Location = New System.Drawing.Point(186, 152) Me.cmdListFirst.Name = "cmdListFirst" - Me.cmdListFirst.Size = New System.Drawing.Size(62, 30) + Me.cmdListFirst.Size = New System.Drawing.Size(93, 45) Me.cmdListFirst.TabIndex = 174 Me.cmdListFirst.Text = "first" Me.cmdListFirst.UseVisualStyleBackColor = True @@ -7144,10 +6671,9 @@ Partial Class ucrCalculator ' Me.cmdListAnyDup.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListAnyDup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListAnyDup.Location = New System.Drawing.Point(63, 101) - Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListAnyDup.Location = New System.Drawing.Point(94, 152) Me.cmdListAnyDup.Name = "cmdListAnyDup" - Me.cmdListAnyDup.Size = New System.Drawing.Size(62, 30) + Me.cmdListAnyDup.Size = New System.Drawing.Size(93, 45) Me.cmdListAnyDup.TabIndex = 173 Me.cmdListAnyDup.Text = "anydup" Me.cmdListAnyDup.UseVisualStyleBackColor = True @@ -7156,10 +6682,9 @@ Partial Class ucrCalculator ' Me.cmdListDistinct.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDistinct.Location = New System.Drawing.Point(2, 101) - Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDistinct.Location = New System.Drawing.Point(3, 152) Me.cmdListDistinct.Name = "cmdListDistinct" - Me.cmdListDistinct.Size = New System.Drawing.Size(62, 30) + Me.cmdListDistinct.Size = New System.Drawing.Size(93, 45) Me.cmdListDistinct.TabIndex = 172 Me.cmdListDistinct.Text = "distinct" Me.cmdListDistinct.UseVisualStyleBackColor = True @@ -7168,10 +6693,9 @@ Partial Class ucrCalculator ' Me.cmdListIQR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListIQR.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListIQR.Location = New System.Drawing.Point(246, 72) - Me.cmdListIQR.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListIQR.Location = New System.Drawing.Point(369, 108) Me.cmdListIQR.Name = "cmdListIQR" - Me.cmdListIQR.Size = New System.Drawing.Size(62, 30) + Me.cmdListIQR.Size = New System.Drawing.Size(93, 45) Me.cmdListIQR.TabIndex = 171 Me.cmdListIQR.Text = "IQR" Me.cmdListIQR.UseVisualStyleBackColor = True @@ -7180,10 +6704,9 @@ Partial Class ucrCalculator ' Me.cmdListMad.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMad.Location = New System.Drawing.Point(185, 72) - Me.cmdListMad.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMad.Location = New System.Drawing.Point(278, 108) Me.cmdListMad.Name = "cmdListMad" - Me.cmdListMad.Size = New System.Drawing.Size(62, 30) + Me.cmdListMad.Size = New System.Drawing.Size(93, 45) Me.cmdListMad.TabIndex = 170 Me.cmdListMad.Text = "mad" Me.cmdListMad.UseVisualStyleBackColor = True @@ -7192,10 +6715,9 @@ Partial Class ucrCalculator ' Me.cmdListSd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSd.Location = New System.Drawing.Point(124, 72) - Me.cmdListSd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSd.Location = New System.Drawing.Point(186, 108) Me.cmdListSd.Name = "cmdListSd" - Me.cmdListSd.Size = New System.Drawing.Size(62, 30) + Me.cmdListSd.Size = New System.Drawing.Size(93, 45) Me.cmdListSd.TabIndex = 169 Me.cmdListSd.Text = "sd" Me.cmdListSd.UseVisualStyleBackColor = True @@ -7204,10 +6726,9 @@ Partial Class ucrCalculator ' Me.cmdListVar.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListVar.Location = New System.Drawing.Point(63, 72) - Me.cmdListVar.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListVar.Location = New System.Drawing.Point(94, 108) Me.cmdListVar.Name = "cmdListVar" - Me.cmdListVar.Size = New System.Drawing.Size(62, 30) + Me.cmdListVar.Size = New System.Drawing.Size(93, 45) Me.cmdListVar.TabIndex = 168 Me.cmdListVar.Text = "var" Me.cmdListVar.UseVisualStyleBackColor = True @@ -7216,10 +6737,9 @@ Partial Class ucrCalculator ' Me.cmdListSsq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSsq.Location = New System.Drawing.Point(2, 72) - Me.cmdListSsq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSsq.Location = New System.Drawing.Point(3, 108) Me.cmdListSsq.Name = "cmdListSsq" - Me.cmdListSsq.Size = New System.Drawing.Size(62, 30) + Me.cmdListSsq.Size = New System.Drawing.Size(93, 45) Me.cmdListSsq.TabIndex = 167 Me.cmdListSsq.Text = "ssq" Me.cmdListSsq.UseVisualStyleBackColor = True @@ -7228,10 +6748,9 @@ Partial Class ucrCalculator ' Me.cmdListMode1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMode1.Location = New System.Drawing.Point(246, 43) - Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMode1.Location = New System.Drawing.Point(369, 64) Me.cmdListMode1.Name = "cmdListMode1" - Me.cmdListMode1.Size = New System.Drawing.Size(62, 30) + Me.cmdListMode1.Size = New System.Drawing.Size(93, 45) Me.cmdListMode1.TabIndex = 166 Me.cmdListMode1.Text = "mode1" Me.cmdListMode1.UseVisualStyleBackColor = True @@ -7240,10 +6759,9 @@ Partial Class ucrCalculator ' Me.cmdListMax.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMax.Location = New System.Drawing.Point(246, 14) - Me.cmdListMax.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMax.Location = New System.Drawing.Point(369, 21) Me.cmdListMax.Name = "cmdListMax" - Me.cmdListMax.Size = New System.Drawing.Size(62, 30) + Me.cmdListMax.Size = New System.Drawing.Size(93, 45) Me.cmdListMax.TabIndex = 165 Me.cmdListMax.Text = "max" Me.cmdListMax.UseVisualStyleBackColor = True @@ -7252,10 +6770,9 @@ Partial Class ucrCalculator ' Me.cmdListFivenum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListFivenum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListFivenum.Location = New System.Drawing.Point(185, 130) - Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListFivenum.Location = New System.Drawing.Point(278, 195) Me.cmdListFivenum.Name = "cmdListFivenum" - Me.cmdListFivenum.Size = New System.Drawing.Size(62, 30) + Me.cmdListFivenum.Size = New System.Drawing.Size(93, 45) Me.cmdListFivenum.TabIndex = 163 Me.cmdListFivenum.Tag = "" Me.cmdListFivenum.Text = "fivenum" @@ -7265,10 +6782,9 @@ Partial Class ucrCalculator ' Me.cmdListMode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMode.Location = New System.Drawing.Point(185, 43) - Me.cmdListMode.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMode.Location = New System.Drawing.Point(278, 64) Me.cmdListMode.Name = "cmdListMode" - Me.cmdListMode.Size = New System.Drawing.Size(62, 30) + Me.cmdListMode.Size = New System.Drawing.Size(93, 45) Me.cmdListMode.TabIndex = 162 Me.cmdListMode.Text = "mode" Me.cmdListMode.UseVisualStyleBackColor = True @@ -7277,10 +6793,9 @@ Partial Class ucrCalculator ' Me.cmdListQuantile.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListQuantile.Location = New System.Drawing.Point(2, 130) - Me.cmdListQuantile.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListQuantile.Location = New System.Drawing.Point(3, 195) Me.cmdListQuantile.Name = "cmdListQuantile" - Me.cmdListQuantile.Size = New System.Drawing.Size(62, 30) + Me.cmdListQuantile.Size = New System.Drawing.Size(93, 45) Me.cmdListQuantile.TabIndex = 154 Me.cmdListQuantile.Text = "quantile" Me.cmdListQuantile.UseVisualStyleBackColor = True @@ -7289,10 +6804,9 @@ Partial Class ucrCalculator ' Me.cmdListDigitsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDigitsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDigitsum.Location = New System.Drawing.Point(63, 130) - Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDigitsum.Location = New System.Drawing.Point(94, 195) Me.cmdListDigitsum.Name = "cmdListDigitsum" - Me.cmdListDigitsum.Size = New System.Drawing.Size(62, 30) + Me.cmdListDigitsum.Size = New System.Drawing.Size(93, 45) Me.cmdListDigitsum.TabIndex = 161 Me.cmdListDigitsum.Text = "digitsum" Me.cmdListDigitsum.UseVisualStyleBackColor = True @@ -7301,10 +6815,9 @@ Partial Class ucrCalculator ' Me.cmdListMin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMin.Location = New System.Drawing.Point(185, 14) - Me.cmdListMin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMin.Location = New System.Drawing.Point(278, 21) Me.cmdListMin.Name = "cmdListMin" - Me.cmdListMin.Size = New System.Drawing.Size(62, 30) + Me.cmdListMin.Size = New System.Drawing.Size(93, 45) Me.cmdListMin.TabIndex = 156 Me.cmdListMin.Text = "min" Me.cmdListMin.UseVisualStyleBackColor = True @@ -7313,10 +6826,9 @@ Partial Class ucrCalculator ' Me.cmdListProd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListProd.Location = New System.Drawing.Point(124, 14) - Me.cmdListProd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListProd.Location = New System.Drawing.Point(186, 21) Me.cmdListProd.Name = "cmdListProd" - Me.cmdListProd.Size = New System.Drawing.Size(62, 30) + Me.cmdListProd.Size = New System.Drawing.Size(93, 45) Me.cmdListProd.TabIndex = 155 Me.cmdListProd.Text = "prod" Me.cmdListProd.UseVisualStyleBackColor = True @@ -7325,10 +6837,9 @@ Partial Class ucrCalculator ' Me.cmdListLength.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLength.Location = New System.Drawing.Point(2, 14) - Me.cmdListLength.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListLength.Location = New System.Drawing.Point(3, 21) Me.cmdListLength.Name = "cmdListLength" - Me.cmdListLength.Size = New System.Drawing.Size(62, 30) + Me.cmdListLength.Size = New System.Drawing.Size(93, 45) Me.cmdListLength.TabIndex = 148 Me.cmdListLength.Text = "length" Me.cmdListLength.UseVisualStyleBackColor = True @@ -7337,10 +6848,9 @@ Partial Class ucrCalculator ' Me.cmdListMedian.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMedian.Location = New System.Drawing.Point(124, 43) - Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMedian.Location = New System.Drawing.Point(186, 64) Me.cmdListMedian.Name = "cmdListMedian" - Me.cmdListMedian.Size = New System.Drawing.Size(62, 30) + Me.cmdListMedian.Size = New System.Drawing.Size(93, 45) Me.cmdListMedian.TabIndex = 160 Me.cmdListMedian.Text = "median" Me.cmdListMedian.UseVisualStyleBackColor = True @@ -7349,10 +6859,9 @@ Partial Class ucrCalculator ' Me.cmdListMean.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMean.Location = New System.Drawing.Point(63, 43) - Me.cmdListMean.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMean.Location = New System.Drawing.Point(94, 64) Me.cmdListMean.Name = "cmdListMean" - Me.cmdListMean.Size = New System.Drawing.Size(62, 30) + Me.cmdListMean.Size = New System.Drawing.Size(93, 45) Me.cmdListMean.TabIndex = 158 Me.cmdListMean.Text = "mean" Me.cmdListMean.UseVisualStyleBackColor = True @@ -7361,10 +6870,9 @@ Partial Class ucrCalculator ' Me.cmdListRange.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRange.Location = New System.Drawing.Point(2, 43) - Me.cmdListRange.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListRange.Location = New System.Drawing.Point(3, 64) Me.cmdListRange.Name = "cmdListRange" - Me.cmdListRange.Size = New System.Drawing.Size(62, 30) + Me.cmdListRange.Size = New System.Drawing.Size(93, 45) Me.cmdListRange.TabIndex = 157 Me.cmdListRange.Text = "range" Me.cmdListRange.UseVisualStyleBackColor = True @@ -7373,10 +6881,9 @@ Partial Class ucrCalculator ' Me.cmdListSum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSum.Location = New System.Drawing.Point(63, 14) - Me.cmdListSum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSum.Location = New System.Drawing.Point(94, 21) Me.cmdListSum.Name = "cmdListSum" - Me.cmdListSum.Size = New System.Drawing.Size(62, 30) + Me.cmdListSum.Size = New System.Drawing.Size(93, 45) Me.cmdListSum.TabIndex = 153 Me.cmdListSum.Text = "sum" Me.cmdListSum.UseVisualStyleBackColor = True @@ -7385,10 +6892,9 @@ Partial Class ucrCalculator ' Me.cmdListSumd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSumd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSumd.Location = New System.Drawing.Point(124, 130) - Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSumd.Location = New System.Drawing.Point(186, 195) Me.cmdListSumd.Name = "cmdListSumd" - Me.cmdListSumd.Size = New System.Drawing.Size(62, 30) + Me.cmdListSumd.Size = New System.Drawing.Size(93, 45) Me.cmdListSumd.TabIndex = 149 Me.cmdListSumd.Text = "sumd" Me.cmdListSumd.UseVisualStyleBackColor = True @@ -7397,10 +6903,9 @@ Partial Class ucrCalculator ' Me.cmdListMissing.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMissing.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMissing.Location = New System.Drawing.Point(246, 130) - Me.cmdListMissing.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMissing.Location = New System.Drawing.Point(369, 195) Me.cmdListMissing.Name = "cmdListMissing" - Me.cmdListMissing.Size = New System.Drawing.Size(62, 30) + Me.cmdListMissing.Size = New System.Drawing.Size(93, 45) Me.cmdListMissing.TabIndex = 164 Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True @@ -7422,11 +6927,9 @@ Partial Class ucrCalculator Me.GroupBox1.Controls.Add(Me.cmdListLag) Me.GroupBox1.Controls.Add(Me.cmdListRank) Me.GroupBox1.Controls.Add(Me.cmdListSort) - Me.GroupBox1.Location = New System.Drawing.Point(4, 248) - Me.GroupBox1.Margin = New System.Windows.Forms.Padding(2) + Me.GroupBox1.Location = New System.Drawing.Point(6, 372) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Padding = New System.Windows.Forms.Padding(2) - Me.GroupBox1.Size = New System.Drawing.Size(310, 110) + Me.GroupBox1.Size = New System.Drawing.Size(465, 165) Me.GroupBox1.TabIndex = 200 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Transform" @@ -7435,10 +6938,9 @@ Partial Class ucrCalculator ' Me.cmdListDuplicated.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDuplicated.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDuplicated.Location = New System.Drawing.Point(242, 72) - Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDuplicated.Location = New System.Drawing.Point(363, 108) Me.cmdListDuplicated.Name = "cmdListDuplicated" - Me.cmdListDuplicated.Size = New System.Drawing.Size(66, 30) + Me.cmdListDuplicated.Size = New System.Drawing.Size(99, 45) Me.cmdListDuplicated.TabIndex = 186 Me.cmdListDuplicated.Text = "duplicated" Me.cmdListDuplicated.UseVisualStyleBackColor = True @@ -7447,10 +6949,9 @@ Partial Class ucrCalculator ' Me.cmdListOperator.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListOperator.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOperator.Location = New System.Drawing.Point(187, 72) - Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListOperator.Location = New System.Drawing.Point(280, 108) Me.cmdListOperator.Name = "cmdListOperator" - Me.cmdListOperator.Size = New System.Drawing.Size(56, 30) + Me.cmdListOperator.Size = New System.Drawing.Size(84, 45) Me.cmdListOperator.TabIndex = 185 Me.cmdListOperator.Text = ">" Me.cmdListOperator.UseVisualStyleBackColor = True @@ -7459,10 +6960,9 @@ Partial Class ucrCalculator ' Me.cmdListDiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDiv.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDiv.Location = New System.Drawing.Point(128, 72) - Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDiv.Location = New System.Drawing.Point(192, 108) Me.cmdListDiv.Name = "cmdListDiv" - Me.cmdListDiv.Size = New System.Drawing.Size(60, 30) + Me.cmdListDiv.Size = New System.Drawing.Size(90, 45) Me.cmdListDiv.TabIndex = 184 Me.cmdListDiv.Text = "div (%/%)" Me.cmdListDiv.UseVisualStyleBackColor = True @@ -7471,10 +6971,9 @@ Partial Class ucrCalculator ' Me.cmdListMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMod.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMod.Location = New System.Drawing.Point(59, 72) - Me.cmdListMod.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMod.Location = New System.Drawing.Point(88, 108) Me.cmdListMod.Name = "cmdListMod" - Me.cmdListMod.Size = New System.Drawing.Size(70, 30) + Me.cmdListMod.Size = New System.Drawing.Size(105, 45) Me.cmdListMod.TabIndex = 183 Me.cmdListMod.Text = "mod (%%)" Me.cmdListMod.UseVisualStyleBackColor = True @@ -7483,10 +6982,9 @@ Partial Class ucrCalculator ' Me.cmdListIfelse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListIfelse.Location = New System.Drawing.Point(2, 72) - Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListIfelse.Location = New System.Drawing.Point(3, 108) Me.cmdListIfelse.Name = "cmdListIfelse" - Me.cmdListIfelse.Size = New System.Drawing.Size(58, 30) + Me.cmdListIfelse.Size = New System.Drawing.Size(87, 45) Me.cmdListIfelse.TabIndex = 182 Me.cmdListIfelse.Text = "ifelse" Me.cmdListIfelse.UseVisualStyleBackColor = True @@ -7495,10 +6993,9 @@ Partial Class ucrCalculator ' Me.cmdListOmit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListOmit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListOmit.Location = New System.Drawing.Point(242, 43) - Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListOmit.Location = New System.Drawing.Point(363, 64) Me.cmdListOmit.Name = "cmdListOmit" - Me.cmdListOmit.Size = New System.Drawing.Size(66, 30) + Me.cmdListOmit.Size = New System.Drawing.Size(99, 45) Me.cmdListOmit.TabIndex = 181 Me.cmdListOmit.Text = "omit.na" Me.cmdListOmit.UseVisualStyleBackColor = True @@ -7507,10 +7004,9 @@ Partial Class ucrCalculator ' Me.cmdListRev.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRev.Location = New System.Drawing.Point(187, 43) - Me.cmdListRev.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListRev.Location = New System.Drawing.Point(280, 64) Me.cmdListRev.Name = "cmdListRev" - Me.cmdListRev.Size = New System.Drawing.Size(56, 30) + Me.cmdListRev.Size = New System.Drawing.Size(84, 45) Me.cmdListRev.TabIndex = 180 Me.cmdListRev.Text = "rev" Me.cmdListRev.UseVisualStyleBackColor = True @@ -7519,10 +7015,9 @@ Partial Class ucrCalculator ' Me.cmdListMovsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListMovsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListMovsum.Location = New System.Drawing.Point(128, 43) - Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMovsum.Location = New System.Drawing.Point(192, 64) Me.cmdListMovsum.Name = "cmdListMovsum" - Me.cmdListMovsum.Size = New System.Drawing.Size(60, 30) + Me.cmdListMovsum.Size = New System.Drawing.Size(90, 45) Me.cmdListMovsum.TabIndex = 179 Me.cmdListMovsum.Text = "movsum" Me.cmdListMovsum.UseVisualStyleBackColor = True @@ -7531,10 +7026,9 @@ Partial Class ucrCalculator ' Me.cmdListCumsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListCumsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListCumsum.Location = New System.Drawing.Point(59, 43) - Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListCumsum.Location = New System.Drawing.Point(88, 64) Me.cmdListCumsum.Name = "cmdListCumsum" - Me.cmdListCumsum.Size = New System.Drawing.Size(70, 30) + Me.cmdListCumsum.Size = New System.Drawing.Size(105, 45) Me.cmdListCumsum.TabIndex = 178 Me.cmdListCumsum.Text = "cumsum" Me.cmdListCumsum.UseVisualStyleBackColor = True @@ -7543,10 +7037,9 @@ Partial Class ucrCalculator ' Me.cmdListScale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListScale.Location = New System.Drawing.Point(2, 43) - Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListScale.Location = New System.Drawing.Point(3, 64) Me.cmdListScale.Name = "cmdListScale" - Me.cmdListScale.Size = New System.Drawing.Size(58, 30) + Me.cmdListScale.Size = New System.Drawing.Size(87, 45) Me.cmdListScale.TabIndex = 177 Me.cmdListScale.Text = " scale" Me.cmdListScale.UseVisualStyleBackColor = True @@ -7555,10 +7048,9 @@ Partial Class ucrCalculator ' Me.cmdListDiff.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListDiff.Location = New System.Drawing.Point(242, 14) - Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDiff.Location = New System.Drawing.Point(363, 21) Me.cmdListDiff.Name = "cmdListDiff" - Me.cmdListDiff.Size = New System.Drawing.Size(66, 30) + Me.cmdListDiff.Size = New System.Drawing.Size(99, 45) Me.cmdListDiff.TabIndex = 176 Me.cmdListDiff.Text = "diff" Me.cmdListDiff.UseVisualStyleBackColor = True @@ -7567,10 +7059,9 @@ Partial Class ucrCalculator ' Me.cmdListLead.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLead.Location = New System.Drawing.Point(187, 14) - Me.cmdListLead.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListLead.Location = New System.Drawing.Point(280, 21) Me.cmdListLead.Name = "cmdListLead" - Me.cmdListLead.Size = New System.Drawing.Size(56, 30) + Me.cmdListLead.Size = New System.Drawing.Size(84, 45) Me.cmdListLead.TabIndex = 175 Me.cmdListLead.Text = "lead" Me.cmdListLead.UseVisualStyleBackColor = True @@ -7579,10 +7070,9 @@ Partial Class ucrCalculator ' Me.cmdListLag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListLag.Location = New System.Drawing.Point(128, 14) - Me.cmdListLag.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListLag.Location = New System.Drawing.Point(192, 21) Me.cmdListLag.Name = "cmdListLag" - Me.cmdListLag.Size = New System.Drawing.Size(60, 30) + Me.cmdListLag.Size = New System.Drawing.Size(90, 45) Me.cmdListLag.TabIndex = 174 Me.cmdListLag.Text = "lag" Me.cmdListLag.UseVisualStyleBackColor = True @@ -7591,10 +7081,9 @@ Partial Class ucrCalculator ' Me.cmdListRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListRank.Location = New System.Drawing.Point(59, 14) - Me.cmdListRank.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListRank.Location = New System.Drawing.Point(88, 21) Me.cmdListRank.Name = "cmdListRank" - Me.cmdListRank.Size = New System.Drawing.Size(70, 30) + Me.cmdListRank.Size = New System.Drawing.Size(105, 45) Me.cmdListRank.TabIndex = 173 Me.cmdListRank.Text = "rank" Me.cmdListRank.UseVisualStyleBackColor = True @@ -7603,10 +7092,9 @@ Partial Class ucrCalculator ' Me.cmdListSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdListSort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdListSort.Location = New System.Drawing.Point(2, 14) - Me.cmdListSort.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSort.Location = New System.Drawing.Point(3, 21) Me.cmdListSort.Name = "cmdListSort" - Me.cmdListSort.Size = New System.Drawing.Size(58, 30) + Me.cmdListSort.Size = New System.Drawing.Size(87, 45) Me.cmdListSort.TabIndex = 172 Me.cmdListSort.Text = "sort" Me.cmdListSort.UseVisualStyleBackColor = True @@ -7616,40 +7104,39 @@ Partial Class ucrCalculator Me.ContextMenuStripFunctions.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripFunctions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MASSFunctionsToolStripMenuItem1, Me.PolynomToolStripMenuItem, Me.StatsToolStripMenuItem1, Me.UtilsToolStripMenuItem1}) Me.ContextMenuStripFunctions.Name = "ContextMenuStrip1" - Me.ContextMenuStripFunctions.Size = New System.Drawing.Size(123, 92) + Me.ContextMenuStripFunctions.Size = New System.Drawing.Size(157, 132) ' 'MASSFunctionsToolStripMenuItem1 ' Me.MASSFunctionsToolStripMenuItem1.Name = "MASSFunctionsToolStripMenuItem1" - Me.MASSFunctionsToolStripMenuItem1.Size = New System.Drawing.Size(122, 22) + Me.MASSFunctionsToolStripMenuItem1.Size = New System.Drawing.Size(156, 32) Me.MASSFunctionsToolStripMenuItem1.Text = "MASS" ' 'PolynomToolStripMenuItem ' Me.PolynomToolStripMenuItem.Name = "PolynomToolStripMenuItem" - Me.PolynomToolStripMenuItem.Size = New System.Drawing.Size(122, 22) + Me.PolynomToolStripMenuItem.Size = New System.Drawing.Size(156, 32) Me.PolynomToolStripMenuItem.Text = "polynom" ' 'StatsToolStripMenuItem1 ' Me.StatsToolStripMenuItem1.Name = "StatsToolStripMenuItem1" - Me.StatsToolStripMenuItem1.Size = New System.Drawing.Size(122, 22) + Me.StatsToolStripMenuItem1.Size = New System.Drawing.Size(156, 32) Me.StatsToolStripMenuItem1.Text = "stats" ' 'UtilsToolStripMenuItem1 ' Me.UtilsToolStripMenuItem1.Name = "UtilsToolStripMenuItem1" - Me.UtilsToolStripMenuItem1.Size = New System.Drawing.Size(122, 22) + Me.UtilsToolStripMenuItem1.Size = New System.Drawing.Size(156, 32) Me.UtilsToolStripMenuItem1.Text = "utils" ' 'cmdRhelpList ' Me.cmdRhelpList.AutoSize = True Me.cmdRhelpList.ContextMenuStrip = Me.ContextMenuStripList - Me.cmdRhelpList.Location = New System.Drawing.Point(678, 26) - Me.cmdRhelpList.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRhelpList.Location = New System.Drawing.Point(1017, 39) Me.cmdRhelpList.Name = "cmdRhelpList" - Me.cmdRhelpList.Size = New System.Drawing.Size(68, 23) + Me.cmdRhelpList.Size = New System.Drawing.Size(102, 34) Me.cmdRhelpList.SplitMenuStrip = Me.ContextMenuStripList Me.cmdRhelpList.TabIndex = 212 Me.cmdRhelpList.Text = "R Help" @@ -7659,10 +7146,9 @@ Partial Class ucrCalculator ' Me.cmdWakefieldHelp.AutoSize = True Me.cmdWakefieldHelp.ContextMenuStrip = Me.ContextMenuStripWakefield - Me.cmdWakefieldHelp.Location = New System.Drawing.Point(774, 34) - Me.cmdWakefieldHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdWakefieldHelp.Location = New System.Drawing.Point(1161, 51) Me.cmdWakefieldHelp.Name = "cmdWakefieldHelp" - Me.cmdWakefieldHelp.Size = New System.Drawing.Size(90, 23) + Me.cmdWakefieldHelp.Size = New System.Drawing.Size(135, 34) Me.cmdWakefieldHelp.SplitMenuStrip = Me.ContextMenuStripWakefield Me.cmdWakefieldHelp.TabIndex = 211 Me.cmdWakefieldHelp.Text = "R Help" @@ -7672,10 +7158,9 @@ Partial Class ucrCalculator ' Me.cmdStringRHelp.AutoSize = True Me.cmdStringRHelp.ContextMenuStrip = Me.ContextMenuStripTxtString - Me.cmdStringRHelp.Location = New System.Drawing.Point(646, 42) - Me.cmdStringRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdStringRHelp.Location = New System.Drawing.Point(969, 63) Me.cmdStringRHelp.Name = "cmdStringRHelp" - Me.cmdStringRHelp.Size = New System.Drawing.Size(90, 23) + Me.cmdStringRHelp.Size = New System.Drawing.Size(135, 34) Me.cmdStringRHelp.SplitMenuStrip = Me.ContextMenuStripTxtString Me.cmdStringRHelp.TabIndex = 210 Me.cmdStringRHelp.Text = "R Help" @@ -7684,20 +7169,20 @@ Partial Class ucrCalculator 'ucrSaveResultInto ' Me.ucrSaveResultInto.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveResultInto.Location = New System.Drawing.Point(10, 303) - Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) + Me.ucrSaveResultInto.Location = New System.Drawing.Point(15, 444) + Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(6, 9, 6, 9) Me.ucrSaveResultInto.Name = "ucrSaveResultInto" - Me.ucrSaveResultInto.Size = New System.Drawing.Size(326, 22) + Me.ucrSaveResultInto.Size = New System.Drawing.Size(489, 33) Me.ucrSaveResultInto.TabIndex = 196 ' 'ucrTryCalculator ' Me.ucrTryCalculator.AutoSize = True - Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 256) - Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(4) + Me.ucrTryCalculator.Location = New System.Drawing.Point(3, 384) + Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrTryCalculator.Name = "ucrTryCalculator" Me.ucrTryCalculator.RunCommandAsMultipleLines = False - Me.ucrTryCalculator.Size = New System.Drawing.Size(396, 37) + Me.ucrTryCalculator.Size = New System.Drawing.Size(594, 56) Me.ucrTryCalculator.TabIndex = 194 ' 'ucrInputCalOptions @@ -7706,10 +7191,9 @@ Partial Class ucrCalculator Me.ucrInputCalOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputCalOptions.GetSetSelectedIndex = -1 Me.ucrInputCalOptions.IsReadOnly = False - Me.ucrInputCalOptions.Location = New System.Drawing.Point(226, 42) - Me.ucrInputCalOptions.Margin = New System.Windows.Forms.Padding(2) + Me.ucrInputCalOptions.Location = New System.Drawing.Point(339, 63) Me.ucrInputCalOptions.Name = "ucrInputCalOptions" - Me.ucrInputCalOptions.Size = New System.Drawing.Size(138, 22) + Me.ucrInputCalOptions.Size = New System.Drawing.Size(207, 33) Me.ucrInputCalOptions.TabIndex = 180 ' 'ucrSelectorForCalculations @@ -7718,21 +7202,20 @@ Partial Class ucrCalculator Me.ucrSelectorForCalculations.bDropUnusedFilterLevels = False Me.ucrSelectorForCalculations.bShowHiddenColumns = False Me.ucrSelectorForCalculations.bUseCurrentFilter = True - Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 64) + Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 96) Me.ucrSelectorForCalculations.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForCalculations.Name = "ucrSelectorForCalculations" - Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(214, 183) + Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(321, 274) Me.ucrSelectorForCalculations.TabIndex = 173 ' 'ucrReceiverForCalculation ' Me.ucrReceiverForCalculation.AutoSize = True Me.ucrReceiverForCalculation.frmParent = Nothing - Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(70, 6) - Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(2) + Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(105, 9) Me.ucrReceiverForCalculation.Name = "ucrReceiverForCalculation" Me.ucrReceiverForCalculation.Selector = Nothing - Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(390, 30) + Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(585, 45) Me.ucrReceiverForCalculation.strNcFilePath = "" Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing @@ -7768,11 +7251,9 @@ Partial Class ucrCalculator Me.grpFunctions.Controls.Add(Me.cmdRoots) Me.grpFunctions.Controls.Add(Me.cmdPolynomial) Me.grpFunctions.Controls.Add(Me.cmdOrigin) - Me.grpFunctions.Location = New System.Drawing.Point(437, 60) - Me.grpFunctions.Margin = New System.Windows.Forms.Padding(2) + Me.grpFunctions.Location = New System.Drawing.Point(656, 90) Me.grpFunctions.Name = "grpFunctions" - Me.grpFunctions.Padding = New System.Windows.Forms.Padding(2) - Me.grpFunctions.Size = New System.Drawing.Size(259, 244) + Me.grpFunctions.Size = New System.Drawing.Size(388, 366) Me.grpFunctions.TabIndex = 216 Me.grpFunctions.TabStop = False Me.grpFunctions.Text = "Functions" @@ -7780,10 +7261,9 @@ Partial Class ucrCalculator 'cmdDigitsumSession ' Me.cmdDigitsumSession.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigitsumSession.Location = New System.Drawing.Point(67, 72) - Me.cmdDigitsumSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigitsumSession.Location = New System.Drawing.Point(100, 108) Me.cmdDigitsumSession.Name = "cmdDigitsumSession" - Me.cmdDigitsumSession.Size = New System.Drawing.Size(62, 30) + Me.cmdDigitsumSession.Size = New System.Drawing.Size(93, 45) Me.cmdDigitsumSession.TabIndex = 228 Me.cmdDigitsumSession.Text = "digitsum*" Me.cmdDigitsumSession.UseVisualStyleBackColor = True @@ -7791,10 +7271,9 @@ Partial Class ucrCalculator 'cmdDigitsquSession ' Me.cmdDigitsquSession.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigitsquSession.Location = New System.Drawing.Point(67, 101) - Me.cmdDigitsquSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigitsquSession.Location = New System.Drawing.Point(100, 152) Me.cmdDigitsquSession.Name = "cmdDigitsquSession" - Me.cmdDigitsquSession.Size = New System.Drawing.Size(62, 30) + Me.cmdDigitsquSession.Size = New System.Drawing.Size(93, 45) Me.cmdDigitsquSession.TabIndex = 227 Me.cmdDigitsquSession.Text = "digitsqu*" Me.cmdDigitsquSession.UseVisualStyleBackColor = True @@ -7802,10 +7281,9 @@ Partial Class ucrCalculator 'cmdFunctionsDigitsum ' Me.cmdFunctionsDigitsum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFunctionsDigitsum.Location = New System.Drawing.Point(2, 72) - Me.cmdFunctionsDigitsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFunctionsDigitsum.Location = New System.Drawing.Point(3, 108) Me.cmdFunctionsDigitsum.Name = "cmdFunctionsDigitsum" - Me.cmdFunctionsDigitsum.Size = New System.Drawing.Size(66, 30) + Me.cmdFunctionsDigitsum.Size = New System.Drawing.Size(99, 45) Me.cmdFunctionsDigitsum.TabIndex = 226 Me.cmdFunctionsDigitsum.Text = "digitsum" Me.cmdFunctionsDigitsum.UseVisualStyleBackColor = True @@ -7813,10 +7291,9 @@ Partial Class ucrCalculator 'cmdDigitsqu ' Me.cmdDigitsqu.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigitsqu.Location = New System.Drawing.Point(2, 101) - Me.cmdDigitsqu.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigitsqu.Location = New System.Drawing.Point(3, 152) Me.cmdDigitsqu.Name = "cmdDigitsqu" - Me.cmdDigitsqu.Size = New System.Drawing.Size(66, 30) + Me.cmdDigitsqu.Size = New System.Drawing.Size(99, 45) Me.cmdDigitsqu.TabIndex = 225 Me.cmdDigitsqu.Text = "digitsqu" Me.cmdDigitsqu.UseVisualStyleBackColor = True @@ -7824,10 +7301,9 @@ Partial Class ucrCalculator 'cmdDecimalsSession ' Me.cmdDecimalsSession.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDecimalsSession.Location = New System.Drawing.Point(189, 130) - Me.cmdDecimalsSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDecimalsSession.Location = New System.Drawing.Point(284, 195) Me.cmdDecimalsSession.Name = "cmdDecimalsSession" - Me.cmdDecimalsSession.Size = New System.Drawing.Size(62, 30) + Me.cmdDecimalsSession.Size = New System.Drawing.Size(93, 45) Me.cmdDecimalsSession.TabIndex = 224 Me.cmdDecimalsSession.Text = "decimals*" Me.cmdDecimalsSession.UseVisualStyleBackColor = True @@ -7835,10 +7311,9 @@ Partial Class ucrCalculator 'cmdMASSFractionsSession ' Me.cmdMASSFractionsSession.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMASSFractionsSession.Location = New System.Drawing.Point(67, 130) - Me.cmdMASSFractionsSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMASSFractionsSession.Location = New System.Drawing.Point(100, 195) Me.cmdMASSFractionsSession.Name = "cmdMASSFractionsSession" - Me.cmdMASSFractionsSession.Size = New System.Drawing.Size(62, 30) + Me.cmdMASSFractionsSession.Size = New System.Drawing.Size(93, 45) Me.cmdMASSFractionsSession.TabIndex = 223 Me.cmdMASSFractionsSession.Text = "fractions*" Me.cmdMASSFractionsSession.UseVisualStyleBackColor = True @@ -7847,10 +7322,9 @@ Partial Class ucrCalculator ' Me.cmdPascalSession.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPascalSession.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPascalSession.Location = New System.Drawing.Point(189, 72) - Me.cmdPascalSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPascalSession.Location = New System.Drawing.Point(284, 108) Me.cmdPascalSession.Name = "cmdPascalSession" - Me.cmdPascalSession.Size = New System.Drawing.Size(62, 30) + Me.cmdPascalSession.Size = New System.Drawing.Size(93, 45) Me.cmdPascalSession.TabIndex = 222 Me.cmdPascalSession.Text = "pascal*" Me.cmdPascalSession.UseVisualStyleBackColor = True @@ -7859,10 +7333,9 @@ Partial Class ucrCalculator ' Me.cmdRhelpFunctions.AutoSize = True Me.cmdRhelpFunctions.ContextMenuStrip = Me.ContextMenuStripFunctions - Me.cmdRhelpFunctions.Location = New System.Drawing.Point(178, 218) - Me.cmdRhelpFunctions.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRhelpFunctions.Location = New System.Drawing.Point(267, 327) Me.cmdRhelpFunctions.Name = "cmdRhelpFunctions" - Me.cmdRhelpFunctions.Size = New System.Drawing.Size(68, 23) + Me.cmdRhelpFunctions.Size = New System.Drawing.Size(129, 45) Me.cmdRhelpFunctions.SplitMenuStrip = Me.ContextMenuStripFunctions Me.cmdRhelpFunctions.TabIndex = 221 Me.cmdRhelpFunctions.Text = "R Help" @@ -7871,10 +7344,9 @@ Partial Class ucrCalculator 'cmdDecimals ' Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDecimals.Location = New System.Drawing.Point(128, 130) - Me.cmdDecimals.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDecimals.Location = New System.Drawing.Point(192, 195) Me.cmdDecimals.Name = "cmdDecimals" - Me.cmdDecimals.Size = New System.Drawing.Size(62, 30) + Me.cmdDecimals.Size = New System.Drawing.Size(93, 45) Me.cmdDecimals.TabIndex = 220 Me.cmdDecimals.Text = "decimals" Me.cmdDecimals.UseVisualStyleBackColor = True @@ -7882,10 +7354,9 @@ Partial Class ucrCalculator 'cmdMASSFractions ' Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 130) - Me.cmdMASSFractions.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMASSFractions.Location = New System.Drawing.Point(3, 195) Me.cmdMASSFractions.Name = "cmdMASSFractions" - Me.cmdMASSFractions.Size = New System.Drawing.Size(66, 30) + Me.cmdMASSFractions.Size = New System.Drawing.Size(99, 45) Me.cmdMASSFractions.TabIndex = 219 Me.cmdMASSFractions.Text = "fractions" Me.cmdMASSFractions.UseVisualStyleBackColor = True @@ -7894,10 +7365,9 @@ Partial Class ucrCalculator ' Me.cmdPascal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPascal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPascal.Location = New System.Drawing.Point(128, 72) - Me.cmdPascal.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPascal.Location = New System.Drawing.Point(192, 108) Me.cmdPascal.Name = "cmdPascal" - Me.cmdPascal.Size = New System.Drawing.Size(62, 30) + Me.cmdPascal.Size = New System.Drawing.Size(93, 45) Me.cmdPascal.TabIndex = 217 Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True @@ -7906,10 +7376,9 @@ Partial Class ucrCalculator ' Me.cmdDigitssq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdDigitssq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigitssq.Location = New System.Drawing.Point(128, 101) - Me.cmdDigitssq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigitssq.Location = New System.Drawing.Point(192, 152) Me.cmdDigitssq.Name = "cmdDigitssq" - Me.cmdDigitssq.Size = New System.Drawing.Size(62, 30) + Me.cmdDigitssq.Size = New System.Drawing.Size(93, 45) Me.cmdDigitssq.TabIndex = 177 Me.cmdDigitssq.Text = "digitssq" Me.cmdDigitssq.UseVisualStyleBackColor = True @@ -7918,10 +7387,9 @@ Partial Class ucrCalculator ' Me.cmddigitssqSession.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmddigitssqSession.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmddigitssqSession.Location = New System.Drawing.Point(189, 101) - Me.cmddigitssqSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmddigitssqSession.Location = New System.Drawing.Point(284, 152) Me.cmddigitssqSession.Name = "cmddigitssqSession" - Me.cmddigitssqSession.Size = New System.Drawing.Size(62, 30) + Me.cmddigitssqSession.Size = New System.Drawing.Size(93, 45) Me.cmddigitssqSession.TabIndex = 178 Me.cmddigitssqSession.Text = "digitssq*" Me.cmddigitssqSession.UseVisualStyleBackColor = True @@ -7930,10 +7398,9 @@ Partial Class ucrCalculator ' Me.cmdCssqSession.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCssqSession.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCssqSession.Location = New System.Drawing.Point(189, 43) - Me.cmdCssqSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCssqSession.Location = New System.Drawing.Point(284, 64) Me.cmdCssqSession.Name = "cmdCssqSession" - Me.cmdCssqSession.Size = New System.Drawing.Size(62, 30) + Me.cmdCssqSession.Size = New System.Drawing.Size(93, 45) Me.cmdCssqSession.TabIndex = 162 Me.cmdCssqSession.Text = "cssq*" Me.cmdCssqSession.UseVisualStyleBackColor = True @@ -7942,10 +7409,9 @@ Partial Class ucrCalculator ' Me.cmdAveBoth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdAveBoth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAveBoth.Location = New System.Drawing.Point(189, 14) - Me.cmdAveBoth.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAveBoth.Location = New System.Drawing.Point(284, 21) Me.cmdAveBoth.Name = "cmdAveBoth" - Me.cmdAveBoth.Size = New System.Drawing.Size(62, 30) + Me.cmdAveBoth.Size = New System.Drawing.Size(93, 45) Me.cmdAveBoth.TabIndex = 156 Me.cmdAveBoth.Text = "ave_both" Me.cmdAveBoth.UseVisualStyleBackColor = True @@ -7954,10 +7420,9 @@ Partial Class ucrCalculator ' Me.cmdCoef.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCoef.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoef.Location = New System.Drawing.Point(128, 188) - Me.cmdCoef.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCoef.Location = New System.Drawing.Point(192, 282) Me.cmdCoef.Name = "cmdCoef" - Me.cmdCoef.Size = New System.Drawing.Size(62, 30) + Me.cmdCoef.Size = New System.Drawing.Size(93, 45) Me.cmdCoef.TabIndex = 174 Me.cmdCoef.Text = "coef" Me.cmdCoef.UseVisualStyleBackColor = True @@ -7966,10 +7431,9 @@ Partial Class ucrCalculator ' Me.cmdAveFac.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdAveFac.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAveFac.Location = New System.Drawing.Point(128, 14) - Me.cmdAveFac.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAveFac.Location = New System.Drawing.Point(192, 21) Me.cmdAveFac.Name = "cmdAveFac" - Me.cmdAveFac.Size = New System.Drawing.Size(62, 30) + Me.cmdAveFac.Size = New System.Drawing.Size(93, 45) Me.cmdAveFac.TabIndex = 155 Me.cmdAveFac.Text = "ave_fac" Me.cmdAveFac.UseVisualStyleBackColor = True @@ -7978,10 +7442,9 @@ Partial Class ucrCalculator ' Me.cmdProd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdProd.Location = New System.Drawing.Point(2, 188) - Me.cmdProd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdProd.Location = New System.Drawing.Point(3, 282) Me.cmdProd.Name = "cmdProd" - Me.cmdProd.Size = New System.Drawing.Size(66, 30) + Me.cmdProd.Size = New System.Drawing.Size(99, 45) Me.cmdProd.TabIndex = 172 Me.cmdProd.Text = "prod" Me.cmdProd.UseVisualStyleBackColor = True @@ -7990,10 +7453,9 @@ Partial Class ucrCalculator ' Me.cmdAve.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdAve.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAve.Location = New System.Drawing.Point(2, 14) - Me.cmdAve.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAve.Location = New System.Drawing.Point(3, 21) Me.cmdAve.Name = "cmdAve" - Me.cmdAve.Size = New System.Drawing.Size(66, 30) + Me.cmdAve.Size = New System.Drawing.Size(99, 45) Me.cmdAve.TabIndex = 148 Me.cmdAve.Text = "ave" Me.cmdAve.UseVisualStyleBackColor = True @@ -8002,10 +7464,9 @@ Partial Class ucrCalculator ' Me.cmdCombn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCombn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCombn.Location = New System.Drawing.Point(67, 188) - Me.cmdCombn.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCombn.Location = New System.Drawing.Point(100, 282) Me.cmdCombn.Name = "cmdCombn" - Me.cmdCombn.Size = New System.Drawing.Size(62, 30) + Me.cmdCombn.Size = New System.Drawing.Size(93, 45) Me.cmdCombn.TabIndex = 173 Me.cmdCombn.Text = "combn" Me.cmdCombn.UseVisualStyleBackColor = True @@ -8014,10 +7475,9 @@ Partial Class ucrCalculator ' Me.cmdCssq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCssq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCssq.Location = New System.Drawing.Point(128, 43) - Me.cmdCssq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCssq.Location = New System.Drawing.Point(192, 64) Me.cmdCssq.Name = "cmdCssq" - Me.cmdCssq.Size = New System.Drawing.Size(62, 30) + Me.cmdCssq.Size = New System.Drawing.Size(93, 45) Me.cmdCssq.TabIndex = 160 Me.cmdCssq.Text = "cssq" Me.cmdCssq.UseVisualStyleBackColor = True @@ -8026,10 +7486,9 @@ Partial Class ucrCalculator ' Me.cmdCoeffs2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCoeffs2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoeffs2.Location = New System.Drawing.Point(189, 188) - Me.cmdCoeffs2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCoeffs2.Location = New System.Drawing.Point(284, 282) Me.cmdCoeffs2.Name = "cmdCoeffs2" - Me.cmdCoeffs2.Size = New System.Drawing.Size(62, 30) + Me.cmdCoeffs2.Size = New System.Drawing.Size(93, 45) Me.cmdCoeffs2.TabIndex = 175 Me.cmdCoeffs2.Text = "coeffs2" Me.cmdCoeffs2.UseVisualStyleBackColor = True @@ -8038,10 +7497,9 @@ Partial Class ucrCalculator ' Me.cmdFunctionsSsqSession.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFunctionsSsqSession.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFunctionsSsqSession.Location = New System.Drawing.Point(67, 43) - Me.cmdFunctionsSsqSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFunctionsSsqSession.Location = New System.Drawing.Point(100, 64) Me.cmdFunctionsSsqSession.Name = "cmdFunctionsSsqSession" - Me.cmdFunctionsSsqSession.Size = New System.Drawing.Size(62, 30) + Me.cmdFunctionsSsqSession.Size = New System.Drawing.Size(93, 45) Me.cmdFunctionsSsqSession.TabIndex = 158 Me.cmdFunctionsSsqSession.Text = "ssq*" Me.cmdFunctionsSsqSession.UseVisualStyleBackColor = True @@ -8050,10 +7508,9 @@ Partial Class ucrCalculator ' Me.cmdFunctionsSsq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFunctionsSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFunctionsSsq.Location = New System.Drawing.Point(2, 43) - Me.cmdFunctionsSsq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFunctionsSsq.Location = New System.Drawing.Point(3, 64) Me.cmdFunctionsSsq.Name = "cmdFunctionsSsq" - Me.cmdFunctionsSsq.Size = New System.Drawing.Size(66, 30) + Me.cmdFunctionsSsq.Size = New System.Drawing.Size(99, 45) Me.cmdFunctionsSsq.TabIndex = 157 Me.cmdFunctionsSsq.Text = "ssq" Me.cmdFunctionsSsq.UseVisualStyleBackColor = True @@ -8062,10 +7519,9 @@ Partial Class ucrCalculator ' Me.cmdCoeffs.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCoeffs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoeffs.Location = New System.Drawing.Point(189, 159) - Me.cmdCoeffs.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCoeffs.Location = New System.Drawing.Point(284, 238) Me.cmdCoeffs.Name = "cmdCoeffs" - Me.cmdCoeffs.Size = New System.Drawing.Size(62, 30) + Me.cmdCoeffs.Size = New System.Drawing.Size(93, 45) Me.cmdCoeffs.TabIndex = 170 Me.cmdCoeffs.Text = "coeffs" Me.cmdCoeffs.UseVisualStyleBackColor = True @@ -8074,10 +7530,9 @@ Partial Class ucrCalculator ' Me.cmdAveFun.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdAveFun.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAveFun.Location = New System.Drawing.Point(67, 14) - Me.cmdAveFun.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAveFun.Location = New System.Drawing.Point(100, 21) Me.cmdAveFun.Name = "cmdAveFun" - Me.cmdAveFun.Size = New System.Drawing.Size(62, 30) + Me.cmdAveFun.Size = New System.Drawing.Size(93, 45) Me.cmdAveFun.TabIndex = 153 Me.cmdAveFun.Text = "ave_fun" Me.cmdAveFun.UseVisualStyleBackColor = True @@ -8086,10 +7541,9 @@ Partial Class ucrCalculator ' Me.cmdRoots.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRoots.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRoots.Location = New System.Drawing.Point(128, 159) - Me.cmdRoots.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRoots.Location = New System.Drawing.Point(192, 238) Me.cmdRoots.Name = "cmdRoots" - Me.cmdRoots.Size = New System.Drawing.Size(62, 30) + Me.cmdRoots.Size = New System.Drawing.Size(93, 45) Me.cmdRoots.TabIndex = 169 Me.cmdRoots.Text = "roots" Me.cmdRoots.UseVisualStyleBackColor = True @@ -8098,10 +7552,9 @@ Partial Class ucrCalculator ' Me.cmdPolynomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPolynomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPolynomial.Location = New System.Drawing.Point(2, 159) - Me.cmdPolynomial.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPolynomial.Location = New System.Drawing.Point(3, 238) Me.cmdPolynomial.Name = "cmdPolynomial" - Me.cmdPolynomial.Size = New System.Drawing.Size(66, 30) + Me.cmdPolynomial.Size = New System.Drawing.Size(99, 45) Me.cmdPolynomial.TabIndex = 167 Me.cmdPolynomial.Text = "polynomial" Me.cmdPolynomial.UseVisualStyleBackColor = True @@ -8110,19 +7563,29 @@ Partial Class ucrCalculator ' Me.cmdOrigin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdOrigin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOrigin.Location = New System.Drawing.Point(67, 159) - Me.cmdOrigin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOrigin.Location = New System.Drawing.Point(100, 238) Me.cmdOrigin.Name = "cmdOrigin" - Me.cmdOrigin.Size = New System.Drawing.Size(62, 30) + Me.cmdOrigin.Size = New System.Drawing.Size(93, 45) Me.cmdOrigin.TabIndex = 168 Me.cmdOrigin.Text = "origin" Me.cmdOrigin.UseVisualStyleBackColor = True ' + 'ucrChkStoreScalar + ' + Me.ucrChkStoreScalar.AutoSize = True + Me.ucrChkStoreScalar.Location = New System.Drawing.Point(391, 487) + Me.ucrChkStoreScalar.Name = "ucrChkStoreScalar" + Me.ucrChkStoreScalar.Size = New System.Drawing.Size(116, 24) + Me.ucrChkStoreScalar.TabIndex = 217 + Me.ucrChkStoreScalar.Text = "CheckBox1" + Me.ucrChkStoreScalar.UseVisualStyleBackColor = True + ' 'ucrCalculator ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True + Me.Controls.Add(Me.ucrChkStoreScalar) Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) @@ -8134,6 +7597,7 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) + Me.Controls.Add(Me.grpList) Me.Controls.Add(Me.grpFunctions) Me.Controls.Add(Me.grpLogical) Me.Controls.Add(Me.grpDates) @@ -8150,50 +7614,48 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpModifier) Me.Controls.Add(Me.grpSymbols) Me.Controls.Add(Me.grpWakefield) - Me.Controls.Add(Me.grpList) - Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" - Me.Size = New System.Drawing.Size(898, 458) + Me.Size = New System.Drawing.Size(1347, 687) Me.grpBasic.ResumeLayout(False) Me.grpDates.ResumeLayout(False) - Me.grpDates.PerformLayout + Me.grpDates.PerformLayout() Me.ContextMenuStripDate.ResumeLayout(False) Me.ContextMenuStripComplex.ResumeLayout(False) Me.grpInteger.ResumeLayout(False) - Me.grpInteger.PerformLayout + Me.grpInteger.PerformLayout() Me.ContextMenuStripInteger.ResumeLayout(False) Me.grpFactor.ResumeLayout(False) - Me.grpFactor.PerformLayout + Me.grpFactor.PerformLayout() Me.ContextMenuStripFactor.ResumeLayout(False) Me.grpHydroGOF.ResumeLayout(False) - Me.grpHydroGOF.PerformLayout + Me.grpHydroGOF.PerformLayout() Me.ContextMenuStripHydroGOF.ResumeLayout(False) Me.grpWakefield.ResumeLayout(False) Me.grpMaths.ResumeLayout(False) - Me.grpMaths.PerformLayout + Me.grpMaths.PerformLayout() Me.ContextMenuStripMaths.ResumeLayout(False) Me.grpSummary.ResumeLayout(False) - Me.grpSummary.PerformLayout + Me.grpSummary.PerformLayout() Me.ContextMenuStripSummary.ResumeLayout(False) Me.grpFrequencies.ResumeLayout(False) Me.grpProbabilty.ResumeLayout(False) - Me.grpProbabilty.PerformLayout + Me.grpProbabilty.PerformLayout() Me.ContextMenuStripProbability.ResumeLayout(False) Me.grpRandom.ResumeLayout(False) Me.grpTransform.ResumeLayout(False) - Me.grpTransform.PerformLayout + Me.grpTransform.PerformLayout() Me.ContextMenuStripTransform.ResumeLayout(False) Me.grpLogical.ResumeLayout(False) - Me.grpLogical.PerformLayout + Me.grpLogical.PerformLayout() Me.ContextMenuStripLogical.ResumeLayout(False) Me.grpTestString.ResumeLayout(False) Me.grpCircular.ResumeLayout(False) - Me.grpCircular.PerformLayout + Me.grpCircular.PerformLayout() Me.ContextMenuStripCircular.ResumeLayout(False) Me.grpModifier.ResumeLayout(False) Me.grpSymbols.ResumeLayout(False) Me.grpComplex.ResumeLayout(False) - Me.grpComplex.PerformLayout + Me.grpComplex.PerformLayout() Me.ContextMenuStripTxtString.ResumeLayout(False) Me.ContextMenuStripWakefield.ResumeLayout(False) Me.ContextMenuStripList.ResumeLayout(False) @@ -8202,9 +7664,9 @@ Partial Class ucrCalculator Me.GroupBox1.ResumeLayout(False) Me.ContextMenuStripFunctions.ResumeLayout(False) Me.grpFunctions.ResumeLayout(False) - Me.grpFunctions.PerformLayout + Me.grpFunctions.PerformLayout() Me.ResumeLayout(False) - Me.PerformLayout + Me.PerformLayout() End Sub @@ -8835,4 +8297,8 @@ Partial Class ucrCalculator Friend WithEvents cmdDigitsqu As Button Friend WithEvents cmdDigitsumSession As Button Friend WithEvents cmdFunctionsDigitsum As Button + Friend WithEvents cmdRank As Button + Friend WithEvents cmdRescale As Button + Friend WithEvents ScalesToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ucrChkStoreScalar As CheckBox End Class diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 49334f48834..2567962efea 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -23,6 +23,8 @@ Public Class ucrCalculator Public Event DataFrameChanged() Public Event TryCommadClick() Public Event ControlValueChanged() + Public Event ClearClick() + Public Event CheckBoxClick() Public bFirstLoad As Boolean = True Public bControlsInitialised As Boolean = False Public clsHelp As New RFunction @@ -65,6 +67,8 @@ Public Class ucrCalculator ucrInputCalOptions.SetDropDownStyleAsNonEditable() ucrReceiverForCalculation.Selector = ucrSelectorForCalculations + ucrChkStoreScalar.Text = "Store Scalar" + clsHelp.SetPackageName("utils") clsHelp.SetRCommand("help") @@ -73,10 +77,9 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdRound, "round(x) to round to whole numbers, round(x,2) to round to 2 decimal places, round(x,-2) to round to the nearest 100") ttCalculator.SetToolTip(cmdSiginf, "signif(x,3) to round to 3 significant figures") - ttCalculator.SetToolTip(cmdSortF, "sorts a vector into ascending or descending order. For example sort(c(5,7,4,4,3)) = (3,4,4,5,7)") - ttCalculator.SetToolTip(cmdScale, "centre and scale the data - usually by producing (x - xbar)/s") - ttCalculator.SetToolTip(cmdMASSFractions, "changes decimal data into a character variable with fractions. So 1.5 becomes 3/2, 0.25 becomes 1/4 etc.") - ttCalculator.SetToolTip(cmdDecimals, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") + 'Transform keyboard tooltips + ttCalculator.SetToolTip(cmdSortF, """Use only With extreme care"" sorts a vector into ascending Or descending order. For example sort(c(5, 7, 4, 4, 3)) = (3, 4, 4, 5, 7)") + ttCalculator.SetToolTip(cmdScale, "centre And scale the data - usually by producing (x - xbar)/s") ttCalculator.SetToolTip(cmdLag, "shift a variable down. For example lag(1:5) = (NA,1,2,3,4); lag(1:5,3) = (NA,NA,NA, 1,2)") ttCalculator.SetToolTip(cmdLead, "shift a variable up. For example lead(1:5) = (2,3,4,5,NA); lead(1:5;3) = (4,5, NA,NA,NA)") ttCalculator.SetToolTip(cmdDiff, "difference between successive elements. For example diff(c(1,4,3,7)) = (NA 3,-1,4)") @@ -97,6 +100,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdNtile, " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)") ttCalculator.SetToolTip(cmdCumdist, "proportion of values less than or equal to the current rank. For example cume_dist(c(2,4,6,8,3)) = (0.2, 0.6, 0.8, 1.0, 0.4)") ttCalculator.SetToolTip(cmdRowRank, "row numbers as ranks. For example :row_number(c(15,11,13,12,NA,12)) = (5,1,3,2,NA,3)") + ttCalculator.SetToolTip(cmdRank, "ranks. For example rank(15,11,13,12, NA, 12) = (5, 1, 4, 2.5, 6, 2.5)") ttCalculator.SetToolTip(cmdPercentRank, "rescale of minimum ranks to [0,1]. For example percent_rank(c(15,11,13,12,NA,12)) = (1,0,0.75,0.25,NA,0.25)") ttCalculator.SetToolTip(cmdDRank, "dense ranks. For example d_rank(c(15,11,13,12,NA,12)) = (4,1,3,2,NA,2)") ttCalculator.SetToolTip(cmdMRank, " minimum ranks. For example m_rank(c(15,11,13,12,NA,12)) = (5,1,4,2,NA,2)") @@ -104,7 +108,9 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdNaapprox, "linear interpolation of missing values. For example na.approx(c(5,NA,NA,2,2,NA,4,7,NA),maxgap=1,na.rm=FALSE) = (5,NA,NA,2,2,3,4,7,NA)") ttCalculator.SetToolTip(cmdNasplin, "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)") ttCalculator.SetToolTip(cmdNaest, "Missing values as the mean (usually) overall or with a factor. For example na.aggregate(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,3.75,4,7,3.75)") + ttCalculator.SetToolTip(cmdRescale, "Transforms to (0, 1) scale, using (x - min)/(max - min)") + 'Logical and Symbols toooltips ttCalculator.SetToolTip(cmdPower, "power(^)or exponent and can also be given as **. For example 2^3 = 8") ttCalculator.SetToolTip(cmdLesser, "less than(<). For example (2 < 3) is TRUE. (2 < 2) is FALSE, (2 < 1) is FALSE") ttCalculator.SetToolTip(cmdLesserOrEqualsTo, "less than or equals(<=). For example (2 <= 3) is TRUE, (2 <=2) is TRUE, (2 <= 1) is FALSE") @@ -139,6 +145,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdPt, " t probabilities. For example pt(-2,5) = 0.051; pt(-2,1000) = 0.0229 ~ pnorm(-2)") ttCalculator.SetToolTip(cmdPChisq, "chi square probabilities. For example pchisq(5,1) = 0.9747; pchisq(5,10) = 0.1088") + 'Probabilityv keyboard tooltips ttCalculator.SetToolTip(cmdPf, "F probabilities. For example pf(2,1,10) = 0.8123; pf(2,50,50) = 0.9921") ttCalculator.SetToolTip(cmdQnorm, "qnormal quantiles. For example qnorm(0.05) = -1.6449; qnorm(0.9772, 100,15) = 130") ttCalculator.SetToolTip(cmdPbirth, "simultaneous birthday probabilities. For example pbirthday(10) = 0.1169 ; pbirthday(50) = 0.97") @@ -238,6 +245,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdEscape, "Escape (with +*.? etc). For example, str_detect(c(""b$t"",""bat?"",""3*4""),""[\\?\\$\\*]"") gives TRUE TRUE TRUE") ttCalculator.SetToolTip(cmdPlusZero, "range of values. For example, str_count(c(""b$t"",""Bat?""),""[a-zA-Z]"") gives 2 3") + 'Interger keyboard tooltips ttCalculator.SetToolTip(cmdBigZ, "encodes arbitrarily large integers") ttCalculator.SetToolTip(cmdBigQ, "encodes rationals encoded as ratios or arbitrarily large integers") ttCalculator.SetToolTip(cmdFactorial, "factorial n!, as big integer. For example, factorialZ(6)= 720") @@ -472,7 +480,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdCombn, "combn(c(-2,1,3,4), 2,FUN=prod) gives the products of the values 2 at a time, -2 -6 -8 , 3 4 12. (result usually put into output window)") ttCalculator.SetToolTip(cmdCoef, "single coefficient of a polynomial if given roots. So sum(combn(c(-2,1,3,4),3. FUN=prod) =(-6 -12-24 +12) = -26") ttCalculator.SetToolTip(cmdCoeffs2, " Gives the polynomial coefficients from the zeros") - ttCalculator.SetToolTip(cmdFunctionsDigitsum, "Gives the sum of the digits in a numeric variable") + ttCalculator.SetToolTip(cmdFunctionsDigitsum, "Gives the sum of the digits in a numeric variable") ttCalculator.SetToolTip(cmdDigitsumSession, "Gives the sum of the digits, if library calculator code has been run in the current session") ttCalculator.SetToolTip(cmdPascalSession, "Gives binomial coefficients, if the library calculator code has been run in the current session") ttCalculator.SetToolTip(cmdDigitsqu, "Squares of digits in an integer variable") @@ -482,6 +490,9 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdDigitssq, " Gives the ssq of the digits in a numeric variable. For example with c(12, 24, 86) gives (5, 20, 100)") ttCalculator.SetToolTip(cmddigitssqSession, "Gives digit sum of squares, but only if the library calculator code has been run in the current sesion") ttCalculator.SetToolTip(cmdPascal, "Gives Pascal triangles, e.g. for c(1,2,3,4) gives 1, (1,1), (1, 2, 1), (1, 3, 3, 1)") + ttCalculator.SetToolTip(cmdMASSFractions, "changes decimal data into a character variable with fractions. So 1.5 becomes 3/2, 0.25 becomes 1/4 etc.") + ttCalculator.SetToolTip(cmdDecimals, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") + '--------------------------------------------------------------------------------------------------------------------- Const strTooltipCmdLength = "number Of observations: For example length(c(1,2,3,4,NA)) = 5 " ttCalculator.SetToolTip(cmdLength, strTooltipCmdLength) @@ -704,6 +715,11 @@ Public Class ucrCalculator Private Sub cmdClear_Click(sender As Object, e As EventArgs) Handles cmdClear.Click ucrReceiverForCalculation.Clear() + RaiseEvent ClearClick() + End Sub + + Private Sub ucrChkStoreScalar_Click(sender As Object, e As EventArgs) Handles ucrChkStoreScalar.Click + RaiseEvent CheckBoxClick() End Sub Private Sub cmdLesser_Click(sender As Object, e As EventArgs) Handles cmdLesser.Click @@ -756,7 +772,7 @@ Public Class ucrCalculator grpList.Visible = False cmdRhelpList.Visible = False cmdRhelpFunctions.Visible = True - Me.Size = New Size(iBasicWidth * 1.38, iBaseHeight) + Me.Size = New Size(iBasicWidth * 1.37, iBaseHeight) Case "Maths" strPackageName = "stats" grpFunctions.Visible = False @@ -1156,33 +1172,33 @@ Public Class ucrCalculator Private Sub cmdRound_Click(sender As Object, e As EventArgs) Handles cmdRound.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round(x= , digits=0)", 11) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round(x= , digits=0)", 12) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round( )", 2) End If End Sub Private Sub cmdFloor_Click(sender As Object, e As EventArgs) Handles cmdFloor.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("floor(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("floor(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("floor()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("floor( )", 2) End If End Sub Private Sub cmdTrunc_Click(sender As Object, e As EventArgs) Handles cmdTrunc.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trunc(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trunc(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trunc()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trunc( )", 2) End If End Sub Private Sub cmdSign_Click(sender As Object, e As EventArgs) Handles cmdSign.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sign(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sign(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sign()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sign( )", 2) End If End Sub @@ -1190,7 +1206,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos( )", 2) End If End Sub @@ -1198,7 +1214,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin( )", 2) End If End Sub @@ -1206,79 +1222,79 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan( )", 2) End If End Sub Private Sub cmdSiginf_Click(sender As Object, e As EventArgs) Handles cmdSiginf.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif(x= , digits=6)", 11) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif(x= , digits=6)", 12) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif()", 2) End If End Sub Private Sub cmdCos_Click(sender As Object, e As EventArgs) Handles cmdCos.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos( )", 2) End If End Sub Private Sub cmdSin_Click(sender As Object, e As EventArgs) Handles cmdSin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin( )", 2) End If End Sub Private Sub cmdTan_Click(sender As Object, e As EventArgs) Handles cmdTan.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan( )", 2) End If End Sub Private Sub cmdAbs_Click(sender As Object, e As EventArgs) Handles cmdAbs.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("abs(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("abs(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("abs()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("abs( )", 2) End If End Sub Private Sub cmdExp_Click_1(sender As Object, e As EventArgs) Handles cmdExp.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp( )", 2) End If End Sub Private Sub cmdLogTen_Click(sender As Object, e As EventArgs) Handles cmdLogTen.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log10(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log10(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log10()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log10( )", 2) End If End Sub Private Sub cmdLog_Click(sender As Object, e As EventArgs) Handles cmdLog.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log(x= , base=exp(1))", 14) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log(x= , base=exp(1))", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log( )", 2) End If End Sub Private Sub cmdSqrt_Click_1(sender As Object, e As EventArgs) Handles cmdSqrt.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt( )", 2) End If End Sub @@ -1320,9 +1336,9 @@ Public Class ucrCalculator Private Sub cmdLength_Click(sender As Object, e As EventArgs) Handles cmdLength.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("length(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("length(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("length()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("length( )", 2) End If End Sub @@ -1330,7 +1346,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(is.na(x= ))", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(is.na())", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(is.na( ))", 3) End If End Sub @@ -1430,7 +1446,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_upper(string = , locale=' ')", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_upper()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_upper()", 2) End If End Sub @@ -1438,7 +1454,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_lower(string= , locale=' ')", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_lower()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_lower( )", 2) End If End Sub @@ -1446,7 +1462,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_title(string= , locale=' ')", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_title()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_title( )", 2) End If End Sub @@ -1454,7 +1470,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trim(string= , side = c('both', 'left', 'right))", 35) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trim()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trim( )", 2) End If End Sub @@ -1470,7 +1486,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_order(x = , decreasing = FALSE , na_last = TRUE)", 40) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_order()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_order( )", 2) End If End Sub @@ -1478,7 +1494,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sort(x= , decreasing = FALSE , na_last = TRUE , locale = ' ')", 53) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sort()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sort( )", 2) End If End Sub @@ -1486,7 +1502,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace(string = , pattern = argument , replacement = ' ' )", 43) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace( )", 2) End If End Sub @@ -1494,7 +1510,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate(string = , pattern = argument)", 22) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate( )", 2) End If End Sub @@ -1502,7 +1518,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract(string = , pattern = argument )", 23) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract( )", 2) End If End Sub @@ -1510,7 +1526,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_count(string = , pattern = argument )", 23) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_count()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_count( )", 2) End If End Sub @@ -1519,7 +1535,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_detect(string = , pattern = , negate = FALSE)", 31) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_detect()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_detect( )", 2) End If End Sub @@ -1527,7 +1543,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm(p= , mean = 0, sd = 1, lower.tail = TRUE, log.p = FALSE)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm( )", 2) End If End Sub @@ -1535,7 +1551,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(p= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(, )", 3) End If End Sub @@ -1543,7 +1559,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(p= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(, )", 3) End If End Sub @@ -1551,7 +1567,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(p= , df1= , df2= ,lower.tail = TRUE)", 34) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(, , )", 5) End If End Sub @@ -1559,7 +1575,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm(q= , mean = 0, sd = 1, lower.tail = True, Log.p = False)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm( )", 2) End If End Sub @@ -1567,7 +1583,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(q= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(, )", 3) End If End Sub @@ -1575,7 +1591,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(, )", 3) End If End Sub @@ -1583,7 +1599,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(q= , df1= ,df2=, lower.tail = TRUE)", 33) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(, , )", 5) End If End Sub @@ -1591,7 +1607,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(n= , k= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(, )", 3) End If End Sub @@ -1599,7 +1615,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial( )", 2) End If End Sub @@ -1607,7 +1623,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(a= , b= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(, )", 3) End If End Sub @@ -1615,7 +1631,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(n= , k= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(, )", 3) End If End Sub @@ -1623,7 +1639,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial( )", 2) End If End Sub @@ -1631,7 +1647,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(a= , b= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(, )", 3) End If End Sub @@ -1639,7 +1655,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma( )", 2) End If End Sub @@ -1647,7 +1663,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma( )", 2) End If End Sub @@ -1655,7 +1671,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma( )", 2) End If End Sub @@ -1663,7 +1679,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma( )", 2) End If End Sub @@ -1676,7 +1692,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_c(string= , pattern=' ')", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_c()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_c( )", 2) End If End Sub @@ -1684,7 +1700,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sub(string="""", start = 1L, end = -1L)", 25) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sub()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sub( )", 2) End If End Sub @@ -1692,7 +1708,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::year(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::year()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::year( )", 2) End If End Sub @@ -1700,7 +1716,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::month(x= , label=FALSE, abbr=TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::month()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::month( )", 2) End If End Sub @@ -1708,7 +1724,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::day(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::day()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::day( )", 2) End If End Sub @@ -1716,7 +1732,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::wday(x= , label=FALSE, abbr=TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::wday()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::wday( )", 2) End If End Sub @@ -1724,7 +1740,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::yday(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::yday()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::yday( )", 2) End If End Sub @@ -1732,7 +1748,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::date(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::date()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::date( )", 2) End If End Sub @@ -1740,31 +1756,31 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_date(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_date()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_date( )", 2) End If End Sub Private Sub cmdYmdHms_Click(sender As Object, e As EventArgs) Handles cmdYmdHms.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hms(x= ) ", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hms(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hms() ", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hms( )", 2) End If End Sub Private Sub cmdYmdHm_Click(sender As Object, e As EventArgs) Handles cmdYmdHm.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hm(x= ) ", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hm(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hm() ", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hm( )", 2) End If End Sub Private Sub cmdYmdH_Click(sender As Object, e As EventArgs) Handles cmdYmdH.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_h(x= ) ", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_h(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_h()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_h( )", 2) End If End Sub @@ -1772,7 +1788,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::leap_year(date= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::leap_year()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::leap_year( )", 2) End If End Sub @@ -1780,7 +1796,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd( )", 2) End If End Sub @@ -1788,7 +1804,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::mdy(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::mdy()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::mdy( )", 2) End If End Sub @@ -1796,7 +1812,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::dmy(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::dmy()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::dmy( )", 2) End If End Sub @@ -1804,7 +1820,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::hour(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::hour()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::hour( )", 2) End If End Sub @@ -1812,7 +1828,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::minute(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::minute()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::minute( )", 2) End If End Sub @@ -1820,7 +1836,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::second(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::second()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::second( )", 2) End If End Sub @@ -1828,7 +1844,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::am(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::am()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::am( )", 2) End If End Sub @@ -1836,15 +1852,15 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::pm(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::pm()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::pm( )", 2) End If End Sub Private Sub cmdD_In_M_Click(sender As Object, e As EventArgs) Handles cmdD_In_M.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::days_in_month(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::days_in_month(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::days_in_month()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::days_in_month( )", 2) End If End Sub @@ -1852,12 +1868,12 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::quarter(x= , with_year = FALSE, fiscal_start = 1 )", 40) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::quarter()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::quarter( )", 2) End If End Sub Private Sub cmdBrackets_Click(sender As Object, e As EventArgs) Handles cmdBrackets.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("( )", 2) End Sub Private Sub cmdOpeningBracket_Click(sender As Object, e As EventArgs) Handles cmdOpeningBracket.Click @@ -1882,65 +1898,65 @@ Public Class ucrCalculator Private Sub cmdLag_Click(sender As Object, e As EventArgs) Handles cmdLag.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lag(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lag(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lag()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lag( )", 2) End If End Sub Private Sub cmdLead_Click(sender As Object, e As EventArgs) Handles cmdLead.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lead(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lead(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lead()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lead( )", 2) End If End Sub Private Sub cmdpmax_Click(sender As Object, e As EventArgs) Handles cmdPMax.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmax(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmax(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmax()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmax( )", 2) End If End Sub Private Sub cmdPMin_Click(sender As Object, e As EventArgs) Handles cmdPMin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmin(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmin(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmin( )", 2) End If End Sub Private Sub cmdcummax_Click(sender As Object, e As EventArgs) Handles cmdCumMax.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummax(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummax(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummax()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummax( )", 2) End If End Sub Private Sub cmdcummin_Click(sender As Object, e As EventArgs) Handles cmdCumMin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummin(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummin(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummin( )", 2) End If End Sub Private Sub cmdcumsum_Click(sender As Object, e As EventArgs) Handles cmdCumSum.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumsum(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumsum(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumsum()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumsum( )", 2) End If End Sub Private Sub cmdpercentrank_Click(sender As Object, e As EventArgs) Handles cmdPercentRank.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::percent_rank(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::percent_rank(x= )*100", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::percent_rank()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::percent_rank( )*100", 6) End If End Sub @@ -1948,7 +1964,6 @@ Public Class ucrCalculator RaiseEvent SelectionChanged() End Sub - Private Sub OpenHelpPage() If strPackageName <> "" Then frmMaximiseOutput.Show(strFileName:=clsFileUrlUtilities.GetHelpFileURL(strPackageName:=strPackageName), bReplace:=False) @@ -1973,14 +1988,14 @@ Public Class ucrCalculator End Sub Private Sub cmdEcdf_Click(sender As Object, e As EventArgs) Handles cmdCumdist.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::cume_dist()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::cume_dist( )*100", 6) End Sub Private Sub cmdNtile_Click(sender As Object, e As EventArgs) Handles cmdNtile.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::ntile(x= , n=2)", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::ntile(x= ,n=2)", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::ntile()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::ntile( )", 2) End If End Sub @@ -2029,38 +2044,54 @@ Public Class ucrCalculator End Sub Private Sub cmdDRank_Click(sender As Object, e As EventArgs) Handles cmdDRank.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::dense_rank()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::dense_rank( )", 2) + End Sub + + Private Sub cmdRank_Click(sender As Object, e As EventArgs) Handles cmdRank.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rank(x= ,na.last=TRUE,ties.method=c(""average"", ""first"", ""last"", ""random"", ""max"", ""min""))", 81) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rank( )", 2) + End If + End Sub + + Private Sub cmdRescale_Click(sender As Object, e As EventArgs) Handles cmdRescale.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scales::rescale( ,to=c(0,1),narm=TRUE)", 22) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scales::rescale( ,narm=TRUE)", 12) + End If End Sub Private Sub cmdRowRank_Click(sender As Object, e As EventArgs) Handles cmdRowRank.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::row_number()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::row_number( )", 2) End Sub Private Sub cmdIfelse_Click(sender As Object, e As EventArgs) Handles cmdIfelse.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ifelse(test= , ""yes"" , ""no"")", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ifelse()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ifelse( )", 2) End If End Sub Private Sub cmdmatch_Click(sender As Object, e As EventArgs) Handles cmdmatch.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("match()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("match( )", 2) End Sub Private Sub cmdwhen_Click(sender As Object, e As EventArgs) Handles cmdwhen.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::case_when()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::case_when( )", 2) End Sub Private Sub cmdBetween_Click(sender As Object, e As EventArgs) Handles cmdBetween.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::between()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::between( )", 2) End Sub Private Sub cmdNear_Click(sender As Object, e As EventArgs) Handles cmdNear.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::near(x= , y= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::near()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::near( )", 2) End If End Sub @@ -2100,7 +2131,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("car::logit(p, percents = Range.p[2] > 1, adjust)", 24) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("car::logit()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("car::logit( )", 2) End If End Sub @@ -2108,27 +2139,27 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stats::plogis(q, Location = 0, Scale() = 1, lower.tail = True, Log.p = False))", 50) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stats::plogis()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stats::plogis( )", 2) End If End Sub Private Sub cmdAtan2_Click(sender As Object, e As EventArgs) Handles cmdAtan2.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan2(y = , x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan2(y= ,x= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan2()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan2( )", 2) End If End Sub Private Sub cmdDuplicate_Click(sender As Object, e As EventArgs) Handles cmdDuplicate.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("duplicated()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("duplicated( )", 2) End Sub Private Sub cmdIsNa_Click(sender As Object, e As EventArgs) Handles cmdIsNa.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("is.na()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("is.na( )", 2) End Sub Private Sub cmdNotIsNa_Click(sender As Object, e As EventArgs) Handles cmdNotIsNa.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("!is.na()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("!is.na( )", 2) End Sub Private Sub cmdCv_Click(sender As Object, e As EventArgs) Handles cmdCv.Click @@ -2157,9 +2188,9 @@ Public Class ucrCalculator Private Sub cmdNonMiss_Click(sender As Object, e As EventArgs) Handles cmdNonMiss.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(!is.na(x= ))", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(!is.na(x= ))", 3) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(!is.na())", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(!is.na( ))", 3) End If End Sub @@ -2200,18 +2231,18 @@ Public Class ucrCalculator End Sub Private Sub cmdRad_Click(sender As Object, e As EventArgs) Handles cmdRad.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rad()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rad( )", 2) End Sub Private Sub cmdDeg_Click(sender As Object, e As EventArgs) Handles cmdDeg.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::deg()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::deg( )", 2) End Sub Private Sub cmdFirst_Click(sender As Object, e As EventArgs) Handles cmdFirst.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::first(x= , order_by=NULL)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::first()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::first( )", 2) End If End Sub @@ -2219,7 +2250,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::last(x= , order_by=NULL)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::last()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::last( )", 2) End If End Sub @@ -2227,7 +2258,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::nth(x= , n= , order_by=NULL)", 21) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::nth()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::nth( )", 2) End If End Sub @@ -2257,7 +2288,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which(x= , arr.ind = FALSE, useNames = TRUE)", 35) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which( )", 2) End If End Sub @@ -3514,25 +3545,25 @@ Public Class ucrCalculator Private Sub cmdCircMean_Click(sender As Object, e As EventArgs) Handles cmdCircMean.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular:: mean.circular(x = , na.rm = TRUE, control.circular = list())", 43) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular:: mean.circular(x= , na.rm = TRUE, control.circular = list())", 43) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::mean.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::mean.circular( )", 2) End If End Sub Private Sub cmdCircMedian_Click(sender As Object, e As EventArgs) Handles cmdCircMedian.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular(x = , na.rm = TRUE)", 16) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular(x= , na.rm = TRUE)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular( )", 2) End If End Sub Private Sub cmdMedianHL_Click(sender As Object, e As EventArgs) Handles cmdMedianHL.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular(x = , na.rm = TRUE, method = c(""HL1"",""HL2"",""HL3""), prop = NULL)", 60) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular(x= , na.rm = TRUE, method = c(""HL1"",""HL2"",""HL3""), prop = NULL)", 60) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular( )", 2) End If End Sub @@ -3540,7 +3571,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::range.circular(x = , test = FALSE, na.rm = TRUE, finite = FALSE, control.circular = list(), )", 75) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::range.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::range.circular( )", 2) End If End Sub @@ -3548,7 +3579,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular(x = , na.rm = TRUE)", 17) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular( )", 2) End If End Sub @@ -3556,7 +3587,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular(x = , na.rm = TRUE)", 17) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular( )", 2) End If End Sub @@ -3564,7 +3595,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::A1(kappa = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::A1()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::A1( )", 2) End If End Sub @@ -3572,7 +3603,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance(x = , na.rm = TRUE)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance( )", 2) End If End Sub @@ -3580,7 +3611,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation(x = , na.rm = TRUE)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation( )", 2) End If End Sub @@ -3653,7 +3684,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.fill(object = , fill = NA , ix = !is.na(object)))", 33) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.fill()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.fill( )", 2) End If End Sub @@ -3661,7 +3692,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.aggregate(object = , by = 1, FUN = mean, na.rm = FALSE, maxgap = Inf))", 52) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.aggregate()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.aggregate( )", 2) End If End Sub @@ -3669,7 +3700,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.approx(object = , x = index(object), xout = , na.rm = FALSE, maxgap = Inf, along))", 66) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.approx()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.approx( )", 2) End If End Sub @@ -3677,9 +3708,8 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.spline(object = , x = index(object), xout = , na.rm = FALSE, maxgap = Inf, along))", 66) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.spline()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.spline( )", 2) End If - End Sub @@ -3687,7 +3717,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::as_factor(x = , ... )", 8) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::as_factor()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::as_factor( )", 2) End If End Sub @@ -3695,7 +3725,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_anon(x = , prefix = "" )", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_anon()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_anon( )", 2) End If End Sub @@ -3703,7 +3733,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("labelled::labelled(x = , labels = , label = NULL)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("labelled::labelled()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("labelled::labelled( )", 2) End If End Sub @@ -3711,7 +3741,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_collapse(.f = , ..., group_other = FALSE)", 28) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_collapse()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_collapse( )", 2) End If End Sub @@ -3719,7 +3749,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_cross(.f = , ..., sep = "":"", keep_empty = FALSE)", 38) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_cross()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_cross( )", 2) End If End Sub @@ -3727,7 +3757,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_drop(f = , only)", 8) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_drop()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_drop( )", 2) End If End Sub @@ -3735,7 +3765,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_expand(f = , ...)", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_expand()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_expand( )", 2) End If End Sub @@ -3743,7 +3773,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_na_value_to_level(f = ,level = Null)", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_na_value_to_level()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_na_value_to_level( )", 2) End If End Sub @@ -3751,7 +3781,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inorder(f = , ordered = NA)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inorder()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inorder( )", 2) End If End Sub @@ -3759,7 +3789,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_infreq(f = , ordered = NA)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_infreq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_infreq( )", 2) End If End Sub @@ -3767,7 +3797,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inseq(f = , ordered = NA)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inseq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inseq( )", 2) End If End Sub @@ -3775,7 +3805,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_lump_min(f = , n, prop, w = NULL, other_level = ""Other"", ties.method = c(""min"", ""average"", ""first"", ""last"", ""random"", ""max""))", 113) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_lump_min()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_lump_min( )", 2) End If End Sub @@ -3783,7 +3813,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_match(f = , lvls)", 8) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_match()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_match( )", 2) End If End Sub @@ -3791,7 +3821,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_other(f = , keep = , drop = , other_level = ""Other"")", 43) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_other()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_other( )", 2) End If End Sub @@ -3799,7 +3829,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_recode(.f = , ...)", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_recode()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_recode( )", 2) End If End Sub @@ -3807,7 +3837,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_relevel(.f = , ..., after = 0L)", 19) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_relevel()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_relevel( )", 2) End If End Sub @@ -3815,7 +3845,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_reorder(.f = , .x = , .fun = median, ..., .desc = FALSE)", 44) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_reorder()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_reorder( )", 2) End If End Sub @@ -3823,7 +3853,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_rev(f = , )", 4) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_rev()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_rev( )", 2) End If End Sub @@ -3831,7 +3861,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shift(f = , n = 1L)", 10) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shift()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shift( )", 2) End If End Sub @@ -3839,7 +3869,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shuffle(f = , )", 4) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shuffle()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shuffle( )", 2) End If End Sub @@ -3848,7 +3878,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(q = , shape = , rate = 1, lower.tail = TRUE,log.p = FALSE)", 55) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(, , )", 5) End If End Sub @@ -3856,7 +3886,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(p = , shape = , rate = 1, lower.tail = TRUE, log.p = FALSE)", 56) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(, )", 3) End If End Sub @@ -3864,7 +3894,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(q = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 67) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(, , )", 5) End If End Sub @@ -3880,7 +3910,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(q = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(, , )", 5) End If End Sub @@ -3888,7 +3918,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(q = , lambda = , lower.tail = TRUE, log.p = FALSE)", 47) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(, )", 3) End If End Sub @@ -3896,7 +3926,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(q = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 61) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(, , )", 5) End If End Sub @@ -3904,7 +3934,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(p = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 67) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(, , )", 5) End If End Sub @@ -3920,7 +3950,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(p = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(, , )", 5) End If End Sub @@ -3928,7 +3958,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(p = , lambda = , lower.tail = TRUE, log.p = FALSE)", 47) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(, )", 3) End If End Sub @@ -3936,7 +3966,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(p = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 61) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(, , )", 5) End If End Sub @@ -3971,7 +4001,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_starts(string = , pattern = , negate = FALSE)", 30) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_starts()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_starts( )", 2) End If End Sub @@ -3979,7 +4009,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove(string = , pattern = )", 14) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove( )", 2) End If End Sub @@ -3987,7 +4017,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove_all(string = , pattern = )", 14) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove_all()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove_all( )", 2) End If End Sub @@ -3995,7 +4025,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_squish(string = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_squish()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_squish( )", 2) End If End Sub @@ -4003,7 +4033,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_conv(string = , encoding = )", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_conv()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_conv( )", 2) End If End Sub @@ -4011,7 +4041,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract_all(string = , pattern = , simplify = FALSE)", 32) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract_all()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract_all( )", 2) End If End Sub @@ -4019,7 +4049,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate_all(string = , pattern = )", 14) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate_all()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate_all( )", 2) End If End Sub @@ -4027,7 +4057,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace_all(string = , pattern = , replacement = )", 30) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace_all()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace_all( )", 2) End If End Sub @@ -4035,7 +4065,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::count(type = c(""character"", ""line_break"", ""sentence"", ""word""), stringr::boundary(), skip_word_none = NA)", 23) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::boundary()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::boundary( )", 2) End If End Sub @@ -4043,7 +4073,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::count(pattern = , stringr::coll(), ignore_case = FALSE, locale = ""en"")", 55) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::coll()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::coll( )", 2) End If End Sub @@ -4051,7 +4081,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::count(pattern = , stringr::fixed(), ignore_case = FALSE)", 41) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::fixed()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::fixed( )", 2) End If End Sub @@ -4059,7 +4089,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::count(pattern = , stringr::regex() , ignore_case = FALSE , multiline = FALSE , comments = FALSE, dotall = FALSE)", 97) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::regex()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::regex( )", 2) End If End Sub @@ -4133,7 +4163,7 @@ Public Class ucrCalculator Private Sub cmdKurtosis_Click(sender As Object, e As EventArgs) Handles cmdKurtosis.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("e1071::kurtosis(x = , na.rm = TRUE, type = 3)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("e1071::kurtosis(x= , na.rm = TRUE, type = 3)", 26) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("e1071::kurtosis( , na.rm = TRUE)", 16) End If @@ -4309,9 +4339,9 @@ Public Class ucrCalculator Private Sub cmdDateTime_Click(sender As Object, e As EventArgs) Handles cmdDateTime.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_datetime(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_datetime(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_datetime()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_datetime( )", 2) End If End Sub @@ -4319,7 +4349,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::hms(seconds = , minutes = , hours = , days = )", 33) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::hms()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::hms( )", 2) End If End Sub @@ -4327,7 +4357,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::as_hms(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::as_hms()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::as_hms( )", 2) End If End Sub @@ -4347,7 +4377,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_glue(.sep = """" , .envir = parent.frame())", 28) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_glue()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_glue( )", 2) End If End Sub @@ -4355,7 +4385,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_length(string="""")", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_length()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_length( )", 2) End If End Sub @@ -4363,7 +4393,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trunc(string = , width = , side = c(""right"" , ""left"", ""center"") , ellipsis = )", 63) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trunc()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trunc( )", 2) End If End Sub @@ -4371,7 +4401,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_ends(string = , pattern = , negate = FALSE)", 39) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_ends()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_ends( )", 2) End If End Sub @@ -4379,7 +4409,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sort(x = , decreasing = FALSE )", 22) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sort()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sort( )", 2) End If End Sub @@ -4387,7 +4417,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigz(a = , mod = NA )", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigz()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigz( )", 2) End If End Sub @@ -4395,7 +4425,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::isprime(n = , reps = )", 11) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::isprime()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::isprime( )", 2) End If End Sub @@ -4403,7 +4433,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::factorialZ(n = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::factorialZ()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::factorialZ( )", 2) End If End Sub @@ -4411,7 +4441,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::chooseZ(n = , k = )", 8) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::chooseZ()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::chooseZ( )", 2) End If End Sub @@ -4419,7 +4449,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::nextprime(n = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::nextprime()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::nextprime( )", 2) End If End Sub @@ -4441,7 +4471,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Divisors(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Divisors()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Divisors( )", 2) End If End Sub @@ -4449,7 +4479,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::PercentRank(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::PercentRank()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::PercentRank( )", 2) End If End Sub @@ -4457,7 +4487,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::DigitSum(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::DigitSum()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::DigitSum( )", 2) End If End Sub @@ -4465,31 +4495,31 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigq(a = , mod = NA )", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigq( )", 2) End If End Sub Private Sub cmdBinary_Click(sender As Object, e As EventArgs) Handles cmdBinary.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin(x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin( )", 2) End If End Sub Private Sub cmdAsOctmode_Click(sender As Object, e As EventArgs) Handles cmdOctal.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToOct(x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToOct(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToOct()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToOct( )", 2) End If End Sub Private Sub cmdAsHexmode_Click(sender As Object, e As EventArgs) Handles cmdHex.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToHex(x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToHex(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToHex()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToHex()", 2) End If End Sub @@ -4527,9 +4557,9 @@ Public Class ucrCalculator Private Sub cmdNthPrime_Click(sender As Object, e As EventArgs) Handles cmdNthPrime.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::nth_prime(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::nth_prime(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::nth_prime()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::nth_prime( )", 2) End If End Sub @@ -4557,9 +4587,9 @@ Public Class ucrCalculator Private Sub cmdReverseStr_Click(sender As Object, e As EventArgs) Handles cmdReverseStr.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringi::stri_reverse(str = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringi::stri_reverse(str= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringi::stri_reverse()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringi::stri_reverse( )", 2) End If End Sub @@ -4591,7 +4621,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::phi(n= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::phi()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::phi( )", 2) End If End Sub @@ -4663,7 +4693,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("utils::as.roman(x= )", 1) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("utils::as.roman()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("utils::as.roman( )", 2) End If End Sub @@ -4775,25 +4805,25 @@ Public Class ucrCalculator Private Sub cmdOctmode_Click(sender As Object, e As EventArgs) Handles cmdOctmode.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.octmode(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.octmode(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.octmode()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.octmode( )", 2) End If End Sub Private Sub cmdHexmode_Click(sender As Object, e As EventArgs) Handles cmdHexmode.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.hexmode(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.hexmode(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.hexmode()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.hexmode( )", 2) End If End Sub Private Sub cmdFactorize_Click(sender As Object, e As EventArgs) Handles cmdFactorize.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Factorize(n= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Factorize(n= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Factorize()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Factorize( )", 2) End If End Sub @@ -4815,9 +4845,9 @@ Public Class ucrCalculator Private Sub cmdCumProd_Click(sender As Object, e As EventArgs) Handles cmdCumProd.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumprod(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumprod(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumprod()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumprod( )", 2) End If End Sub @@ -4831,9 +4861,9 @@ Public Class ucrCalculator Private Sub cmdRev_Click(sender As Object, e As EventArgs) Handles cmdRev.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rev(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rev(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rev()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rev( )", 2) End If End Sub @@ -4861,6 +4891,15 @@ Public Class ucrCalculator OpenHelpPage() End Sub + + Private Sub ScalesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ScalesToolStripMenuItem.Click + CalculationsOptions() + If ucrInputCalOptions.GetText = "Transform" Then + strPackageName = "scales" + End If + OpenHelpPage() + End Sub + Private Sub ZooToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZooToolStripMenuItem.Click CalculationsOptions() If ucrInputCalOptions.GetText = "Transform" Then @@ -4901,7 +4940,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(x=rep(x= ,times= ),na.rm= TRUE)", 23) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(rep(,),na.rm=TRUE)", 14) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(rep(, ),na.rm=TRUE)", 15) End If End Sub @@ -5357,7 +5396,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex(length.out= 0,real= numeric(),imaginary= numeric(),modulus= 1,argument= 0)", 0) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex(real= ,imaginary= )", 14) End If End Sub @@ -5365,39 +5404,39 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin( )", 2) End If End Sub Private Sub cmdComplexAcos_Click(sender As Object, e As EventArgs) Handles cmdComplexAcos.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos( )", 2) End If End Sub Private Sub cmdComplexAtan_Click(sender As Object, e As EventArgs) Handles cmdComplexAtan.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan( )", 2) End If End Sub Private Sub cmdReal_Click(sender As Object, e As EventArgs) Handles cmdReal.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Re(z = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Re(z= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Re( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Re( )", 2) End If End Sub Private Sub cmdImaginary_Click(sender As Object, e As EventArgs) Handles cmdImaginary.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Im(z = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Im(z= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Im( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Im( )", 2) End If End Sub @@ -5405,23 +5444,23 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Mod(z = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Mod( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Mod( )", 2) End If End Sub Private Sub cmdArg_Click(sender As Object, e As EventArgs) Handles cmdArg.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Arg(z = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Arg(z= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Arg( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Arg( )", 2) End If End Sub Private Sub cmdConjugate_Click(sender As Object, e As EventArgs) Handles cmdConjugate.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Conj(z = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Conj(z= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Conj( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Conj( )", 2) End If End Sub @@ -5433,7 +5472,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex( )", 2) End If End Sub @@ -5441,7 +5480,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log(x= , base=exp(1))", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log( )", 2) End If End Sub @@ -5449,7 +5488,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt( )", 2) End If End Sub @@ -5457,7 +5496,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round(x= , digits=0)", 12) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round( )", 2) End If End Sub @@ -5465,7 +5504,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp( )", 2) End If End Sub @@ -5473,7 +5512,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif(x= , digits=6)", 12) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif( )", 2) End If End Sub @@ -5481,7 +5520,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos( )", 2) End If End Sub @@ -5489,7 +5528,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin( )", 2) End If End Sub @@ -5497,7 +5536,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan( )", 2) End If End Sub @@ -5505,7 +5544,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cosh(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cosh()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cosh( )", 2) End If End Sub @@ -5513,7 +5552,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sinh(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sinh()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sinh( )", 2) End If End Sub @@ -5521,16 +5560,16 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tanh(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tanh()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tanh( )", 2) End If End Sub Private Sub cmdComplexRad_Click(sender As Object, e As EventArgs) Handles cmdComplexRad.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rad()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rad( )", 2) End Sub Private Sub cmdComplexDeg_Click(sender As Object, e As EventArgs) Handles cmdComplexDeg.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::deg()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::deg( )", 2) End Sub Private Sub cmdComplexPi_Click(sender As Object, e As EventArgs) Handles cmdComplexPi.Click @@ -5541,7 +5580,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scale( , center = TRUE, scale = TRUE)", 31) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scale( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scale( )", 2) End If End Sub @@ -5747,9 +5786,9 @@ Public Class ucrCalculator Private Sub cmdwhichmax_Click(sender As Object, e As EventArgs) Handles cmdwhichmax.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max( )", 2) End If End Sub @@ -5763,9 +5802,9 @@ Public Class ucrCalculator Private Sub cmdwhichmin_Click(sender As Object, e As EventArgs) Handles cmdwhichmin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min( )", 2) End If End Sub diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 4f7047f131e..d1250cdae1f 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -120,10 +120,20 @@ Partial Class ucrDataView Me.lblHeaderDataView = New System.Windows.Forms.Label() Me.tlpTableContainer = New System.Windows.Forms.TableLayoutPanel() Me.panelSectionsAll = New System.Windows.Forms.Panel() + Me.panelSectionIfYouMust = New System.Windows.Forms.Panel() + Me.linkStartAddRPackage = New System.Windows.Forms.LinkLabel() + Me.lblIFYouMust = New System.Windows.Forms.Label() + Me.linkStartPasteData = New System.Windows.Forms.LinkLabel() + Me.linkStartRestoreBackup = New System.Windows.Forms.LinkLabel() + Me.linkStartSwapDataScriptWindow = New System.Windows.Forms.LinkLabel() Me.panelSectionRecent = New System.Windows.Forms.Panel() Me.lblRecent = New System.Windows.Forms.Label() Me.panelRecentMenuItems = New System.Windows.Forms.Panel() Me.panelSectionHelp = New System.Windows.Forms.Panel() + Me.linkHelpClimaticMenu = New System.Windows.Forms.LinkLabel() + Me.linkHelpPrepareMenu = New System.Windows.Forms.LinkLabel() + Me.linkHelpData = New System.Windows.Forms.LinkLabel() + Me.linkHelpGettingStarted = New System.Windows.Forms.LinkLabel() Me.lblHelp = New System.Windows.Forms.Label() Me.linkHelpIntroduction = New System.Windows.Forms.LinkLabel() Me.linkHelpInstructionVideos = New System.Windows.Forms.LinkLabel() @@ -154,6 +164,7 @@ Partial Class ucrDataView Me.statusColumnMenu.SuspendLayout() Me.tlpTableContainer.SuspendLayout() Me.panelSectionsAll.SuspendLayout() + Me.panelSectionIfYouMust.SuspendLayout() Me.panelSectionRecent.SuspendLayout() Me.panelSectionHelp.SuspendLayout() Me.panelSectionStart.SuspendLayout() @@ -661,6 +672,7 @@ Partial Class ucrDataView ' 'panelSectionsAll ' + Me.panelSectionsAll.Controls.Add(Me.panelSectionIfYouMust) Me.panelSectionsAll.Controls.Add(Me.panelSectionRecent) Me.panelSectionsAll.Controls.Add(Me.panelSectionHelp) Me.panelSectionsAll.Controls.Add(Me.panelSectionStart) @@ -671,13 +683,88 @@ Partial Class ucrDataView Me.panelSectionsAll.Size = New System.Drawing.Size(243, 455) Me.panelSectionsAll.TabIndex = 9 ' + 'panelSectionIfYouMust + ' + Me.panelSectionIfYouMust.Controls.Add(Me.linkStartAddRPackage) + Me.panelSectionIfYouMust.Controls.Add(Me.lblIFYouMust) + Me.panelSectionIfYouMust.Controls.Add(Me.linkStartPasteData) + Me.panelSectionIfYouMust.Controls.Add(Me.linkStartRestoreBackup) + Me.panelSectionIfYouMust.Controls.Add(Me.linkStartSwapDataScriptWindow) + Me.panelSectionIfYouMust.Location = New System.Drawing.Point(28, 446) + Me.panelSectionIfYouMust.Name = "panelSectionIfYouMust" + Me.panelSectionIfYouMust.Size = New System.Drawing.Size(374, 105) + Me.panelSectionIfYouMust.TabIndex = 12 + ' + 'linkStartAddRPackage + ' + Me.linkStartAddRPackage.ActiveLinkColor = System.Drawing.Color.Red + Me.linkStartAddRPackage.AutoSize = True + Me.linkStartAddRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkStartAddRPackage.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkStartAddRPackage.Location = New System.Drawing.Point(7, 86) + Me.linkStartAddRPackage.Name = "linkStartAddRPackage" + Me.linkStartAddRPackage.Size = New System.Drawing.Size(143, 13) + Me.linkStartAddRPackage.TabIndex = 6 + Me.linkStartAddRPackage.TabStop = True + Me.linkStartAddRPackage.Text = "Add R package to R-Instat..." + ' + 'lblIFYouMust + ' + Me.lblIFYouMust.AutoSize = True + Me.lblIFYouMust.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblIFYouMust.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblIFYouMust.Location = New System.Drawing.Point(5, 4) + Me.lblIFYouMust.Name = "lblIFYouMust" + Me.lblIFYouMust.Size = New System.Drawing.Size(122, 25) + Me.lblIFYouMust.TabIndex = 0 + Me.lblIFYouMust.Text = "If you must:" + ' + 'linkStartPasteData + ' + Me.linkStartPasteData.ActiveLinkColor = System.Drawing.Color.Red + Me.linkStartPasteData.AutoSize = True + Me.linkStartPasteData.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkStartPasteData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkStartPasteData.Location = New System.Drawing.Point(7, 31) + Me.linkStartPasteData.Name = "linkStartPasteData" + Me.linkStartPasteData.Size = New System.Drawing.Size(136, 13) + Me.linkStartPasteData.TabIndex = 3 + Me.linkStartPasteData.TabStop = True + Me.linkStartPasteData.Text = "Paste data from clipboard..." + ' + 'linkStartRestoreBackup + ' + Me.linkStartRestoreBackup.ActiveLinkColor = System.Drawing.Color.Red + Me.linkStartRestoreBackup.AutoSize = True + Me.linkStartRestoreBackup.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkStartRestoreBackup.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkStartRestoreBackup.Location = New System.Drawing.Point(7, 49) + Me.linkStartRestoreBackup.Name = "linkStartRestoreBackup" + Me.linkStartRestoreBackup.Size = New System.Drawing.Size(116, 13) + Me.linkStartRestoreBackup.TabIndex = 4 + Me.linkStartRestoreBackup.TabStop = True + Me.linkStartRestoreBackup.Text = "Restore from Backup..." + ' + 'linkStartSwapDataScriptWindow + ' + Me.linkStartSwapDataScriptWindow.ActiveLinkColor = System.Drawing.Color.Red + Me.linkStartSwapDataScriptWindow.AutoSize = True + Me.linkStartSwapDataScriptWindow.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkStartSwapDataScriptWindow.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkStartSwapDataScriptWindow.Location = New System.Drawing.Point(7, 68) + Me.linkStartSwapDataScriptWindow.Name = "linkStartSwapDataScriptWindow" + Me.linkStartSwapDataScriptWindow.Size = New System.Drawing.Size(162, 13) + Me.linkStartSwapDataScriptWindow.TabIndex = 5 + Me.linkStartSwapDataScriptWindow.TabStop = True + Me.linkStartSwapDataScriptWindow.Text = "Swap Data and Script Window..." + ' 'panelSectionRecent ' Me.panelSectionRecent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelSectionRecent.Controls.Add(Me.lblRecent) Me.panelSectionRecent.Controls.Add(Me.panelRecentMenuItems) - Me.panelSectionRecent.Location = New System.Drawing.Point(28, 130) + Me.panelSectionRecent.Location = New System.Drawing.Point(28, 91) Me.panelSectionRecent.Name = "panelSectionRecent" Me.panelSectionRecent.Size = New System.Drawing.Size(179, 186) Me.panelSectionRecent.TabIndex = 13 @@ -705,22 +792,78 @@ Partial Class ucrDataView ' 'panelSectionHelp ' + Me.panelSectionHelp.Controls.Add(Me.linkHelpClimaticMenu) + Me.panelSectionHelp.Controls.Add(Me.linkHelpPrepareMenu) + Me.panelSectionHelp.Controls.Add(Me.linkHelpData) + Me.panelSectionHelp.Controls.Add(Me.linkHelpGettingStarted) Me.panelSectionHelp.Controls.Add(Me.lblHelp) Me.panelSectionHelp.Controls.Add(Me.linkHelpIntroduction) Me.panelSectionHelp.Controls.Add(Me.linkHelpInstructionVideos) Me.panelSectionHelp.Controls.Add(Me.linkHelpRpackages) Me.panelSectionHelp.Controls.Add(Me.linkHelpRInstatWebsite) - Me.panelSectionHelp.Location = New System.Drawing.Point(28, 330) + Me.panelSectionHelp.Location = New System.Drawing.Point(28, 278) Me.panelSectionHelp.Name = "panelSectionHelp" - Me.panelSectionHelp.Size = New System.Drawing.Size(374, 118) + Me.panelSectionHelp.Size = New System.Drawing.Size(374, 169) Me.panelSectionHelp.TabIndex = 12 ' + 'linkHelpClimaticMenu + ' + Me.linkHelpClimaticMenu.ActiveLinkColor = System.Drawing.Color.Red + Me.linkHelpClimaticMenu.AutoSize = True + Me.linkHelpClimaticMenu.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkHelpClimaticMenu.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkHelpClimaticMenu.Location = New System.Drawing.Point(8, 98) + Me.linkHelpClimaticMenu.Name = "linkHelpClimaticMenu" + Me.linkHelpClimaticMenu.Size = New System.Drawing.Size(73, 13) + Me.linkHelpClimaticMenu.TabIndex = 14 + Me.linkHelpClimaticMenu.TabStop = True + Me.linkHelpClimaticMenu.Text = "Climatic Menu" + ' + 'linkHelpPrepareMenu + ' + Me.linkHelpPrepareMenu.ActiveLinkColor = System.Drawing.Color.Red + Me.linkHelpPrepareMenu.AutoSize = True + Me.linkHelpPrepareMenu.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkHelpPrepareMenu.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkHelpPrepareMenu.Location = New System.Drawing.Point(8, 82) + Me.linkHelpPrepareMenu.Name = "linkHelpPrepareMenu" + Me.linkHelpPrepareMenu.Size = New System.Drawing.Size(74, 13) + Me.linkHelpPrepareMenu.TabIndex = 13 + Me.linkHelpPrepareMenu.TabStop = True + Me.linkHelpPrepareMenu.Text = "Prepare Menu" + ' + 'linkHelpData + ' + Me.linkHelpData.ActiveLinkColor = System.Drawing.Color.Red + Me.linkHelpData.AutoSize = True + Me.linkHelpData.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkHelpData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkHelpData.Location = New System.Drawing.Point(8, 66) + Me.linkHelpData.Name = "linkHelpData" + Me.linkHelpData.Size = New System.Drawing.Size(30, 13) + Me.linkHelpData.TabIndex = 12 + Me.linkHelpData.TabStop = True + Me.linkHelpData.Text = "Data" + ' + 'linkHelpGettingStarted + ' + Me.linkHelpGettingStarted.ActiveLinkColor = System.Drawing.Color.Red + Me.linkHelpGettingStarted.AutoSize = True + Me.linkHelpGettingStarted.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkHelpGettingStarted.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkHelpGettingStarted.Location = New System.Drawing.Point(8, 49) + Me.linkHelpGettingStarted.Name = "linkHelpGettingStarted" + Me.linkHelpGettingStarted.Size = New System.Drawing.Size(78, 13) + Me.linkHelpGettingStarted.TabIndex = 11 + Me.linkHelpGettingStarted.TabStop = True + Me.linkHelpGettingStarted.Text = "Getting Started" + ' 'lblHelp ' Me.lblHelp.AutoSize = True Me.lblHelp.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHelp.Location = New System.Drawing.Point(6, 8) + Me.lblHelp.Location = New System.Drawing.Point(6, 3) Me.lblHelp.Name = "lblHelp" Me.lblHelp.Size = New System.Drawing.Size(56, 25) Me.lblHelp.TabIndex = 2 @@ -732,7 +875,7 @@ Partial Class ucrDataView Me.linkHelpIntroduction.AutoSize = True Me.linkHelpIntroduction.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpIntroduction.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpIntroduction.Location = New System.Drawing.Point(8, 38) + Me.linkHelpIntroduction.Location = New System.Drawing.Point(8, 31) Me.linkHelpIntroduction.Name = "linkHelpIntroduction" Me.linkHelpIntroduction.Size = New System.Drawing.Size(63, 13) Me.linkHelpIntroduction.TabIndex = 7 @@ -746,7 +889,7 @@ Partial Class ucrDataView Me.linkHelpInstructionVideos.Enabled = False Me.linkHelpInstructionVideos.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpInstructionVideos.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpInstructionVideos.Location = New System.Drawing.Point(8, 94) + Me.linkHelpInstructionVideos.Location = New System.Drawing.Point(8, 152) Me.linkHelpInstructionVideos.Name = "linkHelpInstructionVideos" Me.linkHelpInstructionVideos.Size = New System.Drawing.Size(98, 13) Me.linkHelpInstructionVideos.TabIndex = 10 @@ -760,7 +903,7 @@ Partial Class ucrDataView Me.linkHelpRpackages.AutoSize = True Me.linkHelpRpackages.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpRpackages.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRpackages.Location = New System.Drawing.Point(8, 56) + Me.linkHelpRpackages.Location = New System.Drawing.Point(8, 114) Me.linkHelpRpackages.Name = "linkHelpRpackages" Me.linkHelpRpackages.Size = New System.Drawing.Size(116, 13) Me.linkHelpRpackages.TabIndex = 8 @@ -773,7 +916,7 @@ Partial Class ucrDataView Me.linkHelpRInstatWebsite.AutoSize = True Me.linkHelpRInstatWebsite.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpRInstatWebsite.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRInstatWebsite.Location = New System.Drawing.Point(8, 75) + Me.linkHelpRInstatWebsite.Location = New System.Drawing.Point(8, 133) Me.linkHelpRInstatWebsite.Name = "linkHelpRInstatWebsite" Me.linkHelpRInstatWebsite.Size = New System.Drawing.Size(83, 13) Me.linkHelpRInstatWebsite.TabIndex = 9 @@ -786,9 +929,9 @@ Partial Class ucrDataView Me.panelSectionStart.Controls.Add(Me.linkStartNewDataFrame) Me.panelSectionStart.Controls.Add(Me.linkStartOpenFile) Me.panelSectionStart.Controls.Add(Me.linkStartOpenLibrary) - Me.panelSectionStart.Location = New System.Drawing.Point(28, 20) + Me.panelSectionStart.Location = New System.Drawing.Point(28, 6) Me.panelSectionStart.Name = "panelSectionStart" - Me.panelSectionStart.Size = New System.Drawing.Size(374, 96) + Me.panelSectionStart.Size = New System.Drawing.Size(374, 85) Me.panelSectionStart.TabIndex = 11 ' 'lblStart @@ -796,7 +939,7 @@ Partial Class ucrDataView Me.lblStart.AutoSize = True Me.lblStart.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStart.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStart.Location = New System.Drawing.Point(5, 6) + Me.lblStart.Location = New System.Drawing.Point(5, 4) Me.lblStart.Name = "lblStart" Me.lblStart.Size = New System.Drawing.Size(57, 25) Me.lblStart.TabIndex = 0 @@ -808,7 +951,7 @@ Partial Class ucrDataView Me.linkStartNewDataFrame.AutoSize = True Me.linkStartNewDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartNewDataFrame.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartNewDataFrame.Location = New System.Drawing.Point(7, 38) + Me.linkStartNewDataFrame.Location = New System.Drawing.Point(7, 31) Me.linkStartNewDataFrame.Name = "linkStartNewDataFrame" Me.linkStartNewDataFrame.Size = New System.Drawing.Size(96, 13) Me.linkStartNewDataFrame.TabIndex = 3 @@ -821,7 +964,7 @@ Partial Class ucrDataView Me.linkStartOpenFile.AutoSize = True Me.linkStartOpenFile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenFile.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenFile.Location = New System.Drawing.Point(7, 56) + Me.linkStartOpenFile.Location = New System.Drawing.Point(7, 49) Me.linkStartOpenFile.Name = "linkStartOpenFile" Me.linkStartOpenFile.Size = New System.Drawing.Size(90, 13) Me.linkStartOpenFile.TabIndex = 4 @@ -834,7 +977,7 @@ Partial Class ucrDataView Me.linkStartOpenLibrary.AutoSize = True Me.linkStartOpenLibrary.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenLibrary.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenLibrary.Location = New System.Drawing.Point(7, 75) + Me.linkStartOpenLibrary.Location = New System.Drawing.Point(7, 68) Me.linkStartOpenLibrary.Name = "linkStartOpenLibrary" Me.linkStartOpenLibrary.Size = New System.Drawing.Size(105, 13) Me.linkStartOpenLibrary.TabIndex = 5 @@ -1023,6 +1166,8 @@ Partial Class ucrDataView Me.tlpTableContainer.ResumeLayout(False) Me.tlpTableContainer.PerformLayout() Me.panelSectionsAll.ResumeLayout(False) + Me.panelSectionIfYouMust.ResumeLayout(False) + Me.panelSectionIfYouMust.PerformLayout() Me.panelSectionRecent.ResumeLayout(False) Me.panelSectionRecent.PerformLayout() Me.panelSectionHelp.ResumeLayout(False) @@ -1146,4 +1291,14 @@ Partial Class ucrDataView Friend WithEvents mnuDeleteCol2 As ToolStripMenuItem Friend WithEvents ToolStripSeparator14 As ToolStripSeparator Friend WithEvents mnuEditCell As ToolStripMenuItem + Friend WithEvents linkHelpPrepareMenu As LinkLabel + Friend WithEvents linkHelpData As LinkLabel + Friend WithEvents linkHelpGettingStarted As LinkLabel + Friend WithEvents linkHelpClimaticMenu As LinkLabel + Friend WithEvents panelSectionIfYouMust As Panel + Friend WithEvents lblIFYouMust As Label + Friend WithEvents linkStartPasteData As LinkLabel + Friend WithEvents linkStartRestoreBackup As LinkLabel + Friend WithEvents linkStartSwapDataScriptWindow As LinkLabel + Friend WithEvents linkStartAddRPackage As LinkLabel End Class diff --git a/instat/ucrDataView.resx b/instat/ucrDataView.resx index 72c17d882d9..796dfc9bc07 100644 --- a/instat/ucrDataView.resx +++ b/instat/ucrDataView.resx @@ -133,6 +133,6 @@ 706, 17 - 47 + 50 \ No newline at end of file diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index f520b209a34..3f77aed3c2f 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -661,24 +661,20 @@ Public Class ucrDataView GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True) Else Dim bCheckLabels As Boolean = GetCurrentDataFrameFocus().clsPrepareFunctions.CheckHasLabels(strColumn) - If bCheckLabels Then - frmConvertToNumeric.SetDataFrameName(GetCurrentDataFrameFocus().strName) - frmConvertToNumeric.SetColumnName(strColumn) - frmConvertToNumeric.CheckLabels(bCheckLabels) - frmConvertToNumeric.SetNonNumeric(iNonNumericValues) - frmConvertToNumeric.ShowDialog() - ' Yes for "normal" convert and No for "ordinal" convert - Select Case frmConvertToNumeric.DialogResult - Case DialogResult.Yes - GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True) - Case DialogResult.No - GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False) - Case DialogResult.Cancel - Continue For - End Select - Else - GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False) - End If + frmConvertToNumeric.SetDataFrameName(GetCurrentDataFrameFocus().strName) + frmConvertToNumeric.SetColumnName(strColumn) + frmConvertToNumeric.CheckLabels(bCheckLabels) + frmConvertToNumeric.SetNonNumeric(iNonNumericValues) + frmConvertToNumeric.ShowDialog() + ' Yes for "normal" convert and No for "ordinal" convert + Select Case frmConvertToNumeric.DialogResult + Case DialogResult.Yes + GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True) + Case DialogResult.No + GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False) + Case DialogResult.Cancel + Continue For + End Select frmConvertToNumeric.Close() End If Next @@ -1015,4 +1011,38 @@ Public Class ucrDataView _grid.SelectColumnInGrid(strColumn) End Sub + Private Sub linkHelpGettingStarted_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpGettingStarted.LinkClicked + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "3") + End Sub + + Private Sub linkHelpData_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpData.LinkClicked + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "71") + End Sub + + Private Sub linkHelpPrepareMenu_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpPrepareMenu.LinkClicked + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "9") + End Sub + + Private Sub linkHelpClimaticMenu_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpClimaticMenu.LinkClicked + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "19") + End Sub + + Private Sub linkStartSwapDataScriptWindow_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkStartSwapDataScriptWindow.LinkClicked + frmMain.mnuViewSwapDataAndMetadata.Enabled = frmMain.mnuViewSwapDataAndScript.Checked + frmMain.mnuViewSwapDataAndScript.Checked = Not frmMain.mnuViewSwapDataAndScript.Checked + frmMain.UpdateSwapDataAndScript() + frmMain.UpdateLayout() + End Sub + + Private Sub linkStartRestoreBackup_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkStartRestoreBackup.LinkClicked + dlgRestoreBackup.ShowDialog() + End Sub + + Private Sub linkStartAddRPackage_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkStartAddRPackage.LinkClicked + dlgInstallRPackage.ShowDialog() + End Sub + + Private Sub linkStartPasteData_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkStartPasteData.LinkClicked + dlgPasteNewColumns.ShowDialog() + End Sub End Class \ No newline at end of file diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 9f293a0eb11..4728c91cea1 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1388,6 +1388,8 @@ Public Class ucrGeom clsgeom_line.AddLayerParameter("position", "list", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "stack" & Chr(34), Chr(34) & "dodge" & Chr(34), Chr(34) & "dodge2" & Chr(34), Chr(34) & "identity" & Chr(34), Chr(34) & "jitter" & Chr(34), Chr(34) & "fill" & Chr(34)}) clsgeom_line.AddLayerParameter("stat", "list", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34), Chr(34) & "bin" & Chr(34), Chr(34) & "count" & Chr(34), Chr(34) & "density" & Chr(34), Chr(34) & "ecdf" & Chr(34), Chr(34) & "sum" & Chr(34), Chr(34) & "unique" & Chr(34)}) clsgeom_line.AddLayerParameter("show.legend", "list", "TRUE", lstParameterStrings:={"NA", "TRUE", "FALSE"}) + clsgeom_line.AddLayerParameter("orientation", "list", "NA", lstParameterStrings:={"NA", Chr(34) & "x" & Chr(34), Chr(34) & "y" & Chr(34)}) + clsgeom_line.AddLayerParameter("arrow", "editablelist", "arrow()", lstParameterStrings:={"arrow()", " arrow(angle=15)", "arrow(ends=" & Chr(34) & "both" & Chr(34) & ")", "arrow(type=" & Chr(34) & "closed" & Chr(34) & ")", "arrow(angle=15, type = " & Chr(34) & "closed" & Chr(34) & ")"}) 'Aesthetics as layer parameters... Used to fix colour, transparence, ... of the geom on that Layer. clsgeom_line.AddLayerParameter("size", "numeric", "0.5", lstParameterStrings:={1, 0}) 'Note: negative size gives size 0 in general, but 'Warning: sometimesgive errors... clsgeom_line.AddLayerParameter("linetype", "list", Chr(34) & "blank" & Chr(34), lstParameterStrings:=strLineType) @@ -1554,7 +1556,7 @@ Public Class ucrGeom clsgeom_path.AddLayerParameter("linejoin", "list", Chr(34) & "round" & Chr(34), lstParameterStrings:={Chr(34) & "round" & Chr(34), Chr(34) & "mitre" & Chr(34), Chr(34) & "bevel" & Chr(34)}) 'linemitre should 1 or a number >1 clsgeom_path.AddLayerParameter("linemitre", "numeric", "1", lstParameterStrings:={0, 1}) - clsgeom_path.AddLayerParameter("arrow", "editablelist", "arrow()", lstParameterStrings:={"arrow()"}) + clsgeom_path.AddLayerParameter("arrow", "editablelist", "arrow()", lstParameterStrings:={"arrow()", " arrow(angle=15)", "arrow(ends=" & Chr(34) & "both" & Chr(34) & ")", "arrow(type=" & Chr(34) & "closed" & Chr(34) & ")", "arrow(angle=15, type = " & Chr(34) & "closed" & Chr(34) & ")"}) lstAllGeoms.Add(clsgeom_path) clsgeom_point.SetGeomName("geom_point") diff --git a/instat/ucrReceiver.vb b/instat/ucrReceiver.vb index 77ee806b729..60218945d01 100644 --- a/instat/ucrReceiver.vb +++ b/instat/ucrReceiver.vb @@ -417,6 +417,8 @@ Public Class ucrReceiver strItemsParameterNameInRFunction = "link_name" Case "calculation" strItemsParameterNameInRFunction = "calculation_name" + Case "scalar" + strItemsParameterNameInRFunction = "scalar_name" End Select If IsCurrentReceiver() Then Selector.LoadList() diff --git a/instat/ucrSelectorByDataFrameAddRemove.Designer.vb b/instat/ucrSelectorByDataFrameAddRemove.Designer.vb index 503ecf13254..714201fe931 100644 --- a/instat/ucrSelectorByDataFrameAddRemove.Designer.vb +++ b/instat/ucrSelectorByDataFrameAddRemove.Designer.vb @@ -46,6 +46,7 @@ Partial Class ucrSelectorByDataFrameAddRemove Me.toolStripAddAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparatorContext = New System.Windows.Forms.ToolStripSeparator() Me.toolStripHelp = New System.Windows.Forms.ToolStripMenuItem() + Me.checkBoxScalar = New System.Windows.Forms.CheckBox() Me.contextMenuStripAdd.SuspendLayout() Me.SuspendLayout() ' @@ -60,9 +61,10 @@ Partial Class ucrSelectorByDataFrameAddRemove 'btnDataOptions ' Me.btnDataOptions.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.75!) - Me.btnDataOptions.Location = New System.Drawing.Point(153, 146) + Me.btnDataOptions.Location = New System.Drawing.Point(226, 219) + Me.btnDataOptions.Margin = New System.Windows.Forms.Padding(4) Me.btnDataOptions.Name = "btnDataOptions" - Me.btnDataOptions.Size = New System.Drawing.Size(57, 34) + Me.btnDataOptions.Size = New System.Drawing.Size(86, 51) Me.btnDataOptions.TabIndex = 4 Me.btnDataOptions.Tag = "Data_Options" Me.btnDataOptions.Text = "Data Options" @@ -72,9 +74,10 @@ Partial Class ucrSelectorByDataFrameAddRemove ' Me.btnAdd.AutoSize = True Me.btnAdd.ContextMenuStrip = Me.contextMenuStripAdd - Me.btnAdd.Location = New System.Drawing.Point(151, 45) + Me.btnAdd.Location = New System.Drawing.Point(226, 68) + Me.btnAdd.Margin = New System.Windows.Forms.Padding(4) Me.btnAdd.Name = "btnAdd" - Me.btnAdd.Size = New System.Drawing.Size(59, 34) + Me.btnAdd.Size = New System.Drawing.Size(88, 51) Me.btnAdd.SplitMenuStrip = Me.contextMenuStripAdd Me.btnAdd.TabIndex = 5 Me.btnAdd.Text = "Add" @@ -82,46 +85,60 @@ Partial Class ucrSelectorByDataFrameAddRemove ' 'contextMenuStripAdd ' + Me.contextMenuStripAdd.ImageScalingSize = New System.Drawing.Size(24, 24) Me.contextMenuStripAdd.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripAddSelected, Me.toolStripAddAll, Me.ToolStripSeparatorContext, Me.toolStripHelp}) Me.contextMenuStripAdd.Name = "SelectionMenuStrip" - Me.contextMenuStripAdd.Size = New System.Drawing.Size(181, 98) + Me.contextMenuStripAdd.Size = New System.Drawing.Size(190, 106) ' 'toolStripAddSelected ' Me.toolStripAddSelected.Name = "toolStripAddSelected" - Me.toolStripAddSelected.Size = New System.Drawing.Size(180, 22) + Me.toolStripAddSelected.Size = New System.Drawing.Size(189, 32) Me.toolStripAddSelected.Tag = "Add_selected" Me.toolStripAddSelected.Text = "Add Selected" ' 'toolStripAddAll ' Me.toolStripAddAll.Name = "toolStripAddAll" - Me.toolStripAddAll.Size = New System.Drawing.Size(180, 22) + Me.toolStripAddAll.Size = New System.Drawing.Size(189, 32) Me.toolStripAddAll.Text = "Add All" ' 'ToolStripSeparatorContext ' Me.ToolStripSeparatorContext.Name = "ToolStripSeparatorContext" - Me.ToolStripSeparatorContext.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparatorContext.Size = New System.Drawing.Size(186, 6) ' 'toolStripHelp ' Me.toolStripHelp.Name = "toolStripHelp" - Me.toolStripHelp.Size = New System.Drawing.Size(180, 22) + Me.toolStripHelp.Size = New System.Drawing.Size(189, 32) Me.toolStripHelp.Text = "Help" ' + 'checkBoxScalar + ' + Me.checkBoxScalar.AutoSize = True + Me.checkBoxScalar.Location = New System.Drawing.Point(226, 153) + Me.checkBoxScalar.Name = "checkBoxScalar" + Me.checkBoxScalar.Size = New System.Drawing.Size(80, 24) + Me.checkBoxScalar.TabIndex = 86 + Me.checkBoxScalar.Text = "Scalar" + Me.checkBoxScalar.UseVisualStyleBackColor = True + Me.checkBoxScalar.Visible = False + ' 'ucrSelectorByDataFrameAddRemove ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi + Me.Controls.Add(Me.checkBoxScalar) Me.Controls.Add(Me.btnAdd) Me.Controls.Add(Me.btnDataOptions) Me.Name = "ucrSelectorByDataFrameAddRemove" - Me.Size = New System.Drawing.Size(270, 183) + Me.Size = New System.Drawing.Size(405, 402) Me.Controls.SetChildIndex(Me.btnDataOptions, 0) Me.Controls.SetChildIndex(Me.btnAdd, 0) Me.Controls.SetChildIndex(Me.ucrAvailableDataFrames, 0) Me.Controls.SetChildIndex(Me.lstAvailableVariable, 0) + Me.Controls.SetChildIndex(Me.checkBoxScalar, 0) Me.contextMenuStripAdd.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -134,4 +151,5 @@ Partial Class ucrSelectorByDataFrameAddRemove Friend WithEvents toolStripAddAll As ToolStripMenuItem Friend WithEvents ToolStripSeparatorContext As ToolStripSeparator Friend WithEvents toolStripHelp As ToolStripMenuItem + Friend WithEvents checkBoxScalar As CheckBox End Class diff --git a/instat/ucrSelectorByDataFrameAddRemove.vb b/instat/ucrSelectorByDataFrameAddRemove.vb index 04718f8adfe..fdfd6c41540 100644 --- a/instat/ucrSelectorByDataFrameAddRemove.vb +++ b/instat/ucrSelectorByDataFrameAddRemove.vb @@ -40,6 +40,14 @@ Public Class ucrSelectorByDataFrameAddRemove End If End Sub + Public Sub ShowCheckBoxScalar(bShowScalarCheck As Boolean) + checkBoxScalar.Visible = bShowScalarCheck + End Sub + + Public Sub ResetCheckBoxScalar() + checkBoxScalar.Checked = False + End Sub + Public Sub ShowColumnSelector(bShow As Boolean) btnAdd.Visible = bShow btnDataOptions.Visible = bShow