diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 5d7b85b05a3..eabdcff9ddc 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -286,7 +286,7 @@ Public Class clsDataFramePage columnHeader.strTypeShortCode = "(L)" ' Structured columns e.g. "circular or bigz or bigq " are coded with "(S)" ElseIf strHeaderType.Contains("circular") OrElse strHeaderType.Contains("bigz") OrElse - strHeaderType.Contains("bigq") Then + strHeaderType.Contains("bigq") OrElse strHeaderType.Contains("polynomial") Then columnHeader.strTypeShortCode = "(S)" ElseIf strHeaderType.Contains("list") Then columnHeader.strTypeShortCode = "(LT)" diff --git a/instat/Model/Output/clsOutputLogger.vb b/instat/Model/Output/clsOutputLogger.vb index 25e04fc2083..1c6b5d4396d 100644 --- a/instat/Model/Output/clsOutputLogger.vb +++ b/instat/Model/Output/clsOutputLogger.vb @@ -71,52 +71,51 @@ Public Class clsOutputLogger End Property Public Sub AddOutput(strScript As String, strOutput As String, bAsFile As Boolean, bDisplayOutputInExternalViewer As Boolean) - 'Note this always takes the last script added as corresponding script + ' Note this always takes the last script added as corresponding script If String.IsNullOrWhiteSpace(strScript) Then Throw New Exception("Cannot find script to attach output to.") Exit Sub End If - 'add the R script as an output element + ' Add the R script as an output element Dim rScriptElement As New clsOutputElement rScriptElement.SetContent(strScript, OutputType.Script, "") _outputElements.Add(rScriptElement) - 'raise event for output pages + ' Raise event for output pages RaiseEvent NewOutputAdded(rScriptElement, False) - - If Not String.IsNullOrEmpty(strOutput) Then - Dim outputElement As New clsOutputElement - Dim outputType As OutputType - If bAsFile Then - Dim strFileExtension As String = Path.GetExtension(strOutput).ToLower - Select Case strFileExtension - Case ".png" - outputType = OutputType.ImageOutput - Case ".html" - outputType = OutputType.HtmlOutput - Case ".txt" - outputType = OutputType.TextOutput - Case Else - MessageBox.Show("The file type to be added is currently not suported", - "Developer Error", - MessageBoxButtons.OK, - MessageBoxIcon.Error) - Exit Sub - End Select - Else - outputType = OutputType.TextOutput + ' Split the strOutput into an array of lines, removing empty entries + Dim arrFilesPaths() As String = strOutput.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) + + For Each output In arrFilesPaths + If Not String.IsNullOrEmpty(output) Then + Dim outputElement As New clsOutputElement + Dim outputType As OutputType + + If bAsFile Then + Dim strFileExtension As String = Path.GetExtension(output).ToLower + Select Case strFileExtension + Case ".png" + outputType = OutputType.ImageOutput + Case ".html" + outputType = OutputType.HtmlOutput + Case ".txt" + outputType = OutputType.TextOutput + Case Else + MessageBox.Show("The file type to be added is currently not supported", "Developer Error", MessageBoxButtons.OK, MessageBoxIcon.Error) + Exit Sub + End Select + Else + outputType = OutputType.TextOutput + End If + + ' Add the output with its R script as another output element + outputElement.SetContent("", outputType, output) + _outputElements.Add(outputElement) + ' Raise event for output pages + RaiseEvent NewOutputAdded(outputElement, bDisplayOutputInExternalViewer) End If - - 'add the output with it's R script as another output element - outputElement.SetContent("", outputType, strOutput) - '_outputElements.Add(outputElement) - 'raise event for output pages - RaiseEvent NewOutputAdded(outputElement, bDisplayOutputInExternalViewer) - - End If - - + Next End Sub diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 0d8972109b5..6188b0e197a 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -22,6 +22,10 @@ Imports RInsightF461 ''' Public Class ucrOutputPage Private _checkBoxes As List(Of CheckBox) + + ''' lastCheckedBox used to store a reference to a CheckBox control. + Private lastCheckedBox As CheckBox = Nothing + Private _bCanReOrder As Boolean Private _bCanRename As Boolean Private _bCanDelete As Boolean @@ -115,6 +119,15 @@ Public Class ucrOutputPage Next End Sub + ''' + ''' Selects all check boxes on the page + ''' + Public Sub SelectAllCheckBoxes() + For Each checkbox In _checkBoxes + checkbox.Checked = True + Next + End Sub + ''' ''' Clears all outputs on the page ''' @@ -215,8 +228,6 @@ Public Class ucrOutputPage End If End Sub - - Private Sub AddNewTextOutput(outputElement As clsOutputElement) Dim panel As Panel = AddElementPanel(outputElement) @@ -377,12 +388,11 @@ Public Class ucrOutputPage } panel.Controls.Add(checkBox) _checkBoxes.Add(checkBox) + AddHandler checkBox.CheckedChanged, AddressOf CheckBox_CheckedChanged AddHandler checkBox.Click, AddressOf checkButton_Click AddHandler checkBox.MouseLeave, AddressOf panelContents_MouseLeave End Sub - - ''' ''' Copies selected elements to clipboard ''' @@ -478,7 +488,6 @@ Public Class ucrOutputPage Next End Sub - Private Sub SetRichTextBoxHeight(richTextBox As RichTextBox) richTextBox.Height = (richTextBox.GetLineFromCharIndex(richTextBox.Text.Length) + 1) * (richTextBox.Font.Height + richTextBox.Margin.Vertical) + 5 End Sub @@ -487,6 +496,41 @@ Public Class ucrOutputPage pictureBox.Height = pictureBox.Width / (pictureBox.Image.Width / pictureBox.Image.Height) End Sub + Private Sub CheckBox_CheckedChanged(sender As Object, e As EventArgs) + Dim currentBox As CheckBox = DirectCast(sender, CheckBox) + + If lastCheckedBox IsNot Nothing AndAlso Control.ModifierKeys = Keys.Shift Then + Dim startIndex As Integer = _checkBoxes.IndexOf(lastCheckedBox) + Dim endIndex As Integer = _checkBoxes.IndexOf(currentBox) + + ' Toggle check state for checkboxes between startIndex and endIndex + For i As Integer = Math.Min(startIndex, endIndex) To Math.Max(startIndex, endIndex) + _checkBoxes(i).Checked = currentBox.Checked + Next + End If + + lastCheckedBox = currentBox + End Sub + + Private Sub CheckBox_MouseDown(sender As Object, e As MouseEventArgs) + Dim currentBox As CheckBox = DirectCast(sender, CheckBox) + + If e.Button = MouseButtons.Left AndAlso Control.ModifierKeys = Keys.Shift Then + ' Deselect all checkboxes between lastCheckedBox and currentBox + Dim startIndex As Integer = _checkBoxes.IndexOf(lastCheckedBox) + Dim endIndex As Integer = _checkBoxes.IndexOf(currentBox) + + For i As Integer = Math.Min(startIndex, endIndex) + 1 To Math.Max(startIndex, endIndex) - 1 + _checkBoxes(i).Checked = False + Next + ElseIf currentBox.Checked AndAlso Not Control.ModifierKeys = Keys.Shift Then + ' Deselect the current checkbox if already checked without Shift key + currentBox.Checked = False + End If + + lastCheckedBox = currentBox + End Sub + Private Sub checkButton_Click(sender As Object, e As EventArgs) RaiseEvent RefreshContextButtons() End Sub diff --git a/instat/UserControl/ucrOutputPages.resx b/instat/UserControl/ucrOutputPages.resx index 65c47d1077b..2b8649f804a 100644 --- a/instat/UserControl/ucrOutputPages.resx +++ b/instat/UserControl/ucrOutputPages.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -139,7 +139,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -154,7 +154,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -169,7 +169,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -184,7 +184,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -199,7 +199,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -214,7 +214,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -229,7 +229,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -244,7 +244,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index 3be43868659..167cae2b39c 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -25,6 +25,7 @@ Public Class ucrOutputPages Private _outputLogger As clsOutputLogger Private _selectedOutputPage As ucrOutputPage Private _strSaveDirectory As String + Private checkBoxSelectAll As New CheckBox() Public Sub New() ' This call is required by the designer. @@ -38,6 +39,10 @@ Public Class ucrOutputPages EnableDisableTopButtons() End Sub + Private Sub ucrOutputPages_Load(sender As Object, e As EventArgs) Handles Me.Load + AddSelectAllCheckBoxToToolStripControl() + End Sub + ''' ''' Holds options. ''' ToDo InstatOptions should be able to be accessed from anywhere @@ -84,6 +89,7 @@ Public Class ucrOutputPages Private Sub AddNewOutput(outputElement As clsOutputElement, bDisplayOutputInExternalViewer As Boolean) ucrMainOutputPage.AddNewOutput(outputElement, bDisplayOutputInExternalViewer) + UpdateSelectAllCheckBoxText() End Sub Private Sub AddNewOutputToTab(outputElement As clsOutputElement, tabName As String) @@ -153,6 +159,7 @@ Public Class ucrOutputPages tbMoveUp.Enabled = False End If tbRename.Enabled = _selectedOutputPage.BCanRename + UpdateSelectAllCheckBoxText() End Sub Private Sub RefreshPage() @@ -213,6 +220,7 @@ Public Class ucrOutputPages _outputLogger.AddOutputToFilteredList(element.Clone, strTabName) Next _selectedOutputPage.ClearAllCheckBoxes() + UpdateSelectAllCheckBoxText() End Sub Private Sub tbCopy_Click(sender As Object, e As EventArgs) Handles tbCopy.Click @@ -239,6 +247,7 @@ Public Class ucrOutputPages Else RefreshPage() End If + UpdateSelectAllCheckBoxText() End Sub ''' @@ -303,4 +312,74 @@ Public Class ucrOutputPages End If Next End Sub + + Private Sub AddSelectAllCheckBoxToToolStripControl() + ' Create a ToolStripControlHost to host the CheckBox + Dim checkBoxHost As ToolStripControlHost = New ToolStripControlHost(checkBoxSelectAll) + + ' Insert the CheckBox host at the beginning of tsButtons items + tsButtons.Items.Insert(0, checkBoxHost) + + ' Create a ToolTip for the checkBoxSelectAll CheckBox + Dim ttcheckBoxSelectAll As New ToolTip + ttcheckBoxSelectAll.SetToolTip(checkBoxSelectAll, "Toggle selection for all elements") + + ' Add a Click event handler to the checkBoxSelectAll CheckBox + AddHandler checkBoxSelectAll.Click, AddressOf checkBoxSelectAll_Click + End Sub + + ''' + ''' Updates the text and state of checkBoxSelectAll based on selected elements and output count. + ''' + Private Sub UpdateSelectAllCheckBoxText() + ' Check if _outputLogger is initialized + If _outputLogger Is Nothing Then + Exit Sub ' Exit the sub if logger is not initialized + End If + + ' Variable to hold the count of output elements + Dim iCountOutputElements As Integer = 0 + + ' Determine the count of output elements based on the selected tab + If SelectedTab() = "Main" Then + iCountOutputElements = _outputLogger.OutputElements.Count + Else + iCountOutputElements = _outputLogger.GetFilteredList(SelectedTab).Output.Count + End If + + ' Enable or disable checkBoxSelectAll based on the count of output elements + checkBoxSelectAll.Enabled = iCountOutputElements > 0 + + ' Get the count of selected elements + Dim iSelectedElements = _selectedOutputPage.SelectedElements.Count + + ' Determine the text and check state of checkBoxSelectAll based on selected and total elements + Select Case True + Case iSelectedElements > 0 AndAlso iCountOutputElements > iSelectedElements + ' Indeterminate state when some but not all elements are selected + checkBoxSelectAll.Text = $"{iSelectedElements} item(s)" + checkBoxSelectAll.CheckState = CheckState.Indeterminate + Case iSelectedElements > 0 AndAlso iCountOutputElements = iSelectedElements + ' All elements selected + checkBoxSelectAll.Text = "Deselect All" + checkBoxSelectAll.CheckState = CheckState.Checked + Case Else + ' No elements selected + checkBoxSelectAll.Text = "Select All" + checkBoxSelectAll.CheckState = CheckState.Unchecked + End Select + End Sub + + Private Sub checkBoxSelectAll_Click(sender As Object, e As EventArgs) + ' Handle CheckBox checked changed event here + Dim checkBoxSelectAll As CheckBox = TryCast(sender, CheckBox) + + If checkBoxSelectAll.Checked Then + _selectedOutputPage.SelectAllCheckBoxes() + Else + _selectedOutputPage.ClearAllCheckBoxes() + End If + EnableDisableTopButtons() + End Sub + End Class \ No newline at end of file diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index b5bae7a3a64..6a5935e111a 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -646,7 +646,7 @@ Public Class RLink ''' ''' The text to add to the save log file. '''-------------------------------------------------------------------------------------------- - Private Sub AppendToAutoSaveLog(strScript As String) + Public Sub AppendToAutoSaveLog(strScript As String) Dim strTempFile As String Dim i As Integer = 1 Try @@ -749,22 +749,9 @@ Public Class RLink bShowWaitDialogOverride:=Nothing) End If - ' Split the strOutput into an array of lines, removing empty entries - Dim arrFilesPaths() As String = strOutput.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) - - ' Check if arrFilesPaths has at least one element before iterating - If arrFilesPaths.Length > 0 Then - ' Iterate through each file path - For Each _path In arrFilesPaths - ' Add output to logger - clsOutputLogger.AddOutput(clsRStatement.Text, _path, bAsFile:=True, - bDisplayOutputInExternalViewer:=clsRStatement.TextNoFormatting.StartsWith("view_object_data")) - Next - Else - ' Add output to logger - clsOutputLogger.AddOutput(clsRStatement.Text, strOutput, bAsFile:=True, + ' Add output to logger + clsOutputLogger.AddOutput(clsRStatement.Text, strOutput, bAsFile:=True, bDisplayOutputInExternalViewer:=clsRStatement.TextNoFormatting.StartsWith("view_object_data")) - End If ' Log the script LogScript(clsRStatement.Text.TrimEnd(vbCr, vbLf)) @@ -1012,22 +999,8 @@ Public Class RLink End If End If - If bAsFile Then - ' Split the strOutput into an array of lines, removing empty entries - Dim arrFilesPaths() As String = strOutput.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) - ' Iterate through each HTML files - For Each _path In arrFilesPaths - ' Add each HTML file as an output to clsOutputLogger - ' strScriptWithComment: the script with associated comments - ' _path: the path to the HTML file - ' bAsFile: a boolean indicating whether the output should be treated as a file - ' bDisplayOutputInExternalViewer: a boolean indicating whether to display the output in an external viewer - clsOutputLogger.AddOutput(strScriptWithComment, _path, bAsFile, bDisplayOutputInExternalViewer) - Next - Else - ' If strOutput is empty or does not contain valid HTML files, add strOutput itself as an output - clsOutputLogger.AddOutput(strScriptWithComment, strOutput, bAsFile, bDisplayOutputInExternalViewer) - End If + ' If strOutput is empty or does not contain valid HTML files, add strOutput itself as an output + clsOutputLogger.AddOutput(strScriptWithComment, strOutput, bAsFile, bDisplayOutputInExternalViewer) Catch e As Exception diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index d0f7c6a00a0..caa3ae1e37f 100644 --- a/instat/dlgBoxPlot.vb +++ b/instat/dlgBoxPlot.vb @@ -125,7 +125,7 @@ Public Class dlgBoxplot ucrPnlPlots.AddFunctionNamesCondition(rdoBoxplotTufte, {"geom_boxplot", "geom_tufteboxplot"}) ucrPnlPlots.AddFunctionNamesCondition(rdoJitter, "geom_jitter") ucrPnlPlots.AddFunctionNamesCondition(rdoViolin, "geom_violin") - ucrPnlPlots.AddToLinkedControls({ucrChkAddPoints, ucrChkWidth}, {rdoBoxplotTufte, rdoViolin}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlPlots.AddToLinkedControls({ucrChkAddPoints}, {rdoBoxplotTufte, rdoViolin}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlPlots.AddToLinkedControls({ucrChkTufte}, {rdoBoxplotTufte}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkTufte.AddToLinkedControls(ucrChkVarWidth, {"FALSE"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlPlots.AddToLinkedControls(ucrChkBoxPlot, {rdoJitter, rdoViolin}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -235,7 +235,7 @@ Public Class dlgBoxplot ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) ucrInputStation.SetDropDownStyleAsNonEditable() - ucrChkWidth.SetText("Width") + ucrChkWidth.SetText("Cut Width") ucrChkWidth.AddToLinkedControls({ucrInputWidth}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.25) ucrChkWidth.AddParameterValuesCondition(True, "cut_width", "True") ucrChkWidth.AddParameterValuesCondition(False, "cut_width", "False") @@ -260,6 +260,7 @@ Public Class dlgBoxplot ucrChkGrouptoConnect.AddParameterPresentCondition(False, strStatSummaryParameterName, False) 'this control exists but diabled for now DialogueSize() + HideShowWidth() End Sub Private Sub SetDefaults() @@ -438,6 +439,7 @@ Public Class dlgBoxplot ucrChkBoxPlot.SetRCode(clsDummyFunction, bReset) ucrChkWidth.SetRCode(clsDummyFunction, bReset) End If + HideShowWidth() End Sub Private Sub TestOkEnabled() @@ -488,6 +490,8 @@ Public Class dlgBoxplot SetGeomPrefixFillColourAes() DialogueSize() EnableDisableBoxplotOptions() + HideShowWidth() + If rdoBoxplotTufte.Checked Then If ucrChkAddPoints.Checked Then clsBoxplotFunction.AddParameter("outlier.shape", "NA", iPosition:=2) @@ -732,6 +736,7 @@ Public Class dlgBoxplot AddRemoveGroupBy() EnableDisableWidth() AddRemoveAesParm() + HideShowWidth() End Sub Private Sub GetParameterValue(clsOperator As ROperator) @@ -805,22 +810,22 @@ Public Class dlgBoxplot clsCutWitdhFunction.RemoveParameterByName("var") End If EnableDisableWidth() + HideShowWidth() + 'ucrInputWidth.Visible = ucrChkWidth.Checked End Sub Private Sub ucrChkWidth_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkWidth.ControlValueChanged EnableDisableWidth() + HideShowWidth() + 'ucrInputWidth.Visible = ucrChkWidth.Checked End Sub Private Sub EnableDisableWidth() If ucrByFactorsReceiver.strCurrDataType = "Date" OrElse ucrByFactorsReceiver.strCurrDataType = "factor" OrElse ucrByFactorsReceiver.strCurrDataType = "orderded, factor" Then - ucrChkWidth.Enabled = False - ucrInputWidth.Enabled = False clsBoxplotFunction.RemoveParameterByName("aes") clsWidthRaesFunction.RemoveParameterByName("group") clsViolinplotFunction.RemoveParameterByName("aes") Else - ucrChkWidth.Enabled = True - ucrInputWidth.Enabled = True If ucrChkWidth.Checked AndAlso Not ucrByFactorsReceiver.IsEmpty Then clsWidthRaesFunction.AddParameter("group", clsRFunctionParameter:=clsCutWitdhFunction, iPosition:=1) clsBoxplotFunction.AddParameter("aes", clsRFunctionParameter:=clsWidthRaesFunction, bIncludeArgumentName:=False, iPosition:=1) @@ -833,6 +838,16 @@ Public Class dlgBoxplot End If End Sub + Private Sub HideShowWidth() + ucrChkWidth.Visible = False + ucrInputWidth.Visible = False + + If (rdoBoxplotTufte.Checked OrElse rdoViolin.Checked) AndAlso ucrByFactorsReceiver.strCurrDataType = "numeric" Then + ucrChkWidth.Visible = True + ucrInputWidth.Visible = ucrChkWidth.Checked + End If + End Sub + Private Sub ucrChkBoxPlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkBoxPlot.ControlValueChanged, ucrNudBoxPlot.ControlValueChanged If ucrChkBoxPlot.Checked Then clsGeomBoxPlotFunction.AddParameter("width", ucrNudBoxPlot.GetText(), iPosition:=3) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 16e9351e19a..1a856338a42 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", "Functions"} Private Sub dlgCalculator_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -158,6 +158,9 @@ Public Class dlgCalculator Private Sub ucrInputCalOptions_NameChanged() Handles ucrCalc.NameChanged Select Case ucrCalc.ucrInputCalOptions.GetText + Case "Functions" + Me.Width = iBasicWidth * 1.5 + ucrBase.iHelpTopicID = 439 Case "Maths" Me.Width = iBasicWidth * 1.38 ucrBase.iHelpTopicID = 126 @@ -192,7 +195,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/dlgCluster.vb b/instat/dlgCluster.vb index bbf683ad0c2..a6b090c6139 100644 --- a/instat/dlgCluster.vb +++ b/instat/dlgCluster.vb @@ -103,7 +103,7 @@ Public Class dlgCluster ucrPnlPrepareData.AddToLinkedControls({ucrChkMatrix, ucrSaveDistance}, {rdoDistanceData}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlPrepareData.AddToLinkedControls(ucrInputMethod, {rdoDistanceData}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrSaveNewDataFrame.SetSaveTypeAsModel() + ucrSaveNewDataFrame.SetSaveTypeAsDataFrame() ucrSaveNewDataFrame.SetDataFrameSelector(ucrSelectorPrepareData.ucrAvailableDataFrames) ucrSaveNewDataFrame.SetLabelText("New Data Frame Name:") ucrSaveNewDataFrame.SetPrefix("scale") 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/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb index b6e8c0cb7c8..edd151ed5b3 100644 --- a/instat/dlgExportClimaticDefinitions.Designer.vb +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -22,21 +22,547 @@ Partial Class dlgExportClimaticDefinitions 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.lblStationID = New System.Windows.Forms.Label() + Me.lblCountry = New System.Windows.Forms.Label() + Me.ucrInputCountry = New instat.ucrInputTextBox() + Me.ucrInputStationID = New instat.ucrInputTextBox() + Me.ucrChkSeasonStartProp = New instat.ucrCheck() + Me.ucrChkExtremes = New instat.ucrCheck() + Me.ucrChkCropSuccessProp = New instat.ucrCheck() + Me.ucrChkAnnualTemp = New instat.ucrCheck() + Me.ucrChkAnnualRainfall = New instat.ucrCheck() + Me.lblMonth = New System.Windows.Forms.Label() + Me.lblYear = New System.Windows.Forms.Label() + Me.ucrReceiverMonth = New instat.ucrReceiverSingle() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() + Me.Label1 = New System.Windows.Forms.Label() + Me.ucrChkIncludeSummaryData = New instat.ucrCheck() + Me.grpSummaries = New System.Windows.Forms.GroupBox() + Me.ucrChkMonthlyTemp = New instat.ucrCheck() + Me.lblMaxTemp = New System.Windows.Forms.Label() + Me.lblCropData = New System.Windows.Forms.Label() + Me.lblDataByYearMonth = New System.Windows.Forms.Label() + Me.lblDataByYear = New System.Windows.Forms.Label() + Me.lblRain = New System.Windows.Forms.Label() + Me.lblMinTemp = New System.Windows.Forms.Label() + Me.lblData = New System.Windows.Forms.Label() + Me.ucrReceiverRain = New instat.ucrReceiverSingle() + Me.ucrReceiverMinTemp = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxTemp = New instat.ucrReceiverSingle() + Me.ucrReceiverData = New instat.ucrReceiverSingle() + Me.ucrSelectorExportDefinitions = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.ucrReceiverDataYear = New instat.ucrReceiverSingle() + Me.ucrReceiverDataYearMonth = New instat.ucrReceiverSingle() + Me.ucrReceiverCropData = New instat.ucrReceiverSingle() + Me.lblExport = New System.Windows.Forms.Label() + Me.cmdChooseFile = New System.Windows.Forms.Button() + Me.ucrInputTokenPath = New instat.ucrInputTextBox() + Me.cmdDefine = New System.Windows.Forms.Button() + Me.grpSummaries.SuspendLayout() Me.SuspendLayout() ' + 'lblStationID + ' + Me.lblStationID.AutoSize = True + Me.lblStationID.Location = New System.Drawing.Point(501, 194) + Me.lblStationID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStationID.Name = "lblStationID" + Me.lblStationID.Size = New System.Drawing.Size(85, 20) + Me.lblStationID.TabIndex = 7 + Me.lblStationID.Text = "Station ID:" + ' + 'lblCountry + ' + Me.lblCountry.AutoSize = True + Me.lblCountry.Location = New System.Drawing.Point(504, 251) + Me.lblCountry.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCountry.Name = "lblCountry" + Me.lblCountry.Size = New System.Drawing.Size(68, 20) + Me.lblCountry.TabIndex = 9 + Me.lblCountry.Text = "Country:" + ' + 'ucrInputCountry + ' + Me.ucrInputCountry.AddQuotesIfUnrecognised = True + Me.ucrInputCountry.AutoSize = True + Me.ucrInputCountry.IsMultiline = False + Me.ucrInputCountry.IsReadOnly = False + Me.ucrInputCountry.Location = New System.Drawing.Point(501, 274) + Me.ucrInputCountry.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputCountry.Name = "ucrInputCountry" + Me.ucrInputCountry.Size = New System.Drawing.Size(177, 32) + Me.ucrInputCountry.TabIndex = 10 + ' + 'ucrInputStationID + ' + Me.ucrInputStationID.AddQuotesIfUnrecognised = True + Me.ucrInputStationID.AutoSize = True + Me.ucrInputStationID.IsMultiline = False + Me.ucrInputStationID.IsReadOnly = False + Me.ucrInputStationID.Location = New System.Drawing.Point(501, 218) + Me.ucrInputStationID.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputStationID.Name = "ucrInputStationID" + Me.ucrInputStationID.Size = New System.Drawing.Size(177, 32) + Me.ucrInputStationID.TabIndex = 8 + ' + 'ucrChkSeasonStartProp + ' + Me.ucrChkSeasonStartProp.AutoSize = True + Me.ucrChkSeasonStartProp.Checked = False + Me.ucrChkSeasonStartProp.Location = New System.Drawing.Point(236, 71) + Me.ucrChkSeasonStartProp.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkSeasonStartProp.Name = "ucrChkSeasonStartProp" + Me.ucrChkSeasonStartProp.Size = New System.Drawing.Size(226, 52) + Me.ucrChkSeasonStartProp.TabIndex = 3 + ' + 'ucrChkExtremes + ' + Me.ucrChkExtremes.AutoSize = True + Me.ucrChkExtremes.Checked = False + Me.ucrChkExtremes.Location = New System.Drawing.Point(236, 120) + Me.ucrChkExtremes.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkExtremes.Name = "ucrChkExtremes" + Me.ucrChkExtremes.Size = New System.Drawing.Size(220, 52) + Me.ucrChkExtremes.TabIndex = 5 + Me.ucrChkExtremes.Visible = False + ' + 'ucrChkCropSuccessProp + ' + Me.ucrChkCropSuccessProp.AutoSize = True + Me.ucrChkCropSuccessProp.Checked = False + Me.ucrChkCropSuccessProp.Location = New System.Drawing.Point(236, 28) + Me.ucrChkCropSuccessProp.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkCropSuccessProp.Name = "ucrChkCropSuccessProp" + Me.ucrChkCropSuccessProp.Size = New System.Drawing.Size(230, 52) + Me.ucrChkCropSuccessProp.TabIndex = 1 + ' + 'ucrChkAnnualTemp + ' + Me.ucrChkAnnualTemp.AutoSize = True + Me.ucrChkAnnualTemp.Checked = False + Me.ucrChkAnnualTemp.Location = New System.Drawing.Point(12, 71) + Me.ucrChkAnnualTemp.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkAnnualTemp.Name = "ucrChkAnnualTemp" + Me.ucrChkAnnualTemp.Size = New System.Drawing.Size(224, 52) + Me.ucrChkAnnualTemp.TabIndex = 2 + ' + 'ucrChkAnnualRainfall + ' + Me.ucrChkAnnualRainfall.AutoSize = True + Me.ucrChkAnnualRainfall.Checked = False + Me.ucrChkAnnualRainfall.Location = New System.Drawing.Point(12, 28) + Me.ucrChkAnnualRainfall.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkAnnualRainfall.Name = "ucrChkAnnualRainfall" + Me.ucrChkAnnualRainfall.Size = New System.Drawing.Size(224, 52) + Me.ucrChkAnnualRainfall.TabIndex = 0 + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(504, 134) + Me.lblMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(58, 20) + Me.lblMonth.TabIndex = 5 + Me.lblMonth.Text = "Month:" + ' + 'lblYear + ' + Me.lblYear.AutoSize = True + Me.lblYear.Location = New System.Drawing.Point(506, 75) + Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(47, 20) + Me.lblYear.TabIndex = 3 + Me.lblYear.Text = "Year:" + ' + 'ucrReceiverMonth + ' + Me.ucrReceiverMonth.AutoSize = True + Me.ucrReceiverMonth.frmParent = Me + Me.ucrReceiverMonth.Location = New System.Drawing.Point(498, 160) + Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonth.Name = "ucrReceiverMonth" + Me.ucrReceiverMonth.Selector = Nothing + Me.ucrReceiverMonth.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverMonth.strNcFilePath = "" + Me.ucrReceiverMonth.TabIndex = 6 + Me.ucrReceiverMonth.ucrSelector = Nothing + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Location = New System.Drawing.Point(500, 100) + Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 4 + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(118, 703) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(0, 20) + Me.Label1.TabIndex = 30 + ' + 'ucrChkIncludeSummaryData + ' + Me.ucrChkIncludeSummaryData.AutoSize = True + Me.ucrChkIncludeSummaryData.Checked = False + Me.ucrChkIncludeSummaryData.Location = New System.Drawing.Point(6, 513) + Me.ucrChkIncludeSummaryData.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkIncludeSummaryData.Name = "ucrChkIncludeSummaryData" + Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(332, 48) + Me.ucrChkIncludeSummaryData.TabIndex = 24 + ' + 'grpSummaries + ' + Me.grpSummaries.Controls.Add(Me.ucrChkMonthlyTemp) + Me.grpSummaries.Controls.Add(Me.ucrChkSeasonStartProp) + Me.grpSummaries.Controls.Add(Me.ucrChkExtremes) + Me.grpSummaries.Controls.Add(Me.ucrChkCropSuccessProp) + Me.grpSummaries.Controls.Add(Me.ucrChkAnnualTemp) + Me.grpSummaries.Controls.Add(Me.ucrChkAnnualRainfall) + Me.grpSummaries.Location = New System.Drawing.Point(6, 325) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.grpSummaries.Name = "grpSummaries" + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.grpSummaries.Size = New System.Drawing.Size(470, 177) + Me.grpSummaries.TabIndex = 23 + Me.grpSummaries.TabStop = False + Me.grpSummaries.Text = "Summaries" + ' + 'ucrChkMonthlyTemp + ' + Me.ucrChkMonthlyTemp.AutoSize = True + Me.ucrChkMonthlyTemp.Checked = False + Me.ucrChkMonthlyTemp.Location = New System.Drawing.Point(12, 120) + Me.ucrChkMonthlyTemp.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkMonthlyTemp.Name = "ucrChkMonthlyTemp" + Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(220, 52) + Me.ucrChkMonthlyTemp.TabIndex = 4 + ' + 'lblMaxTemp + ' + Me.lblMaxTemp.AutoSize = True + Me.lblMaxTemp.Location = New System.Drawing.Point(504, 635) + Me.lblMaxTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxTemp.Name = "lblMaxTemp" + Me.lblMaxTemp.Size = New System.Drawing.Size(86, 20) + Me.lblMaxTemp.TabIndex = 21 + Me.lblMaxTemp.Text = "Max Temp:" + ' + 'lblCropData + ' + Me.lblCropData.AutoSize = True + Me.lblCropData.Location = New System.Drawing.Point(504, 442) + Me.lblCropData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCropData.Name = "lblCropData" + Me.lblCropData.Size = New System.Drawing.Size(86, 20) + Me.lblCropData.TabIndex = 15 + Me.lblCropData.Text = "Crop Data:" + ' + 'lblDataByYearMonth + ' + Me.lblDataByYearMonth.AutoSize = True + Me.lblDataByYearMonth.Location = New System.Drawing.Point(500, 377) + Me.lblDataByYearMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDataByYearMonth.Name = "lblDataByYearMonth" + Me.lblDataByYearMonth.Size = New System.Drawing.Size(188, 20) + Me.lblDataByYearMonth.TabIndex = 13 + Me.lblDataByYearMonth.Text = "Data By Year and Month:" + ' + 'lblDataByYear + ' + Me.lblDataByYear.AutoSize = True + Me.lblDataByYear.Location = New System.Drawing.Point(504, 311) + Me.lblDataByYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDataByYear.Name = "lblDataByYear" + Me.lblDataByYear.Size = New System.Drawing.Size(108, 20) + Me.lblDataByYear.TabIndex = 11 + Me.lblDataByYear.Text = "Data By Year:" + ' + 'lblRain + ' + Me.lblRain.AutoSize = True + Me.lblRain.Location = New System.Drawing.Point(504, 505) + Me.lblRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblRain.Name = "lblRain" + Me.lblRain.Size = New System.Drawing.Size(46, 20) + Me.lblRain.TabIndex = 17 + Me.lblRain.Text = "Rain:" + ' + 'lblMinTemp + ' + Me.lblMinTemp.AutoSize = True + Me.lblMinTemp.Location = New System.Drawing.Point(504, 571) + Me.lblMinTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinTemp.Name = "lblMinTemp" + Me.lblMinTemp.Size = New System.Drawing.Size(82, 20) + Me.lblMinTemp.TabIndex = 19 + Me.lblMinTemp.Text = "Min Temp:" + ' + 'lblData + ' + Me.lblData.AutoSize = True + Me.lblData.Location = New System.Drawing.Point(498, 14) + Me.lblData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblData.Name = "lblData" + Me.lblData.Size = New System.Drawing.Size(48, 20) + Me.lblData.TabIndex = 1 + Me.lblData.Text = "Data:" + ' + 'ucrReceiverRain + ' + Me.ucrReceiverRain.AutoSize = True + Me.ucrReceiverRain.frmParent = Me + Me.ucrReceiverRain.Location = New System.Drawing.Point(501, 531) + Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRain.Name = "ucrReceiverRain" + Me.ucrReceiverRain.Selector = Nothing + Me.ucrReceiverRain.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverRain.strNcFilePath = "" + Me.ucrReceiverRain.TabIndex = 18 + Me.ucrReceiverRain.ucrSelector = Nothing + ' + 'ucrReceiverMinTemp + ' + Me.ucrReceiverMinTemp.AutoSize = True + Me.ucrReceiverMinTemp.frmParent = Me + Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(501, 597) + Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" + Me.ucrReceiverMinTemp.Selector = Nothing + Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverMinTemp.strNcFilePath = "" + Me.ucrReceiverMinTemp.TabIndex = 20 + Me.ucrReceiverMinTemp.ucrSelector = Nothing + ' + 'ucrReceiverMaxTemp + ' + Me.ucrReceiverMaxTemp.AutoSize = True + Me.ucrReceiverMaxTemp.frmParent = Me + Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(501, 663) + Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" + Me.ucrReceiverMaxTemp.Selector = Nothing + Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverMaxTemp.strNcFilePath = "" + Me.ucrReceiverMaxTemp.TabIndex = 22 + Me.ucrReceiverMaxTemp.ucrSelector = Nothing + ' + 'ucrReceiverData + ' + Me.ucrReceiverData.AutoSize = True + Me.ucrReceiverData.frmParent = Me + Me.ucrReceiverData.Location = New System.Drawing.Point(495, 40) + Me.ucrReceiverData.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverData.Name = "ucrReceiverData" + Me.ucrReceiverData.Selector = Nothing + Me.ucrReceiverData.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverData.strNcFilePath = "" + Me.ucrReceiverData.TabIndex = 2 + Me.ucrReceiverData.ucrSelector = Nothing + ' + 'ucrSelectorExportDefinitions + ' + Me.ucrSelectorExportDefinitions.AutoSize = True + Me.ucrSelectorExportDefinitions.bDropUnusedFilterLevels = False + Me.ucrSelectorExportDefinitions.bShowHiddenColumns = False + Me.ucrSelectorExportDefinitions.bUseCurrentFilter = True + Me.ucrSelectorExportDefinitions.Location = New System.Drawing.Point(6, 12) + Me.ucrSelectorExportDefinitions.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorExportDefinitions.Name = "ucrSelectorExportDefinitions" + Me.ucrSelectorExportDefinitions.Size = New System.Drawing.Size(320, 282) + Me.ucrSelectorExportDefinitions.TabIndex = 0 + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(6, 705) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(615, 92) + Me.ucrBase.TabIndex = 29 + ' + 'ucrReceiverDataYear + ' + Me.ucrReceiverDataYear.AutoSize = True + Me.ucrReceiverDataYear.frmParent = Me + Me.ucrReceiverDataYear.Location = New System.Drawing.Point(501, 337) + Me.ucrReceiverDataYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDataYear.Name = "ucrReceiverDataYear" + Me.ucrReceiverDataYear.Selector = Nothing + Me.ucrReceiverDataYear.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverDataYear.strNcFilePath = "" + Me.ucrReceiverDataYear.TabIndex = 12 + Me.ucrReceiverDataYear.ucrSelector = Nothing + ' + 'ucrReceiverDataYearMonth + ' + Me.ucrReceiverDataYearMonth.AutoSize = True + Me.ucrReceiverDataYearMonth.frmParent = Me + Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(501, 403) + Me.ucrReceiverDataYearMonth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDataYearMonth.Name = "ucrReceiverDataYearMonth" + Me.ucrReceiverDataYearMonth.Selector = Nothing + Me.ucrReceiverDataYearMonth.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverDataYearMonth.strNcFilePath = "" + Me.ucrReceiverDataYearMonth.TabIndex = 14 + Me.ucrReceiverDataYearMonth.ucrSelector = Nothing + ' + 'ucrReceiverCropData + ' + Me.ucrReceiverCropData.AutoSize = True + Me.ucrReceiverCropData.frmParent = Me + Me.ucrReceiverCropData.Location = New System.Drawing.Point(501, 466) + Me.ucrReceiverCropData.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverCropData.Name = "ucrReceiverCropData" + Me.ucrReceiverCropData.Selector = Nothing + Me.ucrReceiverCropData.Size = New System.Drawing.Size(180, 31) + Me.ucrReceiverCropData.strNcFilePath = "" + Me.ucrReceiverCropData.TabIndex = 16 + Me.ucrReceiverCropData.ucrSelector = Nothing + ' + 'lblExport + ' + Me.lblExport.AutoSize = True + Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExport.Location = New System.Drawing.Point(10, 603) + Me.lblExport.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblExport.Name = "lblExport" + Me.lblExport.Size = New System.Drawing.Size(57, 20) + Me.lblExport.TabIndex = 26 + Me.lblExport.Text = "Token:" + ' + 'cmdChooseFile + ' + Me.cmdChooseFile.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdChooseFile.Location = New System.Drawing.Point(380, 595) + Me.cmdChooseFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.cmdChooseFile.Name = "cmdChooseFile" + Me.cmdChooseFile.Size = New System.Drawing.Size(120, 35) + Me.cmdChooseFile.TabIndex = 28 + Me.cmdChooseFile.Text = "Browse" + Me.cmdChooseFile.UseVisualStyleBackColor = True + ' + 'ucrInputTokenPath + ' + Me.ucrInputTokenPath.AddQuotesIfUnrecognised = True + Me.ucrInputTokenPath.AutoSize = True + Me.ucrInputTokenPath.IsMultiline = False + Me.ucrInputTokenPath.IsReadOnly = False + Me.ucrInputTokenPath.Location = New System.Drawing.Point(100, 598) + Me.ucrInputTokenPath.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) + Me.ucrInputTokenPath.Name = "ucrInputTokenPath" + Me.ucrInputTokenPath.Size = New System.Drawing.Size(273, 32) + Me.ucrInputTokenPath.TabIndex = 27 + ' + 'cmdDefine + ' + Me.cmdDefine.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDefine.Location = New System.Drawing.Point(338, 512) + Me.cmdDefine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.cmdDefine.Name = "cmdDefine" + Me.cmdDefine.Size = New System.Drawing.Size(120, 45) + Me.cmdDefine.TabIndex = 25 + Me.cmdDefine.Text = "Define" + Me.cmdDefine.UseVisualStyleBackColor = True + ' 'dlgExportClimaticDefinitions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(464, 360) + Me.ClientSize = New System.Drawing.Size(682, 811) + Me.Controls.Add(Me.cmdDefine) + Me.Controls.Add(Me.lblExport) + Me.Controls.Add(Me.cmdChooseFile) + Me.Controls.Add(Me.ucrInputTokenPath) + Me.Controls.Add(Me.lblStationID) + Me.Controls.Add(Me.lblCountry) + Me.Controls.Add(Me.ucrInputCountry) + Me.Controls.Add(Me.ucrInputStationID) + Me.Controls.Add(Me.lblMonth) + Me.Controls.Add(Me.lblYear) + Me.Controls.Add(Me.ucrReceiverMonth) + Me.Controls.Add(Me.ucrReceiverYear) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.ucrChkIncludeSummaryData) + Me.Controls.Add(Me.grpSummaries) + Me.Controls.Add(Me.lblMaxTemp) + Me.Controls.Add(Me.lblCropData) + Me.Controls.Add(Me.lblDataByYearMonth) + Me.Controls.Add(Me.lblDataByYear) + Me.Controls.Add(Me.lblRain) + Me.Controls.Add(Me.lblMinTemp) + Me.Controls.Add(Me.lblData) + Me.Controls.Add(Me.ucrReceiverRain) + Me.Controls.Add(Me.ucrReceiverMinTemp) + Me.Controls.Add(Me.ucrReceiverMaxTemp) + Me.Controls.Add(Me.ucrReceiverData) + Me.Controls.Add(Me.ucrSelectorExportDefinitions) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrReceiverDataYear) + Me.Controls.Add(Me.ucrReceiverDataYearMonth) + Me.Controls.Add(Me.ucrReceiverCropData) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgExportClimaticDefinitions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Export Climatic Definitions" + Me.grpSummaries.ResumeLayout(False) + Me.grpSummaries.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents lblStationID As Label + Friend WithEvents lblCountry As Label + Friend WithEvents ucrInputCountry As ucrInputTextBox + Friend WithEvents ucrInputStationID As ucrInputTextBox + Friend WithEvents ucrChkSeasonStartProp As ucrCheck + Friend WithEvents ucrChkExtremes As ucrCheck + Friend WithEvents ucrChkCropSuccessProp As ucrCheck + Friend WithEvents ucrChkAnnualTemp As ucrCheck + Friend WithEvents ucrChkAnnualRainfall As ucrCheck + Friend WithEvents lblMonth As Label + Friend WithEvents lblYear As Label + Friend WithEvents ucrReceiverMonth As ucrReceiverSingle + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents Label1 As Label + Friend WithEvents ucrChkIncludeSummaryData As ucrCheck + Friend WithEvents grpSummaries As GroupBox + Friend WithEvents ucrChkMonthlyTemp As ucrCheck + Friend WithEvents lblMaxTemp As Label + Friend WithEvents lblCropData As Label + Friend WithEvents lblDataByYearMonth As Label + Friend WithEvents lblDataByYear As Label + Friend WithEvents lblRain As Label + Friend WithEvents lblMinTemp As Label + Friend WithEvents lblData As Label + Friend WithEvents ucrReceiverRain As ucrReceiverSingle + Friend WithEvents ucrReceiverMinTemp As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxTemp As ucrReceiverSingle + Friend WithEvents ucrReceiverData As ucrReceiverSingle + Friend WithEvents ucrSelectorExportDefinitions As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrReceiverDataYear As ucrReceiverSingle + Friend WithEvents ucrReceiverDataYearMonth As ucrReceiverSingle + Friend WithEvents ucrReceiverCropData As ucrReceiverSingle + Friend WithEvents lblExport As Label + Friend WithEvents cmdChooseFile As Button + Friend WithEvents ucrInputTokenPath As ucrInputTextBox + Friend WithEvents cmdDefine As Button End Class diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 89b1ba24c26..0c1638dff41 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -1,3 +1,391 @@ -Public Class dlgExportClimaticDefinitions +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . +Imports instat.Translations +Imports System.IO +Public Class dlgExportClimaticDefinitions + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private bResetSubdialog As Boolean = False + Private clsDummyFunction As New RFunction + Public clsExportRinstatToBucketFunction, ClsGcsAuthFileFunction, clsSummariesFunction As New RFunction + Public clsReforMattAnnualSummariesFunction, clsReformatCropSuccessFunction, clsReformatSeasonStartFunction, clsReformatTempSummariesFunction, clsReformatMonthlyTempSummaries As New RFunction + + Private Sub dlgExportClimaticDefinitions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + SetDefaults() + End If + SetRCodeForControls(bReset) + bReset = False + TestOkEnabled() + autoTranslate(Me) + End Sub + + Private Sub InitialiseDialog() + + ucrReceiverData.SetParameter(New RParameter("data", 0)) + ucrReceiverData.Selector = ucrSelectorExportDefinitions + ucrReceiverData.SetParameterIsString() + ucrReceiverData.SetMeAsReceiver() + ucrReceiverData.SetItemType("dataframe") + ucrReceiverData.strSelectorHeading = "Data Sets" + + ucrReceiverDataYear.SetParameter(New RParameter("data_by_year", 1)) + ucrReceiverDataYear.Selector = ucrSelectorExportDefinitions + ucrReceiverDataYear.SetParameterIsString() + ucrReceiverDataYear.SetItemType("dataframe") + ucrReceiverDataYear.strSelectorHeading = "Data Sets" + ucrReceiverDataYear.SetLinkedDisplayControl(lblDataByYear) + + ucrReceiverDataYearMonth.SetParameter(New RParameter("data_by_year_month", 2)) + ucrReceiverDataYearMonth.Selector = ucrSelectorExportDefinitions + ucrReceiverDataYearMonth.SetParameterIsString() + ucrReceiverDataYearMonth.SetItemType("dataframe") + ucrReceiverDataYearMonth.strSelectorHeading = "Data Sets" + ucrReceiverDataYearMonth.SetLinkedDisplayControl(lblDataByYearMonth) + + ucrReceiverCropData.SetParameter(New RParameter("crop_data", 3)) + ucrReceiverCropData.Selector = ucrSelectorExportDefinitions + ucrReceiverCropData.SetParameterIsString() + ucrReceiverCropData.SetItemType("dataframe") + ucrReceiverCropData.strSelectorHeading = "Data Sets" + ucrReceiverCropData.SetLinkedDisplayControl(lblCropData) + + ucrReceiverMinTemp.SetParameter(New RParameter("tmin", 4)) + ucrReceiverMinTemp.Selector = ucrSelectorExportDefinitions + ucrReceiverMinTemp.SetParameterIsString() + ucrReceiverMinTemp.SetLinkedDisplayControl(lblMinTemp) + + ucrReceiverMaxTemp.SetParameter(New RParameter("tmax", 5)) + ucrReceiverMaxTemp.Selector = ucrSelectorExportDefinitions + ucrReceiverMaxTemp.SetParameterIsString() + ucrReceiverMaxTemp.SetLinkedDisplayControl(lblMaxTemp) + + ucrReceiverRain.SetParameter(New RParameter("rain", 6)) + ucrReceiverRain.Selector = ucrSelectorExportDefinitions + ucrReceiverRain.SetParameterIsString() + ucrReceiverRain.SetLinkedDisplayControl(lblRain) + + ucrReceiverYear.SetParameter(New RParameter("year", 7)) + ucrReceiverYear.Selector = ucrSelectorExportDefinitions + ucrReceiverYear.SetParameterIsString() + ucrReceiverYear.SetLinkedDisplayControl(lblYear) + + ucrReceiverMonth.SetParameter(New RParameter("month", 8)) + ucrReceiverMonth.Selector = ucrSelectorExportDefinitions + ucrReceiverMonth.SetParameterIsString() + ucrReceiverMonth.SetLinkedDisplayControl(lblMonth) + + ucrChkAnnualRainfall.SetText("Annual Rainfall") + ucrChkAnnualRainfall.AddParameterValuesCondition(True, "rain", "True") + ucrChkAnnualRainfall.AddParameterValuesCondition(False, "rain", "False") + + ucrChkAnnualTemp.SetText("Annual Temperature") + ucrChkAnnualTemp.AddParameterValuesCondition(True, "temp", "True") + ucrChkAnnualTemp.AddParameterValuesCondition(False, "temp", "False") + + ucrChkExtremes.SetText("Extremes") + ucrChkExtremes.AddParameterValuesCondition(True, "extrem", "True") + ucrChkExtremes.AddParameterValuesCondition(False, "extrem", "False") + + ucrChkMonthlyTemp.SetText("Monthly Temperature") + ucrChkMonthlyTemp.AddParameterValuesCondition(True, "monthly_temp", "True") + ucrChkMonthlyTemp.AddParameterValuesCondition(False, "monthly_temp", "False") + + ucrChkSeasonStartProp.SetText("Season Start Probabilities") + ucrChkSeasonStartProp.AddParameterValuesCondition(True, "season", "True") + ucrChkSeasonStartProp.AddParameterValuesCondition(False, "season", "False") + + ucrChkCropSuccessProp.SetText("Crop Success Probabilities") + ucrChkCropSuccessProp.AddParameterValuesCondition(True, "crop", "True") + ucrChkCropSuccessProp.AddParameterValuesCondition(False, "crop", "False") + + ucrChkIncludeSummaryData.SetText("Include Summary Data") + ucrChkIncludeSummaryData.SetParameter(New RParameter("include_summary_data", 17)) + ucrChkIncludeSummaryData.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkIncludeSummaryData.SetRDefault("FALSE") + + ucrInputStationID.SetParameter(New RParameter("station_id", 18)) + + ucrInputCountry.SetParameter(New RParameter("country", 19)) + + ucrInputTokenPath.SetParameter(New RParameter("filename", 0)) + + End Sub + + Private Sub SetDefaults() + clsExportRinstatToBucketFunction = New RFunction + clsSummariesFunction = New RFunction + clsReformatCropSuccessFunction = New RFunction + clsReformatMonthlyTempSummaries = New RFunction + clsReformatSeasonStartFunction = New RFunction + clsReforMattAnnualSummariesFunction = New RFunction + clsReformatTempSummariesFunction = New RFunction + ClsGcsAuthFileFunction = New RFunction + clsDummyFunction = New RFunction + bResetSubdialog = True + + ucrSelectorExportDefinitions.Reset() + + clsDummyFunction.AddParameter("rain", "False", iPosition:=0) + clsDummyFunction.AddParameter("temp", "False", iPosition:=1) + clsDummyFunction.AddParameter("monthly_temp", "False", iPosition:=2) + clsDummyFunction.AddParameter("extrem", "False", iPosition:=3) + clsDummyFunction.AddParameter("season", "False", iPosition:=4) + clsDummyFunction.AddParameter("crop", "False", iPosition:=5) + + clsReformatTempSummariesFunction.SetPackageName("epicsawrap") + clsReformatTempSummariesFunction.SetRCommand("reformat_temperature_summaries") + clsReformatTempSummariesFunction.SetAssignTo("annual_temp") + + clsReforMattAnnualSummariesFunction.SetPackageName("epicsawrap") + clsReforMattAnnualSummariesFunction.SetRCommand("reformat_annual_summaries") + clsReforMattAnnualSummariesFunction.SetAssignTo("annual_rain") + + clsReformatSeasonStartFunction.SetPackageName("epicsawrap") + clsReformatSeasonStartFunction.SetRCommand("reformat_season_start") + clsReformatSeasonStartFunction.SetAssignTo("crop_def") + + clsReformatMonthlyTempSummaries.SetPackageName("epicsawrap") + clsReformatMonthlyTempSummaries.SetRCommand("reformat_temperature_summaries") + clsReformatMonthlyTempSummaries.SetAssignTo("monthly_temp") + + clsReformatCropSuccessFunction.SetPackageName("epicsawrap") + clsReformatCropSuccessFunction.SetRCommand("reformat_crop_success") + clsReformatCropSuccessFunction.SetAssignTo("crop_prop") + + clsSummariesFunction.SetRCommand("c") + + clsExportRinstatToBucketFunction.SetPackageName("epicsawrap") + clsExportRinstatToBucketFunction.SetRCommand("export_r_instat_to_bucket") + + ClsGcsAuthFileFunction.SetPackageName("epicsawrap") + ClsGcsAuthFileFunction.SetRCommand("gcs_auth_file") + + ucrBase.clsRsyntax.ClearCodes() + ucrBase.clsRsyntax.AddToBeforeCodes(ClsGcsAuthFileFunction, 0) + ucrBase.clsRsyntax.SetBaseRFunction(clsExportRinstatToBucketFunction) + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrReceiverCropData.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverData.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverDataYear.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverDataYearMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverMaxTemp.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverMinTemp.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverRain.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverYear.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrSelectorExportDefinitions.SetRCode(clsExportRinstatToBucketFunction) + ucrInputTokenPath.SetRCode(ClsGcsAuthFileFunction, bReset) + + ucrInputStationID.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrInputCountry.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrChkIncludeSummaryData.SetRCode(clsExportRinstatToBucketFunction, bReset) + If bReset Then + ucrChkAnnualRainfall.SetRCode(clsDummyFunction, bReset) + ucrChkAnnualTemp.SetRCode(clsDummyFunction, bReset) + ucrChkCropSuccessProp.SetRCode(clsDummyFunction, bReset) + ucrChkExtremes.SetRCode(clsDummyFunction, bReset) + ucrChkMonthlyTemp.SetRCode(clsDummyFunction, bReset) + ucrChkSeasonStartProp.SetRCode(clsDummyFunction, bReset) + End If + AddRemoveSummary() + EnableDisableDefineButton() + End Sub + + Private Sub TestOkEnabled() + If Not ucrReceiverData.IsEmpty AndAlso + Not ucrReceiverMonth.IsEmpty AndAlso + Not ucrReceiverYear.IsEmpty AndAlso + Not ucrInputCountry.IsEmpty AndAlso + Not ucrInputStationID.IsEmpty AndAlso + Not ucrInputTokenPath.IsEmpty Then + + If (ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked) AndAlso + Not ucrReceiverCropData.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf ucrChkAnnualRainfall.Checked AndAlso + Not ucrReceiverRain.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf (ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso + Not ucrReceiverMinTemp.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked) AndAlso + Not ucrReceiverDataYear.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf ucrChkMonthlyTemp.Checked AndAlso + Not ucrReceiverDataYearMonth.IsEmpty Then + ucrBase.OKEnabled(True) + ElseIf (ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso + Not ucrReceiverMaxTemp.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + Else + ucrBase.OKEnabled(False) + End If + End Sub + + Private Sub AddRemoveSummary() + If ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked OrElse ucrChkCropSuccessProp.Checked OrElse ucrChkExtremes.Checked OrElse ucrChkMonthlyTemp.Checked OrElse ucrChkSeasonStartProp.Checked Then + clsExportRinstatToBucketFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesFunction, iPosition:=0) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("summaries") + End If + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + EnableDisableDefineButton() + End Sub + + Private Sub cmdDefine_Click(sender As Object, e As EventArgs) Handles cmdDefine.Click + sdgDefineAnnualRainfall.SetRCode(clsNewReformatCropSuccessFunction:=clsReformatCropSuccessFunction, clsNewReformatSeasonStartFunction:=clsReformatSeasonStartFunction, clsNewReformatMonthlyTempSummaries:=clsReformatMonthlyTempSummaries, + clsNewReforMattAnnualSummaries:=clsReforMattAnnualSummariesFunction, clsNewReformatTempSummariesFunction:=clsReformatTempSummariesFunction, clsNewExportRinstatToBucketFunction:=clsExportRinstatToBucketFunction, bReset:=bResetSubdialog) + sdgDefineAnnualRainfall.ShowDialog() + bResetSubdialog = False + End Sub + + Private Sub ucrChkAnnualRainfall_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAnnualRainfall.ControlValueChanged + If ucrChkAnnualRainfall.Checked Then + clsSummariesFunction.AddParameter("rain", Chr(34) & "annual_rainfall" & Chr(34), iPosition:=0, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("rain") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrChkAnnualTemp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAnnualTemp.ControlValueChanged + If ucrChkAnnualTemp.Checked Then + clsSummariesFunction.AddParameter("temp", Chr(34) & "annual_temperature" & Chr(34), iPosition:=1, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("temp") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrChkCropSuccessProp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkCropSuccessProp.ControlValueChanged + If ucrChkCropSuccessProp.Checked Then + clsSummariesFunction.AddParameter("prop", Chr(34) & "crop_success" & Chr(34), iPosition:=2, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("prop") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrChkExtremes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkExtremes.ControlValueChanged + If ucrChkExtremes.Checked Then + clsSummariesFunction.AddParameter("extreme", Chr(34) & "extremes" & Chr(34), iPosition:=3, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("extreme") + End If + AddRemoveSummary() + EnableDisableDefineButton() + End Sub + + Private Sub ucrChkMonthlyTemp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkMonthlyTemp.ControlValueChanged + If ucrChkMonthlyTemp.Checked Then + clsSummariesFunction.AddParameter("month_temp", Chr(34) & "monthly_temperature" & Chr(34), iPosition:=4, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("month_temp") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrChkSeasonStartProp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSeasonStartProp.ControlValueChanged + If ucrChkSeasonStartProp.Checked Then + clsSummariesFunction.AddParameter("start_prop", Chr(34) & "start_season" & Chr(34), iPosition:=5, bIncludeArgumentName:=False) + Else + clsSummariesFunction.RemoveParameterByName("start_prop") + End If + AddRemoveSummary() + EnableDisableDefineButton() + TestOkEnabled() + End Sub + + Private Sub ucrInputCountry_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCountry.ControlValueChanged + If Not ucrInputCountry.IsEmpty Then + clsExportRinstatToBucketFunction.AddParameter("country", Chr(34) & ucrInputCountry.GetText & Chr(34), iPosition:=19) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("country") + End If + End Sub + + Private Sub ucrInputStationID_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStationID.ControlValueChanged + If Not ucrInputStationID.IsEmpty Then + clsExportRinstatToBucketFunction.AddParameter("station_id", Chr(34) & ucrInputStationID.GetText & Chr(34), iPosition:=18) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("station_id") + End If + End Sub + + Private Sub EnableDisableDefineButton() + cmdDefine.Enabled = ucrChkIncludeSummaryData.Checked AndAlso (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked OrElse ucrChkCropSuccessProp.Checked OrElse ucrChkExtremes.Checked OrElse ucrChkMonthlyTemp.Checked OrElse ucrChkSeasonStartProp.Checked) + ucrReceiverDataYearMonth.Visible = ucrChkMonthlyTemp.Checked + ucrReceiverDataYear.Visible = ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked + ucrReceiverRain.Visible = ucrChkAnnualRainfall.Checked + ucrReceiverCropData.Visible = ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked + ucrReceiverMaxTemp.Visible = ucrChkMonthlyTemp.Checked OrElse ucrChkAnnualTemp.Checked + ucrReceiverMinTemp.Visible = ucrChkMonthlyTemp.Checked OrElse ucrChkAnnualTemp.Checked + + End Sub + + Private Sub ucrChkIncludeSummaryData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeSummaryData.ControlValueChanged + EnableDisableDefineButton() + End Sub + + Private Sub cmdChooseFile_Click(sender As Object, e As EventArgs) Handles cmdChooseFile.Click + Using dlgOpen As New OpenFileDialog + dlgOpen.Filter = "JSON Files|*.json" + dlgOpen.Title = "Import JSON File" + + dlgOpen.InitialDirectory = Path.GetDirectoryName(Replace(ucrInputTokenPath.GetText(), "/", "\")) + + If dlgOpen.ShowDialog() = DialogResult.OK AndAlso dlgOpen.FileName <> "" Then + ucrInputTokenPath.SetName(Replace(dlgOpen.FileName, "\", "/")) + End If + End Using + + End Sub + + Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, + ucrReceiverMaxTemp.ControlContentsChanged, ucrReceiverMinTemp.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, + ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputStationID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, + ucrChkMonthlyTemp.ControlContentsChanged, ucrChkCropSuccessProp.ControlContentsChanged, ucrChkAnnualTemp.ControlContentsChanged, ucrChkAnnualRainfall.ControlContentsChanged, ucrInputTokenPath.ControlContentsChanged, ucrSelectorExportDefinitions.ControlContentsChanged + TestOkEnabled() + End Sub + + Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged + ucrReceiverData.SetMeAsReceiver() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgHelpVignettes.vb b/instat/dlgHelpVignettes.vb index 501464cf301..0a53e7924d9 100644 --- a/instat/dlgHelpVignettes.vb +++ b/instat/dlgHelpVignettes.vb @@ -40,6 +40,7 @@ Public Class dlgHelpVignettes Dim expPackageNames As SymbolicExpression Dim chrPackageNames As CharacterVector + ucrBase.iHelpTopicID = 695 ucrPnlHelpVignettes.AddRadioButton(rdoHelp) ucrPnlHelpVignettes.AddRadioButton(rdoVignettes) diff --git a/instat/dlgHideDataframes.vb b/instat/dlgHideDataframes.vb index 3bcfa18a868..5700bda93e5 100644 --- a/instat/dlgHideDataframes.vb +++ b/instat/dlgHideDataframes.vb @@ -87,7 +87,7 @@ Public Class dlgHideDataframes ucrSelectorForDataFrames.Reset() - clsDummyFunction.AddParameter("checked", "rdoHide", iPosition:=0) + clsDummyFunction.AddParameter("checked", "rdoUnhide", iPosition:=0) clsMappingFunction.SetPackageName("purrr") clsMappingFunction.SetRCommand("map") @@ -143,8 +143,11 @@ Public Class dlgHideDataframes If expTemp IsNot Nothing AndAlso expTemp.Type <> Internals.SymbolicExpressionType.Null Then chrHiddenColumns = expTemp.AsCharacter - For Each strDataFrame As String In chrHiddenColumns - ucrSelectorForDataFrames.lstAvailableVariable.Items.Add(strDataFrame) + For i As Integer = 0 To chrHiddenColumns.Length - 1 + Dim strDataFrame As String = chrHiddenColumns(i) + Dim listItem As New ListViewItem(strDataFrame) + listItem.Tag = "data_names" + ucrSelectorForDataFrames.lstAvailableVariable.Items.Add(listItem) Next End If End Sub diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index 54210b80f68..e36c0fbf244 100644 --- a/instat/dlgParallelCoordinatePlot.vb +++ b/instat/dlgParallelCoordinatePlot.vb @@ -36,6 +36,8 @@ Public Class dlgParallelCoordinatePlot Private clsScaleFillViridisFunction As New RFunction Private clsScaleColourViridisFunction As New RFunction Private clsAnnotateFunction As New RFunction + Private clsMatchFunction As New RFunction + Private clsNamesFunction As New RFunction Private clsFacetFunction As New RFunction Private clsFacetVariablesOperator As New ROperator @@ -159,6 +161,8 @@ Public Class dlgParallelCoordinatePlot clsFacetColOp = New ROperator clsPipeOperator = New ROperator clsGroupByFunction = New RFunction + clsNamesFunction = New RFunction + clsMatchFunction = New RFunction ucrInputStation.SetName(strFacetWrap) ucrInputStation.bUpdateRCodeFromControl = True @@ -171,9 +175,10 @@ Public Class dlgParallelCoordinatePlot clsGGParCoordFunc.SetPackageName("GGally") clsGGParCoordFunc.SetRCommand("ggparcoord") - + clsGGParCoordFunc.AddParameter("columns", "column_numbers", iPosition:=1) clsGGParCoordFunc.AddParameter("missing", Chr(34) & "exclude" & Chr(34), iPosition:=6) - clsGGParCoordFunc.AddParameter("order", Chr(34) & "skewness" & Chr(34), iPosition:=7) + clsGGParCoordFunc.AddParameter("order", clsRFunctionParameter:=clsMatchFunction, iPosition:=7) + clsGGParCoordFunc.AddParameter("centerObsID", "1", iPosition:=8) clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggparcord", clsRFunctionParameter:=clsGGParCoordFunc, iPosition:=0) @@ -194,6 +199,11 @@ Public Class dlgParallelCoordinatePlot clsGroupByFunction.SetPackageName("dplyr") clsGroupByFunction.SetRCommand("group_by") + clsMatchFunction.SetRCommand("match") + clsMatchFunction.SetAssignTo("column_numbers") + + clsNamesFunction.SetRCommand("names") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXLabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() @@ -217,6 +227,8 @@ Public Class dlgParallelCoordinatePlot End Sub Private Sub SetRCodeForControls(bReset As Boolean) + ucrReceiverXVariables.AddAdditionalCodeParameterPair(clsMatchFunction, New RParameter("var", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrSelectorParallelCoordinatePlot.SetRCode(clsGGParCoordFunc, bReset) ucrReceiverFactor.SetRCode(clsGGParCoordFunc, bReset) ucrChkBoxplots.SetRCode(clsGGParCoordFunc, bReset) @@ -226,9 +238,6 @@ Public Class dlgParallelCoordinatePlot ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrSaveGraph.SetRCode(clsBaseOperator, bReset) - If bReset Then - ucrReceiverXVariables.SetRCode(clsGGParCoordFunc, bReset) - End If End Sub Private Sub TestOkEnabled() @@ -425,9 +434,12 @@ Public Class dlgParallelCoordinatePlot Private Sub ucrSelectorParallelCoordinatePlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorParallelCoordinatePlot.ControlValueChanged AutoFacetStation() SetPipeAssignTo() + clsNamesFunction.AddParameter("names", ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0, bIncludeArgumentName:=False) + clsMatchFunction.AddParameter("data", clsRFunctionParameter:=clsNamesFunction, iPosition:=1, bIncludeArgumentName:=False) End Sub Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverXVariables.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrNudTransparency.ControlContentsChanged TestOkEnabled() End Sub + End Class \ No newline at end of file diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 7af7a1f3610..0310ca32fe0 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -132,8 +132,7 @@ Public Class dlgRandomSplit clsTesting.SetPackageName("rsample") clsTesting.SetRCommand("testing") ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) - ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) - ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -153,7 +152,7 @@ Public Class dlgRandomSplit ucrChkStratifyingFactor.SetRCode(clsInitialSplit, bReset) If bReset Then - ucrChkTest.SetRCode(clsInitialSplit, bReset) + ucrChkTest.SetRCode(clsTesting, bReset) End If End Sub @@ -190,24 +189,35 @@ Public Class dlgRandomSplit Private Sub SetBaseFunction() ucrBase.clsRsyntax.ClearCodes() If rdoSample.Checked Then - If ucrSaveTestingData.IsComplete Then - clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) + If ucrChkTest.Checked AndAlso ucrSaveTestingData.IsComplete Then + clsTesting.AddParameter("x", "rsample") + ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTesting) End If If ucrSaveTrainingData.IsComplete Then - clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialSplit) + clsTraining.AddParameter("x", "rsample") + ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTraining) End If ucrBase.clsRsyntax.SetBaseRFunction(clsInitialSplit) Else - If ucrSaveTestingData.IsComplete Then - clsTesting.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + If ucrChkTest.Checked AndAlso ucrSaveTestingData.IsComplete Then + clsTesting.AddParameter("x", "rsample") + ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTesting) End If If ucrSaveTrainingData.IsComplete Then - clsTraining.AddParameter("x", clsRFunctionParameter:=clsInitialTimeSplit) + clsTraining.AddParameter("x", "rsample") + ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsTraining) End If ucrBase.clsRsyntax.SetBaseRFunction(clsInitialTimeSplit) End If - ucrBase.clsRsyntax.AddToAfterCodes(clsTesting, 0) - ucrBase.clsRsyntax.AddToAfterCodes(clsTraining, 1) + End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -233,4 +243,7 @@ Public Class dlgRandomSplit SetBaseFunction() End Sub + Private Sub ucrChkTest_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTest.ControlValueChanged + SetBaseFunction() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgRestoreBackup.Designer.vb b/instat/dlgRestoreBackup.Designer.vb new file mode 100644 index 00000000000..5e9bebf3f98 --- /dev/null +++ b/instat/dlgRestoreBackup.Designer.vb @@ -0,0 +1,243 @@ + _ +Partial Class dlgRestoreBackup + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.grpSavingOptions = New System.Windows.Forms.GroupBox() + Me.ucrInputSavedPathInternalLog = New instat.ucrFilePath() + Me.ucrInputSavedPathLog = New instat.ucrFilePath() + Me.ucrInputSavedPathData = New instat.ucrFilePath() + Me.ucrChkShowInternalLogFile = New instat.ucrCheck() + Me.ucrChkShowLogFile = New instat.ucrCheck() + Me.ucrChkShowDataFile = New instat.ucrCheck() + Me.grpEndChoice = New System.Windows.Forms.GroupBox() + Me.rdoNeither = New System.Windows.Forms.RadioButton() + Me.rdoLoadBackupData = New System.Windows.Forms.RadioButton() + Me.rdoRunBackupLog = New System.Windows.Forms.RadioButton() + Me.ucrBase = New instat.ucrButtons() + Me.ucrChkSendInternalLog = New instat.ucrCheck() + Me.ucrPnlRecoveryOption = New instat.UcrPanel() + Me.grpSavingOptions.SuspendLayout() + Me.grpEndChoice.SuspendLayout() + Me.SuspendLayout() + ' + 'grpSavingOptions + ' + Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathInternalLog) + Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathLog) + Me.grpSavingOptions.Controls.Add(Me.ucrInputSavedPathData) + Me.grpSavingOptions.Controls.Add(Me.ucrChkShowInternalLogFile) + Me.grpSavingOptions.Controls.Add(Me.ucrChkShowLogFile) + Me.grpSavingOptions.Controls.Add(Me.ucrChkShowDataFile) + Me.grpSavingOptions.Location = New System.Drawing.Point(12, 16) + Me.grpSavingOptions.Name = "grpSavingOptions" + Me.grpSavingOptions.Size = New System.Drawing.Size(604, 154) + Me.grpSavingOptions.TabIndex = 20 + Me.grpSavingOptions.TabStop = False + Me.grpSavingOptions.Text = "Saving Options" + ' + 'ucrInputSavedPathInternalLog + ' + Me.ucrInputSavedPathInternalLog.AutoSize = True + Me.ucrInputSavedPathInternalLog.DefaultFileSuggestionName = "" + Me.ucrInputSavedPathInternalLog.FilePath = "" + Me.ucrInputSavedPathInternalLog.FilePathBrowseText = "Browse" + Me.ucrInputSavedPathInternalLog.FilePathDialogFilter = "R file (*.R)|*.R" + Me.ucrInputSavedPathInternalLog.FilePathDialogTitle = "Save R File" + Me.ucrInputSavedPathInternalLog.FilePathLabel = "Save As:" + Me.ucrInputSavedPathInternalLog.FolderBrowse = False + Me.ucrInputSavedPathInternalLog.Location = New System.Drawing.Point(222, 115) + Me.ucrInputSavedPathInternalLog.Name = "ucrInputSavedPathInternalLog" + Me.ucrInputSavedPathInternalLog.SelectedFileFilterIndex = 1 + Me.ucrInputSavedPathInternalLog.Size = New System.Drawing.Size(380, 34) + Me.ucrInputSavedPathInternalLog.TabIndex = 29 + ' + 'ucrInputSavedPathLog + ' + Me.ucrInputSavedPathLog.AutoSize = True + Me.ucrInputSavedPathLog.DefaultFileSuggestionName = "" + Me.ucrInputSavedPathLog.FilePath = "" + Me.ucrInputSavedPathLog.FilePathBrowseText = "Browse" + Me.ucrInputSavedPathLog.FilePathDialogFilter = "R file (*.R)|*.R" + Me.ucrInputSavedPathLog.FilePathDialogTitle = "Save R File" + Me.ucrInputSavedPathLog.FilePathLabel = "Save As:" + Me.ucrInputSavedPathLog.FolderBrowse = False + Me.ucrInputSavedPathLog.Location = New System.Drawing.Point(222, 70) + Me.ucrInputSavedPathLog.Name = "ucrInputSavedPathLog" + Me.ucrInputSavedPathLog.SelectedFileFilterIndex = 1 + Me.ucrInputSavedPathLog.Size = New System.Drawing.Size(380, 34) + Me.ucrInputSavedPathLog.TabIndex = 28 + ' + 'ucrInputSavedPathData + ' + Me.ucrInputSavedPathData.AutoSize = True + Me.ucrInputSavedPathData.DefaultFileSuggestionName = "" + Me.ucrInputSavedPathData.FilePath = "" + Me.ucrInputSavedPathData.FilePathBrowseText = "Browse" + Me.ucrInputSavedPathData.FilePathDialogFilter = "RDS Data file (*.RDS)|*.RDS" + Me.ucrInputSavedPathData.FilePathDialogTitle = "Save Data File" + Me.ucrInputSavedPathData.FilePathLabel = "Save As:" + Me.ucrInputSavedPathData.FolderBrowse = False + Me.ucrInputSavedPathData.Location = New System.Drawing.Point(222, 25) + Me.ucrInputSavedPathData.Name = "ucrInputSavedPathData" + Me.ucrInputSavedPathData.SelectedFileFilterIndex = 1 + Me.ucrInputSavedPathData.Size = New System.Drawing.Size(380, 34) + Me.ucrInputSavedPathData.TabIndex = 25 + ' + 'ucrChkShowInternalLogFile + ' + Me.ucrChkShowInternalLogFile.AutoSize = True + Me.ucrChkShowInternalLogFile.Checked = False + Me.ucrChkShowInternalLogFile.Location = New System.Drawing.Point(6, 117) + Me.ucrChkShowInternalLogFile.Name = "ucrChkShowInternalLogFile" + Me.ucrChkShowInternalLogFile.Size = New System.Drawing.Size(216, 23) + Me.ucrChkShowInternalLogFile.TabIndex = 27 + ' + 'ucrChkShowLogFile + ' + Me.ucrChkShowLogFile.AutoSize = True + Me.ucrChkShowLogFile.Checked = False + Me.ucrChkShowLogFile.Location = New System.Drawing.Point(6, 74) + Me.ucrChkShowLogFile.Name = "ucrChkShowLogFile" + Me.ucrChkShowLogFile.Size = New System.Drawing.Size(216, 23) + Me.ucrChkShowLogFile.TabIndex = 26 + ' + 'ucrChkShowDataFile + ' + Me.ucrChkShowDataFile.AutoSize = True + Me.ucrChkShowDataFile.Checked = False + Me.ucrChkShowDataFile.Location = New System.Drawing.Point(6, 31) + Me.ucrChkShowDataFile.Name = "ucrChkShowDataFile" + Me.ucrChkShowDataFile.Size = New System.Drawing.Size(216, 23) + Me.ucrChkShowDataFile.TabIndex = 25 + ' + 'grpEndChoice + ' + Me.grpEndChoice.Controls.Add(Me.rdoRunBackupLog) + Me.grpEndChoice.Controls.Add(Me.rdoLoadBackupData) + Me.grpEndChoice.Controls.Add(Me.rdoNeither) + Me.grpEndChoice.Controls.Add(Me.ucrPnlRecoveryOption) + Me.grpEndChoice.Location = New System.Drawing.Point(136, 209) + Me.grpEndChoice.Name = "grpEndChoice" + Me.grpEndChoice.Size = New System.Drawing.Size(358, 66) + Me.grpEndChoice.TabIndex = 23 + Me.grpEndChoice.TabStop = False + Me.grpEndChoice.Text = "Choose one of the following" + ' + 'rdoNeither + ' + Me.rdoNeither.AutoSize = True + Me.rdoNeither.Location = New System.Drawing.Point(272, 30) + Me.rdoNeither.Name = "rdoNeither" + Me.rdoNeither.Size = New System.Drawing.Size(59, 17) + Me.rdoNeither.TabIndex = 44 + Me.rdoNeither.TabStop = True + Me.rdoNeither.Text = "Neither" + Me.rdoNeither.UseVisualStyleBackColor = True + ' + 'rdoLoadBackupData + ' + Me.rdoLoadBackupData.AutoSize = True + Me.rdoLoadBackupData.Location = New System.Drawing.Point(138, 30) + Me.rdoLoadBackupData.Name = "rdoLoadBackupData" + Me.rdoLoadBackupData.Size = New System.Drawing.Size(115, 17) + Me.rdoLoadBackupData.TabIndex = 43 + Me.rdoLoadBackupData.TabStop = True + Me.rdoLoadBackupData.Text = "Load Backup Data" + Me.rdoLoadBackupData.UseVisualStyleBackColor = True + ' + 'rdoRunBackupLog + ' + Me.rdoRunBackupLog.AutoSize = True + Me.rdoRunBackupLog.Location = New System.Drawing.Point(25, 30) + Me.rdoRunBackupLog.Name = "rdoRunBackupLog" + Me.rdoRunBackupLog.Size = New System.Drawing.Size(106, 17) + Me.rdoRunBackupLog.TabIndex = 42 + Me.rdoRunBackupLog.TabStop = True + Me.rdoRunBackupLog.Text = "Run Backup Log" + Me.rdoRunBackupLog.UseVisualStyleBackColor = True + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(111, 282) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 24 + ' + 'ucrChkSendInternalLog + ' + Me.ucrChkSendInternalLog.AutoSize = True + Me.ucrChkSendInternalLog.Checked = False + Me.ucrChkSendInternalLog.Location = New System.Drawing.Point(23, 177) + Me.ucrChkSendInternalLog.Name = "ucrChkSendInternalLog" + Me.ucrChkSendInternalLog.Size = New System.Drawing.Size(266, 23) + Me.ucrChkSendInternalLog.TabIndex = 21 + ' + 'ucrPnlRecoveryOption + ' + Me.ucrPnlRecoveryOption.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRecoveryOption.Location = New System.Drawing.Point(17, 19) + Me.ucrPnlRecoveryOption.Name = "ucrPnlRecoveryOption" + Me.ucrPnlRecoveryOption.Size = New System.Drawing.Size(314, 36) + Me.ucrPnlRecoveryOption.TabIndex = 25 + ' + 'dlgRestoreBackup + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi + Me.AutoSize = True + Me.ClientSize = New System.Drawing.Size(627, 340) + Me.Controls.Add(Me.grpEndChoice) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrChkSendInternalLog) + Me.Controls.Add(Me.grpSavingOptions) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgRestoreBackup" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Restore Backup" + Me.grpSavingOptions.ResumeLayout(False) + Me.grpSavingOptions.PerformLayout() + Me.grpEndChoice.ResumeLayout(False) + Me.grpEndChoice.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents grpSavingOptions As GroupBox + Friend WithEvents grpEndChoice As GroupBox + Friend WithEvents ucrChkSendInternalLog As ucrCheck + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrChkShowDataFile As ucrCheck + Friend WithEvents ucrChkShowInternalLogFile As ucrCheck + Friend WithEvents ucrChkShowLogFile As ucrCheck + Friend WithEvents rdoNeither As RadioButton + Friend WithEvents rdoLoadBackupData As RadioButton + Friend WithEvents rdoRunBackupLog As RadioButton + Friend WithEvents ucrInputSavedPathData As ucrFilePath + Friend WithEvents ucrInputSavedPathLog As ucrFilePath + Friend WithEvents ucrInputSavedPathInternalLog As ucrFilePath + Friend WithEvents ucrPnlRecoveryOption As UcrPanel +End Class diff --git a/instat/dlgRestoreBackup.resx b/instat/dlgRestoreBackup.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgRestoreBackup.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb new file mode 100644 index 00000000000..6737206db9a --- /dev/null +++ b/instat/dlgRestoreBackup.vb @@ -0,0 +1,256 @@ +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . + +Imports instat.Translations +Imports System.IO +Imports RDotNet + +Public Class dlgRestoreBackup + Private strAutoSavedLogScript As String + Private strAutoSavedDataFilePaths() As String + Private strAutoSavedLogFilePaths() As String + Private strAutoSavedInternalLogFilePaths() As String + Private strScript As String + Private strLoadDateFilePath As String + Private bUserClose As Boolean = True + Private clsDummyFunction As New RFunction + Public strAutoSaveDataFolderPath = frmMain.strAutoSaveDataFolderPath + Public strAutoSaveLogFolderPath = frmMain.strAutoSaveLogFolderPath + Public strAutoSaveInternalLogFolderPath = frmMain.strAutoSaveInternalLogFolderPath + Private bReset As Boolean = True + Private bFirstload As Boolean = True + + Private Sub dlgRestoreBackup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + If bReset Then + SetDefaults() + End If + SetRCodeForControls(bReset) + bReset = False + SetLogControlsDisable(frmMain.bFirstBackupDone) + autoTranslate(Me) + TestOKEnabled() + End Sub + + Private Sub InitialiseDialog() + ucrBase.iHelpTopicID = 411 + + ucrChkShowDataFile.Checked = False + ucrChkShowInternalLogFile.Checked = False + ucrChkShowLogFile.Checked = False + + 'temporary - not yet implemented + ucrChkSendInternalLog.Visible = False + ucrInputSavedPathData.Visible = False + ucrInputSavedPathLog.Visible = False + ucrInputSavedPathInternalLog.Visible = False + + If (Directory.Exists(strAutoSaveLogFolderPath)) Then + strAutoSavedLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveLogFolderPath).ToArray + End If + If Directory.Exists(strAutoSaveDataFolderPath) Then + strAutoSavedDataFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveDataFolderPath).ToArray + End If + If (Directory.Exists(strAutoSaveInternalLogFolderPath)) Then + strAutoSavedInternalLogFilePaths = My.Computer.FileSystem.GetFiles(strAutoSaveInternalLogFolderPath).ToArray + End If + + ucrBase.contextMenuStripToScript.Enabled = False + + ucrChkSendInternalLog.SetText("Send Debugging Log to R-Instat Team") + + If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 Then + ucrChkShowDataFile.SetText("Backup Data File Detected") + rdoLoadBackupData.Enabled = True + ucrInputSavedPathData.Enabled = True + ucrChkShowDataFile.Enabled = True + Else + ucrChkShowDataFile.SetText("No Backup Data File Detected") + rdoLoadBackupData.Enabled = False + ucrInputSavedPathData.Enabled = False + ucrChkShowDataFile.Enabled = False + End If + If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 Then + ucrChkShowLogFile.SetText("Backup Log File Detected") + rdoRunBackupLog.Enabled = True + ucrInputSavedPathLog.Enabled = True + ucrChkShowLogFile.Enabled = True + Else + ucrChkShowLogFile.SetText("No Backup Log File Detected") + rdoRunBackupLog.Enabled = False + ucrInputSavedPathLog.Enabled = False + ucrChkShowLogFile.Enabled = False + End If + If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 Then + ucrChkShowInternalLogFile.SetText("Backup Debugging Log File Detected") + ucrChkSendInternalLog.Visible = False + ucrChkSendInternalLog.Checked = False + Else + ucrChkShowInternalLogFile.SetText("No Backup Debugging Log File Detected") + ucrChkSendInternalLog.Visible = False + ucrChkSendInternalLog.Checked = False + End If + ucrPnlRecoveryOption.AddRadioButton(rdoLoadBackupData) + ucrPnlRecoveryOption.AddRadioButton(rdoRunBackupLog) + ucrPnlRecoveryOption.AddRadioButton(rdoNeither) + + ucrPnlRecoveryOption.AddParameterValuesCondition(rdoLoadBackupData, "backup", "data") + ucrPnlRecoveryOption.AddParameterValuesCondition(rdoRunBackupLog, "backup", "log") + ucrPnlRecoveryOption.AddParameterValuesCondition(rdoNeither, "backup", "neither") + End Sub + + Private Sub SetDefaults() + ucrInputSavedPathData.Clear() + ucrInputSavedPathLog.Clear() + ucrInputSavedPathInternalLog.Clear() + ucrChkShowDataFile.Checked = False + ucrChkShowLogFile.Checked = False + ucrChkSendInternalLog.Checked = False + clsDummyFunction.AddParameter("backup", "neither") + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrInputSavedPathData.SetPathControlRcode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + ucrInputSavedPathLog.SetPathControlRcode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + ucrPnlRecoveryOption.SetRCode(clsDummyFunction, bReset) + End Sub + + Private Sub SaveFiles() + If strAutoSavedDataFilePaths IsNot Nothing AndAlso strAutoSavedDataFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedDataFilePaths(0)) Then + Try + If Not ucrInputSavedPathData.IsEmpty() AndAlso ucrChkShowDataFile.Checked Then + File.Copy(strAutoSavedDataFilePaths(0), ucrInputSavedPathData.FilePath(), True) + End If + Catch ex As Exception + MsgBox("Could not copy and/or delete data file." & Environment.NewLine & ex.Message, "Error copying/deleting file") + End Try + End If + If strAutoSavedLogFilePaths IsNot Nothing AndAlso strAutoSavedLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedLogFilePaths(0)) Then + Try + If Not ucrInputSavedPathLog.IsEmpty() AndAlso ucrChkShowLogFile.Checked Then + File.Copy(strAutoSavedLogFilePaths(0), ucrInputSavedPathLog.FilePath(), True) + End If + Catch ex As Exception + MsgBox("Could not copy and/or delete log file." & Environment.NewLine & ex.Message, "Error copying/deleting file") + End Try + End If + If strAutoSavedInternalLogFilePaths IsNot Nothing AndAlso strAutoSavedInternalLogFilePaths.Count > 0 AndAlso File.Exists(strAutoSavedInternalLogFilePaths(0)) Then + Try + If Not ucrInputSavedPathInternalLog.IsEmpty() AndAlso ucrChkSendInternalLog.Checked Then + File.Copy(strAutoSavedInternalLogFilePaths(0), ucrInputSavedPathInternalLog.FilePath(), True) + End If + Catch ex As Exception + MsgBox("Could not copy and/or delete internal log file." & Environment.NewLine & ex.Message, "Error copying/deleting file") + End Try + End If + End Sub + + Private Sub TestOKEnabled() + ucrBase.OKEnabled(rdoRunBackupLog.Checked OrElse rdoLoadBackupData.Checked OrElse rdoNeither.Checked) + End Sub + + Private Sub ucrChkShowDataFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkShowLogFile.ControlValueChanged, ucrChkShowInternalLogFile.ControlValueChanged, ucrChkShowDataFile.ControlValueChanged + ucrInputSavedPathData.Visible = ucrChkShowDataFile.Checked + ucrInputSavedPathLog.Visible = ucrChkShowLogFile.Checked + ucrInputSavedPathInternalLog.Visible = ucrChkShowInternalLogFile.Checked + End Sub + + Private Sub SetLogControlsDisable(bEnable As Boolean) + ucrChkShowLogFile.Enabled = Not bEnable + ucrChkShowInternalLogFile.Enabled = Not bEnable + rdoRunBackupLog.Enabled = Not bEnable + ucrChkShowLogFile.Checked = False + ucrChkShowInternalLogFile.Checked = False + End Sub + + Private Sub GetBackupFromLastSession(autoSaveFolderPath As String, searchPattern As String, bLogFile As Boolean) + Dim autoSaveDirectory As New DirectoryInfo(autoSaveFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles(searchPattern) + + If files.Length > 0 Then + Array.Sort(files, Function(x, y) y.LastWriteTime.CompareTo(x.LastWriteTime)) + Dim strLatestBackupFile As FileInfo = files(0) ' Get the backup from the last session + If bLogFile Then + strScript = File.ReadAllText(strLatestBackupFile.FullName) + Else + strLoadDateFilePath = strLatestBackupFile.FullName ' Pass the full path for data files + End If + Else + ' No backup found from the last session + strScript = "" + strLoadDateFilePath = "" + End If + End Sub + + Private Sub ucrInputSavedPathData_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathData.Leave + If Not String.IsNullOrEmpty(ucrInputSavedPathData.IsEmpty) Then + frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathData.FilePath, "\", "/")) + End If + End Sub + + Private Sub ucrInputSavedPathLog_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathLog.Leave + If Not String.IsNullOrEmpty(ucrInputSavedPathLog.IsEmpty) Then + frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathLog.FilePath, "\", "/")) + End If + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + End Sub + + Private Sub GetRecoveryFiles(strRScripts As String, strDataFilePath As String) + 'if data file recovered then add it as part of the initial R set up script + If Not String.IsNullOrEmpty(strDataFilePath) Then + strRScripts = strRScripts & Environment.NewLine & + "# Importing auto recovered data" & Environment.NewLine & + frmMain.clsRLink.GetImportRDSRScript(strDataFilePath, False) + End If + + 'execute the R-Instat set up R scripts + If Not String.IsNullOrEmpty(strRScripts) Then + For Each strLine As String In strRScripts.Split({Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries) + frmMain.clsRLink.RunScript(strScript:=strLine.Trim(), bSeparateThread:=True, bSilent:=True) + Next + End If + + 'grids are only updated when clsRLink.bInstatObjectExists = True + If frmMain.clsRLink.RunInternalScriptGetValue(strScript:="exists('" & frmMain.clsRLink.strInstatDataObject & "')", + bSeparateThread:=True, bSilent:=True).AsCharacter(0) = "TRUE" Then + 'set R-Instat R object as exists if it has been set up in R level and refresh the grids + 'refreshing grids internally updates the .Net databook object as well. + frmMain.clsRLink.bInstatObjectExists = True + frmMain.UpdateAllGrids() + End If + End Sub + + Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk + strScript = "" + strLoadDateFilePath = "" + + If rdoRunBackupLog.Checked Then + GetBackupFromLastSession(strAutoSaveLogFolderPath, "log*.R", True) + ElseIf rdoLoadBackupData.Checked Then + GetBackupFromLastSession(strAutoSaveDataFolderPath, "data_*.rds", False) + End If + + GetRecoveryFiles(strScript, strLoadDateFilePath) + SaveFiles() + End Sub +End Class \ No newline at end of file diff --git a/instat/dlgTransform.vb b/instat/dlgTransform.vb index fc8147d6f9c..1cfaa690e96 100644 --- a/instat/dlgTransform.vb +++ b/instat/dlgTransform.vb @@ -112,7 +112,6 @@ Public Class dlgTransform End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 25 Dim dctSubtractValues As New Dictionary(Of String, String) Dim dctMultiplyValues As New Dictionary(Of String, String) @@ -120,6 +119,7 @@ Public Class dlgTransform Dim dctAddValues As New Dictionary(Of String, String) Dim dctPowerValues As New Dictionary(Of String, String) + ucrBase.iHelpTopicID = 42 ucrPnlTransformOptions.AddRadioButton(rdoRank) ucrPnlTransformOptions.AddRadioButton(rdoNumeric) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index ecf06650717..629c9015bce 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -160,14 +160,29 @@ Partial Class frmMain Me.mnuHelpHelpIntroduction = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpFAQ = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpGetingStarted = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuHelpData = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator28 = New System.Windows.Forms.ToolStripSeparator() Me.mnuHelpWindows = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator81 = New System.Windows.Forms.ToolStripSeparator() Me.mnuHelpMenus = New System.Windows.Forms.ToolStripMenuItem() + Me.MenusAndDialogsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator82 = New System.Windows.Forms.ToolStripSeparator() + Me.FileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.EditToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PrepareToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DescribeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ModelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator83 = New System.Windows.Forms.ToolStripSeparator() + Me.StructuredToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ClimaticToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ProcurementToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ExperimentsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ViewToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpAboutR = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpLearningStatistics = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpRPackages = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpGlossary = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpLicence = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator29 = New System.Windows.Forms.ToolStripSeparator() Me.mnuHelpPackagesDocumentation = New System.Windows.Forms.ToolStripMenuItem() @@ -449,7 +464,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() @@ -474,6 +488,7 @@ Partial Class frmMain Me.mnuPrepareCheckDataAnonymiseIDColumn = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() Me.mnuPrepareCalculator = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator79 = New System.Windows.Forms.ToolStripSeparator() Me.mnuPrepareColumnCalculate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareColumnNumericRegularSequence = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareColumnNumericEnter = New System.Windows.Forms.ToolStripMenuItem() @@ -665,7 +680,7 @@ Partial Class frmMain Me.mnuToolsClearOutputWindow = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.mnuToolsSaveCurrentOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuToolsLoadOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuToolsRestoreBackup = New System.Windows.Forms.ToolStripMenuItem() Me.mnuToolsInstallRPackage = New System.Windows.Forms.ToolStripMenuItem() Me.mnuToolsOptions = New System.Windows.Forms.ToolStripMenuItem() Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -1194,6 +1209,7 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" + Me.mnuModelOtherOneVariable.Visible = False ' 'mnuModelOtherOneVariableExactResults ' @@ -1234,6 +1250,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" + Me.mnuModelOtherTwoVariables.Visible = False ' 'mnuModelOtherTwoVariablesTwoSamples ' @@ -1288,6 +1305,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" + Me.mnuModelOtherThreeVariables.Visible = False ' 'mnuModelOtherThreeVariablesSimpleWithGroups ' @@ -1319,6 +1337,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" + Me.mnuModelOtherGeneral.Visible = False ' 'mnuModelOtherGeneralANOVAGeneral ' @@ -1527,7 +1546,7 @@ Partial Class frmMain ' 'mnuHelp ' - Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpData, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpPackagesDocumentation}) + Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" Me.mnuHelp.Size = New System.Drawing.Size(44, 22) Me.mnuHelp.Tag = "Help" @@ -1536,20 +1555,26 @@ Partial Class frmMain 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpHelpIntroduction.Text = "Introduction" + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpFAQ.Text = "FAQ" + Me.mnuHelpFAQ.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpGetingStarted.Text = "Getting Started" + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpGetingStarted.Text = "Getting Started..." + ' + 'mnuHelpData + ' + Me.mnuHelpData.Name = "mnuHelpData" + Me.mnuHelpData.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' @@ -1559,53 +1584,135 @@ Partial Class frmMain 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpWindows.Text = "Windows" + Me.mnuHelpWindows.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpWindows.Text = "Windows..." + ' + 'ToolStripSeparator81 + ' + Me.ToolStripSeparator81.Name = "ToolStripSeparator81" + Me.ToolStripSeparator81.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpMenus ' + Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) Me.mnuHelpMenus.Name = "mnuHelpMenus" Me.mnuHelpMenus.Size = New System.Drawing.Size(209, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' + 'MenusAndDialogsToolStripMenuItem + ' + Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs" + ' + 'ToolStripSeparator82 + ' + Me.ToolStripSeparator82.Name = "ToolStripSeparator82" + Me.ToolStripSeparator82.Size = New System.Drawing.Size(177, 6) + ' + 'FileToolStripMenuItem + ' + Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.FileToolStripMenuItem.Text = "File" + ' + 'EditToolStripMenuItem + ' + Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.EditToolStripMenuItem.Text = "Edit" + ' + 'PrepareToolStripMenuItem + ' + Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PrepareToolStripMenuItem.Text = "Prepare" + ' + 'DescribeToolStripMenuItem + ' + Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DescribeToolStripMenuItem.Text = "Describe" + ' + 'ModelToolStripMenuItem + ' + Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ModelToolStripMenuItem.Text = "Model" + ' + 'ToolStripSeparator83 + ' + Me.ToolStripSeparator83.Name = "ToolStripSeparator83" + Me.ToolStripSeparator83.Size = New System.Drawing.Size(177, 6) + ' + 'StructuredToolStripMenuItem + ' + Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.StructuredToolStripMenuItem.Text = "Structured" + ' + 'ClimaticToolStripMenuItem + ' + Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ClimaticToolStripMenuItem.Text = "Climatic" + ' + 'ProcurementToolStripMenuItem + ' + Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ProcurementToolStripMenuItem.Text = "Procurement" + ' + 'ExperimentsToolStripMenuItem + ' + Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ExperimentsToolStripMenuItem.Text = "Experiments" + ' + 'ToolsToolStripMenuItem + ' + Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ToolsToolStripMenuItem.Text = "Tools" + ' + 'ViewToolStripMenuItem + ' + Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ViewToolStripMenuItem.Text = "View" + ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpAboutR.Text = "About R" + Me.mnuHelpAboutR.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpLearningStatistics.Text = "Learning Statistics" + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpRPackages.Text = "R Packages" + Me.mnuHelpRPackages.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpGlossary.Text = "Glossary" - ' - 'mnuHelpData - ' - Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpData.Text = "Data" + Me.mnuHelpGlossary.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(218, 22) Me.mnuHelpLicence.Tag = "Licence..." - Me.mnuHelpLicence.Text = "Licence" + Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' @@ -1615,8 +1722,8 @@ Partial Class frmMain 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(209, 22) - Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation" + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(218, 22) + Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation..." ' 'ToolStripSeparator16 ' @@ -1725,7 +1832,6 @@ Partial Class frmMain ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Enabled = False Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." @@ -2906,7 +3012,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(192, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2914,7 +3020,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(192, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2922,27 +3028,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(192, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' '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(167, 22) + Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(192, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(192, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3391,7 +3497,7 @@ Partial Class frmMain ' 'mnuPrepare ' - Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) + Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) Me.mnuPrepare.Tag = "Prepare" @@ -3399,9 +3505,9 @@ 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.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' @@ -3512,13 +3618,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 @@ -3539,7 +3638,7 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData @@ -3660,20 +3759,25 @@ Partial Class frmMain 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." - Me.mnuPrepareCalculator.Text = "Column: Calculator..." + Me.mnuPrepareCalculator.Text = "Calculator..." + ' + 'ToolStripSeparator79 + ' + Me.ToolStripSeparator79.Name = "ToolStripSeparator79" + Me.ToolStripSeparator79.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' @@ -3738,7 +3842,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' @@ -3844,7 +3948,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' @@ -3903,7 +4007,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate @@ -3950,7 +4054,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns @@ -3973,13 +4077,13 @@ Partial Class frmMain 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' @@ -4069,13 +4173,13 @@ Partial Class frmMain 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey @@ -4112,7 +4216,7 @@ Partial Class frmMain ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4202,7 +4306,7 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(186, 22) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' @@ -4852,7 +4956,7 @@ Partial Class frmMain ' 'mnuTools ' - Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsLoadOptions, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) + Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" Me.mnuTools.Size = New System.Drawing.Size(46, 22) Me.mnuTools.Text = "Tools" @@ -4900,13 +5004,12 @@ Partial Class frmMain Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' - 'mnuToolsLoadOptions + 'mnuToolsRestoreBackup ' - Me.mnuToolsLoadOptions.Enabled = False - Me.mnuToolsLoadOptions.Name = "mnuToolsLoadOptions" - Me.mnuToolsLoadOptions.Size = New System.Drawing.Size(198, 22) - Me.mnuToolsLoadOptions.Tag = "Load_Options..." - Me.mnuToolsLoadOptions.Text = "Load Options..." + Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" + Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestoreBackup.Tag = "Load_Options..." + Me.mnuToolsRestoreBackup.Text = "Restore Backup..." ' 'mnuToolsInstallRPackage ' @@ -4945,7 +5048,7 @@ Partial Class frmMain Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) Me.splOverall.Size = New System.Drawing.Size(834, 399) - Me.splOverall.SplitterDistance = 163 + Me.splOverall.SplitterDistance = 162 Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' @@ -4965,8 +5068,8 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(834, 163) - Me.splExtraWindows.SplitterDistance = 253 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 162) + Me.splExtraWindows.SplitterDistance = 252 Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' @@ -4985,8 +5088,8 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(253, 163) - Me.splMetadata.SplitterDistance = 69 + Me.splMetadata.Size = New System.Drawing.Size(252, 162) + Me.splMetadata.SplitterDistance = 68 Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' @@ -4999,7 +5102,7 @@ Partial Class frmMain Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(69, 163) + Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 162) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5010,7 +5113,7 @@ Partial Class frmMain Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 163) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 162) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5021,7 +5124,7 @@ Partial Class frmMain Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(576, 163) + Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 162) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5042,8 +5145,8 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(834, 231) - Me.splDataOutput.SplitterDistance = 383 + Me.splDataOutput.Size = New System.Drawing.Size(834, 232) + Me.splDataOutput.SplitterDistance = 382 Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' @@ -5056,7 +5159,7 @@ Partial Class frmMain Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(383, 231) + Me.ucrDataViewer.Size = New System.Drawing.Size(382, 232) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5068,7 +5171,7 @@ Partial Class frmMain Me.ucrOutput.Location = New System.Drawing.Point(0, 0) Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(446, 231) + Me.ucrOutput.Size = New System.Drawing.Size(447, 232) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5119,9 +5222,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 +5368,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 @@ -5314,7 +5414,7 @@ Partial Class frmMain Friend WithEvents mnuToolsClearOutputWindow As ToolStripMenuItem Friend WithEvents ToolStripSeparator5 As ToolStripSeparator Friend WithEvents mnuToolsSaveCurrentOptions As ToolStripMenuItem - Friend WithEvents mnuToolsLoadOptions As ToolStripMenuItem + Friend WithEvents mnuToolsRestoreBackup As ToolStripMenuItem Friend WithEvents ToolStripSeparator22 As ToolStripSeparator Friend WithEvents mnuModelOtherOneVariableGoodnessofFit As ToolStripMenuItem Friend WithEvents mnuHelpLicence As ToolStripMenuItem @@ -5805,6 +5905,25 @@ Partial Class frmMain Friend WithEvents mnuViewSwapDataAndScript As ToolStripMenuItem Friend WithEvents mnuClimaticExamineEditDataVisualiseData As ToolStripMenuItem Friend WithEvents ToolStripSeparator27 As ToolStripSeparator + Friend WithEvents mnuClimaticPICSAGeneralGrap As ToolStripMenuItem + Friend WithEvents mnuClimaticFileExportToGoogleBucketsToolStrip As ToolStripMenuItem + + Friend WithEvents ToolStripSeparator79 As ToolStripSeparator + Friend WithEvents MenusAndDialogsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents FileToolStripMenuItem As ToolStripMenuItem + Friend WithEvents EditToolStripMenuItem As ToolStripMenuItem + Friend WithEvents PrepareToolStripMenuItem As ToolStripMenuItem + Friend WithEvents DescribeToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ModelToolStripMenuItem As ToolStripMenuItem + Friend WithEvents StructuredToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ClimaticToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator81 As ToolStripSeparator + Friend WithEvents ToolStripSeparator82 As ToolStripSeparator + Friend WithEvents ToolStripSeparator83 As ToolStripSeparator + Friend WithEvents ProcurementToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ExperimentsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ViewToolStripMenuItem As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index ffb7a193f45..c8d4db5f30c 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -43,6 +43,7 @@ Public Class frmMain Private iAutoSaveDataMilliseconds As Integer Private clsDataBook As clsDataBook Private Shared ReadOnly Logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger() + Public bFirstBackupDone As Boolean = False Public ReadOnly Property DataBook As clsDataBook Get Return clsDataBook @@ -485,7 +486,6 @@ Public Class frmMain MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") End Try End If - If strAutoSavedInternalLogFilePaths.Length > 0 Then Try For Each strFilePath As String In strAutoSavedInternalLogFilePaths @@ -510,6 +510,9 @@ Public Class frmMain '--------------------------------------- End Sub + Private Sub mnuToolsRestoreBackup_Click(sender As Object, e As EventArgs) Handles mnuToolsRestoreBackup.Click + dlgRestoreBackup.ShowDialog() + End Sub ''' ''' Updates data view, column meta and data frame meta grids. @@ -653,7 +656,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareColumnNumericRandomSamples_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnNumericRandomSamples.Click - dlgRandomSample.enumRandomsampleMode = dlgRandomSample.RandomsampleMode.Prepare + dlgRandomSample.enumRandomSampleMode = dlgRandomSample.RandomSampleMode.Prepare dlgRandomSample.ShowDialog() End Sub @@ -937,12 +940,8 @@ 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.enumRandomSampleMode = dlgRandomSample.RandomSampleMode.Model dlgRandomSample.ShowDialog() End Sub @@ -1066,9 +1065,7 @@ Public Class frmMain If clsInstatOptions IsNot Nothing Then SaveInstatOptions(Path.Combine(strAppDataPath, strInstatOptionsFile)) End If - DeleteAutoSaveData() - DeleteAutoSaveLog() - DeleteAutoSaveDebugLog() + DeleteAutoSaveFiles() clsRLink.CloseREngine() End If @@ -1096,53 +1093,82 @@ Public Class frmMain If Not Directory.Exists(strAutoSaveDataFolderPath) Then Directory.CreateDirectory(strAutoSaveDataFolderPath) End If - If strCurrentAutoSaveDataFilePath = "" Then - strTempFile = "data.rds" - While File.Exists(Path.Combine(strAutoSaveDataFolderPath, strTempFile)) - i = i + 1 - strTempFile = "data" & i & ".rds" - End While - strCurrentAutoSaveDataFilePath = Path.Combine(strAutoSaveDataFolderPath, strTempFile) - End If + + ' Generate a unique filename with timestamp + strTempFile = "data_" & DateTime.Now.ToString("yyyyMMdd_HHmmss") & ".rds" + strCurrentAutoSaveDataFilePath = Path.Combine(strAutoSaveDataFolderPath, strTempFile) + + Dim strBackupMessage As String = $"##########{vbCrLf}## Backing up data and log files on: {DateTime.Now}{vbCrLf}##########" + Me.ucrScriptWindow.LogText(strBackupMessage) + clsRLink.AppendToAutoSaveLog(strBackupMessage) + clsSaveRDS.SetRCommand("saveRDS") clsSaveRDS.AddParameter("object", clsRLink.strInstatDataObject) clsSaveRDS.AddParameter("file", Chr(34) & strCurrentAutoSaveDataFilePath.Replace("\", "/") & Chr(34)) clsRLink.RunInternalScript(clsSaveRDS.ToScript(), bSilent:=True, bShowWaitDialogOverride:=False) tstatus.Text = strCurrentStatus Cursor = Cursors.Default + bFirstBackupDone = True End If autoTranslate(Me) End Sub - Public Sub DeleteAutoSaveData() - If strCurrentAutoSaveDataFilePath <> "" Then - Try - File.Delete(strCurrentAutoSaveDataFilePath) - Catch ex As Exception - MsgBox("Could not delete auto save data file at: " & strCurrentAutoSaveDataFilePath & Environment.NewLine & ex.Message) - End Try - End If - End Sub - - Public Sub DeleteAutoSaveLog() - If clsRLink.strAutoSaveLogFilePath <> "" Then - Try - File.Delete(clsRLink.strAutoSaveLogFilePath) - Catch ex As Exception - MsgBox("Could not delete auto save log file at: " & clsRLink.strAutoSaveLogFilePath & Environment.NewLine & ex.Message) - End Try - End If + Public Sub DeleteAutoSaveFiles() + Try + If Directory.Exists(strAutoSaveDataFolderPath) OrElse Directory.Exists(strAutoSaveLogFolderPath) OrElse Directory.Exists(strAutoSaveInternalLogFolderPath) Then + ' Define the retention policy (keep last N autosaves) + Dim retentionCount As Integer = 5 ' Example: Keep the last 5 autosaves + + ' Retrieve autosaved files + If Directory.Exists(strAutoSaveDataFolderPath) Then + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveDataFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles("data_*.rds") ' Adjust pattern to match actual filenames + + ' Sort files by last write time in descending order + Dim sortedFiles As IOrderedEnumerable(Of FileInfo) = files.OrderByDescending(Function(f) f.LastWriteTime) + + ' Determine files to delete based on retention policy + Dim filesToDelete As IEnumerable(Of FileInfo) = sortedFiles.Skip(retentionCount) + + ' Delete older autosaved files + For Each file In filesToDelete + file.Delete() + Next + ElseIf Directory.Exists(strAutoSaveLogFolderPath) Then + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveLogFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles("log*.R") ' Adjust pattern to match actual filenames + + ' Sort files by last write time in descending order + Dim sortedFiles As IOrderedEnumerable(Of FileInfo) = files.OrderByDescending(Function(f) f.LastWriteTime) + + ' Determine files to delete based on retention policy + Dim filesToDelete As IEnumerable(Of FileInfo) = sortedFiles.Skip(retentionCount) + + ' Delete older autosaved files + For Each file In filesToDelete + file.Delete() + Next + ElseIf Directory.Exists(strAutoSaveInternalLogFolderPath) Then + Dim autoSaveDirectory As New DirectoryInfo(strAutoSaveInternalLogFolderPath) + Dim files As FileInfo() = autoSaveDirectory.GetFiles("debug_log*.R") ' Adjust pattern to match actual filenames + + ' Sort files by last write time in descending order + Dim sortedFiles As IOrderedEnumerable(Of FileInfo) = files.OrderByDescending(Function(f) f.LastWriteTime) + + ' Determine files to delete based on retention policy + Dim filesToDelete As IEnumerable(Of FileInfo) = sortedFiles.Skip(retentionCount) + + ' Delete older autosaved files + For Each file In filesToDelete + file.Delete() + Next + End If + End If + Catch ex As Exception + MsgBox("Could not delete auto save data file at: " & strCurrentAutoSaveDataFilePath & Environment.NewLine & ex.Message) + End Try End Sub - Public Sub DeleteAutoSaveDebugLog() - If clsRLink.strAutoSaveDebugLogFilePath <> "" Then - Try - File.Delete(clsRLink.strAutoSaveDebugLogFilePath) - Catch ex As Exception - MsgBox("Could not delete auto save debug log file at: " & clsRLink.strAutoSaveDebugLogFilePath & Environment.NewLine & ex.Message) - End Try - End If - End Sub Private Sub mnuOrganiseDataObjectHideDataframes_Click(sender As Object, e As EventArgs) Handles mnuPrepareDataObjectHideDataframes.Click dlgHideDataframes.ShowDialog() @@ -1315,10 +1341,6 @@ Public Class frmMain Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "133") End Sub - Private Sub mnuHelpMenus_Click(sender As Object, e As EventArgs) Handles mnuHelpMenus.Click - Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "12") - End Sub - Private Sub mnuHelpLicence_Click(sender As Object, e As EventArgs) Handles mnuHelpLicence.Click Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "323") End Sub @@ -2736,4 +2758,52 @@ Public Class frmMain Private Sub mnuClimaticFileExportToGoogleBucketsToolStrip_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileExportToGoogleBucketsToolStrip.Click dlgExportClimaticDefinitions.ShowDialog() End Sub + + Private Sub FileToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FileToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "13") + End Sub + + Private Sub EditToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EditToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "7") + End Sub + + Private Sub PrepareToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PrepareToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "9") + End Sub + + Private Sub DescribeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DescribeToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "18") + End Sub + + Private Sub ModelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ModelToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "17") + End Sub + + Private Sub StructuredToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StructuredToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "454") + End Sub + + Private Sub ClimaticToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ClimaticToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "19") + End Sub + + Private Sub ProcurementToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ProcurementToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "498") + End Sub + + Private Sub ExperimentsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExperimentsToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "570") + End Sub + + Private Sub ToolsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ToolsToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "8") + End Sub + + Private Sub ViewToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles ViewToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "21") + End Sub + + Private Sub MenusAndDialogsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MenusAndDialogsToolStripMenuItem.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "12") + End Sub End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index a9f2605da8b..741d4f7da58 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -287,6 +287,12 @@ Form + + dlgRestoreBackup.vb + + + Form + dlgSeasonalGraph.vb @@ -307,6 +313,12 @@ + + sdgDefineAnnualRainfall.vb + + + Form + sdgHSConstants.vb @@ -3137,6 +3149,9 @@ dlgRandomSplit.vb + + dlgRestoreBackup.vb + dlgScript.vb @@ -3185,6 +3200,9 @@ dlgThreeVariablePivotTable.vb + + sdgDefineAnnualRainfall.vb + sdgHSConstants.vb diff --git a/instat/sdgDefineAnnualRainfall.Designer.vb b/instat/sdgDefineAnnualRainfall.Designer.vb new file mode 100644 index 00000000000..e03002e434a --- /dev/null +++ b/instat/sdgDefineAnnualRainfall.Designer.vb @@ -0,0 +1,1315 @@ + _ +Partial Class sdgDefineAnnualRainfall + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrReceiverPlantingDayCondition = New instat.ucrReceiverSingle() + Me.lblMinMinAnnual = New System.Windows.Forms.Label() + Me.ucrReceiverMinMinAnnual = New instat.ucrReceiverSingle() + Me.lblMeanAnnualTemp = New System.Windows.Forms.Label() + Me.lblMaxMinAnnual = New System.Windows.Forms.Label() + Me.lblAnnualTempYear = New System.Windows.Forms.Label() + Me.lblAnnualTempStation = New System.Windows.Forms.Label() + Me.lblMaxMaxAnnual = New System.Windows.Forms.Label() + Me.ucrSelecetorMonthlyTemp = New instat.ucrSelectorByDataFrame() + Me.lblMinMaxAnnual = New System.Windows.Forms.Label() + Me.lblMeanMaxAnnual = New System.Windows.Forms.Label() + Me.ucrReceiverMaxMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMinAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualTempYr = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualTempStation = New instat.ucrReceiverSingle() + Me.tbAnnualTempSummaries = New System.Windows.Forms.TabPage() + Me.ucrSelectorAnnualTemp = New instat.ucrSelectorByDataFrame() + Me.lblPlantingDayCond = New System.Windows.Forms.Label() + Me.tbMonthlyTemp = New System.Windows.Forms.TabPage() + Me.lblMonth = New System.Windows.Forms.Label() + Me.ucrReceiverMonthMonthly = New instat.ucrReceiverSingle() + Me.lblMinMInMonthly = New System.Windows.Forms.Label() + Me.ucrReceiverMinMinMonthly = New instat.ucrReceiverSingle() + Me.lblMeanMinMonthly = New System.Windows.Forms.Label() + Me.lblMaxMinMonthly = New System.Windows.Forms.Label() + Me.lblYearMonthTemp = New System.Windows.Forms.Label() + Me.lblStationMonthTemp = New System.Windows.Forms.Label() + Me.lblMaxMaxMonthly = New System.Windows.Forms.Label() + Me.lblMinMaxMonthly = New System.Windows.Forms.Label() + Me.lblMeanMaxMonthly = New System.Windows.Forms.Label() + Me.ucrReceiverMaxMaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanmaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMinMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanminMontly = New instat.ucrReceiverSingle() + Me.ucrReceiverYearMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMonthlyTemp = New instat.ucrReceiverSingle() + Me.ucrBase = New instat.ucrButtonsSubdialogue() + Me.lblSeasonPlantingDay = New System.Windows.Forms.Label() + Me.lblRainyDaysYear = New System.Windows.Forms.Label() + Me.ucrReceiverRainDaysYear = New instat.ucrReceiverSingle() + Me.lblNoRainDaysSeason = New System.Windows.Forms.Label() + Me.lblSeasonalLength = New System.Windows.Forms.Label() + Me.lblSeasonalRain = New System.Windows.Forms.Label() + Me.lblAnnualRain = New System.Windows.Forms.Label() + Me.lblEndSeasonDate = New System.Windows.Forms.Label() + Me.lblEndSeasonDOY = New System.Windows.Forms.Label() + Me.lblEndRainDate = New System.Windows.Forms.Label() + Me.lblEndRainsDOY = New System.Windows.Forms.Label() + Me.lblStartRainDate = New System.Windows.Forms.Label() + Me.lblStartRainDOY = New System.Windows.Forms.Label() + Me.lblYear = New System.Windows.Forms.Label() + Me.lblStation = New System.Windows.Forms.Label() + Me.ucrReceiverStartRainDate = New instat.ucrReceiverSingle() + Me.ucrReceiverStartRainDOY = New instat.ucrReceiverSingle() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() + Me.ucrReceiverEndSeasonDate = New instat.ucrReceiverSingle() + Me.ucrReceiverEndSeasonDOY = New instat.ucrReceiverSingle() + Me.ucrReceiverEndRainsDOY = New instat.ucrReceiverSingle() + Me.tbSummaries = New System.Windows.Forms.TabControl() + Me.tbAnnualRainfall = New System.Windows.Forms.TabPage() + Me.ucrReceiverEndRainsDate = New instat.ucrReceiverSingle() + Me.ucrReceiverSeasonalLength = New instat.ucrReceiverSingle() + Me.ucrReceiverRainDaysSeason = New instat.ucrReceiverSingle() + Me.ucrReceiverSeasonalRain = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualRain = New instat.ucrReceiverSingle() + Me.ucrSelectorDefineAnnualRain = New instat.ucrSelectorByDataFrame() + Me.tbCropSuccessProp = New System.Windows.Forms.TabPage() + Me.lblPlantingLength = New System.Windows.Forms.Label() + Me.ucrReceiverPlantingLenghth = New instat.ucrReceiverSingle() + Me.lblPlantingDay = New System.Windows.Forms.Label() + Me.lblProbSuccess = New System.Windows.Forms.Label() + Me.lblTotalRain = New System.Windows.Forms.Label() + Me.lblCropStation = New System.Windows.Forms.Label() + Me.ucrReceiverPropSuccess = New instat.ucrReceiverSingle() + Me.ucrReceiverPlantingDay = New instat.ucrReceiverSingle() + Me.ucrReceiverTotalRain = New instat.ucrReceiverSingle() + Me.ucrReceiverStationCrop = New instat.ucrReceiverSingle() + Me.ucrSelectorCropProp = New instat.ucrSelectorByDataFrame() + Me.tbSeasonStartProb = New System.Windows.Forms.TabPage() + Me.lblSeasonYear = New System.Windows.Forms.Label() + Me.lblStationSeasonProb = New System.Windows.Forms.Label() + Me.ucrReceiverSeasonPlantingDay = New instat.ucrReceiverSingle() + Me.ucrReceiverSeasonYear = New instat.ucrReceiverSingle() + Me.ucrReceiverSeasonStationProb = New instat.ucrReceiverSingle() + Me.ucrSelectorSeasonStartProp = New instat.ucrSelectorByDataFrame() + Me.tbAnnualTempSummaries.SuspendLayout() + Me.tbMonthlyTemp.SuspendLayout() + Me.tbSummaries.SuspendLayout() + Me.tbAnnualRainfall.SuspendLayout() + Me.tbCropSuccessProp.SuspendLayout() + Me.tbSeasonStartProb.SuspendLayout() + Me.SuspendLayout() + ' + 'ucrReceiverPlantingDayCondition + ' + Me.ucrReceiverPlantingDayCondition.AutoSize = True + Me.ucrReceiverPlantingDayCondition.frmParent = Nothing + Me.ucrReceiverPlantingDayCondition.Location = New System.Drawing.Point(252, 155) + Me.ucrReceiverPlantingDayCondition.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingDayCondition.Name = "ucrReceiverPlantingDayCondition" + Me.ucrReceiverPlantingDayCondition.Selector = Nothing + Me.ucrReceiverPlantingDayCondition.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverPlantingDayCondition.strNcFilePath = "" + Me.ucrReceiverPlantingDayCondition.TabIndex = 8 + Me.ucrReceiverPlantingDayCondition.ucrSelector = Nothing + ' + 'lblMinMinAnnual + ' + Me.lblMinMinAnnual.AutoSize = True + Me.lblMinMinAnnual.Location = New System.Drawing.Point(249, 135) + Me.lblMinMinAnnual.Name = "lblMinMinAnnual" + Me.lblMinMinAnnual.Size = New System.Drawing.Size(98, 13) + Me.lblMinMinAnnual.TabIndex = 7 + Me.lblMinMinAnnual.Text = "Min Minimum Temp" + ' + 'ucrReceiverMinMinAnnual + ' + Me.ucrReceiverMinMinAnnual.AutoSize = True + Me.ucrReceiverMinMinAnnual.frmParent = Nothing + Me.ucrReceiverMinMinAnnual.Location = New System.Drawing.Point(250, 151) + Me.ucrReceiverMinMinAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMinAnnual.Name = "ucrReceiverMinMinAnnual" + Me.ucrReceiverMinMinAnnual.Selector = Nothing + Me.ucrReceiverMinMinAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMinMinAnnual.strNcFilePath = "" + Me.ucrReceiverMinMinAnnual.TabIndex = 8 + Me.ucrReceiverMinMinAnnual.ucrSelector = Nothing + ' + 'lblMeanAnnualTemp + ' + Me.lblMeanAnnualTemp.AutoSize = True + Me.lblMeanAnnualTemp.Location = New System.Drawing.Point(245, 93) + Me.lblMeanAnnualTemp.Name = "lblMeanAnnualTemp" + Me.lblMeanAnnualTemp.Size = New System.Drawing.Size(108, 13) + Me.lblMeanAnnualTemp.TabIndex = 5 + Me.lblMeanAnnualTemp.Text = "Mean Minimum Temp" + ' + 'lblMaxMinAnnual + ' + Me.lblMaxMinAnnual.AutoSize = True + Me.lblMaxMinAnnual.Location = New System.Drawing.Point(251, 174) + Me.lblMaxMinAnnual.Name = "lblMaxMinAnnual" + Me.lblMaxMinAnnual.Size = New System.Drawing.Size(101, 13) + Me.lblMaxMinAnnual.TabIndex = 9 + Me.lblMaxMinAnnual.Text = "Max Minimum Temp" + ' + 'lblAnnualTempYear + ' + Me.lblAnnualTempYear.AutoSize = True + Me.lblAnnualTempYear.Location = New System.Drawing.Point(249, 52) + Me.lblAnnualTempYear.Name = "lblAnnualTempYear" + Me.lblAnnualTempYear.Size = New System.Drawing.Size(32, 13) + Me.lblAnnualTempYear.TabIndex = 3 + Me.lblAnnualTempYear.Text = "Year:" + ' + 'lblAnnualTempStation + ' + Me.lblAnnualTempStation.AutoSize = True + Me.lblAnnualTempStation.Location = New System.Drawing.Point(248, 9) + Me.lblAnnualTempStation.Name = "lblAnnualTempStation" + Me.lblAnnualTempStation.Size = New System.Drawing.Size(43, 13) + Me.lblAnnualTempStation.TabIndex = 1 + Me.lblAnnualTempStation.Text = "Station:" + ' + 'lblMaxMaxAnnual + ' + Me.lblMaxMaxAnnual.AutoSize = True + Me.lblMaxMaxAnnual.Location = New System.Drawing.Point(255, 295) + Me.lblMaxMaxAnnual.Name = "lblMaxMaxAnnual" + Me.lblMaxMaxAnnual.Size = New System.Drawing.Size(104, 13) + Me.lblMaxMaxAnnual.TabIndex = 15 + Me.lblMaxMaxAnnual.Text = "Max Maximum Temp" + ' + 'ucrSelecetorMonthlyTemp + ' + Me.ucrSelecetorMonthlyTemp.AutoSize = True + Me.ucrSelecetorMonthlyTemp.bDropUnusedFilterLevels = False + Me.ucrSelecetorMonthlyTemp.bShowHiddenColumns = False + Me.ucrSelecetorMonthlyTemp.bUseCurrentFilter = True + Me.ucrSelecetorMonthlyTemp.Location = New System.Drawing.Point(10, 12) + Me.ucrSelecetorMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelecetorMonthlyTemp.Name = "ucrSelecetorMonthlyTemp" + Me.ucrSelecetorMonthlyTemp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelecetorMonthlyTemp.TabIndex = 0 + ' + 'lblMinMaxAnnual + ' + Me.lblMinMaxAnnual.AutoSize = True + Me.lblMinMaxAnnual.Location = New System.Drawing.Point(254, 253) + Me.lblMinMaxAnnual.Name = "lblMinMaxAnnual" + Me.lblMinMaxAnnual.Size = New System.Drawing.Size(104, 13) + Me.lblMinMaxAnnual.TabIndex = 13 + Me.lblMinMaxAnnual.Text = "Min Maximum Temp:" + ' + 'lblMeanMaxAnnual + ' + Me.lblMeanMaxAnnual.AutoSize = True + Me.lblMeanMaxAnnual.Location = New System.Drawing.Point(254, 214) + Me.lblMeanMaxAnnual.Name = "lblMeanMaxAnnual" + Me.lblMeanMaxAnnual.Size = New System.Drawing.Size(111, 13) + Me.lblMeanMaxAnnual.TabIndex = 11 + Me.lblMeanMaxAnnual.Text = "Mean Maximum Temp" + ' + 'ucrReceiverMaxMaxAnnual + ' + Me.ucrReceiverMaxMaxAnnual.AutoSize = True + Me.ucrReceiverMaxMaxAnnual.frmParent = Nothing + Me.ucrReceiverMaxMaxAnnual.Location = New System.Drawing.Point(254, 308) + Me.ucrReceiverMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMaxAnnual.Name = "ucrReceiverMaxMaxAnnual" + Me.ucrReceiverMaxMaxAnnual.Selector = Nothing + Me.ucrReceiverMaxMaxAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMaxMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMaxMaxAnnual.TabIndex = 16 + Me.ucrReceiverMaxMaxAnnual.ucrSelector = Nothing + ' + 'ucrReceiverMeanMaxAnnual + ' + Me.ucrReceiverMeanMaxAnnual.AutoSize = True + Me.ucrReceiverMeanMaxAnnual.frmParent = Nothing + Me.ucrReceiverMeanMaxAnnual.Location = New System.Drawing.Point(253, 231) + Me.ucrReceiverMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanMaxAnnual.Name = "ucrReceiverMeanMaxAnnual" + Me.ucrReceiverMeanMaxAnnual.Selector = Nothing + Me.ucrReceiverMeanMaxAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMeanMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMeanMaxAnnual.TabIndex = 12 + Me.ucrReceiverMeanMaxAnnual.ucrSelector = Nothing + ' + 'ucrReceiverMinMaxAnnual + ' + Me.ucrReceiverMinMaxAnnual.AutoSize = True + Me.ucrReceiverMinMaxAnnual.frmParent = Nothing + Me.ucrReceiverMinMaxAnnual.Location = New System.Drawing.Point(251, 271) + Me.ucrReceiverMinMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMaxAnnual.Name = "ucrReceiverMinMaxAnnual" + Me.ucrReceiverMinMaxAnnual.Selector = Nothing + Me.ucrReceiverMinMaxAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMinMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMinMaxAnnual.TabIndex = 14 + Me.ucrReceiverMinMaxAnnual.ucrSelector = Nothing + ' + 'ucrReceiverMaxMinAnnual + ' + Me.ucrReceiverMaxMinAnnual.AutoSize = True + Me.ucrReceiverMaxMinAnnual.frmParent = Nothing + Me.ucrReceiverMaxMinAnnual.Location = New System.Drawing.Point(249, 192) + Me.ucrReceiverMaxMinAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMinAnnual.Name = "ucrReceiverMaxMinAnnual" + Me.ucrReceiverMaxMinAnnual.Selector = Nothing + Me.ucrReceiverMaxMinAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMaxMinAnnual.strNcFilePath = "" + Me.ucrReceiverMaxMinAnnual.TabIndex = 10 + Me.ucrReceiverMaxMinAnnual.ucrSelector = Nothing + ' + 'ucrReceiverMeanAnnual + ' + Me.ucrReceiverMeanAnnual.AutoSize = True + Me.ucrReceiverMeanAnnual.frmParent = Nothing + Me.ucrReceiverMeanAnnual.Location = New System.Drawing.Point(248, 112) + Me.ucrReceiverMeanAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanAnnual.Name = "ucrReceiverMeanAnnual" + Me.ucrReceiverMeanAnnual.Selector = Nothing + Me.ucrReceiverMeanAnnual.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMeanAnnual.strNcFilePath = "" + Me.ucrReceiverMeanAnnual.TabIndex = 6 + Me.ucrReceiverMeanAnnual.ucrSelector = Nothing + ' + 'ucrReceiverAnnualTempYr + ' + Me.ucrReceiverAnnualTempYr.AutoSize = True + Me.ucrReceiverAnnualTempYr.frmParent = Nothing + Me.ucrReceiverAnnualTempYr.Location = New System.Drawing.Point(247, 69) + Me.ucrReceiverAnnualTempYr.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualTempYr.Name = "ucrReceiverAnnualTempYr" + Me.ucrReceiverAnnualTempYr.Selector = Nothing + Me.ucrReceiverAnnualTempYr.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverAnnualTempYr.strNcFilePath = "" + Me.ucrReceiverAnnualTempYr.TabIndex = 4 + Me.ucrReceiverAnnualTempYr.ucrSelector = Nothing + ' + 'ucrReceiverAnnualTempStation + ' + Me.ucrReceiverAnnualTempStation.AutoSize = True + Me.ucrReceiverAnnualTempStation.frmParent = Nothing + Me.ucrReceiverAnnualTempStation.Location = New System.Drawing.Point(246, 26) + Me.ucrReceiverAnnualTempStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualTempStation.Name = "ucrReceiverAnnualTempStation" + Me.ucrReceiverAnnualTempStation.Selector = Nothing + Me.ucrReceiverAnnualTempStation.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverAnnualTempStation.strNcFilePath = "" + Me.ucrReceiverAnnualTempStation.TabIndex = 2 + Me.ucrReceiverAnnualTempStation.ucrSelector = Nothing + ' + 'tbAnnualTempSummaries + ' + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanAnnualTemp) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempYear) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempYr) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrSelectorAnnualTemp) + Me.tbAnnualTempSummaries.Location = New System.Drawing.Point(4, 22) + Me.tbAnnualTempSummaries.Name = "tbAnnualTempSummaries" + Me.tbAnnualTempSummaries.Padding = New System.Windows.Forms.Padding(3) + Me.tbAnnualTempSummaries.Size = New System.Drawing.Size(515, 404) + Me.tbAnnualTempSummaries.TabIndex = 3 + Me.tbAnnualTempSummaries.Text = "Annual Temperature" + Me.tbAnnualTempSummaries.UseVisualStyleBackColor = True + ' + 'ucrSelectorAnnualTemp + ' + Me.ucrSelectorAnnualTemp.AutoSize = True + Me.ucrSelectorAnnualTemp.bDropUnusedFilterLevels = False + Me.ucrSelectorAnnualTemp.bShowHiddenColumns = False + Me.ucrSelectorAnnualTemp.bUseCurrentFilter = True + Me.ucrSelectorAnnualTemp.Location = New System.Drawing.Point(11, 6) + Me.ucrSelectorAnnualTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorAnnualTemp.Name = "ucrSelectorAnnualTemp" + Me.ucrSelectorAnnualTemp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelectorAnnualTemp.TabIndex = 0 + ' + 'lblPlantingDayCond + ' + Me.lblPlantingDayCond.AutoSize = True + Me.lblPlantingDayCond.Location = New System.Drawing.Point(254, 139) + Me.lblPlantingDayCond.Name = "lblPlantingDayCond" + Me.lblPlantingDayCond.Size = New System.Drawing.Size(117, 13) + Me.lblPlantingDayCond.TabIndex = 7 + Me.lblPlantingDayCond.Text = "Planting Day Condition:" + ' + 'tbMonthlyTemp + ' + Me.tbMonthlyTemp.Controls.Add(Me.lblMonth) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMInMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblYearMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblStationMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanmaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanminMontly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverYearMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthlyTemp) + Me.tbMonthlyTemp.Controls.Add(Me.ucrSelecetorMonthlyTemp) + Me.tbMonthlyTemp.Location = New System.Drawing.Point(4, 22) + Me.tbMonthlyTemp.Name = "tbMonthlyTemp" + Me.tbMonthlyTemp.Padding = New System.Windows.Forms.Padding(3) + Me.tbMonthlyTemp.Size = New System.Drawing.Size(515, 404) + Me.tbMonthlyTemp.TabIndex = 4 + Me.tbMonthlyTemp.Text = "Monthly Temperature" + Me.tbMonthlyTemp.UseVisualStyleBackColor = True + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(247, 95) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 5 + Me.lblMonth.Text = "Month:" + ' + 'ucrReceiverMonthMonthly + ' + Me.ucrReceiverMonthMonthly.AutoSize = True + Me.ucrReceiverMonthMonthly.frmParent = Nothing + Me.ucrReceiverMonthMonthly.Location = New System.Drawing.Point(245, 112) + Me.ucrReceiverMonthMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthMonthly.Name = "ucrReceiverMonthMonthly" + Me.ucrReceiverMonthMonthly.Selector = Nothing + Me.ucrReceiverMonthMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMonthMonthly.strNcFilePath = "" + Me.ucrReceiverMonthMonthly.TabIndex = 6 + Me.ucrReceiverMonthMonthly.ucrSelector = Nothing + ' + 'lblMinMInMonthly + ' + Me.lblMinMInMonthly.AutoSize = True + Me.lblMinMInMonthly.Location = New System.Drawing.Point(248, 181) + Me.lblMinMInMonthly.Name = "lblMinMInMonthly" + Me.lblMinMInMonthly.Size = New System.Drawing.Size(98, 13) + Me.lblMinMInMonthly.TabIndex = 9 + Me.lblMinMInMonthly.Text = "Min Minimum Temp" + ' + 'ucrReceiverMinMinMonthly + ' + Me.ucrReceiverMinMinMonthly.AutoSize = True + Me.ucrReceiverMinMinMonthly.frmParent = Nothing + Me.ucrReceiverMinMinMonthly.Location = New System.Drawing.Point(249, 197) + Me.ucrReceiverMinMinMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMinMonthly.Name = "ucrReceiverMinMinMonthly" + Me.ucrReceiverMinMinMonthly.Selector = Nothing + Me.ucrReceiverMinMinMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMinMinMonthly.strNcFilePath = "" + Me.ucrReceiverMinMinMonthly.TabIndex = 10 + Me.ucrReceiverMinMinMonthly.ucrSelector = Nothing + ' + 'lblMeanMinMonthly + ' + Me.lblMeanMinMonthly.AutoSize = True + Me.lblMeanMinMonthly.Location = New System.Drawing.Point(244, 139) + Me.lblMeanMinMonthly.Name = "lblMeanMinMonthly" + Me.lblMeanMinMonthly.Size = New System.Drawing.Size(108, 13) + Me.lblMeanMinMonthly.TabIndex = 7 + Me.lblMeanMinMonthly.Text = "Mean Minimum Temp" + ' + 'lblMaxMinMonthly + ' + Me.lblMaxMinMonthly.AutoSize = True + Me.lblMaxMinMonthly.Location = New System.Drawing.Point(250, 220) + Me.lblMaxMinMonthly.Name = "lblMaxMinMonthly" + Me.lblMaxMinMonthly.Size = New System.Drawing.Size(101, 13) + Me.lblMaxMinMonthly.TabIndex = 11 + Me.lblMaxMinMonthly.Text = "Max Minimum Temp" + ' + 'lblYearMonthTemp + ' + Me.lblYearMonthTemp.AutoSize = True + Me.lblYearMonthTemp.Location = New System.Drawing.Point(248, 54) + Me.lblYearMonthTemp.Name = "lblYearMonthTemp" + Me.lblYearMonthTemp.Size = New System.Drawing.Size(32, 13) + Me.lblYearMonthTemp.TabIndex = 3 + Me.lblYearMonthTemp.Text = "Year:" + ' + 'lblStationMonthTemp + ' + Me.lblStationMonthTemp.AutoSize = True + Me.lblStationMonthTemp.Location = New System.Drawing.Point(247, 15) + Me.lblStationMonthTemp.Name = "lblStationMonthTemp" + Me.lblStationMonthTemp.Size = New System.Drawing.Size(43, 13) + Me.lblStationMonthTemp.TabIndex = 1 + Me.lblStationMonthTemp.Text = "Station:" + ' + 'lblMaxMaxMonthly + ' + Me.lblMaxMaxMonthly.AutoSize = True + Me.lblMaxMaxMonthly.Location = New System.Drawing.Point(254, 341) + Me.lblMaxMaxMonthly.Name = "lblMaxMaxMonthly" + Me.lblMaxMaxMonthly.Size = New System.Drawing.Size(104, 13) + Me.lblMaxMaxMonthly.TabIndex = 17 + Me.lblMaxMaxMonthly.Text = "Max Maximum Temp" + ' + 'lblMinMaxMonthly + ' + Me.lblMinMaxMonthly.AutoSize = True + Me.lblMinMaxMonthly.Location = New System.Drawing.Point(253, 299) + Me.lblMinMaxMonthly.Name = "lblMinMaxMonthly" + Me.lblMinMaxMonthly.Size = New System.Drawing.Size(104, 13) + Me.lblMinMaxMonthly.TabIndex = 15 + Me.lblMinMaxMonthly.Text = "Min Maximum Temp:" + ' + 'lblMeanMaxMonthly + ' + Me.lblMeanMaxMonthly.AutoSize = True + Me.lblMeanMaxMonthly.Location = New System.Drawing.Point(253, 260) + Me.lblMeanMaxMonthly.Name = "lblMeanMaxMonthly" + Me.lblMeanMaxMonthly.Size = New System.Drawing.Size(111, 13) + Me.lblMeanMaxMonthly.TabIndex = 13 + Me.lblMeanMaxMonthly.Text = "Mean Maximum Temp" + ' + 'ucrReceiverMaxMaxMonthly + ' + Me.ucrReceiverMaxMaxMonthly.AutoSize = True + Me.ucrReceiverMaxMaxMonthly.frmParent = Nothing + Me.ucrReceiverMaxMaxMonthly.Location = New System.Drawing.Point(253, 354) + Me.ucrReceiverMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMaxMonthly.Name = "ucrReceiverMaxMaxMonthly" + Me.ucrReceiverMaxMaxMonthly.Selector = Nothing + Me.ucrReceiverMaxMaxMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMaxMaxMonthly.strNcFilePath = "" + Me.ucrReceiverMaxMaxMonthly.TabIndex = 18 + Me.ucrReceiverMaxMaxMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMeanmaxMonthly + ' + Me.ucrReceiverMeanmaxMonthly.AutoSize = True + Me.ucrReceiverMeanmaxMonthly.frmParent = Nothing + Me.ucrReceiverMeanmaxMonthly.Location = New System.Drawing.Point(252, 277) + Me.ucrReceiverMeanmaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanmaxMonthly.Name = "ucrReceiverMeanmaxMonthly" + Me.ucrReceiverMeanmaxMonthly.Selector = Nothing + Me.ucrReceiverMeanmaxMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMeanmaxMonthly.strNcFilePath = "" + Me.ucrReceiverMeanmaxMonthly.TabIndex = 14 + Me.ucrReceiverMeanmaxMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMinMaxMonthly + ' + Me.ucrReceiverMinMaxMonthly.AutoSize = True + Me.ucrReceiverMinMaxMonthly.frmParent = Nothing + Me.ucrReceiverMinMaxMonthly.Location = New System.Drawing.Point(250, 317) + Me.ucrReceiverMinMaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMaxMonthly.Name = "ucrReceiverMinMaxMonthly" + Me.ucrReceiverMinMaxMonthly.Selector = Nothing + Me.ucrReceiverMinMaxMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMinMaxMonthly.strNcFilePath = "" + Me.ucrReceiverMinMaxMonthly.TabIndex = 16 + Me.ucrReceiverMinMaxMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMaxMinMonthly + ' + Me.ucrReceiverMaxMinMonthly.AutoSize = True + Me.ucrReceiverMaxMinMonthly.frmParent = Nothing + Me.ucrReceiverMaxMinMonthly.Location = New System.Drawing.Point(248, 238) + Me.ucrReceiverMaxMinMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMinMonthly.Name = "ucrReceiverMaxMinMonthly" + Me.ucrReceiverMaxMinMonthly.Selector = Nothing + Me.ucrReceiverMaxMinMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMaxMinMonthly.strNcFilePath = "" + Me.ucrReceiverMaxMinMonthly.TabIndex = 12 + Me.ucrReceiverMaxMinMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMeanminMontly + ' + Me.ucrReceiverMeanminMontly.AutoSize = True + Me.ucrReceiverMeanminMontly.frmParent = Nothing + Me.ucrReceiverMeanminMontly.Location = New System.Drawing.Point(247, 158) + Me.ucrReceiverMeanminMontly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanminMontly.Name = "ucrReceiverMeanminMontly" + Me.ucrReceiverMeanminMontly.Selector = Nothing + Me.ucrReceiverMeanminMontly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMeanminMontly.strNcFilePath = "" + Me.ucrReceiverMeanminMontly.TabIndex = 8 + Me.ucrReceiverMeanminMontly.ucrSelector = Nothing + ' + 'ucrReceiverYearMonthly + ' + Me.ucrReceiverYearMonthly.AutoSize = True + Me.ucrReceiverYearMonthly.frmParent = Nothing + Me.ucrReceiverYearMonthly.Location = New System.Drawing.Point(246, 71) + Me.ucrReceiverYearMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYearMonthly.Name = "ucrReceiverYearMonthly" + Me.ucrReceiverYearMonthly.Selector = Nothing + Me.ucrReceiverYearMonthly.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverYearMonthly.strNcFilePath = "" + Me.ucrReceiverYearMonthly.TabIndex = 4 + Me.ucrReceiverYearMonthly.ucrSelector = Nothing + ' + 'ucrReceiverMonthlyTemp + ' + Me.ucrReceiverMonthlyTemp.AutoSize = True + Me.ucrReceiverMonthlyTemp.frmParent = Nothing + Me.ucrReceiverMonthlyTemp.Location = New System.Drawing.Point(245, 32) + Me.ucrReceiverMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthlyTemp.Name = "ucrReceiverMonthlyTemp" + Me.ucrReceiverMonthlyTemp.Selector = Nothing + Me.ucrReceiverMonthlyTemp.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverMonthlyTemp.strNcFilePath = "" + Me.ucrReceiverMonthlyTemp.TabIndex = 2 + Me.ucrReceiverMonthlyTemp.ucrSelector = Nothing + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.Location = New System.Drawing.Point(157, 455) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(224, 30) + Me.ucrBase.TabIndex = 1 + ' + 'lblSeasonPlantingDay + ' + Me.lblSeasonPlantingDay.AutoSize = True + Me.lblSeasonPlantingDay.Location = New System.Drawing.Point(247, 97) + Me.lblSeasonPlantingDay.Name = "lblSeasonPlantingDay" + Me.lblSeasonPlantingDay.Size = New System.Drawing.Size(70, 13) + Me.lblSeasonPlantingDay.TabIndex = 5 + Me.lblSeasonPlantingDay.Text = "Planting Day:" + ' + 'lblRainyDaysYear + ' + Me.lblRainyDaysYear.AutoSize = True + Me.lblRainyDaysYear.Location = New System.Drawing.Point(248, 137) + Me.lblRainyDaysYear.Name = "lblRainyDaysYear" + Me.lblRainyDaysYear.Size = New System.Drawing.Size(103, 13) + Me.lblRainyDaysYear.TabIndex = 7 + Me.lblRainyDaysYear.Text = " Rainy Days in Year:" + ' + 'ucrReceiverRainDaysYear + ' + Me.ucrReceiverRainDaysYear.AutoSize = True + Me.ucrReceiverRainDaysYear.frmParent = Nothing + Me.ucrReceiverRainDaysYear.Location = New System.Drawing.Point(246, 153) + Me.ucrReceiverRainDaysYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainDaysYear.Name = "ucrReceiverRainDaysYear" + Me.ucrReceiverRainDaysYear.Selector = Nothing + Me.ucrReceiverRainDaysYear.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverRainDaysYear.strNcFilePath = "" + Me.ucrReceiverRainDaysYear.TabIndex = 8 + Me.ucrReceiverRainDaysYear.ucrSelector = Nothing + ' + 'lblNoRainDaysSeason + ' + Me.lblNoRainDaysSeason.AutoSize = True + Me.lblNoRainDaysSeason.Location = New System.Drawing.Point(241, 95) + Me.lblNoRainDaysSeason.Name = "lblNoRainDaysSeason" + Me.lblNoRainDaysSeason.Size = New System.Drawing.Size(117, 13) + Me.lblNoRainDaysSeason.TabIndex = 5 + Me.lblNoRainDaysSeason.Text = " Rainy Days in Season:" + ' + 'lblSeasonalLength + ' + Me.lblSeasonalLength.AutoSize = True + Me.lblSeasonalLength.Location = New System.Drawing.Point(247, 176) + Me.lblSeasonalLength.Name = "lblSeasonalLength" + Me.lblSeasonalLength.Size = New System.Drawing.Size(90, 13) + Me.lblSeasonalLength.TabIndex = 9 + Me.lblSeasonalLength.Text = "Seasonal Length:" + ' + 'lblSeasonalRain + ' + Me.lblSeasonalRain.AutoSize = True + Me.lblSeasonalRain.Location = New System.Drawing.Point(245, 54) + Me.lblSeasonalRain.Name = "lblSeasonalRain" + Me.lblSeasonalRain.Size = New System.Drawing.Size(79, 13) + Me.lblSeasonalRain.TabIndex = 3 + Me.lblSeasonalRain.Text = "Seasonal Rain:" + ' + 'lblAnnualRain + ' + Me.lblAnnualRain.AutoSize = True + Me.lblAnnualRain.Location = New System.Drawing.Point(244, 11) + Me.lblAnnualRain.Name = "lblAnnualRain" + Me.lblAnnualRain.Size = New System.Drawing.Size(68, 13) + Me.lblAnnualRain.TabIndex = 1 + Me.lblAnnualRain.Text = "Annual Rain:" + ' + 'lblEndSeasonDate + ' + Me.lblEndSeasonDate.AutoSize = True + Me.lblEndSeasonDate.Location = New System.Drawing.Point(250, 331) + Me.lblEndSeasonDate.Name = "lblEndSeasonDate" + Me.lblEndSeasonDate.Size = New System.Drawing.Size(97, 13) + Me.lblEndSeasonDate.TabIndex = 17 + Me.lblEndSeasonDate.Text = "End Season(Date):" + ' + 'lblEndSeasonDOY + ' + Me.lblEndSeasonDOY.AutoSize = True + Me.lblEndSeasonDOY.Location = New System.Drawing.Point(251, 297) + Me.lblEndSeasonDOY.Name = "lblEndSeasonDOY" + Me.lblEndSeasonDOY.Size = New System.Drawing.Size(97, 13) + Me.lblEndSeasonDOY.TabIndex = 15 + Me.lblEndSeasonDOY.Text = "End Season(DOY):" + ' + 'lblEndRainDate + ' + Me.lblEndRainDate.AutoSize = True + Me.lblEndRainDate.Location = New System.Drawing.Point(250, 255) + Me.lblEndRainDate.Name = "lblEndRainDate" + Me.lblEndRainDate.Size = New System.Drawing.Size(83, 13) + Me.lblEndRainDate.TabIndex = 13 + Me.lblEndRainDate.Text = "End Rain(Date):" + ' + 'lblEndRainsDOY + ' + Me.lblEndRainsDOY.AutoSize = True + Me.lblEndRainsDOY.Location = New System.Drawing.Point(250, 216) + Me.lblEndRainsDOY.Name = "lblEndRainsDOY" + Me.lblEndRainsDOY.Size = New System.Drawing.Size(83, 13) + Me.lblEndRainsDOY.TabIndex = 11 + Me.lblEndRainsDOY.Text = "End Rain(DOY):" + ' + 'lblStartRainDate + ' + Me.lblStartRainDate.AutoSize = True + Me.lblStartRainDate.Location = New System.Drawing.Point(11, 326) + Me.lblStartRainDate.Name = "lblStartRainDate" + Me.lblStartRainDate.Size = New System.Drawing.Size(86, 13) + Me.lblStartRainDate.TabIndex = 25 + Me.lblStartRainDate.Text = "Start Rain(Date):" + ' + 'lblStartRainDOY + ' + Me.lblStartRainDOY.AutoSize = True + Me.lblStartRainDOY.Location = New System.Drawing.Point(12, 285) + Me.lblStartRainDOY.Name = "lblStartRainDOY" + Me.lblStartRainDOY.Size = New System.Drawing.Size(86, 13) + Me.lblStartRainDOY.TabIndex = 23 + Me.lblStartRainDOY.Text = "Start Rain(DOY):" + ' + 'lblYear + ' + Me.lblYear.AutoSize = True + Me.lblYear.Location = New System.Drawing.Point(14, 239) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.TabIndex = 21 + Me.lblYear.Text = "Year:" + ' + 'lblStation + ' + Me.lblStation.AutoSize = True + Me.lblStation.Location = New System.Drawing.Point(15, 198) + Me.lblStation.Name = "lblStation" + Me.lblStation.Size = New System.Drawing.Size(43, 13) + Me.lblStation.TabIndex = 19 + Me.lblStation.Text = "Station:" + ' + 'ucrReceiverStartRainDate + ' + Me.ucrReceiverStartRainDate.AutoSize = True + Me.ucrReceiverStartRainDate.frmParent = Nothing + Me.ucrReceiverStartRainDate.Location = New System.Drawing.Point(9, 344) + Me.ucrReceiverStartRainDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDate.Name = "ucrReceiverStartRainDate" + Me.ucrReceiverStartRainDate.Selector = Nothing + Me.ucrReceiverStartRainDate.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStartRainDate.strNcFilePath = "" + Me.ucrReceiverStartRainDate.TabIndex = 26 + Me.ucrReceiverStartRainDate.ucrSelector = Nothing + ' + 'ucrReceiverStartRainDOY + ' + Me.ucrReceiverStartRainDOY.AutoSize = True + Me.ucrReceiverStartRainDOY.frmParent = Nothing + Me.ucrReceiverStartRainDOY.Location = New System.Drawing.Point(9, 302) + Me.ucrReceiverStartRainDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDOY.Name = "ucrReceiverStartRainDOY" + Me.ucrReceiverStartRainDOY.Selector = Nothing + Me.ucrReceiverStartRainDOY.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStartRainDOY.strNcFilePath = "" + Me.ucrReceiverStartRainDOY.TabIndex = 24 + Me.ucrReceiverStartRainDOY.ucrSelector = Nothing + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Nothing + Me.ucrReceiverYear.Location = New System.Drawing.Point(9, 258) + Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 22 + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'ucrReceiverStation + ' + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Nothing + Me.ucrReceiverStation.Location = New System.Drawing.Point(11, 215) + Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 20 + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'ucrReceiverEndSeasonDate + ' + Me.ucrReceiverEndSeasonDate.AutoSize = True + Me.ucrReceiverEndSeasonDate.frmParent = Nothing + Me.ucrReceiverEndSeasonDate.Location = New System.Drawing.Point(246, 348) + Me.ucrReceiverEndSeasonDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonDate.Name = "ucrReceiverEndSeasonDate" + Me.ucrReceiverEndSeasonDate.Selector = Nothing + Me.ucrReceiverEndSeasonDate.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndSeasonDate.strNcFilePath = "" + Me.ucrReceiverEndSeasonDate.TabIndex = 18 + Me.ucrReceiverEndSeasonDate.ucrSelector = Nothing + ' + 'ucrReceiverEndSeasonDOY + ' + Me.ucrReceiverEndSeasonDOY.AutoSize = True + Me.ucrReceiverEndSeasonDOY.frmParent = Nothing + Me.ucrReceiverEndSeasonDOY.Location = New System.Drawing.Point(250, 310) + Me.ucrReceiverEndSeasonDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonDOY.Name = "ucrReceiverEndSeasonDOY" + Me.ucrReceiverEndSeasonDOY.Selector = Nothing + Me.ucrReceiverEndSeasonDOY.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndSeasonDOY.strNcFilePath = "" + Me.ucrReceiverEndSeasonDOY.TabIndex = 16 + Me.ucrReceiverEndSeasonDOY.ucrSelector = Nothing + ' + 'ucrReceiverEndRainsDOY + ' + Me.ucrReceiverEndRainsDOY.AutoSize = True + Me.ucrReceiverEndRainsDOY.frmParent = Nothing + Me.ucrReceiverEndRainsDOY.Location = New System.Drawing.Point(249, 233) + Me.ucrReceiverEndRainsDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainsDOY.Name = "ucrReceiverEndRainsDOY" + Me.ucrReceiverEndRainsDOY.Selector = Nothing + Me.ucrReceiverEndRainsDOY.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndRainsDOY.strNcFilePath = "" + Me.ucrReceiverEndRainsDOY.TabIndex = 12 + Me.ucrReceiverEndRainsDOY.ucrSelector = Nothing + ' + 'tbSummaries + ' + Me.tbSummaries.Controls.Add(Me.tbAnnualRainfall) + Me.tbSummaries.Controls.Add(Me.tbCropSuccessProp) + Me.tbSummaries.Controls.Add(Me.tbSeasonStartProb) + Me.tbSummaries.Controls.Add(Me.tbAnnualTempSummaries) + Me.tbSummaries.Controls.Add(Me.tbMonthlyTemp) + Me.tbSummaries.Location = New System.Drawing.Point(12, 17) + Me.tbSummaries.Name = "tbSummaries" + Me.tbSummaries.SelectedIndex = 0 + Me.tbSummaries.Size = New System.Drawing.Size(523, 430) + Me.tbSummaries.TabIndex = 7 + ' + 'tbAnnualRainfall + ' + Me.tbAnnualRainfall.Controls.Add(Me.lblRainyDaysYear) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysYear) + Me.tbAnnualRainfall.Controls.Add(Me.lblNoRainDaysSeason) + Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalLength) + Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalRain) + Me.tbAnnualRainfall.Controls.Add(Me.lblAnnualRain) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainsDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblYear) + Me.tbAnnualRainfall.Controls.Add(Me.lblStation) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverYear) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStation) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalLength) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysSeason) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalRain) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverAnnualRain) + Me.tbAnnualRainfall.Controls.Add(Me.ucrSelectorDefineAnnualRain) + Me.tbAnnualRainfall.Location = New System.Drawing.Point(4, 22) + Me.tbAnnualRainfall.Name = "tbAnnualRainfall" + Me.tbAnnualRainfall.Padding = New System.Windows.Forms.Padding(3) + Me.tbAnnualRainfall.Size = New System.Drawing.Size(515, 404) + Me.tbAnnualRainfall.TabIndex = 0 + Me.tbAnnualRainfall.Text = "Annual Rainfall" + Me.tbAnnualRainfall.UseVisualStyleBackColor = True + ' + 'ucrReceiverEndRainsDate + ' + Me.ucrReceiverEndRainsDate.AutoSize = True + Me.ucrReceiverEndRainsDate.frmParent = Nothing + Me.ucrReceiverEndRainsDate.Location = New System.Drawing.Point(247, 273) + Me.ucrReceiverEndRainsDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainsDate.Name = "ucrReceiverEndRainsDate" + Me.ucrReceiverEndRainsDate.Selector = Nothing + Me.ucrReceiverEndRainsDate.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverEndRainsDate.strNcFilePath = "" + Me.ucrReceiverEndRainsDate.TabIndex = 14 + Me.ucrReceiverEndRainsDate.ucrSelector = Nothing + ' + 'ucrReceiverSeasonalLength + ' + Me.ucrReceiverSeasonalLength.AutoSize = True + Me.ucrReceiverSeasonalLength.frmParent = Nothing + Me.ucrReceiverSeasonalLength.Location = New System.Drawing.Point(245, 194) + Me.ucrReceiverSeasonalLength.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonalLength.Name = "ucrReceiverSeasonalLength" + Me.ucrReceiverSeasonalLength.Selector = Nothing + Me.ucrReceiverSeasonalLength.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonalLength.strNcFilePath = "" + Me.ucrReceiverSeasonalLength.TabIndex = 10 + Me.ucrReceiverSeasonalLength.ucrSelector = Nothing + ' + 'ucrReceiverRainDaysSeason + ' + Me.ucrReceiverRainDaysSeason.AutoSize = True + Me.ucrReceiverRainDaysSeason.frmParent = Nothing + Me.ucrReceiverRainDaysSeason.Location = New System.Drawing.Point(244, 114) + Me.ucrReceiverRainDaysSeason.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainDaysSeason.Name = "ucrReceiverRainDaysSeason" + Me.ucrReceiverRainDaysSeason.Selector = Nothing + Me.ucrReceiverRainDaysSeason.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverRainDaysSeason.strNcFilePath = "" + Me.ucrReceiverRainDaysSeason.TabIndex = 6 + Me.ucrReceiverRainDaysSeason.ucrSelector = Nothing + ' + 'ucrReceiverSeasonalRain + ' + Me.ucrReceiverSeasonalRain.AutoSize = True + Me.ucrReceiverSeasonalRain.frmParent = Nothing + Me.ucrReceiverSeasonalRain.Location = New System.Drawing.Point(243, 71) + Me.ucrReceiverSeasonalRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonalRain.Name = "ucrReceiverSeasonalRain" + Me.ucrReceiverSeasonalRain.Selector = Nothing + Me.ucrReceiverSeasonalRain.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonalRain.strNcFilePath = "" + Me.ucrReceiverSeasonalRain.TabIndex = 4 + Me.ucrReceiverSeasonalRain.ucrSelector = Nothing + ' + 'ucrReceiverAnnualRain + ' + Me.ucrReceiverAnnualRain.AutoSize = True + Me.ucrReceiverAnnualRain.frmParent = Nothing + Me.ucrReceiverAnnualRain.Location = New System.Drawing.Point(242, 28) + Me.ucrReceiverAnnualRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualRain.Name = "ucrReceiverAnnualRain" + Me.ucrReceiverAnnualRain.Selector = Nothing + Me.ucrReceiverAnnualRain.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverAnnualRain.strNcFilePath = "" + Me.ucrReceiverAnnualRain.TabIndex = 2 + Me.ucrReceiverAnnualRain.ucrSelector = Nothing + ' + 'ucrSelectorDefineAnnualRain + ' + Me.ucrSelectorDefineAnnualRain.AutoSize = True + Me.ucrSelectorDefineAnnualRain.bDropUnusedFilterLevels = False + Me.ucrSelectorDefineAnnualRain.bShowHiddenColumns = False + Me.ucrSelectorDefineAnnualRain.bUseCurrentFilter = True + Me.ucrSelectorDefineAnnualRain.Location = New System.Drawing.Point(7, 8) + Me.ucrSelectorDefineAnnualRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDefineAnnualRain.Name = "ucrSelectorDefineAnnualRain" + Me.ucrSelectorDefineAnnualRain.Size = New System.Drawing.Size(151, 185) + Me.ucrSelectorDefineAnnualRain.TabIndex = 0 + ' + 'tbCropSuccessProp + ' + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingLength) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingLenghth) + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.lblProbSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.lblTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.lblCropStation) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPropSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverStationCrop) + Me.tbCropSuccessProp.Controls.Add(Me.ucrSelectorCropProp) + Me.tbCropSuccessProp.Location = New System.Drawing.Point(4, 22) + Me.tbCropSuccessProp.Name = "tbCropSuccessProp" + Me.tbCropSuccessProp.Padding = New System.Windows.Forms.Padding(3) + Me.tbCropSuccessProp.Size = New System.Drawing.Size(515, 404) + Me.tbCropSuccessProp.TabIndex = 1 + Me.tbCropSuccessProp.Text = "Crop Success Prop" + Me.tbCropSuccessProp.UseVisualStyleBackColor = True + ' + 'lblPlantingLength + ' + Me.lblPlantingLength.AutoSize = True + Me.lblPlantingLength.Location = New System.Drawing.Point(252, 137) + Me.lblPlantingLength.Name = "lblPlantingLength" + Me.lblPlantingLength.Size = New System.Drawing.Size(84, 13) + Me.lblPlantingLength.TabIndex = 7 + Me.lblPlantingLength.Text = "Planting Length:" + ' + 'ucrReceiverPlantingLenghth + ' + Me.ucrReceiverPlantingLenghth.AutoSize = True + Me.ucrReceiverPlantingLenghth.frmParent = Nothing + Me.ucrReceiverPlantingLenghth.Location = New System.Drawing.Point(250, 153) + Me.ucrReceiverPlantingLenghth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingLenghth.Name = "ucrReceiverPlantingLenghth" + Me.ucrReceiverPlantingLenghth.Selector = Nothing + Me.ucrReceiverPlantingLenghth.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverPlantingLenghth.strNcFilePath = "" + Me.ucrReceiverPlantingLenghth.TabIndex = 8 + Me.ucrReceiverPlantingLenghth.ucrSelector = Nothing + ' + 'lblPlantingDay + ' + Me.lblPlantingDay.AutoSize = True + Me.lblPlantingDay.Location = New System.Drawing.Point(245, 95) + Me.lblPlantingDay.Name = "lblPlantingDay" + Me.lblPlantingDay.Size = New System.Drawing.Size(70, 13) + Me.lblPlantingDay.TabIndex = 5 + Me.lblPlantingDay.Text = "Planting Day:" + ' + 'lblProbSuccess + ' + Me.lblProbSuccess.AutoSize = True + Me.lblProbSuccess.Location = New System.Drawing.Point(251, 176) + Me.lblProbSuccess.Name = "lblProbSuccess" + Me.lblProbSuccess.Size = New System.Drawing.Size(117, 13) + Me.lblProbSuccess.TabIndex = 9 + Me.lblProbSuccess.Text = "Proportion of Success :" + ' + 'lblTotalRain + ' + Me.lblTotalRain.AutoSize = True + Me.lblTotalRain.Location = New System.Drawing.Point(249, 54) + Me.lblTotalRain.Name = "lblTotalRain" + Me.lblTotalRain.Size = New System.Drawing.Size(59, 13) + Me.lblTotalRain.TabIndex = 3 + Me.lblTotalRain.Text = "Total Rain:" + ' + 'lblCropStation + ' + Me.lblCropStation.AutoSize = True + Me.lblCropStation.Location = New System.Drawing.Point(248, 11) + Me.lblCropStation.Name = "lblCropStation" + Me.lblCropStation.Size = New System.Drawing.Size(43, 13) + Me.lblCropStation.TabIndex = 1 + Me.lblCropStation.Text = "Station:" + ' + 'ucrReceiverPropSuccess + ' + Me.ucrReceiverPropSuccess.AutoSize = True + Me.ucrReceiverPropSuccess.frmParent = Nothing + Me.ucrReceiverPropSuccess.Location = New System.Drawing.Point(249, 194) + Me.ucrReceiverPropSuccess.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPropSuccess.Name = "ucrReceiverPropSuccess" + Me.ucrReceiverPropSuccess.Selector = Nothing + Me.ucrReceiverPropSuccess.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverPropSuccess.strNcFilePath = "" + Me.ucrReceiverPropSuccess.TabIndex = 10 + Me.ucrReceiverPropSuccess.ucrSelector = Nothing + ' + 'ucrReceiverPlantingDay + ' + Me.ucrReceiverPlantingDay.AutoSize = True + Me.ucrReceiverPlantingDay.frmParent = Nothing + Me.ucrReceiverPlantingDay.Location = New System.Drawing.Point(248, 114) + Me.ucrReceiverPlantingDay.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingDay.Name = "ucrReceiverPlantingDay" + Me.ucrReceiverPlantingDay.Selector = Nothing + Me.ucrReceiverPlantingDay.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverPlantingDay.strNcFilePath = "" + Me.ucrReceiverPlantingDay.TabIndex = 6 + Me.ucrReceiverPlantingDay.ucrSelector = Nothing + ' + 'ucrReceiverTotalRain + ' + Me.ucrReceiverTotalRain.AutoSize = True + Me.ucrReceiverTotalRain.frmParent = Nothing + Me.ucrReceiverTotalRain.Location = New System.Drawing.Point(247, 71) + Me.ucrReceiverTotalRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverTotalRain.Name = "ucrReceiverTotalRain" + Me.ucrReceiverTotalRain.Selector = Nothing + Me.ucrReceiverTotalRain.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverTotalRain.strNcFilePath = "" + Me.ucrReceiverTotalRain.TabIndex = 4 + Me.ucrReceiverTotalRain.ucrSelector = Nothing + ' + 'ucrReceiverStationCrop + ' + Me.ucrReceiverStationCrop.AutoSize = True + Me.ucrReceiverStationCrop.frmParent = Nothing + Me.ucrReceiverStationCrop.Location = New System.Drawing.Point(246, 28) + Me.ucrReceiverStationCrop.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStationCrop.Name = "ucrReceiverStationCrop" + Me.ucrReceiverStationCrop.Selector = Nothing + Me.ucrReceiverStationCrop.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverStationCrop.strNcFilePath = "" + Me.ucrReceiverStationCrop.TabIndex = 2 + Me.ucrReceiverStationCrop.ucrSelector = Nothing + ' + 'ucrSelectorCropProp + ' + Me.ucrSelectorCropProp.AutoSize = True + Me.ucrSelectorCropProp.bDropUnusedFilterLevels = False + Me.ucrSelectorCropProp.bShowHiddenColumns = False + Me.ucrSelectorCropProp.bUseCurrentFilter = True + Me.ucrSelectorCropProp.Location = New System.Drawing.Point(11, 8) + Me.ucrSelectorCropProp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCropProp.Name = "ucrSelectorCropProp" + Me.ucrSelectorCropProp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelectorCropProp.TabIndex = 0 + ' + 'tbSeasonStartProb + ' + Me.tbSeasonStartProb.Controls.Add(Me.lblPlantingDayCond) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverPlantingDayCondition) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.lblStationSeasonProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonStationProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrSelectorSeasonStartProp) + Me.tbSeasonStartProb.Location = New System.Drawing.Point(4, 22) + Me.tbSeasonStartProb.Name = "tbSeasonStartProb" + Me.tbSeasonStartProb.Padding = New System.Windows.Forms.Padding(3) + Me.tbSeasonStartProb.Size = New System.Drawing.Size(515, 404) + Me.tbSeasonStartProb.TabIndex = 2 + Me.tbSeasonStartProb.Text = "Season Start Prob" + Me.tbSeasonStartProb.UseVisualStyleBackColor = True + ' + 'lblSeasonYear + ' + Me.lblSeasonYear.AutoSize = True + Me.lblSeasonYear.Location = New System.Drawing.Point(251, 56) + Me.lblSeasonYear.Name = "lblSeasonYear" + Me.lblSeasonYear.Size = New System.Drawing.Size(32, 13) + Me.lblSeasonYear.TabIndex = 3 + Me.lblSeasonYear.Text = "Year:" + ' + 'lblStationSeasonProb + ' + Me.lblStationSeasonProb.AutoSize = True + Me.lblStationSeasonProb.Location = New System.Drawing.Point(250, 13) + Me.lblStationSeasonProb.Name = "lblStationSeasonProb" + Me.lblStationSeasonProb.Size = New System.Drawing.Size(43, 13) + Me.lblStationSeasonProb.TabIndex = 1 + Me.lblStationSeasonProb.Text = "Station:" + ' + 'ucrReceiverSeasonPlantingDay + ' + Me.ucrReceiverSeasonPlantingDay.AutoSize = True + Me.ucrReceiverSeasonPlantingDay.frmParent = Nothing + Me.ucrReceiverSeasonPlantingDay.Location = New System.Drawing.Point(250, 116) + Me.ucrReceiverSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonPlantingDay.Name = "ucrReceiverSeasonPlantingDay" + Me.ucrReceiverSeasonPlantingDay.Selector = Nothing + Me.ucrReceiverSeasonPlantingDay.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonPlantingDay.strNcFilePath = "" + Me.ucrReceiverSeasonPlantingDay.TabIndex = 6 + Me.ucrReceiverSeasonPlantingDay.ucrSelector = Nothing + ' + 'ucrReceiverSeasonYear + ' + Me.ucrReceiverSeasonYear.AutoSize = True + Me.ucrReceiverSeasonYear.frmParent = Nothing + Me.ucrReceiverSeasonYear.Location = New System.Drawing.Point(249, 73) + Me.ucrReceiverSeasonYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonYear.Name = "ucrReceiverSeasonYear" + Me.ucrReceiverSeasonYear.Selector = Nothing + Me.ucrReceiverSeasonYear.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonYear.strNcFilePath = "" + Me.ucrReceiverSeasonYear.TabIndex = 4 + Me.ucrReceiverSeasonYear.ucrSelector = Nothing + ' + 'ucrReceiverSeasonStationProb + ' + Me.ucrReceiverSeasonStationProb.AutoSize = True + Me.ucrReceiverSeasonStationProb.frmParent = Nothing + Me.ucrReceiverSeasonStationProb.Location = New System.Drawing.Point(248, 30) + Me.ucrReceiverSeasonStationProb.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonStationProb.Name = "ucrReceiverSeasonStationProb" + Me.ucrReceiverSeasonStationProb.Selector = Nothing + Me.ucrReceiverSeasonStationProb.Size = New System.Drawing.Size(120, 25) + Me.ucrReceiverSeasonStationProb.strNcFilePath = "" + Me.ucrReceiverSeasonStationProb.TabIndex = 2 + Me.ucrReceiverSeasonStationProb.ucrSelector = Nothing + ' + 'ucrSelectorSeasonStartProp + ' + Me.ucrSelectorSeasonStartProp.AutoSize = True + Me.ucrSelectorSeasonStartProp.bDropUnusedFilterLevels = False + Me.ucrSelectorSeasonStartProp.bShowHiddenColumns = False + Me.ucrSelectorSeasonStartProp.bUseCurrentFilter = True + Me.ucrSelectorSeasonStartProp.Location = New System.Drawing.Point(13, 10) + Me.ucrSelectorSeasonStartProp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorSeasonStartProp.Name = "ucrSelectorSeasonStartProp" + Me.ucrSelectorSeasonStartProp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelectorSeasonStartProp.TabIndex = 0 + ' + 'sdgDefineAnnualRainfall + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(547, 503) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.tbSummaries) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "sdgDefineAnnualRainfall" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Define Elements" + Me.tbAnnualTempSummaries.ResumeLayout(False) + Me.tbAnnualTempSummaries.PerformLayout() + Me.tbMonthlyTemp.ResumeLayout(False) + Me.tbMonthlyTemp.PerformLayout() + Me.tbSummaries.ResumeLayout(False) + Me.tbAnnualRainfall.ResumeLayout(False) + Me.tbAnnualRainfall.PerformLayout() + Me.tbCropSuccessProp.ResumeLayout(False) + Me.tbCropSuccessProp.PerformLayout() + Me.tbSeasonStartProb.ResumeLayout(False) + Me.tbSeasonStartProb.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrReceiverPlantingDayCondition As ucrReceiverSingle + Friend WithEvents lblMinMinAnnual As Label + Friend WithEvents ucrReceiverMinMinAnnual As ucrReceiverSingle + Friend WithEvents lblMeanAnnualTemp As Label + Friend WithEvents lblMaxMinAnnual As Label + Friend WithEvents lblAnnualTempYear As Label + Friend WithEvents lblAnnualTempStation As Label + Friend WithEvents lblMaxMaxAnnual As Label + Friend WithEvents ucrSelecetorMonthlyTemp As ucrSelectorByDataFrame + Friend WithEvents lblMinMaxAnnual As Label + Friend WithEvents lblMeanMaxAnnual As Label + Friend WithEvents ucrReceiverMaxMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMinAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualTempYr As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualTempStation As ucrReceiverSingle + Friend WithEvents tbAnnualTempSummaries As TabPage + Friend WithEvents ucrSelectorAnnualTemp As ucrSelectorByDataFrame + Friend WithEvents lblPlantingDayCond As Label + Friend WithEvents tbMonthlyTemp As TabPage + Friend WithEvents lblMonth As Label + Friend WithEvents ucrReceiverMonthMonthly As ucrReceiverSingle + Friend WithEvents lblMinMInMonthly As Label + Friend WithEvents ucrReceiverMinMinMonthly As ucrReceiverSingle + Friend WithEvents lblMeanMinMonthly As Label + Friend WithEvents lblMaxMinMonthly As Label + Friend WithEvents lblYearMonthTemp As Label + Friend WithEvents lblStationMonthTemp As Label + Friend WithEvents lblMaxMaxMonthly As Label + Friend WithEvents lblMinMaxMonthly As Label + Friend WithEvents lblMeanMaxMonthly As Label + Friend WithEvents ucrReceiverMaxMaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanmaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMinMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanminMontly As ucrReceiverSingle + Friend WithEvents ucrReceiverYearMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMonthlyTemp As ucrReceiverSingle + Friend WithEvents ucrBase As ucrButtonsSubdialogue + Friend WithEvents lblSeasonPlantingDay As Label + Friend WithEvents lblRainyDaysYear As Label + Friend WithEvents ucrReceiverRainDaysYear As ucrReceiverSingle + Friend WithEvents lblNoRainDaysSeason As Label + Friend WithEvents lblSeasonalLength As Label + Friend WithEvents lblSeasonalRain As Label + Friend WithEvents lblAnnualRain As Label + Friend WithEvents lblEndSeasonDate As Label + Friend WithEvents lblEndSeasonDOY As Label + Friend WithEvents lblEndRainDate As Label + Friend WithEvents lblEndRainsDOY As Label + Friend WithEvents lblStartRainDate As Label + Friend WithEvents lblStartRainDOY As Label + Friend WithEvents lblYear As Label + Friend WithEvents lblStation As Label + Friend WithEvents ucrReceiverStartRainDate As ucrReceiverSingle + Friend WithEvents ucrReceiverStartRainDOY As ucrReceiverSingle + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents ucrReceiverEndSeasonDate As ucrReceiverSingle + Friend WithEvents ucrReceiverEndSeasonDOY As ucrReceiverSingle + Friend WithEvents ucrReceiverEndRainsDOY As ucrReceiverSingle + Friend WithEvents tbSummaries As TabControl + Friend WithEvents tbAnnualRainfall As TabPage + Friend WithEvents ucrReceiverEndRainsDate As ucrReceiverSingle + Friend WithEvents ucrReceiverSeasonalLength As ucrReceiverSingle + Friend WithEvents ucrReceiverRainDaysSeason As ucrReceiverSingle + Friend WithEvents ucrReceiverSeasonalRain As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualRain As ucrReceiverSingle + Friend WithEvents ucrSelectorDefineAnnualRain As ucrSelectorByDataFrame + Friend WithEvents tbCropSuccessProp As TabPage + Friend WithEvents lblPlantingLength As Label + Friend WithEvents ucrReceiverPlantingLenghth As ucrReceiverSingle + Friend WithEvents lblPlantingDay As Label + Friend WithEvents lblProbSuccess As Label + Friend WithEvents lblTotalRain As Label + Friend WithEvents lblCropStation As Label + Friend WithEvents ucrReceiverPropSuccess As ucrReceiverSingle + Friend WithEvents ucrReceiverPlantingDay As ucrReceiverSingle + Friend WithEvents ucrReceiverTotalRain As ucrReceiverSingle + Friend WithEvents ucrReceiverStationCrop As ucrReceiverSingle + Friend WithEvents ucrSelectorCropProp As ucrSelectorByDataFrame + Friend WithEvents tbSeasonStartProb As TabPage + Friend WithEvents lblSeasonYear As Label + Friend WithEvents lblStationSeasonProb As Label + Friend WithEvents ucrReceiverSeasonPlantingDay As ucrReceiverSingle + Friend WithEvents ucrReceiverSeasonYear As ucrReceiverSingle + Friend WithEvents ucrReceiverSeasonStationProb As ucrReceiverSingle + Friend WithEvents ucrSelectorSeasonStartProp As ucrSelectorByDataFrame +End Class diff --git a/instat/sdgDefineAnnualRainfall.resx b/instat/sdgDefineAnnualRainfall.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgDefineAnnualRainfall.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgDefineAnnualRainfall.vb b/instat/sdgDefineAnnualRainfall.vb new file mode 100644 index 00000000000..f5b9c623b36 --- /dev/null +++ b/instat/sdgDefineAnnualRainfall.vb @@ -0,0 +1,319 @@ +'R-Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . + +Imports instat.Translations +Public Class sdgDefineAnnualRainfall + + Public clsReforMattAnnualSummariesFunction, clsExportRinstatToBucketFunction, clsReformatCropSuccessFunction, clsReformatSeasonStartFunction, clsReformatTempSummariesFunction, clsReformatMonthlyTempSummaries As New RFunction + Public clsRsyntax As New RSyntax + Public bControlsInitialised As Boolean = False + + Private Sub sdgDefineAnnualRainfall_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub + + Public Sub InitialiseControls() + ucrSelectorDefineAnnualRain.SetParameter(New RParameter("data", 0)) + ucrSelectorDefineAnnualRain.SetParameterIsrfunction() + + ucrSelectorAnnualTemp.SetParameter(New RParameter("data", 0)) + ucrSelectorAnnualTemp.SetParameterIsrfunction() + + ucrSelectorCropProp.SetParameter(New RParameter("data", 0)) + ucrSelectorCropProp.SetParameterIsrfunction() + + ucrSelectorSeasonStartProp.SetParameter(New RParameter("data", 0)) + ucrSelectorSeasonStartProp.SetParameterIsrfunction() + + ucrSelecetorMonthlyTemp.SetParameter(New RParameter("data", 0)) + ucrSelecetorMonthlyTemp.SetParameterIsrfunction() + + ucrReceiverStation.SetParameter(New RParameter("station_col", 1)) + ucrReceiverStation.Selector = ucrSelectorDefineAnnualRain + ucrReceiverStation.SetParameterIsString() + + ucrReceiverYear.SetParameter(New RParameter("year_col", 2)) + ucrReceiverYear.Selector = ucrSelectorDefineAnnualRain + ucrReceiverYear.SetParameterIsString() + + ucrReceiverStartRainDOY.SetParameter(New RParameter("start_rains_doy_col", 3)) + ucrReceiverStartRainDOY.Selector = ucrSelectorDefineAnnualRain + ucrReceiverStartRainDOY.SetParameterIsString() + + ucrReceiverStartRainDate.SetParameter(New RParameter("start_rains_date_col", 4)) + ucrReceiverStartRainDate.Selector = ucrSelectorDefineAnnualRain + ucrReceiverStartRainDate.SetParameterIsString() + + ucrReceiverEndRainsDOY.SetParameter(New RParameter("end_rains_doy_col", 5)) + ucrReceiverEndRainsDOY.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndRainsDOY.SetParameterIsString() + + ucrReceiverEndRainsDate.SetParameter(New RParameter("end_rains_date_col", 6)) + ucrReceiverEndRainsDate.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndRainsDate.SetParameterIsString() + + ucrReceiverEndSeasonDOY.SetParameter(New RParameter("end_season_doy_col", 7)) + ucrReceiverEndSeasonDOY.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndSeasonDOY.SetParameterIsString() + + ucrReceiverEndSeasonDate.SetParameter(New RParameter("end_season_date_col", 8)) + ucrReceiverEndSeasonDate.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndSeasonDate.SetParameterIsString() + + ucrReceiverSeasonalRain.SetParameter(New RParameter("seasonal_rain_col", 9)) + ucrReceiverSeasonalRain.Selector = ucrSelectorDefineAnnualRain + ucrReceiverSeasonalRain.SetParameterIsString() + + ucrReceiverRainDaysSeason.SetParameter(New RParameter("n_seasonal_rain_col", 10)) + ucrReceiverRainDaysSeason.Selector = ucrSelectorDefineAnnualRain + ucrReceiverRainDaysSeason.SetParameterIsString() + + ucrReceiverRainDaysYear.SetParameter(New RParameter("n_rain_col", 11)) + ucrReceiverRainDaysYear.Selector = ucrSelectorDefineAnnualRain + ucrReceiverRainDaysYear.SetParameterIsString() + + ucrReceiverSeasonalLength.SetParameter(New RParameter("season_length_col", 12)) + ucrReceiverSeasonalLength.Selector = ucrSelectorDefineAnnualRain + ucrReceiverSeasonalLength.SetParameterIsString() + + ucrReceiverAnnualRain.SetParameter(New RParameter("annual_rain_col", 13)) + ucrReceiverAnnualRain.Selector = ucrSelectorDefineAnnualRain + ucrReceiverAnnualRain.SetParameterIsString() + + ucrReceiverStationCrop.SetParameter(New RParameter("station_col", 1)) + ucrReceiverStationCrop.Selector = ucrSelectorCropProp + ucrReceiverStationCrop.SetParameterIsString() + + ucrReceiverTotalRain.SetParameter(New RParameter("total_rain_col", 2)) + ucrReceiverTotalRain.Selector = ucrSelectorCropProp + ucrReceiverTotalRain.SetParameterIsString() + + ucrReceiverPlantingDay.SetParameter(New RParameter("plant_day_col", 3)) + ucrReceiverPlantingDay.Selector = ucrSelectorCropProp + ucrReceiverPlantingDay.SetParameterIsString() + + ucrReceiverPlantingLenghth.SetParameter(New RParameter("plant_length_col", 4)) + ucrReceiverPlantingLenghth.Selector = ucrSelectorCropProp + ucrReceiverPlantingLenghth.SetParameterIsString() + + ucrReceiverPropSuccess.SetParameter(New RParameter("prop_success_col", 5)) + ucrReceiverPropSuccess.Selector = ucrSelectorCropProp + ucrReceiverPropSuccess.SetParameterIsString() + + 'Season start + ucrReceiverSeasonStationProb.SetParameter(New RParameter("station_col", 1)) + ucrReceiverSeasonStationProb.Selector = ucrSelectorSeasonStartProp + ucrReceiverSeasonStationProb.SetParameterIsString() + + ucrReceiverSeasonYear.SetParameter(New RParameter("year_col", 2)) + ucrReceiverSeasonYear.Selector = ucrSelectorSeasonStartProp + ucrReceiverSeasonYear.SetParameterIsString() + + + ucrReceiverSeasonPlantingDay.SetParameter(New RParameter("plant_day_col", 3)) + ucrReceiverSeasonPlantingDay.Selector = ucrSelectorSeasonStartProp + ucrReceiverSeasonPlantingDay.SetParameterIsString() + + + ucrReceiverPlantingDayCondition.SetParameter(New RParameter("plant_day_cond_col", 5)) + ucrReceiverPlantingDayCondition.Selector = ucrSelectorSeasonStartProp + ucrReceiverPlantingDayCondition.SetParameterIsString() + + 'Annual Temp + ucrReceiverAnnualTempStation.SetParameter(New RParameter("station_col", 1)) + ucrReceiverAnnualTempStation.Selector = ucrSelectorAnnualTemp + ucrReceiverAnnualTempStation.SetParameterIsString() + + ucrReceiverAnnualTempYr.SetParameter(New RParameter("year_col", 2)) + ucrReceiverAnnualTempYr.Selector = ucrSelectorAnnualTemp + ucrReceiverAnnualTempYr.SetParameterIsString() + + ucrReceiverMeanAnnual.SetParameter(New RParameter("mean_tmin_col", 3)) + ucrReceiverMeanAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMeanAnnual.SetParameterIsString() + + ucrReceiverMinMinAnnual.SetParameter(New RParameter("min_tmin_col", 4)) + ucrReceiverMinMinAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMinMinAnnual.SetParameterIsString() + + ucrReceiverMaxMinAnnual.SetParameter(New RParameter("max_tmin_col", 5)) + ucrReceiverMaxMinAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMaxMinAnnual.SetParameterIsString() + + ucrReceiverMeanMaxAnnual.SetParameter(New RParameter("mean_tmax_col", 6)) + ucrReceiverMeanMaxAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMeanMaxAnnual.SetParameterIsString() + + ucrReceiverMinMaxAnnual.SetParameter(New RParameter("min_tmax_col", 7)) + ucrReceiverMinMaxAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMinMaxAnnual.SetParameterIsString() + + ucrReceiverMaxMaxAnnual.SetParameter(New RParameter("max_tmax_col", 8)) + ucrReceiverMaxMaxAnnual.Selector = ucrSelectorAnnualTemp + ucrReceiverMaxMaxAnnual.SetParameterIsString() + + 'Monthly Temp + ucrReceiverMonthlyTemp.SetParameter(New RParameter("station_col", 1)) + ucrReceiverMonthlyTemp.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMonthlyTemp.SetParameterIsString() + + ucrReceiverYearMonthly.SetParameter(New RParameter("year_col", 2)) + ucrReceiverYearMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverYearMonthly.SetParameterIsString() + + ucrReceiverMonthMonthly.SetParameter(New RParameter("month_col", 3)) + ucrReceiverMonthMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMonthMonthly.SetParameterIsString() + + + ucrReceiverMeanminMontly.SetParameter(New RParameter("mean_tmin_col", 4)) + ucrReceiverMeanminMontly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMeanminMontly.SetParameterIsString() + + ucrReceiverMinMinMonthly.SetParameter(New RParameter("min_tmin_col", 5)) + ucrReceiverMinMinMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMinMinMonthly.SetParameterIsString() + + ucrReceiverMaxMinMonthly.SetParameter(New RParameter("max_tmin_col", 6)) + ucrReceiverMaxMinMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMaxMinMonthly.SetParameterIsString() + + ucrReceiverMeanmaxMonthly.SetParameter(New RParameter("mean_tmax_col", 7)) + ucrReceiverMeanmaxMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMeanmaxMonthly.SetParameterIsString() + + ucrReceiverMinMaxMonthly.SetParameter(New RParameter("min_tmax_col", 8)) + ucrReceiverMinMaxMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMinMaxMonthly.SetParameterIsString() + + ucrReceiverMaxMaxMonthly.SetParameter(New RParameter("max_tmax_col", 9)) + ucrReceiverMaxMaxMonthly.Selector = ucrSelecetorMonthlyTemp + ucrReceiverMaxMaxMonthly.SetParameterIsString() + + End Sub + Public Sub SetRCode(clsNewReforMattAnnualSummaries As RFunction, clsNewExportRinstatToBucketFunction As RFunction, clsNewReformatCropSuccessFunction As RFunction, clsNewReformatMonthlyTempSummaries As RFunction, clsNewReformatSeasonStartFunction As RFunction, clsNewReformatTempSummariesFunction As RFunction, Optional bReset As Boolean = False) + If Not bControlsInitialised Then + InitialiseControls() + End If + + clsReforMattAnnualSummariesFunction = clsNewReforMattAnnualSummaries + clsReformatCropSuccessFunction = clsNewReformatCropSuccessFunction + clsReformatMonthlyTempSummaries = clsNewReformatMonthlyTempSummaries + clsReformatSeasonStartFunction = clsNewReformatSeasonStartFunction + clsReformatTempSummariesFunction = clsNewReformatTempSummariesFunction + clsExportRinstatToBucketFunction = clsNewExportRinstatToBucketFunction + + ucrReceiverAnnualRain.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverEndRainsDate.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverEndRainsDOY.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverEndSeasonDate.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverEndSeasonDOY.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverRainDaysSeason.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverRainDaysYear.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverSeasonalLength.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverSeasonalRain.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverStartRainDate.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverStartRainDOY.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverStation.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverYear.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrSelectorDefineAnnualRain.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + + ucrReceiverStationCrop.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrReceiverTotalRain.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrReceiverPlantingDay.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrReceiverPlantingLenghth.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrReceiverPropSuccess.SetRCode(clsReformatCropSuccessFunction, bReset) + ucrSelectorCropProp.SetRCode(clsReformatCropSuccessFunction, bReset) + + ucrReceiverSeasonStationProb.SetRCode(clsReformatSeasonStartFunction, bReset) + ucrReceiverSeasonYear.SetRCode(clsReformatSeasonStartFunction, bReset) + ucrReceiverSeasonPlantingDay.SetRCode(clsReformatSeasonStartFunction, bReset) + ucrReceiverPlantingDayCondition.SetRCode(clsReformatSeasonStartFunction, bReset) + ucrSelectorSeasonStartProp.SetRCode(clsReformatSeasonStartFunction, bReset) + + ucrReceiverAnnualTempStation.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverAnnualTempYr.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMeanAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMinMaxAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMaxMinAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMaxMaxAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMinMinAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrReceiverMeanMaxAnnual.SetRCode(clsReformatTempSummariesFunction, bReset) + ucrSelectorAnnualTemp.SetRCode(clsReformatTempSummariesFunction, bReset) + + ucrReceiverMonthlyTemp.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverYearMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMonthMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMeanmaxMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMinMaxMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMaxMinMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMaxMaxMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMinMinMonthly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrReceiverMeanminMontly.SetRCode(clsReformatMonthlyTempSummaries, bReset) + ucrSelecetorMonthlyTemp.SetRCode(clsReformatMonthlyTempSummaries, bReset) + End Sub + + Private Sub ucrReceiverAnnualRain_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAnnualRain.ControlValueChanged, ucrReceiverEndRainsDate.ControlValueChanged, ucrReceiverEndRainsDOY.ControlValueChanged, ucrReceiverEndSeasonDate.ControlValueChanged, + ucrReceiverEndSeasonDOY.ControlValueChanged, ucrReceiverRainDaysSeason.ControlValueChanged, ucrReceiverRainDaysYear.ControlValueChanged, ucrReceiverSeasonalLength.ControlValueChanged, ucrReceiverSeasonalRain.ControlValueChanged, + ucrReceiverStartRainDate.ControlValueChanged, ucrReceiverStartRainDOY.ControlValueChanged, ucrReceiverStation.ControlValueChanged, ucrReceiverYear.ControlValueChanged + + If Not (ucrReceiverAnnualRain.IsEmpty AndAlso ucrReceiverEndRainsDate.IsEmpty AndAlso ucrReceiverEndRainsDOY.IsEmpty AndAlso ucrReceiverSeasonalLength.IsEmpty AndAlso ucrReceiverSeasonalRain.IsEmpty AndAlso + ucrReceiverEndSeasonDate.IsEmpty AndAlso ucrReceiverEndSeasonDOY.IsEmpty AndAlso ucrReceiverRainDaysSeason.IsEmpty AndAlso ucrReceiverRainDaysYear.IsEmpty AndAlso ucrReceiverStartRainDate.IsEmpty AndAlso + ucrReceiverStartRainDOY.IsEmpty AndAlso ucrReceiverStation.IsEmpty AndAlso ucrReceiverYear.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("annual_rainfall_data", clsRFunctionParameter:=clsReforMattAnnualSummariesFunction, iPosition:=1) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("annual_rainfall_data") + End If + End Sub + + Private Sub ucrReceiverStationCrop_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStationCrop.ControlValueChanged, ucrReceiverTotalRain.ControlValueChanged, ucrReceiverPlantingDay.ControlValueChanged, ucrReceiverPlantingLenghth.ControlValueChanged, + ucrReceiverPropSuccess.ControlValueChanged + + If Not (ucrReceiverStationCrop.IsEmpty AndAlso ucrReceiverTotalRain.IsEmpty AndAlso ucrReceiverPlantingDay.IsEmpty AndAlso ucrReceiverPlantingLenghth.IsEmpty AndAlso ucrReceiverPropSuccess.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("crop_success_data", clsRFunctionParameter:=clsReformatCropSuccessFunction, iPosition:=2) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("crop_success_data") + End If + End Sub + + Private Sub ucrReceiverSeasonStationProb_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSeasonStationProb.ControlValueChanged, ucrReceiverSeasonPlantingDay.ControlValueChanged, ucrReceiverPlantingDayCondition.ControlValueChanged, ucrReceiverSeasonYear.ControlValueChanged + + If Not (ucrReceiverSeasonStationProb.IsEmpty AndAlso ucrReceiverSeasonPlantingDay.IsEmpty AndAlso ucrReceiverPlantingDayCondition.IsEmpty AndAlso ucrReceiverSeasonYear.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("season_start_data", clsRFunctionParameter:=clsReformatSeasonStartFunction, iPosition:=3) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("season_start_data") + End If + End Sub + + Private Sub ucrReceiverAnnualTempStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAnnualTempStation.ControlValueChanged, ucrReceiverAnnualTempYr.ControlValueChanged, ucrReceiverMaxMaxAnnual.ControlValueChanged, ucrReceiverMaxMinAnnual.ControlValueChanged, ucrReceiverMeanAnnual.ControlValueChanged, ucrReceiverMeanMaxAnnual.ControlValueChanged, ucrReceiverMinMaxAnnual.ControlValueChanged, ucrReceiverMinMinAnnual.ControlValueChanged + If Not (ucrReceiverAnnualTempStation.IsEmpty AndAlso ucrReceiverAnnualTempYr.IsEmpty AndAlso ucrReceiverMaxMaxAnnual.IsEmpty AndAlso + ucrReceiverMaxMinAnnual.IsEmpty AndAlso ucrReceiverMeanAnnual.IsEmpty AndAlso ucrReceiverMeanMaxAnnual.IsEmpty AndAlso ucrReceiverMinMaxAnnual.IsEmpty AndAlso ucrReceiverMinMinAnnual.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("annual_temperature_data", clsRFunctionParameter:=clsReformatTempSummariesFunction, iPosition:=4) + Else + + clsExportRinstatToBucketFunction.RemoveParameterByName("annual_temperature_data") + End If + End Sub + + Private Sub ucrReceiverMonthlyTemp_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthlyTemp.ControlValueChanged, ucrReceiverYearMonthly.ControlValueChanged, ucrReceiverMonthMonthly.ControlValueChanged, ucrReceiverMeanmaxMonthly.ControlValueChanged, ucrReceiverMeanminMontly.ControlValueChanged, ucrReceiverMinMaxMonthly.ControlValueChanged, ucrReceiverMinMinMonthly.ControlValueChanged, ucrReceiverMaxMinMonthly.ControlValueChanged, ucrReceiverMaxMaxMonthly.ControlValueChanged + If Not (ucrReceiverMonthlyTemp.IsEmpty AndAlso ucrReceiverYearMonthly.IsEmpty AndAlso ucrReceiverMonthMonthly.IsEmpty AndAlso ucrReceiverMeanmaxMonthly.IsEmpty AndAlso ucrReceiverMeanminMontly.IsEmpty AndAlso ucrReceiverMinMaxMonthly.IsEmpty AndAlso ucrReceiverMinMinMonthly.IsEmpty AndAlso ucrReceiverMaxMinMonthly.IsEmpty AndAlso ucrReceiverMaxMaxMonthly.IsEmpty) Then + clsExportRinstatToBucketFunction.AddParameter("monthly_temperature_data", clsRFunctionParameter:=clsReformatMonthlyTempSummaries, iPosition:=5) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("monthly_temperature_data") + End If + End Sub + +End Class \ No newline at end of file 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/static/Help/R-Instat.chm b/instat/static/Help/R-Instat.chm index 30d29a7fd41..24fca5f21b7 100644 Binary files a/instat/static/Help/R-Instat.chm and b/instat/static/Help/R-Instat.chm differ diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index a81b21fa1db..bd9af123a80 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -670,7 +670,7 @@ DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, if(require_correct_length) stop("Length of new column must be divisible by the length of the data frame") else curr_col <- rep(curr_col, length.out = self$get_data_frame_length()) } - if(use_col_name_as_prefix) curr_col_name = self$get_next_default_column_name(col_name) + if(use_col_name_as_prefix) curr_col_name = self$get_next_default_column_name(col_name[i]) else curr_col_name = col_name[[i]] curr_col_name <- make.names(iconv(curr_col_name, to = "ASCII//TRANSLIT", sub = ".")) new_col_names <- c(new_col_names, curr_col_name) diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 7ec022bba69..8cfa1d7f5a3 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 06205839228..5c2087b6d34 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -86,6 +86,7 @@ Partial Class ucrCalculator Me.cmdMdy = New System.Windows.Forms.Button() Me.cmdYmd = New System.Windows.Forms.Button() Me.cmdLeap = New System.Windows.Forms.Button() + Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripDate = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateLubridateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateHmsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -106,7 +107,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() @@ -123,6 +124,7 @@ Partial Class ucrCalculator Me.cmdGCD = New System.Windows.Forms.Button() Me.cmdGeneratePrimes = New System.Windows.Forms.Button() Me.cmdNthPrime = New System.Windows.Forms.Button() + Me.cmdIntegerRHelp = New instat.ucrSplitButton() Me.ContextMenuStripInteger = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GmpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DescToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -145,6 +147,7 @@ Partial Class ucrCalculator Me.cmdIsPrime = New System.Windows.Forms.Button() Me.cmdBigZ = New System.Windows.Forms.Button() Me.grpFactor = New System.Windows.Forms.GroupBox() + Me.cmdTransformHelp = New instat.ucrSplitButton() Me.ContextMenuStripFactor = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FactorForcatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdShuffle = New System.Windows.Forms.Button() @@ -168,6 +171,7 @@ Partial Class ucrCalculator Me.cmdFactor = New System.Windows.Forms.Button() Me.cmdAnon = New System.Windows.Forms.Button() Me.grpHydroGOF = New System.Windows.Forms.GroupBox() + Me.cmdHydroHelp = New instat.ucrSplitButton() Me.ContextMenuStripHydroGOF = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.HydroGOFToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdVE = New System.Windows.Forms.Button() @@ -221,7 +225,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() @@ -248,6 +252,7 @@ Partial Class ucrCalculator Me.cmdGroup = New System.Windows.Forms.Button() Me.cmdGrade = New System.Windows.Forms.Button() Me.grpMaths = New System.Windows.Forms.GroupBox() + Me.cmdMathsHelp = New instat.ucrSplitButton() Me.ContextMenuStripMaths = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MathsBaseStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MathsStatsStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -281,6 +286,7 @@ Partial Class ucrCalculator Me.cmdwhichmax = New System.Windows.Forms.Button() Me.cmdwheremax = New System.Windows.Forms.Button() Me.cmdwhichmin = New System.Windows.Forms.Button() + Me.cmdSummaryRHelp = New instat.ucrSplitButton() Me.ContextMenuStripSummary = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.StatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -309,7 +315,6 @@ Partial Class ucrCalculator Me.cmdRange = New System.Windows.Forms.Button() Me.cmdSd = New System.Windows.Forms.Button() Me.cmdMedian = New System.Windows.Forms.Button() - Me.cmdMin = New System.Windows.Forms.Button() Me.cmdMax = New System.Windows.Forms.Button() Me.cmdMean = New System.Windows.Forms.Button() Me.cmdMiss = New System.Windows.Forms.Button() @@ -332,8 +337,9 @@ Partial Class ucrCalculator Me.cmdFreqMin = New System.Windows.Forms.Button() Me.cmdFreqSum = New System.Windows.Forms.Button() Me.cmdFreqLength = New System.Windows.Forms.Button() + Me.cmdMin = New System.Windows.Forms.Button() Me.grpProbabilty = New System.Windows.Forms.GroupBox() - Me.cmdPascal = New System.Windows.Forms.Button() + Me.cmdProbRHelp = New instat.ucrSplitButton() Me.ContextMenuStripProbability = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ProbStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ProbBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -379,9 +385,8 @@ Partial Class ucrCalculator Me.cmdBeta = New System.Windows.Forms.Button() Me.cmdDigamma = New System.Windows.Forms.Button() Me.grpTransform = New System.Windows.Forms.GroupBox() - Me.cmdDecimals = New System.Windows.Forms.Button() - Me.cmdMASSFractions = New System.Windows.Forms.Button() Me.cmdScale = New System.Windows.Forms.Button() + Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -413,13 +418,14 @@ Partial Class ucrCalculator Me.cmdCumMax = New System.Windows.Forms.Button() Me.cmdPMin = New System.Windows.Forms.Button() Me.cmdPMax = New System.Windows.Forms.Button() - Me.cmdLead = New System.Windows.Forms.Button() Me.cmdLag = New System.Windows.Forms.Button() + Me.cmdLead = New System.Windows.Forms.Button() Me.grpLogical = New System.Windows.Forms.GroupBox() Me.cmdnumeric = New System.Windows.Forms.Button() Me.cmdCalcRepelicationFunction = New System.Windows.Forms.Button() Me.cmdCalcSequenceFunction = New System.Windows.Forms.Button() Me.cmdCalcConcantenateFunction = New System.Windows.Forms.Button() + Me.cmdLogicalHelp = New instat.ucrSplitButton() Me.ContextMenuStripLogical = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.LogBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LogDplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -483,6 +489,7 @@ Partial Class ucrCalculator Me.cmdSquishb = New System.Windows.Forms.Button() Me.ttCalculator = New System.Windows.Forms.ToolTip(Me.components) Me.grpCircular = New System.Windows.Forms.GroupBox() + Me.cmdCircularHelp = New instat.ucrSplitButton() Me.ContextMenuStripCircular = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CircularToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdCircular = New System.Windows.Forms.Button() @@ -528,6 +535,7 @@ Partial Class ucrCalculator Me.cmdComplexAcos = New System.Windows.Forms.Button() Me.cmdAsComplex = New System.Windows.Forms.Button() Me.cmdComplexi = New System.Windows.Forms.Button() + Me.cmdComplexRHelp = New instat.ucrSplitButton() Me.cmdComplexTanH = New System.Windows.Forms.Button() Me.cmdComplexTan = New System.Windows.Forms.Button() Me.cmdComplexPi = New System.Windows.Forms.Button() @@ -558,22 +566,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 +602,27 @@ 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.ContextMenuStripFunctions = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.MASSFunctionsToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.PolynomToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.StatsToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.UtilsToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.cmdRhelpList = New instat.ucrSplitButton() Me.cmdWakefieldHelp = New instat.ucrSplitButton() Me.cmdStringRHelp = New instat.ucrSplitButton() @@ -618,17 +631,36 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() - Me.cmdLogicalHelp = New instat.ucrSplitButton() - Me.cmdRHelp = New instat.ucrSplitButton() - Me.cmdHydroHelp = New instat.ucrSplitButton() - Me.cmdTransformHelp = New instat.ucrSplitButton() - Me.cmdCircularHelp = New instat.ucrSplitButton() - Me.cmdMathsHelp = New instat.ucrSplitButton() - Me.cmdProbRHelp = New instat.ucrSplitButton() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() - Me.cmdComplexRHelp = New instat.ucrSplitButton() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() - Me.cmdTransformRHelp = New instat.ucrSplitButton() + Me.grpFunctions = New System.Windows.Forms.GroupBox() + Me.cmdDigitsumSession = New System.Windows.Forms.Button() + Me.cmdDigitsquSession = New System.Windows.Forms.Button() + Me.cmdFunctionsDigitsum = New System.Windows.Forms.Button() + Me.cmdDigitsqu = New System.Windows.Forms.Button() + Me.cmdDecimalsSession = New System.Windows.Forms.Button() + Me.cmdMASSFractionsSession = New System.Windows.Forms.Button() + Me.cmdPascalSession = New System.Windows.Forms.Button() + Me.cmdRhelpFunctions = New instat.ucrSplitButton() + Me.cmdDecimals = New System.Windows.Forms.Button() + Me.cmdMASSFractions = New System.Windows.Forms.Button() + Me.cmdPascal = New System.Windows.Forms.Button() + Me.cmdDigitssq = New System.Windows.Forms.Button() + Me.cmddigitssqSession = New System.Windows.Forms.Button() + Me.cmdCssqSession = New System.Windows.Forms.Button() + Me.cmdAveBoth = New System.Windows.Forms.Button() + Me.cmdCoef = New System.Windows.Forms.Button() + Me.cmdAveFac = New System.Windows.Forms.Button() + Me.cmdProd = New System.Windows.Forms.Button() + Me.cmdAve = New System.Windows.Forms.Button() + Me.cmdCombn = New System.Windows.Forms.Button() + Me.cmdCssq = New System.Windows.Forms.Button() + Me.cmdCoeffs2 = New System.Windows.Forms.Button() + Me.cmdFunctionsSsqSession = New System.Windows.Forms.Button() + Me.cmdFunctionsSsq = New System.Windows.Forms.Button() + Me.cmdCoeffs = New System.Windows.Forms.Button() + Me.cmdAveFun = New System.Windows.Forms.Button() + Me.cmdRoots = New System.Windows.Forms.Button() + Me.cmdPolynomial = New System.Windows.Forms.Button() + Me.cmdOrigin = New System.Windows.Forms.Button() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -662,18 +694,20 @@ Partial Class ucrCalculator Me.ContextMenuStripWakefield.SuspendLayout Me.ContextMenuStripList.SuspendLayout Me.grpList.SuspendLayout - Me.GroupBox1.SuspendLayout Me.grpMathBloc.SuspendLayout + Me.GroupBox1.SuspendLayout + Me.ContextMenuStripFunctions.SuspendLayout + Me.grpFunctions.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 +716,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 +745,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 +757,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 +769,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 +780,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 +792,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 +804,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 +816,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 +828,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 +840,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 +852,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 +863,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 +874,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 +885,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 +896,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 +907,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 +918,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 +929,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 +940,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 +951,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 +962,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 +997,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 +1010,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 +1021,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 +1032,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 +1043,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 +1054,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 +1065,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 +1076,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 +1087,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 +1098,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 +1109,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 +1120,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 +1131,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 +1142,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 +1153,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 +1164,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 +1176,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 +1187,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 +1199,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 +1210,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 +1221,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 +1232,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 +1243,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 +1254,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,31 +1265,44 @@ 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 ' + 'cmdRHelp + ' + Me.cmdRHelp.AutoSize = True + Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.Location = New System.Drawing.Point(157, 193) + Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRHelp.Name = "cmdRHelp" + Me.cmdRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate + Me.cmdRHelp.TabIndex = 212 + Me.cmdRHelp.Text = "R Help" + Me.cmdRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripDate ' Me.ContextMenuStripDate.ImageScalingSize = New System.Drawing.Size(24, 24) 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 +1310,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 +1334,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 +1365,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 +1377,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 +1388,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 +1419,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 +1430,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 +1441,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 +1452,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 +1463,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 +1474,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 +1485,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 +1496,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 +1507,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 +1518,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 +1551,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 +1562,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 +1573,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 +1584,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 +1595,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 +1606,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 +1617,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 +1628,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 +1639,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 +1650,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 +1661,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 +1672,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 +1683,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,77 +1694,93 @@ 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 ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(205, 283) + Me.cmdIntegerRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" + Me.cmdIntegerRHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.TabIndex = 16 + Me.cmdIntegerRHelp.Text = "R Help" + Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripInteger ' Me.ContextMenuStripInteger.ImageScalingSize = New System.Drawing.Size(24, 24) 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 +1788,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 +1799,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 +1810,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 +1831,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 +1892,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 +1903,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,35 +1934,48 @@ 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" ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 172) + Me.cmdTransformHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformHelp.Name = "cmdTransformHelp" + Me.cmdTransformHelp.Size = New System.Drawing.Size(90, 30) + Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.TabIndex = 212 + Me.cmdTransformHelp.Text = "R Help" + Me.cmdTransformHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripFactor ' Me.ContextMenuStripFactor.ImageScalingSize = New System.Drawing.Size(24, 24) 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 +1983,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 +1994,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 +2005,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 +2016,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 +2027,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 +2038,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 +2049,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 +2060,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 +2071,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 +2082,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 +2093,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 +2104,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 +2115,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 +2126,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 +2137,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 +2148,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 +2159,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 +2170,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 +2181,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 +2213,48 @@ 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" + ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(91, 236) + Me.cmdHydroHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdHydroHelp.Name = "cmdHydroHelp" + Me.cmdHydroHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.TabIndex = 212 + Me.cmdHydroHelp.Text = "R Help" + Me.cmdHydroHelp.UseVisualStyleBackColor = True ' 'ContextMenuStripHydroGOF ' Me.ContextMenuStripHydroGOF.ImageScalingSize = New System.Drawing.Size(24, 24) 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 +2262,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 +2273,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 +2284,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 +2295,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 +2306,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 +2317,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 +2328,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 +2339,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 +2350,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 +2361,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 +2372,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 +2383,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 +2394,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 +2405,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 +2416,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 +2427,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 +2438,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 +2449,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 +2460,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 +2471,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 +2510,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 +2536,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 +2549,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 +2561,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 +2573,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 +2585,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 +2597,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 +2609,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 +2621,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 +2633,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 +2645,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 +2657,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 +2669,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 +2681,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 +2693,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 +2705,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 +2717,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 +2729,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 +2741,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 +2753,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 +2765,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 +2777,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 +2789,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 +2801,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 +2813,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 +2825,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 +2837,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 +2849,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 +2861,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 +2873,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 +2885,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 +2921,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 +2933,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 +2945,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 +2957,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 +2969,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 +2981,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 +2993,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 +3005,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 +3017,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 +3029,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 +3041,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 +3053,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 +3065,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 +3077,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 +3089,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 +3101,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 +3113,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 +3125,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 +3137,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 +3149,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 +3161,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 +3173,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 +3185,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 +3197,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,52 +3231,66 @@ 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" ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 132) + Me.cmdMathsHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMathsHelp.Name = "cmdMathsHelp" + Me.cmdMathsHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.TabIndex = 211 + Me.cmdMathsHelp.Text = "R Help" + Me.cmdMathsHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripMaths ' Me.ContextMenuStripMaths.ImageScalingSize = New System.Drawing.Size(24, 24) 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 +3298,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 +3309,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 +3320,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 +3332,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 +3344,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 +3355,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 +3366,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 +3377,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 +3389,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 +3400,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 +3411,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 +3423,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 +3434,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 +3446,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 +3457,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 +3468,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 +3479,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 +3490,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 +3502,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 +3513,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 +3524,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 +3535,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 @@ -3351,7 +3571,6 @@ Partial Class ucrCalculator Me.grpSummary.Controls.Add(Me.cmdRange) Me.grpSummary.Controls.Add(Me.cmdSd) Me.grpSummary.Controls.Add(Me.cmdMedian) - Me.grpSummary.Controls.Add(Me.cmdMin) Me.grpSummary.Controls.Add(Me.cmdMax) Me.grpSummary.Controls.Add(Me.cmdMean) Me.grpSummary.Controls.Add(Me.cmdMiss) @@ -3359,11 +3578,12 @@ 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.Controls.Add(Me.cmdMin) + 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 +3592,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 +3603,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 +3614,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,65 +3626,78 @@ 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 ' + '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 + ' 'ContextMenuStripSummary ' 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 +3705,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 +3716,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 +3727,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 +3738,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 +3749,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 +3760,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 +3771,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 +3783,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 +3795,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 +3807,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 +3819,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 +3831,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 +3843,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 +3854,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 +3865,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 +3877,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 +3889,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 +3901,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 +3912,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,32 +3924,21 @@ 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 ' - '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.Name = "cmdMin" - Me.cmdMin.Size = New System.Drawing.Size(70, 38) - Me.cmdMin.TabIndex = 155 - Me.cmdMin.Text = "min" - Me.cmdMin.UseVisualStyleBackColor = True - ' '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 +3947,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 +3958,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 +3970,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 +3981,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 +3992,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 +4017,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 +4030,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 +4042,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 +4054,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 +4066,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 +4078,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 +4090,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 +4102,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 +4114,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 +4126,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 +4138,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 +4150,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 +4162,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 +4174,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 +4186,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,17 +4198,27 @@ 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 ' + 'cmdMin + ' + Me.cmdMin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdMin.Location = New System.Drawing.Point(118, 14) + Me.cmdMin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMin.Name = "cmdMin" + Me.cmdMin.Size = New System.Drawing.Size(56, 30) + Me.cmdMin.TabIndex = 155 + Me.cmdMin.Text = "min" + Me.cmdMin.UseVisualStyleBackColor = True + ' 'grpProbabilty ' - Me.grpProbabilty.Controls.Add(Me.cmdPascal) Me.grpProbabilty.Controls.Add(Me.cmdProbRHelp) Me.grpProbabilty.Controls.Add(Me.grpRandom) Me.grpProbabilty.Controls.Add(Me.cmdQnbin) @@ -4017,42 +4251,45 @@ 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" ' - 'cmdPascal + 'cmdProbRHelp ' - 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.Name = "cmdPascal" - Me.cmdPascal.Size = New System.Drawing.Size(78, 38) - Me.cmdPascal.TabIndex = 213 - Me.cmdPascal.Text = "pascal" - Me.cmdPascal.UseVisualStyleBackColor = True + Me.cmdProbRHelp.AutoSize = True + Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 190) + Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdProbRHelp.Name = "cmdProbRHelp" + Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability + Me.cmdProbRHelp.TabIndex = 212 + Me.cmdProbRHelp.Text = "R Help" + Me.cmdProbRHelp.UseVisualStyleBackColor = True ' 'ContextMenuStripProbability ' Me.ContextMenuStripProbability.ImageScalingSize = New System.Drawing.Size(24, 24) 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 +4304,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, 226) + 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 +4329,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 +4341,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 +4353,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 +4365,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 +4377,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 +4389,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 +4401,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 +4413,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 +4425,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 +4437,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 +4449,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 +4461,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 +4473,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 +4485,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 +4497,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 +4509,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 +4521,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 +4533,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 +4545,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 +4557,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 +4569,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 +4581,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 +4594,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 +4606,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 +4618,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 +4630,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 +4642,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 +4654,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 +4666,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 +4678,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 +4690,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 +4702,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 +4714,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 +4726,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 +4738,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 +4750,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 +4762,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 +4774,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,18 +4786,16 @@ 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 ' 'grpTransform ' - Me.grpTransform.Controls.Add(Me.cmdDecimals) - Me.grpTransform.Controls.Add(Me.cmdMASSFractions) Me.grpTransform.Controls.Add(Me.cmdScale) Me.grpTransform.Controls.Add(Me.cmdTransformRHelp) Me.grpTransform.Controls.Add(Me.cmdRev) @@ -4587,82 +4824,79 @@ Partial Class ucrCalculator Me.grpTransform.Controls.Add(Me.cmdCumMax) Me.grpTransform.Controls.Add(Me.cmdPMin) 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.Controls.Add(Me.cmdLead) + 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, 225) Me.grpTransform.TabIndex = 189 Me.grpTransform.TabStop = False Me.grpTransform.Text = "Transform" ' - 'cmdDecimals - ' - Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDecimals.Location = New System.Drawing.Point(2, 237) - Me.cmdDecimals.Name = "cmdDecimals" - Me.cmdDecimals.Size = New System.Drawing.Size(78, 38) - Me.cmdDecimals.TabIndex = 207 - Me.cmdDecimals.Text = "decimals" - Me.cmdDecimals.UseVisualStyleBackColor = True - ' - 'cmdMASSFractions - ' - Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 200) - Me.cmdMASSFractions.Name = "cmdMASSFractions" - Me.cmdMASSFractions.Size = New System.Drawing.Size(78, 38) - Me.cmdMASSFractions.TabIndex = 206 - Me.cmdMASSFractions.Text = "fractions" - Me.cmdMASSFractions.UseVisualStyleBackColor = True - ' '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 ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(218, 188) + Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdTransformRHelp.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 + ' 'ContextMenuStripTransform ' Me.ContextMenuStripTransform.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripTransform.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem, Me.DplyrToolStripMenuItem, Me.MASSToolStripMenuItem, Me.ZooToolStripMenuItem}) Me.ContextMenuStripTransform.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 +4904,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 +4915,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 +4926,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 +4937,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(240, 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(68, 30) Me.cmdNasplin.TabIndex = 197 Me.cmdNasplin.Text = "nasplin" Me.cmdNasplin.UseVisualStyleBackColor = True @@ -4710,9 +4948,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(162, 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(79, 30) Me.cmdNaapprox.TabIndex = 196 Me.cmdNaapprox.Text = "naapprox" Me.cmdNaapprox.UseVisualStyleBackColor = True @@ -4720,9 +4959,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(80, 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(83, 30) Me.cmdNaest.TabIndex = 195 Me.cmdNaest.Text = "naest" Me.cmdNaest.UseVisualStyleBackColor = True @@ -4730,9 +4970,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(2, 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(79, 30) Me.cmdNafill.TabIndex = 194 Me.cmdNafill.Text = "nafill" Me.cmdNafill.UseVisualStyleBackColor = True @@ -4740,9 +4981,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 +4992,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 +5003,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 +5014,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 +5025,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 +5036,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 +5047,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 +5058,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 +5069,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 +5080,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 +5091,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 +5102,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 +5114,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 +5125,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 +5136,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 +5147,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 +5158,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,33 +5169,36 @@ 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 ' - 'cmdLead - ' - Me.cmdLead.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLead.Location = New System.Drawing.Point(155, 18) - Me.cmdLead.Name = "cmdLead" - Me.cmdLead.Size = New System.Drawing.Size(78, 38) - Me.cmdLead.TabIndex = 175 - Me.cmdLead.Text = "lead" - Me.cmdLead.UseVisualStyleBackColor = True - ' '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 ' + 'cmdLead + ' + Me.cmdLead.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdLead.Location = New System.Drawing.Point(124, 14) + Me.cmdLead.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLead.Name = "cmdLead" + Me.cmdLead.Size = New System.Drawing.Size(62, 30) + Me.cmdLead.TabIndex = 175 + Me.cmdLead.Text = "lead" + Me.cmdLead.UseVisualStyleBackColor = True + ' 'grpLogical ' Me.grpLogical.Controls.Add(Me.cmdnumeric) @@ -4976,11 +5236,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 +5248,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 +5260,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 +5272,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,39 +5284,53 @@ 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 ' + 'cmdLogicalHelp + ' + Me.cmdLogicalHelp.AutoSize = True + Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.Location = New System.Drawing.Point(165, 218) + Me.cmdLogicalHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdLogicalHelp.Name = "cmdLogicalHelp" + Me.cmdLogicalHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical + Me.cmdLogicalHelp.TabIndex = 212 + Me.cmdLogicalHelp.Text = "R Help" + Me.cmdLogicalHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripLogical ' Me.ContextMenuStripLogical.ImageScalingSize = New System.Drawing.Size(24, 24) 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 +5338,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 +5349,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 +5360,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 +5371,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 +5382,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 +5393,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 +5404,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 +5415,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 +5426,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 +5437,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 +5448,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 +5459,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 +5470,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 +5481,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 +5493,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 +5504,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 +5515,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 +5528,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 +5541,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 +5552,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 +5563,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 +5574,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 +5585,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 +5596,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 +5607,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 +5618,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 +5630,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 +5641,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 +5652,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 +5690,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 +5703,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 +5715,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 +5727,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 +5739,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 +5751,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 +5763,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 +5776,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 +5789,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 +5802,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 +5815,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 +5828,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 +5841,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 +5854,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 +5866,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 +5879,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 +5891,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 +5904,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 +5916,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 +5928,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 +5940,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 +5952,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 +5964,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 +5976,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 +5988,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 +6000,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 +6012,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 +6024,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,35 +6057,48 @@ 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" ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(158, 142) + Me.cmdCircularHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCircularHelp.Name = "cmdCircularHelp" + Me.cmdCircularHelp.Size = New System.Drawing.Size(86, 30) + Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.TabIndex = 212 + Me.cmdCircularHelp.Text = "R Help" + Me.cmdCircularHelp.UseVisualStyleBackColor = True + ' 'ContextMenuStripCircular ' Me.ContextMenuStripCircular.ImageScalingSize = New System.Drawing.Size(24, 24) 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 +6106,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 +6117,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 +6128,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 +6139,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 +6150,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 +6161,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 +6172,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 +6183,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 +6194,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 +6205,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 +6216,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 +6227,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 +6238,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 +6249,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 +6260,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 +6274,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 +6286,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 +6297,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 +6308,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 +6319,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 +6344,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 +6356,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 +6367,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 +6378,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 +6389,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 +6400,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 +6411,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 +6422,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 +6433,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 +6444,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 +6455,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 +6466,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 +6477,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 +6488,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 +6499,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 +6510,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 +6546,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 +6559,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 +6571,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 +6583,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 +6595,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,22 +6607,35 @@ 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 ' + 'cmdComplexRHelp + ' + Me.cmdComplexRHelp.AutoSize = True + Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex + Me.cmdComplexRHelp.Location = New System.Drawing.Point(190, 192) + Me.cmdComplexRHelp.Margin = New System.Windows.Forms.Padding(2) + Me.cmdComplexRHelp.Name = "cmdComplexRHelp" + 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 + ' 'cmdComplexTanH ' 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 +6644,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 +6656,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 +6668,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 +6680,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 +6692,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 +6704,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 +6716,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 +6728,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 +6740,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 +6752,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 +6764,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 +6776,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 +6788,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 +6800,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 +6812,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 +6824,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 +6836,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 +6848,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 +6860,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 +6873,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 +6892,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 +6905,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,218 +6953,17 @@ 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 + 'grpMathBloc ' Me.grpMathBloc.Controls.Add(Me.cmdListSQRT) Me.grpMathBloc.Controls.Add(Me.cmdListPercent2) @@ -6862,9 +6975,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 +6988,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 +7000,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 +7012,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 +7024,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 +7036,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 +7048,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 +7060,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 +7072,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 +7084,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 +7096,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 +7108,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 +7120,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 +7132,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 +7144,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 +7156,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 +7168,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 +7180,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 +7192,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 +7204,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 +7216,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 +7228,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 +7240,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 +7252,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 +7265,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 +7277,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 +7289,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 +7301,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 +7313,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 +7325,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 +7337,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 +7349,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 +7361,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 +7373,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 +7385,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 +7397,259 @@ 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 + ' + 'ContextMenuStripFunctions + ' + Me.ContextMenuStripFunctions.ImageScalingSize = New System.Drawing.Size(24, 24) + Me.ContextMenuStripFunctions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MASSFunctionsToolStripMenuItem1, Me.PolynomToolStripMenuItem, Me.StatsToolStripMenuItem1, Me.UtilsToolStripMenuItem1}) + Me.ContextMenuStripFunctions.Name = "ContextMenuStrip1" + Me.ContextMenuStripFunctions.Size = New System.Drawing.Size(123, 92) + ' + 'MASSFunctionsToolStripMenuItem1 + ' + Me.MASSFunctionsToolStripMenuItem1.Name = "MASSFunctionsToolStripMenuItem1" + Me.MASSFunctionsToolStripMenuItem1.Size = New System.Drawing.Size(122, 22) + Me.MASSFunctionsToolStripMenuItem1.Text = "MASS" + ' + 'PolynomToolStripMenuItem + ' + Me.PolynomToolStripMenuItem.Name = "PolynomToolStripMenuItem" + Me.PolynomToolStripMenuItem.Size = New System.Drawing.Size(122, 22) + Me.PolynomToolStripMenuItem.Text = "polynom" + ' + 'StatsToolStripMenuItem1 + ' + Me.StatsToolStripMenuItem1.Name = "StatsToolStripMenuItem1" + Me.StatsToolStripMenuItem1.Size = New System.Drawing.Size(122, 22) + Me.StatsToolStripMenuItem1.Text = "stats" + ' + 'UtilsToolStripMenuItem1 + ' + Me.UtilsToolStripMenuItem1.Name = "UtilsToolStripMenuItem1" + Me.UtilsToolStripMenuItem1.Size = New System.Drawing.Size(122, 22) + Me.UtilsToolStripMenuItem1.Text = "utils" + ' '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 +7659,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 +7672,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 +7684,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 +7706,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,163 +7718,411 @@ 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 ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(207, 277) - Me.cmdLogicalHelp.Name = "cmdLogicalHelp" - Me.cmdLogicalHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdLogicalHelp.SplitMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.TabIndex = 212 - Me.cmdLogicalHelp.Text = "R Help" - Me.cmdLogicalHelp.UseVisualStyleBackColor = True - ' - 'cmdRHelp + 'grpFunctions + ' + Me.grpFunctions.Controls.Add(Me.cmdDigitsumSession) + Me.grpFunctions.Controls.Add(Me.cmdDigitsquSession) + Me.grpFunctions.Controls.Add(Me.cmdFunctionsDigitsum) + Me.grpFunctions.Controls.Add(Me.cmdDigitsqu) + Me.grpFunctions.Controls.Add(Me.cmdDecimalsSession) + Me.grpFunctions.Controls.Add(Me.cmdMASSFractionsSession) + Me.grpFunctions.Controls.Add(Me.cmdPascalSession) + Me.grpFunctions.Controls.Add(Me.cmdRhelpFunctions) + Me.grpFunctions.Controls.Add(Me.cmdDecimals) + Me.grpFunctions.Controls.Add(Me.cmdMASSFractions) + Me.grpFunctions.Controls.Add(Me.cmdPascal) + Me.grpFunctions.Controls.Add(Me.cmdDigitssq) + Me.grpFunctions.Controls.Add(Me.cmddigitssqSession) + Me.grpFunctions.Controls.Add(Me.cmdCssqSession) + Me.grpFunctions.Controls.Add(Me.cmdAveBoth) + Me.grpFunctions.Controls.Add(Me.cmdCoef) + Me.grpFunctions.Controls.Add(Me.cmdAveFac) + Me.grpFunctions.Controls.Add(Me.cmdProd) + Me.grpFunctions.Controls.Add(Me.cmdAve) + Me.grpFunctions.Controls.Add(Me.cmdCombn) + Me.grpFunctions.Controls.Add(Me.cmdCssq) + Me.grpFunctions.Controls.Add(Me.cmdCoeffs2) + Me.grpFunctions.Controls.Add(Me.cmdFunctionsSsqSession) + Me.grpFunctions.Controls.Add(Me.cmdFunctionsSsq) + Me.grpFunctions.Controls.Add(Me.cmdCoeffs) + Me.grpFunctions.Controls.Add(Me.cmdAveFun) + Me.grpFunctions.Controls.Add(Me.cmdRoots) + Me.grpFunctions.Controls.Add(Me.cmdPolynomial) + Me.grpFunctions.Controls.Add(Me.cmdOrigin) + Me.grpFunctions.Location = New System.Drawing.Point(437, 60) + Me.grpFunctions.Margin = New System.Windows.Forms.Padding(2) + Me.grpFunctions.Name = "grpFunctions" + Me.grpFunctions.Padding = New System.Windows.Forms.Padding(2) + Me.grpFunctions.Size = New System.Drawing.Size(259, 244) + Me.grpFunctions.TabIndex = 216 + Me.grpFunctions.TabStop = False + Me.grpFunctions.Text = "Functions" + ' + 'cmdDigitsumSession + ' + Me.cmdDigitsumSession.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDigitsumSession.Location = New System.Drawing.Point(67, 72) + Me.cmdDigitsumSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigitsumSession.Name = "cmdDigitsumSession" + Me.cmdDigitsumSession.Size = New System.Drawing.Size(62, 30) + Me.cmdDigitsumSession.TabIndex = 228 + Me.cmdDigitsumSession.Text = "digitsum*" + Me.cmdDigitsumSession.UseVisualStyleBackColor = True + ' + 'cmdDigitsquSession + ' + Me.cmdDigitsquSession.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDigitsquSession.Location = New System.Drawing.Point(67, 101) + Me.cmdDigitsquSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigitsquSession.Name = "cmdDigitsquSession" + Me.cmdDigitsquSession.Size = New System.Drawing.Size(62, 30) + Me.cmdDigitsquSession.TabIndex = 227 + Me.cmdDigitsquSession.Text = "digitsqu*" + Me.cmdDigitsquSession.UseVisualStyleBackColor = True + ' + 'cmdFunctionsDigitsum + ' + Me.cmdFunctionsDigitsum.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFunctionsDigitsum.Location = New System.Drawing.Point(2, 72) + Me.cmdFunctionsDigitsum.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFunctionsDigitsum.Name = "cmdFunctionsDigitsum" + Me.cmdFunctionsDigitsum.Size = New System.Drawing.Size(66, 30) + Me.cmdFunctionsDigitsum.TabIndex = 226 + Me.cmdFunctionsDigitsum.Text = "digitsum" + Me.cmdFunctionsDigitsum.UseVisualStyleBackColor = True + ' + 'cmdDigitsqu + ' + Me.cmdDigitsqu.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDigitsqu.Location = New System.Drawing.Point(2, 101) + Me.cmdDigitsqu.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigitsqu.Name = "cmdDigitsqu" + Me.cmdDigitsqu.Size = New System.Drawing.Size(66, 30) + Me.cmdDigitsqu.TabIndex = 225 + Me.cmdDigitsqu.Text = "digitsqu" + Me.cmdDigitsqu.UseVisualStyleBackColor = True + ' + 'cmdDecimalsSession + ' + Me.cmdDecimalsSession.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDecimalsSession.Location = New System.Drawing.Point(189, 130) + Me.cmdDecimalsSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDecimalsSession.Name = "cmdDecimalsSession" + Me.cmdDecimalsSession.Size = New System.Drawing.Size(62, 30) + Me.cmdDecimalsSession.TabIndex = 224 + Me.cmdDecimalsSession.Text = "decimals*" + Me.cmdDecimalsSession.UseVisualStyleBackColor = True + ' + 'cmdMASSFractionsSession + ' + Me.cmdMASSFractionsSession.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdMASSFractionsSession.Location = New System.Drawing.Point(67, 130) + Me.cmdMASSFractionsSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMASSFractionsSession.Name = "cmdMASSFractionsSession" + Me.cmdMASSFractionsSession.Size = New System.Drawing.Size(62, 30) + Me.cmdMASSFractionsSession.TabIndex = 223 + Me.cmdMASSFractionsSession.Text = "fractions*" + Me.cmdMASSFractionsSession.UseVisualStyleBackColor = True + ' + 'cmdPascalSession + ' + Me.cmdPascalSession.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdPascalSession.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdPascalSession.Location = New System.Drawing.Point(189, 72) + Me.cmdPascalSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPascalSession.Name = "cmdPascalSession" + Me.cmdPascalSession.Size = New System.Drawing.Size(62, 30) + Me.cmdPascalSession.TabIndex = 222 + Me.cmdPascalSession.Text = "pascal*" + Me.cmdPascalSession.UseVisualStyleBackColor = True + ' + 'cmdRhelpFunctions + ' + Me.cmdRhelpFunctions.AutoSize = True + Me.cmdRhelpFunctions.ContextMenuStrip = Me.ContextMenuStripFunctions + Me.cmdRhelpFunctions.Location = New System.Drawing.Point(178, 218) + Me.cmdRhelpFunctions.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRhelpFunctions.Name = "cmdRhelpFunctions" + Me.cmdRhelpFunctions.Size = New System.Drawing.Size(68, 23) + Me.cmdRhelpFunctions.SplitMenuStrip = Me.ContextMenuStripFunctions + Me.cmdRhelpFunctions.TabIndex = 221 + Me.cmdRhelpFunctions.Text = "R Help" + Me.cmdRhelpFunctions.UseVisualStyleBackColor = True ' - Me.cmdRHelp.AutoSize = True - Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.Location = New System.Drawing.Point(194, 248) - Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripDate - Me.cmdRHelp.TabIndex = 212 - Me.cmdRHelp.Text = "R Help" - Me.cmdRHelp.UseVisualStyleBackColor = True - ' - 'cmdHydroHelp - ' - Me.cmdHydroHelp.AutoSize = True - Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.Location = New System.Drawing.Point(113, 298) - Me.cmdHydroHelp.Name = "cmdHydroHelp" - Me.cmdHydroHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdHydroHelp.SplitMenuStrip = Me.ContextMenuStripHydroGOF - Me.cmdHydroHelp.TabIndex = 212 - Me.cmdHydroHelp.Text = "R Help" - Me.cmdHydroHelp.UseVisualStyleBackColor = True - ' - 'cmdTransformHelp - ' - Me.cmdTransformHelp.AutoSize = True - Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.Location = New System.Drawing.Point(188, 218) - Me.cmdTransformHelp.Name = "cmdTransformHelp" - Me.cmdTransformHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdTransformHelp.SplitMenuStrip = Me.ContextMenuStripFactor - Me.cmdTransformHelp.TabIndex = 212 - Me.cmdTransformHelp.Text = "R Help" - Me.cmdTransformHelp.UseVisualStyleBackColor = True - ' - 'cmdCircularHelp - ' - Me.cmdCircularHelp.AutoSize = True - Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.Location = New System.Drawing.Point(197, 178) - Me.cmdCircularHelp.Name = "cmdCircularHelp" - Me.cmdCircularHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdCircularHelp.SplitMenuStrip = Me.ContextMenuStripCircular - Me.cmdCircularHelp.TabIndex = 212 - Me.cmdCircularHelp.Text = "R Help" - Me.cmdCircularHelp.UseVisualStyleBackColor = True - ' - 'cmdMathsHelp - ' - Me.cmdMathsHelp.AutoSize = True - Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.Location = New System.Drawing.Point(204, 165) - Me.cmdMathsHelp.Name = "cmdMathsHelp" - Me.cmdMathsHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdMathsHelp.SplitMenuStrip = Me.ContextMenuStripMaths - Me.cmdMathsHelp.TabIndex = 211 - Me.cmdMathsHelp.Text = "R Help" - Me.cmdMathsHelp.UseVisualStyleBackColor = True - ' - 'cmdProbRHelp - ' - Me.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(269, 239) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(108, 38) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True - ' - 'cmdIntegerRHelp - ' - Me.cmdIntegerRHelp.AutoSize = True - Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.Location = New System.Drawing.Point(262, 354) - Me.cmdIntegerRHelp.Name = "cmdIntegerRHelp" - Me.cmdIntegerRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdIntegerRHelp.SplitMenuStrip = Me.ContextMenuStripInteger - Me.cmdIntegerRHelp.TabIndex = 16 - Me.cmdIntegerRHelp.Text = "R Help" - Me.cmdIntegerRHelp.UseVisualStyleBackColor = True + 'cmdDecimals ' - 'cmdComplexRHelp + Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDecimals.Location = New System.Drawing.Point(128, 130) + Me.cmdDecimals.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDecimals.Name = "cmdDecimals" + Me.cmdDecimals.Size = New System.Drawing.Size(62, 30) + Me.cmdDecimals.TabIndex = 220 + Me.cmdDecimals.Text = "decimals" + Me.cmdDecimals.UseVisualStyleBackColor = True ' - Me.cmdComplexRHelp.AutoSize = True - Me.cmdComplexRHelp.ContextMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.Location = New System.Drawing.Point(237, 240) - Me.cmdComplexRHelp.Name = "cmdComplexRHelp" - Me.cmdComplexRHelp.Size = New System.Drawing.Size(113, 38) - Me.cmdComplexRHelp.SplitMenuStrip = Me.ContextMenuStripComplex - Me.cmdComplexRHelp.TabIndex = 209 - Me.cmdComplexRHelp.Text = "R Help" - Me.cmdComplexRHelp.UseVisualStyleBackColor = True + 'cmdMASSFractions ' - 'cmdSummaryRHelp + Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 130) + Me.cmdMASSFractions.Margin = New System.Windows.Forms.Padding(2) + Me.cmdMASSFractions.Name = "cmdMASSFractions" + Me.cmdMASSFractions.Size = New System.Drawing.Size(66, 30) + Me.cmdMASSFractions.TabIndex = 219 + Me.cmdMASSFractions.Text = "fractions" + Me.cmdMASSFractions.UseVisualStyleBackColor = True ' - 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 + 'cmdPascal ' - 'cmdTransformRHelp + Me.cmdPascal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdPascal.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdPascal.Location = New System.Drawing.Point(128, 72) + Me.cmdPascal.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPascal.Name = "cmdPascal" + Me.cmdPascal.Size = New System.Drawing.Size(62, 30) + Me.cmdPascal.TabIndex = 217 + Me.cmdPascal.Text = "pascal" + Me.cmdPascal.UseVisualStyleBackColor = True ' - 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 + 'cmdDigitssq + ' + Me.cmdDigitssq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdDigitssq.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDigitssq.Location = New System.Drawing.Point(128, 101) + Me.cmdDigitssq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigitssq.Name = "cmdDigitssq" + Me.cmdDigitssq.Size = New System.Drawing.Size(62, 30) + Me.cmdDigitssq.TabIndex = 177 + Me.cmdDigitssq.Text = "digitssq" + Me.cmdDigitssq.UseVisualStyleBackColor = True + ' + 'cmddigitssqSession + ' + Me.cmddigitssqSession.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmddigitssqSession.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmddigitssqSession.Location = New System.Drawing.Point(189, 101) + Me.cmddigitssqSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmddigitssqSession.Name = "cmddigitssqSession" + Me.cmddigitssqSession.Size = New System.Drawing.Size(62, 30) + Me.cmddigitssqSession.TabIndex = 178 + Me.cmddigitssqSession.Text = "digitssq*" + Me.cmddigitssqSession.UseVisualStyleBackColor = True + ' + 'cmdCssqSession + ' + Me.cmdCssqSession.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCssqSession.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCssqSession.Location = New System.Drawing.Point(189, 43) + Me.cmdCssqSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCssqSession.Name = "cmdCssqSession" + Me.cmdCssqSession.Size = New System.Drawing.Size(62, 30) + Me.cmdCssqSession.TabIndex = 162 + Me.cmdCssqSession.Text = "cssq*" + Me.cmdCssqSession.UseVisualStyleBackColor = True + ' + 'cmdAveBoth + ' + Me.cmdAveBoth.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdAveBoth.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAveBoth.Location = New System.Drawing.Point(189, 14) + Me.cmdAveBoth.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAveBoth.Name = "cmdAveBoth" + Me.cmdAveBoth.Size = New System.Drawing.Size(62, 30) + Me.cmdAveBoth.TabIndex = 156 + Me.cmdAveBoth.Text = "ave_both" + Me.cmdAveBoth.UseVisualStyleBackColor = True + ' + 'cmdCoef + ' + Me.cmdCoef.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCoef.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCoef.Location = New System.Drawing.Point(128, 188) + Me.cmdCoef.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCoef.Name = "cmdCoef" + Me.cmdCoef.Size = New System.Drawing.Size(62, 30) + Me.cmdCoef.TabIndex = 174 + Me.cmdCoef.Text = "coef" + Me.cmdCoef.UseVisualStyleBackColor = True + ' + 'cmdAveFac + ' + Me.cmdAveFac.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdAveFac.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAveFac.Location = New System.Drawing.Point(128, 14) + Me.cmdAveFac.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAveFac.Name = "cmdAveFac" + Me.cmdAveFac.Size = New System.Drawing.Size(62, 30) + Me.cmdAveFac.TabIndex = 155 + Me.cmdAveFac.Text = "ave_fac" + Me.cmdAveFac.UseVisualStyleBackColor = True + ' + 'cmdProd + ' + Me.cmdProd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdProd.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdProd.Location = New System.Drawing.Point(2, 188) + Me.cmdProd.Margin = New System.Windows.Forms.Padding(2) + Me.cmdProd.Name = "cmdProd" + Me.cmdProd.Size = New System.Drawing.Size(66, 30) + Me.cmdProd.TabIndex = 172 + Me.cmdProd.Text = "prod" + Me.cmdProd.UseVisualStyleBackColor = True + ' + 'cmdAve + ' + Me.cmdAve.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdAve.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAve.Location = New System.Drawing.Point(2, 14) + Me.cmdAve.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAve.Name = "cmdAve" + Me.cmdAve.Size = New System.Drawing.Size(66, 30) + Me.cmdAve.TabIndex = 148 + Me.cmdAve.Text = "ave" + Me.cmdAve.UseVisualStyleBackColor = True + ' + 'cmdCombn + ' + Me.cmdCombn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCombn.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCombn.Location = New System.Drawing.Point(67, 188) + Me.cmdCombn.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCombn.Name = "cmdCombn" + Me.cmdCombn.Size = New System.Drawing.Size(62, 30) + Me.cmdCombn.TabIndex = 173 + Me.cmdCombn.Text = "combn" + Me.cmdCombn.UseVisualStyleBackColor = True + ' + 'cmdCssq + ' + Me.cmdCssq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCssq.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCssq.Location = New System.Drawing.Point(128, 43) + Me.cmdCssq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCssq.Name = "cmdCssq" + Me.cmdCssq.Size = New System.Drawing.Size(62, 30) + Me.cmdCssq.TabIndex = 160 + Me.cmdCssq.Text = "cssq" + Me.cmdCssq.UseVisualStyleBackColor = True + ' + 'cmdCoeffs2 + ' + Me.cmdCoeffs2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCoeffs2.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCoeffs2.Location = New System.Drawing.Point(189, 188) + Me.cmdCoeffs2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCoeffs2.Name = "cmdCoeffs2" + Me.cmdCoeffs2.Size = New System.Drawing.Size(62, 30) + Me.cmdCoeffs2.TabIndex = 175 + Me.cmdCoeffs2.Text = "coeffs2" + Me.cmdCoeffs2.UseVisualStyleBackColor = True + ' + 'cmdFunctionsSsqSession + ' + Me.cmdFunctionsSsqSession.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdFunctionsSsqSession.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFunctionsSsqSession.Location = New System.Drawing.Point(67, 43) + Me.cmdFunctionsSsqSession.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFunctionsSsqSession.Name = "cmdFunctionsSsqSession" + Me.cmdFunctionsSsqSession.Size = New System.Drawing.Size(62, 30) + Me.cmdFunctionsSsqSession.TabIndex = 158 + Me.cmdFunctionsSsqSession.Text = "ssq*" + Me.cmdFunctionsSsqSession.UseVisualStyleBackColor = True + ' + 'cmdFunctionsSsq + ' + Me.cmdFunctionsSsq.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdFunctionsSsq.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFunctionsSsq.Location = New System.Drawing.Point(2, 43) + Me.cmdFunctionsSsq.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFunctionsSsq.Name = "cmdFunctionsSsq" + Me.cmdFunctionsSsq.Size = New System.Drawing.Size(66, 30) + Me.cmdFunctionsSsq.TabIndex = 157 + Me.cmdFunctionsSsq.Text = "ssq" + Me.cmdFunctionsSsq.UseVisualStyleBackColor = True + ' + 'cmdCoeffs + ' + Me.cmdCoeffs.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdCoeffs.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdCoeffs.Location = New System.Drawing.Point(189, 159) + Me.cmdCoeffs.Margin = New System.Windows.Forms.Padding(2) + Me.cmdCoeffs.Name = "cmdCoeffs" + Me.cmdCoeffs.Size = New System.Drawing.Size(62, 30) + Me.cmdCoeffs.TabIndex = 170 + Me.cmdCoeffs.Text = "coeffs" + Me.cmdCoeffs.UseVisualStyleBackColor = True + ' + 'cmdAveFun + ' + Me.cmdAveFun.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdAveFun.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAveFun.Location = New System.Drawing.Point(67, 14) + Me.cmdAveFun.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAveFun.Name = "cmdAveFun" + Me.cmdAveFun.Size = New System.Drawing.Size(62, 30) + Me.cmdAveFun.TabIndex = 153 + Me.cmdAveFun.Text = "ave_fun" + Me.cmdAveFun.UseVisualStyleBackColor = True + ' + 'cmdRoots + ' + Me.cmdRoots.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdRoots.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdRoots.Location = New System.Drawing.Point(128, 159) + Me.cmdRoots.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRoots.Name = "cmdRoots" + Me.cmdRoots.Size = New System.Drawing.Size(62, 30) + Me.cmdRoots.TabIndex = 169 + Me.cmdRoots.Text = "roots" + Me.cmdRoots.UseVisualStyleBackColor = True + ' + 'cmdPolynomial + ' + Me.cmdPolynomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdPolynomial.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdPolynomial.Location = New System.Drawing.Point(2, 159) + Me.cmdPolynomial.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPolynomial.Name = "cmdPolynomial" + Me.cmdPolynomial.Size = New System.Drawing.Size(66, 30) + Me.cmdPolynomial.TabIndex = 167 + Me.cmdPolynomial.Text = "polynomial" + Me.cmdPolynomial.UseVisualStyleBackColor = True + ' + 'cmdOrigin + ' + Me.cmdOrigin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdOrigin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdOrigin.Location = New System.Drawing.Point(67, 159) + Me.cmdOrigin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOrigin.Name = "cmdOrigin" + Me.cmdOrigin.Size = New System.Drawing.Size(62, 30) + Me.cmdOrigin.TabIndex = 168 + Me.cmdOrigin.Text = "origin" + Me.cmdOrigin.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) Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) @@ -7531,71 +8134,77 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) + Me.Controls.Add(Me.grpFunctions) 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.grpModifier) + Me.Controls.Add(Me.grpSymbols) + Me.Controls.Add(Me.grpWakefield) + Me.Controls.Add(Me.grpList) + Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" - Me.Size = New System.Drawing.Size(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.ContextMenuStripFunctions.ResumeLayout(False) + Me.grpFunctions.ResumeLayout(False) + Me.grpFunctions.PerformLayout Me.ResumeLayout(False) - Me.PerformLayout() + Me.PerformLayout End Sub @@ -7786,7 +8395,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 +8590,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 @@ -8090,17 +8699,12 @@ Partial Class ucrCalculator Friend WithEvents ListBaseToolStripMenuItem As ToolStripMenuItem Friend WithEvents ListStatsToolStripMenuItem As ToolStripMenuItem Friend WithEvents ListStatipToolStripMenuItem As ToolStripMenuItem - - Friend WithEvents cmdDecimals As Button - Friend WithEvents cmdMASSFractions As Button Friend WithEvents cmdScale As Button Friend WithEvents MASSToolStripMenuItem As ToolStripMenuItem Friend WithEvents cmdPrimorial As Button Friend WithEvents cmdFactorize2 As Button - - Friend WithEvents cmdPascal As Button Friend WithEvents ConfdesignToolStripMenuItem As ToolStripMenuItem Friend WithEvents grpList As GroupBox Friend WithEvents cmdRhelpList As ucrSplitButton @@ -8196,4 +8800,39 @@ Partial Class ucrCalculator Friend WithEvents cmdCalcRepelicationFunction As Button Friend WithEvents cmdCalcSequenceFunction As Button Friend WithEvents cmdCalcConcantenateFunction As Button + Friend WithEvents ContextMenuStripFunctions As ContextMenuStrip + Friend WithEvents MASSFunctionsToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents PolynomToolStripMenuItem As ToolStripMenuItem + Friend WithEvents StatsToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents UtilsToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents grpFunctions As GroupBox + Friend WithEvents cmdDecimals As Button + Friend WithEvents cmdMASSFractions As Button + Friend WithEvents cmdPascal As Button + Friend WithEvents cmdDigitssq As Button + Friend WithEvents cmddigitssqSession As Button + Friend WithEvents cmdCoeffs2 As Button + Friend WithEvents cmdCoef As Button + Friend WithEvents cmdCombn As Button + Friend WithEvents cmdProd As Button + Friend WithEvents cmdCoeffs As Button + Friend WithEvents cmdRoots As Button + Friend WithEvents cmdOrigin As Button + Friend WithEvents cmdPolynomial As Button + Friend WithEvents cmdCssqSession As Button + Friend WithEvents cmdAveBoth As Button + Friend WithEvents cmdAveFac As Button + Friend WithEvents cmdAve As Button + Friend WithEvents cmdCssq As Button + Friend WithEvents cmdFunctionsSsqSession As Button + Friend WithEvents cmdFunctionsSsq As Button + Friend WithEvents cmdAveFun As Button + Friend WithEvents cmdRhelpFunctions As ucrSplitButton + Friend WithEvents cmdPascalSession As Button + Friend WithEvents cmdDecimalsSession As Button + Friend WithEvents cmdMASSFractionsSession As Button + Friend WithEvents cmdDigitsquSession As Button + Friend WithEvents cmdDigitsqu As Button + Friend WithEvents cmdDigitsumSession As Button + Friend WithEvents cmdFunctionsDigitsum As Button End Class diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index b436018d56a..5c820c491f3 100644 --- a/instat/ucrCalculator.resx +++ b/instat/ucrCalculator.resx @@ -151,7 +151,7 @@ 17, 17 - 381, 104 + 379, 108 352, 64 @@ -162,7 +162,10 @@ 759, 103 + + 17, 140 + - 99 + 95 \ No newline at end of file diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index be3a2823860..49334f48834 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", "Functions"}) ' "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.") @@ -309,7 +309,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdComplexTanH, "hyperbolic tangent of a number in radians (atanh also exists)") ttCalculator.SetToolTip(cmdComplexLog, "natural logarithm. For example log(1 + 2i) gives 0.805+1.107i") - 'Hydro GOF keyboard tooltips + 'Goodness of Fit keyboard tooltips ttCalculator.SetToolTip(cmdBr2, "r-squared times the slope of the regression line between sim and obs") ttCalculator.SetToolTip(cmdCp, "coefficent of persistence between sim and obs") ttCalculator.SetToolTip(cmdD, "Index of agreement between sim and obs") @@ -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") @@ -455,6 +455,34 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdShift, "Shift the order of the factor levels") ttCalculator.SetToolTip(cmdShuffle, "Shuffle the order of the factor levels") + 'Functions keyboard tooltips + ttCalculator.SetToolTip(cmdAve, "Gives the mean, as a column. For example ave(c(1,2,3,4,10)) = 4, 4, 4, 4, 4") + ttCalculator.SetToolTip(cmdAveFun, "As ave key, but change mean (in the function) to any summary, e.g. sd, for std dev or raster::cv for coefficient of variation") + ttCalculator.SetToolTip(cmdAveFac, "Gives the means for one or more factors") + ttCalculator.SetToolTip(cmdAveBoth, "Gives any summary measure for one or more factors") + ttCalculator.SetToolTip(cmdFunctionsSsq, "Gives uncorrected sum of squares through the ave function") + ttCalculator.SetToolTip(cmdFunctionsSsqSession, "Gives uncorrected sum of squares, but only if the library calculator code has been run in the current sesion") + ttCalculator.SetToolTip(cmdCssq, "Gives corrected sum of squares through the ave function") + ttCalculator.SetToolTip(cmdCssqSession, "Gives corrected sum of squares, but only if the library calculator code has been run in the current sesion") + ttCalculator.SetToolTip(cmdPolynomial, "Makes a variable into a polynomial object") + ttCalculator.SetToolTip(cmdOrigin, " Gives the polynomial coefficients, relative to a new origin") + ttCalculator.SetToolTip(cmdRoots, "Gives the zeros of a polynomial") + ttCalculator.SetToolTip(cmdCoeffs, "Gives the polynomial from the zeros") + ttCalculator.SetToolTip(cmdProd, "The product of the values. So prod(c(1,2,3,4,10)) = 240") + ttCalculator.SetToolTip(cmdCombn, "combn(c(-2,1,3,4), 2,FUN=prod) gives the products of the values 2 at a time, -2 -6 -8 , 3 4 12. (result usually put into output window)") + ttCalculator.SetToolTip(cmdCoef, "single coefficient of a polynomial if given roots. So sum(combn(c(-2,1,3,4),3. FUN=prod) =(-6 -12-24 +12) = -26") + ttCalculator.SetToolTip(cmdCoeffs2, " Gives the polynomial coefficients from the zeros") + ttCalculator.SetToolTip(cmdFunctionsDigitsum, "Gives the sum of the digits in a numeric variable") + ttCalculator.SetToolTip(cmdDigitsumSession, "Gives the sum of the digits, if library calculator code has been run in the current session") + ttCalculator.SetToolTip(cmdPascalSession, "Gives binomial coefficients, if the library calculator code has been run in the current session") + ttCalculator.SetToolTip(cmdDigitsqu, "Squares of digits in an integer variable") + ttCalculator.SetToolTip(cmdDigitsquSession, "Squares of digits if the library calculator code has been run in the current session") + ttCalculator.SetToolTip(cmdMASSFractionsSession, "Changes decimal dta into fractions, if the library calculator code has been run in the current session") + ttCalculator.SetToolTip(cmdDecimalsSession, "Changes fractions back to decimals if the library calculator code has been run in the current session") + ttCalculator.SetToolTip(cmdDigitssq, " Gives the ssq of the digits in a numeric variable. For example with c(12, 24, 86) gives (5, 20, 100)") + ttCalculator.SetToolTip(cmddigitssqSession, "Gives digit sum of squares, but only if the library calculator code has been run in the current sesion") + ttCalculator.SetToolTip(cmdPascal, "Gives Pascal triangles, e.g. for c(1,2,3,4) gives 1, (1,1), (1, 2, 1), (1, 3, 3, 1)") + Const strTooltipCmdLength = "number Of observations: For example length(c(1,2,3,4,NA)) = 5 " ttCalculator.SetToolTip(cmdLength, strTooltipCmdLength) ttCalculator.SetToolTip(cmdListLength, strTooltipCmdLength) @@ -592,7 +620,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() @@ -705,8 +732,34 @@ Public Class ucrCalculator Private Sub CalculationsOptions() Select Case ucrInputCalOptions.GetText + Case "Functions" + strPackageName = "ave" + grpSummary.Visible = False + grpMaths.Visible = False + grpLogical.Visible = False + grpFunctions.Visible = True + grpBasic.Visible = True + grpTestString.Visible = False + grpFactor.Visible = False + grpProbabilty.Visible = False + grpTransform.Visible = False + grpDates.Visible = False + grpCircular.Visible = False + cmdStringRHelp.Visible = False + cmdWakefieldHelp.Visible = False + grpWakefield.Visible = False + grpModifier.Visible = False + grpSymbols.Visible = False + grpHydroGOF.Visible = False + grpInteger.Visible = False + grpComplex.Visible = False + grpList.Visible = False + cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = True + Me.Size = New Size(iBasicWidth * 1.38, iBaseHeight) Case "Maths" strPackageName = "stats" + grpFunctions.Visible = False grpSummary.Visible = False grpMaths.Visible = True grpLogical.Visible = False @@ -727,9 +780,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.38, iBaseHeight) Case "Logical and Symbols" strPackageName = "base" + grpFunctions.Visible = False grpDates.Visible = False grpSummary.Visible = False grpLogical.Visible = True @@ -751,8 +806,10 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Case "Summary" strPackageName = "base" + grpFunctions.Visible = False grpDates.Visible = False grpSummary.Visible = True grpLogical.Visible = False @@ -774,8 +831,10 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Case "Text/Strings (Character Columns)" strPackageName = "stringr" + grpFunctions.Visible = False grpDates.Visible = False grpTestString.Visible = True grpFactor.Visible = False @@ -796,9 +855,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.42, iBaseHeight) Case "Factor" strPackageName = "base" + grpFunctions.Visible = False grpFactor.Visible = True grpDates.Visible = False grpSummary.Visible = False @@ -820,8 +881,10 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Case "Probability" strPackageName = "stats" + grpFunctions.Visible = False grpDates.Visible = False grpProbabilty.Visible = True grpTestString.Visible = False @@ -842,9 +905,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.57, iBaseHeight) Case "Dates/Times" strPackageName = "lubridate" + grpFunctions.Visible = False grpDates.Visible = True grpProbabilty.Visible = False grpTestString.Visible = False @@ -865,9 +930,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.32, iBaseHeight) Case "Transform" strPackageName = "dplyr" + grpFunctions.Visible = False grpDates.Visible = False grpProbabilty.Visible = False grpSummary.Visible = False @@ -888,9 +955,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.47, iBaseHeight) Case "Wakefield" strPackageName = "wakefield" + grpFunctions.Visible = False grpDates.Visible = False grpProbabilty.Visible = False grpSummary.Visible = False @@ -911,9 +980,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.8, iBaseHeight) Case "Circular" strPackageName = "circular" + grpFunctions.Visible = False grpDates.Visible = False grpProbabilty.Visible = False grpSummary.Visible = False @@ -934,9 +1005,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.39, iBaseHeight) - Case "hydroGOF" + Case "Goodness of Fit" strPackageName = "hydroGOF" + grpFunctions.Visible = False grpDates.Visible = False grpProbabilty.Visible = False grpSummary.Visible = False @@ -957,9 +1030,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.27, iBaseHeight) Case "Integer" strPackageName = "gmp" + grpFunctions.Visible = False grpSummary.Visible = False grpMaths.Visible = False grpLogical.Visible = False @@ -980,9 +1055,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.5, iBaseHeight) Case "List" strPackageName = "base" + grpFunctions.Visible = False grpSummary.Visible = False grpMaths.Visible = False grpLogical.Visible = False @@ -1003,9 +1080,11 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = True cmdRhelpList.Visible = True + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.3, iBaseHeight) Case "Complex" strPackageName = "base" + grpFunctions.Visible = False grpSummary.Visible = False grpMaths.Visible = False grpLogical.Visible = False @@ -1026,8 +1105,10 @@ Public Class ucrCalculator grpComplex.Visible = True grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Me.Size = New Size(iBasicWidth * 1.3, iBaseHeight) Case "Basic" + grpFunctions.Visible = False grpSummary.Visible = False grpMaths.Visible = False grpBasic.Visible = True @@ -1049,8 +1130,10 @@ Public Class ucrCalculator grpComplex.Visible = False grpList.Visible = False cmdRhelpList.Visible = False + cmdRhelpFunctions.Visible = False Case Else grpDates.Visible = False + grpFunctions.Visible = False Me.Size = New Size(iBasicWidth, iBaseHeight) grpProbabilty.Visible = False grpSummary.Visible = False @@ -1442,7 +1525,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 +1533,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 +1565,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 +1605,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 +1629,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 +1645,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 +1653,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 +1661,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 +2887,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) - - 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) + 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) - 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 +3620,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 +3846,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 +3878,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 +3918,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 +4424,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 +4601,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 +4644,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 +4683,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 +4745,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 +4754,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 +5107,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() @@ -5465,10 +5537,6 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pi", -1) 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) - End Sub - Private Sub cmdScale_Click(sender As Object, e As EventArgs) Handles cmdScale.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scale( , center = TRUE, scale = TRUE)", 31) @@ -5477,18 +5545,6 @@ Public Class ucrCalculator End If End Sub - Private Sub cmdMASSFractions_Click(sender As Object, e As EventArgs) Handles cmdMASSFractions.Click - If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.character(MASS::fractions( , cycles = 10, max.denominator = 2000))", 39) - Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.character(MASS::fractions( ))", 3) - End If - End Sub - - Private Sub cmdDecimals_Click(sender As Object, e As EventArgs) Handles cmdDecimals.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply(X = , FUN = function(v) {sapply(X = v,FUN = function(w) eval(parse(text=w)))})", 75) - End Sub - Private Sub cmdListLength_Click(sender As Object, e As EventArgs) Handles cmdListLength.Click ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( ,length)", 9) End Sub @@ -5720,4 +5776,284 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" [which.max( )]", 15) End If End Sub -End Class + + 'Functions keyboard + Private Sub cmdAve_Click(sender As Object, e As EventArgs) Handles cmdAve.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave( )", 2) + End If + End Sub + + Private Sub cmdAveFun_Click(sender As Object, e As EventArgs) Handles cmdAveFun.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave(x= ,FUN=function(x) mean(x, na.rm=TRUE))", 38) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave( ,FUN=mean)", 11) + End If + End Sub + + Private Sub cmdAveFac_Click(sender As Object, e As EventArgs) Handles cmdAveFac.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave(x= , )", 4) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave(, )", 3) + End If + End Sub + + Private Sub cmdAveBoth_Click(sender As Object, e As EventArgs) Handles cmdAveBoth.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave(x= , , FUN=function(x) mean(x, trim=0.1))", 39) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave( , ,FUN=mean)", 13) + End If + End Sub + + Private Sub cmdFunctionsSsq_Click(sender As Object, e As EventArgs) Handles cmdFunctionsSsq.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave(x= ,FUN= function(x) sum(x*x,na.rm=TRUE))", 39) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave( ,FUN= function(x) sum(x*x,na.rm=TRUE))", 39) + End If + End Sub + + Private Sub cmdFunctionsSsqSession_Click(sender As Object, e As EventArgs) Handles cmdFunctionsSsqSession.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ssq(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ssq( )", 2) + End If + End Sub + + Private Sub cmdCssq_Click(sender As Object, e As EventArgs) Handles cmdCssq.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave(x= ,FUN=function(x) sum((x - mean(x,na.rm=TRUE))^2,na.rm=TRUE))", 61) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ave( ,FUN=function(x) sum((x - mean(x,na.rm=TRUE))^2,na.rm=TRUE))", 61) + End If + End Sub + + Private Sub cmdCssqSession_Click(sender As Object, e As EventArgs) Handles cmdCssqSession.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cssq(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cssq( )", 2) + End If + End Sub + + Private Sub cmdPolynomial_Click(sender As Object, e As EventArgs) Handles cmdPolynomial.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("polynom::polynomial(coef= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("polynom::polynomial( )", 2) + End If + End Sub + + Private Sub cmdOrigin_Click(sender As Object, e As EventArgs) Handles cmdOrigin.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("polynom::change.origin( p= ,o= )", 6) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("polynom::change.origin(, )", 3) + End If + End Sub + + Private Sub cmdRoots_Click(sender As Object, e As EventArgs) Handles cmdRoots.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" c(polyroot(z= ),NA) ", 7) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("c(polyroot( ),NA) ", 7) + End If + End Sub + + Private Sub cmdCoeffs_Click(sender As Object, e As EventArgs) Handles cmdCoeffs.Click + Dim clsCoeffsFunction As New RFunction + + Dim dataFrameName As String = ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem + Dim DataFunctionCoeffs As String = " [1:nrow(" & dataFrameName & ")-1]" + + clsCoeffsFunction.SetPackageName("polynom") + clsCoeffsFunction.SetRCommand("poly.calc") + clsCoeffsFunction.AddParameter("s", DataFunctionCoeffs, iPosition:=0, bIncludeArgumentName:=False) + + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsCoeffsFunction.ToScript, 22) + End Sub + + Private Sub cmdProd_Click(sender As Object, e As EventArgs) Handles cmdProd.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" prod(x= , na.rm=TRUE) ", 15) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("prod( , na.rm=TRUE)", 14) + End If + End Sub + + Private Sub cmdCombn_Click(sender As Object, e As EventArgs) Handles cmdCombn.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("combn(x- ,m- ,FUN=prod, na.rm=TRUE)", 27) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("combn( , ,FUN=prod, na.rm=TRUE)", 25) + End If + End Sub + + Private Sub cmdCoef_Click(sender As Object, e As EventArgs) Handles cmdCoef.Click + Dim clsSumCoefFunction As New RFunction + Dim clsCmbnCoefFunction As New RFunction + Dim clsReFunction As New RFunction + Dim dataFrameName As String = ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem + Dim DataFunctionCoef As String = " [1:nrow(" & dataFrameName & ")-1]" + + clsReFunction.SetRCommand("Re") + clsReFunction.AddParameter("c", clsRFunctionParameter:=clsSumCoefFunction, iPosition:=0, bIncludeArgumentName:=False) + clsSumCoefFunction.SetRCommand("sum") + clsSumCoefFunction.AddParameter("s", clsRFunctionParameter:=clsCmbnCoefFunction, iPosition:=1, bIncludeArgumentName:=False) + clsCmbnCoefFunction.SetRCommand("combn") + clsCmbnCoefFunction.AddParameter("d", DataFunctionCoef, iPosition:=0, bIncludeArgumentName:=False) + clsCmbnCoefFunction.AddParameter("var", "0", iPosition:=1, bIncludeArgumentName:=False) + clsCmbnCoefFunction.AddParameter("FUN", "prod", iPosition:=2) + clsCmbnCoefFunction.AddParameter("na.rm", "TRUE", iPosition:=3) + + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsReFunction.ToScript, 49) + End Sub + + Private Sub cmdCoeffs2_Click(sender As Object, e As EventArgs) Handles cmdCoeffs2.Click + Dim clsCoeffs2Function As New RFunction + Dim clsMapFunction As New RFunction + Dim clsSumFunction As New RFunction + Dim clsCmbnFunction As New RFunction + + Dim dataFrameName As String = ucrSelectorForCalculations.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem + Dim DataFunction1 As String = "(nrow(" & dataFrameName & ")-1):0" + Dim DataFunction2 As String = " [1:nrow(" & dataFrameName & ")-1]" + + clsCoeffs2Function.AddParameter("map", clsRFunctionParameter:=clsMapFunction, iPosition:=0, bIncludeArgumentName:=False) + clsCoeffs2Function.SetRCommand("as.numeric") + clsMapFunction.SetPackageName("purrr") + clsMapFunction.SetRCommand("map") + clsMapFunction.AddParameter(".x", DataFunction1, iPosition:=0) + clsCmbnFunction.SetRCommand("combn") + clsCmbnFunction.AddParameter("k", DataFunction2, bIncludeArgumentName:=False, iPosition:=0) + clsCmbnFunction.AddParameter("var", ".x", iPosition:=1, bIncludeArgumentName:=False) + clsCmbnFunction.AddParameter("FUN", "prod", iPosition:=2) + clsSumFunction.SetRCommand("~sum") + clsSumFunction.AddParameter("y", clsRFunctionParameter:=clsCmbnFunction, iPosition:=0, bIncludeArgumentName:=False) + clsMapFunction.AddParameter(".f", clsRFunctionParameter:=clsSumFunction, iPosition:=1) + + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsCoeffs2Function.ToScript, 39) + End Sub + + Private Sub cmdDigitssqSession_Click(sender As Object, e As EventArgs) Handles cmddigitssqSession.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digitssq(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digitssq( )", 2) + End If + End Sub + + Private Sub cmdDigitssq_Click(sender As Object, e As EventArgs) Handles cmdDigitssq.Click + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( ,function(n){a<-as.integer(c(strsplit(as.character(n),split="""")[[1]])); sum(a^2)})", 83) + End Sub + + Private Sub cmdRHelpFunctions_Click(sender As Object, e As EventArgs) Handles cmdRhelpFunctions.Click, MASSFunctionsToolStripMenuItem1.Click + CalculationsOptions() + If ucrInputCalOptions.GetText = "Functions" Then + strPackageName = "MASS" + End If + OpenHelpPage() + End Sub + + Private Sub UtilsToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles UtilsToolStripMenuItem1.Click + CalculationsOptions() + If ucrInputCalOptions.GetText = "Functions" Then + strPackageName = "utils" + End If + OpenHelpPage() + End Sub + + Private Sub MASSFunctionsToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles MASSFunctionsToolStripMenuItem1.Click + CalculationsOptions() + If ucrInputCalOptions.GetText = "Functions" Then + strPackageName = "MASS" + End If + OpenHelpPage() + End Sub + + Private Sub PolynomToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PolynomToolStripMenuItem.Click + CalculationsOptions() + If ucrInputCalOptions.GetText = "Functions" Then + strPackageName = "polynom" + End If + OpenHelpPage() + End Sub + + Private Sub StatsToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles StatsToolStripMenuItem1.Click + CalculationsOptions() + If ucrInputCalOptions.GetText = "Functions" Then + strPackageName = "stats" + End If + OpenHelpPage() + 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)})})", 57) + End Sub + + Private Sub cmdPascalSession_Click(sender As Object, e As EventArgs) Handles cmdPascalSession.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pascal(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pascal( )", 2) + End If + End Sub + + Private Sub cmdDigitsqu_Click(sender As Object, e As EventArgs) Handles cmdDigitsqu.Click + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" sapply( , function(n) {a<-as.integer(c(strsplit(as.character(n), split= """")[[1]])); a^2})", 82) + End Sub + + Private Sub cmdDigitsquSession_Click(sender As Object, e As EventArgs) Handles cmdDigitsquSession.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digitsqu(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digitsqu( )", 2) + End If + End Sub + + Private Sub cmdFunctionsDigitsum_Click(sender As Object, e As EventArgs) Handles cmdFunctionsDigitsum.Click + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( , function(n){a<-as.integer(c(strsplit(as.character(n),split="""")[[1]]));sum(a)})", 81) + End Sub + + Private Sub cmdDigitsumSession_Click(sender As Object, e As EventArgs) Handles cmdDigitsumSession.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digitsum(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digitsum( )", 2) + End If + End Sub + + Private Sub cmdMASSFractions_Click(sender As Object, e As EventArgs) Handles cmdMASSFractions.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.character(MASS::fractions( , cycles = 10, max.denominator = 2000))", 40) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.character(MASS::fractions( ))", 3) + End If + End Sub + + Private Sub cmdMASSFractionsSession_Click(sender As Object, e As EventArgs) Handles cmdMASSFractionsSession.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("fractions(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("fractions( )", 2) + End If + End Sub + + Private Sub cmdDecimals_Click(sender As Object, e As EventArgs) Handles cmdDecimals.Click + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply(X = , FUN = function(v) {sapply(X = v,FUN = function(w) eval(parse(text=w)))})", 75) + End Sub + + Private Sub cmdDecimalsSession_Click(sender As Object, e As EventArgs) Handles cmdDecimalsSession.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("decimals(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("decimals( )", 2) + End If + End Sub +End Class \ No newline at end of file