From ad8107abaf8c46167a6b1dbacff2dd8f5e4ced3a Mon Sep 17 00:00:00 2001 From: Raymond Date: Mon, 20 Nov 2023 10:06:34 +0000 Subject: [PATCH 01/31] Added Numeric button to dlg Visualize data --- instat/dlgVisualizeData.Designer.vb | 83 +++++++++++++++++++++++-- instat/dlgVisualizeData.vb | 94 ++++++++++++++++------------- 2 files changed, 129 insertions(+), 48 deletions(-) diff --git a/instat/dlgVisualizeData.Designer.vb b/instat/dlgVisualizeData.Designer.vb index e74fb59e6e4..70eb33291f9 100644 --- a/instat/dlgVisualizeData.Designer.vb +++ b/instat/dlgVisualizeData.Designer.vb @@ -31,6 +31,11 @@ Partial Class dlgVisualizeData Me.lblMillionDataPoints = New System.Windows.Forms.Label() Me.lblPaltte = New System.Windows.Forms.Label() Me.lblSampling = New System.Windows.Forms.Label() + Me.rdoNumeric = New System.Windows.Forms.RadioButton() + Me.lblColour = New System.Windows.Forms.Label() + Me.lblpalettecolor = New System.Windows.Forms.Label() + Me.ucrInputColourPalette = New instat.ucrInputComboBox() + Me.ucrInputColour = New instat.ucrInputComboBox() Me.ucrNudAdjustSize = New instat.ucrNud() Me.ucrChkAdjustSize = New instat.ucrCheck() Me.ucrNudSamplingFunction = New instat.ucrNud() @@ -52,12 +57,12 @@ Partial Class dlgVisualizeData Me.rdoVisDat.FlatAppearance.BorderSize = 2 Me.rdoVisDat.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoVisDat.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoVisDat.Location = New System.Drawing.Point(60, 11) + Me.rdoVisDat.Location = New System.Drawing.Point(28, 11) Me.rdoVisDat.Name = "rdoVisDat" Me.rdoVisDat.Size = New System.Drawing.Size(100, 28) Me.rdoVisDat.TabIndex = 1 Me.rdoVisDat.TabStop = True - Me.rdoVisDat.Text = "Data" + Me.rdoVisDat.Text = "Column Type " Me.rdoVisDat.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoVisDat.UseVisualStyleBackColor = True ' @@ -68,9 +73,9 @@ Partial Class dlgVisualizeData Me.rdoVisMiss.FlatAppearance.BorderSize = 2 Me.rdoVisMiss.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoVisMiss.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoVisMiss.Location = New System.Drawing.Point(156, 11) + Me.rdoVisMiss.Location = New System.Drawing.Point(126, 11) Me.rdoVisMiss.Name = "rdoVisMiss" - Me.rdoVisMiss.Size = New System.Drawing.Size(100, 28) + Me.rdoVisMiss.Size = New System.Drawing.Size(77, 28) Me.rdoVisMiss.TabIndex = 2 Me.rdoVisMiss.TabStop = True Me.rdoVisMiss.Text = "Missing" @@ -84,12 +89,12 @@ Partial Class dlgVisualizeData Me.rdoVisGuess.FlatAppearance.BorderSize = 2 Me.rdoVisGuess.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoVisGuess.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoVisGuess.Location = New System.Drawing.Point(252, 11) + Me.rdoVisGuess.Location = New System.Drawing.Point(201, 11) Me.rdoVisGuess.Name = "rdoVisGuess" Me.rdoVisGuess.Size = New System.Drawing.Size(100, 28) Me.rdoVisGuess.TabIndex = 3 Me.rdoVisGuess.TabStop = True - Me.rdoVisGuess.Text = "Guess" + Me.rdoVisGuess.Text = "Row Type" Me.rdoVisGuess.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoVisGuess.UseVisualStyleBackColor = True ' @@ -150,6 +155,62 @@ Partial Class dlgVisualizeData Me.lblSampling.TabIndex = 9 Me.lblSampling.Text = "Sampling Fraction:" ' + 'rdoNumeric + ' + Me.rdoNumeric.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoNumeric.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoNumeric.FlatAppearance.BorderSize = 2 + Me.rdoNumeric.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoNumeric.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoNumeric.Location = New System.Drawing.Point(288, 11) + Me.rdoNumeric.Name = "rdoNumeric" + Me.rdoNumeric.Size = New System.Drawing.Size(94, 28) + Me.rdoNumeric.TabIndex = 21 + Me.rdoNumeric.TabStop = True + Me.rdoNumeric.Text = "Numeric" + Me.rdoNumeric.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoNumeric.UseVisualStyleBackColor = True + ' + 'lblColour + ' + Me.lblColour.AutoSize = True + Me.lblColour.Location = New System.Drawing.Point(250, 274) + Me.lblColour.Name = "lblColour" + Me.lblColour.Size = New System.Drawing.Size(40, 13) + Me.lblColour.TabIndex = 23 + Me.lblColour.Text = "Colour:" + ' + 'lblpalettecolor + ' + Me.lblpalettecolor.AutoSize = True + Me.lblpalettecolor.Location = New System.Drawing.Point(281, 309) + Me.lblpalettecolor.Name = "lblpalettecolor" + Me.lblpalettecolor.Size = New System.Drawing.Size(43, 13) + Me.lblpalettecolor.TabIndex = 24 + Me.lblpalettecolor.Text = "Palette:" + ' + 'ucrInputColourPalette + ' + Me.ucrInputColourPalette.AddQuotesIfUnrecognised = True + Me.ucrInputColourPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputColourPalette.GetSetSelectedIndex = -1 + Me.ucrInputColourPalette.IsReadOnly = False + Me.ucrInputColourPalette.Location = New System.Drawing.Point(330, 307) + Me.ucrInputColourPalette.Name = "ucrInputColourPalette" + Me.ucrInputColourPalette.Size = New System.Drawing.Size(85, 21) + Me.ucrInputColourPalette.TabIndex = 25 + ' + 'ucrInputColour + ' + 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(299, 269) + Me.ucrInputColour.Name = "ucrInputColour" + Me.ucrInputColour.Size = New System.Drawing.Size(85, 21) + Me.ucrInputColour.TabIndex = 22 + ' 'ucrNudAdjustSize ' Me.ucrNudAdjustSize.AutoSize = True @@ -283,6 +344,11 @@ Partial Class dlgVisualizeData Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(418, 441) + Me.Controls.Add(Me.ucrInputColourPalette) + Me.Controls.Add(Me.lblpalettecolor) + Me.Controls.Add(Me.lblColour) + Me.Controls.Add(Me.ucrInputColour) + Me.Controls.Add(Me.rdoNumeric) Me.Controls.Add(Me.ucrNudAdjustSize) Me.Controls.Add(Me.ucrChkAdjustSize) Me.Controls.Add(Me.lblSampling) @@ -336,4 +402,9 @@ Partial Class dlgVisualizeData Friend WithEvents ucrNudSamplingFunction As ucrNud Friend WithEvents ucrNudAdjustSize As ucrNud Friend WithEvents ucrChkAdjustSize As ucrCheck + Friend WithEvents rdoNumeric As RadioButton + Friend WithEvents ucrInputColour As ucrInputComboBox + Friend WithEvents lblColour As Label + Friend WithEvents ucrInputColourPalette As ucrInputComboBox + Friend WithEvents lblpalettecolor As Label End Class \ No newline at end of file diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 3a915058943..a0ddfe4a4b9 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -22,15 +22,13 @@ Public Class dlgVisualizeData Private clsVisDatFunction As New RFunction Private clsVisMissFunction As New RFunction Private clsVisGuessFunction As New RFunction + Private clsVisValueFunction As New RFunction Private clsCurrBaseFunction As New RFunction Private clsFilterFunction As New RFunction Private clsAsLogicalFunction As New RFunction Private clsRBinonFunction As New RFunction - Private clsElementTextFunction As New RFunction - Private clsThemeFunction As New RFunction Private clsNRowFunction As New RFunction Private clsPipeOperator As New ROperator - Private clsBaseOperator As New ROperator Private Sub dlgVisualizeData_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -47,11 +45,11 @@ Public Class dlgVisualizeData End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 54 Dim lstMaximumControls As New List(Of Control) Dim lstMaximumSizeControls As New List(Of Control) Dim dctPalette As New Dictionary(Of String, String) Dim dctPaletteGuess As New Dictionary(Of String, String) + Dim dctColourPallette As New Dictionary(Of String, String) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrBase.clsRsyntax.iCallType = 3 @@ -59,16 +57,25 @@ Public Class dlgVisualizeData ucrPnlVisualizeData.AddRadioButton(rdoVisDat) ucrPnlVisualizeData.AddRadioButton(rdoVisMiss) ucrPnlVisualizeData.AddRadioButton(rdoVisGuess) + ucrPnlVisualizeData.AddRadioButton(rdoNumeric) ucrPnlVisualizeData.AddFunctionNamesCondition(rdoVisDat, "vis_dat") ucrPnlVisualizeData.AddFunctionNamesCondition(rdoVisMiss, "vis_miss") ucrPnlVisualizeData.AddFunctionNamesCondition(rdoVisGuess, "vis_guess") + ucrPnlVisualizeData.AddFunctionNamesCondition(rdoNumeric, "vis_value") ucrPnlVisualizeData.AddToLinkedControls(ucrChkSortVariables, {rdoVisDat, rdoVisMiss}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrInputComboboxPalette, {rdoVisDat, rdoVisGuess}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrNudMaximumSize, {rdoVisDat, rdoVisMiss}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.9) ucrPnlSelectData.AddRadioButton(rdoWholeDataFrame) ucrPnlSelectData.AddRadioButton(rdoSelectedColumn) + 'ucrPnlVisualizeData.AddToLinkedControls(ucrInputColourPalette, {rdoNumeric}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Viridis") + ucrPnlVisualizeData.AddToLinkedControls({ucrInputColour, ucrInputColourPalette}, {rdoNumeric}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Grey") + + ucrInputColour.SetParameter(New RParameter("na_colour", 4)) + ucrInputColour.SetLinkedDisplayControl(lblColour) + ucrInputColour.SetRDefault(Chr(34) & "Grey" & Chr(34)) + ucrInputColour.SetItems(New Dictionary(Of String, String)(GgplotDefaults.dctColour)) ucrPnlSelectData.AddParameterPresentCondition(rdoWholeDataFrame, "data") ucrPnlSelectData.AddParameterPresentCondition(rdoSelectedColumn, "x") @@ -77,6 +84,15 @@ Public Class dlgVisualizeData ucrChkSortVariables.SetText("Sort Variables") ucrChkSortVariables.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrInputColourPalette.SetParameter(New RParameter("viridis_option", 3)) + dctColourPallette.Add("Viridis", Chr(34) & "A" & Chr(34)) + dctColourPallette.Add("Magma", Chr(34) & "B" & Chr(34)) + dctColourPallette.Add("Inferno", Chr(34) & "C" & Chr(34)) + dctColourPallette.Add("Plasma", Chr(34) & "D" & Chr(34)) + dctColourPallette.Add("Cividis", Chr(34) & "E" & Chr(34)) + ucrInputColourPalette.SetItems(dctColourPallette) + ucrInputColourPalette.SetDropDownStyleAsNonEditable() + ucrInputComboboxPalette.SetParameter(New RParameter("palette", 2)) dctPalette.Add("default", Chr(34) & "default" & Chr(34)) dctPalette.Add("qual", Chr(34) & "qual" & Chr(34)) @@ -84,24 +100,17 @@ Public Class dlgVisualizeData ucrInputComboboxPalette.SetDropDownStyleAsNonEditable() ucrInputComboboxPalette.SetItems(dctPalette) - ucrNudMaximumSize.SetMinMax(0.1, Integer.MaxValue) ucrNudMaximumSize.DecimalPlaces = 1 ucrNudMaximumSize.Increment = 0.1 + ucrNudMaximumSize.Minimum = 0.1 + ucrNudMaximumSize.Maximum = Integer.MaxValue ' Not yet implemented ucrNudSamplingFunction.SetParameter(New RParameter("prob", 2)) - ucrNudSamplingFunction.SetMinMax(0.01, 1) ucrNudSamplingFunction.DecimalPlaces = 2 ucrNudSamplingFunction.Increment = 0.01 - - ucrChkAdjustSize.SetText("Adjust size of variable names:") - ucrChkAdjustSize.AddToLinkedControls(ucrNudAdjustSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=5) - ucrNudAdjustSize.SetParameter(New RParameter("size", 0)) - ucrNudAdjustSize.SetMinMax(0.1, 15) - ucrNudAdjustSize.DecimalPlaces = 1 - ucrNudAdjustSize.Increment = 0.1 - ucrChkAdjustSize.AddParameterPresentCondition(True, "size") - ucrChkAdjustSize.AddParameterPresentCondition(False, "size", False) + ucrNudSamplingFunction.Minimum = 0.01 + ucrNudSamplingFunction.Maximum = 1 ucrReceiverVisualizeData.SetParameter(New RParameter("x", 0)) ucrReceiverVisualizeData.SetParameterIsRFunction() @@ -131,13 +140,11 @@ Public Class dlgVisualizeData clsVisDatFunction = New RFunction clsVisMissFunction = New RFunction clsVisGuessFunction = New RFunction + clsVisValueFunction = New RFunction clsFilterFunction = New RFunction clsRBinonFunction = New RFunction clsAsLogicalFunction = New RFunction clsNRowFunction = New RFunction - clsElementTextFunction = New RFunction - clsThemeFunction = New RFunction - clsBaseOperator = New ROperator clsPipeOperator = New ROperator ucrSelectorVisualizeData.Reset() @@ -145,13 +152,6 @@ Public Class dlgVisualizeData clsCurrBaseFunction = clsVisDatFunction - clsThemeFunction.SetPackageName("ggplot2") - clsThemeFunction.SetRCommand("theme") - clsThemeFunction.AddParameter("axis.text.x", clsRFunctionParameter:=clsElementTextFunction, iPosition:=0) - - clsElementTextFunction.SetPackageName("ggplot2") - clsElementTextFunction.SetRCommand("element_text") - clsVisDatFunction.SetPackageName("visdat") clsVisDatFunction.SetRCommand("vis_dat") clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) @@ -168,6 +168,12 @@ Public Class dlgVisualizeData clsVisMissFunction.AddParameter("show_perc_col", "TRUE", iPosition:=4) clsVisMissFunction.AddParameter("warn_large_data", "TRUE", iPosition:=6) + clsVisValueFunction.SetPackageName("visdat") + clsVisValueFunction.SetRCommand("vis_value") + clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisValueFunction.AddParameter("viridis_option", Chr(34) & "A" & Chr(34), iPosition:=2) + clsVisValueFunction.AddParameter("na_color", Chr(34) & "grey" & Chr(34), iPosition:=2) + clsPipeOperator.SetOperation("%>%") clsPipeOperator.AddParameter("right", clsRFunctionParameter:=clsFilterFunction, iPosition:=1) @@ -189,29 +195,33 @@ Public Class dlgVisualizeData clsVisGuessFunction.SetRCommand("vis_guess") clsVisGuessFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) - clsBaseOperator.SetOperation("+") - clsBaseOperator.AddParameter("left", clsRFunctionParameter:=clsCurrBaseFunction, iPosition:=0) - - clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorVisualizeData.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + clsCurrBaseFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorVisualizeData.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") + ucrBase.clsRsyntax.SetBaseRFunction(clsCurrBaseFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("x", 0), 1) ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("x", 0), 2) + ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsVisValueFunction, New RParameter("x", 0), 3) + ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsPipeOperator, New RParameter("left", 0, bNewIncludeArgumentName:=False), 3) + ucrSelectorVisualizeData.AddAdditionalCodeParameterPair(clsPipeOperator, New RParameter("left", 0, bNewIncludeArgumentName:=False), 1) + ucrSaveGraph.AddAdditionalRCode(clsVisMissFunction, iAdditionalPairNo:=1) + ucrSaveGraph.AddAdditionalRCode(clsVisGuessFunction, iAdditionalPairNo:=2) + ucrSaveGraph.AddAdditionalRCode(clsVisValueFunction, iAdditionalPairNo:=2) ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("palette", 1), iAdditionalPairNo:=1) ucrChkSortVariables.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("sort_miss", 2), iAdditionalPairNo:=1) + 'ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisValueFunction, New RParameter("viridis_option", 1), iAdditionalPairNo:=1) ucrPnlSelectData.SetRCode(clsCurrBaseFunction, bReset) ucrPnlVisualizeData.SetRCode(clsCurrBaseFunction, bReset) ucrReceiverVisualizeData.SetRCode(clsVisDatFunction, bReset) ucrSelectorVisualizeData.SetRCode(clsNRowFunction, bReset) - ucrSaveGraph.SetRCode(clsBaseOperator, bReset) + ucrSaveGraph.SetRCode(clsVisDatFunction, bReset) ucrInputComboboxPalette.SetRCode(clsVisDatFunction, bReset) + ucrInputColourPalette.SetRCode(clsVisValueFunction, bReset) + ucrInputColour.SetRCode(clsVisValueFunction, bReset) ucrChkSortVariables.SetRCode(clsVisDatFunction) - ucrNudAdjustSize.SetRCode(clsElementTextFunction, bReset) - ucrChkAdjustSize.SetRCode(clsElementTextFunction, bReset) ucrNudSamplingFunction.SetRCode(clsRBinonFunction, bReset) End Sub @@ -241,8 +251,11 @@ Public Class dlgVisualizeData ElseIf rdoVisGuess.Checked Then ucrSaveGraph.SetPrefix("vis_guess") clsCurrBaseFunction = clsVisGuessFunction + ElseIf rdoNumeric.Checked Then + ucrSaveGraph.SetPrefix("vis_value") + clsCurrBaseFunction = clsVisValueFunction End If - ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + ucrBase.clsRsyntax.SetBaseRFunction(clsCurrBaseFunction) AddRemoveDataHideOptionsButtons() End Sub @@ -285,6 +298,7 @@ Public Class dlgVisualizeData clsVisDatFunction.RemoveParameterByName("data") clsVisGuessFunction.RemoveParameterByName("data") clsVisMissFunction.RemoveParameterByName("data") + clsVisValueFunction.RemoveParameterByName("data") If ucrNudSamplingFunction.Value = 1 Then clsVisDatFunction.RemoveParameterByName("x") clsVisGuessFunction.RemoveParameterByName("x") @@ -300,12 +314,14 @@ Public Class dlgVisualizeData clsVisDatFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) clsVisGuessFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) clsVisMissFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) + clsVisValueFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) clsPipeOperator.AddParameter("left", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), iPosition:=0) End If ElseIf rdoWholeDataFrame.Checked Then clsVisDatFunction.RemoveParameterByName("x") clsVisGuessFunction.RemoveParameterByName("x") clsVisMissFunction.RemoveParameterByName("x") + clsVisValueFunction.RemoveParameterByName("x") If ucrNudSamplingFunction.Value = 1 Then clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) clsVisGuessFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) @@ -316,15 +332,9 @@ Public Class dlgVisualizeData clsVisDatFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) clsVisGuessFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) clsVisMissFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) - End If - End If - End Sub + clsVisValueFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) - Private Sub ucrChkAdjustSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAdjustSize.ControlValueChanged - If ucrChkAdjustSize.Checked Then - clsBaseOperator.AddParameter("right", clsRFunctionParameter:=clsThemeFunction, iPosition:=1) - Else - clsBaseOperator.RemoveParameterByName("right") + End If End If End Sub From 5d297cb2d4e2c03baf1a2e318645a0070e570e9a Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Mon, 20 Nov 2023 17:00:40 +0300 Subject: [PATCH 02/31] changes --- instat/dlgVisualizeData.Designer.vb | 4 ++-- instat/dlgVisualizeData.vb | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/instat/dlgVisualizeData.Designer.vb b/instat/dlgVisualizeData.Designer.vb index 70eb33291f9..05e56130709 100644 --- a/instat/dlgVisualizeData.Designer.vb +++ b/instat/dlgVisualizeData.Designer.vb @@ -303,9 +303,9 @@ Partial Class dlgVisualizeData 'ucrPnlVisualizeData ' Me.ucrPnlVisualizeData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlVisualizeData.Location = New System.Drawing.Point(44, 1) + Me.ucrPnlVisualizeData.Location = New System.Drawing.Point(12, 1) Me.ucrPnlVisualizeData.Name = "ucrPnlVisualizeData" - Me.ucrPnlVisualizeData.Size = New System.Drawing.Size(324, 46) + Me.ucrPnlVisualizeData.Size = New System.Drawing.Size(388, 46) Me.ucrPnlVisualizeData.TabIndex = 0 ' 'ucrSaveGraph diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index a0ddfe4a4b9..85f63847a38 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -171,7 +171,7 @@ Public Class dlgVisualizeData clsVisValueFunction.SetPackageName("visdat") clsVisValueFunction.SetRCommand("vis_value") clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) - clsVisValueFunction.AddParameter("viridis_option", Chr(34) & "A" & Chr(34), iPosition:=2) + clsVisValueFunction.AddParameter("viridis_option", Chr(34) & "A" & Chr(34), iPosition:=1) clsVisValueFunction.AddParameter("na_color", Chr(34) & "grey" & Chr(34), iPosition:=2) clsPipeOperator.SetOperation("%>%") @@ -207,7 +207,7 @@ Public Class dlgVisualizeData ucrSelectorVisualizeData.AddAdditionalCodeParameterPair(clsPipeOperator, New RParameter("left", 0, bNewIncludeArgumentName:=False), 1) ucrSaveGraph.AddAdditionalRCode(clsVisMissFunction, iAdditionalPairNo:=1) ucrSaveGraph.AddAdditionalRCode(clsVisGuessFunction, iAdditionalPairNo:=2) - ucrSaveGraph.AddAdditionalRCode(clsVisValueFunction, iAdditionalPairNo:=2) + ucrSaveGraph.AddAdditionalRCode(clsVisValueFunction, iAdditionalPairNo:=3) ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("palette", 1), iAdditionalPairNo:=1) ucrChkSortVariables.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("sort_miss", 2), iAdditionalPairNo:=1) 'ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisValueFunction, New RParameter("viridis_option", 1), iAdditionalPairNo:=1) @@ -303,6 +303,8 @@ Public Class dlgVisualizeData clsVisDatFunction.RemoveParameterByName("x") clsVisGuessFunction.RemoveParameterByName("x") clsVisMissFunction.RemoveParameterByName("x") + clsVisValueFunction.RemoveParameterByName("x") + clsVisValueFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) clsVisDatFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) clsVisGuessFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) clsVisMissFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) @@ -326,6 +328,7 @@ Public Class dlgVisualizeData clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) clsVisGuessFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) Else clsPipeOperator.RemoveParameterByName("left") clsPipeOperator.AddParameter("left", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) @@ -333,7 +336,6 @@ Public Class dlgVisualizeData clsVisGuessFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) clsVisMissFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) clsVisValueFunction.AddParameter("data", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) - End If End If End Sub From 37e35dc06893ad1e022e871dbda3539a62c83059 Mon Sep 17 00:00:00 2001 From: Raymond Date: Fri, 24 Nov 2023 16:12:04 +0000 Subject: [PATCH 03/31] Adding Facets to visualize data dialogue --- instat/dlgVisualizeData.Designer.vb | 40 ++++++++++++++++++++++++----- instat/dlgVisualizeData.vb | 33 ++++++++++++++++++++---- 2 files changed, 62 insertions(+), 11 deletions(-) diff --git a/instat/dlgVisualizeData.Designer.vb b/instat/dlgVisualizeData.Designer.vb index 05e56130709..0cf2aca7215 100644 --- a/instat/dlgVisualizeData.Designer.vb +++ b/instat/dlgVisualizeData.Designer.vb @@ -48,6 +48,8 @@ Partial Class dlgVisualizeData Me.ucrSaveGraph = New instat.ucrSave() Me.ucrSelectorVisualizeData = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.ucrByFactorsReceiver = New instat.ucrReceiverSingle() + Me.ucrChkFacet = New instat.ucrCheck() Me.SuspendLayout() ' 'rdoVisDat @@ -149,7 +151,7 @@ Partial Class dlgVisualizeData 'lblSampling ' Me.lblSampling.AutoSize = True - Me.lblSampling.Location = New System.Drawing.Point(191, 244) + Me.lblSampling.Location = New System.Drawing.Point(191, 275) Me.lblSampling.Name = "lblSampling" Me.lblSampling.Size = New System.Drawing.Size(94, 13) Me.lblSampling.TabIndex = 9 @@ -174,7 +176,7 @@ Partial Class dlgVisualizeData 'lblColour ' Me.lblColour.AutoSize = True - Me.lblColour.Location = New System.Drawing.Point(250, 274) + Me.lblColour.Location = New System.Drawing.Point(10, 296) Me.lblColour.Name = "lblColour" Me.lblColour.Size = New System.Drawing.Size(40, 13) Me.lblColour.TabIndex = 23 @@ -183,7 +185,7 @@ Partial Class dlgVisualizeData 'lblpalettecolor ' Me.lblpalettecolor.AutoSize = True - Me.lblpalettecolor.Location = New System.Drawing.Point(281, 309) + Me.lblpalettecolor.Location = New System.Drawing.Point(7, 269) Me.lblpalettecolor.Name = "lblpalettecolor" Me.lblpalettecolor.Size = New System.Drawing.Size(43, 13) Me.lblpalettecolor.TabIndex = 24 @@ -195,7 +197,7 @@ Partial Class dlgVisualizeData Me.ucrInputColourPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputColourPalette.GetSetSelectedIndex = -1 Me.ucrInputColourPalette.IsReadOnly = False - Me.ucrInputColourPalette.Location = New System.Drawing.Point(330, 307) + Me.ucrInputColourPalette.Location = New System.Drawing.Point(55, 266) Me.ucrInputColourPalette.Name = "ucrInputColourPalette" Me.ucrInputColourPalette.Size = New System.Drawing.Size(85, 21) Me.ucrInputColourPalette.TabIndex = 25 @@ -206,7 +208,7 @@ Partial Class dlgVisualizeData Me.ucrInputColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputColour.GetSetSelectedIndex = -1 Me.ucrInputColour.IsReadOnly = False - Me.ucrInputColour.Location = New System.Drawing.Point(299, 269) + Me.ucrInputColour.Location = New System.Drawing.Point(55, 293) Me.ucrInputColour.Name = "ucrInputColour" Me.ucrInputColour.Size = New System.Drawing.Size(85, 21) Me.ucrInputColour.TabIndex = 22 @@ -238,7 +240,7 @@ Partial Class dlgVisualizeData Me.ucrNudSamplingFunction.AutoSize = True Me.ucrNudSamplingFunction.DecimalPlaces = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudSamplingFunction.Increment = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSamplingFunction.Location = New System.Drawing.Point(330, 242) + Me.ucrNudSamplingFunction.Location = New System.Drawing.Point(330, 273) Me.ucrNudSamplingFunction.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSamplingFunction.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSamplingFunction.Name = "ucrNudSamplingFunction" @@ -338,12 +340,36 @@ Partial Class dlgVisualizeData Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 18 ' + 'ucrByFactorsReceiver + ' + Me.ucrByFactorsReceiver.AutoSize = True + Me.ucrByFactorsReceiver.frmParent = Me + Me.ucrByFactorsReceiver.Location = New System.Drawing.Point(262, 245) + Me.ucrByFactorsReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrByFactorsReceiver.Name = "ucrByFactorsReceiver" + Me.ucrByFactorsReceiver.Selector = Nothing + Me.ucrByFactorsReceiver.Size = New System.Drawing.Size(120, 20) + Me.ucrByFactorsReceiver.strNcFilePath = "" + Me.ucrByFactorsReceiver.TabIndex = 26 + Me.ucrByFactorsReceiver.ucrSelector = Nothing + ' + 'ucrChkFacet + ' + Me.ucrChkFacet.AutoSize = True + Me.ucrChkFacet.Checked = False + Me.ucrChkFacet.Location = New System.Drawing.Point(258, 222) + Me.ucrChkFacet.Name = "ucrChkFacet" + Me.ucrChkFacet.Size = New System.Drawing.Size(124, 23) + Me.ucrChkFacet.TabIndex = 27 + ' 'dlgVisualizeData ' 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(418, 441) + Me.Controls.Add(Me.ucrChkFacet) + Me.Controls.Add(Me.ucrByFactorsReceiver) Me.Controls.Add(Me.ucrInputColourPalette) Me.Controls.Add(Me.lblpalettecolor) Me.Controls.Add(Me.lblColour) @@ -407,4 +433,6 @@ Partial Class dlgVisualizeData Friend WithEvents lblColour As Label Friend WithEvents ucrInputColourPalette As ucrInputComboBox Friend WithEvents lblpalettecolor As Label + Friend WithEvents ucrChkFacet As ucrCheck + Friend WithEvents ucrByFactorsReceiver As ucrReceiverSingle End Class \ No newline at end of file diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 85f63847a38..900b961c253 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -64,13 +64,22 @@ Public Class dlgVisualizeData ucrPnlVisualizeData.AddFunctionNamesCondition(rdoVisGuess, "vis_guess") ucrPnlVisualizeData.AddFunctionNamesCondition(rdoNumeric, "vis_value") - ucrPnlVisualizeData.AddToLinkedControls(ucrChkSortVariables, {rdoVisDat, rdoVisMiss}, bNewLinkedHideIfParameterMissing:=True) + ucrByFactorsReceiver.SetParameter(New RParameter("facet", 3)) + ucrByFactorsReceiver.Selector = ucrSelectorVisualizeData + ucrByFactorsReceiver.SetIncludedDataTypes({"factor"}) + ucrByFactorsReceiver.strSelectorHeading = "Factors" + ucrByFactorsReceiver.SetParameterIsString() + 'ucrByFactorsReceiver.bWithQuotes = False + ucrByFactorsReceiver.SetValuesToIgnore({Chr(34) & Chr(34)}) + ucrByFactorsReceiver.bAddParameterIfEmpty = True + + ucrPnlVisualizeData.AddToLinkedControls({ucrChkSortVariables, ucrChkFacet}, {rdoVisDat, rdoVisMiss}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrInputComboboxPalette, {rdoVisDat, rdoVisGuess}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrNudMaximumSize, {rdoVisDat, rdoVisMiss}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.9) ucrPnlSelectData.AddRadioButton(rdoWholeDataFrame) ucrPnlSelectData.AddRadioButton(rdoSelectedColumn) - 'ucrPnlVisualizeData.AddToLinkedControls(ucrInputColourPalette, {rdoNumeric}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Viridis") - ucrPnlVisualizeData.AddToLinkedControls({ucrInputColour, ucrInputColourPalette}, {rdoNumeric}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Grey") + ucrPnlVisualizeData.AddToLinkedControls(ucrInputColourPalette, {rdoNumeric}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Viridis") + ucrPnlVisualizeData.AddToLinkedControls({ucrInputColour}, {rdoNumeric}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Grey") ucrInputColour.SetParameter(New RParameter("na_colour", 4)) ucrInputColour.SetLinkedDisplayControl(lblColour) @@ -125,6 +134,11 @@ Public Class dlgVisualizeData lstMaximumSizeControls.Add(lblMillionDataPoints) lstMaximumSizeControls.Add(lblMaximumSize) ucrNudMaximumSize.SetLinkedDisplayControl(lstMaximumSizeControls) + ucrInputColourPalette.SetLinkedDisplayControl(lblpalettecolor) + + ucrChkFacet.SetText("Facets") + ucrChkFacet.AddToLinkedControls(ucrByFactorsReceiver, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrNudSamplingFunction.SetLinkedDisplayControl(lblSampling) ucrPnlSelectData.AddToLinkedControls(ucrReceiverVisualizeData, {rdoSelectedColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -172,7 +186,7 @@ Public Class dlgVisualizeData clsVisValueFunction.SetRCommand("vis_value") clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) clsVisValueFunction.AddParameter("viridis_option", Chr(34) & "A" & Chr(34), iPosition:=1) - clsVisValueFunction.AddParameter("na_color", Chr(34) & "grey" & Chr(34), iPosition:=2) + clsVisValueFunction.AddParameter("na_colour", Chr(34) & "grey" & Chr(34), iPosition:=2) clsPipeOperator.SetOperation("%>%") clsPipeOperator.AddParameter("right", clsRFunctionParameter:=clsFilterFunction, iPosition:=1) @@ -210,9 +224,10 @@ Public Class dlgVisualizeData ucrSaveGraph.AddAdditionalRCode(clsVisValueFunction, iAdditionalPairNo:=3) ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("palette", 1), iAdditionalPairNo:=1) ucrChkSortVariables.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("sort_miss", 2), iAdditionalPairNo:=1) - 'ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisValueFunction, New RParameter("viridis_option", 1), iAdditionalPairNo:=1) + ucrByFactorsReceiver.AddAdditionalCodeParameterPair(clsVisMissFunction, ucrByFactorsReceiver.GetParameter(), iAdditionalPairNo:=1) + ucrByFactorsReceiver.SetRCode(clsVisDatFunction, bReset) ucrPnlSelectData.SetRCode(clsCurrBaseFunction, bReset) ucrPnlVisualizeData.SetRCode(clsCurrBaseFunction, bReset) ucrReceiverVisualizeData.SetRCode(clsVisDatFunction, bReset) @@ -343,4 +358,12 @@ Public Class dlgVisualizeData Private Sub ucrCore_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverVisualizeData.ControlContentsChanged, ucrSelectorVisualizeData.ControlContentsChanged, ucrPnlSelectData.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrNudMaximumSize.ControlValueChanged, ucrNudSamplingFunction.ControlValueChanged TestOkEnabled() End Sub + + Private Sub ucrChkFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkFacet.ControlValueChanged + If ucrChkFacet.Checked Then + ucrByFactorsReceiver.SetMeAsReceiver() + Else + ucrReceiverVisualizeData.SetMeAsReceiver() + End If + End Sub End Class \ No newline at end of file From 8b5127b132b5c5166cf34312fa66b1131c656040 Mon Sep 17 00:00:00 2001 From: Raymond Date: Mon, 4 Dec 2023 15:56:28 +0000 Subject: [PATCH 04/31] Code changes --- instat/dlgVisualizeData.vb | 42 ++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 900b961c253..92f4f1b37c4 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -27,6 +27,7 @@ Public Class dlgVisualizeData Private clsFilterFunction As New RFunction Private clsAsLogicalFunction As New RFunction Private clsRBinonFunction As New RFunction + Private clsGetVariableFunction As New RFunction Private clsNRowFunction As New RFunction Private clsPipeOperator As New ROperator @@ -69,7 +70,7 @@ Public Class dlgVisualizeData ucrByFactorsReceiver.SetIncludedDataTypes({"factor"}) ucrByFactorsReceiver.strSelectorHeading = "Factors" ucrByFactorsReceiver.SetParameterIsString() - 'ucrByFactorsReceiver.bWithQuotes = False + ucrByFactorsReceiver.bWithQuotes = False ucrByFactorsReceiver.SetValuesToIgnore({Chr(34) & Chr(34)}) ucrByFactorsReceiver.bAddParameterIfEmpty = True @@ -159,23 +160,27 @@ Public Class dlgVisualizeData clsRBinonFunction = New RFunction clsAsLogicalFunction = New RFunction clsNRowFunction = New RFunction + clsGetVariableFunction = New RFunction clsPipeOperator = New ROperator ucrSelectorVisualizeData.Reset() ucrSaveGraph.Reset() clsCurrBaseFunction = clsVisDatFunction + clsGetVariableFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") + clsGetVariableFunction.SetAssignTo("colnames") + clsGetVariableFunction.AddParameter("force_as_data_frame", "TRUE") clsVisDatFunction.SetPackageName("visdat") clsVisDatFunction.SetRCommand("vis_dat") - clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisDatFunction.AddParameter("sort_type", "FALSE", iPosition:=1) clsVisDatFunction.AddParameter("palette", Chr(34) & "default" & Chr(34), iPosition:=2) clsVisDatFunction.AddParameter("warn_large_data", "TRUE", iPosition:=3) clsVisMissFunction.SetPackageName("visdat") clsVisMissFunction.SetRCommand("vis_miss") - clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisMissFunction.AddParameter("cluster", "FALSE", iPosition:=1) clsVisMissFunction.AddParameter("sort_miss", "FALSE", iPosition:=2) clsVisMissFunction.AddParameter("show_perc", "TRUE", iPosition:=3) @@ -230,7 +235,6 @@ Public Class dlgVisualizeData ucrByFactorsReceiver.SetRCode(clsVisDatFunction, bReset) ucrPnlSelectData.SetRCode(clsCurrBaseFunction, bReset) ucrPnlVisualizeData.SetRCode(clsCurrBaseFunction, bReset) - ucrReceiverVisualizeData.SetRCode(clsVisDatFunction, bReset) ucrSelectorVisualizeData.SetRCode(clsNRowFunction, bReset) ucrSaveGraph.SetRCode(clsVisDatFunction, bReset) ucrInputComboboxPalette.SetRCode(clsVisDatFunction, bReset) @@ -238,10 +242,13 @@ Public Class dlgVisualizeData ucrInputColour.SetRCode(clsVisValueFunction, bReset) ucrChkSortVariables.SetRCode(clsVisDatFunction) ucrNudSamplingFunction.SetRCode(clsRBinonFunction, bReset) + If bReset Then + ucrReceiverVisualizeData.SetRCode(clsVisDatFunction, bReset) + End If End Sub Private Sub TestOkEnabled() - If ucrSelectorVisualizeData.ucrAvailableDataFrames.cboAvailableDataFrames.Text = "" OrElse (rdoSelectedColumn.Checked AndAlso ucrReceiverVisualizeData.IsEmpty) OrElse Not ucrSaveGraph.IsComplete() OrElse (ucrNudMaximumSize.Visible = True AndAlso ucrNudMaximumSize.GetText = "") OrElse (ucrNudSamplingFunction.GetText = "") Then + If ucrSelectorVisualizeData.ucrAvailableDataFrames.cboAvailableDataFrames.Text = "" OrElse (rdoSelectedColumn.Checked AndAlso ucrReceiverVisualizeData.IsEmpty) OrElse (rdoNumeric.Checked AndAlso rdoWholeDataFrame.Checked) OrElse Not ucrSaveGraph.IsComplete() OrElse (ucrNudMaximumSize.Visible = True AndAlso ucrNudMaximumSize.GetText = "") OrElse (ucrNudSamplingFunction.GetText = "") Then ucrBase.OKEnabled(False) Else ucrBase.OKEnabled(True) @@ -272,6 +279,11 @@ Public Class dlgVisualizeData End If ucrBase.clsRsyntax.SetBaseRFunction(clsCurrBaseFunction) AddRemoveDataHideOptionsButtons() + If rdoNumeric.Checked Then + rdoWholeDataFrame.Enabled = False + Else + rdoWholeDataFrame.Enabled = True + End If End Sub Private Sub AddRemoveDataHideOptionsButtons() @@ -320,9 +332,9 @@ Public Class dlgVisualizeData clsVisMissFunction.RemoveParameterByName("x") clsVisValueFunction.RemoveParameterByName("x") clsVisValueFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) - clsVisDatFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) + clsVisDatFunction.AddParameter("x", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisGuessFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) - clsVisMissFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) + clsVisMissFunction.AddParameter("x", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) Else ' if it is not checked we run vis_dat(col = columns selected) clsVisDatFunction.RemoveParameterByName("x") clsVisGuessFunction.RemoveParameterByName("x") @@ -340,9 +352,9 @@ Public Class dlgVisualizeData clsVisMissFunction.RemoveParameterByName("x") clsVisValueFunction.RemoveParameterByName("x") If ucrNudSamplingFunction.Value = 1 Then - clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisGuessFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) - clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) Else clsPipeOperator.RemoveParameterByName("left") @@ -366,4 +378,16 @@ Public Class dlgVisualizeData ucrReceiverVisualizeData.SetMeAsReceiver() End If End Sub + Private Sub ucrByFactorsReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrByFactorsReceiver.ControlValueChanged, ucrReceiverVisualizeData.ControlValueChanged, ucrSelectorVisualizeData.ControlValueChanged + If ucrReceiverVisualizeData.lstSelectedVariables.Items.Count <= 0 Then + Exit Sub + End If + Dim Lstvariable As List(Of String) = ucrReceiverVisualizeData.GetVariableNamesAsList + Dim StrFacetvariable As String = ucrByFactorsReceiver.GetVariableNames(False) + If Not ucrByFactorsReceiver.IsEmpty AndAlso Not Lstvariable.Contains(StrFacetvariable) Then + Lstvariable.Add(StrFacetvariable) + End If + clsGetVariableFunction.AddParameter("data_name", Chr(34) & ucrSelectorVisualizeData.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0) + clsGetVariableFunction.AddParameter("col_names", frmMain.clsRLink.GetListAsRString(Lstvariable, bWithQuotes:=True), iPosition:=1) + End Sub End Class \ No newline at end of file From 3156cc1e8241e0c33e35354c7347fddc78f5d22b Mon Sep 17 00:00:00 2001 From: Raymond Date: Wed, 6 Dec 2023 07:30:36 +0000 Subject: [PATCH 05/31] Code Changes --- instat/dlgVisualizeData.vb | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 92f4f1b37c4..99b387f515d 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -67,14 +67,13 @@ Public Class dlgVisualizeData ucrByFactorsReceiver.SetParameter(New RParameter("facet", 3)) ucrByFactorsReceiver.Selector = ucrSelectorVisualizeData - ucrByFactorsReceiver.SetIncludedDataTypes({"factor"}) - ucrByFactorsReceiver.strSelectorHeading = "Factors" ucrByFactorsReceiver.SetParameterIsString() ucrByFactorsReceiver.bWithQuotes = False ucrByFactorsReceiver.SetValuesToIgnore({Chr(34) & Chr(34)}) ucrByFactorsReceiver.bAddParameterIfEmpty = True - ucrPnlVisualizeData.AddToLinkedControls({ucrChkSortVariables, ucrChkFacet}, {rdoVisDat, rdoVisMiss}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlVisualizeData.AddToLinkedControls(ucrChkFacet, {rdoVisDat, rdoVisMiss, rdoNumeric}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlVisualizeData.AddToLinkedControls(ucrChkSortVariables, {rdoVisDat, rdoVisMiss}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrInputComboboxPalette, {rdoVisDat, rdoVisGuess}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrNudMaximumSize, {rdoVisDat, rdoVisMiss}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.9) ucrPnlSelectData.AddRadioButton(rdoWholeDataFrame) @@ -161,12 +160,12 @@ Public Class dlgVisualizeData clsAsLogicalFunction = New RFunction clsNRowFunction = New RFunction clsGetVariableFunction = New RFunction - clsPipeOperator = New ROperator ucrSelectorVisualizeData.Reset() ucrSaveGraph.Reset() clsCurrBaseFunction = clsVisDatFunction + clsGetVariableFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsGetVariableFunction.SetAssignTo("colnames") clsGetVariableFunction.AddParameter("force_as_data_frame", "TRUE") @@ -189,7 +188,7 @@ Public Class dlgVisualizeData clsVisValueFunction.SetPackageName("visdat") clsVisValueFunction.SetRCommand("vis_value") - clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) + clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisValueFunction.AddParameter("viridis_option", Chr(34) & "A" & Chr(34), iPosition:=1) clsVisValueFunction.AddParameter("na_colour", Chr(34) & "grey" & Chr(34), iPosition:=2) @@ -265,15 +264,19 @@ Public Class dlgVisualizeData Private Sub ucrPnlVisualizeData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlVisualizeData.ControlValueChanged If rdoVisDat.Checked Then + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger"}) ucrSaveGraph.SetPrefix("vis_dat") clsCurrBaseFunction = clsVisDatFunction ElseIf rdoVisMiss.Checked Then + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger"}) ucrSaveGraph.SetPrefix("vis_miss") clsCurrBaseFunction = clsVisMissFunction ElseIf rdoVisGuess.Checked Then + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger"}) ucrSaveGraph.SetPrefix("vis_guess") clsCurrBaseFunction = clsVisGuessFunction ElseIf rdoNumeric.Checked Then + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "interger"}) ucrSaveGraph.SetPrefix("vis_value") clsCurrBaseFunction = clsVisValueFunction End If @@ -288,9 +291,9 @@ Public Class dlgVisualizeData Private Sub AddRemoveDataHideOptionsButtons() If rdoWholeDataFrame.Checked Then - ucrSelectorVisualizeData.lstAvailableVariable.Visible = False - ucrSelectorVisualizeData.btnAdd.Visible = False - ucrSelectorVisualizeData.btnDataOptions.Visible = False + 'ucrSelectorVisualizeData.lstAvailableVariable.Visible = False + 'ucrSelectorVisualizeData.btnAdd.Visible = False + 'ucrSelectorVisualizeData.btnDataOptions.Visible = False ElseIf rdoSelectedColumn.Checked Then ucrSelectorVisualizeData.lstAvailableVariable.Visible = True ucrSelectorVisualizeData.btnAdd.Visible = True @@ -331,7 +334,7 @@ Public Class dlgVisualizeData clsVisGuessFunction.RemoveParameterByName("x") clsVisMissFunction.RemoveParameterByName("x") clsVisValueFunction.RemoveParameterByName("x") - clsVisValueFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) + clsVisValueFunction.AddParameter("x", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisDatFunction.AddParameter("x", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) clsVisGuessFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverVisualizeData.GetVariables(True), bIncludeArgumentName:=False, iPosition:=0) clsVisMissFunction.AddParameter("x", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) @@ -352,9 +355,9 @@ Public Class dlgVisualizeData clsVisMissFunction.RemoveParameterByName("x") clsVisValueFunction.RemoveParameterByName("x") If ucrNudSamplingFunction.Value = 1 Then - clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) + clsVisDatFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) clsVisGuessFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) - clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=clsGetVariableFunction, bIncludeArgumentName:=False, iPosition:=0) + clsVisMissFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) clsVisValueFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorVisualizeData.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0) Else clsPipeOperator.RemoveParameterByName("left") @@ -378,6 +381,7 @@ Public Class dlgVisualizeData ucrReceiverVisualizeData.SetMeAsReceiver() End If End Sub + Private Sub ucrByFactorsReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrByFactorsReceiver.ControlValueChanged, ucrReceiverVisualizeData.ControlValueChanged, ucrSelectorVisualizeData.ControlValueChanged If ucrReceiverVisualizeData.lstSelectedVariables.Items.Count <= 0 Then Exit Sub From 38a21e30820e84619f7ff6c09b9f2880190baef2 Mon Sep 17 00:00:00 2001 From: Raymond Date: Wed, 6 Dec 2023 13:01:54 +0000 Subject: [PATCH 06/31] Code Changes --- instat/dlgVisualizeData.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 99b387f515d..4d07a966bbe 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -67,12 +67,14 @@ Public Class dlgVisualizeData ucrByFactorsReceiver.SetParameter(New RParameter("facet", 3)) ucrByFactorsReceiver.Selector = ucrSelectorVisualizeData + ucrByFactorsReceiver.SetIncludedDataTypes({"factors"}) + ucrByFactorsReceiver.SetSelectorHeading("Factor") ucrByFactorsReceiver.SetParameterIsString() ucrByFactorsReceiver.bWithQuotes = False ucrByFactorsReceiver.SetValuesToIgnore({Chr(34) & Chr(34)}) ucrByFactorsReceiver.bAddParameterIfEmpty = True - ucrPnlVisualizeData.AddToLinkedControls(ucrChkFacet, {rdoVisDat, rdoVisMiss, rdoNumeric}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlVisualizeData.AddToLinkedControls(ucrChkFacet, {rdoVisDat, rdoVisMiss}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrChkSortVariables, {rdoVisDat, rdoVisMiss}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrInputComboboxPalette, {rdoVisDat, rdoVisGuess}, bNewLinkedHideIfParameterMissing:=True) ucrPnlVisualizeData.AddToLinkedControls(ucrNudMaximumSize, {rdoVisDat, rdoVisMiss}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.9) From a07ca73c663e5d22a275183d2796bfe218265a57 Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 7 Dec 2023 12:23:10 +0000 Subject: [PATCH 07/31] Code Changes --- instat/dlgVisualizeData.vb | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 4d07a966bbe..84542dcdfb9 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -67,7 +67,7 @@ Public Class dlgVisualizeData ucrByFactorsReceiver.SetParameter(New RParameter("facet", 3)) ucrByFactorsReceiver.Selector = ucrSelectorVisualizeData - ucrByFactorsReceiver.SetIncludedDataTypes({"factors"}) + ucrByFactorsReceiver.SetIncludedDataTypes({"factor", "ordered,factor"}) ucrByFactorsReceiver.SetSelectorHeading("Factor") ucrByFactorsReceiver.SetParameterIsString() ucrByFactorsReceiver.bWithQuotes = False @@ -230,10 +230,9 @@ Public Class dlgVisualizeData ucrSaveGraph.AddAdditionalRCode(clsVisValueFunction, iAdditionalPairNo:=3) ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("palette", 1), iAdditionalPairNo:=1) ucrChkSortVariables.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("sort_miss", 2), iAdditionalPairNo:=1) - ucrByFactorsReceiver.AddAdditionalCodeParameterPair(clsVisMissFunction, ucrByFactorsReceiver.GetParameter(), iAdditionalPairNo:=1) + 'ucrByFactorsReceiver.AddAdditionalCodeParameterPair(clsVisMissFunction, ucrByFactorsReceiver.GetParameter(), iAdditionalPairNo:=1) - - ucrByFactorsReceiver.SetRCode(clsVisDatFunction, bReset) + 'ucrByFactorsReceiver.SetRCode(clsVisDatFunction, bReset) ucrPnlSelectData.SetRCode(clsCurrBaseFunction, bReset) ucrPnlVisualizeData.SetRCode(clsCurrBaseFunction, bReset) ucrSelectorVisualizeData.SetRCode(clsNRowFunction, bReset) @@ -245,11 +244,12 @@ Public Class dlgVisualizeData ucrNudSamplingFunction.SetRCode(clsRBinonFunction, bReset) If bReset Then ucrReceiverVisualizeData.SetRCode(clsVisDatFunction, bReset) + ucrChkFacet.SetRCode(clsVisDatFunction, bReset) End If End Sub Private Sub TestOkEnabled() - If ucrSelectorVisualizeData.ucrAvailableDataFrames.cboAvailableDataFrames.Text = "" OrElse (rdoSelectedColumn.Checked AndAlso ucrReceiverVisualizeData.IsEmpty) OrElse (rdoNumeric.Checked AndAlso rdoWholeDataFrame.Checked) OrElse Not ucrSaveGraph.IsComplete() OrElse (ucrNudMaximumSize.Visible = True AndAlso ucrNudMaximumSize.GetText = "") OrElse (ucrNudSamplingFunction.GetText = "") Then + If ucrSelectorVisualizeData.ucrAvailableDataFrames.cboAvailableDataFrames.Text = "" OrElse (rdoSelectedColumn.Checked AndAlso ucrReceiverVisualizeData.IsEmpty) OrElse Not ucrSaveGraph.IsComplete() OrElse (ucrNudMaximumSize.Visible = True AndAlso ucrNudMaximumSize.GetText = "") OrElse (ucrNudSamplingFunction.GetText = "") Then ucrBase.OKEnabled(False) Else ucrBase.OKEnabled(True) @@ -293,10 +293,16 @@ Public Class dlgVisualizeData Private Sub AddRemoveDataHideOptionsButtons() If rdoWholeDataFrame.Checked Then - 'ucrSelectorVisualizeData.lstAvailableVariable.Visible = False - 'ucrSelectorVisualizeData.btnAdd.Visible = False - 'ucrSelectorVisualizeData.btnDataOptions.Visible = False - ElseIf rdoSelectedColumn.Checked Then + If ucrChkFacet.Checked Then + ucrSelectorVisualizeData.lstAvailableVariable.Visible = True + ucrSelectorVisualizeData.btnAdd.Visible = True + ucrSelectorVisualizeData.btnDataOptions.Visible = True + Else + ucrSelectorVisualizeData.lstAvailableVariable.Visible = False + ucrSelectorVisualizeData.btnAdd.Visible = False + ucrSelectorVisualizeData.btnDataOptions.Visible = False + End If + Else ucrSelectorVisualizeData.lstAvailableVariable.Visible = True ucrSelectorVisualizeData.btnAdd.Visible = True ucrSelectorVisualizeData.btnDataOptions.Visible = True @@ -379,9 +385,19 @@ Public Class dlgVisualizeData Private Sub ucrChkFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkFacet.ControlValueChanged If ucrChkFacet.Checked Then ucrByFactorsReceiver.SetMeAsReceiver() + If Not ucrByFactorsReceiver.IsEmpty Then + clsVisDatFunction.AddParameter("facet", ucrByFactorsReceiver.GetVariableNames(bWithQuotes:=False)) + clsVisMissFunction.AddParameter("facet", ucrByFactorsReceiver.GetVariableNames(bWithQuotes:=False)) + Else + clsVisDatFunction.RemoveParameterByName("facet") + clsVisMissFunction.RemoveParameterByName("facet") + End If Else ucrReceiverVisualizeData.SetMeAsReceiver() + clsVisDatFunction.RemoveParameterByName("facet") + clsVisMissFunction.RemoveParameterByName("facet") End If + AddRemoveDataHideOptionsButtons() End Sub Private Sub ucrByFactorsReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrByFactorsReceiver.ControlValueChanged, ucrReceiverVisualizeData.ControlValueChanged, ucrSelectorVisualizeData.ControlValueChanged From 59d41db3fbfa3d4bc48e86ab7db90bc10b001de3 Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 14 Dec 2023 14:40:26 +0300 Subject: [PATCH 08/31] Setting the limits of variables to add in the multiple receiver --- instat/ucrReceiverMultiple.vb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb index 16063dcb64e..74ab2d29bd4 100644 --- a/instat/ucrReceiverMultiple.vb +++ b/instat/ucrReceiverMultiple.vb @@ -21,6 +21,7 @@ Public Class ucrReceiverMultiple Public bSingleType As Boolean = False ' If bSingleType and bCategoricalNumeric then categorical and numeric are the only considered types Public bCategoricalNumeric As Boolean = False + Public iMaxItems As Integer Private Sub ucrReceiverMultiple_Load(sender As Object, e As EventArgs) Handles Me.Load If bFirstLoad Then @@ -58,6 +59,9 @@ Public Class ucrReceiverMultiple 'then add the new items For Each kvpTempItem As KeyValuePair(Of String, String) In lstActualItemsToAdd + If iMaxItems <> 0 AndAlso lstSelectedVariables.Items.Count >= iMaxItems Then + Exit For ' Exit the loop if the maximum limit is reached + End If lstSelectedVariables.Items.Add(New ListViewItem With { .Name = kvpTempItem.Value, .Text = kvpTempItem.Value, From 57f66e7be38c82bf6f19c2d113b2e4ec5446161d Mon Sep 17 00:00:00 2001 From: n-thony Date: Thu, 14 Dec 2023 14:48:35 +0300 Subject: [PATCH 09/31] added message box --- instat/ucrReceiverMultiple.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb index 74ab2d29bd4..8faacee4df7 100644 --- a/instat/ucrReceiverMultiple.vb +++ b/instat/ucrReceiverMultiple.vb @@ -57,9 +57,10 @@ Public Class ucrReceiverMultiple Exit Sub End If - 'then add the new items + 'Then add the new items with limit check For Each kvpTempItem As KeyValuePair(Of String, String) In lstActualItemsToAdd If iMaxItems <> 0 AndAlso lstSelectedVariables.Items.Count >= iMaxItems Then + MessageBox.Show($"Cannot add more than {iMaxItems} items.", "Item Limit Exceeded", MessageBoxButtons.OK, MessageBoxIcon.Warning) Exit For ' Exit the loop if the maximum limit is reached End If lstSelectedVariables.Items.Add(New ListViewItem With { From a5cbfd34c80e1218aa8f3bb30538bb42d81ecd42 Mon Sep 17 00:00:00 2001 From: Raymond Date: Tue, 9 Jan 2024 06:12:50 +0000 Subject: [PATCH 10/31] Fixes issue of facets not appearing when using the dialog. experimental_survey,diamonds and airquality datasets were used. --- instat/dlgVisualizeData.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 84542dcdfb9..3310cea42a8 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -230,9 +230,9 @@ Public Class dlgVisualizeData ucrSaveGraph.AddAdditionalRCode(clsVisValueFunction, iAdditionalPairNo:=3) ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("palette", 1), iAdditionalPairNo:=1) ucrChkSortVariables.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("sort_miss", 2), iAdditionalPairNo:=1) - 'ucrByFactorsReceiver.AddAdditionalCodeParameterPair(clsVisMissFunction, ucrByFactorsReceiver.GetParameter(), iAdditionalPairNo:=1) + ucrByFactorsReceiver.AddAdditionalCodeParameterPair(clsVisMissFunction, ucrByFactorsReceiver.GetParameter(), iAdditionalPairNo:=1) - 'ucrByFactorsReceiver.SetRCode(clsVisDatFunction, bReset) + ucrByFactorsReceiver.SetRCode(clsVisDatFunction, bReset) ucrPnlSelectData.SetRCode(clsCurrBaseFunction, bReset) ucrPnlVisualizeData.SetRCode(clsCurrBaseFunction, bReset) ucrSelectorVisualizeData.SetRCode(clsNRowFunction, bReset) From f5dffedc9b714d560bcdf7df2272ea21b64a7cdd Mon Sep 17 00:00:00 2001 From: Raymond Date: Wed, 17 Jan 2024 01:08:38 +0000 Subject: [PATCH 11/31] This fixes the facets issue. experimental_survey and diamonds datasets were used. Sorry for the delay, I had to resolve an issue regarding my internship and also derrick was making some corrections which also delayed a bit. --- instat/dlgVisualizeData.vb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 3310cea42a8..be8d4033c99 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -28,6 +28,7 @@ Public Class dlgVisualizeData Private clsAsLogicalFunction As New RFunction Private clsRBinonFunction As New RFunction Private clsGetVariableFunction As New RFunction + Private clsDummyFunction As New RFunction Private clsNRowFunction As New RFunction Private clsPipeOperator As New ROperator @@ -140,7 +141,8 @@ Public Class dlgVisualizeData ucrChkFacet.SetText("Facets") ucrChkFacet.AddToLinkedControls(ucrByFactorsReceiver, {True}, bNewLinkedHideIfParameterMissing:=True) - + ucrChkFacet.AddParameterValuesCondition(True, "checked", "True") + ucrChkFacet.AddParameterValuesCondition(False, "checked", "False") ucrNudSamplingFunction.SetLinkedDisplayControl(lblSampling) ucrPnlSelectData.AddToLinkedControls(ucrReceiverVisualizeData, {rdoSelectedColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -159,6 +161,7 @@ Public Class dlgVisualizeData clsVisValueFunction = New RFunction clsFilterFunction = New RFunction clsRBinonFunction = New RFunction + clsDummyFunction = New RFunction clsAsLogicalFunction = New RFunction clsNRowFunction = New RFunction clsGetVariableFunction = New RFunction @@ -230,9 +233,7 @@ Public Class dlgVisualizeData ucrSaveGraph.AddAdditionalRCode(clsVisValueFunction, iAdditionalPairNo:=3) ucrInputComboboxPalette.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("palette", 1), iAdditionalPairNo:=1) ucrChkSortVariables.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("sort_miss", 2), iAdditionalPairNo:=1) - ucrByFactorsReceiver.AddAdditionalCodeParameterPair(clsVisMissFunction, ucrByFactorsReceiver.GetParameter(), iAdditionalPairNo:=1) - ucrByFactorsReceiver.SetRCode(clsVisDatFunction, bReset) ucrPnlSelectData.SetRCode(clsCurrBaseFunction, bReset) ucrPnlVisualizeData.SetRCode(clsCurrBaseFunction, bReset) ucrSelectorVisualizeData.SetRCode(clsNRowFunction, bReset) @@ -244,7 +245,7 @@ Public Class dlgVisualizeData ucrNudSamplingFunction.SetRCode(clsRBinonFunction, bReset) If bReset Then ucrReceiverVisualizeData.SetRCode(clsVisDatFunction, bReset) - ucrChkFacet.SetRCode(clsVisDatFunction, bReset) + ucrChkFacet.SetRCode(clsDummyFunction, bReset) End If End Sub @@ -382,7 +383,7 @@ Public Class dlgVisualizeData TestOkEnabled() End Sub - Private Sub ucrChkFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkFacet.ControlValueChanged + Private Sub ucrChkFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkFacet.ControlValueChanged, ucrByFactorsReceiver.ControlValueChanged If ucrChkFacet.Checked Then ucrByFactorsReceiver.SetMeAsReceiver() If Not ucrByFactorsReceiver.IsEmpty Then From 694c384408b9486f3035475ae53e94d2e143c4cf Mon Sep 17 00:00:00 2001 From: Raymond Date: Wed, 17 Jan 2024 16:17:38 +0000 Subject: [PATCH 12/31] This fixes the issue of the date variables not appearing on the reciever. --- instat/dlgVisualizeData.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index be8d4033c99..803ba3cb138 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -267,15 +267,15 @@ Public Class dlgVisualizeData Private Sub ucrPnlVisualizeData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlVisualizeData.ControlValueChanged If rdoVisDat.Checked Then - ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger"}) + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger", "Date"}) ucrSaveGraph.SetPrefix("vis_dat") clsCurrBaseFunction = clsVisDatFunction ElseIf rdoVisMiss.Checked Then - ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger"}) + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger", "Date"}) ucrSaveGraph.SetPrefix("vis_miss") clsCurrBaseFunction = clsVisMissFunction ElseIf rdoVisGuess.Checked Then - ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger"}) + ucrReceiverVisualizeData.SetIncludedDataTypes({"numeric", "logical", "factor", "character", "interger", "Date"}) ucrSaveGraph.SetPrefix("vis_guess") clsCurrBaseFunction = clsVisGuessFunction ElseIf rdoNumeric.Checked Then From f29ffa0461ea16f9128ace9ab23953118753127d Mon Sep 17 00:00:00 2001 From: Raymond Date: Mon, 29 Jan 2024 14:06:40 +0000 Subject: [PATCH 13/31] Code changes. Fixes changes requested --- instat/dlgVisualizeData.vb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 803ba3cb138..41c8f376080 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -405,12 +405,12 @@ Public Class dlgVisualizeData If ucrReceiverVisualizeData.lstSelectedVariables.Items.Count <= 0 Then Exit Sub End If - Dim Lstvariable As List(Of String) = ucrReceiverVisualizeData.GetVariableNamesAsList - Dim StrFacetvariable As String = ucrByFactorsReceiver.GetVariableNames(False) - If Not ucrByFactorsReceiver.IsEmpty AndAlso Not Lstvariable.Contains(StrFacetvariable) Then - Lstvariable.Add(StrFacetvariable) + Dim lstvariable As List(Of String) = ucrReceiverVisualizeData.GetVariableNamesAsList + Dim strFacetvariable As String = ucrByFactorsReceiver.GetVariableNames(False) + If Not ucrByFactorsReceiver.IsEmpty AndAlso Not lstvariable.Contains(strFacetvariable) Then + lstvariable.Add(strFacetvariable) End If clsGetVariableFunction.AddParameter("data_name", Chr(34) & ucrSelectorVisualizeData.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0) - clsGetVariableFunction.AddParameter("col_names", frmMain.clsRLink.GetListAsRString(Lstvariable, bWithQuotes:=True), iPosition:=1) + clsGetVariableFunction.AddParameter("col_names", frmMain.clsRLink.GetListAsRString(lstvariable, bWithQuotes:=True), iPosition:=1) End Sub End Class \ No newline at end of file From 4f9840790733667b26d9987db1081e4134b412d0 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 30 Jan 2024 10:21:29 +0300 Subject: [PATCH 14/31] Bug fixes --- instat/dlgVisualizeData.vb | 6 +++--- instat/ucrReceiverMultiple.vb | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 41c8f376080..edeeacaa4c1 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -226,7 +226,7 @@ Public Class dlgVisualizeData ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsVisMissFunction, New RParameter("x", 0), 1) ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsVisGuessFunction, New RParameter("x", 0), 2) ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsVisValueFunction, New RParameter("x", 0), 3) - ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsPipeOperator, New RParameter("left", 0, bNewIncludeArgumentName:=False), 3) + ucrReceiverVisualizeData.AddAdditionalCodeParameterPair(clsPipeOperator, New RParameter("left", 0, bNewIncludeArgumentName:=False), 4) ucrSelectorVisualizeData.AddAdditionalCodeParameterPair(clsPipeOperator, New RParameter("left", 0, bNewIncludeArgumentName:=False), 1) ucrSaveGraph.AddAdditionalRCode(clsVisMissFunction, iAdditionalPairNo:=1) ucrSaveGraph.AddAdditionalRCode(clsVisGuessFunction, iAdditionalPairNo:=2) @@ -401,13 +401,13 @@ Public Class dlgVisualizeData AddRemoveDataHideOptionsButtons() End Sub - Private Sub ucrByFactorsReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrByFactorsReceiver.ControlValueChanged, ucrReceiverVisualizeData.ControlValueChanged, ucrSelectorVisualizeData.ControlValueChanged + Private Sub ucrByFactorsReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrByFactorsReceiver.ControlValueChanged, ucrReceiverVisualizeData.ControlValueChanged, ucrSelectorVisualizeData.ControlValueChanged, ucrPnlVisualizeData.ControlValueChanged If ucrReceiverVisualizeData.lstSelectedVariables.Items.Count <= 0 Then Exit Sub End If Dim lstvariable As List(Of String) = ucrReceiverVisualizeData.GetVariableNamesAsList Dim strFacetvariable As String = ucrByFactorsReceiver.GetVariableNames(False) - If Not ucrByFactorsReceiver.IsEmpty AndAlso Not lstvariable.Contains(strFacetvariable) Then + If Not ucrByFactorsReceiver.IsEmpty AndAlso (rdoVisDat.Checked OrElse rdoVisMiss.Checked) AndAlso Not Lstvariable.Contains(StrFacetvariable) Then lstvariable.Add(strFacetvariable) End If clsGetVariableFunction.AddParameter("data_name", Chr(34) & ucrSelectorVisualizeData.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0) diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb index 16063dcb64e..8e43f8ce1fd 100644 --- a/instat/ucrReceiverMultiple.vb +++ b/instat/ucrReceiverMultiple.vb @@ -153,6 +153,7 @@ Public Class ucrReceiverMultiple lstSelectedVariables.Items.Remove(lvi) Next + SetGroupHeaderVariablesCount() OnSelectionChanged() MyBase.RemoveSelected() End Sub From ded3951df0988ac6fa1d3ac46b468b414dbe91d1 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Wed, 28 Feb 2024 09:17:48 +0300 Subject: [PATCH 15/31] Changes to the code --- instat/dlgScript.Designer.vb | 51 +++++++++++++++++++++++++++--------- instat/dlgScript.vb | 25 ++++++++++++++++++ 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/instat/dlgScript.Designer.vb b/instat/dlgScript.Designer.vb index 17509bd83a3..86321d76d0b 100644 --- a/instat/dlgScript.Designer.vb +++ b/instat/dlgScript.Designer.vb @@ -83,6 +83,8 @@ Partial Class dlgScript Me.lblPreview = New System.Windows.Forms.Label() Me.txtScript = New System.Windows.Forms.TextBox() Me.ucrBase = New instat.ucrButtons() + Me.ucrChkWindow = New instat.ucrCheck() + Me.rdoWindow = New System.Windows.Forms.RadioButton() Me.tbFeatures.SuspendLayout() Me.tbPageSaveData.SuspendLayout() Me.tbPageGetData.SuspendLayout() @@ -460,6 +462,8 @@ Partial Class dlgScript ' 'tbPageCommand ' + Me.tbPageCommand.Controls.Add(Me.ucrChkWindow) + Me.tbPageCommand.Controls.Add(Me.rdoWindow) Me.tbPageCommand.Controls.Add(Me.ucrChkInto) Me.tbPageCommand.Controls.Add(Me.rdoListData) Me.tbPageCommand.Controls.Add(Me.ucrInputSaveData) @@ -490,7 +494,7 @@ Partial Class dlgScript ' Me.ucrChkInto.AutoSize = True Me.ucrChkInto.Checked = False - Me.ucrChkInto.Location = New System.Drawing.Point(233, 48) + Me.ucrChkInto.Location = New System.Drawing.Point(233, 33) Me.ucrChkInto.Name = "ucrChkInto" Me.ucrChkInto.Size = New System.Drawing.Size(84, 23) Me.ucrChkInto.TabIndex = 63 @@ -498,7 +502,7 @@ Partial Class dlgScript 'rdoListData ' Me.rdoListData.AutoSize = True - Me.rdoListData.Location = New System.Drawing.Point(25, 50) + Me.rdoListData.Location = New System.Drawing.Point(25, 35) Me.rdoListData.Margin = New System.Windows.Forms.Padding(2) Me.rdoListData.Name = "rdoListData" Me.rdoListData.Size = New System.Drawing.Size(70, 17) @@ -513,7 +517,7 @@ Partial Class dlgScript Me.ucrInputSaveData.AutoSize = True Me.ucrInputSaveData.IsMultiline = False Me.ucrInputSaveData.IsReadOnly = False - Me.ucrInputSaveData.Location = New System.Drawing.Point(319, 46) + Me.ucrInputSaveData.Location = New System.Drawing.Point(319, 31) Me.ucrInputSaveData.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputSaveData.Name = "ucrInputSaveData" Me.ucrInputSaveData.Size = New System.Drawing.Size(110, 21) @@ -525,7 +529,7 @@ Partial Class dlgScript Me.ucrCboCommandDataPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrCboCommandDataPackage.GetSetSelectedIndex = -1 Me.ucrCboCommandDataPackage.IsReadOnly = False - Me.ucrCboCommandDataPackage.Location = New System.Drawing.Point(109, 46) + Me.ucrCboCommandDataPackage.Location = New System.Drawing.Point(109, 31) Me.ucrCboCommandDataPackage.Margin = New System.Windows.Forms.Padding(9) Me.ucrCboCommandDataPackage.Name = "ucrCboCommandDataPackage" Me.ucrCboCommandDataPackage.Size = New System.Drawing.Size(117, 21) @@ -537,7 +541,7 @@ Partial Class dlgScript Me.ucrInputViewData.AutoSize = True Me.ucrInputViewData.IsMultiline = False Me.ucrInputViewData.IsReadOnly = False - Me.ucrInputViewData.Location = New System.Drawing.Point(156, 121) + Me.ucrInputViewData.Location = New System.Drawing.Point(156, 129) Me.ucrInputViewData.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputViewData.Name = "ucrInputViewData" Me.ucrInputViewData.Size = New System.Drawing.Size(145, 21) @@ -546,7 +550,7 @@ Partial Class dlgScript 'rdoViewData ' Me.rdoViewData.AutoSize = True - Me.rdoViewData.Location = New System.Drawing.Point(25, 121) + Me.rdoViewData.Location = New System.Drawing.Point(25, 129) Me.rdoViewData.Margin = New System.Windows.Forms.Padding(2) Me.rdoViewData.Name = "rdoViewData" Me.rdoViewData.Size = New System.Drawing.Size(77, 17) @@ -589,7 +593,7 @@ Partial Class dlgScript ' Me.ucrChkOpenRFile.AutoSize = True Me.ucrChkOpenRFile.Checked = False - Me.ucrChkOpenRFile.Location = New System.Drawing.Point(156, 80) + Me.ucrChkOpenRFile.Location = New System.Drawing.Point(156, 64) Me.ucrChkOpenRFile.Name = "ucrChkOpenRFile" Me.ucrChkOpenRFile.Size = New System.Drawing.Size(100, 23) Me.ucrChkOpenRFile.TabIndex = 53 @@ -600,7 +604,7 @@ Partial Class dlgScript Me.ucrInputChooseFile.AutoSize = True Me.ucrInputChooseFile.IsMultiline = False Me.ucrInputChooseFile.IsReadOnly = False - Me.ucrInputChooseFile.Location = New System.Drawing.Point(265, 80) + Me.ucrInputChooseFile.Location = New System.Drawing.Point(265, 64) Me.ucrInputChooseFile.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputChooseFile.Name = "ucrInputChooseFile" Me.ucrInputChooseFile.Size = New System.Drawing.Size(145, 21) @@ -609,7 +613,7 @@ Partial Class dlgScript 'rdoChooseFile ' Me.rdoChooseFile.AutoSize = True - Me.rdoChooseFile.Location = New System.Drawing.Point(27, 80) + Me.rdoChooseFile.Location = New System.Drawing.Point(25, 64) Me.rdoChooseFile.Margin = New System.Windows.Forms.Padding(2) Me.rdoChooseFile.Name = "rdoChooseFile" Me.rdoChooseFile.Size = New System.Drawing.Size(83, 17) @@ -657,7 +661,7 @@ Partial Class dlgScript 'rdoCommandPackage ' Me.rdoCommandPackage.AutoSize = True - Me.rdoCommandPackage.Location = New System.Drawing.Point(25, 23) + Me.rdoCommandPackage.Location = New System.Drawing.Point(25, 9) Me.rdoCommandPackage.Margin = New System.Windows.Forms.Padding(2) Me.rdoCommandPackage.Name = "rdoCommandPackage" Me.rdoCommandPackage.Size = New System.Drawing.Size(91, 17) @@ -684,7 +688,7 @@ Partial Class dlgScript Me.ucrCboCommandPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrCboCommandPackage.GetSetSelectedIndex = -1 Me.ucrCboCommandPackage.IsReadOnly = False - Me.ucrCboCommandPackage.Location = New System.Drawing.Point(156, 19) + Me.ucrCboCommandPackage.Location = New System.Drawing.Point(156, 5) Me.ucrCboCommandPackage.Margin = New System.Windows.Forms.Padding(9) Me.ucrCboCommandPackage.Name = "ucrCboCommandPackage" Me.ucrCboCommandPackage.Size = New System.Drawing.Size(137, 21) @@ -693,7 +697,7 @@ Partial Class dlgScript 'ucrPnlCommands ' Me.ucrPnlCommands.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlCommands.Location = New System.Drawing.Point(9, 8) + Me.ucrPnlCommands.Location = New System.Drawing.Point(2, 8) Me.ucrPnlCommands.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlCommands.Name = "ucrPnlCommands" Me.ucrPnlCommands.Size = New System.Drawing.Size(429, 238) @@ -834,6 +838,27 @@ Partial Class dlgScript Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 16 ' + 'ucrChkWindow + ' + Me.ucrChkWindow.AutoSize = True + Me.ucrChkWindow.Checked = False + Me.ucrChkWindow.Location = New System.Drawing.Point(160, 94) + Me.ucrChkWindow.Name = "ucrChkWindow" + Me.ucrChkWindow.Size = New System.Drawing.Size(100, 23) + Me.ucrChkWindow.TabIndex = 67 + ' + 'rdoWindow + ' + Me.rdoWindow.AutoSize = True + Me.rdoWindow.Location = New System.Drawing.Point(25, 94) + Me.rdoWindow.Margin = New System.Windows.Forms.Padding(2) + Me.rdoWindow.Name = "rdoWindow" + Me.rdoWindow.Size = New System.Drawing.Size(134, 17) + Me.rdoWindow.TabIndex = 66 + Me.rdoWindow.TabStop = True + Me.rdoWindow.Text = "Output Graph Window:" + Me.rdoWindow.UseVisualStyleBackColor = True + ' 'dlgScript ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -925,4 +950,6 @@ Partial Class dlgScript Friend WithEvents ucrInputSaveData As ucrInputTextBox Friend WithEvents ucrCboCommandDataPackage As ucrInputComboBox Friend WithEvents ucrChkInto As ucrCheck + Friend WithEvents ucrChkWindow As ucrCheck + Friend WithEvents rdoWindow As RadioButton End Class diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index ca378f13c8d..1d5a23c7a50 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -107,6 +107,8 @@ Public Class dlgScript ucrChkInto.SetText("Into:") + ucrChkWindow.SetText("Multiple Graphs:") + ucrInputGgplotify.SetLinkedDisplayControl(lblGraphObject) ucrInputGraphCommand.SetLinkedDisplayControl(lblGraphCommand) @@ -116,6 +118,7 @@ Public Class dlgScript ucrPnlCommands.AddRadioButton(rdoChooseFile) ucrPnlCommands.AddRadioButton(rdoViewData) ucrPnlCommands.AddRadioButton(rdoListData) + ucrPnlCommands.AddRadioButton(rdoWindow) '-------------------------------- 'Get example controls @@ -172,6 +175,7 @@ Public Class dlgScript ucrChkDisplayGraph.Checked = True ucrChkOpenRFile.Checked = False ucrChkInto.Checked = False + ucrChkDisplayGraph.Checked = False ucrDataFrameSaveOutputSelect.Reset() ' Get controls reset @@ -379,6 +383,7 @@ Public Class dlgScript ucrInputViewData.SetVisible(False) ucrCboCommandDataPackage.SetVisible(False) ucrInputSaveData.SetVisible(False) + ucrChkWindow.SetVisible(False) rdoChooseFile.Enabled = False If rdoCommandPackage.Checked Then ucrCboCommandPackage.SetVisible(True) @@ -404,6 +409,9 @@ Public Class dlgScript ucrCboCommandDataPackage.OnControlValueChanged() ucrInputSaveData.OnControlValueChanged() ucrChkInto.OnControlValueChanged() + ElseIf rdoWindow.Checked Then + ucrChkWindow.SetVisible(True) + ucrChkWindow.OnControlValueChanged() End If End Sub @@ -681,4 +689,21 @@ Public Class dlgScript PreviewScript(strScript) End Sub + Private Sub ucrChkWindow_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkWindow.ControlContentsChanged + Dim strScript As String = "" + Dim clsWindowFunction As New RFunction + + If ucrChkWindow.Checked Then + clsWindowFunction.SetRCommand("windows") + clsWindowFunction.AddParameter("record", "TRUE", iPosition:=0) + strScript = "#Recording multiple graphs" & Environment.NewLine & clsWindowFunction.ToScript() + Else + clsWindowFunction.SetRCommand("windows") + clsWindowFunction.RemoveParameterByName("record") + strScript = "#Output graph window" & Environment.NewLine & clsWindowFunction.ToScript() + End If + + PreviewScript(strScript) + End Sub + End Class \ No newline at end of file From 0753db6413cd2e5a72c5778f158d1233a179c2fc Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Thu, 29 Feb 2024 16:09:28 +0300 Subject: [PATCH 16/31] Changes to R- --- instat/dlgScript.Designer.vb | 60 +++++++++++++++++++++--------------- instat/dlgScript.vb | 27 ++++++++++++---- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/instat/dlgScript.Designer.vb b/instat/dlgScript.Designer.vb index 86321d76d0b..50e3cf72d3e 100644 --- a/instat/dlgScript.Designer.vb +++ b/instat/dlgScript.Designer.vb @@ -52,6 +52,8 @@ Partial Class dlgScript Me.ucrPnlGetData = New instat.UcrPanel() Me.ucrSelectorGetObject = New instat.ucrSelectorByDataFrameAddRemove() Me.tbPageCommand = New System.Windows.Forms.TabPage() + Me.ucrChkWindow = New instat.ucrCheck() + Me.rdoWindow = New System.Windows.Forms.RadioButton() Me.ucrChkInto = New instat.ucrCheck() Me.rdoListData = New System.Windows.Forms.RadioButton() Me.ucrInputSaveData = New instat.ucrInputTextBox() @@ -72,6 +74,7 @@ Partial Class dlgScript Me.ucrCboCommandPackage = New instat.ucrInputComboBox() Me.ucrPnlCommands = New instat.UcrPanel() Me.tbPageExamples = New System.Windows.Forms.TabPage() + Me.cmdHelp = New System.Windows.Forms.Button() Me.rdoExampleData = New System.Windows.Forms.RadioButton() Me.rdoExampleFunction = New System.Windows.Forms.RadioButton() Me.ucrPnlExample = New instat.UcrPanel() @@ -83,8 +86,6 @@ Partial Class dlgScript Me.lblPreview = New System.Windows.Forms.Label() Me.txtScript = New System.Windows.Forms.TextBox() Me.ucrBase = New instat.ucrButtons() - Me.ucrChkWindow = New instat.ucrCheck() - Me.rdoWindow = New System.Windows.Forms.RadioButton() Me.tbFeatures.SuspendLayout() Me.tbPageSaveData.SuspendLayout() Me.tbPageGetData.SuspendLayout() @@ -490,6 +491,27 @@ Partial Class dlgScript Me.tbPageCommand.Text = "Commands" Me.tbPageCommand.UseVisualStyleBackColor = True ' + 'ucrChkWindow + ' + Me.ucrChkWindow.AutoSize = True + Me.ucrChkWindow.Checked = False + Me.ucrChkWindow.Location = New System.Drawing.Point(160, 94) + Me.ucrChkWindow.Name = "ucrChkWindow" + Me.ucrChkWindow.Size = New System.Drawing.Size(100, 23) + Me.ucrChkWindow.TabIndex = 67 + ' + 'rdoWindow + ' + Me.rdoWindow.AutoSize = True + Me.rdoWindow.Location = New System.Drawing.Point(25, 94) + Me.rdoWindow.Margin = New System.Windows.Forms.Padding(2) + Me.rdoWindow.Name = "rdoWindow" + Me.rdoWindow.Size = New System.Drawing.Size(134, 17) + Me.rdoWindow.TabIndex = 66 + Me.rdoWindow.TabStop = True + Me.rdoWindow.Text = "Output Graph Window:" + Me.rdoWindow.UseVisualStyleBackColor = True + ' 'ucrChkInto ' Me.ucrChkInto.AutoSize = True @@ -705,6 +727,7 @@ Partial Class dlgScript ' 'tbPageExamples ' + Me.tbPageExamples.Controls.Add(Me.cmdHelp) Me.tbPageExamples.Controls.Add(Me.rdoExampleData) Me.tbPageExamples.Controls.Add(Me.rdoExampleFunction) Me.tbPageExamples.Controls.Add(Me.ucrPnlExample) @@ -715,9 +738,18 @@ Partial Class dlgScript Me.tbPageExamples.Name = "tbPageExamples" Me.tbPageExamples.Size = New System.Drawing.Size(438, 245) Me.tbPageExamples.TabIndex = 4 - Me.tbPageExamples.Text = "Examples" + Me.tbPageExamples.Text = "Library" Me.tbPageExamples.UseVisualStyleBackColor = True ' + 'cmdHelp + ' + Me.cmdHelp.Location = New System.Drawing.Point(357, 7) + Me.cmdHelp.Name = "cmdHelp" + Me.cmdHelp.Size = New System.Drawing.Size(75, 23) + Me.cmdHelp.TabIndex = 61 + Me.cmdHelp.Text = "R Help" + Me.cmdHelp.UseVisualStyleBackColor = True + ' 'rdoExampleData ' Me.rdoExampleData.Appearance = System.Windows.Forms.Appearance.Button @@ -838,27 +870,6 @@ Partial Class dlgScript Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 16 ' - 'ucrChkWindow - ' - Me.ucrChkWindow.AutoSize = True - Me.ucrChkWindow.Checked = False - Me.ucrChkWindow.Location = New System.Drawing.Point(160, 94) - Me.ucrChkWindow.Name = "ucrChkWindow" - Me.ucrChkWindow.Size = New System.Drawing.Size(100, 23) - Me.ucrChkWindow.TabIndex = 67 - ' - 'rdoWindow - ' - Me.rdoWindow.AutoSize = True - Me.rdoWindow.Location = New System.Drawing.Point(25, 94) - Me.rdoWindow.Margin = New System.Windows.Forms.Padding(2) - Me.rdoWindow.Name = "rdoWindow" - Me.rdoWindow.Size = New System.Drawing.Size(134, 17) - Me.rdoWindow.TabIndex = 66 - Me.rdoWindow.TabStop = True - Me.rdoWindow.Text = "Output Graph Window:" - Me.rdoWindow.UseVisualStyleBackColor = True - ' 'dlgScript ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -952,4 +963,5 @@ Partial Class dlgScript Friend WithEvents ucrChkInto As ucrCheck Friend WithEvents ucrChkWindow As ucrCheck Friend WithEvents rdoWindow As RadioButton + Friend WithEvents cmdHelp As Button End Class diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index 1d5a23c7a50..9055aaa3755 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -30,10 +30,13 @@ Public Class dlgScript SetDefaults() bFirstload = False End If + autoTranslate(Me) + EnableHelp() End Sub Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 180 ' Supported output object types and formats dctOutputObjectTypes.Add("Summary", RObjectTypeLabel.Summary) @@ -384,7 +387,6 @@ Public Class dlgScript ucrCboCommandDataPackage.SetVisible(False) ucrInputSaveData.SetVisible(False) ucrChkWindow.SetVisible(False) - rdoChooseFile.Enabled = False If rdoCommandPackage.Checked Then ucrCboCommandPackage.SetVisible(True) ucrCboCommandPackage.OnControlValueChanged() @@ -428,7 +430,7 @@ Public Class dlgScript PreviewScript(strScript) End Sub - Private Sub ucrCboCommandDataPackage_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrCboCommandDataPackage.ControlValueChanged, ucrInputSaveData.ControlContentsChanged, ucrChkInto.ControlContentsChanged + Private Sub ucrCboCommandDataPackage_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSaveData.ControlContentsChanged, ucrChkInto.ControlContentsChanged, ucrCboCommandDataPackage.ControlValueChanged ucrInputSaveData.Visible = ucrChkInto.Checked Dim strScript As String = "" @@ -490,7 +492,7 @@ Public Class dlgScript PreviewScript(strScript) End Sub - Private Sub ucrInputGgplotify_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputGgplotify.ControlContentsChanged, ucrInputGraphCommand.ControlContentsChanged + Private Sub ucrInputGgplotify_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputGraphCommand.ControlContentsChanged, ucrInputGgplotify.ControlContentsChanged Dim strScript As String = "" If Not ucrInputGgplotify.IsEmpty() AndAlso Not ucrInputGraphCommand.IsEmpty Then @@ -526,7 +528,7 @@ Public Class dlgScript PreviewScript(strScript) End Sub - Private Sub ucrComboGetPackages_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrCboExamplePackages.ControlValueChanged, ucrPnlExample.ControlValueChanged + Private Sub ucrComboGetPackages_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlExample.ControlValueChanged, ucrCboExamplePackages.ControlValueChanged PreviewScript("") lstExampleCollection.Items.Clear() @@ -544,7 +546,7 @@ Public Class dlgScript lstExampleCollection.Items.AddRange(GetFunctions(strSelectedPackage)) End If lstExampleCollection.Select() - + EnableHelp() End Sub Private Function GetDatasets(strPackage As String) As ListViewItem() @@ -609,6 +611,7 @@ Public Class dlgScript Catch ex As Exception MsgBox(strTopic & " has a help file but no examples.") End Try + EnableHelp() End Sub Private Sub txtScript_TextChanged(sender As Object, e As EventArgs) Handles txtScript.TextChanged @@ -618,6 +621,7 @@ Public Class dlgScript Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() + EnableHelp() End Sub Private Sub tbFeatures_Selected(sender As Object, e As TabControlEventArgs) Handles tbFeatures.Selected @@ -688,6 +692,9 @@ Public Class dlgScript End If PreviewScript(strScript) End Sub + Private Sub EnableHelp() + cmdHelp.Enabled = rdoExampleData.Checked AndAlso lstExampleCollection.SelectedItems.Count > 0 + End Sub Private Sub ucrChkWindow_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkWindow.ControlContentsChanged Dim strScript As String = "" @@ -700,10 +707,18 @@ Public Class dlgScript Else clsWindowFunction.SetRCommand("windows") clsWindowFunction.RemoveParameterByName("record") - strScript = "#Output graph window" & Environment.NewLine & clsWindowFunction.ToScript() + strScript = "#Open the R graph viewer" & Environment.NewLine & clsWindowFunction.ToScript() End If PreviewScript(strScript) End Sub + Private Sub cmdHelp_Click(sender As Object, e As EventArgs) Handles cmdHelp.Click + Dim strPackageName As String = ucrCboExamplePackages.cboInput.SelectedItem + Dim strTopic As String = lstExampleCollection.SelectedItems(0).Text + If strPackageName <> "" AndAlso strTopic <> "" Then + Dim frmMaximiseOutput As New frmMaximiseOutput + frmMaximiseOutput.Show(strFileName:=clsFileUrlUtilities.GetHelpFileURL(strPackageName:=strPackageName, strTopic:=strTopic), bReplace:=False) + End If + End Sub End Class \ No newline at end of file From cc6309ef264f2f9e0a16939bdbcd34e6e785504a Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Thu, 29 Feb 2024 16:32:51 +0300 Subject: [PATCH 17/31] changes --- instat/dlgBarAndPieChart.Designer.vb | 31 ++------------------ instat/dlgBarAndPieChart.vb | 44 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 51 deletions(-) diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb index a319b8a4e5d..24dd99b55dd 100644 --- a/instat/dlgBarAndPieChart.Designer.vb +++ b/instat/dlgBarAndPieChart.Designer.vb @@ -50,7 +50,6 @@ Partial Class dlgBarAndPieChart Me.lblLabelColour = New System.Windows.Forms.Label() Me.lblLabelSize = New System.Windows.Forms.Label() Me.lblLollipopSize = New System.Windows.Forms.Label() - Me.lblLollipopColour = New System.Windows.Forms.Label() Me.lblReorder = New System.Windows.Forms.Label() Me.rdoTreeMap = New System.Windows.Forms.RadioButton() Me.lblFill = New System.Windows.Forms.Label() @@ -81,7 +80,6 @@ Partial Class dlgBarAndPieChart Me.ucrInputLabelSize = New instat.ucrInputComboBox() Me.ucrNudLollipopSize = New instat.ucrNud() Me.ucrNudMaxSize = New instat.ucrNud() - Me.ucrInputLollipopColour = New instat.ucrInputComboBox() Me.ucrChkLollipop = New instat.ucrCheck() Me.ucrInputLabelPosition = New instat.ucrInputComboBox() Me.ucrInputBarChartPositions = New instat.ucrInputComboBox() @@ -247,22 +245,12 @@ Partial Class dlgBarAndPieChart ' Me.lblLollipopSize.AutoSize = True Me.lblLollipopSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLollipopSize.Location = New System.Drawing.Point(123, 408) + Me.lblLollipopSize.Location = New System.Drawing.Point(123, 390) Me.lblLollipopSize.Name = "lblLollipopSize" Me.lblLollipopSize.Size = New System.Drawing.Size(30, 13) Me.lblLollipopSize.TabIndex = 42 Me.lblLollipopSize.Text = "Size:" ' - 'lblLollipopColour - ' - Me.lblLollipopColour.AutoSize = True - Me.lblLollipopColour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLollipopColour.Location = New System.Drawing.Point(220, 408) - Me.lblLollipopColour.Name = "lblLollipopColour" - Me.lblLollipopColour.Size = New System.Drawing.Size(40, 13) - Me.lblLollipopColour.TabIndex = 44 - Me.lblLollipopColour.Text = "Colour:" - ' 'lblReorder ' Me.lblReorder.AutoSize = True @@ -521,7 +509,7 @@ Partial Class dlgBarAndPieChart Me.ucrNudLollipopSize.AutoSize = True Me.ucrNudLollipopSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLollipopSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLollipopSize.Location = New System.Drawing.Point(170, 405) + Me.ucrNudLollipopSize.Location = New System.Drawing.Point(170, 387) Me.ucrNudLollipopSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudLollipopSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudLollipopSize.Name = "ucrNudLollipopSize" @@ -542,17 +530,6 @@ Partial Class dlgBarAndPieChart Me.ucrNudMaxSize.TabIndex = 64 Me.ucrNudMaxSize.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' - 'ucrInputLollipopColour - ' - Me.ucrInputLollipopColour.AddQuotesIfUnrecognised = True - Me.ucrInputLollipopColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputLollipopColour.GetSetSelectedIndex = -1 - Me.ucrInputLollipopColour.IsReadOnly = False - Me.ucrInputLollipopColour.Location = New System.Drawing.Point(276, 405) - Me.ucrInputLollipopColour.Name = "ucrInputLollipopColour" - Me.ucrInputLollipopColour.Size = New System.Drawing.Size(93, 21) - Me.ucrInputLollipopColour.TabIndex = 45 - ' 'ucrChkLollipop ' Me.ucrChkLollipop.AutoSize = True @@ -954,8 +931,6 @@ Partial Class dlgBarAndPieChart Me.Controls.Add(Me.rdoWordCloud) Me.Controls.Add(Me.lblLabel) Me.Controls.Add(Me.rdoTreeMap) - Me.Controls.Add(Me.ucrInputLollipopColour) - Me.Controls.Add(Me.lblLollipopColour) Me.Controls.Add(Me.lblLollipopSize) Me.Controls.Add(Me.ucrChkLollipop) Me.Controls.Add(Me.lblLabelSize) @@ -1042,8 +1017,6 @@ Partial Class dlgBarAndPieChart Friend WithEvents ucrInputLabelColour As ucrInputComboBox Friend WithEvents lblLabelSize As Label Friend WithEvents ucrInputLabelSize As ucrInputComboBox - Friend WithEvents ucrInputLollipopColour As ucrInputComboBox - Friend WithEvents lblLollipopColour As Label Friend WithEvents ucrNudLollipopSize As ucrNud Friend WithEvents lblLollipopSize As Label Friend WithEvents ucrChkLollipop As ucrCheck diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 8b68ddcf059..afcc55c89c7 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -295,21 +295,21 @@ Public Class dlgBarAndPieChart ucrInputPlace.SetLinkedDisplayControl(lblPlace) ucrReceiverLabel.SetLinkedDisplayControl(lblLabel) - ucrInputLollipopColour.SetParameter(New RParameter("point.colour", 0)) - dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34)) - dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34)) - dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34)) - dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34)) - dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34)) - dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34)) - dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34)) - dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34)) - dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34)) - ucrInputLollipopColour.SetItems(dctLollipopColours) - ucrInputLollipopColour.bAllowNonConditionValues = True + 'ucrInputLollipopColour.SetParameter(New RParameter("point.colour", 0)) + 'dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34)) + 'dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34)) + 'dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34)) + 'dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34)) + 'dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34)) + 'dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + 'dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34)) + 'dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34)) + 'dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34)) + 'dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34)) + 'dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34)) + 'dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34)) + 'ucrInputLollipopColour.SetItems(dctLollipopColours) + 'ucrInputLollipopColour.bAllowNonConditionValues = True ucrNudLollipopSize.SetParameter(New RParameter("point.size", 1)) ucrNudLollipopSize.DecimalPlaces = 0 @@ -317,12 +317,12 @@ Public Class dlgBarAndPieChart ucrNudLollipopSize.Minimum = 1 ucrNudLollipopSize.Maximum = 15 - ucrChkLollipop.SetText("Lollipop") - ucrChkLollipop.AddParameterPresentCondition(True, "geom_lollipop") - ucrChkLollipop.AddParameterPresentCondition(False, "geom_lollipop", False) - ucrChkLollipop.AddToLinkedControls({ucrNudLollipopSize, ucrInputLollipopColour}, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrNudLollipopSize.SetLinkedDisplayControl(lblLollipopSize) - ucrInputLollipopColour.SetLinkedDisplayControl(lblLollipopColour) + 'ucrChkLollipop.SetText("Lollipop") + 'ucrChkLollipop.AddParameterPresentCondition(True, "geom_lollipop") + 'ucrChkLollipop.AddParameterPresentCondition(False, "geom_lollipop", False) + 'ucrChkLollipop.AddToLinkedControls({ucrNudLollipopSize, ucrInputLollipopColour}, {True}, bNewLinkedHideIfParameterMissing:=True) + 'ucrNudLollipopSize.SetLinkedDisplayControl(lblLollipopSize) + 'ucrInputLollipopColour.SetLinkedDisplayControl(lblLollipopColour) ucrInputAddReorder.SetItems({strAscending, strDescending, strReverse, strNone}) ucrInputAddReorder.SetDropDownStyleAsNonEditable() @@ -683,7 +683,7 @@ Public Class dlgBarAndPieChart ucrInputLabelPosition.SetRCode(clsGeomTextFunction, bReset) ucrInputLabelSize.SetRCode(clsGeomTextFunction, bReset) ucrNudLollipopSize.SetRCode(clsGeomLollipopFunction, bReset) - ucrInputLollipopColour.SetRCode(clsGeomLollipopFunction, bReset) + 'ucrInputLollipopColour.SetRCode(clsGeomLollipopFunction, bReset) ucrChkLollipop.SetRCode(clsBaseOperator, bReset) ucrReceiverArea.SetRCode(clsAsNumericFunction, bReset) ucrReceiverFill.SetRCode(clsGeomTreemapAesFunction, bReset) From 6c75706f21e26534a3c0b6a79c676d68401a39aa Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Thu, 29 Feb 2024 16:51:51 +0300 Subject: [PATCH 18/31] Changes to the code --- instat/dlgScript.Designer.vb | 2 +- instat/dlgScript.vb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/dlgScript.Designer.vb b/instat/dlgScript.Designer.vb index 50e3cf72d3e..1b9e58bcd5a 100644 --- a/instat/dlgScript.Designer.vb +++ b/instat/dlgScript.Designer.vb @@ -743,7 +743,7 @@ Partial Class dlgScript ' 'cmdHelp ' - Me.cmdHelp.Location = New System.Drawing.Point(357, 7) + Me.cmdHelp.Location = New System.Drawing.Point(361, 4) Me.cmdHelp.Name = "cmdHelp" Me.cmdHelp.Size = New System.Drawing.Size(75, 23) Me.cmdHelp.TabIndex = 61 diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index 9055aaa3755..ede28ab5c52 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -721,4 +721,5 @@ Public Class dlgScript frmMaximiseOutput.Show(strFileName:=clsFileUrlUtilities.GetHelpFileURL(strPackageName:=strPackageName, strTopic:=strTopic), bReplace:=False) End If End Sub + End Class \ No newline at end of file From bda6f28df557f6f100ab81548fe8702c659ac3f6 Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 29 Feb 2024 18:56:25 +0300 Subject: [PATCH 19/31] change --- instat/dlgBarAndPieChart.vb | 75 +++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index afcc55c89c7..3a7da8dd015 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -296,18 +296,18 @@ Public Class dlgBarAndPieChart ucrReceiverLabel.SetLinkedDisplayControl(lblLabel) 'ucrInputLollipopColour.SetParameter(New RParameter("point.colour", 0)) - 'dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34)) - 'dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34)) - 'dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34)) - 'dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34)) - 'dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34)) - 'dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - 'dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34)) - 'dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34)) - 'dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34)) - 'dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34)) - 'dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34)) - 'dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34)) + dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34)) + dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34)) + dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34)) + dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34)) + dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34)) + dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34)) + dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34)) + dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34)) + dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34)) + dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34)) + dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34)) 'ucrInputLollipopColour.SetItems(dctLollipopColours) 'ucrInputLollipopColour.bAllowNonConditionValues = True @@ -317,12 +317,13 @@ Public Class dlgBarAndPieChart ucrNudLollipopSize.Minimum = 1 ucrNudLollipopSize.Maximum = 15 - 'ucrChkLollipop.SetText("Lollipop") - 'ucrChkLollipop.AddParameterPresentCondition(True, "geom_lollipop") - 'ucrChkLollipop.AddParameterPresentCondition(False, "geom_lollipop", False) - 'ucrChkLollipop.AddToLinkedControls({ucrNudLollipopSize, ucrInputLollipopColour}, {True}, bNewLinkedHideIfParameterMissing:=True) - 'ucrNudLollipopSize.SetLinkedDisplayControl(lblLollipopSize) + ucrChkLollipop.SetText("Lollipop") + ucrChkLollipop.AddParameterPresentCondition(True, "geom_lollipop") + ucrChkLollipop.AddParameterPresentCondition(False, "geom_lollipop", False) + ucrChkLollipop.AddToLinkedControls({ucrNudLollipopSize}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrNudLollipopSize.SetLinkedDisplayControl(lblLollipopSize) 'ucrInputLollipopColour.SetLinkedDisplayControl(lblLollipopColour) + ' ucrChkLollipop.AddToLinkedControls({'ucrInputLollipopColour}, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="steelBlue") ucrInputAddReorder.SetItems({strAscending, strDescending, strReverse, strNone}) ucrInputAddReorder.SetDropDownStyleAsNonEditable() @@ -506,7 +507,6 @@ Public Class dlgBarAndPieChart clsGeomLollipopFunction.SetPackageName("ggalt") clsGeomLollipopFunction.SetRCommand("geom_lollipop") - clsGeomLollipopFunction.AddParameter("point.colour", "steelblue", iPosition:=0) clsGeomLollipopFunction.AddParameter("point.size", "1", iPosition:=1) clsGeomLollipopAesFunction.SetPackageName("ggplot2") @@ -662,8 +662,6 @@ Public Class dlgBarAndPieChart End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrBarChartSelector.AddAdditionalCodeParameterPair(clsSubsetFunction1, ucrBarChartSelector.GetParameter(), iAdditionalPairNo:=1) - ucrBarChartSelector.AddAdditionalCodeParameterPair(clsSubsetFunction2, ucrBarChartSelector.GetParameter(), iAdditionalPairNo:=2) ucrReceiverByFactor.AddAdditionalCodeParameterPair(clsIsEqualToOperator1, New RParameter("left", 0), iAdditionalPairNo:=1) ucrReceiverByFactor.AddAdditionalCodeParameterPair(clsIsEqualToOperator2, New RParameter("left", 0), iAdditionalPairNo:=2) ucrReceiverByFactor.AddAdditionalCodeParameterPair(clsLevelsFunction, New RParameter("x", 0), iAdditionalPairNo:=3) @@ -875,6 +873,15 @@ Public Class dlgBarAndPieChart End If End Sub + Private Sub AddRemovelollipopparameter() + If ucrChkLollipop.Checked AndAlso Not ucrReceiverByFactor.IsEmpty Then + clsGeomLollipopFunction.RemoveParameterByName("point.colour") + clsGeomLollipopAesFunction.AddParameter("colour", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) + Else + clsGeomLollipopFunction.AddParameter("point.colour", "steelblue", iPosition:=0) + End If + End Sub + Private Sub UpdateParameter() Dim strChangedTextFreq As String = ucrInputReorderX.GetText() Dim strChangedTextValue As String = ucrInputAddReorder.GetText() @@ -949,21 +956,26 @@ Public Class dlgBarAndPieChart clsReorderFunction.AddParameter("X", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) clsBarAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) clsPieAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) Case strDescending clsReorderFunction.AddParameter("X", "-" & ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) clsBarAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) clsPieAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", clsRFunctionParameter:=clsReorderFunction, iPosition:=0) Case strReverse clsForecatsReverse.AddParameter("f", ucrReceiverX.GetVariableNames(False), iPosition:=0) clsBarAesFunction.AddParameter("x", clsRFunctionParameter:=clsForecatsReverse, iPosition:=0) clsPieAesFunction.AddParameter("x", clsRFunctionParameter:=clsForecatsReverse, iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", clsRFunctionParameter:=clsForecatsReverse, iPosition:=0) Case strNone clsBarAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) clsPieAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) End Select Else clsBarAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=1) clsPieAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=1) End If If ucrChkPolarCoordinates.Checked Then If rdoPie.Checked OrElse rdoDonut.Checked Then @@ -991,17 +1003,21 @@ Public Class dlgBarAndPieChart clsReorderFunctionValue.AddParameter("X", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) clsBarAesFunction.AddParameter("fill", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) clsPieAesFunction.AddParameter("fill", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) Case strDescending clsReorderFunctionValue.AddParameter("X", "-" & ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) clsBarAesFunction.AddParameter("fill", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) clsPieAesFunction.AddParameter("fill", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", clsRFunctionParameter:=clsReorderFunctionValue, iPosition:=2) Case strReverse clsForecatsReverseValue.AddParameter("f", ucrReceiverByFactor.GetVariableNames(False), iPosition:=0) clsBarAesFunction.AddParameter("fill", clsRFunctionParameter:=clsForecatsReverseValue, iPosition:=2) clsPieAesFunction.AddParameter("fill", clsRFunctionParameter:=clsForecatsReverseValue, iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", clsRFunctionParameter:=clsForecatsReverseValue, iPosition:=2) Case strNone clsBarAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=1) clsPieAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", ucrReceiverByFactor.GetVariableNames(False), iPosition:=1) End Select End If End If @@ -1018,7 +1034,7 @@ Public Class dlgBarAndPieChart clsRggplotFunction.RemoveParameterByName("aes") clsGeomLollipopAesFunction.RemoveParameterByName("x") clsGeomLollipopAesFunction.RemoveParameterByName("y") - clsGeomLollipopAesFunction.RemoveParameterByName("fill") + clsGeomLollipopAesFunction.RemoveParameterByName("colour") If rdoValue.Checked Then clsBarAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) clsBarAesFunction.AddParameter("y", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) @@ -1033,7 +1049,7 @@ Public Class dlgBarAndPieChart End If clsGeomLollipopAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) clsGeomLollipopAesFunction.AddParameter("y", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) - clsGeomLollipopAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) + clsGeomLollipopAesFunction.AddParameter("colour", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) clsRgeomBarFunction1.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=2) clsRgeomBarFunction2.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) clsRgeomBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) @@ -1044,6 +1060,7 @@ Public Class dlgBarAndPieChart If ucrReceiverX.IsEmpty Then clsBarAesFunction.AddParameter("x", Chr(34) & Chr(34), iPosition:=0) clsPieAesFunction.AddParameter("x", Chr(34) & Chr(34), iPosition:=0) + clsGeomLollipopAesFunction.AddParameter("x", Chr(34) & Chr(34), iPosition:=0) End If If ucrVariablesAsFactorForBarChart.IsEmpty Then clsBarAesFunction.AddParameter("y", Chr(34) & Chr(34), iPosition:=1) @@ -1053,6 +1070,7 @@ Public Class dlgBarAndPieChart clsBarAesFunction.AddParameter("fill", Chr(34) & Chr(34), iPosition:=2) clsPieAesFunction.AddParameter("fill", Chr(34) & Chr(34), iPosition:=2) clsRgeomBarFunction.RemoveParameterByName("position") + clsGeomLollipopAesFunction.AddParameter("colour", Chr(34) & Chr(34), iPosition:=2) End If If ucrChkLollipop.Checked Then clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsGeomLollipopAesFunction, iPosition:=1) @@ -1080,12 +1098,10 @@ Public Class dlgBarAndPieChart clsBarAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=1) clsPieAesFunction.AddParameter("fill", ucrReceiverByFactor.GetVariableNames(False), iPosition:=1) End If - clsRgeomBarFunction1.AddParameter("stat", Chr(34) & "count" & Chr(34), iPosition:=2) clsRgeomBarFunction.AddParameter("stat", Chr(34) & "count" & Chr(34), iPosition:=1) clsRgeomBarFunction2.RemoveParameterByName("stat") End If clsRgeomBarFunction.AddParameter("stat", Chr(34) & "count" & Chr(34), iPosition:=1) - clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsRgeomBarFunction, iPosition:=2) clsBaseOperator.RemoveParameterByName("geom_treemap") clsBaseOperator.RemoveParameterByName("geom_text_wordcloud") ElseIf rdoTreeMap.Checked Then @@ -1272,6 +1288,7 @@ Public Class dlgBarAndPieChart ucrChkAddLabelsText.ControlValueChanged, ucrChkReorderValue.ControlValueChanged, ucrInputReorderX.ControlValueChanged, ucrInputAddReorder.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrNudMaxSize.ControlValueChanged, ucrChkIncreaseSize.ControlValueChanged, ucrChkLollipop.ControlValueChanged + AddRemovelollipopparameter() SetDialogOptions() ChangeParameterName() If rdoTreeMap.Checked Then @@ -1309,8 +1326,10 @@ Public Class dlgBarAndPieChart ucrChkPolarCoordinates.Enabled = False ucrChkPolarCoordinates.Checked = Not ucrChkBacktoback.Checked clsBaseOperator.RemoveParameterByName("geom_bar") - clsSubsetFunction1.AddParameter("subset", clsROperatorParameter:=clsIsEqualToOperator1, iPosition:=1, bIncludeArgumentName:=False) - clsSubsetFunction2.AddParameter("subset", clsROperatorParameter:=clsIsEqualToOperator2, iPosition:=1, bIncludeArgumentName:=False) + clsSubsetFunction1.AddParameter("data", ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=1, bIncludeArgumentName:=False) + clsSubsetFunction1.AddParameter("subset", clsROperatorParameter:=clsIsEqualToOperator1, iPosition:=2, bIncludeArgumentName:=False) + clsSubsetFunction2.AddParameter("data", ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=1, bIncludeArgumentName:=False) + clsSubsetFunction2.AddParameter("subset", clsROperatorParameter:=clsIsEqualToOperator2, iPosition:=2, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_bar2", clsRFunctionParameter:=clsRgeomBarFunction2, iPosition:=1) clsBaseOperator.AddParameter("geom_bar1", clsRFunctionParameter:=clsRgeomBarFunction1, iPosition:=2) clsBaseOperator.AddParameter("scale_y_symmetric", clsRFunctionParameter:=clsScaleYSymmetricFunction, iPosition:=3) @@ -1320,8 +1339,8 @@ Public Class dlgBarAndPieChart clsRgeomBarFunction2.AddParameter("aes", clsRFunctionParameter:=clsAesFunction1, iPosition:=1) clsRgeomBarFunction1.AddParameter("aes", clsRFunctionParameter:=clsAesFunction2, iPosition:=1) Else - clsAesFunction1.AddParameter("y", "..count..*(-1)", iPosition:=0) - clsRgeomBarFunction1.AddParameter("aes", clsRFunctionParameter:=clsAesFunction1, iPosition:=1) + clsAesFunction1.AddParameter("y", "after_stat(count) * (-1)", iPosition:=0) + clsRgeomBarFunction1.AddParameter("aes", clsRFunctionParameter:=clsAesFunction1, iPosition:=1, bIncludeArgumentName:=False) End If End If End If From 7f5e0335b06057770b9a532829681a605b1a63eb Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 29 Feb 2024 19:09:17 +0300 Subject: [PATCH 20/31] change --- instat/dlgBarAndPieChart.vb | 47 +++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 3a7da8dd015..d10c24de47d 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -296,20 +296,18 @@ Public Class dlgBarAndPieChart ucrReceiverLabel.SetLinkedDisplayControl(lblLabel) 'ucrInputLollipopColour.SetParameter(New RParameter("point.colour", 0)) - dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34)) - dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34)) - dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34)) - dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34)) - dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34)) - dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34)) - dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34)) - dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34)) - dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34)) - dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34)) - dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34)) - 'ucrInputLollipopColour.SetItems(dctLollipopColours) - 'ucrInputLollipopColour.bAllowNonConditionValues = True + 'dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34)) + 'dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34)) + 'dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34)) + 'dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34)) + 'dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34)) + 'dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34)) + 'dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34)) + 'dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34)) + 'dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34)) + 'dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34)) + 'dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34)) + 'dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34)) ucrNudLollipopSize.SetParameter(New RParameter("point.size", 1)) ucrNudLollipopSize.DecimalPlaces = 0 @@ -322,8 +320,6 @@ Public Class dlgBarAndPieChart ucrChkLollipop.AddParameterPresentCondition(False, "geom_lollipop", False) ucrChkLollipop.AddToLinkedControls({ucrNudLollipopSize}, {True}, bNewLinkedHideIfParameterMissing:=True) ucrNudLollipopSize.SetLinkedDisplayControl(lblLollipopSize) - 'ucrInputLollipopColour.SetLinkedDisplayControl(lblLollipopColour) - ' ucrChkLollipop.AddToLinkedControls({'ucrInputLollipopColour}, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="steelBlue") ucrInputAddReorder.SetItems({strAscending, strDescending, strReverse, strNone}) ucrInputAddReorder.SetDropDownStyleAsNonEditable() @@ -681,7 +677,6 @@ Public Class dlgBarAndPieChart ucrInputLabelPosition.SetRCode(clsGeomTextFunction, bReset) ucrInputLabelSize.SetRCode(clsGeomTextFunction, bReset) ucrNudLollipopSize.SetRCode(clsGeomLollipopFunction, bReset) - 'ucrInputLollipopColour.SetRCode(clsGeomLollipopFunction, bReset) ucrChkLollipop.SetRCode(clsBaseOperator, bReset) ucrReceiverArea.SetRCode(clsAsNumericFunction, bReset) ucrReceiverFill.SetRCode(clsGeomTreemapAesFunction, bReset) @@ -873,14 +868,14 @@ Public Class dlgBarAndPieChart End If End Sub - Private Sub AddRemovelollipopparameter() - If ucrChkLollipop.Checked AndAlso Not ucrReceiverByFactor.IsEmpty Then - clsGeomLollipopFunction.RemoveParameterByName("point.colour") - clsGeomLollipopAesFunction.AddParameter("colour", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) - Else - clsGeomLollipopFunction.AddParameter("point.colour", "steelblue", iPosition:=0) - End If - End Sub + 'Private Sub AddRemovelollipopparameter() + ' If ucrChkLollipop.Checked AndAlso Not ucrReceiverByFactor.IsEmpty Then + ' clsGeomLollipopFunction.RemoveParameterByName("point.colour") + ' clsGeomLollipopAesFunction.AddParameter("colour", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) + ' Else + ' clsGeomLollipopFunction.AddParameter("point.colour", "steelblue", iPosition:=0) + ' End If + 'End Sub Private Sub UpdateParameter() Dim strChangedTextFreq As String = ucrInputReorderX.GetText() @@ -1288,7 +1283,7 @@ Public Class dlgBarAndPieChart ucrChkAddLabelsText.ControlValueChanged, ucrChkReorderValue.ControlValueChanged, ucrInputReorderX.ControlValueChanged, ucrInputAddReorder.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrNudMaxSize.ControlValueChanged, ucrChkIncreaseSize.ControlValueChanged, ucrChkLollipop.ControlValueChanged - AddRemovelollipopparameter() + ' AddRemovelollipopparameter() SetDialogOptions() ChangeParameterName() If rdoTreeMap.Checked Then From 5b032716bdd4f344d7d571a4284cdb0c43b307cb Mon Sep 17 00:00:00 2001 From: JUMA Date: Thu, 29 Feb 2024 19:35:58 +0300 Subject: [PATCH 21/31] changes --- instat/dlgBarAndPieChart.vb | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index d10c24de47d..5d3b85c46ad 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -295,20 +295,6 @@ Public Class dlgBarAndPieChart ucrInputPlace.SetLinkedDisplayControl(lblPlace) ucrReceiverLabel.SetLinkedDisplayControl(lblLabel) - 'ucrInputLollipopColour.SetParameter(New RParameter("point.colour", 0)) - 'dctLollipopColours.Add("SteelBlue", Chr(34) & "steelBlue" & Chr(34)) - 'dctLollipopColours.Add("Black", Chr(34) & "black" & Chr(34)) - 'dctLollipopColours.Add("White", Chr(34) & "white" & Chr(34)) - 'dctLollipopColours.Add("Blue", Chr(34) & "blue" & Chr(34)) - 'dctLollipopColours.Add("Red", Chr(34) & "red" & Chr(34)) - 'dctLollipopColours.Add("Yellow", Chr(34) & "yellow" & Chr(34)) - 'dctLollipopColours.Add("Purple", Chr(34) & "purple" & Chr(34)) - 'dctLollipopColours.Add("Green", Chr(34) & "green" & Chr(34)) - 'dctLollipopColours.Add("Orange", Chr(34) & "orange" & Chr(34)) - 'dctLollipopColours.Add("Grey", Chr(34) & "grey" & Chr(34)) - 'dctLollipopColours.Add("Brown", Chr(34) & "brown" & Chr(34)) - 'dctLollipopColours.Add("Pink", Chr(34) & "pink" & Chr(34)) - ucrNudLollipopSize.SetParameter(New RParameter("point.size", 1)) ucrNudLollipopSize.DecimalPlaces = 0 ucrNudLollipopSize.Increment = 1 @@ -868,15 +854,6 @@ Public Class dlgBarAndPieChart End If End Sub - 'Private Sub AddRemovelollipopparameter() - ' If ucrChkLollipop.Checked AndAlso Not ucrReceiverByFactor.IsEmpty Then - ' clsGeomLollipopFunction.RemoveParameterByName("point.colour") - ' clsGeomLollipopAesFunction.AddParameter("colour", ucrReceiverByFactor.GetVariableNames(False), iPosition:=2) - ' Else - ' clsGeomLollipopFunction.AddParameter("point.colour", "steelblue", iPosition:=0) - ' End If - 'End Sub - Private Sub UpdateParameter() Dim strChangedTextFreq As String = ucrInputReorderX.GetText() Dim strChangedTextValue As String = ucrInputAddReorder.GetText() @@ -1283,7 +1260,6 @@ Public Class dlgBarAndPieChart ucrChkAddLabelsText.ControlValueChanged, ucrChkReorderValue.ControlValueChanged, ucrInputReorderX.ControlValueChanged, ucrInputAddReorder.ControlValueChanged, ucrInputReorderValue.ControlValueChanged, ucrNudMaxSize.ControlValueChanged, ucrChkIncreaseSize.ControlValueChanged, ucrChkLollipop.ControlValueChanged - ' AddRemovelollipopparameter() SetDialogOptions() ChangeParameterName() If rdoTreeMap.Checked Then From 85e71cd5d70e8a4faa4657dab7c7177c88a9973a Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Fri, 1 Mar 2024 14:32:33 +0300 Subject: [PATCH 22/31] changes to the code --- instat/dlgScript.Designer.vb | 4 ++-- instat/dlgScript.vb | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/instat/dlgScript.Designer.vb b/instat/dlgScript.Designer.vb index 1b9e58bcd5a..abe8f61287a 100644 --- a/instat/dlgScript.Designer.vb +++ b/instat/dlgScript.Designer.vb @@ -495,9 +495,9 @@ Partial Class dlgScript ' Me.ucrChkWindow.AutoSize = True Me.ucrChkWindow.Checked = False - Me.ucrChkWindow.Location = New System.Drawing.Point(160, 94) + Me.ucrChkWindow.Location = New System.Drawing.Point(233, 94) Me.ucrChkWindow.Name = "ucrChkWindow" - Me.ucrChkWindow.Size = New System.Drawing.Size(100, 23) + Me.ucrChkWindow.Size = New System.Drawing.Size(126, 23) Me.ucrChkWindow.TabIndex = 67 ' 'rdoWindow diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index ede28ab5c52..ce35d7bf66e 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -31,6 +31,13 @@ Public Class dlgScript bFirstload = False End If + If lstExampleCollection.SelectedItems.Count > 0 Then + 'make the listview have the focus + lstExampleCollection.Select() + 'set the selected item to be visible + lstExampleCollection.TopItem = lstExampleCollection.Items(lstExampleCollection.Items.IndexOf(lstExampleCollection.SelectedItems.Item(0))) + End If + autoTranslate(Me) EnableHelp() End Sub @@ -179,6 +186,7 @@ Public Class dlgScript ucrChkOpenRFile.Checked = False ucrChkInto.Checked = False ucrChkDisplayGraph.Checked = False + ucrChkWindow.Checked = True ucrDataFrameSaveOutputSelect.Reset() ' Get controls reset @@ -666,14 +674,14 @@ Public Class dlgScript If rdoChooseFile.Checked Then If Not ucrChkOpenRFile.Checked Then ' Only file choosing logic - clsFileChooseFunction.SetRCommand("file.choose") + clsFileChooseFunction.SetRCommand("choose.files") Dim strAssignedScript As String = "" clsFileChooseFunction.SetAssignTo("filename") clsFileChooseFunction.ToScript(strScript:=strAssignedScript) strScript = "#Open file interactively" & Environment.NewLine & strAssignedScript ElseIf ucrChkOpenRFile.Checked AndAlso Not ucrInputChooseFile.IsEmpty Then ' File choosing and RDS file reading logic - clsFileChooseFunction.SetRCommand("file.choose") + clsFileChooseFunction.SetRCommand("choose.files") Dim strAssignedScript As String = "" clsFileChooseFunction.SetAssignTo("filename") clsFileChooseFunction.ToScript(strScript:=strAssignedScript) From 511b465312ce380655ff06d2af28c2d63aec5a49 Mon Sep 17 00:00:00 2001 From: JUMA Date: Mon, 4 Mar 2024 14:46:53 +0300 Subject: [PATCH 23/31] change --- instat/dlgBarAndPieChart.vb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 5d3b85c46ad..011f33a91c3 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -1007,6 +1007,9 @@ Public Class dlgBarAndPieChart clsGeomLollipopAesFunction.RemoveParameterByName("x") clsGeomLollipopAesFunction.RemoveParameterByName("y") clsGeomLollipopAesFunction.RemoveParameterByName("colour") + clsRgeomBarFunction1.RemoveParameterByName("stat") + clsRgeomBarFunction2.RemoveParameterByName("stat") + clsRgeomBarFunction.RemoveParameterByName("stat") If rdoValue.Checked Then clsBarAesFunction.AddParameter("x", ucrReceiverX.GetVariableNames(False), iPosition:=0) clsBarAesFunction.AddParameter("y", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=1) From b2a59f32c4209539385328ad27b0f9860bb530a2 Mon Sep 17 00:00:00 2001 From: JUMA Date: Tue, 5 Mar 2024 15:34:23 +0300 Subject: [PATCH 24/31] dtframe --- instat/ucrSave.Designer.vb | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/instat/ucrSave.Designer.vb b/instat/ucrSave.Designer.vb index 96343812c86..fdbb2c62663 100644 --- a/instat/ucrSave.Designer.vb +++ b/instat/ucrSave.Designer.vb @@ -50,17 +50,18 @@ Partial Class ucrSave Me.ucrChkSave.AutoSize = True Me.ucrChkSave.Checked = False Me.ucrChkSave.Location = New System.Drawing.Point(0, 0) - Me.ucrChkSave.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrChkSave.Margin = New System.Windows.Forms.Padding(8, 10, 8, 10) Me.ucrChkSave.Name = "ucrChkSave" - Me.ucrChkSave.Size = New System.Drawing.Size(100, 23) + Me.ucrChkSave.Size = New System.Drawing.Size(125, 29) Me.ucrChkSave.TabIndex = 0 ' 'lblSaveText ' Me.lblSaveText.AutoSize = True - Me.lblSaveText.Location = New System.Drawing.Point(0, 3) + Me.lblSaveText.Location = New System.Drawing.Point(0, 4) + Me.lblSaveText.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSaveText.Name = "lblSaveText" - Me.lblSaveText.Size = New System.Drawing.Size(39, 13) + Me.lblSaveText.Size = New System.Drawing.Size(48, 16) Me.lblSaveText.TabIndex = 1 Me.lblSaveText.Text = "Label1" ' @@ -71,10 +72,10 @@ Partial Class ucrSave Me.ucrInputComboSave.Dock = System.Windows.Forms.DockStyle.Right Me.ucrInputComboSave.GetSetSelectedIndex = -1 Me.ucrInputComboSave.IsReadOnly = False - Me.ucrInputComboSave.Location = New System.Drawing.Point(194, 0) - Me.ucrInputComboSave.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) + Me.ucrInputComboSave.Location = New System.Drawing.Point(245, 0) + Me.ucrInputComboSave.Margin = New System.Windows.Forms.Padding(11, 15, 11, 15) Me.ucrInputComboSave.Name = "ucrInputComboSave" - Me.ucrInputComboSave.Size = New System.Drawing.Size(155, 34) + Me.ucrInputComboSave.Size = New System.Drawing.Size(194, 42) Me.ucrInputComboSave.TabIndex = 4 ' 'ucrInputTextSave @@ -83,10 +84,10 @@ Partial Class ucrSave Me.ucrInputTextSave.AutoSize = True Me.ucrInputTextSave.IsMultiline = False Me.ucrInputTextSave.IsReadOnly = False - Me.ucrInputTextSave.Location = New System.Drawing.Point(194, 0) - Me.ucrInputTextSave.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) + Me.ucrInputTextSave.Location = New System.Drawing.Point(182, 0) + Me.ucrInputTextSave.Margin = New System.Windows.Forms.Padding(11, 15, 11, 15) Me.ucrInputTextSave.Name = "ucrInputTextSave" - Me.ucrInputTextSave.Size = New System.Drawing.Size(155, 34) + Me.ucrInputTextSave.Size = New System.Drawing.Size(194, 42) Me.ucrInputTextSave.TabIndex = 3 ' 'btnColumnPosition @@ -94,16 +95,17 @@ Partial Class ucrSave Me.btnColumnPosition.AutoSize = True Me.btnColumnPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.btnColumnPosition.Dock = System.Windows.Forms.DockStyle.Right - Me.btnColumnPosition.Location = New System.Drawing.Point(349, 0) + Me.btnColumnPosition.Location = New System.Drawing.Point(439, 0) + Me.btnColumnPosition.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.btnColumnPosition.Name = "btnColumnPosition" - Me.btnColumnPosition.Size = New System.Drawing.Size(54, 34) + Me.btnColumnPosition.Size = New System.Drawing.Size(65, 42) Me.btnColumnPosition.TabIndex = 5 Me.btnColumnPosition.Text = "Position" Me.btnColumnPosition.UseVisualStyleBackColor = True ' 'ucrSave ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = False Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -112,9 +114,9 @@ Partial Class ucrSave Me.Controls.Add(Me.lblSaveText) Me.Controls.Add(Me.ucrChkSave) Me.Controls.Add(Me.btnColumnPosition) - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) Me.Name = "ucrSave" - Me.Size = New System.Drawing.Size(403, 34) + Me.Size = New System.Drawing.Size(504, 42) Me.ResumeLayout(False) Me.PerformLayout() From 2d4b9cc2bc2d7dc363aa2064ef26a1b7b4284d04 Mon Sep 17 00:00:00 2001 From: JUMA Date: Tue, 5 Mar 2024 16:36:47 +0300 Subject: [PATCH 25/31] change --- instat/ucrCalculator.Designer.vb | 2991 +++++++++++++++--------------- 1 file changed, 1446 insertions(+), 1545 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 08a0b89ce46..65533ad85e1 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -649,9 +649,10 @@ Partial Class ucrCalculator ' Me.lblExpression.AutoSize = True Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExpression.Location = New System.Drawing.Point(9, 15) + Me.lblExpression.Location = New System.Drawing.Point(8, 12) + Me.lblExpression.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblExpression.Name = "lblExpression" - Me.lblExpression.Size = New System.Drawing.Size(91, 20) + Me.lblExpression.Size = New System.Drawing.Size(77, 16) Me.lblExpression.TabIndex = 119 Me.lblExpression.Tag = "Expression" Me.lblExpression.Text = "Expression:" @@ -660,10 +661,9 @@ Partial Class ucrCalculator ' Me.chkShowParameters.AutoSize = True Me.chkShowParameters.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.chkShowParameters.Location = New System.Drawing.Point(105, 62) - Me.chkShowParameters.Margin = New System.Windows.Forms.Padding(4) + Me.chkShowParameters.Location = New System.Drawing.Point(88, 52) Me.chkShowParameters.Name = "chkShowParameters" - Me.chkShowParameters.Size = New System.Drawing.Size(161, 24) + Me.chkShowParameters.Size = New System.Drawing.Size(135, 20) Me.chkShowParameters.TabIndex = 181 Me.chkShowParameters.Text = "Show Parameters" Me.chkShowParameters.UseVisualStyleBackColor = True @@ -689,11 +689,11 @@ 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(334, 104) - Me.grpBasic.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpBasic.Location = New System.Drawing.Point(278, 87) + Me.grpBasic.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpBasic.Name = "grpBasic" - Me.grpBasic.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.grpBasic.Size = New System.Drawing.Size(308, 201) + Me.grpBasic.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpBasic.Size = New System.Drawing.Size(257, 168) Me.grpBasic.TabIndex = 179 Me.grpBasic.TabStop = False Me.grpBasic.Text = "Basic" @@ -701,10 +701,10 @@ Partial Class ucrCalculator 'cmdClear ' Me.cmdClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClear.Location = New System.Drawing.Point(226, 106) - Me.cmdClear.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdClear.Location = New System.Drawing.Point(188, 88) + Me.cmdClear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdClear.Name = "cmdClear" - Me.cmdClear.Size = New System.Drawing.Size(74, 90) + Me.cmdClear.Size = New System.Drawing.Size(62, 75) Me.cmdClear.TabIndex = 190 Me.cmdClear.Text = "Clear" Me.cmdClear.UseVisualStyleBackColor = True @@ -713,10 +713,10 @@ 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(4, 150) - Me.cmdComma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComma.Location = New System.Drawing.Point(3, 125) + Me.cmdComma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComma.Name = "cmdComma" - Me.cmdComma.Size = New System.Drawing.Size(57, 45) + Me.cmdComma.Size = New System.Drawing.Size(48, 38) Me.cmdComma.TabIndex = 138 Me.cmdComma.Text = "," Me.cmdComma.UseVisualStyleBackColor = True @@ -724,10 +724,10 @@ Partial Class ucrCalculator 'cmdBrackets ' Me.cmdBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrackets.Location = New System.Drawing.Point(116, 150) - Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdBrackets.Location = New System.Drawing.Point(97, 125) + Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdBrackets.Name = "cmdBrackets" - Me.cmdBrackets.Size = New System.Drawing.Size(57, 45) + Me.cmdBrackets.Size = New System.Drawing.Size(48, 38) Me.cmdBrackets.TabIndex = 136 Me.cmdBrackets.Text = "( )" Me.cmdBrackets.UseVisualStyleBackColor = True @@ -736,10 +736,10 @@ 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(226, 63) - Me.cmdPower.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPower.Location = New System.Drawing.Point(188, 52) + Me.cmdPower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPower.Name = "cmdPower" - Me.cmdPower.Size = New System.Drawing.Size(74, 45) + Me.cmdPower.Size = New System.Drawing.Size(62, 38) Me.cmdPower.TabIndex = 133 Me.cmdPower.Text = "^" Me.cmdPower.UseVisualStyleBackColor = True @@ -748,10 +748,10 @@ 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(171, 20) - Me.cmdDivide.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDivide.Location = New System.Drawing.Point(142, 17) + Me.cmdDivide.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDivide.Name = "cmdDivide" - Me.cmdDivide.Size = New System.Drawing.Size(57, 45) + Me.cmdDivide.Size = New System.Drawing.Size(48, 38) Me.cmdDivide.TabIndex = 131 Me.cmdDivide.Text = "/" Me.cmdDivide.UseVisualStyleBackColor = True @@ -760,10 +760,10 @@ 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(171, 150) - Me.cmdPlus.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPlus.Location = New System.Drawing.Point(142, 125) + Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPlus.Name = "cmdPlus" - Me.cmdPlus.Size = New System.Drawing.Size(57, 45) + Me.cmdPlus.Size = New System.Drawing.Size(48, 38) Me.cmdPlus.TabIndex = 130 Me.cmdPlus.Text = "+" Me.cmdPlus.UseVisualStyleBackColor = True @@ -772,10 +772,10 @@ 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(171, 106) - Me.cmdMinus.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMinus.Location = New System.Drawing.Point(142, 88) + Me.cmdMinus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMinus.Name = "cmdMinus" - Me.cmdMinus.Size = New System.Drawing.Size(57, 45) + Me.cmdMinus.Size = New System.Drawing.Size(48, 38) Me.cmdMinus.TabIndex = 129 Me.cmdMinus.Text = "-" Me.cmdMinus.UseVisualStyleBackColor = True @@ -784,10 +784,10 @@ 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(171, 63) - Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMultiply.Location = New System.Drawing.Point(142, 52) + Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMultiply.Name = "cmdMultiply" - Me.cmdMultiply.Size = New System.Drawing.Size(57, 45) + Me.cmdMultiply.Size = New System.Drawing.Size(48, 38) Me.cmdMultiply.TabIndex = 128 Me.cmdMultiply.Text = "*" Me.cmdMultiply.UseVisualStyleBackColor = True @@ -796,10 +796,10 @@ 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(226, 20) - Me.cmdDot.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDot.Location = New System.Drawing.Point(188, 17) + Me.cmdDot.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDot.Name = "cmdDot" - Me.cmdDot.Size = New System.Drawing.Size(74, 45) + Me.cmdDot.Size = New System.Drawing.Size(62, 38) Me.cmdDot.TabIndex = 127 Me.cmdDot.Text = "." Me.cmdDot.UseVisualStyleBackColor = True @@ -807,10 +807,10 @@ Partial Class ucrCalculator 'cmd9 ' Me.cmd9.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd9.Location = New System.Drawing.Point(116, 20) - Me.cmd9.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd9.Location = New System.Drawing.Point(97, 17) + Me.cmd9.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd9.Name = "cmd9" - Me.cmd9.Size = New System.Drawing.Size(57, 45) + Me.cmd9.Size = New System.Drawing.Size(48, 38) Me.cmd9.TabIndex = 126 Me.cmd9.Text = "9" Me.cmd9.UseVisualStyleBackColor = True @@ -818,10 +818,10 @@ Partial Class ucrCalculator 'cmd8 ' Me.cmd8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd8.Location = New System.Drawing.Point(60, 20) - Me.cmd8.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd8.Location = New System.Drawing.Point(50, 17) + Me.cmd8.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd8.Name = "cmd8" - Me.cmd8.Size = New System.Drawing.Size(57, 45) + Me.cmd8.Size = New System.Drawing.Size(48, 38) Me.cmd8.TabIndex = 125 Me.cmd8.Text = "8" Me.cmd8.UseVisualStyleBackColor = True @@ -829,10 +829,10 @@ Partial Class ucrCalculator 'cmd7 ' Me.cmd7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd7.Location = New System.Drawing.Point(4, 20) - Me.cmd7.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd7.Location = New System.Drawing.Point(3, 17) + Me.cmd7.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd7.Name = "cmd7" - Me.cmd7.Size = New System.Drawing.Size(57, 45) + Me.cmd7.Size = New System.Drawing.Size(48, 38) Me.cmd7.TabIndex = 124 Me.cmd7.Text = "7" Me.cmd7.UseVisualStyleBackColor = True @@ -840,10 +840,10 @@ Partial Class ucrCalculator 'cmd6 ' Me.cmd6.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd6.Location = New System.Drawing.Point(116, 63) - Me.cmd6.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd6.Location = New System.Drawing.Point(97, 52) + Me.cmd6.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd6.Name = "cmd6" - Me.cmd6.Size = New System.Drawing.Size(57, 45) + Me.cmd6.Size = New System.Drawing.Size(48, 38) Me.cmd6.TabIndex = 123 Me.cmd6.Text = "6" Me.cmd6.UseVisualStyleBackColor = True @@ -851,10 +851,10 @@ Partial Class ucrCalculator 'cmd5 ' Me.cmd5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd5.Location = New System.Drawing.Point(60, 63) - Me.cmd5.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd5.Location = New System.Drawing.Point(50, 52) + Me.cmd5.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd5.Name = "cmd5" - Me.cmd5.Size = New System.Drawing.Size(57, 45) + Me.cmd5.Size = New System.Drawing.Size(48, 38) Me.cmd5.TabIndex = 122 Me.cmd5.Text = "5" Me.cmd5.UseVisualStyleBackColor = True @@ -862,10 +862,10 @@ Partial Class ucrCalculator 'cmd4 ' Me.cmd4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd4.Location = New System.Drawing.Point(4, 63) - Me.cmd4.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd4.Location = New System.Drawing.Point(3, 52) + Me.cmd4.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd4.Name = "cmd4" - Me.cmd4.Size = New System.Drawing.Size(57, 45) + Me.cmd4.Size = New System.Drawing.Size(48, 38) Me.cmd4.TabIndex = 121 Me.cmd4.Text = "4" Me.cmd4.UseVisualStyleBackColor = True @@ -873,10 +873,10 @@ Partial Class ucrCalculator 'cmd3 ' Me.cmd3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd3.Location = New System.Drawing.Point(116, 106) - Me.cmd3.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd3.Location = New System.Drawing.Point(97, 88) + Me.cmd3.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd3.Name = "cmd3" - Me.cmd3.Size = New System.Drawing.Size(57, 45) + Me.cmd3.Size = New System.Drawing.Size(48, 38) Me.cmd3.TabIndex = 120 Me.cmd3.Text = "3" Me.cmd3.UseVisualStyleBackColor = True @@ -884,10 +884,10 @@ Partial Class ucrCalculator 'cmd2 ' Me.cmd2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd2.Location = New System.Drawing.Point(60, 106) - Me.cmd2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd2.Location = New System.Drawing.Point(50, 88) + Me.cmd2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd2.Name = "cmd2" - Me.cmd2.Size = New System.Drawing.Size(57, 45) + Me.cmd2.Size = New System.Drawing.Size(48, 38) Me.cmd2.TabIndex = 119 Me.cmd2.Text = "2" Me.cmd2.UseVisualStyleBackColor = True @@ -895,10 +895,10 @@ Partial Class ucrCalculator 'cmd0 ' Me.cmd0.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd0.Location = New System.Drawing.Point(60, 150) - Me.cmd0.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd0.Location = New System.Drawing.Point(50, 125) + Me.cmd0.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd0.Name = "cmd0" - Me.cmd0.Size = New System.Drawing.Size(57, 45) + Me.cmd0.Size = New System.Drawing.Size(48, 38) Me.cmd0.TabIndex = 118 Me.cmd0.Text = "0" Me.cmd0.UseVisualStyleBackColor = True @@ -906,10 +906,10 @@ Partial Class ucrCalculator 'cmd1 ' Me.cmd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd1.Location = New System.Drawing.Point(4, 106) - Me.cmd1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmd1.Location = New System.Drawing.Point(3, 88) + Me.cmd1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmd1.Name = "cmd1" - Me.cmd1.Size = New System.Drawing.Size(57, 45) + Me.cmd1.Size = New System.Drawing.Size(48, 38) Me.cmd1.TabIndex = 117 Me.cmd1.Text = "1" Me.cmd1.UseVisualStyleBackColor = True @@ -936,12 +936,10 @@ Partial Class ucrCalculator Me.grpDates.Controls.Add(Me.cmdMdy) Me.grpDates.Controls.Add(Me.cmdYmd) Me.grpDates.Controls.Add(Me.cmdLeap) - Me.grpDates.Location = New System.Drawing.Point(651, 93) - Me.grpDates.Margin = New System.Windows.Forms.Padding(4) + Me.grpDates.Location = New System.Drawing.Point(542, 78) Me.grpDates.Name = "grpDates" - Me.grpDates.Padding = New System.Windows.Forms.Padding(4) Me.grpDates.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.grpDates.Size = New System.Drawing.Size(366, 243) + Me.grpDates.Size = New System.Drawing.Size(305, 205) Me.grpDates.TabIndex = 188 Me.grpDates.TabStop = False Me.grpDates.Text = "Dates/Times" @@ -950,10 +948,9 @@ Partial Class ucrCalculator ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(222, 202) - Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRHelp.Location = New System.Drawing.Point(186, 164) Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(136, 45) + Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate Me.cmdRHelp.TabIndex = 212 Me.cmdRHelp.Text = "R Help" @@ -964,27 +961,26 @@ 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(155, 68) + Me.ContextMenuStripDate.Size = New System.Drawing.Size(139, 52) ' 'DateLubridateToolStripMenuItem ' Me.DateLubridateToolStripMenuItem.Name = "DateLubridateToolStripMenuItem" - Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(154, 32) + Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(138, 24) Me.DateLubridateToolStripMenuItem.Text = "lubridate" ' 'DateHmsToolStripMenuItem ' Me.DateHmsToolStripMenuItem.Name = "DateHmsToolStripMenuItem" - Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(154, 32) + Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(138, 24) Me.DateHmsToolStripMenuItem.Text = "hms" ' 'cmdPm ' Me.cmdPm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPm.Location = New System.Drawing.Point(6, 195) - Me.cmdPm.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPm.Location = New System.Drawing.Point(5, 162) Me.cmdPm.Name = "cmdPm" - Me.cmdPm.Size = New System.Drawing.Size(90, 45) + Me.cmdPm.Size = New System.Drawing.Size(75, 38) Me.cmdPm.TabIndex = 161 Me.cmdPm.Text = "pm" Me.cmdPm.UseVisualStyleBackColor = True @@ -992,10 +988,10 @@ Partial Class ucrCalculator 'cmdTime ' Me.cmdTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTime.Location = New System.Drawing.Point(183, 21) - Me.cmdTime.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTime.Location = New System.Drawing.Point(152, 18) + Me.cmdTime.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTime.Name = "cmdTime" - Me.cmdTime.Size = New System.Drawing.Size(90, 45) + Me.cmdTime.Size = New System.Drawing.Size(75, 38) Me.cmdTime.TabIndex = 160 Me.cmdTime.Text = "time" Me.cmdTime.UseVisualStyleBackColor = True @@ -1003,10 +999,10 @@ Partial Class ucrCalculator 'cmdDateTime ' Me.cmdDateTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDateTime.Location = New System.Drawing.Point(94, 21) - Me.cmdDateTime.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDateTime.Location = New System.Drawing.Point(78, 18) + Me.cmdDateTime.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDateTime.Name = "cmdDateTime" - Me.cmdDateTime.Size = New System.Drawing.Size(90, 45) + Me.cmdDateTime.Size = New System.Drawing.Size(75, 38) Me.cmdDateTime.TabIndex = 159 Me.cmdDateTime.Text = "datetime" Me.cmdDateTime.UseVisualStyleBackColor = True @@ -1014,10 +1010,9 @@ Partial Class ucrCalculator 'cmdQuarter ' Me.cmdQuarter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuarter.Location = New System.Drawing.Point(94, 195) - Me.cmdQuarter.Margin = New System.Windows.Forms.Padding(4) + Me.cmdQuarter.Location = New System.Drawing.Point(78, 162) Me.cmdQuarter.Name = "cmdQuarter" - Me.cmdQuarter.Size = New System.Drawing.Size(90, 45) + Me.cmdQuarter.Size = New System.Drawing.Size(75, 38) Me.cmdQuarter.TabIndex = 157 Me.cmdQuarter.Text = "quarter" Me.cmdQuarter.UseVisualStyleBackColor = True @@ -1025,10 +1020,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(94, 64) - Me.cmdD_In_M.Margin = New System.Windows.Forms.Padding(4) + Me.cmdD_In_M.Location = New System.Drawing.Point(78, 53) Me.cmdD_In_M.Name = "cmdD_In_M" - Me.cmdD_In_M.Size = New System.Drawing.Size(90, 45) + Me.cmdD_In_M.Size = New System.Drawing.Size(75, 38) Me.cmdD_In_M.TabIndex = 156 Me.cmdD_In_M.Text = "d_in_m" Me.cmdD_In_M.UseVisualStyleBackColor = True @@ -1036,10 +1030,9 @@ Partial Class ucrCalculator 'cmdAm ' Me.cmdAm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAm.Location = New System.Drawing.Point(272, 152) - Me.cmdAm.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAm.Location = New System.Drawing.Point(227, 127) Me.cmdAm.Name = "cmdAm" - Me.cmdAm.Size = New System.Drawing.Size(90, 45) + Me.cmdAm.Size = New System.Drawing.Size(75, 38) Me.cmdAm.TabIndex = 155 Me.cmdAm.Text = "am" Me.cmdAm.UseVisualStyleBackColor = True @@ -1047,10 +1040,9 @@ Partial Class ucrCalculator 'cmdSec ' Me.cmdSec.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSec.Location = New System.Drawing.Point(183, 152) - Me.cmdSec.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSec.Location = New System.Drawing.Point(152, 127) Me.cmdSec.Name = "cmdSec" - Me.cmdSec.Size = New System.Drawing.Size(90, 45) + Me.cmdSec.Size = New System.Drawing.Size(75, 38) Me.cmdSec.TabIndex = 154 Me.cmdSec.Text = "sec" Me.cmdSec.UseVisualStyleBackColor = True @@ -1058,10 +1050,9 @@ Partial Class ucrCalculator 'cmdHour ' Me.cmdHour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHour.Location = New System.Drawing.Point(6, 152) - Me.cmdHour.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHour.Location = New System.Drawing.Point(5, 127) Me.cmdHour.Name = "cmdHour" - Me.cmdHour.Size = New System.Drawing.Size(90, 45) + Me.cmdHour.Size = New System.Drawing.Size(75, 38) Me.cmdHour.TabIndex = 153 Me.cmdHour.Text = "hour" Me.cmdHour.UseVisualStyleBackColor = True @@ -1069,10 +1060,9 @@ Partial Class ucrCalculator 'cmdminutes ' Me.cmdminutes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdminutes.Location = New System.Drawing.Point(94, 152) - Me.cmdminutes.Margin = New System.Windows.Forms.Padding(4) + Me.cmdminutes.Location = New System.Drawing.Point(78, 127) Me.cmdminutes.Name = "cmdminutes" - Me.cmdminutes.Size = New System.Drawing.Size(90, 45) + Me.cmdminutes.Size = New System.Drawing.Size(75, 38) Me.cmdminutes.TabIndex = 152 Me.cmdminutes.Text = "min" Me.cmdminutes.UseVisualStyleBackColor = True @@ -1080,10 +1070,10 @@ Partial Class ucrCalculator 'cmdDmy ' Me.cmdDmy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDmy.Location = New System.Drawing.Point(94, 108) - Me.cmdDmy.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDmy.Location = New System.Drawing.Point(78, 90) + Me.cmdDmy.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDmy.Name = "cmdDmy" - Me.cmdDmy.Size = New System.Drawing.Size(90, 45) + Me.cmdDmy.Size = New System.Drawing.Size(75, 38) Me.cmdDmy.TabIndex = 151 Me.cmdDmy.Tag = "dmy" Me.cmdDmy.Text = "dmy" @@ -1092,10 +1082,10 @@ Partial Class ucrCalculator 'cmdDay ' Me.cmdDay.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDay.Location = New System.Drawing.Point(6, 64) - Me.cmdDay.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDay.Location = New System.Drawing.Point(5, 53) + Me.cmdDay.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDay.Name = "cmdDay" - Me.cmdDay.Size = New System.Drawing.Size(90, 45) + Me.cmdDay.Size = New System.Drawing.Size(75, 38) Me.cmdDay.TabIndex = 145 Me.cmdDay.Text = "day" Me.cmdDay.UseVisualStyleBackColor = True @@ -1103,11 +1093,11 @@ Partial Class ucrCalculator 'cmdMonth ' Me.cmdMonth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMonth.Location = New System.Drawing.Point(6, 64) - Me.cmdMonth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMonth.Location = New System.Drawing.Point(5, 53) + Me.cmdMonth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMonth.Name = "cmdMonth" Me.cmdMonth.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.cmdMonth.Size = New System.Drawing.Size(90, 45) + Me.cmdMonth.Size = New System.Drawing.Size(75, 38) Me.cmdMonth.TabIndex = 144 Me.cmdMonth.Text = "month" Me.cmdMonth.UseVisualStyleBackColor = True @@ -1115,10 +1105,10 @@ Partial Class ucrCalculator 'cmdYear ' Me.cmdYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYear.Location = New System.Drawing.Point(272, 21) - Me.cmdYear.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdYear.Location = New System.Drawing.Point(227, 18) + Me.cmdYear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdYear.Name = "cmdYear" - Me.cmdYear.Size = New System.Drawing.Size(90, 45) + Me.cmdYear.Size = New System.Drawing.Size(75, 38) Me.cmdYear.TabIndex = 143 Me.cmdYear.Text = "year" Me.cmdYear.UseVisualStyleBackColor = True @@ -1126,10 +1116,10 @@ Partial Class ucrCalculator 'cmdDate ' Me.cmdDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDate.Location = New System.Drawing.Point(6, 21) - Me.cmdDate.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDate.Location = New System.Drawing.Point(5, 18) + Me.cmdDate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDate.Name = "cmdDate" - Me.cmdDate.Size = New System.Drawing.Size(90, 45) + Me.cmdDate.Size = New System.Drawing.Size(75, 38) Me.cmdDate.TabIndex = 142 Me.cmdDate.Text = "date" Me.cmdDate.UseVisualStyleBackColor = True @@ -1137,10 +1127,10 @@ Partial Class ucrCalculator 'cmdYday ' Me.cmdYday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYday.Location = New System.Drawing.Point(272, 64) - Me.cmdYday.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdYday.Location = New System.Drawing.Point(227, 53) + Me.cmdYday.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdYday.Name = "cmdYday" - Me.cmdYday.Size = New System.Drawing.Size(90, 45) + Me.cmdYday.Size = New System.Drawing.Size(75, 38) Me.cmdYday.TabIndex = 141 Me.cmdYday.Text = "yday" Me.cmdYday.UseVisualStyleBackColor = True @@ -1148,10 +1138,10 @@ Partial Class ucrCalculator 'cmdWday ' Me.cmdWday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWday.Location = New System.Drawing.Point(183, 64) - Me.cmdWday.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdWday.Location = New System.Drawing.Point(152, 53) + Me.cmdWday.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdWday.Name = "cmdWday" - Me.cmdWday.Size = New System.Drawing.Size(90, 45) + Me.cmdWday.Size = New System.Drawing.Size(75, 38) Me.cmdWday.TabIndex = 140 Me.cmdWday.Text = "wday" Me.cmdWday.UseVisualStyleBackColor = True @@ -1159,10 +1149,10 @@ Partial Class ucrCalculator 'cmdMdy ' Me.cmdMdy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMdy.Location = New System.Drawing.Point(183, 108) - Me.cmdMdy.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMdy.Location = New System.Drawing.Point(152, 90) + Me.cmdMdy.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMdy.Name = "cmdMdy" - Me.cmdMdy.Size = New System.Drawing.Size(90, 45) + Me.cmdMdy.Size = New System.Drawing.Size(75, 38) Me.cmdMdy.TabIndex = 139 Me.cmdMdy.Text = "mdy" Me.cmdMdy.UseVisualStyleBackColor = True @@ -1170,10 +1160,10 @@ Partial Class ucrCalculator 'cmdYmd ' Me.cmdYmd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmd.Location = New System.Drawing.Point(6, 108) - Me.cmdYmd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdYmd.Location = New System.Drawing.Point(5, 90) + Me.cmdYmd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdYmd.Name = "cmdYmd" - Me.cmdYmd.Size = New System.Drawing.Size(90, 45) + Me.cmdYmd.Size = New System.Drawing.Size(75, 38) Me.cmdYmd.TabIndex = 138 Me.cmdYmd.Text = "ymd" Me.cmdYmd.UseVisualStyleBackColor = True @@ -1181,10 +1171,10 @@ Partial Class ucrCalculator 'cmdLeap ' Me.cmdLeap.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLeap.Location = New System.Drawing.Point(272, 108) - Me.cmdLeap.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLeap.Location = New System.Drawing.Point(227, 90) + Me.cmdLeap.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLeap.Name = "cmdLeap" - Me.cmdLeap.Size = New System.Drawing.Size(90, 45) + Me.cmdLeap.Size = New System.Drawing.Size(75, 38) Me.cmdLeap.TabIndex = 136 Me.cmdLeap.Text = "leap" Me.cmdLeap.UseVisualStyleBackColor = True @@ -1194,12 +1184,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(122, 36) + Me.ContextMenuStripComplex.Size = New System.Drawing.Size(110, 28) ' 'ComplexBaseToolStripMenuItem ' Me.ComplexBaseToolStripMenuItem.Name = "ComplexBaseToolStripMenuItem" - Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(121, 32) + Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 24) Me.ComplexBaseToolStripMenuItem.Text = "base" ' 'grpInteger @@ -1249,11 +1239,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(651, 92) - Me.grpInteger.Margin = New System.Windows.Forms.Padding(4) + Me.grpInteger.Location = New System.Drawing.Point(542, 77) Me.grpInteger.Name = "grpInteger" - Me.grpInteger.Padding = New System.Windows.Forms.Padding(4) - Me.grpInteger.Size = New System.Drawing.Size(462, 476) + Me.grpInteger.Size = New System.Drawing.Size(385, 397) Me.grpInteger.TabIndex = 183 Me.grpInteger.TabStop = False Me.grpInteger.Text = "Integer" @@ -1261,10 +1249,9 @@ Partial Class ucrCalculator 'cmdPrimorial ' Me.cmdPrimorial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPrimorial.Location = New System.Drawing.Point(334, 272) - Me.cmdPrimorial.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPrimorial.Location = New System.Drawing.Point(278, 227) Me.cmdPrimorial.Name = "cmdPrimorial" - Me.cmdPrimorial.Size = New System.Drawing.Size(112, 34) + Me.cmdPrimorial.Size = New System.Drawing.Size(93, 28) Me.cmdPrimorial.TabIndex = 47 Me.cmdPrimorial.Text = "primorial" Me.cmdPrimorial.UseVisualStyleBackColor = True @@ -1272,30 +1259,27 @@ Partial Class ucrCalculator 'cmdFactorize2 ' Me.cmdFactorize2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFactorize2.Location = New System.Drawing.Point(224, 58) - Me.cmdFactorize2.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFactorize2.Location = New System.Drawing.Point(187, 48) Me.cmdFactorize2.Name = "cmdFactorize2" - Me.cmdFactorize2.Size = New System.Drawing.Size(112, 34) + Me.cmdFactorize2.Size = New System.Drawing.Size(93, 28) Me.cmdFactorize2.TabIndex = 46 Me.cmdFactorize2.Text = "factorize2" Me.cmdFactorize2.UseVisualStyleBackColor = True ' 'cmdLucas ' - Me.cmdLucas.Location = New System.Drawing.Point(112, 92) - Me.cmdLucas.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLucas.Location = New System.Drawing.Point(93, 77) Me.cmdLucas.Name = "cmdLucas" - Me.cmdLucas.Size = New System.Drawing.Size(112, 34) + Me.cmdLucas.Size = New System.Drawing.Size(93, 28) Me.cmdLucas.TabIndex = 45 Me.cmdLucas.Text = "lucas" Me.cmdLucas.UseVisualStyleBackColor = True ' 'cmdFactorize ' - Me.cmdFactorize.Location = New System.Drawing.Point(112, 58) - Me.cmdFactorize.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFactorize.Location = New System.Drawing.Point(93, 48) Me.cmdFactorize.Name = "cmdFactorize" - Me.cmdFactorize.Size = New System.Drawing.Size(112, 34) + Me.cmdFactorize.Size = New System.Drawing.Size(93, 28) Me.cmdFactorize.TabIndex = 44 Me.cmdFactorize.Text = "factorize" Me.cmdFactorize.UseVisualStyleBackColor = True @@ -1303,10 +1287,9 @@ Partial Class ucrCalculator 'cmdSquare ' Me.cmdSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSquare.Location = New System.Drawing.Point(334, 386) - Me.cmdSquare.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSquare.Location = New System.Drawing.Point(278, 322) Me.cmdSquare.Name = "cmdSquare" - Me.cmdSquare.Size = New System.Drawing.Size(112, 34) + Me.cmdSquare.Size = New System.Drawing.Size(93, 28) Me.cmdSquare.TabIndex = 43 Me.cmdSquare.Text = "square" Me.cmdSquare.UseVisualStyleBackColor = True @@ -1314,10 +1297,9 @@ Partial Class ucrCalculator 'cmdTriangle ' Me.cmdTriangle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriangle.Location = New System.Drawing.Point(224, 386) - Me.cmdTriangle.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTriangle.Location = New System.Drawing.Point(187, 322) Me.cmdTriangle.Name = "cmdTriangle" - Me.cmdTriangle.Size = New System.Drawing.Size(112, 34) + Me.cmdTriangle.Size = New System.Drawing.Size(93, 28) Me.cmdTriangle.TabIndex = 42 Me.cmdTriangle.Text = "triangle" Me.cmdTriangle.UseVisualStyleBackColor = True @@ -1325,10 +1307,9 @@ Partial Class ucrCalculator 'cmdPadovan ' Me.cmdPadovan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPadovan.Location = New System.Drawing.Point(112, 386) - Me.cmdPadovan.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPadovan.Location = New System.Drawing.Point(93, 322) Me.cmdPadovan.Name = "cmdPadovan" - Me.cmdPadovan.Size = New System.Drawing.Size(112, 34) + Me.cmdPadovan.Size = New System.Drawing.Size(93, 28) Me.cmdPadovan.TabIndex = 41 Me.cmdPadovan.Text = "padovan" Me.cmdPadovan.UseVisualStyleBackColor = True @@ -1336,10 +1317,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, 386) - Me.cmdAchilles.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAchilles.Location = New System.Drawing.Point(2, 322) Me.cmdAchilles.Name = "cmdAchilles" - Me.cmdAchilles.Size = New System.Drawing.Size(112, 34) + Me.cmdAchilles.Size = New System.Drawing.Size(93, 28) Me.cmdAchilles.TabIndex = 40 Me.cmdAchilles.Text = "achilles" Me.cmdAchilles.UseVisualStyleBackColor = True @@ -1347,10 +1327,9 @@ Partial Class ucrCalculator 'cmdHappy ' Me.cmdHappy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHappy.Location = New System.Drawing.Point(334, 352) - Me.cmdHappy.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHappy.Location = New System.Drawing.Point(278, 293) Me.cmdHappy.Name = "cmdHappy" - Me.cmdHappy.Size = New System.Drawing.Size(112, 34) + Me.cmdHappy.Size = New System.Drawing.Size(93, 28) Me.cmdHappy.TabIndex = 39 Me.cmdHappy.Text = "happy" Me.cmdHappy.UseVisualStyleBackColor = True @@ -1358,10 +1337,9 @@ Partial Class ucrCalculator 'cmdUgly ' Me.cmdUgly.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdUgly.Location = New System.Drawing.Point(224, 352) - Me.cmdUgly.Margin = New System.Windows.Forms.Padding(4) + Me.cmdUgly.Location = New System.Drawing.Point(187, 293) Me.cmdUgly.Name = "cmdUgly" - Me.cmdUgly.Size = New System.Drawing.Size(112, 34) + Me.cmdUgly.Size = New System.Drawing.Size(93, 28) Me.cmdUgly.TabIndex = 38 Me.cmdUgly.Text = "ugly" Me.cmdUgly.UseVisualStyleBackColor = True @@ -1369,10 +1347,9 @@ Partial Class ucrCalculator 'cmdPowerful ' Me.cmdPowerful.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPowerful.Location = New System.Drawing.Point(112, 352) - Me.cmdPowerful.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPowerful.Location = New System.Drawing.Point(93, 293) Me.cmdPowerful.Name = "cmdPowerful" - Me.cmdPowerful.Size = New System.Drawing.Size(112, 34) + Me.cmdPowerful.Size = New System.Drawing.Size(93, 28) Me.cmdPowerful.TabIndex = 37 Me.cmdPowerful.Text = "powerful" Me.cmdPowerful.UseVisualStyleBackColor = True @@ -1380,10 +1357,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, 352) - Me.cmdFrugal.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFrugal.Location = New System.Drawing.Point(2, 293) Me.cmdFrugal.Name = "cmdFrugal" - Me.cmdFrugal.Size = New System.Drawing.Size(112, 34) + Me.cmdFrugal.Size = New System.Drawing.Size(93, 28) Me.cmdFrugal.TabIndex = 36 Me.cmdFrugal.Text = "frugal" Me.cmdFrugal.UseVisualStyleBackColor = True @@ -1391,10 +1367,9 @@ Partial Class ucrCalculator 'cmdPerfect ' Me.cmdPerfect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPerfect.Location = New System.Drawing.Point(334, 320) - Me.cmdPerfect.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPerfect.Location = New System.Drawing.Point(278, 267) Me.cmdPerfect.Name = "cmdPerfect" - Me.cmdPerfect.Size = New System.Drawing.Size(112, 34) + Me.cmdPerfect.Size = New System.Drawing.Size(93, 28) Me.cmdPerfect.TabIndex = 35 Me.cmdPerfect.Text = "perfect" Me.cmdPerfect.UseVisualStyleBackColor = True @@ -1402,10 +1377,9 @@ Partial Class ucrCalculator 'cmdAbundant ' Me.cmdAbundant.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAbundant.Location = New System.Drawing.Point(224, 320) - Me.cmdAbundant.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAbundant.Location = New System.Drawing.Point(187, 267) Me.cmdAbundant.Name = "cmdAbundant" - Me.cmdAbundant.Size = New System.Drawing.Size(112, 34) + Me.cmdAbundant.Size = New System.Drawing.Size(93, 28) Me.cmdAbundant.TabIndex = 34 Me.cmdAbundant.Text = "abundant" Me.cmdAbundant.UseVisualStyleBackColor = True @@ -1413,10 +1387,9 @@ Partial Class ucrCalculator 'cmdFibonacci2 ' Me.cmdFibonacci2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFibonacci2.Location = New System.Drawing.Point(112, 320) - Me.cmdFibonacci2.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFibonacci2.Location = New System.Drawing.Point(93, 267) Me.cmdFibonacci2.Name = "cmdFibonacci2" - Me.cmdFibonacci2.Size = New System.Drawing.Size(112, 34) + Me.cmdFibonacci2.Size = New System.Drawing.Size(93, 28) Me.cmdFibonacci2.TabIndex = 33 Me.cmdFibonacci2.Text = "fibonacci2" Me.cmdFibonacci2.UseVisualStyleBackColor = True @@ -1424,10 +1397,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, 320) - Me.cmdPalindrome.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPalindrome.Location = New System.Drawing.Point(2, 267) Me.cmdPalindrome.Name = "cmdPalindrome" - Me.cmdPalindrome.Size = New System.Drawing.Size(112, 34) + Me.cmdPalindrome.Size = New System.Drawing.Size(93, 28) Me.cmdPalindrome.TabIndex = 32 Me.cmdPalindrome.Text = "palindrome" Me.cmdPalindrome.UseVisualStyleBackColor = True @@ -1435,10 +1407,9 @@ Partial Class ucrCalculator 'cmdRoman ' Me.cmdRoman.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRoman.Location = New System.Drawing.Point(224, 158) - Me.cmdRoman.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRoman.Location = New System.Drawing.Point(187, 132) Me.cmdRoman.Name = "cmdRoman" - Me.cmdRoman.Size = New System.Drawing.Size(112, 34) + Me.cmdRoman.Size = New System.Drawing.Size(93, 28) Me.cmdRoman.TabIndex = 31 Me.cmdRoman.Text = "roman" Me.cmdRoman.UseVisualStyleBackColor = True @@ -1446,10 +1417,9 @@ Partial Class ucrCalculator 'cmdHexmode ' Me.cmdHexmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHexmode.Location = New System.Drawing.Point(334, 124) - Me.cmdHexmode.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHexmode.Location = New System.Drawing.Point(278, 103) Me.cmdHexmode.Name = "cmdHexmode" - Me.cmdHexmode.Size = New System.Drawing.Size(112, 34) + Me.cmdHexmode.Size = New System.Drawing.Size(93, 28) Me.cmdHexmode.TabIndex = 30 Me.cmdHexmode.Text = "hexmode" Me.cmdHexmode.UseVisualStyleBackColor = True @@ -1457,10 +1427,9 @@ Partial Class ucrCalculator 'cmdOctmode ' Me.cmdOctmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctmode.Location = New System.Drawing.Point(224, 124) - Me.cmdOctmode.Margin = New System.Windows.Forms.Padding(4) + Me.cmdOctmode.Location = New System.Drawing.Point(187, 103) Me.cmdOctmode.Name = "cmdOctmode" - Me.cmdOctmode.Size = New System.Drawing.Size(112, 34) + Me.cmdOctmode.Size = New System.Drawing.Size(93, 28) Me.cmdOctmode.TabIndex = 29 Me.cmdOctmode.Text = "octmode" Me.cmdOctmode.UseVisualStyleBackColor = True @@ -1468,10 +1437,9 @@ Partial Class ucrCalculator 'cmdKTuple ' Me.cmdKTuple.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdKTuple.Location = New System.Drawing.Point(224, 272) - Me.cmdKTuple.Margin = New System.Windows.Forms.Padding(4) + Me.cmdKTuple.Location = New System.Drawing.Point(187, 227) Me.cmdKTuple.Name = "cmdKTuple" - Me.cmdKTuple.Size = New System.Drawing.Size(112, 34) + Me.cmdKTuple.Size = New System.Drawing.Size(93, 28) Me.cmdKTuple.TabIndex = 28 Me.cmdKTuple.Text = "k-tuple" Me.cmdKTuple.UseVisualStyleBackColor = True @@ -1479,10 +1447,9 @@ Partial Class ucrCalculator 'cmdTriplets ' Me.cmdTriplets.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriplets.Location = New System.Drawing.Point(112, 272) - Me.cmdTriplets.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTriplets.Location = New System.Drawing.Point(93, 227) Me.cmdTriplets.Name = "cmdTriplets" - Me.cmdTriplets.Size = New System.Drawing.Size(112, 34) + Me.cmdTriplets.Size = New System.Drawing.Size(93, 28) Me.cmdTriplets.TabIndex = 27 Me.cmdTriplets.Text = "triplets" Me.cmdTriplets.UseVisualStyleBackColor = True @@ -1490,10 +1457,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, 272) - Me.cmdThird.Margin = New System.Windows.Forms.Padding(4) + Me.cmdThird.Location = New System.Drawing.Point(2, 227) Me.cmdThird.Name = "cmdThird" - Me.cmdThird.Size = New System.Drawing.Size(112, 34) + Me.cmdThird.Size = New System.Drawing.Size(93, 28) Me.cmdThird.TabIndex = 26 Me.cmdThird.Text = "third" Me.cmdThird.UseVisualStyleBackColor = True @@ -1501,10 +1467,9 @@ Partial Class ucrCalculator 'cmdSexy ' Me.cmdSexy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSexy.Location = New System.Drawing.Point(334, 238) - Me.cmdSexy.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSexy.Location = New System.Drawing.Point(278, 198) Me.cmdSexy.Name = "cmdSexy" - Me.cmdSexy.Size = New System.Drawing.Size(112, 34) + Me.cmdSexy.Size = New System.Drawing.Size(93, 28) Me.cmdSexy.TabIndex = 25 Me.cmdSexy.Text = "sexy" Me.cmdSexy.UseVisualStyleBackColor = True @@ -1512,10 +1477,9 @@ Partial Class ucrCalculator 'cmdCousin ' Me.cmdCousin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCousin.Location = New System.Drawing.Point(224, 238) - Me.cmdCousin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCousin.Location = New System.Drawing.Point(187, 198) Me.cmdCousin.Name = "cmdCousin" - Me.cmdCousin.Size = New System.Drawing.Size(112, 34) + Me.cmdCousin.Size = New System.Drawing.Size(93, 28) Me.cmdCousin.TabIndex = 24 Me.cmdCousin.Text = "cousin" Me.cmdCousin.UseVisualStyleBackColor = True @@ -1523,10 +1487,9 @@ Partial Class ucrCalculator 'cmdTwin ' Me.cmdTwin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTwin.Location = New System.Drawing.Point(112, 238) - Me.cmdTwin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTwin.Location = New System.Drawing.Point(93, 198) Me.cmdTwin.Name = "cmdTwin" - Me.cmdTwin.Size = New System.Drawing.Size(112, 34) + Me.cmdTwin.Size = New System.Drawing.Size(93, 28) Me.cmdTwin.TabIndex = 23 Me.cmdTwin.Text = "twin" Me.cmdTwin.UseVisualStyleBackColor = True @@ -1534,10 +1497,9 @@ Partial Class ucrCalculator 'cmdPhi ' Me.cmdPhi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPhi.Location = New System.Drawing.Point(112, 158) - Me.cmdPhi.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPhi.Location = New System.Drawing.Point(93, 132) Me.cmdPhi.Name = "cmdPhi" - Me.cmdPhi.Size = New System.Drawing.Size(112, 34) + Me.cmdPhi.Size = New System.Drawing.Size(93, 28) Me.cmdPhi.TabIndex = 22 Me.cmdPhi.Text = "phi" Me.cmdPhi.UseVisualStyleBackColor = True @@ -1545,10 +1507,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, 238) - Me.cmdCoprime.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCoprime.Location = New System.Drawing.Point(2, 198) Me.cmdCoprime.Name = "cmdCoprime" - Me.cmdCoprime.Size = New System.Drawing.Size(112, 34) + Me.cmdCoprime.Size = New System.Drawing.Size(93, 28) Me.cmdCoprime.TabIndex = 21 Me.cmdCoprime.Text = "coprime" Me.cmdCoprime.UseVisualStyleBackColor = True @@ -1556,10 +1517,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, 158) - Me.cmdSCM.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSCM.Location = New System.Drawing.Point(2, 132) Me.cmdSCM.Name = "cmdSCM" - Me.cmdSCM.Size = New System.Drawing.Size(112, 34) + Me.cmdSCM.Size = New System.Drawing.Size(93, 28) Me.cmdSCM.TabIndex = 20 Me.cmdSCM.Text = "scm" Me.cmdSCM.UseVisualStyleBackColor = True @@ -1567,10 +1527,9 @@ Partial Class ucrCalculator 'cmdGCD ' Me.cmdGCD.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGCD.Location = New System.Drawing.Point(334, 158) - Me.cmdGCD.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGCD.Location = New System.Drawing.Point(278, 132) Me.cmdGCD.Name = "cmdGCD" - Me.cmdGCD.Size = New System.Drawing.Size(112, 34) + Me.cmdGCD.Size = New System.Drawing.Size(93, 28) Me.cmdGCD.TabIndex = 19 Me.cmdGCD.Text = "gcd" Me.cmdGCD.UseVisualStyleBackColor = True @@ -1578,20 +1537,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, 206) - Me.cmdGeneratePrimes.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 172) Me.cmdGeneratePrimes.Name = "cmdGeneratePrimes" - Me.cmdGeneratePrimes.Size = New System.Drawing.Size(112, 34) + Me.cmdGeneratePrimes.Size = New System.Drawing.Size(93, 28) Me.cmdGeneratePrimes.TabIndex = 18 Me.cmdGeneratePrimes.Text = "primes" Me.cmdGeneratePrimes.UseVisualStyleBackColor = True ' 'cmdNthPrime ' - Me.cmdNthPrime.Location = New System.Drawing.Point(112, 206) - Me.cmdNthPrime.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNthPrime.Location = New System.Drawing.Point(93, 172) Me.cmdNthPrime.Name = "cmdNthPrime" - Me.cmdNthPrime.Size = New System.Drawing.Size(112, 34) + Me.cmdNthPrime.Size = New System.Drawing.Size(93, 28) Me.cmdNthPrime.TabIndex = 17 Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True @@ -1600,10 +1557,9 @@ Partial Class ucrCalculator ' Me.cmdIntegerRHelp.AutoSize = True Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(315, 434) - Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(136, 45) + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger Me.cmdIntegerRHelp.TabIndex = 16 Me.cmdIntegerRHelp.Text = "R Help" @@ -1614,57 +1570,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(180, 228) + Me.ContextMenuStripInteger.Size = New System.Drawing.Size(157, 172) ' 'GmpToolStripMenuItem ' Me.GmpToolStripMenuItem.Name = "GmpToolStripMenuItem" - Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.GmpToolStripMenuItem.Text = "Gmp" ' 'DescToolsToolStripMenuItem ' Me.DescToolsToolStripMenuItem.Name = "DescToolsToolStripMenuItem" - Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.DescToolsToolStripMenuItem.Text = "DescTools" ' 'RutilsToolStripMenuItem ' Me.RutilsToolStripMenuItem.Name = "RutilsToolStripMenuItem" - Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.RutilsToolStripMenuItem.Text = "R.utils" ' 'PrimesToolStripMenuItem ' Me.PrimesToolStripMenuItem.Name = "PrimesToolStripMenuItem" - Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.PrimesToolStripMenuItem.Text = "Primes" ' 'ZseqToolStripMenuItem ' Me.ZseqToolStripMenuItem.Name = "ZseqToolStripMenuItem" - Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.ZseqToolStripMenuItem.Text = "Zseq" ' 'UtilsToolStripMenuItem ' Me.UtilsToolStripMenuItem.Name = "UtilsToolStripMenuItem" - Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) Me.UtilsToolStripMenuItem.Text = "R Utils" ' 'ConfdesignToolStripMenuItem ' Me.ConfdesignToolStripMenuItem.Name = "ConfdesignToolStripMenuItem" - Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(179, 32) + Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(156, 24) 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(112, 124) - Me.cmdHex.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHex.Location = New System.Drawing.Point(93, 103) Me.cmdHex.Name = "cmdHex" - Me.cmdHex.Size = New System.Drawing.Size(112, 34) + Me.cmdHex.Size = New System.Drawing.Size(93, 28) Me.cmdHex.TabIndex = 15 Me.cmdHex.Text = "hex" Me.cmdHex.UseVisualStyleBackColor = True @@ -1672,10 +1627,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, 124) - Me.cmdOctal.Margin = New System.Windows.Forms.Padding(4) + Me.cmdOctal.Location = New System.Drawing.Point(2, 103) Me.cmdOctal.Name = "cmdOctal" - Me.cmdOctal.Size = New System.Drawing.Size(112, 34) + Me.cmdOctal.Size = New System.Drawing.Size(93, 28) Me.cmdOctal.TabIndex = 14 Me.cmdOctal.Text = "octal" Me.cmdOctal.UseVisualStyleBackColor = True @@ -1683,10 +1637,9 @@ Partial Class ucrCalculator 'cmdBinary ' Me.cmdBinary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBinary.Location = New System.Drawing.Point(334, 92) - Me.cmdBinary.Margin = New System.Windows.Forms.Padding(4) + Me.cmdBinary.Location = New System.Drawing.Point(278, 77) Me.cmdBinary.Name = "cmdBinary" - Me.cmdBinary.Size = New System.Drawing.Size(112, 34) + Me.cmdBinary.Size = New System.Drawing.Size(93, 28) Me.cmdBinary.TabIndex = 13 Me.cmdBinary.Text = "binary" Me.cmdBinary.UseVisualStyleBackColor = True @@ -1694,20 +1647,18 @@ Partial Class ucrCalculator 'cmdBigQ ' Me.cmdBigQ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigQ.Location = New System.Drawing.Point(112, 26) - Me.cmdBigQ.Margin = New System.Windows.Forms.Padding(4) + Me.cmdBigQ.Location = New System.Drawing.Point(93, 22) Me.cmdBigQ.Name = "cmdBigQ" - Me.cmdBigQ.Size = New System.Drawing.Size(112, 34) + Me.cmdBigQ.Size = New System.Drawing.Size(93, 28) Me.cmdBigQ.TabIndex = 12 Me.cmdBigQ.Text = "bigq" Me.cmdBigQ.UseVisualStyleBackColor = True ' 'cmdDigitSum ' - Me.cmdDigitSum.Location = New System.Drawing.Point(334, 58) - Me.cmdDigitSum.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDigitSum.Location = New System.Drawing.Point(278, 48) Me.cmdDigitSum.Name = "cmdDigitSum" - Me.cmdDigitSum.Size = New System.Drawing.Size(112, 34) + Me.cmdDigitSum.Size = New System.Drawing.Size(93, 28) Me.cmdDigitSum.TabIndex = 10 Me.cmdDigitSum.Text = "digitsum" Me.cmdDigitSum.UseVisualStyleBackColor = True @@ -1715,60 +1666,54 @@ Partial Class ucrCalculator 'cmdRankPercent ' Me.cmdRankPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRankPercent.Location = New System.Drawing.Point(224, 92) - Me.cmdRankPercent.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRankPercent.Location = New System.Drawing.Point(187, 77) Me.cmdRankPercent.Name = "cmdRankPercent" - Me.cmdRankPercent.Size = New System.Drawing.Size(112, 34) + Me.cmdRankPercent.Size = New System.Drawing.Size(93, 28) Me.cmdRankPercent.TabIndex = 9 Me.cmdRankPercent.Text = "percentrank" Me.cmdRankPercent.UseVisualStyleBackColor = True ' 'cmdDivisors ' - Me.cmdDivisors.Location = New System.Drawing.Point(2, 58) - Me.cmdDivisors.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDivisors.Location = New System.Drawing.Point(2, 48) Me.cmdDivisors.Name = "cmdDivisors" - Me.cmdDivisors.Size = New System.Drawing.Size(112, 34) + Me.cmdDivisors.Size = New System.Drawing.Size(93, 28) Me.cmdDivisors.TabIndex = 8 Me.cmdDivisors.Text = "divisors" Me.cmdDivisors.UseVisualStyleBackColor = True ' 'cmdFibonacci ' - Me.cmdFibonacci.Location = New System.Drawing.Point(2, 92) - Me.cmdFibonacci.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFibonacci.Location = New System.Drawing.Point(2, 77) Me.cmdFibonacci.Name = "cmdFibonacci" - Me.cmdFibonacci.Size = New System.Drawing.Size(112, 34) + Me.cmdFibonacci.Size = New System.Drawing.Size(93, 28) Me.cmdFibonacci.TabIndex = 7 Me.cmdFibonacci.Text = "fibonacci" Me.cmdFibonacci.UseVisualStyleBackColor = True ' 'cmdNextPrime ' - Me.cmdNextPrime.Location = New System.Drawing.Point(224, 206) - Me.cmdNextPrime.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNextPrime.Location = New System.Drawing.Point(187, 172) Me.cmdNextPrime.Name = "cmdNextPrime" - Me.cmdNextPrime.Size = New System.Drawing.Size(112, 34) + Me.cmdNextPrime.Size = New System.Drawing.Size(93, 28) Me.cmdNextPrime.TabIndex = 5 Me.cmdNextPrime.Text = "next prime" Me.cmdNextPrime.UseVisualStyleBackColor = True ' 'cmdChoosez ' - Me.cmdChoosez.Location = New System.Drawing.Point(334, 26) - Me.cmdChoosez.Margin = New System.Windows.Forms.Padding(4) + Me.cmdChoosez.Location = New System.Drawing.Point(278, 22) Me.cmdChoosez.Name = "cmdChoosez" - Me.cmdChoosez.Size = New System.Drawing.Size(112, 34) + Me.cmdChoosez.Size = New System.Drawing.Size(93, 28) Me.cmdChoosez.TabIndex = 4 Me.cmdChoosez.Text = "choose" Me.cmdChoosez.UseVisualStyleBackColor = True ' 'cmdFactorial ' - Me.cmdFactorial.Location = New System.Drawing.Point(224, 26) - Me.cmdFactorial.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFactorial.Location = New System.Drawing.Point(187, 22) Me.cmdFactorial.Name = "cmdFactorial" - Me.cmdFactorial.Size = New System.Drawing.Size(112, 34) + Me.cmdFactorial.Size = New System.Drawing.Size(93, 28) Me.cmdFactorial.TabIndex = 2 Me.cmdFactorial.Text = "factorial" Me.cmdFactorial.UseVisualStyleBackColor = True @@ -1776,10 +1721,9 @@ Partial Class ucrCalculator 'cmdIsPrime ' Me.cmdIsPrime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdIsPrime.Location = New System.Drawing.Point(334, 206) - Me.cmdIsPrime.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIsPrime.Location = New System.Drawing.Point(278, 172) Me.cmdIsPrime.Name = "cmdIsPrime" - Me.cmdIsPrime.Size = New System.Drawing.Size(112, 34) + Me.cmdIsPrime.Size = New System.Drawing.Size(93, 28) Me.cmdIsPrime.TabIndex = 1 Me.cmdIsPrime.Text = "is_prime" Me.cmdIsPrime.UseVisualStyleBackColor = True @@ -1787,10 +1731,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, 26) - Me.cmdBigZ.Margin = New System.Windows.Forms.Padding(4) + Me.cmdBigZ.Location = New System.Drawing.Point(2, 22) Me.cmdBigZ.Name = "cmdBigZ" - Me.cmdBigZ.Size = New System.Drawing.Size(112, 34) + Me.cmdBigZ.Size = New System.Drawing.Size(93, 28) Me.cmdBigZ.TabIndex = 0 Me.cmdBigZ.Text = "bigz" Me.cmdBigZ.UseVisualStyleBackColor = True @@ -1818,9 +1761,11 @@ 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(651, 92) + Me.grpFactor.Location = New System.Drawing.Point(542, 77) + Me.grpFactor.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.grpFactor.Name = "grpFactor" - Me.grpFactor.Size = New System.Drawing.Size(372, 312) + Me.grpFactor.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpFactor.Size = New System.Drawing.Size(310, 260) Me.grpFactor.TabIndex = 191 Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" @@ -1829,10 +1774,9 @@ Partial Class ucrCalculator ' Me.cmdTransformHelp.AutoSize = True Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(226, 262) - Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(136, 45) + Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor Me.cmdTransformHelp.TabIndex = 212 Me.cmdTransformHelp.Text = "R Help" @@ -1843,20 +1787,21 @@ 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(139, 36) + Me.ContextMenuStripFactor.Size = New System.Drawing.Size(124, 28) ' 'FactorForcatsToolStripMenuItem ' Me.FactorForcatsToolStripMenuItem.Name = "FactorForcatsToolStripMenuItem" - Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(138, 32) + Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(123, 24) Me.FactorForcatsToolStripMenuItem.Text = "forcats" ' 'cmdShuffle ' Me.cmdShuffle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShuffle.Location = New System.Drawing.Point(273, 214) + Me.cmdShuffle.Location = New System.Drawing.Point(228, 178) + Me.cmdShuffle.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdShuffle.Name = "cmdShuffle" - Me.cmdShuffle.Size = New System.Drawing.Size(90, 48) + Me.cmdShuffle.Size = New System.Drawing.Size(75, 40) Me.cmdShuffle.TabIndex = 210 Me.cmdShuffle.Text = "shuffle" Me.cmdShuffle.UseVisualStyleBackColor = True @@ -1864,9 +1809,10 @@ Partial Class ucrCalculator 'cmdShift ' Me.cmdShift.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShift.Location = New System.Drawing.Point(184, 214) + Me.cmdShift.Location = New System.Drawing.Point(153, 178) + Me.cmdShift.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdShift.Name = "cmdShift" - Me.cmdShift.Size = New System.Drawing.Size(90, 48) + Me.cmdShift.Size = New System.Drawing.Size(75, 40) Me.cmdShift.TabIndex = 209 Me.cmdShift.Text = "shift" Me.cmdShift.UseVisualStyleBackColor = True @@ -1874,9 +1820,10 @@ Partial Class ucrCalculator 'cmdReverse ' Me.cmdReverse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverse.Location = New System.Drawing.Point(96, 214) + Me.cmdReverse.Location = New System.Drawing.Point(80, 178) + Me.cmdReverse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdReverse.Name = "cmdReverse" - Me.cmdReverse.Size = New System.Drawing.Size(90, 48) + Me.cmdReverse.Size = New System.Drawing.Size(75, 40) Me.cmdReverse.TabIndex = 208 Me.cmdReverse.Text = "reverse" Me.cmdReverse.UseVisualStyleBackColor = True @@ -1884,9 +1831,10 @@ Partial Class ucrCalculator 'cmdReorder ' Me.cmdReorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReorder.Location = New System.Drawing.Point(6, 214) + Me.cmdReorder.Location = New System.Drawing.Point(5, 178) + Me.cmdReorder.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdReorder.Name = "cmdReorder" - Me.cmdReorder.Size = New System.Drawing.Size(90, 48) + Me.cmdReorder.Size = New System.Drawing.Size(75, 40) Me.cmdReorder.TabIndex = 207 Me.cmdReorder.Text = "reorder" Me.cmdReorder.UseVisualStyleBackColor = True @@ -1894,9 +1842,10 @@ Partial Class ucrCalculator 'cmdRelevel ' Me.cmdRelevel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRelevel.Location = New System.Drawing.Point(273, 166) + Me.cmdRelevel.Location = New System.Drawing.Point(228, 138) + Me.cmdRelevel.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdRelevel.Name = "cmdRelevel" - Me.cmdRelevel.Size = New System.Drawing.Size(90, 48) + Me.cmdRelevel.Size = New System.Drawing.Size(75, 40) Me.cmdRelevel.TabIndex = 206 Me.cmdRelevel.Text = "relevel" Me.cmdRelevel.UseVisualStyleBackColor = True @@ -1904,9 +1853,10 @@ Partial Class ucrCalculator 'cmdRecode ' Me.cmdRecode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRecode.Location = New System.Drawing.Point(184, 166) + Me.cmdRecode.Location = New System.Drawing.Point(153, 138) + Me.cmdRecode.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdRecode.Name = "cmdRecode" - Me.cmdRecode.Size = New System.Drawing.Size(90, 48) + Me.cmdRecode.Size = New System.Drawing.Size(75, 40) Me.cmdRecode.TabIndex = 205 Me.cmdRecode.Text = "recode" Me.cmdRecode.UseVisualStyleBackColor = True @@ -1914,9 +1864,10 @@ Partial Class ucrCalculator 'cmdOther ' Me.cmdOther.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOther.Location = New System.Drawing.Point(96, 166) + Me.cmdOther.Location = New System.Drawing.Point(80, 138) + Me.cmdOther.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdOther.Name = "cmdOther" - Me.cmdOther.Size = New System.Drawing.Size(90, 48) + Me.cmdOther.Size = New System.Drawing.Size(75, 40) Me.cmdOther.TabIndex = 204 Me.cmdOther.Text = "other" Me.cmdOther.UseVisualStyleBackColor = True @@ -1924,9 +1875,10 @@ Partial Class ucrCalculator 'cmdFmatch ' Me.cmdFmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFmatch.Location = New System.Drawing.Point(6, 166) + Me.cmdFmatch.Location = New System.Drawing.Point(5, 138) + Me.cmdFmatch.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdFmatch.Name = "cmdFmatch" - Me.cmdFmatch.Size = New System.Drawing.Size(90, 48) + Me.cmdFmatch.Size = New System.Drawing.Size(75, 40) Me.cmdFmatch.TabIndex = 203 Me.cmdFmatch.Text = "match" Me.cmdFmatch.UseVisualStyleBackColor = True @@ -1934,9 +1886,10 @@ Partial Class ucrCalculator 'cmdLump ' Me.cmdLump.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLump.Location = New System.Drawing.Point(273, 120) + Me.cmdLump.Location = New System.Drawing.Point(228, 100) + Me.cmdLump.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdLump.Name = "cmdLump" - Me.cmdLump.Size = New System.Drawing.Size(90, 48) + Me.cmdLump.Size = New System.Drawing.Size(75, 40) Me.cmdLump.TabIndex = 202 Me.cmdLump.Text = "lump" Me.cmdLump.UseVisualStyleBackColor = True @@ -1944,9 +1897,10 @@ Partial Class ucrCalculator 'cmdInseq ' Me.cmdInseq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInseq.Location = New System.Drawing.Point(184, 120) + Me.cmdInseq.Location = New System.Drawing.Point(153, 100) + Me.cmdInseq.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdInseq.Name = "cmdInseq" - Me.cmdInseq.Size = New System.Drawing.Size(90, 48) + Me.cmdInseq.Size = New System.Drawing.Size(75, 40) Me.cmdInseq.TabIndex = 201 Me.cmdInseq.Text = "inseq" Me.cmdInseq.UseVisualStyleBackColor = True @@ -1954,9 +1908,10 @@ Partial Class ucrCalculator 'cmdInfreq ' Me.cmdInfreq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInfreq.Location = New System.Drawing.Point(96, 120) + Me.cmdInfreq.Location = New System.Drawing.Point(80, 100) + Me.cmdInfreq.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdInfreq.Name = "cmdInfreq" - Me.cmdInfreq.Size = New System.Drawing.Size(90, 48) + Me.cmdInfreq.Size = New System.Drawing.Size(75, 40) Me.cmdInfreq.TabIndex = 200 Me.cmdInfreq.Text = "infreq" Me.cmdInfreq.UseVisualStyleBackColor = True @@ -1964,9 +1919,10 @@ Partial Class ucrCalculator 'cmdInorder ' Me.cmdInorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInorder.Location = New System.Drawing.Point(6, 120) + Me.cmdInorder.Location = New System.Drawing.Point(5, 100) + Me.cmdInorder.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdInorder.Name = "cmdInorder" - Me.cmdInorder.Size = New System.Drawing.Size(90, 48) + Me.cmdInorder.Size = New System.Drawing.Size(75, 40) Me.cmdInorder.TabIndex = 199 Me.cmdInorder.Text = "inorder" Me.cmdInorder.UseVisualStyleBackColor = True @@ -1974,9 +1930,10 @@ Partial Class ucrCalculator 'cmdAdd_na ' Me.cmdAdd_na.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAdd_na.Location = New System.Drawing.Point(273, 72) + Me.cmdAdd_na.Location = New System.Drawing.Point(228, 60) + Me.cmdAdd_na.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdAdd_na.Name = "cmdAdd_na" - Me.cmdAdd_na.Size = New System.Drawing.Size(90, 48) + Me.cmdAdd_na.Size = New System.Drawing.Size(75, 40) Me.cmdAdd_na.TabIndex = 198 Me.cmdAdd_na.Text = "add_na" Me.cmdAdd_na.UseVisualStyleBackColor = True @@ -1984,9 +1941,10 @@ Partial Class ucrCalculator 'cmdExpand ' Me.cmdExpand.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExpand.Location = New System.Drawing.Point(184, 72) + Me.cmdExpand.Location = New System.Drawing.Point(153, 60) + Me.cmdExpand.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdExpand.Name = "cmdExpand" - Me.cmdExpand.Size = New System.Drawing.Size(90, 48) + Me.cmdExpand.Size = New System.Drawing.Size(75, 40) Me.cmdExpand.TabIndex = 197 Me.cmdExpand.Text = "expand" Me.cmdExpand.UseVisualStyleBackColor = True @@ -1994,9 +1952,10 @@ Partial Class ucrCalculator 'cmdDrop ' Me.cmdDrop.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDrop.Location = New System.Drawing.Point(96, 72) + Me.cmdDrop.Location = New System.Drawing.Point(80, 60) + Me.cmdDrop.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdDrop.Name = "cmdDrop" - Me.cmdDrop.Size = New System.Drawing.Size(90, 48) + Me.cmdDrop.Size = New System.Drawing.Size(75, 40) Me.cmdDrop.TabIndex = 196 Me.cmdDrop.Text = "drop" Me.cmdDrop.UseVisualStyleBackColor = True @@ -2004,9 +1963,10 @@ Partial Class ucrCalculator 'cmdCross ' Me.cmdCross.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCross.Location = New System.Drawing.Point(6, 72) + Me.cmdCross.Location = New System.Drawing.Point(5, 60) + Me.cmdCross.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCross.Name = "cmdCross" - Me.cmdCross.Size = New System.Drawing.Size(90, 48) + Me.cmdCross.Size = New System.Drawing.Size(75, 40) Me.cmdCross.TabIndex = 195 Me.cmdCross.Text = "cross" Me.cmdCross.UseVisualStyleBackColor = True @@ -2014,9 +1974,10 @@ Partial Class ucrCalculator 'cmdCollapse ' Me.cmdCollapse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollapse.Location = New System.Drawing.Point(273, 24) + Me.cmdCollapse.Location = New System.Drawing.Point(228, 20) + Me.cmdCollapse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCollapse.Name = "cmdCollapse" - Me.cmdCollapse.Size = New System.Drawing.Size(90, 48) + Me.cmdCollapse.Size = New System.Drawing.Size(75, 40) Me.cmdCollapse.TabIndex = 194 Me.cmdCollapse.Text = "collapse" Me.cmdCollapse.UseVisualStyleBackColor = True @@ -2024,9 +1985,10 @@ Partial Class ucrCalculator 'cmdLabelled ' Me.cmdLabelled.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLabelled.Location = New System.Drawing.Point(184, 24) + Me.cmdLabelled.Location = New System.Drawing.Point(153, 20) + Me.cmdLabelled.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdLabelled.Name = "cmdLabelled" - Me.cmdLabelled.Size = New System.Drawing.Size(90, 48) + Me.cmdLabelled.Size = New System.Drawing.Size(75, 40) Me.cmdLabelled.TabIndex = 193 Me.cmdLabelled.Text = "labelled " Me.cmdLabelled.UseVisualStyleBackColor = True @@ -2034,9 +1996,10 @@ Partial Class ucrCalculator 'cmdFactor ' Me.cmdFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFactor.Location = New System.Drawing.Point(6, 24) + Me.cmdFactor.Location = New System.Drawing.Point(5, 20) + Me.cmdFactor.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdFactor.Name = "cmdFactor" - Me.cmdFactor.Size = New System.Drawing.Size(90, 48) + Me.cmdFactor.Size = New System.Drawing.Size(75, 40) Me.cmdFactor.TabIndex = 191 Me.cmdFactor.Text = "factor" Me.cmdFactor.UseVisualStyleBackColor = True @@ -2044,9 +2007,10 @@ Partial Class ucrCalculator 'cmdAnon ' Me.cmdAnon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnon.Location = New System.Drawing.Point(96, 24) + Me.cmdAnon.Location = New System.Drawing.Point(80, 20) + Me.cmdAnon.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdAnon.Name = "cmdAnon" - Me.cmdAnon.Size = New System.Drawing.Size(90, 48) + Me.cmdAnon.Size = New System.Drawing.Size(75, 40) Me.cmdAnon.TabIndex = 192 Me.cmdAnon.Text = "anon" Me.cmdAnon.UseVisualStyleBackColor = True @@ -2075,9 +2039,11 @@ 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(651, 92) + Me.grpHydroGOF.Location = New System.Drawing.Point(542, 77) + Me.grpHydroGOF.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.grpHydroGOF.Name = "grpHydroGOF" - Me.grpHydroGOF.Size = New System.Drawing.Size(274, 404) + Me.grpHydroGOF.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpHydroGOF.Size = New System.Drawing.Size(228, 337) Me.grpHydroGOF.TabIndex = 195 Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "hydroGOF " @@ -2086,10 +2052,9 @@ Partial Class ucrCalculator ' Me.cmdHydroHelp.AutoSize = True Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(166, 358) - Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(129, 45) + Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF Me.cmdHydroHelp.TabIndex = 212 Me.cmdHydroHelp.Text = "R Help" @@ -2100,20 +2065,21 @@ 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(167, 36) + Me.ContextMenuStripHydroGOF.Size = New System.Drawing.Size(145, 28) ' 'HydroGOFToolStripMenuItem ' Me.HydroGOFToolStripMenuItem.Name = "HydroGOFToolStripMenuItem" - Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(166, 32) + Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(144, 24) Me.HydroGOFToolStripMenuItem.Text = "hydroGOF" ' 'cmdVE ' Me.cmdVE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVE.Location = New System.Drawing.Point(180, 309) + Me.cmdVE.Location = New System.Drawing.Point(150, 258) + Me.cmdVE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdVE.Name = "cmdVE" - Me.cmdVE.Size = New System.Drawing.Size(90, 48) + Me.cmdVE.Size = New System.Drawing.Size(75, 40) Me.cmdVE.TabIndex = 20 Me.cmdVE.Text = "VE" Me.cmdVE.UseVisualStyleBackColor = True @@ -2121,9 +2087,10 @@ Partial Class ucrCalculator 'cmdSsq ' Me.cmdSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSsq.Location = New System.Drawing.Point(92, 309) + Me.cmdSsq.Location = New System.Drawing.Point(77, 258) + Me.cmdSsq.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdSsq.Name = "cmdSsq" - Me.cmdSsq.Size = New System.Drawing.Size(90, 48) + Me.cmdSsq.Size = New System.Drawing.Size(75, 40) Me.cmdSsq.TabIndex = 19 Me.cmdSsq.Text = "ssq" Me.cmdSsq.UseVisualStyleBackColor = True @@ -2131,9 +2098,10 @@ Partial Class ucrCalculator 'cmdRsr ' Me.cmdRsr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRsr.Location = New System.Drawing.Point(3, 309) + Me.cmdRsr.Location = New System.Drawing.Point(2, 258) + Me.cmdRsr.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdRsr.Name = "cmdRsr" - Me.cmdRsr.Size = New System.Drawing.Size(90, 48) + Me.cmdRsr.Size = New System.Drawing.Size(75, 40) Me.cmdRsr.TabIndex = 18 Me.cmdRsr.Text = "rsr" Me.cmdRsr.UseVisualStyleBackColor = True @@ -2141,9 +2109,10 @@ Partial Class ucrCalculator 'cmdRSD ' Me.cmdRSD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRSD.Location = New System.Drawing.Point(180, 262) + Me.cmdRSD.Location = New System.Drawing.Point(150, 218) + Me.cmdRSD.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdRSD.Name = "cmdRSD" - Me.cmdRSD.Size = New System.Drawing.Size(90, 48) + Me.cmdRSD.Size = New System.Drawing.Size(75, 40) Me.cmdRSD.TabIndex = 17 Me.cmdRSD.Text = "rSD" Me.cmdRSD.UseVisualStyleBackColor = True @@ -2151,9 +2120,10 @@ Partial Class ucrCalculator 'cmdRPearson ' Me.cmdRPearson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRPearson.Location = New System.Drawing.Point(92, 262) + Me.cmdRPearson.Location = New System.Drawing.Point(77, 218) + Me.cmdRPearson.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdRPearson.Name = "cmdRPearson" - Me.cmdRPearson.Size = New System.Drawing.Size(90, 48) + Me.cmdRPearson.Size = New System.Drawing.Size(75, 40) Me.cmdRPearson.TabIndex = 16 Me.cmdRPearson.Text = "rPearson" Me.cmdRPearson.UseVisualStyleBackColor = True @@ -2161,9 +2131,10 @@ Partial Class ucrCalculator 'cmdRNSE ' Me.cmdRNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRNSE.Location = New System.Drawing.Point(3, 262) + Me.cmdRNSE.Location = New System.Drawing.Point(2, 218) + Me.cmdRNSE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdRNSE.Name = "cmdRNSE" - Me.cmdRNSE.Size = New System.Drawing.Size(90, 48) + Me.cmdRNSE.Size = New System.Drawing.Size(75, 40) Me.cmdRNSE.TabIndex = 15 Me.cmdRNSE.Text = "rNSE" Me.cmdRNSE.UseVisualStyleBackColor = True @@ -2171,9 +2142,10 @@ Partial Class ucrCalculator 'cmdRmse ' Me.cmdRmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRmse.Location = New System.Drawing.Point(180, 214) + Me.cmdRmse.Location = New System.Drawing.Point(150, 178) + Me.cmdRmse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdRmse.Name = "cmdRmse" - Me.cmdRmse.Size = New System.Drawing.Size(90, 48) + Me.cmdRmse.Size = New System.Drawing.Size(75, 40) Me.cmdRmse.TabIndex = 14 Me.cmdRmse.Text = "rmse" Me.cmdRmse.UseVisualStyleBackColor = True @@ -2181,9 +2153,10 @@ Partial Class ucrCalculator 'cmdRd ' Me.cmdRd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRd.Location = New System.Drawing.Point(92, 214) + Me.cmdRd.Location = New System.Drawing.Point(77, 178) + Me.cmdRd.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdRd.Name = "cmdRd" - Me.cmdRd.Size = New System.Drawing.Size(90, 48) + Me.cmdRd.Size = New System.Drawing.Size(75, 40) Me.cmdRd.TabIndex = 13 Me.cmdRd.Text = "rd" Me.cmdRd.UseVisualStyleBackColor = True @@ -2191,9 +2164,10 @@ Partial Class ucrCalculator 'cmdPbiasfde ' Me.cmdPbiasfde.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbiasfde.Location = New System.Drawing.Point(3, 214) + Me.cmdPbiasfde.Location = New System.Drawing.Point(2, 178) + Me.cmdPbiasfde.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdPbiasfde.Name = "cmdPbiasfde" - Me.cmdPbiasfde.Size = New System.Drawing.Size(90, 48) + Me.cmdPbiasfde.Size = New System.Drawing.Size(75, 40) Me.cmdPbiasfde.TabIndex = 12 Me.cmdPbiasfde.Text = "pbiasfdc" Me.cmdPbiasfde.UseVisualStyleBackColor = True @@ -2201,9 +2175,10 @@ Partial Class ucrCalculator 'cmdPbias ' Me.cmdPbias.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbias.Location = New System.Drawing.Point(180, 166) + Me.cmdPbias.Location = New System.Drawing.Point(150, 138) + Me.cmdPbias.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdPbias.Name = "cmdPbias" - Me.cmdPbias.Size = New System.Drawing.Size(90, 48) + Me.cmdPbias.Size = New System.Drawing.Size(75, 40) Me.cmdPbias.TabIndex = 11 Me.cmdPbias.Text = "pbias" Me.cmdPbias.UseVisualStyleBackColor = True @@ -2211,9 +2186,10 @@ Partial Class ucrCalculator 'cmdNSE ' Me.cmdNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNSE.Location = New System.Drawing.Point(92, 166) + Me.cmdNSE.Location = New System.Drawing.Point(77, 138) + Me.cmdNSE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdNSE.Name = "cmdNSE" - Me.cmdNSE.Size = New System.Drawing.Size(90, 48) + Me.cmdNSE.Size = New System.Drawing.Size(75, 40) Me.cmdNSE.TabIndex = 10 Me.cmdNSE.Text = "NSE" Me.cmdNSE.UseVisualStyleBackColor = True @@ -2221,9 +2197,10 @@ Partial Class ucrCalculator 'cmdNrmse ' Me.cmdNrmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNrmse.Location = New System.Drawing.Point(3, 166) + Me.cmdNrmse.Location = New System.Drawing.Point(2, 138) + Me.cmdNrmse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdNrmse.Name = "cmdNrmse" - Me.cmdNrmse.Size = New System.Drawing.Size(90, 48) + Me.cmdNrmse.Size = New System.Drawing.Size(75, 40) Me.cmdNrmse.TabIndex = 9 Me.cmdNrmse.Text = "nrmse" Me.cmdNrmse.UseVisualStyleBackColor = True @@ -2231,9 +2208,10 @@ Partial Class ucrCalculator 'cmdMse ' Me.cmdMse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMse.Location = New System.Drawing.Point(180, 120) + Me.cmdMse.Location = New System.Drawing.Point(150, 100) + Me.cmdMse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdMse.Name = "cmdMse" - Me.cmdMse.Size = New System.Drawing.Size(90, 48) + Me.cmdMse.Size = New System.Drawing.Size(75, 40) Me.cmdMse.TabIndex = 8 Me.cmdMse.Text = "mse" Me.cmdMse.UseVisualStyleBackColor = True @@ -2241,9 +2219,10 @@ Partial Class ucrCalculator 'cmdmNSE ' Me.cmdmNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmNSE.Location = New System.Drawing.Point(92, 120) + Me.cmdmNSE.Location = New System.Drawing.Point(77, 100) + Me.cmdmNSE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdmNSE.Name = "cmdmNSE" - Me.cmdmNSE.Size = New System.Drawing.Size(90, 48) + Me.cmdmNSE.Size = New System.Drawing.Size(75, 40) Me.cmdmNSE.TabIndex = 7 Me.cmdmNSE.Text = "mNSE" Me.cmdmNSE.UseVisualStyleBackColor = True @@ -2251,9 +2230,10 @@ Partial Class ucrCalculator 'cmdMe ' Me.cmdMe.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMe.Location = New System.Drawing.Point(3, 120) + Me.cmdMe.Location = New System.Drawing.Point(2, 100) + Me.cmdMe.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdMe.Name = "cmdMe" - Me.cmdMe.Size = New System.Drawing.Size(90, 48) + Me.cmdMe.Size = New System.Drawing.Size(75, 40) Me.cmdMe.TabIndex = 6 Me.cmdMe.Text = "me" Me.cmdMe.UseVisualStyleBackColor = True @@ -2261,9 +2241,10 @@ Partial Class ucrCalculator 'cmdMd ' Me.cmdMd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMd.Location = New System.Drawing.Point(180, 72) + Me.cmdMd.Location = New System.Drawing.Point(150, 60) + Me.cmdMd.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdMd.Name = "cmdMd" - Me.cmdMd.Size = New System.Drawing.Size(90, 48) + Me.cmdMd.Size = New System.Drawing.Size(75, 40) Me.cmdMd.TabIndex = 5 Me.cmdMd.Text = "md" Me.cmdMd.UseVisualStyleBackColor = True @@ -2271,9 +2252,10 @@ Partial Class ucrCalculator 'cmdMae ' Me.cmdMae.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMae.Location = New System.Drawing.Point(92, 72) + Me.cmdMae.Location = New System.Drawing.Point(77, 60) + Me.cmdMae.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdMae.Name = "cmdMae" - Me.cmdMae.Size = New System.Drawing.Size(90, 48) + Me.cmdMae.Size = New System.Drawing.Size(75, 40) Me.cmdMae.TabIndex = 4 Me.cmdMae.Text = "mae" Me.cmdMae.UseVisualStyleBackColor = True @@ -2281,9 +2263,10 @@ Partial Class ucrCalculator 'cmdKGE ' Me.cmdKGE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKGE.Location = New System.Drawing.Point(3, 72) + Me.cmdKGE.Location = New System.Drawing.Point(2, 60) + Me.cmdKGE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdKGE.Name = "cmdKGE" - Me.cmdKGE.Size = New System.Drawing.Size(90, 48) + Me.cmdKGE.Size = New System.Drawing.Size(75, 40) Me.cmdKGE.TabIndex = 3 Me.cmdKGE.Text = "KGE" Me.cmdKGE.UseVisualStyleBackColor = True @@ -2291,9 +2274,10 @@ Partial Class ucrCalculator 'cmdD ' Me.cmdD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdD.Location = New System.Drawing.Point(180, 24) + Me.cmdD.Location = New System.Drawing.Point(150, 20) + Me.cmdD.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdD.Name = "cmdD" - Me.cmdD.Size = New System.Drawing.Size(90, 48) + Me.cmdD.Size = New System.Drawing.Size(75, 40) Me.cmdD.TabIndex = 2 Me.cmdD.Text = "d" Me.cmdD.UseVisualStyleBackColor = True @@ -2301,9 +2285,10 @@ Partial Class ucrCalculator 'cmdCp ' Me.cmdCp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCp.Location = New System.Drawing.Point(92, 24) + Me.cmdCp.Location = New System.Drawing.Point(77, 20) + Me.cmdCp.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCp.Name = "cmdCp" - Me.cmdCp.Size = New System.Drawing.Size(90, 48) + Me.cmdCp.Size = New System.Drawing.Size(75, 40) Me.cmdCp.TabIndex = 1 Me.cmdCp.Text = "cp" Me.cmdCp.UseVisualStyleBackColor = True @@ -2311,9 +2296,10 @@ Partial Class ucrCalculator 'cmdBr2 ' Me.cmdBr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBr2.Location = New System.Drawing.Point(3, 24) + Me.cmdBr2.Location = New System.Drawing.Point(2, 20) + Me.cmdBr2.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdBr2.Name = "cmdBr2" - Me.cmdBr2.Size = New System.Drawing.Size(90, 48) + Me.cmdBr2.Size = New System.Drawing.Size(75, 40) Me.cmdBr2.TabIndex = 0 Me.cmdBr2.Text = "br2" Me.cmdBr2.UseVisualStyleBackColor = True @@ -2375,11 +2361,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(650, 93) - Me.grpWakefield.Margin = New System.Windows.Forms.Padding(4) + Me.grpWakefield.Location = New System.Drawing.Point(542, 78) Me.grpWakefield.Name = "grpWakefield" - Me.grpWakefield.Padding = New System.Windows.Forms.Padding(4) - Me.grpWakefield.Size = New System.Drawing.Size(652, 519) + Me.grpWakefield.Size = New System.Drawing.Size(543, 432) Me.grpWakefield.TabIndex = 191 Me.grpWakefield.TabStop = False Me.grpWakefield.Text = "Wakefield" @@ -2388,10 +2372,9 @@ Partial Class ucrCalculator ' Me.cmdLinkert7.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLinkert7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLinkert7.Location = New System.Drawing.Point(512, 459) - Me.cmdLinkert7.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLinkert7.Location = New System.Drawing.Point(427, 382) Me.cmdLinkert7.Name = "cmdLinkert7" - Me.cmdLinkert7.Size = New System.Drawing.Size(128, 45) + Me.cmdLinkert7.Size = New System.Drawing.Size(107, 38) Me.cmdLinkert7.TabIndex = 54 Me.cmdLinkert7.Text = "linkert7 (o.f)" Me.cmdLinkert7.UseVisualStyleBackColor = True @@ -2400,10 +2383,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(386, 459) - Me.cmdWakefield_Year.Margin = New System.Windows.Forms.Padding(4) + Me.cmdWakefield_Year.Location = New System.Drawing.Point(322, 382) Me.cmdWakefield_Year.Name = "cmdWakefield_Year" - Me.cmdWakefield_Year.Size = New System.Drawing.Size(128, 45) + Me.cmdWakefield_Year.Size = New System.Drawing.Size(107, 38) Me.cmdWakefield_Year.TabIndex = 53 Me.cmdWakefield_Year.Text = "year" Me.cmdWakefield_Year.UseVisualStyleBackColor = True @@ -2412,10 +2394,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(260, 459) - Me.cmdValid.Margin = New System.Windows.Forms.Padding(4) + Me.cmdValid.Location = New System.Drawing.Point(217, 382) Me.cmdValid.Name = "cmdValid" - Me.cmdValid.Size = New System.Drawing.Size(128, 45) + Me.cmdValid.Size = New System.Drawing.Size(107, 38) Me.cmdValid.TabIndex = 52 Me.cmdValid.Text = "valid (L)" Me.cmdValid.UseVisualStyleBackColor = True @@ -2424,10 +2405,9 @@ Partial Class ucrCalculator ' Me.cmdWakefield_Upper.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefield_Upper.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefield_Upper.Location = New System.Drawing.Point(134, 459) - Me.cmdWakefield_Upper.Margin = New System.Windows.Forms.Padding(4) + Me.cmdWakefield_Upper.Location = New System.Drawing.Point(112, 382) Me.cmdWakefield_Upper.Name = "cmdWakefield_Upper" - Me.cmdWakefield_Upper.Size = New System.Drawing.Size(128, 45) + Me.cmdWakefield_Upper.Size = New System.Drawing.Size(107, 38) Me.cmdWakefield_Upper.TabIndex = 51 Me.cmdWakefield_Upper.Text = "upper (c)" Me.cmdWakefield_Upper.UseVisualStyleBackColor = True @@ -2436,10 +2416,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(8, 459) - Me.cmdString.Margin = New System.Windows.Forms.Padding(4) + Me.cmdString.Location = New System.Drawing.Point(7, 382) Me.cmdString.Name = "cmdString" - Me.cmdString.Size = New System.Drawing.Size(128, 45) + Me.cmdString.Size = New System.Drawing.Size(107, 38) Me.cmdString.TabIndex = 50 Me.cmdString.Text = "string (c)" Me.cmdString.UseVisualStyleBackColor = True @@ -2448,10 +2427,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(512, 416) - Me.cmdState.Margin = New System.Windows.Forms.Padding(4) + Me.cmdState.Location = New System.Drawing.Point(427, 347) Me.cmdState.Name = "cmdState" - Me.cmdState.Size = New System.Drawing.Size(128, 45) + Me.cmdState.Size = New System.Drawing.Size(107, 38) Me.cmdState.TabIndex = 49 Me.cmdState.Text = "state (f)" Me.cmdState.UseVisualStyleBackColor = True @@ -2460,10 +2438,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(386, 416) - Me.cmdSpeed.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSpeed.Location = New System.Drawing.Point(322, 347) Me.cmdSpeed.Name = "cmdSpeed" - Me.cmdSpeed.Size = New System.Drawing.Size(128, 45) + Me.cmdSpeed.Size = New System.Drawing.Size(107, 38) Me.cmdSpeed.TabIndex = 48 Me.cmdSpeed.Text = "speed" Me.cmdSpeed.UseVisualStyleBackColor = True @@ -2472,10 +2449,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(260, 416) - Me.cmdSmokes.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSmokes.Location = New System.Drawing.Point(217, 347) Me.cmdSmokes.Name = "cmdSmokes" - Me.cmdSmokes.Size = New System.Drawing.Size(128, 45) + Me.cmdSmokes.Size = New System.Drawing.Size(107, 38) Me.cmdSmokes.TabIndex = 47 Me.cmdSmokes.Text = "smokes (L)" Me.cmdSmokes.UseVisualStyleBackColor = True @@ -2484,10 +2460,9 @@ Partial Class ucrCalculator ' Me.cmdSex.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdSex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSex.Location = New System.Drawing.Point(134, 416) - Me.cmdSex.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSex.Location = New System.Drawing.Point(112, 347) Me.cmdSex.Name = "cmdSex" - Me.cmdSex.Size = New System.Drawing.Size(128, 45) + Me.cmdSex.Size = New System.Drawing.Size(107, 38) Me.cmdSex.TabIndex = 46 Me.cmdSex.Text = "sex (f)" Me.cmdSex.UseVisualStyleBackColor = True @@ -2496,10 +2471,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(8, 416) - Me.cmdSex_Inclusive.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSex_Inclusive.Location = New System.Drawing.Point(7, 347) Me.cmdSex_Inclusive.Name = "cmdSex_Inclusive" - Me.cmdSex_Inclusive.Size = New System.Drawing.Size(128, 45) + Me.cmdSex_Inclusive.Size = New System.Drawing.Size(107, 38) Me.cmdSex_Inclusive.TabIndex = 45 Me.cmdSex_Inclusive.Text = "sex_inclusive (f)" Me.cmdSex_Inclusive.UseVisualStyleBackColor = True @@ -2508,10 +2482,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(512, 372) - Me.cmdGender.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGender.Location = New System.Drawing.Point(427, 310) Me.cmdGender.Name = "cmdGender" - Me.cmdGender.Size = New System.Drawing.Size(128, 45) + Me.cmdGender.Size = New System.Drawing.Size(107, 38) Me.cmdGender.TabIndex = 44 Me.cmdGender.Text = "gender (f)" Me.cmdGender.UseVisualStyleBackColor = True @@ -2520,10 +2493,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(386, 372) - Me.cmdSentence.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSentence.Location = New System.Drawing.Point(322, 310) Me.cmdSentence.Name = "cmdSentence" - Me.cmdSentence.Size = New System.Drawing.Size(128, 45) + Me.cmdSentence.Size = New System.Drawing.Size(107, 38) Me.cmdSentence.TabIndex = 43 Me.cmdSentence.Text = "sentence (c)" Me.cmdSentence.UseVisualStyleBackColor = True @@ -2532,10 +2504,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(260, 372) - Me.cmdSat.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSat.Location = New System.Drawing.Point(217, 310) Me.cmdSat.Name = "cmdSat" - Me.cmdSat.Size = New System.Drawing.Size(128, 45) + Me.cmdSat.Size = New System.Drawing.Size(107, 38) Me.cmdSat.TabIndex = 42 Me.cmdSat.Text = "sat" Me.cmdSat.UseVisualStyleBackColor = True @@ -2544,10 +2515,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(134, 372) - Me.cmdReligion.Margin = New System.Windows.Forms.Padding(4) + Me.cmdReligion.Location = New System.Drawing.Point(112, 310) Me.cmdReligion.Name = "cmdReligion" - Me.cmdReligion.Size = New System.Drawing.Size(128, 45) + Me.cmdReligion.Size = New System.Drawing.Size(107, 38) Me.cmdReligion.TabIndex = 41 Me.cmdReligion.Text = "religion (f)" Me.cmdReligion.UseVisualStyleBackColor = True @@ -2556,10 +2526,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(8, 372) - Me.cmdRace.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRace.Location = New System.Drawing.Point(7, 310) Me.cmdRace.Name = "cmdRace" - Me.cmdRace.Size = New System.Drawing.Size(128, 45) + Me.cmdRace.Size = New System.Drawing.Size(107, 38) Me.cmdRace.TabIndex = 40 Me.cmdRace.Text = "race (f)" Me.cmdRace.UseVisualStyleBackColor = True @@ -2568,10 +2537,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(512, 328) - Me.cmdPolitical.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPolitical.Location = New System.Drawing.Point(427, 273) Me.cmdPolitical.Name = "cmdPolitical" - Me.cmdPolitical.Size = New System.Drawing.Size(128, 45) + Me.cmdPolitical.Size = New System.Drawing.Size(107, 38) Me.cmdPolitical.TabIndex = 39 Me.cmdPolitical.Text = "political (f)" Me.cmdPolitical.UseVisualStyleBackColor = True @@ -2580,10 +2548,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(386, 328) - Me.cmdNormal.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNormal.Location = New System.Drawing.Point(322, 273) Me.cmdNormal.Name = "cmdNormal" - Me.cmdNormal.Size = New System.Drawing.Size(128, 45) + Me.cmdNormal.Size = New System.Drawing.Size(107, 38) Me.cmdNormal.TabIndex = 38 Me.cmdNormal.Text = "normal" Me.cmdNormal.UseVisualStyleBackColor = True @@ -2592,10 +2559,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(260, 328) - Me.cmdName.Margin = New System.Windows.Forms.Padding(4) + Me.cmdName.Location = New System.Drawing.Point(217, 273) Me.cmdName.Name = "cmdName" - Me.cmdName.Size = New System.Drawing.Size(128, 45) + Me.cmdName.Size = New System.Drawing.Size(107, 38) Me.cmdName.TabIndex = 37 Me.cmdName.Text = "name (c)" Me.cmdName.UseVisualStyleBackColor = True @@ -2604,10 +2570,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(134, 328) - Me.cmdWakefield_Month.Margin = New System.Windows.Forms.Padding(4) + Me.cmdWakefield_Month.Location = New System.Drawing.Point(112, 273) Me.cmdWakefield_Month.Name = "cmdWakefield_Month" - Me.cmdWakefield_Month.Size = New System.Drawing.Size(128, 45) + Me.cmdWakefield_Month.Size = New System.Drawing.Size(107, 38) Me.cmdWakefield_Month.TabIndex = 36 Me.cmdWakefield_Month.Text = "month (f)" Me.cmdWakefield_Month.UseVisualStyleBackColor = True @@ -2616,10 +2581,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(8, 328) - Me.cmdMilitary.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMilitary.Location = New System.Drawing.Point(7, 273) Me.cmdMilitary.Name = "cmdMilitary" - Me.cmdMilitary.Size = New System.Drawing.Size(128, 45) + Me.cmdMilitary.Size = New System.Drawing.Size(107, 38) Me.cmdMilitary.TabIndex = 35 Me.cmdMilitary.Text = "military (f)" Me.cmdMilitary.UseVisualStyleBackColor = True @@ -2628,10 +2592,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(512, 284) - Me.cmdMarital.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMarital.Location = New System.Drawing.Point(427, 237) Me.cmdMarital.Name = "cmdMarital" - Me.cmdMarital.Size = New System.Drawing.Size(128, 45) + Me.cmdMarital.Size = New System.Drawing.Size(107, 38) Me.cmdMarital.TabIndex = 34 Me.cmdMarital.Text = "marital (f)" Me.cmdMarital.UseVisualStyleBackColor = True @@ -2640,10 +2603,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(386, 284) - Me.cmdLorem_ipsum.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLorem_ipsum.Location = New System.Drawing.Point(322, 237) Me.cmdLorem_ipsum.Name = "cmdLorem_ipsum" - Me.cmdLorem_ipsum.Size = New System.Drawing.Size(128, 45) + Me.cmdLorem_ipsum.Size = New System.Drawing.Size(107, 38) Me.cmdLorem_ipsum.TabIndex = 33 Me.cmdLorem_ipsum.Text = "lorem_ipsum (c)" Me.cmdLorem_ipsum.UseVisualStyleBackColor = True @@ -2652,10 +2614,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(260, 284) - Me.cmdLikert.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLikert.Location = New System.Drawing.Point(217, 237) Me.cmdLikert.Name = "cmdLikert" - Me.cmdLikert.Size = New System.Drawing.Size(128, 45) + Me.cmdLikert.Size = New System.Drawing.Size(107, 38) Me.cmdLikert.TabIndex = 32 Me.cmdLikert.Text = "likert (o.f)" Me.cmdLikert.UseVisualStyleBackColor = True @@ -2664,10 +2625,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(134, 284) - Me.cmdGpa.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGpa.Location = New System.Drawing.Point(112, 237) Me.cmdGpa.Name = "cmdGpa" - Me.cmdGpa.Size = New System.Drawing.Size(128, 45) + Me.cmdGpa.Size = New System.Drawing.Size(107, 38) Me.cmdGpa.TabIndex = 31 Me.cmdGpa.Text = "gpa" Me.cmdGpa.UseVisualStyleBackColor = True @@ -2676,10 +2636,9 @@ Partial Class ucrCalculator ' Me.cmdEla.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdEla.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEla.Location = New System.Drawing.Point(8, 284) - Me.cmdEla.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEla.Location = New System.Drawing.Point(7, 237) Me.cmdEla.Name = "cmdEla" - Me.cmdEla.Size = New System.Drawing.Size(128, 45) + Me.cmdEla.Size = New System.Drawing.Size(107, 38) Me.cmdEla.TabIndex = 30 Me.cmdEla.Text = "ela" Me.cmdEla.UseVisualStyleBackColor = True @@ -2688,10 +2647,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(512, 240) - Me.cmdMath.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMath.Location = New System.Drawing.Point(427, 200) Me.cmdMath.Name = "cmdMath" - Me.cmdMath.Size = New System.Drawing.Size(128, 45) + Me.cmdMath.Size = New System.Drawing.Size(107, 38) Me.cmdMath.TabIndex = 29 Me.cmdMath.Text = "math" Me.cmdMath.UseVisualStyleBackColor = True @@ -2700,10 +2658,9 @@ Partial Class ucrCalculator ' Me.cmdLevel.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLevel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLevel.Location = New System.Drawing.Point(386, 240) - Me.cmdLevel.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLevel.Location = New System.Drawing.Point(322, 200) Me.cmdLevel.Name = "cmdLevel" - Me.cmdLevel.Size = New System.Drawing.Size(128, 45) + Me.cmdLevel.Size = New System.Drawing.Size(107, 38) Me.cmdLevel.TabIndex = 28 Me.cmdLevel.Text = "level" Me.cmdLevel.UseVisualStyleBackColor = True @@ -2712,10 +2669,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(260, 240) - Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLanguage.Location = New System.Drawing.Point(217, 200) Me.cmdLanguage.Name = "cmdLanguage" - Me.cmdLanguage.Size = New System.Drawing.Size(128, 45) + Me.cmdLanguage.Size = New System.Drawing.Size(107, 38) Me.cmdLanguage.TabIndex = 27 Me.cmdLanguage.Text = "language (f)" Me.cmdLanguage.UseVisualStyleBackColor = True @@ -2724,10 +2680,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(134, 240) - Me.cmdIq.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIq.Location = New System.Drawing.Point(112, 200) Me.cmdIq.Name = "cmdIq" - Me.cmdIq.Size = New System.Drawing.Size(128, 45) + Me.cmdIq.Size = New System.Drawing.Size(107, 38) Me.cmdIq.TabIndex = 26 Me.cmdIq.Text = "iq" Me.cmdIq.UseVisualStyleBackColor = True @@ -2736,10 +2691,9 @@ Partial Class ucrCalculator ' Me.cmdInternet_Browser.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdInternet_Browser.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInternet_Browser.Location = New System.Drawing.Point(8, 240) - Me.cmdInternet_Browser.Margin = New System.Windows.Forms.Padding(4) + Me.cmdInternet_Browser.Location = New System.Drawing.Point(7, 200) Me.cmdInternet_Browser.Name = "cmdInternet_Browser" - Me.cmdInternet_Browser.Size = New System.Drawing.Size(128, 45) + Me.cmdInternet_Browser.Size = New System.Drawing.Size(107, 38) Me.cmdInternet_Browser.TabIndex = 25 Me.cmdInternet_Browser.Text = "browser (f)" Me.cmdInternet_Browser.UseVisualStyleBackColor = True @@ -2748,10 +2702,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(512, 153) - Me.cmdGrade_Level.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGrade_Level.Location = New System.Drawing.Point(427, 128) Me.cmdGrade_Level.Name = "cmdGrade_Level" - Me.cmdGrade_Level.Size = New System.Drawing.Size(128, 45) + Me.cmdGrade_Level.Size = New System.Drawing.Size(107, 38) Me.cmdGrade_Level.TabIndex = 19 Me.cmdGrade_Level.Text = "grade_level (f)" Me.cmdGrade_Level.UseVisualStyleBackColor = True @@ -2760,10 +2713,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(386, 153) - Me.cmdEye.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEye.Location = New System.Drawing.Point(322, 128) Me.cmdEye.Name = "cmdEye" - Me.cmdEye.Size = New System.Drawing.Size(128, 45) + Me.cmdEye.Size = New System.Drawing.Size(107, 38) Me.cmdEye.TabIndex = 18 Me.cmdEye.Text = "eye (f)" Me.cmdEye.UseVisualStyleBackColor = True @@ -2772,10 +2724,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(260, 153) - Me.cmdEmployment.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEmployment.Location = New System.Drawing.Point(217, 128) Me.cmdEmployment.Name = "cmdEmployment" - Me.cmdEmployment.Size = New System.Drawing.Size(128, 45) + Me.cmdEmployment.Size = New System.Drawing.Size(107, 38) Me.cmdEmployment.TabIndex = 17 Me.cmdEmployment.Text = "employment (f)" Me.cmdEmployment.UseVisualStyleBackColor = True @@ -2784,10 +2735,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(134, 153) - Me.cmdEducation.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEducation.Location = New System.Drawing.Point(112, 128) Me.cmdEducation.Name = "cmdEducation" - Me.cmdEducation.Size = New System.Drawing.Size(128, 45) + Me.cmdEducation.Size = New System.Drawing.Size(107, 38) Me.cmdEducation.TabIndex = 16 Me.cmdEducation.Text = "education (f)" Me.cmdEducation.UseVisualStyleBackColor = True @@ -2796,10 +2746,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(8, 153) - Me.cmdDummy.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDummy.Location = New System.Drawing.Point(7, 128) Me.cmdDummy.Name = "cmdDummy" - Me.cmdDummy.Size = New System.Drawing.Size(128, 45) + Me.cmdDummy.Size = New System.Drawing.Size(107, 38) Me.cmdDummy.TabIndex = 15 Me.cmdDummy.Text = "dummy" Me.cmdDummy.UseVisualStyleBackColor = True @@ -2808,10 +2757,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(512, 108) - Me.cmdDob.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDob.Location = New System.Drawing.Point(427, 90) Me.cmdDob.Name = "cmdDob" - Me.cmdDob.Size = New System.Drawing.Size(128, 45) + Me.cmdDob.Size = New System.Drawing.Size(107, 38) Me.cmdDob.TabIndex = 14 Me.cmdDob.Text = "dob (D)" Me.cmdDob.UseVisualStyleBackColor = True @@ -2820,10 +2768,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(386, 108) - Me.cmdDna.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDna.Location = New System.Drawing.Point(322, 90) Me.cmdDna.Name = "cmdDna" - Me.cmdDna.Size = New System.Drawing.Size(128, 45) + Me.cmdDna.Size = New System.Drawing.Size(107, 38) Me.cmdDna.TabIndex = 13 Me.cmdDna.Text = "dna (f)" Me.cmdDna.UseVisualStyleBackColor = True @@ -2832,10 +2779,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(260, 108) - Me.cmdDice.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDice.Location = New System.Drawing.Point(217, 90) Me.cmdDice.Name = "cmdDice" - Me.cmdDice.Size = New System.Drawing.Size(128, 45) + Me.cmdDice.Size = New System.Drawing.Size(107, 38) Me.cmdDice.TabIndex = 12 Me.cmdDice.Text = "dice" Me.cmdDice.UseVisualStyleBackColor = True @@ -2844,10 +2790,9 @@ Partial Class ucrCalculator ' Me.cmdDied.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDied.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDied.Location = New System.Drawing.Point(134, 108) - Me.cmdDied.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDied.Location = New System.Drawing.Point(112, 90) Me.cmdDied.Name = "cmdDied" - Me.cmdDied.Size = New System.Drawing.Size(128, 45) + Me.cmdDied.Size = New System.Drawing.Size(107, 38) Me.cmdDied.TabIndex = 11 Me.cmdDied.Text = "died (L)" Me.cmdDied.UseVisualStyleBackColor = True @@ -2856,10 +2801,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(8, 108) - Me.cmdDeath.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDeath.Location = New System.Drawing.Point(7, 90) Me.cmdDeath.Name = "cmdDeath" - Me.cmdDeath.Size = New System.Drawing.Size(128, 45) + Me.cmdDeath.Size = New System.Drawing.Size(107, 38) Me.cmdDeath.TabIndex = 10 Me.cmdDeath.Text = "death (L)" Me.cmdDeath.UseVisualStyleBackColor = True @@ -2868,10 +2812,9 @@ Partial Class ucrCalculator ' Me.cmdDate_Stamp.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdDate_Stamp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDate_Stamp.Location = New System.Drawing.Point(512, 64) - Me.cmdDate_Stamp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDate_Stamp.Location = New System.Drawing.Point(427, 53) Me.cmdDate_Stamp.Name = "cmdDate_Stamp" - Me.cmdDate_Stamp.Size = New System.Drawing.Size(128, 45) + Me.cmdDate_Stamp.Size = New System.Drawing.Size(107, 38) Me.cmdDate_Stamp.TabIndex = 9 Me.cmdDate_Stamp.Text = "date_stamp" Me.cmdDate_Stamp.UseVisualStyleBackColor = True @@ -2880,10 +2823,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(386, 64) - Me.cmdPrimary.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPrimary.Location = New System.Drawing.Point(322, 53) Me.cmdPrimary.Name = "cmdPrimary" - Me.cmdPrimary.Size = New System.Drawing.Size(128, 45) + Me.cmdPrimary.Size = New System.Drawing.Size(107, 38) Me.cmdPrimary.TabIndex = 8 Me.cmdPrimary.Text = "primary (f)" Me.cmdPrimary.UseVisualStyleBackColor = True @@ -2892,10 +2834,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(260, 64) - Me.cmdColor.Margin = New System.Windows.Forms.Padding(4) + Me.cmdColor.Location = New System.Drawing.Point(217, 53) Me.cmdColor.Name = "cmdColor" - Me.cmdColor.Size = New System.Drawing.Size(128, 45) + Me.cmdColor.Size = New System.Drawing.Size(107, 38) Me.cmdColor.TabIndex = 7 Me.cmdColor.Text = "color (f)" Me.cmdColor.UseVisualStyleBackColor = True @@ -2904,10 +2845,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(134, 64) - Me.cmdCoin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCoin.Location = New System.Drawing.Point(112, 53) Me.cmdCoin.Name = "cmdCoin" - Me.cmdCoin.Size = New System.Drawing.Size(128, 45) + Me.cmdCoin.Size = New System.Drawing.Size(107, 38) Me.cmdCoin.TabIndex = 6 Me.cmdCoin.Text = "coin (f)" Me.cmdCoin.UseVisualStyleBackColor = True @@ -2916,10 +2856,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(8, 64) - Me.cmdChildren.Margin = New System.Windows.Forms.Padding(4) + Me.cmdChildren.Location = New System.Drawing.Point(7, 53) Me.cmdChildren.Name = "cmdChildren" - Me.cmdChildren.Size = New System.Drawing.Size(128, 45) + Me.cmdChildren.Size = New System.Drawing.Size(107, 38) Me.cmdChildren.TabIndex = 5 Me.cmdChildren.Text = "children" Me.cmdChildren.UseVisualStyleBackColor = True @@ -2928,10 +2867,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(512, 21) - Me.cmdCar.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCar.Location = New System.Drawing.Point(427, 18) Me.cmdCar.Name = "cmdCar" - Me.cmdCar.Size = New System.Drawing.Size(128, 45) + Me.cmdCar.Size = New System.Drawing.Size(107, 38) Me.cmdCar.TabIndex = 4 Me.cmdCar.Text = "car (f)" Me.cmdCar.UseVisualStyleBackColor = True @@ -2940,10 +2878,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(386, 21) - Me.cmdAnswer.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAnswer.Location = New System.Drawing.Point(322, 18) Me.cmdAnswer.Name = "cmdAnswer" - Me.cmdAnswer.Size = New System.Drawing.Size(128, 45) + Me.cmdAnswer.Size = New System.Drawing.Size(107, 38) Me.cmdAnswer.TabIndex = 3 Me.cmdAnswer.Text = "answer (f)" Me.cmdAnswer.UseVisualStyleBackColor = True @@ -2952,10 +2889,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(260, 21) - Me.cmdPet.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPet.Location = New System.Drawing.Point(217, 18) Me.cmdPet.Name = "cmdPet" - Me.cmdPet.Size = New System.Drawing.Size(128, 45) + Me.cmdPet.Size = New System.Drawing.Size(107, 38) Me.cmdPet.TabIndex = 2 Me.cmdPet.Text = "pet (f)" Me.cmdPet.UseVisualStyleBackColor = True @@ -2964,10 +2900,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(134, 21) - Me.cmdAnimal.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAnimal.Location = New System.Drawing.Point(112, 18) Me.cmdAnimal.Name = "cmdAnimal" - Me.cmdAnimal.Size = New System.Drawing.Size(128, 45) + Me.cmdAnimal.Size = New System.Drawing.Size(107, 38) Me.cmdAnimal.TabIndex = 1 Me.cmdAnimal.Text = "animal (f)" Me.cmdAnimal.UseVisualStyleBackColor = True @@ -2976,10 +2911,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(8, 21) - Me.cmdAge.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAge.Location = New System.Drawing.Point(7, 18) Me.cmdAge.Name = "cmdAge" - Me.cmdAge.Size = New System.Drawing.Size(128, 45) + Me.cmdAge.Size = New System.Drawing.Size(107, 38) Me.cmdAge.TabIndex = 0 Me.cmdAge.Text = "age" Me.cmdAge.UseVisualStyleBackColor = True @@ -2988,10 +2922,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(512, 196) - Me.cmdIncome.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIncome.Location = New System.Drawing.Point(427, 163) Me.cmdIncome.Name = "cmdIncome" - Me.cmdIncome.Size = New System.Drawing.Size(128, 45) + Me.cmdIncome.Size = New System.Drawing.Size(107, 38) Me.cmdIncome.TabIndex = 24 Me.cmdIncome.Text = "income" Me.cmdIncome.UseVisualStyleBackColor = True @@ -3000,10 +2933,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(386, 196) - Me.cmdHeight.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHeight.Location = New System.Drawing.Point(322, 163) Me.cmdHeight.Name = "cmdHeight" - Me.cmdHeight.Size = New System.Drawing.Size(128, 45) + Me.cmdHeight.Size = New System.Drawing.Size(107, 38) Me.cmdHeight.TabIndex = 23 Me.cmdHeight.Text = "height" Me.cmdHeight.UseVisualStyleBackColor = True @@ -3012,10 +2944,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(260, 196) - Me.cmdHair.Margin = New System.Windows.Forms.Padding(4) + Me.cmdHair.Location = New System.Drawing.Point(217, 163) Me.cmdHair.Name = "cmdHair" - Me.cmdHair.Size = New System.Drawing.Size(128, 45) + Me.cmdHair.Size = New System.Drawing.Size(107, 38) Me.cmdHair.TabIndex = 22 Me.cmdHair.Text = "hair (f)" Me.cmdHair.UseVisualStyleBackColor = True @@ -3024,10 +2955,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(134, 196) - Me.cmdGroup.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGroup.Location = New System.Drawing.Point(112, 163) Me.cmdGroup.Name = "cmdGroup" - Me.cmdGroup.Size = New System.Drawing.Size(128, 45) + Me.cmdGroup.Size = New System.Drawing.Size(107, 38) Me.cmdGroup.TabIndex = 21 Me.cmdGroup.Text = "group (f)" Me.cmdGroup.UseVisualStyleBackColor = True @@ -3036,10 +2966,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(8, 196) - Me.cmdGrade.Margin = New System.Windows.Forms.Padding(4) + Me.cmdGrade.Location = New System.Drawing.Point(7, 163) Me.cmdGrade.Name = "cmdGrade" - Me.cmdGrade.Size = New System.Drawing.Size(128, 45) + Me.cmdGrade.Size = New System.Drawing.Size(107, 38) Me.cmdGrade.TabIndex = 20 Me.cmdGrade.Text = "grade" Me.cmdGrade.UseVisualStyleBackColor = True @@ -3070,11 +2999,11 @@ 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(650, 93) - Me.grpMaths.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpMaths.Location = New System.Drawing.Point(542, 78) + Me.grpMaths.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpMaths.Name = "grpMaths" - Me.grpMaths.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.grpMaths.Size = New System.Drawing.Size(384, 246) + Me.grpMaths.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpMaths.Size = New System.Drawing.Size(320, 205) Me.grpMaths.TabIndex = 184 Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" @@ -3083,10 +3012,9 @@ Partial Class ucrCalculator ' Me.cmdMathsHelp.AutoSize = True Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(264, 198) - Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(129, 45) + Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths Me.cmdMathsHelp.TabIndex = 211 Me.cmdMathsHelp.Text = "R Help" @@ -3097,21 +3025,20 @@ Partial Class ucrCalculator Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsStatsStripMenuItem}) Me.ContextMenuStripMaths.Name = "ContextMenuStrip1" - Me.ContextMenuStripMaths.Size = New System.Drawing.Size(122, 36) + Me.ContextMenuStripMaths.Size = New System.Drawing.Size(109, 28) ' 'MathsStatsStripMenuItem ' Me.MathsStatsStripMenuItem.Name = "MathsStatsStripMenuItem" - Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(121, 32) + Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(108, 24) Me.MathsStatsStripMenuItem.Text = "stats" ' 'cmdAtan2 ' Me.cmdAtan2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan2.Location = New System.Drawing.Point(153, 195) - Me.cmdAtan2.Margin = New System.Windows.Forms.Padding(4) + Me.cmdAtan2.Location = New System.Drawing.Point(128, 162) Me.cmdAtan2.Name = "cmdAtan2" - Me.cmdAtan2.Size = New System.Drawing.Size(76, 45) + Me.cmdAtan2.Size = New System.Drawing.Size(63, 38) Me.cmdAtan2.TabIndex = 151 Me.cmdAtan2.Text = "atan2" Me.cmdAtan2.UseVisualStyleBackColor = True @@ -3119,10 +3046,9 @@ Partial Class ucrCalculator 'cmdLogistic ' Me.cmdLogistic.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogistic.Location = New System.Drawing.Point(78, 195) - Me.cmdLogistic.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLogistic.Location = New System.Drawing.Point(65, 162) Me.cmdLogistic.Name = "cmdLogistic" - Me.cmdLogistic.Size = New System.Drawing.Size(76, 45) + Me.cmdLogistic.Size = New System.Drawing.Size(63, 38) Me.cmdLogistic.TabIndex = 149 Me.cmdLogistic.Text = "logistic" Me.cmdLogistic.UseVisualStyleBackColor = True @@ -3130,10 +3056,9 @@ Partial Class ucrCalculator 'cmdLogit ' Me.cmdLogit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogit.Location = New System.Drawing.Point(3, 195) - Me.cmdLogit.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLogit.Location = New System.Drawing.Point(2, 162) Me.cmdLogit.Name = "cmdLogit" - Me.cmdLogit.Size = New System.Drawing.Size(76, 45) + Me.cmdLogit.Size = New System.Drawing.Size(63, 38) Me.cmdLogit.TabIndex = 148 Me.cmdLogit.Text = "logit" Me.cmdLogit.UseVisualStyleBackColor = True @@ -3141,10 +3066,10 @@ Partial Class ucrCalculator 'cmdSign ' Me.cmdSign.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSign.Location = New System.Drawing.Point(304, 152) - Me.cmdSign.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSign.Location = New System.Drawing.Point(253, 127) + Me.cmdSign.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSign.Name = "cmdSign" - Me.cmdSign.Size = New System.Drawing.Size(76, 45) + Me.cmdSign.Size = New System.Drawing.Size(63, 38) Me.cmdSign.TabIndex = 147 Me.cmdSign.Text = "sign" Me.cmdSign.UseVisualStyleBackColor = True @@ -3153,10 +3078,10 @@ 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(230, 152) - Me.cmdRound.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRound.Location = New System.Drawing.Point(192, 127) + Me.cmdRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRound.Name = "cmdRound" - Me.cmdRound.Size = New System.Drawing.Size(76, 45) + Me.cmdRound.Size = New System.Drawing.Size(63, 38) Me.cmdRound.TabIndex = 146 Me.cmdRound.Text = "round" Me.cmdRound.UseVisualStyleBackColor = True @@ -3165,10 +3090,10 @@ 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(154, 152) - Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSiginf.Location = New System.Drawing.Point(128, 127) + Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSiginf.Name = "cmdSiginf" - Me.cmdSiginf.Size = New System.Drawing.Size(76, 45) + Me.cmdSiginf.Size = New System.Drawing.Size(63, 38) Me.cmdSiginf.TabIndex = 145 Me.cmdSiginf.Text = "siginf" Me.cmdSiginf.UseVisualStyleBackColor = True @@ -3176,10 +3101,10 @@ Partial Class ucrCalculator 'cmdAbs ' Me.cmdAbs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAbs.Location = New System.Drawing.Point(78, 152) - Me.cmdAbs.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAbs.Location = New System.Drawing.Point(65, 127) + Me.cmdAbs.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAbs.Name = "cmdAbs" - Me.cmdAbs.Size = New System.Drawing.Size(76, 45) + Me.cmdAbs.Size = New System.Drawing.Size(63, 38) Me.cmdAbs.TabIndex = 144 Me.cmdAbs.Text = "abs" Me.cmdAbs.UseVisualStyleBackColor = True @@ -3187,10 +3112,10 @@ Partial Class ucrCalculator 'cmdExp ' Me.cmdExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExp.Location = New System.Drawing.Point(3, 152) - Me.cmdExp.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdExp.Location = New System.Drawing.Point(2, 127) + Me.cmdExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdExp.Name = "cmdExp" - Me.cmdExp.Size = New System.Drawing.Size(76, 45) + Me.cmdExp.Size = New System.Drawing.Size(63, 38) Me.cmdExp.TabIndex = 143 Me.cmdExp.Text = "exp" Me.cmdExp.UseVisualStyleBackColor = True @@ -3198,10 +3123,10 @@ Partial Class ucrCalculator 'cmdDeg ' Me.cmdDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDeg.Location = New System.Drawing.Point(304, 108) - Me.cmdDeg.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDeg.Location = New System.Drawing.Point(253, 90) + Me.cmdDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDeg.Name = "cmdDeg" - Me.cmdDeg.Size = New System.Drawing.Size(76, 45) + Me.cmdDeg.Size = New System.Drawing.Size(63, 38) Me.cmdDeg.TabIndex = 142 Me.cmdDeg.Text = "deg" Me.cmdDeg.UseVisualStyleBackColor = True @@ -3210,10 +3135,10 @@ 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(230, 108) - Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTrunc.Location = New System.Drawing.Point(192, 90) + Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTrunc.Name = "cmdTrunc" - Me.cmdTrunc.Size = New System.Drawing.Size(76, 45) + Me.cmdTrunc.Size = New System.Drawing.Size(63, 38) Me.cmdTrunc.TabIndex = 141 Me.cmdTrunc.Text = "trunc" Me.cmdTrunc.UseVisualStyleBackColor = True @@ -3221,10 +3146,10 @@ Partial Class ucrCalculator 'cmdAtan ' Me.cmdAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan.Location = New System.Drawing.Point(154, 108) - Me.cmdAtan.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAtan.Location = New System.Drawing.Point(128, 90) + Me.cmdAtan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAtan.Name = "cmdAtan" - Me.cmdAtan.Size = New System.Drawing.Size(76, 45) + Me.cmdAtan.Size = New System.Drawing.Size(63, 38) Me.cmdAtan.TabIndex = 140 Me.cmdAtan.Text = "atan" Me.cmdAtan.UseVisualStyleBackColor = True @@ -3232,10 +3157,10 @@ Partial Class ucrCalculator 'cmdTan ' Me.cmdTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTan.Location = New System.Drawing.Point(78, 108) - Me.cmdTan.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTan.Location = New System.Drawing.Point(65, 90) + Me.cmdTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTan.Name = "cmdTan" - Me.cmdTan.Size = New System.Drawing.Size(76, 45) + Me.cmdTan.Size = New System.Drawing.Size(63, 38) Me.cmdTan.TabIndex = 139 Me.cmdTan.Text = "tan" Me.cmdTan.UseVisualStyleBackColor = True @@ -3244,10 +3169,10 @@ 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(3, 108) - Me.cmdLogTen.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLogTen.Location = New System.Drawing.Point(2, 90) + Me.cmdLogTen.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLogTen.Name = "cmdLogTen" - Me.cmdLogTen.Size = New System.Drawing.Size(76, 45) + Me.cmdLogTen.Size = New System.Drawing.Size(63, 38) Me.cmdLogTen.TabIndex = 138 Me.cmdLogTen.Text = "log10" Me.cmdLogTen.UseVisualStyleBackColor = True @@ -3255,10 +3180,10 @@ Partial Class ucrCalculator 'cmdRad ' Me.cmdRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRad.Location = New System.Drawing.Point(304, 64) - Me.cmdRad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRad.Location = New System.Drawing.Point(253, 53) + Me.cmdRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRad.Name = "cmdRad" - Me.cmdRad.Size = New System.Drawing.Size(76, 45) + Me.cmdRad.Size = New System.Drawing.Size(63, 38) Me.cmdRad.TabIndex = 137 Me.cmdRad.Text = "rad" Me.cmdRad.UseVisualStyleBackColor = True @@ -3267,10 +3192,10 @@ 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(230, 64) - Me.cmdFloor.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFloor.Location = New System.Drawing.Point(192, 53) + Me.cmdFloor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFloor.Name = "cmdFloor" - Me.cmdFloor.Size = New System.Drawing.Size(76, 45) + Me.cmdFloor.Size = New System.Drawing.Size(63, 38) Me.cmdFloor.TabIndex = 136 Me.cmdFloor.Text = "floor" Me.cmdFloor.UseVisualStyleBackColor = True @@ -3278,10 +3203,10 @@ Partial Class ucrCalculator 'cmdAsin ' Me.cmdAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsin.Location = New System.Drawing.Point(154, 64) - Me.cmdAsin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAsin.Location = New System.Drawing.Point(128, 53) + Me.cmdAsin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAsin.Name = "cmdAsin" - Me.cmdAsin.Size = New System.Drawing.Size(76, 45) + Me.cmdAsin.Size = New System.Drawing.Size(63, 38) Me.cmdAsin.TabIndex = 135 Me.cmdAsin.Text = "asin" Me.cmdAsin.UseVisualStyleBackColor = True @@ -3289,10 +3214,10 @@ Partial Class ucrCalculator 'cmdSin ' Me.cmdSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSin.Location = New System.Drawing.Point(78, 64) - Me.cmdSin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSin.Location = New System.Drawing.Point(65, 53) + Me.cmdSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSin.Name = "cmdSin" - Me.cmdSin.Size = New System.Drawing.Size(76, 45) + Me.cmdSin.Size = New System.Drawing.Size(63, 38) Me.cmdSin.TabIndex = 134 Me.cmdSin.Text = "sin" Me.cmdSin.UseVisualStyleBackColor = True @@ -3300,10 +3225,10 @@ Partial Class ucrCalculator 'cmdLog ' Me.cmdLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLog.Location = New System.Drawing.Point(3, 64) - Me.cmdLog.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLog.Location = New System.Drawing.Point(2, 53) + Me.cmdLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLog.Name = "cmdLog" - Me.cmdLog.Size = New System.Drawing.Size(76, 45) + Me.cmdLog.Size = New System.Drawing.Size(63, 38) Me.cmdLog.TabIndex = 133 Me.cmdLog.Text = "log" Me.cmdLog.UseVisualStyleBackColor = True @@ -3311,10 +3236,10 @@ Partial Class ucrCalculator 'cmdPi ' Me.cmdPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPi.Location = New System.Drawing.Point(304, 21) - Me.cmdPi.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPi.Location = New System.Drawing.Point(253, 18) + Me.cmdPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPi.Name = "cmdPi" - Me.cmdPi.Size = New System.Drawing.Size(76, 45) + Me.cmdPi.Size = New System.Drawing.Size(63, 38) Me.cmdPi.TabIndex = 132 Me.cmdPi.Text = "pi" Me.cmdPi.UseVisualStyleBackColor = True @@ -3323,10 +3248,10 @@ 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(230, 21) - Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCeiling.Location = New System.Drawing.Point(192, 18) + Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCeiling.Name = "cmdCeiling" - Me.cmdCeiling.Size = New System.Drawing.Size(76, 45) + Me.cmdCeiling.Size = New System.Drawing.Size(63, 38) Me.cmdCeiling.TabIndex = 131 Me.cmdCeiling.Text = "ceiling" Me.cmdCeiling.UseVisualStyleBackColor = True @@ -3334,10 +3259,10 @@ Partial Class ucrCalculator 'cmdAcos ' Me.cmdAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAcos.Location = New System.Drawing.Point(154, 21) - Me.cmdAcos.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAcos.Location = New System.Drawing.Point(128, 18) + Me.cmdAcos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAcos.Name = "cmdAcos" - Me.cmdAcos.Size = New System.Drawing.Size(76, 45) + Me.cmdAcos.Size = New System.Drawing.Size(63, 38) Me.cmdAcos.TabIndex = 130 Me.cmdAcos.Text = "acos" Me.cmdAcos.UseVisualStyleBackColor = True @@ -3345,10 +3270,10 @@ Partial Class ucrCalculator 'cmdCos ' Me.cmdCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCos.Location = New System.Drawing.Point(78, 21) - Me.cmdCos.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCos.Location = New System.Drawing.Point(65, 18) + Me.cmdCos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCos.Name = "cmdCos" - Me.cmdCos.Size = New System.Drawing.Size(76, 45) + Me.cmdCos.Size = New System.Drawing.Size(63, 38) Me.cmdCos.TabIndex = 129 Me.cmdCos.Text = "cos" Me.cmdCos.UseVisualStyleBackColor = True @@ -3356,10 +3281,10 @@ Partial Class ucrCalculator 'cmdSqrt ' Me.cmdSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSqrt.Location = New System.Drawing.Point(3, 21) - Me.cmdSqrt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSqrt.Location = New System.Drawing.Point(2, 18) + Me.cmdSqrt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSqrt.Name = "cmdSqrt" - Me.cmdSqrt.Size = New System.Drawing.Size(76, 45) + Me.cmdSqrt.Size = New System.Drawing.Size(63, 38) Me.cmdSqrt.TabIndex = 128 Me.cmdSqrt.Text = "sqrt" Me.cmdSqrt.UseVisualStyleBackColor = True @@ -3396,11 +3321,11 @@ Partial Class ucrCalculator Me.grpSummary.Controls.Add(Me.cmdLength) Me.grpSummary.Controls.Add(Me.cmdSum) Me.grpSummary.Controls.Add(Me.cmdVar) - Me.grpSummary.Location = New System.Drawing.Point(651, 94) - Me.grpSummary.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpSummary.Location = New System.Drawing.Point(542, 78) + Me.grpSummary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpSummary.Name = "grpSummary" - Me.grpSummary.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.grpSummary.Size = New System.Drawing.Size(432, 489) + Me.grpSummary.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpSummary.Size = New System.Drawing.Size(360, 408) Me.grpSummary.TabIndex = 185 Me.grpSummary.TabStop = False Me.grpSummary.Text = "Summary" @@ -3409,10 +3334,9 @@ Partial Class ucrCalculator ' Me.cmdSummaryRHelp.AutoSize = True Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(291, 246) - Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(242, 205) Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(136, 45) + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38) Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary Me.cmdSummaryRHelp.TabIndex = 185 Me.cmdSummaryRHelp.Text = "R Help" @@ -3423,42 +3347,42 @@ 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(178, 196) + Me.ContextMenuStripSummary.Size = New System.Drawing.Size(156, 148) ' 'BaseToolStripMenuItem1 ' Me.BaseToolStripMenuItem1.Name = "BaseToolStripMenuItem1" - Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(177, 32) + Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(155, 24) Me.BaseToolStripMenuItem1.Text = "Base" ' 'StatsToolStripMenuItem ' Me.StatsToolStripMenuItem.Name = "StatsToolStripMenuItem" - Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.StatsToolStripMenuItem.Text = "Stats" ' 'StatipToolStripMenuItem ' Me.StatipToolStripMenuItem.Name = "StatipToolStripMenuItem" - Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.StatipToolStripMenuItem.Text = "Statip" ' 'E1071ToolStripMenuItem ' Me.E1071ToolStripMenuItem.Name = "E1071ToolStripMenuItem" - Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.E1071ToolStripMenuItem.Text = "e1071" ' 'RobustbaseToolStripMenuItem ' Me.RobustbaseToolStripMenuItem.Name = "RobustbaseToolStripMenuItem" - Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.RobustbaseToolStripMenuItem.Text = "Robustbase" ' 'RasterToolStripMenuItem ' Me.RasterToolStripMenuItem.Name = "RasterToolStripMenuItem" - Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(177, 32) + Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(155, 24) Me.RasterToolStripMenuItem.Text = "Raster" ' 'grpFrequencies @@ -3478,11 +3402,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(3, 312) - Me.grpFrequencies.Margin = New System.Windows.Forms.Padding(4) + Me.grpFrequencies.Location = New System.Drawing.Point(2, 260) Me.grpFrequencies.Name = "grpFrequencies" - Me.grpFrequencies.Padding = New System.Windows.Forms.Padding(4) - Me.grpFrequencies.Size = New System.Drawing.Size(424, 160) + Me.grpFrequencies.Size = New System.Drawing.Size(353, 133) Me.grpFrequencies.TabIndex = 184 Me.grpFrequencies.TabStop = False Me.grpFrequencies.Text = "Frequencies" @@ -3491,10 +3413,10 @@ 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(338, 108) - Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqQuantile.Location = New System.Drawing.Point(282, 90) + Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqQuantile.Name = "cmdFreqQuantile" - Me.cmdFreqQuantile.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqQuantile.Size = New System.Drawing.Size(72, 38) Me.cmdFreqQuantile.TabIndex = 186 Me.cmdFreqQuantile.Text = "quantile" Me.cmdFreqQuantile.UseVisualStyleBackColor = True @@ -3503,10 +3425,10 @@ 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(254, 108) - Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqPropn.Location = New System.Drawing.Point(212, 90) + Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqPropn.Name = "cmdFreqPropn" - Me.cmdFreqPropn.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqPropn.Size = New System.Drawing.Size(72, 38) Me.cmdFreqPropn.TabIndex = 185 Me.cmdFreqPropn.Text = "propn" Me.cmdFreqPropn.UseVisualStyleBackColor = True @@ -3515,10 +3437,10 @@ 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(170, 108) - Me.cmdFreqDistinct.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqDistinct.Location = New System.Drawing.Point(142, 90) + Me.cmdFreqDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqDistinct.Name = "cmdFreqDistinct" - Me.cmdFreqDistinct.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqDistinct.Size = New System.Drawing.Size(72, 38) Me.cmdFreqDistinct.TabIndex = 184 Me.cmdFreqDistinct.Text = "distinct" Me.cmdFreqDistinct.UseVisualStyleBackColor = True @@ -3527,10 +3449,10 @@ 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(84, 108) - Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqIQR.Location = New System.Drawing.Point(70, 90) + Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqIQR.Name = "cmdFreqIQR" - Me.cmdFreqIQR.Size = New System.Drawing.Size(87, 45) + Me.cmdFreqIQR.Size = New System.Drawing.Size(72, 38) Me.cmdFreqIQR.TabIndex = 183 Me.cmdFreqIQR.Text = "IQR" Me.cmdFreqIQR.UseVisualStyleBackColor = True @@ -3539,10 +3461,10 @@ 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(170, 64) - Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMedian.Location = New System.Drawing.Point(142, 53) + Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMedian.Name = "cmdFreqMedian" - Me.cmdFreqMedian.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMedian.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMedian.TabIndex = 182 Me.cmdFreqMedian.Text = "median" Me.cmdFreqMedian.UseVisualStyleBackColor = True @@ -3551,10 +3473,10 @@ 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(338, 64) - Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqSd.Location = New System.Drawing.Point(282, 53) + Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqSd.Name = "cmdFreqSd" - Me.cmdFreqSd.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqSd.Size = New System.Drawing.Size(72, 38) Me.cmdFreqSd.TabIndex = 181 Me.cmdFreqSd.Text = "sd" Me.cmdFreqSd.UseVisualStyleBackColor = True @@ -3563,10 +3485,10 @@ 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(254, 64) - Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqVar.Location = New System.Drawing.Point(212, 53) + Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqVar.Name = "cmdFreqVar" - Me.cmdFreqVar.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqVar.Size = New System.Drawing.Size(72, 38) Me.cmdFreqVar.TabIndex = 180 Me.cmdFreqVar.Text = "var" Me.cmdFreqVar.UseVisualStyleBackColor = True @@ -3575,10 +3497,10 @@ 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(84, 64) - Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMean.Location = New System.Drawing.Point(70, 53) + Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMean.Name = "cmdFreqMean" - Me.cmdFreqMean.Size = New System.Drawing.Size(87, 45) + Me.cmdFreqMean.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMean.TabIndex = 179 Me.cmdFreqMean.Text = "mean" Me.cmdFreqMean.UseVisualStyleBackColor = True @@ -3587,10 +3509,10 @@ 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, 108) - Me.cmdFreqMad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMad.Location = New System.Drawing.Point(0, 90) + Me.cmdFreqMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMad.Name = "cmdFreqMad" - Me.cmdFreqMad.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMad.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMad.TabIndex = 178 Me.cmdFreqMad.Text = "mad" Me.cmdFreqMad.UseVisualStyleBackColor = True @@ -3599,10 +3521,10 @@ 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, 64) - Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 53) + Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMiss.Name = "cmdFreqMiss" - Me.cmdFreqMiss.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMiss.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMiss.TabIndex = 177 Me.cmdFreqMiss.Text = "miss" Me.cmdFreqMiss.UseVisualStyleBackColor = True @@ -3611,10 +3533,10 @@ 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(338, 21) - Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMode1.Location = New System.Drawing.Point(282, 18) + Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMode1.Name = "cmdFreqMode1" - Me.cmdFreqMode1.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMode1.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMode1.TabIndex = 176 Me.cmdFreqMode1.Text = "mode1" Me.cmdFreqMode1.UseVisualStyleBackColor = True @@ -3623,10 +3545,10 @@ 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(254, 21) - Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMax.Location = New System.Drawing.Point(212, 18) + Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMax.Name = "cmdFreqMax" - Me.cmdFreqMax.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMax.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMax.TabIndex = 175 Me.cmdFreqMax.Text = "max" Me.cmdFreqMax.UseVisualStyleBackColor = True @@ -3635,10 +3557,10 @@ 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(170, 21) - Me.cmdFreqMin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqMin.Location = New System.Drawing.Point(142, 18) + Me.cmdFreqMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqMin.Name = "cmdFreqMin" - Me.cmdFreqMin.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqMin.Size = New System.Drawing.Size(72, 38) Me.cmdFreqMin.TabIndex = 174 Me.cmdFreqMin.Text = "min" Me.cmdFreqMin.UseVisualStyleBackColor = True @@ -3647,10 +3569,10 @@ 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(84, 21) - Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqSum.Location = New System.Drawing.Point(70, 18) + Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqSum.Name = "cmdFreqSum" - Me.cmdFreqSum.Size = New System.Drawing.Size(87, 45) + Me.cmdFreqSum.Size = New System.Drawing.Size(72, 38) Me.cmdFreqSum.TabIndex = 173 Me.cmdFreqSum.Text = "sum" Me.cmdFreqSum.UseVisualStyleBackColor = True @@ -3659,10 +3581,10 @@ 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, 21) - Me.cmdFreqLength.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFreqLength.Location = New System.Drawing.Point(0, 18) + Me.cmdFreqLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFreqLength.Name = "cmdFreqLength" - Me.cmdFreqLength.Size = New System.Drawing.Size(86, 45) + Me.cmdFreqLength.Size = New System.Drawing.Size(72, 38) Me.cmdFreqLength.TabIndex = 172 Me.cmdFreqLength.Text = "length" Me.cmdFreqLength.UseVisualStyleBackColor = True @@ -3671,10 +3593,10 @@ Partial Class ucrCalculator ' 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(344, 150) - Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdKurtosis.Location = New System.Drawing.Point(287, 125) + Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdKurtosis.Name = "cmdKurtosis" - Me.cmdKurtosis.Size = New System.Drawing.Size(84, 45) + Me.cmdKurtosis.Size = New System.Drawing.Size(70, 38) Me.cmdKurtosis.TabIndex = 182 Me.cmdKurtosis.Text = "kurtosis" Me.cmdKurtosis.UseVisualStyleBackColor = True @@ -3682,10 +3604,10 @@ Partial Class ucrCalculator 'cmdMode1 ' Me.cmdMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode1.Location = New System.Drawing.Point(344, 63) - Me.cmdMode1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMode1.Location = New System.Drawing.Point(287, 52) + Me.cmdMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMode1.Name = "cmdMode1" - Me.cmdMode1.Size = New System.Drawing.Size(84, 45) + Me.cmdMode1.Size = New System.Drawing.Size(70, 38) Me.cmdMode1.TabIndex = 180 Me.cmdMode1.Text = "mode1" Me.cmdMode1.UseVisualStyleBackColor = True @@ -3693,10 +3615,10 @@ Partial Class ucrCalculator 'cmdMode ' Me.cmdMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode.Location = New System.Drawing.Point(261, 63) - Me.cmdMode.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMode.Location = New System.Drawing.Point(218, 52) + Me.cmdMode.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMode.Name = "cmdMode" - Me.cmdMode.Size = New System.Drawing.Size(84, 45) + Me.cmdMode.Size = New System.Drawing.Size(70, 38) Me.cmdMode.TabIndex = 179 Me.cmdMode.Text = "mode" Me.cmdMode.UseVisualStyleBackColor = True @@ -3704,10 +3626,10 @@ Partial Class ucrCalculator 'cmdFirst ' Me.cmdFirst.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFirst.Location = New System.Drawing.Point(178, 194) - Me.cmdFirst.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFirst.Location = New System.Drawing.Point(148, 162) + Me.cmdFirst.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFirst.Name = "cmdFirst" - Me.cmdFirst.Size = New System.Drawing.Size(84, 45) + Me.cmdFirst.Size = New System.Drawing.Size(70, 38) Me.cmdFirst.TabIndex = 178 Me.cmdFirst.Text = "first" Me.cmdFirst.UseVisualStyleBackColor = True @@ -3715,10 +3637,10 @@ Partial Class ucrCalculator 'cmdLast ' Me.cmdLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLast.Location = New System.Drawing.Point(261, 194) - Me.cmdLast.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLast.Location = New System.Drawing.Point(218, 162) + Me.cmdLast.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLast.Name = "cmdLast" - Me.cmdLast.Size = New System.Drawing.Size(84, 45) + Me.cmdLast.Size = New System.Drawing.Size(70, 38) Me.cmdLast.TabIndex = 177 Me.cmdLast.Text = "last" Me.cmdLast.UseVisualStyleBackColor = True @@ -3726,10 +3648,10 @@ Partial Class ucrCalculator 'cmdnth ' Me.cmdnth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnth.Location = New System.Drawing.Point(344, 194) - Me.cmdnth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdnth.Location = New System.Drawing.Point(287, 162) + Me.cmdnth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdnth.Name = "cmdnth" - Me.cmdnth.Size = New System.Drawing.Size(84, 45) + Me.cmdnth.Size = New System.Drawing.Size(70, 38) Me.cmdnth.TabIndex = 176 Me.cmdnth.Text = "nth" Me.cmdnth.UseVisualStyleBackColor = True @@ -3737,10 +3659,10 @@ Partial Class ucrCalculator 'cmdCor ' Me.cmdCor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCor.Location = New System.Drawing.Point(3, 237) - Me.cmdCor.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCor.Location = New System.Drawing.Point(2, 198) + Me.cmdCor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCor.Name = "cmdCor" - Me.cmdCor.Size = New System.Drawing.Size(94, 45) + Me.cmdCor.Size = New System.Drawing.Size(78, 38) Me.cmdCor.TabIndex = 175 Me.cmdCor.Text = "cor" Me.cmdCor.UseVisualStyleBackColor = True @@ -3748,10 +3670,10 @@ Partial Class ucrCalculator 'cmdCov ' Me.cmdCov.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCov.Location = New System.Drawing.Point(96, 237) - Me.cmdCov.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCov.Location = New System.Drawing.Point(80, 198) + Me.cmdCov.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCov.Name = "cmdCov" - Me.cmdCov.Size = New System.Drawing.Size(84, 45) + Me.cmdCov.Size = New System.Drawing.Size(70, 38) Me.cmdCov.TabIndex = 174 Me.cmdCov.Text = "cov" Me.cmdCov.UseVisualStyleBackColor = True @@ -3760,10 +3682,10 @@ 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(261, 106) - Me.cmdMad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMad.Location = New System.Drawing.Point(218, 88) + Me.cmdMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMad.Name = "cmdMad" - Me.cmdMad.Size = New System.Drawing.Size(84, 45) + Me.cmdMad.Size = New System.Drawing.Size(70, 38) Me.cmdMad.TabIndex = 173 Me.cmdMad.Text = "mad" Me.cmdMad.UseVisualStyleBackColor = True @@ -3772,10 +3694,10 @@ 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(178, 150) - Me.cmdMc.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMc.Location = New System.Drawing.Point(148, 125) + Me.cmdMc.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMc.Name = "cmdMc" - Me.cmdMc.Size = New System.Drawing.Size(84, 45) + Me.cmdMc.Size = New System.Drawing.Size(70, 38) Me.cmdMc.TabIndex = 172 Me.cmdMc.Text = "mc" Me.cmdMc.UseVisualStyleBackColor = True @@ -3784,10 +3706,10 @@ 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(96, 194) - Me.cmdPropn.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPropn.Location = New System.Drawing.Point(80, 162) + Me.cmdPropn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPropn.Name = "cmdPropn" - Me.cmdPropn.Size = New System.Drawing.Size(84, 45) + Me.cmdPropn.Size = New System.Drawing.Size(70, 38) Me.cmdPropn.TabIndex = 171 Me.cmdPropn.Text = "propn" Me.cmdPropn.UseVisualStyleBackColor = True @@ -3796,10 +3718,10 @@ 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(96, 150) - Me.cmdCv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCv.Location = New System.Drawing.Point(80, 125) + Me.cmdCv.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCv.Name = "cmdCv" - Me.cmdCv.Size = New System.Drawing.Size(84, 45) + Me.cmdCv.Size = New System.Drawing.Size(70, 38) Me.cmdCv.TabIndex = 170 Me.cmdCv.Text = "cv" Me.cmdCv.UseVisualStyleBackColor = True @@ -3808,10 +3730,10 @@ 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(261, 150) - Me.cmdSkew.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSkew.Location = New System.Drawing.Point(218, 125) + Me.cmdSkew.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSkew.Name = "cmdSkew" - Me.cmdSkew.Size = New System.Drawing.Size(84, 45) + Me.cmdSkew.Size = New System.Drawing.Size(70, 38) Me.cmdSkew.TabIndex = 169 Me.cmdSkew.Text = "skew" Me.cmdSkew.UseVisualStyleBackColor = True @@ -3820,10 +3742,10 @@ 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(3, 194) - Me.cmdAnyDup.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAnyDup.Location = New System.Drawing.Point(2, 162) + Me.cmdAnyDup.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAnyDup.Name = "cmdAnyDup" - Me.cmdAnyDup.Size = New System.Drawing.Size(94, 45) + Me.cmdAnyDup.Size = New System.Drawing.Size(78, 38) Me.cmdAnyDup.TabIndex = 168 Me.cmdAnyDup.Text = "anyDup" Me.cmdAnyDup.UseVisualStyleBackColor = True @@ -3831,10 +3753,10 @@ Partial Class ucrCalculator 'cmdDistinct ' Me.cmdDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDistinct.Location = New System.Drawing.Point(3, 150) - Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDistinct.Location = New System.Drawing.Point(2, 125) + Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDistinct.Name = "cmdDistinct" - Me.cmdDistinct.Size = New System.Drawing.Size(94, 45) + Me.cmdDistinct.Size = New System.Drawing.Size(78, 38) Me.cmdDistinct.TabIndex = 167 Me.cmdDistinct.Text = "distinct" Me.cmdDistinct.UseVisualStyleBackColor = True @@ -3842,10 +3764,10 @@ Partial Class ucrCalculator 'cmdNonMiss ' Me.cmdNonMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNonMiss.Location = New System.Drawing.Point(3, 106) - Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdNonMiss.Location = New System.Drawing.Point(2, 88) + Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdNonMiss.Name = "cmdNonMiss" - Me.cmdNonMiss.Size = New System.Drawing.Size(94, 45) + Me.cmdNonMiss.Size = New System.Drawing.Size(78, 38) Me.cmdNonMiss.TabIndex = 166 Me.cmdNonMiss.Text = "non miss" Me.cmdNonMiss.UseVisualStyleBackColor = True @@ -3854,10 +3776,10 @@ 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(344, 106) - Me.cmdIQR.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdIQR.Location = New System.Drawing.Point(287, 88) + Me.cmdIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdIQR.Name = "cmdIQR" - Me.cmdIQR.Size = New System.Drawing.Size(84, 45) + Me.cmdIQR.Size = New System.Drawing.Size(70, 38) Me.cmdIQR.TabIndex = 165 Me.cmdIQR.Text = "IQR" Me.cmdIQR.UseVisualStyleBackColor = True @@ -3866,10 +3788,10 @@ 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(178, 237) - Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQuantile.Location = New System.Drawing.Point(148, 198) + Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQuantile.Name = "cmdQuantile" - Me.cmdQuantile.Size = New System.Drawing.Size(84, 45) + Me.cmdQuantile.Size = New System.Drawing.Size(70, 38) Me.cmdQuantile.TabIndex = 164 Me.cmdQuantile.Text = "quantile" Me.cmdQuantile.UseVisualStyleBackColor = True @@ -3878,10 +3800,10 @@ 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(344, 20) - Me.cmdRange.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRange.Location = New System.Drawing.Point(287, 17) + Me.cmdRange.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRange.Name = "cmdRange" - Me.cmdRange.Size = New System.Drawing.Size(84, 45) + Me.cmdRange.Size = New System.Drawing.Size(70, 38) Me.cmdRange.TabIndex = 163 Me.cmdRange.Text = "range" Me.cmdRange.UseVisualStyleBackColor = True @@ -3889,10 +3811,10 @@ Partial Class ucrCalculator 'cmdSd ' Me.cmdSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSd.Location = New System.Drawing.Point(178, 106) - Me.cmdSd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSd.Location = New System.Drawing.Point(148, 88) + Me.cmdSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSd.Name = "cmdSd" - Me.cmdSd.Size = New System.Drawing.Size(84, 45) + Me.cmdSd.Size = New System.Drawing.Size(70, 38) Me.cmdSd.TabIndex = 160 Me.cmdSd.Text = "sd" Me.cmdSd.UseVisualStyleBackColor = True @@ -3901,10 +3823,10 @@ 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(178, 63) - Me.cmdMedian.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMedian.Location = New System.Drawing.Point(148, 52) + Me.cmdMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMedian.Name = "cmdMedian" - Me.cmdMedian.Size = New System.Drawing.Size(84, 45) + Me.cmdMedian.Size = New System.Drawing.Size(70, 38) Me.cmdMedian.TabIndex = 158 Me.cmdMedian.Text = "median" Me.cmdMedian.UseVisualStyleBackColor = True @@ -3912,10 +3834,10 @@ Partial Class ucrCalculator 'cmdMin ' Me.cmdMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMin.Location = New System.Drawing.Point(178, 20) - Me.cmdMin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMin.Location = New System.Drawing.Point(148, 17) + Me.cmdMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMin.Name = "cmdMin" - Me.cmdMin.Size = New System.Drawing.Size(84, 45) + Me.cmdMin.Size = New System.Drawing.Size(70, 38) Me.cmdMin.TabIndex = 155 Me.cmdMin.Text = "min" Me.cmdMin.UseVisualStyleBackColor = True @@ -3923,10 +3845,10 @@ Partial Class ucrCalculator 'cmdMax ' Me.cmdMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMax.Location = New System.Drawing.Point(261, 20) - Me.cmdMax.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMax.Location = New System.Drawing.Point(218, 17) + Me.cmdMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMax.Name = "cmdMax" - Me.cmdMax.Size = New System.Drawing.Size(84, 45) + Me.cmdMax.Size = New System.Drawing.Size(70, 38) Me.cmdMax.TabIndex = 154 Me.cmdMax.Text = "max" Me.cmdMax.UseVisualStyleBackColor = True @@ -3935,10 +3857,10 @@ 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(96, 63) - Me.cmdMean.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMean.Location = New System.Drawing.Point(80, 52) + Me.cmdMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMean.Name = "cmdMean" - Me.cmdMean.Size = New System.Drawing.Size(84, 45) + Me.cmdMean.Size = New System.Drawing.Size(70, 38) Me.cmdMean.TabIndex = 153 Me.cmdMean.Text = "mean" Me.cmdMean.UseVisualStyleBackColor = True @@ -3946,10 +3868,10 @@ Partial Class ucrCalculator 'cmdMiss ' Me.cmdMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMiss.Location = New System.Drawing.Point(3, 63) - Me.cmdMiss.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMiss.Location = New System.Drawing.Point(2, 52) + Me.cmdMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMiss.Name = "cmdMiss" - Me.cmdMiss.Size = New System.Drawing.Size(94, 45) + Me.cmdMiss.Size = New System.Drawing.Size(78, 38) Me.cmdMiss.TabIndex = 149 Me.cmdMiss.Text = "miss" Me.cmdMiss.UseVisualStyleBackColor = True @@ -3958,10 +3880,10 @@ 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(3, 20) - Me.cmdLength.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLength.Location = New System.Drawing.Point(2, 17) + Me.cmdLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLength.Name = "cmdLength" - Me.cmdLength.Size = New System.Drawing.Size(94, 45) + Me.cmdLength.Size = New System.Drawing.Size(78, 38) Me.cmdLength.TabIndex = 148 Me.cmdLength.Text = "length" Me.cmdLength.UseVisualStyleBackColor = True @@ -3969,10 +3891,10 @@ Partial Class ucrCalculator 'cmdSum ' Me.cmdSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSum.Location = New System.Drawing.Point(96, 20) - Me.cmdSum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSum.Location = New System.Drawing.Point(80, 17) + Me.cmdSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSum.Name = "cmdSum" - Me.cmdSum.Size = New System.Drawing.Size(84, 45) + Me.cmdSum.Size = New System.Drawing.Size(70, 38) Me.cmdSum.TabIndex = 150 Me.cmdSum.Text = "sum" Me.cmdSum.UseVisualStyleBackColor = True @@ -3980,10 +3902,10 @@ Partial Class ucrCalculator 'cmdVar ' Me.cmdVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVar.Location = New System.Drawing.Point(96, 106) - Me.cmdVar.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdVar.Location = New System.Drawing.Point(80, 88) + Me.cmdVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdVar.Name = "cmdVar" - Me.cmdVar.Size = New System.Drawing.Size(84, 45) + Me.cmdVar.Size = New System.Drawing.Size(70, 38) Me.cmdVar.TabIndex = 159 Me.cmdVar.Text = "var" Me.cmdVar.UseVisualStyleBackColor = True @@ -4023,11 +3945,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(651, 93) - Me.grpProbabilty.Margin = New System.Windows.Forms.Padding(4) + Me.grpProbabilty.Location = New System.Drawing.Point(542, 78) Me.grpProbabilty.Name = "grpProbabilty" - Me.grpProbabilty.Padding = New System.Windows.Forms.Padding(4) - Me.grpProbabilty.Size = New System.Drawing.Size(474, 482) + Me.grpProbabilty.Size = New System.Drawing.Size(395, 402) Me.grpProbabilty.TabIndex = 187 Me.grpProbabilty.TabStop = False Me.grpProbabilty.Text = "Probability" @@ -4036,10 +3956,10 @@ 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(3, 284) - Me.cmdPascal.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPascal.Location = New System.Drawing.Point(2, 237) + Me.cmdPascal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPascal.Name = "cmdPascal" - Me.cmdPascal.Size = New System.Drawing.Size(93, 45) + Me.cmdPascal.Size = New System.Drawing.Size(78, 38) Me.cmdPascal.TabIndex = 213 Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True @@ -4048,10 +3968,9 @@ Partial Class ucrCalculator ' Me.cmdProbRHelp.AutoSize = True Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(360, 285) - Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(129, 45) + Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability Me.cmdProbRHelp.TabIndex = 212 Me.cmdProbRHelp.Text = "R Help" @@ -4062,18 +3981,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(122, 68) + Me.ContextMenuStripProbability.Size = New System.Drawing.Size(110, 52) ' 'ProbStatsToolStripMenuItem ' Me.ProbStatsToolStripMenuItem.Name = "ProbStatsToolStripMenuItem" - Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(121, 32) + Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(109, 24) Me.ProbStatsToolStripMenuItem.Text = "stats" ' 'ProbBaseToolStripMenuItem ' Me.ProbBaseToolStripMenuItem.Name = "ProbBaseToolStripMenuItem" - Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(121, 32) + Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 24) Me.ProbBaseToolStripMenuItem.Text = "base" ' 'grpRandom @@ -4088,11 +4007,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(9, 342) - Me.grpRandom.Margin = New System.Windows.Forms.Padding(4) + Me.grpRandom.Location = New System.Drawing.Point(8, 285) Me.grpRandom.Name = "grpRandom" - Me.grpRandom.Padding = New System.Windows.Forms.Padding(4) - Me.grpRandom.Size = New System.Drawing.Size(459, 126) + Me.grpRandom.Size = New System.Drawing.Size(382, 105) Me.grpRandom.TabIndex = 199 Me.grpRandom.TabStop = False Me.grpRandom.Text = "Random" @@ -4101,10 +4018,10 @@ 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(174, 64) - Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdnbinomial.Location = New System.Drawing.Point(145, 53) + Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdnbinomial.Name = "cmdnbinomial" - Me.cmdnbinomial.Size = New System.Drawing.Size(108, 45) + Me.cmdnbinomial.Size = New System.Drawing.Size(90, 38) Me.cmdnbinomial.TabIndex = 182 Me.cmdnbinomial.Text = "nbinomial" Me.cmdnbinomial.UseVisualStyleBackColor = True @@ -4113,10 +4030,10 @@ 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(364, 64) - Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRan_sample.Location = New System.Drawing.Point(303, 53) + Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRan_sample.Name = "cmdRan_sample" - Me.cmdRan_sample.Size = New System.Drawing.Size(86, 45) + Me.cmdRan_sample.Size = New System.Drawing.Size(72, 38) Me.cmdRan_sample.TabIndex = 181 Me.cmdRan_sample.Text = "sample" Me.cmdRan_sample.UseVisualStyleBackColor = True @@ -4125,10 +4042,10 @@ 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(280, 64) - Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRan_beta.Location = New System.Drawing.Point(233, 53) + Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRan_beta.Name = "cmdRan_beta" - Me.cmdRan_beta.Size = New System.Drawing.Size(86, 45) + Me.cmdRan_beta.Size = New System.Drawing.Size(72, 38) Me.cmdRan_beta.TabIndex = 180 Me.cmdRan_beta.Text = "beta" Me.cmdRan_beta.UseVisualStyleBackColor = True @@ -4137,10 +4054,10 @@ 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(88, 64) - Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRan_gamma.Location = New System.Drawing.Point(73, 53) + Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRan_gamma.Name = "cmdRan_gamma" - Me.cmdRan_gamma.Size = New System.Drawing.Size(87, 45) + Me.cmdRan_gamma.Size = New System.Drawing.Size(72, 38) Me.cmdRan_gamma.TabIndex = 179 Me.cmdRan_gamma.Text = "gamma" Me.cmdRan_gamma.UseVisualStyleBackColor = True @@ -4149,10 +4066,10 @@ 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(4, 64) - Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdpoisson.Location = New System.Drawing.Point(3, 53) + Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdpoisson.Name = "cmdpoisson" - Me.cmdpoisson.Size = New System.Drawing.Size(86, 45) + Me.cmdpoisson.Size = New System.Drawing.Size(72, 38) Me.cmdpoisson.TabIndex = 177 Me.cmdpoisson.Text = "poisson" Me.cmdpoisson.UseVisualStyleBackColor = True @@ -4161,10 +4078,10 @@ 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(364, 21) - Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdbinomial.Location = New System.Drawing.Point(303, 18) + Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdbinomial.Name = "cmdbinomial" - Me.cmdbinomial.Size = New System.Drawing.Size(86, 45) + Me.cmdbinomial.Size = New System.Drawing.Size(72, 38) Me.cmdbinomial.TabIndex = 176 Me.cmdbinomial.Text = "binomial" Me.cmdbinomial.UseVisualStyleBackColor = True @@ -4173,10 +4090,10 @@ 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(280, 21) - Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdbernoulli.Location = New System.Drawing.Point(233, 18) + Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdbernoulli.Name = "cmdbernoulli" - Me.cmdbernoulli.Size = New System.Drawing.Size(86, 45) + Me.cmdbernoulli.Size = New System.Drawing.Size(72, 38) Me.cmdbernoulli.TabIndex = 175 Me.cmdbernoulli.Text = "bernoulli" Me.cmdbernoulli.UseVisualStyleBackColor = True @@ -4185,10 +4102,10 @@ 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(174, 21) - Me.cmduni_integer.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmduni_integer.Location = New System.Drawing.Point(145, 18) + Me.cmduni_integer.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmduni_integer.Name = "cmduni_integer" - Me.cmduni_integer.Size = New System.Drawing.Size(108, 45) + Me.cmduni_integer.Size = New System.Drawing.Size(90, 38) Me.cmduni_integer.TabIndex = 174 Me.cmduni_integer.Text = "uni_integer" Me.cmduni_integer.UseVisualStyleBackColor = True @@ -4197,10 +4114,10 @@ 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(88, 21) - Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRan_normal.Location = New System.Drawing.Point(73, 18) + Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRan_normal.Name = "cmdRan_normal" - Me.cmdRan_normal.Size = New System.Drawing.Size(87, 45) + Me.cmdRan_normal.Size = New System.Drawing.Size(72, 38) Me.cmdRan_normal.TabIndex = 173 Me.cmdRan_normal.Text = "normal" Me.cmdRan_normal.UseVisualStyleBackColor = True @@ -4209,10 +4126,10 @@ 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(4, 21) - Me.cmduniform.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmduniform.Location = New System.Drawing.Point(3, 18) + Me.cmduniform.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmduniform.Name = "cmduniform" - Me.cmduniform.Size = New System.Drawing.Size(86, 45) + Me.cmduniform.Size = New System.Drawing.Size(72, 38) Me.cmduniform.TabIndex = 172 Me.cmduniform.Text = "uniform" Me.cmduniform.UseVisualStyleBackColor = True @@ -4221,10 +4138,10 @@ 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(369, 153) - Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQnbin.Location = New System.Drawing.Point(308, 128) + Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQnbin.Name = "cmdQnbin" - Me.cmdQnbin.Size = New System.Drawing.Size(93, 45) + Me.cmdQnbin.Size = New System.Drawing.Size(78, 38) Me.cmdQnbin.TabIndex = 176 Me.cmdQnbin.Text = "qnbin" Me.cmdQnbin.UseVisualStyleBackColor = True @@ -4233,10 +4150,10 @@ 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(278, 153) - Me.cmdQpois.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQpois.Location = New System.Drawing.Point(232, 128) + Me.cmdQpois.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQpois.Name = "cmdQpois" - Me.cmdQpois.Size = New System.Drawing.Size(93, 45) + Me.cmdQpois.Size = New System.Drawing.Size(78, 38) Me.cmdQpois.TabIndex = 175 Me.cmdQpois.Text = "qpois" Me.cmdQpois.UseVisualStyleBackColor = True @@ -4245,10 +4162,10 @@ 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(186, 153) - Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQbinom.Location = New System.Drawing.Point(155, 128) + Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQbinom.Name = "cmdQbinom" - Me.cmdQbinom.Size = New System.Drawing.Size(93, 45) + Me.cmdQbinom.Size = New System.Drawing.Size(78, 38) Me.cmdQbinom.TabIndex = 174 Me.cmdQbinom.Text = "qbinom" Me.cmdQbinom.UseVisualStyleBackColor = True @@ -4257,10 +4174,10 @@ 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(94, 153) - Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQbirth.Location = New System.Drawing.Point(78, 128) + Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQbirth.Name = "cmdQbirth" - Me.cmdQbirth.Size = New System.Drawing.Size(93, 45) + Me.cmdQbirth.Size = New System.Drawing.Size(78, 38) Me.cmdQbirth.TabIndex = 173 Me.cmdQbirth.Text = "qbirth" Me.cmdQbirth.UseVisualStyleBackColor = True @@ -4269,10 +4186,10 @@ 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(3, 153) - Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQbeta.Location = New System.Drawing.Point(2, 128) + Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQbeta.Name = "cmdQbeta" - Me.cmdQbeta.Size = New System.Drawing.Size(93, 45) + Me.cmdQbeta.Size = New System.Drawing.Size(78, 38) Me.cmdQbeta.TabIndex = 172 Me.cmdQbeta.Text = "qbeta" Me.cmdQbeta.UseVisualStyleBackColor = True @@ -4281,10 +4198,10 @@ 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(369, 110) - Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPnbin.Location = New System.Drawing.Point(308, 92) + Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPnbin.Name = "cmdPnbin" - Me.cmdPnbin.Size = New System.Drawing.Size(93, 45) + Me.cmdPnbin.Size = New System.Drawing.Size(78, 38) Me.cmdPnbin.TabIndex = 171 Me.cmdPnbin.Text = "pnbin" Me.cmdPnbin.UseVisualStyleBackColor = True @@ -4293,10 +4210,10 @@ 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(278, 110) - Me.cmdPpois.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPpois.Location = New System.Drawing.Point(232, 92) + Me.cmdPpois.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPpois.Name = "cmdPpois" - Me.cmdPpois.Size = New System.Drawing.Size(93, 45) + Me.cmdPpois.Size = New System.Drawing.Size(78, 38) Me.cmdPpois.TabIndex = 170 Me.cmdPpois.Text = "ppois" Me.cmdPpois.UseVisualStyleBackColor = True @@ -4305,10 +4222,10 @@ 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(186, 110) - Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPbinom.Location = New System.Drawing.Point(155, 92) + Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPbinom.Name = "cmdPbinom" - Me.cmdPbinom.Size = New System.Drawing.Size(93, 45) + Me.cmdPbinom.Size = New System.Drawing.Size(78, 38) Me.cmdPbinom.TabIndex = 169 Me.cmdPbinom.Text = "pbinom" Me.cmdPbinom.UseVisualStyleBackColor = True @@ -4317,10 +4234,10 @@ 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(94, 110) - Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPbirth.Location = New System.Drawing.Point(78, 92) + Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPbirth.Name = "cmdPbirth" - Me.cmdPbirth.Size = New System.Drawing.Size(93, 45) + Me.cmdPbirth.Size = New System.Drawing.Size(78, 38) Me.cmdPbirth.TabIndex = 168 Me.cmdPbirth.Text = "pbirth" Me.cmdPbirth.UseVisualStyleBackColor = True @@ -4329,10 +4246,10 @@ 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(3, 110) - Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPbeta.Location = New System.Drawing.Point(2, 92) + Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPbeta.Name = "cmdPbeta" - Me.cmdPbeta.Size = New System.Drawing.Size(93, 45) + Me.cmdPbeta.Size = New System.Drawing.Size(78, 38) Me.cmdPbeta.TabIndex = 167 Me.cmdPbeta.Text = "pbeta" Me.cmdPbeta.UseVisualStyleBackColor = True @@ -4341,10 +4258,10 @@ 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(369, 66) - Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQgamma.Location = New System.Drawing.Point(308, 55) + Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQgamma.Name = "cmdQgamma" - Me.cmdQgamma.Size = New System.Drawing.Size(93, 45) + Me.cmdQgamma.Size = New System.Drawing.Size(78, 38) Me.cmdQgamma.TabIndex = 166 Me.cmdQgamma.Text = "qgamma" Me.cmdQgamma.UseVisualStyleBackColor = True @@ -4353,10 +4270,10 @@ 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(369, 22) - Me.cmdPgamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPgamma.Location = New System.Drawing.Point(308, 18) + Me.cmdPgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPgamma.Name = "cmdPgamma" - Me.cmdPgamma.Size = New System.Drawing.Size(93, 45) + Me.cmdPgamma.Size = New System.Drawing.Size(78, 38) Me.cmdPgamma.TabIndex = 165 Me.cmdPgamma.Text = "pgamma" Me.cmdPgamma.UseVisualStyleBackColor = True @@ -4365,10 +4282,10 @@ 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(278, 196) - Me.cmdGamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdGamma.Location = New System.Drawing.Point(232, 163) + Me.cmdGamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdGamma.Name = "cmdGamma" - Me.cmdGamma.Size = New System.Drawing.Size(93, 45) + Me.cmdGamma.Size = New System.Drawing.Size(78, 38) Me.cmdGamma.TabIndex = 163 Me.cmdGamma.Tag = "" Me.cmdGamma.Text = "gamma" @@ -4378,10 +4295,10 @@ 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(186, 240) - Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLbeta.Location = New System.Drawing.Point(155, 200) + Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLbeta.Name = "cmdLbeta" - Me.cmdLbeta.Size = New System.Drawing.Size(93, 45) + Me.cmdLbeta.Size = New System.Drawing.Size(78, 38) Me.cmdLbeta.TabIndex = 159 Me.cmdLbeta.Text = "lbeta" Me.cmdLbeta.UseVisualStyleBackColor = True @@ -4390,10 +4307,10 @@ 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(278, 66) - Me.cmdqF.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdqF.Location = New System.Drawing.Point(232, 55) + Me.cmdqF.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdqF.Name = "cmdqF" - Me.cmdqF.Size = New System.Drawing.Size(93, 45) + Me.cmdqF.Size = New System.Drawing.Size(78, 38) Me.cmdqF.TabIndex = 162 Me.cmdqF.Text = "qf" Me.cmdqF.UseVisualStyleBackColor = True @@ -4402,10 +4319,10 @@ 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(3, 196) - Me.cmdFact.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdFact.Location = New System.Drawing.Point(2, 163) + Me.cmdFact.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdFact.Name = "cmdFact" - Me.cmdFact.Size = New System.Drawing.Size(93, 45) + Me.cmdFact.Size = New System.Drawing.Size(78, 38) Me.cmdFact.TabIndex = 154 Me.cmdFact.Text = "fact" Me.cmdFact.UseVisualStyleBackColor = True @@ -4414,10 +4331,10 @@ 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(94, 196) - Me.cmdChoose.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdChoose.Location = New System.Drawing.Point(78, 163) + Me.cmdChoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdChoose.Name = "cmdChoose" - Me.cmdChoose.Size = New System.Drawing.Size(93, 45) + Me.cmdChoose.Size = New System.Drawing.Size(78, 38) Me.cmdChoose.TabIndex = 161 Me.cmdChoose.Text = "choose" Me.cmdChoose.UseVisualStyleBackColor = True @@ -4426,10 +4343,10 @@ 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(278, 22) - Me.cmdPf.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPf.Location = New System.Drawing.Point(232, 18) + Me.cmdPf.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPf.Name = "cmdPf" - Me.cmdPf.Size = New System.Drawing.Size(93, 45) + Me.cmdPf.Size = New System.Drawing.Size(78, 38) Me.cmdPf.TabIndex = 156 Me.cmdPf.Text = "pf" Me.cmdPf.UseVisualStyleBackColor = True @@ -4438,10 +4355,10 @@ 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(186, 22) - Me.cmdPChisq.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPChisq.Location = New System.Drawing.Point(155, 18) + Me.cmdPChisq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPChisq.Name = "cmdPChisq" - Me.cmdPChisq.Size = New System.Drawing.Size(93, 45) + Me.cmdPChisq.Size = New System.Drawing.Size(78, 38) Me.cmdPChisq.TabIndex = 155 Me.cmdPChisq.Text = "pchisq" Me.cmdPChisq.UseVisualStyleBackColor = True @@ -4450,10 +4367,10 @@ 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(278, 240) - Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLgamma.Location = New System.Drawing.Point(232, 200) + Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLgamma.Name = "cmdLgamma" - Me.cmdLgamma.Size = New System.Drawing.Size(93, 45) + Me.cmdLgamma.Size = New System.Drawing.Size(78, 38) Me.cmdLgamma.TabIndex = 152 Me.cmdLgamma.Text = "lgamma" Me.cmdLgamma.UseVisualStyleBackColor = True @@ -4462,10 +4379,10 @@ 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(3, 22) - Me.cmdPnorm.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPnorm.Location = New System.Drawing.Point(2, 18) + Me.cmdPnorm.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPnorm.Name = "cmdPnorm" - Me.cmdPnorm.Size = New System.Drawing.Size(93, 45) + Me.cmdPnorm.Size = New System.Drawing.Size(78, 38) Me.cmdPnorm.TabIndex = 148 Me.cmdPnorm.Text = "pnorm" Me.cmdPnorm.UseVisualStyleBackColor = True @@ -4474,10 +4391,10 @@ 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(186, 66) - Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQchisq.Location = New System.Drawing.Point(155, 55) + Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQchisq.Name = "cmdQchisq" - Me.cmdQchisq.Size = New System.Drawing.Size(93, 45) + Me.cmdQchisq.Size = New System.Drawing.Size(78, 38) Me.cmdQchisq.TabIndex = 160 Me.cmdQchisq.Text = "qchisq" Me.cmdQchisq.UseVisualStyleBackColor = True @@ -4486,10 +4403,10 @@ 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(94, 66) - Me.cmdQt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQt.Location = New System.Drawing.Point(78, 55) + Me.cmdQt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQt.Name = "cmdQt" - Me.cmdQt.Size = New System.Drawing.Size(93, 45) + Me.cmdQt.Size = New System.Drawing.Size(78, 38) Me.cmdQt.TabIndex = 158 Me.cmdQt.Text = "qt" Me.cmdQt.UseVisualStyleBackColor = True @@ -4498,10 +4415,10 @@ 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(3, 66) - Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQnorm.Location = New System.Drawing.Point(2, 55) + Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQnorm.Name = "cmdQnorm" - Me.cmdQnorm.Size = New System.Drawing.Size(93, 45) + Me.cmdQnorm.Size = New System.Drawing.Size(78, 38) Me.cmdQnorm.TabIndex = 157 Me.cmdQnorm.Text = "qnorm" Me.cmdQnorm.UseVisualStyleBackColor = True @@ -4510,10 +4427,10 @@ 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(94, 22) - Me.cmdPt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPt.Location = New System.Drawing.Point(78, 18) + Me.cmdPt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPt.Name = "cmdPt" - Me.cmdPt.Size = New System.Drawing.Size(93, 45) + Me.cmdPt.Size = New System.Drawing.Size(78, 38) Me.cmdPt.TabIndex = 153 Me.cmdPt.Text = "pt" Me.cmdPt.UseVisualStyleBackColor = True @@ -4522,10 +4439,10 @@ 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(94, 240) - Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLchoose.Location = New System.Drawing.Point(78, 200) + Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLchoose.Name = "cmdLchoose" - Me.cmdLchoose.Size = New System.Drawing.Size(93, 45) + Me.cmdLchoose.Size = New System.Drawing.Size(78, 38) Me.cmdLchoose.TabIndex = 151 Me.cmdLchoose.Text = "lchoose" Me.cmdLchoose.UseVisualStyleBackColor = True @@ -4534,10 +4451,10 @@ 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(3, 240) - Me.cmdLfact.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLfact.Location = New System.Drawing.Point(2, 200) + Me.cmdLfact.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLfact.Name = "cmdLfact" - Me.cmdLfact.Size = New System.Drawing.Size(93, 45) + Me.cmdLfact.Size = New System.Drawing.Size(78, 38) Me.cmdLfact.TabIndex = 150 Me.cmdLfact.Text = "lfact" Me.cmdLfact.UseVisualStyleBackColor = True @@ -4546,10 +4463,10 @@ 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(369, 240) - Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTrigamma.Location = New System.Drawing.Point(308, 200) + Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTrigamma.Name = "cmdTrigamma" - Me.cmdTrigamma.Size = New System.Drawing.Size(93, 45) + Me.cmdTrigamma.Size = New System.Drawing.Size(78, 38) Me.cmdTrigamma.TabIndex = 149 Me.cmdTrigamma.Text = "trigamma" Me.cmdTrigamma.UseVisualStyleBackColor = True @@ -4558,10 +4475,10 @@ 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(186, 196) - Me.cmdBeta.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdBeta.Location = New System.Drawing.Point(155, 163) + Me.cmdBeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdBeta.Name = "cmdBeta" - Me.cmdBeta.Size = New System.Drawing.Size(93, 45) + Me.cmdBeta.Size = New System.Drawing.Size(78, 38) Me.cmdBeta.TabIndex = 149 Me.cmdBeta.Text = "beta" Me.cmdBeta.UseVisualStyleBackColor = True @@ -4570,10 +4487,10 @@ 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(369, 196) - Me.cmdDigamma.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDigamma.Location = New System.Drawing.Point(308, 163) + Me.cmdDigamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDigamma.Name = "cmdDigamma" - Me.cmdDigamma.Size = New System.Drawing.Size(93, 45) + Me.cmdDigamma.Size = New System.Drawing.Size(78, 38) Me.cmdDigamma.TabIndex = 164 Me.cmdDigamma.Text = "digamma" Me.cmdDigamma.UseVisualStyleBackColor = True @@ -4612,11 +4529,9 @@ Partial Class ucrCalculator Me.grpTransform.Controls.Add(Me.cmdPMax) Me.grpTransform.Controls.Add(Me.cmdLead) Me.grpTransform.Controls.Add(Me.cmdLag) - Me.grpTransform.Location = New System.Drawing.Point(651, 93) - Me.grpTransform.Margin = New System.Windows.Forms.Padding(4) + Me.grpTransform.Location = New System.Drawing.Point(542, 78) Me.grpTransform.Name = "grpTransform" - Me.grpTransform.Padding = New System.Windows.Forms.Padding(4) - Me.grpTransform.Size = New System.Drawing.Size(465, 376) + Me.grpTransform.Size = New System.Drawing.Size(388, 313) Me.grpTransform.TabIndex = 189 Me.grpTransform.TabStop = False Me.grpTransform.Text = "Transform" @@ -4624,10 +4539,9 @@ Partial Class ucrCalculator 'cmdDecimals ' Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDecimals.Location = New System.Drawing.Point(3, 284) - Me.cmdDecimals.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDecimals.Location = New System.Drawing.Point(2, 237) Me.cmdDecimals.Name = "cmdDecimals" - Me.cmdDecimals.Size = New System.Drawing.Size(93, 45) + Me.cmdDecimals.Size = New System.Drawing.Size(78, 38) Me.cmdDecimals.TabIndex = 207 Me.cmdDecimals.Text = "decimals" Me.cmdDecimals.UseVisualStyleBackColor = True @@ -4635,10 +4549,9 @@ Partial Class ucrCalculator 'cmdMASSFractions ' Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMASSFractions.Location = New System.Drawing.Point(3, 240) - Me.cmdMASSFractions.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 200) Me.cmdMASSFractions.Name = "cmdMASSFractions" - Me.cmdMASSFractions.Size = New System.Drawing.Size(93, 45) + Me.cmdMASSFractions.Size = New System.Drawing.Size(78, 38) Me.cmdMASSFractions.TabIndex = 206 Me.cmdMASSFractions.Text = "fractions" Me.cmdMASSFractions.UseVisualStyleBackColor = True @@ -4646,10 +4559,9 @@ Partial Class ucrCalculator 'cmdScale ' Me.cmdScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdScale.Location = New System.Drawing.Point(3, 196) - Me.cmdScale.Margin = New System.Windows.Forms.Padding(4) + Me.cmdScale.Location = New System.Drawing.Point(2, 163) Me.cmdScale.Name = "cmdScale" - Me.cmdScale.Size = New System.Drawing.Size(93, 45) + Me.cmdScale.Size = New System.Drawing.Size(78, 38) Me.cmdScale.TabIndex = 205 Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True @@ -4658,10 +4570,9 @@ Partial Class ucrCalculator ' Me.cmdTransformRHelp.AutoSize = True Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(324, 330) - Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245) Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(136, 45) + Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38) Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform Me.cmdTransformRHelp.TabIndex = 204 Me.cmdTransformRHelp.Text = "R Help" @@ -4672,39 +4583,38 @@ Partial Class ucrCalculator 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.Name = "ContextMenuStrip1" - Me.ContextMenuStripTransform.Size = New System.Drawing.Size(133, 132) + Me.ContextMenuStripTransform.Size = New System.Drawing.Size(118, 100) ' 'BaseToolStripMenuItem ' Me.BaseToolStripMenuItem.Name = "BaseToolStripMenuItem" - Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(132, 32) + Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(117, 24) Me.BaseToolStripMenuItem.Text = "base" ' 'DplyrToolStripMenuItem ' Me.DplyrToolStripMenuItem.Name = "DplyrToolStripMenuItem" - Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(132, 32) + Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(117, 24) Me.DplyrToolStripMenuItem.Text = "dplyr" ' 'MASSToolStripMenuItem ' Me.MASSToolStripMenuItem.Name = "MASSToolStripMenuItem" - Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(132, 32) + Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(117, 24) Me.MASSToolStripMenuItem.Text = "MASS" ' 'ZooToolStripMenuItem ' Me.ZooToolStripMenuItem.Name = "ZooToolStripMenuItem" - Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(132, 32) + Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(117, 24) Me.ZooToolStripMenuItem.Text = "zoo" ' 'cmdRev ' Me.cmdRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRev.Location = New System.Drawing.Point(186, 153) - Me.cmdRev.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRev.Location = New System.Drawing.Point(155, 128) Me.cmdRev.Name = "cmdRev" - Me.cmdRev.Size = New System.Drawing.Size(93, 45) + Me.cmdRev.Size = New System.Drawing.Size(78, 38) Me.cmdRev.TabIndex = 203 Me.cmdRev.Text = "rev" Me.cmdRev.UseVisualStyleBackColor = True @@ -4712,10 +4622,9 @@ Partial Class ucrCalculator 'cmdMovProd ' Me.cmdMovProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovProd.Location = New System.Drawing.Point(186, 110) - Me.cmdMovProd.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovProd.Location = New System.Drawing.Point(155, 92) Me.cmdMovProd.Name = "cmdMovProd" - Me.cmdMovProd.Size = New System.Drawing.Size(93, 45) + Me.cmdMovProd.Size = New System.Drawing.Size(78, 38) Me.cmdMovProd.TabIndex = 202 Me.cmdMovProd.Text = "movprod" Me.cmdMovProd.UseVisualStyleBackColor = True @@ -4723,10 +4632,9 @@ Partial Class ucrCalculator 'cmdCumProd ' Me.cmdCumProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumProd.Location = New System.Drawing.Point(186, 66) - Me.cmdCumProd.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumProd.Location = New System.Drawing.Point(155, 55) Me.cmdCumProd.Name = "cmdCumProd" - Me.cmdCumProd.Size = New System.Drawing.Size(93, 45) + Me.cmdCumProd.Size = New System.Drawing.Size(78, 38) Me.cmdCumProd.TabIndex = 201 Me.cmdCumProd.Text = "cumprod" Me.cmdCumProd.UseVisualStyleBackColor = True @@ -4734,10 +4642,9 @@ Partial Class ucrCalculator 'cmdSortF ' Me.cmdSortF.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSortF.Location = New System.Drawing.Point(3, 22) - Me.cmdSortF.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSortF.Location = New System.Drawing.Point(2, 18) Me.cmdSortF.Name = "cmdSortF" - Me.cmdSortF.Size = New System.Drawing.Size(93, 45) + Me.cmdSortF.Size = New System.Drawing.Size(78, 38) Me.cmdSortF.TabIndex = 198 Me.cmdSortF.Text = "sort" Me.cmdSortF.UseVisualStyleBackColor = True @@ -4745,10 +4652,9 @@ Partial Class ucrCalculator 'cmdNasplin ' Me.cmdNasplin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNasplin.Location = New System.Drawing.Point(369, 240) - Me.cmdNasplin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNasplin.Location = New System.Drawing.Point(308, 200) Me.cmdNasplin.Name = "cmdNasplin" - Me.cmdNasplin.Size = New System.Drawing.Size(93, 45) + Me.cmdNasplin.Size = New System.Drawing.Size(78, 38) Me.cmdNasplin.TabIndex = 197 Me.cmdNasplin.Text = "nasplin" Me.cmdNasplin.UseVisualStyleBackColor = True @@ -4756,10 +4662,9 @@ Partial Class ucrCalculator 'cmdNaapprox ' Me.cmdNaapprox.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaapprox.Location = New System.Drawing.Point(278, 240) - Me.cmdNaapprox.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNaapprox.Location = New System.Drawing.Point(232, 200) Me.cmdNaapprox.Name = "cmdNaapprox" - Me.cmdNaapprox.Size = New System.Drawing.Size(93, 45) + Me.cmdNaapprox.Size = New System.Drawing.Size(78, 38) Me.cmdNaapprox.TabIndex = 196 Me.cmdNaapprox.Text = "naapprox" Me.cmdNaapprox.UseVisualStyleBackColor = True @@ -4767,10 +4672,9 @@ Partial Class ucrCalculator 'cmdNaest ' Me.cmdNaest.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaest.Location = New System.Drawing.Point(186, 240) - Me.cmdNaest.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNaest.Location = New System.Drawing.Point(155, 200) Me.cmdNaest.Name = "cmdNaest" - Me.cmdNaest.Size = New System.Drawing.Size(93, 45) + Me.cmdNaest.Size = New System.Drawing.Size(78, 38) Me.cmdNaest.TabIndex = 195 Me.cmdNaest.Text = "naest" Me.cmdNaest.UseVisualStyleBackColor = True @@ -4778,10 +4682,9 @@ Partial Class ucrCalculator 'cmdNafill ' Me.cmdNafill.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNafill.Location = New System.Drawing.Point(94, 240) - Me.cmdNafill.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNafill.Location = New System.Drawing.Point(78, 200) Me.cmdNafill.Name = "cmdNafill" - Me.cmdNafill.Size = New System.Drawing.Size(93, 45) + Me.cmdNafill.Size = New System.Drawing.Size(78, 38) Me.cmdNafill.TabIndex = 194 Me.cmdNafill.Text = "nafill" Me.cmdNafill.UseVisualStyleBackColor = True @@ -4789,10 +4692,9 @@ Partial Class ucrCalculator 'cmdMovmin ' Me.cmdMovmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovmin.Location = New System.Drawing.Point(369, 110) - Me.cmdMovmin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovmin.Location = New System.Drawing.Point(308, 92) Me.cmdMovmin.Name = "cmdMovmin" - Me.cmdMovmin.Size = New System.Drawing.Size(93, 45) + Me.cmdMovmin.Size = New System.Drawing.Size(78, 38) Me.cmdMovmin.TabIndex = 193 Me.cmdMovmin.Text = "movmin" Me.cmdMovmin.UseVisualStyleBackColor = True @@ -4800,10 +4702,9 @@ Partial Class ucrCalculator 'cmdRowRank ' Me.cmdRowRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRowRank.Location = New System.Drawing.Point(94, 196) - Me.cmdRowRank.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRowRank.Location = New System.Drawing.Point(78, 163) Me.cmdRowRank.Name = "cmdRowRank" - Me.cmdRowRank.Size = New System.Drawing.Size(93, 45) + Me.cmdRowRank.Size = New System.Drawing.Size(78, 38) Me.cmdRowRank.TabIndex = 192 Me.cmdRowRank.Text = "r_rank" Me.cmdRowRank.UseVisualStyleBackColor = True @@ -4811,10 +4712,9 @@ Partial Class ucrCalculator 'cmdDiff ' Me.cmdDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDiff.Location = New System.Drawing.Point(94, 153) - Me.cmdDiff.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDiff.Location = New System.Drawing.Point(78, 128) Me.cmdDiff.Name = "cmdDiff" - Me.cmdDiff.Size = New System.Drawing.Size(93, 45) + Me.cmdDiff.Size = New System.Drawing.Size(78, 38) Me.cmdDiff.TabIndex = 191 Me.cmdDiff.Text = "diff" Me.cmdDiff.UseVisualStyleBackColor = True @@ -4822,10 +4722,9 @@ Partial Class ucrCalculator 'cmdCumdist ' Me.cmdCumdist.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumdist.Location = New System.Drawing.Point(369, 153) - Me.cmdCumdist.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumdist.Location = New System.Drawing.Point(308, 128) Me.cmdCumdist.Name = "cmdCumdist" - Me.cmdCumdist.Size = New System.Drawing.Size(93, 45) + Me.cmdCumdist.Size = New System.Drawing.Size(78, 38) Me.cmdCumdist.TabIndex = 190 Me.cmdCumdist.Text = "cumdist" Me.cmdCumdist.UseVisualStyleBackColor = True @@ -4833,10 +4732,9 @@ Partial Class ucrCalculator 'cmdMovMean ' Me.cmdMovMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMean.Location = New System.Drawing.Point(278, 110) - Me.cmdMovMean.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovMean.Location = New System.Drawing.Point(232, 92) Me.cmdMovMean.Name = "cmdMovMean" - Me.cmdMovMean.Size = New System.Drawing.Size(93, 45) + Me.cmdMovMean.Size = New System.Drawing.Size(78, 38) Me.cmdMovMean.TabIndex = 189 Me.cmdMovMean.Text = "movmean" Me.cmdMovMean.UseVisualStyleBackColor = True @@ -4844,10 +4742,9 @@ Partial Class ucrCalculator 'cmdCumMean ' Me.cmdCumMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMean.Location = New System.Drawing.Point(278, 66) - Me.cmdCumMean.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumMean.Location = New System.Drawing.Point(232, 55) Me.cmdCumMean.Name = "cmdCumMean" - Me.cmdCumMean.Size = New System.Drawing.Size(93, 45) + Me.cmdCumMean.Size = New System.Drawing.Size(78, 38) Me.cmdCumMean.TabIndex = 188 Me.cmdCumMean.Text = "cummean" Me.cmdCumMean.UseVisualStyleBackColor = True @@ -4855,10 +4752,9 @@ Partial Class ucrCalculator 'cmdNtile ' Me.cmdNtile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNtile.Location = New System.Drawing.Point(278, 153) - Me.cmdNtile.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNtile.Location = New System.Drawing.Point(232, 128) Me.cmdNtile.Name = "cmdNtile" - Me.cmdNtile.Size = New System.Drawing.Size(93, 45) + Me.cmdNtile.Size = New System.Drawing.Size(78, 38) Me.cmdNtile.TabIndex = 187 Me.cmdNtile.Text = "ntile" Me.cmdNtile.UseVisualStyleBackColor = True @@ -4866,10 +4762,9 @@ Partial Class ucrCalculator 'cmMovMed ' Me.cmMovMed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmMovMed.Location = New System.Drawing.Point(3, 153) - Me.cmMovMed.Margin = New System.Windows.Forms.Padding(4) + Me.cmMovMed.Location = New System.Drawing.Point(2, 128) Me.cmMovMed.Name = "cmMovMed" - Me.cmMovMed.Size = New System.Drawing.Size(93, 45) + Me.cmMovMed.Size = New System.Drawing.Size(78, 38) Me.cmMovMed.TabIndex = 186 Me.cmMovMed.Text = "movmed" Me.cmMovMed.UseVisualStyleBackColor = True @@ -4877,10 +4772,9 @@ Partial Class ucrCalculator 'cmdMRank ' Me.cmdMRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMRank.Location = New System.Drawing.Point(369, 196) - Me.cmdMRank.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMRank.Location = New System.Drawing.Point(308, 163) Me.cmdMRank.Name = "cmdMRank" - Me.cmdMRank.Size = New System.Drawing.Size(93, 45) + Me.cmdMRank.Size = New System.Drawing.Size(78, 38) Me.cmdMRank.TabIndex = 185 Me.cmdMRank.Text = "m_rank" Me.cmdMRank.UseVisualStyleBackColor = True @@ -4888,10 +4782,9 @@ Partial Class ucrCalculator 'cmdDRank ' Me.cmdDRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDRank.Location = New System.Drawing.Point(278, 196) - Me.cmdDRank.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDRank.Location = New System.Drawing.Point(232, 163) Me.cmdDRank.Name = "cmdDRank" - Me.cmdDRank.Size = New System.Drawing.Size(93, 45) + Me.cmdDRank.Size = New System.Drawing.Size(78, 38) Me.cmdDRank.TabIndex = 184 Me.cmdDRank.Text = "d_rank" Me.cmdDRank.UseVisualStyleBackColor = True @@ -4899,10 +4792,9 @@ Partial Class ucrCalculator 'cmdMovMax ' Me.cmdMovMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMax.Location = New System.Drawing.Point(3, 110) - Me.cmdMovMax.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovMax.Location = New System.Drawing.Point(2, 92) Me.cmdMovMax.Name = "cmdMovMax" - Me.cmdMovMax.Size = New System.Drawing.Size(93, 45) + Me.cmdMovMax.Size = New System.Drawing.Size(78, 38) Me.cmdMovMax.TabIndex = 183 Me.cmdMovMax.Text = "movmax" Me.cmdMovMax.UseVisualStyleBackColor = True @@ -4910,10 +4802,9 @@ Partial Class ucrCalculator 'cmdMovSum ' Me.cmdMovSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovSum.Location = New System.Drawing.Point(94, 110) - Me.cmdMovSum.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMovSum.Location = New System.Drawing.Point(78, 92) Me.cmdMovSum.Name = "cmdMovSum" - Me.cmdMovSum.Size = New System.Drawing.Size(93, 45) + Me.cmdMovSum.Size = New System.Drawing.Size(78, 38) Me.cmdMovSum.TabIndex = 182 Me.cmdMovSum.Text = "movsum" Me.cmdMovSum.UseVisualStyleBackColor = True @@ -4922,10 +4813,10 @@ 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(186, 196) - Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPercentRank.Location = New System.Drawing.Point(155, 163) + Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPercentRank.Name = "cmdPercentRank" - Me.cmdPercentRank.Size = New System.Drawing.Size(93, 45) + Me.cmdPercentRank.Size = New System.Drawing.Size(78, 38) Me.cmdPercentRank.TabIndex = 181 Me.cmdPercentRank.Text = "% rank" Me.cmdPercentRank.UseVisualStyleBackColor = True @@ -4933,10 +4824,9 @@ Partial Class ucrCalculator 'cmdCumSum ' Me.cmdCumSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumSum.Location = New System.Drawing.Point(94, 66) - Me.cmdCumSum.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumSum.Location = New System.Drawing.Point(78, 55) Me.cmdCumSum.Name = "cmdCumSum" - Me.cmdCumSum.Size = New System.Drawing.Size(93, 45) + Me.cmdCumSum.Size = New System.Drawing.Size(78, 38) Me.cmdCumSum.TabIndex = 180 Me.cmdCumSum.Text = "cumsum" Me.cmdCumSum.UseVisualStyleBackColor = True @@ -4944,10 +4834,9 @@ Partial Class ucrCalculator 'cmdCumMin ' Me.cmdCumMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMin.Location = New System.Drawing.Point(369, 66) - Me.cmdCumMin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumMin.Location = New System.Drawing.Point(308, 55) Me.cmdCumMin.Name = "cmdCumMin" - Me.cmdCumMin.Size = New System.Drawing.Size(93, 45) + Me.cmdCumMin.Size = New System.Drawing.Size(78, 38) Me.cmdCumMin.TabIndex = 179 Me.cmdCumMin.Text = "cummin" Me.cmdCumMin.UseVisualStyleBackColor = True @@ -4955,10 +4844,9 @@ Partial Class ucrCalculator 'cmdCumMax ' Me.cmdCumMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMax.Location = New System.Drawing.Point(3, 66) - Me.cmdCumMax.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCumMax.Location = New System.Drawing.Point(2, 55) Me.cmdCumMax.Name = "cmdCumMax" - Me.cmdCumMax.Size = New System.Drawing.Size(93, 45) + Me.cmdCumMax.Size = New System.Drawing.Size(78, 38) Me.cmdCumMax.TabIndex = 178 Me.cmdCumMax.Text = "cummax" Me.cmdCumMax.UseVisualStyleBackColor = True @@ -4966,10 +4854,9 @@ Partial Class ucrCalculator 'cmdPMin ' Me.cmdPMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMin.Location = New System.Drawing.Point(369, 22) - Me.cmdPMin.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPMin.Location = New System.Drawing.Point(308, 18) Me.cmdPMin.Name = "cmdPMin" - Me.cmdPMin.Size = New System.Drawing.Size(93, 45) + Me.cmdPMin.Size = New System.Drawing.Size(78, 38) Me.cmdPMin.TabIndex = 177 Me.cmdPMin.Text = "pmin" Me.cmdPMin.UseVisualStyleBackColor = True @@ -4977,10 +4864,9 @@ Partial Class ucrCalculator 'cmdPMax ' Me.cmdPMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMax.Location = New System.Drawing.Point(278, 22) - Me.cmdPMax.Margin = New System.Windows.Forms.Padding(4) + Me.cmdPMax.Location = New System.Drawing.Point(232, 18) Me.cmdPMax.Name = "cmdPMax" - Me.cmdPMax.Size = New System.Drawing.Size(93, 45) + Me.cmdPMax.Size = New System.Drawing.Size(78, 38) Me.cmdPMax.TabIndex = 176 Me.cmdPMax.Text = "pmax" Me.cmdPMax.UseVisualStyleBackColor = True @@ -4988,10 +4874,9 @@ Partial Class ucrCalculator 'cmdLead ' Me.cmdLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLead.Location = New System.Drawing.Point(186, 22) - Me.cmdLead.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLead.Location = New System.Drawing.Point(155, 18) Me.cmdLead.Name = "cmdLead" - Me.cmdLead.Size = New System.Drawing.Size(93, 45) + Me.cmdLead.Size = New System.Drawing.Size(78, 38) Me.cmdLead.TabIndex = 175 Me.cmdLead.Text = "lead" Me.cmdLead.UseVisualStyleBackColor = True @@ -4999,10 +4884,9 @@ Partial Class ucrCalculator 'cmdLag ' Me.cmdLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLag.Location = New System.Drawing.Point(94, 22) - Me.cmdLag.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLag.Location = New System.Drawing.Point(78, 18) Me.cmdLag.Name = "cmdLag" - Me.cmdLag.Size = New System.Drawing.Size(93, 45) + Me.cmdLag.Size = New System.Drawing.Size(78, 38) Me.cmdLag.TabIndex = 174 Me.cmdLag.Text = "lag" Me.cmdLag.UseVisualStyleBackColor = True @@ -5040,11 +4924,11 @@ 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(650, 93) - Me.grpLogical.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpLogical.Location = New System.Drawing.Point(542, 78) + Me.grpLogical.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpLogical.Name = "grpLogical" - Me.grpLogical.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.grpLogical.Size = New System.Drawing.Size(387, 320) + Me.grpLogical.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpLogical.Size = New System.Drawing.Size(322, 276) Me.grpLogical.TabIndex = 183 Me.grpLogical.TabStop = False Me.grpLogical.Text = "Logical and Symbols" @@ -5053,10 +4937,9 @@ Partial Class ucrCalculator ' Me.cmdLogicalHelp.AutoSize = True Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(279, 280) - Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 234) Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(129, 45) + Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical Me.cmdLogicalHelp.TabIndex = 212 Me.cmdLogicalHelp.Text = "R Help" @@ -5067,27 +4950,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(126, 68) + Me.ContextMenuStripLogical.Size = New System.Drawing.Size(113, 52) ' 'LogBaseToolStripMenuItem ' Me.LogBaseToolStripMenuItem.Name = "LogBaseToolStripMenuItem" - Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(125, 32) + Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(112, 24) Me.LogBaseToolStripMenuItem.Text = "base" ' 'LogDplyrToolStripMenuItem ' Me.LogDplyrToolStripMenuItem.Name = "LogDplyrToolStripMenuItem" - Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(125, 32) + Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(112, 24) Me.LogDplyrToolStripMenuItem.Text = "dplyr" ' 'cmdFalse ' Me.cmdFalse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFalse.Location = New System.Drawing.Point(303, 63) - Me.cmdFalse.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFalse.Location = New System.Drawing.Point(252, 52) Me.cmdFalse.Name = "cmdFalse" - Me.cmdFalse.Size = New System.Drawing.Size(78, 45) + Me.cmdFalse.Size = New System.Drawing.Size(65, 38) Me.cmdFalse.TabIndex = 207 Me.cmdFalse.Text = "FALSE" Me.cmdFalse.UseVisualStyleBackColor = True @@ -5095,10 +4977,9 @@ Partial Class ucrCalculator 'cmdTrue ' Me.cmdTrue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrue.Location = New System.Drawing.Point(303, 20) - Me.cmdTrue.Margin = New System.Windows.Forms.Padding(4) + Me.cmdTrue.Location = New System.Drawing.Point(252, 17) Me.cmdTrue.Name = "cmdTrue" - Me.cmdTrue.Size = New System.Drawing.Size(78, 45) + Me.cmdTrue.Size = New System.Drawing.Size(65, 38) Me.cmdTrue.TabIndex = 206 Me.cmdTrue.Text = "TRUE" Me.cmdTrue.UseVisualStyleBackColor = True @@ -5106,9 +4987,10 @@ Partial Class ucrCalculator 'cmdDoubleSqrBrackets ' Me.cmdDoubleSqrBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDoubleSqrBrackets.Location = New System.Drawing.Point(192, 106) + Me.cmdDoubleSqrBrackets.Location = New System.Drawing.Point(160, 88) + Me.cmdDoubleSqrBrackets.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdDoubleSqrBrackets.Name = "cmdDoubleSqrBrackets" - Me.cmdDoubleSqrBrackets.Size = New System.Drawing.Size(54, 45) + Me.cmdDoubleSqrBrackets.Size = New System.Drawing.Size(45, 38) Me.cmdDoubleSqrBrackets.TabIndex = 205 Me.cmdDoubleSqrBrackets.Text = "[[ ]]" Me.cmdDoubleSqrBrackets.UseVisualStyleBackColor = True @@ -5116,10 +4998,10 @@ Partial Class ucrCalculator 'cmdIn ' Me.cmdIn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIn.Location = New System.Drawing.Point(192, 150) - Me.cmdIn.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdIn.Location = New System.Drawing.Point(160, 125) + Me.cmdIn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdIn.Name = "cmdIn" - Me.cmdIn.Size = New System.Drawing.Size(98, 45) + Me.cmdIn.Size = New System.Drawing.Size(82, 38) Me.cmdIn.TabIndex = 204 Me.cmdIn.Text = "%in%" Me.cmdIn.UseVisualStyleBackColor = True @@ -5127,10 +5009,9 @@ Partial Class ucrCalculator 'cmdWhich ' Me.cmdWhich.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWhich.Location = New System.Drawing.Point(288, 150) - Me.cmdWhich.Margin = New System.Windows.Forms.Padding(4) + Me.cmdWhich.Location = New System.Drawing.Point(240, 125) Me.cmdWhich.Name = "cmdWhich" - Me.cmdWhich.Size = New System.Drawing.Size(93, 45) + Me.cmdWhich.Size = New System.Drawing.Size(78, 38) Me.cmdWhich.TabIndex = 203 Me.cmdWhich.Text = "which" Me.cmdWhich.UseVisualStyleBackColor = True @@ -5138,10 +5019,10 @@ Partial Class ucrCalculator 'cmdNA ' Me.cmdNA.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNA.Location = New System.Drawing.Point(244, 63) - Me.cmdNA.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdNA.Location = New System.Drawing.Point(203, 52) + Me.cmdNA.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdNA.Name = "cmdNA" - Me.cmdNA.Size = New System.Drawing.Size(60, 45) + Me.cmdNA.Size = New System.Drawing.Size(50, 38) Me.cmdNA.TabIndex = 202 Me.cmdNA.Text = "NA" Me.cmdNA.UseVisualStyleBackColor = True @@ -5149,10 +5030,9 @@ Partial Class ucrCalculator 'cmdNear ' Me.cmdNear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNear.Location = New System.Drawing.Point(288, 237) - Me.cmdNear.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNear.Location = New System.Drawing.Point(240, 198) Me.cmdNear.Name = "cmdNear" - Me.cmdNear.Size = New System.Drawing.Size(93, 45) + Me.cmdNear.Size = New System.Drawing.Size(78, 38) Me.cmdNear.TabIndex = 201 Me.cmdNear.Text = "near" Me.cmdNear.UseVisualStyleBackColor = True @@ -5160,10 +5040,9 @@ Partial Class ucrCalculator 'cmdBetween ' Me.cmdBetween.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBetween.Location = New System.Drawing.Point(288, 194) - Me.cmdBetween.Margin = New System.Windows.Forms.Padding(4) + Me.cmdBetween.Location = New System.Drawing.Point(240, 162) Me.cmdBetween.Name = "cmdBetween" - Me.cmdBetween.Size = New System.Drawing.Size(93, 45) + Me.cmdBetween.Size = New System.Drawing.Size(78, 38) Me.cmdBetween.TabIndex = 200 Me.cmdBetween.Text = "between" Me.cmdBetween.UseVisualStyleBackColor = True @@ -5171,10 +5050,9 @@ Partial Class ucrCalculator 'cmdIsNa ' Me.cmdIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIsNa.Location = New System.Drawing.Point(6, 237) - Me.cmdIsNa.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIsNa.Location = New System.Drawing.Point(5, 198) Me.cmdIsNa.Name = "cmdIsNa" - Me.cmdIsNa.Size = New System.Drawing.Size(93, 45) + Me.cmdIsNa.Size = New System.Drawing.Size(78, 38) Me.cmdIsNa.TabIndex = 195 Me.cmdIsNa.Text = "is.na" Me.cmdIsNa.UseVisualStyleBackColor = True @@ -5182,10 +5060,9 @@ Partial Class ucrCalculator 'cmdNotIsNa ' Me.cmdNotIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotIsNa.Location = New System.Drawing.Point(98, 237) - Me.cmdNotIsNa.Margin = New System.Windows.Forms.Padding(4) + Me.cmdNotIsNa.Location = New System.Drawing.Point(82, 198) Me.cmdNotIsNa.Name = "cmdNotIsNa" - Me.cmdNotIsNa.Size = New System.Drawing.Size(94, 45) + Me.cmdNotIsNa.Size = New System.Drawing.Size(78, 38) Me.cmdNotIsNa.TabIndex = 194 Me.cmdNotIsNa.Text = "!is.na" Me.cmdNotIsNa.UseVisualStyleBackColor = True @@ -5193,10 +5070,9 @@ Partial Class ucrCalculator 'cmdDuplicate ' Me.cmdDuplicate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDuplicate.Location = New System.Drawing.Point(192, 237) - Me.cmdDuplicate.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDuplicate.Location = New System.Drawing.Point(160, 198) Me.cmdDuplicate.Name = "cmdDuplicate" - Me.cmdDuplicate.Size = New System.Drawing.Size(98, 45) + Me.cmdDuplicate.Size = New System.Drawing.Size(82, 38) Me.cmdDuplicate.TabIndex = 193 Me.cmdDuplicate.Text = "duplicated" Me.cmdDuplicate.UseVisualStyleBackColor = True @@ -5204,10 +5080,9 @@ Partial Class ucrCalculator 'cmdIfelse ' Me.cmdIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIfelse.Location = New System.Drawing.Point(6, 194) - Me.cmdIfelse.Margin = New System.Windows.Forms.Padding(4) + Me.cmdIfelse.Location = New System.Drawing.Point(5, 162) Me.cmdIfelse.Name = "cmdIfelse" - Me.cmdIfelse.Size = New System.Drawing.Size(93, 45) + Me.cmdIfelse.Size = New System.Drawing.Size(78, 38) Me.cmdIfelse.TabIndex = 192 Me.cmdIfelse.Text = "ifelse" Me.cmdIfelse.UseVisualStyleBackColor = True @@ -5215,10 +5090,9 @@ Partial Class ucrCalculator 'cmdmatch ' Me.cmdmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmatch.Location = New System.Drawing.Point(98, 194) - Me.cmdmatch.Margin = New System.Windows.Forms.Padding(4) + Me.cmdmatch.Location = New System.Drawing.Point(82, 162) Me.cmdmatch.Name = "cmdmatch" - Me.cmdmatch.Size = New System.Drawing.Size(94, 45) + Me.cmdmatch.Size = New System.Drawing.Size(78, 38) Me.cmdmatch.TabIndex = 191 Me.cmdmatch.Text = "match" Me.cmdmatch.UseVisualStyleBackColor = True @@ -5226,10 +5100,9 @@ Partial Class ucrCalculator 'cmdwhen ' Me.cmdwhen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhen.Location = New System.Drawing.Point(192, 194) - Me.cmdwhen.Margin = New System.Windows.Forms.Padding(4) + Me.cmdwhen.Location = New System.Drawing.Point(160, 162) Me.cmdwhen.Name = "cmdwhen" - Me.cmdwhen.Size = New System.Drawing.Size(98, 45) + Me.cmdwhen.Size = New System.Drawing.Size(82, 38) Me.cmdwhen.TabIndex = 190 Me.cmdwhen.Text = "when" Me.cmdwhen.UseVisualStyleBackColor = True @@ -5237,10 +5110,10 @@ Partial Class ucrCalculator 'cmdOpeningBracket ' Me.cmdOpeningBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpeningBracket.Location = New System.Drawing.Point(244, 106) - Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdOpeningBracket.Location = New System.Drawing.Point(203, 88) + Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdOpeningBracket.Name = "cmdOpeningBracket" - Me.cmdOpeningBracket.Size = New System.Drawing.Size(60, 45) + Me.cmdOpeningBracket.Size = New System.Drawing.Size(50, 38) Me.cmdOpeningBracket.TabIndex = 139 Me.cmdOpeningBracket.Text = "(" Me.cmdOpeningBracket.UseVisualStyleBackColor = True @@ -5249,10 +5122,10 @@ 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(64, 106) - Me.cmdColon.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdColon.Location = New System.Drawing.Point(53, 88) + Me.cmdColon.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdColon.Name = "cmdColon" - Me.cmdColon.Size = New System.Drawing.Size(60, 45) + Me.cmdColon.Size = New System.Drawing.Size(50, 38) Me.cmdColon.TabIndex = 139 Me.cmdColon.Text = ":" Me.cmdColon.UseVisualStyleBackColor = True @@ -5260,10 +5133,10 @@ Partial Class ucrCalculator 'cmdGreaterOrEqualsTo ' Me.cmdGreaterOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(192, 20) - Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(160, 17) + Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdGreaterOrEqualsTo.Name = "cmdGreaterOrEqualsTo" - Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(54, 45) + Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(45, 38) Me.cmdGreaterOrEqualsTo.TabIndex = 138 Me.cmdGreaterOrEqualsTo.Text = ">=" Me.cmdGreaterOrEqualsTo.UseVisualStyleBackColor = True @@ -5271,10 +5144,10 @@ Partial Class ucrCalculator 'cmdClossingBracket ' Me.cmdClossingBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClossingBracket.Location = New System.Drawing.Point(303, 106) - Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdClossingBracket.Location = New System.Drawing.Point(252, 88) + Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdClossingBracket.Name = "cmdClossingBracket" - Me.cmdClossingBracket.Size = New System.Drawing.Size(78, 45) + Me.cmdClossingBracket.Size = New System.Drawing.Size(65, 38) Me.cmdClossingBracket.TabIndex = 137 Me.cmdClossingBracket.Tag = "" Me.cmdClossingBracket.Text = ")" @@ -5284,10 +5157,10 @@ 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(192, 63) - Me.cmdAnd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAnd.Location = New System.Drawing.Point(160, 52) + Me.cmdAnd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAnd.Name = "cmdAnd" - Me.cmdAnd.Size = New System.Drawing.Size(54, 45) + Me.cmdAnd.Size = New System.Drawing.Size(45, 38) Me.cmdAnd.TabIndex = 137 Me.cmdAnd.Tag = "And" Me.cmdAnd.Text = "&&" @@ -5297,10 +5170,10 @@ 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(244, 20) - Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdQuotes.Location = New System.Drawing.Point(203, 17) + Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQuotes.Name = "cmdQuotes" - Me.cmdQuotes.Size = New System.Drawing.Size(60, 45) + Me.cmdQuotes.Size = New System.Drawing.Size(50, 38) Me.cmdQuotes.TabIndex = 135 Me.cmdQuotes.Text = """ """ Me.cmdQuotes.UseVisualStyleBackColor = True @@ -5308,9 +5181,10 @@ Partial Class ucrCalculator 'cmdSquareBrackets ' Me.cmdSquareBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSquareBrackets.Location = New System.Drawing.Point(123, 106) + Me.cmdSquareBrackets.Location = New System.Drawing.Point(102, 88) + Me.cmdSquareBrackets.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdSquareBrackets.Name = "cmdSquareBrackets" - Me.cmdSquareBrackets.Size = New System.Drawing.Size(69, 45) + Me.cmdSquareBrackets.Size = New System.Drawing.Size(58, 38) Me.cmdSquareBrackets.TabIndex = 134 Me.cmdSquareBrackets.Text = "[ ]" Me.cmdSquareBrackets.UseVisualStyleBackColor = True @@ -5318,10 +5192,10 @@ Partial Class ucrCalculator 'cmdIntegerDivision ' Me.cmdIntegerDivision.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIntegerDivision.Location = New System.Drawing.Point(98, 150) - Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdIntegerDivision.Location = New System.Drawing.Point(82, 125) + Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdIntegerDivision.Name = "cmdIntegerDivision" - Me.cmdIntegerDivision.Size = New System.Drawing.Size(94, 45) + Me.cmdIntegerDivision.Size = New System.Drawing.Size(78, 38) Me.cmdIntegerDivision.TabIndex = 135 Me.cmdIntegerDivision.Text = "div (%/%)" Me.cmdIntegerDivision.UseVisualStyleBackColor = True @@ -5329,9 +5203,10 @@ Partial Class ucrCalculator 'cmdModulas ' Me.cmdModulas.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdModulas.Location = New System.Drawing.Point(6, 150) + Me.cmdModulas.Location = New System.Drawing.Point(5, 125) + Me.cmdModulas.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdModulas.Name = "cmdModulas" - Me.cmdModulas.Size = New System.Drawing.Size(93, 45) + Me.cmdModulas.Size = New System.Drawing.Size(78, 38) Me.cmdModulas.TabIndex = 134 Me.cmdModulas.Text = "mod (%%)" Me.cmdModulas.UseVisualStyleBackColor = True @@ -5339,10 +5214,10 @@ Partial Class ucrCalculator 'cmdGreater ' Me.cmdGreater.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreater.Location = New System.Drawing.Point(123, 20) - Me.cmdGreater.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdGreater.Location = New System.Drawing.Point(102, 17) + Me.cmdGreater.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdGreater.Name = "cmdGreater" - Me.cmdGreater.Size = New System.Drawing.Size(69, 45) + Me.cmdGreater.Size = New System.Drawing.Size(58, 38) Me.cmdGreater.TabIndex = 133 Me.cmdGreater.Text = ">" Me.cmdGreater.UseVisualStyleBackColor = True @@ -5350,10 +5225,10 @@ Partial Class ucrCalculator 'cmdLesserOrEqualsTo ' Me.cmdLesserOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(64, 20) - Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(53, 17) + Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLesserOrEqualsTo.Name = "cmdLesserOrEqualsTo" - Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(60, 45) + Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(50, 38) Me.cmdLesserOrEqualsTo.TabIndex = 132 Me.cmdLesserOrEqualsTo.Text = "<=" Me.cmdLesserOrEqualsTo.UseVisualStyleBackColor = True @@ -5361,9 +5236,10 @@ Partial Class ucrCalculator 'cmdLesser ' Me.cmdLesser.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesser.Location = New System.Drawing.Point(6, 20) + Me.cmdLesser.Location = New System.Drawing.Point(5, 17) + Me.cmdLesser.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdLesser.Name = "cmdLesser" - Me.cmdLesser.Size = New System.Drawing.Size(58, 45) + Me.cmdLesser.Size = New System.Drawing.Size(48, 38) Me.cmdLesser.TabIndex = 131 Me.cmdLesser.Text = "<" Me.cmdLesser.UseVisualStyleBackColor = True @@ -5371,10 +5247,10 @@ Partial Class ucrCalculator 'cmdOr ' Me.cmdOr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr.Location = New System.Drawing.Point(123, 63) - Me.cmdOr.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdOr.Location = New System.Drawing.Point(102, 52) + Me.cmdOr.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdOr.Name = "cmdOr" - Me.cmdOr.Size = New System.Drawing.Size(69, 45) + Me.cmdOr.Size = New System.Drawing.Size(58, 38) Me.cmdOr.TabIndex = 130 Me.cmdOr.Text = "|" Me.cmdOr.UseVisualStyleBackColor = True @@ -5383,10 +5259,10 @@ 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(6, 106) - Me.cmdNot.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdNot.Location = New System.Drawing.Point(5, 88) + Me.cmdNot.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdNot.Name = "cmdNot" - Me.cmdNot.Size = New System.Drawing.Size(58, 45) + Me.cmdNot.Size = New System.Drawing.Size(48, 38) Me.cmdNot.TabIndex = 129 Me.cmdNot.Text = "!" Me.cmdNot.UseVisualStyleBackColor = True @@ -5394,10 +5270,10 @@ Partial Class ucrCalculator 'cmdNotEqualsTo ' Me.cmdNotEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotEqualsTo.Location = New System.Drawing.Point(64, 63) - Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdNotEqualsTo.Location = New System.Drawing.Point(53, 52) + Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdNotEqualsTo.Name = "cmdNotEqualsTo" - Me.cmdNotEqualsTo.Size = New System.Drawing.Size(60, 45) + Me.cmdNotEqualsTo.Size = New System.Drawing.Size(50, 38) Me.cmdNotEqualsTo.TabIndex = 128 Me.cmdNotEqualsTo.Text = "!=" Me.cmdNotEqualsTo.UseVisualStyleBackColor = True @@ -5405,9 +5281,10 @@ Partial Class ucrCalculator 'cmdEquivalent ' Me.cmdEquivalent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEquivalent.Location = New System.Drawing.Point(6, 63) + Me.cmdEquivalent.Location = New System.Drawing.Point(5, 52) + Me.cmdEquivalent.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdEquivalent.Name = "cmdEquivalent" - Me.cmdEquivalent.Size = New System.Drawing.Size(58, 45) + Me.cmdEquivalent.Size = New System.Drawing.Size(48, 38) Me.cmdEquivalent.TabIndex = 127 Me.cmdEquivalent.Text = "==" Me.cmdEquivalent.UseVisualStyleBackColor = True @@ -5427,7 +5304,6 @@ Partial Class ucrCalculator Me.grpTestString.Controls.Add(Me.cmdLocate2) Me.grpTestString.Controls.Add(Me.cmdExtract2) Me.grpTestString.Controls.Add(Me.cmdEncodeb) - Me.grpTestString.Controls.Add(Me.cmdSquishb) Me.grpTestString.Controls.Add(Me.cmdSub) Me.grpTestString.Controls.Add(Me.cmdCombine) Me.grpTestString.Controls.Add(Me.cmdDetect) @@ -5441,12 +5317,11 @@ Partial Class ucrCalculator Me.grpTestString.Controls.Add(Me.cmdExtract) Me.grpTestString.Controls.Add(Me.cmdCountstrings) 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(651, 92) - Me.grpTestString.Margin = New System.Windows.Forms.Padding(4) + Me.grpTestString.Location = New System.Drawing.Point(542, 77) Me.grpTestString.Name = "grpTestString" - Me.grpTestString.Padding = New System.Windows.Forms.Padding(4) - Me.grpTestString.Size = New System.Drawing.Size(454, 246) + Me.grpTestString.Size = New System.Drawing.Size(378, 205) Me.grpTestString.TabIndex = 186 Me.grpTestString.TabStop = False Me.grpTestString.Text = "Text/Strings (Character Columns)" @@ -5455,10 +5330,10 @@ 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(369, 153) - Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdReverseStr.Location = New System.Drawing.Point(308, 128) + Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReverseStr.Name = "cmdReverseStr" - Me.cmdReverseStr.Size = New System.Drawing.Size(78, 45) + Me.cmdReverseStr.Size = New System.Drawing.Size(65, 38) Me.cmdReverseStr.TabIndex = 165 Me.cmdReverseStr.Tag = "" Me.cmdReverseStr.Text = "reverse" @@ -5467,10 +5342,9 @@ Partial Class ucrCalculator 'cmdEnds ' Me.cmdEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnds.Location = New System.Drawing.Point(180, 110) - Me.cmdEnds.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEnds.Location = New System.Drawing.Point(150, 92) Me.cmdEnds.Name = "cmdEnds" - Me.cmdEnds.Size = New System.Drawing.Size(90, 45) + Me.cmdEnds.Size = New System.Drawing.Size(75, 38) Me.cmdEnds.TabIndex = 164 Me.cmdEnds.Text = "ends" Me.cmdEnds.UseVisualStyleBackColor = True @@ -5479,10 +5353,10 @@ 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(369, 196) - Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTrunck.Location = New System.Drawing.Point(308, 163) + Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTrunck.Name = "cmdTrunck" - Me.cmdTrunck.Size = New System.Drawing.Size(78, 45) + Me.cmdTrunck.Size = New System.Drawing.Size(65, 38) Me.cmdTrunck.TabIndex = 163 Me.cmdTrunck.Text = "trunc " Me.cmdTrunck.UseVisualStyleBackColor = True @@ -5491,10 +5365,10 @@ 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(242, 153) - Me.cmdLenth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLenth.Location = New System.Drawing.Point(202, 128) + Me.cmdLenth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLenth.Name = "cmdLenth" - Me.cmdLenth.Size = New System.Drawing.Size(66, 45) + Me.cmdLenth.Size = New System.Drawing.Size(55, 38) Me.cmdLenth.TabIndex = 162 Me.cmdLenth.Text = "length" Me.cmdLenth.UseVisualStyleBackColor = True @@ -5503,10 +5377,10 @@ 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(306, 153) - Me.cmdGlue.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdGlue.Location = New System.Drawing.Point(255, 128) + Me.cmdGlue.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdGlue.Name = "cmdGlue" - Me.cmdGlue.Size = New System.Drawing.Size(64, 45) + Me.cmdGlue.Size = New System.Drawing.Size(53, 38) Me.cmdGlue.TabIndex = 161 Me.cmdGlue.Text = "glue" Me.cmdGlue.UseVisualStyleBackColor = True @@ -5515,10 +5389,10 @@ 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(302, 196) - Me.cmdStarts.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdStarts.Location = New System.Drawing.Point(252, 163) + Me.cmdStarts.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdStarts.Name = "cmdStarts" - Me.cmdStarts.Size = New System.Drawing.Size(69, 45) + Me.cmdStarts.Size = New System.Drawing.Size(58, 38) Me.cmdStarts.TabIndex = 160 Me.cmdStarts.Tag = "" Me.cmdStarts.Text = "starts" @@ -5528,10 +5402,10 @@ 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(165, 196) - Me.cmdReplace2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdReplace2.Location = New System.Drawing.Point(138, 163) + Me.cmdReplace2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReplace2.Name = "cmdReplace2" - Me.cmdReplace2.Size = New System.Drawing.Size(90, 45) + Me.cmdReplace2.Size = New System.Drawing.Size(75, 38) Me.cmdReplace2.TabIndex = 159 Me.cmdReplace2.Tag = "" Me.cmdReplace2.Text = "replace2" @@ -5541,10 +5415,10 @@ 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(92, 196) - Me.cmdReplace.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdReplace.Location = New System.Drawing.Point(77, 163) + Me.cmdReplace.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReplace.Name = "cmdReplace" - Me.cmdReplace.Size = New System.Drawing.Size(75, 45) + Me.cmdReplace.Size = New System.Drawing.Size(62, 38) Me.cmdReplace.TabIndex = 158 Me.cmdReplace.Tag = "" Me.cmdReplace.Text = "replace" @@ -5554,10 +5428,10 @@ 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(3, 196) - Me.cmdRemove2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRemove2.Location = New System.Drawing.Point(2, 163) + Me.cmdRemove2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRemove2.Name = "cmdRemove2" - Me.cmdRemove2.Size = New System.Drawing.Size(90, 45) + Me.cmdRemove2.Size = New System.Drawing.Size(75, 38) Me.cmdRemove2.TabIndex = 157 Me.cmdRemove2.Tag = "" Me.cmdRemove2.Text = "remove2" @@ -5567,10 +5441,10 @@ 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(165, 153) - Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdRemove1.Location = New System.Drawing.Point(138, 128) + Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdRemove1.Name = "cmdRemove1" - Me.cmdRemove1.Size = New System.Drawing.Size(78, 45) + Me.cmdRemove1.Size = New System.Drawing.Size(65, 38) Me.cmdRemove1.TabIndex = 156 Me.cmdRemove1.Tag = "" Me.cmdRemove1.Text = "remove" @@ -5580,10 +5454,10 @@ 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(92, 153) - Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLocate2.Location = New System.Drawing.Point(77, 128) + Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLocate2.Name = "cmdLocate2" - Me.cmdLocate2.Size = New System.Drawing.Size(75, 45) + Me.cmdLocate2.Size = New System.Drawing.Size(62, 38) Me.cmdLocate2.TabIndex = 155 Me.cmdLocate2.Tag = "" Me.cmdLocate2.Text = "locate2" @@ -5593,10 +5467,10 @@ 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(357, 110) - Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdExtract2.Location = New System.Drawing.Point(298, 92) + Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdExtract2.Name = "cmdExtract2" - Me.cmdExtract2.Size = New System.Drawing.Size(90, 45) + Me.cmdExtract2.Size = New System.Drawing.Size(75, 38) Me.cmdExtract2.TabIndex = 154 Me.cmdExtract2.Tag = "" Me.cmdExtract2.Text = "extract2" @@ -5606,10 +5480,10 @@ 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(357, 66) - Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdEncodeb.Location = New System.Drawing.Point(298, 55) + Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdEncodeb.Name = "cmdEncodeb" - Me.cmdEncodeb.Size = New System.Drawing.Size(90, 45) + Me.cmdEncodeb.Size = New System.Drawing.Size(75, 38) Me.cmdEncodeb.TabIndex = 151 Me.cmdEncodeb.Text = "encode " Me.cmdEncodeb.UseVisualStyleBackColor = True @@ -5618,10 +5492,10 @@ 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(357, 22) - Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSquishb.Location = New System.Drawing.Point(298, 18) + Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSquishb.Name = "cmdSquishb" - Me.cmdSquishb.Size = New System.Drawing.Size(90, 45) + Me.cmdSquishb.Size = New System.Drawing.Size(75, 38) Me.cmdSquishb.TabIndex = 150 Me.cmdSquishb.Text = "squish " Me.cmdSquishb.UseVisualStyleBackColor = True @@ -5630,10 +5504,10 @@ 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(254, 196) - Me.cmdSub.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSub.Location = New System.Drawing.Point(212, 163) + Me.cmdSub.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSub.Name = "cmdSub" - Me.cmdSub.Size = New System.Drawing.Size(50, 45) + Me.cmdSub.Size = New System.Drawing.Size(42, 38) Me.cmdSub.TabIndex = 149 Me.cmdSub.Tag = "" Me.cmdSub.Text = "sub" @@ -5643,10 +5517,10 @@ 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(268, 66) - Me.cmdCombine.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCombine.Location = New System.Drawing.Point(223, 55) + Me.cmdCombine.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCombine.Name = "cmdCombine" - Me.cmdCombine.Size = New System.Drawing.Size(90, 45) + Me.cmdCombine.Size = New System.Drawing.Size(75, 38) Me.cmdCombine.TabIndex = 148 Me.cmdCombine.Text = "combine" Me.cmdCombine.UseVisualStyleBackColor = True @@ -5655,10 +5529,10 @@ 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(92, 110) - Me.cmdDetect.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdDetect.Location = New System.Drawing.Point(77, 92) + Me.cmdDetect.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdDetect.Name = "cmdDetect" - Me.cmdDetect.Size = New System.Drawing.Size(90, 45) + Me.cmdDetect.Size = New System.Drawing.Size(75, 38) Me.cmdDetect.TabIndex = 147 Me.cmdDetect.Tag = "" Me.cmdDetect.Text = "detect" @@ -5668,10 +5542,10 @@ 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(268, 22) - Me.cmdTrim.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTrim.Location = New System.Drawing.Point(223, 18) + Me.cmdTrim.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTrim.Name = "cmdTrim" - Me.cmdTrim.Size = New System.Drawing.Size(90, 45) + Me.cmdTrim.Size = New System.Drawing.Size(75, 38) Me.cmdTrim.TabIndex = 146 Me.cmdTrim.Text = "trim" Me.cmdTrim.UseVisualStyleBackColor = True @@ -5680,10 +5554,10 @@ 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(180, 22) - Me.cmdTitle.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdTitle.Location = New System.Drawing.Point(150, 18) + Me.cmdTitle.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdTitle.Name = "cmdTitle" - Me.cmdTitle.Size = New System.Drawing.Size(90, 45) + Me.cmdTitle.Size = New System.Drawing.Size(75, 38) Me.cmdTitle.TabIndex = 142 Me.cmdTitle.Text = "title" Me.cmdTitle.UseVisualStyleBackColor = True @@ -5692,10 +5566,10 @@ 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(92, 22) - Me.cmdLower.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLower.Location = New System.Drawing.Point(77, 18) + Me.cmdLower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLower.Name = "cmdLower" - Me.cmdLower.Size = New System.Drawing.Size(90, 45) + Me.cmdLower.Size = New System.Drawing.Size(75, 38) Me.cmdLower.TabIndex = 141 Me.cmdLower.Text = "lower" Me.cmdLower.UseVisualStyleBackColor = True @@ -5704,10 +5578,10 @@ 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(3, 22) - Me.cmdUpper.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdUpper.Location = New System.Drawing.Point(2, 18) + Me.cmdUpper.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdUpper.Name = "cmdUpper" - Me.cmdUpper.Size = New System.Drawing.Size(90, 45) + Me.cmdUpper.Size = New System.Drawing.Size(75, 38) Me.cmdUpper.TabIndex = 140 Me.cmdUpper.Text = "upper" Me.cmdUpper.UseVisualStyleBackColor = True @@ -5716,10 +5590,10 @@ 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(180, 66) - Me.cmdSort.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdSort.Location = New System.Drawing.Point(150, 55) + Me.cmdSort.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdSort.Name = "cmdSort" - Me.cmdSort.Size = New System.Drawing.Size(90, 45) + Me.cmdSort.Size = New System.Drawing.Size(75, 38) Me.cmdSort.TabIndex = 139 Me.cmdSort.Text = "sort" Me.cmdSort.UseVisualStyleBackColor = True @@ -5728,10 +5602,10 @@ 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(92, 66) - Me.cmdOrder.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdOrder.Location = New System.Drawing.Point(77, 55) + Me.cmdOrder.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdOrder.Name = "cmdOrder" - Me.cmdOrder.Size = New System.Drawing.Size(90, 45) + Me.cmdOrder.Size = New System.Drawing.Size(75, 38) Me.cmdOrder.TabIndex = 138 Me.cmdOrder.Text = "order" Me.cmdOrder.UseVisualStyleBackColor = True @@ -5740,10 +5614,10 @@ 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(3, 66) - Me.cmdPad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdPad.Location = New System.Drawing.Point(2, 55) + Me.cmdPad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPad.Name = "cmdPad" - Me.cmdPad.Size = New System.Drawing.Size(90, 45) + Me.cmdPad.Size = New System.Drawing.Size(75, 38) Me.cmdPad.TabIndex = 137 Me.cmdPad.Text = "pad" Me.cmdPad.UseVisualStyleBackColor = True @@ -5752,10 +5626,10 @@ 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(268, 110) - Me.cmdExtract.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdExtract.Location = New System.Drawing.Point(223, 92) + Me.cmdExtract.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdExtract.Name = "cmdExtract" - Me.cmdExtract.Size = New System.Drawing.Size(90, 45) + Me.cmdExtract.Size = New System.Drawing.Size(75, 38) Me.cmdExtract.TabIndex = 136 Me.cmdExtract.Text = "extract" Me.cmdExtract.UseVisualStyleBackColor = True @@ -5764,10 +5638,10 @@ 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(3, 110) - Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdCountstrings.Location = New System.Drawing.Point(2, 92) + Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCountstrings.Name = "cmdCountstrings" - Me.cmdCountstrings.Size = New System.Drawing.Size(90, 45) + Me.cmdCountstrings.Size = New System.Drawing.Size(75, 38) Me.cmdCountstrings.TabIndex = 134 Me.cmdCountstrings.Text = "count" Me.cmdCountstrings.UseVisualStyleBackColor = True @@ -5776,10 +5650,10 @@ 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(3, 153) - Me.cmdLocate.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdLocate.Location = New System.Drawing.Point(2, 128) + Me.cmdLocate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdLocate.Name = "cmdLocate" - Me.cmdLocate.Size = New System.Drawing.Size(90, 45) + Me.cmdLocate.Size = New System.Drawing.Size(75, 38) Me.cmdLocate.TabIndex = 133 Me.cmdLocate.Text = "locate" Me.cmdLocate.UseVisualStyleBackColor = True @@ -5809,9 +5683,11 @@ 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(651, 92) + Me.grpCircular.Location = New System.Drawing.Point(542, 77) + Me.grpCircular.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.grpCircular.Name = "grpCircular" - Me.grpCircular.Size = New System.Drawing.Size(372, 252) + Me.grpCircular.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpCircular.Size = New System.Drawing.Size(310, 217) Me.grpCircular.TabIndex = 192 Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" @@ -5820,10 +5696,9 @@ Partial Class ucrCalculator ' Me.cmdCircularHelp.AutoSize = True Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(261, 213) - Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(129, 45) + Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular Me.cmdCircularHelp.TabIndex = 212 Me.cmdCircularHelp.Text = "R Help" @@ -5834,20 +5709,21 @@ 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(140, 36) + Me.ContextMenuStripCircular.Size = New System.Drawing.Size(127, 28) ' 'CircularToolStripMenuItem ' Me.CircularToolStripMenuItem.Name = "CircularToolStripMenuItem" - Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(139, 32) + Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(126, 24) Me.CircularToolStripMenuItem.Text = "circular" ' 'cmdCircular ' Me.cmdCircular.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircular.Location = New System.Drawing.Point(3, 27) + Me.cmdCircular.Location = New System.Drawing.Point(2, 22) + Me.cmdCircular.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircular.Name = "cmdCircular" - Me.cmdCircular.Size = New System.Drawing.Size(90, 48) + Me.cmdCircular.Size = New System.Drawing.Size(75, 40) Me.cmdCircular.TabIndex = 15 Me.cmdCircular.Text = "circular" Me.cmdCircular.UseVisualStyleBackColor = True @@ -5855,9 +5731,10 @@ Partial Class ucrCalculator 'cmdCircQuantile ' Me.cmdCircQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQuantile.Location = New System.Drawing.Point(180, 120) + Me.cmdCircQuantile.Location = New System.Drawing.Point(150, 100) + Me.cmdCircQuantile.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircQuantile.Name = "cmdCircQuantile" - Me.cmdCircQuantile.Size = New System.Drawing.Size(90, 48) + Me.cmdCircQuantile.Size = New System.Drawing.Size(75, 40) Me.cmdCircQuantile.TabIndex = 13 Me.cmdCircQuantile.Text = "quantile" Me.cmdCircQuantile.UseVisualStyleBackColor = True @@ -5865,9 +5742,10 @@ Partial Class ucrCalculator 'cmdCircMax ' Me.cmdCircMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMax.Location = New System.Drawing.Point(268, 166) + Me.cmdCircMax.Location = New System.Drawing.Point(223, 138) + Me.cmdCircMax.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircMax.Name = "cmdCircMax" - Me.cmdCircMax.Size = New System.Drawing.Size(98, 48) + Me.cmdCircMax.Size = New System.Drawing.Size(82, 40) Me.cmdCircMax.TabIndex = 10 Me.cmdCircMax.Text = "max" Me.cmdCircMax.UseVisualStyleBackColor = True @@ -5875,9 +5753,10 @@ Partial Class ucrCalculator 'cmdA1 ' Me.cmdA1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdA1.Location = New System.Drawing.Point(3, 120) + Me.cmdA1.Location = New System.Drawing.Point(2, 100) + Me.cmdA1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdA1.Name = "cmdA1" - Me.cmdA1.Size = New System.Drawing.Size(90, 48) + Me.cmdA1.Size = New System.Drawing.Size(75, 40) Me.cmdA1.TabIndex = 8 Me.cmdA1.Text = "A1" Me.cmdA1.UseVisualStyleBackColor = True @@ -5885,9 +5764,10 @@ Partial Class ucrCalculator 'cmdAngVar ' Me.cmdAngVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngVar.Location = New System.Drawing.Point(92, 120) + Me.cmdAngVar.Location = New System.Drawing.Point(77, 100) + Me.cmdAngVar.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdAngVar.Name = "cmdAngVar" - Me.cmdAngVar.Size = New System.Drawing.Size(90, 48) + Me.cmdAngVar.Size = New System.Drawing.Size(75, 40) Me.cmdAngVar.TabIndex = 6 Me.cmdAngVar.Text = "ang.var" Me.cmdAngVar.UseVisualStyleBackColor = True @@ -5895,9 +5775,10 @@ Partial Class ucrCalculator 'cmdCircRho ' Me.cmdCircRho.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRho.Location = New System.Drawing.Point(268, 120) + Me.cmdCircRho.Location = New System.Drawing.Point(223, 100) + Me.cmdCircRho.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircRho.Name = "cmdCircRho" - Me.cmdCircRho.Size = New System.Drawing.Size(98, 48) + Me.cmdCircRho.Size = New System.Drawing.Size(82, 40) Me.cmdCircRho.TabIndex = 14 Me.cmdCircRho.Text = "rho" Me.cmdCircRho.UseVisualStyleBackColor = True @@ -5905,9 +5786,10 @@ Partial Class ucrCalculator 'cmdCircQ3 ' Me.cmdCircQ3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ3.Location = New System.Drawing.Point(180, 166) + Me.cmdCircQ3.Location = New System.Drawing.Point(150, 138) + Me.cmdCircQ3.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircQ3.Name = "cmdCircQ3" - Me.cmdCircQ3.Size = New System.Drawing.Size(90, 48) + Me.cmdCircQ3.Size = New System.Drawing.Size(75, 40) Me.cmdCircQ3.TabIndex = 12 Me.cmdCircQ3.Text = "q3" Me.cmdCircQ3.UseVisualStyleBackColor = True @@ -5915,9 +5797,10 @@ Partial Class ucrCalculator 'cmdCircQ1 ' Me.cmdCircQ1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ1.Location = New System.Drawing.Point(92, 166) + Me.cmdCircQ1.Location = New System.Drawing.Point(77, 138) + Me.cmdCircQ1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircQ1.Name = "cmdCircQ1" - Me.cmdCircQ1.Size = New System.Drawing.Size(90, 48) + Me.cmdCircQ1.Size = New System.Drawing.Size(75, 40) Me.cmdCircQ1.TabIndex = 11 Me.cmdCircQ1.Text = "q1" Me.cmdCircQ1.UseVisualStyleBackColor = True @@ -5925,9 +5808,10 @@ Partial Class ucrCalculator 'cmdCircMin ' Me.cmdCircMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMin.Location = New System.Drawing.Point(3, 166) + Me.cmdCircMin.Location = New System.Drawing.Point(2, 138) + Me.cmdCircMin.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircMin.Name = "cmdCircMin" - Me.cmdCircMin.Size = New System.Drawing.Size(90, 48) + Me.cmdCircMin.Size = New System.Drawing.Size(75, 40) Me.cmdCircMin.TabIndex = 9 Me.cmdCircMin.Text = "min" Me.cmdCircMin.UseVisualStyleBackColor = True @@ -5935,9 +5819,10 @@ Partial Class ucrCalculator 'cmdAngDev ' Me.cmdAngDev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngDev.Location = New System.Drawing.Point(180, 74) + Me.cmdAngDev.Location = New System.Drawing.Point(150, 62) + Me.cmdAngDev.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdAngDev.Name = "cmdAngDev" - Me.cmdAngDev.Size = New System.Drawing.Size(90, 48) + Me.cmdAngDev.Size = New System.Drawing.Size(75, 40) Me.cmdAngDev.TabIndex = 7 Me.cmdAngDev.Text = "ang.dev" Me.cmdAngDev.UseVisualStyleBackColor = True @@ -5945,9 +5830,10 @@ Partial Class ucrCalculator 'cmdCircVar ' Me.cmdCircVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircVar.Location = New System.Drawing.Point(268, 74) + Me.cmdCircVar.Location = New System.Drawing.Point(223, 62) + Me.cmdCircVar.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircVar.Name = "cmdCircVar" - Me.cmdCircVar.Size = New System.Drawing.Size(98, 48) + Me.cmdCircVar.Size = New System.Drawing.Size(82, 40) Me.cmdCircVar.TabIndex = 5 Me.cmdCircVar.Text = "var" Me.cmdCircVar.UseVisualStyleBackColor = True @@ -5955,9 +5841,10 @@ Partial Class ucrCalculator 'cmdCircSd ' Me.cmdCircSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircSd.Location = New System.Drawing.Point(92, 74) + Me.cmdCircSd.Location = New System.Drawing.Point(77, 62) + Me.cmdCircSd.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircSd.Name = "cmdCircSd" - Me.cmdCircSd.Size = New System.Drawing.Size(90, 48) + Me.cmdCircSd.Size = New System.Drawing.Size(75, 40) Me.cmdCircSd.TabIndex = 4 Me.cmdCircSd.Text = "sd" Me.cmdCircSd.UseVisualStyleBackColor = True @@ -5965,9 +5852,10 @@ Partial Class ucrCalculator 'cmdCircRange ' Me.cmdCircRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRange.Location = New System.Drawing.Point(3, 74) + Me.cmdCircRange.Location = New System.Drawing.Point(2, 62) + Me.cmdCircRange.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircRange.Name = "cmdCircRange" - Me.cmdCircRange.Size = New System.Drawing.Size(90, 48) + Me.cmdCircRange.Size = New System.Drawing.Size(75, 40) Me.cmdCircRange.TabIndex = 3 Me.cmdCircRange.Text = "range" Me.cmdCircRange.UseVisualStyleBackColor = True @@ -5975,9 +5863,10 @@ Partial Class ucrCalculator 'cmdMedianHL ' Me.cmdMedianHL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMedianHL.Location = New System.Drawing.Point(268, 27) + Me.cmdMedianHL.Location = New System.Drawing.Point(223, 22) + Me.cmdMedianHL.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdMedianHL.Name = "cmdMedianHL" - Me.cmdMedianHL.Size = New System.Drawing.Size(98, 48) + Me.cmdMedianHL.Size = New System.Drawing.Size(82, 40) Me.cmdMedianHL.TabIndex = 2 Me.cmdMedianHL.Text = "medianHL" Me.cmdMedianHL.UseVisualStyleBackColor = True @@ -5985,9 +5874,10 @@ Partial Class ucrCalculator 'cmdCircMedian ' Me.cmdCircMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMedian.Location = New System.Drawing.Point(180, 27) + Me.cmdCircMedian.Location = New System.Drawing.Point(150, 22) + Me.cmdCircMedian.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircMedian.Name = "cmdCircMedian" - Me.cmdCircMedian.Size = New System.Drawing.Size(90, 48) + Me.cmdCircMedian.Size = New System.Drawing.Size(75, 40) Me.cmdCircMedian.TabIndex = 1 Me.cmdCircMedian.Text = "median" Me.cmdCircMedian.UseVisualStyleBackColor = True @@ -5995,9 +5885,10 @@ Partial Class ucrCalculator 'cmdCircMean ' Me.cmdCircMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMean.Location = New System.Drawing.Point(92, 27) + Me.cmdCircMean.Location = New System.Drawing.Point(77, 22) + Me.cmdCircMean.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCircMean.Name = "cmdCircMean" - Me.cmdCircMean.Size = New System.Drawing.Size(90, 48) + Me.cmdCircMean.Size = New System.Drawing.Size(75, 40) Me.cmdCircMean.TabIndex = 0 Me.cmdCircMean.Text = "mean" Me.cmdCircMean.UseVisualStyleBackColor = True @@ -6008,9 +5899,11 @@ 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(651, 344) + Me.grpModifier.Location = New System.Drawing.Point(542, 287) + Me.grpModifier.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.grpModifier.Name = "grpModifier" - Me.grpModifier.Size = New System.Drawing.Size(384, 80) + Me.grpModifier.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpModifier.Size = New System.Drawing.Size(320, 67) Me.grpModifier.TabIndex = 192 Me.grpModifier.TabStop = False Me.grpModifier.Text = "Modifier" @@ -6018,9 +5911,10 @@ Partial Class ucrCalculator 'cmdRegex ' Me.cmdRegex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRegex.Location = New System.Drawing.Point(282, 20) + Me.cmdRegex.Location = New System.Drawing.Point(235, 17) + Me.cmdRegex.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdRegex.Name = "cmdRegex" - Me.cmdRegex.Size = New System.Drawing.Size(94, 45) + Me.cmdRegex.Size = New System.Drawing.Size(78, 38) Me.cmdRegex.TabIndex = 3 Me.cmdRegex.Text = "regex" Me.cmdRegex.UseVisualStyleBackColor = True @@ -6028,9 +5922,10 @@ Partial Class ucrCalculator 'cmdFixed ' Me.cmdFixed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFixed.Location = New System.Drawing.Point(189, 20) + Me.cmdFixed.Location = New System.Drawing.Point(158, 17) + Me.cmdFixed.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdFixed.Name = "cmdFixed" - Me.cmdFixed.Size = New System.Drawing.Size(94, 45) + Me.cmdFixed.Size = New System.Drawing.Size(78, 38) Me.cmdFixed.TabIndex = 2 Me.cmdFixed.Text = "fixed" Me.cmdFixed.UseVisualStyleBackColor = True @@ -6038,9 +5933,10 @@ Partial Class ucrCalculator 'cmdCollate ' Me.cmdCollate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollate.Location = New System.Drawing.Point(96, 20) + Me.cmdCollate.Location = New System.Drawing.Point(80, 17) + Me.cmdCollate.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdCollate.Name = "cmdCollate" - Me.cmdCollate.Size = New System.Drawing.Size(94, 45) + Me.cmdCollate.Size = New System.Drawing.Size(78, 38) Me.cmdCollate.TabIndex = 1 Me.cmdCollate.Text = "collate" Me.cmdCollate.UseVisualStyleBackColor = True @@ -6048,9 +5944,10 @@ Partial Class ucrCalculator 'cmdBoundary ' Me.cmdBoundary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBoundary.Location = New System.Drawing.Point(3, 20) + Me.cmdBoundary.Location = New System.Drawing.Point(2, 17) + Me.cmdBoundary.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdBoundary.Name = "cmdBoundary" - Me.cmdBoundary.Size = New System.Drawing.Size(94, 45) + Me.cmdBoundary.Size = New System.Drawing.Size(78, 38) Me.cmdBoundary.TabIndex = 0 Me.cmdBoundary.Text = "boundary" Me.cmdBoundary.UseVisualStyleBackColor = True @@ -6072,9 +5969,11 @@ 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(650, 426) + Me.grpSymbols.Location = New System.Drawing.Point(542, 355) + Me.grpSymbols.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.grpSymbols.Name = "grpSymbols" - Me.grpSymbols.Size = New System.Drawing.Size(474, 168) + Me.grpSymbols.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpSymbols.Size = New System.Drawing.Size(395, 140) Me.grpSymbols.TabIndex = 193 Me.grpSymbols.TabStop = False Me.grpSymbols.Text = "Symbols" @@ -6082,9 +5981,10 @@ Partial Class ucrCalculator 'cmdOr3 ' Me.cmdOr3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr3.Location = New System.Drawing.Point(190, 69) + Me.cmdOr3.Location = New System.Drawing.Point(158, 58) + Me.cmdOr3.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdOr3.Name = "cmdOr3" - Me.cmdOr3.Size = New System.Drawing.Size(94, 45) + Me.cmdOr3.Size = New System.Drawing.Size(78, 38) Me.cmdOr3.TabIndex = 16 Me.cmdOr3.Text = "| or" Me.cmdOr3.UseVisualStyleBackColor = True @@ -6092,9 +5992,10 @@ Partial Class ucrCalculator 'cmdEscape ' Me.cmdEscape.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEscape.Location = New System.Drawing.Point(284, 112) + Me.cmdEscape.Location = New System.Drawing.Point(237, 93) + Me.cmdEscape.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdEscape.Name = "cmdEscape" - Me.cmdEscape.Size = New System.Drawing.Size(94, 45) + Me.cmdEscape.Size = New System.Drawing.Size(78, 38) Me.cmdEscape.TabIndex = 14 Me.cmdEscape.Text = "\\ escape" Me.cmdEscape.UseVisualStyleBackColor = True @@ -6102,9 +6003,10 @@ Partial Class ucrCalculator 'cmdPlusZero ' Me.cmdPlusZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusZero.Location = New System.Drawing.Point(376, 112) + Me.cmdPlusZero.Location = New System.Drawing.Point(313, 93) + Me.cmdPlusZero.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdPlusZero.Name = "cmdPlusZero" - Me.cmdPlusZero.Size = New System.Drawing.Size(94, 45) + Me.cmdPlusZero.Size = New System.Drawing.Size(78, 38) Me.cmdPlusZero.TabIndex = 15 Me.cmdPlusZero.Text = "- to" Me.cmdPlusZero.UseVisualStyleBackColor = True @@ -6112,9 +6014,10 @@ Partial Class ucrCalculator 'cmdZero ' Me.cmdZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZero.Location = New System.Drawing.Point(190, 112) + Me.cmdZero.Location = New System.Drawing.Point(158, 93) + Me.cmdZero.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdZero.Name = "cmdZero" - Me.cmdZero.Size = New System.Drawing.Size(94, 45) + Me.cmdZero.Size = New System.Drawing.Size(78, 38) Me.cmdZero.TabIndex = 13 Me.cmdZero.Text = "* 0+" Me.cmdZero.UseVisualStyleBackColor = True @@ -6122,9 +6025,10 @@ Partial Class ucrCalculator 'cmdPlusOne ' Me.cmdPlusOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusOne.Location = New System.Drawing.Point(96, 112) + Me.cmdPlusOne.Location = New System.Drawing.Point(80, 93) + Me.cmdPlusOne.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdPlusOne.Name = "cmdPlusOne" - Me.cmdPlusOne.Size = New System.Drawing.Size(94, 45) + Me.cmdPlusOne.Size = New System.Drawing.Size(78, 38) Me.cmdPlusOne.TabIndex = 12 Me.cmdPlusOne.Text = "+ 1+" Me.cmdPlusOne.UseVisualStyleBackColor = True @@ -6132,9 +6036,10 @@ Partial Class ucrCalculator 'cmdZeroOrOne ' Me.cmdZeroOrOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZeroOrOne.Location = New System.Drawing.Point(3, 112) + Me.cmdZeroOrOne.Location = New System.Drawing.Point(2, 93) + Me.cmdZeroOrOne.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdZeroOrOne.Name = "cmdZeroOrOne" - Me.cmdZeroOrOne.Size = New System.Drawing.Size(94, 45) + Me.cmdZeroOrOne.Size = New System.Drawing.Size(78, 38) Me.cmdZeroOrOne.TabIndex = 11 Me.cmdZeroOrOne.Text = "? 0 or 1" Me.cmdZeroOrOne.UseVisualStyleBackColor = True @@ -6142,9 +6047,10 @@ Partial Class ucrCalculator 'cmdNumbers ' Me.cmdNumbers.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNumbers.Location = New System.Drawing.Point(376, 69) + Me.cmdNumbers.Location = New System.Drawing.Point(313, 58) + Me.cmdNumbers.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdNumbers.Name = "cmdNumbers" - Me.cmdNumbers.Size = New System.Drawing.Size(94, 45) + Me.cmdNumbers.Size = New System.Drawing.Size(78, 38) Me.cmdNumbers.TabIndex = 10 Me.cmdNumbers.Text = "{ m,n } " Me.cmdNumbers.UseVisualStyleBackColor = True @@ -6152,9 +6058,10 @@ Partial Class ucrCalculator 'cmdNot1 ' Me.cmdNot1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot1.Location = New System.Drawing.Point(96, 69) + Me.cmdNot1.Location = New System.Drawing.Point(80, 58) + Me.cmdNot1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdNot1.Name = "cmdNot1" - Me.cmdNot1.Size = New System.Drawing.Size(94, 45) + Me.cmdNot1.Size = New System.Drawing.Size(78, 38) Me.cmdNot1.TabIndex = 8 Me.cmdNot1.Text = "[^ ] not" Me.cmdNot1.UseVisualStyleBackColor = True @@ -6162,9 +6069,10 @@ Partial Class ucrCalculator 'cmdOr2 ' Me.cmdOr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr2.Location = New System.Drawing.Point(284, 69) + Me.cmdOr2.Location = New System.Drawing.Point(237, 58) + Me.cmdOr2.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdOr2.Name = "cmdOr2" - Me.cmdOr2.Size = New System.Drawing.Size(94, 45) + Me.cmdOr2.Size = New System.Drawing.Size(78, 38) Me.cmdOr2.TabIndex = 9 Me.cmdOr2.Text = "{ n} " Me.cmdOr2.UseVisualStyleBackColor = True @@ -6172,9 +6080,10 @@ Partial Class ucrCalculator 'cmdOr1 ' Me.cmdOr1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr1.Location = New System.Drawing.Point(3, 69) + Me.cmdOr1.Location = New System.Drawing.Point(2, 58) + Me.cmdOr1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdOr1.Name = "cmdOr1" - Me.cmdOr1.Size = New System.Drawing.Size(94, 45) + Me.cmdOr1.Size = New System.Drawing.Size(78, 38) Me.cmdOr1.TabIndex = 7 Me.cmdOr1.Text = "[ ] or" Me.cmdOr1.UseVisualStyleBackColor = True @@ -6182,9 +6091,10 @@ Partial Class ucrCalculator 'cmdSpace ' Me.cmdSpace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpace.Location = New System.Drawing.Point(376, 24) + Me.cmdSpace.Location = New System.Drawing.Point(313, 20) + Me.cmdSpace.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdSpace.Name = "cmdSpace" - Me.cmdSpace.Size = New System.Drawing.Size(94, 45) + Me.cmdSpace.Size = New System.Drawing.Size(78, 38) Me.cmdSpace.TabIndex = 6 Me.cmdSpace.Text = "\\s space" Me.cmdSpace.UseVisualStyleBackColor = True @@ -6192,9 +6102,10 @@ Partial Class ucrCalculator 'cmdDigit ' Me.cmdDigit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigit.Location = New System.Drawing.Point(284, 24) + Me.cmdDigit.Location = New System.Drawing.Point(237, 20) + Me.cmdDigit.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdDigit.Name = "cmdDigit" - Me.cmdDigit.Size = New System.Drawing.Size(94, 45) + Me.cmdDigit.Size = New System.Drawing.Size(78, 38) Me.cmdDigit.TabIndex = 5 Me.cmdDigit.Text = "\\d digit" Me.cmdDigit.UseVisualStyleBackColor = True @@ -6202,9 +6113,10 @@ Partial Class ucrCalculator 'cmdEnd1 ' Me.cmdEnd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnd1.Location = New System.Drawing.Point(190, 24) + Me.cmdEnd1.Location = New System.Drawing.Point(158, 20) + Me.cmdEnd1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdEnd1.Name = "cmdEnd1" - Me.cmdEnd1.Size = New System.Drawing.Size(94, 45) + Me.cmdEnd1.Size = New System.Drawing.Size(78, 38) Me.cmdEnd1.TabIndex = 4 Me.cmdEnd1.Text = "$ end" Me.cmdEnd1.UseVisualStyleBackColor = True @@ -6212,9 +6124,10 @@ Partial Class ucrCalculator 'cmdbegin ' Me.cmdbegin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbegin.Location = New System.Drawing.Point(96, 24) + Me.cmdbegin.Location = New System.Drawing.Point(80, 20) + Me.cmdbegin.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdbegin.Name = "cmdbegin" - Me.cmdbegin.Size = New System.Drawing.Size(94, 45) + Me.cmdbegin.Size = New System.Drawing.Size(78, 38) Me.cmdbegin.TabIndex = 3 Me.cmdbegin.Text = "^ begin" Me.cmdbegin.UseVisualStyleBackColor = True @@ -6222,9 +6135,10 @@ Partial Class ucrCalculator 'cmdAny1 ' Me.cmdAny1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAny1.Location = New System.Drawing.Point(3, 24) + Me.cmdAny1.Location = New System.Drawing.Point(2, 20) + Me.cmdAny1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdAny1.Name = "cmdAny1" - Me.cmdAny1.Size = New System.Drawing.Size(94, 45) + Me.cmdAny1.Size = New System.Drawing.Size(78, 38) Me.cmdAny1.TabIndex = 2 Me.cmdAny1.Text = ". any" Me.cmdAny1.UseVisualStyleBackColor = True @@ -6252,11 +6166,9 @@ Partial Class ucrCalculator Me.grpComplex.Controls.Add(Me.cmdImaginary) Me.grpComplex.Controls.Add(Me.cmdReal) Me.grpComplex.Controls.Add(Me.cmdAsComplex) - Me.grpComplex.Location = New System.Drawing.Point(651, 104) - Me.grpComplex.Margin = New System.Windows.Forms.Padding(4) + Me.grpComplex.Location = New System.Drawing.Point(542, 87) Me.grpComplex.Name = "grpComplex" - Me.grpComplex.Padding = New System.Windows.Forms.Padding(4) - Me.grpComplex.Size = New System.Drawing.Size(432, 339) + Me.grpComplex.Size = New System.Drawing.Size(360, 282) Me.grpComplex.TabIndex = 198 Me.grpComplex.TabStop = False Me.grpComplex.Text = "Complex" @@ -6265,10 +6177,9 @@ Partial Class ucrCalculator ' Me.cmdComplexRHelp.AutoSize = True Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(274, 254) - Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdComplexRHelp.Location = New System.Drawing.Point(228, 212) Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(136, 45) + Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex Me.cmdComplexRHelp.TabIndex = 209 Me.cmdComplexRHelp.Text = "R Help" @@ -6278,10 +6189,10 @@ 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(318, 156) - Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexTanH.Location = New System.Drawing.Point(265, 130) + Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexTanH.Name = "cmdComplexTanH" - Me.cmdComplexTanH.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexTanH.Size = New System.Drawing.Size(72, 38) Me.cmdComplexTanH.TabIndex = 208 Me.cmdComplexTanH.Text = "tanh" Me.cmdComplexTanH.UseVisualStyleBackColor = True @@ -6290,10 +6201,10 @@ 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(318, 112) - Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexTan.Location = New System.Drawing.Point(265, 93) + Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexTan.Name = "cmdComplexTan" - Me.cmdComplexTan.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexTan.Size = New System.Drawing.Size(72, 38) Me.cmdComplexTan.TabIndex = 207 Me.cmdComplexTan.Text = "tan" Me.cmdComplexTan.UseVisualStyleBackColor = True @@ -6302,10 +6213,10 @@ 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(318, 200) - Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexPi.Location = New System.Drawing.Point(265, 167) + Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexPi.Name = "cmdComplexPi" - Me.cmdComplexPi.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexPi.Size = New System.Drawing.Size(72, 38) Me.cmdComplexPi.TabIndex = 206 Me.cmdComplexPi.Text = "pi" Me.cmdComplexPi.UseVisualStyleBackColor = True @@ -6314,10 +6225,10 @@ 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(318, 69) - Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexDeg.Location = New System.Drawing.Point(265, 58) + Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexDeg.Name = "cmdComplexDeg" - Me.cmdComplexDeg.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexDeg.Size = New System.Drawing.Size(72, 38) Me.cmdComplexDeg.TabIndex = 205 Me.cmdComplexDeg.Text = "deg" Me.cmdComplexDeg.UseVisualStyleBackColor = True @@ -6326,10 +6237,10 @@ 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(318, 26) - Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexRad.Location = New System.Drawing.Point(265, 22) + Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexRad.Name = "cmdComplexRad" - Me.cmdComplexRad.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexRad.Size = New System.Drawing.Size(72, 38) Me.cmdComplexRad.TabIndex = 204 Me.cmdComplexRad.Text = "rad" Me.cmdComplexRad.UseVisualStyleBackColor = True @@ -6338,10 +6249,10 @@ 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(220, 200) - Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexSignif.Location = New System.Drawing.Point(183, 167) + Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSignif.Name = "cmdComplexSignif" - Me.cmdComplexSignif.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexSignif.Size = New System.Drawing.Size(82, 38) Me.cmdComplexSignif.TabIndex = 203 Me.cmdComplexSignif.Text = "signif" Me.cmdComplexSignif.UseVisualStyleBackColor = True @@ -6350,10 +6261,10 @@ 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(220, 156) - Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexCosH.Location = New System.Drawing.Point(183, 130) + Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexCosH.Name = "cmdComplexCosH" - Me.cmdComplexCosH.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexCosH.Size = New System.Drawing.Size(82, 38) Me.cmdComplexCosH.TabIndex = 202 Me.cmdComplexCosH.Text = "cosh" Me.cmdComplexCosH.UseVisualStyleBackColor = True @@ -6362,10 +6273,10 @@ 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(134, 156) - Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexSinH.Location = New System.Drawing.Point(112, 130) + Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSinH.Name = "cmdComplexSinH" - Me.cmdComplexSinH.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexSinH.Size = New System.Drawing.Size(72, 38) Me.cmdComplexSinH.TabIndex = 201 Me.cmdComplexSinH.Text = "sinh" Me.cmdComplexSinH.UseVisualStyleBackColor = True @@ -6374,10 +6285,10 @@ 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(220, 112) - Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexCos.Location = New System.Drawing.Point(183, 93) + Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexCos.Name = "cmdComplexCos" - Me.cmdComplexCos.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexCos.Size = New System.Drawing.Size(82, 38) Me.cmdComplexCos.TabIndex = 200 Me.cmdComplexCos.Text = "cos" Me.cmdComplexCos.UseVisualStyleBackColor = True @@ -6386,10 +6297,10 @@ 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(134, 112) - Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexSin.Location = New System.Drawing.Point(112, 93) + Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSin.Name = "cmdComplexSin" - Me.cmdComplexSin.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexSin.Size = New System.Drawing.Size(72, 38) Me.cmdComplexSin.TabIndex = 199 Me.cmdComplexSin.Text = "sin" Me.cmdComplexSin.UseVisualStyleBackColor = True @@ -6398,10 +6309,10 @@ 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(36, 112) - Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexExp.Location = New System.Drawing.Point(30, 93) + Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexExp.Name = "cmdComplexExp" - Me.cmdComplexExp.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexExp.Size = New System.Drawing.Size(82, 38) Me.cmdComplexExp.TabIndex = 192 Me.cmdComplexExp.Text = "exp" Me.cmdComplexExp.UseVisualStyleBackColor = True @@ -6410,10 +6321,10 @@ 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(134, 200) - Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexRound.Location = New System.Drawing.Point(112, 167) + Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexRound.Name = "cmdComplexRound" - Me.cmdComplexRound.Size = New System.Drawing.Size(87, 45) + Me.cmdComplexRound.Size = New System.Drawing.Size(72, 38) Me.cmdComplexRound.TabIndex = 191 Me.cmdComplexRound.Text = "round" Me.cmdComplexRound.UseVisualStyleBackColor = True @@ -6422,10 +6333,10 @@ 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(36, 156) - Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexLog.Location = New System.Drawing.Point(30, 130) + Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexLog.Name = "cmdComplexLog" - Me.cmdComplexLog.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexLog.Size = New System.Drawing.Size(82, 38) Me.cmdComplexLog.TabIndex = 190 Me.cmdComplexLog.Text = "log" Me.cmdComplexLog.UseVisualStyleBackColor = True @@ -6434,10 +6345,10 @@ 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(36, 200) - Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdComplexSqrt.Location = New System.Drawing.Point(30, 167) + Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdComplexSqrt.Name = "cmdComplexSqrt" - Me.cmdComplexSqrt.Size = New System.Drawing.Size(98, 45) + Me.cmdComplexSqrt.Size = New System.Drawing.Size(82, 38) Me.cmdComplexSqrt.TabIndex = 189 Me.cmdComplexSqrt.Text = "sqrt" Me.cmdComplexSqrt.UseVisualStyleBackColor = True @@ -6446,10 +6357,10 @@ 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(220, 69) - Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdConjugate.Location = New System.Drawing.Point(183, 58) + Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdConjugate.Name = "cmdConjugate" - Me.cmdConjugate.Size = New System.Drawing.Size(98, 45) + Me.cmdConjugate.Size = New System.Drawing.Size(82, 38) Me.cmdConjugate.TabIndex = 188 Me.cmdConjugate.Text = "conjugate" Me.cmdConjugate.UseVisualStyleBackColor = True @@ -6458,10 +6369,10 @@ 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(134, 69) - Me.cmdArg.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdArg.Location = New System.Drawing.Point(112, 58) + Me.cmdArg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdArg.Name = "cmdArg" - Me.cmdArg.Size = New System.Drawing.Size(87, 45) + Me.cmdArg.Size = New System.Drawing.Size(72, 38) Me.cmdArg.TabIndex = 187 Me.cmdArg.Text = "arg" Me.cmdArg.UseVisualStyleBackColor = True @@ -6470,10 +6381,10 @@ 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(36, 69) - Me.cmdMod.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdMod.Location = New System.Drawing.Point(30, 58) + Me.cmdMod.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdMod.Name = "cmdMod" - Me.cmdMod.Size = New System.Drawing.Size(98, 45) + Me.cmdMod.Size = New System.Drawing.Size(82, 38) Me.cmdMod.TabIndex = 186 Me.cmdMod.Text = "mod" Me.cmdMod.UseVisualStyleBackColor = True @@ -6482,10 +6393,10 @@ 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(220, 26) - Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdImaginary.Location = New System.Drawing.Point(183, 22) + Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdImaginary.Name = "cmdImaginary" - Me.cmdImaginary.Size = New System.Drawing.Size(98, 45) + Me.cmdImaginary.Size = New System.Drawing.Size(82, 38) Me.cmdImaginary.TabIndex = 185 Me.cmdImaginary.Text = "imaginary" Me.cmdImaginary.UseVisualStyleBackColor = True @@ -6494,10 +6405,10 @@ 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(134, 26) - Me.cmdReal.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdReal.Location = New System.Drawing.Point(112, 22) + Me.cmdReal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdReal.Name = "cmdReal" - Me.cmdReal.Size = New System.Drawing.Size(87, 45) + Me.cmdReal.Size = New System.Drawing.Size(72, 38) Me.cmdReal.TabIndex = 177 Me.cmdReal.Text = "real" Me.cmdReal.UseVisualStyleBackColor = True @@ -6506,10 +6417,10 @@ 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(36, 26) - Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdAsComplex.Location = New System.Drawing.Point(30, 22) + Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdAsComplex.Name = "cmdAsComplex" - Me.cmdAsComplex.Size = New System.Drawing.Size(98, 45) + Me.cmdAsComplex.Size = New System.Drawing.Size(82, 38) Me.cmdAsComplex.TabIndex = 176 Me.cmdAsComplex.Text = "complex" Me.cmdAsComplex.UseVisualStyleBackColor = True @@ -6519,18 +6430,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(137, 68) + Me.ContextMenuStripTxtString.Size = New System.Drawing.Size(123, 52) ' 'TxTStringrToolStripMenuItem ' Me.TxTStringrToolStripMenuItem.Name = "TxTStringrToolStripMenuItem" - Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(136, 32) + Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(122, 24) Me.TxTStringrToolStripMenuItem.Text = "Stringr" ' 'TxTBaseToolStripMenuItem ' Me.TxTBaseToolStripMenuItem.Name = "TxTBaseToolStripMenuItem" - Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(136, 32) + Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(122, 24) Me.TxTBaseToolStripMenuItem.Text = "base" ' 'ContextMenuStripWakefield @@ -6538,12 +6449,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(159, 36) + Me.ContextMenuStripWakefield.Size = New System.Drawing.Size(143, 28) ' 'WakefieldToolStripMenuItem ' Me.WakefieldToolStripMenuItem.Name = "WakefieldToolStripMenuItem" - Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(158, 32) + Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(142, 24) Me.WakefieldToolStripMenuItem.Text = "wakefield" ' 'ContextMenuStripList @@ -6551,24 +6462,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(129, 100) + Me.ContextMenuStripList.Size = New System.Drawing.Size(116, 76) ' 'ListBaseToolStripMenuItem ' Me.ListBaseToolStripMenuItem.Name = "ListBaseToolStripMenuItem" - Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(128, 32) + Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(115, 24) Me.ListBaseToolStripMenuItem.Text = "base" ' 'ListStatsToolStripMenuItem ' Me.ListStatsToolStripMenuItem.Name = "ListStatsToolStripMenuItem" - Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(128, 32) + Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(115, 24) Me.ListStatsToolStripMenuItem.Text = "stats" ' 'ListStatipToolStripMenuItem ' Me.ListStatipToolStripMenuItem.Name = "ListStatipToolStripMenuItem" - Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(128, 32) + Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(115, 24) Me.ListStatipToolStripMenuItem.Text = "statip" ' 'grpList @@ -6600,11 +6511,9 @@ Partial Class ucrCalculator Me.grpList.Controls.Add(Me.cmdListSum) Me.grpList.Controls.Add(Me.cmdListSumd) Me.grpList.Controls.Add(Me.cmdListMissing) - Me.grpList.Location = New System.Drawing.Point(657, 62) - Me.grpList.Margin = New System.Windows.Forms.Padding(4) + Me.grpList.Location = New System.Drawing.Point(548, 52) Me.grpList.Name = "grpList" - Me.grpList.Padding = New System.Windows.Forms.Padding(4) - Me.grpList.Size = New System.Drawing.Size(474, 550) + Me.grpList.Size = New System.Drawing.Size(395, 458) Me.grpList.TabIndex = 214 Me.grpList.TabStop = False Me.grpList.Text = "Summary" @@ -6626,11 +6535,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(6, 372) - Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4) + Me.GroupBox1.Location = New System.Drawing.Point(5, 310) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4) - Me.GroupBox1.Size = New System.Drawing.Size(466, 164) + Me.GroupBox1.Size = New System.Drawing.Size(388, 137) Me.GroupBox1.TabIndex = 200 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Transform" @@ -6639,10 +6546,10 @@ 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(362, 108) - Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDuplicated.Location = New System.Drawing.Point(302, 90) + Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDuplicated.Name = "cmdListDuplicated" - Me.cmdListDuplicated.Size = New System.Drawing.Size(98, 45) + Me.cmdListDuplicated.Size = New System.Drawing.Size(82, 38) Me.cmdListDuplicated.TabIndex = 186 Me.cmdListDuplicated.Text = "duplicated" Me.cmdListDuplicated.UseVisualStyleBackColor = True @@ -6651,10 +6558,10 @@ 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(279, 108) - Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListOperator.Location = New System.Drawing.Point(232, 90) + Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListOperator.Name = "cmdListOperator" - Me.cmdListOperator.Size = New System.Drawing.Size(84, 45) + Me.cmdListOperator.Size = New System.Drawing.Size(70, 38) Me.cmdListOperator.TabIndex = 185 Me.cmdListOperator.Text = ">" Me.cmdListOperator.UseVisualStyleBackColor = True @@ -6663,10 +6570,10 @@ 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(190, 108) - Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDiv.Location = New System.Drawing.Point(158, 90) + Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDiv.Name = "cmdListDiv" - Me.cmdListDiv.Size = New System.Drawing.Size(90, 45) + Me.cmdListDiv.Size = New System.Drawing.Size(75, 38) Me.cmdListDiv.TabIndex = 184 Me.cmdListDiv.Text = "div (%/%)" Me.cmdListDiv.UseVisualStyleBackColor = True @@ -6675,10 +6582,10 @@ 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(86, 108) - Me.cmdListMod.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMod.Location = New System.Drawing.Point(72, 90) + Me.cmdListMod.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMod.Name = "cmdListMod" - Me.cmdListMod.Size = New System.Drawing.Size(106, 45) + Me.cmdListMod.Size = New System.Drawing.Size(88, 38) Me.cmdListMod.TabIndex = 183 Me.cmdListMod.Text = "mod (%%)" Me.cmdListMod.UseVisualStyleBackColor = True @@ -6687,10 +6594,10 @@ 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, 108) - Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListIfelse.Location = New System.Drawing.Point(2, 90) + Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListIfelse.Name = "cmdListIfelse" - Me.cmdListIfelse.Size = New System.Drawing.Size(86, 45) + Me.cmdListIfelse.Size = New System.Drawing.Size(72, 38) Me.cmdListIfelse.TabIndex = 182 Me.cmdListIfelse.Text = "ifelse" Me.cmdListIfelse.UseVisualStyleBackColor = True @@ -6699,10 +6606,10 @@ 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(362, 64) - Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListOmit.Location = New System.Drawing.Point(302, 53) + Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListOmit.Name = "cmdListOmit" - Me.cmdListOmit.Size = New System.Drawing.Size(98, 45) + Me.cmdListOmit.Size = New System.Drawing.Size(82, 38) Me.cmdListOmit.TabIndex = 181 Me.cmdListOmit.Text = "omit.na" Me.cmdListOmit.UseVisualStyleBackColor = True @@ -6711,10 +6618,10 @@ 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(279, 64) - Me.cmdListRev.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListRev.Location = New System.Drawing.Point(232, 53) + Me.cmdListRev.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListRev.Name = "cmdListRev" - Me.cmdListRev.Size = New System.Drawing.Size(84, 45) + Me.cmdListRev.Size = New System.Drawing.Size(70, 38) Me.cmdListRev.TabIndex = 180 Me.cmdListRev.Text = "rev" Me.cmdListRev.UseVisualStyleBackColor = True @@ -6723,10 +6630,10 @@ 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(190, 64) - Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMovsum.Location = New System.Drawing.Point(158, 53) + Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMovsum.Name = "cmdListMovsum" - Me.cmdListMovsum.Size = New System.Drawing.Size(90, 45) + Me.cmdListMovsum.Size = New System.Drawing.Size(75, 38) Me.cmdListMovsum.TabIndex = 179 Me.cmdListMovsum.Text = "movsum" Me.cmdListMovsum.UseVisualStyleBackColor = True @@ -6735,10 +6642,10 @@ 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(86, 64) - Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListCumsum.Location = New System.Drawing.Point(72, 53) + Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListCumsum.Name = "cmdListCumsum" - Me.cmdListCumsum.Size = New System.Drawing.Size(106, 45) + Me.cmdListCumsum.Size = New System.Drawing.Size(88, 38) Me.cmdListCumsum.TabIndex = 178 Me.cmdListCumsum.Text = "cumsum" Me.cmdListCumsum.UseVisualStyleBackColor = True @@ -6747,10 +6654,10 @@ 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, 64) - Me.cmdListScale.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListScale.Location = New System.Drawing.Point(2, 53) + Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListScale.Name = "cmdListScale" - Me.cmdListScale.Size = New System.Drawing.Size(86, 45) + Me.cmdListScale.Size = New System.Drawing.Size(72, 38) Me.cmdListScale.TabIndex = 177 Me.cmdListScale.Text = " scale" Me.cmdListScale.UseVisualStyleBackColor = True @@ -6759,10 +6666,10 @@ 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(362, 21) - Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDiff.Location = New System.Drawing.Point(302, 18) + Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDiff.Name = "cmdListDiff" - Me.cmdListDiff.Size = New System.Drawing.Size(98, 45) + Me.cmdListDiff.Size = New System.Drawing.Size(82, 38) Me.cmdListDiff.TabIndex = 176 Me.cmdListDiff.Text = "diff" Me.cmdListDiff.UseVisualStyleBackColor = True @@ -6771,10 +6678,10 @@ 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(279, 21) - Me.cmdListLead.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListLead.Location = New System.Drawing.Point(232, 18) + Me.cmdListLead.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListLead.Name = "cmdListLead" - Me.cmdListLead.Size = New System.Drawing.Size(84, 45) + Me.cmdListLead.Size = New System.Drawing.Size(70, 38) Me.cmdListLead.TabIndex = 175 Me.cmdListLead.Text = "lead" Me.cmdListLead.UseVisualStyleBackColor = True @@ -6783,10 +6690,10 @@ 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(190, 21) - Me.cmdListLag.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListLag.Location = New System.Drawing.Point(158, 18) + Me.cmdListLag.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListLag.Name = "cmdListLag" - Me.cmdListLag.Size = New System.Drawing.Size(90, 45) + Me.cmdListLag.Size = New System.Drawing.Size(75, 38) Me.cmdListLag.TabIndex = 174 Me.cmdListLag.Text = "lag" Me.cmdListLag.UseVisualStyleBackColor = True @@ -6795,10 +6702,10 @@ 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(86, 21) - Me.cmdListRank.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListRank.Location = New System.Drawing.Point(72, 18) + Me.cmdListRank.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListRank.Name = "cmdListRank" - Me.cmdListRank.Size = New System.Drawing.Size(106, 45) + Me.cmdListRank.Size = New System.Drawing.Size(88, 38) Me.cmdListRank.TabIndex = 173 Me.cmdListRank.Text = "rank" Me.cmdListRank.UseVisualStyleBackColor = True @@ -6807,10 +6714,10 @@ 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, 21) - Me.cmdListSort.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSort.Location = New System.Drawing.Point(2, 18) + Me.cmdListSort.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSort.Name = "cmdListSort" - Me.cmdListSort.Size = New System.Drawing.Size(86, 45) + Me.cmdListSort.Size = New System.Drawing.Size(72, 38) Me.cmdListSort.TabIndex = 172 Me.cmdListSort.Text = "sort" Me.cmdListSort.UseVisualStyleBackColor = True @@ -6827,11 +6734,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(4, 244) - Me.grpMathBloc.Margin = New System.Windows.Forms.Padding(4) + Me.grpMathBloc.Location = New System.Drawing.Point(3, 203) Me.grpMathBloc.Name = "grpMathBloc" - Me.grpMathBloc.Padding = New System.Windows.Forms.Padding(4) - Me.grpMathBloc.Size = New System.Drawing.Size(466, 126) + Me.grpMathBloc.Size = New System.Drawing.Size(388, 105) Me.grpMathBloc.TabIndex = 199 Me.grpMathBloc.TabStop = False Me.grpMathBloc.Text = "Maths" @@ -6840,10 +6745,10 @@ 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(368, 64) - Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSQRT.Location = New System.Drawing.Point(307, 53) + Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSQRT.Name = "cmdListSQRT" - Me.cmdListSQRT.Size = New System.Drawing.Size(88, 45) + Me.cmdListSQRT.Size = New System.Drawing.Size(73, 38) Me.cmdListSQRT.TabIndex = 181 Me.cmdListSQRT.Text = "sqrt" Me.cmdListSQRT.UseVisualStyleBackColor = True @@ -6852,10 +6757,10 @@ 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(279, 64) - Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListPercent2.Location = New System.Drawing.Point(232, 53) + Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListPercent2.Name = "cmdListPercent2" - Me.cmdListPercent2.Size = New System.Drawing.Size(90, 45) + Me.cmdListPercent2.Size = New System.Drawing.Size(75, 38) Me.cmdListPercent2.TabIndex = 180 Me.cmdListPercent2.Text = "percent2" Me.cmdListPercent2.UseVisualStyleBackColor = True @@ -6864,10 +6769,10 @@ 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(190, 64) - Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListPercent.Location = New System.Drawing.Point(158, 53) + Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListPercent.Name = "cmdListPercent" - Me.cmdListPercent.Size = New System.Drawing.Size(90, 45) + Me.cmdListPercent.Size = New System.Drawing.Size(75, 38) Me.cmdListPercent.TabIndex = 179 Me.cmdListPercent.Text = "percent" Me.cmdListPercent.UseVisualStyleBackColor = True @@ -6876,10 +6781,10 @@ 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(86, 64) - Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListProportion.Location = New System.Drawing.Point(72, 53) + Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListProportion.Name = "cmdListProportion" - Me.cmdListProportion.Size = New System.Drawing.Size(106, 45) + Me.cmdListProportion.Size = New System.Drawing.Size(88, 38) Me.cmdListProportion.TabIndex = 178 Me.cmdListProportion.Text = "proportion" Me.cmdListProportion.UseVisualStyleBackColor = True @@ -6888,10 +6793,10 @@ 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, 64) - Me.cmdListRound.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListRound.Location = New System.Drawing.Point(2, 53) + Me.cmdListRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListRound.Name = "cmdListRound" - Me.cmdListRound.Size = New System.Drawing.Size(86, 45) + Me.cmdListRound.Size = New System.Drawing.Size(72, 38) Me.cmdListRound.TabIndex = 177 Me.cmdListRound.Text = "round" Me.cmdListRound.UseVisualStyleBackColor = True @@ -6900,10 +6805,10 @@ 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(368, 21) - Me.cmdListSquare.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSquare.Location = New System.Drawing.Point(307, 18) + Me.cmdListSquare.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSquare.Name = "cmdListSquare" - Me.cmdListSquare.Size = New System.Drawing.Size(88, 45) + Me.cmdListSquare.Size = New System.Drawing.Size(73, 38) Me.cmdListSquare.TabIndex = 176 Me.cmdListSquare.Text = "power (^)" Me.cmdListSquare.UseVisualStyleBackColor = True @@ -6912,10 +6817,10 @@ 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(279, 21) - Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDivide.Location = New System.Drawing.Point(232, 18) + Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDivide.Name = "cmdListDivide" - Me.cmdListDivide.Size = New System.Drawing.Size(90, 45) + Me.cmdListDivide.Size = New System.Drawing.Size(75, 38) Me.cmdListDivide.TabIndex = 175 Me.cmdListDivide.Text = "divide (/)" Me.cmdListDivide.UseVisualStyleBackColor = True @@ -6924,10 +6829,10 @@ 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(190, 21) - Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMultiply.Location = New System.Drawing.Point(158, 18) + Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMultiply.Name = "cmdListMultiply" - Me.cmdListMultiply.Size = New System.Drawing.Size(90, 45) + Me.cmdListMultiply.Size = New System.Drawing.Size(75, 38) Me.cmdListMultiply.TabIndex = 174 Me.cmdListMultiply.Text = "times (*)" Me.cmdListMultiply.UseVisualStyleBackColor = True @@ -6936,10 +6841,10 @@ 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(86, 21) - Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSubtract.Location = New System.Drawing.Point(72, 18) + Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSubtract.Name = "cmdListSubtract" - Me.cmdListSubtract.Size = New System.Drawing.Size(106, 45) + Me.cmdListSubtract.Size = New System.Drawing.Size(88, 38) Me.cmdListSubtract.TabIndex = 173 Me.cmdListSubtract.Text = " subtract (-)" Me.cmdListSubtract.UseVisualStyleBackColor = True @@ -6948,10 +6853,10 @@ 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, 21) - Me.cmdListAdd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListAdd.Location = New System.Drawing.Point(2, 18) + Me.cmdListAdd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListAdd.Name = "cmdListAdd" - Me.cmdListAdd.Size = New System.Drawing.Size(86, 45) + Me.cmdListAdd.Size = New System.Drawing.Size(72, 38) Me.cmdListAdd.TabIndex = 172 Me.cmdListAdd.Text = "sum (+)" Me.cmdListAdd.UseVisualStyleBackColor = True @@ -6960,10 +6865,10 @@ 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(370, 152) - Me.cmdListNth.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListNth.Location = New System.Drawing.Point(308, 127) + Me.cmdListNth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListNth.Name = "cmdListNth" - Me.cmdListNth.Size = New System.Drawing.Size(93, 45) + Me.cmdListNth.Size = New System.Drawing.Size(78, 38) Me.cmdListNth.TabIndex = 176 Me.cmdListNth.Text = "nth" Me.cmdListNth.UseVisualStyleBackColor = True @@ -6972,10 +6877,10 @@ 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(279, 152) - Me.cmdListLast.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListLast.Location = New System.Drawing.Point(232, 127) + Me.cmdListLast.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListLast.Name = "cmdListLast" - Me.cmdListLast.Size = New System.Drawing.Size(93, 45) + Me.cmdListLast.Size = New System.Drawing.Size(78, 38) Me.cmdListLast.TabIndex = 175 Me.cmdListLast.Text = "last" Me.cmdListLast.UseVisualStyleBackColor = True @@ -6984,10 +6889,10 @@ 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(188, 152) - Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListFirst.Location = New System.Drawing.Point(157, 127) + Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListFirst.Name = "cmdListFirst" - Me.cmdListFirst.Size = New System.Drawing.Size(93, 45) + Me.cmdListFirst.Size = New System.Drawing.Size(78, 38) Me.cmdListFirst.TabIndex = 174 Me.cmdListFirst.Text = "first" Me.cmdListFirst.UseVisualStyleBackColor = True @@ -6996,10 +6901,10 @@ 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(96, 152) - Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListAnyDup.Location = New System.Drawing.Point(80, 127) + Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListAnyDup.Name = "cmdListAnyDup" - Me.cmdListAnyDup.Size = New System.Drawing.Size(93, 45) + Me.cmdListAnyDup.Size = New System.Drawing.Size(78, 38) Me.cmdListAnyDup.TabIndex = 173 Me.cmdListAnyDup.Text = "anydup" Me.cmdListAnyDup.UseVisualStyleBackColor = True @@ -7008,10 +6913,10 @@ 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(4, 152) - Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDistinct.Location = New System.Drawing.Point(3, 127) + Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDistinct.Name = "cmdListDistinct" - Me.cmdListDistinct.Size = New System.Drawing.Size(93, 45) + Me.cmdListDistinct.Size = New System.Drawing.Size(78, 38) Me.cmdListDistinct.TabIndex = 172 Me.cmdListDistinct.Text = "distinct" Me.cmdListDistinct.UseVisualStyleBackColor = True @@ -7020,10 +6925,10 @@ 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(370, 108) - Me.cmdListIQR.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListIQR.Location = New System.Drawing.Point(308, 90) + Me.cmdListIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListIQR.Name = "cmdListIQR" - Me.cmdListIQR.Size = New System.Drawing.Size(93, 45) + Me.cmdListIQR.Size = New System.Drawing.Size(78, 38) Me.cmdListIQR.TabIndex = 171 Me.cmdListIQR.Text = "IQR" Me.cmdListIQR.UseVisualStyleBackColor = True @@ -7032,10 +6937,10 @@ 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(279, 108) - Me.cmdListMad.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMad.Location = New System.Drawing.Point(232, 90) + Me.cmdListMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMad.Name = "cmdListMad" - Me.cmdListMad.Size = New System.Drawing.Size(93, 45) + Me.cmdListMad.Size = New System.Drawing.Size(78, 38) Me.cmdListMad.TabIndex = 170 Me.cmdListMad.Text = "mad" Me.cmdListMad.UseVisualStyleBackColor = True @@ -7044,10 +6949,10 @@ 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(188, 108) - Me.cmdListSd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSd.Location = New System.Drawing.Point(157, 90) + Me.cmdListSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSd.Name = "cmdListSd" - Me.cmdListSd.Size = New System.Drawing.Size(93, 45) + Me.cmdListSd.Size = New System.Drawing.Size(78, 38) Me.cmdListSd.TabIndex = 169 Me.cmdListSd.Text = "sd" Me.cmdListSd.UseVisualStyleBackColor = True @@ -7056,10 +6961,10 @@ 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(96, 108) - Me.cmdListVar.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListVar.Location = New System.Drawing.Point(80, 90) + Me.cmdListVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListVar.Name = "cmdListVar" - Me.cmdListVar.Size = New System.Drawing.Size(93, 45) + Me.cmdListVar.Size = New System.Drawing.Size(78, 38) Me.cmdListVar.TabIndex = 168 Me.cmdListVar.Text = "var" Me.cmdListVar.UseVisualStyleBackColor = True @@ -7068,10 +6973,10 @@ 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(4, 108) - Me.cmdListSsq.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSsq.Location = New System.Drawing.Point(3, 90) + Me.cmdListSsq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSsq.Name = "cmdListSsq" - Me.cmdListSsq.Size = New System.Drawing.Size(93, 45) + Me.cmdListSsq.Size = New System.Drawing.Size(78, 38) Me.cmdListSsq.TabIndex = 167 Me.cmdListSsq.Text = "ssq" Me.cmdListSsq.UseVisualStyleBackColor = True @@ -7080,10 +6985,10 @@ 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(370, 64) - Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMode1.Location = New System.Drawing.Point(308, 53) + Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMode1.Name = "cmdListMode1" - Me.cmdListMode1.Size = New System.Drawing.Size(93, 45) + Me.cmdListMode1.Size = New System.Drawing.Size(78, 38) Me.cmdListMode1.TabIndex = 166 Me.cmdListMode1.Text = "mode1" Me.cmdListMode1.UseVisualStyleBackColor = True @@ -7092,10 +6997,10 @@ 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(370, 21) - Me.cmdListMax.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMax.Location = New System.Drawing.Point(308, 18) + Me.cmdListMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMax.Name = "cmdListMax" - Me.cmdListMax.Size = New System.Drawing.Size(93, 45) + Me.cmdListMax.Size = New System.Drawing.Size(78, 38) Me.cmdListMax.TabIndex = 165 Me.cmdListMax.Text = "max" Me.cmdListMax.UseVisualStyleBackColor = True @@ -7104,10 +7009,10 @@ 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(279, 195) - Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListFivenum.Location = New System.Drawing.Point(232, 162) + Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListFivenum.Name = "cmdListFivenum" - Me.cmdListFivenum.Size = New System.Drawing.Size(93, 45) + Me.cmdListFivenum.Size = New System.Drawing.Size(78, 38) Me.cmdListFivenum.TabIndex = 163 Me.cmdListFivenum.Tag = "" Me.cmdListFivenum.Text = "fivenum" @@ -7117,10 +7022,10 @@ 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(279, 64) - Me.cmdListMode.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMode.Location = New System.Drawing.Point(232, 53) + Me.cmdListMode.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMode.Name = "cmdListMode" - Me.cmdListMode.Size = New System.Drawing.Size(93, 45) + Me.cmdListMode.Size = New System.Drawing.Size(78, 38) Me.cmdListMode.TabIndex = 162 Me.cmdListMode.Text = "mode" Me.cmdListMode.UseVisualStyleBackColor = True @@ -7129,10 +7034,10 @@ 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(4, 195) - Me.cmdListQuantile.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListQuantile.Location = New System.Drawing.Point(3, 162) + Me.cmdListQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListQuantile.Name = "cmdListQuantile" - Me.cmdListQuantile.Size = New System.Drawing.Size(93, 45) + Me.cmdListQuantile.Size = New System.Drawing.Size(78, 38) Me.cmdListQuantile.TabIndex = 154 Me.cmdListQuantile.Text = "quantile" Me.cmdListQuantile.UseVisualStyleBackColor = True @@ -7141,10 +7046,10 @@ 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(96, 195) - Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListDigitsum.Location = New System.Drawing.Point(80, 162) + Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListDigitsum.Name = "cmdListDigitsum" - Me.cmdListDigitsum.Size = New System.Drawing.Size(93, 45) + Me.cmdListDigitsum.Size = New System.Drawing.Size(78, 38) Me.cmdListDigitsum.TabIndex = 161 Me.cmdListDigitsum.Text = "digitsum" Me.cmdListDigitsum.UseVisualStyleBackColor = True @@ -7153,10 +7058,10 @@ 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(279, 21) - Me.cmdListMin.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMin.Location = New System.Drawing.Point(232, 18) + Me.cmdListMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMin.Name = "cmdListMin" - Me.cmdListMin.Size = New System.Drawing.Size(93, 45) + Me.cmdListMin.Size = New System.Drawing.Size(78, 38) Me.cmdListMin.TabIndex = 156 Me.cmdListMin.Text = "min" Me.cmdListMin.UseVisualStyleBackColor = True @@ -7165,10 +7070,10 @@ 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(188, 21) - Me.cmdListProd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListProd.Location = New System.Drawing.Point(157, 18) + Me.cmdListProd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListProd.Name = "cmdListProd" - Me.cmdListProd.Size = New System.Drawing.Size(93, 45) + Me.cmdListProd.Size = New System.Drawing.Size(78, 38) Me.cmdListProd.TabIndex = 155 Me.cmdListProd.Text = "prod" Me.cmdListProd.UseVisualStyleBackColor = True @@ -7177,10 +7082,10 @@ 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(4, 21) - Me.cmdListLength.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListLength.Location = New System.Drawing.Point(3, 18) + Me.cmdListLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListLength.Name = "cmdListLength" - Me.cmdListLength.Size = New System.Drawing.Size(93, 45) + Me.cmdListLength.Size = New System.Drawing.Size(78, 38) Me.cmdListLength.TabIndex = 148 Me.cmdListLength.Text = "length" Me.cmdListLength.UseVisualStyleBackColor = True @@ -7189,10 +7094,10 @@ 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(188, 64) - Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMedian.Location = New System.Drawing.Point(157, 53) + Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMedian.Name = "cmdListMedian" - Me.cmdListMedian.Size = New System.Drawing.Size(93, 45) + Me.cmdListMedian.Size = New System.Drawing.Size(78, 38) Me.cmdListMedian.TabIndex = 160 Me.cmdListMedian.Text = "median" Me.cmdListMedian.UseVisualStyleBackColor = True @@ -7201,10 +7106,10 @@ 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(96, 64) - Me.cmdListMean.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMean.Location = New System.Drawing.Point(80, 53) + Me.cmdListMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMean.Name = "cmdListMean" - Me.cmdListMean.Size = New System.Drawing.Size(93, 45) + Me.cmdListMean.Size = New System.Drawing.Size(78, 38) Me.cmdListMean.TabIndex = 158 Me.cmdListMean.Text = "mean" Me.cmdListMean.UseVisualStyleBackColor = True @@ -7213,10 +7118,10 @@ 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(4, 64) - Me.cmdListRange.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListRange.Location = New System.Drawing.Point(3, 53) + Me.cmdListRange.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListRange.Name = "cmdListRange" - Me.cmdListRange.Size = New System.Drawing.Size(93, 45) + Me.cmdListRange.Size = New System.Drawing.Size(78, 38) Me.cmdListRange.TabIndex = 157 Me.cmdListRange.Text = "range" Me.cmdListRange.UseVisualStyleBackColor = True @@ -7225,10 +7130,10 @@ 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(96, 21) - Me.cmdListSum.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSum.Location = New System.Drawing.Point(80, 18) + Me.cmdListSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSum.Name = "cmdListSum" - Me.cmdListSum.Size = New System.Drawing.Size(93, 45) + Me.cmdListSum.Size = New System.Drawing.Size(78, 38) Me.cmdListSum.TabIndex = 153 Me.cmdListSum.Text = "sum" Me.cmdListSum.UseVisualStyleBackColor = True @@ -7237,10 +7142,10 @@ 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(188, 195) - Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListSumd.Location = New System.Drawing.Point(157, 162) + Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListSumd.Name = "cmdListSumd" - Me.cmdListSumd.Size = New System.Drawing.Size(93, 45) + Me.cmdListSumd.Size = New System.Drawing.Size(78, 38) Me.cmdListSumd.TabIndex = 149 Me.cmdListSumd.Text = "sumd" Me.cmdListSumd.UseVisualStyleBackColor = True @@ -7249,10 +7154,10 @@ 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(370, 195) - Me.cmdListMissing.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.cmdListMissing.Location = New System.Drawing.Point(308, 162) + Me.cmdListMissing.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdListMissing.Name = "cmdListMissing" - Me.cmdListMissing.Size = New System.Drawing.Size(93, 45) + Me.cmdListMissing.Size = New System.Drawing.Size(78, 38) Me.cmdListMissing.TabIndex = 164 Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True @@ -7261,10 +7166,9 @@ Partial Class ucrCalculator ' Me.cmdRhelpList.AutoSize = True Me.cmdRhelpList.ContextMenuStrip = Me.ContextMenuStripList - Me.cmdRhelpList.Location = New System.Drawing.Point(1011, 39) - Me.cmdRhelpList.Margin = New System.Windows.Forms.Padding(4) + Me.cmdRhelpList.Location = New System.Drawing.Point(842, 32) Me.cmdRhelpList.Name = "cmdRhelpList" - Me.cmdRhelpList.Size = New System.Drawing.Size(102, 34) + Me.cmdRhelpList.Size = New System.Drawing.Size(85, 28) Me.cmdRhelpList.SplitMenuStrip = Me.ContextMenuStripList Me.cmdRhelpList.TabIndex = 212 Me.cmdRhelpList.Text = "R Help" @@ -7274,10 +7178,9 @@ Partial Class ucrCalculator ' Me.cmdWakefieldHelp.AutoSize = True Me.cmdWakefieldHelp.ContextMenuStrip = Me.ContextMenuStripWakefield - Me.cmdWakefieldHelp.Location = New System.Drawing.Point(1161, 62) - Me.cmdWakefieldHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdWakefieldHelp.Location = New System.Drawing.Point(968, 52) Me.cmdWakefieldHelp.Name = "cmdWakefieldHelp" - Me.cmdWakefieldHelp.Size = New System.Drawing.Size(136, 34) + Me.cmdWakefieldHelp.Size = New System.Drawing.Size(113, 28) Me.cmdWakefieldHelp.SplitMenuStrip = Me.ContextMenuStripWakefield Me.cmdWakefieldHelp.TabIndex = 211 Me.cmdWakefieldHelp.Text = "R Help" @@ -7287,10 +7190,9 @@ Partial Class ucrCalculator ' Me.cmdStringRHelp.AutoSize = True Me.cmdStringRHelp.ContextMenuStrip = Me.ContextMenuStripTxtString - Me.cmdStringRHelp.Location = New System.Drawing.Point(970, 62) - Me.cmdStringRHelp.Margin = New System.Windows.Forms.Padding(4) + Me.cmdStringRHelp.Location = New System.Drawing.Point(808, 52) Me.cmdStringRHelp.Name = "cmdStringRHelp" - Me.cmdStringRHelp.Size = New System.Drawing.Size(136, 34) + Me.cmdStringRHelp.Size = New System.Drawing.Size(113, 28) Me.cmdStringRHelp.SplitMenuStrip = Me.ContextMenuStripTxtString Me.cmdStringRHelp.TabIndex = 210 Me.cmdStringRHelp.Text = "R Help" @@ -7299,20 +7201,20 @@ Partial Class ucrCalculator 'ucrSaveResultInto ' Me.ucrSaveResultInto.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveResultInto.Location = New System.Drawing.Point(16, 455) - Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveResultInto.Location = New System.Drawing.Point(13, 379) + Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(5, 7, 5, 7) Me.ucrSaveResultInto.Name = "ucrSaveResultInto" - Me.ucrSaveResultInto.Size = New System.Drawing.Size(490, 33) + Me.ucrSaveResultInto.Size = New System.Drawing.Size(408, 28) Me.ucrSaveResultInto.TabIndex = 196 ' 'ucrTryCalculator ' Me.ucrTryCalculator.AutoSize = True - Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 384) - Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(6) + Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 320) + Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) Me.ucrTryCalculator.Name = "ucrTryCalculator" Me.ucrTryCalculator.RunCommandAsMultipleLines = False - Me.ucrTryCalculator.Size = New System.Drawing.Size(594, 55) + Me.ucrTryCalculator.Size = New System.Drawing.Size(495, 46) Me.ucrTryCalculator.TabIndex = 194 ' 'ucrInputCalOptions @@ -7321,10 +7223,10 @@ 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(339, 62) - Me.ucrInputCalOptions.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.ucrInputCalOptions.Location = New System.Drawing.Point(282, 52) + Me.ucrInputCalOptions.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.ucrInputCalOptions.Name = "ucrInputCalOptions" - Me.ucrInputCalOptions.Size = New System.Drawing.Size(206, 33) + Me.ucrInputCalOptions.Size = New System.Drawing.Size(172, 28) Me.ucrInputCalOptions.TabIndex = 180 ' 'ucrSelectorForCalculations @@ -7333,50 +7235,50 @@ Partial Class ucrCalculator Me.ucrSelectorForCalculations.bDropUnusedFilterLevels = False Me.ucrSelectorForCalculations.bShowHiddenColumns = False Me.ucrSelectorForCalculations.bUseCurrentFilter = True - Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 96) + Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 80) Me.ucrSelectorForCalculations.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForCalculations.Name = "ucrSelectorForCalculations" - Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(267, 228) Me.ucrSelectorForCalculations.TabIndex = 173 ' 'ucrReceiverForCalculation ' Me.ucrReceiverForCalculation.AutoSize = True Me.ucrReceiverForCalculation.frmParent = Nothing - Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(105, 9) - Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(88, 8) + Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.ucrReceiverForCalculation.Name = "ucrReceiverForCalculation" Me.ucrReceiverForCalculation.Selector = Nothing - Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(586, 44) + Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(488, 37) Me.ucrReceiverForCalculation.strNcFilePath = "" Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' 'ucrCalculator ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.Controls.Add(Me.cmdRhelpList) - Me.Controls.Add(Me.grpList) - Me.Controls.Add(Me.grpProbabilty) - Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) Me.Controls.Add(Me.ucrSaveResultInto) Me.Controls.Add(Me.ucrTryCalculator) - Me.Controls.Add(Me.grpSymbols) Me.Controls.Add(Me.chkShowParameters) Me.Controls.Add(Me.ucrInputCalOptions) Me.Controls.Add(Me.grpBasic) Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) + Me.Controls.Add(Me.grpList) + Me.Controls.Add(Me.grpProbabilty) + Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.grpTestString) - Me.Controls.Add(Me.grpModifier) Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpWakefield) + Me.Controls.Add(Me.grpModifier) + Me.Controls.Add(Me.grpSymbols) Me.Controls.Add(Me.grpTransform) Me.Controls.Add(Me.grpLogical) Me.Controls.Add(Me.grpDates) @@ -7384,9 +7286,8 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpFactor) Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpMaths) - Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "ucrCalculator" - Me.Size = New System.Drawing.Size(1348, 686) + Me.Size = New System.Drawing.Size(1123, 572) Me.grpBasic.ResumeLayout(False) Me.grpDates.ResumeLayout(False) Me.grpDates.PerformLayout() From 8ea2d0589fd282106dd3472cdeade440b5341306 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Wed, 6 Mar 2024 15:06:21 +0300 Subject: [PATCH 26/31] changes to the code --- instat/dlgScript.Designer.vb | 753 +++++++++++++++++++---------------- instat/dlgScript.vb | 45 ++- 2 files changed, 438 insertions(+), 360 deletions(-) diff --git a/instat/dlgScript.Designer.vb b/instat/dlgScript.Designer.vb index abe8f61287a..aa3987e2b19 100644 --- a/instat/dlgScript.Designer.vb +++ b/instat/dlgScript.Designer.vb @@ -24,67 +24,70 @@ Partial Class dlgScript Private Sub InitializeComponent() Me.tbFeatures = New System.Windows.Forms.TabControl() Me.tbPageSaveData = New System.Windows.Forms.TabPage() - Me.ucrChkDisplayGraph = New instat.ucrCheck() - Me.ucrChkSaveDataFrameSingle = New instat.ucrCheck() - Me.lblSaveDataFrame = New System.Windows.Forms.Label() - Me.ucrInputSaveDataFrame = New instat.ucrInputTextBox() + Me.rdoFromRFile = New System.Windows.Forms.RadioButton() + Me.rdoDataFrame = New System.Windows.Forms.RadioButton() Me.lblSaveObjectFormat = New System.Windows.Forms.Label() - Me.ucrCboSaveOutputObjectFormat = New instat.ucrInputComboBox() Me.lblSaveObjectType = New System.Windows.Forms.Label() - Me.ucrCboSaveOutputObjectType = New instat.ucrInputComboBox() Me.rdoSaveOutputObject = New System.Windows.Forms.RadioButton() Me.rdoSaveDataFrame = New System.Windows.Forms.RadioButton() Me.rdoSaveColumn = New System.Windows.Forms.RadioButton() - Me.ucrSaveObject = New instat.ucrSave() - Me.ucrDataFrameSaveOutputSelect = New instat.ucrDataFrame() - Me.ucrPnlSaveData = New instat.UcrPanel() Me.tbPageGetData = New System.Windows.Forms.TabPage() - Me.ucrReceiverGetOutputObject = New instat.ucrReceiverSingle() - Me.ucrReceiverGetColumns = New instat.ucrReceiverMultiple() Me.lblGetColumn = New System.Windows.Forms.Label() Me.lblGetObjectType = New System.Windows.Forms.Label() Me.rdoGetOutputObject = New System.Windows.Forms.RadioButton() Me.lblGetOutputObject = New System.Windows.Forms.Label() Me.rdoGetDataFrame = New System.Windows.Forms.RadioButton() Me.rdoGetColumn = New System.Windows.Forms.RadioButton() - Me.ucrDataFrameGetDF = New instat.ucrDataFrame() - Me.ucrCboGetOutputObjectType = New instat.ucrInputComboBox() - Me.ucrPnlGetData = New instat.UcrPanel() - Me.ucrSelectorGetObject = New instat.ucrSelectorByDataFrameAddRemove() Me.tbPageCommand = New System.Windows.Forms.TabPage() - Me.ucrChkWindow = New instat.ucrCheck() Me.rdoWindow = New System.Windows.Forms.RadioButton() - Me.ucrChkInto = New instat.ucrCheck() Me.rdoListData = New System.Windows.Forms.RadioButton() - Me.ucrInputSaveData = New instat.ucrInputTextBox() - Me.ucrCboCommandDataPackage = New instat.ucrInputComboBox() - Me.ucrInputViewData = New instat.ucrInputTextBox() Me.rdoViewData = New System.Windows.Forms.RadioButton() Me.lblGraphCommand = New System.Windows.Forms.Label() - Me.ucrInputGraphCommand = New instat.ucrInputTextBox() Me.lblGraphObject = New System.Windows.Forms.Label() - Me.ucrChkOpenRFile = New instat.ucrCheck() - Me.ucrInputChooseFile = New instat.ucrInputTextBox() Me.rdoChooseFile = New System.Windows.Forms.RadioButton() - Me.ucrInputGgplotify = New instat.ucrInputTextBox() Me.rdoGgplotify = New System.Windows.Forms.RadioButton() - Me.ucrInputRemoveObjects = New instat.ucrInputTextBox() Me.rdoCommandPackage = New System.Windows.Forms.RadioButton() Me.rdoCommandObject = New System.Windows.Forms.RadioButton() - Me.ucrCboCommandPackage = New instat.ucrInputComboBox() - Me.ucrPnlCommands = New instat.UcrPanel() Me.tbPageExamples = New System.Windows.Forms.TabPage() Me.cmdHelp = New System.Windows.Forms.Button() Me.rdoExampleData = New System.Windows.Forms.RadioButton() Me.rdoExampleFunction = New System.Windows.Forms.RadioButton() - Me.ucrPnlExample = New instat.UcrPanel() Me.lstExampleCollection = New System.Windows.Forms.ListView() Me.clmDatasets = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.clmDesc = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.Label3 = New System.Windows.Forms.Label() - Me.ucrCboExamplePackages = New instat.ucrInputComboBox() Me.lblPreview = New System.Windows.Forms.Label() Me.txtScript = New System.Windows.Forms.TextBox() + Me.ucrInputSaveRFile = New instat.ucrInputTextBox() + Me.ucrChkDisplayGraph = New instat.ucrCheck() + Me.ucrChkSaveDataFrameSingle = New instat.ucrCheck() + Me.ucrInputSaveDataFrame = New instat.ucrInputTextBox() + Me.ucrCboSaveOutputObjectFormat = New instat.ucrInputComboBox() + Me.ucrCboSaveOutputObjectType = New instat.ucrInputComboBox() + Me.ucrSaveObject = New instat.ucrSave() + Me.ucrDataFrameSaveOutputSelect = New instat.ucrDataFrame() + Me.ucrPnlSaveData = New instat.UcrPanel() + Me.ucrPnlSaveDataFrame = New instat.UcrPanel() + Me.ucrReceiverGetOutputObject = New instat.ucrReceiverSingle() + Me.ucrReceiverGetColumns = New instat.ucrReceiverMultiple() + Me.ucrDataFrameGetDF = New instat.ucrDataFrame() + Me.ucrCboGetOutputObjectType = New instat.ucrInputComboBox() + Me.ucrPnlGetData = New instat.UcrPanel() + Me.ucrSelectorGetObject = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrChkWindow = New instat.ucrCheck() + Me.ucrChkInto = New instat.ucrCheck() + Me.ucrInputSaveData = New instat.ucrInputTextBox() + Me.ucrCboCommandDataPackage = New instat.ucrInputComboBox() + Me.ucrInputViewData = New instat.ucrInputTextBox() + Me.ucrInputGraphCommand = New instat.ucrInputTextBox() + Me.ucrChkOpenRFile = New instat.ucrCheck() + Me.ucrInputChooseFile = New instat.ucrInputTextBox() + Me.ucrInputGgplotify = New instat.ucrInputTextBox() + Me.ucrInputRemoveObjects = New instat.ucrInputTextBox() + Me.ucrCboCommandPackage = New instat.ucrInputComboBox() + Me.ucrPnlCommands = New instat.UcrPanel() + Me.ucrPnlExample = New instat.UcrPanel() + Me.ucrCboExamplePackages = New instat.ucrInputComboBox() Me.ucrBase = New instat.ucrButtons() Me.tbFeatures.SuspendLayout() Me.tbPageSaveData.SuspendLayout() @@ -107,9 +110,11 @@ Partial Class dlgScript ' 'tbPageSaveData ' + Me.tbPageSaveData.Controls.Add(Me.ucrInputSaveRFile) + Me.tbPageSaveData.Controls.Add(Me.rdoFromRFile) + Me.tbPageSaveData.Controls.Add(Me.rdoDataFrame) Me.tbPageSaveData.Controls.Add(Me.ucrChkDisplayGraph) Me.tbPageSaveData.Controls.Add(Me.ucrChkSaveDataFrameSingle) - Me.tbPageSaveData.Controls.Add(Me.lblSaveDataFrame) Me.tbPageSaveData.Controls.Add(Me.ucrInputSaveDataFrame) Me.tbPageSaveData.Controls.Add(Me.lblSaveObjectFormat) Me.tbPageSaveData.Controls.Add(Me.ucrCboSaveOutputObjectFormat) @@ -121,6 +126,7 @@ Partial Class dlgScript Me.tbPageSaveData.Controls.Add(Me.ucrSaveObject) Me.tbPageSaveData.Controls.Add(Me.ucrDataFrameSaveOutputSelect) Me.tbPageSaveData.Controls.Add(Me.ucrPnlSaveData) + Me.tbPageSaveData.Controls.Add(Me.ucrPnlSaveDataFrame) Me.tbPageSaveData.Location = New System.Drawing.Point(4, 22) Me.tbPageSaveData.Name = "tbPageSaveData" Me.tbPageSaveData.Size = New System.Drawing.Size(438, 245) @@ -128,44 +134,29 @@ Partial Class dlgScript Me.tbPageSaveData.Text = "Save Data" Me.tbPageSaveData.UseVisualStyleBackColor = True ' - 'ucrChkDisplayGraph - ' - Me.ucrChkDisplayGraph.AutoSize = True - Me.ucrChkDisplayGraph.Checked = False - Me.ucrChkDisplayGraph.Location = New System.Drawing.Point(88, 217) - Me.ucrChkDisplayGraph.Name = "ucrChkDisplayGraph" - Me.ucrChkDisplayGraph.Size = New System.Drawing.Size(113, 23) - Me.ucrChkDisplayGraph.TabIndex = 60 - ' - 'ucrChkSaveDataFrameSingle - ' - Me.ucrChkSaveDataFrameSingle.AutoSize = True - Me.ucrChkSaveDataFrameSingle.Checked = False - Me.ucrChkSaveDataFrameSingle.Location = New System.Drawing.Point(91, 101) - Me.ucrChkSaveDataFrameSingle.Name = "ucrChkSaveDataFrameSingle" - Me.ucrChkSaveDataFrameSingle.Size = New System.Drawing.Size(146, 23) - Me.ucrChkSaveDataFrameSingle.TabIndex = 59 - ' - 'lblSaveDataFrame - ' - Me.lblSaveDataFrame.AutoSize = True - Me.lblSaveDataFrame.Location = New System.Drawing.Point(89, 52) - Me.lblSaveDataFrame.Name = "lblSaveDataFrame" - Me.lblSaveDataFrame.Size = New System.Drawing.Size(65, 13) - Me.lblSaveDataFrame.TabIndex = 58 - Me.lblSaveDataFrame.Text = "Data Frame:" - ' - 'ucrInputSaveDataFrame - ' - Me.ucrInputSaveDataFrame.AddQuotesIfUnrecognised = True - Me.ucrInputSaveDataFrame.AutoSize = True - Me.ucrInputSaveDataFrame.IsMultiline = False - Me.ucrInputSaveDataFrame.IsReadOnly = False - Me.ucrInputSaveDataFrame.Location = New System.Drawing.Point(92, 70) - Me.ucrInputSaveDataFrame.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSaveDataFrame.Name = "ucrInputSaveDataFrame" - Me.ucrInputSaveDataFrame.Size = New System.Drawing.Size(145, 21) - Me.ucrInputSaveDataFrame.TabIndex = 57 + 'rdoFromRFile + ' + Me.rdoFromRFile.AutoSize = True + Me.rdoFromRFile.Location = New System.Drawing.Point(89, 125) + Me.rdoFromRFile.Margin = New System.Windows.Forms.Padding(2) + Me.rdoFromRFile.Name = "rdoFromRFile" + Me.rdoFromRFile.Size = New System.Drawing.Size(81, 17) + Me.rdoFromRFile.TabIndex = 63 + Me.rdoFromRFile.TabStop = True + Me.rdoFromRFile.Text = "From R File:" + Me.rdoFromRFile.UseVisualStyleBackColor = True + ' + 'rdoDataFrame + ' + Me.rdoDataFrame.AutoSize = True + Me.rdoDataFrame.Location = New System.Drawing.Point(83, 48) + Me.rdoDataFrame.Margin = New System.Windows.Forms.Padding(2) + Me.rdoDataFrame.Name = "rdoDataFrame" + Me.rdoDataFrame.Size = New System.Drawing.Size(109, 17) + Me.rdoDataFrame.TabIndex = 62 + Me.rdoDataFrame.TabStop = True + Me.rdoDataFrame.Text = "From Data Frame:" + Me.rdoDataFrame.UseVisualStyleBackColor = True ' 'lblSaveObjectFormat ' @@ -176,18 +167,6 @@ Partial Class dlgScript Me.lblSaveObjectFormat.TabIndex = 56 Me.lblSaveObjectFormat.Text = "Format:" ' - 'ucrCboSaveOutputObjectFormat - ' - Me.ucrCboSaveOutputObjectFormat.AddQuotesIfUnrecognised = True - Me.ucrCboSaveOutputObjectFormat.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboSaveOutputObjectFormat.GetSetSelectedIndex = -1 - Me.ucrCboSaveOutputObjectFormat.IsReadOnly = False - Me.ucrCboSaveOutputObjectFormat.Location = New System.Drawing.Point(88, 160) - Me.ucrCboSaveOutputObjectFormat.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboSaveOutputObjectFormat.Name = "ucrCboSaveOutputObjectFormat" - Me.ucrCboSaveOutputObjectFormat.Size = New System.Drawing.Size(141, 21) - Me.ucrCboSaveOutputObjectFormat.TabIndex = 55 - ' 'lblSaveObjectType ' Me.lblSaveObjectType.AutoSize = True @@ -197,18 +176,6 @@ Partial Class dlgScript Me.lblSaveObjectType.TabIndex = 54 Me.lblSaveObjectType.Text = "Type:" ' - 'ucrCboSaveOutputObjectType - ' - Me.ucrCboSaveOutputObjectType.AddQuotesIfUnrecognised = True - Me.ucrCboSaveOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboSaveOutputObjectType.GetSetSelectedIndex = -1 - Me.ucrCboSaveOutputObjectType.IsReadOnly = False - Me.ucrCboSaveOutputObjectType.Location = New System.Drawing.Point(87, 116) - Me.ucrCboSaveOutputObjectType.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboSaveOutputObjectType.Name = "ucrCboSaveOutputObjectType" - Me.ucrCboSaveOutputObjectType.Size = New System.Drawing.Size(144, 21) - Me.ucrCboSaveOutputObjectType.TabIndex = 53 - ' 'rdoSaveOutputObject ' Me.rdoSaveOutputObject.Appearance = System.Windows.Forms.Appearance.Button @@ -260,35 +227,6 @@ Partial Class dlgScript Me.rdoSaveColumn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoSaveColumn.UseVisualStyleBackColor = True ' - 'ucrSaveObject - ' - Me.ucrSaveObject.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveObject.Location = New System.Drawing.Point(88, 193) - Me.ucrSaveObject.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveObject.Name = "ucrSaveObject" - Me.ucrSaveObject.Size = New System.Drawing.Size(258, 22) - Me.ucrSaveObject.TabIndex = 35 - ' - 'ucrDataFrameSaveOutputSelect - ' - Me.ucrDataFrameSaveOutputSelect.AutoSize = True - Me.ucrDataFrameSaveOutputSelect.bDropUnusedFilterLevels = False - Me.ucrDataFrameSaveOutputSelect.bUseCurrentFilter = True - Me.ucrDataFrameSaveOutputSelect.Location = New System.Drawing.Point(86, 54) - Me.ucrDataFrameSaveOutputSelect.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFrameSaveOutputSelect.Name = "ucrDataFrameSaveOutputSelect" - Me.ucrDataFrameSaveOutputSelect.Size = New System.Drawing.Size(224, 59) - Me.ucrDataFrameSaveOutputSelect.TabIndex = 29 - ' - 'ucrPnlSaveData - ' - Me.ucrPnlSaveData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSaveData.Location = New System.Drawing.Point(13, 12) - Me.ucrPnlSaveData.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlSaveData.Name = "ucrPnlSaveData" - Me.ucrPnlSaveData.Size = New System.Drawing.Size(402, 36) - Me.ucrPnlSaveData.TabIndex = 47 - ' 'tbPageGetData ' Me.tbPageGetData.Controls.Add(Me.ucrReceiverGetOutputObject) @@ -311,32 +249,6 @@ Partial Class dlgScript Me.tbPageGetData.Text = "Get Data" Me.tbPageGetData.UseVisualStyleBackColor = True ' - 'ucrReceiverGetOutputObject - ' - Me.ucrReceiverGetOutputObject.AutoSize = True - Me.ucrReceiverGetOutputObject.frmParent = Nothing - Me.ucrReceiverGetOutputObject.Location = New System.Drawing.Point(240, 117) - Me.ucrReceiverGetOutputObject.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverGetOutputObject.Name = "ucrReceiverGetOutputObject" - Me.ucrReceiverGetOutputObject.Selector = Nothing - Me.ucrReceiverGetOutputObject.Size = New System.Drawing.Size(138, 20) - Me.ucrReceiverGetOutputObject.strNcFilePath = "" - Me.ucrReceiverGetOutputObject.TabIndex = 27 - Me.ucrReceiverGetOutputObject.ucrSelector = Nothing - ' - 'ucrReceiverGetColumns - ' - Me.ucrReceiverGetColumns.AutoSize = True - Me.ucrReceiverGetColumns.frmParent = Nothing - Me.ucrReceiverGetColumns.Location = New System.Drawing.Point(243, 104) - Me.ucrReceiverGetColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverGetColumns.Name = "ucrReceiverGetColumns" - Me.ucrReceiverGetColumns.Selector = Nothing - Me.ucrReceiverGetColumns.Size = New System.Drawing.Size(137, 105) - Me.ucrReceiverGetColumns.strNcFilePath = "" - Me.ucrReceiverGetColumns.TabIndex = 49 - Me.ucrReceiverGetColumns.ucrSelector = Nothing - ' 'lblGetColumn ' Me.lblGetColumn.AutoSize = True @@ -417,71 +329,27 @@ Partial Class dlgScript Me.rdoGetColumn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoGetColumn.UseVisualStyleBackColor = True ' - 'ucrDataFrameGetDF - ' - Me.ucrDataFrameGetDF.AutoSize = True - Me.ucrDataFrameGetDF.bDropUnusedFilterLevels = False - Me.ucrDataFrameGetDF.bUseCurrentFilter = True - Me.ucrDataFrameGetDF.Location = New System.Drawing.Point(81, 55) - Me.ucrDataFrameGetDF.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFrameGetDF.Name = "ucrDataFrameGetDF" - Me.ucrDataFrameGetDF.Size = New System.Drawing.Size(224, 59) - Me.ucrDataFrameGetDF.TabIndex = 31 - ' - 'ucrCboGetOutputObjectType - ' - Me.ucrCboGetOutputObjectType.AddQuotesIfUnrecognised = True - Me.ucrCboGetOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboGetOutputObjectType.GetSetSelectedIndex = -1 - Me.ucrCboGetOutputObjectType.IsReadOnly = False - Me.ucrCboGetOutputObjectType.Location = New System.Drawing.Point(241, 72) - Me.ucrCboGetOutputObjectType.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboGetOutputObjectType.Name = "ucrCboGetOutputObjectType" - Me.ucrCboGetOutputObjectType.Size = New System.Drawing.Size(137, 21) - Me.ucrCboGetOutputObjectType.TabIndex = 47 - ' - 'ucrPnlGetData - ' - Me.ucrPnlGetData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGetData.Location = New System.Drawing.Point(5, 10) - Me.ucrPnlGetData.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlGetData.Name = "ucrPnlGetData" - Me.ucrPnlGetData.Size = New System.Drawing.Size(402, 36) - Me.ucrPnlGetData.TabIndex = 42 - ' - 'ucrSelectorGetObject - ' - Me.ucrSelectorGetObject.AutoSize = True - Me.ucrSelectorGetObject.bDropUnusedFilterLevels = False - Me.ucrSelectorGetObject.bShowHiddenColumns = False - Me.ucrSelectorGetObject.bUseCurrentFilter = True - Me.ucrSelectorGetObject.Location = New System.Drawing.Point(9, 52) - Me.ucrSelectorGetObject.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorGetObject.Name = "ucrSelectorGetObject" - Me.ucrSelectorGetObject.Size = New System.Drawing.Size(320, 274) - Me.ucrSelectorGetObject.TabIndex = 34 - ' 'tbPageCommand ' Me.tbPageCommand.Controls.Add(Me.ucrChkWindow) Me.tbPageCommand.Controls.Add(Me.rdoWindow) - Me.tbPageCommand.Controls.Add(Me.ucrChkInto) Me.tbPageCommand.Controls.Add(Me.rdoListData) + Me.tbPageCommand.Controls.Add(Me.rdoViewData) + Me.tbPageCommand.Controls.Add(Me.lblGraphCommand) + Me.tbPageCommand.Controls.Add(Me.lblGraphObject) + Me.tbPageCommand.Controls.Add(Me.rdoChooseFile) + Me.tbPageCommand.Controls.Add(Me.rdoGgplotify) + Me.tbPageCommand.Controls.Add(Me.rdoCommandPackage) + Me.tbPageCommand.Controls.Add(Me.rdoCommandObject) + Me.tbPageCommand.Controls.Add(Me.ucrChkInto) Me.tbPageCommand.Controls.Add(Me.ucrInputSaveData) Me.tbPageCommand.Controls.Add(Me.ucrCboCommandDataPackage) Me.tbPageCommand.Controls.Add(Me.ucrInputViewData) - Me.tbPageCommand.Controls.Add(Me.rdoViewData) - Me.tbPageCommand.Controls.Add(Me.lblGraphCommand) Me.tbPageCommand.Controls.Add(Me.ucrInputGraphCommand) - Me.tbPageCommand.Controls.Add(Me.lblGraphObject) Me.tbPageCommand.Controls.Add(Me.ucrChkOpenRFile) Me.tbPageCommand.Controls.Add(Me.ucrInputChooseFile) - Me.tbPageCommand.Controls.Add(Me.rdoChooseFile) Me.tbPageCommand.Controls.Add(Me.ucrInputGgplotify) - Me.tbPageCommand.Controls.Add(Me.rdoGgplotify) Me.tbPageCommand.Controls.Add(Me.ucrInputRemoveObjects) - Me.tbPageCommand.Controls.Add(Me.rdoCommandPackage) - Me.tbPageCommand.Controls.Add(Me.rdoCommandObject) Me.tbPageCommand.Controls.Add(Me.ucrCboCommandPackage) Me.tbPageCommand.Controls.Add(Me.ucrPnlCommands) Me.tbPageCommand.Location = New System.Drawing.Point(4, 22) @@ -491,15 +359,6 @@ Partial Class dlgScript Me.tbPageCommand.Text = "Commands" Me.tbPageCommand.UseVisualStyleBackColor = True ' - 'ucrChkWindow - ' - Me.ucrChkWindow.AutoSize = True - Me.ucrChkWindow.Checked = False - Me.ucrChkWindow.Location = New System.Drawing.Point(233, 94) - Me.ucrChkWindow.Name = "ucrChkWindow" - Me.ucrChkWindow.Size = New System.Drawing.Size(126, 23) - Me.ucrChkWindow.TabIndex = 67 - ' 'rdoWindow ' Me.rdoWindow.AutoSize = True @@ -512,15 +371,6 @@ Partial Class dlgScript Me.rdoWindow.Text = "Output Graph Window:" Me.rdoWindow.UseVisualStyleBackColor = True ' - 'ucrChkInto - ' - Me.ucrChkInto.AutoSize = True - Me.ucrChkInto.Checked = False - Me.ucrChkInto.Location = New System.Drawing.Point(233, 33) - Me.ucrChkInto.Name = "ucrChkInto" - Me.ucrChkInto.Size = New System.Drawing.Size(84, 23) - Me.ucrChkInto.TabIndex = 63 - ' 'rdoListData ' Me.rdoListData.AutoSize = True @@ -533,43 +383,7 @@ Partial Class dlgScript Me.rdoListData.Text = "List Data:" Me.rdoListData.UseVisualStyleBackColor = True ' - 'ucrInputSaveData - ' - Me.ucrInputSaveData.AddQuotesIfUnrecognised = True - Me.ucrInputSaveData.AutoSize = True - Me.ucrInputSaveData.IsMultiline = False - Me.ucrInputSaveData.IsReadOnly = False - Me.ucrInputSaveData.Location = New System.Drawing.Point(319, 31) - Me.ucrInputSaveData.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSaveData.Name = "ucrInputSaveData" - Me.ucrInputSaveData.Size = New System.Drawing.Size(110, 21) - Me.ucrInputSaveData.TabIndex = 60 - ' - 'ucrCboCommandDataPackage - ' - Me.ucrCboCommandDataPackage.AddQuotesIfUnrecognised = True - Me.ucrCboCommandDataPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboCommandDataPackage.GetSetSelectedIndex = -1 - Me.ucrCboCommandDataPackage.IsReadOnly = False - Me.ucrCboCommandDataPackage.Location = New System.Drawing.Point(109, 31) - Me.ucrCboCommandDataPackage.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboCommandDataPackage.Name = "ucrCboCommandDataPackage" - Me.ucrCboCommandDataPackage.Size = New System.Drawing.Size(117, 21) - Me.ucrCboCommandDataPackage.TabIndex = 59 - ' - 'ucrInputViewData - ' - Me.ucrInputViewData.AddQuotesIfUnrecognised = True - Me.ucrInputViewData.AutoSize = True - Me.ucrInputViewData.IsMultiline = False - Me.ucrInputViewData.IsReadOnly = False - Me.ucrInputViewData.Location = New System.Drawing.Point(156, 129) - Me.ucrInputViewData.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputViewData.Name = "ucrInputViewData" - Me.ucrInputViewData.Size = New System.Drawing.Size(145, 21) - Me.ucrInputViewData.TabIndex = 57 - ' - 'rdoViewData + 'rdoViewData ' Me.rdoViewData.AutoSize = True Me.rdoViewData.Location = New System.Drawing.Point(25, 129) @@ -590,18 +404,6 @@ Partial Class dlgScript Me.lblGraphCommand.TabIndex = 56 Me.lblGraphCommand.Text = "Graph Command:" ' - 'ucrInputGraphCommand - ' - Me.ucrInputGraphCommand.AddQuotesIfUnrecognised = True - Me.ucrInputGraphCommand.AutoSize = True - Me.ucrInputGraphCommand.IsMultiline = False - Me.ucrInputGraphCommand.IsReadOnly = False - Me.ucrInputGraphCommand.Location = New System.Drawing.Point(247, 161) - Me.ucrInputGraphCommand.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputGraphCommand.Name = "ucrInputGraphCommand" - Me.ucrInputGraphCommand.Size = New System.Drawing.Size(145, 21) - Me.ucrInputGraphCommand.TabIndex = 55 - ' 'lblGraphObject ' Me.lblGraphObject.AutoSize = True @@ -611,27 +413,6 @@ Partial Class dlgScript Me.lblGraphObject.TabIndex = 54 Me.lblGraphObject.Text = "Graph Object:" ' - 'ucrChkOpenRFile - ' - Me.ucrChkOpenRFile.AutoSize = True - Me.ucrChkOpenRFile.Checked = False - Me.ucrChkOpenRFile.Location = New System.Drawing.Point(156, 64) - Me.ucrChkOpenRFile.Name = "ucrChkOpenRFile" - Me.ucrChkOpenRFile.Size = New System.Drawing.Size(100, 23) - Me.ucrChkOpenRFile.TabIndex = 53 - ' - 'ucrInputChooseFile - ' - Me.ucrInputChooseFile.AddQuotesIfUnrecognised = True - Me.ucrInputChooseFile.AutoSize = True - Me.ucrInputChooseFile.IsMultiline = False - Me.ucrInputChooseFile.IsReadOnly = False - Me.ucrInputChooseFile.Location = New System.Drawing.Point(265, 64) - Me.ucrInputChooseFile.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputChooseFile.Name = "ucrInputChooseFile" - Me.ucrInputChooseFile.Size = New System.Drawing.Size(145, 21) - Me.ucrInputChooseFile.TabIndex = 51 - ' 'rdoChooseFile ' Me.rdoChooseFile.AutoSize = True @@ -644,18 +425,6 @@ Partial Class dlgScript Me.rdoChooseFile.Text = "Choose File:" Me.rdoChooseFile.UseVisualStyleBackColor = True ' - 'ucrInputGgplotify - ' - Me.ucrInputGgplotify.AddQuotesIfUnrecognised = True - Me.ucrInputGgplotify.AutoSize = True - Me.ucrInputGgplotify.IsMultiline = False - Me.ucrInputGgplotify.IsReadOnly = False - Me.ucrInputGgplotify.Location = New System.Drawing.Point(247, 186) - Me.ucrInputGgplotify.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputGgplotify.Name = "ucrInputGgplotify" - Me.ucrInputGgplotify.Size = New System.Drawing.Size(145, 21) - Me.ucrInputGgplotify.TabIndex = 49 - ' 'rdoGgplotify ' Me.rdoGgplotify.AutoSize = True @@ -668,18 +437,6 @@ Partial Class dlgScript Me.rdoGgplotify.Text = "Ggplotify:" Me.rdoGgplotify.UseVisualStyleBackColor = True ' - 'ucrInputRemoveObjects - ' - Me.ucrInputRemoveObjects.AddQuotesIfUnrecognised = True - Me.ucrInputRemoveObjects.AutoSize = True - Me.ucrInputRemoveObjects.IsMultiline = False - Me.ucrInputRemoveObjects.IsReadOnly = False - Me.ucrInputRemoveObjects.Location = New System.Drawing.Point(156, 218) - Me.ucrInputRemoveObjects.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputRemoveObjects.Name = "ucrInputRemoveObjects" - Me.ucrInputRemoveObjects.Size = New System.Drawing.Size(145, 21) - Me.ucrInputRemoveObjects.TabIndex = 2 - ' 'rdoCommandPackage ' Me.rdoCommandPackage.AutoSize = True @@ -704,27 +461,6 @@ Partial Class dlgScript Me.rdoCommandObject.Text = "Remove Object(s):" Me.rdoCommandObject.UseVisualStyleBackColor = True ' - 'ucrCboCommandPackage - ' - Me.ucrCboCommandPackage.AddQuotesIfUnrecognised = True - Me.ucrCboCommandPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboCommandPackage.GetSetSelectedIndex = -1 - Me.ucrCboCommandPackage.IsReadOnly = False - Me.ucrCboCommandPackage.Location = New System.Drawing.Point(156, 5) - Me.ucrCboCommandPackage.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboCommandPackage.Name = "ucrCboCommandPackage" - Me.ucrCboCommandPackage.Size = New System.Drawing.Size(137, 21) - Me.ucrCboCommandPackage.TabIndex = 44 - ' - 'ucrPnlCommands - ' - Me.ucrPnlCommands.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlCommands.Location = New System.Drawing.Point(2, 8) - Me.ucrPnlCommands.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlCommands.Name = "ucrPnlCommands" - Me.ucrPnlCommands.Size = New System.Drawing.Size(429, 238) - Me.ucrPnlCommands.TabIndex = 47 - ' 'tbPageExamples ' Me.tbPageExamples.Controls.Add(Me.cmdHelp) @@ -784,15 +520,6 @@ Partial Class dlgScript Me.rdoExampleFunction.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoExampleFunction.UseVisualStyleBackColor = True ' - 'ucrPnlExample - ' - Me.ucrPnlExample.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlExample.Location = New System.Drawing.Point(7, 51) - Me.ucrPnlExample.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlExample.Name = "ucrPnlExample" - Me.ucrPnlExample.Size = New System.Drawing.Size(402, 34) - Me.ucrPnlExample.TabIndex = 56 - ' 'lstExampleCollection ' Me.lstExampleCollection.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.clmDatasets, Me.clmDesc}) @@ -829,18 +556,6 @@ Partial Class dlgScript Me.Label3.TabIndex = 52 Me.Label3.Text = "Package" ' - 'ucrCboExamplePackages - ' - Me.ucrCboExamplePackages.AddQuotesIfUnrecognised = True - Me.ucrCboExamplePackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboExamplePackages.GetSetSelectedIndex = -1 - Me.ucrCboExamplePackages.IsReadOnly = False - Me.ucrCboExamplePackages.Location = New System.Drawing.Point(14, 22) - Me.ucrCboExamplePackages.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboExamplePackages.Name = "ucrCboExamplePackages" - Me.ucrCboExamplePackages.Size = New System.Drawing.Size(137, 21) - Me.ucrCboExamplePackages.TabIndex = 51 - ' 'lblPreview ' Me.lblPreview.AutoSize = True @@ -860,6 +575,333 @@ Partial Class dlgScript Me.txtScript.Size = New System.Drawing.Size(445, 96) Me.txtScript.TabIndex = 32 ' + 'ucrInputSaveRFile + ' + Me.ucrInputSaveRFile.AddQuotesIfUnrecognised = True + Me.ucrInputSaveRFile.AutoSize = True + Me.ucrInputSaveRFile.IsMultiline = False + Me.ucrInputSaveRFile.IsReadOnly = False + Me.ucrInputSaveRFile.Location = New System.Drawing.Point(92, 150) + Me.ucrInputSaveRFile.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSaveRFile.Name = "ucrInputSaveRFile" + Me.ucrInputSaveRFile.Size = New System.Drawing.Size(145, 21) + Me.ucrInputSaveRFile.TabIndex = 64 + ' + 'ucrChkDisplayGraph + ' + Me.ucrChkDisplayGraph.AutoSize = True + Me.ucrChkDisplayGraph.Checked = False + Me.ucrChkDisplayGraph.Location = New System.Drawing.Point(88, 217) + Me.ucrChkDisplayGraph.Name = "ucrChkDisplayGraph" + Me.ucrChkDisplayGraph.Size = New System.Drawing.Size(113, 23) + Me.ucrChkDisplayGraph.TabIndex = 60 + ' + 'ucrChkSaveDataFrameSingle + ' + Me.ucrChkSaveDataFrameSingle.AutoSize = True + Me.ucrChkSaveDataFrameSingle.Checked = False + Me.ucrChkSaveDataFrameSingle.Location = New System.Drawing.Point(91, 101) + Me.ucrChkSaveDataFrameSingle.Name = "ucrChkSaveDataFrameSingle" + Me.ucrChkSaveDataFrameSingle.Size = New System.Drawing.Size(146, 23) + Me.ucrChkSaveDataFrameSingle.TabIndex = 59 + ' + 'ucrInputSaveDataFrame + ' + Me.ucrInputSaveDataFrame.AddQuotesIfUnrecognised = True + Me.ucrInputSaveDataFrame.AutoSize = True + Me.ucrInputSaveDataFrame.IsMultiline = False + Me.ucrInputSaveDataFrame.IsReadOnly = False + Me.ucrInputSaveDataFrame.Location = New System.Drawing.Point(92, 70) + Me.ucrInputSaveDataFrame.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSaveDataFrame.Name = "ucrInputSaveDataFrame" + Me.ucrInputSaveDataFrame.Size = New System.Drawing.Size(145, 21) + Me.ucrInputSaveDataFrame.TabIndex = 57 + ' + 'ucrCboSaveOutputObjectFormat + ' + Me.ucrCboSaveOutputObjectFormat.AddQuotesIfUnrecognised = True + Me.ucrCboSaveOutputObjectFormat.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSaveOutputObjectFormat.GetSetSelectedIndex = -1 + Me.ucrCboSaveOutputObjectFormat.IsReadOnly = False + Me.ucrCboSaveOutputObjectFormat.Location = New System.Drawing.Point(88, 160) + Me.ucrCboSaveOutputObjectFormat.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboSaveOutputObjectFormat.Name = "ucrCboSaveOutputObjectFormat" + Me.ucrCboSaveOutputObjectFormat.Size = New System.Drawing.Size(141, 21) + Me.ucrCboSaveOutputObjectFormat.TabIndex = 55 + ' + 'ucrCboSaveOutputObjectType + ' + Me.ucrCboSaveOutputObjectType.AddQuotesIfUnrecognised = True + Me.ucrCboSaveOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSaveOutputObjectType.GetSetSelectedIndex = -1 + Me.ucrCboSaveOutputObjectType.IsReadOnly = False + Me.ucrCboSaveOutputObjectType.Location = New System.Drawing.Point(87, 116) + Me.ucrCboSaveOutputObjectType.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboSaveOutputObjectType.Name = "ucrCboSaveOutputObjectType" + Me.ucrCboSaveOutputObjectType.Size = New System.Drawing.Size(144, 21) + Me.ucrCboSaveOutputObjectType.TabIndex = 53 + ' + 'ucrSaveObject + ' + Me.ucrSaveObject.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveObject.Location = New System.Drawing.Point(88, 193) + Me.ucrSaveObject.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveObject.Name = "ucrSaveObject" + Me.ucrSaveObject.Size = New System.Drawing.Size(258, 22) + Me.ucrSaveObject.TabIndex = 35 + ' + 'ucrDataFrameSaveOutputSelect + ' + Me.ucrDataFrameSaveOutputSelect.AutoSize = True + Me.ucrDataFrameSaveOutputSelect.bDropUnusedFilterLevels = False + Me.ucrDataFrameSaveOutputSelect.bUseCurrentFilter = True + Me.ucrDataFrameSaveOutputSelect.Location = New System.Drawing.Point(86, 54) + Me.ucrDataFrameSaveOutputSelect.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFrameSaveOutputSelect.Name = "ucrDataFrameSaveOutputSelect" + Me.ucrDataFrameSaveOutputSelect.Size = New System.Drawing.Size(224, 59) + Me.ucrDataFrameSaveOutputSelect.TabIndex = 29 + ' + 'ucrPnlSaveData + ' + Me.ucrPnlSaveData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSaveData.Location = New System.Drawing.Point(13, 12) + Me.ucrPnlSaveData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlSaveData.Name = "ucrPnlSaveData" + Me.ucrPnlSaveData.Size = New System.Drawing.Size(402, 36) + Me.ucrPnlSaveData.TabIndex = 47 + ' + 'ucrPnlSaveDataFrame + ' + Me.ucrPnlSaveDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSaveDataFrame.Location = New System.Drawing.Point(5, 48) + Me.ucrPnlSaveDataFrame.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlSaveDataFrame.Name = "ucrPnlSaveDataFrame" + Me.ucrPnlSaveDataFrame.Size = New System.Drawing.Size(429, 134) + Me.ucrPnlSaveDataFrame.TabIndex = 65 + ' + 'ucrReceiverGetOutputObject + ' + Me.ucrReceiverGetOutputObject.AutoSize = True + Me.ucrReceiverGetOutputObject.frmParent = Nothing + Me.ucrReceiverGetOutputObject.Location = New System.Drawing.Point(240, 117) + Me.ucrReceiverGetOutputObject.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverGetOutputObject.Name = "ucrReceiverGetOutputObject" + Me.ucrReceiverGetOutputObject.Selector = Nothing + Me.ucrReceiverGetOutputObject.Size = New System.Drawing.Size(138, 20) + Me.ucrReceiverGetOutputObject.strNcFilePath = "" + Me.ucrReceiverGetOutputObject.TabIndex = 27 + Me.ucrReceiverGetOutputObject.ucrSelector = Nothing + ' + 'ucrReceiverGetColumns + ' + Me.ucrReceiverGetColumns.AutoSize = True + Me.ucrReceiverGetColumns.frmParent = Nothing + Me.ucrReceiverGetColumns.Location = New System.Drawing.Point(243, 104) + Me.ucrReceiverGetColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverGetColumns.Name = "ucrReceiverGetColumns" + Me.ucrReceiverGetColumns.Selector = Nothing + Me.ucrReceiverGetColumns.Size = New System.Drawing.Size(137, 105) + Me.ucrReceiverGetColumns.strNcFilePath = "" + Me.ucrReceiverGetColumns.TabIndex = 49 + Me.ucrReceiverGetColumns.ucrSelector = Nothing + ' + 'ucrDataFrameGetDF + ' + Me.ucrDataFrameGetDF.AutoSize = True + Me.ucrDataFrameGetDF.bDropUnusedFilterLevels = False + Me.ucrDataFrameGetDF.bUseCurrentFilter = True + Me.ucrDataFrameGetDF.Location = New System.Drawing.Point(81, 55) + Me.ucrDataFrameGetDF.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFrameGetDF.Name = "ucrDataFrameGetDF" + Me.ucrDataFrameGetDF.Size = New System.Drawing.Size(224, 59) + Me.ucrDataFrameGetDF.TabIndex = 31 + ' + 'ucrCboGetOutputObjectType + ' + Me.ucrCboGetOutputObjectType.AddQuotesIfUnrecognised = True + Me.ucrCboGetOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboGetOutputObjectType.GetSetSelectedIndex = -1 + Me.ucrCboGetOutputObjectType.IsReadOnly = False + Me.ucrCboGetOutputObjectType.Location = New System.Drawing.Point(241, 72) + Me.ucrCboGetOutputObjectType.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboGetOutputObjectType.Name = "ucrCboGetOutputObjectType" + Me.ucrCboGetOutputObjectType.Size = New System.Drawing.Size(137, 21) + Me.ucrCboGetOutputObjectType.TabIndex = 47 + ' + 'ucrPnlGetData + ' + Me.ucrPnlGetData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlGetData.Location = New System.Drawing.Point(5, 10) + Me.ucrPnlGetData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlGetData.Name = "ucrPnlGetData" + Me.ucrPnlGetData.Size = New System.Drawing.Size(402, 36) + Me.ucrPnlGetData.TabIndex = 42 + ' + 'ucrSelectorGetObject + ' + Me.ucrSelectorGetObject.AutoSize = True + Me.ucrSelectorGetObject.bDropUnusedFilterLevels = False + Me.ucrSelectorGetObject.bShowHiddenColumns = False + Me.ucrSelectorGetObject.bUseCurrentFilter = True + Me.ucrSelectorGetObject.Location = New System.Drawing.Point(9, 52) + Me.ucrSelectorGetObject.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorGetObject.Name = "ucrSelectorGetObject" + Me.ucrSelectorGetObject.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorGetObject.TabIndex = 34 + ' + 'ucrChkWindow + ' + Me.ucrChkWindow.AutoSize = True + Me.ucrChkWindow.Checked = False + Me.ucrChkWindow.Location = New System.Drawing.Point(233, 94) + Me.ucrChkWindow.Name = "ucrChkWindow" + Me.ucrChkWindow.Size = New System.Drawing.Size(126, 23) + Me.ucrChkWindow.TabIndex = 67 + ' + 'ucrChkInto + ' + Me.ucrChkInto.AutoSize = True + Me.ucrChkInto.Checked = False + Me.ucrChkInto.Location = New System.Drawing.Point(233, 33) + Me.ucrChkInto.Name = "ucrChkInto" + Me.ucrChkInto.Size = New System.Drawing.Size(84, 23) + Me.ucrChkInto.TabIndex = 63 + ' + 'ucrInputSaveData + ' + Me.ucrInputSaveData.AddQuotesIfUnrecognised = True + Me.ucrInputSaveData.AutoSize = True + Me.ucrInputSaveData.IsMultiline = False + Me.ucrInputSaveData.IsReadOnly = False + Me.ucrInputSaveData.Location = New System.Drawing.Point(319, 31) + Me.ucrInputSaveData.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSaveData.Name = "ucrInputSaveData" + Me.ucrInputSaveData.Size = New System.Drawing.Size(110, 21) + Me.ucrInputSaveData.TabIndex = 60 + ' + 'ucrCboCommandDataPackage + ' + Me.ucrCboCommandDataPackage.AddQuotesIfUnrecognised = True + Me.ucrCboCommandDataPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboCommandDataPackage.GetSetSelectedIndex = -1 + Me.ucrCboCommandDataPackage.IsReadOnly = False + Me.ucrCboCommandDataPackage.Location = New System.Drawing.Point(109, 31) + Me.ucrCboCommandDataPackage.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboCommandDataPackage.Name = "ucrCboCommandDataPackage" + Me.ucrCboCommandDataPackage.Size = New System.Drawing.Size(117, 21) + Me.ucrCboCommandDataPackage.TabIndex = 59 + ' + 'ucrInputViewData + ' + Me.ucrInputViewData.AddQuotesIfUnrecognised = True + Me.ucrInputViewData.AutoSize = True + Me.ucrInputViewData.IsMultiline = False + Me.ucrInputViewData.IsReadOnly = False + Me.ucrInputViewData.Location = New System.Drawing.Point(156, 129) + Me.ucrInputViewData.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputViewData.Name = "ucrInputViewData" + Me.ucrInputViewData.Size = New System.Drawing.Size(145, 21) + Me.ucrInputViewData.TabIndex = 57 + ' + 'ucrInputGraphCommand + ' + Me.ucrInputGraphCommand.AddQuotesIfUnrecognised = True + Me.ucrInputGraphCommand.AutoSize = True + Me.ucrInputGraphCommand.IsMultiline = False + Me.ucrInputGraphCommand.IsReadOnly = False + Me.ucrInputGraphCommand.Location = New System.Drawing.Point(247, 161) + Me.ucrInputGraphCommand.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputGraphCommand.Name = "ucrInputGraphCommand" + Me.ucrInputGraphCommand.Size = New System.Drawing.Size(145, 21) + Me.ucrInputGraphCommand.TabIndex = 55 + ' + 'ucrChkOpenRFile + ' + Me.ucrChkOpenRFile.AutoSize = True + Me.ucrChkOpenRFile.Checked = False + Me.ucrChkOpenRFile.Location = New System.Drawing.Point(156, 64) + Me.ucrChkOpenRFile.Name = "ucrChkOpenRFile" + Me.ucrChkOpenRFile.Size = New System.Drawing.Size(100, 23) + Me.ucrChkOpenRFile.TabIndex = 53 + ' + 'ucrInputChooseFile + ' + Me.ucrInputChooseFile.AddQuotesIfUnrecognised = True + Me.ucrInputChooseFile.AutoSize = True + Me.ucrInputChooseFile.IsMultiline = False + Me.ucrInputChooseFile.IsReadOnly = False + Me.ucrInputChooseFile.Location = New System.Drawing.Point(265, 64) + Me.ucrInputChooseFile.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputChooseFile.Name = "ucrInputChooseFile" + Me.ucrInputChooseFile.Size = New System.Drawing.Size(145, 21) + Me.ucrInputChooseFile.TabIndex = 51 + ' + 'ucrInputGgplotify + ' + Me.ucrInputGgplotify.AddQuotesIfUnrecognised = True + Me.ucrInputGgplotify.AutoSize = True + Me.ucrInputGgplotify.IsMultiline = False + Me.ucrInputGgplotify.IsReadOnly = False + Me.ucrInputGgplotify.Location = New System.Drawing.Point(247, 186) + Me.ucrInputGgplotify.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputGgplotify.Name = "ucrInputGgplotify" + Me.ucrInputGgplotify.Size = New System.Drawing.Size(145, 21) + Me.ucrInputGgplotify.TabIndex = 49 + ' + 'ucrInputRemoveObjects + ' + Me.ucrInputRemoveObjects.AddQuotesIfUnrecognised = True + Me.ucrInputRemoveObjects.AutoSize = True + Me.ucrInputRemoveObjects.IsMultiline = False + Me.ucrInputRemoveObjects.IsReadOnly = False + Me.ucrInputRemoveObjects.Location = New System.Drawing.Point(156, 218) + Me.ucrInputRemoveObjects.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputRemoveObjects.Name = "ucrInputRemoveObjects" + Me.ucrInputRemoveObjects.Size = New System.Drawing.Size(145, 21) + Me.ucrInputRemoveObjects.TabIndex = 2 + ' + 'ucrCboCommandPackage + ' + Me.ucrCboCommandPackage.AddQuotesIfUnrecognised = True + Me.ucrCboCommandPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboCommandPackage.GetSetSelectedIndex = -1 + Me.ucrCboCommandPackage.IsReadOnly = False + Me.ucrCboCommandPackage.Location = New System.Drawing.Point(156, 5) + Me.ucrCboCommandPackage.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboCommandPackage.Name = "ucrCboCommandPackage" + Me.ucrCboCommandPackage.Size = New System.Drawing.Size(137, 21) + Me.ucrCboCommandPackage.TabIndex = 44 + ' + 'ucrPnlCommands + ' + Me.ucrPnlCommands.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlCommands.Location = New System.Drawing.Point(2, 8) + Me.ucrPnlCommands.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlCommands.Name = "ucrPnlCommands" + Me.ucrPnlCommands.Size = New System.Drawing.Size(429, 238) + Me.ucrPnlCommands.TabIndex = 47 + ' + 'ucrPnlExample + ' + Me.ucrPnlExample.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlExample.Location = New System.Drawing.Point(7, 51) + Me.ucrPnlExample.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlExample.Name = "ucrPnlExample" + Me.ucrPnlExample.Size = New System.Drawing.Size(402, 34) + Me.ucrPnlExample.TabIndex = 56 + ' + 'ucrCboExamplePackages + ' + Me.ucrCboExamplePackages.AddQuotesIfUnrecognised = True + Me.ucrCboExamplePackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboExamplePackages.GetSetSelectedIndex = -1 + Me.ucrCboExamplePackages.IsReadOnly = False + Me.ucrCboExamplePackages.Location = New System.Drawing.Point(14, 22) + Me.ucrCboExamplePackages.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboExamplePackages.Name = "ucrCboExamplePackages" + Me.ucrCboExamplePackages.Size = New System.Drawing.Size(137, 21) + Me.ucrCboExamplePackages.TabIndex = 51 + ' 'ucrBase ' Me.ucrBase.AutoSize = True @@ -943,7 +985,6 @@ Partial Class dlgScript Friend WithEvents ucrPnlCommands As UcrPanel Friend WithEvents rdoCommandPackage As RadioButton Friend WithEvents rdoCommandObject As RadioButton - Friend WithEvents lblSaveDataFrame As Label Friend WithEvents ucrInputSaveDataFrame As ucrInputTextBox Friend WithEvents ucrChkSaveDataFrameSingle As ucrCheck Friend WithEvents ucrChkDisplayGraph As ucrCheck @@ -964,4 +1005,8 @@ Partial Class dlgScript Friend WithEvents ucrChkWindow As ucrCheck Friend WithEvents rdoWindow As RadioButton Friend WithEvents cmdHelp As Button + Friend WithEvents ucrInputSaveRFile As ucrInputTextBox + Friend WithEvents rdoFromRFile As RadioButton + Friend WithEvents rdoDataFrame As RadioButton + Friend WithEvents ucrPnlSaveDataFrame As UcrPanel End Class diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index ce35d7bf66e..7f2316ef17d 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -76,9 +76,13 @@ Public Class dlgScript ucrSaveObject.SetIsComboBox() ucrSaveObject.SetDataFrameSelector(ucrDataFrameSaveOutputSelect) - ucrInputSaveDataFrame.SetLinkedDisplayControl(lblSaveDataFrame) + 'ucrInputSaveDataFrame.SetLinkedDisplayControl(lblSaveDataFrame) + ucrPnlSaveDataFrame.AddRadioButton(rdoDataFrame) + ucrPnlSaveDataFrame.AddRadioButton(rdoFromRFile) + ucrChkSaveDataFrameSingle.SetText("Single") + ucrChkDisplayGraph.SetText("Display Output") '-------------------------------- @@ -185,7 +189,7 @@ Public Class dlgScript ucrChkDisplayGraph.Checked = True ucrChkOpenRFile.Checked = False ucrChkInto.Checked = False - ucrChkDisplayGraph.Checked = False + 'ucrChkDispla.Checked = False ucrChkWindow.Checked = True ucrDataFrameSaveOutputSelect.Reset() @@ -207,12 +211,15 @@ Public Class dlgScript ucrCboSaveOutputObjectType.SetVisible(False) ucrCboSaveOutputObjectFormat.SetVisible(False) ucrSaveObject.SetVisible(False) - ucrInputSaveDataFrame.SetVisible(False) + 'ucrInputSaveDataFrame.SetVisible(False) ucrChkDisplayGraph.Visible = False - ucrChkSaveDataFrameSingle.SetVisible(False) + ucrPnlSaveDataFrame.SetVisible(False) + ' ucrChkSaveDataFrameSingle.SetVisible(False) If rdoSaveDataFrame.Checked Then - ucrInputSaveDataFrame.SetVisible(True) - ucrChkSaveDataFrameSingle.SetVisible(True) + 'ucrInputSaveDataFrame.SetVisible(True) + ' ucrChkSaveDataFrameSingle.SetVisible(True) + ucrPnlSaveDataFrame.SetVisible(True) + ucrChkDisplayGraph.Visible = False ucrInputSaveDataFrame.SetName("") ElseIf rdoSaveColumn.Checked Then @@ -265,6 +272,17 @@ Public Class dlgScript End If strScript = "# Save data frame(s) """ & strDataFrameName & """" & Environment.NewLine & clsImportRFunction.ToScript() + If ucrInputSaveRFile.IsEmpty Then + ucrChkSaveDataFrameSingle.Enabled = False + Dim clsImportRDSFunction As New RFunction + clsImportRDSFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_RDS") + clsImportRDSFunction.AddParameter(strParameterName:="data_RDS", strParameterValue:=strDataFrameName) + + strScript = "# Save RDS File(s) """ & strDataFrameName & """" & Environment.NewLine & clsImportRDSFunction.ToScript() + Else + ucrChkSaveDataFrameSingle.Enabled = True + + End If End If PreviewScript(strScript) @@ -730,4 +748,19 @@ Public Class dlgScript End If End Sub + Private Sub ucrPnlSaveDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSaveDataFrame.ControlValueChanged + + ucrInputSaveRFile.SetVisible(False) + ucrInputSaveDataFrame.SetVisible(False) + ucrChkSaveDataFrameSingle.SetVisible(False) + If rdoSaveDataFrame.Checked Then + ucrInputSaveDataFrame.SetVisible(True) + ucrChkSaveDataFrameSingle.SetVisible(True) + ucrInputSaveDataFrame.OnControlValueChanged() + ucrChkSaveDataFrameSingle.OnControlValueChanged() + ElseIf rdoFromRFile.Checked Then + ucrInputSaveRFile.SetVisible(True) + ucrInputSaveRFile.OnControlValueChanged() + End If + End Sub End Class \ No newline at end of file From 104b796581218c0edb407040383e80ed06e591d3 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Wed, 6 Mar 2024 15:06:44 +0300 Subject: [PATCH 27/31] changes --- instat/dlgScript.vb | 72 +++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index 7f2316ef17d..ad10ba3859a 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -189,7 +189,6 @@ Public Class dlgScript ucrChkDisplayGraph.Checked = True ucrChkOpenRFile.Checked = False ucrChkInto.Checked = False - 'ucrChkDispla.Checked = False ucrChkWindow.Checked = True ucrDataFrameSaveOutputSelect.Reset() @@ -198,6 +197,7 @@ Public Class dlgScript ucrCboGetOutputObjectType.GetSetSelectedIndex = 0 ucrDataFrameGetDF.Reset() rdoGetDataFrame.Checked = True + rdoDataFrame.Checked = True 'activate the selected tab to library tab @@ -211,15 +211,13 @@ Public Class dlgScript ucrCboSaveOutputObjectType.SetVisible(False) ucrCboSaveOutputObjectFormat.SetVisible(False) ucrSaveObject.SetVisible(False) - 'ucrInputSaveDataFrame.SetVisible(False) ucrChkDisplayGraph.Visible = False ucrPnlSaveDataFrame.SetVisible(False) - ' ucrChkSaveDataFrameSingle.SetVisible(False) If rdoSaveDataFrame.Checked Then 'ucrInputSaveDataFrame.SetVisible(True) ' ucrChkSaveDataFrameSingle.SetVisible(True) ucrPnlSaveDataFrame.SetVisible(True) - + VisiilityOfControls() ucrChkDisplayGraph.Visible = False ucrInputSaveDataFrame.SetName("") ElseIf rdoSaveColumn.Checked Then @@ -227,6 +225,10 @@ Public Class dlgScript ucrSaveObject.SetVisible(True) ucrDataFrameSaveOutputSelect.SetVisible(True) ucrChkDisplayGraph.Visible = False + ucrInputSaveRFile.SetVisible(False) + ucrInputSaveDataFrame.SetVisible(False) + ucrChkSaveDataFrameSingle.SetVisible(False) + ucrPnlSaveDataFrame.SetVisible(False) SetupSaveDataControl("Column", RObjectTypeLabel.Column, "") ElseIf rdoSaveOutputObject.Checked Then ucrSaveObject.Location = New Point(ucrSaveObject.Location.X, ucrCboSaveOutputObjectFormat.Location.Y + 33) @@ -234,7 +236,11 @@ Public Class dlgScript ucrDataFrameSaveOutputSelect.SetVisible(True) ucrChkDisplayGraph.Visible = True ucrCboSaveOutputObjectType.SetVisible(True) + ucrInputSaveRFile.SetVisible(False) + ucrInputSaveDataFrame.SetVisible(False) ucrCboSaveOutputObjectFormat.SetVisible(True) + ucrChkSaveDataFrameSingle.SetVisible(False) + ucrPnlSaveDataFrame.SetVisible(False) SetupSaveDataControl(ucrCboSaveOutputObjectType.GetText(), dctOutputObjectTypes.Item(ucrCboSaveOutputObjectType.GetText()), dctOutputObjectFormats.Item(ucrCboSaveOutputObjectFormat.GetText())) End If End Sub @@ -251,40 +257,46 @@ Public Class dlgScript ucrSaveObject.SetName("") End Sub - Private Sub ucrSaveDataFrameControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSaveDataFrame.ControlContentsChanged, ucrChkSaveDataFrameSingle.ControlContentsChanged + Private Sub ucrSaveDataFrameControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSaveDataFrame.ControlContentsChanged, ucrChkSaveDataFrameSingle.ControlContentsChanged, + ucrInputSaveRFile.ControlContentsChanged + Dim strScript As String = "" - If Not ucrInputSaveDataFrame.IsEmpty() Then - Dim strDataFrameName As String = ucrInputSaveDataFrame.GetText() - Dim clsImportRFunction As New RFunction + If rdoDataFrame.Checked Then + If Not ucrInputSaveDataFrame.IsEmpty() Then + Dim clsImportRFunction As New RFunction + Dim strDataFrameName As String = ucrInputSaveDataFrame.GetText() - clsImportRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_data") + clsImportRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_data") - If ucrChkSaveDataFrameSingle.Checked Then - ' If it's a single data frame then wrap it into a list - Dim clsDataListRFunction As New RFunction - clsDataListRFunction.SetRCommand("list") - clsDataListRFunction.AddParameter(strParameterName:=strDataFrameName, strParameterValue:=strDataFrameName) - clsImportRFunction.AddParameter(strParameterName:="data_tables", clsRFunctionParameter:=clsDataListRFunction) - Else - ' If it's already a list of data frames, then add the name directly - clsImportRFunction.AddParameter(strParameterName:="data_tables", strParameterValue:=strDataFrameName) - End If + If ucrChkSaveDataFrameSingle.Checked Then + ' If it's a single data frame then wrap it into a list + Dim clsDataListRFunction As New RFunction + clsDataListRFunction.SetRCommand("list") + clsDataListRFunction.AddParameter(strParameterName:=strDataFrameName, strParameterValue:=strDataFrameName) + clsImportRFunction.AddParameter(strParameterName:="data_tables", clsRFunctionParameter:=clsDataListRFunction) + Else + ' If it's already a list of data frames, then add the name directly + clsImportRFunction.AddParameter(strParameterName:="data_tables", strParameterValue:=strDataFrameName) + End If + + strScript = "# Save data frame(s) """ & strDataFrameName & """" & Environment.NewLine & clsImportRFunction.ToScript() - strScript = "# Save data frame(s) """ & strDataFrameName & """" & Environment.NewLine & clsImportRFunction.ToScript() - If ucrInputSaveRFile.IsEmpty Then - ucrChkSaveDataFrameSingle.Enabled = False + End If + Else + If Not ucrInputSaveRFile.IsEmpty Then Dim clsImportRDSFunction As New RFunction + Dim strRFileName As String = ucrInputSaveRFile.GetText() + clsImportRDSFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_RDS") - clsImportRDSFunction.AddParameter(strParameterName:="data_RDS", strParameterValue:=strDataFrameName) + clsImportRDSFunction.AddParameter(strParameterName:="data_RDS", strParameterValue:=strRFileName) - strScript = "# Save RDS File(s) """ & strDataFrameName & """" & Environment.NewLine & clsImportRDSFunction.ToScript() - Else - ucrChkSaveDataFrameSingle.Enabled = True + strScript = "# Save RDS File(s) """ & strRFileName & """" & Environment.NewLine & clsImportRDSFunction.ToScript() End If End If + PreviewScript(strScript) End Sub @@ -749,11 +761,13 @@ Public Class dlgScript End Sub Private Sub ucrPnlSaveDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSaveDataFrame.ControlValueChanged - + VisiilityOfControls() + End Sub + Private Sub VisiilityOfControls() ucrInputSaveRFile.SetVisible(False) ucrInputSaveDataFrame.SetVisible(False) ucrChkSaveDataFrameSingle.SetVisible(False) - If rdoSaveDataFrame.Checked Then + If rdoDataFrame.Checked Then ucrInputSaveDataFrame.SetVisible(True) ucrChkSaveDataFrameSingle.SetVisible(True) ucrInputSaveDataFrame.OnControlValueChanged() @@ -763,4 +777,6 @@ Public Class dlgScript ucrInputSaveRFile.OnControlValueChanged() End If End Sub + + End Class \ No newline at end of file From 8dd55323e2ed2dcace217c18a38857517bb429da Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Wed, 6 Mar 2024 15:36:31 +0300 Subject: [PATCH 28/31] chages to the code --- instat/dlgScript.Designer.vb | 2 +- instat/dlgScript.vb | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/instat/dlgScript.Designer.vb b/instat/dlgScript.Designer.vb index aa3987e2b19..ba37efac17a 100644 --- a/instat/dlgScript.Designer.vb +++ b/instat/dlgScript.Designer.vb @@ -137,7 +137,7 @@ Partial Class dlgScript 'rdoFromRFile ' Me.rdoFromRFile.AutoSize = True - Me.rdoFromRFile.Location = New System.Drawing.Point(89, 125) + Me.rdoFromRFile.Location = New System.Drawing.Point(83, 125) Me.rdoFromRFile.Margin = New System.Windows.Forms.Padding(2) Me.rdoFromRFile.Name = "rdoFromRFile" Me.rdoFromRFile.Size = New System.Drawing.Size(81, 17) diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index ad10ba3859a..317aaad3503 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -76,13 +76,11 @@ Public Class dlgScript ucrSaveObject.SetIsComboBox() ucrSaveObject.SetDataFrameSelector(ucrDataFrameSaveOutputSelect) - 'ucrInputSaveDataFrame.SetLinkedDisplayControl(lblSaveDataFrame) ucrPnlSaveDataFrame.AddRadioButton(rdoDataFrame) ucrPnlSaveDataFrame.AddRadioButton(rdoFromRFile) ucrChkSaveDataFrameSingle.SetText("Single") - ucrChkDisplayGraph.SetText("Display Output") '-------------------------------- @@ -199,7 +197,6 @@ Public Class dlgScript rdoGetDataFrame.Checked = True rdoDataFrame.Checked = True - 'activate the selected tab to library tab tbFeatures.SelectedIndex = -1 tbFeatures.SelectedTab = tbPageSaveData @@ -214,8 +211,6 @@ Public Class dlgScript ucrChkDisplayGraph.Visible = False ucrPnlSaveDataFrame.SetVisible(False) If rdoSaveDataFrame.Checked Then - 'ucrInputSaveDataFrame.SetVisible(True) - ' ucrChkSaveDataFrameSingle.SetVisible(True) ucrPnlSaveDataFrame.SetVisible(True) VisiilityOfControls() ucrChkDisplayGraph.Visible = False @@ -296,7 +291,6 @@ Public Class dlgScript End If End If - PreviewScript(strScript) End Sub @@ -763,6 +757,7 @@ Public Class dlgScript Private Sub ucrPnlSaveDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSaveDataFrame.ControlValueChanged VisiilityOfControls() End Sub + Private Sub VisiilityOfControls() ucrInputSaveRFile.SetVisible(False) ucrInputSaveDataFrame.SetVisible(False) @@ -778,5 +773,4 @@ Public Class dlgScript End If End Sub - End Class \ No newline at end of file From ac41e8be46e6b15fcec1610f4a86120c598484a7 Mon Sep 17 00:00:00 2001 From: JUMA Date: Wed, 6 Mar 2024 16:47:19 +0300 Subject: [PATCH 29/31] chnages --- instat/ucrCalculator.Designer.vb | 645 +++++++++++++++++-------------- 1 file changed, 351 insertions(+), 294 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 65533ad85e1..86a4f97b8c2 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -62,7 +62,6 @@ Partial Class ucrCalculator Me.cmd0 = New System.Windows.Forms.Button() Me.cmd1 = New System.Windows.Forms.Button() Me.grpDates = New System.Windows.Forms.GroupBox() - Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -119,7 +118,6 @@ Partial Class ucrCalculator Me.cmdGCD = New System.Windows.Forms.Button() Me.cmdGeneratePrimes = New System.Windows.Forms.Button() Me.cmdNthPrime = New System.Windows.Forms.Button() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -142,7 +140,6 @@ Partial Class ucrCalculator Me.cmdIsPrime = New System.Windows.Forms.Button() Me.cmdBigZ = New System.Windows.Forms.Button() Me.grpFactor = New System.Windows.Forms.GroupBox() - Me.cmdTransformHelp = New instat.ucrSplitButton() Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdShuffle = New System.Windows.Forms.Button() @@ -166,7 +163,6 @@ Partial Class ucrCalculator Me.cmdFactor = New System.Windows.Forms.Button() Me.cmdAnon = New System.Windows.Forms.Button() Me.grpHydroGOF = New System.Windows.Forms.GroupBox() - Me.cmdHydroHelp = New instat.ucrSplitButton() Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdVE = New System.Windows.Forms.Button() @@ -247,7 +243,6 @@ Partial Class ucrCalculator Me.cmdGroup = New System.Windows.Forms.Button() Me.cmdGrade = New System.Windows.Forms.Button() Me.grpMaths = New System.Windows.Forms.GroupBox() - Me.cmdMathsHelp = New instat.ucrSplitButton() Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdAtan2 = New System.Windows.Forms.Button() @@ -274,7 +269,6 @@ Partial Class ucrCalculator Me.cmdCos = New System.Windows.Forms.Button() Me.cmdSqrt = New System.Windows.Forms.Button() Me.grpSummary = New System.Windows.Forms.GroupBox() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -328,7 +322,6 @@ Partial Class ucrCalculator Me.cmdVar = New System.Windows.Forms.Button() Me.grpProbabilty = New System.Windows.Forms.GroupBox() Me.cmdPascal = New System.Windows.Forms.Button() - Me.cmdProbRHelp = New instat.ucrSplitButton() Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -377,7 +370,6 @@ Partial Class ucrCalculator Me.cmdDecimals = New System.Windows.Forms.Button() Me.cmdMASSFractions = 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() @@ -412,7 +404,6 @@ Partial Class ucrCalculator Me.cmdLead = New System.Windows.Forms.Button() Me.cmdLag = New System.Windows.Forms.Button() Me.grpLogical = New System.Windows.Forms.GroupBox() - Me.cmdLogicalHelp = New instat.ucrSplitButton() Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -460,7 +451,6 @@ Partial Class ucrCalculator Me.cmdLocate2 = New System.Windows.Forms.Button() Me.cmdExtract2 = New System.Windows.Forms.Button() Me.cmdEncodeb = New System.Windows.Forms.Button() - Me.cmdSquishb = New System.Windows.Forms.Button() Me.cmdSub = New System.Windows.Forms.Button() Me.cmdCombine = New System.Windows.Forms.Button() Me.cmdDetect = New System.Windows.Forms.Button() @@ -474,9 +464,9 @@ Partial Class ucrCalculator Me.cmdExtract = New System.Windows.Forms.Button() Me.cmdCountstrings = New System.Windows.Forms.Button() Me.cmdLocate = New System.Windows.Forms.Button() + Me.cmdSquishb = New System.Windows.Forms.Button() Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components) Me.grpCircular = New System.Windows.Forms.GroupBox() - Me.cmdCircularHelp = New instat.ucrSplitButton() Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdCircular = New System.Windows.Forms.Button() @@ -517,7 +507,6 @@ Partial Class ucrCalculator Me.cmdbegin = New System.Windows.Forms.Button() Me.cmdAny1 = New System.Windows.Forms.Button() Me.grpComplex = New System.Windows.Forms.GroupBox() - Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -600,6 +589,10 @@ Partial Class ucrCalculator Me.cmdListSum = New System.Windows.Forms.Button() Me.cmdListSumd = New System.Windows.Forms.Button() Me.cmdListMissing = New System.Windows.Forms.Button() + Me.Button2 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() + Me.Button4 = New System.Windows.Forms.Button() + Me.Button5 = New System.Windows.Forms.Button() Me.cmdRhelpList = New instat.ucrSplitButton() Me.cmdWakefieldHelp = New instat.ucrSplitButton() Me.cmdStringRHelp = New instat.ucrSplitButton() @@ -608,42 +601,53 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() - Me.grpBasic.SuspendLayout() - Me.grpDates.SuspendLayout() - Me.ContextMenuStripDate.SuspendLayout() - Me.ContextMenuStripComplex.SuspendLayout() - Me.grpInteger.SuspendLayout() - Me.ContextMenuStripInteger.SuspendLayout() - Me.grpFactor.SuspendLayout() - Me.ContextMenuStripFactor.SuspendLayout() - Me.grpHydroGOF.SuspendLayout() - Me.ContextMenuStripHydroGOF.SuspendLayout() - Me.grpWakefield.SuspendLayout() - Me.grpMaths.SuspendLayout() - Me.ContextMenuStripMaths.SuspendLayout() - Me.grpSummary.SuspendLayout() - Me.ContextMenuStripSummary.SuspendLayout() - Me.grpFrequencies.SuspendLayout() - Me.grpProbabilty.SuspendLayout() - Me.ContextMenuStripProbability.SuspendLayout() - Me.grpRandom.SuspendLayout() - Me.grpTransform.SuspendLayout() - Me.ContextMenuStripTransform.SuspendLayout() - Me.grpLogical.SuspendLayout() - Me.ContextMenuStripLogical.SuspendLayout() - Me.grpTestString.SuspendLayout() - Me.grpCircular.SuspendLayout() - Me.ContextMenuStripCircular.SuspendLayout() - Me.grpModifier.SuspendLayout() - Me.grpSymbols.SuspendLayout() - Me.grpComplex.SuspendLayout() - Me.ContextMenuStripTxtString.SuspendLayout() - Me.ContextMenuStripWakefield.SuspendLayout() - Me.ContextMenuStripList.SuspendLayout() - Me.grpList.SuspendLayout() - Me.GroupBox1.SuspendLayout() - Me.grpMathBloc.SuspendLayout() - Me.SuspendLayout() + Me.cmdSummaryRHelp = New instat.ucrSplitButton() + Me.cmdTransformRHelp = New instat.ucrSplitButton() + Me.cmdLogicalHelp = New instat.ucrSplitButton() + Me.cmdRHelp = New instat.ucrSplitButton() + Me.cmdHydroHelp = New instat.ucrSplitButton() + Me.cmdTransformHelp = New instat.ucrSplitButton() + Me.cmdCircularHelp = New instat.ucrSplitButton() + Me.cmdMathsHelp = New instat.ucrSplitButton() + Me.cmdProbRHelp = New instat.ucrSplitButton() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() + Me.cmdComplexRHelp = New instat.ucrSplitButton() + Me.grpBasic.SuspendLayout + Me.grpDates.SuspendLayout + Me.ContextMenuStripDate.SuspendLayout + Me.ContextMenuStripComplex.SuspendLayout + Me.grpInteger.SuspendLayout + Me.ContextMenuStripInteger.SuspendLayout + Me.grpFactor.SuspendLayout + Me.ContextMenuStripFactor.SuspendLayout + Me.grpHydroGOF.SuspendLayout + Me.ContextMenuStripHydroGOF.SuspendLayout + Me.grpWakefield.SuspendLayout + Me.grpMaths.SuspendLayout + Me.ContextMenuStripMaths.SuspendLayout + Me.grpSummary.SuspendLayout + Me.ContextMenuStripSummary.SuspendLayout + Me.grpFrequencies.SuspendLayout + Me.grpProbabilty.SuspendLayout + Me.ContextMenuStripProbability.SuspendLayout + Me.grpRandom.SuspendLayout + Me.grpTransform.SuspendLayout + Me.ContextMenuStripTransform.SuspendLayout + Me.grpLogical.SuspendLayout + Me.ContextMenuStripLogical.SuspendLayout + Me.grpTestString.SuspendLayout + Me.grpCircular.SuspendLayout + Me.ContextMenuStripCircular.SuspendLayout + Me.grpModifier.SuspendLayout + Me.grpSymbols.SuspendLayout + Me.grpComplex.SuspendLayout + Me.ContextMenuStripTxtString.SuspendLayout + Me.ContextMenuStripWakefield.SuspendLayout + Me.ContextMenuStripList.SuspendLayout + Me.grpList.SuspendLayout + Me.GroupBox1.SuspendLayout + Me.grpMathBloc.SuspendLayout + Me.SuspendLayout ' 'lblExpression ' @@ -944,18 +948,6 @@ Partial Class ucrCalculator Me.grpDates.TabStop = False Me.grpDates.Text = "Dates/Times" ' - 'cmdRHelp - ' - Me.cmdRHelp.AutoSize = True - Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(186, 164) - Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.TabIndex = 212 - Me.cmdRHelp.Text = "R Help" - Me.cmdRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripDate ' Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1553,18 +1545,6 @@ Partial Class ucrCalculator Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True ' - 'cmdIntegerRHelp - ' - Me.cmdIntegerRHelp.AutoSize = True - Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) - Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.TabIndex = 16 - Me.cmdIntegerRHelp.Text = "R Help" - Me.cmdIntegerRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripInteger ' Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1762,26 +1742,14 @@ Partial Class ucrCalculator Me.grpFactor.Controls.Add(Me.cmdFactor) Me.grpFactor.Controls.Add(Me.cmdAnon) Me.grpFactor.Location = New System.Drawing.Point(542, 77) - Me.grpFactor.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpFactor.Margin = New System.Windows.Forms.Padding(2) Me.grpFactor.Name = "grpFactor" - Me.grpFactor.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpFactor.Padding = New System.Windows.Forms.Padding(2) Me.grpFactor.Size = New System.Drawing.Size(310, 260) Me.grpFactor.TabIndex = 191 Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" ' - 'cmdTransformHelp - ' - Me.cmdTransformHelp.AutoSize = True - Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) - Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.TabIndex = 212 - Me.cmdTransformHelp.Text = "R Help" - Me.cmdTransformHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripFactor ' Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1799,7 +1767,7 @@ Partial Class ucrCalculator ' Me.cmdShuffle.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdShuffle.Location = New System.Drawing.Point(228, 178) - Me.cmdShuffle.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdShuffle.Margin = New System.Windows.Forms.Padding(2) Me.cmdShuffle.Name = "cmdShuffle" Me.cmdShuffle.Size = New System.Drawing.Size(75, 40) Me.cmdShuffle.TabIndex = 210 @@ -1810,7 +1778,7 @@ Partial Class ucrCalculator ' Me.cmdShift.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdShift.Location = New System.Drawing.Point(153, 178) - Me.cmdShift.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdShift.Margin = New System.Windows.Forms.Padding(2) Me.cmdShift.Name = "cmdShift" Me.cmdShift.Size = New System.Drawing.Size(75, 40) Me.cmdShift.TabIndex = 209 @@ -1821,7 +1789,7 @@ Partial Class ucrCalculator ' Me.cmdReverse.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdReverse.Location = New System.Drawing.Point(80, 178) - Me.cmdReverse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdReverse.Margin = New System.Windows.Forms.Padding(2) Me.cmdReverse.Name = "cmdReverse" Me.cmdReverse.Size = New System.Drawing.Size(75, 40) Me.cmdReverse.TabIndex = 208 @@ -1832,7 +1800,7 @@ Partial Class ucrCalculator ' Me.cmdReorder.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdReorder.Location = New System.Drawing.Point(5, 178) - Me.cmdReorder.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdReorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdReorder.Name = "cmdReorder" Me.cmdReorder.Size = New System.Drawing.Size(75, 40) Me.cmdReorder.TabIndex = 207 @@ -1843,7 +1811,7 @@ Partial Class ucrCalculator ' Me.cmdRelevel.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRelevel.Location = New System.Drawing.Point(228, 138) - Me.cmdRelevel.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdRelevel.Margin = New System.Windows.Forms.Padding(2) Me.cmdRelevel.Name = "cmdRelevel" Me.cmdRelevel.Size = New System.Drawing.Size(75, 40) Me.cmdRelevel.TabIndex = 206 @@ -1854,7 +1822,7 @@ Partial Class ucrCalculator ' Me.cmdRecode.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRecode.Location = New System.Drawing.Point(153, 138) - Me.cmdRecode.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdRecode.Margin = New System.Windows.Forms.Padding(2) Me.cmdRecode.Name = "cmdRecode" Me.cmdRecode.Size = New System.Drawing.Size(75, 40) Me.cmdRecode.TabIndex = 205 @@ -1865,7 +1833,7 @@ Partial Class ucrCalculator ' Me.cmdOther.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdOther.Location = New System.Drawing.Point(80, 138) - Me.cmdOther.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdOther.Margin = New System.Windows.Forms.Padding(2) Me.cmdOther.Name = "cmdOther" Me.cmdOther.Size = New System.Drawing.Size(75, 40) Me.cmdOther.TabIndex = 204 @@ -1876,7 +1844,7 @@ Partial Class ucrCalculator ' Me.cmdFmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdFmatch.Location = New System.Drawing.Point(5, 138) - Me.cmdFmatch.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdFmatch.Margin = New System.Windows.Forms.Padding(2) Me.cmdFmatch.Name = "cmdFmatch" Me.cmdFmatch.Size = New System.Drawing.Size(75, 40) Me.cmdFmatch.TabIndex = 203 @@ -1887,7 +1855,7 @@ Partial Class ucrCalculator ' Me.cmdLump.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdLump.Location = New System.Drawing.Point(228, 100) - Me.cmdLump.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdLump.Margin = New System.Windows.Forms.Padding(2) Me.cmdLump.Name = "cmdLump" Me.cmdLump.Size = New System.Drawing.Size(75, 40) Me.cmdLump.TabIndex = 202 @@ -1898,7 +1866,7 @@ Partial Class ucrCalculator ' Me.cmdInseq.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdInseq.Location = New System.Drawing.Point(153, 100) - Me.cmdInseq.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdInseq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInseq.Name = "cmdInseq" Me.cmdInseq.Size = New System.Drawing.Size(75, 40) Me.cmdInseq.TabIndex = 201 @@ -1909,7 +1877,7 @@ Partial Class ucrCalculator ' Me.cmdInfreq.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdInfreq.Location = New System.Drawing.Point(80, 100) - Me.cmdInfreq.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdInfreq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInfreq.Name = "cmdInfreq" Me.cmdInfreq.Size = New System.Drawing.Size(75, 40) Me.cmdInfreq.TabIndex = 200 @@ -1920,7 +1888,7 @@ Partial Class ucrCalculator ' Me.cmdInorder.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdInorder.Location = New System.Drawing.Point(5, 100) - Me.cmdInorder.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdInorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdInorder.Name = "cmdInorder" Me.cmdInorder.Size = New System.Drawing.Size(75, 40) Me.cmdInorder.TabIndex = 199 @@ -1931,7 +1899,7 @@ Partial Class ucrCalculator ' Me.cmdAdd_na.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdAdd_na.Location = New System.Drawing.Point(228, 60) - Me.cmdAdd_na.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdAdd_na.Margin = New System.Windows.Forms.Padding(2) Me.cmdAdd_na.Name = "cmdAdd_na" Me.cmdAdd_na.Size = New System.Drawing.Size(75, 40) Me.cmdAdd_na.TabIndex = 198 @@ -1942,7 +1910,7 @@ Partial Class ucrCalculator ' Me.cmdExpand.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdExpand.Location = New System.Drawing.Point(153, 60) - Me.cmdExpand.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdExpand.Margin = New System.Windows.Forms.Padding(2) Me.cmdExpand.Name = "cmdExpand" Me.cmdExpand.Size = New System.Drawing.Size(75, 40) Me.cmdExpand.TabIndex = 197 @@ -1953,7 +1921,7 @@ Partial Class ucrCalculator ' Me.cmdDrop.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdDrop.Location = New System.Drawing.Point(80, 60) - Me.cmdDrop.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdDrop.Margin = New System.Windows.Forms.Padding(2) Me.cmdDrop.Name = "cmdDrop" Me.cmdDrop.Size = New System.Drawing.Size(75, 40) Me.cmdDrop.TabIndex = 196 @@ -1964,7 +1932,7 @@ Partial Class ucrCalculator ' Me.cmdCross.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCross.Location = New System.Drawing.Point(5, 60) - Me.cmdCross.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCross.Margin = New System.Windows.Forms.Padding(2) Me.cmdCross.Name = "cmdCross" Me.cmdCross.Size = New System.Drawing.Size(75, 40) Me.cmdCross.TabIndex = 195 @@ -1975,7 +1943,7 @@ Partial Class ucrCalculator ' Me.cmdCollapse.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCollapse.Location = New System.Drawing.Point(228, 20) - Me.cmdCollapse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCollapse.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollapse.Name = "cmdCollapse" Me.cmdCollapse.Size = New System.Drawing.Size(75, 40) Me.cmdCollapse.TabIndex = 194 @@ -1986,7 +1954,7 @@ Partial Class ucrCalculator ' Me.cmdLabelled.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdLabelled.Location = New System.Drawing.Point(153, 20) - Me.cmdLabelled.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdLabelled.Margin = New System.Windows.Forms.Padding(2) Me.cmdLabelled.Name = "cmdLabelled" Me.cmdLabelled.Size = New System.Drawing.Size(75, 40) Me.cmdLabelled.TabIndex = 193 @@ -1997,7 +1965,7 @@ Partial Class ucrCalculator ' Me.cmdFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdFactor.Location = New System.Drawing.Point(5, 20) - Me.cmdFactor.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdFactor.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactor.Name = "cmdFactor" Me.cmdFactor.Size = New System.Drawing.Size(75, 40) Me.cmdFactor.TabIndex = 191 @@ -2008,7 +1976,7 @@ Partial Class ucrCalculator ' Me.cmdAnon.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdAnon.Location = New System.Drawing.Point(80, 20) - Me.cmdAnon.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdAnon.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnon.Name = "cmdAnon" Me.cmdAnon.Size = New System.Drawing.Size(75, 40) Me.cmdAnon.TabIndex = 192 @@ -2040,26 +2008,14 @@ Partial Class ucrCalculator Me.grpHydroGOF.Controls.Add(Me.cmdCp) Me.grpHydroGOF.Controls.Add(Me.cmdBr2) Me.grpHydroGOF.Location = New System.Drawing.Point(542, 77) - Me.grpHydroGOF.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpHydroGOF.Margin = New System.Windows.Forms.Padding(2) Me.grpHydroGOF.Name = "grpHydroGOF" - Me.grpHydroGOF.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpHydroGOF.Padding = New System.Windows.Forms.Padding(2) Me.grpHydroGOF.Size = New System.Drawing.Size(228, 337) Me.grpHydroGOF.TabIndex = 195 Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "hydroGOF " ' - 'cmdHydroHelp - ' - Me.cmdHydroHelp.AutoSize = True - Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) - Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.TabIndex = 212 - Me.cmdHydroHelp.Text = "R Help" - Me.cmdHydroHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripHydroGOF ' Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2077,7 +2033,7 @@ Partial Class ucrCalculator ' Me.cmdVE.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdVE.Location = New System.Drawing.Point(150, 258) - Me.cmdVE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdVE.Margin = New System.Windows.Forms.Padding(2) Me.cmdVE.Name = "cmdVE" Me.cmdVE.Size = New System.Drawing.Size(75, 40) Me.cmdVE.TabIndex = 20 @@ -2088,7 +2044,7 @@ Partial Class ucrCalculator ' Me.cmdSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdSsq.Location = New System.Drawing.Point(77, 258) - Me.cmdSsq.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdSsq.Margin = New System.Windows.Forms.Padding(2) Me.cmdSsq.Name = "cmdSsq" Me.cmdSsq.Size = New System.Drawing.Size(75, 40) Me.cmdSsq.TabIndex = 19 @@ -2099,7 +2055,7 @@ Partial Class ucrCalculator ' Me.cmdRsr.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRsr.Location = New System.Drawing.Point(2, 258) - Me.cmdRsr.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdRsr.Margin = New System.Windows.Forms.Padding(2) Me.cmdRsr.Name = "cmdRsr" Me.cmdRsr.Size = New System.Drawing.Size(75, 40) Me.cmdRsr.TabIndex = 18 @@ -2110,7 +2066,7 @@ Partial Class ucrCalculator ' Me.cmdRSD.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRSD.Location = New System.Drawing.Point(150, 218) - Me.cmdRSD.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdRSD.Margin = New System.Windows.Forms.Padding(2) Me.cmdRSD.Name = "cmdRSD" Me.cmdRSD.Size = New System.Drawing.Size(75, 40) Me.cmdRSD.TabIndex = 17 @@ -2121,7 +2077,7 @@ Partial Class ucrCalculator ' Me.cmdRPearson.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRPearson.Location = New System.Drawing.Point(77, 218) - Me.cmdRPearson.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdRPearson.Margin = New System.Windows.Forms.Padding(2) Me.cmdRPearson.Name = "cmdRPearson" Me.cmdRPearson.Size = New System.Drawing.Size(75, 40) Me.cmdRPearson.TabIndex = 16 @@ -2132,7 +2088,7 @@ Partial Class ucrCalculator ' Me.cmdRNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRNSE.Location = New System.Drawing.Point(2, 218) - Me.cmdRNSE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdRNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdRNSE.Name = "cmdRNSE" Me.cmdRNSE.Size = New System.Drawing.Size(75, 40) Me.cmdRNSE.TabIndex = 15 @@ -2143,7 +2099,7 @@ Partial Class ucrCalculator ' Me.cmdRmse.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRmse.Location = New System.Drawing.Point(150, 178) - Me.cmdRmse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdRmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdRmse.Name = "cmdRmse" Me.cmdRmse.Size = New System.Drawing.Size(75, 40) Me.cmdRmse.TabIndex = 14 @@ -2154,7 +2110,7 @@ Partial Class ucrCalculator ' Me.cmdRd.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRd.Location = New System.Drawing.Point(77, 178) - Me.cmdRd.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdRd.Margin = New System.Windows.Forms.Padding(2) Me.cmdRd.Name = "cmdRd" Me.cmdRd.Size = New System.Drawing.Size(75, 40) Me.cmdRd.TabIndex = 13 @@ -2165,7 +2121,7 @@ Partial Class ucrCalculator ' Me.cmdPbiasfde.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdPbiasfde.Location = New System.Drawing.Point(2, 178) - Me.cmdPbiasfde.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdPbiasfde.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbiasfde.Name = "cmdPbiasfde" Me.cmdPbiasfde.Size = New System.Drawing.Size(75, 40) Me.cmdPbiasfde.TabIndex = 12 @@ -2176,7 +2132,7 @@ Partial Class ucrCalculator ' Me.cmdPbias.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdPbias.Location = New System.Drawing.Point(150, 138) - Me.cmdPbias.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdPbias.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbias.Name = "cmdPbias" Me.cmdPbias.Size = New System.Drawing.Size(75, 40) Me.cmdPbias.TabIndex = 11 @@ -2187,7 +2143,7 @@ Partial Class ucrCalculator ' Me.cmdNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdNSE.Location = New System.Drawing.Point(77, 138) - Me.cmdNSE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdNSE.Name = "cmdNSE" Me.cmdNSE.Size = New System.Drawing.Size(75, 40) Me.cmdNSE.TabIndex = 10 @@ -2198,7 +2154,7 @@ Partial Class ucrCalculator ' Me.cmdNrmse.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdNrmse.Location = New System.Drawing.Point(2, 138) - Me.cmdNrmse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdNrmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdNrmse.Name = "cmdNrmse" Me.cmdNrmse.Size = New System.Drawing.Size(75, 40) Me.cmdNrmse.TabIndex = 9 @@ -2209,7 +2165,7 @@ Partial Class ucrCalculator ' Me.cmdMse.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdMse.Location = New System.Drawing.Point(150, 100) - Me.cmdMse.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdMse.Margin = New System.Windows.Forms.Padding(2) Me.cmdMse.Name = "cmdMse" Me.cmdMse.Size = New System.Drawing.Size(75, 40) Me.cmdMse.TabIndex = 8 @@ -2220,7 +2176,7 @@ Partial Class ucrCalculator ' Me.cmdmNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdmNSE.Location = New System.Drawing.Point(77, 100) - Me.cmdmNSE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdmNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdmNSE.Name = "cmdmNSE" Me.cmdmNSE.Size = New System.Drawing.Size(75, 40) Me.cmdmNSE.TabIndex = 7 @@ -2231,7 +2187,7 @@ Partial Class ucrCalculator ' Me.cmdMe.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdMe.Location = New System.Drawing.Point(2, 100) - Me.cmdMe.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdMe.Margin = New System.Windows.Forms.Padding(2) Me.cmdMe.Name = "cmdMe" Me.cmdMe.Size = New System.Drawing.Size(75, 40) Me.cmdMe.TabIndex = 6 @@ -2242,7 +2198,7 @@ Partial Class ucrCalculator ' Me.cmdMd.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdMd.Location = New System.Drawing.Point(150, 60) - Me.cmdMd.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdMd.Margin = New System.Windows.Forms.Padding(2) Me.cmdMd.Name = "cmdMd" Me.cmdMd.Size = New System.Drawing.Size(75, 40) Me.cmdMd.TabIndex = 5 @@ -2253,7 +2209,7 @@ Partial Class ucrCalculator ' Me.cmdMae.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdMae.Location = New System.Drawing.Point(77, 60) - Me.cmdMae.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdMae.Margin = New System.Windows.Forms.Padding(2) Me.cmdMae.Name = "cmdMae" Me.cmdMae.Size = New System.Drawing.Size(75, 40) Me.cmdMae.TabIndex = 4 @@ -2264,7 +2220,7 @@ Partial Class ucrCalculator ' Me.cmdKGE.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdKGE.Location = New System.Drawing.Point(2, 60) - Me.cmdKGE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdKGE.Margin = New System.Windows.Forms.Padding(2) Me.cmdKGE.Name = "cmdKGE" Me.cmdKGE.Size = New System.Drawing.Size(75, 40) Me.cmdKGE.TabIndex = 3 @@ -2275,7 +2231,7 @@ Partial Class ucrCalculator ' Me.cmdD.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdD.Location = New System.Drawing.Point(150, 20) - Me.cmdD.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdD.Margin = New System.Windows.Forms.Padding(2) Me.cmdD.Name = "cmdD" Me.cmdD.Size = New System.Drawing.Size(75, 40) Me.cmdD.TabIndex = 2 @@ -2286,7 +2242,7 @@ Partial Class ucrCalculator ' Me.cmdCp.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCp.Location = New System.Drawing.Point(77, 20) - Me.cmdCp.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCp.Margin = New System.Windows.Forms.Padding(2) Me.cmdCp.Name = "cmdCp" Me.cmdCp.Size = New System.Drawing.Size(75, 40) Me.cmdCp.TabIndex = 1 @@ -2297,7 +2253,7 @@ Partial Class ucrCalculator ' Me.cmdBr2.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdBr2.Location = New System.Drawing.Point(2, 20) - Me.cmdBr2.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdBr2.Margin = New System.Windows.Forms.Padding(2) Me.cmdBr2.Name = "cmdBr2" Me.cmdBr2.Size = New System.Drawing.Size(75, 40) Me.cmdBr2.TabIndex = 0 @@ -3008,18 +2964,6 @@ Partial Class ucrCalculator Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" ' - 'cmdMathsHelp - ' - Me.cmdMathsHelp.AutoSize = True - Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) - Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.TabIndex = 211 - Me.cmdMathsHelp.Text = "R Help" - Me.cmdMathsHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3291,6 +3235,10 @@ Partial Class ucrCalculator ' 'grpSummary ' + Me.grpSummary.Controls.Add(Me.Button5) + Me.grpSummary.Controls.Add(Me.Button2) + Me.grpSummary.Controls.Add(Me.Button3) + Me.grpSummary.Controls.Add(Me.Button4) Me.grpSummary.Controls.Add(Me.cmdSummaryRHelp) Me.grpSummary.Controls.Add(Me.grpFrequencies) Me.grpSummary.Controls.Add(Me.cmdKurtosis) @@ -3325,23 +3273,11 @@ Partial Class ucrCalculator Me.grpSummary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.grpSummary.Name = "grpSummary" Me.grpSummary.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpSummary.Size = New System.Drawing.Size(360, 408) + Me.grpSummary.Size = New System.Drawing.Size(360, 421) Me.grpSummary.TabIndex = 185 Me.grpSummary.TabStop = False Me.grpSummary.Text = "Summary" ' - 'cmdSummaryRHelp - ' - Me.cmdSummaryRHelp.AutoSize = True - Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(242, 205) - Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.TabIndex = 185 - Me.cmdSummaryRHelp.Text = "R Help" - Me.cmdSummaryRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripSummary ' Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3402,7 +3338,7 @@ 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, 260) + Me.grpFrequencies.Location = New System.Drawing.Point(2, 284) Me.grpFrequencies.Name = "grpFrequencies" Me.grpFrequencies.Size = New System.Drawing.Size(353, 133) Me.grpFrequencies.TabIndex = 184 @@ -3659,7 +3595,7 @@ Partial Class ucrCalculator 'cmdCor ' Me.cmdCor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCor.Location = New System.Drawing.Point(2, 198) + Me.cmdCor.Location = New System.Drawing.Point(2, 235) Me.cmdCor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCor.Name = "cmdCor" Me.cmdCor.Size = New System.Drawing.Size(78, 38) @@ -3670,7 +3606,7 @@ Partial Class ucrCalculator 'cmdCov ' Me.cmdCov.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCov.Location = New System.Drawing.Point(80, 198) + Me.cmdCov.Location = New System.Drawing.Point(79, 235) Me.cmdCov.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCov.Name = "cmdCov" Me.cmdCov.Size = New System.Drawing.Size(70, 38) @@ -3788,7 +3724,7 @@ 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(148, 198) + Me.cmdQuantile.Location = New System.Drawing.Point(148, 235) Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdQuantile.Name = "cmdQuantile" Me.cmdQuantile.Size = New System.Drawing.Size(70, 38) @@ -3964,18 +3900,6 @@ Partial Class ucrCalculator Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True ' - 'cmdProbRHelp - ' - Me.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripProbability ' Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4566,18 +4490,6 @@ Partial Class ucrCalculator Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True ' - 'cmdTransformRHelp - ' - Me.cmdTransformRHelp.AutoSize = True - Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245) - Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.TabIndex = 204 - Me.cmdTransformRHelp.Text = "R Help" - Me.cmdTransformRHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4933,18 +4845,6 @@ Partial Class ucrCalculator Me.grpLogical.TabStop = False Me.grpLogical.Text = "Logical and Symbols" ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 234) - Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.TabIndex = 212 - Me.cmdLogicalHelp.Text = "R Help" - Me.cmdLogicalHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripLogical ' Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4988,7 +4888,7 @@ Partial Class ucrCalculator ' Me.cmdDoubleSqrBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdDoubleSqrBrackets.Location = New System.Drawing.Point(160, 88) - Me.cmdDoubleSqrBrackets.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdDoubleSqrBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdDoubleSqrBrackets.Name = "cmdDoubleSqrBrackets" Me.cmdDoubleSqrBrackets.Size = New System.Drawing.Size(45, 38) Me.cmdDoubleSqrBrackets.TabIndex = 205 @@ -5182,7 +5082,7 @@ Partial Class ucrCalculator ' Me.cmdSquareBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdSquareBrackets.Location = New System.Drawing.Point(102, 88) - Me.cmdSquareBrackets.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdSquareBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquareBrackets.Name = "cmdSquareBrackets" Me.cmdSquareBrackets.Size = New System.Drawing.Size(58, 38) Me.cmdSquareBrackets.TabIndex = 134 @@ -5204,7 +5104,7 @@ Partial Class ucrCalculator ' Me.cmdModulas.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdModulas.Location = New System.Drawing.Point(5, 125) - Me.cmdModulas.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdModulas.Margin = New System.Windows.Forms.Padding(2) Me.cmdModulas.Name = "cmdModulas" Me.cmdModulas.Size = New System.Drawing.Size(78, 38) Me.cmdModulas.TabIndex = 134 @@ -5237,7 +5137,7 @@ Partial Class ucrCalculator ' Me.cmdLesser.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdLesser.Location = New System.Drawing.Point(5, 17) - Me.cmdLesser.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdLesser.Margin = New System.Windows.Forms.Padding(2) Me.cmdLesser.Name = "cmdLesser" Me.cmdLesser.Size = New System.Drawing.Size(48, 38) Me.cmdLesser.TabIndex = 131 @@ -5282,7 +5182,7 @@ Partial Class ucrCalculator ' Me.cmdEquivalent.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdEquivalent.Location = New System.Drawing.Point(5, 52) - Me.cmdEquivalent.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdEquivalent.Margin = New System.Windows.Forms.Padding(2) Me.cmdEquivalent.Name = "cmdEquivalent" Me.cmdEquivalent.Size = New System.Drawing.Size(48, 38) Me.cmdEquivalent.TabIndex = 127 @@ -5488,18 +5388,6 @@ Partial Class ucrCalculator Me.cmdEncodeb.Text = "encode " Me.cmdEncodeb.UseVisualStyleBackColor = True ' - 'cmdSquishb - ' - 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(298, 18) - Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdSquishb.Name = "cmdSquishb" - Me.cmdSquishb.Size = New System.Drawing.Size(75, 38) - Me.cmdSquishb.TabIndex = 150 - Me.cmdSquishb.Text = "squish " - Me.cmdSquishb.UseVisualStyleBackColor = True - ' 'cmdSub ' Me.cmdSub.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) @@ -5658,6 +5546,18 @@ Partial Class ucrCalculator Me.cmdLocate.Text = "locate" Me.cmdLocate.UseVisualStyleBackColor = True ' + 'cmdSquishb + ' + 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(298, 18) + Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSquishb.Name = "cmdSquishb" + Me.cmdSquishb.Size = New System.Drawing.Size(75, 38) + Me.cmdSquishb.TabIndex = 150 + Me.cmdSquishb.Text = "squish " + Me.cmdSquishb.UseVisualStyleBackColor = True + ' 'ttCalculator ' Me.ttCalculator.AutoPopDelay = 10000 @@ -5684,26 +5584,14 @@ Partial Class ucrCalculator Me.grpCircular.Controls.Add(Me.cmdCircMedian) Me.grpCircular.Controls.Add(Me.cmdCircMean) Me.grpCircular.Location = New System.Drawing.Point(542, 77) - Me.grpCircular.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpCircular.Margin = New System.Windows.Forms.Padding(2) Me.grpCircular.Name = "grpCircular" - Me.grpCircular.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpCircular.Padding = New System.Windows.Forms.Padding(2) Me.grpCircular.Size = New System.Drawing.Size(310, 217) Me.grpCircular.TabIndex = 192 Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" ' - 'cmdCircularHelp - ' - Me.cmdCircularHelp.AutoSize = True - Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) - Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.TabIndex = 212 - Me.cmdCircularHelp.Text = "R Help" - Me.cmdCircularHelp.UseVisualStyleBackColor = True - ' 'ContextMenuStripCircular ' Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -5721,7 +5609,7 @@ Partial Class ucrCalculator ' Me.cmdCircular.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircular.Location = New System.Drawing.Point(2, 22) - Me.cmdCircular.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircular.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircular.Name = "cmdCircular" Me.cmdCircular.Size = New System.Drawing.Size(75, 40) Me.cmdCircular.TabIndex = 15 @@ -5732,7 +5620,7 @@ Partial Class ucrCalculator ' Me.cmdCircQuantile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircQuantile.Location = New System.Drawing.Point(150, 100) - Me.cmdCircQuantile.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircQuantile.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQuantile.Name = "cmdCircQuantile" Me.cmdCircQuantile.Size = New System.Drawing.Size(75, 40) Me.cmdCircQuantile.TabIndex = 13 @@ -5743,7 +5631,7 @@ Partial Class ucrCalculator ' Me.cmdCircMax.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircMax.Location = New System.Drawing.Point(223, 138) - Me.cmdCircMax.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMax.Name = "cmdCircMax" Me.cmdCircMax.Size = New System.Drawing.Size(82, 40) Me.cmdCircMax.TabIndex = 10 @@ -5754,7 +5642,7 @@ Partial Class ucrCalculator ' Me.cmdA1.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdA1.Location = New System.Drawing.Point(2, 100) - Me.cmdA1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdA1.Margin = New System.Windows.Forms.Padding(2) Me.cmdA1.Name = "cmdA1" Me.cmdA1.Size = New System.Drawing.Size(75, 40) Me.cmdA1.TabIndex = 8 @@ -5765,7 +5653,7 @@ Partial Class ucrCalculator ' Me.cmdAngVar.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdAngVar.Location = New System.Drawing.Point(77, 100) - Me.cmdAngVar.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdAngVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdAngVar.Name = "cmdAngVar" Me.cmdAngVar.Size = New System.Drawing.Size(75, 40) Me.cmdAngVar.TabIndex = 6 @@ -5776,7 +5664,7 @@ Partial Class ucrCalculator ' Me.cmdCircRho.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircRho.Location = New System.Drawing.Point(223, 100) - Me.cmdCircRho.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircRho.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircRho.Name = "cmdCircRho" Me.cmdCircRho.Size = New System.Drawing.Size(82, 40) Me.cmdCircRho.TabIndex = 14 @@ -5787,7 +5675,7 @@ Partial Class ucrCalculator ' Me.cmdCircQ3.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircQ3.Location = New System.Drawing.Point(150, 138) - Me.cmdCircQ3.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircQ3.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQ3.Name = "cmdCircQ3" Me.cmdCircQ3.Size = New System.Drawing.Size(75, 40) Me.cmdCircQ3.TabIndex = 12 @@ -5798,7 +5686,7 @@ Partial Class ucrCalculator ' Me.cmdCircQ1.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircQ1.Location = New System.Drawing.Point(77, 138) - Me.cmdCircQ1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircQ1.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQ1.Name = "cmdCircQ1" Me.cmdCircQ1.Size = New System.Drawing.Size(75, 40) Me.cmdCircQ1.TabIndex = 11 @@ -5809,7 +5697,7 @@ Partial Class ucrCalculator ' Me.cmdCircMin.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircMin.Location = New System.Drawing.Point(2, 138) - Me.cmdCircMin.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMin.Name = "cmdCircMin" Me.cmdCircMin.Size = New System.Drawing.Size(75, 40) Me.cmdCircMin.TabIndex = 9 @@ -5820,7 +5708,7 @@ Partial Class ucrCalculator ' Me.cmdAngDev.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdAngDev.Location = New System.Drawing.Point(150, 62) - Me.cmdAngDev.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdAngDev.Margin = New System.Windows.Forms.Padding(2) Me.cmdAngDev.Name = "cmdAngDev" Me.cmdAngDev.Size = New System.Drawing.Size(75, 40) Me.cmdAngDev.TabIndex = 7 @@ -5831,7 +5719,7 @@ Partial Class ucrCalculator ' Me.cmdCircVar.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircVar.Location = New System.Drawing.Point(223, 62) - Me.cmdCircVar.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircVar.Name = "cmdCircVar" Me.cmdCircVar.Size = New System.Drawing.Size(82, 40) Me.cmdCircVar.TabIndex = 5 @@ -5842,7 +5730,7 @@ Partial Class ucrCalculator ' Me.cmdCircSd.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircSd.Location = New System.Drawing.Point(77, 62) - Me.cmdCircSd.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircSd.Name = "cmdCircSd" Me.cmdCircSd.Size = New System.Drawing.Size(75, 40) Me.cmdCircSd.TabIndex = 4 @@ -5853,7 +5741,7 @@ Partial Class ucrCalculator ' Me.cmdCircRange.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircRange.Location = New System.Drawing.Point(2, 62) - Me.cmdCircRange.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircRange.Name = "cmdCircRange" Me.cmdCircRange.Size = New System.Drawing.Size(75, 40) Me.cmdCircRange.TabIndex = 3 @@ -5864,7 +5752,7 @@ Partial Class ucrCalculator ' Me.cmdMedianHL.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdMedianHL.Location = New System.Drawing.Point(223, 22) - Me.cmdMedianHL.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdMedianHL.Margin = New System.Windows.Forms.Padding(2) Me.cmdMedianHL.Name = "cmdMedianHL" Me.cmdMedianHL.Size = New System.Drawing.Size(82, 40) Me.cmdMedianHL.TabIndex = 2 @@ -5875,7 +5763,7 @@ Partial Class ucrCalculator ' Me.cmdCircMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircMedian.Location = New System.Drawing.Point(150, 22) - Me.cmdCircMedian.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMedian.Name = "cmdCircMedian" Me.cmdCircMedian.Size = New System.Drawing.Size(75, 40) Me.cmdCircMedian.TabIndex = 1 @@ -5886,7 +5774,7 @@ Partial Class ucrCalculator ' Me.cmdCircMean.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCircMean.Location = New System.Drawing.Point(77, 22) - Me.cmdCircMean.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCircMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMean.Name = "cmdCircMean" Me.cmdCircMean.Size = New System.Drawing.Size(75, 40) Me.cmdCircMean.TabIndex = 0 @@ -5900,9 +5788,9 @@ Partial Class ucrCalculator Me.grpModifier.Controls.Add(Me.cmdCollate) Me.grpModifier.Controls.Add(Me.cmdBoundary) Me.grpModifier.Location = New System.Drawing.Point(542, 287) - Me.grpModifier.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpModifier.Margin = New System.Windows.Forms.Padding(2) Me.grpModifier.Name = "grpModifier" - Me.grpModifier.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpModifier.Padding = New System.Windows.Forms.Padding(2) Me.grpModifier.Size = New System.Drawing.Size(320, 67) Me.grpModifier.TabIndex = 192 Me.grpModifier.TabStop = False @@ -5912,7 +5800,7 @@ Partial Class ucrCalculator ' Me.cmdRegex.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRegex.Location = New System.Drawing.Point(235, 17) - Me.cmdRegex.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdRegex.Margin = New System.Windows.Forms.Padding(2) Me.cmdRegex.Name = "cmdRegex" Me.cmdRegex.Size = New System.Drawing.Size(78, 38) Me.cmdRegex.TabIndex = 3 @@ -5923,7 +5811,7 @@ Partial Class ucrCalculator ' Me.cmdFixed.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdFixed.Location = New System.Drawing.Point(158, 17) - Me.cmdFixed.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdFixed.Margin = New System.Windows.Forms.Padding(2) Me.cmdFixed.Name = "cmdFixed" Me.cmdFixed.Size = New System.Drawing.Size(78, 38) Me.cmdFixed.TabIndex = 2 @@ -5934,7 +5822,7 @@ Partial Class ucrCalculator ' Me.cmdCollate.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCollate.Location = New System.Drawing.Point(80, 17) - Me.cmdCollate.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdCollate.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollate.Name = "cmdCollate" Me.cmdCollate.Size = New System.Drawing.Size(78, 38) Me.cmdCollate.TabIndex = 1 @@ -5945,7 +5833,7 @@ Partial Class ucrCalculator ' Me.cmdBoundary.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdBoundary.Location = New System.Drawing.Point(2, 17) - Me.cmdBoundary.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdBoundary.Margin = New System.Windows.Forms.Padding(2) Me.cmdBoundary.Name = "cmdBoundary" Me.cmdBoundary.Size = New System.Drawing.Size(78, 38) Me.cmdBoundary.TabIndex = 0 @@ -5970,9 +5858,9 @@ Partial Class ucrCalculator Me.grpSymbols.Controls.Add(Me.cmdbegin) Me.grpSymbols.Controls.Add(Me.cmdAny1) Me.grpSymbols.Location = New System.Drawing.Point(542, 355) - Me.grpSymbols.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpSymbols.Margin = New System.Windows.Forms.Padding(2) Me.grpSymbols.Name = "grpSymbols" - Me.grpSymbols.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpSymbols.Padding = New System.Windows.Forms.Padding(2) Me.grpSymbols.Size = New System.Drawing.Size(395, 140) Me.grpSymbols.TabIndex = 193 Me.grpSymbols.TabStop = False @@ -5982,7 +5870,7 @@ Partial Class ucrCalculator ' Me.cmdOr3.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdOr3.Location = New System.Drawing.Point(158, 58) - Me.cmdOr3.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdOr3.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr3.Name = "cmdOr3" Me.cmdOr3.Size = New System.Drawing.Size(78, 38) Me.cmdOr3.TabIndex = 16 @@ -5993,7 +5881,7 @@ Partial Class ucrCalculator ' Me.cmdEscape.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdEscape.Location = New System.Drawing.Point(237, 93) - Me.cmdEscape.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdEscape.Margin = New System.Windows.Forms.Padding(2) Me.cmdEscape.Name = "cmdEscape" Me.cmdEscape.Size = New System.Drawing.Size(78, 38) Me.cmdEscape.TabIndex = 14 @@ -6004,7 +5892,7 @@ Partial Class ucrCalculator ' Me.cmdPlusZero.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdPlusZero.Location = New System.Drawing.Point(313, 93) - Me.cmdPlusZero.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdPlusZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusZero.Name = "cmdPlusZero" Me.cmdPlusZero.Size = New System.Drawing.Size(78, 38) Me.cmdPlusZero.TabIndex = 15 @@ -6015,7 +5903,7 @@ Partial Class ucrCalculator ' Me.cmdZero.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdZero.Location = New System.Drawing.Point(158, 93) - Me.cmdZero.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdZero.Name = "cmdZero" Me.cmdZero.Size = New System.Drawing.Size(78, 38) Me.cmdZero.TabIndex = 13 @@ -6026,7 +5914,7 @@ Partial Class ucrCalculator ' Me.cmdPlusOne.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdPlusOne.Location = New System.Drawing.Point(80, 93) - Me.cmdPlusOne.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdPlusOne.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusOne.Name = "cmdPlusOne" Me.cmdPlusOne.Size = New System.Drawing.Size(78, 38) Me.cmdPlusOne.TabIndex = 12 @@ -6037,7 +5925,7 @@ Partial Class ucrCalculator ' Me.cmdZeroOrOne.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdZeroOrOne.Location = New System.Drawing.Point(2, 93) - Me.cmdZeroOrOne.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdZeroOrOne.Margin = New System.Windows.Forms.Padding(2) Me.cmdZeroOrOne.Name = "cmdZeroOrOne" Me.cmdZeroOrOne.Size = New System.Drawing.Size(78, 38) Me.cmdZeroOrOne.TabIndex = 11 @@ -6048,7 +5936,7 @@ Partial Class ucrCalculator ' Me.cmdNumbers.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdNumbers.Location = New System.Drawing.Point(313, 58) - Me.cmdNumbers.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdNumbers.Margin = New System.Windows.Forms.Padding(2) Me.cmdNumbers.Name = "cmdNumbers" Me.cmdNumbers.Size = New System.Drawing.Size(78, 38) Me.cmdNumbers.TabIndex = 10 @@ -6059,7 +5947,7 @@ Partial Class ucrCalculator ' Me.cmdNot1.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdNot1.Location = New System.Drawing.Point(80, 58) - Me.cmdNot1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdNot1.Margin = New System.Windows.Forms.Padding(2) Me.cmdNot1.Name = "cmdNot1" Me.cmdNot1.Size = New System.Drawing.Size(78, 38) Me.cmdNot1.TabIndex = 8 @@ -6070,7 +5958,7 @@ Partial Class ucrCalculator ' Me.cmdOr2.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdOr2.Location = New System.Drawing.Point(237, 58) - Me.cmdOr2.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdOr2.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr2.Name = "cmdOr2" Me.cmdOr2.Size = New System.Drawing.Size(78, 38) Me.cmdOr2.TabIndex = 9 @@ -6081,7 +5969,7 @@ Partial Class ucrCalculator ' Me.cmdOr1.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdOr1.Location = New System.Drawing.Point(2, 58) - Me.cmdOr1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdOr1.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr1.Name = "cmdOr1" Me.cmdOr1.Size = New System.Drawing.Size(78, 38) Me.cmdOr1.TabIndex = 7 @@ -6092,7 +5980,7 @@ Partial Class ucrCalculator ' Me.cmdSpace.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdSpace.Location = New System.Drawing.Point(313, 20) - Me.cmdSpace.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdSpace.Margin = New System.Windows.Forms.Padding(2) Me.cmdSpace.Name = "cmdSpace" Me.cmdSpace.Size = New System.Drawing.Size(78, 38) Me.cmdSpace.TabIndex = 6 @@ -6103,7 +5991,7 @@ Partial Class ucrCalculator ' Me.cmdDigit.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdDigit.Location = New System.Drawing.Point(237, 20) - Me.cmdDigit.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdDigit.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigit.Name = "cmdDigit" Me.cmdDigit.Size = New System.Drawing.Size(78, 38) Me.cmdDigit.TabIndex = 5 @@ -6114,7 +6002,7 @@ Partial Class ucrCalculator ' Me.cmdEnd1.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdEnd1.Location = New System.Drawing.Point(158, 20) - Me.cmdEnd1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdEnd1.Margin = New System.Windows.Forms.Padding(2) Me.cmdEnd1.Name = "cmdEnd1" Me.cmdEnd1.Size = New System.Drawing.Size(78, 38) Me.cmdEnd1.TabIndex = 4 @@ -6125,7 +6013,7 @@ Partial Class ucrCalculator ' Me.cmdbegin.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdbegin.Location = New System.Drawing.Point(80, 20) - Me.cmdbegin.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdbegin.Margin = New System.Windows.Forms.Padding(2) Me.cmdbegin.Name = "cmdbegin" Me.cmdbegin.Size = New System.Drawing.Size(78, 38) Me.cmdbegin.TabIndex = 3 @@ -6136,7 +6024,7 @@ Partial Class ucrCalculator ' Me.cmdAny1.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdAny1.Location = New System.Drawing.Point(2, 20) - Me.cmdAny1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.cmdAny1.Margin = New System.Windows.Forms.Padding(2) Me.cmdAny1.Name = "cmdAny1" Me.cmdAny1.Size = New System.Drawing.Size(78, 38) Me.cmdAny1.TabIndex = 2 @@ -6173,18 +6061,6 @@ Partial Class ucrCalculator Me.grpComplex.TabStop = False Me.grpComplex.Text = "Complex" ' - 'cmdComplexRHelp - ' - Me.cmdComplexRHelp.AutoSize = True - Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(228, 212) - Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.TabIndex = 209 - Me.cmdComplexRHelp.Text = "R Help" - Me.cmdComplexRHelp.UseVisualStyleBackColor = True - ' 'cmdComplexTanH ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) @@ -7162,6 +7038,51 @@ Partial Class ucrCalculator Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True ' + 'Button2 + ' + Me.Button2.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Button2.Location = New System.Drawing.Point(2, 198) + Me.Button2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(78, 38) + Me.Button2.TabIndex = 188 + Me.Button2.UseVisualStyleBackColor = True + ' + 'Button3 + ' + Me.Button3.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Button3.Location = New System.Drawing.Point(79, 198) + Me.Button3.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(70, 38) + Me.Button3.TabIndex = 187 + Me.Button3.Text = "cov" + Me.Button3.UseVisualStyleBackColor = True + ' + 'Button4 + ' + Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.Button4.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Button4.Location = New System.Drawing.Point(148, 198) + Me.Button4.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(70, 38) + Me.Button4.TabIndex = 186 + Me.Button4.Text = "quantile" + Me.Button4.UseVisualStyleBackColor = True + ' + 'Button5 + ' + Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.Button5.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Button5.Location = New System.Drawing.Point(217, 198) + Me.Button5.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(70, 38) + Me.Button5.TabIndex = 189 + Me.Button5.Text = "quantile" + Me.Button5.UseVisualStyleBackColor = True + ' 'cmdRhelpList ' Me.cmdRhelpList.AutoSize = True @@ -7211,7 +7132,7 @@ Partial Class ucrCalculator ' Me.ucrTryCalculator.AutoSize = True Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 320) - Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) + Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(5) Me.ucrTryCalculator.Name = "ucrTryCalculator" Me.ucrTryCalculator.RunCommandAsMultipleLines = False Me.ucrTryCalculator.Size = New System.Drawing.Size(495, 46) @@ -7254,6 +7175,138 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' + 'cmdSummaryRHelp + ' + Me.cmdSummaryRHelp.AutoSize = True + Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(228, 238) + Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.TabIndex = 185 + Me.cmdSummaryRHelp.Text = "R Help" + Me.cmdSummaryRHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245) + Me.cmdTransformRHelp.Name = "cmdTransformRHelp" + Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.TabIndex = 204 + Me.cmdTransformRHelp.Text = "R Help" + Me.cmdTransformRHelp.UseVisualStyleBackColor = True + ' + 'cmdLogicalHelp + ' + Me.cmdLogicalHelp.AutoSize = True + Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 234) + Me.cmdLogicalHelp.Name = "cmdLogicalHelp" + Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.TabIndex = 212 + Me.cmdLogicalHelp.Text = "R Help" + Me.cmdLogicalHelp.UseVisualStyleBackColor = True + ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.Location = New System.Drawing.Point(186, 164) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.TabIndex = 212 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) + Me.cmdHydroHelp.Name = "cmdHydroHelp" + Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.TabIndex = 212 + Me.cmdHydroHelp.Text = "R Help" + Me.cmdHydroHelp.UseVisualStyleBackColor = True + ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) + Me.cmdTransformHelp.Name = "cmdTransformHelp" + Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.TabIndex = 212 + Me.cmdTransformHelp.Text = "R Help" + Me.cmdTransformHelp.UseVisualStyleBackColor = True + ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) + Me.cmdCircularHelp.Name = "cmdCircularHelp" + Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.TabIndex = 212 + Me.cmdCircularHelp.Text = "R Help" + Me.cmdCircularHelp.UseVisualStyleBackColor = True + ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) + Me.cmdMathsHelp.Name = "cmdMathsHelp" + Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.TabIndex = 211 + Me.cmdMathsHelp.Text = "R Help" + Me.cmdMathsHelp.UseVisualStyleBackColor = True + ' + 'cmdProbRHelp + ' + Me.cmdProbRHelp.AutoSize = True + Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) + Me.cmdProbRHelp.Name = "cmdProbRHelp" + Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.TabIndex = 212 + Me.cmdProbRHelp.Text = "R Help" + Me.cmdProbRHelp.UseVisualStyleBackColor = True + ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) + Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.TabIndex = 16 + Me.cmdIntegerRHelp.Text = "R Help" + Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + ' + 'cmdComplexRHelp + ' + Me.cmdComplexRHelp.AutoSize = True + Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.Location = New System.Drawing.Point(228, 212) + Me.cmdComplexRHelp.Name = "cmdComplexRHelp" + Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.TabIndex = 209 + Me.cmdComplexRHelp.Text = "R Help" + Me.cmdComplexRHelp.UseVisualStyleBackColor = True + ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) @@ -7270,11 +7323,6 @@ 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.grpProbabilty) - Me.Controls.Add(Me.grpInteger) - Me.Controls.Add(Me.grpTestString) - Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpWakefield) Me.Controls.Add(Me.grpModifier) @@ -7286,6 +7334,11 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpFactor) Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpMaths) + Me.Controls.Add(Me.grpList) + Me.Controls.Add(Me.grpProbabilty) + Me.Controls.Add(Me.grpInteger) + Me.Controls.Add(Me.grpTestString) + Me.Controls.Add(Me.grpComplex) Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(1123, 572) Me.grpBasic.ResumeLayout(False) @@ -7915,4 +7968,8 @@ Partial Class ucrCalculator Friend WithEvents cmdListDiv As Button Friend WithEvents cmdListMod As Button Friend WithEvents cmdListIfelse As Button + Friend WithEvents Button5 As Button + Friend WithEvents Button2 As Button + Friend WithEvents Button3 As Button + Friend WithEvents Button4 As Button End Class From 8347aafbfaaee495862dfd69a5656f4f016cb2d4 Mon Sep 17 00:00:00 2001 From: JUMA Date: Wed, 6 Mar 2024 17:08:27 +0300 Subject: [PATCH 30/31] code_change --- instat/ucrCalculator.Designer.vb | 429 ++++++++++++++++--------------- instat/ucrCalculator.vb | 37 ++- 2 files changed, 251 insertions(+), 215 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 86a4f97b8c2..49155781003 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -62,6 +62,7 @@ Partial Class ucrCalculator Me.cmd0 = New System.Windows.Forms.Button() Me.cmd1 = New System.Windows.Forms.Button() Me.grpDates = New System.Windows.Forms.GroupBox() + Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -118,6 +119,7 @@ Partial Class ucrCalculator Me.cmdGCD = New System.Windows.Forms.Button() Me.cmdGeneratePrimes = New System.Windows.Forms.Button() Me.cmdNthPrime = New System.Windows.Forms.Button() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -140,6 +142,7 @@ Partial Class ucrCalculator Me.cmdIsPrime = New System.Windows.Forms.Button() Me.cmdBigZ = New System.Windows.Forms.Button() Me.grpFactor = New System.Windows.Forms.GroupBox() + Me.cmdTransformHelp = New instat.ucrSplitButton() Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdShuffle = New System.Windows.Forms.Button() @@ -163,6 +166,7 @@ Partial Class ucrCalculator Me.cmdFactor = New System.Windows.Forms.Button() Me.cmdAnon = New System.Windows.Forms.Button() Me.grpHydroGOF = New System.Windows.Forms.GroupBox() + Me.cmdHydroHelp = New instat.ucrSplitButton() Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdVE = New System.Windows.Forms.Button() @@ -243,6 +247,7 @@ Partial Class ucrCalculator Me.cmdGroup = New System.Windows.Forms.Button() Me.cmdGrade = New System.Windows.Forms.Button() Me.grpMaths = New System.Windows.Forms.GroupBox() + Me.cmdMathsHelp = New instat.ucrSplitButton() Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdAtan2 = New System.Windows.Forms.Button() @@ -269,6 +274,11 @@ Partial Class ucrCalculator Me.cmdCos = New System.Windows.Forms.Button() Me.cmdSqrt = New System.Windows.Forms.Button() Me.grpSummary = New System.Windows.Forms.GroupBox() + Me.cmdwheremin = New System.Windows.Forms.Button() + Me.cmdwhichmax = New System.Windows.Forms.Button() + Me.cmdwheremax = New System.Windows.Forms.Button() + Me.cmdwhichmin = New System.Windows.Forms.Button() + Me.cmdSummaryRHelp = New instat.ucrSplitButton() Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -322,6 +332,7 @@ Partial Class ucrCalculator Me.cmdVar = New System.Windows.Forms.Button() Me.grpProbabilty = New System.Windows.Forms.GroupBox() Me.cmdPascal = New System.Windows.Forms.Button() + Me.cmdProbRHelp = New instat.ucrSplitButton() Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -370,6 +381,7 @@ Partial Class ucrCalculator Me.cmdDecimals = New System.Windows.Forms.Button() Me.cmdMASSFractions = 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() @@ -404,6 +416,7 @@ Partial Class ucrCalculator Me.cmdLead = New System.Windows.Forms.Button() Me.cmdLag = New System.Windows.Forms.Button() Me.grpLogical = New System.Windows.Forms.GroupBox() + Me.cmdLogicalHelp = New instat.ucrSplitButton() Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -467,6 +480,7 @@ Partial Class ucrCalculator Me.cmdSquishb = New System.Windows.Forms.Button() Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components) Me.grpCircular = New System.Windows.Forms.GroupBox() + Me.cmdCircularHelp = New instat.ucrSplitButton() Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdCircular = New System.Windows.Forms.Button() @@ -507,6 +521,7 @@ Partial Class ucrCalculator Me.cmdbegin = New System.Windows.Forms.Button() Me.cmdAny1 = New System.Windows.Forms.Button() Me.grpComplex = New System.Windows.Forms.GroupBox() + Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -589,10 +604,6 @@ Partial Class ucrCalculator Me.cmdListSum = New System.Windows.Forms.Button() Me.cmdListSumd = New System.Windows.Forms.Button() Me.cmdListMissing = New System.Windows.Forms.Button() - Me.Button2 = New System.Windows.Forms.Button() - Me.Button3 = New System.Windows.Forms.Button() - Me.Button4 = New System.Windows.Forms.Button() - Me.Button5 = New System.Windows.Forms.Button() Me.cmdRhelpList = New instat.ucrSplitButton() Me.cmdWakefieldHelp = New instat.ucrSplitButton() Me.cmdStringRHelp = New instat.ucrSplitButton() @@ -601,17 +612,6 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() - Me.cmdTransformRHelp = New instat.ucrSplitButton() - Me.cmdLogicalHelp = New instat.ucrSplitButton() - Me.cmdRHelp = New instat.ucrSplitButton() - Me.cmdHydroHelp = New instat.ucrSplitButton() - Me.cmdTransformHelp = New instat.ucrSplitButton() - Me.cmdCircularHelp = New instat.ucrSplitButton() - Me.cmdMathsHelp = New instat.ucrSplitButton() - Me.cmdProbRHelp = New instat.ucrSplitButton() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() - Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -948,6 +948,18 @@ Partial Class ucrCalculator Me.grpDates.TabStop = False Me.grpDates.Text = "Dates/Times" ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.Location = New System.Drawing.Point(186, 164) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.TabIndex = 212 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripDate ' Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1545,6 +1557,18 @@ Partial Class ucrCalculator Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) + Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.TabIndex = 16 + Me.cmdIntegerRHelp.Text = "R Help" + Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripInteger ' Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -1750,6 +1774,18 @@ Partial Class ucrCalculator Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) + Me.cmdTransformHelp.Name = "cmdTransformHelp" + Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.TabIndex = 212 + Me.cmdTransformHelp.Text = "R Help" + Me.cmdTransformHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripFactor ' Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2016,6 +2052,18 @@ Partial Class ucrCalculator Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "hydroGOF " ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) + Me.cmdHydroHelp.Name = "cmdHydroHelp" + Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.TabIndex = 212 + Me.cmdHydroHelp.Text = "R Help" + Me.cmdHydroHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripHydroGOF ' Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2964,6 +3012,18 @@ Partial Class ucrCalculator Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) + Me.cmdMathsHelp.Name = "cmdMathsHelp" + Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.TabIndex = 211 + Me.cmdMathsHelp.Text = "R Help" + Me.cmdMathsHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3235,10 +3295,10 @@ Partial Class ucrCalculator ' 'grpSummary ' - Me.grpSummary.Controls.Add(Me.Button5) - Me.grpSummary.Controls.Add(Me.Button2) - Me.grpSummary.Controls.Add(Me.Button3) - Me.grpSummary.Controls.Add(Me.Button4) + Me.grpSummary.Controls.Add(Me.cmdwheremin) + Me.grpSummary.Controls.Add(Me.cmdwhichmax) + Me.grpSummary.Controls.Add(Me.cmdwheremax) + Me.grpSummary.Controls.Add(Me.cmdwhichmin) Me.grpSummary.Controls.Add(Me.cmdSummaryRHelp) Me.grpSummary.Controls.Add(Me.grpFrequencies) Me.grpSummary.Controls.Add(Me.cmdKurtosis) @@ -3278,6 +3338,64 @@ Partial Class ucrCalculator Me.grpSummary.TabStop = False Me.grpSummary.Text = "Summary" ' + 'cmdwheremin + ' + 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(269, 199) + Me.cmdwheremin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwheremin.Name = "cmdwheremin" + Me.cmdwheremin.Size = New System.Drawing.Size(90, 38) + Me.cmdwheremin.TabIndex = 193 + Me.cmdwheremin.Text = "where.min" + Me.cmdwheremin.UseVisualStyleBackColor = True + ' + 'cmdwhichmax + ' + Me.cmdwhichmax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdwhichmax.Location = New System.Drawing.Point(2, 199) + Me.cmdwhichmax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwhichmax.Name = "cmdwhichmax" + Me.cmdwhichmax.Size = New System.Drawing.Size(90, 38) + Me.cmdwhichmax.TabIndex = 192 + Me.cmdwhichmax.Text = "which.max" + Me.cmdwhichmax.UseVisualStyleBackColor = True + ' + 'cmdwheremax + ' + Me.cmdwheremax.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdwheremax.Location = New System.Drawing.Point(91, 199) + Me.cmdwheremax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwheremax.Name = "cmdwheremax" + Me.cmdwheremax.Size = New System.Drawing.Size(90, 38) + Me.cmdwheremax.TabIndex = 191 + Me.cmdwheremax.Text = "where.max" + Me.cmdwheremax.UseVisualStyleBackColor = True + ' + 'cmdwhichmin + ' + 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(180, 199) + Me.cmdwhichmin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwhichmin.Name = "cmdwhichmin" + Me.cmdwhichmin.Size = New System.Drawing.Size(90, 38) + Me.cmdwhichmin.TabIndex = 190 + Me.cmdwhichmin.Text = "which.min" + Me.cmdwhichmin.UseVisualStyleBackColor = True + ' + 'cmdSummaryRHelp + ' + Me.cmdSummaryRHelp.AutoSize = True + Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.Location = New System.Drawing.Point(228, 238) + Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary + Me.cmdSummaryRHelp.TabIndex = 185 + Me.cmdSummaryRHelp.Text = "R Help" + Me.cmdSummaryRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripSummary ' Me.ContextMenuStripSummary.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3338,7 +3456,7 @@ 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, 284) + Me.grpFrequencies.Location = New System.Drawing.Point(2, 283) Me.grpFrequencies.Name = "grpFrequencies" Me.grpFrequencies.Size = New System.Drawing.Size(353, 133) Me.grpFrequencies.TabIndex = 184 @@ -3900,6 +4018,18 @@ Partial Class ucrCalculator Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True ' + 'cmdProbRHelp + ' + Me.cmdProbRHelp.AutoSize = True + Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) + Me.cmdProbRHelp.Name = "cmdProbRHelp" + Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.TabIndex = 212 + Me.cmdProbRHelp.Text = "R Help" + Me.cmdProbRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripProbability ' Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4490,6 +4620,18 @@ Partial Class ucrCalculator Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245) + Me.cmdTransformRHelp.Name = "cmdTransformRHelp" + Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.TabIndex = 204 + Me.cmdTransformRHelp.Text = "R Help" + Me.cmdTransformRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -4845,6 +4987,18 @@ Partial Class ucrCalculator Me.grpLogical.TabStop = False Me.grpLogical.Text = "Logical and Symbols" ' + 'cmdLogicalHelp + ' + Me.cmdLogicalHelp.AutoSize = True + Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 234) + Me.cmdLogicalHelp.Name = "cmdLogicalHelp" + Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.TabIndex = 212 + Me.cmdLogicalHelp.Text = "R Help" + Me.cmdLogicalHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripLogical ' Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -5592,6 +5746,18 @@ Partial Class ucrCalculator Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) + Me.cmdCircularHelp.Name = "cmdCircularHelp" + Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.TabIndex = 212 + Me.cmdCircularHelp.Text = "R Help" + Me.cmdCircularHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripCircular ' Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -6061,6 +6227,18 @@ Partial Class ucrCalculator Me.grpComplex.TabStop = False Me.grpComplex.Text = "Complex" ' + 'cmdComplexRHelp + ' + Me.cmdComplexRHelp.AutoSize = True + Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.Location = New System.Drawing.Point(228, 212) + Me.cmdComplexRHelp.Name = "cmdComplexRHelp" + Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.TabIndex = 209 + Me.cmdComplexRHelp.Text = "R Help" + Me.cmdComplexRHelp.UseVisualStyleBackColor = True + ' 'cmdComplexTanH ' Me.cmdComplexTanH.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) @@ -7038,51 +7216,6 @@ Partial Class ucrCalculator Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True ' - 'Button2 - ' - Me.Button2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button2.Location = New System.Drawing.Point(2, 198) - Me.Button2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(78, 38) - Me.Button2.TabIndex = 188 - Me.Button2.UseVisualStyleBackColor = True - ' - 'Button3 - ' - Me.Button3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button3.Location = New System.Drawing.Point(79, 198) - Me.Button3.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(70, 38) - Me.Button3.TabIndex = 187 - Me.Button3.Text = "cov" - Me.Button3.UseVisualStyleBackColor = True - ' - 'Button4 - ' - Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.Button4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button4.Location = New System.Drawing.Point(148, 198) - Me.Button4.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(70, 38) - Me.Button4.TabIndex = 186 - Me.Button4.Text = "quantile" - Me.Button4.UseVisualStyleBackColor = True - ' - 'Button5 - ' - Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.Button5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button5.Location = New System.Drawing.Point(217, 198) - Me.Button5.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(70, 38) - Me.Button5.TabIndex = 189 - Me.Button5.Text = "quantile" - Me.Button5.UseVisualStyleBackColor = True - ' 'cmdRhelpList ' Me.cmdRhelpList.AutoSize = True @@ -7175,143 +7308,12 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' - 'cmdSummaryRHelp - ' - Me.cmdSummaryRHelp.AutoSize = True - Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(228, 238) - Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.TabIndex = 185 - Me.cmdSummaryRHelp.Text = "R Help" - Me.cmdSummaryRHelp.UseVisualStyleBackColor = True - ' - 'cmdTransformRHelp - ' - Me.cmdTransformRHelp.AutoSize = True - Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(267, 245) - Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.TabIndex = 204 - Me.cmdTransformRHelp.Text = "R Help" - Me.cmdTransformRHelp.UseVisualStyleBackColor = True - ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 234) - Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.TabIndex = 212 - Me.cmdLogicalHelp.Text = "R Help" - Me.cmdLogicalHelp.UseVisualStyleBackColor = True - ' - 'cmdRHelp - ' - Me.cmdRHelp.AutoSize = True - Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(186, 164) - Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.TabIndex = 212 - Me.cmdRHelp.Text = "R Help" - Me.cmdRHelp.UseVisualStyleBackColor = True - ' - 'cmdHydroHelp - ' - Me.cmdHydroHelp.AutoSize = True - Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) - Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.TabIndex = 212 - Me.cmdHydroHelp.Text = "R Help" - Me.cmdHydroHelp.UseVisualStyleBackColor = True - ' - 'cmdTransformHelp - ' - Me.cmdTransformHelp.AutoSize = True - Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) - Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.TabIndex = 212 - Me.cmdTransformHelp.Text = "R Help" - Me.cmdTransformHelp.UseVisualStyleBackColor = True - ' - 'cmdCircularHelp - ' - Me.cmdCircularHelp.AutoSize = True - Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) - Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.TabIndex = 212 - Me.cmdCircularHelp.Text = "R Help" - Me.cmdCircularHelp.UseVisualStyleBackColor = True - ' - 'cmdMathsHelp - ' - Me.cmdMathsHelp.AutoSize = True - Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) - Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.TabIndex = 211 - Me.cmdMathsHelp.Text = "R Help" - Me.cmdMathsHelp.UseVisualStyleBackColor = True - ' - 'cmdProbRHelp - ' - Me.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True - ' - 'cmdIntegerRHelp - ' - Me.cmdIntegerRHelp.AutoSize = True - Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) - Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.TabIndex = 16 - Me.cmdIntegerRHelp.Text = "R Help" - Me.cmdIntegerRHelp.UseVisualStyleBackColor = True - ' - 'cmdComplexRHelp - ' - Me.cmdComplexRHelp.AutoSize = True - Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(228, 212) - Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.TabIndex = 209 - Me.cmdComplexRHelp.Text = "R Help" - Me.cmdComplexRHelp.UseVisualStyleBackColor = True - ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True + Me.Controls.Add(Me.grpList) Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) @@ -7334,7 +7336,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpFactor) Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpMaths) - Me.Controls.Add(Me.grpList) Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.grpTestString) @@ -7343,44 +7344,44 @@ Partial Class ucrCalculator Me.Size = New System.Drawing.Size(1123, 572) 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) @@ -7388,7 +7389,7 @@ Partial Class ucrCalculator Me.GroupBox1.ResumeLayout(False) Me.grpMathBloc.ResumeLayout(False) Me.ResumeLayout(False) - Me.PerformLayout() + Me.PerformLayout End Sub @@ -7968,8 +7969,8 @@ Partial Class ucrCalculator Friend WithEvents cmdListDiv As Button Friend WithEvents cmdListMod As Button Friend WithEvents cmdListIfelse As Button - Friend WithEvents Button5 As Button - Friend WithEvents Button2 As Button - Friend WithEvents Button3 As Button - Friend WithEvents Button4 As Button + Friend WithEvents cmdwheremin As Button + Friend WithEvents cmdwhichmax As Button + Friend WithEvents cmdwheremax As Button + Friend WithEvents cmdwhichmin As Button End Class diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 452d7b8475a..f6c6adf25a2 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -342,7 +342,10 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdCor, "correlation between 2 variables. It is a value between -1 and +1.") ttCalculator.SetToolTip(cmdCov, "covariance between 2 variables.") ttCalculator.SetToolTip(cmdQuantile, "a quantile, given a value between 0 and 1. So quantile(c(1,2,3,4,10), 0.25) = 2 and is the lower quartile.") - + ttCalculator.SetToolTip(cmdwhichmax, "Row number of the maximum value. So which.max(c(4,3,10,1,2)) is 3") + ttCalculator.SetToolTip(cmdwhichmin, "Row number of the minimum value. So which.min(c(4,3,10,1,2)) is 4") + ttCalculator.SetToolTip(cmdwheremax, "Value of a variable at the which.max position. So for c(""a"",""b"",""c"",""d"",""e""), is ""c"", for the data in which.max tooltip.") + ttCalculator.SetToolTip(cmdwheremin, "Value of a variable at the which.min position. So for c(""a"",""b"",""c"",""d"",""e""), is ""d"", for the data in which.min tooltip.") ttCalculator.SetToolTip(cmdFreqDistinct, "complete the command by rep(d ,f) for data in variable called d and frequencies in f") ttCalculator.SetToolTip(cmdFreqIQR, "complete the command by rep(d ,f) for data in variable called d and frequencies in f") ttCalculator.SetToolTip(cmdFreqLength, "complete the command by rep(d ,f) for data in variable called d and frequencies in f") @@ -5374,4 +5377,36 @@ Public Class ucrCalculator Private Sub cmdListDuplicated_Click(sender As Object, e As EventArgs) Handles cmdListDuplicated.Click ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( ,duplicated)", 13) End Sub + + Private Sub cmdwhichmax_Click(sender As Object, e As EventArgs) Handles cmdwhichmax.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max(x= )", 1) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max()", 1) + End If + End Sub + + Private Sub cmdwheremin_Click(sender As Object, e As EventArgs) Handles cmdwheremin.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.min(x= )]", 17) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.min( )]", 15) + End If + End Sub + + Private Sub cmdwhichmin_Click(sender As Object, e As EventArgs) Handles cmdwhichmin.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min(x= )", 1) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min()", 1) + End If + End Sub + + Private Sub cmdwheremax_Click(sender As Object, e As EventArgs) Handles cmdwheremax.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.max(x= )]", 17) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.max( )]", 15) + End If + End Sub End Class From f6f2922d40c8f7574280ff72f6972696b73d6bb4 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Thu, 7 Mar 2024 10:44:59 +0300 Subject: [PATCH 31/31] Changes --- instat/dlgScript.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index 317aaad3503..f16bb22c428 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -212,7 +212,7 @@ Public Class dlgScript ucrPnlSaveDataFrame.SetVisible(False) If rdoSaveDataFrame.Checked Then ucrPnlSaveDataFrame.SetVisible(True) - VisiilityOfControls() + HideShowSaveDataFrameControls() ucrChkDisplayGraph.Visible = False ucrInputSaveDataFrame.SetName("") ElseIf rdoSaveColumn.Checked Then @@ -748,17 +748,17 @@ Public Class dlgScript Private Sub cmdHelp_Click(sender As Object, e As EventArgs) Handles cmdHelp.Click Dim strPackageName As String = ucrCboExamplePackages.cboInput.SelectedItem Dim strTopic As String = lstExampleCollection.SelectedItems(0).Text - If strPackageName <> "" AndAlso strTopic <> "" Then + If Not String.IsNullOrEmpty(strPackageName) AndAlso Not String.IsNullOrEmpty(strTopic) Then Dim frmMaximiseOutput As New frmMaximiseOutput frmMaximiseOutput.Show(strFileName:=clsFileUrlUtilities.GetHelpFileURL(strPackageName:=strPackageName, strTopic:=strTopic), bReplace:=False) End If End Sub Private Sub ucrPnlSaveDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSaveDataFrame.ControlValueChanged - VisiilityOfControls() + HideShowSaveDataFrameControls() End Sub - Private Sub VisiilityOfControls() + Private Sub HideShowSaveDataFrameControls() ucrInputSaveRFile.SetVisible(False) ucrInputSaveDataFrame.SetVisible(False) ucrChkSaveDataFrameSingle.SetVisible(False)