diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 16e9351e19a..73f2c715b79 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -27,7 +27,7 @@ Public Class dlgCalculator Private iBasicWidth As Integer Private strDefaultKeyboard As String ' Note: This list needs to be updated when a new keyboard is added. - Private strKeyboards() As String = {"Maths", "Logical and Symbols", "Summary", "Text/Strings (Character Columns)", "Factor", "Probability", "Dates/Times", "Transform", "Circular", "Wakefield", "Modifier", "Symbols", "HydroGOF", "Integer", "Complex", "List"} + Private strKeyboards() As String = {"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer"} Private Sub dlgCalculator_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -192,7 +192,7 @@ Public Class dlgCalculator Me.Width = iBasicWidth * 1.39 Case "Symbols" Me.Width = iBasicWidth * 2.56 - Case "hydroGOF" + Case "Goodness of Fit" Me.Width = iBasicWidth * 1.27 ucrBase.iHelpTopicID = 598 Case "Integer" diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index 45452879aa7..b78cee3e008 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -501,7 +501,7 @@ Public Class dlgEvapotranspiration clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) clsListFunction.AddParameter("z", 2, iPosition:=4) clsListFunction.AddParameter("G", 0, iPosition:=6) - clsListFunction.AddParameter("as", 0.25, iPosition:=7) + clsListFunction.AddParameter("as", 0.23, iPosition:=7) clsListFunction.AddParameter("bs", 0.5, iPosition:=8) clsListFunction.AddParameter("lambda", 2.45, iPosition:=1) clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) @@ -522,7 +522,7 @@ Public Class dlgEvapotranspiration clsListFunction.AddParameter("Gsc", 0.082, iPosition:=3) clsListFunction.AddParameter("sigma", 4.903 * 10 ^ -9, iPosition:=5) clsListFunction.AddParameter("G", 0, iPosition:=6) - clsListFunction.AddParameter("as", 0.25, iPosition:=7) + clsListFunction.AddParameter("as", 0.23, iPosition:=7) clsListFunction.AddParameter("bs", 0.5, iPosition:=8) clsListFunction.AddParameter("alphaPT", 1.26, iPosition:=9) clsListFunction.RemoveParameterByName("z") diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index ecf06650717..7f10ad794d1 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -449,7 +449,6 @@ Partial Class frmMain Me.mnuPrepareDataFrameInsertColumnsRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameDeleteColumnsRows = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameProtectColumn = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuPrepareDataFrameHideColumns = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataFrameFreezeColumns = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareDataframeColourByProperty = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareCheckData = New System.Windows.Forms.ToolStripMenuItem() @@ -2929,8 +2928,8 @@ Partial Class frmMain 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(192, 22) - Me.mnuEditPasteNew.Text = "Paste New Data Frame" + Me.mnuEditPasteNew.Size = New System.Drawing.Size(180, 22) + Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' @@ -3399,7 +3398,7 @@ Partial Class frmMain ' 'mnuPrepareDataFrame ' - Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameHideColumns, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) + Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(186, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" @@ -3512,13 +3511,6 @@ Partial Class frmMain Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False ' - 'mnuPrepareDataFrameHideColumns - ' - Me.mnuPrepareDataFrameHideColumns.Name = "mnuPrepareDataFrameHideColumns" - Me.mnuPrepareDataFrameHideColumns.Size = New System.Drawing.Size(201, 22) - Me.mnuPrepareDataFrameHideColumns.Tag = "Hide_Columns..." - Me.mnuPrepareDataFrameHideColumns.Text = "Hide/Show Columns..." - ' 'mnuPrepareDataFrameFreezeColumns ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False @@ -5119,9 +5111,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() @@ -5267,7 +5257,6 @@ Partial Class frmMain Friend WithEvents mnuPrepareDataFrameInsertColumnsRows As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameDeleteColumnsRows As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameProtectColumn As ToolStripMenuItem - Friend WithEvents mnuPrepareDataFrameHideColumns As ToolStripMenuItem Friend WithEvents mnuPrepareDataFrameFreezeColumns As ToolStripMenuItem Friend WithEvents mnuPrepareColumnNumericRegularSequence As ToolStripMenuItem Friend WithEvents mnuPrepareColumnNumericRandomSamples As ToolStripMenuItem diff --git a/instat/frmMain.vb b/instat/frmMain.vb index ffb7a193f45..8e968457c32 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -937,10 +937,6 @@ Public Class frmMain mnuIncludeComments.Checked = dlgOptions.ucrChkIncludeCommentsbyDefault.chkCheck.Checked End Sub - Private Sub mnuOrganiseDataFrameHideColumns_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataFrameHideColumns.Click - dlgHideShowColumns.ShowDialog() - End Sub - Private Sub mnuModelProbabilityDistributionsRandomSamplesUseModel_Click(sender As Object, e As EventArgs) Handles mnuModelProbabilityDistributionsRandomSamplesUseModel.Click dlgRandomSample.enumRandomsampleMode = dlgRandomSample.RandomsampleMode.Model dlgRandomSample.ShowDialog() diff --git a/instat/sdgLocation.vb b/instat/sdgLocation.vb index ad902300c93..dd2baa3a3b9 100644 --- a/instat/sdgLocation.vb +++ b/instat/sdgLocation.vb @@ -49,6 +49,7 @@ Public Class sdgLocation ucrInputLatitude.SetParameter(New RParameter("lat_rad", 2)) ucrInputLatitude.AddQuotesIfUnrecognised = False ucrInputLatitude.SetLinkedDisplayControl(lblLatitude) + ucrInputLatitude.SetValidationTypeAsNumeric() ucrInputLatitude.SetRDefault("0") ucrReceiverLongitude.SetParameter(New RParameter("lon", 3)) @@ -60,7 +61,8 @@ Public Class sdgLocation ucrInputLongitude.SetParameter(New RParameter("lon", 3)) ucrInputLongitude.AddQuotesIfUnrecognised = False ucrInputLongitude.SetLinkedDisplayControl(lblLongitude) - ucrInputLongitude.SetRDefault(0) + ucrInputLongitude.SetValidationTypeAsNumeric() + ucrInputLongitude.SetRDefault("0") ucrReceiverAltitude.SetParameter(New RParameter("Elev", 4)) ucrReceiverAltitude.SetParameterIsRFunction() @@ -71,6 +73,7 @@ Public Class sdgLocation ucrInputElevation.SetParameter(New RParameter("Elev", 4)) ucrInputElevation.AddQuotesIfUnrecognised = False ucrInputElevation.SetLinkedDisplayControl(lblLatitude) + ucrInputElevation.SetValidationTypeAsNumeric() ucrInputElevation.SetRDefault("0") bControlsInitialised = True @@ -117,6 +120,11 @@ Public Class sdgLocation Private Sub ucrInputElevation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputElevation.ControlValueChanged EnableDesableSelector() + If Not ucrInputElevation.IsEmpty Then + clsListFunction.AddParameter("Elev", ucrInputElevation.GetText(), iPosition:=4) + Else + clsListFunction.RemoveParameterByName("Elev") + End If End Sub Private Sub ucrSelectorLocation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorLocation.ControlValueChanged @@ -125,9 +133,14 @@ Public Class sdgLocation Private Sub ucrInputLatitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLatitude.ControlValueChanged EnableDesableSelector() + If Not ucrInputLatitude.IsEmpty Then + clsListFunction.AddParameter("lat_rad", ucrInputLatitude.GetText(), iPosition:=1) + Else + clsListFunction.RemoveParameterByName("lat_rad") + End If End Sub - Private Sub ucrInputLongitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLongitude.ControlValueChanged + Private Sub ucrReceiverLatitude_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLatitude.ControlValueChanged EnableDesableSelector() End Sub End Class \ No newline at end of file diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 06205839228..71f72738cf1 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -106,7 +106,7 @@ Partial Class ucrCalculator Me.cmdFrugal = New System.Windows.Forms.Button() Me.cmdPerfect = New System.Windows.Forms.Button() Me.cmdAbundant = New System.Windows.Forms.Button() - Me.cmdFibonacci2 = New System.Windows.Forms.Button() + Me.cmdCatalan = New System.Windows.Forms.Button() Me.cmdPalindrome = New System.Windows.Forms.Button() Me.cmdRoman = New System.Windows.Forms.Button() Me.cmdHexmode = New System.Windows.Forms.Button() @@ -221,7 +221,7 @@ Partial Class ucrCalculator Me.cmdWakefieldLower = New System.Windows.Forms.Button() Me.cmdLanguage = New System.Windows.Forms.Button() Me.cmdIq = New System.Windows.Forms.Button() - Me.cmdInternet_Browser = New System.Windows.Forms.Button() + Me.cmdid = New System.Windows.Forms.Button() Me.cmdGrade_Level = New System.Windows.Forms.Button() Me.cmdEye = New System.Windows.Forms.Button() Me.cmdEmployment = New System.Windows.Forms.Button() @@ -558,22 +558,6 @@ Partial Class ucrCalculator Me.ListStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ListStatipToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.grpList = New System.Windows.Forms.GroupBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.cmdListDuplicated = New System.Windows.Forms.Button() - Me.cmdListOperator = New System.Windows.Forms.Button() - Me.cmdListDiv = New System.Windows.Forms.Button() - Me.cmdListMod = New System.Windows.Forms.Button() - Me.cmdListIfelse = New System.Windows.Forms.Button() - Me.cmdListOmit = New System.Windows.Forms.Button() - Me.cmdListRev = New System.Windows.Forms.Button() - Me.cmdListMovsum = New System.Windows.Forms.Button() - Me.cmdListCumsum = New System.Windows.Forms.Button() - Me.cmdListScale = New System.Windows.Forms.Button() - Me.cmdListDiff = New System.Windows.Forms.Button() - Me.cmdListLead = New System.Windows.Forms.Button() - Me.cmdListLag = New System.Windows.Forms.Button() - Me.cmdListRank = New System.Windows.Forms.Button() - Me.cmdListSort = New System.Windows.Forms.Button() Me.grpMathBloc = New System.Windows.Forms.GroupBox() Me.cmdListSQRT = New System.Windows.Forms.Button() Me.cmdListPercent2 = New System.Windows.Forms.Button() @@ -610,6 +594,22 @@ 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.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.cmdListDuplicated = New System.Windows.Forms.Button() + Me.cmdListOperator = New System.Windows.Forms.Button() + Me.cmdListDiv = New System.Windows.Forms.Button() + Me.cmdListMod = New System.Windows.Forms.Button() + Me.cmdListIfelse = New System.Windows.Forms.Button() + Me.cmdListOmit = New System.Windows.Forms.Button() + Me.cmdListRev = New System.Windows.Forms.Button() + Me.cmdListMovsum = New System.Windows.Forms.Button() + Me.cmdListCumsum = New System.Windows.Forms.Button() + Me.cmdListScale = New System.Windows.Forms.Button() + Me.cmdListDiff = New System.Windows.Forms.Button() + Me.cmdListLead = New System.Windows.Forms.Button() + Me.cmdListLag = New System.Windows.Forms.Button() + Me.cmdListRank = New System.Windows.Forms.Button() + Me.cmdListSort = New System.Windows.Forms.Button() Me.cmdRhelpList = New instat.ucrSplitButton() Me.cmdWakefieldHelp = New instat.ucrSplitButton() Me.cmdStringRHelp = New instat.ucrSplitButton() @@ -618,6 +618,8 @@ 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() @@ -627,8 +629,6 @@ Partial Class ucrCalculator Me.cmdProbRHelp = New instat.ucrSplitButton() Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.cmdComplexRHelp = New instat.ucrSplitButton() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() - Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -662,18 +662,18 @@ Partial Class ucrCalculator Me.ContextMenuStripWakefield.SuspendLayout Me.ContextMenuStripList.SuspendLayout Me.grpList.SuspendLayout - Me.GroupBox1.SuspendLayout Me.grpMathBloc.SuspendLayout + Me.GroupBox1.SuspendLayout Me.SuspendLayout ' 'lblExpression ' Me.lblExpression.AutoSize = True Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExpression.Location = New System.Drawing.Point(8, 12) + Me.lblExpression.Location = New System.Drawing.Point(6, 10) Me.lblExpression.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblExpression.Name = "lblExpression" - Me.lblExpression.Size = New System.Drawing.Size(77, 16) + Me.lblExpression.Size = New System.Drawing.Size(61, 13) Me.lblExpression.TabIndex = 119 Me.lblExpression.Tag = "Expression" Me.lblExpression.Text = "Expression:" @@ -682,9 +682,10 @@ Partial Class ucrCalculator ' Me.chkShowParameters.AutoSize = True Me.chkShowParameters.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.chkShowParameters.Location = New System.Drawing.Point(88, 52) + Me.chkShowParameters.Location = New System.Drawing.Point(70, 42) + Me.chkShowParameters.Margin = New System.Windows.Forms.Padding(2) Me.chkShowParameters.Name = "chkShowParameters" - Me.chkShowParameters.Size = New System.Drawing.Size(135, 20) + Me.chkShowParameters.Size = New System.Drawing.Size(109, 17) Me.chkShowParameters.TabIndex = 181 Me.chkShowParameters.Text = "Show Parameters" Me.chkShowParameters.UseVisualStyleBackColor = True @@ -710,11 +711,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(278, 87) - Me.grpBasic.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpBasic.Location = New System.Drawing.Point(222, 70) + Me.grpBasic.Margin = New System.Windows.Forms.Padding(2) Me.grpBasic.Name = "grpBasic" - Me.grpBasic.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpBasic.Size = New System.Drawing.Size(257, 168) + Me.grpBasic.Padding = New System.Windows.Forms.Padding(2) + Me.grpBasic.Size = New System.Drawing.Size(206, 134) Me.grpBasic.TabIndex = 179 Me.grpBasic.TabStop = False Me.grpBasic.Text = "Basic" @@ -722,10 +723,10 @@ Partial Class ucrCalculator 'cmdClear ' Me.cmdClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClear.Location = New System.Drawing.Point(188, 88) - Me.cmdClear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdClear.Location = New System.Drawing.Point(150, 72) + Me.cmdClear.Margin = New System.Windows.Forms.Padding(2) Me.cmdClear.Name = "cmdClear" - Me.cmdClear.Size = New System.Drawing.Size(62, 75) + Me.cmdClear.Size = New System.Drawing.Size(50, 58) Me.cmdClear.TabIndex = 190 Me.cmdClear.Text = "Clear" Me.cmdClear.UseVisualStyleBackColor = True @@ -734,10 +735,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(3, 125) - Me.cmdComma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComma.Location = New System.Drawing.Point(2, 101) + Me.cmdComma.Margin = New System.Windows.Forms.Padding(2) Me.cmdComma.Name = "cmdComma" - Me.cmdComma.Size = New System.Drawing.Size(48, 38) + Me.cmdComma.Size = New System.Drawing.Size(38, 30) Me.cmdComma.TabIndex = 138 Me.cmdComma.Text = "," Me.cmdComma.UseVisualStyleBackColor = True @@ -745,10 +746,10 @@ Partial Class ucrCalculator 'cmdBrackets ' Me.cmdBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrackets.Location = New System.Drawing.Point(97, 125) - Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdBrackets.Location = New System.Drawing.Point(76, 101) + Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdBrackets.Name = "cmdBrackets" - Me.cmdBrackets.Size = New System.Drawing.Size(48, 38) + Me.cmdBrackets.Size = New System.Drawing.Size(38, 30) Me.cmdBrackets.TabIndex = 136 Me.cmdBrackets.Text = "( )" Me.cmdBrackets.UseVisualStyleBackColor = True @@ -757,10 +758,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(188, 52) - Me.cmdPower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPower.Location = New System.Drawing.Point(150, 43) + Me.cmdPower.Margin = New System.Windows.Forms.Padding(2) Me.cmdPower.Name = "cmdPower" - Me.cmdPower.Size = New System.Drawing.Size(62, 38) + Me.cmdPower.Size = New System.Drawing.Size(50, 30) Me.cmdPower.TabIndex = 133 Me.cmdPower.Text = "^" Me.cmdPower.UseVisualStyleBackColor = True @@ -769,10 +770,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(142, 17) - Me.cmdDivide.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDivide.Location = New System.Drawing.Point(113, 14) + Me.cmdDivide.Margin = New System.Windows.Forms.Padding(2) Me.cmdDivide.Name = "cmdDivide" - Me.cmdDivide.Size = New System.Drawing.Size(48, 38) + Me.cmdDivide.Size = New System.Drawing.Size(38, 30) Me.cmdDivide.TabIndex = 131 Me.cmdDivide.Text = "/" Me.cmdDivide.UseVisualStyleBackColor = True @@ -781,10 +782,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(142, 125) - Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPlus.Location = New System.Drawing.Point(113, 101) + Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlus.Name = "cmdPlus" - Me.cmdPlus.Size = New System.Drawing.Size(48, 38) + Me.cmdPlus.Size = New System.Drawing.Size(38, 29) Me.cmdPlus.TabIndex = 130 Me.cmdPlus.Text = "+" Me.cmdPlus.UseVisualStyleBackColor = True @@ -793,10 +794,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(142, 88) - Me.cmdMinus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMinus.Location = New System.Drawing.Point(113, 72) + Me.cmdMinus.Margin = New System.Windows.Forms.Padding(2) Me.cmdMinus.Name = "cmdMinus" - Me.cmdMinus.Size = New System.Drawing.Size(48, 38) + Me.cmdMinus.Size = New System.Drawing.Size(38, 30) Me.cmdMinus.TabIndex = 129 Me.cmdMinus.Text = "-" Me.cmdMinus.UseVisualStyleBackColor = True @@ -805,10 +806,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(142, 52) - Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMultiply.Location = New System.Drawing.Point(113, 43) + Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2) Me.cmdMultiply.Name = "cmdMultiply" - Me.cmdMultiply.Size = New System.Drawing.Size(48, 38) + Me.cmdMultiply.Size = New System.Drawing.Size(38, 30) Me.cmdMultiply.TabIndex = 128 Me.cmdMultiply.Text = "*" Me.cmdMultiply.UseVisualStyleBackColor = True @@ -817,10 +818,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(188, 17) - Me.cmdDot.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDot.Location = New System.Drawing.Point(150, 14) + Me.cmdDot.Margin = New System.Windows.Forms.Padding(2) Me.cmdDot.Name = "cmdDot" - Me.cmdDot.Size = New System.Drawing.Size(62, 38) + Me.cmdDot.Size = New System.Drawing.Size(50, 30) Me.cmdDot.TabIndex = 127 Me.cmdDot.Text = "." Me.cmdDot.UseVisualStyleBackColor = True @@ -828,10 +829,10 @@ Partial Class ucrCalculator 'cmd9 ' Me.cmd9.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd9.Location = New System.Drawing.Point(97, 17) - Me.cmd9.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd9.Location = New System.Drawing.Point(76, 14) + Me.cmd9.Margin = New System.Windows.Forms.Padding(2) Me.cmd9.Name = "cmd9" - Me.cmd9.Size = New System.Drawing.Size(48, 38) + Me.cmd9.Size = New System.Drawing.Size(38, 30) Me.cmd9.TabIndex = 126 Me.cmd9.Text = "9" Me.cmd9.UseVisualStyleBackColor = True @@ -839,10 +840,10 @@ Partial Class ucrCalculator 'cmd8 ' Me.cmd8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd8.Location = New System.Drawing.Point(50, 17) - Me.cmd8.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd8.Location = New System.Drawing.Point(39, 14) + Me.cmd8.Margin = New System.Windows.Forms.Padding(2) Me.cmd8.Name = "cmd8" - Me.cmd8.Size = New System.Drawing.Size(48, 38) + Me.cmd8.Size = New System.Drawing.Size(38, 30) Me.cmd8.TabIndex = 125 Me.cmd8.Text = "8" Me.cmd8.UseVisualStyleBackColor = True @@ -850,10 +851,10 @@ Partial Class ucrCalculator 'cmd7 ' Me.cmd7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd7.Location = New System.Drawing.Point(3, 17) - Me.cmd7.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd7.Location = New System.Drawing.Point(2, 14) + Me.cmd7.Margin = New System.Windows.Forms.Padding(2) Me.cmd7.Name = "cmd7" - Me.cmd7.Size = New System.Drawing.Size(48, 38) + Me.cmd7.Size = New System.Drawing.Size(38, 30) Me.cmd7.TabIndex = 124 Me.cmd7.Text = "7" Me.cmd7.UseVisualStyleBackColor = True @@ -861,10 +862,10 @@ Partial Class ucrCalculator 'cmd6 ' Me.cmd6.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd6.Location = New System.Drawing.Point(97, 52) - Me.cmd6.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd6.Location = New System.Drawing.Point(76, 43) + Me.cmd6.Margin = New System.Windows.Forms.Padding(2) Me.cmd6.Name = "cmd6" - Me.cmd6.Size = New System.Drawing.Size(48, 38) + Me.cmd6.Size = New System.Drawing.Size(38, 30) Me.cmd6.TabIndex = 123 Me.cmd6.Text = "6" Me.cmd6.UseVisualStyleBackColor = True @@ -872,10 +873,10 @@ Partial Class ucrCalculator 'cmd5 ' Me.cmd5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd5.Location = New System.Drawing.Point(50, 52) - Me.cmd5.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd5.Location = New System.Drawing.Point(39, 43) + Me.cmd5.Margin = New System.Windows.Forms.Padding(2) Me.cmd5.Name = "cmd5" - Me.cmd5.Size = New System.Drawing.Size(48, 38) + Me.cmd5.Size = New System.Drawing.Size(38, 30) Me.cmd5.TabIndex = 122 Me.cmd5.Text = "5" Me.cmd5.UseVisualStyleBackColor = True @@ -883,10 +884,10 @@ Partial Class ucrCalculator 'cmd4 ' Me.cmd4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd4.Location = New System.Drawing.Point(3, 52) - Me.cmd4.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd4.Location = New System.Drawing.Point(2, 43) + Me.cmd4.Margin = New System.Windows.Forms.Padding(2) Me.cmd4.Name = "cmd4" - Me.cmd4.Size = New System.Drawing.Size(48, 38) + Me.cmd4.Size = New System.Drawing.Size(38, 30) Me.cmd4.TabIndex = 121 Me.cmd4.Text = "4" Me.cmd4.UseVisualStyleBackColor = True @@ -894,10 +895,10 @@ Partial Class ucrCalculator 'cmd3 ' Me.cmd3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd3.Location = New System.Drawing.Point(97, 88) - Me.cmd3.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd3.Location = New System.Drawing.Point(76, 72) + Me.cmd3.Margin = New System.Windows.Forms.Padding(2) Me.cmd3.Name = "cmd3" - Me.cmd3.Size = New System.Drawing.Size(48, 38) + Me.cmd3.Size = New System.Drawing.Size(38, 30) Me.cmd3.TabIndex = 120 Me.cmd3.Text = "3" Me.cmd3.UseVisualStyleBackColor = True @@ -905,10 +906,10 @@ Partial Class ucrCalculator 'cmd2 ' Me.cmd2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd2.Location = New System.Drawing.Point(50, 88) - Me.cmd2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd2.Location = New System.Drawing.Point(39, 72) + Me.cmd2.Margin = New System.Windows.Forms.Padding(2) Me.cmd2.Name = "cmd2" - Me.cmd2.Size = New System.Drawing.Size(48, 38) + Me.cmd2.Size = New System.Drawing.Size(38, 30) Me.cmd2.TabIndex = 119 Me.cmd2.Text = "2" Me.cmd2.UseVisualStyleBackColor = True @@ -916,10 +917,10 @@ Partial Class ucrCalculator 'cmd0 ' Me.cmd0.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd0.Location = New System.Drawing.Point(50, 125) - Me.cmd0.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd0.Location = New System.Drawing.Point(39, 101) + Me.cmd0.Margin = New System.Windows.Forms.Padding(2) Me.cmd0.Name = "cmd0" - Me.cmd0.Size = New System.Drawing.Size(48, 38) + Me.cmd0.Size = New System.Drawing.Size(38, 30) Me.cmd0.TabIndex = 118 Me.cmd0.Text = "0" Me.cmd0.UseVisualStyleBackColor = True @@ -927,10 +928,10 @@ Partial Class ucrCalculator 'cmd1 ' Me.cmd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd1.Location = New System.Drawing.Point(3, 88) - Me.cmd1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd1.Location = New System.Drawing.Point(2, 72) + Me.cmd1.Margin = New System.Windows.Forms.Padding(2) Me.cmd1.Name = "cmd1" - Me.cmd1.Size = New System.Drawing.Size(48, 38) + Me.cmd1.Size = New System.Drawing.Size(38, 30) Me.cmd1.TabIndex = 117 Me.cmd1.Text = "1" Me.cmd1.UseVisualStyleBackColor = True @@ -962,10 +963,12 @@ Partial Class ucrCalculator Me.grpDates.Controls.Add(Me.cmdYmd) Me.grpDates.Controls.Add(Me.cmdLeap) Me.grpDates.Controls.Add(Me.cmdRHelp) - Me.grpDates.Location = New System.Drawing.Point(542, 78) + Me.grpDates.Location = New System.Drawing.Point(434, 62) + Me.grpDates.Margin = New System.Windows.Forms.Padding(2) Me.grpDates.Name = "grpDates" + Me.grpDates.Padding = New System.Windows.Forms.Padding(2) Me.grpDates.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.grpDates.Size = New System.Drawing.Size(315, 291) + Me.grpDates.Size = New System.Drawing.Size(252, 233) Me.grpDates.TabIndex = 188 Me.grpDates.TabStop = False Me.grpDates.Text = "Dates/Times" @@ -973,9 +976,10 @@ Partial Class ucrCalculator 'cmdYmdHms ' Me.cmdYmdHms.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmdHms.Location = New System.Drawing.Point(6, 91) + Me.cmdYmdHms.Location = New System.Drawing.Point(5, 73) + Me.cmdYmdHms.Margin = New System.Windows.Forms.Padding(2) Me.cmdYmdHms.Name = "cmdYmdHms" - Me.cmdYmdHms.Size = New System.Drawing.Size(75, 38) + Me.cmdYmdHms.Size = New System.Drawing.Size(60, 30) Me.cmdYmdHms.TabIndex = 242 Me.cmdYmdHms.Text = "ymd.hms" Me.cmdYmdHms.UseVisualStyleBackColor = True @@ -983,9 +987,10 @@ Partial Class ucrCalculator 'cmdYmdHm ' Me.cmdYmdHm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmdHm.Location = New System.Drawing.Point(80, 91) + Me.cmdYmdHm.Location = New System.Drawing.Point(64, 73) + Me.cmdYmdHm.Margin = New System.Windows.Forms.Padding(2) Me.cmdYmdHm.Name = "cmdYmdHm" - Me.cmdYmdHm.Size = New System.Drawing.Size(75, 38) + Me.cmdYmdHm.Size = New System.Drawing.Size(60, 30) Me.cmdYmdHm.TabIndex = 241 Me.cmdYmdHm.Text = "ymd.hm" Me.cmdYmdHm.UseVisualStyleBackColor = True @@ -993,9 +998,10 @@ Partial Class ucrCalculator 'cmdAsDate ' Me.cmdAsDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsDate.Location = New System.Drawing.Point(80, 19) + Me.cmdAsDate.Location = New System.Drawing.Point(64, 15) + Me.cmdAsDate.Margin = New System.Windows.Forms.Padding(2) Me.cmdAsDate.Name = "cmdAsDate" - Me.cmdAsDate.Size = New System.Drawing.Size(75, 38) + Me.cmdAsDate.Size = New System.Drawing.Size(60, 30) Me.cmdAsDate.TabIndex = 240 Me.cmdAsDate.Text = "as.date" Me.cmdAsDate.UseVisualStyleBackColor = True @@ -1003,9 +1009,10 @@ Partial Class ucrCalculator 'cmdAsTime ' Me.cmdAsTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsTime.Location = New System.Drawing.Point(239, 55) + Me.cmdAsTime.Location = New System.Drawing.Point(191, 44) + Me.cmdAsTime.Margin = New System.Windows.Forms.Padding(2) Me.cmdAsTime.Name = "cmdAsTime" - Me.cmdAsTime.Size = New System.Drawing.Size(75, 38) + Me.cmdAsTime.Size = New System.Drawing.Size(60, 30) Me.cmdAsTime.TabIndex = 239 Me.cmdAsTime.Text = "as.time" Me.cmdAsTime.UseVisualStyleBackColor = True @@ -1013,9 +1020,10 @@ Partial Class ucrCalculator 'cmdYmdH ' Me.cmdYmdH.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmdH.Location = New System.Drawing.Point(154, 91) + Me.cmdYmdH.Location = New System.Drawing.Point(123, 73) + Me.cmdYmdH.Margin = New System.Windows.Forms.Padding(2) Me.cmdYmdH.Name = "cmdYmdH" - Me.cmdYmdH.Size = New System.Drawing.Size(86, 38) + Me.cmdYmdH.Size = New System.Drawing.Size(69, 30) Me.cmdYmdH.TabIndex = 238 Me.cmdYmdH.Text = "ymd.h" Me.cmdYmdH.UseVisualStyleBackColor = True @@ -1023,9 +1031,10 @@ Partial Class ucrCalculator 'cmdPm ' Me.cmdPm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPm.Location = New System.Drawing.Point(6, 200) + Me.cmdPm.Location = New System.Drawing.Point(5, 160) + Me.cmdPm.Margin = New System.Windows.Forms.Padding(2) Me.cmdPm.Name = "cmdPm" - Me.cmdPm.Size = New System.Drawing.Size(75, 38) + Me.cmdPm.Size = New System.Drawing.Size(60, 30) Me.cmdPm.TabIndex = 237 Me.cmdPm.Text = "pm" Me.cmdPm.UseVisualStyleBackColor = True @@ -1033,10 +1042,10 @@ Partial Class ucrCalculator 'cmdTime ' Me.cmdTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTime.Location = New System.Drawing.Point(239, 19) - Me.cmdTime.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTime.Location = New System.Drawing.Point(191, 15) + Me.cmdTime.Margin = New System.Windows.Forms.Padding(2) Me.cmdTime.Name = "cmdTime" - Me.cmdTime.Size = New System.Drawing.Size(75, 38) + Me.cmdTime.Size = New System.Drawing.Size(60, 30) Me.cmdTime.TabIndex = 236 Me.cmdTime.Text = "time" Me.cmdTime.UseVisualStyleBackColor = True @@ -1044,10 +1053,10 @@ Partial Class ucrCalculator 'cmdDateTime ' Me.cmdDateTime.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDateTime.Location = New System.Drawing.Point(154, 19) - Me.cmdDateTime.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDateTime.Location = New System.Drawing.Point(123, 15) + Me.cmdDateTime.Margin = New System.Windows.Forms.Padding(2) Me.cmdDateTime.Name = "cmdDateTime" - Me.cmdDateTime.Size = New System.Drawing.Size(86, 38) + Me.cmdDateTime.Size = New System.Drawing.Size(69, 30) Me.cmdDateTime.TabIndex = 235 Me.cmdDateTime.Text = "as.datetime" Me.cmdDateTime.UseVisualStyleBackColor = True @@ -1055,9 +1064,10 @@ Partial Class ucrCalculator 'cmdQuarter ' Me.cmdQuarter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuarter.Location = New System.Drawing.Point(80, 127) + Me.cmdQuarter.Location = New System.Drawing.Point(64, 102) + Me.cmdQuarter.Margin = New System.Windows.Forms.Padding(2) Me.cmdQuarter.Name = "cmdQuarter" - Me.cmdQuarter.Size = New System.Drawing.Size(75, 38) + Me.cmdQuarter.Size = New System.Drawing.Size(60, 30) Me.cmdQuarter.TabIndex = 234 Me.cmdQuarter.Text = "quarter" Me.cmdQuarter.UseVisualStyleBackColor = True @@ -1065,9 +1075,10 @@ 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(154, 164) + Me.cmdD_In_M.Location = New System.Drawing.Point(123, 131) + Me.cmdD_In_M.Margin = New System.Windows.Forms.Padding(2) Me.cmdD_In_M.Name = "cmdD_In_M" - Me.cmdD_In_M.Size = New System.Drawing.Size(86, 38) + Me.cmdD_In_M.Size = New System.Drawing.Size(69, 30) Me.cmdD_In_M.TabIndex = 233 Me.cmdD_In_M.Text = "d_in_m" Me.cmdD_In_M.UseVisualStyleBackColor = True @@ -1075,9 +1086,10 @@ Partial Class ucrCalculator 'cmdAm ' Me.cmdAm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAm.Location = New System.Drawing.Point(239, 164) + Me.cmdAm.Location = New System.Drawing.Point(191, 131) + Me.cmdAm.Margin = New System.Windows.Forms.Padding(2) Me.cmdAm.Name = "cmdAm" - Me.cmdAm.Size = New System.Drawing.Size(75, 38) + Me.cmdAm.Size = New System.Drawing.Size(60, 30) Me.cmdAm.TabIndex = 232 Me.cmdAm.Text = "am" Me.cmdAm.UseVisualStyleBackColor = True @@ -1085,9 +1097,10 @@ Partial Class ucrCalculator 'cmdSec ' Me.cmdSec.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSec.Location = New System.Drawing.Point(239, 200) + Me.cmdSec.Location = New System.Drawing.Point(191, 160) + Me.cmdSec.Margin = New System.Windows.Forms.Padding(2) Me.cmdSec.Name = "cmdSec" - Me.cmdSec.Size = New System.Drawing.Size(75, 38) + Me.cmdSec.Size = New System.Drawing.Size(60, 30) Me.cmdSec.TabIndex = 231 Me.cmdSec.Text = "sec" Me.cmdSec.UseVisualStyleBackColor = True @@ -1095,9 +1108,10 @@ Partial Class ucrCalculator 'cmdHour ' Me.cmdHour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdHour.Location = New System.Drawing.Point(80, 200) + Me.cmdHour.Location = New System.Drawing.Point(64, 160) + Me.cmdHour.Margin = New System.Windows.Forms.Padding(2) Me.cmdHour.Name = "cmdHour" - Me.cmdHour.Size = New System.Drawing.Size(75, 38) + Me.cmdHour.Size = New System.Drawing.Size(60, 30) Me.cmdHour.TabIndex = 230 Me.cmdHour.Text = "hour" Me.cmdHour.UseVisualStyleBackColor = True @@ -1105,9 +1119,10 @@ Partial Class ucrCalculator 'cmdMinutes ' Me.cmdMinutes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMinutes.Location = New System.Drawing.Point(154, 200) + Me.cmdMinutes.Location = New System.Drawing.Point(123, 160) + Me.cmdMinutes.Margin = New System.Windows.Forms.Padding(2) Me.cmdMinutes.Name = "cmdMinutes" - Me.cmdMinutes.Size = New System.Drawing.Size(86, 38) + Me.cmdMinutes.Size = New System.Drawing.Size(69, 30) Me.cmdMinutes.TabIndex = 229 Me.cmdMinutes.Text = "min" Me.cmdMinutes.UseVisualStyleBackColor = True @@ -1115,10 +1130,10 @@ Partial Class ucrCalculator 'cmdDmy ' Me.cmdDmy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDmy.Location = New System.Drawing.Point(80, 55) - Me.cmdDmy.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDmy.Location = New System.Drawing.Point(64, 44) + Me.cmdDmy.Margin = New System.Windows.Forms.Padding(2) Me.cmdDmy.Name = "cmdDmy" - Me.cmdDmy.Size = New System.Drawing.Size(75, 38) + Me.cmdDmy.Size = New System.Drawing.Size(60, 30) Me.cmdDmy.TabIndex = 228 Me.cmdDmy.Tag = "dmy" Me.cmdDmy.Text = "dmy" @@ -1127,10 +1142,10 @@ Partial Class ucrCalculator 'cmdDay ' Me.cmdDay.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDay.Location = New System.Drawing.Point(239, 127) - Me.cmdDay.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDay.Location = New System.Drawing.Point(191, 102) + Me.cmdDay.Margin = New System.Windows.Forms.Padding(2) Me.cmdDay.Name = "cmdDay" - Me.cmdDay.Size = New System.Drawing.Size(75, 38) + Me.cmdDay.Size = New System.Drawing.Size(60, 30) Me.cmdDay.TabIndex = 227 Me.cmdDay.Text = "day" Me.cmdDay.UseVisualStyleBackColor = True @@ -1138,11 +1153,11 @@ Partial Class ucrCalculator 'cmdMonth ' Me.cmdMonth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMonth.Location = New System.Drawing.Point(154, 127) - Me.cmdMonth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMonth.Location = New System.Drawing.Point(123, 102) + Me.cmdMonth.Margin = New System.Windows.Forms.Padding(2) Me.cmdMonth.Name = "cmdMonth" Me.cmdMonth.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.cmdMonth.Size = New System.Drawing.Size(86, 38) + Me.cmdMonth.Size = New System.Drawing.Size(69, 30) Me.cmdMonth.TabIndex = 226 Me.cmdMonth.Text = "month" Me.cmdMonth.UseVisualStyleBackColor = True @@ -1150,10 +1165,10 @@ Partial Class ucrCalculator 'cmdYear ' Me.cmdYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYear.Location = New System.Drawing.Point(6, 127) - Me.cmdYear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdYear.Location = New System.Drawing.Point(5, 102) + Me.cmdYear.Margin = New System.Windows.Forms.Padding(2) Me.cmdYear.Name = "cmdYear" - Me.cmdYear.Size = New System.Drawing.Size(75, 38) + Me.cmdYear.Size = New System.Drawing.Size(60, 30) Me.cmdYear.TabIndex = 225 Me.cmdYear.Text = "year" Me.cmdYear.UseVisualStyleBackColor = True @@ -1161,10 +1176,10 @@ Partial Class ucrCalculator 'cmdDate ' Me.cmdDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDate.Location = New System.Drawing.Point(6, 19) - Me.cmdDate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDate.Location = New System.Drawing.Point(5, 15) + Me.cmdDate.Margin = New System.Windows.Forms.Padding(2) Me.cmdDate.Name = "cmdDate" - Me.cmdDate.Size = New System.Drawing.Size(75, 38) + Me.cmdDate.Size = New System.Drawing.Size(60, 30) Me.cmdDate.TabIndex = 224 Me.cmdDate.Text = "date" Me.cmdDate.UseVisualStyleBackColor = True @@ -1172,10 +1187,10 @@ Partial Class ucrCalculator 'cmdYday ' Me.cmdYday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYday.Location = New System.Drawing.Point(6, 164) - Me.cmdYday.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdYday.Location = New System.Drawing.Point(5, 131) + Me.cmdYday.Margin = New System.Windows.Forms.Padding(2) Me.cmdYday.Name = "cmdYday" - Me.cmdYday.Size = New System.Drawing.Size(75, 38) + Me.cmdYday.Size = New System.Drawing.Size(60, 30) Me.cmdYday.TabIndex = 223 Me.cmdYday.Text = "yday" Me.cmdYday.UseVisualStyleBackColor = True @@ -1183,10 +1198,10 @@ Partial Class ucrCalculator 'cmdWday ' Me.cmdWday.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWday.Location = New System.Drawing.Point(80, 164) - Me.cmdWday.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdWday.Location = New System.Drawing.Point(64, 131) + Me.cmdWday.Margin = New System.Windows.Forms.Padding(2) Me.cmdWday.Name = "cmdWday" - Me.cmdWday.Size = New System.Drawing.Size(75, 38) + Me.cmdWday.Size = New System.Drawing.Size(60, 30) Me.cmdWday.TabIndex = 222 Me.cmdWday.Text = "wday" Me.cmdWday.UseVisualStyleBackColor = True @@ -1194,10 +1209,10 @@ Partial Class ucrCalculator 'cmdMdy ' Me.cmdMdy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMdy.Location = New System.Drawing.Point(154, 55) - Me.cmdMdy.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMdy.Location = New System.Drawing.Point(123, 44) + Me.cmdMdy.Margin = New System.Windows.Forms.Padding(2) Me.cmdMdy.Name = "cmdMdy" - Me.cmdMdy.Size = New System.Drawing.Size(86, 38) + Me.cmdMdy.Size = New System.Drawing.Size(69, 30) Me.cmdMdy.TabIndex = 221 Me.cmdMdy.Text = "mdy" Me.cmdMdy.UseVisualStyleBackColor = True @@ -1205,10 +1220,10 @@ Partial Class ucrCalculator 'cmdYmd ' Me.cmdYmd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdYmd.Location = New System.Drawing.Point(6, 55) - Me.cmdYmd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdYmd.Location = New System.Drawing.Point(5, 44) + Me.cmdYmd.Margin = New System.Windows.Forms.Padding(2) Me.cmdYmd.Name = "cmdYmd" - Me.cmdYmd.Size = New System.Drawing.Size(75, 38) + Me.cmdYmd.Size = New System.Drawing.Size(60, 30) Me.cmdYmd.TabIndex = 220 Me.cmdYmd.Text = "ymd" Me.cmdYmd.UseVisualStyleBackColor = True @@ -1216,10 +1231,10 @@ Partial Class ucrCalculator 'cmdLeap ' Me.cmdLeap.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLeap.Location = New System.Drawing.Point(239, 91) - Me.cmdLeap.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLeap.Location = New System.Drawing.Point(191, 73) + Me.cmdLeap.Margin = New System.Windows.Forms.Padding(2) Me.cmdLeap.Name = "cmdLeap" - Me.cmdLeap.Size = New System.Drawing.Size(75, 38) + Me.cmdLeap.Size = New System.Drawing.Size(60, 30) Me.cmdLeap.TabIndex = 219 Me.cmdLeap.Text = "leap" Me.cmdLeap.UseVisualStyleBackColor = True @@ -1229,18 +1244,18 @@ Partial Class ucrCalculator Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripDate.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateLubridateToolStripMenuItem, Me.DateHmsToolStripMenuItem}) Me.ContextMenuStripDate.Name = "ContextMenuStrip1" - Me.ContextMenuStripDate.Size = New System.Drawing.Size(139, 52) + Me.ContextMenuStripDate.Size = New System.Drawing.Size(122, 48) ' 'DateLubridateToolStripMenuItem ' Me.DateLubridateToolStripMenuItem.Name = "DateLubridateToolStripMenuItem" - Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(138, 24) + Me.DateLubridateToolStripMenuItem.Size = New System.Drawing.Size(121, 22) Me.DateLubridateToolStripMenuItem.Text = "lubridate" ' 'DateHmsToolStripMenuItem ' Me.DateHmsToolStripMenuItem.Name = "DateHmsToolStripMenuItem" - Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(138, 24) + Me.DateHmsToolStripMenuItem.Size = New System.Drawing.Size(121, 22) Me.DateHmsToolStripMenuItem.Text = "hms" ' 'ContextMenuStripComplex @@ -1248,12 +1263,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(110, 28) + Me.ContextMenuStripComplex.Size = New System.Drawing.Size(99, 26) ' 'ComplexBaseToolStripMenuItem ' Me.ComplexBaseToolStripMenuItem.Name = "ComplexBaseToolStripMenuItem" - Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 24) + Me.ComplexBaseToolStripMenuItem.Size = New System.Drawing.Size(98, 22) Me.ComplexBaseToolStripMenuItem.Text = "base" ' 'grpInteger @@ -1272,7 +1287,7 @@ Partial Class ucrCalculator Me.grpInteger.Controls.Add(Me.cmdFrugal) Me.grpInteger.Controls.Add(Me.cmdPerfect) Me.grpInteger.Controls.Add(Me.cmdAbundant) - Me.grpInteger.Controls.Add(Me.cmdFibonacci2) + Me.grpInteger.Controls.Add(Me.cmdCatalan) Me.grpInteger.Controls.Add(Me.cmdPalindrome) Me.grpInteger.Controls.Add(Me.cmdRoman) Me.grpInteger.Controls.Add(Me.cmdHexmode) @@ -1303,9 +1318,11 @@ 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(542, 77) + Me.grpInteger.Location = New System.Drawing.Point(434, 62) + Me.grpInteger.Margin = New System.Windows.Forms.Padding(2) Me.grpInteger.Name = "grpInteger" - Me.grpInteger.Size = New System.Drawing.Size(385, 397) + Me.grpInteger.Padding = New System.Windows.Forms.Padding(2) + Me.grpInteger.Size = New System.Drawing.Size(308, 318) Me.grpInteger.TabIndex = 183 Me.grpInteger.TabStop = False Me.grpInteger.Text = "Integer" @@ -1313,9 +1330,10 @@ Partial Class ucrCalculator 'cmdPrimorial ' Me.cmdPrimorial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPrimorial.Location = New System.Drawing.Point(278, 227) + Me.cmdPrimorial.Location = New System.Drawing.Point(221, 181) + Me.cmdPrimorial.Margin = New System.Windows.Forms.Padding(2) Me.cmdPrimorial.Name = "cmdPrimorial" - Me.cmdPrimorial.Size = New System.Drawing.Size(93, 28) + Me.cmdPrimorial.Size = New System.Drawing.Size(74, 22) Me.cmdPrimorial.TabIndex = 47 Me.cmdPrimorial.Text = "primorial" Me.cmdPrimorial.UseVisualStyleBackColor = True @@ -1323,27 +1341,30 @@ Partial Class ucrCalculator 'cmdFactorize2 ' Me.cmdFactorize2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFactorize2.Location = New System.Drawing.Point(187, 48) + Me.cmdFactorize2.Location = New System.Drawing.Point(148, 39) + Me.cmdFactorize2.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactorize2.Name = "cmdFactorize2" - Me.cmdFactorize2.Size = New System.Drawing.Size(93, 28) + Me.cmdFactorize2.Size = New System.Drawing.Size(74, 22) Me.cmdFactorize2.TabIndex = 46 Me.cmdFactorize2.Text = "factorize2" Me.cmdFactorize2.UseVisualStyleBackColor = True ' 'cmdLucas ' - Me.cmdLucas.Location = New System.Drawing.Point(93, 77) + Me.cmdLucas.Location = New System.Drawing.Point(75, 60) + Me.cmdLucas.Margin = New System.Windows.Forms.Padding(2) Me.cmdLucas.Name = "cmdLucas" - Me.cmdLucas.Size = New System.Drawing.Size(93, 28) + Me.cmdLucas.Size = New System.Drawing.Size(74, 22) Me.cmdLucas.TabIndex = 45 Me.cmdLucas.Text = "lucas" Me.cmdLucas.UseVisualStyleBackColor = True ' 'cmdFactorize ' - Me.cmdFactorize.Location = New System.Drawing.Point(93, 48) + Me.cmdFactorize.Location = New System.Drawing.Point(75, 39) + Me.cmdFactorize.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactorize.Name = "cmdFactorize" - Me.cmdFactorize.Size = New System.Drawing.Size(93, 28) + Me.cmdFactorize.Size = New System.Drawing.Size(74, 22) Me.cmdFactorize.TabIndex = 44 Me.cmdFactorize.Text = "factorize" Me.cmdFactorize.UseVisualStyleBackColor = True @@ -1351,9 +1372,10 @@ Partial Class ucrCalculator 'cmdSquare ' Me.cmdSquare.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSquare.Location = New System.Drawing.Point(278, 322) + Me.cmdSquare.Location = New System.Drawing.Point(221, 256) + Me.cmdSquare.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquare.Name = "cmdSquare" - Me.cmdSquare.Size = New System.Drawing.Size(93, 28) + Me.cmdSquare.Size = New System.Drawing.Size(74, 22) Me.cmdSquare.TabIndex = 43 Me.cmdSquare.Text = "square" Me.cmdSquare.UseVisualStyleBackColor = True @@ -1361,9 +1383,10 @@ Partial Class ucrCalculator 'cmdTriangle ' Me.cmdTriangle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriangle.Location = New System.Drawing.Point(187, 322) + Me.cmdTriangle.Location = New System.Drawing.Point(148, 256) + Me.cmdTriangle.Margin = New System.Windows.Forms.Padding(2) Me.cmdTriangle.Name = "cmdTriangle" - Me.cmdTriangle.Size = New System.Drawing.Size(93, 28) + Me.cmdTriangle.Size = New System.Drawing.Size(74, 22) Me.cmdTriangle.TabIndex = 42 Me.cmdTriangle.Text = "triangle" Me.cmdTriangle.UseVisualStyleBackColor = True @@ -1371,9 +1394,10 @@ Partial Class ucrCalculator 'cmdPadovan ' Me.cmdPadovan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPadovan.Location = New System.Drawing.Point(93, 322) + Me.cmdPadovan.Location = New System.Drawing.Point(75, 256) + Me.cmdPadovan.Margin = New System.Windows.Forms.Padding(2) Me.cmdPadovan.Name = "cmdPadovan" - Me.cmdPadovan.Size = New System.Drawing.Size(93, 28) + Me.cmdPadovan.Size = New System.Drawing.Size(74, 22) Me.cmdPadovan.TabIndex = 41 Me.cmdPadovan.Text = "padovan" Me.cmdPadovan.UseVisualStyleBackColor = True @@ -1381,9 +1405,10 @@ Partial Class ucrCalculator 'cmdAchilles ' Me.cmdAchilles.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAchilles.Location = New System.Drawing.Point(2, 322) + Me.cmdAchilles.Location = New System.Drawing.Point(2, 256) + Me.cmdAchilles.Margin = New System.Windows.Forms.Padding(2) Me.cmdAchilles.Name = "cmdAchilles" - Me.cmdAchilles.Size = New System.Drawing.Size(93, 28) + Me.cmdAchilles.Size = New System.Drawing.Size(74, 22) Me.cmdAchilles.TabIndex = 40 Me.cmdAchilles.Text = "achilles" Me.cmdAchilles.UseVisualStyleBackColor = True @@ -1391,9 +1416,10 @@ Partial Class ucrCalculator 'cmdHappy ' Me.cmdHappy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHappy.Location = New System.Drawing.Point(278, 293) + Me.cmdHappy.Location = New System.Drawing.Point(221, 235) + Me.cmdHappy.Margin = New System.Windows.Forms.Padding(2) Me.cmdHappy.Name = "cmdHappy" - Me.cmdHappy.Size = New System.Drawing.Size(93, 28) + Me.cmdHappy.Size = New System.Drawing.Size(74, 22) Me.cmdHappy.TabIndex = 39 Me.cmdHappy.Text = "happy" Me.cmdHappy.UseVisualStyleBackColor = True @@ -1401,9 +1427,10 @@ Partial Class ucrCalculator 'cmdUgly ' Me.cmdUgly.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdUgly.Location = New System.Drawing.Point(187, 293) + Me.cmdUgly.Location = New System.Drawing.Point(148, 235) + Me.cmdUgly.Margin = New System.Windows.Forms.Padding(2) Me.cmdUgly.Name = "cmdUgly" - Me.cmdUgly.Size = New System.Drawing.Size(93, 28) + Me.cmdUgly.Size = New System.Drawing.Size(74, 22) Me.cmdUgly.TabIndex = 38 Me.cmdUgly.Text = "ugly" Me.cmdUgly.UseVisualStyleBackColor = True @@ -1411,9 +1438,10 @@ Partial Class ucrCalculator 'cmdPowerful ' Me.cmdPowerful.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPowerful.Location = New System.Drawing.Point(93, 293) + Me.cmdPowerful.Location = New System.Drawing.Point(75, 235) + Me.cmdPowerful.Margin = New System.Windows.Forms.Padding(2) Me.cmdPowerful.Name = "cmdPowerful" - Me.cmdPowerful.Size = New System.Drawing.Size(93, 28) + Me.cmdPowerful.Size = New System.Drawing.Size(74, 22) Me.cmdPowerful.TabIndex = 37 Me.cmdPowerful.Text = "powerful" Me.cmdPowerful.UseVisualStyleBackColor = True @@ -1421,9 +1449,10 @@ Partial Class ucrCalculator 'cmdFrugal ' Me.cmdFrugal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFrugal.Location = New System.Drawing.Point(2, 293) + Me.cmdFrugal.Location = New System.Drawing.Point(2, 235) + Me.cmdFrugal.Margin = New System.Windows.Forms.Padding(2) Me.cmdFrugal.Name = "cmdFrugal" - Me.cmdFrugal.Size = New System.Drawing.Size(93, 28) + Me.cmdFrugal.Size = New System.Drawing.Size(74, 22) Me.cmdFrugal.TabIndex = 36 Me.cmdFrugal.Text = "frugal" Me.cmdFrugal.UseVisualStyleBackColor = True @@ -1431,9 +1460,10 @@ Partial Class ucrCalculator 'cmdPerfect ' Me.cmdPerfect.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPerfect.Location = New System.Drawing.Point(278, 267) + Me.cmdPerfect.Location = New System.Drawing.Point(221, 214) + Me.cmdPerfect.Margin = New System.Windows.Forms.Padding(2) Me.cmdPerfect.Name = "cmdPerfect" - Me.cmdPerfect.Size = New System.Drawing.Size(93, 28) + Me.cmdPerfect.Size = New System.Drawing.Size(74, 22) Me.cmdPerfect.TabIndex = 35 Me.cmdPerfect.Text = "perfect" Me.cmdPerfect.UseVisualStyleBackColor = True @@ -1441,29 +1471,32 @@ Partial Class ucrCalculator 'cmdAbundant ' Me.cmdAbundant.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdAbundant.Location = New System.Drawing.Point(187, 267) + Me.cmdAbundant.Location = New System.Drawing.Point(148, 214) + Me.cmdAbundant.Margin = New System.Windows.Forms.Padding(2) Me.cmdAbundant.Name = "cmdAbundant" - Me.cmdAbundant.Size = New System.Drawing.Size(93, 28) + Me.cmdAbundant.Size = New System.Drawing.Size(74, 22) Me.cmdAbundant.TabIndex = 34 Me.cmdAbundant.Text = "abundant" Me.cmdAbundant.UseVisualStyleBackColor = True ' - 'cmdFibonacci2 + 'cmdCatalan ' - Me.cmdFibonacci2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdFibonacci2.Location = New System.Drawing.Point(93, 267) - Me.cmdFibonacci2.Name = "cmdFibonacci2" - Me.cmdFibonacci2.Size = New System.Drawing.Size(93, 28) - Me.cmdFibonacci2.TabIndex = 33 - Me.cmdFibonacci2.Text = "fibonacci2" - Me.cmdFibonacci2.UseVisualStyleBackColor = True + Me.cmdCatalan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCatalan.Location = New System.Drawing.Point(75, 214) + Me.cmdCatalan.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCatalan.Name = "cmdCatalan" + Me.cmdCatalan.Size = New System.Drawing.Size(74, 22) + Me.cmdCatalan.TabIndex = 33 + Me.cmdCatalan.Text = " catalan" + Me.cmdCatalan.UseVisualStyleBackColor = True ' 'cmdPalindrome ' Me.cmdPalindrome.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPalindrome.Location = New System.Drawing.Point(2, 267) + Me.cmdPalindrome.Location = New System.Drawing.Point(2, 214) + Me.cmdPalindrome.Margin = New System.Windows.Forms.Padding(2) Me.cmdPalindrome.Name = "cmdPalindrome" - Me.cmdPalindrome.Size = New System.Drawing.Size(93, 28) + Me.cmdPalindrome.Size = New System.Drawing.Size(74, 22) Me.cmdPalindrome.TabIndex = 32 Me.cmdPalindrome.Text = "palindrome" Me.cmdPalindrome.UseVisualStyleBackColor = True @@ -1471,9 +1504,10 @@ Partial Class ucrCalculator 'cmdRoman ' Me.cmdRoman.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRoman.Location = New System.Drawing.Point(187, 132) + Me.cmdRoman.Location = New System.Drawing.Point(148, 102) + Me.cmdRoman.Margin = New System.Windows.Forms.Padding(2) Me.cmdRoman.Name = "cmdRoman" - Me.cmdRoman.Size = New System.Drawing.Size(93, 28) + Me.cmdRoman.Size = New System.Drawing.Size(74, 22) Me.cmdRoman.TabIndex = 31 Me.cmdRoman.Text = "roman" Me.cmdRoman.UseVisualStyleBackColor = True @@ -1481,9 +1515,10 @@ Partial Class ucrCalculator 'cmdHexmode ' Me.cmdHexmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHexmode.Location = New System.Drawing.Point(278, 103) + Me.cmdHexmode.Location = New System.Drawing.Point(221, 81) + Me.cmdHexmode.Margin = New System.Windows.Forms.Padding(2) Me.cmdHexmode.Name = "cmdHexmode" - Me.cmdHexmode.Size = New System.Drawing.Size(93, 28) + Me.cmdHexmode.Size = New System.Drawing.Size(74, 22) Me.cmdHexmode.TabIndex = 30 Me.cmdHexmode.Text = "hexmode" Me.cmdHexmode.UseVisualStyleBackColor = True @@ -1491,9 +1526,10 @@ Partial Class ucrCalculator 'cmdOctmode ' Me.cmdOctmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctmode.Location = New System.Drawing.Point(187, 103) + Me.cmdOctmode.Location = New System.Drawing.Point(148, 81) + Me.cmdOctmode.Margin = New System.Windows.Forms.Padding(2) Me.cmdOctmode.Name = "cmdOctmode" - Me.cmdOctmode.Size = New System.Drawing.Size(93, 28) + Me.cmdOctmode.Size = New System.Drawing.Size(74, 22) Me.cmdOctmode.TabIndex = 29 Me.cmdOctmode.Text = "octmode" Me.cmdOctmode.UseVisualStyleBackColor = True @@ -1501,9 +1537,10 @@ Partial Class ucrCalculator 'cmdKTuple ' Me.cmdKTuple.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdKTuple.Location = New System.Drawing.Point(187, 227) + Me.cmdKTuple.Location = New System.Drawing.Point(148, 181) + Me.cmdKTuple.Margin = New System.Windows.Forms.Padding(2) Me.cmdKTuple.Name = "cmdKTuple" - Me.cmdKTuple.Size = New System.Drawing.Size(93, 28) + Me.cmdKTuple.Size = New System.Drawing.Size(74, 22) Me.cmdKTuple.TabIndex = 28 Me.cmdKTuple.Text = "k-tuple" Me.cmdKTuple.UseVisualStyleBackColor = True @@ -1511,9 +1548,10 @@ Partial Class ucrCalculator 'cmdTriplets ' Me.cmdTriplets.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTriplets.Location = New System.Drawing.Point(93, 227) + Me.cmdTriplets.Location = New System.Drawing.Point(75, 181) + Me.cmdTriplets.Margin = New System.Windows.Forms.Padding(2) Me.cmdTriplets.Name = "cmdTriplets" - Me.cmdTriplets.Size = New System.Drawing.Size(93, 28) + Me.cmdTriplets.Size = New System.Drawing.Size(74, 22) Me.cmdTriplets.TabIndex = 27 Me.cmdTriplets.Text = "triplets" Me.cmdTriplets.UseVisualStyleBackColor = True @@ -1521,9 +1559,10 @@ Partial Class ucrCalculator 'cmdThird ' Me.cmdThird.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdThird.Location = New System.Drawing.Point(2, 227) + Me.cmdThird.Location = New System.Drawing.Point(2, 181) + Me.cmdThird.Margin = New System.Windows.Forms.Padding(2) Me.cmdThird.Name = "cmdThird" - Me.cmdThird.Size = New System.Drawing.Size(93, 28) + Me.cmdThird.Size = New System.Drawing.Size(74, 22) Me.cmdThird.TabIndex = 26 Me.cmdThird.Text = "third" Me.cmdThird.UseVisualStyleBackColor = True @@ -1531,9 +1570,10 @@ Partial Class ucrCalculator 'cmdSexy ' Me.cmdSexy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSexy.Location = New System.Drawing.Point(278, 198) + Me.cmdSexy.Location = New System.Drawing.Point(221, 160) + Me.cmdSexy.Margin = New System.Windows.Forms.Padding(2) Me.cmdSexy.Name = "cmdSexy" - Me.cmdSexy.Size = New System.Drawing.Size(93, 28) + Me.cmdSexy.Size = New System.Drawing.Size(74, 22) Me.cmdSexy.TabIndex = 25 Me.cmdSexy.Text = "sexy" Me.cmdSexy.UseVisualStyleBackColor = True @@ -1541,9 +1581,10 @@ Partial Class ucrCalculator 'cmdCousin ' Me.cmdCousin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCousin.Location = New System.Drawing.Point(187, 198) + Me.cmdCousin.Location = New System.Drawing.Point(148, 160) + Me.cmdCousin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCousin.Name = "cmdCousin" - Me.cmdCousin.Size = New System.Drawing.Size(93, 28) + Me.cmdCousin.Size = New System.Drawing.Size(74, 22) Me.cmdCousin.TabIndex = 24 Me.cmdCousin.Text = "cousin" Me.cmdCousin.UseVisualStyleBackColor = True @@ -1551,9 +1592,10 @@ Partial Class ucrCalculator 'cmdTwin ' Me.cmdTwin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdTwin.Location = New System.Drawing.Point(93, 198) + Me.cmdTwin.Location = New System.Drawing.Point(75, 160) + Me.cmdTwin.Margin = New System.Windows.Forms.Padding(2) Me.cmdTwin.Name = "cmdTwin" - Me.cmdTwin.Size = New System.Drawing.Size(93, 28) + Me.cmdTwin.Size = New System.Drawing.Size(74, 22) Me.cmdTwin.TabIndex = 23 Me.cmdTwin.Text = "twin" Me.cmdTwin.UseVisualStyleBackColor = True @@ -1561,9 +1603,10 @@ Partial Class ucrCalculator 'cmdPhi ' Me.cmdPhi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdPhi.Location = New System.Drawing.Point(93, 132) + Me.cmdPhi.Location = New System.Drawing.Point(75, 102) + Me.cmdPhi.Margin = New System.Windows.Forms.Padding(2) Me.cmdPhi.Name = "cmdPhi" - Me.cmdPhi.Size = New System.Drawing.Size(93, 28) + Me.cmdPhi.Size = New System.Drawing.Size(74, 22) Me.cmdPhi.TabIndex = 22 Me.cmdPhi.Text = "phi" Me.cmdPhi.UseVisualStyleBackColor = True @@ -1571,9 +1614,10 @@ Partial Class ucrCalculator 'cmdCoprime ' Me.cmdCoprime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdCoprime.Location = New System.Drawing.Point(2, 198) + Me.cmdCoprime.Location = New System.Drawing.Point(2, 160) + Me.cmdCoprime.Margin = New System.Windows.Forms.Padding(2) Me.cmdCoprime.Name = "cmdCoprime" - Me.cmdCoprime.Size = New System.Drawing.Size(93, 28) + Me.cmdCoprime.Size = New System.Drawing.Size(74, 22) Me.cmdCoprime.TabIndex = 21 Me.cmdCoprime.Text = "coprime" Me.cmdCoprime.UseVisualStyleBackColor = True @@ -1581,9 +1625,10 @@ Partial Class ucrCalculator 'cmdSCM ' Me.cmdSCM.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdSCM.Location = New System.Drawing.Point(2, 132) + Me.cmdSCM.Location = New System.Drawing.Point(2, 102) + Me.cmdSCM.Margin = New System.Windows.Forms.Padding(2) Me.cmdSCM.Name = "cmdSCM" - Me.cmdSCM.Size = New System.Drawing.Size(93, 28) + Me.cmdSCM.Size = New System.Drawing.Size(74, 22) Me.cmdSCM.TabIndex = 20 Me.cmdSCM.Text = "scm" Me.cmdSCM.UseVisualStyleBackColor = True @@ -1591,9 +1636,10 @@ Partial Class ucrCalculator 'cmdGCD ' Me.cmdGCD.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGCD.Location = New System.Drawing.Point(278, 132) + Me.cmdGCD.Location = New System.Drawing.Point(221, 102) + Me.cmdGCD.Margin = New System.Windows.Forms.Padding(2) Me.cmdGCD.Name = "cmdGCD" - Me.cmdGCD.Size = New System.Drawing.Size(93, 28) + Me.cmdGCD.Size = New System.Drawing.Size(74, 22) Me.cmdGCD.TabIndex = 19 Me.cmdGCD.Text = "gcd" Me.cmdGCD.UseVisualStyleBackColor = True @@ -1601,18 +1647,20 @@ Partial Class ucrCalculator 'cmdGeneratePrimes ' Me.cmdGeneratePrimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 172) + Me.cmdGeneratePrimes.Location = New System.Drawing.Point(2, 139) + Me.cmdGeneratePrimes.Margin = New System.Windows.Forms.Padding(2) Me.cmdGeneratePrimes.Name = "cmdGeneratePrimes" - Me.cmdGeneratePrimes.Size = New System.Drawing.Size(93, 28) + Me.cmdGeneratePrimes.Size = New System.Drawing.Size(74, 22) Me.cmdGeneratePrimes.TabIndex = 18 Me.cmdGeneratePrimes.Text = "primes" Me.cmdGeneratePrimes.UseVisualStyleBackColor = True ' 'cmdNthPrime ' - Me.cmdNthPrime.Location = New System.Drawing.Point(93, 172) + Me.cmdNthPrime.Location = New System.Drawing.Point(75, 139) + Me.cmdNthPrime.Margin = New System.Windows.Forms.Padding(2) Me.cmdNthPrime.Name = "cmdNthPrime" - Me.cmdNthPrime.Size = New System.Drawing.Size(93, 28) + Me.cmdNthPrime.Size = New System.Drawing.Size(74, 22) Me.cmdNthPrime.TabIndex = 17 Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True @@ -1622,56 +1670,57 @@ 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(157, 172) + Me.ContextMenuStripInteger.Size = New System.Drawing.Size(139, 158) ' 'GmpToolStripMenuItem ' Me.GmpToolStripMenuItem.Name = "GmpToolStripMenuItem" - Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.GmpToolStripMenuItem.Text = "Gmp" ' 'DescToolsToolStripMenuItem ' Me.DescToolsToolStripMenuItem.Name = "DescToolsToolStripMenuItem" - Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.DescToolsToolStripMenuItem.Text = "DescTools" ' 'RutilsToolStripMenuItem ' Me.RutilsToolStripMenuItem.Name = "RutilsToolStripMenuItem" - Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.RutilsToolStripMenuItem.Text = "R.utils" ' 'PrimesToolStripMenuItem ' Me.PrimesToolStripMenuItem.Name = "PrimesToolStripMenuItem" - Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.PrimesToolStripMenuItem.Text = "Primes" ' 'ZseqToolStripMenuItem ' Me.ZseqToolStripMenuItem.Name = "ZseqToolStripMenuItem" - Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.ZseqToolStripMenuItem.Text = "Zseq" ' 'UtilsToolStripMenuItem ' Me.UtilsToolStripMenuItem.Name = "UtilsToolStripMenuItem" - Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.UtilsToolStripMenuItem.Text = "R Utils" ' 'ConfdesignToolStripMenuItem ' Me.ConfdesignToolStripMenuItem.Name = "ConfdesignToolStripMenuItem" - Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(156, 24) + Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(138, 22) 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(93, 103) + Me.cmdHex.Location = New System.Drawing.Point(75, 81) + Me.cmdHex.Margin = New System.Windows.Forms.Padding(2) Me.cmdHex.Name = "cmdHex" - Me.cmdHex.Size = New System.Drawing.Size(93, 28) + Me.cmdHex.Size = New System.Drawing.Size(74, 22) Me.cmdHex.TabIndex = 15 Me.cmdHex.Text = "hex" Me.cmdHex.UseVisualStyleBackColor = True @@ -1679,9 +1728,10 @@ Partial Class ucrCalculator 'cmdOctal ' Me.cmdOctal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctal.Location = New System.Drawing.Point(2, 103) + Me.cmdOctal.Location = New System.Drawing.Point(2, 81) + Me.cmdOctal.Margin = New System.Windows.Forms.Padding(2) Me.cmdOctal.Name = "cmdOctal" - Me.cmdOctal.Size = New System.Drawing.Size(93, 28) + Me.cmdOctal.Size = New System.Drawing.Size(74, 22) Me.cmdOctal.TabIndex = 14 Me.cmdOctal.Text = "octal" Me.cmdOctal.UseVisualStyleBackColor = True @@ -1689,9 +1739,10 @@ Partial Class ucrCalculator 'cmdBinary ' Me.cmdBinary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBinary.Location = New System.Drawing.Point(278, 77) + Me.cmdBinary.Location = New System.Drawing.Point(221, 60) + Me.cmdBinary.Margin = New System.Windows.Forms.Padding(2) Me.cmdBinary.Name = "cmdBinary" - Me.cmdBinary.Size = New System.Drawing.Size(93, 28) + Me.cmdBinary.Size = New System.Drawing.Size(74, 22) Me.cmdBinary.TabIndex = 13 Me.cmdBinary.Text = "binary" Me.cmdBinary.UseVisualStyleBackColor = True @@ -1699,18 +1750,20 @@ Partial Class ucrCalculator 'cmdBigQ ' Me.cmdBigQ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigQ.Location = New System.Drawing.Point(93, 22) + Me.cmdBigQ.Location = New System.Drawing.Point(75, 18) + Me.cmdBigQ.Margin = New System.Windows.Forms.Padding(2) Me.cmdBigQ.Name = "cmdBigQ" - Me.cmdBigQ.Size = New System.Drawing.Size(93, 28) + Me.cmdBigQ.Size = New System.Drawing.Size(74, 22) Me.cmdBigQ.TabIndex = 12 Me.cmdBigQ.Text = "bigq" Me.cmdBigQ.UseVisualStyleBackColor = True ' 'cmdDigitSum ' - Me.cmdDigitSum.Location = New System.Drawing.Point(278, 48) + Me.cmdDigitSum.Location = New System.Drawing.Point(221, 39) + Me.cmdDigitSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigitSum.Name = "cmdDigitSum" - Me.cmdDigitSum.Size = New System.Drawing.Size(93, 28) + Me.cmdDigitSum.Size = New System.Drawing.Size(74, 22) Me.cmdDigitSum.TabIndex = 10 Me.cmdDigitSum.Text = "digitsum" Me.cmdDigitSum.UseVisualStyleBackColor = True @@ -1718,54 +1771,60 @@ Partial Class ucrCalculator 'cmdRankPercent ' Me.cmdRankPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRankPercent.Location = New System.Drawing.Point(187, 77) + Me.cmdRankPercent.Location = New System.Drawing.Point(148, 60) + Me.cmdRankPercent.Margin = New System.Windows.Forms.Padding(2) Me.cmdRankPercent.Name = "cmdRankPercent" - Me.cmdRankPercent.Size = New System.Drawing.Size(93, 28) + Me.cmdRankPercent.Size = New System.Drawing.Size(74, 22) Me.cmdRankPercent.TabIndex = 9 Me.cmdRankPercent.Text = "percentrank" Me.cmdRankPercent.UseVisualStyleBackColor = True ' 'cmdDivisors ' - Me.cmdDivisors.Location = New System.Drawing.Point(2, 48) + Me.cmdDivisors.Location = New System.Drawing.Point(2, 39) + Me.cmdDivisors.Margin = New System.Windows.Forms.Padding(2) Me.cmdDivisors.Name = "cmdDivisors" - Me.cmdDivisors.Size = New System.Drawing.Size(93, 28) + Me.cmdDivisors.Size = New System.Drawing.Size(74, 22) Me.cmdDivisors.TabIndex = 8 Me.cmdDivisors.Text = "divisors" Me.cmdDivisors.UseVisualStyleBackColor = True ' 'cmdFibonacci ' - Me.cmdFibonacci.Location = New System.Drawing.Point(2, 77) + Me.cmdFibonacci.Location = New System.Drawing.Point(2, 60) + Me.cmdFibonacci.Margin = New System.Windows.Forms.Padding(2) Me.cmdFibonacci.Name = "cmdFibonacci" - Me.cmdFibonacci.Size = New System.Drawing.Size(93, 28) + Me.cmdFibonacci.Size = New System.Drawing.Size(74, 22) Me.cmdFibonacci.TabIndex = 7 Me.cmdFibonacci.Text = "fibonacci" Me.cmdFibonacci.UseVisualStyleBackColor = True ' 'cmdNextPrime ' - Me.cmdNextPrime.Location = New System.Drawing.Point(187, 172) + Me.cmdNextPrime.Location = New System.Drawing.Point(148, 139) + Me.cmdNextPrime.Margin = New System.Windows.Forms.Padding(2) Me.cmdNextPrime.Name = "cmdNextPrime" - Me.cmdNextPrime.Size = New System.Drawing.Size(93, 28) + Me.cmdNextPrime.Size = New System.Drawing.Size(74, 22) Me.cmdNextPrime.TabIndex = 5 Me.cmdNextPrime.Text = "next prime" Me.cmdNextPrime.UseVisualStyleBackColor = True ' 'cmdChoosez ' - Me.cmdChoosez.Location = New System.Drawing.Point(278, 22) + Me.cmdChoosez.Location = New System.Drawing.Point(221, 18) + Me.cmdChoosez.Margin = New System.Windows.Forms.Padding(2) Me.cmdChoosez.Name = "cmdChoosez" - Me.cmdChoosez.Size = New System.Drawing.Size(93, 28) + Me.cmdChoosez.Size = New System.Drawing.Size(74, 22) Me.cmdChoosez.TabIndex = 4 Me.cmdChoosez.Text = "choose" Me.cmdChoosez.UseVisualStyleBackColor = True ' 'cmdFactorial ' - Me.cmdFactorial.Location = New System.Drawing.Point(187, 22) + Me.cmdFactorial.Location = New System.Drawing.Point(148, 18) + Me.cmdFactorial.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactorial.Name = "cmdFactorial" - Me.cmdFactorial.Size = New System.Drawing.Size(93, 28) + Me.cmdFactorial.Size = New System.Drawing.Size(74, 22) Me.cmdFactorial.TabIndex = 2 Me.cmdFactorial.Text = "factorial" Me.cmdFactorial.UseVisualStyleBackColor = True @@ -1773,9 +1832,10 @@ Partial Class ucrCalculator 'cmdIsPrime ' Me.cmdIsPrime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdIsPrime.Location = New System.Drawing.Point(278, 172) + Me.cmdIsPrime.Location = New System.Drawing.Point(221, 139) + Me.cmdIsPrime.Margin = New System.Windows.Forms.Padding(2) Me.cmdIsPrime.Name = "cmdIsPrime" - Me.cmdIsPrime.Size = New System.Drawing.Size(93, 28) + Me.cmdIsPrime.Size = New System.Drawing.Size(74, 22) Me.cmdIsPrime.TabIndex = 1 Me.cmdIsPrime.Text = "is_prime" Me.cmdIsPrime.UseVisualStyleBackColor = True @@ -1783,9 +1843,10 @@ Partial Class ucrCalculator 'cmdBigZ ' Me.cmdBigZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBigZ.Location = New System.Drawing.Point(2, 22) + Me.cmdBigZ.Location = New System.Drawing.Point(2, 18) + Me.cmdBigZ.Margin = New System.Windows.Forms.Padding(2) Me.cmdBigZ.Name = "cmdBigZ" - Me.cmdBigZ.Size = New System.Drawing.Size(93, 28) + Me.cmdBigZ.Size = New System.Drawing.Size(74, 22) Me.cmdBigZ.TabIndex = 0 Me.cmdBigZ.Text = "bigz" Me.cmdBigZ.UseVisualStyleBackColor = True @@ -1813,11 +1874,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(542, 77) + Me.grpFactor.Location = New System.Drawing.Point(434, 62) Me.grpFactor.Margin = New System.Windows.Forms.Padding(2) Me.grpFactor.Name = "grpFactor" Me.grpFactor.Padding = New System.Windows.Forms.Padding(2) - Me.grpFactor.Size = New System.Drawing.Size(310, 260) + Me.grpFactor.Size = New System.Drawing.Size(248, 208) Me.grpFactor.TabIndex = 191 Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" @@ -1827,21 +1888,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(124, 28) + Me.ContextMenuStripFactor.Size = New System.Drawing.Size(111, 26) ' 'FactorForcatsToolStripMenuItem ' Me.FactorForcatsToolStripMenuItem.Name = "FactorForcatsToolStripMenuItem" - Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(123, 24) + Me.FactorForcatsToolStripMenuItem.Size = New System.Drawing.Size(110, 22) Me.FactorForcatsToolStripMenuItem.Text = "forcats" ' 'cmdShuffle ' Me.cmdShuffle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShuffle.Location = New System.Drawing.Point(228, 178) + Me.cmdShuffle.Location = New System.Drawing.Point(181, 140) Me.cmdShuffle.Margin = New System.Windows.Forms.Padding(2) Me.cmdShuffle.Name = "cmdShuffle" - Me.cmdShuffle.Size = New System.Drawing.Size(75, 40) + Me.cmdShuffle.Size = New System.Drawing.Size(60, 32) Me.cmdShuffle.TabIndex = 210 Me.cmdShuffle.Text = "shuffle" Me.cmdShuffle.UseVisualStyleBackColor = True @@ -1849,10 +1910,10 @@ Partial Class ucrCalculator 'cmdShift ' Me.cmdShift.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdShift.Location = New System.Drawing.Point(153, 178) + Me.cmdShift.Location = New System.Drawing.Point(122, 140) Me.cmdShift.Margin = New System.Windows.Forms.Padding(2) Me.cmdShift.Name = "cmdShift" - Me.cmdShift.Size = New System.Drawing.Size(75, 40) + Me.cmdShift.Size = New System.Drawing.Size(60, 32) Me.cmdShift.TabIndex = 209 Me.cmdShift.Text = "shift" Me.cmdShift.UseVisualStyleBackColor = True @@ -1860,10 +1921,10 @@ Partial Class ucrCalculator 'cmdReverse ' Me.cmdReverse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReverse.Location = New System.Drawing.Point(80, 178) + Me.cmdReverse.Location = New System.Drawing.Point(63, 140) Me.cmdReverse.Margin = New System.Windows.Forms.Padding(2) Me.cmdReverse.Name = "cmdReverse" - Me.cmdReverse.Size = New System.Drawing.Size(75, 40) + Me.cmdReverse.Size = New System.Drawing.Size(60, 32) Me.cmdReverse.TabIndex = 208 Me.cmdReverse.Text = "reverse" Me.cmdReverse.UseVisualStyleBackColor = True @@ -1871,10 +1932,10 @@ Partial Class ucrCalculator 'cmdReorder ' Me.cmdReorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReorder.Location = New System.Drawing.Point(5, 178) + Me.cmdReorder.Location = New System.Drawing.Point(4, 140) Me.cmdReorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdReorder.Name = "cmdReorder" - Me.cmdReorder.Size = New System.Drawing.Size(75, 40) + Me.cmdReorder.Size = New System.Drawing.Size(60, 32) Me.cmdReorder.TabIndex = 207 Me.cmdReorder.Text = "reorder" Me.cmdReorder.UseVisualStyleBackColor = True @@ -1882,10 +1943,10 @@ Partial Class ucrCalculator 'cmdRelevel ' Me.cmdRelevel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRelevel.Location = New System.Drawing.Point(228, 138) + Me.cmdRelevel.Location = New System.Drawing.Point(181, 109) Me.cmdRelevel.Margin = New System.Windows.Forms.Padding(2) Me.cmdRelevel.Name = "cmdRelevel" - Me.cmdRelevel.Size = New System.Drawing.Size(75, 40) + Me.cmdRelevel.Size = New System.Drawing.Size(60, 32) Me.cmdRelevel.TabIndex = 206 Me.cmdRelevel.Text = "relevel" Me.cmdRelevel.UseVisualStyleBackColor = True @@ -1893,10 +1954,10 @@ Partial Class ucrCalculator 'cmdRecode ' Me.cmdRecode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRecode.Location = New System.Drawing.Point(153, 138) + Me.cmdRecode.Location = New System.Drawing.Point(122, 109) Me.cmdRecode.Margin = New System.Windows.Forms.Padding(2) Me.cmdRecode.Name = "cmdRecode" - Me.cmdRecode.Size = New System.Drawing.Size(75, 40) + Me.cmdRecode.Size = New System.Drawing.Size(60, 32) Me.cmdRecode.TabIndex = 205 Me.cmdRecode.Text = "recode" Me.cmdRecode.UseVisualStyleBackColor = True @@ -1904,10 +1965,10 @@ Partial Class ucrCalculator 'cmdOther ' Me.cmdOther.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOther.Location = New System.Drawing.Point(80, 138) + Me.cmdOther.Location = New System.Drawing.Point(63, 109) Me.cmdOther.Margin = New System.Windows.Forms.Padding(2) Me.cmdOther.Name = "cmdOther" - Me.cmdOther.Size = New System.Drawing.Size(75, 40) + Me.cmdOther.Size = New System.Drawing.Size(60, 32) Me.cmdOther.TabIndex = 204 Me.cmdOther.Text = "other" Me.cmdOther.UseVisualStyleBackColor = True @@ -1915,10 +1976,10 @@ Partial Class ucrCalculator 'cmdFmatch ' Me.cmdFmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFmatch.Location = New System.Drawing.Point(5, 138) + Me.cmdFmatch.Location = New System.Drawing.Point(4, 109) Me.cmdFmatch.Margin = New System.Windows.Forms.Padding(2) Me.cmdFmatch.Name = "cmdFmatch" - Me.cmdFmatch.Size = New System.Drawing.Size(75, 40) + Me.cmdFmatch.Size = New System.Drawing.Size(60, 32) Me.cmdFmatch.TabIndex = 203 Me.cmdFmatch.Text = "match" Me.cmdFmatch.UseVisualStyleBackColor = True @@ -1926,10 +1987,10 @@ Partial Class ucrCalculator 'cmdLump ' Me.cmdLump.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLump.Location = New System.Drawing.Point(228, 100) + Me.cmdLump.Location = New System.Drawing.Point(181, 78) Me.cmdLump.Margin = New System.Windows.Forms.Padding(2) Me.cmdLump.Name = "cmdLump" - Me.cmdLump.Size = New System.Drawing.Size(75, 40) + Me.cmdLump.Size = New System.Drawing.Size(60, 32) Me.cmdLump.TabIndex = 202 Me.cmdLump.Text = "lump" Me.cmdLump.UseVisualStyleBackColor = True @@ -1937,10 +1998,10 @@ Partial Class ucrCalculator 'cmdInseq ' Me.cmdInseq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInseq.Location = New System.Drawing.Point(153, 100) + Me.cmdInseq.Location = New System.Drawing.Point(122, 78) Me.cmdInseq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInseq.Name = "cmdInseq" - Me.cmdInseq.Size = New System.Drawing.Size(75, 40) + Me.cmdInseq.Size = New System.Drawing.Size(60, 32) Me.cmdInseq.TabIndex = 201 Me.cmdInseq.Text = "inseq" Me.cmdInseq.UseVisualStyleBackColor = True @@ -1948,10 +2009,10 @@ Partial Class ucrCalculator 'cmdInfreq ' Me.cmdInfreq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInfreq.Location = New System.Drawing.Point(80, 100) + Me.cmdInfreq.Location = New System.Drawing.Point(63, 78) Me.cmdInfreq.Margin = New System.Windows.Forms.Padding(2) Me.cmdInfreq.Name = "cmdInfreq" - Me.cmdInfreq.Size = New System.Drawing.Size(75, 40) + Me.cmdInfreq.Size = New System.Drawing.Size(60, 32) Me.cmdInfreq.TabIndex = 200 Me.cmdInfreq.Text = "infreq" Me.cmdInfreq.UseVisualStyleBackColor = True @@ -1959,10 +2020,10 @@ Partial Class ucrCalculator 'cmdInorder ' Me.cmdInorder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdInorder.Location = New System.Drawing.Point(5, 100) + Me.cmdInorder.Location = New System.Drawing.Point(4, 78) Me.cmdInorder.Margin = New System.Windows.Forms.Padding(2) Me.cmdInorder.Name = "cmdInorder" - Me.cmdInorder.Size = New System.Drawing.Size(75, 40) + Me.cmdInorder.Size = New System.Drawing.Size(60, 32) Me.cmdInorder.TabIndex = 199 Me.cmdInorder.Text = "inorder" Me.cmdInorder.UseVisualStyleBackColor = True @@ -1970,10 +2031,10 @@ Partial Class ucrCalculator 'cmdAdd_na ' Me.cmdAdd_na.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAdd_na.Location = New System.Drawing.Point(228, 60) + Me.cmdAdd_na.Location = New System.Drawing.Point(181, 47) 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.Size = New System.Drawing.Size(60, 32) Me.cmdAdd_na.TabIndex = 198 Me.cmdAdd_na.Text = "add_na" Me.cmdAdd_na.UseVisualStyleBackColor = True @@ -1981,10 +2042,10 @@ Partial Class ucrCalculator 'cmdExpand ' Me.cmdExpand.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExpand.Location = New System.Drawing.Point(153, 60) + Me.cmdExpand.Location = New System.Drawing.Point(122, 47) Me.cmdExpand.Margin = New System.Windows.Forms.Padding(2) Me.cmdExpand.Name = "cmdExpand" - Me.cmdExpand.Size = New System.Drawing.Size(75, 40) + Me.cmdExpand.Size = New System.Drawing.Size(60, 32) Me.cmdExpand.TabIndex = 197 Me.cmdExpand.Text = "expand" Me.cmdExpand.UseVisualStyleBackColor = True @@ -1992,10 +2053,10 @@ Partial Class ucrCalculator 'cmdDrop ' Me.cmdDrop.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDrop.Location = New System.Drawing.Point(80, 60) + Me.cmdDrop.Location = New System.Drawing.Point(63, 47) Me.cmdDrop.Margin = New System.Windows.Forms.Padding(2) Me.cmdDrop.Name = "cmdDrop" - Me.cmdDrop.Size = New System.Drawing.Size(75, 40) + Me.cmdDrop.Size = New System.Drawing.Size(60, 32) Me.cmdDrop.TabIndex = 196 Me.cmdDrop.Text = "drop" Me.cmdDrop.UseVisualStyleBackColor = True @@ -2003,10 +2064,10 @@ Partial Class ucrCalculator 'cmdCross ' Me.cmdCross.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCross.Location = New System.Drawing.Point(5, 60) + Me.cmdCross.Location = New System.Drawing.Point(4, 47) Me.cmdCross.Margin = New System.Windows.Forms.Padding(2) Me.cmdCross.Name = "cmdCross" - Me.cmdCross.Size = New System.Drawing.Size(75, 40) + Me.cmdCross.Size = New System.Drawing.Size(60, 32) Me.cmdCross.TabIndex = 195 Me.cmdCross.Text = "cross" Me.cmdCross.UseVisualStyleBackColor = True @@ -2014,10 +2075,10 @@ Partial Class ucrCalculator 'cmdCollapse ' Me.cmdCollapse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollapse.Location = New System.Drawing.Point(228, 20) + Me.cmdCollapse.Location = New System.Drawing.Point(181, 16) Me.cmdCollapse.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollapse.Name = "cmdCollapse" - Me.cmdCollapse.Size = New System.Drawing.Size(75, 40) + Me.cmdCollapse.Size = New System.Drawing.Size(60, 32) Me.cmdCollapse.TabIndex = 194 Me.cmdCollapse.Text = "collapse" Me.cmdCollapse.UseVisualStyleBackColor = True @@ -2025,10 +2086,10 @@ Partial Class ucrCalculator 'cmdLabelled ' Me.cmdLabelled.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLabelled.Location = New System.Drawing.Point(153, 20) + Me.cmdLabelled.Location = New System.Drawing.Point(122, 16) Me.cmdLabelled.Margin = New System.Windows.Forms.Padding(2) Me.cmdLabelled.Name = "cmdLabelled" - Me.cmdLabelled.Size = New System.Drawing.Size(75, 40) + Me.cmdLabelled.Size = New System.Drawing.Size(60, 32) Me.cmdLabelled.TabIndex = 193 Me.cmdLabelled.Text = "labelled " Me.cmdLabelled.UseVisualStyleBackColor = True @@ -2036,10 +2097,10 @@ Partial Class ucrCalculator 'cmdFactor ' Me.cmdFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFactor.Location = New System.Drawing.Point(5, 20) + Me.cmdFactor.Location = New System.Drawing.Point(4, 16) Me.cmdFactor.Margin = New System.Windows.Forms.Padding(2) Me.cmdFactor.Name = "cmdFactor" - Me.cmdFactor.Size = New System.Drawing.Size(75, 40) + Me.cmdFactor.Size = New System.Drawing.Size(60, 32) Me.cmdFactor.TabIndex = 191 Me.cmdFactor.Text = "factor" Me.cmdFactor.UseVisualStyleBackColor = True @@ -2047,10 +2108,10 @@ Partial Class ucrCalculator 'cmdAnon ' Me.cmdAnon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAnon.Location = New System.Drawing.Point(80, 20) + Me.cmdAnon.Location = New System.Drawing.Point(63, 16) Me.cmdAnon.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnon.Name = "cmdAnon" - Me.cmdAnon.Size = New System.Drawing.Size(75, 40) + Me.cmdAnon.Size = New System.Drawing.Size(60, 32) Me.cmdAnon.TabIndex = 192 Me.cmdAnon.Text = "anon" Me.cmdAnon.UseVisualStyleBackColor = True @@ -2079,35 +2140,35 @@ 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(542, 77) + Me.grpHydroGOF.Location = New System.Drawing.Point(434, 62) Me.grpHydroGOF.Margin = New System.Windows.Forms.Padding(2) Me.grpHydroGOF.Name = "grpHydroGOF" Me.grpHydroGOF.Padding = New System.Windows.Forms.Padding(2) - Me.grpHydroGOF.Size = New System.Drawing.Size(228, 337) + Me.grpHydroGOF.Size = New System.Drawing.Size(182, 270) Me.grpHydroGOF.TabIndex = 195 Me.grpHydroGOF.TabStop = False - Me.grpHydroGOF.Text = "hydroGOF " + Me.grpHydroGOF.Text = "Goodness of Fit" ' 'ContextMenuStripHydroGOF ' 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(145, 28) + Me.ContextMenuStripHydroGOF.Size = New System.Drawing.Size(129, 26) ' 'HydroGOFToolStripMenuItem ' Me.HydroGOFToolStripMenuItem.Name = "HydroGOFToolStripMenuItem" - Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(144, 24) + Me.HydroGOFToolStripMenuItem.Size = New System.Drawing.Size(128, 22) Me.HydroGOFToolStripMenuItem.Text = "hydroGOF" ' 'cmdVE ' Me.cmdVE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVE.Location = New System.Drawing.Point(150, 258) + Me.cmdVE.Location = New System.Drawing.Point(120, 202) Me.cmdVE.Margin = New System.Windows.Forms.Padding(2) Me.cmdVE.Name = "cmdVE" - Me.cmdVE.Size = New System.Drawing.Size(75, 40) + Me.cmdVE.Size = New System.Drawing.Size(60, 32) Me.cmdVE.TabIndex = 20 Me.cmdVE.Text = "VE" Me.cmdVE.UseVisualStyleBackColor = True @@ -2115,10 +2176,10 @@ Partial Class ucrCalculator 'cmdSsq ' Me.cmdSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSsq.Location = New System.Drawing.Point(77, 258) + Me.cmdSsq.Location = New System.Drawing.Point(61, 202) Me.cmdSsq.Margin = New System.Windows.Forms.Padding(2) Me.cmdSsq.Name = "cmdSsq" - Me.cmdSsq.Size = New System.Drawing.Size(75, 40) + Me.cmdSsq.Size = New System.Drawing.Size(60, 32) Me.cmdSsq.TabIndex = 19 Me.cmdSsq.Text = "ssq" Me.cmdSsq.UseVisualStyleBackColor = True @@ -2126,10 +2187,10 @@ Partial Class ucrCalculator 'cmdRsr ' Me.cmdRsr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRsr.Location = New System.Drawing.Point(2, 258) + Me.cmdRsr.Location = New System.Drawing.Point(2, 202) Me.cmdRsr.Margin = New System.Windows.Forms.Padding(2) Me.cmdRsr.Name = "cmdRsr" - Me.cmdRsr.Size = New System.Drawing.Size(75, 40) + Me.cmdRsr.Size = New System.Drawing.Size(60, 32) Me.cmdRsr.TabIndex = 18 Me.cmdRsr.Text = "rsr" Me.cmdRsr.UseVisualStyleBackColor = True @@ -2137,10 +2198,10 @@ Partial Class ucrCalculator 'cmdRSD ' Me.cmdRSD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRSD.Location = New System.Drawing.Point(150, 218) + Me.cmdRSD.Location = New System.Drawing.Point(120, 171) Me.cmdRSD.Margin = New System.Windows.Forms.Padding(2) Me.cmdRSD.Name = "cmdRSD" - Me.cmdRSD.Size = New System.Drawing.Size(75, 40) + Me.cmdRSD.Size = New System.Drawing.Size(60, 32) Me.cmdRSD.TabIndex = 17 Me.cmdRSD.Text = "rSD" Me.cmdRSD.UseVisualStyleBackColor = True @@ -2148,10 +2209,10 @@ Partial Class ucrCalculator 'cmdRPearson ' Me.cmdRPearson.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRPearson.Location = New System.Drawing.Point(77, 218) + Me.cmdRPearson.Location = New System.Drawing.Point(61, 171) Me.cmdRPearson.Margin = New System.Windows.Forms.Padding(2) Me.cmdRPearson.Name = "cmdRPearson" - Me.cmdRPearson.Size = New System.Drawing.Size(75, 40) + Me.cmdRPearson.Size = New System.Drawing.Size(60, 32) Me.cmdRPearson.TabIndex = 16 Me.cmdRPearson.Text = "rPearson" Me.cmdRPearson.UseVisualStyleBackColor = True @@ -2159,10 +2220,10 @@ Partial Class ucrCalculator 'cmdRNSE ' Me.cmdRNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRNSE.Location = New System.Drawing.Point(2, 218) + Me.cmdRNSE.Location = New System.Drawing.Point(2, 171) Me.cmdRNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdRNSE.Name = "cmdRNSE" - Me.cmdRNSE.Size = New System.Drawing.Size(75, 40) + Me.cmdRNSE.Size = New System.Drawing.Size(60, 32) Me.cmdRNSE.TabIndex = 15 Me.cmdRNSE.Text = "rNSE" Me.cmdRNSE.UseVisualStyleBackColor = True @@ -2170,10 +2231,10 @@ Partial Class ucrCalculator 'cmdRmse ' Me.cmdRmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRmse.Location = New System.Drawing.Point(150, 178) + Me.cmdRmse.Location = New System.Drawing.Point(120, 140) Me.cmdRmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdRmse.Name = "cmdRmse" - Me.cmdRmse.Size = New System.Drawing.Size(75, 40) + Me.cmdRmse.Size = New System.Drawing.Size(60, 32) Me.cmdRmse.TabIndex = 14 Me.cmdRmse.Text = "rmse" Me.cmdRmse.UseVisualStyleBackColor = True @@ -2181,10 +2242,10 @@ Partial Class ucrCalculator 'cmdRd ' Me.cmdRd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRd.Location = New System.Drawing.Point(77, 178) + Me.cmdRd.Location = New System.Drawing.Point(61, 140) Me.cmdRd.Margin = New System.Windows.Forms.Padding(2) Me.cmdRd.Name = "cmdRd" - Me.cmdRd.Size = New System.Drawing.Size(75, 40) + Me.cmdRd.Size = New System.Drawing.Size(60, 32) Me.cmdRd.TabIndex = 13 Me.cmdRd.Text = "rd" Me.cmdRd.UseVisualStyleBackColor = True @@ -2192,10 +2253,10 @@ Partial Class ucrCalculator 'cmdPbiasfdc ' Me.cmdPbiasfdc.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbiasfdc.Location = New System.Drawing.Point(2, 178) + Me.cmdPbiasfdc.Location = New System.Drawing.Point(2, 140) Me.cmdPbiasfdc.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbiasfdc.Name = "cmdPbiasfdc" - Me.cmdPbiasfdc.Size = New System.Drawing.Size(75, 40) + Me.cmdPbiasfdc.Size = New System.Drawing.Size(60, 32) Me.cmdPbiasfdc.TabIndex = 12 Me.cmdPbiasfdc.Text = "pbiasfdc" Me.cmdPbiasfdc.UseVisualStyleBackColor = True @@ -2203,10 +2264,10 @@ Partial Class ucrCalculator 'cmdPbias ' Me.cmdPbias.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPbias.Location = New System.Drawing.Point(150, 138) + Me.cmdPbias.Location = New System.Drawing.Point(120, 109) Me.cmdPbias.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbias.Name = "cmdPbias" - Me.cmdPbias.Size = New System.Drawing.Size(75, 40) + Me.cmdPbias.Size = New System.Drawing.Size(60, 32) Me.cmdPbias.TabIndex = 11 Me.cmdPbias.Text = "pbias" Me.cmdPbias.UseVisualStyleBackColor = True @@ -2214,10 +2275,10 @@ Partial Class ucrCalculator 'cmdNSE ' Me.cmdNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNSE.Location = New System.Drawing.Point(77, 138) + Me.cmdNSE.Location = New System.Drawing.Point(61, 109) Me.cmdNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdNSE.Name = "cmdNSE" - Me.cmdNSE.Size = New System.Drawing.Size(75, 40) + Me.cmdNSE.Size = New System.Drawing.Size(60, 32) Me.cmdNSE.TabIndex = 10 Me.cmdNSE.Text = "NSE" Me.cmdNSE.UseVisualStyleBackColor = True @@ -2225,10 +2286,10 @@ Partial Class ucrCalculator 'cmdNrmse ' Me.cmdNrmse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNrmse.Location = New System.Drawing.Point(2, 138) + Me.cmdNrmse.Location = New System.Drawing.Point(2, 109) Me.cmdNrmse.Margin = New System.Windows.Forms.Padding(2) Me.cmdNrmse.Name = "cmdNrmse" - Me.cmdNrmse.Size = New System.Drawing.Size(75, 40) + Me.cmdNrmse.Size = New System.Drawing.Size(60, 32) Me.cmdNrmse.TabIndex = 9 Me.cmdNrmse.Text = "nrmse" Me.cmdNrmse.UseVisualStyleBackColor = True @@ -2236,10 +2297,10 @@ Partial Class ucrCalculator 'cmdMse ' Me.cmdMse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMse.Location = New System.Drawing.Point(150, 100) + Me.cmdMse.Location = New System.Drawing.Point(120, 78) Me.cmdMse.Margin = New System.Windows.Forms.Padding(2) Me.cmdMse.Name = "cmdMse" - Me.cmdMse.Size = New System.Drawing.Size(75, 40) + Me.cmdMse.Size = New System.Drawing.Size(60, 32) Me.cmdMse.TabIndex = 8 Me.cmdMse.Text = "mse" Me.cmdMse.UseVisualStyleBackColor = True @@ -2247,10 +2308,10 @@ Partial Class ucrCalculator 'cmdmNSE ' Me.cmdmNSE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmNSE.Location = New System.Drawing.Point(77, 100) + Me.cmdmNSE.Location = New System.Drawing.Point(61, 78) Me.cmdmNSE.Margin = New System.Windows.Forms.Padding(2) Me.cmdmNSE.Name = "cmdmNSE" - Me.cmdmNSE.Size = New System.Drawing.Size(75, 40) + Me.cmdmNSE.Size = New System.Drawing.Size(60, 32) Me.cmdmNSE.TabIndex = 7 Me.cmdmNSE.Text = "mNSE" Me.cmdmNSE.UseVisualStyleBackColor = True @@ -2258,10 +2319,10 @@ Partial Class ucrCalculator 'cmdMe ' Me.cmdMe.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMe.Location = New System.Drawing.Point(2, 100) + Me.cmdMe.Location = New System.Drawing.Point(2, 78) Me.cmdMe.Margin = New System.Windows.Forms.Padding(2) Me.cmdMe.Name = "cmdMe" - Me.cmdMe.Size = New System.Drawing.Size(75, 40) + Me.cmdMe.Size = New System.Drawing.Size(60, 32) Me.cmdMe.TabIndex = 6 Me.cmdMe.Text = "me" Me.cmdMe.UseVisualStyleBackColor = True @@ -2269,10 +2330,10 @@ Partial Class ucrCalculator 'cmdMd ' Me.cmdMd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMd.Location = New System.Drawing.Point(150, 60) + Me.cmdMd.Location = New System.Drawing.Point(120, 47) Me.cmdMd.Margin = New System.Windows.Forms.Padding(2) Me.cmdMd.Name = "cmdMd" - Me.cmdMd.Size = New System.Drawing.Size(75, 40) + Me.cmdMd.Size = New System.Drawing.Size(60, 32) Me.cmdMd.TabIndex = 5 Me.cmdMd.Text = "md" Me.cmdMd.UseVisualStyleBackColor = True @@ -2280,10 +2341,10 @@ Partial Class ucrCalculator 'cmdMae ' Me.cmdMae.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMae.Location = New System.Drawing.Point(77, 60) + Me.cmdMae.Location = New System.Drawing.Point(61, 47) Me.cmdMae.Margin = New System.Windows.Forms.Padding(2) Me.cmdMae.Name = "cmdMae" - Me.cmdMae.Size = New System.Drawing.Size(75, 40) + Me.cmdMae.Size = New System.Drawing.Size(60, 32) Me.cmdMae.TabIndex = 4 Me.cmdMae.Text = "mae" Me.cmdMae.UseVisualStyleBackColor = True @@ -2291,10 +2352,10 @@ Partial Class ucrCalculator 'cmdKGE ' Me.cmdKGE.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKGE.Location = New System.Drawing.Point(2, 60) + Me.cmdKGE.Location = New System.Drawing.Point(2, 47) Me.cmdKGE.Margin = New System.Windows.Forms.Padding(2) Me.cmdKGE.Name = "cmdKGE" - Me.cmdKGE.Size = New System.Drawing.Size(75, 40) + Me.cmdKGE.Size = New System.Drawing.Size(60, 32) Me.cmdKGE.TabIndex = 3 Me.cmdKGE.Text = "KGE" Me.cmdKGE.UseVisualStyleBackColor = True @@ -2302,10 +2363,10 @@ Partial Class ucrCalculator 'cmdD ' Me.cmdD.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdD.Location = New System.Drawing.Point(150, 20) + Me.cmdD.Location = New System.Drawing.Point(120, 16) Me.cmdD.Margin = New System.Windows.Forms.Padding(2) Me.cmdD.Name = "cmdD" - Me.cmdD.Size = New System.Drawing.Size(75, 40) + Me.cmdD.Size = New System.Drawing.Size(60, 32) Me.cmdD.TabIndex = 2 Me.cmdD.Text = "d" Me.cmdD.UseVisualStyleBackColor = True @@ -2313,10 +2374,10 @@ Partial Class ucrCalculator 'cmdCp ' Me.cmdCp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCp.Location = New System.Drawing.Point(77, 20) + Me.cmdCp.Location = New System.Drawing.Point(61, 16) Me.cmdCp.Margin = New System.Windows.Forms.Padding(2) Me.cmdCp.Name = "cmdCp" - Me.cmdCp.Size = New System.Drawing.Size(75, 40) + Me.cmdCp.Size = New System.Drawing.Size(60, 32) Me.cmdCp.TabIndex = 1 Me.cmdCp.Text = "cp" Me.cmdCp.UseVisualStyleBackColor = True @@ -2324,10 +2385,10 @@ Partial Class ucrCalculator 'cmdBr2 ' Me.cmdBr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBr2.Location = New System.Drawing.Point(2, 20) + Me.cmdBr2.Location = New System.Drawing.Point(2, 16) Me.cmdBr2.Margin = New System.Windows.Forms.Padding(2) Me.cmdBr2.Name = "cmdBr2" - Me.cmdBr2.Size = New System.Drawing.Size(75, 40) + Me.cmdBr2.Size = New System.Drawing.Size(60, 32) Me.cmdBr2.TabIndex = 0 Me.cmdBr2.Text = "br2" Me.cmdBr2.UseVisualStyleBackColor = True @@ -2363,7 +2424,7 @@ Partial Class ucrCalculator Me.grpWakefield.Controls.Add(Me.cmdWakefieldLower) Me.grpWakefield.Controls.Add(Me.cmdLanguage) Me.grpWakefield.Controls.Add(Me.cmdIq) - Me.grpWakefield.Controls.Add(Me.cmdInternet_Browser) + Me.grpWakefield.Controls.Add(Me.cmdid) Me.grpWakefield.Controls.Add(Me.cmdGrade_Level) Me.grpWakefield.Controls.Add(Me.cmdEye) Me.grpWakefield.Controls.Add(Me.cmdEmployment) @@ -2389,9 +2450,11 @@ 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(542, 78) + Me.grpWakefield.Location = New System.Drawing.Point(434, 62) + Me.grpWakefield.Margin = New System.Windows.Forms.Padding(2) Me.grpWakefield.Name = "grpWakefield" - Me.grpWakefield.Size = New System.Drawing.Size(543, 432) + Me.grpWakefield.Padding = New System.Windows.Forms.Padding(2) + Me.grpWakefield.Size = New System.Drawing.Size(434, 346) Me.grpWakefield.TabIndex = 191 Me.grpWakefield.TabStop = False Me.grpWakefield.Text = "Wakefield" @@ -2400,9 +2463,10 @@ Partial Class ucrCalculator ' Me.cmdLikert7.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdLikert7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLikert7.Location = New System.Drawing.Point(427, 382) + Me.cmdLikert7.Location = New System.Drawing.Point(346, 304) + Me.cmdLikert7.Margin = New System.Windows.Forms.Padding(2) Me.cmdLikert7.Name = "cmdLikert7" - Me.cmdLikert7.Size = New System.Drawing.Size(107, 38) + Me.cmdLikert7.Size = New System.Drawing.Size(86, 30) Me.cmdLikert7.TabIndex = 54 Me.cmdLikert7.Text = "likert7 (O.F)" Me.cmdLikert7.UseVisualStyleBackColor = True @@ -2411,9 +2475,10 @@ 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(322, 382) + Me.cmdWakefield_Year.Location = New System.Drawing.Point(261, 304) + Me.cmdWakefield_Year.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefield_Year.Name = "cmdWakefield_Year" - Me.cmdWakefield_Year.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefield_Year.Size = New System.Drawing.Size(86, 30) Me.cmdWakefield_Year.TabIndex = 53 Me.cmdWakefield_Year.Text = "year" Me.cmdWakefield_Year.UseVisualStyleBackColor = True @@ -2422,9 +2487,10 @@ 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(217, 382) + Me.cmdValid.Location = New System.Drawing.Point(176, 304) + Me.cmdValid.Margin = New System.Windows.Forms.Padding(2) Me.cmdValid.Name = "cmdValid" - Me.cmdValid.Size = New System.Drawing.Size(107, 38) + Me.cmdValid.Size = New System.Drawing.Size(86, 30) Me.cmdValid.TabIndex = 52 Me.cmdValid.Text = "valid (L)" Me.cmdValid.UseVisualStyleBackColor = True @@ -2433,9 +2499,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldUpper.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldUpper.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldUpper.Location = New System.Drawing.Point(112, 382) + Me.cmdWakefieldUpper.Location = New System.Drawing.Point(91, 304) + Me.cmdWakefieldUpper.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldUpper.Name = "cmdWakefieldUpper" - Me.cmdWakefieldUpper.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldUpper.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldUpper.TabIndex = 51 Me.cmdWakefieldUpper.Text = "upper (F)" Me.cmdWakefieldUpper.UseVisualStyleBackColor = True @@ -2444,9 +2511,10 @@ 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(7, 382) + Me.cmdString.Location = New System.Drawing.Point(6, 304) + Me.cmdString.Margin = New System.Windows.Forms.Padding(2) Me.cmdString.Name = "cmdString" - Me.cmdString.Size = New System.Drawing.Size(107, 38) + Me.cmdString.Size = New System.Drawing.Size(86, 30) Me.cmdString.TabIndex = 50 Me.cmdString.Text = "string (C)" Me.cmdString.UseVisualStyleBackColor = True @@ -2455,9 +2523,10 @@ 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(427, 347) + Me.cmdState.Location = New System.Drawing.Point(346, 275) + Me.cmdState.Margin = New System.Windows.Forms.Padding(2) Me.cmdState.Name = "cmdState" - Me.cmdState.Size = New System.Drawing.Size(107, 38) + Me.cmdState.Size = New System.Drawing.Size(86, 30) Me.cmdState.TabIndex = 49 Me.cmdState.Text = "state (F)" Me.cmdState.UseVisualStyleBackColor = True @@ -2466,9 +2535,10 @@ 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(322, 347) + Me.cmdSpeed.Location = New System.Drawing.Point(261, 275) + Me.cmdSpeed.Margin = New System.Windows.Forms.Padding(2) Me.cmdSpeed.Name = "cmdSpeed" - Me.cmdSpeed.Size = New System.Drawing.Size(107, 38) + Me.cmdSpeed.Size = New System.Drawing.Size(86, 30) Me.cmdSpeed.TabIndex = 48 Me.cmdSpeed.Text = "speed" Me.cmdSpeed.UseVisualStyleBackColor = True @@ -2477,9 +2547,10 @@ 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(217, 347) + Me.cmdSmokes.Location = New System.Drawing.Point(176, 275) + Me.cmdSmokes.Margin = New System.Windows.Forms.Padding(2) Me.cmdSmokes.Name = "cmdSmokes" - Me.cmdSmokes.Size = New System.Drawing.Size(107, 38) + Me.cmdSmokes.Size = New System.Drawing.Size(86, 30) Me.cmdSmokes.TabIndex = 47 Me.cmdSmokes.Text = "smokes (L)" Me.cmdSmokes.UseVisualStyleBackColor = True @@ -2488,9 +2559,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldTimes.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldTimes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldTimes.Location = New System.Drawing.Point(112, 347) + Me.cmdWakefieldTimes.Location = New System.Drawing.Point(91, 275) + Me.cmdWakefieldTimes.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldTimes.Name = "cmdWakefieldTimes" - Me.cmdWakefieldTimes.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldTimes.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldTimes.TabIndex = 46 Me.cmdWakefieldTimes.Text = "times (T)" Me.cmdWakefieldTimes.UseVisualStyleBackColor = True @@ -2499,9 +2571,10 @@ 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(7, 347) + Me.cmdSex_Inclusive.Location = New System.Drawing.Point(6, 275) + Me.cmdSex_Inclusive.Margin = New System.Windows.Forms.Padding(2) Me.cmdSex_Inclusive.Name = "cmdSex_Inclusive" - Me.cmdSex_Inclusive.Size = New System.Drawing.Size(107, 38) + Me.cmdSex_Inclusive.Size = New System.Drawing.Size(86, 30) Me.cmdSex_Inclusive.TabIndex = 45 Me.cmdSex_Inclusive.Text = "sex_inclusive (F)" Me.cmdSex_Inclusive.UseVisualStyleBackColor = True @@ -2510,9 +2583,10 @@ 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(427, 310) + Me.cmdGender.Location = New System.Drawing.Point(346, 246) + Me.cmdGender.Margin = New System.Windows.Forms.Padding(2) Me.cmdGender.Name = "cmdGender" - Me.cmdGender.Size = New System.Drawing.Size(107, 38) + Me.cmdGender.Size = New System.Drawing.Size(86, 30) Me.cmdGender.TabIndex = 44 Me.cmdGender.Text = "gender (F)" Me.cmdGender.UseVisualStyleBackColor = True @@ -2521,9 +2595,10 @@ 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(322, 310) + Me.cmdSentence.Location = New System.Drawing.Point(261, 246) + Me.cmdSentence.Margin = New System.Windows.Forms.Padding(2) Me.cmdSentence.Name = "cmdSentence" - Me.cmdSentence.Size = New System.Drawing.Size(107, 38) + Me.cmdSentence.Size = New System.Drawing.Size(86, 30) Me.cmdSentence.TabIndex = 43 Me.cmdSentence.Text = "sentence (C)" Me.cmdSentence.UseVisualStyleBackColor = True @@ -2532,9 +2607,10 @@ 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(217, 310) + Me.cmdSat.Location = New System.Drawing.Point(176, 246) + Me.cmdSat.Margin = New System.Windows.Forms.Padding(2) Me.cmdSat.Name = "cmdSat" - Me.cmdSat.Size = New System.Drawing.Size(107, 38) + Me.cmdSat.Size = New System.Drawing.Size(86, 30) Me.cmdSat.TabIndex = 42 Me.cmdSat.Text = "sat" Me.cmdSat.UseVisualStyleBackColor = True @@ -2543,9 +2619,10 @@ 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(112, 310) + Me.cmdReligion.Location = New System.Drawing.Point(91, 246) + Me.cmdReligion.Margin = New System.Windows.Forms.Padding(2) Me.cmdReligion.Name = "cmdReligion" - Me.cmdReligion.Size = New System.Drawing.Size(107, 38) + Me.cmdReligion.Size = New System.Drawing.Size(86, 30) Me.cmdReligion.TabIndex = 41 Me.cmdReligion.Text = "religion (F)" Me.cmdReligion.UseVisualStyleBackColor = True @@ -2554,9 +2631,10 @@ 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(7, 310) + Me.cmdRace.Location = New System.Drawing.Point(6, 246) + Me.cmdRace.Margin = New System.Windows.Forms.Padding(2) Me.cmdRace.Name = "cmdRace" - Me.cmdRace.Size = New System.Drawing.Size(107, 38) + Me.cmdRace.Size = New System.Drawing.Size(86, 30) Me.cmdRace.TabIndex = 40 Me.cmdRace.Text = "race (F)" Me.cmdRace.UseVisualStyleBackColor = True @@ -2565,9 +2643,10 @@ 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(427, 273) + Me.cmdPolitical.Location = New System.Drawing.Point(346, 217) + Me.cmdPolitical.Margin = New System.Windows.Forms.Padding(2) Me.cmdPolitical.Name = "cmdPolitical" - Me.cmdPolitical.Size = New System.Drawing.Size(107, 38) + Me.cmdPolitical.Size = New System.Drawing.Size(86, 30) Me.cmdPolitical.TabIndex = 39 Me.cmdPolitical.Text = "political (F)" Me.cmdPolitical.UseVisualStyleBackColor = True @@ -2576,9 +2655,10 @@ 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(322, 273) + Me.cmdNormal.Location = New System.Drawing.Point(261, 217) + Me.cmdNormal.Margin = New System.Windows.Forms.Padding(2) Me.cmdNormal.Name = "cmdNormal" - Me.cmdNormal.Size = New System.Drawing.Size(107, 38) + Me.cmdNormal.Size = New System.Drawing.Size(86, 30) Me.cmdNormal.TabIndex = 38 Me.cmdNormal.Text = "normal" Me.cmdNormal.UseVisualStyleBackColor = True @@ -2587,9 +2667,10 @@ 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(217, 273) + Me.cmdName.Location = New System.Drawing.Point(176, 217) + Me.cmdName.Margin = New System.Windows.Forms.Padding(2) Me.cmdName.Name = "cmdName" - Me.cmdName.Size = New System.Drawing.Size(107, 38) + Me.cmdName.Size = New System.Drawing.Size(86, 30) Me.cmdName.TabIndex = 37 Me.cmdName.Text = "name (C)" Me.cmdName.UseVisualStyleBackColor = True @@ -2598,9 +2679,10 @@ 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(112, 273) + Me.cmdWakefield_Month.Location = New System.Drawing.Point(91, 217) + Me.cmdWakefield_Month.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefield_Month.Name = "cmdWakefield_Month" - Me.cmdWakefield_Month.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefield_Month.Size = New System.Drawing.Size(86, 30) Me.cmdWakefield_Month.TabIndex = 36 Me.cmdWakefield_Month.Text = "month (F)" Me.cmdWakefield_Month.UseVisualStyleBackColor = True @@ -2609,9 +2691,10 @@ 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(7, 273) + Me.cmdMilitary.Location = New System.Drawing.Point(6, 217) + Me.cmdMilitary.Margin = New System.Windows.Forms.Padding(2) Me.cmdMilitary.Name = "cmdMilitary" - Me.cmdMilitary.Size = New System.Drawing.Size(107, 38) + Me.cmdMilitary.Size = New System.Drawing.Size(86, 30) Me.cmdMilitary.TabIndex = 35 Me.cmdMilitary.Text = "military (F)" Me.cmdMilitary.UseVisualStyleBackColor = True @@ -2620,9 +2703,10 @@ 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(427, 237) + Me.cmdMarital.Location = New System.Drawing.Point(346, 188) + Me.cmdMarital.Margin = New System.Windows.Forms.Padding(2) Me.cmdMarital.Name = "cmdMarital" - Me.cmdMarital.Size = New System.Drawing.Size(107, 38) + Me.cmdMarital.Size = New System.Drawing.Size(86, 30) Me.cmdMarital.TabIndex = 34 Me.cmdMarital.Text = "marital (F)" Me.cmdMarital.UseVisualStyleBackColor = True @@ -2631,9 +2715,10 @@ 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(322, 237) + Me.cmdLorem_ipsum.Location = New System.Drawing.Point(261, 188) + Me.cmdLorem_ipsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdLorem_ipsum.Name = "cmdLorem_ipsum" - Me.cmdLorem_ipsum.Size = New System.Drawing.Size(107, 38) + Me.cmdLorem_ipsum.Size = New System.Drawing.Size(86, 30) Me.cmdLorem_ipsum.TabIndex = 33 Me.cmdLorem_ipsum.Text = "lorem_ipsum (C)" Me.cmdLorem_ipsum.UseVisualStyleBackColor = True @@ -2642,9 +2727,10 @@ 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(217, 237) + Me.cmdLikert.Location = New System.Drawing.Point(176, 188) + Me.cmdLikert.Margin = New System.Windows.Forms.Padding(2) Me.cmdLikert.Name = "cmdLikert" - Me.cmdLikert.Size = New System.Drawing.Size(107, 38) + Me.cmdLikert.Size = New System.Drawing.Size(86, 30) Me.cmdLikert.TabIndex = 32 Me.cmdLikert.Text = "likert (O.F)" Me.cmdLikert.UseVisualStyleBackColor = True @@ -2653,9 +2739,10 @@ 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(112, 237) + Me.cmdGpa.Location = New System.Drawing.Point(91, 188) + Me.cmdGpa.Margin = New System.Windows.Forms.Padding(2) Me.cmdGpa.Name = "cmdGpa" - Me.cmdGpa.Size = New System.Drawing.Size(107, 38) + Me.cmdGpa.Size = New System.Drawing.Size(86, 30) Me.cmdGpa.TabIndex = 31 Me.cmdGpa.Text = "gpa" Me.cmdGpa.UseVisualStyleBackColor = True @@ -2664,9 +2751,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldMinute.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldMinute.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldMinute.Location = New System.Drawing.Point(7, 237) + Me.cmdWakefieldMinute.Location = New System.Drawing.Point(6, 188) + Me.cmdWakefieldMinute.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldMinute.Name = "cmdWakefieldMinute" - Me.cmdWakefieldMinute.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldMinute.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldMinute.TabIndex = 30 Me.cmdWakefieldMinute.Text = "minute (T)" Me.cmdWakefieldMinute.UseVisualStyleBackColor = True @@ -2675,9 +2763,10 @@ 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(427, 200) + Me.cmdMath.Location = New System.Drawing.Point(346, 159) + Me.cmdMath.Margin = New System.Windows.Forms.Padding(2) Me.cmdMath.Name = "cmdMath" - Me.cmdMath.Size = New System.Drawing.Size(107, 38) + Me.cmdMath.Size = New System.Drawing.Size(86, 30) Me.cmdMath.TabIndex = 29 Me.cmdMath.Text = "math" Me.cmdMath.UseVisualStyleBackColor = True @@ -2686,9 +2775,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldLower.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldLower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldLower.Location = New System.Drawing.Point(322, 200) + Me.cmdWakefieldLower.Location = New System.Drawing.Point(261, 159) + Me.cmdWakefieldLower.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldLower.Name = "cmdWakefieldLower" - Me.cmdWakefieldLower.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldLower.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldLower.TabIndex = 28 Me.cmdWakefieldLower.Text = "lower(F)" Me.cmdWakefieldLower.UseVisualStyleBackColor = True @@ -2697,9 +2787,10 @@ 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(217, 200) + Me.cmdLanguage.Location = New System.Drawing.Point(176, 159) + Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(2) Me.cmdLanguage.Name = "cmdLanguage" - Me.cmdLanguage.Size = New System.Drawing.Size(107, 38) + Me.cmdLanguage.Size = New System.Drawing.Size(86, 30) Me.cmdLanguage.TabIndex = 27 Me.cmdLanguage.Text = "language (F)" Me.cmdLanguage.UseVisualStyleBackColor = True @@ -2708,31 +2799,34 @@ 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(112, 200) + Me.cmdIq.Location = New System.Drawing.Point(91, 159) + Me.cmdIq.Margin = New System.Windows.Forms.Padding(2) Me.cmdIq.Name = "cmdIq" - Me.cmdIq.Size = New System.Drawing.Size(107, 38) + Me.cmdIq.Size = New System.Drawing.Size(86, 30) Me.cmdIq.TabIndex = 26 Me.cmdIq.Text = "iq" Me.cmdIq.UseVisualStyleBackColor = True ' - 'cmdInternet_Browser + 'cmdid ' - 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(7, 200) - Me.cmdInternet_Browser.Name = "cmdInternet_Browser" - 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 + Me.cmdid.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) + Me.cmdid.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdid.Location = New System.Drawing.Point(6, 159) + Me.cmdid.Margin = New System.Windows.Forms.Padding(2) + Me.cmdid.Name = "cmdid" + Me.cmdid.Size = New System.Drawing.Size(86, 30) + Me.cmdid.TabIndex = 25 + Me.cmdid.Text = "id (C)" + Me.cmdid.UseVisualStyleBackColor = True ' 'cmdGrade_Level ' 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(427, 128) + Me.cmdGrade_Level.Location = New System.Drawing.Point(346, 101) + Me.cmdGrade_Level.Margin = New System.Windows.Forms.Padding(2) Me.cmdGrade_Level.Name = "cmdGrade_Level" - Me.cmdGrade_Level.Size = New System.Drawing.Size(107, 38) + Me.cmdGrade_Level.Size = New System.Drawing.Size(86, 30) Me.cmdGrade_Level.TabIndex = 19 Me.cmdGrade_Level.Text = "grade_level (F)" Me.cmdGrade_Level.UseVisualStyleBackColor = True @@ -2741,9 +2835,10 @@ 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(322, 128) + Me.cmdEye.Location = New System.Drawing.Point(261, 101) + Me.cmdEye.Margin = New System.Windows.Forms.Padding(2) Me.cmdEye.Name = "cmdEye" - Me.cmdEye.Size = New System.Drawing.Size(107, 38) + Me.cmdEye.Size = New System.Drawing.Size(86, 30) Me.cmdEye.TabIndex = 18 Me.cmdEye.Text = "eye (F)" Me.cmdEye.UseVisualStyleBackColor = True @@ -2752,9 +2847,10 @@ 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(217, 128) + Me.cmdEmployment.Location = New System.Drawing.Point(176, 101) + Me.cmdEmployment.Margin = New System.Windows.Forms.Padding(2) Me.cmdEmployment.Name = "cmdEmployment" - Me.cmdEmployment.Size = New System.Drawing.Size(107, 38) + Me.cmdEmployment.Size = New System.Drawing.Size(86, 30) Me.cmdEmployment.TabIndex = 17 Me.cmdEmployment.Text = "employment (F)" Me.cmdEmployment.UseVisualStyleBackColor = True @@ -2763,9 +2859,10 @@ 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(112, 128) + Me.cmdEducation.Location = New System.Drawing.Point(91, 101) + Me.cmdEducation.Margin = New System.Windows.Forms.Padding(2) Me.cmdEducation.Name = "cmdEducation" - Me.cmdEducation.Size = New System.Drawing.Size(107, 38) + Me.cmdEducation.Size = New System.Drawing.Size(86, 30) Me.cmdEducation.TabIndex = 16 Me.cmdEducation.Text = "education (F)" Me.cmdEducation.UseVisualStyleBackColor = True @@ -2774,9 +2871,10 @@ 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(7, 128) + Me.cmdDummy.Location = New System.Drawing.Point(6, 101) + Me.cmdDummy.Margin = New System.Windows.Forms.Padding(2) Me.cmdDummy.Name = "cmdDummy" - Me.cmdDummy.Size = New System.Drawing.Size(107, 38) + Me.cmdDummy.Size = New System.Drawing.Size(86, 30) Me.cmdDummy.TabIndex = 15 Me.cmdDummy.Text = "dummy" Me.cmdDummy.UseVisualStyleBackColor = True @@ -2785,9 +2883,10 @@ 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(427, 90) + Me.cmdDob.Location = New System.Drawing.Point(346, 72) + Me.cmdDob.Margin = New System.Windows.Forms.Padding(2) Me.cmdDob.Name = "cmdDob" - Me.cmdDob.Size = New System.Drawing.Size(107, 38) + Me.cmdDob.Size = New System.Drawing.Size(86, 30) Me.cmdDob.TabIndex = 14 Me.cmdDob.Text = "dob (D)" Me.cmdDob.UseVisualStyleBackColor = True @@ -2796,9 +2895,10 @@ 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(322, 90) + Me.cmdDna.Location = New System.Drawing.Point(261, 72) + Me.cmdDna.Margin = New System.Windows.Forms.Padding(2) Me.cmdDna.Name = "cmdDna" - Me.cmdDna.Size = New System.Drawing.Size(107, 38) + Me.cmdDna.Size = New System.Drawing.Size(86, 30) Me.cmdDna.TabIndex = 13 Me.cmdDna.Text = "dna (F)" Me.cmdDna.UseVisualStyleBackColor = True @@ -2807,9 +2907,10 @@ 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(217, 90) + Me.cmdDice.Location = New System.Drawing.Point(176, 72) + Me.cmdDice.Margin = New System.Windows.Forms.Padding(2) Me.cmdDice.Name = "cmdDice" - Me.cmdDice.Size = New System.Drawing.Size(107, 38) + Me.cmdDice.Size = New System.Drawing.Size(86, 30) Me.cmdDice.TabIndex = 12 Me.cmdDice.Text = "dice" Me.cmdDice.UseVisualStyleBackColor = True @@ -2818,9 +2919,10 @@ Partial Class ucrCalculator ' Me.cmdGrade_Letter.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdGrade_Letter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGrade_Letter.Location = New System.Drawing.Point(112, 90) + Me.cmdGrade_Letter.Location = New System.Drawing.Point(91, 72) + Me.cmdGrade_Letter.Margin = New System.Windows.Forms.Padding(2) Me.cmdGrade_Letter.Name = "cmdGrade_Letter" - Me.cmdGrade_Letter.Size = New System.Drawing.Size(107, 38) + Me.cmdGrade_Letter.Size = New System.Drawing.Size(86, 30) Me.cmdGrade_Letter.TabIndex = 11 Me.cmdGrade_Letter.Text = "grade_letter(F)" Me.cmdGrade_Letter.UseVisualStyleBackColor = True @@ -2829,9 +2931,10 @@ 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(7, 90) + Me.cmdDeath.Location = New System.Drawing.Point(6, 72) + Me.cmdDeath.Margin = New System.Windows.Forms.Padding(2) Me.cmdDeath.Name = "cmdDeath" - Me.cmdDeath.Size = New System.Drawing.Size(107, 38) + Me.cmdDeath.Size = New System.Drawing.Size(86, 30) Me.cmdDeath.TabIndex = 10 Me.cmdDeath.Text = "death (L)" Me.cmdDeath.UseVisualStyleBackColor = True @@ -2840,9 +2943,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldDates.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.25!) Me.cmdWakefieldDates.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWakefieldDates.Location = New System.Drawing.Point(427, 53) + Me.cmdWakefieldDates.Location = New System.Drawing.Point(346, 43) + Me.cmdWakefieldDates.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldDates.Name = "cmdWakefieldDates" - Me.cmdWakefieldDates.Size = New System.Drawing.Size(107, 38) + Me.cmdWakefieldDates.Size = New System.Drawing.Size(86, 30) Me.cmdWakefieldDates.TabIndex = 9 Me.cmdWakefieldDates.Text = "dates (D)" Me.cmdWakefieldDates.UseVisualStyleBackColor = True @@ -2851,9 +2955,10 @@ 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(322, 53) + Me.cmdPrimary.Location = New System.Drawing.Point(261, 43) + Me.cmdPrimary.Margin = New System.Windows.Forms.Padding(2) Me.cmdPrimary.Name = "cmdPrimary" - Me.cmdPrimary.Size = New System.Drawing.Size(107, 38) + Me.cmdPrimary.Size = New System.Drawing.Size(86, 30) Me.cmdPrimary.TabIndex = 8 Me.cmdPrimary.Text = "primary (F)" Me.cmdPrimary.UseVisualStyleBackColor = True @@ -2862,9 +2967,10 @@ 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(217, 53) + Me.cmdColor.Location = New System.Drawing.Point(176, 43) + Me.cmdColor.Margin = New System.Windows.Forms.Padding(2) Me.cmdColor.Name = "cmdColor" - Me.cmdColor.Size = New System.Drawing.Size(107, 38) + Me.cmdColor.Size = New System.Drawing.Size(86, 30) Me.cmdColor.TabIndex = 7 Me.cmdColor.Text = "color (F)" Me.cmdColor.UseVisualStyleBackColor = True @@ -2873,9 +2979,10 @@ 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(112, 53) + Me.cmdCoin.Location = New System.Drawing.Point(91, 43) + Me.cmdCoin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCoin.Name = "cmdCoin" - Me.cmdCoin.Size = New System.Drawing.Size(107, 38) + Me.cmdCoin.Size = New System.Drawing.Size(86, 30) Me.cmdCoin.TabIndex = 6 Me.cmdCoin.Text = "coin (F)" Me.cmdCoin.UseVisualStyleBackColor = True @@ -2884,9 +2991,10 @@ 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(7, 53) + Me.cmdChildren.Location = New System.Drawing.Point(6, 43) + Me.cmdChildren.Margin = New System.Windows.Forms.Padding(2) Me.cmdChildren.Name = "cmdChildren" - Me.cmdChildren.Size = New System.Drawing.Size(107, 38) + Me.cmdChildren.Size = New System.Drawing.Size(86, 30) Me.cmdChildren.TabIndex = 5 Me.cmdChildren.Text = "children" Me.cmdChildren.UseVisualStyleBackColor = True @@ -2895,9 +3003,10 @@ 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(427, 18) + Me.cmdCar.Location = New System.Drawing.Point(346, 14) + Me.cmdCar.Margin = New System.Windows.Forms.Padding(2) Me.cmdCar.Name = "cmdCar" - Me.cmdCar.Size = New System.Drawing.Size(107, 38) + Me.cmdCar.Size = New System.Drawing.Size(86, 30) Me.cmdCar.TabIndex = 4 Me.cmdCar.Text = "car (F)" Me.cmdCar.UseVisualStyleBackColor = True @@ -2906,9 +3015,10 @@ 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(322, 18) + Me.cmdAnswer.Location = New System.Drawing.Point(261, 14) + Me.cmdAnswer.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnswer.Name = "cmdAnswer" - Me.cmdAnswer.Size = New System.Drawing.Size(107, 38) + Me.cmdAnswer.Size = New System.Drawing.Size(86, 30) Me.cmdAnswer.TabIndex = 3 Me.cmdAnswer.Text = "answer (F)" Me.cmdAnswer.UseVisualStyleBackColor = True @@ -2917,9 +3027,10 @@ 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(217, 18) + Me.cmdPet.Location = New System.Drawing.Point(176, 14) + Me.cmdPet.Margin = New System.Windows.Forms.Padding(2) Me.cmdPet.Name = "cmdPet" - Me.cmdPet.Size = New System.Drawing.Size(107, 38) + Me.cmdPet.Size = New System.Drawing.Size(86, 30) Me.cmdPet.TabIndex = 2 Me.cmdPet.Text = "pet (F)" Me.cmdPet.UseVisualStyleBackColor = True @@ -2928,9 +3039,10 @@ 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(112, 18) + Me.cmdAnimal.Location = New System.Drawing.Point(91, 14) + Me.cmdAnimal.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnimal.Name = "cmdAnimal" - Me.cmdAnimal.Size = New System.Drawing.Size(107, 38) + Me.cmdAnimal.Size = New System.Drawing.Size(86, 30) Me.cmdAnimal.TabIndex = 1 Me.cmdAnimal.Text = "animal (F)" Me.cmdAnimal.UseVisualStyleBackColor = True @@ -2939,9 +3051,10 @@ 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(7, 18) + Me.cmdAge.Location = New System.Drawing.Point(6, 14) + Me.cmdAge.Margin = New System.Windows.Forms.Padding(2) Me.cmdAge.Name = "cmdAge" - Me.cmdAge.Size = New System.Drawing.Size(107, 38) + Me.cmdAge.Size = New System.Drawing.Size(86, 30) Me.cmdAge.TabIndex = 0 Me.cmdAge.Text = "age" Me.cmdAge.UseVisualStyleBackColor = True @@ -2950,9 +3063,10 @@ 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(427, 163) + Me.cmdIncome.Location = New System.Drawing.Point(346, 130) + Me.cmdIncome.Margin = New System.Windows.Forms.Padding(2) Me.cmdIncome.Name = "cmdIncome" - Me.cmdIncome.Size = New System.Drawing.Size(107, 38) + Me.cmdIncome.Size = New System.Drawing.Size(86, 30) Me.cmdIncome.TabIndex = 24 Me.cmdIncome.Text = "income" Me.cmdIncome.UseVisualStyleBackColor = True @@ -2961,9 +3075,10 @@ 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(322, 163) + Me.cmdHeight.Location = New System.Drawing.Point(261, 130) + Me.cmdHeight.Margin = New System.Windows.Forms.Padding(2) Me.cmdHeight.Name = "cmdHeight" - Me.cmdHeight.Size = New System.Drawing.Size(107, 38) + Me.cmdHeight.Size = New System.Drawing.Size(86, 30) Me.cmdHeight.TabIndex = 23 Me.cmdHeight.Text = "height" Me.cmdHeight.UseVisualStyleBackColor = True @@ -2972,9 +3087,10 @@ 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(217, 163) + Me.cmdHair.Location = New System.Drawing.Point(176, 130) + Me.cmdHair.Margin = New System.Windows.Forms.Padding(2) Me.cmdHair.Name = "cmdHair" - Me.cmdHair.Size = New System.Drawing.Size(107, 38) + Me.cmdHair.Size = New System.Drawing.Size(86, 30) Me.cmdHair.TabIndex = 22 Me.cmdHair.Text = "hair (F)" Me.cmdHair.UseVisualStyleBackColor = True @@ -2983,9 +3099,10 @@ 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(112, 163) + Me.cmdGroup.Location = New System.Drawing.Point(91, 130) + Me.cmdGroup.Margin = New System.Windows.Forms.Padding(2) Me.cmdGroup.Name = "cmdGroup" - Me.cmdGroup.Size = New System.Drawing.Size(107, 38) + Me.cmdGroup.Size = New System.Drawing.Size(86, 30) Me.cmdGroup.TabIndex = 21 Me.cmdGroup.Text = "group (F)" Me.cmdGroup.UseVisualStyleBackColor = True @@ -2994,9 +3111,10 @@ 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(7, 163) + Me.cmdGrade.Location = New System.Drawing.Point(6, 130) + Me.cmdGrade.Margin = New System.Windows.Forms.Padding(2) Me.cmdGrade.Name = "cmdGrade" - Me.cmdGrade.Size = New System.Drawing.Size(107, 38) + Me.cmdGrade.Size = New System.Drawing.Size(86, 30) Me.cmdGrade.TabIndex = 20 Me.cmdGrade.Text = "grade" Me.cmdGrade.UseVisualStyleBackColor = True @@ -3027,11 +3145,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(542, 78) - Me.grpMaths.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpMaths.Location = New System.Drawing.Point(434, 62) + Me.grpMaths.Margin = New System.Windows.Forms.Padding(2) Me.grpMaths.Name = "grpMaths" - Me.grpMaths.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpMaths.Size = New System.Drawing.Size(320, 205) + Me.grpMaths.Padding = New System.Windows.Forms.Padding(2) + Me.grpMaths.Size = New System.Drawing.Size(256, 164) Me.grpMaths.TabIndex = 184 Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" @@ -3041,38 +3159,39 @@ Partial Class ucrCalculator Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripMaths.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MathsBaseStripMenuItem, Me.MathsStatsStripMenuItem, Me.MathsCarToolStripMenuItem, Me.MathsCircularToolStripMenuItem}) Me.ContextMenuStripMaths.Name = "ContextMenuStrip1" - Me.ContextMenuStripMaths.Size = New System.Drawing.Size(127, 100) + Me.ContextMenuStripMaths.Size = New System.Drawing.Size(114, 92) ' 'MathsBaseStripMenuItem ' Me.MathsBaseStripMenuItem.Name = "MathsBaseStripMenuItem" - Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsBaseStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.MathsBaseStripMenuItem.Text = "base" ' 'MathsStatsStripMenuItem ' Me.MathsStatsStripMenuItem.Name = "MathsStatsStripMenuItem" - Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsStatsStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.MathsStatsStripMenuItem.Text = "stats" ' 'MathsCarToolStripMenuItem ' Me.MathsCarToolStripMenuItem.Name = "MathsCarToolStripMenuItem" - Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsCarToolStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.MathsCarToolStripMenuItem.Text = "car" ' 'MathsCircularToolStripMenuItem ' Me.MathsCircularToolStripMenuItem.Name = "MathsCircularToolStripMenuItem" - Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.MathsCircularToolStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.MathsCircularToolStripMenuItem.Text = "circular" ' 'cmdAtan2 ' Me.cmdAtan2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan2.Location = New System.Drawing.Point(128, 162) + Me.cmdAtan2.Location = New System.Drawing.Point(100, 130) + Me.cmdAtan2.Margin = New System.Windows.Forms.Padding(2) Me.cmdAtan2.Name = "cmdAtan2" - Me.cmdAtan2.Size = New System.Drawing.Size(63, 38) + Me.cmdAtan2.Size = New System.Drawing.Size(50, 30) Me.cmdAtan2.TabIndex = 151 Me.cmdAtan2.Text = "atan2" Me.cmdAtan2.UseVisualStyleBackColor = True @@ -3080,9 +3199,10 @@ Partial Class ucrCalculator 'cmdLogistic ' Me.cmdLogistic.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogistic.Location = New System.Drawing.Point(65, 162) + Me.cmdLogistic.Location = New System.Drawing.Point(51, 130) + Me.cmdLogistic.Margin = New System.Windows.Forms.Padding(2) Me.cmdLogistic.Name = "cmdLogistic" - Me.cmdLogistic.Size = New System.Drawing.Size(63, 38) + Me.cmdLogistic.Size = New System.Drawing.Size(50, 30) Me.cmdLogistic.TabIndex = 149 Me.cmdLogistic.Text = "logistic" Me.cmdLogistic.UseVisualStyleBackColor = True @@ -3090,9 +3210,10 @@ Partial Class ucrCalculator 'cmdLogit ' Me.cmdLogit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogit.Location = New System.Drawing.Point(2, 162) + Me.cmdLogit.Location = New System.Drawing.Point(2, 130) + Me.cmdLogit.Margin = New System.Windows.Forms.Padding(2) Me.cmdLogit.Name = "cmdLogit" - Me.cmdLogit.Size = New System.Drawing.Size(63, 38) + Me.cmdLogit.Size = New System.Drawing.Size(50, 30) Me.cmdLogit.TabIndex = 148 Me.cmdLogit.Text = "logit" Me.cmdLogit.UseVisualStyleBackColor = True @@ -3100,10 +3221,10 @@ Partial Class ucrCalculator 'cmdSign ' Me.cmdSign.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSign.Location = New System.Drawing.Point(253, 127) - Me.cmdSign.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSign.Location = New System.Drawing.Point(199, 101) + Me.cmdSign.Margin = New System.Windows.Forms.Padding(2) Me.cmdSign.Name = "cmdSign" - Me.cmdSign.Size = New System.Drawing.Size(63, 38) + Me.cmdSign.Size = New System.Drawing.Size(50, 30) Me.cmdSign.TabIndex = 147 Me.cmdSign.Text = "sign" Me.cmdSign.UseVisualStyleBackColor = True @@ -3112,10 +3233,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(192, 127) - Me.cmdRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRound.Location = New System.Drawing.Point(150, 101) + Me.cmdRound.Margin = New System.Windows.Forms.Padding(2) Me.cmdRound.Name = "cmdRound" - Me.cmdRound.Size = New System.Drawing.Size(63, 38) + Me.cmdRound.Size = New System.Drawing.Size(50, 30) Me.cmdRound.TabIndex = 146 Me.cmdRound.Text = "round" Me.cmdRound.UseVisualStyleBackColor = True @@ -3124,10 +3245,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(128, 127) - Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSiginf.Location = New System.Drawing.Point(100, 101) + Me.cmdSiginf.Margin = New System.Windows.Forms.Padding(2) Me.cmdSiginf.Name = "cmdSiginf" - Me.cmdSiginf.Size = New System.Drawing.Size(63, 38) + Me.cmdSiginf.Size = New System.Drawing.Size(50, 30) Me.cmdSiginf.TabIndex = 145 Me.cmdSiginf.Text = "siginf" Me.cmdSiginf.UseVisualStyleBackColor = True @@ -3135,10 +3256,10 @@ Partial Class ucrCalculator 'cmdAbs ' Me.cmdAbs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAbs.Location = New System.Drawing.Point(65, 127) - Me.cmdAbs.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAbs.Location = New System.Drawing.Point(51, 101) + Me.cmdAbs.Margin = New System.Windows.Forms.Padding(2) Me.cmdAbs.Name = "cmdAbs" - Me.cmdAbs.Size = New System.Drawing.Size(63, 38) + Me.cmdAbs.Size = New System.Drawing.Size(50, 30) Me.cmdAbs.TabIndex = 144 Me.cmdAbs.Text = "abs" Me.cmdAbs.UseVisualStyleBackColor = True @@ -3146,10 +3267,10 @@ Partial Class ucrCalculator 'cmdExp ' Me.cmdExp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExp.Location = New System.Drawing.Point(2, 127) - Me.cmdExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdExp.Location = New System.Drawing.Point(2, 101) + Me.cmdExp.Margin = New System.Windows.Forms.Padding(2) Me.cmdExp.Name = "cmdExp" - Me.cmdExp.Size = New System.Drawing.Size(63, 38) + Me.cmdExp.Size = New System.Drawing.Size(50, 30) Me.cmdExp.TabIndex = 143 Me.cmdExp.Text = "exp" Me.cmdExp.UseVisualStyleBackColor = True @@ -3157,10 +3278,10 @@ Partial Class ucrCalculator 'cmdDeg ' Me.cmdDeg.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDeg.Location = New System.Drawing.Point(253, 90) - Me.cmdDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDeg.Location = New System.Drawing.Point(199, 72) + Me.cmdDeg.Margin = New System.Windows.Forms.Padding(2) Me.cmdDeg.Name = "cmdDeg" - Me.cmdDeg.Size = New System.Drawing.Size(63, 38) + Me.cmdDeg.Size = New System.Drawing.Size(50, 30) Me.cmdDeg.TabIndex = 142 Me.cmdDeg.Text = "deg" Me.cmdDeg.UseVisualStyleBackColor = True @@ -3169,10 +3290,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(192, 90) - Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTrunc.Location = New System.Drawing.Point(150, 72) + Me.cmdTrunc.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrunc.Name = "cmdTrunc" - Me.cmdTrunc.Size = New System.Drawing.Size(63, 38) + Me.cmdTrunc.Size = New System.Drawing.Size(50, 30) Me.cmdTrunc.TabIndex = 141 Me.cmdTrunc.Text = "trunc" Me.cmdTrunc.UseVisualStyleBackColor = True @@ -3180,10 +3301,10 @@ Partial Class ucrCalculator 'cmdAtan ' Me.cmdAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAtan.Location = New System.Drawing.Point(128, 90) - Me.cmdAtan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAtan.Location = New System.Drawing.Point(100, 72) + Me.cmdAtan.Margin = New System.Windows.Forms.Padding(2) Me.cmdAtan.Name = "cmdAtan" - Me.cmdAtan.Size = New System.Drawing.Size(63, 38) + Me.cmdAtan.Size = New System.Drawing.Size(50, 30) Me.cmdAtan.TabIndex = 140 Me.cmdAtan.Text = "atan" Me.cmdAtan.UseVisualStyleBackColor = True @@ -3191,10 +3312,10 @@ Partial Class ucrCalculator 'cmdTan ' Me.cmdTan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTan.Location = New System.Drawing.Point(65, 90) - Me.cmdTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTan.Location = New System.Drawing.Point(51, 72) + Me.cmdTan.Margin = New System.Windows.Forms.Padding(2) Me.cmdTan.Name = "cmdTan" - Me.cmdTan.Size = New System.Drawing.Size(63, 38) + Me.cmdTan.Size = New System.Drawing.Size(50, 30) Me.cmdTan.TabIndex = 139 Me.cmdTan.Text = "tan" Me.cmdTan.UseVisualStyleBackColor = True @@ -3203,10 +3324,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(2, 90) - Me.cmdLogTen.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLogTen.Location = New System.Drawing.Point(2, 72) + Me.cmdLogTen.Margin = New System.Windows.Forms.Padding(2) Me.cmdLogTen.Name = "cmdLogTen" - Me.cmdLogTen.Size = New System.Drawing.Size(63, 38) + Me.cmdLogTen.Size = New System.Drawing.Size(50, 30) Me.cmdLogTen.TabIndex = 138 Me.cmdLogTen.Text = "log10" Me.cmdLogTen.UseVisualStyleBackColor = True @@ -3214,10 +3335,10 @@ Partial Class ucrCalculator 'cmdRad ' Me.cmdRad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRad.Location = New System.Drawing.Point(253, 53) - Me.cmdRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRad.Location = New System.Drawing.Point(199, 43) + Me.cmdRad.Margin = New System.Windows.Forms.Padding(2) Me.cmdRad.Name = "cmdRad" - Me.cmdRad.Size = New System.Drawing.Size(63, 38) + Me.cmdRad.Size = New System.Drawing.Size(50, 30) Me.cmdRad.TabIndex = 137 Me.cmdRad.Text = "rad" Me.cmdRad.UseVisualStyleBackColor = True @@ -3226,10 +3347,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(192, 53) - Me.cmdFloor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFloor.Location = New System.Drawing.Point(150, 43) + Me.cmdFloor.Margin = New System.Windows.Forms.Padding(2) Me.cmdFloor.Name = "cmdFloor" - Me.cmdFloor.Size = New System.Drawing.Size(63, 38) + Me.cmdFloor.Size = New System.Drawing.Size(50, 30) Me.cmdFloor.TabIndex = 136 Me.cmdFloor.Text = "floor" Me.cmdFloor.UseVisualStyleBackColor = True @@ -3237,10 +3358,10 @@ Partial Class ucrCalculator 'cmdAsin ' Me.cmdAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAsin.Location = New System.Drawing.Point(128, 53) - Me.cmdAsin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAsin.Location = New System.Drawing.Point(100, 43) + Me.cmdAsin.Margin = New System.Windows.Forms.Padding(2) Me.cmdAsin.Name = "cmdAsin" - Me.cmdAsin.Size = New System.Drawing.Size(63, 38) + Me.cmdAsin.Size = New System.Drawing.Size(50, 30) Me.cmdAsin.TabIndex = 135 Me.cmdAsin.Text = "asin" Me.cmdAsin.UseVisualStyleBackColor = True @@ -3248,10 +3369,10 @@ Partial Class ucrCalculator 'cmdSin ' Me.cmdSin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSin.Location = New System.Drawing.Point(65, 53) - Me.cmdSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSin.Location = New System.Drawing.Point(51, 43) + Me.cmdSin.Margin = New System.Windows.Forms.Padding(2) Me.cmdSin.Name = "cmdSin" - Me.cmdSin.Size = New System.Drawing.Size(63, 38) + Me.cmdSin.Size = New System.Drawing.Size(50, 30) Me.cmdSin.TabIndex = 134 Me.cmdSin.Text = "sin" Me.cmdSin.UseVisualStyleBackColor = True @@ -3259,10 +3380,10 @@ Partial Class ucrCalculator 'cmdLog ' Me.cmdLog.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLog.Location = New System.Drawing.Point(2, 53) - Me.cmdLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLog.Location = New System.Drawing.Point(2, 43) + Me.cmdLog.Margin = New System.Windows.Forms.Padding(2) Me.cmdLog.Name = "cmdLog" - Me.cmdLog.Size = New System.Drawing.Size(63, 38) + Me.cmdLog.Size = New System.Drawing.Size(50, 30) Me.cmdLog.TabIndex = 133 Me.cmdLog.Text = "log" Me.cmdLog.UseVisualStyleBackColor = True @@ -3270,10 +3391,10 @@ Partial Class ucrCalculator 'cmdPi ' Me.cmdPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPi.Location = New System.Drawing.Point(253, 18) - Me.cmdPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPi.Location = New System.Drawing.Point(199, 14) + Me.cmdPi.Margin = New System.Windows.Forms.Padding(2) Me.cmdPi.Name = "cmdPi" - Me.cmdPi.Size = New System.Drawing.Size(63, 38) + Me.cmdPi.Size = New System.Drawing.Size(50, 30) Me.cmdPi.TabIndex = 132 Me.cmdPi.Text = "pi" Me.cmdPi.UseVisualStyleBackColor = True @@ -3282,10 +3403,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(192, 18) - Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCeiling.Location = New System.Drawing.Point(150, 14) + Me.cmdCeiling.Margin = New System.Windows.Forms.Padding(2) Me.cmdCeiling.Name = "cmdCeiling" - Me.cmdCeiling.Size = New System.Drawing.Size(63, 38) + Me.cmdCeiling.Size = New System.Drawing.Size(50, 30) Me.cmdCeiling.TabIndex = 131 Me.cmdCeiling.Text = "ceiling" Me.cmdCeiling.UseVisualStyleBackColor = True @@ -3293,10 +3414,10 @@ Partial Class ucrCalculator 'cmdAcos ' Me.cmdAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAcos.Location = New System.Drawing.Point(128, 18) - Me.cmdAcos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAcos.Location = New System.Drawing.Point(100, 14) + Me.cmdAcos.Margin = New System.Windows.Forms.Padding(2) Me.cmdAcos.Name = "cmdAcos" - Me.cmdAcos.Size = New System.Drawing.Size(63, 38) + Me.cmdAcos.Size = New System.Drawing.Size(50, 30) Me.cmdAcos.TabIndex = 130 Me.cmdAcos.Text = "acos" Me.cmdAcos.UseVisualStyleBackColor = True @@ -3304,10 +3425,10 @@ Partial Class ucrCalculator 'cmdCos ' Me.cmdCos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCos.Location = New System.Drawing.Point(65, 18) - Me.cmdCos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCos.Location = New System.Drawing.Point(51, 14) + Me.cmdCos.Margin = New System.Windows.Forms.Padding(2) Me.cmdCos.Name = "cmdCos" - Me.cmdCos.Size = New System.Drawing.Size(63, 38) + Me.cmdCos.Size = New System.Drawing.Size(50, 30) Me.cmdCos.TabIndex = 129 Me.cmdCos.Text = "cos" Me.cmdCos.UseVisualStyleBackColor = True @@ -3315,10 +3436,10 @@ Partial Class ucrCalculator 'cmdSqrt ' Me.cmdSqrt.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSqrt.Location = New System.Drawing.Point(2, 18) - Me.cmdSqrt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSqrt.Location = New System.Drawing.Point(2, 14) + Me.cmdSqrt.Margin = New System.Windows.Forms.Padding(2) Me.cmdSqrt.Name = "cmdSqrt" - Me.cmdSqrt.Size = New System.Drawing.Size(63, 38) + Me.cmdSqrt.Size = New System.Drawing.Size(50, 30) Me.cmdSqrt.TabIndex = 128 Me.cmdSqrt.Text = "sqrt" Me.cmdSqrt.UseVisualStyleBackColor = True @@ -3359,11 +3480,11 @@ Partial Class ucrCalculator Me.grpSummary.Controls.Add(Me.cmdSum) Me.grpSummary.Controls.Add(Me.cmdVar) Me.grpSummary.Controls.Add(Me.grpFrequencies) - Me.grpSummary.Location = New System.Drawing.Point(542, 78) - Me.grpSummary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpSummary.Location = New System.Drawing.Point(434, 62) + Me.grpSummary.Margin = New System.Windows.Forms.Padding(2) Me.grpSummary.Name = "grpSummary" - Me.grpSummary.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpSummary.Size = New System.Drawing.Size(360, 421) + Me.grpSummary.Padding = New System.Windows.Forms.Padding(2) + Me.grpSummary.Size = New System.Drawing.Size(295, 337) Me.grpSummary.TabIndex = 185 Me.grpSummary.TabStop = False Me.grpSummary.Text = "Summary" @@ -3372,10 +3493,10 @@ Partial Class ucrCalculator ' Me.cmdwheremin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdwheremin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwheremin.Location = New System.Drawing.Point(269, 199) - Me.cmdwheremin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwheremin.Location = New System.Drawing.Point(215, 159) + Me.cmdwheremin.Margin = New System.Windows.Forms.Padding(2) Me.cmdwheremin.Name = "cmdwheremin" - Me.cmdwheremin.Size = New System.Drawing.Size(88, 38) + Me.cmdwheremin.Size = New System.Drawing.Size(70, 30) Me.cmdwheremin.TabIndex = 193 Me.cmdwheremin.Text = "where.min" Me.cmdwheremin.UseVisualStyleBackColor = True @@ -3383,10 +3504,10 @@ Partial Class ucrCalculator '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.Location = New System.Drawing.Point(2, 159) + Me.cmdwhichmax.Margin = New System.Windows.Forms.Padding(2) Me.cmdwhichmax.Name = "cmdwhichmax" - Me.cmdwhichmax.Size = New System.Drawing.Size(90, 38) + Me.cmdwhichmax.Size = New System.Drawing.Size(72, 30) Me.cmdwhichmax.TabIndex = 192 Me.cmdwhichmax.Text = "which.max" Me.cmdwhichmax.UseVisualStyleBackColor = True @@ -3394,10 +3515,10 @@ Partial Class ucrCalculator '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.Location = New System.Drawing.Point(73, 159) + Me.cmdwheremax.Margin = New System.Windows.Forms.Padding(2) Me.cmdwheremax.Name = "cmdwheremax" - Me.cmdwheremax.Size = New System.Drawing.Size(90, 38) + Me.cmdwheremax.Size = New System.Drawing.Size(72, 30) Me.cmdwheremax.TabIndex = 191 Me.cmdwheremax.Text = "where.max" Me.cmdwheremax.UseVisualStyleBackColor = True @@ -3406,10 +3527,10 @@ Partial Class ucrCalculator ' Me.cmdwhichmin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdwhichmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhichmin.Location = New System.Drawing.Point(180, 199) - Me.cmdwhichmin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdwhichmin.Location = New System.Drawing.Point(144, 159) + Me.cmdwhichmin.Margin = New System.Windows.Forms.Padding(2) Me.cmdwhichmin.Name = "cmdwhichmin" - Me.cmdwhichmin.Size = New System.Drawing.Size(90, 38) + Me.cmdwhichmin.Size = New System.Drawing.Size(72, 30) Me.cmdwhichmin.TabIndex = 190 Me.cmdwhichmin.Text = "which.min" Me.cmdwhichmin.UseVisualStyleBackColor = True @@ -3419,52 +3540,52 @@ 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(156, 148) + Me.ContextMenuStripSummary.Size = New System.Drawing.Size(136, 136) ' 'BaseToolStripMenuItem1 ' Me.BaseToolStripMenuItem1.Name = "BaseToolStripMenuItem1" - Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(155, 24) + Me.BaseToolStripMenuItem1.Size = New System.Drawing.Size(135, 22) Me.BaseToolStripMenuItem1.Text = "Base" ' 'StatsToolStripMenuItem ' Me.StatsToolStripMenuItem.Name = "StatsToolStripMenuItem" - Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.StatsToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.StatsToolStripMenuItem.Text = "Stats" ' 'StatipToolStripMenuItem ' Me.StatipToolStripMenuItem.Name = "StatipToolStripMenuItem" - Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.StatipToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.StatipToolStripMenuItem.Text = "Statip" ' 'E1071ToolStripMenuItem ' Me.E1071ToolStripMenuItem.Name = "E1071ToolStripMenuItem" - Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.E1071ToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.E1071ToolStripMenuItem.Text = "e1071" ' 'RobustbaseToolStripMenuItem ' Me.RobustbaseToolStripMenuItem.Name = "RobustbaseToolStripMenuItem" - Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.RobustbaseToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.RobustbaseToolStripMenuItem.Text = "Robustbase" ' 'RasterToolStripMenuItem ' Me.RasterToolStripMenuItem.Name = "RasterToolStripMenuItem" - Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(155, 24) + Me.RasterToolStripMenuItem.Size = New System.Drawing.Size(135, 22) Me.RasterToolStripMenuItem.Text = "Raster" ' 'cmdKurtosis ' Me.cmdKurtosis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdKurtosis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdKurtosis.Location = New System.Drawing.Point(287, 125) - Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdKurtosis.Location = New System.Drawing.Point(228, 101) + Me.cmdKurtosis.Margin = New System.Windows.Forms.Padding(2) Me.cmdKurtosis.Name = "cmdKurtosis" - Me.cmdKurtosis.Size = New System.Drawing.Size(70, 38) + Me.cmdKurtosis.Size = New System.Drawing.Size(56, 30) Me.cmdKurtosis.TabIndex = 182 Me.cmdKurtosis.Text = "kurtosis" Me.cmdKurtosis.UseVisualStyleBackColor = True @@ -3472,10 +3593,10 @@ Partial Class ucrCalculator 'cmdMode1 ' Me.cmdMode1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode1.Location = New System.Drawing.Point(287, 52) - Me.cmdMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMode1.Location = New System.Drawing.Point(228, 43) + Me.cmdMode1.Margin = New System.Windows.Forms.Padding(2) Me.cmdMode1.Name = "cmdMode1" - Me.cmdMode1.Size = New System.Drawing.Size(70, 38) + Me.cmdMode1.Size = New System.Drawing.Size(56, 30) Me.cmdMode1.TabIndex = 180 Me.cmdMode1.Text = "mode1" Me.cmdMode1.UseVisualStyleBackColor = True @@ -3483,10 +3604,10 @@ Partial Class ucrCalculator 'cmdMode ' Me.cmdMode.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMode.Location = New System.Drawing.Point(218, 52) - Me.cmdMode.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMode.Location = New System.Drawing.Point(173, 43) + Me.cmdMode.Margin = New System.Windows.Forms.Padding(2) Me.cmdMode.Name = "cmdMode" - Me.cmdMode.Size = New System.Drawing.Size(70, 38) + Me.cmdMode.Size = New System.Drawing.Size(56, 30) Me.cmdMode.TabIndex = 179 Me.cmdMode.Text = "mode" Me.cmdMode.UseVisualStyleBackColor = True @@ -3494,10 +3615,10 @@ Partial Class ucrCalculator 'cmdFirst ' Me.cmdFirst.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFirst.Location = New System.Drawing.Point(148, 162) - Me.cmdFirst.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFirst.Location = New System.Drawing.Point(118, 130) + Me.cmdFirst.Margin = New System.Windows.Forms.Padding(2) Me.cmdFirst.Name = "cmdFirst" - Me.cmdFirst.Size = New System.Drawing.Size(70, 38) + Me.cmdFirst.Size = New System.Drawing.Size(56, 30) Me.cmdFirst.TabIndex = 178 Me.cmdFirst.Text = "first" Me.cmdFirst.UseVisualStyleBackColor = True @@ -3505,10 +3626,10 @@ Partial Class ucrCalculator 'cmdLast ' Me.cmdLast.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLast.Location = New System.Drawing.Point(218, 162) - Me.cmdLast.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLast.Location = New System.Drawing.Point(173, 130) + Me.cmdLast.Margin = New System.Windows.Forms.Padding(2) Me.cmdLast.Name = "cmdLast" - Me.cmdLast.Size = New System.Drawing.Size(70, 38) + Me.cmdLast.Size = New System.Drawing.Size(56, 30) Me.cmdLast.TabIndex = 177 Me.cmdLast.Text = "last" Me.cmdLast.UseVisualStyleBackColor = True @@ -3516,10 +3637,10 @@ Partial Class ucrCalculator 'cmdnth ' Me.cmdnth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnth.Location = New System.Drawing.Point(287, 162) - Me.cmdnth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdnth.Location = New System.Drawing.Point(228, 130) + Me.cmdnth.Margin = New System.Windows.Forms.Padding(2) Me.cmdnth.Name = "cmdnth" - Me.cmdnth.Size = New System.Drawing.Size(70, 38) + Me.cmdnth.Size = New System.Drawing.Size(56, 30) Me.cmdnth.TabIndex = 176 Me.cmdnth.Text = "nth" Me.cmdnth.UseVisualStyleBackColor = True @@ -3527,10 +3648,10 @@ Partial Class ucrCalculator 'cmdCor ' Me.cmdCor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCor.Location = New System.Drawing.Point(2, 236) - Me.cmdCor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCor.Location = New System.Drawing.Point(2, 188) + Me.cmdCor.Margin = New System.Windows.Forms.Padding(2) Me.cmdCor.Name = "cmdCor" - Me.cmdCor.Size = New System.Drawing.Size(78, 38) + Me.cmdCor.Size = New System.Drawing.Size(62, 30) Me.cmdCor.TabIndex = 175 Me.cmdCor.Text = "cor" Me.cmdCor.UseVisualStyleBackColor = True @@ -3538,10 +3659,10 @@ Partial Class ucrCalculator 'cmdCov ' Me.cmdCov.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCov.Location = New System.Drawing.Point(79, 236) - Me.cmdCov.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCov.Location = New System.Drawing.Point(63, 188) + Me.cmdCov.Margin = New System.Windows.Forms.Padding(2) Me.cmdCov.Name = "cmdCov" - Me.cmdCov.Size = New System.Drawing.Size(70, 38) + Me.cmdCov.Size = New System.Drawing.Size(56, 30) Me.cmdCov.TabIndex = 174 Me.cmdCov.Text = "cov" Me.cmdCov.UseVisualStyleBackColor = True @@ -3550,10 +3671,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(218, 88) - Me.cmdMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMad.Location = New System.Drawing.Point(173, 72) + Me.cmdMad.Margin = New System.Windows.Forms.Padding(2) Me.cmdMad.Name = "cmdMad" - Me.cmdMad.Size = New System.Drawing.Size(70, 38) + Me.cmdMad.Size = New System.Drawing.Size(56, 30) Me.cmdMad.TabIndex = 173 Me.cmdMad.Text = "mad" Me.cmdMad.UseVisualStyleBackColor = True @@ -3562,10 +3683,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(148, 125) - Me.cmdMc.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMc.Location = New System.Drawing.Point(118, 101) + Me.cmdMc.Margin = New System.Windows.Forms.Padding(2) Me.cmdMc.Name = "cmdMc" - Me.cmdMc.Size = New System.Drawing.Size(70, 38) + Me.cmdMc.Size = New System.Drawing.Size(56, 30) Me.cmdMc.TabIndex = 172 Me.cmdMc.Text = "mc" Me.cmdMc.UseVisualStyleBackColor = True @@ -3574,10 +3695,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(80, 162) - Me.cmdPropn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPropn.Location = New System.Drawing.Point(63, 130) + Me.cmdPropn.Margin = New System.Windows.Forms.Padding(2) Me.cmdPropn.Name = "cmdPropn" - Me.cmdPropn.Size = New System.Drawing.Size(70, 38) + Me.cmdPropn.Size = New System.Drawing.Size(56, 30) Me.cmdPropn.TabIndex = 171 Me.cmdPropn.Text = "propn" Me.cmdPropn.UseVisualStyleBackColor = True @@ -3586,10 +3707,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(80, 125) - Me.cmdCv.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCv.Location = New System.Drawing.Point(63, 101) + Me.cmdCv.Margin = New System.Windows.Forms.Padding(2) Me.cmdCv.Name = "cmdCv" - Me.cmdCv.Size = New System.Drawing.Size(70, 38) + Me.cmdCv.Size = New System.Drawing.Size(56, 30) Me.cmdCv.TabIndex = 170 Me.cmdCv.Text = "cv" Me.cmdCv.UseVisualStyleBackColor = True @@ -3598,10 +3719,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(218, 125) - Me.cmdSkew.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSkew.Location = New System.Drawing.Point(173, 101) + Me.cmdSkew.Margin = New System.Windows.Forms.Padding(2) Me.cmdSkew.Name = "cmdSkew" - Me.cmdSkew.Size = New System.Drawing.Size(70, 38) + Me.cmdSkew.Size = New System.Drawing.Size(56, 30) Me.cmdSkew.TabIndex = 169 Me.cmdSkew.Text = "skew" Me.cmdSkew.UseVisualStyleBackColor = True @@ -3610,10 +3731,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(2, 162) - Me.cmdAnyDup.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAnyDup.Location = New System.Drawing.Point(2, 130) + Me.cmdAnyDup.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnyDup.Name = "cmdAnyDup" - Me.cmdAnyDup.Size = New System.Drawing.Size(78, 38) + Me.cmdAnyDup.Size = New System.Drawing.Size(62, 30) Me.cmdAnyDup.TabIndex = 168 Me.cmdAnyDup.Text = "anyDup" Me.cmdAnyDup.UseVisualStyleBackColor = True @@ -3621,10 +3742,10 @@ Partial Class ucrCalculator 'cmdDistinct ' Me.cmdDistinct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDistinct.Location = New System.Drawing.Point(2, 125) - Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDistinct.Location = New System.Drawing.Point(2, 101) + Me.cmdDistinct.Margin = New System.Windows.Forms.Padding(2) Me.cmdDistinct.Name = "cmdDistinct" - Me.cmdDistinct.Size = New System.Drawing.Size(78, 38) + Me.cmdDistinct.Size = New System.Drawing.Size(62, 30) Me.cmdDistinct.TabIndex = 167 Me.cmdDistinct.Text = "distinct" Me.cmdDistinct.UseVisualStyleBackColor = True @@ -3632,10 +3753,10 @@ Partial Class ucrCalculator 'cmdNonMiss ' Me.cmdNonMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNonMiss.Location = New System.Drawing.Point(2, 88) - Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdNonMiss.Location = New System.Drawing.Point(2, 72) + Me.cmdNonMiss.Margin = New System.Windows.Forms.Padding(2) Me.cmdNonMiss.Name = "cmdNonMiss" - Me.cmdNonMiss.Size = New System.Drawing.Size(78, 38) + Me.cmdNonMiss.Size = New System.Drawing.Size(62, 30) Me.cmdNonMiss.TabIndex = 166 Me.cmdNonMiss.Text = "non miss" Me.cmdNonMiss.UseVisualStyleBackColor = True @@ -3644,10 +3765,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(287, 88) - Me.cmdIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdIQR.Location = New System.Drawing.Point(228, 72) + Me.cmdIQR.Margin = New System.Windows.Forms.Padding(2) Me.cmdIQR.Name = "cmdIQR" - Me.cmdIQR.Size = New System.Drawing.Size(70, 38) + Me.cmdIQR.Size = New System.Drawing.Size(56, 30) Me.cmdIQR.TabIndex = 165 Me.cmdIQR.Text = "IQR" Me.cmdIQR.UseVisualStyleBackColor = True @@ -3656,10 +3777,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(148, 236) - Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQuantile.Location = New System.Drawing.Point(118, 188) + Me.cmdQuantile.Margin = New System.Windows.Forms.Padding(2) Me.cmdQuantile.Name = "cmdQuantile" - Me.cmdQuantile.Size = New System.Drawing.Size(70, 38) + Me.cmdQuantile.Size = New System.Drawing.Size(56, 30) Me.cmdQuantile.TabIndex = 164 Me.cmdQuantile.Text = "quantile" Me.cmdQuantile.UseVisualStyleBackColor = True @@ -3668,10 +3789,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(287, 17) - Me.cmdRange.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRange.Location = New System.Drawing.Point(228, 14) + Me.cmdRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdRange.Name = "cmdRange" - Me.cmdRange.Size = New System.Drawing.Size(70, 38) + Me.cmdRange.Size = New System.Drawing.Size(56, 30) Me.cmdRange.TabIndex = 163 Me.cmdRange.Text = "range" Me.cmdRange.UseVisualStyleBackColor = True @@ -3679,10 +3800,10 @@ Partial Class ucrCalculator 'cmdSd ' Me.cmdSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSd.Location = New System.Drawing.Point(148, 88) - Me.cmdSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSd.Location = New System.Drawing.Point(118, 72) + Me.cmdSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdSd.Name = "cmdSd" - Me.cmdSd.Size = New System.Drawing.Size(70, 38) + Me.cmdSd.Size = New System.Drawing.Size(56, 30) Me.cmdSd.TabIndex = 160 Me.cmdSd.Text = "sd" Me.cmdSd.UseVisualStyleBackColor = True @@ -3691,10 +3812,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(148, 52) - Me.cmdMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMedian.Location = New System.Drawing.Point(118, 43) + Me.cmdMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdMedian.Name = "cmdMedian" - Me.cmdMedian.Size = New System.Drawing.Size(70, 38) + Me.cmdMedian.Size = New System.Drawing.Size(56, 30) Me.cmdMedian.TabIndex = 158 Me.cmdMedian.Text = "median" Me.cmdMedian.UseVisualStyleBackColor = True @@ -3702,10 +3823,10 @@ Partial Class ucrCalculator 'cmdMin ' Me.cmdMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMin.Location = New System.Drawing.Point(148, 17) - Me.cmdMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMin.Location = New System.Drawing.Point(118, 14) + Me.cmdMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdMin.Name = "cmdMin" - Me.cmdMin.Size = New System.Drawing.Size(70, 38) + Me.cmdMin.Size = New System.Drawing.Size(56, 30) Me.cmdMin.TabIndex = 155 Me.cmdMin.Text = "min" Me.cmdMin.UseVisualStyleBackColor = True @@ -3713,10 +3834,10 @@ Partial Class ucrCalculator 'cmdMax ' Me.cmdMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMax.Location = New System.Drawing.Point(218, 17) - Me.cmdMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMax.Location = New System.Drawing.Point(173, 14) + Me.cmdMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdMax.Name = "cmdMax" - Me.cmdMax.Size = New System.Drawing.Size(70, 38) + Me.cmdMax.Size = New System.Drawing.Size(56, 30) Me.cmdMax.TabIndex = 154 Me.cmdMax.Text = "max" Me.cmdMax.UseVisualStyleBackColor = True @@ -3725,10 +3846,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(80, 52) - Me.cmdMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMean.Location = New System.Drawing.Point(63, 43) + Me.cmdMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdMean.Name = "cmdMean" - Me.cmdMean.Size = New System.Drawing.Size(70, 38) + Me.cmdMean.Size = New System.Drawing.Size(56, 30) Me.cmdMean.TabIndex = 153 Me.cmdMean.Text = "mean" Me.cmdMean.UseVisualStyleBackColor = True @@ -3736,10 +3857,10 @@ Partial Class ucrCalculator 'cmdMiss ' Me.cmdMiss.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMiss.Location = New System.Drawing.Point(2, 52) - Me.cmdMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMiss.Location = New System.Drawing.Point(2, 43) + Me.cmdMiss.Margin = New System.Windows.Forms.Padding(2) Me.cmdMiss.Name = "cmdMiss" - Me.cmdMiss.Size = New System.Drawing.Size(78, 38) + Me.cmdMiss.Size = New System.Drawing.Size(62, 30) Me.cmdMiss.TabIndex = 149 Me.cmdMiss.Text = "miss" Me.cmdMiss.UseVisualStyleBackColor = True @@ -3748,10 +3869,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(2, 17) - Me.cmdLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLength.Location = New System.Drawing.Point(2, 14) + Me.cmdLength.Margin = New System.Windows.Forms.Padding(2) Me.cmdLength.Name = "cmdLength" - Me.cmdLength.Size = New System.Drawing.Size(78, 38) + Me.cmdLength.Size = New System.Drawing.Size(62, 30) Me.cmdLength.TabIndex = 148 Me.cmdLength.Text = "length" Me.cmdLength.UseVisualStyleBackColor = True @@ -3759,10 +3880,10 @@ Partial Class ucrCalculator 'cmdSum ' Me.cmdSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSum.Location = New System.Drawing.Point(80, 17) - Me.cmdSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSum.Location = New System.Drawing.Point(63, 14) + Me.cmdSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdSum.Name = "cmdSum" - Me.cmdSum.Size = New System.Drawing.Size(70, 38) + Me.cmdSum.Size = New System.Drawing.Size(56, 30) Me.cmdSum.TabIndex = 150 Me.cmdSum.Text = "sum" Me.cmdSum.UseVisualStyleBackColor = True @@ -3770,10 +3891,10 @@ Partial Class ucrCalculator 'cmdVar ' Me.cmdVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdVar.Location = New System.Drawing.Point(80, 88) - Me.cmdVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdVar.Location = New System.Drawing.Point(63, 72) + Me.cmdVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdVar.Name = "cmdVar" - Me.cmdVar.Size = New System.Drawing.Size(70, 38) + Me.cmdVar.Size = New System.Drawing.Size(56, 30) Me.cmdVar.TabIndex = 159 Me.cmdVar.Text = "var" Me.cmdVar.UseVisualStyleBackColor = True @@ -3795,9 +3916,11 @@ 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, 283) + Me.grpFrequencies.Location = New System.Drawing.Point(2, 226) + Me.grpFrequencies.Margin = New System.Windows.Forms.Padding(2) Me.grpFrequencies.Name = "grpFrequencies" - Me.grpFrequencies.Size = New System.Drawing.Size(353, 133) + Me.grpFrequencies.Padding = New System.Windows.Forms.Padding(2) + Me.grpFrequencies.Size = New System.Drawing.Size(286, 106) Me.grpFrequencies.TabIndex = 184 Me.grpFrequencies.TabStop = False Me.grpFrequencies.Text = "Frequencies" @@ -3806,10 +3929,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(282, 90) - Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqQuantile.Location = New System.Drawing.Point(228, 72) + Me.cmdFreqQuantile.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqQuantile.Name = "cmdFreqQuantile" - Me.cmdFreqQuantile.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqQuantile.Size = New System.Drawing.Size(58, 30) Me.cmdFreqQuantile.TabIndex = 186 Me.cmdFreqQuantile.Text = "quantile" Me.cmdFreqQuantile.UseVisualStyleBackColor = True @@ -3818,10 +3941,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(212, 90) - Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqPropn.Location = New System.Drawing.Point(171, 72) + Me.cmdFreqPropn.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqPropn.Name = "cmdFreqPropn" - Me.cmdFreqPropn.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqPropn.Size = New System.Drawing.Size(58, 30) Me.cmdFreqPropn.TabIndex = 185 Me.cmdFreqPropn.Text = "propn" Me.cmdFreqPropn.UseVisualStyleBackColor = True @@ -3830,10 +3953,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(142, 90) - Me.cmdFreqDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqDistinct.Location = New System.Drawing.Point(114, 72) + Me.cmdFreqDistinct.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqDistinct.Name = "cmdFreqDistinct" - Me.cmdFreqDistinct.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqDistinct.Size = New System.Drawing.Size(58, 30) Me.cmdFreqDistinct.TabIndex = 184 Me.cmdFreqDistinct.Text = "distinct" Me.cmdFreqDistinct.UseVisualStyleBackColor = True @@ -3842,10 +3965,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(70, 90) - Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqIQR.Location = New System.Drawing.Point(57, 72) + Me.cmdFreqIQR.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqIQR.Name = "cmdFreqIQR" - Me.cmdFreqIQR.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqIQR.Size = New System.Drawing.Size(58, 30) Me.cmdFreqIQR.TabIndex = 183 Me.cmdFreqIQR.Text = "IQR" Me.cmdFreqIQR.UseVisualStyleBackColor = True @@ -3854,10 +3977,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(142, 53) - Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMedian.Location = New System.Drawing.Point(114, 43) + Me.cmdFreqMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMedian.Name = "cmdFreqMedian" - Me.cmdFreqMedian.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMedian.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMedian.TabIndex = 182 Me.cmdFreqMedian.Text = "median" Me.cmdFreqMedian.UseVisualStyleBackColor = True @@ -3866,10 +3989,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(282, 53) - Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqSd.Location = New System.Drawing.Point(228, 43) + Me.cmdFreqSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqSd.Name = "cmdFreqSd" - Me.cmdFreqSd.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqSd.Size = New System.Drawing.Size(58, 30) Me.cmdFreqSd.TabIndex = 181 Me.cmdFreqSd.Text = "sd" Me.cmdFreqSd.UseVisualStyleBackColor = True @@ -3878,10 +4001,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(212, 53) - Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqVar.Location = New System.Drawing.Point(171, 43) + Me.cmdFreqVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqVar.Name = "cmdFreqVar" - Me.cmdFreqVar.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqVar.Size = New System.Drawing.Size(58, 30) Me.cmdFreqVar.TabIndex = 180 Me.cmdFreqVar.Text = "var" Me.cmdFreqVar.UseVisualStyleBackColor = True @@ -3890,10 +4013,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(70, 53) - Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMean.Location = New System.Drawing.Point(57, 43) + Me.cmdFreqMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMean.Name = "cmdFreqMean" - Me.cmdFreqMean.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMean.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMean.TabIndex = 179 Me.cmdFreqMean.Text = "mean" Me.cmdFreqMean.UseVisualStyleBackColor = True @@ -3902,10 +4025,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, 90) - Me.cmdFreqMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMad.Location = New System.Drawing.Point(0, 72) + Me.cmdFreqMad.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMad.Name = "cmdFreqMad" - Me.cmdFreqMad.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMad.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMad.TabIndex = 178 Me.cmdFreqMad.Text = "mad" Me.cmdFreqMad.UseVisualStyleBackColor = True @@ -3914,10 +4037,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, 53) - Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMiss.Location = New System.Drawing.Point(0, 43) + Me.cmdFreqMiss.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMiss.Name = "cmdFreqMiss" - Me.cmdFreqMiss.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMiss.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMiss.TabIndex = 177 Me.cmdFreqMiss.Text = "miss" Me.cmdFreqMiss.UseVisualStyleBackColor = True @@ -3926,10 +4049,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(282, 18) - Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMode1.Location = New System.Drawing.Point(228, 14) + Me.cmdFreqMode1.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMode1.Name = "cmdFreqMode1" - Me.cmdFreqMode1.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMode1.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMode1.TabIndex = 176 Me.cmdFreqMode1.Text = "mode1" Me.cmdFreqMode1.UseVisualStyleBackColor = True @@ -3938,10 +4061,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(212, 18) - Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMax.Location = New System.Drawing.Point(171, 14) + Me.cmdFreqMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMax.Name = "cmdFreqMax" - Me.cmdFreqMax.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMax.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMax.TabIndex = 175 Me.cmdFreqMax.Text = "max" Me.cmdFreqMax.UseVisualStyleBackColor = True @@ -3950,10 +4073,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(142, 18) - Me.cmdFreqMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqMin.Location = New System.Drawing.Point(114, 14) + Me.cmdFreqMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqMin.Name = "cmdFreqMin" - Me.cmdFreqMin.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqMin.Size = New System.Drawing.Size(58, 30) Me.cmdFreqMin.TabIndex = 174 Me.cmdFreqMin.Text = "min" Me.cmdFreqMin.UseVisualStyleBackColor = True @@ -3962,10 +4085,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(70, 18) - Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqSum.Location = New System.Drawing.Point(57, 14) + Me.cmdFreqSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqSum.Name = "cmdFreqSum" - Me.cmdFreqSum.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqSum.Size = New System.Drawing.Size(58, 30) Me.cmdFreqSum.TabIndex = 173 Me.cmdFreqSum.Text = "sum" Me.cmdFreqSum.UseVisualStyleBackColor = True @@ -3974,10 +4097,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, 18) - Me.cmdFreqLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFreqLength.Location = New System.Drawing.Point(0, 14) + Me.cmdFreqLength.Margin = New System.Windows.Forms.Padding(2) Me.cmdFreqLength.Name = "cmdFreqLength" - Me.cmdFreqLength.Size = New System.Drawing.Size(72, 38) + Me.cmdFreqLength.Size = New System.Drawing.Size(58, 30) Me.cmdFreqLength.TabIndex = 172 Me.cmdFreqLength.Text = "length" Me.cmdFreqLength.UseVisualStyleBackColor = True @@ -4017,9 +4140,11 @@ 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(542, 78) + Me.grpProbabilty.Location = New System.Drawing.Point(434, 62) + Me.grpProbabilty.Margin = New System.Windows.Forms.Padding(2) Me.grpProbabilty.Name = "grpProbabilty" - Me.grpProbabilty.Size = New System.Drawing.Size(395, 402) + Me.grpProbabilty.Padding = New System.Windows.Forms.Padding(2) + Me.grpProbabilty.Size = New System.Drawing.Size(316, 322) Me.grpProbabilty.TabIndex = 187 Me.grpProbabilty.TabStop = False Me.grpProbabilty.Text = "Probability" @@ -4028,10 +4153,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(2, 237) - Me.cmdPascal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPascal.Location = New System.Drawing.Point(2, 188) + Me.cmdPascal.Margin = New System.Windows.Forms.Padding(2) Me.cmdPascal.Name = "cmdPascal" - Me.cmdPascal.Size = New System.Drawing.Size(78, 38) + Me.cmdPascal.Size = New System.Drawing.Size(62, 30) Me.cmdPascal.TabIndex = 213 Me.cmdPascal.Text = "pascal" Me.cmdPascal.UseVisualStyleBackColor = True @@ -4041,18 +4166,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(110, 52) + Me.ContextMenuStripProbability.Size = New System.Drawing.Size(99, 48) ' 'ProbStatsToolStripMenuItem ' Me.ProbStatsToolStripMenuItem.Name = "ProbStatsToolStripMenuItem" - Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(109, 24) + Me.ProbStatsToolStripMenuItem.Size = New System.Drawing.Size(98, 22) Me.ProbStatsToolStripMenuItem.Text = "stats" ' 'ProbBaseToolStripMenuItem ' Me.ProbBaseToolStripMenuItem.Name = "ProbBaseToolStripMenuItem" - Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 24) + Me.ProbBaseToolStripMenuItem.Size = New System.Drawing.Size(98, 22) Me.ProbBaseToolStripMenuItem.Text = "base" ' 'grpRandom @@ -4067,21 +4192,23 @@ 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(8, 285) + Me.grpRandom.Location = New System.Drawing.Point(6, 228) + Me.grpRandom.Margin = New System.Windows.Forms.Padding(2) Me.grpRandom.Name = "grpRandom" - Me.grpRandom.Size = New System.Drawing.Size(382, 105) + Me.grpRandom.Padding = New System.Windows.Forms.Padding(2) + Me.grpRandom.Size = New System.Drawing.Size(306, 84) Me.grpRandom.TabIndex = 199 Me.grpRandom.TabStop = False - Me.grpRandom.Text = "Random" + Me.grpRandom.Text = "Random Samples" ' 'cmdnbinomial ' 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(145, 53) - Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdnbinomial.Location = New System.Drawing.Point(116, 43) + Me.cmdnbinomial.Margin = New System.Windows.Forms.Padding(2) Me.cmdnbinomial.Name = "cmdnbinomial" - Me.cmdnbinomial.Size = New System.Drawing.Size(90, 38) + Me.cmdnbinomial.Size = New System.Drawing.Size(72, 30) Me.cmdnbinomial.TabIndex = 182 Me.cmdnbinomial.Text = "nbinomial" Me.cmdnbinomial.UseVisualStyleBackColor = True @@ -4090,10 +4217,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(303, 53) - Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRan_sample.Location = New System.Drawing.Point(244, 43) + Me.cmdRan_sample.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_sample.Name = "cmdRan_sample" - Me.cmdRan_sample.Size = New System.Drawing.Size(72, 38) + Me.cmdRan_sample.Size = New System.Drawing.Size(58, 30) Me.cmdRan_sample.TabIndex = 181 Me.cmdRan_sample.Text = "sample" Me.cmdRan_sample.UseVisualStyleBackColor = True @@ -4102,10 +4229,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(233, 53) - Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRan_beta.Location = New System.Drawing.Point(187, 43) + Me.cmdRan_beta.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_beta.Name = "cmdRan_beta" - Me.cmdRan_beta.Size = New System.Drawing.Size(72, 38) + Me.cmdRan_beta.Size = New System.Drawing.Size(58, 30) Me.cmdRan_beta.TabIndex = 180 Me.cmdRan_beta.Text = "beta" Me.cmdRan_beta.UseVisualStyleBackColor = True @@ -4114,10 +4241,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(73, 53) - Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRan_gamma.Location = New System.Drawing.Point(59, 43) + Me.cmdRan_gamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_gamma.Name = "cmdRan_gamma" - Me.cmdRan_gamma.Size = New System.Drawing.Size(72, 38) + Me.cmdRan_gamma.Size = New System.Drawing.Size(58, 30) Me.cmdRan_gamma.TabIndex = 179 Me.cmdRan_gamma.Text = "gamma" Me.cmdRan_gamma.UseVisualStyleBackColor = True @@ -4126,10 +4253,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(3, 53) - Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdpoisson.Location = New System.Drawing.Point(2, 43) + Me.cmdpoisson.Margin = New System.Windows.Forms.Padding(2) Me.cmdpoisson.Name = "cmdpoisson" - Me.cmdpoisson.Size = New System.Drawing.Size(72, 38) + Me.cmdpoisson.Size = New System.Drawing.Size(58, 30) Me.cmdpoisson.TabIndex = 177 Me.cmdpoisson.Text = "poisson" Me.cmdpoisson.UseVisualStyleBackColor = True @@ -4138,10 +4265,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(303, 18) - Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdbinomial.Location = New System.Drawing.Point(244, 14) + Me.cmdbinomial.Margin = New System.Windows.Forms.Padding(2) Me.cmdbinomial.Name = "cmdbinomial" - Me.cmdbinomial.Size = New System.Drawing.Size(72, 38) + Me.cmdbinomial.Size = New System.Drawing.Size(58, 30) Me.cmdbinomial.TabIndex = 176 Me.cmdbinomial.Text = "binomial" Me.cmdbinomial.UseVisualStyleBackColor = True @@ -4150,10 +4277,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(233, 18) - Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdbernoulli.Location = New System.Drawing.Point(187, 14) + Me.cmdbernoulli.Margin = New System.Windows.Forms.Padding(2) Me.cmdbernoulli.Name = "cmdbernoulli" - Me.cmdbernoulli.Size = New System.Drawing.Size(72, 38) + Me.cmdbernoulli.Size = New System.Drawing.Size(58, 30) Me.cmdbernoulli.TabIndex = 175 Me.cmdbernoulli.Text = "bernoulli" Me.cmdbernoulli.UseVisualStyleBackColor = True @@ -4162,10 +4289,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(145, 18) - Me.cmduni_integer.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmduni_integer.Location = New System.Drawing.Point(116, 14) + Me.cmduni_integer.Margin = New System.Windows.Forms.Padding(2) Me.cmduni_integer.Name = "cmduni_integer" - Me.cmduni_integer.Size = New System.Drawing.Size(90, 38) + Me.cmduni_integer.Size = New System.Drawing.Size(72, 30) Me.cmduni_integer.TabIndex = 174 Me.cmduni_integer.Text = "uni_integer" Me.cmduni_integer.UseVisualStyleBackColor = True @@ -4174,10 +4301,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(73, 18) - Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRan_normal.Location = New System.Drawing.Point(59, 14) + Me.cmdRan_normal.Margin = New System.Windows.Forms.Padding(2) Me.cmdRan_normal.Name = "cmdRan_normal" - Me.cmdRan_normal.Size = New System.Drawing.Size(72, 38) + Me.cmdRan_normal.Size = New System.Drawing.Size(58, 30) Me.cmdRan_normal.TabIndex = 173 Me.cmdRan_normal.Text = "normal" Me.cmdRan_normal.UseVisualStyleBackColor = True @@ -4186,10 +4313,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(3, 18) - Me.cmduniform.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmduniform.Location = New System.Drawing.Point(2, 14) + Me.cmduniform.Margin = New System.Windows.Forms.Padding(2) Me.cmduniform.Name = "cmduniform" - Me.cmduniform.Size = New System.Drawing.Size(72, 38) + Me.cmduniform.Size = New System.Drawing.Size(58, 30) Me.cmduniform.TabIndex = 172 Me.cmduniform.Text = "uniform" Me.cmduniform.UseVisualStyleBackColor = True @@ -4198,10 +4325,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(308, 128) - Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQnbin.Location = New System.Drawing.Point(246, 101) + Me.cmdQnbin.Margin = New System.Windows.Forms.Padding(2) Me.cmdQnbin.Name = "cmdQnbin" - Me.cmdQnbin.Size = New System.Drawing.Size(78, 38) + Me.cmdQnbin.Size = New System.Drawing.Size(62, 30) Me.cmdQnbin.TabIndex = 176 Me.cmdQnbin.Text = "qnbin" Me.cmdQnbin.UseVisualStyleBackColor = True @@ -4210,10 +4337,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(232, 128) - Me.cmdQpois.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQpois.Location = New System.Drawing.Point(185, 101) + Me.cmdQpois.Margin = New System.Windows.Forms.Padding(2) Me.cmdQpois.Name = "cmdQpois" - Me.cmdQpois.Size = New System.Drawing.Size(78, 38) + Me.cmdQpois.Size = New System.Drawing.Size(62, 30) Me.cmdQpois.TabIndex = 175 Me.cmdQpois.Text = "qpois" Me.cmdQpois.UseVisualStyleBackColor = True @@ -4222,10 +4349,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(155, 128) - Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQbinom.Location = New System.Drawing.Point(124, 101) + Me.cmdQbinom.Margin = New System.Windows.Forms.Padding(2) Me.cmdQbinom.Name = "cmdQbinom" - Me.cmdQbinom.Size = New System.Drawing.Size(78, 38) + Me.cmdQbinom.Size = New System.Drawing.Size(62, 30) Me.cmdQbinom.TabIndex = 174 Me.cmdQbinom.Text = "qbinom" Me.cmdQbinom.UseVisualStyleBackColor = True @@ -4234,10 +4361,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(78, 128) - Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQbirth.Location = New System.Drawing.Point(63, 101) + Me.cmdQbirth.Margin = New System.Windows.Forms.Padding(2) Me.cmdQbirth.Name = "cmdQbirth" - Me.cmdQbirth.Size = New System.Drawing.Size(78, 38) + Me.cmdQbirth.Size = New System.Drawing.Size(62, 30) Me.cmdQbirth.TabIndex = 173 Me.cmdQbirth.Text = "qbirth" Me.cmdQbirth.UseVisualStyleBackColor = True @@ -4246,10 +4373,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(2, 128) - Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQbeta.Location = New System.Drawing.Point(2, 101) + Me.cmdQbeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdQbeta.Name = "cmdQbeta" - Me.cmdQbeta.Size = New System.Drawing.Size(78, 38) + Me.cmdQbeta.Size = New System.Drawing.Size(62, 30) Me.cmdQbeta.TabIndex = 172 Me.cmdQbeta.Text = "qbeta" Me.cmdQbeta.UseVisualStyleBackColor = True @@ -4258,10 +4385,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(308, 92) - Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPnbin.Location = New System.Drawing.Point(246, 72) + Me.cmdPnbin.Margin = New System.Windows.Forms.Padding(2) Me.cmdPnbin.Name = "cmdPnbin" - Me.cmdPnbin.Size = New System.Drawing.Size(78, 38) + Me.cmdPnbin.Size = New System.Drawing.Size(62, 30) Me.cmdPnbin.TabIndex = 171 Me.cmdPnbin.Text = "pnbin" Me.cmdPnbin.UseVisualStyleBackColor = True @@ -4270,10 +4397,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(232, 92) - Me.cmdPpois.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPpois.Location = New System.Drawing.Point(185, 72) + Me.cmdPpois.Margin = New System.Windows.Forms.Padding(2) Me.cmdPpois.Name = "cmdPpois" - Me.cmdPpois.Size = New System.Drawing.Size(78, 38) + Me.cmdPpois.Size = New System.Drawing.Size(62, 30) Me.cmdPpois.TabIndex = 170 Me.cmdPpois.Text = "ppois" Me.cmdPpois.UseVisualStyleBackColor = True @@ -4282,10 +4409,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(155, 92) - Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPbinom.Location = New System.Drawing.Point(124, 72) + Me.cmdPbinom.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbinom.Name = "cmdPbinom" - Me.cmdPbinom.Size = New System.Drawing.Size(78, 38) + Me.cmdPbinom.Size = New System.Drawing.Size(62, 30) Me.cmdPbinom.TabIndex = 169 Me.cmdPbinom.Text = "pbinom" Me.cmdPbinom.UseVisualStyleBackColor = True @@ -4294,10 +4421,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(78, 92) - Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPbirth.Location = New System.Drawing.Point(63, 72) + Me.cmdPbirth.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbirth.Name = "cmdPbirth" - Me.cmdPbirth.Size = New System.Drawing.Size(78, 38) + Me.cmdPbirth.Size = New System.Drawing.Size(62, 30) Me.cmdPbirth.TabIndex = 168 Me.cmdPbirth.Text = "pbirth" Me.cmdPbirth.UseVisualStyleBackColor = True @@ -4306,10 +4433,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(2, 92) - Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPbeta.Location = New System.Drawing.Point(2, 72) + Me.cmdPbeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdPbeta.Name = "cmdPbeta" - Me.cmdPbeta.Size = New System.Drawing.Size(78, 38) + Me.cmdPbeta.Size = New System.Drawing.Size(62, 30) Me.cmdPbeta.TabIndex = 167 Me.cmdPbeta.Text = "pbeta" Me.cmdPbeta.UseVisualStyleBackColor = True @@ -4318,10 +4445,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(308, 55) - Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQgamma.Location = New System.Drawing.Point(246, 43) + Me.cmdQgamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdQgamma.Name = "cmdQgamma" - Me.cmdQgamma.Size = New System.Drawing.Size(78, 38) + Me.cmdQgamma.Size = New System.Drawing.Size(62, 30) Me.cmdQgamma.TabIndex = 166 Me.cmdQgamma.Text = "qgamma" Me.cmdQgamma.UseVisualStyleBackColor = True @@ -4330,10 +4457,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(308, 18) - Me.cmdPgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPgamma.Location = New System.Drawing.Point(246, 14) + Me.cmdPgamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdPgamma.Name = "cmdPgamma" - Me.cmdPgamma.Size = New System.Drawing.Size(78, 38) + Me.cmdPgamma.Size = New System.Drawing.Size(62, 30) Me.cmdPgamma.TabIndex = 165 Me.cmdPgamma.Text = "pgamma" Me.cmdPgamma.UseVisualStyleBackColor = True @@ -4342,10 +4469,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(232, 163) - Me.cmdGamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdGamma.Location = New System.Drawing.Point(185, 130) + Me.cmdGamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdGamma.Name = "cmdGamma" - Me.cmdGamma.Size = New System.Drawing.Size(78, 38) + Me.cmdGamma.Size = New System.Drawing.Size(62, 30) Me.cmdGamma.TabIndex = 163 Me.cmdGamma.Tag = "" Me.cmdGamma.Text = "gamma" @@ -4355,10 +4482,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(155, 200) - Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLbeta.Location = New System.Drawing.Point(124, 159) + Me.cmdLbeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdLbeta.Name = "cmdLbeta" - Me.cmdLbeta.Size = New System.Drawing.Size(78, 38) + Me.cmdLbeta.Size = New System.Drawing.Size(62, 30) Me.cmdLbeta.TabIndex = 159 Me.cmdLbeta.Text = "lbeta" Me.cmdLbeta.UseVisualStyleBackColor = True @@ -4367,10 +4494,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(232, 55) - Me.cmdqF.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdqF.Location = New System.Drawing.Point(185, 43) + Me.cmdqF.Margin = New System.Windows.Forms.Padding(2) Me.cmdqF.Name = "cmdqF" - Me.cmdqF.Size = New System.Drawing.Size(78, 38) + Me.cmdqF.Size = New System.Drawing.Size(62, 30) Me.cmdqF.TabIndex = 162 Me.cmdqF.Text = "qf" Me.cmdqF.UseVisualStyleBackColor = True @@ -4379,10 +4506,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(2, 163) - Me.cmdFact.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFact.Location = New System.Drawing.Point(2, 130) + Me.cmdFact.Margin = New System.Windows.Forms.Padding(2) Me.cmdFact.Name = "cmdFact" - Me.cmdFact.Size = New System.Drawing.Size(78, 38) + Me.cmdFact.Size = New System.Drawing.Size(62, 30) Me.cmdFact.TabIndex = 154 Me.cmdFact.Text = "fact" Me.cmdFact.UseVisualStyleBackColor = True @@ -4391,10 +4518,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(78, 163) - Me.cmdChoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdChoose.Location = New System.Drawing.Point(63, 130) + Me.cmdChoose.Margin = New System.Windows.Forms.Padding(2) Me.cmdChoose.Name = "cmdChoose" - Me.cmdChoose.Size = New System.Drawing.Size(78, 38) + Me.cmdChoose.Size = New System.Drawing.Size(62, 30) Me.cmdChoose.TabIndex = 161 Me.cmdChoose.Text = "choose" Me.cmdChoose.UseVisualStyleBackColor = True @@ -4403,10 +4530,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(232, 18) - Me.cmdPf.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPf.Location = New System.Drawing.Point(185, 14) + Me.cmdPf.Margin = New System.Windows.Forms.Padding(2) Me.cmdPf.Name = "cmdPf" - Me.cmdPf.Size = New System.Drawing.Size(78, 38) + Me.cmdPf.Size = New System.Drawing.Size(62, 30) Me.cmdPf.TabIndex = 156 Me.cmdPf.Text = "pf" Me.cmdPf.UseVisualStyleBackColor = True @@ -4415,10 +4542,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(155, 18) - Me.cmdPChisq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPChisq.Location = New System.Drawing.Point(124, 14) + Me.cmdPChisq.Margin = New System.Windows.Forms.Padding(2) Me.cmdPChisq.Name = "cmdPChisq" - Me.cmdPChisq.Size = New System.Drawing.Size(78, 38) + Me.cmdPChisq.Size = New System.Drawing.Size(62, 30) Me.cmdPChisq.TabIndex = 155 Me.cmdPChisq.Text = "pchisq" Me.cmdPChisq.UseVisualStyleBackColor = True @@ -4427,10 +4554,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(232, 200) - Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLgamma.Location = New System.Drawing.Point(185, 159) + Me.cmdLgamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdLgamma.Name = "cmdLgamma" - Me.cmdLgamma.Size = New System.Drawing.Size(78, 38) + Me.cmdLgamma.Size = New System.Drawing.Size(62, 30) Me.cmdLgamma.TabIndex = 152 Me.cmdLgamma.Text = "lgamma" Me.cmdLgamma.UseVisualStyleBackColor = True @@ -4439,10 +4566,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(2, 18) - Me.cmdPnorm.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPnorm.Location = New System.Drawing.Point(2, 14) + Me.cmdPnorm.Margin = New System.Windows.Forms.Padding(2) Me.cmdPnorm.Name = "cmdPnorm" - Me.cmdPnorm.Size = New System.Drawing.Size(78, 38) + Me.cmdPnorm.Size = New System.Drawing.Size(62, 30) Me.cmdPnorm.TabIndex = 148 Me.cmdPnorm.Text = "pnorm" Me.cmdPnorm.UseVisualStyleBackColor = True @@ -4451,10 +4578,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(155, 55) - Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQchisq.Location = New System.Drawing.Point(124, 43) + Me.cmdQchisq.Margin = New System.Windows.Forms.Padding(2) Me.cmdQchisq.Name = "cmdQchisq" - Me.cmdQchisq.Size = New System.Drawing.Size(78, 38) + Me.cmdQchisq.Size = New System.Drawing.Size(62, 30) Me.cmdQchisq.TabIndex = 160 Me.cmdQchisq.Text = "qchisq" Me.cmdQchisq.UseVisualStyleBackColor = True @@ -4463,10 +4590,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(78, 55) - Me.cmdQt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQt.Location = New System.Drawing.Point(63, 43) + Me.cmdQt.Margin = New System.Windows.Forms.Padding(2) Me.cmdQt.Name = "cmdQt" - Me.cmdQt.Size = New System.Drawing.Size(78, 38) + Me.cmdQt.Size = New System.Drawing.Size(62, 30) Me.cmdQt.TabIndex = 158 Me.cmdQt.Text = "qt" Me.cmdQt.UseVisualStyleBackColor = True @@ -4475,10 +4602,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(2, 55) - Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQnorm.Location = New System.Drawing.Point(2, 43) + Me.cmdQnorm.Margin = New System.Windows.Forms.Padding(2) Me.cmdQnorm.Name = "cmdQnorm" - Me.cmdQnorm.Size = New System.Drawing.Size(78, 38) + Me.cmdQnorm.Size = New System.Drawing.Size(62, 30) Me.cmdQnorm.TabIndex = 157 Me.cmdQnorm.Text = "qnorm" Me.cmdQnorm.UseVisualStyleBackColor = True @@ -4487,10 +4614,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(78, 18) - Me.cmdPt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPt.Location = New System.Drawing.Point(63, 14) + Me.cmdPt.Margin = New System.Windows.Forms.Padding(2) Me.cmdPt.Name = "cmdPt" - Me.cmdPt.Size = New System.Drawing.Size(78, 38) + Me.cmdPt.Size = New System.Drawing.Size(62, 30) Me.cmdPt.TabIndex = 153 Me.cmdPt.Text = "pt" Me.cmdPt.UseVisualStyleBackColor = True @@ -4499,10 +4626,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(78, 200) - Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLchoose.Location = New System.Drawing.Point(63, 159) + Me.cmdLchoose.Margin = New System.Windows.Forms.Padding(2) Me.cmdLchoose.Name = "cmdLchoose" - Me.cmdLchoose.Size = New System.Drawing.Size(78, 38) + Me.cmdLchoose.Size = New System.Drawing.Size(62, 30) Me.cmdLchoose.TabIndex = 151 Me.cmdLchoose.Text = "lchoose" Me.cmdLchoose.UseVisualStyleBackColor = True @@ -4511,10 +4638,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(2, 200) - Me.cmdLfact.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLfact.Location = New System.Drawing.Point(2, 159) + Me.cmdLfact.Margin = New System.Windows.Forms.Padding(2) Me.cmdLfact.Name = "cmdLfact" - Me.cmdLfact.Size = New System.Drawing.Size(78, 38) + Me.cmdLfact.Size = New System.Drawing.Size(62, 30) Me.cmdLfact.TabIndex = 150 Me.cmdLfact.Text = "lfact" Me.cmdLfact.UseVisualStyleBackColor = True @@ -4523,10 +4650,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(308, 200) - Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTrigamma.Location = New System.Drawing.Point(246, 159) + Me.cmdTrigamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrigamma.Name = "cmdTrigamma" - Me.cmdTrigamma.Size = New System.Drawing.Size(78, 38) + Me.cmdTrigamma.Size = New System.Drawing.Size(62, 30) Me.cmdTrigamma.TabIndex = 149 Me.cmdTrigamma.Text = "trigamma" Me.cmdTrigamma.UseVisualStyleBackColor = True @@ -4535,10 +4662,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(155, 163) - Me.cmdBeta.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdBeta.Location = New System.Drawing.Point(124, 130) + Me.cmdBeta.Margin = New System.Windows.Forms.Padding(2) Me.cmdBeta.Name = "cmdBeta" - Me.cmdBeta.Size = New System.Drawing.Size(78, 38) + Me.cmdBeta.Size = New System.Drawing.Size(62, 30) Me.cmdBeta.TabIndex = 149 Me.cmdBeta.Text = "beta" Me.cmdBeta.UseVisualStyleBackColor = True @@ -4547,10 +4674,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(308, 163) - Me.cmdDigamma.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDigamma.Location = New System.Drawing.Point(246, 130) + Me.cmdDigamma.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigamma.Name = "cmdDigamma" - Me.cmdDigamma.Size = New System.Drawing.Size(78, 38) + Me.cmdDigamma.Size = New System.Drawing.Size(62, 30) Me.cmdDigamma.TabIndex = 164 Me.cmdDigamma.Text = "digamma" Me.cmdDigamma.UseVisualStyleBackColor = True @@ -4589,9 +4716,11 @@ 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(542, 78) + Me.grpTransform.Location = New System.Drawing.Point(434, 62) + Me.grpTransform.Margin = New System.Windows.Forms.Padding(2) Me.grpTransform.Name = "grpTransform" - Me.grpTransform.Size = New System.Drawing.Size(388, 313) + Me.grpTransform.Padding = New System.Windows.Forms.Padding(2) + Me.grpTransform.Size = New System.Drawing.Size(310, 250) Me.grpTransform.TabIndex = 189 Me.grpTransform.TabStop = False Me.grpTransform.Text = "Transform" @@ -4599,9 +4728,10 @@ Partial Class ucrCalculator 'cmdDecimals ' Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDecimals.Location = New System.Drawing.Point(2, 237) + Me.cmdDecimals.Location = New System.Drawing.Point(2, 188) + Me.cmdDecimals.Margin = New System.Windows.Forms.Padding(2) Me.cmdDecimals.Name = "cmdDecimals" - Me.cmdDecimals.Size = New System.Drawing.Size(78, 38) + Me.cmdDecimals.Size = New System.Drawing.Size(62, 30) Me.cmdDecimals.TabIndex = 207 Me.cmdDecimals.Text = "decimals" Me.cmdDecimals.UseVisualStyleBackColor = True @@ -4609,9 +4739,10 @@ Partial Class ucrCalculator 'cmdMASSFractions ' Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 200) + Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 159) + Me.cmdMASSFractions.Margin = New System.Windows.Forms.Padding(2) Me.cmdMASSFractions.Name = "cmdMASSFractions" - Me.cmdMASSFractions.Size = New System.Drawing.Size(78, 38) + Me.cmdMASSFractions.Size = New System.Drawing.Size(62, 30) Me.cmdMASSFractions.TabIndex = 206 Me.cmdMASSFractions.Text = "fractions" Me.cmdMASSFractions.UseVisualStyleBackColor = True @@ -4619,9 +4750,10 @@ Partial Class ucrCalculator 'cmdScale ' Me.cmdScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdScale.Location = New System.Drawing.Point(2, 163) + Me.cmdScale.Location = New System.Drawing.Point(2, 130) + Me.cmdScale.Margin = New System.Windows.Forms.Padding(2) Me.cmdScale.Name = "cmdScale" - Me.cmdScale.Size = New System.Drawing.Size(78, 38) + Me.cmdScale.Size = New System.Drawing.Size(62, 30) Me.cmdScale.TabIndex = 205 Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True @@ -4631,38 +4763,39 @@ 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(118, 100) + Me.ContextMenuStripTransform.Size = New System.Drawing.Size(106, 92) ' 'BaseToolStripMenuItem ' Me.BaseToolStripMenuItem.Name = "BaseToolStripMenuItem" - Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(117, 24) + Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.BaseToolStripMenuItem.Text = "base" ' 'DplyrToolStripMenuItem ' Me.DplyrToolStripMenuItem.Name = "DplyrToolStripMenuItem" - Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(117, 24) + Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.DplyrToolStripMenuItem.Text = "dplyr" ' 'MASSToolStripMenuItem ' Me.MASSToolStripMenuItem.Name = "MASSToolStripMenuItem" - Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(117, 24) + Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.MASSToolStripMenuItem.Text = "MASS" ' 'ZooToolStripMenuItem ' Me.ZooToolStripMenuItem.Name = "ZooToolStripMenuItem" - Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(117, 24) + Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.ZooToolStripMenuItem.Text = "zoo" ' 'cmdRev ' Me.cmdRev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRev.Location = New System.Drawing.Point(155, 128) + Me.cmdRev.Location = New System.Drawing.Point(124, 101) + Me.cmdRev.Margin = New System.Windows.Forms.Padding(2) Me.cmdRev.Name = "cmdRev" - Me.cmdRev.Size = New System.Drawing.Size(78, 38) + Me.cmdRev.Size = New System.Drawing.Size(62, 30) Me.cmdRev.TabIndex = 203 Me.cmdRev.Text = "rev" Me.cmdRev.UseVisualStyleBackColor = True @@ -4670,9 +4803,10 @@ Partial Class ucrCalculator 'cmdMovProd ' Me.cmdMovProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovProd.Location = New System.Drawing.Point(155, 92) + Me.cmdMovProd.Location = New System.Drawing.Point(124, 72) + Me.cmdMovProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovProd.Name = "cmdMovProd" - Me.cmdMovProd.Size = New System.Drawing.Size(78, 38) + Me.cmdMovProd.Size = New System.Drawing.Size(62, 30) Me.cmdMovProd.TabIndex = 202 Me.cmdMovProd.Text = "movprod" Me.cmdMovProd.UseVisualStyleBackColor = True @@ -4680,9 +4814,10 @@ Partial Class ucrCalculator 'cmdCumProd ' Me.cmdCumProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumProd.Location = New System.Drawing.Point(155, 55) + Me.cmdCumProd.Location = New System.Drawing.Point(124, 43) + Me.cmdCumProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumProd.Name = "cmdCumProd" - Me.cmdCumProd.Size = New System.Drawing.Size(78, 38) + Me.cmdCumProd.Size = New System.Drawing.Size(62, 30) Me.cmdCumProd.TabIndex = 201 Me.cmdCumProd.Text = "cumprod" Me.cmdCumProd.UseVisualStyleBackColor = True @@ -4690,9 +4825,10 @@ Partial Class ucrCalculator 'cmdSortF ' Me.cmdSortF.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSortF.Location = New System.Drawing.Point(2, 18) + Me.cmdSortF.Location = New System.Drawing.Point(2, 14) + Me.cmdSortF.Margin = New System.Windows.Forms.Padding(2) Me.cmdSortF.Name = "cmdSortF" - Me.cmdSortF.Size = New System.Drawing.Size(78, 38) + Me.cmdSortF.Size = New System.Drawing.Size(62, 30) Me.cmdSortF.TabIndex = 198 Me.cmdSortF.Text = "sort" Me.cmdSortF.UseVisualStyleBackColor = True @@ -4700,9 +4836,10 @@ Partial Class ucrCalculator 'cmdNasplin ' Me.cmdNasplin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNasplin.Location = New System.Drawing.Point(308, 200) + Me.cmdNasplin.Location = New System.Drawing.Point(246, 159) + Me.cmdNasplin.Margin = New System.Windows.Forms.Padding(2) Me.cmdNasplin.Name = "cmdNasplin" - Me.cmdNasplin.Size = New System.Drawing.Size(78, 38) + Me.cmdNasplin.Size = New System.Drawing.Size(62, 30) Me.cmdNasplin.TabIndex = 197 Me.cmdNasplin.Text = "nasplin" Me.cmdNasplin.UseVisualStyleBackColor = True @@ -4710,9 +4847,10 @@ Partial Class ucrCalculator 'cmdNaapprox ' Me.cmdNaapprox.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaapprox.Location = New System.Drawing.Point(232, 200) + Me.cmdNaapprox.Location = New System.Drawing.Point(185, 159) + Me.cmdNaapprox.Margin = New System.Windows.Forms.Padding(2) Me.cmdNaapprox.Name = "cmdNaapprox" - Me.cmdNaapprox.Size = New System.Drawing.Size(78, 38) + Me.cmdNaapprox.Size = New System.Drawing.Size(62, 30) Me.cmdNaapprox.TabIndex = 196 Me.cmdNaapprox.Text = "naapprox" Me.cmdNaapprox.UseVisualStyleBackColor = True @@ -4720,9 +4858,10 @@ Partial Class ucrCalculator 'cmdNaest ' Me.cmdNaest.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaest.Location = New System.Drawing.Point(155, 200) + Me.cmdNaest.Location = New System.Drawing.Point(124, 159) + Me.cmdNaest.Margin = New System.Windows.Forms.Padding(2) Me.cmdNaest.Name = "cmdNaest" - Me.cmdNaest.Size = New System.Drawing.Size(78, 38) + Me.cmdNaest.Size = New System.Drawing.Size(62, 30) Me.cmdNaest.TabIndex = 195 Me.cmdNaest.Text = "naest" Me.cmdNaest.UseVisualStyleBackColor = True @@ -4730,9 +4869,10 @@ Partial Class ucrCalculator 'cmdNafill ' Me.cmdNafill.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNafill.Location = New System.Drawing.Point(78, 200) + Me.cmdNafill.Location = New System.Drawing.Point(63, 159) + Me.cmdNafill.Margin = New System.Windows.Forms.Padding(2) Me.cmdNafill.Name = "cmdNafill" - Me.cmdNafill.Size = New System.Drawing.Size(78, 38) + Me.cmdNafill.Size = New System.Drawing.Size(62, 30) Me.cmdNafill.TabIndex = 194 Me.cmdNafill.Text = "nafill" Me.cmdNafill.UseVisualStyleBackColor = True @@ -4740,9 +4880,10 @@ Partial Class ucrCalculator 'cmdMovmin ' Me.cmdMovmin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovmin.Location = New System.Drawing.Point(308, 92) + Me.cmdMovmin.Location = New System.Drawing.Point(246, 72) + Me.cmdMovmin.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovmin.Name = "cmdMovmin" - Me.cmdMovmin.Size = New System.Drawing.Size(78, 38) + Me.cmdMovmin.Size = New System.Drawing.Size(62, 30) Me.cmdMovmin.TabIndex = 193 Me.cmdMovmin.Text = "movmin" Me.cmdMovmin.UseVisualStyleBackColor = True @@ -4750,9 +4891,10 @@ Partial Class ucrCalculator 'cmdRowRank ' Me.cmdRowRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRowRank.Location = New System.Drawing.Point(78, 163) + Me.cmdRowRank.Location = New System.Drawing.Point(63, 130) + Me.cmdRowRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdRowRank.Name = "cmdRowRank" - Me.cmdRowRank.Size = New System.Drawing.Size(78, 38) + Me.cmdRowRank.Size = New System.Drawing.Size(62, 30) Me.cmdRowRank.TabIndex = 192 Me.cmdRowRank.Text = "r_rank" Me.cmdRowRank.UseVisualStyleBackColor = True @@ -4760,9 +4902,10 @@ Partial Class ucrCalculator 'cmdDiff ' Me.cmdDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDiff.Location = New System.Drawing.Point(78, 128) + Me.cmdDiff.Location = New System.Drawing.Point(63, 101) + Me.cmdDiff.Margin = New System.Windows.Forms.Padding(2) Me.cmdDiff.Name = "cmdDiff" - Me.cmdDiff.Size = New System.Drawing.Size(78, 38) + Me.cmdDiff.Size = New System.Drawing.Size(62, 30) Me.cmdDiff.TabIndex = 191 Me.cmdDiff.Text = "diff" Me.cmdDiff.UseVisualStyleBackColor = True @@ -4770,9 +4913,10 @@ Partial Class ucrCalculator 'cmdCumdist ' Me.cmdCumdist.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumdist.Location = New System.Drawing.Point(308, 128) + Me.cmdCumdist.Location = New System.Drawing.Point(246, 101) + Me.cmdCumdist.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumdist.Name = "cmdCumdist" - Me.cmdCumdist.Size = New System.Drawing.Size(78, 38) + Me.cmdCumdist.Size = New System.Drawing.Size(62, 30) Me.cmdCumdist.TabIndex = 190 Me.cmdCumdist.Text = "cumdist" Me.cmdCumdist.UseVisualStyleBackColor = True @@ -4780,9 +4924,10 @@ Partial Class ucrCalculator 'cmdMovMean ' Me.cmdMovMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMean.Location = New System.Drawing.Point(232, 92) + Me.cmdMovMean.Location = New System.Drawing.Point(185, 72) + Me.cmdMovMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovMean.Name = "cmdMovMean" - Me.cmdMovMean.Size = New System.Drawing.Size(78, 38) + Me.cmdMovMean.Size = New System.Drawing.Size(62, 30) Me.cmdMovMean.TabIndex = 189 Me.cmdMovMean.Text = "movmean" Me.cmdMovMean.UseVisualStyleBackColor = True @@ -4790,9 +4935,10 @@ Partial Class ucrCalculator 'cmdCumMean ' Me.cmdCumMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMean.Location = New System.Drawing.Point(232, 55) + Me.cmdCumMean.Location = New System.Drawing.Point(185, 43) + Me.cmdCumMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumMean.Name = "cmdCumMean" - Me.cmdCumMean.Size = New System.Drawing.Size(78, 38) + Me.cmdCumMean.Size = New System.Drawing.Size(62, 30) Me.cmdCumMean.TabIndex = 188 Me.cmdCumMean.Text = "cummean" Me.cmdCumMean.UseVisualStyleBackColor = True @@ -4800,9 +4946,10 @@ Partial Class ucrCalculator 'cmdNtile ' Me.cmdNtile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNtile.Location = New System.Drawing.Point(232, 128) + Me.cmdNtile.Location = New System.Drawing.Point(185, 101) + Me.cmdNtile.Margin = New System.Windows.Forms.Padding(2) Me.cmdNtile.Name = "cmdNtile" - Me.cmdNtile.Size = New System.Drawing.Size(78, 38) + Me.cmdNtile.Size = New System.Drawing.Size(62, 30) Me.cmdNtile.TabIndex = 187 Me.cmdNtile.Text = "ntile" Me.cmdNtile.UseVisualStyleBackColor = True @@ -4810,9 +4957,10 @@ Partial Class ucrCalculator 'cmMovMed ' Me.cmMovMed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmMovMed.Location = New System.Drawing.Point(2, 128) + Me.cmMovMed.Location = New System.Drawing.Point(2, 101) + Me.cmMovMed.Margin = New System.Windows.Forms.Padding(2) Me.cmMovMed.Name = "cmMovMed" - Me.cmMovMed.Size = New System.Drawing.Size(78, 38) + Me.cmMovMed.Size = New System.Drawing.Size(62, 30) Me.cmMovMed.TabIndex = 186 Me.cmMovMed.Text = "movmed" Me.cmMovMed.UseVisualStyleBackColor = True @@ -4820,9 +4968,10 @@ Partial Class ucrCalculator 'cmdMRank ' Me.cmdMRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMRank.Location = New System.Drawing.Point(308, 163) + Me.cmdMRank.Location = New System.Drawing.Point(246, 130) + Me.cmdMRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdMRank.Name = "cmdMRank" - Me.cmdMRank.Size = New System.Drawing.Size(78, 38) + Me.cmdMRank.Size = New System.Drawing.Size(62, 30) Me.cmdMRank.TabIndex = 185 Me.cmdMRank.Text = "m_rank" Me.cmdMRank.UseVisualStyleBackColor = True @@ -4830,9 +4979,10 @@ Partial Class ucrCalculator 'cmdDRank ' Me.cmdDRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDRank.Location = New System.Drawing.Point(232, 163) + Me.cmdDRank.Location = New System.Drawing.Point(185, 130) + Me.cmdDRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdDRank.Name = "cmdDRank" - Me.cmdDRank.Size = New System.Drawing.Size(78, 38) + Me.cmdDRank.Size = New System.Drawing.Size(62, 30) Me.cmdDRank.TabIndex = 184 Me.cmdDRank.Text = "d_rank" Me.cmdDRank.UseVisualStyleBackColor = True @@ -4840,9 +4990,10 @@ Partial Class ucrCalculator 'cmdMovMax ' Me.cmdMovMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovMax.Location = New System.Drawing.Point(2, 92) + Me.cmdMovMax.Location = New System.Drawing.Point(2, 72) + Me.cmdMovMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovMax.Name = "cmdMovMax" - Me.cmdMovMax.Size = New System.Drawing.Size(78, 38) + Me.cmdMovMax.Size = New System.Drawing.Size(62, 30) Me.cmdMovMax.TabIndex = 183 Me.cmdMovMax.Text = "movmax" Me.cmdMovMax.UseVisualStyleBackColor = True @@ -4850,9 +5001,10 @@ Partial Class ucrCalculator 'cmdMovSum ' Me.cmdMovSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMovSum.Location = New System.Drawing.Point(78, 92) + Me.cmdMovSum.Location = New System.Drawing.Point(63, 72) + Me.cmdMovSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdMovSum.Name = "cmdMovSum" - Me.cmdMovSum.Size = New System.Drawing.Size(78, 38) + Me.cmdMovSum.Size = New System.Drawing.Size(62, 30) Me.cmdMovSum.TabIndex = 182 Me.cmdMovSum.Text = "movsum" Me.cmdMovSum.UseVisualStyleBackColor = True @@ -4861,10 +5013,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(155, 163) - Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPercentRank.Location = New System.Drawing.Point(124, 130) + Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdPercentRank.Name = "cmdPercentRank" - Me.cmdPercentRank.Size = New System.Drawing.Size(78, 38) + Me.cmdPercentRank.Size = New System.Drawing.Size(62, 30) Me.cmdPercentRank.TabIndex = 181 Me.cmdPercentRank.Text = "% rank" Me.cmdPercentRank.UseVisualStyleBackColor = True @@ -4872,9 +5024,10 @@ Partial Class ucrCalculator 'cmdCumSum ' Me.cmdCumSum.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumSum.Location = New System.Drawing.Point(78, 55) + Me.cmdCumSum.Location = New System.Drawing.Point(63, 43) + Me.cmdCumSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumSum.Name = "cmdCumSum" - Me.cmdCumSum.Size = New System.Drawing.Size(78, 38) + Me.cmdCumSum.Size = New System.Drawing.Size(62, 30) Me.cmdCumSum.TabIndex = 180 Me.cmdCumSum.Text = "cumsum" Me.cmdCumSum.UseVisualStyleBackColor = True @@ -4882,9 +5035,10 @@ Partial Class ucrCalculator 'cmdCumMin ' Me.cmdCumMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMin.Location = New System.Drawing.Point(308, 55) + Me.cmdCumMin.Location = New System.Drawing.Point(246, 43) + Me.cmdCumMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumMin.Name = "cmdCumMin" - Me.cmdCumMin.Size = New System.Drawing.Size(78, 38) + Me.cmdCumMin.Size = New System.Drawing.Size(62, 30) Me.cmdCumMin.TabIndex = 179 Me.cmdCumMin.Text = "cummin" Me.cmdCumMin.UseVisualStyleBackColor = True @@ -4892,9 +5046,10 @@ Partial Class ucrCalculator 'cmdCumMax ' Me.cmdCumMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCumMax.Location = New System.Drawing.Point(2, 55) + Me.cmdCumMax.Location = New System.Drawing.Point(2, 43) + Me.cmdCumMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdCumMax.Name = "cmdCumMax" - Me.cmdCumMax.Size = New System.Drawing.Size(78, 38) + Me.cmdCumMax.Size = New System.Drawing.Size(62, 30) Me.cmdCumMax.TabIndex = 178 Me.cmdCumMax.Text = "cummax" Me.cmdCumMax.UseVisualStyleBackColor = True @@ -4902,9 +5057,10 @@ Partial Class ucrCalculator 'cmdPMin ' Me.cmdPMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMin.Location = New System.Drawing.Point(308, 18) + Me.cmdPMin.Location = New System.Drawing.Point(246, 14) + Me.cmdPMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdPMin.Name = "cmdPMin" - Me.cmdPMin.Size = New System.Drawing.Size(78, 38) + Me.cmdPMin.Size = New System.Drawing.Size(62, 30) Me.cmdPMin.TabIndex = 177 Me.cmdPMin.Text = "pmin" Me.cmdPMin.UseVisualStyleBackColor = True @@ -4912,9 +5068,10 @@ Partial Class ucrCalculator 'cmdPMax ' Me.cmdPMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPMax.Location = New System.Drawing.Point(232, 18) + Me.cmdPMax.Location = New System.Drawing.Point(185, 14) + Me.cmdPMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdPMax.Name = "cmdPMax" - Me.cmdPMax.Size = New System.Drawing.Size(78, 38) + Me.cmdPMax.Size = New System.Drawing.Size(62, 30) Me.cmdPMax.TabIndex = 176 Me.cmdPMax.Text = "pmax" Me.cmdPMax.UseVisualStyleBackColor = True @@ -4922,9 +5079,10 @@ Partial Class ucrCalculator 'cmdLead ' Me.cmdLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLead.Location = New System.Drawing.Point(155, 18) + Me.cmdLead.Location = New System.Drawing.Point(124, 14) + Me.cmdLead.Margin = New System.Windows.Forms.Padding(2) Me.cmdLead.Name = "cmdLead" - Me.cmdLead.Size = New System.Drawing.Size(78, 38) + Me.cmdLead.Size = New System.Drawing.Size(62, 30) Me.cmdLead.TabIndex = 175 Me.cmdLead.Text = "lead" Me.cmdLead.UseVisualStyleBackColor = True @@ -4932,9 +5090,10 @@ Partial Class ucrCalculator 'cmdLag ' Me.cmdLag.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLag.Location = New System.Drawing.Point(78, 18) + Me.cmdLag.Location = New System.Drawing.Point(63, 14) + Me.cmdLag.Margin = New System.Windows.Forms.Padding(2) Me.cmdLag.Name = "cmdLag" - Me.cmdLag.Size = New System.Drawing.Size(78, 38) + Me.cmdLag.Size = New System.Drawing.Size(62, 30) Me.cmdLag.TabIndex = 174 Me.cmdLag.Text = "lag" Me.cmdLag.UseVisualStyleBackColor = True @@ -4976,11 +5135,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(542, 78) - Me.grpLogical.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpLogical.Location = New System.Drawing.Point(434, 62) + Me.grpLogical.Margin = New System.Windows.Forms.Padding(2) Me.grpLogical.Name = "grpLogical" - Me.grpLogical.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpLogical.Size = New System.Drawing.Size(322, 320) + Me.grpLogical.Padding = New System.Windows.Forms.Padding(2) + Me.grpLogical.Size = New System.Drawing.Size(258, 256) Me.grpLogical.TabIndex = 183 Me.grpLogical.TabStop = False Me.grpLogical.Text = "Logical and Symbols" @@ -4988,10 +5147,10 @@ Partial Class ucrCalculator 'cmdnumeric ' Me.cmdnumeric.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdnumeric.Location = New System.Drawing.Point(239, 234) - Me.cmdnumeric.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdnumeric.Location = New System.Drawing.Point(191, 188) + Me.cmdnumeric.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdnumeric.Name = "cmdnumeric" - Me.cmdnumeric.Size = New System.Drawing.Size(78, 38) + Me.cmdnumeric.Size = New System.Drawing.Size(62, 30) Me.cmdnumeric.TabIndex = 216 Me.cmdnumeric.Text = "numeric" Me.cmdnumeric.UseVisualStyleBackColor = True @@ -5000,10 +5159,10 @@ Partial Class ucrCalculator ' Me.cmdCalcRepelicationFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCalcRepelicationFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcRepelicationFunction.Location = New System.Drawing.Point(5, 234) - Me.cmdCalcRepelicationFunction.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdCalcRepelicationFunction.Location = New System.Drawing.Point(4, 188) + Me.cmdCalcRepelicationFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCalcRepelicationFunction.Name = "cmdCalcRepelicationFunction" - Me.cmdCalcRepelicationFunction.Size = New System.Drawing.Size(78, 38) + Me.cmdCalcRepelicationFunction.Size = New System.Drawing.Size(62, 30) Me.cmdCalcRepelicationFunction.TabIndex = 215 Me.cmdCalcRepelicationFunction.Text = "rep" Me.cmdCalcRepelicationFunction.UseVisualStyleBackColor = True @@ -5012,10 +5171,10 @@ Partial Class ucrCalculator ' Me.cmdCalcSequenceFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCalcSequenceFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcSequenceFunction.Location = New System.Drawing.Point(82, 234) - Me.cmdCalcSequenceFunction.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdCalcSequenceFunction.Location = New System.Drawing.Point(65, 188) + Me.cmdCalcSequenceFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCalcSequenceFunction.Name = "cmdCalcSequenceFunction" - Me.cmdCalcSequenceFunction.Size = New System.Drawing.Size(78, 38) + Me.cmdCalcSequenceFunction.Size = New System.Drawing.Size(62, 30) Me.cmdCalcSequenceFunction.TabIndex = 214 Me.cmdCalcSequenceFunction.Tag = "Del" Me.cmdCalcSequenceFunction.Text = "seq" @@ -5024,10 +5183,10 @@ Partial Class ucrCalculator 'cmdCalcConcantenateFunction ' Me.cmdCalcConcantenateFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCalcConcantenateFunction.Location = New System.Drawing.Point(159, 234) - Me.cmdCalcConcantenateFunction.Margin = New System.Windows.Forms.Padding(2, 4, 2, 4) + Me.cmdCalcConcantenateFunction.Location = New System.Drawing.Point(126, 188) + Me.cmdCalcConcantenateFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdCalcConcantenateFunction.Name = "cmdCalcConcantenateFunction" - Me.cmdCalcConcantenateFunction.Size = New System.Drawing.Size(82, 38) + Me.cmdCalcConcantenateFunction.Size = New System.Drawing.Size(66, 30) Me.cmdCalcConcantenateFunction.TabIndex = 213 Me.cmdCalcConcantenateFunction.Text = "c( )" Me.cmdCalcConcantenateFunction.UseVisualStyleBackColor = True @@ -5037,26 +5196,27 @@ 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(113, 52) + Me.ContextMenuStripLogical.Size = New System.Drawing.Size(102, 48) ' 'LogBaseToolStripMenuItem ' Me.LogBaseToolStripMenuItem.Name = "LogBaseToolStripMenuItem" - Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(112, 24) + Me.LogBaseToolStripMenuItem.Size = New System.Drawing.Size(101, 22) Me.LogBaseToolStripMenuItem.Text = "base" ' 'LogDplyrToolStripMenuItem ' Me.LogDplyrToolStripMenuItem.Name = "LogDplyrToolStripMenuItem" - Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(112, 24) + Me.LogDplyrToolStripMenuItem.Size = New System.Drawing.Size(101, 22) Me.LogDplyrToolStripMenuItem.Text = "dplyr" ' 'cmdFalse ' Me.cmdFalse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFalse.Location = New System.Drawing.Point(251, 52) + Me.cmdFalse.Location = New System.Drawing.Point(199, 43) + Me.cmdFalse.Margin = New System.Windows.Forms.Padding(2) Me.cmdFalse.Name = "cmdFalse" - Me.cmdFalse.Size = New System.Drawing.Size(65, 38) + Me.cmdFalse.Size = New System.Drawing.Size(52, 30) Me.cmdFalse.TabIndex = 207 Me.cmdFalse.Text = "FALSE" Me.cmdFalse.UseVisualStyleBackColor = True @@ -5064,9 +5224,10 @@ Partial Class ucrCalculator 'cmdTrue ' Me.cmdTrue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTrue.Location = New System.Drawing.Point(251, 17) + Me.cmdTrue.Location = New System.Drawing.Point(199, 14) + Me.cmdTrue.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrue.Name = "cmdTrue" - Me.cmdTrue.Size = New System.Drawing.Size(65, 38) + Me.cmdTrue.Size = New System.Drawing.Size(52, 30) Me.cmdTrue.TabIndex = 206 Me.cmdTrue.Text = "TRUE" Me.cmdTrue.UseVisualStyleBackColor = True @@ -5074,10 +5235,10 @@ Partial Class ucrCalculator 'cmdTilde ' Me.cmdTilde.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTilde.Location = New System.Drawing.Point(159, 88) + Me.cmdTilde.Location = New System.Drawing.Point(125, 72) Me.cmdTilde.Margin = New System.Windows.Forms.Padding(2) Me.cmdTilde.Name = "cmdTilde" - Me.cmdTilde.Size = New System.Drawing.Size(45, 38) + Me.cmdTilde.Size = New System.Drawing.Size(36, 30) Me.cmdTilde.TabIndex = 205 Me.cmdTilde.Text = "~" Me.cmdTilde.UseVisualStyleBackColor = True @@ -5085,10 +5246,10 @@ Partial Class ucrCalculator 'cmdIn ' Me.cmdIn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIn.Location = New System.Drawing.Point(159, 125) - Me.cmdIn.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdIn.Location = New System.Drawing.Point(126, 101) + Me.cmdIn.Margin = New System.Windows.Forms.Padding(2) Me.cmdIn.Name = "cmdIn" - Me.cmdIn.Size = New System.Drawing.Size(82, 38) + Me.cmdIn.Size = New System.Drawing.Size(66, 30) Me.cmdIn.TabIndex = 204 Me.cmdIn.Text = "%in%" Me.cmdIn.UseVisualStyleBackColor = True @@ -5096,9 +5257,10 @@ Partial Class ucrCalculator 'cmdWhich ' Me.cmdWhich.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWhich.Location = New System.Drawing.Point(239, 125) + Me.cmdWhich.Location = New System.Drawing.Point(191, 101) + Me.cmdWhich.Margin = New System.Windows.Forms.Padding(2) Me.cmdWhich.Name = "cmdWhich" - Me.cmdWhich.Size = New System.Drawing.Size(78, 38) + Me.cmdWhich.Size = New System.Drawing.Size(62, 30) Me.cmdWhich.TabIndex = 203 Me.cmdWhich.Text = "which" Me.cmdWhich.UseVisualStyleBackColor = True @@ -5106,10 +5268,10 @@ Partial Class ucrCalculator 'cmdNA ' Me.cmdNA.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNA.Location = New System.Drawing.Point(202, 52) - Me.cmdNA.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdNA.Location = New System.Drawing.Point(160, 43) + Me.cmdNA.Margin = New System.Windows.Forms.Padding(2) Me.cmdNA.Name = "cmdNA" - Me.cmdNA.Size = New System.Drawing.Size(50, 38) + Me.cmdNA.Size = New System.Drawing.Size(40, 30) Me.cmdNA.TabIndex = 202 Me.cmdNA.Text = "NA" Me.cmdNA.UseVisualStyleBackColor = True @@ -5117,9 +5279,10 @@ Partial Class ucrCalculator 'cmdNear ' Me.cmdNear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNear.Location = New System.Drawing.Point(239, 198) + Me.cmdNear.Location = New System.Drawing.Point(191, 159) + Me.cmdNear.Margin = New System.Windows.Forms.Padding(2) Me.cmdNear.Name = "cmdNear" - Me.cmdNear.Size = New System.Drawing.Size(78, 38) + Me.cmdNear.Size = New System.Drawing.Size(62, 30) Me.cmdNear.TabIndex = 201 Me.cmdNear.Text = "near" Me.cmdNear.UseVisualStyleBackColor = True @@ -5127,9 +5290,10 @@ Partial Class ucrCalculator 'cmdBetween ' Me.cmdBetween.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBetween.Location = New System.Drawing.Point(239, 162) + Me.cmdBetween.Location = New System.Drawing.Point(191, 130) + Me.cmdBetween.Margin = New System.Windows.Forms.Padding(2) Me.cmdBetween.Name = "cmdBetween" - Me.cmdBetween.Size = New System.Drawing.Size(78, 38) + Me.cmdBetween.Size = New System.Drawing.Size(62, 30) Me.cmdBetween.TabIndex = 200 Me.cmdBetween.Text = "between" Me.cmdBetween.UseVisualStyleBackColor = True @@ -5137,9 +5301,10 @@ Partial Class ucrCalculator 'cmdIsNa ' Me.cmdIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIsNa.Location = New System.Drawing.Point(5, 198) + Me.cmdIsNa.Location = New System.Drawing.Point(4, 159) + Me.cmdIsNa.Margin = New System.Windows.Forms.Padding(2) Me.cmdIsNa.Name = "cmdIsNa" - Me.cmdIsNa.Size = New System.Drawing.Size(78, 38) + Me.cmdIsNa.Size = New System.Drawing.Size(62, 30) Me.cmdIsNa.TabIndex = 195 Me.cmdIsNa.Text = "is.na" Me.cmdIsNa.UseVisualStyleBackColor = True @@ -5147,9 +5312,10 @@ Partial Class ucrCalculator 'cmdNotIsNa ' Me.cmdNotIsNa.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotIsNa.Location = New System.Drawing.Point(82, 198) + Me.cmdNotIsNa.Location = New System.Drawing.Point(65, 159) + Me.cmdNotIsNa.Margin = New System.Windows.Forms.Padding(2) Me.cmdNotIsNa.Name = "cmdNotIsNa" - Me.cmdNotIsNa.Size = New System.Drawing.Size(78, 38) + Me.cmdNotIsNa.Size = New System.Drawing.Size(62, 30) Me.cmdNotIsNa.TabIndex = 194 Me.cmdNotIsNa.Text = "!is.na" Me.cmdNotIsNa.UseVisualStyleBackColor = True @@ -5157,9 +5323,10 @@ Partial Class ucrCalculator 'cmdDuplicate ' Me.cmdDuplicate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDuplicate.Location = New System.Drawing.Point(159, 198) + Me.cmdDuplicate.Location = New System.Drawing.Point(126, 159) + Me.cmdDuplicate.Margin = New System.Windows.Forms.Padding(2) Me.cmdDuplicate.Name = "cmdDuplicate" - Me.cmdDuplicate.Size = New System.Drawing.Size(82, 38) + Me.cmdDuplicate.Size = New System.Drawing.Size(66, 30) Me.cmdDuplicate.TabIndex = 193 Me.cmdDuplicate.Text = "duplicated" Me.cmdDuplicate.UseVisualStyleBackColor = True @@ -5167,9 +5334,10 @@ Partial Class ucrCalculator 'cmdIfelse ' Me.cmdIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIfelse.Location = New System.Drawing.Point(5, 162) + Me.cmdIfelse.Location = New System.Drawing.Point(4, 130) + Me.cmdIfelse.Margin = New System.Windows.Forms.Padding(2) Me.cmdIfelse.Name = "cmdIfelse" - Me.cmdIfelse.Size = New System.Drawing.Size(78, 38) + Me.cmdIfelse.Size = New System.Drawing.Size(62, 30) Me.cmdIfelse.TabIndex = 192 Me.cmdIfelse.Text = "ifelse" Me.cmdIfelse.UseVisualStyleBackColor = True @@ -5177,9 +5345,10 @@ Partial Class ucrCalculator 'cmdmatch ' Me.cmdmatch.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdmatch.Location = New System.Drawing.Point(82, 162) + Me.cmdmatch.Location = New System.Drawing.Point(65, 130) + Me.cmdmatch.Margin = New System.Windows.Forms.Padding(2) Me.cmdmatch.Name = "cmdmatch" - Me.cmdmatch.Size = New System.Drawing.Size(78, 38) + Me.cmdmatch.Size = New System.Drawing.Size(62, 30) Me.cmdmatch.TabIndex = 191 Me.cmdmatch.Text = "match" Me.cmdmatch.UseVisualStyleBackColor = True @@ -5187,9 +5356,10 @@ Partial Class ucrCalculator 'cmdwhen ' Me.cmdwhen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdwhen.Location = New System.Drawing.Point(159, 162) + Me.cmdwhen.Location = New System.Drawing.Point(126, 130) + Me.cmdwhen.Margin = New System.Windows.Forms.Padding(2) Me.cmdwhen.Name = "cmdwhen" - Me.cmdwhen.Size = New System.Drawing.Size(82, 38) + Me.cmdwhen.Size = New System.Drawing.Size(66, 30) Me.cmdwhen.TabIndex = 190 Me.cmdwhen.Text = "when" Me.cmdwhen.UseVisualStyleBackColor = True @@ -5197,10 +5367,10 @@ Partial Class ucrCalculator 'cmdOpeningBracket ' Me.cmdOpeningBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpeningBracket.Location = New System.Drawing.Point(202, 88) - Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdOpeningBracket.Location = New System.Drawing.Point(160, 72) + Me.cmdOpeningBracket.Margin = New System.Windows.Forms.Padding(2) Me.cmdOpeningBracket.Name = "cmdOpeningBracket" - Me.cmdOpeningBracket.Size = New System.Drawing.Size(50, 38) + Me.cmdOpeningBracket.Size = New System.Drawing.Size(40, 30) Me.cmdOpeningBracket.TabIndex = 139 Me.cmdOpeningBracket.Text = "(" Me.cmdOpeningBracket.UseVisualStyleBackColor = True @@ -5209,10 +5379,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(53, 88) - Me.cmdColon.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdColon.Location = New System.Drawing.Point(41, 72) + Me.cmdColon.Margin = New System.Windows.Forms.Padding(2) Me.cmdColon.Name = "cmdColon" - Me.cmdColon.Size = New System.Drawing.Size(50, 38) + Me.cmdColon.Size = New System.Drawing.Size(40, 30) Me.cmdColon.TabIndex = 139 Me.cmdColon.Text = ":" Me.cmdColon.UseVisualStyleBackColor = True @@ -5220,10 +5390,10 @@ Partial Class ucrCalculator 'cmdGreaterOrEqualsTo ' Me.cmdGreaterOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(159, 17) - Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdGreaterOrEqualsTo.Location = New System.Drawing.Point(125, 14) + Me.cmdGreaterOrEqualsTo.Margin = New System.Windows.Forms.Padding(2) Me.cmdGreaterOrEqualsTo.Name = "cmdGreaterOrEqualsTo" - Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(45, 38) + Me.cmdGreaterOrEqualsTo.Size = New System.Drawing.Size(36, 30) Me.cmdGreaterOrEqualsTo.TabIndex = 138 Me.cmdGreaterOrEqualsTo.Text = ">=" Me.cmdGreaterOrEqualsTo.UseVisualStyleBackColor = True @@ -5231,10 +5401,10 @@ Partial Class ucrCalculator 'cmdClossingBracket ' Me.cmdClossingBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClossingBracket.Location = New System.Drawing.Point(251, 88) - Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdClossingBracket.Location = New System.Drawing.Point(199, 72) + Me.cmdClossingBracket.Margin = New System.Windows.Forms.Padding(2) Me.cmdClossingBracket.Name = "cmdClossingBracket" - Me.cmdClossingBracket.Size = New System.Drawing.Size(65, 38) + Me.cmdClossingBracket.Size = New System.Drawing.Size(52, 30) Me.cmdClossingBracket.TabIndex = 137 Me.cmdClossingBracket.Tag = "" Me.cmdClossingBracket.Text = ")" @@ -5244,10 +5414,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(159, 52) - Me.cmdAnd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAnd.Location = New System.Drawing.Point(125, 43) + Me.cmdAnd.Margin = New System.Windows.Forms.Padding(2) Me.cmdAnd.Name = "cmdAnd" - Me.cmdAnd.Size = New System.Drawing.Size(45, 38) + Me.cmdAnd.Size = New System.Drawing.Size(36, 30) Me.cmdAnd.TabIndex = 137 Me.cmdAnd.Tag = "And" Me.cmdAnd.Text = "&&" @@ -5257,10 +5427,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(202, 17) - Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQuotes.Location = New System.Drawing.Point(160, 14) + Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2) Me.cmdQuotes.Name = "cmdQuotes" - Me.cmdQuotes.Size = New System.Drawing.Size(50, 38) + Me.cmdQuotes.Size = New System.Drawing.Size(40, 30) Me.cmdQuotes.TabIndex = 135 Me.cmdQuotes.Text = """ """ Me.cmdQuotes.UseVisualStyleBackColor = True @@ -5268,10 +5438,10 @@ Partial Class ucrCalculator 'cmdSquareBrackets ' Me.cmdSquareBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSquareBrackets.Location = New System.Drawing.Point(102, 88) + Me.cmdSquareBrackets.Location = New System.Drawing.Point(80, 72) Me.cmdSquareBrackets.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquareBrackets.Name = "cmdSquareBrackets" - Me.cmdSquareBrackets.Size = New System.Drawing.Size(58, 38) + Me.cmdSquareBrackets.Size = New System.Drawing.Size(46, 30) Me.cmdSquareBrackets.TabIndex = 134 Me.cmdSquareBrackets.Text = "[ ]" Me.cmdSquareBrackets.UseVisualStyleBackColor = True @@ -5279,10 +5449,10 @@ Partial Class ucrCalculator 'cmdIntegerDivision ' Me.cmdIntegerDivision.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdIntegerDivision.Location = New System.Drawing.Point(82, 125) - Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdIntegerDivision.Location = New System.Drawing.Point(65, 101) + Me.cmdIntegerDivision.Margin = New System.Windows.Forms.Padding(2) Me.cmdIntegerDivision.Name = "cmdIntegerDivision" - Me.cmdIntegerDivision.Size = New System.Drawing.Size(78, 38) + Me.cmdIntegerDivision.Size = New System.Drawing.Size(62, 30) Me.cmdIntegerDivision.TabIndex = 135 Me.cmdIntegerDivision.Text = "div (%/%)" Me.cmdIntegerDivision.UseVisualStyleBackColor = True @@ -5290,10 +5460,10 @@ Partial Class ucrCalculator 'cmdModulas ' Me.cmdModulas.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdModulas.Location = New System.Drawing.Point(5, 125) + Me.cmdModulas.Location = New System.Drawing.Point(4, 101) Me.cmdModulas.Margin = New System.Windows.Forms.Padding(2) Me.cmdModulas.Name = "cmdModulas" - Me.cmdModulas.Size = New System.Drawing.Size(78, 38) + Me.cmdModulas.Size = New System.Drawing.Size(62, 30) Me.cmdModulas.TabIndex = 134 Me.cmdModulas.Text = "mod (%%)" Me.cmdModulas.UseVisualStyleBackColor = True @@ -5301,10 +5471,10 @@ Partial Class ucrCalculator 'cmdGreater ' Me.cmdGreater.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdGreater.Location = New System.Drawing.Point(102, 17) - Me.cmdGreater.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdGreater.Location = New System.Drawing.Point(80, 14) + Me.cmdGreater.Margin = New System.Windows.Forms.Padding(2) Me.cmdGreater.Name = "cmdGreater" - Me.cmdGreater.Size = New System.Drawing.Size(58, 38) + Me.cmdGreater.Size = New System.Drawing.Size(46, 30) Me.cmdGreater.TabIndex = 133 Me.cmdGreater.Text = ">" Me.cmdGreater.UseVisualStyleBackColor = True @@ -5312,10 +5482,10 @@ Partial Class ucrCalculator 'cmdLesserOrEqualsTo ' Me.cmdLesserOrEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(53, 17) - Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLesserOrEqualsTo.Location = New System.Drawing.Point(41, 14) + Me.cmdLesserOrEqualsTo.Margin = New System.Windows.Forms.Padding(2) Me.cmdLesserOrEqualsTo.Name = "cmdLesserOrEqualsTo" - Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(50, 38) + Me.cmdLesserOrEqualsTo.Size = New System.Drawing.Size(40, 30) Me.cmdLesserOrEqualsTo.TabIndex = 132 Me.cmdLesserOrEqualsTo.Text = "<=" Me.cmdLesserOrEqualsTo.UseVisualStyleBackColor = True @@ -5323,10 +5493,10 @@ Partial Class ucrCalculator 'cmdLesser ' Me.cmdLesser.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLesser.Location = New System.Drawing.Point(5, 17) + Me.cmdLesser.Location = New System.Drawing.Point(4, 14) Me.cmdLesser.Margin = New System.Windows.Forms.Padding(2) Me.cmdLesser.Name = "cmdLesser" - Me.cmdLesser.Size = New System.Drawing.Size(48, 38) + Me.cmdLesser.Size = New System.Drawing.Size(38, 30) Me.cmdLesser.TabIndex = 131 Me.cmdLesser.Text = "<" Me.cmdLesser.UseVisualStyleBackColor = True @@ -5334,10 +5504,10 @@ Partial Class ucrCalculator 'cmdOr ' Me.cmdOr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr.Location = New System.Drawing.Point(102, 52) - Me.cmdOr.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdOr.Location = New System.Drawing.Point(80, 43) + Me.cmdOr.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr.Name = "cmdOr" - Me.cmdOr.Size = New System.Drawing.Size(58, 38) + Me.cmdOr.Size = New System.Drawing.Size(46, 30) Me.cmdOr.TabIndex = 130 Me.cmdOr.Text = "|" Me.cmdOr.UseVisualStyleBackColor = True @@ -5346,10 +5516,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(5, 88) - Me.cmdNot.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdNot.Location = New System.Drawing.Point(4, 72) + Me.cmdNot.Margin = New System.Windows.Forms.Padding(2) Me.cmdNot.Name = "cmdNot" - Me.cmdNot.Size = New System.Drawing.Size(48, 38) + Me.cmdNot.Size = New System.Drawing.Size(38, 30) Me.cmdNot.TabIndex = 129 Me.cmdNot.Text = "!" Me.cmdNot.UseVisualStyleBackColor = True @@ -5357,10 +5527,10 @@ Partial Class ucrCalculator 'cmdNotEqualsTo ' Me.cmdNotEqualsTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNotEqualsTo.Location = New System.Drawing.Point(53, 52) - Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdNotEqualsTo.Location = New System.Drawing.Point(41, 43) + Me.cmdNotEqualsTo.Margin = New System.Windows.Forms.Padding(2) Me.cmdNotEqualsTo.Name = "cmdNotEqualsTo" - Me.cmdNotEqualsTo.Size = New System.Drawing.Size(50, 38) + Me.cmdNotEqualsTo.Size = New System.Drawing.Size(40, 30) Me.cmdNotEqualsTo.TabIndex = 128 Me.cmdNotEqualsTo.Text = "!=" Me.cmdNotEqualsTo.UseVisualStyleBackColor = True @@ -5368,10 +5538,10 @@ Partial Class ucrCalculator 'cmdEquivalent ' Me.cmdEquivalent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEquivalent.Location = New System.Drawing.Point(5, 52) + Me.cmdEquivalent.Location = New System.Drawing.Point(4, 43) Me.cmdEquivalent.Margin = New System.Windows.Forms.Padding(2) Me.cmdEquivalent.Name = "cmdEquivalent" - Me.cmdEquivalent.Size = New System.Drawing.Size(48, 38) + Me.cmdEquivalent.Size = New System.Drawing.Size(38, 30) Me.cmdEquivalent.TabIndex = 127 Me.cmdEquivalent.Text = "==" Me.cmdEquivalent.UseVisualStyleBackColor = True @@ -5406,9 +5576,11 @@ Partial Class ucrCalculator Me.grpTestString.Controls.Add(Me.cmdLocate) Me.grpTestString.Controls.Add(Me.cmdSquishb) Me.grpTestString.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.grpTestString.Location = New System.Drawing.Point(542, 77) + Me.grpTestString.Location = New System.Drawing.Point(434, 62) + Me.grpTestString.Margin = New System.Windows.Forms.Padding(2) Me.grpTestString.Name = "grpTestString" - Me.grpTestString.Size = New System.Drawing.Size(378, 205) + Me.grpTestString.Padding = New System.Windows.Forms.Padding(2) + Me.grpTestString.Size = New System.Drawing.Size(302, 164) Me.grpTestString.TabIndex = 186 Me.grpTestString.TabStop = False Me.grpTestString.Text = "Text/Strings (Character Columns)" @@ -5417,10 +5589,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(308, 128) - Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdReverseStr.Location = New System.Drawing.Point(245, 101) + Me.cmdReverseStr.Margin = New System.Windows.Forms.Padding(2) Me.cmdReverseStr.Name = "cmdReverseStr" - Me.cmdReverseStr.Size = New System.Drawing.Size(65, 38) + Me.cmdReverseStr.Size = New System.Drawing.Size(52, 30) Me.cmdReverseStr.TabIndex = 165 Me.cmdReverseStr.Tag = "" Me.cmdReverseStr.Text = "reverse" @@ -5429,9 +5601,10 @@ Partial Class ucrCalculator 'cmdEnds ' Me.cmdEnds.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnds.Location = New System.Drawing.Point(150, 92) + Me.cmdEnds.Location = New System.Drawing.Point(120, 72) + Me.cmdEnds.Margin = New System.Windows.Forms.Padding(2) Me.cmdEnds.Name = "cmdEnds" - Me.cmdEnds.Size = New System.Drawing.Size(75, 38) + Me.cmdEnds.Size = New System.Drawing.Size(60, 30) Me.cmdEnds.TabIndex = 164 Me.cmdEnds.Text = "ends" Me.cmdEnds.UseVisualStyleBackColor = True @@ -5440,10 +5613,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(308, 163) - Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTrunck.Location = New System.Drawing.Point(247, 130) + Me.cmdTrunck.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrunck.Name = "cmdTrunck" - Me.cmdTrunck.Size = New System.Drawing.Size(65, 38) + Me.cmdTrunck.Size = New System.Drawing.Size(52, 30) Me.cmdTrunck.TabIndex = 163 Me.cmdTrunck.Text = "trunc " Me.cmdTrunck.UseVisualStyleBackColor = True @@ -5452,10 +5625,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(202, 128) - Me.cmdLenth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLenth.Location = New System.Drawing.Point(161, 101) + Me.cmdLenth.Margin = New System.Windows.Forms.Padding(2) Me.cmdLenth.Name = "cmdLenth" - Me.cmdLenth.Size = New System.Drawing.Size(55, 38) + Me.cmdLenth.Size = New System.Drawing.Size(44, 30) Me.cmdLenth.TabIndex = 162 Me.cmdLenth.Text = "length" Me.cmdLenth.UseVisualStyleBackColor = True @@ -5464,10 +5637,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(255, 128) - Me.cmdGlue.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdGlue.Location = New System.Drawing.Point(204, 101) + Me.cmdGlue.Margin = New System.Windows.Forms.Padding(2) Me.cmdGlue.Name = "cmdGlue" - Me.cmdGlue.Size = New System.Drawing.Size(53, 38) + Me.cmdGlue.Size = New System.Drawing.Size(42, 30) Me.cmdGlue.TabIndex = 161 Me.cmdGlue.Text = "glue" Me.cmdGlue.UseVisualStyleBackColor = True @@ -5476,10 +5649,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(252, 163) - Me.cmdStarts.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdStarts.Location = New System.Drawing.Point(202, 130) + Me.cmdStarts.Margin = New System.Windows.Forms.Padding(2) Me.cmdStarts.Name = "cmdStarts" - Me.cmdStarts.Size = New System.Drawing.Size(58, 38) + Me.cmdStarts.Size = New System.Drawing.Size(46, 30) Me.cmdStarts.TabIndex = 160 Me.cmdStarts.Tag = "" Me.cmdStarts.Text = "starts" @@ -5489,10 +5662,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(138, 163) - Me.cmdReplace2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdReplace2.Location = New System.Drawing.Point(110, 130) + Me.cmdReplace2.Margin = New System.Windows.Forms.Padding(2) Me.cmdReplace2.Name = "cmdReplace2" - Me.cmdReplace2.Size = New System.Drawing.Size(75, 38) + Me.cmdReplace2.Size = New System.Drawing.Size(60, 30) Me.cmdReplace2.TabIndex = 159 Me.cmdReplace2.Tag = "" Me.cmdReplace2.Text = "replace2" @@ -5502,10 +5675,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(77, 163) - Me.cmdReplace.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdReplace.Location = New System.Drawing.Point(61, 130) + Me.cmdReplace.Margin = New System.Windows.Forms.Padding(2) Me.cmdReplace.Name = "cmdReplace" - Me.cmdReplace.Size = New System.Drawing.Size(62, 38) + Me.cmdReplace.Size = New System.Drawing.Size(50, 30) Me.cmdReplace.TabIndex = 158 Me.cmdReplace.Tag = "" Me.cmdReplace.Text = "replace" @@ -5515,10 +5688,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(2, 163) - Me.cmdRemove2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRemove2.Location = New System.Drawing.Point(2, 130) + Me.cmdRemove2.Margin = New System.Windows.Forms.Padding(2) Me.cmdRemove2.Name = "cmdRemove2" - Me.cmdRemove2.Size = New System.Drawing.Size(75, 38) + Me.cmdRemove2.Size = New System.Drawing.Size(60, 30) Me.cmdRemove2.TabIndex = 157 Me.cmdRemove2.Tag = "" Me.cmdRemove2.Text = "remove2" @@ -5528,10 +5701,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(138, 128) - Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRemove1.Location = New System.Drawing.Point(110, 101) + Me.cmdRemove1.Margin = New System.Windows.Forms.Padding(2) Me.cmdRemove1.Name = "cmdRemove1" - Me.cmdRemove1.Size = New System.Drawing.Size(65, 38) + Me.cmdRemove1.Size = New System.Drawing.Size(52, 30) Me.cmdRemove1.TabIndex = 156 Me.cmdRemove1.Tag = "" Me.cmdRemove1.Text = "remove" @@ -5541,10 +5714,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(77, 128) - Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLocate2.Location = New System.Drawing.Point(61, 101) + Me.cmdLocate2.Margin = New System.Windows.Forms.Padding(2) Me.cmdLocate2.Name = "cmdLocate2" - Me.cmdLocate2.Size = New System.Drawing.Size(62, 38) + Me.cmdLocate2.Size = New System.Drawing.Size(50, 30) Me.cmdLocate2.TabIndex = 155 Me.cmdLocate2.Tag = "" Me.cmdLocate2.Text = "locate2" @@ -5554,10 +5727,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(298, 92) - Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdExtract2.Location = New System.Drawing.Point(238, 72) + Me.cmdExtract2.Margin = New System.Windows.Forms.Padding(2) Me.cmdExtract2.Name = "cmdExtract2" - Me.cmdExtract2.Size = New System.Drawing.Size(75, 38) + Me.cmdExtract2.Size = New System.Drawing.Size(60, 30) Me.cmdExtract2.TabIndex = 154 Me.cmdExtract2.Tag = "" Me.cmdExtract2.Text = "extract2" @@ -5567,10 +5740,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(298, 55) - Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdEncodeb.Location = New System.Drawing.Point(238, 43) + Me.cmdEncodeb.Margin = New System.Windows.Forms.Padding(2) Me.cmdEncodeb.Name = "cmdEncodeb" - Me.cmdEncodeb.Size = New System.Drawing.Size(75, 38) + Me.cmdEncodeb.Size = New System.Drawing.Size(60, 30) Me.cmdEncodeb.TabIndex = 151 Me.cmdEncodeb.Text = "encode " Me.cmdEncodeb.UseVisualStyleBackColor = True @@ -5579,10 +5752,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(212, 163) - Me.cmdSub.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSub.Location = New System.Drawing.Point(169, 130) + Me.cmdSub.Margin = New System.Windows.Forms.Padding(2) Me.cmdSub.Name = "cmdSub" - Me.cmdSub.Size = New System.Drawing.Size(42, 38) + Me.cmdSub.Size = New System.Drawing.Size(34, 30) Me.cmdSub.TabIndex = 149 Me.cmdSub.Tag = "" Me.cmdSub.Text = "sub" @@ -5592,10 +5765,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(223, 55) - Me.cmdCombine.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCombine.Location = New System.Drawing.Point(179, 43) + Me.cmdCombine.Margin = New System.Windows.Forms.Padding(2) Me.cmdCombine.Name = "cmdCombine" - Me.cmdCombine.Size = New System.Drawing.Size(75, 38) + Me.cmdCombine.Size = New System.Drawing.Size(60, 30) Me.cmdCombine.TabIndex = 148 Me.cmdCombine.Text = "combine" Me.cmdCombine.UseVisualStyleBackColor = True @@ -5604,10 +5777,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(77, 92) - Me.cmdDetect.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDetect.Location = New System.Drawing.Point(61, 72) + Me.cmdDetect.Margin = New System.Windows.Forms.Padding(2) Me.cmdDetect.Name = "cmdDetect" - Me.cmdDetect.Size = New System.Drawing.Size(75, 38) + Me.cmdDetect.Size = New System.Drawing.Size(60, 30) Me.cmdDetect.TabIndex = 147 Me.cmdDetect.Tag = "" Me.cmdDetect.Text = "detect" @@ -5617,10 +5790,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(223, 18) - Me.cmdTrim.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTrim.Location = New System.Drawing.Point(179, 14) + Me.cmdTrim.Margin = New System.Windows.Forms.Padding(2) Me.cmdTrim.Name = "cmdTrim" - Me.cmdTrim.Size = New System.Drawing.Size(75, 38) + Me.cmdTrim.Size = New System.Drawing.Size(60, 30) Me.cmdTrim.TabIndex = 146 Me.cmdTrim.Text = "trim" Me.cmdTrim.UseVisualStyleBackColor = True @@ -5629,10 +5802,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(150, 18) - Me.cmdTitle.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdTitle.Location = New System.Drawing.Point(120, 14) + Me.cmdTitle.Margin = New System.Windows.Forms.Padding(2) Me.cmdTitle.Name = "cmdTitle" - Me.cmdTitle.Size = New System.Drawing.Size(75, 38) + Me.cmdTitle.Size = New System.Drawing.Size(60, 30) Me.cmdTitle.TabIndex = 142 Me.cmdTitle.Text = "title" Me.cmdTitle.UseVisualStyleBackColor = True @@ -5641,10 +5814,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(77, 18) - Me.cmdLower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLower.Location = New System.Drawing.Point(61, 14) + Me.cmdLower.Margin = New System.Windows.Forms.Padding(2) Me.cmdLower.Name = "cmdLower" - Me.cmdLower.Size = New System.Drawing.Size(75, 38) + Me.cmdLower.Size = New System.Drawing.Size(60, 30) Me.cmdLower.TabIndex = 141 Me.cmdLower.Text = "lower" Me.cmdLower.UseVisualStyleBackColor = True @@ -5653,10 +5826,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(2, 18) - Me.cmdUpper.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdUpper.Location = New System.Drawing.Point(2, 14) + Me.cmdUpper.Margin = New System.Windows.Forms.Padding(2) Me.cmdUpper.Name = "cmdUpper" - Me.cmdUpper.Size = New System.Drawing.Size(75, 38) + Me.cmdUpper.Size = New System.Drawing.Size(60, 30) Me.cmdUpper.TabIndex = 140 Me.cmdUpper.Text = "upper" Me.cmdUpper.UseVisualStyleBackColor = True @@ -5665,10 +5838,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(150, 55) - Me.cmdSort.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSort.Location = New System.Drawing.Point(120, 43) + Me.cmdSort.Margin = New System.Windows.Forms.Padding(2) Me.cmdSort.Name = "cmdSort" - Me.cmdSort.Size = New System.Drawing.Size(75, 38) + Me.cmdSort.Size = New System.Drawing.Size(60, 30) Me.cmdSort.TabIndex = 139 Me.cmdSort.Text = "sort" Me.cmdSort.UseVisualStyleBackColor = True @@ -5677,10 +5850,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(77, 55) - Me.cmdOrder.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdOrder.Location = New System.Drawing.Point(61, 43) + Me.cmdOrder.Margin = New System.Windows.Forms.Padding(2) Me.cmdOrder.Name = "cmdOrder" - Me.cmdOrder.Size = New System.Drawing.Size(75, 38) + Me.cmdOrder.Size = New System.Drawing.Size(60, 30) Me.cmdOrder.TabIndex = 138 Me.cmdOrder.Text = "order" Me.cmdOrder.UseVisualStyleBackColor = True @@ -5689,10 +5862,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(2, 55) - Me.cmdPad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPad.Location = New System.Drawing.Point(2, 43) + Me.cmdPad.Margin = New System.Windows.Forms.Padding(2) Me.cmdPad.Name = "cmdPad" - Me.cmdPad.Size = New System.Drawing.Size(75, 38) + Me.cmdPad.Size = New System.Drawing.Size(60, 30) Me.cmdPad.TabIndex = 137 Me.cmdPad.Text = "pad" Me.cmdPad.UseVisualStyleBackColor = True @@ -5701,10 +5874,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(223, 92) - Me.cmdExtract.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdExtract.Location = New System.Drawing.Point(179, 72) + Me.cmdExtract.Margin = New System.Windows.Forms.Padding(2) Me.cmdExtract.Name = "cmdExtract" - Me.cmdExtract.Size = New System.Drawing.Size(75, 38) + Me.cmdExtract.Size = New System.Drawing.Size(60, 30) Me.cmdExtract.TabIndex = 136 Me.cmdExtract.Text = "extract" Me.cmdExtract.UseVisualStyleBackColor = True @@ -5713,10 +5886,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(2, 92) - Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdCountstrings.Location = New System.Drawing.Point(2, 72) + Me.cmdCountstrings.Margin = New System.Windows.Forms.Padding(2) Me.cmdCountstrings.Name = "cmdCountstrings" - Me.cmdCountstrings.Size = New System.Drawing.Size(75, 38) + Me.cmdCountstrings.Size = New System.Drawing.Size(60, 30) Me.cmdCountstrings.TabIndex = 134 Me.cmdCountstrings.Text = "count" Me.cmdCountstrings.UseVisualStyleBackColor = True @@ -5725,10 +5898,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(2, 128) - Me.cmdLocate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLocate.Location = New System.Drawing.Point(2, 101) + Me.cmdLocate.Margin = New System.Windows.Forms.Padding(2) Me.cmdLocate.Name = "cmdLocate" - Me.cmdLocate.Size = New System.Drawing.Size(75, 38) + Me.cmdLocate.Size = New System.Drawing.Size(60, 30) Me.cmdLocate.TabIndex = 133 Me.cmdLocate.Text = "locate" Me.cmdLocate.UseVisualStyleBackColor = True @@ -5737,10 +5910,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(298, 18) - Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSquishb.Location = New System.Drawing.Point(238, 14) + Me.cmdSquishb.Margin = New System.Windows.Forms.Padding(2) Me.cmdSquishb.Name = "cmdSquishb" - Me.cmdSquishb.Size = New System.Drawing.Size(75, 38) + Me.cmdSquishb.Size = New System.Drawing.Size(60, 30) Me.cmdSquishb.TabIndex = 150 Me.cmdSquishb.Text = "squish " Me.cmdSquishb.UseVisualStyleBackColor = True @@ -5770,11 +5943,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(542, 77) + Me.grpCircular.Location = New System.Drawing.Point(434, 62) Me.grpCircular.Margin = New System.Windows.Forms.Padding(2) Me.grpCircular.Name = "grpCircular" Me.grpCircular.Padding = New System.Windows.Forms.Padding(2) - Me.grpCircular.Size = New System.Drawing.Size(310, 217) + Me.grpCircular.Size = New System.Drawing.Size(248, 174) Me.grpCircular.TabIndex = 192 Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" @@ -5784,21 +5957,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(127, 28) + Me.ContextMenuStripCircular.Size = New System.Drawing.Size(114, 26) ' 'CircularToolStripMenuItem ' Me.CircularToolStripMenuItem.Name = "CircularToolStripMenuItem" - Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(126, 24) + Me.CircularToolStripMenuItem.Size = New System.Drawing.Size(113, 22) Me.CircularToolStripMenuItem.Text = "circular" ' 'cmdCircular ' Me.cmdCircular.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircular.Location = New System.Drawing.Point(2, 22) + Me.cmdCircular.Location = New System.Drawing.Point(2, 18) Me.cmdCircular.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircular.Name = "cmdCircular" - Me.cmdCircular.Size = New System.Drawing.Size(75, 40) + Me.cmdCircular.Size = New System.Drawing.Size(60, 32) Me.cmdCircular.TabIndex = 15 Me.cmdCircular.Text = "circular" Me.cmdCircular.UseVisualStyleBackColor = True @@ -5806,10 +5979,10 @@ Partial Class ucrCalculator 'cmdCircQuantiles ' Me.cmdCircQuantiles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQuantiles.Location = New System.Drawing.Point(150, 100) + Me.cmdCircQuantiles.Location = New System.Drawing.Point(120, 80) Me.cmdCircQuantiles.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQuantiles.Name = "cmdCircQuantiles" - Me.cmdCircQuantiles.Size = New System.Drawing.Size(75, 40) + Me.cmdCircQuantiles.Size = New System.Drawing.Size(60, 32) Me.cmdCircQuantiles.TabIndex = 13 Me.cmdCircQuantiles.Text = "quantiles" Me.cmdCircQuantiles.UseVisualStyleBackColor = True @@ -5817,10 +5990,10 @@ Partial Class ucrCalculator 'cmdCircMax ' Me.cmdCircMax.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMax.Location = New System.Drawing.Point(224, 139) + Me.cmdCircMax.Location = New System.Drawing.Point(179, 111) Me.cmdCircMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMax.Name = "cmdCircMax" - Me.cmdCircMax.Size = New System.Drawing.Size(82, 40) + Me.cmdCircMax.Size = New System.Drawing.Size(66, 32) Me.cmdCircMax.TabIndex = 10 Me.cmdCircMax.Text = "max" Me.cmdCircMax.UseVisualStyleBackColor = True @@ -5828,10 +6001,10 @@ Partial Class ucrCalculator 'cmdA1 ' Me.cmdA1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdA1.Location = New System.Drawing.Point(2, 100) + Me.cmdA1.Location = New System.Drawing.Point(2, 80) Me.cmdA1.Margin = New System.Windows.Forms.Padding(2) Me.cmdA1.Name = "cmdA1" - Me.cmdA1.Size = New System.Drawing.Size(75, 40) + Me.cmdA1.Size = New System.Drawing.Size(60, 32) Me.cmdA1.TabIndex = 8 Me.cmdA1.Text = "A1" Me.cmdA1.UseVisualStyleBackColor = True @@ -5839,10 +6012,10 @@ Partial Class ucrCalculator 'cmdAngVar ' Me.cmdAngVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngVar.Location = New System.Drawing.Point(76, 100) + Me.cmdAngVar.Location = New System.Drawing.Point(61, 80) Me.cmdAngVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdAngVar.Name = "cmdAngVar" - Me.cmdAngVar.Size = New System.Drawing.Size(75, 40) + Me.cmdAngVar.Size = New System.Drawing.Size(60, 32) Me.cmdAngVar.TabIndex = 6 Me.cmdAngVar.Text = "ang.var" Me.cmdAngVar.UseVisualStyleBackColor = True @@ -5850,10 +6023,10 @@ Partial Class ucrCalculator 'cmdCircRho ' Me.cmdCircRho.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRho.Location = New System.Drawing.Point(224, 100) + Me.cmdCircRho.Location = New System.Drawing.Point(179, 80) Me.cmdCircRho.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircRho.Name = "cmdCircRho" - Me.cmdCircRho.Size = New System.Drawing.Size(82, 40) + Me.cmdCircRho.Size = New System.Drawing.Size(66, 32) Me.cmdCircRho.TabIndex = 14 Me.cmdCircRho.Text = "rho" Me.cmdCircRho.UseVisualStyleBackColor = True @@ -5861,10 +6034,10 @@ Partial Class ucrCalculator 'cmdCircQ3 ' Me.cmdCircQ3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ3.Location = New System.Drawing.Point(150, 139) + Me.cmdCircQ3.Location = New System.Drawing.Point(120, 111) Me.cmdCircQ3.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQ3.Name = "cmdCircQ3" - Me.cmdCircQ3.Size = New System.Drawing.Size(75, 40) + Me.cmdCircQ3.Size = New System.Drawing.Size(60, 32) Me.cmdCircQ3.TabIndex = 12 Me.cmdCircQ3.Text = "q3" Me.cmdCircQ3.UseVisualStyleBackColor = True @@ -5872,10 +6045,10 @@ Partial Class ucrCalculator 'cmdCircQ1 ' Me.cmdCircQ1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircQ1.Location = New System.Drawing.Point(76, 139) + Me.cmdCircQ1.Location = New System.Drawing.Point(61, 111) Me.cmdCircQ1.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircQ1.Name = "cmdCircQ1" - Me.cmdCircQ1.Size = New System.Drawing.Size(75, 40) + Me.cmdCircQ1.Size = New System.Drawing.Size(60, 32) Me.cmdCircQ1.TabIndex = 11 Me.cmdCircQ1.Text = "q1" Me.cmdCircQ1.UseVisualStyleBackColor = True @@ -5883,10 +6056,10 @@ Partial Class ucrCalculator 'cmdCircMin ' Me.cmdCircMin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMin.Location = New System.Drawing.Point(2, 139) + Me.cmdCircMin.Location = New System.Drawing.Point(2, 111) Me.cmdCircMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMin.Name = "cmdCircMin" - Me.cmdCircMin.Size = New System.Drawing.Size(75, 40) + Me.cmdCircMin.Size = New System.Drawing.Size(60, 32) Me.cmdCircMin.TabIndex = 9 Me.cmdCircMin.Text = "min" Me.cmdCircMin.UseVisualStyleBackColor = True @@ -5894,10 +6067,10 @@ Partial Class ucrCalculator 'cmdAngDev ' Me.cmdAngDev.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAngDev.Location = New System.Drawing.Point(150, 61) + Me.cmdAngDev.Location = New System.Drawing.Point(120, 49) Me.cmdAngDev.Margin = New System.Windows.Forms.Padding(2) Me.cmdAngDev.Name = "cmdAngDev" - Me.cmdAngDev.Size = New System.Drawing.Size(75, 40) + Me.cmdAngDev.Size = New System.Drawing.Size(60, 32) Me.cmdAngDev.TabIndex = 7 Me.cmdAngDev.Text = "ang.dev" Me.cmdAngDev.UseVisualStyleBackColor = True @@ -5905,10 +6078,10 @@ Partial Class ucrCalculator 'cmdCircVar ' Me.cmdCircVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircVar.Location = New System.Drawing.Point(224, 61) + Me.cmdCircVar.Location = New System.Drawing.Point(179, 49) Me.cmdCircVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircVar.Name = "cmdCircVar" - Me.cmdCircVar.Size = New System.Drawing.Size(82, 40) + Me.cmdCircVar.Size = New System.Drawing.Size(66, 32) Me.cmdCircVar.TabIndex = 5 Me.cmdCircVar.Text = "var" Me.cmdCircVar.UseVisualStyleBackColor = True @@ -5916,10 +6089,10 @@ Partial Class ucrCalculator 'cmdCircSd ' Me.cmdCircSd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircSd.Location = New System.Drawing.Point(76, 61) + Me.cmdCircSd.Location = New System.Drawing.Point(61, 49) Me.cmdCircSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircSd.Name = "cmdCircSd" - Me.cmdCircSd.Size = New System.Drawing.Size(75, 40) + Me.cmdCircSd.Size = New System.Drawing.Size(60, 32) Me.cmdCircSd.TabIndex = 4 Me.cmdCircSd.Text = "sd" Me.cmdCircSd.UseVisualStyleBackColor = True @@ -5927,10 +6100,10 @@ Partial Class ucrCalculator 'cmdCircRange ' Me.cmdCircRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircRange.Location = New System.Drawing.Point(2, 61) + Me.cmdCircRange.Location = New System.Drawing.Point(2, 49) Me.cmdCircRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircRange.Name = "cmdCircRange" - Me.cmdCircRange.Size = New System.Drawing.Size(75, 40) + Me.cmdCircRange.Size = New System.Drawing.Size(60, 32) Me.cmdCircRange.TabIndex = 3 Me.cmdCircRange.Text = "range" Me.cmdCircRange.UseVisualStyleBackColor = True @@ -5938,10 +6111,10 @@ Partial Class ucrCalculator 'cmdMedianHL ' Me.cmdMedianHL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMedianHL.Location = New System.Drawing.Point(224, 22) + Me.cmdMedianHL.Location = New System.Drawing.Point(179, 18) Me.cmdMedianHL.Margin = New System.Windows.Forms.Padding(2) Me.cmdMedianHL.Name = "cmdMedianHL" - Me.cmdMedianHL.Size = New System.Drawing.Size(82, 40) + Me.cmdMedianHL.Size = New System.Drawing.Size(66, 32) Me.cmdMedianHL.TabIndex = 2 Me.cmdMedianHL.Text = "medianHL" Me.cmdMedianHL.UseVisualStyleBackColor = True @@ -5949,10 +6122,10 @@ Partial Class ucrCalculator 'cmdCircMedian ' Me.cmdCircMedian.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMedian.Location = New System.Drawing.Point(150, 22) + Me.cmdCircMedian.Location = New System.Drawing.Point(120, 18) Me.cmdCircMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMedian.Name = "cmdCircMedian" - Me.cmdCircMedian.Size = New System.Drawing.Size(75, 40) + Me.cmdCircMedian.Size = New System.Drawing.Size(60, 32) Me.cmdCircMedian.TabIndex = 1 Me.cmdCircMedian.Text = "median" Me.cmdCircMedian.UseVisualStyleBackColor = True @@ -5960,10 +6133,10 @@ Partial Class ucrCalculator 'cmdCircMean ' Me.cmdCircMean.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCircMean.Location = New System.Drawing.Point(76, 22) + Me.cmdCircMean.Location = New System.Drawing.Point(61, 18) Me.cmdCircMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircMean.Name = "cmdCircMean" - Me.cmdCircMean.Size = New System.Drawing.Size(75, 40) + Me.cmdCircMean.Size = New System.Drawing.Size(60, 32) Me.cmdCircMean.TabIndex = 0 Me.cmdCircMean.Text = "mean" Me.cmdCircMean.UseVisualStyleBackColor = True @@ -5974,11 +6147,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(542, 287) + Me.grpModifier.Location = New System.Drawing.Point(434, 230) Me.grpModifier.Margin = New System.Windows.Forms.Padding(2) Me.grpModifier.Name = "grpModifier" Me.grpModifier.Padding = New System.Windows.Forms.Padding(2) - Me.grpModifier.Size = New System.Drawing.Size(320, 67) + Me.grpModifier.Size = New System.Drawing.Size(256, 54) Me.grpModifier.TabIndex = 192 Me.grpModifier.TabStop = False Me.grpModifier.Text = "Modifier" @@ -5986,10 +6159,10 @@ Partial Class ucrCalculator 'cmdRegex ' Me.cmdRegex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRegex.Location = New System.Drawing.Point(235, 17) + Me.cmdRegex.Location = New System.Drawing.Point(185, 14) Me.cmdRegex.Margin = New System.Windows.Forms.Padding(2) Me.cmdRegex.Name = "cmdRegex" - Me.cmdRegex.Size = New System.Drawing.Size(78, 38) + Me.cmdRegex.Size = New System.Drawing.Size(62, 30) Me.cmdRegex.TabIndex = 3 Me.cmdRegex.Text = "regex" Me.cmdRegex.UseVisualStyleBackColor = True @@ -5997,10 +6170,10 @@ Partial Class ucrCalculator 'cmdFixed ' Me.cmdFixed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFixed.Location = New System.Drawing.Point(158, 17) + Me.cmdFixed.Location = New System.Drawing.Point(124, 14) Me.cmdFixed.Margin = New System.Windows.Forms.Padding(2) Me.cmdFixed.Name = "cmdFixed" - Me.cmdFixed.Size = New System.Drawing.Size(78, 38) + Me.cmdFixed.Size = New System.Drawing.Size(62, 30) Me.cmdFixed.TabIndex = 2 Me.cmdFixed.Text = "fixed" Me.cmdFixed.UseVisualStyleBackColor = True @@ -6008,10 +6181,10 @@ Partial Class ucrCalculator 'cmdCollate ' Me.cmdCollate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCollate.Location = New System.Drawing.Point(80, 17) + Me.cmdCollate.Location = New System.Drawing.Point(63, 14) Me.cmdCollate.Margin = New System.Windows.Forms.Padding(2) Me.cmdCollate.Name = "cmdCollate" - Me.cmdCollate.Size = New System.Drawing.Size(78, 38) + Me.cmdCollate.Size = New System.Drawing.Size(62, 30) Me.cmdCollate.TabIndex = 1 Me.cmdCollate.Text = "collate" Me.cmdCollate.UseVisualStyleBackColor = True @@ -6019,10 +6192,10 @@ Partial Class ucrCalculator 'cmdBoundary ' Me.cmdBoundary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBoundary.Location = New System.Drawing.Point(2, 17) + Me.cmdBoundary.Location = New System.Drawing.Point(2, 14) Me.cmdBoundary.Margin = New System.Windows.Forms.Padding(2) Me.cmdBoundary.Name = "cmdBoundary" - Me.cmdBoundary.Size = New System.Drawing.Size(78, 38) + Me.cmdBoundary.Size = New System.Drawing.Size(62, 30) Me.cmdBoundary.TabIndex = 0 Me.cmdBoundary.Text = "boundary" Me.cmdBoundary.UseVisualStyleBackColor = True @@ -6044,11 +6217,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(542, 359) + Me.grpSymbols.Location = New System.Drawing.Point(434, 287) Me.grpSymbols.Margin = New System.Windows.Forms.Padding(2) Me.grpSymbols.Name = "grpSymbols" Me.grpSymbols.Padding = New System.Windows.Forms.Padding(2) - Me.grpSymbols.Size = New System.Drawing.Size(395, 140) + Me.grpSymbols.Size = New System.Drawing.Size(316, 112) Me.grpSymbols.TabIndex = 193 Me.grpSymbols.TabStop = False Me.grpSymbols.Text = "Symbols" @@ -6056,10 +6229,10 @@ Partial Class ucrCalculator 'cmdOr3 ' Me.cmdOr3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr3.Location = New System.Drawing.Point(158, 58) + Me.cmdOr3.Location = New System.Drawing.Point(124, 45) Me.cmdOr3.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr3.Name = "cmdOr3" - Me.cmdOr3.Size = New System.Drawing.Size(78, 38) + Me.cmdOr3.Size = New System.Drawing.Size(62, 30) Me.cmdOr3.TabIndex = 16 Me.cmdOr3.Text = "| or" Me.cmdOr3.UseVisualStyleBackColor = True @@ -6067,10 +6240,10 @@ Partial Class ucrCalculator 'cmdEscape ' Me.cmdEscape.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEscape.Location = New System.Drawing.Point(237, 93) + Me.cmdEscape.Location = New System.Drawing.Point(185, 74) Me.cmdEscape.Margin = New System.Windows.Forms.Padding(2) Me.cmdEscape.Name = "cmdEscape" - Me.cmdEscape.Size = New System.Drawing.Size(78, 38) + Me.cmdEscape.Size = New System.Drawing.Size(62, 30) Me.cmdEscape.TabIndex = 14 Me.cmdEscape.Text = "\\ escape" Me.cmdEscape.UseVisualStyleBackColor = True @@ -6078,10 +6251,10 @@ Partial Class ucrCalculator 'cmdPlusZero ' Me.cmdPlusZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusZero.Location = New System.Drawing.Point(313, 93) + Me.cmdPlusZero.Location = New System.Drawing.Point(246, 74) Me.cmdPlusZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusZero.Name = "cmdPlusZero" - Me.cmdPlusZero.Size = New System.Drawing.Size(78, 38) + Me.cmdPlusZero.Size = New System.Drawing.Size(62, 30) Me.cmdPlusZero.TabIndex = 15 Me.cmdPlusZero.Text = "- to" Me.cmdPlusZero.UseVisualStyleBackColor = True @@ -6089,10 +6262,10 @@ Partial Class ucrCalculator 'cmdZero ' Me.cmdZero.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZero.Location = New System.Drawing.Point(158, 93) + Me.cmdZero.Location = New System.Drawing.Point(124, 74) Me.cmdZero.Margin = New System.Windows.Forms.Padding(2) Me.cmdZero.Name = "cmdZero" - Me.cmdZero.Size = New System.Drawing.Size(78, 38) + Me.cmdZero.Size = New System.Drawing.Size(62, 30) Me.cmdZero.TabIndex = 13 Me.cmdZero.Text = "* 0+" Me.cmdZero.UseVisualStyleBackColor = True @@ -6100,10 +6273,10 @@ Partial Class ucrCalculator 'cmdPlusOne ' Me.cmdPlusOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlusOne.Location = New System.Drawing.Point(80, 93) + Me.cmdPlusOne.Location = New System.Drawing.Point(63, 74) Me.cmdPlusOne.Margin = New System.Windows.Forms.Padding(2) Me.cmdPlusOne.Name = "cmdPlusOne" - Me.cmdPlusOne.Size = New System.Drawing.Size(78, 38) + Me.cmdPlusOne.Size = New System.Drawing.Size(62, 30) Me.cmdPlusOne.TabIndex = 12 Me.cmdPlusOne.Text = "+ 1+" Me.cmdPlusOne.UseVisualStyleBackColor = True @@ -6111,10 +6284,10 @@ Partial Class ucrCalculator 'cmdZeroOrOne ' Me.cmdZeroOrOne.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdZeroOrOne.Location = New System.Drawing.Point(2, 93) + Me.cmdZeroOrOne.Location = New System.Drawing.Point(2, 74) Me.cmdZeroOrOne.Margin = New System.Windows.Forms.Padding(2) Me.cmdZeroOrOne.Name = "cmdZeroOrOne" - Me.cmdZeroOrOne.Size = New System.Drawing.Size(78, 38) + Me.cmdZeroOrOne.Size = New System.Drawing.Size(62, 30) Me.cmdZeroOrOne.TabIndex = 11 Me.cmdZeroOrOne.Text = "? 0 or 1" Me.cmdZeroOrOne.UseVisualStyleBackColor = True @@ -6122,10 +6295,10 @@ Partial Class ucrCalculator 'cmdNumbers ' Me.cmdNumbers.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNumbers.Location = New System.Drawing.Point(313, 58) + Me.cmdNumbers.Location = New System.Drawing.Point(246, 45) Me.cmdNumbers.Margin = New System.Windows.Forms.Padding(2) Me.cmdNumbers.Name = "cmdNumbers" - Me.cmdNumbers.Size = New System.Drawing.Size(78, 38) + Me.cmdNumbers.Size = New System.Drawing.Size(62, 30) Me.cmdNumbers.TabIndex = 10 Me.cmdNumbers.Text = "{ m,n } " Me.cmdNumbers.UseVisualStyleBackColor = True @@ -6133,10 +6306,10 @@ Partial Class ucrCalculator 'cmdNot1 ' Me.cmdNot1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNot1.Location = New System.Drawing.Point(80, 58) + Me.cmdNot1.Location = New System.Drawing.Point(63, 45) Me.cmdNot1.Margin = New System.Windows.Forms.Padding(2) Me.cmdNot1.Name = "cmdNot1" - Me.cmdNot1.Size = New System.Drawing.Size(78, 38) + Me.cmdNot1.Size = New System.Drawing.Size(62, 30) Me.cmdNot1.TabIndex = 8 Me.cmdNot1.Text = "[^ ] not" Me.cmdNot1.UseVisualStyleBackColor = True @@ -6144,10 +6317,10 @@ Partial Class ucrCalculator 'cmdOr2 ' Me.cmdOr2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr2.Location = New System.Drawing.Point(237, 58) + Me.cmdOr2.Location = New System.Drawing.Point(185, 45) Me.cmdOr2.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr2.Name = "cmdOr2" - Me.cmdOr2.Size = New System.Drawing.Size(78, 38) + Me.cmdOr2.Size = New System.Drawing.Size(62, 30) Me.cmdOr2.TabIndex = 9 Me.cmdOr2.Text = "{ n} " Me.cmdOr2.UseVisualStyleBackColor = True @@ -6155,10 +6328,10 @@ Partial Class ucrCalculator 'cmdOr1 ' Me.cmdOr1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr1.Location = New System.Drawing.Point(2, 58) + Me.cmdOr1.Location = New System.Drawing.Point(2, 45) Me.cmdOr1.Margin = New System.Windows.Forms.Padding(2) Me.cmdOr1.Name = "cmdOr1" - Me.cmdOr1.Size = New System.Drawing.Size(78, 38) + Me.cmdOr1.Size = New System.Drawing.Size(62, 30) Me.cmdOr1.TabIndex = 7 Me.cmdOr1.Text = "[ ] or" Me.cmdOr1.UseVisualStyleBackColor = True @@ -6166,10 +6339,10 @@ Partial Class ucrCalculator 'cmdSpace ' Me.cmdSpace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSpace.Location = New System.Drawing.Point(313, 20) + Me.cmdSpace.Location = New System.Drawing.Point(246, 16) Me.cmdSpace.Margin = New System.Windows.Forms.Padding(2) Me.cmdSpace.Name = "cmdSpace" - Me.cmdSpace.Size = New System.Drawing.Size(78, 38) + Me.cmdSpace.Size = New System.Drawing.Size(62, 30) Me.cmdSpace.TabIndex = 6 Me.cmdSpace.Text = "\\s space" Me.cmdSpace.UseVisualStyleBackColor = True @@ -6177,10 +6350,10 @@ Partial Class ucrCalculator 'cmdDigit ' Me.cmdDigit.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDigit.Location = New System.Drawing.Point(237, 20) + Me.cmdDigit.Location = New System.Drawing.Point(185, 16) Me.cmdDigit.Margin = New System.Windows.Forms.Padding(2) Me.cmdDigit.Name = "cmdDigit" - Me.cmdDigit.Size = New System.Drawing.Size(78, 38) + Me.cmdDigit.Size = New System.Drawing.Size(62, 30) Me.cmdDigit.TabIndex = 5 Me.cmdDigit.Text = "\\d digit" Me.cmdDigit.UseVisualStyleBackColor = True @@ -6188,10 +6361,10 @@ Partial Class ucrCalculator 'cmdEnd1 ' Me.cmdEnd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEnd1.Location = New System.Drawing.Point(158, 20) + Me.cmdEnd1.Location = New System.Drawing.Point(124, 16) Me.cmdEnd1.Margin = New System.Windows.Forms.Padding(2) Me.cmdEnd1.Name = "cmdEnd1" - Me.cmdEnd1.Size = New System.Drawing.Size(78, 38) + Me.cmdEnd1.Size = New System.Drawing.Size(62, 30) Me.cmdEnd1.TabIndex = 4 Me.cmdEnd1.Text = "$ end" Me.cmdEnd1.UseVisualStyleBackColor = True @@ -6199,10 +6372,10 @@ Partial Class ucrCalculator 'cmdbegin ' Me.cmdbegin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdbegin.Location = New System.Drawing.Point(80, 20) + Me.cmdbegin.Location = New System.Drawing.Point(63, 16) Me.cmdbegin.Margin = New System.Windows.Forms.Padding(2) Me.cmdbegin.Name = "cmdbegin" - Me.cmdbegin.Size = New System.Drawing.Size(78, 38) + Me.cmdbegin.Size = New System.Drawing.Size(62, 30) Me.cmdbegin.TabIndex = 3 Me.cmdbegin.Text = "^ begin" Me.cmdbegin.UseVisualStyleBackColor = True @@ -6210,10 +6383,10 @@ Partial Class ucrCalculator 'cmdAny1 ' Me.cmdAny1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdAny1.Location = New System.Drawing.Point(2, 20) + Me.cmdAny1.Location = New System.Drawing.Point(2, 16) Me.cmdAny1.Margin = New System.Windows.Forms.Padding(2) Me.cmdAny1.Name = "cmdAny1" - Me.cmdAny1.Size = New System.Drawing.Size(78, 38) + Me.cmdAny1.Size = New System.Drawing.Size(62, 30) Me.cmdAny1.TabIndex = 2 Me.cmdAny1.Text = ". any" Me.cmdAny1.UseVisualStyleBackColor = True @@ -6246,9 +6419,11 @@ Partial Class ucrCalculator Me.grpComplex.Controls.Add(Me.cmdImaginary) Me.grpComplex.Controls.Add(Me.cmdReal) Me.grpComplex.Controls.Add(Me.cmdComplex) - Me.grpComplex.Location = New System.Drawing.Point(542, 87) + Me.grpComplex.Location = New System.Drawing.Point(434, 70) + Me.grpComplex.Margin = New System.Windows.Forms.Padding(2) Me.grpComplex.Name = "grpComplex" - Me.grpComplex.Size = New System.Drawing.Size(360, 282) + Me.grpComplex.Padding = New System.Windows.Forms.Padding(2) + Me.grpComplex.Size = New System.Drawing.Size(288, 226) Me.grpComplex.TabIndex = 198 Me.grpComplex.TabStop = False Me.grpComplex.Text = "Complex" @@ -6257,10 +6432,10 @@ Partial Class ucrCalculator ' Me.cmdComplexAsin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAsin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAsin.Location = New System.Drawing.Point(30, 128) - Me.cmdComplexAsin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexAsin.Location = New System.Drawing.Point(24, 105) + Me.cmdComplexAsin.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexAsin.Name = "cmdComplexAsin" - Me.cmdComplexAsin.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexAsin.Size = New System.Drawing.Size(66, 30) Me.cmdComplexAsin.TabIndex = 217 Me.cmdComplexAsin.Text = "asin" Me.cmdComplexAsin.UseVisualStyleBackColor = True @@ -6269,10 +6444,10 @@ Partial Class ucrCalculator ' Me.cmdComplexAtan.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAtan.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAtan.Location = New System.Drawing.Point(198, 128) - Me.cmdComplexAtan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexAtan.Location = New System.Drawing.Point(158, 105) + Me.cmdComplexAtan.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexAtan.Name = "cmdComplexAtan" - Me.cmdComplexAtan.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexAtan.Size = New System.Drawing.Size(66, 30) Me.cmdComplexAtan.TabIndex = 216 Me.cmdComplexAtan.Text = "atan" Me.cmdComplexAtan.UseVisualStyleBackColor = True @@ -6281,10 +6456,10 @@ Partial Class ucrCalculator ' Me.cmdComplexAcos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexAcos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexAcos.Location = New System.Drawing.Point(111, 128) - Me.cmdComplexAcos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexAcos.Location = New System.Drawing.Point(89, 105) + Me.cmdComplexAcos.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexAcos.Name = "cmdComplexAcos" - Me.cmdComplexAcos.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexAcos.Size = New System.Drawing.Size(70, 30) Me.cmdComplexAcos.TabIndex = 215 Me.cmdComplexAcos.Text = "acos" Me.cmdComplexAcos.UseVisualStyleBackColor = True @@ -6293,10 +6468,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(111, 22) - Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdAsComplex.Location = New System.Drawing.Point(89, 18) + Me.cmdAsComplex.Margin = New System.Windows.Forms.Padding(2) Me.cmdAsComplex.Name = "cmdAsComplex" - Me.cmdAsComplex.Size = New System.Drawing.Size(88, 38) + Me.cmdAsComplex.Size = New System.Drawing.Size(70, 30) Me.cmdAsComplex.TabIndex = 211 Me.cmdAsComplex.Text = "as.complex" Me.cmdAsComplex.UseVisualStyleBackColor = True @@ -6305,10 +6480,10 @@ Partial Class ucrCalculator ' Me.cmdComplexi.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplexi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplexi.Location = New System.Drawing.Point(30, 237) - Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexi.Location = New System.Drawing.Point(24, 192) + Me.cmdComplexi.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexi.Name = "cmdComplexi" - Me.cmdComplexi.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexi.Size = New System.Drawing.Size(66, 30) Me.cmdComplexi.TabIndex = 210 Me.cmdComplexi.Text = "i" Me.cmdComplexi.UseVisualStyleBackColor = True @@ -6317,10 +6492,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(198, 164) - Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexTanH.Location = New System.Drawing.Point(158, 134) + Me.cmdComplexTanH.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexTanH.Name = "cmdComplexTanH" - Me.cmdComplexTanH.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexTanH.Size = New System.Drawing.Size(66, 30) Me.cmdComplexTanH.TabIndex = 208 Me.cmdComplexTanH.Text = "tanh" Me.cmdComplexTanH.UseVisualStyleBackColor = True @@ -6329,10 +6504,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(198, 92) - Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexTan.Location = New System.Drawing.Point(158, 76) + Me.cmdComplexTan.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexTan.Name = "cmdComplexTan" - Me.cmdComplexTan.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexTan.Size = New System.Drawing.Size(66, 30) Me.cmdComplexTan.TabIndex = 207 Me.cmdComplexTan.Text = "tan" Me.cmdComplexTan.UseVisualStyleBackColor = True @@ -6341,10 +6516,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(279, 128) - Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexPi.Location = New System.Drawing.Point(223, 105) + Me.cmdComplexPi.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexPi.Name = "cmdComplexPi" - Me.cmdComplexPi.Size = New System.Drawing.Size(78, 38) + Me.cmdComplexPi.Size = New System.Drawing.Size(62, 30) Me.cmdComplexPi.TabIndex = 206 Me.cmdComplexPi.Text = "pi" Me.cmdComplexPi.UseVisualStyleBackColor = True @@ -6353,10 +6528,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(279, 92) - Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexDeg.Location = New System.Drawing.Point(223, 76) + Me.cmdComplexDeg.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexDeg.Name = "cmdComplexDeg" - Me.cmdComplexDeg.Size = New System.Drawing.Size(79, 38) + Me.cmdComplexDeg.Size = New System.Drawing.Size(63, 30) Me.cmdComplexDeg.TabIndex = 205 Me.cmdComplexDeg.Text = "deg" Me.cmdComplexDeg.UseVisualStyleBackColor = True @@ -6365,10 +6540,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(279, 58) - Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexRad.Location = New System.Drawing.Point(223, 47) + Me.cmdComplexRad.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexRad.Name = "cmdComplexRad" - Me.cmdComplexRad.Size = New System.Drawing.Size(79, 38) + Me.cmdComplexRad.Size = New System.Drawing.Size(63, 30) Me.cmdComplexRad.TabIndex = 204 Me.cmdComplexRad.Text = "rad" Me.cmdComplexRad.UseVisualStyleBackColor = True @@ -6377,10 +6552,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(198, 200) - Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexSignif.Location = New System.Drawing.Point(158, 163) + Me.cmdComplexSignif.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSignif.Name = "cmdComplexSignif" - Me.cmdComplexSignif.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexSignif.Size = New System.Drawing.Size(66, 30) Me.cmdComplexSignif.TabIndex = 203 Me.cmdComplexSignif.Text = "signif" Me.cmdComplexSignif.UseVisualStyleBackColor = True @@ -6389,10 +6564,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(111, 164) - Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexCosH.Location = New System.Drawing.Point(89, 134) + Me.cmdComplexCosH.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexCosH.Name = "cmdComplexCosH" - Me.cmdComplexCosH.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexCosH.Size = New System.Drawing.Size(70, 30) Me.cmdComplexCosH.TabIndex = 202 Me.cmdComplexCosH.Text = "cosh" Me.cmdComplexCosH.UseVisualStyleBackColor = True @@ -6401,10 +6576,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(30, 164) - Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexSinH.Location = New System.Drawing.Point(24, 134) + Me.cmdComplexSinH.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSinH.Name = "cmdComplexSinH" - Me.cmdComplexSinH.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexSinH.Size = New System.Drawing.Size(66, 30) Me.cmdComplexSinH.TabIndex = 201 Me.cmdComplexSinH.Text = "sinh" Me.cmdComplexSinH.UseVisualStyleBackColor = True @@ -6413,10 +6588,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(111, 92) - Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexCos.Location = New System.Drawing.Point(89, 76) + Me.cmdComplexCos.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexCos.Name = "cmdComplexCos" - Me.cmdComplexCos.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexCos.Size = New System.Drawing.Size(70, 30) Me.cmdComplexCos.TabIndex = 200 Me.cmdComplexCos.Text = "cos" Me.cmdComplexCos.UseVisualStyleBackColor = True @@ -6425,10 +6600,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(30, 92) - Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexSin.Location = New System.Drawing.Point(24, 76) + Me.cmdComplexSin.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSin.Name = "cmdComplexSin" - Me.cmdComplexSin.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexSin.Size = New System.Drawing.Size(66, 30) Me.cmdComplexSin.TabIndex = 199 Me.cmdComplexSin.Text = "sin" Me.cmdComplexSin.UseVisualStyleBackColor = True @@ -6437,10 +6612,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(279, 164) - Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexExp.Location = New System.Drawing.Point(223, 134) + Me.cmdComplexExp.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexExp.Name = "cmdComplexExp" - Me.cmdComplexExp.Size = New System.Drawing.Size(79, 38) + Me.cmdComplexExp.Size = New System.Drawing.Size(63, 30) Me.cmdComplexExp.TabIndex = 192 Me.cmdComplexExp.Text = "exp" Me.cmdComplexExp.UseVisualStyleBackColor = True @@ -6449,10 +6624,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(111, 200) - Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexRound.Location = New System.Drawing.Point(89, 163) + Me.cmdComplexRound.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexRound.Name = "cmdComplexRound" - Me.cmdComplexRound.Size = New System.Drawing.Size(88, 38) + Me.cmdComplexRound.Size = New System.Drawing.Size(70, 30) Me.cmdComplexRound.TabIndex = 191 Me.cmdComplexRound.Text = "round" Me.cmdComplexRound.UseVisualStyleBackColor = True @@ -6461,10 +6636,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(279, 200) - Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexLog.Location = New System.Drawing.Point(223, 163) + Me.cmdComplexLog.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexLog.Name = "cmdComplexLog" - Me.cmdComplexLog.Size = New System.Drawing.Size(79, 38) + Me.cmdComplexLog.Size = New System.Drawing.Size(63, 30) Me.cmdComplexLog.TabIndex = 190 Me.cmdComplexLog.Text = "log" Me.cmdComplexLog.UseVisualStyleBackColor = True @@ -6473,10 +6648,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(30, 200) - Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplexSqrt.Location = New System.Drawing.Point(24, 163) + Me.cmdComplexSqrt.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexSqrt.Name = "cmdComplexSqrt" - Me.cmdComplexSqrt.Size = New System.Drawing.Size(82, 38) + Me.cmdComplexSqrt.Size = New System.Drawing.Size(66, 30) Me.cmdComplexSqrt.TabIndex = 189 Me.cmdComplexSqrt.Text = "sqrt" Me.cmdComplexSqrt.UseVisualStyleBackColor = True @@ -6485,10 +6660,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(198, 58) - Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdConjugate.Location = New System.Drawing.Point(158, 47) + Me.cmdConjugate.Margin = New System.Windows.Forms.Padding(2) Me.cmdConjugate.Name = "cmdConjugate" - Me.cmdConjugate.Size = New System.Drawing.Size(82, 38) + Me.cmdConjugate.Size = New System.Drawing.Size(66, 30) Me.cmdConjugate.TabIndex = 188 Me.cmdConjugate.Text = "conjugate" Me.cmdConjugate.UseVisualStyleBackColor = True @@ -6497,10 +6672,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(111, 58) - Me.cmdArg.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdArg.Location = New System.Drawing.Point(89, 47) + Me.cmdArg.Margin = New System.Windows.Forms.Padding(2) Me.cmdArg.Name = "cmdArg" - Me.cmdArg.Size = New System.Drawing.Size(88, 38) + Me.cmdArg.Size = New System.Drawing.Size(70, 30) Me.cmdArg.TabIndex = 187 Me.cmdArg.Text = "arg" Me.cmdArg.UseVisualStyleBackColor = True @@ -6509,10 +6684,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(30, 58) - Me.cmdMod.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMod.Location = New System.Drawing.Point(24, 47) + Me.cmdMod.Margin = New System.Windows.Forms.Padding(2) Me.cmdMod.Name = "cmdMod" - Me.cmdMod.Size = New System.Drawing.Size(82, 38) + Me.cmdMod.Size = New System.Drawing.Size(66, 30) Me.cmdMod.TabIndex = 186 Me.cmdMod.Text = "mod" Me.cmdMod.UseVisualStyleBackColor = True @@ -6521,10 +6696,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(279, 22) - Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdImaginary.Location = New System.Drawing.Point(223, 18) + Me.cmdImaginary.Margin = New System.Windows.Forms.Padding(2) Me.cmdImaginary.Name = "cmdImaginary" - Me.cmdImaginary.Size = New System.Drawing.Size(79, 38) + Me.cmdImaginary.Size = New System.Drawing.Size(63, 30) Me.cmdImaginary.TabIndex = 185 Me.cmdImaginary.Text = "imaginary" Me.cmdImaginary.UseVisualStyleBackColor = True @@ -6533,10 +6708,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(198, 22) - Me.cmdReal.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdReal.Location = New System.Drawing.Point(158, 18) + Me.cmdReal.Margin = New System.Windows.Forms.Padding(2) Me.cmdReal.Name = "cmdReal" - Me.cmdReal.Size = New System.Drawing.Size(82, 38) + Me.cmdReal.Size = New System.Drawing.Size(66, 30) Me.cmdReal.TabIndex = 177 Me.cmdReal.Text = "real" Me.cmdReal.UseVisualStyleBackColor = True @@ -6545,10 +6720,10 @@ Partial Class ucrCalculator ' Me.cmdComplex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdComplex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComplex.Location = New System.Drawing.Point(30, 22) - Me.cmdComplex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdComplex.Location = New System.Drawing.Point(24, 18) + Me.cmdComplex.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplex.Name = "cmdComplex" - Me.cmdComplex.Size = New System.Drawing.Size(82, 38) + Me.cmdComplex.Size = New System.Drawing.Size(66, 30) Me.cmdComplex.TabIndex = 176 Me.cmdComplex.Text = "complex" Me.cmdComplex.UseVisualStyleBackColor = True @@ -6558,18 +6733,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(123, 52) + Me.ContextMenuStripTxtString.Size = New System.Drawing.Size(110, 48) ' 'TxTStringrToolStripMenuItem ' Me.TxTStringrToolStripMenuItem.Name = "TxTStringrToolStripMenuItem" - Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.TxTStringrToolStripMenuItem.Size = New System.Drawing.Size(109, 22) Me.TxTStringrToolStripMenuItem.Text = "Stringr" ' 'TxTBaseToolStripMenuItem ' Me.TxTBaseToolStripMenuItem.Name = "TxTBaseToolStripMenuItem" - Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(122, 24) + Me.TxTBaseToolStripMenuItem.Size = New System.Drawing.Size(109, 22) Me.TxTBaseToolStripMenuItem.Text = "base" ' 'ContextMenuStripWakefield @@ -6577,12 +6752,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(143, 28) + Me.ContextMenuStripWakefield.Size = New System.Drawing.Size(125, 26) ' 'WakefieldToolStripMenuItem ' Me.WakefieldToolStripMenuItem.Name = "WakefieldToolStripMenuItem" - Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(142, 24) + Me.WakefieldToolStripMenuItem.Size = New System.Drawing.Size(124, 22) Me.WakefieldToolStripMenuItem.Text = "wakefield" ' 'ContextMenuStripList @@ -6590,29 +6765,28 @@ 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(116, 76) + Me.ContextMenuStripList.Size = New System.Drawing.Size(104, 70) ' 'ListBaseToolStripMenuItem ' Me.ListBaseToolStripMenuItem.Name = "ListBaseToolStripMenuItem" - Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(115, 24) + Me.ListBaseToolStripMenuItem.Size = New System.Drawing.Size(103, 22) Me.ListBaseToolStripMenuItem.Text = "base" ' 'ListStatsToolStripMenuItem ' Me.ListStatsToolStripMenuItem.Name = "ListStatsToolStripMenuItem" - Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(115, 24) + Me.ListStatsToolStripMenuItem.Size = New System.Drawing.Size(103, 22) Me.ListStatsToolStripMenuItem.Text = "stats" ' 'ListStatipToolStripMenuItem ' Me.ListStatipToolStripMenuItem.Name = "ListStatipToolStripMenuItem" - Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(115, 24) + Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(103, 22) Me.ListStatipToolStripMenuItem.Text = "statip" ' 'grpList ' - Me.grpList.Controls.Add(Me.GroupBox1) Me.grpList.Controls.Add(Me.grpMathBloc) Me.grpList.Controls.Add(Me.cmdListNth) Me.grpList.Controls.Add(Me.cmdListLast) @@ -6639,217 +6813,16 @@ 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(548, 52) + Me.grpList.Controls.Add(Me.GroupBox1) + Me.grpList.Location = New System.Drawing.Point(438, 52) + Me.grpList.Margin = New System.Windows.Forms.Padding(2) Me.grpList.Name = "grpList" - Me.grpList.Size = New System.Drawing.Size(395, 458) + Me.grpList.Padding = New System.Windows.Forms.Padding(2) + Me.grpList.Size = New System.Drawing.Size(316, 366) Me.grpList.TabIndex = 214 Me.grpList.TabStop = False Me.grpList.Text = "Summary" ' - 'GroupBox1 - ' - Me.GroupBox1.Controls.Add(Me.cmdListDuplicated) - Me.GroupBox1.Controls.Add(Me.cmdListOperator) - Me.GroupBox1.Controls.Add(Me.cmdListDiv) - Me.GroupBox1.Controls.Add(Me.cmdListMod) - Me.GroupBox1.Controls.Add(Me.cmdListIfelse) - Me.GroupBox1.Controls.Add(Me.cmdListOmit) - Me.GroupBox1.Controls.Add(Me.cmdListRev) - Me.GroupBox1.Controls.Add(Me.cmdListMovsum) - Me.GroupBox1.Controls.Add(Me.cmdListCumsum) - Me.GroupBox1.Controls.Add(Me.cmdListScale) - Me.GroupBox1.Controls.Add(Me.cmdListDiff) - Me.GroupBox1.Controls.Add(Me.cmdListLead) - 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(5, 310) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(388, 137) - Me.GroupBox1.TabIndex = 200 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Transform" - ' - 'cmdListDuplicated - ' - 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(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(82, 38) - Me.cmdListDuplicated.TabIndex = 186 - Me.cmdListDuplicated.Text = "duplicated" - Me.cmdListDuplicated.UseVisualStyleBackColor = True - ' - 'cmdListOperator - ' - 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(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(70, 38) - Me.cmdListOperator.TabIndex = 185 - Me.cmdListOperator.Text = ">" - Me.cmdListOperator.UseVisualStyleBackColor = True - ' - 'cmdListDiv - ' - 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(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(75, 38) - Me.cmdListDiv.TabIndex = 184 - Me.cmdListDiv.Text = "div (%/%)" - Me.cmdListDiv.UseVisualStyleBackColor = True - ' - 'cmdListMod - ' - 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(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(88, 38) - Me.cmdListMod.TabIndex = 183 - Me.cmdListMod.Text = "mod (%%)" - Me.cmdListMod.UseVisualStyleBackColor = True - ' - 'cmdListIfelse - ' - 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, 90) - Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdListIfelse.Name = "cmdListIfelse" - Me.cmdListIfelse.Size = New System.Drawing.Size(72, 38) - Me.cmdListIfelse.TabIndex = 182 - Me.cmdListIfelse.Text = "ifelse" - Me.cmdListIfelse.UseVisualStyleBackColor = True - ' - 'cmdListOmit - ' - 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(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(82, 38) - Me.cmdListOmit.TabIndex = 181 - Me.cmdListOmit.Text = "omit.na" - Me.cmdListOmit.UseVisualStyleBackColor = True - ' - 'cmdListRev - ' - 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(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(70, 38) - Me.cmdListRev.TabIndex = 180 - Me.cmdListRev.Text = "rev" - Me.cmdListRev.UseVisualStyleBackColor = True - ' - 'cmdListMovsum - ' - 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(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(75, 38) - Me.cmdListMovsum.TabIndex = 179 - Me.cmdListMovsum.Text = "movsum" - Me.cmdListMovsum.UseVisualStyleBackColor = True - ' - 'cmdListCumsum - ' - 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(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(88, 38) - Me.cmdListCumsum.TabIndex = 178 - Me.cmdListCumsum.Text = "cumsum" - Me.cmdListCumsum.UseVisualStyleBackColor = True - ' - 'cmdListScale - ' - 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, 53) - Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdListScale.Name = "cmdListScale" - Me.cmdListScale.Size = New System.Drawing.Size(72, 38) - Me.cmdListScale.TabIndex = 177 - Me.cmdListScale.Text = " scale" - Me.cmdListScale.UseVisualStyleBackColor = True - ' - 'cmdListDiff - ' - 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(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(82, 38) - Me.cmdListDiff.TabIndex = 176 - Me.cmdListDiff.Text = "diff" - Me.cmdListDiff.UseVisualStyleBackColor = True - ' - 'cmdListLead - ' - 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(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(70, 38) - Me.cmdListLead.TabIndex = 175 - Me.cmdListLead.Text = "lead" - Me.cmdListLead.UseVisualStyleBackColor = True - ' - 'cmdListLag - ' - 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(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(75, 38) - Me.cmdListLag.TabIndex = 174 - Me.cmdListLag.Text = "lag" - Me.cmdListLag.UseVisualStyleBackColor = True - ' - 'cmdListRank - ' - 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(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(88, 38) - Me.cmdListRank.TabIndex = 173 - Me.cmdListRank.Text = "rank" - Me.cmdListRank.UseVisualStyleBackColor = True - ' - 'cmdListSort - ' - 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, 18) - Me.cmdListSort.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdListSort.Name = "cmdListSort" - Me.cmdListSort.Size = New System.Drawing.Size(72, 38) - Me.cmdListSort.TabIndex = 172 - Me.cmdListSort.Text = "sort" - Me.cmdListSort.UseVisualStyleBackColor = True - ' 'grpMathBloc ' Me.grpMathBloc.Controls.Add(Me.cmdListSQRT) @@ -6862,9 +6835,11 @@ 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(3, 203) + Me.grpMathBloc.Location = New System.Drawing.Point(2, 162) + Me.grpMathBloc.Margin = New System.Windows.Forms.Padding(2) Me.grpMathBloc.Name = "grpMathBloc" - Me.grpMathBloc.Size = New System.Drawing.Size(388, 105) + Me.grpMathBloc.Padding = New System.Windows.Forms.Padding(2) + Me.grpMathBloc.Size = New System.Drawing.Size(310, 84) Me.grpMathBloc.TabIndex = 199 Me.grpMathBloc.TabStop = False Me.grpMathBloc.Text = "Maths" @@ -6873,10 +6848,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(307, 52) - Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSQRT.Location = New System.Drawing.Point(246, 43) + Me.cmdListSQRT.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSQRT.Name = "cmdListSQRT" - Me.cmdListSQRT.Size = New System.Drawing.Size(73, 38) + Me.cmdListSQRT.Size = New System.Drawing.Size(58, 30) Me.cmdListSQRT.TabIndex = 181 Me.cmdListSQRT.Text = "sqrt" Me.cmdListSQRT.UseVisualStyleBackColor = True @@ -6885,10 +6860,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(232, 53) - Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListPercent2.Location = New System.Drawing.Point(187, 43) + Me.cmdListPercent2.Margin = New System.Windows.Forms.Padding(2) Me.cmdListPercent2.Name = "cmdListPercent2" - Me.cmdListPercent2.Size = New System.Drawing.Size(75, 38) + Me.cmdListPercent2.Size = New System.Drawing.Size(60, 30) Me.cmdListPercent2.TabIndex = 180 Me.cmdListPercent2.Text = "percent2" Me.cmdListPercent2.UseVisualStyleBackColor = True @@ -6897,10 +6872,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(158, 53) - Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListPercent.Location = New System.Drawing.Point(128, 43) + Me.cmdListPercent.Margin = New System.Windows.Forms.Padding(2) Me.cmdListPercent.Name = "cmdListPercent" - Me.cmdListPercent.Size = New System.Drawing.Size(75, 38) + Me.cmdListPercent.Size = New System.Drawing.Size(60, 30) Me.cmdListPercent.TabIndex = 179 Me.cmdListPercent.Text = "percent" Me.cmdListPercent.UseVisualStyleBackColor = True @@ -6909,10 +6884,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(72, 53) - Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListProportion.Location = New System.Drawing.Point(59, 43) + Me.cmdListProportion.Margin = New System.Windows.Forms.Padding(2) Me.cmdListProportion.Name = "cmdListProportion" - Me.cmdListProportion.Size = New System.Drawing.Size(88, 38) + Me.cmdListProportion.Size = New System.Drawing.Size(70, 30) Me.cmdListProportion.TabIndex = 178 Me.cmdListProportion.Text = "proportion" Me.cmdListProportion.UseVisualStyleBackColor = True @@ -6921,10 +6896,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, 53) - Me.cmdListRound.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListRound.Location = New System.Drawing.Point(2, 43) + Me.cmdListRound.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRound.Name = "cmdListRound" - Me.cmdListRound.Size = New System.Drawing.Size(72, 38) + Me.cmdListRound.Size = New System.Drawing.Size(58, 30) Me.cmdListRound.TabIndex = 177 Me.cmdListRound.Text = "round" Me.cmdListRound.UseVisualStyleBackColor = True @@ -6933,10 +6908,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(307, 18) - Me.cmdListSquare.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSquare.Location = New System.Drawing.Point(246, 14) + Me.cmdListSquare.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSquare.Name = "cmdListSquare" - Me.cmdListSquare.Size = New System.Drawing.Size(73, 38) + Me.cmdListSquare.Size = New System.Drawing.Size(58, 30) Me.cmdListSquare.TabIndex = 176 Me.cmdListSquare.Text = "power (^)" Me.cmdListSquare.UseVisualStyleBackColor = True @@ -6945,10 +6920,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(232, 18) - Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListDivide.Location = New System.Drawing.Point(187, 14) + Me.cmdListDivide.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDivide.Name = "cmdListDivide" - Me.cmdListDivide.Size = New System.Drawing.Size(75, 38) + Me.cmdListDivide.Size = New System.Drawing.Size(60, 30) Me.cmdListDivide.TabIndex = 175 Me.cmdListDivide.Text = "divide (/)" Me.cmdListDivide.UseVisualStyleBackColor = True @@ -6957,10 +6932,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(158, 18) - Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMultiply.Location = New System.Drawing.Point(128, 14) + Me.cmdListMultiply.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMultiply.Name = "cmdListMultiply" - Me.cmdListMultiply.Size = New System.Drawing.Size(75, 38) + Me.cmdListMultiply.Size = New System.Drawing.Size(60, 30) Me.cmdListMultiply.TabIndex = 174 Me.cmdListMultiply.Text = "times (*)" Me.cmdListMultiply.UseVisualStyleBackColor = True @@ -6969,10 +6944,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(72, 18) - Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSubtract.Location = New System.Drawing.Point(59, 14) + Me.cmdListSubtract.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSubtract.Name = "cmdListSubtract" - Me.cmdListSubtract.Size = New System.Drawing.Size(88, 38) + Me.cmdListSubtract.Size = New System.Drawing.Size(70, 30) Me.cmdListSubtract.TabIndex = 173 Me.cmdListSubtract.Text = " subtract (-)" Me.cmdListSubtract.UseVisualStyleBackColor = True @@ -6981,10 +6956,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, 18) - Me.cmdListAdd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListAdd.Location = New System.Drawing.Point(2, 14) + Me.cmdListAdd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListAdd.Name = "cmdListAdd" - Me.cmdListAdd.Size = New System.Drawing.Size(72, 38) + Me.cmdListAdd.Size = New System.Drawing.Size(58, 30) Me.cmdListAdd.TabIndex = 172 Me.cmdListAdd.Text = "sum (+)" Me.cmdListAdd.UseVisualStyleBackColor = True @@ -6993,10 +6968,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(308, 127) - Me.cmdListNth.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListNth.Location = New System.Drawing.Point(246, 101) + Me.cmdListNth.Margin = New System.Windows.Forms.Padding(2) Me.cmdListNth.Name = "cmdListNth" - Me.cmdListNth.Size = New System.Drawing.Size(78, 38) + Me.cmdListNth.Size = New System.Drawing.Size(62, 30) Me.cmdListNth.TabIndex = 176 Me.cmdListNth.Text = "nth" Me.cmdListNth.UseVisualStyleBackColor = True @@ -7005,10 +6980,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(232, 127) - Me.cmdListLast.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListLast.Location = New System.Drawing.Point(185, 101) + Me.cmdListLast.Margin = New System.Windows.Forms.Padding(2) Me.cmdListLast.Name = "cmdListLast" - Me.cmdListLast.Size = New System.Drawing.Size(78, 38) + Me.cmdListLast.Size = New System.Drawing.Size(62, 30) Me.cmdListLast.TabIndex = 175 Me.cmdListLast.Text = "last" Me.cmdListLast.UseVisualStyleBackColor = True @@ -7017,10 +6992,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(157, 127) - Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListFirst.Location = New System.Drawing.Point(124, 101) + Me.cmdListFirst.Margin = New System.Windows.Forms.Padding(2) Me.cmdListFirst.Name = "cmdListFirst" - Me.cmdListFirst.Size = New System.Drawing.Size(78, 38) + Me.cmdListFirst.Size = New System.Drawing.Size(62, 30) Me.cmdListFirst.TabIndex = 174 Me.cmdListFirst.Text = "first" Me.cmdListFirst.UseVisualStyleBackColor = True @@ -7029,10 +7004,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(80, 127) - Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListAnyDup.Location = New System.Drawing.Point(63, 101) + Me.cmdListAnyDup.Margin = New System.Windows.Forms.Padding(2) Me.cmdListAnyDup.Name = "cmdListAnyDup" - Me.cmdListAnyDup.Size = New System.Drawing.Size(78, 38) + Me.cmdListAnyDup.Size = New System.Drawing.Size(62, 30) Me.cmdListAnyDup.TabIndex = 173 Me.cmdListAnyDup.Text = "anydup" Me.cmdListAnyDup.UseVisualStyleBackColor = True @@ -7041,10 +7016,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(3, 127) - Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListDistinct.Location = New System.Drawing.Point(2, 101) + Me.cmdListDistinct.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDistinct.Name = "cmdListDistinct" - Me.cmdListDistinct.Size = New System.Drawing.Size(78, 38) + Me.cmdListDistinct.Size = New System.Drawing.Size(62, 30) Me.cmdListDistinct.TabIndex = 172 Me.cmdListDistinct.Text = "distinct" Me.cmdListDistinct.UseVisualStyleBackColor = True @@ -7053,10 +7028,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(308, 90) - Me.cmdListIQR.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListIQR.Location = New System.Drawing.Point(246, 72) + Me.cmdListIQR.Margin = New System.Windows.Forms.Padding(2) Me.cmdListIQR.Name = "cmdListIQR" - Me.cmdListIQR.Size = New System.Drawing.Size(78, 38) + Me.cmdListIQR.Size = New System.Drawing.Size(62, 30) Me.cmdListIQR.TabIndex = 171 Me.cmdListIQR.Text = "IQR" Me.cmdListIQR.UseVisualStyleBackColor = True @@ -7065,10 +7040,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(232, 90) - Me.cmdListMad.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMad.Location = New System.Drawing.Point(185, 72) + Me.cmdListMad.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMad.Name = "cmdListMad" - Me.cmdListMad.Size = New System.Drawing.Size(78, 38) + Me.cmdListMad.Size = New System.Drawing.Size(62, 30) Me.cmdListMad.TabIndex = 170 Me.cmdListMad.Text = "mad" Me.cmdListMad.UseVisualStyleBackColor = True @@ -7077,10 +7052,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(157, 90) - Me.cmdListSd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSd.Location = New System.Drawing.Point(124, 72) + Me.cmdListSd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSd.Name = "cmdListSd" - Me.cmdListSd.Size = New System.Drawing.Size(78, 38) + Me.cmdListSd.Size = New System.Drawing.Size(62, 30) Me.cmdListSd.TabIndex = 169 Me.cmdListSd.Text = "sd" Me.cmdListSd.UseVisualStyleBackColor = True @@ -7089,10 +7064,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(80, 90) - Me.cmdListVar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListVar.Location = New System.Drawing.Point(63, 72) + Me.cmdListVar.Margin = New System.Windows.Forms.Padding(2) Me.cmdListVar.Name = "cmdListVar" - Me.cmdListVar.Size = New System.Drawing.Size(78, 38) + Me.cmdListVar.Size = New System.Drawing.Size(62, 30) Me.cmdListVar.TabIndex = 168 Me.cmdListVar.Text = "var" Me.cmdListVar.UseVisualStyleBackColor = True @@ -7101,10 +7076,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(3, 90) - Me.cmdListSsq.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSsq.Location = New System.Drawing.Point(2, 72) + Me.cmdListSsq.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSsq.Name = "cmdListSsq" - Me.cmdListSsq.Size = New System.Drawing.Size(78, 38) + Me.cmdListSsq.Size = New System.Drawing.Size(62, 30) Me.cmdListSsq.TabIndex = 167 Me.cmdListSsq.Text = "ssq" Me.cmdListSsq.UseVisualStyleBackColor = True @@ -7113,10 +7088,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(308, 53) - Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMode1.Location = New System.Drawing.Point(246, 43) + Me.cmdListMode1.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMode1.Name = "cmdListMode1" - Me.cmdListMode1.Size = New System.Drawing.Size(78, 38) + Me.cmdListMode1.Size = New System.Drawing.Size(62, 30) Me.cmdListMode1.TabIndex = 166 Me.cmdListMode1.Text = "mode1" Me.cmdListMode1.UseVisualStyleBackColor = True @@ -7125,10 +7100,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(308, 18) - Me.cmdListMax.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMax.Location = New System.Drawing.Point(246, 14) + Me.cmdListMax.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMax.Name = "cmdListMax" - Me.cmdListMax.Size = New System.Drawing.Size(78, 38) + Me.cmdListMax.Size = New System.Drawing.Size(62, 30) Me.cmdListMax.TabIndex = 165 Me.cmdListMax.Text = "max" Me.cmdListMax.UseVisualStyleBackColor = True @@ -7137,10 +7112,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(232, 162) - Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListFivenum.Location = New System.Drawing.Point(185, 130) + Me.cmdListFivenum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListFivenum.Name = "cmdListFivenum" - Me.cmdListFivenum.Size = New System.Drawing.Size(78, 38) + Me.cmdListFivenum.Size = New System.Drawing.Size(62, 30) Me.cmdListFivenum.TabIndex = 163 Me.cmdListFivenum.Tag = "" Me.cmdListFivenum.Text = "fivenum" @@ -7150,10 +7125,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(232, 53) - Me.cmdListMode.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMode.Location = New System.Drawing.Point(185, 43) + Me.cmdListMode.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMode.Name = "cmdListMode" - Me.cmdListMode.Size = New System.Drawing.Size(78, 38) + Me.cmdListMode.Size = New System.Drawing.Size(62, 30) Me.cmdListMode.TabIndex = 162 Me.cmdListMode.Text = "mode" Me.cmdListMode.UseVisualStyleBackColor = True @@ -7162,10 +7137,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(3, 162) - Me.cmdListQuantile.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListQuantile.Location = New System.Drawing.Point(2, 130) + Me.cmdListQuantile.Margin = New System.Windows.Forms.Padding(2) Me.cmdListQuantile.Name = "cmdListQuantile" - Me.cmdListQuantile.Size = New System.Drawing.Size(78, 38) + Me.cmdListQuantile.Size = New System.Drawing.Size(62, 30) Me.cmdListQuantile.TabIndex = 154 Me.cmdListQuantile.Text = "quantile" Me.cmdListQuantile.UseVisualStyleBackColor = True @@ -7174,10 +7149,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(80, 162) - Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListDigitsum.Location = New System.Drawing.Point(63, 130) + Me.cmdListDigitsum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListDigitsum.Name = "cmdListDigitsum" - Me.cmdListDigitsum.Size = New System.Drawing.Size(78, 38) + Me.cmdListDigitsum.Size = New System.Drawing.Size(62, 30) Me.cmdListDigitsum.TabIndex = 161 Me.cmdListDigitsum.Text = "digitsum" Me.cmdListDigitsum.UseVisualStyleBackColor = True @@ -7186,10 +7161,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(232, 18) - Me.cmdListMin.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMin.Location = New System.Drawing.Point(185, 14) + Me.cmdListMin.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMin.Name = "cmdListMin" - Me.cmdListMin.Size = New System.Drawing.Size(78, 38) + Me.cmdListMin.Size = New System.Drawing.Size(62, 30) Me.cmdListMin.TabIndex = 156 Me.cmdListMin.Text = "min" Me.cmdListMin.UseVisualStyleBackColor = True @@ -7198,10 +7173,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(157, 18) - Me.cmdListProd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListProd.Location = New System.Drawing.Point(124, 14) + Me.cmdListProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListProd.Name = "cmdListProd" - Me.cmdListProd.Size = New System.Drawing.Size(78, 38) + Me.cmdListProd.Size = New System.Drawing.Size(62, 30) Me.cmdListProd.TabIndex = 155 Me.cmdListProd.Text = "prod" Me.cmdListProd.UseVisualStyleBackColor = True @@ -7210,10 +7185,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(3, 18) - Me.cmdListLength.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListLength.Location = New System.Drawing.Point(2, 14) + Me.cmdListLength.Margin = New System.Windows.Forms.Padding(2) Me.cmdListLength.Name = "cmdListLength" - Me.cmdListLength.Size = New System.Drawing.Size(78, 38) + Me.cmdListLength.Size = New System.Drawing.Size(62, 30) Me.cmdListLength.TabIndex = 148 Me.cmdListLength.Text = "length" Me.cmdListLength.UseVisualStyleBackColor = True @@ -7222,10 +7197,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(157, 53) - Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMedian.Location = New System.Drawing.Point(124, 43) + Me.cmdListMedian.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMedian.Name = "cmdListMedian" - Me.cmdListMedian.Size = New System.Drawing.Size(78, 38) + Me.cmdListMedian.Size = New System.Drawing.Size(62, 30) Me.cmdListMedian.TabIndex = 160 Me.cmdListMedian.Text = "median" Me.cmdListMedian.UseVisualStyleBackColor = True @@ -7234,10 +7209,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(80, 53) - Me.cmdListMean.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMean.Location = New System.Drawing.Point(63, 43) + Me.cmdListMean.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMean.Name = "cmdListMean" - Me.cmdListMean.Size = New System.Drawing.Size(78, 38) + Me.cmdListMean.Size = New System.Drawing.Size(62, 30) Me.cmdListMean.TabIndex = 158 Me.cmdListMean.Text = "mean" Me.cmdListMean.UseVisualStyleBackColor = True @@ -7246,10 +7221,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(3, 53) - Me.cmdListRange.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListRange.Location = New System.Drawing.Point(2, 43) + Me.cmdListRange.Margin = New System.Windows.Forms.Padding(2) Me.cmdListRange.Name = "cmdListRange" - Me.cmdListRange.Size = New System.Drawing.Size(78, 38) + Me.cmdListRange.Size = New System.Drawing.Size(62, 30) Me.cmdListRange.TabIndex = 157 Me.cmdListRange.Text = "range" Me.cmdListRange.UseVisualStyleBackColor = True @@ -7258,10 +7233,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(80, 18) - Me.cmdListSum.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSum.Location = New System.Drawing.Point(63, 14) + Me.cmdListSum.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSum.Name = "cmdListSum" - Me.cmdListSum.Size = New System.Drawing.Size(78, 38) + Me.cmdListSum.Size = New System.Drawing.Size(62, 30) Me.cmdListSum.TabIndex = 153 Me.cmdListSum.Text = "sum" Me.cmdListSum.UseVisualStyleBackColor = True @@ -7270,10 +7245,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(157, 162) - Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListSumd.Location = New System.Drawing.Point(124, 130) + Me.cmdListSumd.Margin = New System.Windows.Forms.Padding(2) Me.cmdListSumd.Name = "cmdListSumd" - Me.cmdListSumd.Size = New System.Drawing.Size(78, 38) + Me.cmdListSumd.Size = New System.Drawing.Size(62, 30) Me.cmdListSumd.TabIndex = 149 Me.cmdListSumd.Text = "sumd" Me.cmdListSumd.UseVisualStyleBackColor = True @@ -7282,21 +7257,228 @@ 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(308, 162) - Me.cmdListMissing.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdListMissing.Location = New System.Drawing.Point(246, 130) + Me.cmdListMissing.Margin = New System.Windows.Forms.Padding(2) Me.cmdListMissing.Name = "cmdListMissing" - Me.cmdListMissing.Size = New System.Drawing.Size(78, 38) + Me.cmdListMissing.Size = New System.Drawing.Size(62, 30) Me.cmdListMissing.TabIndex = 164 Me.cmdListMissing.Text = "missing" Me.cmdListMissing.UseVisualStyleBackColor = True ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.cmdListDuplicated) + Me.GroupBox1.Controls.Add(Me.cmdListOperator) + Me.GroupBox1.Controls.Add(Me.cmdListDiv) + Me.GroupBox1.Controls.Add(Me.cmdListMod) + Me.GroupBox1.Controls.Add(Me.cmdListIfelse) + Me.GroupBox1.Controls.Add(Me.cmdListOmit) + Me.GroupBox1.Controls.Add(Me.cmdListRev) + Me.GroupBox1.Controls.Add(Me.cmdListMovsum) + Me.GroupBox1.Controls.Add(Me.cmdListCumsum) + Me.GroupBox1.Controls.Add(Me.cmdListScale) + Me.GroupBox1.Controls.Add(Me.cmdListDiff) + Me.GroupBox1.Controls.Add(Me.cmdListLead) + Me.GroupBox1.Controls.Add(Me.cmdListLag) + Me.GroupBox1.Controls.Add(Me.cmdListRank) + Me.GroupBox1.Controls.Add(Me.cmdListSort) + Me.GroupBox1.Location = New System.Drawing.Point(4, 248) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(2) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(2) + Me.GroupBox1.Size = New System.Drawing.Size(310, 110) + Me.GroupBox1.TabIndex = 200 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Transform" + ' + 'cmdListDuplicated + ' + Me.cmdListDuplicated.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListDuplicated.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListDuplicated.Location = New System.Drawing.Point(242, 72) + Me.cmdListDuplicated.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDuplicated.Name = "cmdListDuplicated" + Me.cmdListDuplicated.Size = New System.Drawing.Size(66, 30) + Me.cmdListDuplicated.TabIndex = 186 + Me.cmdListDuplicated.Text = "duplicated" + Me.cmdListDuplicated.UseVisualStyleBackColor = True + ' + 'cmdListOperator + ' + Me.cmdListOperator.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListOperator.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListOperator.Location = New System.Drawing.Point(187, 72) + Me.cmdListOperator.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListOperator.Name = "cmdListOperator" + Me.cmdListOperator.Size = New System.Drawing.Size(56, 30) + Me.cmdListOperator.TabIndex = 185 + Me.cmdListOperator.Text = ">" + Me.cmdListOperator.UseVisualStyleBackColor = True + ' + 'cmdListDiv + ' + Me.cmdListDiv.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListDiv.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListDiv.Location = New System.Drawing.Point(128, 72) + Me.cmdListDiv.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDiv.Name = "cmdListDiv" + Me.cmdListDiv.Size = New System.Drawing.Size(60, 30) + Me.cmdListDiv.TabIndex = 184 + Me.cmdListDiv.Text = "div (%/%)" + Me.cmdListDiv.UseVisualStyleBackColor = True + ' + 'cmdListMod + ' + Me.cmdListMod.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListMod.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListMod.Location = New System.Drawing.Point(59, 72) + Me.cmdListMod.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMod.Name = "cmdListMod" + Me.cmdListMod.Size = New System.Drawing.Size(70, 30) + Me.cmdListMod.TabIndex = 183 + Me.cmdListMod.Text = "mod (%%)" + Me.cmdListMod.UseVisualStyleBackColor = True + ' + 'cmdListIfelse + ' + Me.cmdListIfelse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListIfelse.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListIfelse.Location = New System.Drawing.Point(2, 72) + Me.cmdListIfelse.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListIfelse.Name = "cmdListIfelse" + Me.cmdListIfelse.Size = New System.Drawing.Size(58, 30) + Me.cmdListIfelse.TabIndex = 182 + Me.cmdListIfelse.Text = "ifelse" + Me.cmdListIfelse.UseVisualStyleBackColor = True + ' + 'cmdListOmit + ' + Me.cmdListOmit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListOmit.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListOmit.Location = New System.Drawing.Point(242, 43) + Me.cmdListOmit.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListOmit.Name = "cmdListOmit" + Me.cmdListOmit.Size = New System.Drawing.Size(66, 30) + Me.cmdListOmit.TabIndex = 181 + Me.cmdListOmit.Text = "omit.na" + Me.cmdListOmit.UseVisualStyleBackColor = True + ' + 'cmdListRev + ' + Me.cmdListRev.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListRev.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListRev.Location = New System.Drawing.Point(187, 43) + Me.cmdListRev.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListRev.Name = "cmdListRev" + Me.cmdListRev.Size = New System.Drawing.Size(56, 30) + Me.cmdListRev.TabIndex = 180 + Me.cmdListRev.Text = "rev" + Me.cmdListRev.UseVisualStyleBackColor = True + ' + 'cmdListMovsum + ' + Me.cmdListMovsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListMovsum.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListMovsum.Location = New System.Drawing.Point(128, 43) + Me.cmdListMovsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListMovsum.Name = "cmdListMovsum" + Me.cmdListMovsum.Size = New System.Drawing.Size(60, 30) + Me.cmdListMovsum.TabIndex = 179 + Me.cmdListMovsum.Text = "movsum" + Me.cmdListMovsum.UseVisualStyleBackColor = True + ' + 'cmdListCumsum + ' + Me.cmdListCumsum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListCumsum.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListCumsum.Location = New System.Drawing.Point(59, 43) + Me.cmdListCumsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListCumsum.Name = "cmdListCumsum" + Me.cmdListCumsum.Size = New System.Drawing.Size(70, 30) + Me.cmdListCumsum.TabIndex = 178 + Me.cmdListCumsum.Text = "cumsum" + Me.cmdListCumsum.UseVisualStyleBackColor = True + ' + 'cmdListScale + ' + Me.cmdListScale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListScale.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListScale.Location = New System.Drawing.Point(2, 43) + Me.cmdListScale.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListScale.Name = "cmdListScale" + Me.cmdListScale.Size = New System.Drawing.Size(58, 30) + Me.cmdListScale.TabIndex = 177 + Me.cmdListScale.Text = " scale" + Me.cmdListScale.UseVisualStyleBackColor = True + ' + 'cmdListDiff + ' + Me.cmdListDiff.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListDiff.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListDiff.Location = New System.Drawing.Point(242, 14) + Me.cmdListDiff.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListDiff.Name = "cmdListDiff" + Me.cmdListDiff.Size = New System.Drawing.Size(66, 30) + Me.cmdListDiff.TabIndex = 176 + Me.cmdListDiff.Text = "diff" + Me.cmdListDiff.UseVisualStyleBackColor = True + ' + 'cmdListLead + ' + Me.cmdListLead.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListLead.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListLead.Location = New System.Drawing.Point(187, 14) + Me.cmdListLead.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListLead.Name = "cmdListLead" + Me.cmdListLead.Size = New System.Drawing.Size(56, 30) + Me.cmdListLead.TabIndex = 175 + Me.cmdListLead.Text = "lead" + Me.cmdListLead.UseVisualStyleBackColor = True + ' + 'cmdListLag + ' + Me.cmdListLag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListLag.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListLag.Location = New System.Drawing.Point(128, 14) + Me.cmdListLag.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListLag.Name = "cmdListLag" + Me.cmdListLag.Size = New System.Drawing.Size(60, 30) + Me.cmdListLag.TabIndex = 174 + Me.cmdListLag.Text = "lag" + Me.cmdListLag.UseVisualStyleBackColor = True + ' + 'cmdListRank + ' + Me.cmdListRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListRank.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListRank.Location = New System.Drawing.Point(59, 14) + Me.cmdListRank.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListRank.Name = "cmdListRank" + Me.cmdListRank.Size = New System.Drawing.Size(70, 30) + Me.cmdListRank.TabIndex = 173 + Me.cmdListRank.Text = "rank" + Me.cmdListRank.UseVisualStyleBackColor = True + ' + 'cmdListSort + ' + Me.cmdListSort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdListSort.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdListSort.Location = New System.Drawing.Point(2, 14) + Me.cmdListSort.Margin = New System.Windows.Forms.Padding(2) + Me.cmdListSort.Name = "cmdListSort" + Me.cmdListSort.Size = New System.Drawing.Size(58, 30) + Me.cmdListSort.TabIndex = 172 + Me.cmdListSort.Text = "sort" + Me.cmdListSort.UseVisualStyleBackColor = True + ' 'cmdRhelpList ' Me.cmdRhelpList.AutoSize = True Me.cmdRhelpList.ContextMenuStrip = Me.ContextMenuStripList - Me.cmdRhelpList.Location = New System.Drawing.Point(842, 32) + Me.cmdRhelpList.Location = New System.Drawing.Point(678, 26) + Me.cmdRhelpList.Margin = New System.Windows.Forms.Padding(2) Me.cmdRhelpList.Name = "cmdRhelpList" - Me.cmdRhelpList.Size = New System.Drawing.Size(85, 28) + Me.cmdRhelpList.Size = New System.Drawing.Size(68, 23) Me.cmdRhelpList.SplitMenuStrip = Me.ContextMenuStripList Me.cmdRhelpList.TabIndex = 212 Me.cmdRhelpList.Text = "R Help" @@ -7306,9 +7488,10 @@ Partial Class ucrCalculator ' Me.cmdWakefieldHelp.AutoSize = True Me.cmdWakefieldHelp.ContextMenuStrip = Me.ContextMenuStripWakefield - Me.cmdWakefieldHelp.Location = New System.Drawing.Point(967, 43) + Me.cmdWakefieldHelp.Location = New System.Drawing.Point(774, 34) + Me.cmdWakefieldHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdWakefieldHelp.Name = "cmdWakefieldHelp" - Me.cmdWakefieldHelp.Size = New System.Drawing.Size(113, 28) + Me.cmdWakefieldHelp.Size = New System.Drawing.Size(90, 23) Me.cmdWakefieldHelp.SplitMenuStrip = Me.ContextMenuStripWakefield Me.cmdWakefieldHelp.TabIndex = 211 Me.cmdWakefieldHelp.Text = "R Help" @@ -7318,9 +7501,10 @@ Partial Class ucrCalculator ' Me.cmdStringRHelp.AutoSize = True Me.cmdStringRHelp.ContextMenuStrip = Me.ContextMenuStripTxtString - Me.cmdStringRHelp.Location = New System.Drawing.Point(808, 52) + Me.cmdStringRHelp.Location = New System.Drawing.Point(646, 42) + Me.cmdStringRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdStringRHelp.Name = "cmdStringRHelp" - Me.cmdStringRHelp.Size = New System.Drawing.Size(113, 28) + Me.cmdStringRHelp.Size = New System.Drawing.Size(90, 23) Me.cmdStringRHelp.SplitMenuStrip = Me.ContextMenuStripTxtString Me.cmdStringRHelp.TabIndex = 210 Me.cmdStringRHelp.Text = "R Help" @@ -7329,20 +7513,20 @@ Partial Class ucrCalculator 'ucrSaveResultInto ' Me.ucrSaveResultInto.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveResultInto.Location = New System.Drawing.Point(13, 379) - Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(5, 7, 5, 7) + Me.ucrSaveResultInto.Location = New System.Drawing.Point(10, 303) + Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.ucrSaveResultInto.Name = "ucrSaveResultInto" - Me.ucrSaveResultInto.Size = New System.Drawing.Size(408, 28) + Me.ucrSaveResultInto.Size = New System.Drawing.Size(326, 22) Me.ucrSaveResultInto.TabIndex = 196 ' 'ucrTryCalculator ' Me.ucrTryCalculator.AutoSize = True - Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 320) - Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(5) + Me.ucrTryCalculator.Location = New System.Drawing.Point(2, 256) + Me.ucrTryCalculator.Margin = New System.Windows.Forms.Padding(4) Me.ucrTryCalculator.Name = "ucrTryCalculator" Me.ucrTryCalculator.RunCommandAsMultipleLines = False - Me.ucrTryCalculator.Size = New System.Drawing.Size(495, 46) + Me.ucrTryCalculator.Size = New System.Drawing.Size(396, 37) Me.ucrTryCalculator.TabIndex = 194 ' 'ucrInputCalOptions @@ -7351,10 +7535,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(282, 52) - Me.ucrInputCalOptions.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.ucrInputCalOptions.Location = New System.Drawing.Point(226, 42) + Me.ucrInputCalOptions.Margin = New System.Windows.Forms.Padding(2) Me.ucrInputCalOptions.Name = "ucrInputCalOptions" - Me.ucrInputCalOptions.Size = New System.Drawing.Size(172, 28) + Me.ucrInputCalOptions.Size = New System.Drawing.Size(138, 22) Me.ucrInputCalOptions.TabIndex = 180 ' 'ucrSelectorForCalculations @@ -7363,32 +7547,59 @@ Partial Class ucrCalculator Me.ucrSelectorForCalculations.bDropUnusedFilterLevels = False Me.ucrSelectorForCalculations.bShowHiddenColumns = False Me.ucrSelectorForCalculations.bUseCurrentFilter = True - Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 80) + Me.ucrSelectorForCalculations.Location = New System.Drawing.Point(0, 64) Me.ucrSelectorForCalculations.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForCalculations.Name = "ucrSelectorForCalculations" - Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(267, 228) + Me.ucrSelectorForCalculations.Size = New System.Drawing.Size(214, 183) Me.ucrSelectorForCalculations.TabIndex = 173 ' 'ucrReceiverForCalculation ' Me.ucrReceiverForCalculation.AutoSize = True Me.ucrReceiverForCalculation.frmParent = Nothing - Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(88, 8) - Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(70, 6) + Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(2) Me.ucrReceiverForCalculation.Name = "ucrReceiverForCalculation" Me.ucrReceiverForCalculation.Selector = Nothing - Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(488, 37) + Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(390, 30) Me.ucrReceiverForCalculation.strNcFilePath = "" 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(194, 189) + Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" + Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) + 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(218, 189) + Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformRHelp.Name = "cmdTransformRHelp" + Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) + 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, 277) + Me.cmdLogicalHelp.Location = New System.Drawing.Point(165, 218) + Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical Me.cmdLogicalHelp.TabIndex = 212 Me.cmdLogicalHelp.Text = "R Help" @@ -7398,9 +7609,10 @@ Partial Class ucrCalculator ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(194, 248) + Me.cmdRHelp.Location = New System.Drawing.Point(157, 193) + Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate Me.cmdRHelp.TabIndex = 212 Me.cmdRHelp.Text = "R Help" @@ -7410,9 +7622,10 @@ Partial Class ucrCalculator ' Me.cmdHydroHelp.AutoSize = True Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) + Me.cmdHydroHelp.Location = New System.Drawing.Point(91, 236) + Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF Me.cmdHydroHelp.TabIndex = 212 Me.cmdHydroHelp.Text = "R Help" @@ -7422,9 +7635,10 @@ Partial Class ucrCalculator ' Me.cmdTransformHelp.AutoSize = True Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) + Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 172) + Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor Me.cmdTransformHelp.TabIndex = 212 Me.cmdTransformHelp.Text = "R Help" @@ -7434,9 +7648,10 @@ Partial Class ucrCalculator ' Me.cmdCircularHelp.AutoSize = True Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) + Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) + Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular Me.cmdCircularHelp.TabIndex = 212 Me.cmdCircularHelp.Text = "R Help" @@ -7446,9 +7661,10 @@ Partial Class ucrCalculator ' Me.cmdMathsHelp.AutoSize = True Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) + Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) + Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths Me.cmdMathsHelp.TabIndex = 211 Me.cmdMathsHelp.Text = "R Help" @@ -7458,9 +7674,10 @@ Partial Class ucrCalculator ' Me.cmdProbRHelp.AutoSize = True Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) + Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 191) + Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) + Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability Me.cmdProbRHelp.TabIndex = 212 Me.cmdProbRHelp.Text = "R Help" @@ -7470,9 +7687,10 @@ Partial Class ucrCalculator ' Me.cmdIntegerRHelp.AutoSize = True Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(205, 283) + Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger Me.cmdIntegerRHelp.TabIndex = 16 Me.cmdIntegerRHelp.Text = "R Help" @@ -7482,41 +7700,18 @@ Partial Class ucrCalculator ' Me.cmdComplexRHelp.AutoSize = True Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(237, 240) + Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) + Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) + Me.cmdComplexRHelp.Size = New System.Drawing.Size(90, 30) Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex Me.cmdComplexRHelp.TabIndex = 209 Me.cmdComplexRHelp.Text = "R Help" Me.cmdComplexRHelp.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 - ' - '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 - ' 'ucrCalculator ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.Controls.Add(Me.grpList) @@ -7531,71 +7726,72 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) + Me.Controls.Add(Me.grpSummary) + Me.Controls.Add(Me.grpTransform) + Me.Controls.Add(Me.grpWakefield) Me.Controls.Add(Me.grpLogical) Me.Controls.Add(Me.grpDates) Me.Controls.Add(Me.grpHydroGOF) Me.Controls.Add(Me.grpFactor) - Me.Controls.Add(Me.grpWakefield) Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpMaths) Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.grpTestString) - Me.Controls.Add(Me.grpModifier) - Me.Controls.Add(Me.grpSymbols) Me.Controls.Add(Me.grpComplex) - Me.Controls.Add(Me.grpSummary) - Me.Controls.Add(Me.grpTransform) + Me.Controls.Add(Me.grpSymbols) + Me.Controls.Add(Me.grpModifier) + Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" - Me.Size = New System.Drawing.Size(1123, 572) + Me.Size = New System.Drawing.Size(898, 458) 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) Me.grpList.ResumeLayout(False) - Me.GroupBox1.ResumeLayout(False) Me.grpMathBloc.ResumeLayout(False) + Me.GroupBox1.ResumeLayout(False) Me.ResumeLayout(False) - Me.PerformLayout() + Me.PerformLayout End Sub @@ -7786,7 +7982,7 @@ Partial Class ucrCalculator Friend WithEvents cmdWakefieldLower As Button Friend WithEvents cmdLanguage As Button Friend WithEvents cmdIq As Button - Friend WithEvents cmdInternet_Browser As Button + Friend WithEvents cmdid As Button Friend WithEvents cmdGrade_Level As Button Friend WithEvents cmdEye As Button Friend WithEvents cmdEmployment As Button @@ -7981,7 +8177,7 @@ Partial Class ucrCalculator Friend WithEvents cmdFrugal As Button Friend WithEvents cmdPerfect As Button Friend WithEvents cmdAbundant As Button - Friend WithEvents cmdFibonacci2 As Button + Friend WithEvents cmdCatalan As Button Friend WithEvents cmdPalindrome As Button Friend WithEvents cmdFactorize As Button Friend WithEvents GmpToolStripMenuItem As ToolStripMenuItem diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index b436018d56a..fab1bf083ba 100644 --- a/instat/ucrCalculator.resx +++ b/instat/ucrCalculator.resx @@ -163,6 +163,6 @@ 759, 103 - 99 + 65 \ No newline at end of file diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index be3a2823860..776aa1b3597 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -61,7 +61,7 @@ Public Class ucrCalculator End Sub Public Sub InitialiseControls() - ucrInputCalOptions.SetItems({"Basic", "Maths", "Logical and Symbols", "Summary", "Text/Strings (Character Columns)", "Factor", "Probability", "Dates/Times", "Transform", "Wakefield", "Circular", "hydroGOF", "List", "Complex", "Integer"}) ' "Rows" is a temp. name + ucrInputCalOptions.SetItems({"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer"}) ' "Rows" is a temp. name ucrInputCalOptions.SetDropDownStyleAsNonEditable() ucrReceiverForCalculation.Selector = ucrSelectorForCalculations @@ -128,6 +128,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdDuplicate, "duplicate detects non-unique values, for example duplicated(c(1:3,2,7)) gives FALSE, FALSE, FALSE, TRUE, FALSE") ttCalculator.SetToolTip(cmdNear, "near(x,y)compares 2 variables. For example sqrt(5)^2 is almost, but isn't exactly 5, however near(sqrt(5)^2,5) is TRUE") ttCalculator.SetToolTip(cmdnumeric, "Define a variable as numeric. For example as numeric(c(TRUE,TRUE,FALSE,TRUE)) gives (1, 1,0, 1) ") + ttCalculator.SetToolTip(cmdSquareBrackets, "Extract one or more elements from a column (or data frame") ttCalculator.SetToolTip(cmdTilde, "This is called tilde and links the left side and right side of a formula") ttCalculator.SetToolTip(cmdCalcConcantenateFunction, "Combines arguments to form a single vector, e.g. c(1:3 8) is 1, 2, 3, 8") ttCalculator.SetToolTip(cmdCalcRepelicationFunction, "Repeat of a sequence, e.g. rep(c(2, 3, 4), each=2) gives 2, 2, 3, 3, 4, 4") @@ -268,8 +269,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdKTuple, "k_tuple general formula for all these keys. For example k_tuple(0, 10, c(0,2)) gives twin primes") ttCalculator.SetToolTip(cmdRoman, "converts a small(up to 3899) positive integer to Roman numbers. For example as.roman(14)=XIV") ttCalculator.SetToolTip(cmdPalindrome, "generates palindromes to the length of the dataframe. For example the 100th palindromic number is 909") - ttCalculator.SetToolTip(cmdFibonacci2, "generates fibonacci numbers to the length of the data frame. For example the 10th fibonacci number is just 34, but the 50th is much larger, 7778742049") - ttCalculator.SetToolTip(cmdAbundant, "when divisors sum to more than the number. So 12 is less than 1+2+3+4+6 = 16. Opposite is Deficient") + ttCalculator.SetToolTip(cmdCatalan, "generates Catalan numbers to the length of the data frame. The 5th is 10!/(5!*6!) =7 * 6 = 42") ttCalculator.SetToolTip(cmdPerfect, "divisors add to the number. So 6 = 1+2+3. Only 51 perfect numbers are currently known.") ttCalculator.SetToolTip(cmdFrugal, "125 is frugal because 125 = 5(cubed) and 5 and 3 are fewer digits (2) than 125 (3).") ttCalculator.SetToolTip(cmdPowerful, "36 = 2(squared)*3(squared) is powerful because for each divisor, here 2 and 3, its square is also a divisor.") @@ -359,7 +359,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdHair, "Sample with default of 4 hair colours, brown, black, blonde, red, and defined probabilities") ttCalculator.SetToolTip(cmdHeight, "Sample from normal distribution with default mean 69, and sd 3.75, min 1, and no specified max, rounded to no decimals") ttCalculator.SetToolTip(cmdIncome, "Sample from a gamma distribution with mean 40,000 and shape 2. (Multiply the result to change the mean)") - ttCalculator.SetToolTip(cmdInternet_Browser, "Sample from ""Which browser do you use?"" with Chrome, IE, Firefox, Safari, Opera, Android, being the options") + ttCalculator.SetToolTip(cmdid, "Generate a variable with zero-padded IDs") ttCalculator.SetToolTip(cmdIq, "Sample from normal distribution with default of mean 100 and sd 15 - not 10 as provided by the package") ttCalculator.SetToolTip(cmdLanguage, "Sample of world's languages with default being list of 99 languages, provided, together with their proportions") ttCalculator.SetToolTip(cmdWakefieldLower, "Sample of single letters, with default being one of a,b,c,d,e") @@ -592,7 +592,6 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdListDuplicated, "gives TRUE for any duplicates and FALSE otherwise.") ttCalculator.SetToolTip(cmdListFivenum, "gives the same summaries as the boxplot, so minimum, lower and upper hinges (roughly the quartiles), median, and maximum.") ttCalculator.SetToolTip(cmdListSumd, "if the list contains the 2 numbers 34 and 27, then the sum of the digits (individually) is 3 + 4 = 7 and 2 + 7 = 9, so sumd will give 7 + 9 = 16.") - End Sub Public Sub Reset() @@ -935,7 +934,7 @@ Public Class ucrCalculator grpList.Visible = False cmdRhelpList.Visible = False Me.Size = New Size(iBasicWidth * 1.39, iBaseHeight) - Case "hydroGOF" + Case "Goodness of Fit" strPackageName = "hydroGOF" grpDates.Visible = False grpProbabilty.Visible = False @@ -1442,7 +1441,7 @@ Public Class ucrCalculator Private Sub cmdQnorm_Click(sender As Object, e As EventArgs) Handles cmdQnorm.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm(p= , mean = 0, sd = 1, lower.tail = TRUE, log.p = FALSE)", 53) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm(p= , mean = 0, sd = 1, lower.tail = TRUE, log.p = FALSE)", 54) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm()", 1) End If @@ -1450,31 +1449,31 @@ Public Class ucrCalculator Private Sub cmdQt_Click(sender As Object, e As EventArgs) Handles cmdQt.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(p= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(p= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(,)", 2) End If End Sub Private Sub cmdQchisq_Click(sender As Object, e As EventArgs) Handles cmdQchisq.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(p= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(p= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(,)", 2) End If End Sub Private Sub cmdqF_Click(sender As Object, e As EventArgs) Handles cmdqF.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(p= , df1= , df2= ,lower.tail = TRUE)", 33) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(p= , df1= , df2= ,lower.tail = TRUE)", 34) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(,,)", 3) End If End Sub Private Sub cmdPnorm_Click(sender As Object, e As EventArgs) Handles cmdPnorm.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm(q= , mean = 0, sd = 1, lower.tail = True, Log.p = False)", 52) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm(q= , mean = 0, sd = 1, lower.tail = True, Log.p = False)", 54) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm()", 1) End If @@ -1482,39 +1481,39 @@ Public Class ucrCalculator Private Sub cmdPt_Click(sender As Object, e As EventArgs) Handles cmdPt.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(q= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(q= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(,)", 2) End If End Sub Private Sub cmdPChisq_Click(sender As Object, e As EventArgs) Handles cmdPChisq.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(,)", 2) End If End Sub Private Sub cmdPf_Click(sender As Object, e As EventArgs) Handles cmdPf.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(q= , df1= ,df2=, lower.tail = TRUE)", 33) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(,,)", 3) End If End Sub Private Sub cmdChoose_Click(sender As Object, e As EventArgs) Handles cmdChoose.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(n= , k= )", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(n= , k= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(,)", 2) End If End Sub Private Sub cmdFact_Click(sender As Object, e As EventArgs) Handles cmdFact.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial()", 1) End If @@ -1522,23 +1521,23 @@ Public Class ucrCalculator Private Sub cmdBeta_Click(sender As Object, e As EventArgs) Handles cmdBeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(a= , b= )", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(a= , b= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(,)", 2) End If End Sub Private Sub cmdLchoose_Click(sender As Object, e As EventArgs) Handles cmdLchoose.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(n= , k= )", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(n= , k= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(,)", 2) End If End Sub Private Sub cmdLfact_Click(sender As Object, e As EventArgs) Handles cmdLfact.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial()", 1) End If @@ -1546,15 +1545,15 @@ Public Class ucrCalculator Private Sub cmdLbeta_Click(sender As Object, e As EventArgs) Handles cmdLbeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(a= , b= )", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(a= , b= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(,)", 2) End If End Sub Private Sub cmdGamma_Click(sender As Object, e As EventArgs) Handles cmdGamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma()", 1) End If @@ -1562,7 +1561,7 @@ Public Class ucrCalculator Private Sub cmdLgamma_Click(sender As Object, e As EventArgs) Handles cmdLgamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma()", 1) End If @@ -1570,7 +1569,7 @@ Public Class ucrCalculator Private Sub cmdDigamma_Click(sender As Object, e As EventArgs) Handles cmdDigamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma()", 1) End If @@ -1578,7 +1577,7 @@ Public Class ucrCalculator Private Sub cmdTrigamma_Click(sender As Object, e As EventArgs) Handles cmdTrigamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma(x= )", 2) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma()", 1) End If @@ -2804,39 +2803,20 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldIncomeFunction.ToScript, 0) End Sub - Private Sub cmdInternet_Browser_Click(sender As Object, e As EventArgs) Handles cmdInternet_Browser.Click - Dim clsWakefieldInternetBrowserFunction As New RFunction + Private Sub cmdid_Click(sender As Object, e As EventArgs) Handles cmdid.Click + Dim clsWakefieldIDFunction As New RFunction Dim clsWakefieldNrowFunction As New RFunction - Dim clsBrowserListFunction As New RFunction - Dim clsBrowserProbFunction As New RFunction clsWakefieldNrowFunction.SetRCommand("nrow") clsWakefieldNrowFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, iPosition:=0) - clsBrowserListFunction.SetRCommand("c") - clsBrowserListFunction.AddParameter("chrome", Chr(34) & "Chrome" & Chr(34), iPosition:=0, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("IE", Chr(34) & "IE" & Chr(34), iPosition:=1, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("firefox", Chr(34) & "Firefox" & Chr(34), iPosition:=2, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("safari", Chr(34) & "Safari" & Chr(34), iPosition:=3, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("opera", Chr(34) & "Opera" & Chr(34), iPosition:=4, bIncludeArgumentName:=False) - clsBrowserListFunction.AddParameter("android", Chr(34) & "Android" & Chr(34), iPosition:=5, bIncludeArgumentName:=False) - - clsBrowserProbFunction.SetRCommand("c") - clsBrowserProbFunction.AddParameter("0.5027", "0.5027", iPosition:=0, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.175", "0.175", iPosition:=1, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.1689", "0.1689", iPosition:=2, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.0994", "0.0994", iPosition:=3, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.017", "0.017", iPosition:=4, bIncludeArgumentName:=False) - clsBrowserProbFunction.AddParameter("0.0132", "0.0132", iPosition:=5, bIncludeArgumentName:=False) + clsWakefieldIDFunction.SetPackageName("wakefield") + clsWakefieldIDFunction.SetRCommand("id") + clsWakefieldIDFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) + clsWakefieldIDFunction.AddParameter("random", "FALSE", iPosition:=1) + clsWakefieldIDFunction.AddParameter("name", Chr(34) & "ID" & Chr(34), iPosition:=2) - clsWakefieldInternetBrowserFunction.SetPackageName("wakefield") - clsWakefieldInternetBrowserFunction.SetRCommand("internet_browser") - clsWakefieldInternetBrowserFunction.AddParameter("n", clsRFunctionParameter:=clsWakefieldNrowFunction, iPosition:=0) - clsWakefieldInternetBrowserFunction.AddParameter("x", clsRFunctionParameter:=clsBrowserListFunction, iPosition:=1) - clsWakefieldInternetBrowserFunction.AddParameter("prob", clsRFunctionParameter:=clsBrowserProbFunction, iPosition:=2) - clsWakefieldInternetBrowserFunction.AddParameter("name", Chr(34) & "Browser" & Chr(34), iPosition:=3) - - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldInternetBrowserFunction.ToScript, 0) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsWakefieldIDFunction.ToScript, 0) End Sub Private Sub cmdIq_Click(sender As Object, e As EventArgs) Handles cmdIq.Click @@ -3556,7 +3536,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25), na.rm = TRUE, names = TRUE, type = 7)", 65) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25))", 28) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::quantile.circular(x = , probs = seq(0, 1, 0.25))", 26) End If End Sub @@ -3782,25 +3762,25 @@ Public Class ucrCalculator Private Sub cmdPgamma_Click(sender As Object, e As EventArgs) Handles cmdPgamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(q = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE,log.p = FALSE))", 73) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(q = , shape = , rate = 1, lower.tail = TRUE,log.p = FALSE)", 55) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(,,)", 3) End If End Sub Private Sub cmdQgamma_Click(sender As Object, e As EventArgs) Handles cmdQgamma.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(p = , shape = , rate = 1, scale = 1/rate, lower.tail = TRUE, log.p = FALSE))", 73) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(p = , shape = , rate = 1, lower.tail = TRUE, log.p = FALSE)", 56) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(,)", 2) End If End Sub Private Sub cmdPbeta_Click(sender As Object, e As EventArgs) Handles cmdPbeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(q = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE))", 68) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(q = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 67) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(,,)", 3) End If End Sub @@ -3814,33 +3794,33 @@ Public Class ucrCalculator Private Sub cmdPbinom_Click(sender As Object, e As EventArgs) Handles cmdPbinom.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(q = , size = , prob = , lower.tail = TRUE, log.p = FALSE))", 55) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(q = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(,,)", 3) End If End Sub Private Sub cmdPpois_Click(sender As Object, e As EventArgs) Handles cmdPpois.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(q = , lambda = , lower.tail = TRUE, log.p = FALSE))", 48) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(q = , lambda = , lower.tail = TRUE, log.p = FALSE)", 47) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(,)", 2) End If End Sub Private Sub cmdPnbin_Click(sender As Object, e As EventArgs) Handles cmdPnbin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(q = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE))", 62) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(q = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 61) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(,,)", 3) End If End Sub Private Sub cmdQbeta_Click(sender As Object, e As EventArgs) Handles cmdQbeta.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(p = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE))", 68) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(p = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 67) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(,,)", 3) End If End Sub @@ -3854,25 +3834,25 @@ Public Class ucrCalculator Private Sub cmdQbinom_Click(sender As Object, e As EventArgs) Handles cmdQbinom.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(p = , size = , prob = , lower.tail = TRUE, log.p = FALSE))", 55) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(p = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(,,)", 3) End If End Sub Private Sub Button5_Click(sender As Object, e As EventArgs) Handles cmdQpois.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(p = , lambda = , lower.tail = TRUE, log.p = FALSE))", 48) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(p = , lambda = , lower.tail = TRUE, log.p = FALSE)", 47) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(,)", 2) End If End Sub Private Sub cmdQnbin_Click(sender As Object, e As EventArgs) Handles cmdQnbin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(p = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE))", 62) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(p = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 61) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(,,)", 3) End If End Sub @@ -4360,13 +4340,19 @@ Public Class ucrCalculator End Sub Private Sub cmdFibonacci_Click(sender As Object, e As EventArgs) Handles cmdFibonacci.Click - If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Fibonacci(n = )", 2) - Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Fibonacci()", 1) - End If + Dim clsFibonacciFunction As New RFunction + + clsDataFunction.SetRCommand("nrow") + clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) + + clsFibonacciFunction.SetPackageName("Zseq") + clsFibonacciFunction.SetRCommand("Fibonacci") + clsFibonacciFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) + + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsFibonacciFunction.ToScript, 0) End Sub + Private Sub cmdDivisors_Click(sender As Object, e As EventArgs) Handles cmdDivisors.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Divisors(x = )", 2) @@ -4531,7 +4517,7 @@ Public Class ucrCalculator clsPrimesFunction.SetPackageName("primes") clsPrimesFunction.SetRCommand(strRCommand) clsPrimesFunction.AddParameter("min", "0", iPosition:=0) - clsPrimesFunction.AddParameter("max", "100", iPosition:=1) + clsPrimesFunction.AddParameter("max", "1000000", iPosition:=1) clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) @@ -4574,11 +4560,12 @@ Public Class ucrCalculator clsTuplePatternFunction.SetRCommand("c") clsTuplePatternFunction.AddParameter("x", "0", iPosition:=0, bIncludeArgumentName:=False) clsTuplePatternFunction.AddParameter("y", "2", iPosition:=1, bIncludeArgumentName:=False) + clsTuplePatternFunction.AddParameter("z", "8", iPosition:=2, bIncludeArgumentName:=False) clsKTuplePrimeFunction.SetPackageName("primes") clsKTuplePrimeFunction.SetRCommand("k_tuple") clsKTuplePrimeFunction.AddParameter("min", "0", iPosition:=0) - clsKTuplePrimeFunction.AddParameter("max", "100", iPosition:=1) + clsKTuplePrimeFunction.AddParameter("max", "1000000", iPosition:=1) clsKTuplePrimeFunction.AddParameter("tuple", clsRFunctionParameter:=clsTuplePatternFunction, iPosition:=2) clsRepFunction.SetRCommand("rep") @@ -4612,19 +4599,20 @@ Public Class ucrCalculator ZseqFunctions("Palindromic") End Sub - Private Sub cmdFibonnaci_Click(sender As Object, e As EventArgs) Handles cmdFibonacci2.Click - Dim clsFibonacciFunction As New RFunction + Private Sub cmdCatalan_Click(sender As Object, e As EventArgs) Handles cmdCatalan.Click + Dim clsCatalanFunction As New RFunction clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) - clsFibonacciFunction.SetPackageName("Zseq") - clsFibonacciFunction.SetRCommand("Fibonacci") - clsFibonacciFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) + clsCatalanFunction.SetPackageName("Zseq") + clsCatalanFunction.SetRCommand("Catalan") + clsCatalanFunction.AddParameter("n", clsRFunctionParameter:=clsDataFunction, iPosition:=0) - ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsFibonacciFunction.ToScript, 0) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsCatalanFunction.ToScript, 0) End Sub + Private Sub cmdAbundant_Click(sender As Object, e As EventArgs) Handles cmdAbundant.Click ZseqFunctions("Abundant") End Sub @@ -4673,7 +4661,6 @@ Public Class ucrCalculator clsPerfectFunction.SetRCommand("Perfect") clsPerfectFunction.AddParameter("n", "10", iPosition:=0) - clsDataFunction.SetRCommand("nrow") clsDataFunction.AddParameter("x", ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem) clsRepFunction.SetRCommand("rep") @@ -4683,6 +4670,7 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsRepFunction.ToScript, 0) End Sub + Private Sub cmdUgly_Click(sender As Object, e As EventArgs) Handles cmdUgly.Click Dim clsUglyFunction As New RFunction @@ -5035,7 +5023,7 @@ Public Class ucrCalculator Private Sub cmdHydroHelp_Click(sender As Object, e As EventArgs) Handles cmdHydroHelp.Click, HydroGOFToolStripMenuItem.Click CalculationsOptions() - If ucrInputCalOptions.GetText = "hydroGOF" Then + If ucrInputCalOptions.GetText = "Goodness of Fit " Then strPackageName = "hydroGOF" End If OpenHelpPage() @@ -5466,7 +5454,7 @@ Public Class ucrCalculator End Sub Private Sub cmdPascal_Click(sender As Object, e As EventArgs) Handles cmdPascal.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( , function(x) {lapply(x, function(i) {choose(i, 0:i)})})", 56) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( , function(x) {lapply(x, function(i) {choose(i, 0:i)})})", 57) End Sub Private Sub cmdScale_Click(sender As Object, e As EventArgs) Handles cmdScale.Click