diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 5d7b85b05a3..9d1250831aa 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)" @@ -294,6 +294,8 @@ Public Class clsDataFramePage columnHeader.strTypeShortCode = "(CX)" ElseIf strHeaderType.Contains("sfc_MULTIPOLYGON") OrElse strHeaderType.Contains("sfc") Then columnHeader.strTypeShortCode = "(G)" + ElseIf strHeaderType.Contains("Timeseries") OrElse strHeaderType.Contains("ts") Then + columnHeader.strTypeShortCode = "(TS)" ' Types of data for specific Application areas e.g. survival are coded with "(A)" ' No examples implemented yet. 'ElseIf strType.Contains() Then diff --git a/instat/Model/Output/clsOutputLogger.vb b/instat/Model/Output/clsOutputLogger.vb index 9905d4c7ea3..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/clsRLink.vb b/instat/clsRLink.vb index 4a686600ca7..dd664f4f927 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -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, + ' Add output to logger + clsOutputLogger.AddOutput(clsRStatement.Text, strOutput, bAsFile:=True, bDisplayOutputInExternalViewer:=clsRStatement.TextNoFormatting.StartsWith("view_object_data")) - Next - Else - ' 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 @@ -1447,6 +1420,8 @@ Public Class RLink clsGetItems.SetRCommand(strInstatDataObject & "$get_link_names") Case "key" clsGetItems.SetRCommand(strInstatDataObject & "$get_key_names") + Case "scalar" + clsGetItems.SetRCommand(strInstatDataObject & "$get_scalar_names") Case "database_variables" clsGetItems.SetRCommand(strInstatDataObject & "$get_database_variable_names") clsGetItems.AddParameter("query", Chr(34) & strDatabaseQuery & Chr(34)) diff --git a/instat/clsRSyntax.vb b/instat/clsRSyntax.vb index c73283a7497..962d041bf4a 100644 --- a/instat/clsRSyntax.vb +++ b/instat/clsRSyntax.vb @@ -309,8 +309,8 @@ Public Class RSyntax 'Sometimes the output of the R-command we deal with should not be part of the script... 'That's only the case when this output has already been assigned. If (bUseBaseFunction AndAlso clsBaseFunction.IsAssigned()) OrElse - (bUseBaseOperator AndAlso clsBaseFunction.IsAssigned()) OrElse - (bUseCommandString AndAlso clsBaseFunction.IsAssigned()) Then + (bUseBaseOperator AndAlso clsBaseOperator.IsAssigned()) OrElse + (bUseCommandString AndAlso clsBaseCommandString.IsAssigned()) Then Return strScript End If End If diff --git a/instat/dlgAddKey.vb b/instat/dlgAddKey.vb index ea59b4c312d..bec1acced22 100644 --- a/instat/dlgAddKey.vb +++ b/instat/dlgAddKey.vb @@ -138,9 +138,9 @@ Public Class dlgAddKey Private Sub SetHelpOptions() Select Case enumAddkeyMode Case AddkeyMode.Prepare - ucrBase.iHelpTopicID = 416 + ucrBase.iHelpTopicID = 504 Case AddkeyMode.Climatic - ucrBase.iHelpTopicID = 424 + ucrBase.iHelpTopicID = 611 End Select End Sub diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index 011f33a91c3..4f7f6cc316e 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -224,7 +224,7 @@ Public Class dlgBarAndPieChart ucrReceiverWordcloudAngle.Selector = ucrBarChartSelector ucrSaveBar.SetIsComboBox() - ucrSaveBar.SetCheckBoxText("Save Graph") + ucrSaveBar.SetCheckBoxText("Store Graph") ucrSaveBar.SetDataFrameSelector(ucrBarChartSelector.ucrAvailableDataFrames) ucrSaveBar.SetSaveTypeAsGraph() ucrSaveBar.SetPrefix("bar_plot") diff --git a/instat/dlgBoxPlot.vb b/instat/dlgBoxPlot.vb index d0f7c6a00a0..4b478348a95 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) @@ -198,7 +198,7 @@ Public Class dlgBoxplot ucrSaveBoxplot.SetPrefix("box_plot") ucrSaveBoxplot.SetIsComboBox() - ucrSaveBoxplot.SetCheckBoxText("Save Graph") + ucrSaveBoxplot.SetCheckBoxText("Store Graph") ucrSaveBoxplot.SetSaveTypeAsGraph() ucrSaveBoxplot.SetDataFrameSelector(ucrSelectorBoxPlot.ucrAvailableDataFrames) ucrSaveBoxplot.SetAssignToIfUncheckedValue("last_graph") @@ -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 73f2c715b79..52822e1cdf7 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -18,16 +18,24 @@ Imports System.ComponentModel Imports instat.Translations Public Class dlgCalculator + Public enumCalculatorMode As String = CalculatorMode.Prepare + Public Enum CalculatorMode + Prepare + Structured + End Enum + Private clsAttachFunction As New RFunction Private clsDetachFunction As New RFunction Private clsRemoveLabelsFunction As New RFunction + Private clsScalarsDataFuntion, clsAddScalarFunction As New RFunction + Private clsAttachScalarsFunction, clsDetachScalarsFunction As New RFunction Public bFirstLoad As Boolean = True Public iHelpCalcID As Integer 'holds the original width of the form 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 = {"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer"} + 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 @@ -35,15 +43,15 @@ Public Class dlgCalculator iBasicWidth = Me.Width SetDefaults() bFirstLoad = False - Else - ReopenDialog() End If + SetHelpOptions() + ReopenDialog() TestOKEnabled() autoTranslate(Me) End Sub Private Sub TestOKEnabled() - ucrBase.OKEnabled(Not ucrCalc.ucrReceiverForCalculation.IsEmpty AndAlso ucrCalc.ucrSaveResultInto.IsComplete) + ucrBase.OKEnabled(Not ucrCalc.ucrReceiverForCalculation.IsEmpty) End Sub Private Sub SetDefaults() @@ -54,6 +62,8 @@ Public Class dlgCalculator ucrCalc.ucrSaveResultInto.Reset() ucrCalc.ucrSaveResultInto.ucrChkSave.Checked = True ucrCalc.chkShowParameters.Checked = False + ucrCalc.ucrChkStoreScalar.Checked = False + ucrCalc.ucrSelectorForCalculations.ResetCheckBoxScalar() ucrCalc.ucrSaveResultInto.SetRCode(ucrBase.clsRsyntax.clsBaseCommandString) SaveResults() ucrCalc.ucrSelectorForCalculations.bUseCurrentFilter = False @@ -65,18 +75,28 @@ Public Class dlgCalculator bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore, bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength) ucrBase.Visible = True + SetHelpOptions() End Sub Private Sub ReopenDialog() SaveResults() + ucrCalc.ucrSelectorForCalculations.ShowCheckBoxScalar(True) + ucrCalc.ucrChkStoreScalar.Checked = False End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 14 ucrCalc.ucrReceiverForCalculation.SetMeAsReceiver() ucrCalc.ucrTryCalculator.SetIsCommand() ucrCalc.ucrTryCalculator.SetReceiver(ucrCalc.ucrReceiverForCalculation) + ucrCalc.ucrSelectorForCalculations.SetItemType("column") + ucrCalc.ucrReceiverForCalculation.strSelectorHeading = "Variables" + + clsAddScalarFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_scalar") + + clsScalarsDataFuntion.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_scalars") + clsScalarsDataFuntion.SetAssignTo("scalars") + clsRemoveLabelsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$append_to_variables_metadata") clsRemoveLabelsFunction.AddParameter("property", Chr(34) & "labels" & Chr(34), iPosition:=2) clsRemoveLabelsFunction.AddParameter("new_val", Chr(34) & Chr(34), iPosition:=3) @@ -84,21 +104,49 @@ Public Class dlgCalculator clsAttachFunction.SetRCommand("attach") clsDetachFunction.SetRCommand("detach") clsAttachFunction.AddParameter("what", clsRFunctionParameter:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.clsCurrDataFrame) - clsDetachFunction.AddParameter("name", clsRFunctionParameter:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.clsCurrDataFrame) clsDetachFunction.AddParameter("unload", "TRUE") + + clsAttachScalarsFunction.SetRCommand("attach") + clsDetachScalarsFunction.SetRCommand("detach") + clsAttachScalarsFunction.AddParameter("what", clsRFunctionParameter:=clsScalarsDataFuntion) + clsDetachScalarsFunction.AddParameter("name", "scalars") + clsDetachScalarsFunction.AddParameter("unload", "TRUE") + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachFunction, 0) - ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) + + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 1) + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) + ucrBase.clsRsyntax.SetCommandString("") ucrCalc.ucrSaveResultInto.SetPrefix("calc") ucrCalc.ucrSaveResultInto.SetSaveTypeAsColumn() ucrCalc.ucrSaveResultInto.SetIsComboBox() - ucrCalc.ucrSaveResultInto.SetCheckBoxText("Save Result") + ucrCalc.ucrSaveResultInto.SetCheckBoxText("Store Result") ucrCalc.ucrSaveResultInto.SetAssignToIfUncheckedValue("last_calc") ucrCalc.ucrSaveResultInto.SetDataFrameSelector(ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames) ucrCalc.ucrTryCalculator.StrvecOutputRequired() + AddHandler ucrCalc.ucrSelectorForCalculations.checkBoxScalar.CheckedChanged, AddressOf checkBoxScalar_CheckedChanged + + End Sub + + Private Sub checkBoxScalar_CheckedChanged() + SetItemType() + End Sub + + Private Sub SetItemType() + If Not String.IsNullOrEmpty(ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame) Then + If ucrCalc.ucrSelectorForCalculations.checkBoxScalar.Checked Then + ucrCalc.ucrReceiverForCalculation.strSelectorHeading = "Scalars" + ucrCalc.ucrSelectorForCalculations.SetItemType("scalar") + Else + ucrCalc.ucrReceiverForCalculation.strSelectorHeading = "Variables" + ucrCalc.ucrSelectorForCalculations.SetItemType("column") + End If + End If End Sub Public Sub SetDefaultKeyboard(strNewDefaultKeyboard As String) @@ -112,7 +160,6 @@ Public Class dlgCalculator Private Sub ucrCalc_SaveNameChanged() Handles ucrCalc.SaveNameChanged SaveResults() - TestOKEnabled() End Sub Private Sub ucrCalc_ControlValueChanged() Handles ucrCalc.ControlValueChanged @@ -125,7 +172,7 @@ Public Class dlgCalculator Private Sub SaveResults() If ucrCalc.ucrSaveResultInto.ucrChkSave.Checked AndAlso ucrCalc.ucrSaveResultInto.IsComplete Then clsRemoveLabelsFunction.AddParameter("col_names", Chr(34) & ucrCalc.ucrSaveResultInto.GetText() & Chr(34), iPosition:=1) - ucrBase.clsRsyntax.AddToAfterCodes(clsRemoveLabelsFunction, 1) + ucrBase.clsRsyntax.AddToAfterCodes(clsRemoveLabelsFunction, 3) ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = True ucrBase.clsRsyntax.iCallType = 0 Else @@ -134,7 +181,43 @@ Public Class dlgCalculator ucrBase.clsRsyntax.iCallType = 5 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False End If + ManageScalarStorage() + End Sub + + Private Sub ManageScalarStorage() + + Dim dataFrameName As String = ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame + + ' Check if scalar should be stored + If ucrCalc.ucrChkStoreScalar.Checked AndAlso Not ucrCalc.ucrReceiverForCalculation.IsEmpty _ + AndAlso ucrCalc.ucrSaveResultInto.GetText <> "" _ + AndAlso Not String.IsNullOrEmpty(dataFrameName) Then + Dim strResut As String = ucrCalc.ucrSaveResultInto.GetText + clsAddScalarFunction.AddParameter("scalar_name", Chr(34) & strResut & Chr(34), iPosition:=1) + clsAddScalarFunction.AddParameter("scalar_value", strResut, iPosition:=2) + ucrBase.clsRsyntax.AddToAfterCodes(clsAddScalarFunction, 0) + ucrBase.clsRsyntax.SetAssignTo(strResut) + ucrCalc.ucrSaveResultInto.btnColumnPosition.Enabled = False + ucrCalc.ucrSaveResultInto.btnColumnPosition.Visible = True + ucrCalc.ucrSaveResultInto.ucrChkSave.Checked = False + ucrCalc.ucrSaveResultInto.ucrChkSave.Enabled = False + ucrCalc.ucrSaveResultInto.ucrInputComboSave.Visible = True + ucrCalc.ucrSaveResultInto.ucrInputComboSave.Enabled = True + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsAddScalarFunction) + ucrCalc.ucrSaveResultInto.btnColumnPosition.Enabled = True + ucrCalc.ucrSaveResultInto.btnColumnPosition.Visible = True + ucrCalc.ucrSaveResultInto.ucrChkSave.Enabled = True + ucrCalc.ucrSaveResultInto.ucrInputComboSave.Visible = True + ucrCalc.ucrSaveResultInto.ucrInputComboSave.Enabled = True + + End If + + ' Update command string and clear input try message name + ucrBase.clsRsyntax.SetCommandString(ucrCalc.ucrReceiverForCalculation.GetVariableNames(False)) + ' Test if OK button can be enabled + TestOKEnabled() End Sub Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk @@ -142,13 +225,56 @@ Public Class dlgCalculator End Sub Private Sub ucrCalc_SelectionChanged() Handles ucrCalc.SelectionChanged - ucrBase.clsRsyntax.SetCommandString(ucrCalc.ucrReceiverForCalculation.GetVariableNames(False)) - ucrCalc.ucrTryCalculator.ucrInputTryMessage.SetName("") + ucrCalc.ucrChkStoreScalar.Checked = False + ManageScalarStorage() + SaveResults() TestOKEnabled() End Sub Private Sub ucrSelectorForCalculation_DataframeChanged() Handles ucrCalc.DataFrameChanged - clsRemoveLabelsFunction.AddParameter("data_name", Chr(34) & ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame & Chr(34), iPosition:=0) + If Not String.IsNullOrEmpty(ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame) Then + Dim strDataFrame As String = ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame + ucrCalc.ucrTryCalculator.ucrInputTryMessage.SetName("") + clsScalarsDataFuntion.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34)) + clsDetachFunction.AddParameter("name", strDataFrame) + clsAddScalarFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) + clsRemoveLabelsFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) + SaveResults() + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachFunction, 0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) + + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 1) + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) + ucrCalc.ucrSaveResultInto.Enabled = True + ucrCalc.ucrChkStoreScalar.Visible = True + Else + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachFunction) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachScalarsFunction) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDetachFunction) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDetachScalarsFunction) + ucrCalc.ucrSelectorForCalculations.ResetCheckBoxScalar() + ucrCalc.ucrSaveResultInto.Enabled = False + ucrCalc.ucrChkStoreScalar.Visible = False + ucrCalc.ucrChkStoreScalar.Checked = False + End If + End Sub + + Private Sub SetHelpOptions() + Select Case enumCalculatorMode + Case CalculatorMode.Prepare + ucrBase.iHelpTopicID = 14 + Case CalculatorMode.Structured + ucrCalc.ucrInputCalOptions.SetName("Circular") + ucrBase.iHelpTopicID = 677 + End Select + End Sub + + Private Sub ucrCalc_Click() Handles ucrCalc.CheckBoxClick + ManageScalarStorage() + End Sub + + Private Sub ucrCalc_ClearClick() Handles ucrCalc.ClearClick + ucrCalc.ucrChkStoreScalar.Checked = False End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -158,6 +284,9 @@ Public Class dlgCalculator Private Sub ucrInputCalOptions_NameChanged() Handles ucrCalc.NameChanged Select Case ucrCalc.ucrInputCalOptions.GetText + Case "Functions" + Me.Width = iBasicWidth * 1.4 + ucrBase.iHelpTopicID = 167 Case "Maths" Me.Width = iBasicWidth * 1.38 ucrBase.iHelpTopicID = 126 @@ -194,7 +323,7 @@ Public Class dlgCalculator Me.Width = iBasicWidth * 2.56 Case "Goodness of Fit" Me.Width = iBasicWidth * 1.27 - ucrBase.iHelpTopicID = 598 + ucrBase.iHelpTopicID = 717 Case "Integer" Me.Width = iBasicWidth * 1.5 ucrBase.iHelpTopicID = 463 @@ -208,11 +337,6 @@ Public Class dlgCalculator Me.Width = iBasicWidth End Select End Sub - - Private Sub ucrSelectorForCalculations_DataframeChanged() Handles ucrCalc.DataFrameChanged - ucrCalc.ucrTryCalculator.ucrInputTryMessage.SetName("") - SaveResults() - End Sub End Class diff --git a/instat/dlgCanonicalCorrelationAnalysis.vb b/instat/dlgCanonicalCorrelationAnalysis.vb index af5bbb0335c..f7dab3ff36a 100644 --- a/instat/dlgCanonicalCorrelationAnalysis.vb +++ b/instat/dlgCanonicalCorrelationAnalysis.vb @@ -66,7 +66,7 @@ Public Class dlgCanonicalCorrelationAnalysis ucrSaveResult.SetSaveType(RObjectTypeLabel.Model, strRObjectFormat:=RObjectFormat.Text) ucrSaveResult.SetDataFrameSelector(ucrSelectorCCA.ucrAvailableDataFrames) ucrSaveResult.SetIsComboBox() - ucrSaveResult.SetCheckBoxText("Save Model") + ucrSaveResult.SetCheckBoxText("Store Model") ucrSaveResult.SetAssignToIfUncheckedValue("last_model") End Sub diff --git a/instat/dlgCircular.vb b/instat/dlgCircular.vb index 18d089f3a7a..2779e920ae3 100644 --- a/instat/dlgCircular.vb +++ b/instat/dlgCircular.vb @@ -32,7 +32,7 @@ Public Class dlgCircular End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID = 520 + ucrBase.iHelpTopicID = 175 ucrReceiverCircular.Selector = ucrSelectorCircular ucrReceiverCircular.SetMeAsReceiver() diff --git a/instat/dlgCircularDensityPlot.vb b/instat/dlgCircularDensityPlot.vb index 7861799a9ab..33561bf1c09 100644 --- a/instat/dlgCircularDensityPlot.vb +++ b/instat/dlgCircularDensityPlot.vb @@ -103,7 +103,7 @@ Public Class dlgCircularDensityPlot ucrSaveDensity.SetPrefix("circular_density") ucrSaveDensity.SetDataFrameSelector(ucrSelectorDataFrame.ucrAvailableDataFrames) ucrSaveDensity.SetIsComboBox() - ucrSaveDensity.SetCheckBoxText("Save Graph") + ucrSaveDensity.SetCheckBoxText("Store Graph") ucrSaveDensity.SetSaveTypeAsGraph() ucrSaveDensity.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgClimaticBoxPlot.vb b/instat/dlgClimaticBoxPlot.vb index c8874b72be6..b4ab4385bf2 100644 --- a/instat/dlgClimaticBoxPlot.vb +++ b/instat/dlgClimaticBoxPlot.vb @@ -200,7 +200,7 @@ Public Class dlgClimaticBoxPlot ucrSavePlot.SetPrefix("box_plot") ucrSavePlot.SetIsComboBox() - ucrSavePlot.SetCheckBoxText("Save Graph") + ucrSavePlot.SetCheckBoxText("Store Graph") ucrSavePlot.SetSaveTypeAsGraph() ucrSavePlot.SetDataFrameSelector(ucrSelectorClimaticBoxPlot.ucrAvailableDataFrames) ucrSavePlot.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgClimaticStationMaps.vb b/instat/dlgClimaticStationMaps.vb index 7d27f489804..d1be62a0b98 100644 --- a/instat/dlgClimaticStationMaps.vb +++ b/instat/dlgClimaticStationMaps.vb @@ -120,7 +120,7 @@ Public Class dlgClimaticStationMaps ucrSaveMap.SetPrefix("map") ucrSaveMap.SetSaveTypeAsGraph() ucrSaveMap.SetIsComboBox() - ucrSaveMap.SetCheckBoxText("Save Map") + ucrSaveMap.SetCheckBoxText("Store Map") ucrSaveMap.SetAssignToIfUncheckedValue("last_map") ucrSaveMap.SetDataFrameSelector(ucrSelectorOutline.ucrAvailableDataFrames) diff --git a/instat/dlgClimdexIndices.vb b/instat/dlgClimdexIndices.vb index 991cc3ee222..613ef424cc8 100644 --- a/instat/dlgClimdexIndices.vb +++ b/instat/dlgClimdexIndices.vb @@ -101,7 +101,7 @@ Public Class dlgClimdexIndices ucrPnlAnnualMonthly.SetRDefault(Chr(34) & "annual" & Chr(34)) ucrPnlAnnualMonthly.AddToLinkedControls({ucrReceiverMonth}, {rdoMonthly}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkSave.SetText("Save Indices") + ucrChkSave.SetText("Store Indices") ucrChkSave.bChangeParameterValue = False End Sub diff --git a/instat/dlgCluster.vb b/instat/dlgCluster.vb index a6b090c6139..724e58ea15e 100644 --- a/instat/dlgCluster.vb +++ b/instat/dlgCluster.vb @@ -111,7 +111,7 @@ Public Class dlgCluster ucrSaveDistance.SetSaveTypeAsDataFrame() ucrSaveDistance.SetDataFrameSelector(ucrSelectorPrepareData.ucrAvailableDataFrames) - ucrSaveDistance.SetCheckBoxText("Save Result:") + ucrSaveDistance.SetCheckBoxText("Store Result:") ucrSaveDistance.SetPrefix("distance") ucrSaveDistance.SetIsComboBox() ucrSaveDistance.SetAssignToIfUncheckedValue("last_distance") diff --git a/instat/dlgClusterAnalysis.vb b/instat/dlgClusterAnalysis.vb index 328bd682f89..67ee63a0125 100644 --- a/instat/dlgClusterAnalysis.vb +++ b/instat/dlgClusterAnalysis.vb @@ -119,7 +119,7 @@ Public Class dlgClusterAnalysis ucrSaveGraph.SetPrefix("Cluster_plot") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorClusterData.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgCombineforGraphics.vb b/instat/dlgCombineforGraphics.vb index df1997762ac..c7cb3855f09 100644 --- a/instat/dlgCombineforGraphics.vb +++ b/instat/dlgCombineforGraphics.vb @@ -48,7 +48,7 @@ Public Class dlgCombineforGraphics ucrSave.SetPrefix("combined_graph") ucrSave.SetDataFrameSelector(ucrCombineGraphSelector.ucrAvailableDataFrames) ucrSave.SetSaveType(strRObjectType:=RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) - ucrSave.SetCheckBoxText("Save Graph") + ucrSave.SetCheckBoxText("Store Graph") ucrSave.SetIsComboBox() ucrSave.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgCompareColumns.vb b/instat/dlgCompareColumns.vb index b1336fb1939..38838c9e50f 100644 --- a/instat/dlgCompareColumns.vb +++ b/instat/dlgCompareColumns.vb @@ -114,7 +114,7 @@ Public Class dlgCompareColumns ucrSaveLogical.SetLabelText("New Column Name:") - ucrSaveLogical.SetLabelText("Save result for second column:") + ucrSaveLogical.SetLabelText("Store result for second column:") ucrSaveLogical.setLinkedReceiver(ucrReceiverSecond) ucrBase.clsRsyntax.iCallType = 2 diff --git a/instat/dlgCompareTreatmentLines.vb b/instat/dlgCompareTreatmentLines.vb index 4f464a8dd99..d73b112418a 100644 --- a/instat/dlgCompareTreatmentLines.vb +++ b/instat/dlgCompareTreatmentLines.vb @@ -156,7 +156,7 @@ Public Class dlgCompareTreatmentLines ucrSavePlot.SetPrefix("two_options") ucrSavePlot.SetIsComboBox() - ucrSavePlot.SetCheckBoxText("Save Graph") + ucrSavePlot.SetCheckBoxText("Store Graph") ucrSavePlot.SetSaveTypeAsGraph() ucrSavePlot.SetDataFrameSelector(ucrSelectorPlot.ucrAvailableDataFrames) ucrSavePlot.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgConditionalQuantilePlot.vb b/instat/dlgConditionalQuantilePlot.vb index e3ceb9deef0..5a22b4e399d 100644 --- a/instat/dlgConditionalQuantilePlot.vb +++ b/instat/dlgConditionalQuantilePlot.vb @@ -131,7 +131,7 @@ Public Class dlgConditionalQuantilePlot ucrReceiverType.SetLinkedDisplayControl(lblType) ucrSavePlot.SetPrefix("cond_quantile_plot") - ucrSavePlot.SetCheckBoxText("Save Graph") + ucrSavePlot.SetCheckBoxText("Store Graph") ucrSavePlot.SetIsComboBox() ucrSavePlot.SetSaveTypeAsGraph() ucrSavePlot.SetDataFrameSelector(ucrConditionalQuantilePlotSelector.ucrAvailableDataFrames) diff --git a/instat/dlgCorrelation.vb b/instat/dlgCorrelation.vb index a9a743c7292..332b92185c1 100644 --- a/instat/dlgCorrelation.vb +++ b/instat/dlgCorrelation.vb @@ -16,6 +16,12 @@ Imports instat.Translations Public Class dlgCorrelation + Public Enum DefaultSequenceOption + MultipleOption + TwoVariableOption + ClimaticOption + End Enum + Private bFirstload As Boolean = True Private bReset As Boolean = True Private bRcodeSet As Boolean = True @@ -30,17 +36,13 @@ Public Class dlgCorrelation Private clsNotOperator As New ROperator Private clsRGGscatMatricReverseOperator As New ROperator Private strColFunction As String - Private enumDefaultSequenceOption As DefaultSequenceOption = DefaultSequenceOption.MultipleOption + Public enumDefaultSequenceOption As DefaultSequenceOption = DefaultSequenceOption.MultipleOption Private bDefaultOptionChanged As Boolean = False Private bResetSubdialog As Boolean = False Public strDefaultDataFrame As String = "" Public strDefaultColumns() As String = Nothing Public mnuCurrent As ToolStripMenuItem - Private Enum DefaultSequenceOption - MultipleOption - TwoVariableOption - End Enum Private Sub dlgCorrelation_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then InitialiseDialog() @@ -67,6 +69,8 @@ Public Class dlgCorrelation rdoMultipleColumns.Checked = True Case DefaultSequenceOption.TwoVariableOption rdoTwoColumns.Checked = True + Case DefaultSequenceOption.ClimaticOption + rdoMultipleColumns.Checked = True End Select End Sub @@ -76,6 +80,7 @@ Public Class dlgCorrelation Public Sub SetMultipleSequenceAsDefaultOption() enumDefaultSequenceOption = DefaultSequenceOption.MultipleOption bDefaultOptionChanged = True + ucrBase.iHelpTopicID = 421 End Sub ''' @@ -84,7 +89,15 @@ Public Class dlgCorrelation Public Sub SetTwoVariableSequenceAsDefaultOption() enumDefaultSequenceOption = DefaultSequenceOption.TwoVariableOption bDefaultOptionChanged = True + ucrBase.iHelpTopicID = 153 + End Sub + + Public Sub SetClimaticAsDefaultOption() + enumDefaultSequenceOption = DefaultSequenceOption.ClimaticOption + bDefaultOptionChanged = True + ucrBase.iHelpTopicID = 637 End Sub + Private Sub InitialiseDialog() Dim dctNaPrint As New Dictionary(Of String, String) Dim dctDiagonal As New Dictionary(Of String, String) @@ -579,7 +592,7 @@ Public Class dlgCorrelation If rdoAsText.Checked Then clsDummyFunction.AddParameter("output", "as.table", iPosition:=2) ucrSaveCorrelation.SetSaveType(strRObjectType:=RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text) - ucrSaveCorrelation.SetCheckBoxText("Save Table") + ucrSaveCorrelation.SetCheckBoxText("Store Table") ucrSaveCorrelation.SetPrefix("summary_table") ucrSaveCorrelation.SetAssignToIfUncheckedValue("last_table") clsPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", @@ -591,14 +604,14 @@ Public Class dlgCorrelation clsDummyFunction.AddParameter("output", "as.dataframe", iPosition:=2) clsPipeOperator.RemoveAssignTo() ucrSaveCorrelation.SetSaveTypeAsDataFrame() - ucrSaveCorrelation.SetCheckBoxText("Save Data Frame") + ucrSaveCorrelation.SetCheckBoxText("Store Data Frame") ucrSaveCorrelation.SetPrefix("data_frame") ucrSaveCorrelation.SetAssignToIfUncheckedValue("last_dataframe") End If Else ucrSaveCorrelation.SetSaveType(strRObjectType:=RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text) - ucrSaveCorrelation.SetCheckBoxText("Save Table") + ucrSaveCorrelation.SetCheckBoxText("Store Table") ucrSaveCorrelation.SetPrefix("summary_table") ucrSaveCorrelation.SetAssignToIfUncheckedValue("last_table") clsCorrelationFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", @@ -610,7 +623,7 @@ Public Class dlgCorrelation Else ucrSaveCorrelation.SetSaveType(strRObjectType:=RObjectTypeLabel.Model, strRObjectFormat:=RObjectFormat.Text) - ucrSaveCorrelation.SetCheckBoxText("Save Model") + ucrSaveCorrelation.SetCheckBoxText("Store Model") ucrSaveCorrelation.SetPrefix("summary_model") ucrSaveCorrelation.SetAssignToIfUncheckedValue("last_model") clsCorrelationTestFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_model", diff --git a/instat/dlgCountryColouredMap.vb b/instat/dlgCountryColouredMap.vb index 10e97e2f2e0..ccea8029c23 100644 --- a/instat/dlgCountryColouredMap.vb +++ b/instat/dlgCountryColouredMap.vb @@ -92,7 +92,7 @@ Public Class dlgCountryColouredMap ucrSaveMap.SetPrefix("Map") ucrSaveMap.SetSaveTypeAsGraph() ucrSaveMap.SetIsComboBox() - ucrSaveMap.SetCheckBoxText("Save Graph") + ucrSaveMap.SetCheckBoxText("Store Graph") ucrSaveMap.SetAssignToIfUncheckedValue("last_graph") ucrSaveMap.SetDataFrameSelector(ucrSelectorCountryColouredMap.ucrAvailableDataFrames) End Sub diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb index cd123316452..f6f326a7f47 100644 --- a/instat/dlgCumulativeDistribution.vb +++ b/instat/dlgCumulativeDistribution.vb @@ -164,7 +164,7 @@ Public Class dlgCumulativeDistribution ucrSaveCumDist.SetSaveTypeAsGraph() ucrSaveCumDist.SetDataFrameSelector(ucrCumDistSelector.ucrAvailableDataFrames) - ucrSaveCumDist.SetCheckBoxText("Save Graph") + ucrSaveCumDist.SetCheckBoxText("Store Graph") ucrSaveCumDist.SetIsComboBox() ucrSaveCumDist.SetPrefix("cumulative_dist") ucrSaveCumDist.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgDeleteObjects.vb b/instat/dlgDeleteObjects.vb index fa78b766a2c..85aa409d968 100644 --- a/instat/dlgDeleteObjects.vb +++ b/instat/dlgDeleteObjects.vb @@ -51,6 +51,7 @@ Public Class dlgDeleteObjects dctTypes.Add("Filters", Chr(34) & "filter" & Chr(34)) dctTypes.Add("Column selections", Chr(34) & "column_selection" & Chr(34)) dctTypes.Add("Calculations", Chr(34) & "calculation" & Chr(34)) + dctTypes.Add("Scalars", Chr(34) & "scalar" & Chr(34)) ucrInputComboType.SetItems(dctTypes) ucrInputComboType.SetDropDownStyleAsNonEditable() @@ -58,9 +59,6 @@ Public Class dlgDeleteObjects ucrReceiverObjectsToDelete.SetParameterIsString() ucrReceiverObjectsToDelete.Selector = ucrSelectorDeleteObject ucrReceiverObjectsToDelete.SetMeAsReceiver() - - - End Sub Private Sub SetDefaults() diff --git a/instat/dlgDescribeTwoVarGraph.vb b/instat/dlgDescribeTwoVarGraph.vb index 00169a986fe..082a787de78 100644 --- a/instat/dlgDescribeTwoVarGraph.vb +++ b/instat/dlgDescribeTwoVarGraph.vb @@ -274,7 +274,7 @@ Public Class dlgDescribeTwoVarGraph ucrSaveGraph.SetPrefix("two_var") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorTwoVarGraph.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 72f32dd229a..e0234ea7e9f 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -60,25 +60,32 @@ Partial Class dlgDescribeTwoVariable Me.cmdSummaries = New System.Windows.Forms.Button() Me.lblMarginName = New System.Windows.Forms.Label() Me.grpDisplay = New System.Windows.Forms.GroupBox() - Me.lblFactorAsPercentage = New System.Windows.Forms.Label() + Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() + Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() + Me.rdoOCol = New System.Windows.Forms.RadioButton() + Me.rdoOCell = New System.Windows.Forms.RadioButton() + Me.rdoORow = New System.Windows.Forms.RadioButton() + Me.ucrpnlPercent = New instat.UcrPanel() + Me.ucrReceiverPercentages = New instat.ucrReceiverSingle() + Me.ucrReceiverThreeVariableSecondFactor = New instat.ucrReceiverSingle() + Me.ucrReceiverSecondTwoVariableFactor = New instat.ucrReceiverSingle() + Me.ucrReceiverThreeVariableThirdVariable = New instat.ucrReceiverSingle() Me.ucrReceiverFirstVars = New instat.ucrReceiverMultiple() Me.ucrSaveTable = New instat.ucrSave() - Me.ucrChkPercentageProportion = New instat.ucrCheck() - Me.ucrReceiverPercentages = New instat.ucrReceiverSingle() - Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.ucrInputMarginName = New instat.ucrInputTextBox() Me.ucrReorderSummary = New instat.ucrReorder() - Me.ucrChkDisplayMargins = New instat.ucrCheck() Me.ucrBase = New instat.ucrButtons() - Me.ucrReceiverThreeVariableThirdVariable = New instat.ucrReceiverSingle() Me.ucrReceiverSecondSkimrGroupByFactor = New instat.ucrReceiverSingle() - Me.ucrReceiverSecondTwoVariableFactor = New instat.ucrReceiverSingle() Me.ucrSelectorDescribeTwoVar = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrPnlDescribe = New instat.UcrPanel() - Me.ucrReceiverThreeVariableSecondFactor = New instat.ucrReceiverSingle() Me.ucrReceiverSkimrGroupByFactor = New instat.ucrReceiverSingle() - Me.ucrChkOmitMissing = New instat.ucrCheck() Me.ucrChkSummariesRowCol = New instat.ucrCheck() + Me.ucrChkMeans = New instat.ucrCheck() + Me.ucrChkDisplayMargins = New instat.ucrCheck() + Me.ucrChkSwapXYVar = New instat.ucrCheck() + Me.ucrChkCorrelations = New instat.ucrCheck() + Me.ucrChkLevSig = New instat.ucrCheck() + Me.ucrChkOmitMissing = New instat.ucrCheck() Me.grpSummaries.SuspendLayout() Me.grpDisplay.SuspendLayout() Me.SuspendLayout() @@ -92,7 +99,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) - Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoThreeVariable.Name = "rdoThreeVariable" Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) Me.rdoThreeVariable.TabIndex = 3 @@ -102,9 +109,10 @@ Partial Class dlgDescribeTwoVariable ' 'cmdFormatTable ' + Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdFormatTable.Location = New System.Drawing.Point(489, 634) - Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4) Me.cmdFormatTable.Name = "cmdFormatTable" Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) Me.cmdFormatTable.TabIndex = 23 @@ -125,8 +133,8 @@ Partial Class dlgDescribeTwoVariable 'cmdMissingOptions ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMissingOptions.Location = New System.Drawing.Point(250, 444) - Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdMissingOptions.Location = New System.Drawing.Point(539, 439) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4) Me.cmdMissingOptions.Name = "cmdMissingOptions" Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) Me.cmdMissingOptions.TabIndex = 21 @@ -166,9 +174,9 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) Me.grpSummaries.Location = New System.Drawing.Point(16, 328) - Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4) Me.grpSummaries.Size = New System.Drawing.Size(315, 108) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False @@ -267,7 +275,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoSkim.Location = New System.Drawing.Point(142, 12) - Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4) Me.rdoSkim.Name = "rdoSkim" Me.rdoSkim.Size = New System.Drawing.Size(150, 42) Me.rdoSkim.TabIndex = 1 @@ -306,7 +314,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) - Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoTwoVariable.Name = "rdoTwoVariable" Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) Me.rdoTwoVariable.TabIndex = 2 @@ -318,7 +326,7 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdSummaries.Location = New System.Drawing.Point(465, 344) - Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4) Me.cmdSummaries.Name = "cmdSummaries" Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) Me.cmdSummaries.TabIndex = 1 @@ -339,29 +347,133 @@ Partial Class dlgDescribeTwoVariable ' 'grpDisplay ' - Me.grpDisplay.Controls.Add(Me.ucrChkPercentageProportion) - Me.grpDisplay.Controls.Add(Me.lblFactorAsPercentage) - Me.grpDisplay.Controls.Add(Me.ucrReceiverPercentages) + Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(412, 308) - Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Location = New System.Drawing.Point(414, 277) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.grpDisplay.Size = New System.Drawing.Size(291, 172) + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4) + Me.grpDisplay.Size = New System.Drawing.Size(291, 219) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" ' - 'lblFactorAsPercentage + 'ucrReceiverColumns + ' + Me.ucrReceiverColumns.AutoSize = True + Me.ucrReceiverColumns.frmParent = Me + Me.ucrReceiverColumns.Location = New System.Drawing.Point(19, 92) + Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumns.Name = "ucrReceiverColumns" + Me.ucrReceiverColumns.Selector = Nothing + Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 121) + Me.ucrReceiverColumns.strNcFilePath = "" + Me.ucrReceiverColumns.TabIndex = 55 + Me.ucrReceiverColumns.ucrSelector = Nothing + ' + 'ucrChkDisplayAsPercentage + ' + Me.ucrChkDisplayAsPercentage.AutoSize = True + Me.ucrChkDisplayAsPercentage.Checked = False + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 34) + Me.ucrChkDisplayAsPercentage.TabIndex = 54 + ' + 'rdoOCol + ' + Me.rdoOCol.AutoSize = True + Me.rdoOCol.Location = New System.Drawing.Point(432, 336) + Me.rdoOCol.Name = "rdoOCol" + Me.rdoOCol.Size = New System.Drawing.Size(81, 24) + Me.rdoOCol.TabIndex = 40 + Me.rdoOCol.TabStop = True + Me.rdoOCol.Text = "Col(%)" + Me.rdoOCol.UseVisualStyleBackColor = True + ' + 'rdoOCell + ' + Me.rdoOCell.AutoSize = True + Me.rdoOCell.Location = New System.Drawing.Point(612, 335) + Me.rdoOCell.Name = "rdoOCell" + Me.rdoOCell.Size = New System.Drawing.Size(84, 24) + Me.rdoOCell.TabIndex = 41 + Me.rdoOCell.TabStop = True + Me.rdoOCell.Text = "Cell(%)" + Me.rdoOCell.UseVisualStyleBackColor = True + ' + 'rdoORow + ' + Me.rdoORow.AutoSize = True + Me.rdoORow.Location = New System.Drawing.Point(517, 336) + Me.rdoORow.Name = "rdoORow" + Me.rdoORow.Size = New System.Drawing.Size(90, 24) + Me.rdoORow.TabIndex = 42 + Me.rdoORow.TabStop = True + Me.rdoORow.Text = "Row(%)" + Me.rdoORow.UseVisualStyleBackColor = True + ' + 'ucrpnlPercent + ' + Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 331) + Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrpnlPercent.Name = "ucrpnlPercent" + Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 37) + Me.ucrpnlPercent.TabIndex = 43 + ' + 'ucrReceiverPercentages + ' + Me.ucrReceiverPercentages.AutoSize = True + Me.ucrReceiverPercentages.frmParent = Me + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(431, 369) + Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" + Me.ucrReceiverPercentages.Selector = Nothing + Me.ucrReceiverPercentages.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverPercentages.strNcFilePath = "" + Me.ucrReceiverPercentages.TabIndex = 39 + Me.ucrReceiverPercentages.ucrSelector = Nothing + ' + 'ucrReceiverThreeVariableSecondFactor + ' + Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True + Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me + Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverThreeVariableSecondFactor.Name = "ucrReceiverThreeVariableSecondFactor" + Me.ucrReceiverThreeVariableSecondFactor.Selector = Nothing + Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" + Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 12 + Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing + ' + 'ucrReceiverSecondTwoVariableFactor + ' + Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True + Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me + Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverSecondTwoVariableFactor.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSecondTwoVariableFactor.Name = "ucrReceiverSecondTwoVariableFactor" + Me.ucrReceiverSecondTwoVariableFactor.Selector = Nothing + Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" + Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 1 + Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing ' - Me.lblFactorAsPercentage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFactorAsPercentage.Location = New System.Drawing.Point(14, 63) - Me.lblFactorAsPercentage.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblFactorAsPercentage.Name = "lblFactorAsPercentage" - Me.lblFactorAsPercentage.Size = New System.Drawing.Size(231, 22) - Me.lblFactorAsPercentage.TabIndex = 2 - Me.lblFactorAsPercentage.Tag = "" - Me.lblFactorAsPercentage.Text = "Factor as Percentage:" + 'ucrReceiverThreeVariableThirdVariable + ' + Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True + Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 306) + Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" + Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" + Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 + Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing ' 'ucrReceiverFirstVars ' @@ -382,42 +494,9 @@ Partial Class dlgDescribeTwoVariable Me.ucrSaveTable.Location = New System.Drawing.Point(22, 676) Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(598, 36) + Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) Me.ucrSaveTable.TabIndex = 24 ' - 'ucrChkPercentageProportion - ' - Me.ucrChkPercentageProportion.AutoSize = True - Me.ucrChkPercentageProportion.Checked = False - Me.ucrChkPercentageProportion.Location = New System.Drawing.Point(18, 126) - Me.ucrChkPercentageProportion.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkPercentageProportion.Name = "ucrChkPercentageProportion" - Me.ucrChkPercentageProportion.Size = New System.Drawing.Size(214, 51) - Me.ucrChkPercentageProportion.TabIndex = 0 - ' - 'ucrReceiverPercentages - ' - Me.ucrReceiverPercentages.AutoSize = True - Me.ucrReceiverPercentages.frmParent = Nothing - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(18, 86) - Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" - Me.ucrReceiverPercentages.Selector = Nothing - Me.ucrReceiverPercentages.Size = New System.Drawing.Size(214, 30) - Me.ucrReceiverPercentages.strNcFilePath = "" - Me.ucrReceiverPercentages.TabIndex = 3 - Me.ucrReceiverPercentages.ucrSelector = Nothing - ' - 'ucrChkDisplayAsPercentage - ' - Me.ucrChkDisplayAsPercentage.AutoSize = True - Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(18, 26) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(214, 51) - Me.ucrChkDisplayAsPercentage.TabIndex = 1 - ' 'ucrInputMarginName ' Me.ucrInputMarginName.AddQuotesIfUnrecognised = True @@ -440,16 +519,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrReorderSummary.ucrDataFrameList = Nothing Me.ucrReorderSummary.ucrReceiver = Nothing ' - 'ucrChkDisplayMargins - ' - Me.ucrChkDisplayMargins.AutoSize = True - Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) - Me.ucrChkDisplayMargins.TabIndex = 18 - ' 'ucrBase ' Me.ucrBase.AutoSize = True @@ -460,19 +529,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 25 ' - 'ucrReceiverThreeVariableThirdVariable - ' - Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True - Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 306) - Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" - Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" - Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 - Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing - ' 'ucrReceiverSecondSkimrGroupByFactor ' Me.ucrReceiverSecondSkimrGroupByFactor.AutoSize = True @@ -486,19 +542,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverSecondSkimrGroupByFactor.TabIndex = 34 Me.ucrReceiverSecondSkimrGroupByFactor.ucrSelector = Nothing ' - 'ucrReceiverSecondTwoVariableFactor - ' - Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True - Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me - Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(465, 246) - Me.ucrReceiverSecondTwoVariableFactor.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSecondTwoVariableFactor.Name = "ucrReceiverSecondTwoVariableFactor" - Me.ucrReceiverSecondTwoVariableFactor.Selector = Nothing - Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" - Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 11 - Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing - ' 'ucrSelectorDescribeTwoVar ' Me.ucrSelectorDescribeTwoVar.AutoSize = True @@ -520,19 +563,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) Me.ucrPnlDescribe.TabIndex = 0 ' - 'ucrReceiverThreeVariableSecondFactor - ' - Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True - Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me - Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(465, 246) - Me.ucrReceiverThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverThreeVariableSecondFactor.Name = "ucrReceiverThreeVariableSecondFactor" - Me.ucrReceiverThreeVariableSecondFactor.Selector = Nothing - Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" - Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 36 - Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing - ' 'ucrReceiverSkimrGroupByFactor ' Me.ucrReceiverSkimrGroupByFactor.AutoSize = True @@ -543,19 +573,9 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverSkimrGroupByFactor.Selector = Nothing Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" - Me.ucrReceiverSkimrGroupByFactor.TabIndex = 32 + Me.ucrReceiverSkimrGroupByFactor.TabIndex = 2 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing ' - 'ucrChkOmitMissing - ' - Me.ucrChkOmitMissing.AutoSize = True - Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(26, 444) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) - Me.ucrChkOmitMissing.TabIndex = 0 - ' 'ucrChkSummariesRowCol ' Me.ucrChkSummariesRowCol.AutoSize = True @@ -566,12 +586,79 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(270, 34) Me.ucrChkSummariesRowCol.TabIndex = 20 ' + 'ucrChkMeans + ' + Me.ucrChkMeans.AutoSize = True + Me.ucrChkMeans.Checked = False + Me.ucrChkMeans.Location = New System.Drawing.Point(450, 278) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkMeans.Name = "ucrChkMeans" + Me.ucrChkMeans.Size = New System.Drawing.Size(145, 34) + Me.ucrChkMeans.TabIndex = 37 + ' + 'ucrChkDisplayMargins + ' + Me.ucrChkDisplayMargins.AutoSize = True + Me.ucrChkDisplayMargins.Checked = False + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) + Me.ucrChkDisplayMargins.TabIndex = 18 + ' + 'ucrChkSwapXYVar + ' + Me.ucrChkSwapXYVar.AutoSize = True + Me.ucrChkSwapXYVar.Checked = False + Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(450, 309) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" + Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) + Me.ucrChkSwapXYVar.TabIndex = 36 + ' + 'ucrChkCorrelations + ' + Me.ucrChkCorrelations.AutoSize = True + Me.ucrChkCorrelations.Checked = False + Me.ucrChkCorrelations.Location = New System.Drawing.Point(450, 344) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkCorrelations.Name = "ucrChkCorrelations" + Me.ucrChkCorrelations.Size = New System.Drawing.Size(223, 34) + Me.ucrChkCorrelations.TabIndex = 35 + ' + 'ucrChkLevSig + ' + Me.ucrChkLevSig.AutoSize = True + Me.ucrChkLevSig.Checked = False + Me.ucrChkLevSig.Location = New System.Drawing.Point(595, 278) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkLevSig.Name = "ucrChkLevSig" + Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) + Me.ucrChkLevSig.TabIndex = 38 + ' + 'ucrChkOmitMissing + ' + Me.ucrChkOmitMissing.AutoSize = True + Me.ucrChkOmitMissing.Checked = False + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(450, 383) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) + Me.ucrChkOmitMissing.TabIndex = 0 + ' 'dlgDescribeTwoVariable ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ClientSize = New System.Drawing.Size(723, 748) + Me.Controls.Add(Me.ucrReceiverPercentages) + Me.Controls.Add(Me.rdoORow) + Me.Controls.Add(Me.rdoOCell) + Me.Controls.Add(Me.rdoOCol) + Me.Controls.Add(Me.ucrpnlPercent) + Me.Controls.Add(Me.ucrReceiverThreeVariableSecondFactor) + Me.Controls.Add(Me.ucrReceiverSecondTwoVariableFactor) Me.Controls.Add(Me.ucrReceiverFirstVars) Me.Controls.Add(Me.ucrSaveTable) Me.Controls.Add(Me.grpDisplay) @@ -579,13 +666,9 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.cmdSummaries) Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.lblMarginName) - Me.Controls.Add(Me.cmdMissingOptions) - Me.Controls.Add(Me.ucrChkDisplayMargins) Me.Controls.Add(Me.cmdFormatTable) Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) Me.Controls.Add(Me.ucrReceiverSecondSkimrGroupByFactor) - Me.Controls.Add(Me.ucrReceiverSecondTwoVariableFactor) Me.Controls.Add(Me.ucrSelectorDescribeTwoVar) Me.Controls.Add(Me.lblFirstVariable) Me.Controls.Add(Me.grpSummaries) @@ -593,17 +676,23 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.rdoTwoVariable) Me.Controls.Add(Me.rdoSkim) Me.Controls.Add(Me.ucrPnlDescribe) - Me.Controls.Add(Me.ucrReceiverThreeVariableSecondFactor) Me.Controls.Add(Me.ucrReceiverSkimrGroupByFactor) Me.Controls.Add(Me.lblThirdVariable) Me.Controls.Add(Me.lblSecondGroupByFactor) Me.Controls.Add(Me.lbSecondVariable) Me.Controls.Add(Me.lblFirstGroupByFactor) Me.Controls.Add(Me.lblThreeVariableSecondFactor) - Me.Controls.Add(Me.ucrChkOmitMissing) Me.Controls.Add(Me.ucrChkSummariesRowCol) + Me.Controls.Add(Me.ucrChkMeans) + Me.Controls.Add(Me.ucrChkDisplayMargins) + Me.Controls.Add(Me.ucrChkSwapXYVar) + Me.Controls.Add(Me.ucrChkCorrelations) + Me.Controls.Add(Me.ucrChkLevSig) + Me.Controls.Add(Me.ucrChkOmitMissing) + Me.Controls.Add(Me.cmdMissingOptions) + Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" @@ -652,11 +741,18 @@ Partial Class dlgDescribeTwoVariable Friend WithEvents lblMarginName As Label Friend WithEvents ucrChkDisplayMargins As ucrCheck Friend WithEvents grpDisplay As GroupBox - Friend WithEvents ucrChkPercentageProportion As ucrCheck - Friend WithEvents lblFactorAsPercentage As Label - Friend WithEvents ucrReceiverPercentages As ucrReceiverSingle Friend WithEvents ucrChkDisplayAsPercentage As ucrCheck Friend WithEvents ucrSaveTable As ucrSave Friend WithEvents ucrReceiverFirstVars As ucrReceiverMultiple Friend WithEvents ucrChkSummariesRowCol As ucrCheck + Friend WithEvents ucrChkCorrelations As ucrCheck + Friend WithEvents ucrChkSwapXYVar As ucrCheck + Friend WithEvents ucrChkMeans As ucrCheck + Friend WithEvents ucrChkLevSig As ucrCheck + Friend WithEvents ucrReceiverPercentages As ucrReceiverSingle + Friend WithEvents rdoORow As RadioButton + Friend WithEvents rdoOCell As RadioButton + Friend WithEvents rdoOCol As RadioButton + Friend WithEvents ucrpnlPercent As UcrPanel + Friend WithEvents ucrReceiverColumns As ucrReceiverMultiple End Class diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index de0e1c3e530..5d42d1e4ae1 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -26,14 +26,14 @@ Public Class dlgDescribeTwoVariable Private bReset As Boolean = True Private bRcodeSet As Boolean = True Private bResetSubdialog As Boolean = False - Public strFirstVariablesType, strSecondVariableType As String + Public strFirstVariablesType, strSecondVariableType, strThirdVariableType As String 'SUMMARY FUNCTIoNS - Private clsCombineFrequencyParametersFunction, clsCombineFunction, - clsDummyFunction, clsGroupByFunction, clsRAnovaFunction, - clsRCorrelationFunction, clsSkimrFunction, clsSummariesListFunction, - clsSummaryTableCombineFactorsFunction, clsSummaryTableFunction, - clsThreeVariableCombineFrequencyParametersFunction, clsPivotWiderFunction As New RFunction + Private clsCombineFrequencyParametersFunction, clsCombineFrequencyColParametersFunction, clsCombineFunction, clsCombineSwapAnova2Table, clsCombineAnova2Function, clsSummariseFunction, + clsDummyFunction, clsGroupByFunction, clsRAnovaFunction, clsCorrFunction, clsRAnovaTableFunction, + clsRCorrelationFunction, clsSkimrFunction, clsSummariesListFunction, clsCombineAnovaFunction, + clsSummaryTableCombineFactorsFunction, clsSummaryTableFunction, clsRAnovaSwapTable2Funtion, + clsThreeVariableCombineFrequencyParametersFunction, clsPivotWiderFunction, clsMappingFunction, clsMapping2Function, clsRAnovaTable2Function As New RFunction 'FORMAT TABLE FUNCTIONS Private clsFootnoteCellBodyFunction, clsFootnoteCellFunction, @@ -44,7 +44,11 @@ Public Class dlgDescribeTwoVariable clsTabStyleCellTextFunction, clsTabStyleCellTitleFunction, clsTabStyleFunction, clsTabStylePxFunction, clsgtExtrasThemesFuction As New RFunction - Private clsGroupByPipeOperator, clsSummaryOperator, clsTildOperator, clsMapOperator, clsPivotOperator As New ROperator + + Private clsGroupByPipeOperator, clsSummaryOperator, clsGroupByPipeOperator2, clsGroupByPipeOperator3, clsGroupByPipeOperator4, clsGroupByPipeOperatorData As New ROperator + + Private clsTildOperator, clsMapOperator, clsPivotOperator As New ROperator + Private clsgtFunction, clsMapSummaryFunction, clsMapGtFunction As New RFunction 'Frequency Parameters @@ -54,7 +58,7 @@ Public Class dlgDescribeTwoVariable 'Format Operators Private clsPipeOperator, clsTabFootnoteOperator, - clsJoiningPipeOperator, clsMutableOperator As New ROperator + clsJoiningPipeOperator, clsMutableOperator, clsAnovaSwapTable2Opeator, clsAnovaTable2Operator, clsYlist2Operator, clsYlistOperator As New ROperator Private iUcrBaseXLocation, iDialogueXsize As Integer Private Sub dlgDescribeTwoVariable_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -123,45 +127,73 @@ Public Class dlgDescribeTwoVariable ucrInputMarginName.SetLinkedDisplayControl(lblMarginName) - ucrChkDisplayAsPercentage.SetParameter(New RParameter("percentage_type", 1)) - ucrChkDisplayAsPercentage.SetText("As Percentages") - ucrChkDisplayAsPercentage.SetValuesCheckedAndUnchecked(Chr(34) & "factors" & Chr(34), Chr(34) & "none" & Chr(34)) - ucrChkDisplayAsPercentage.SetRDefault(Chr(34) & "none" & Chr(34)) - - ucrChkDisplayAsPercentage.AddToLinkedControls(ucrReceiverPercentages, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkDisplayAsPercentage.AddToLinkedControls(ucrChkPercentageProportion, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrReceiverPercentages.SetParameter(New RParameter("perc_total_factors", 2)) ucrReceiverPercentages.SetParameterIsString() ucrReceiverPercentages.Selector = ucrSelectorDescribeTwoVar ucrReceiverPercentages.SetDataType("factor") - ucrReceiverPercentages.SetLinkedDisplayControl(lblFactorAsPercentage) - ucrChkPercentageProportion.SetParameter(New RParameter("perc_decimal", 3)) - ucrChkPercentageProportion.SetText("Display as Decimal") - ucrChkPercentageProportion.SetRDefault("FALSE") + ucrReceiverColumns.SetParameter(New RParameter("perc_total_factors", 3)) + ucrReceiverColumns.SetParameterIsString() + ucrReceiverColumns.Selector = ucrSelectorDescribeTwoVar + ucrReceiverColumns.SetDataType("factor") + + ucrChkDisplayAsPercentage.SetParameter(New RParameter("percentage_type", 1)) + ucrChkDisplayAsPercentage.SetText("As Percentages") + ucrChkDisplayAsPercentage.SetValuesCheckedAndUnchecked(Chr(34) & "factors" & Chr(34), Chr(34) & "none" & Chr(34)) + ucrChkDisplayAsPercentage.SetRDefault(Chr(34) & "none" & Chr(34)) + + ucrChkDisplayAsPercentage.AddToLinkedControls(ucrReceiverPercentages, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True) + ucrChkDisplayAsPercentage.AddToLinkedControls(ucrpnlPercent, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkSummariesRowCol.SetText("Summaries in Rows") ucrChkSummariesRowCol.AddParameterValuesCondition(True, "row_sum", "True") ucrChkSummariesRowCol.AddParameterValuesCondition(False, "row_sum", "False") + ucrChkCorrelations.SetText("Correlations") + ucrChkCorrelations.AddParameterValuesCondition(True, "corr", "True") + ucrChkCorrelations.AddParameterValuesCondition(False, "corr", "False") + + ucrChkMeans.SetText("Means") + ucrChkMeans.SetParameter(New RParameter("means", 5)) + ucrChkMeans.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkMeans.SetRDefault("FALSE") + + ucrChkLevSig.SetText("Sig.Level") + ucrChkLevSig.SetParameter(New RParameter("sign_level", 4)) + ucrChkLevSig.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkLevSig.SetRDefault("FALSE") + + ucrChkSwapXYVar.SetText("Swap First/Second Variables") + ucrChkSwapXYVar.AddParameterValuesCondition(True, "var", "True") + ucrChkSwapXYVar.AddParameterValuesCondition(False, "var", "False") + ucrPnlDescribe.AddRadioButton(rdoTwoVariable) ucrPnlDescribe.AddRadioButton(rdoSkim) ucrPnlDescribe.AddRadioButton(rdoThreeVariable) ucrPnlDescribe.AddParameterValuesCondition(rdoTwoVariable, "checked", "customize") ucrPnlDescribe.AddParameterValuesCondition(rdoSkim, "checked", "skim") ucrPnlDescribe.AddParameterValuesCondition(rdoThreeVariable, "checked", "three_variable") + rdoThreeVariable.Enabled = False + ucrpnlPercent.AddRadioButton(rdoOCol) + ucrpnlPercent.AddRadioButton(rdoORow) + ucrpnlPercent.AddRadioButton(rdoOCell) + ucrpnlPercent.AddParameterValuesCondition(rdoOCol, "percent", "col") + ucrpnlPercent.AddParameterValuesCondition(rdoORow, "percent", "row") + ucrpnlPercent.AddParameterValuesCondition(rdoOCell, "percent", "cell") + ucrPnlDescribe.AddToLinkedControls({ucrReceiverSkimrGroupByFactor, ucrReceiverSecondSkimrGroupByFactor}, {rdoSkim}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlDescribe.AddToLinkedControls({ucrReceiverThreeVariableThirdVariable}, {rdoThreeVariable}, bNewLinkedHideIfParameterMissing:=True) ucrPnlDescribe.AddToLinkedControls({ucrReceiverSecondTwoVariableFactor, ucrChkSummariesRowCol}, {rdoTwoVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlDescribe.AddToLinkedControls({ucrReceiverThreeVariableSecondFactor}, {rdoThreeVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrpnlPercent.AddToLinkedControls({ucrReceiverPercentages}, {rdoORow}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrpnlPercent.AddToLinkedControls({ucrReceiverColumns}, {rdoOCol}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrReceiverThreeVariableSecondFactor.SetParameter(New RParameter("second_three_varible_factor", 0, bNewIncludeArgumentName:=False)) ucrReceiverThreeVariableSecondFactor.SetParameterIsString() ucrReceiverThreeVariableSecondFactor.Selector = ucrSelectorDescribeTwoVar - ucrReceiverThreeVariableSecondFactor.SetIncludedDataTypes({"factor"}) ucrReceiverThreeVariableSecondFactor.SetLinkedDisplayControl(lblThreeVariableSecondFactor) ucrSaveTable.SetDataFrameSelector(ucrSelectorDescribeTwoVar.ucrAvailableDataFrames) @@ -172,6 +204,7 @@ Public Class dlgDescribeTwoVariable Private Sub SetDefaults() clsCombineFrequencyParametersFunction = New RFunction + clsCombineFrequencyColParametersFunction = New RFunction clsCombineFunction = New RFunction clsDummyFunction = New RFunction clsFootnoteCellBodyFunction = New RFunction @@ -206,8 +239,28 @@ Public Class dlgDescribeTwoVariable clsSummaryOperator = New ROperator clsMapOperator = New ROperator clsPivotWiderFunction = New RFunction + clsCombineAnovaFunction = New RFunction + clsCombineAnova2Function = New RFunction + clsCombineSwapAnova2Table = New RFunction + clsSummariseFunction = New RFunction + clsCorrFunction = New RFunction + clsRAnovaTableFunction = New RFunction clsgtExtrasThemesFuction = New RFunction clsMutableOperator = New ROperator + + clsGroupByPipeOperator2 = New ROperator + clsGroupByPipeOperator3 = New ROperator + clsGroupByPipeOperator4 = New ROperator + clsGroupByPipeOperatorData = New ROperator + clsMappingFunction = New RFunction + clsMapping2Function = New RFunction + clsAnovaTable2Operator = New ROperator + clsAnovaSwapTable2Opeator = New ROperator + clsYlistOperator = New ROperator + clsYlist2Operator = New ROperator + clsRAnovaTable2Function = New RFunction + clsRAnovaSwapTable2Funtion = New RFunction + clsTildOperator = New ROperator clsMapSummaryFunction = New RFunction clsMapGtFunction = New RFunction @@ -220,6 +273,7 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.Reset() clsCombineFrequencyParametersFunction.SetRCommand("c") + clsCombineFrequencyColParametersFunction.SetRCommand("c") clsCombineFunction.SetRCommand("c") @@ -227,6 +281,9 @@ Public Class dlgDescribeTwoVariable clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) clsDummyFunction.AddParameter("theme", "select", iPosition:=2) clsDummyFunction.AddParameter("row_sum", "False", iPosition:=3) + clsDummyFunction.AddParameter("corr", "False", iPosition:=4) + clsDummyFunction.AddParameter("var", "False", iPosition:=5) + clsDummyFunction.AddParameter("percent", "col", iPosition:=6) clsPivotWiderFunction.SetRCommand("pivot_wider") clsPivotWiderFunction.AddParameter("values_from", "value", iPosition:=2) @@ -245,8 +302,47 @@ Public Class dlgDescribeTwoVariable clsgtExtrasThemesFuction.SetPackageName("gtExtras") - clsGroupByFunction.SetPackageName("dplyr") - clsGroupByFunction.SetRCommand("group_by") + clsCombineAnova2Function.SetRCommand("c") + + clsCombineSwapAnova2Table.SetRCommand("c") + + clsMappingFunction.SetPackageName("purrr") + clsMappingFunction.SetRCommand("map") + clsMappingFunction.AddParameter(".x", clsROperatorParameter:=clsYlistOperator, iPosition:=0) + clsMappingFunction.AddParameter(".f", clsROperatorParameter:=clsAnovaTable2Operator, iPosition:=1) + + clsMapping2Function.SetPackageName("purrr") + clsMapping2Function.SetRCommand("map") + clsMapping2Function.AddParameter(".x", clsROperatorParameter:=clsYlist2Operator, iPosition:=0) + clsMapping2Function.AddParameter(".f", clsROperatorParameter:=clsAnovaSwapTable2Opeator, iPosition:=1) + + clsAnovaTable2Operator.SetOperation("~") + clsAnovaTable2Operator.AddParameter("right", clsRFunctionParameter:=clsRAnovaTable2Function, iPosition:=1) + clsAnovaTable2Operator.bForceIncludeOperation = True + + clsAnovaSwapTable2Opeator.SetOperation("~") + clsAnovaSwapTable2Opeator.AddParameter("right", clsRFunctionParameter:=clsRAnovaSwapTable2Funtion, iPosition:=1) + clsAnovaSwapTable2Opeator.bForceIncludeOperation = True + + clsYlistOperator.SetOperation("", bBracketsTemp:=False) + clsYlistOperator.SetAssignTo("y_col_names_list") + + clsYlist2Operator.SetOperation("", bBracketsTemp:=False) + clsYlist2Operator.SetAssignTo("y_col_names_list") + + clsRAnovaTable2Function.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$anova_tables2") + clsRAnovaTable2Function.AddParameter("data", Chr(34) & ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsRAnovaTable2Function.AddParameter(" x_col_names", clsRFunctionParameter:=clsCombineAnova2Function, iPosition:=1) + clsRAnovaTable2Function.AddParameter("y_col_name", ".x", iPosition:=2) + clsRAnovaTable2Function.AddParameter("signif.stars", "FALSE", iPosition:=3) + clsRAnovaTable2Function.AddParameter("sign_level", "FALSE", iPosition:=4) + + clsRAnovaSwapTable2Funtion.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$anova_tables2") + clsRAnovaSwapTable2Funtion.AddParameter("data", Chr(34) & ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsRAnovaSwapTable2Funtion.AddParameter(" y_col_name", clsRFunctionParameter:=clsCombineSwapAnova2Table, iPosition:=1) + clsRAnovaSwapTable2Funtion.AddParameter("x_col_names", ".x", iPosition:=2) + clsRAnovaSwapTable2Funtion.AddParameter("signif.stars", "FALSE", iPosition:=3) + clsRAnovaSwapTable2Funtion.AddParameter("sign_level", "FALSE", iPosition:=4) clsGroupByPipeOperator.SetOperation("%>%") clsGroupByPipeOperator.AddParameter("skim", clsRFunctionParameter:=clsSkimrFunction, @@ -257,11 +353,40 @@ Public Class dlgDescribeTwoVariable clsGroupByFunction.SetPackageName("dplyr") clsGroupByFunction.SetRCommand("group_by") + clsGroupByPipeOperator2.SetOperation("%>%") + clsGroupByPipeOperator2.AddParameter("left", clsROperatorParameter:=clsGroupByPipeOperatorData, iPosition:=0) + clsGroupByPipeOperator2.AddParameter("right", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + + clsGroupByPipeOperator3.SetOperation("%>%") + clsGroupByPipeOperator3.AddParameter("left", clsROperatorParameter:=clsGroupByPipeOperator2, iPosition:=0) + clsGroupByPipeOperator3.AddParameter("right", clsRFunctionParameter:=clsSummariseFunction, iPosition:=1) + + clsGroupByPipeOperator4.SetOperation("%>%") + clsGroupByPipeOperator4.AddParameter("left", clsROperatorParameter:=clsGroupByPipeOperator3, iPosition:=0) + clsGroupByPipeOperator4.AddParameter("right", clsRFunctionParameter:=clsgtFunction, iPosition:=1) + + clsGroupByPipeOperatorData.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) + + clsSummariseFunction.SetRCommand("summarise") + clsSummariseFunction.AddParameter("cor", clsRFunctionParameter:=clsCorrFunction, bIncludeArgumentName:=False, iPosition:=0) + + clsCorrFunction.SetRCommand("cor") + clsSkimrFunction.SetPackageName("skimr") clsSkimrFunction.SetRCommand("skim_without_charts") + clsRAnovaTableFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$anova_tables") + clsRAnovaTableFunction.AddParameter("data", Chr(34) & ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsRAnovaTableFunction.AddParameter("x_col_names", clsRFunctionParameter:=clsCombineAnovaFunction, iPosition:=1) + clsRAnovaTableFunction.AddParameter("y_col_name", clsRFunctionParameter:=clsCombineFunction, iPosition:=2) + clsRAnovaTableFunction.AddParameter("signif.stars", "FALSE", iPosition:=3) + clsRAnovaTableFunction.AddParameter("sign_level", "FALSE", iPosition:=4) + clsRAnovaTableFunction.AddParameter("means", "FALSE", iPosition:=5) + clsCombineFunction.SetRCommand("c") + clsCombineAnovaFunction.SetRCommand("c") + clsPipeOperator.SetOperation("%>%") clsPipeOperator.bBrackets = False @@ -281,14 +406,13 @@ Public Class dlgDescribeTwoVariable clsStyleListFunction.SetRCommand("list") clsSummariesListFunction.SetRCommand("c") - clsSummariesListFunction.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), + clsSummariesListFunction.AddParameter("summary_mean", Chr(34) & "summary_mean" & Chr(34), bIncludeArgumentName:=False, iPosition:=0) clsSummaryTableCombineFactorsFunction.SetRCommand("c") clsSummaryTableFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$summary_table") clsSummaryTableFunction.AddParameter("treat_columns_as_factor", "FALSE", iPosition:=3) - 'clsSummaryTableFunction.SetAssignTo("summary_table") clsTildOperator.SetOperation("~") clsTildOperator.AddParameter("right", clsRFunctionParameter:=clsSummaryTableFunction) @@ -310,7 +434,6 @@ Public Class dlgDescribeTwoVariable clsSummaryOperator.SetOperation("%>%") clsSummaryOperator.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsMapSummaryFunction, iPosition:=1) - 'clsSummaryOperator.AddParameter("gttbl", clsRFunctionParameter:=clsgtFunction, iPosition:=1) clsPivotOperator.SetOperation("%>%") clsPivotOperator.AddParameter("left", clsRFunctionParameter:=clsPivotWiderFunction) @@ -319,8 +442,6 @@ Public Class dlgDescribeTwoVariable clsMapOperator.SetOperation("%>%") clsMapOperator.AddParameter("left", clsROperatorParameter:=clsTildOperator) - 'clsMapOperator.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) - 'clsMapOperator.AddParameter("tableFun", clsRFunctionParameter:=clsMapSummaryFunction, iPosition:=1) clsMapOperator.AddParameter("right", clsROperatorParameter:=clsPivotOperator) clsMapOperator.bBrackets = False @@ -372,16 +493,16 @@ Public Class dlgDescribeTwoVariable Private Sub SetRCodeForControls(bReset As Boolean) bRcodeSet = False - ucrReceiverSecondTwoVariableFactor.AddAdditionalCodeParameterPair(clsRAnovaFunction, New RParameter("y_col_name", 2), iAdditionalPairNo:=1) - ucrReceiverSecondTwoVariableFactor.AddAdditionalCodeParameterPair(clsRCorrelationFunction, New RParameter("y_col_name", 2), iAdditionalPairNo:=2) - - ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsRAnovaFunction, New RParameter("x_col_names", 1), iAdditionalPairNo:=1) - ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsRCorrelationFunction, New RParameter("x_col_names", 1), iAdditionalPairNo:=2) - ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsSkimrFunction, New RParameter("col_names", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) - ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsMapSummaryFunction, New RParameter(".x", 1), iAdditionalPairNo:=4) - - ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsRAnovaFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=1) - ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsSummaryTableFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=2) + ucrReceiverSecondTwoVariableFactor.AddAdditionalCodeParameterPair(clsRCorrelationFunction, New RParameter("y_col_name", 2), iAdditionalPairNo:=1) + ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsRCorrelationFunction, New RParameter("x_col_names", 1), iAdditionalPairNo:=1) + ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsSkimrFunction, New RParameter("col_names", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) + ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsMapSummaryFunction, New RParameter(".x", 1), iAdditionalPairNo:=3) + ucrChkMeans.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("means", iNewPosition:=5), iAdditionalPairNo:=1) + ucrChkLevSig.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("sign_level", iNewPosition:=4), iAdditionalPairNo:=1) + ucrChkDisplayMargins.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("include_margins", iNewPosition:=5), iAdditionalPairNo:=1) + ucrChkDisplayAsPercentage.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("percentage_type", iNewPosition:=1), iAdditionalPairNo:=1) + + ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsSummaryTableFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=1) ucrSaveTable.AddAdditionalRCode(clsJoiningPipeOperator, iAdditionalPairNo:=1) ucrChkOmitMissing.SetRCode(clsSummaryTableFunction, bReset) @@ -392,9 +513,14 @@ Public Class dlgDescribeTwoVariable ucrReceiverSecondSkimrGroupByFactor.SetRCode(clsGroupByFunction, bReset) ucrChkDisplayAsPercentage.SetRCode(clsCombineFrequencyParametersFunction, bReset) ucrReceiverPercentages.SetRCode(clsCombineFrequencyParametersFunction, bReset) - ucrChkPercentageProportion.SetRCode(clsCombineFrequencyParametersFunction, bReset) + ucrReceiverColumns.SetRCode(clsCombineFrequencyColParametersFunction, bReset) ucrPnlDescribe.SetRCode(clsDummyFunction, bReset) + ucrpnlPercent.SetRCode(clsDummyFunction, bReset) ucrChkSummariesRowCol.SetRCode(clsDummyFunction, bReset) + ucrChkCorrelations.SetRCode(clsDummyFunction, bReset) + ucrChkSwapXYVar.SetRCode(clsDummyFunction, bReset) + ucrChkMeans.SetRCode(clsRAnovaTable2Function, bReset) + ucrChkLevSig.SetRCode(clsRAnovaTable2Function, bReset) ucrReceiverThreeVariableSecondFactor.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrReceiverThreeVariableThirdVariable.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrChkDisplayMargins.SetRCode(clsCombineFrequencyParametersFunction, bReset) @@ -412,7 +538,8 @@ Public Class dlgDescribeTwoVariable OrElse (Not ucrReceiverThreeVariableSecondFactor.IsEmpty _ AndAlso Not ucrReceiverThreeVariableThirdVariable.IsEmpty) _ AndAlso (IsFactorByFactor() OrElse IsNumericByFactor() _ - OrElse IsFactorByNumeric() OrElse IsNumericByNumeric())) AndAlso ucrSaveTable.IsComplete) + OrElse IsFactorByNumeric() OrElse IsNumericByNumericByFactor() OrElse IsNumericByFactorByFactor() OrElse IsNumericByNumericByNumeric() _ + OrElse IsFactorByNumericByNumeric() OrElse IsNumericByFactorByNumeric() OrElse IsFactorByFactorByFactor() OrElse IsNumericByNumeric())) AndAlso ucrSaveTable.IsComplete) End Sub Private Function IsFactorByFactor() As Boolean @@ -431,6 +558,30 @@ Public Class dlgDescribeTwoVariable Return strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "numeric" End Function + Private Function IsNumericByNumericByFactor() As Boolean + Return strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "numeric" AndAlso strThirdVariableType = "categorical" + End Function + + Private Function IsNumericByFactorByFactor() As Boolean + Return strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "categorical" AndAlso strThirdVariableType = "categorical" + End Function + + Private Function IsFactorByFactorByFactor() As Boolean + Return strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "categorical" AndAlso strThirdVariableType = "categorical" + End Function + + Private Function IsNumericByFactorByNumeric() As Boolean + Return strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "categorical" AndAlso strThirdVariableType = "numeric" + End Function + + Private Function IsNumericByNumericByNumeric() As Boolean + Return strFirstVariablesType = "numeric" AndAlso strSecondVariableType = "numeric" AndAlso strThirdVariableType = "numeric" + End Function + + Private Function IsFactorByNumericByNumeric() As Boolean + Return strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "numeric" AndAlso strThirdVariableType = "numeric" + End Function + Private Sub ucrBaseDescribeTwoVar_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) @@ -439,11 +590,7 @@ Public Class dlgDescribeTwoVariable Private Sub cmdSummaries_Click(sender As Object, e As EventArgs) Handles cmdSummaries.Click If rdoTwoVariable.Checked Then - If IsNumericByFactor() Then - sdgSummaries.SetRFunction(clsSummariesListFunction, clsSummaryTableFunction, clsCombineFunction, ucrSelectorDescribeTwoVar, bResetSubdialog) - End If - ElseIf rdoThreeVariable.Checked Then - If IsFactorByNumeric() OrElse IsNumericByFactor() Then + If IsFactorByNumeric() Then sdgSummaries.SetRFunction(clsSummariesListFunction, clsSummaryTableFunction, clsCombineFunction, ucrSelectorDescribeTwoVar, bResetSubdialog) End If End If @@ -462,34 +609,57 @@ Public Class dlgDescribeTwoVariable Private Sub ManageControlsVisibility() grpSummaries.Visible = rdoThreeVariable.Checked OrElse rdoTwoVariable.Checked - ucrReorderSummary.Visible = IsNumericByFactor() - cmdSummaries.Visible = IsNumericByFactor() ucrChkDisplayMargins.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactor() grpDisplay.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() - ucrChkSummariesRowCol.Visible = False + ucrReceiverPercentages.Visible = ucrChkDisplayAsPercentage.Checked AndAlso rdoORow.Checked AndAlso IsFactorByFactor() + ucrpnlPercent.Visible = ucrChkDisplayAsPercentage.Checked AndAlso IsFactorByFactor() + ucrReceiverColumns.Visible = ucrChkDisplayAsPercentage.Checked AndAlso IsFactorByFactor() AndAlso rdoOCol.Checked + ucrChkCorrelations.Visible = False + ucrChkSwapXYVar.Visible = False + ucrChkOmitMissing.Visible = False + cmdMissingOptions.Visible = False + If rdoTwoVariable.Checked Then - ucrChkOmitMissing.Visible = strFirstVariablesType = "numeric" - ucrChkSummariesRowCol.Visible = IsNumericByFactor() + ucrChkOmitMissing.Visible = IsNumericByNumeric() OrElse IsNumericByFactor() + ucrChkSwapXYVar.Visible = IsNumericByNumeric() OrElse IsFactorByNumeric() + ucrChkCorrelations.Visible = IsNumericByNumeric() + cmdMissingOptions.Visible = ucrChkOmitMissing.Checked + ElseIf rdoThreeVariable.Checked Then ucrChkOmitMissing.Visible = IsFactorByNumeric() OrElse IsNumericByFactor() Else ucrChkOmitMissing.Visible = False + cmdMissingOptions.Visible = False + End If + If rdoThreeVariable.Checked Then + If IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then + ucrReorderSummary.Visible = False + cmdSummaries.Visible = False + End If + ucrChkDisplayMargins.Visible = IsFactorByFactorByFactor() + ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactorByFactor() End If - cmdMissingOptions.Visible = ucrChkOmitMissing.Checked End Sub Private Sub ChangeBaseRCode() ucrSaveTable.Visible = False + ucrReorderSummary.Visible = False + cmdSummaries.Visible = False + ucrChkSummariesRowCol.Visible = False + cmdFormatTable.Visible = False + ucrChkMeans.Visible = False + ucrChkLevSig.Visible = False + cmdMissingOptions.Visible = False If rdoSkim.Checked Then clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) - + cmdFormatTable.Visible = False ucrSaveTable.Visible = True ucrSaveTable.Location = New Point(23, 286) ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveTable.SetAssignToIfUncheckedValue("last_summary") - ucrSaveTable.SetCheckBoxText("Save Summary") + ucrSaveTable.SetCheckBoxText("Store Summary") ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator) clsGroupByPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Summary, @@ -500,12 +670,30 @@ Public Class dlgDescribeTwoVariable ElseIf rdoTwoVariable.Checked Then clsDummyFunction.AddParameter("checked", "customize", iPosition:=0) If IsNumericByNumeric() Then - ucrBase.clsRsyntax.SetBaseRFunction(clsRCorrelationFunction) - ucrSaveTable.Visible = False - ElseIf IsFactorByNumeric() Then - ucrBase.clsRsyntax.SetBaseRFunction(clsRAnovaFunction) + If ucrChkSwapXYVar.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) + clsDummyFunction.AddParameter("var", "True", iPosition:=5) + + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) + clsDummyFunction.AddParameter("var", "False", iPosition:=5) + End If + If ucrChkCorrelations.Checked Then + ucrBase.clsRsyntax.AddToAfterCodes(clsRCorrelationFunction, iPosition:=0) + clsDummyFunction.AddParameter("corr", "True", iPosition:=4) + clsRCorrelationFunction.iCallType = 2 + Else + clsDummyFunction.AddParameter("corr", "False", iPosition:=4) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsRCorrelationFunction) + End If ucrSaveTable.Visible = False + cmdFormatTable.Visible = False + ucrChkMeans.Visible = True + ucrChkLevSig.Visible = True ElseIf IsNumericByFactor() Then + ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) + ucrChkMeans.Visible = True + ucrChkLevSig.Visible = True ucrSaveTable.Visible = True ucrSaveTable.Location = New Point(23, 450) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) @@ -513,7 +701,7 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") - ucrSaveTable.SetCheckBoxText("Save Table") + ucrSaveTable.SetCheckBoxText("Store Table") clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, strRObjectFormatToAssignTo:=RObjectFormat.Html, @@ -521,27 +709,99 @@ Public Class dlgDescribeTwoVariable strObjectName:="last_table") ElseIf IsFactorByFactor() Then ucrSaveTable.Visible = True - ucrSaveTable.Location = New Point(23, 350) + cmdFormatTable.Visible = True + ucrChkMeans.Visible = False + ucrChkLevSig.Visible = False + ucrSaveTable.Location = New Point(23, 351) clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=1) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveTable.SetPrefix("frequency_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") - ucrSaveTable.SetCheckBoxText("Save Table") + ucrSaveTable.SetCheckBoxText("Store Table") clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, strRObjectFormatToAssignTo:=RObjectFormat.Html, strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, strObjectName:="last_table") + ElseIf IsFactorByNumeric() Then + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsRCorrelationFunction) + If ucrChkSwapXYVar.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) + clsDummyFunction.AddParameter("var", "True", iPosition:=5) + ucrReorderSummary.Visible = False + cmdSummaries.Visible = False + ucrChkSummariesRowCol.Visible = False + cmdFormatTable.Visible = False + ucrChkMeans.Visible = True + ucrChkLevSig.Visible = True + Else + clsDummyFunction.AddParameter("var", "False", iPosition:=5) + ucrSaveTable.Visible = True + ucrReorderSummary.Visible = True + cmdSummaries.Visible = True + ucrChkSummariesRowCol.Visible = True + cmdFormatTable.Visible = True + ucrChkMeans.Visible = False + ucrChkLevSig.Visible = False + ucrSaveTable.Location = New Point(23, 450) + clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) + ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + ucrSaveTable.SetPrefix("summary_table") + ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + ucrSaveTable.SetCheckBoxText("Save Table") + clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Html, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") + End If + End If ElseIf rdoThreeVariable.Checked Then clsDummyFunction.AddParameter("checked", "three_variable", iPosition:=0) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetCheckBoxText("Save Table") + If IsFactorByFactorByFactor() Then + cmdFormatTable.Visible = True + + ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Html, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") + End If + If IsFactorByNumericByNumeric() Then + cmdFormatTable.Visible = False + ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator4) + clsGroupByPipeOperator4.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Html, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") + End If + If IsNumericByNumericByFactor() Then + ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) + cmdFormatTable.Visible = False + End If + If IsNumericByNumericByNumeric() Then + cmdFormatTable.Visible = False + ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) + End If + If IsNumericByFactorByFactor() Then + cmdFormatTable.Visible = False + ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) + End If + If IsNumericByFactorByNumeric() Then + cmdFormatTable.Visible = False + ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) + End If + ucrSaveTable.SetCheckBoxText("Store Table") End If FactorColumns() - End Sub Private Sub UpdateCombineFactorParameterFunction() @@ -567,8 +827,8 @@ Public Class dlgDescribeTwoVariable TestOKEnabled() End Sub - Private Sub ucrChkOmitMissing_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkOmitMissing.ControlValueChanged - If ucrChkOmitMissing.Checked Then + Private Sub ucrChkOmitMissing_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkOmitMissing.ControlValueChanged, ucrChkCorrelations.ControlValueChanged + If ucrChkOmitMissing.Checked AndAlso ucrChkCorrelations.Checked Then clsRCorrelationFunction.AddParameter("use", Chr(34) & "pairwise.complete.obs" & Chr(34), iPosition:=2) Else clsRCorrelationFunction.RemoveParameterByName("use") @@ -583,6 +843,8 @@ Public Class dlgDescribeTwoVariable Else clsSummaryTableFunction.AddParameter("na_type", clsRFunctionParameter:=clsCombineFunction, iPosition:=9) End If + cmdMissingOptions.Visible = ucrChkOmitMissing.Checked + End Sub Private Sub ucrPnlDescribe_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlDescribe.ControlValueChanged @@ -594,8 +856,8 @@ Public Class dlgDescribeTwoVariable ElseIf rdoThreeVariable.Checked Then ucrReceiverFirstVars.SetSingleTypeStatus(True, bIsCategoricalNumeric:=True) lblThreeVariableCategorical.Visible = True - lblThreeVariableCategorical.Location = New Point(106, 18) - lblSecondType.Location = New Point(12, 33) + lblThreeVariableCategorical.Location = New Point(38, 33) + lblSecondType.Location = New Point(106, 18) lblSecondBy.Visible = True Else ucrReceiverFirstVars.SetSingleTypeStatus(True, bIsCategoricalNumeric:=True) @@ -607,35 +869,52 @@ Public Class dlgDescribeTwoVariable ChangeFirstTypeLabel() AssignSecondVariableType() + AssignThirdVariableType() ChangeBaseRCode() ManageControlsVisibility() UpdateSummaryTableFunction() UpdateCombineFactorParameterFunction() ChangeLocations() AddRemoveNAParameter() - HideFormatTableButton() FactorColumns() - End Sub - - Private Sub HideFormatTableButton() - cmdFormatTable.Visible = IsNumericByFactor() _ - OrElse IsFactorByFactor() OrElse (IsFactorByNumeric() _ - AndAlso rdoThreeVariable.Checked) + AddRemoveFirstCorrParam() + AddRemoveSecondCorrParam() + AddRemoveThirdCorrParam() + AddRemoveSecondAnovaParam() + AddRemoveThirdAnovaParam() + AddRemoveFirstAnova2Param() End Sub Private Sub ChangeLocations() - If IsNumericByFactor() _ - OrElse (IsFactorByNumeric() AndAlso rdoThreeVariable.Checked) Then - ucrBase.Location = New Point(iUcrBaseXLocation, 487) - Me.Size = New Point(iDialogueXsize, 580) - cmdFormatTable.Location = New Point(326, 423) - ElseIf IsFactorByNumeric() Then - ucrBase.Location = New Point(iUcrBaseXLocation, 319) - Me.Size = New Point(iDialogueXsize, 415) - ElseIf IsFactorByFactor() Then - ucrBase.Location = New Point(iUcrBaseXLocation, 370) - Me.Size = New Point(iDialogueXsize, 465) - cmdFormatTable.Location = New Point(326, 325) + If rdoTwoVariable.Checked Then + If IsFactorByNumeric() Then + ucrBase.Location = New Point(iUcrBaseXLocation, 487) + Me.Size = New Point(iDialogueXsize, 580) + cmdFormatTable.Location = New Point(326, 423) + ElseIf IsNumericByFactor() Then + ucrBase.Location = New Point(iUcrBaseXLocation, 319) + Me.Size = New Point(iDialogueXsize, 415) + ElseIf IsFactorByFactor() Then + ucrBase.Location = New Point(iUcrBaseXLocation, 372) + Me.Size = New Point(iDialogueXsize, 465) + cmdFormatTable.Location = New Point(326, 330) + Else + ucrBase.Location = New Point(iUcrBaseXLocation, 328) + Me.Size = New Point(iDialogueXsize, 425) + End If + ElseIf rdoThreeVariable.Checked Then + If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then + ucrBase.Location = New Point(iUcrBaseXLocation, 328) + Me.Size = New Point(iDialogueXsize, 425) + ElseIf IsFactorByFactorByFactor() Then + ucrBase.Location = New Point(iUcrBaseXLocation, 370) + Me.Size = New Point(iDialogueXsize, 465) + cmdFormatTable.Visible = True + cmdFormatTable.Location = New Point(326, 350) + Else + ucrBase.Location = New Point(iUcrBaseXLocation, 385) + Me.Size = New Point(iDialogueXsize, 480) + End If Else ucrBase.Location = New Point(iUcrBaseXLocation, 328) Me.Size = New Point(iDialogueXsize, 425) @@ -650,12 +929,54 @@ Public Class dlgDescribeTwoVariable End If End Sub + Private Sub AddRemoveFirstCorrParam() + If rdoThreeVariable.Checked Then + If IsFactorByNumericByNumeric() Then + If ucrReceiverFirstVars.IsEmpty Then + clsGroupByFunction.RemoveParameterByName("var") + Else + clsGroupByFunction.AddParameter("var", ucrReceiverFirstVars.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + End If + End If + End If + End Sub + + Private Sub AddRemoveSecondCorrParam() + If rdoThreeVariable.Checked Then + If IsFactorByNumericByNumeric() Then + If ucrReceiverThreeVariableSecondFactor.IsEmpty Then + clsCorrFunction.RemoveParameterByName("x") + Else + clsCorrFunction.AddParameter("x", ucrReceiverThreeVariableSecondFactor.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + End If + End If + End If + End Sub + + Private Sub AddRemoveThirdCorrParam() + If rdoThreeVariable.Checked Then + If IsFactorByNumericByNumeric() Then + If ucrReceiverThreeVariableThirdVariable.IsEmpty Then + clsCorrFunction.RemoveParameterByName("y") + Else + clsCorrFunction.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames(False), iPosition:=2, bIncludeArgumentName:=False) + End If + End If + End If + End Sub + Private Sub FactorColumns() If rdoTwoVariable.Checked Then If IsFactorByFactor() Then clsSummaryTableFunction.AddParameter("factors", "c(" & ucrReceiverSecondTwoVariableFactor.GetVariableNames & "," & ".x" & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ".x") clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) + ElseIf IsFactorByNumeric() Then + clsSummaryTableFunction.AddParameter("factors", ".x") + clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) + clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverSecondTwoVariableFactor.GetVariableNames) + clsMapSummaryFunction.AddParameter(".x", ucrReceiverFirstVars.GetVariableNames, iPosition:=3) + SummariesInRowsOrCols() Else clsSummaryTableFunction.AddParameter("factors", ucrReceiverSecondTwoVariableFactor.GetVariableNames) clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=1) @@ -663,6 +984,131 @@ Public Class dlgDescribeTwoVariable SummariesInRowsOrCols() End If End If + If rdoThreeVariable.Checked Then + clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) + If IsFactorByFactorByFactor() Then + clsSummaryTableFunction.AddParameter("factors", "c(" & Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34) & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") + clsSummaryTableFunction.AddParameter("columns_to_summarise", Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34)) + clsPivotWiderFunction.AddParameter("names_from", ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text, iPosition:=0) + Else + clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=0) + clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverFirstVars.GetVariableNames) + SummariesInRowsOrCols() + End If + End If + End Sub + + Private Sub AddRemoveFirstAnova2Param() + If rdoThreeVariable.Checked Then + If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then + If ucrReceiverFirstVars.IsEmpty Then + clsYlistOperator.RemoveParameterByName("cols") + Else + clsYlistOperator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + End If + End If + ElseIf rdoTwoVariable.Checked Then + If IsNumericByNumeric() Then + If Not ucrReceiverFirstVars.IsEmpty Then + If ucrChkSwapXYVar.Checked Then + clsYlist2Operator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + clsYlistOperator.RemoveParameterByName("cols") + + Else + clsYlistOperator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + clsYlist2Operator.RemoveParameterByName("cols") + + End If + Else + clsYlist2Operator.RemoveParameterByName("cols") + clsYlistOperator.RemoveParameterByName("cols") + + End If + ElseIf IsNumericByFactor() Then + If ucrReceiverFirstVars.IsEmpty Then + clsYlistOperator.RemoveParameterByName("cols") + Else + clsYlistOperator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + End If + ElseIf IsFactorByNumeric() Then + If Not ucrReceiverFirstVars.IsEmpty Then + If ucrChkSwapXYVar.Checked Then + clsYlist2Operator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + clsYlistOperator.RemoveParameterByName("cols") + Else + clsYlist2Operator.RemoveParameterByName("cols") + clsYlistOperator.RemoveParameterByName("cols") + End If + Else + clsYlist2Operator.RemoveParameterByName("cols") + clsYlistOperator.RemoveParameterByName("cols") + + End If + End If + + End If + End Sub + + Private Sub AddRemoveSecondAnovaParam() + If rdoThreeVariable.Checked Then + If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then + If ucrReceiverThreeVariableSecondFactor.IsEmpty Then + clsCombineAnova2Function.RemoveParameterByName("x") + Else + clsCombineAnova2Function.AddParameter("x", ucrReceiverThreeVariableSecondFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) + End If + End If + ElseIf rdoTwoVariable.Checked Then + If IsNumericByNumeric() Then + If Not ucrReceiverSecondTwoVariableFactor.IsEmpty Then + If ucrChkSwapXYVar.Checked Then + clsCombineSwapAnova2Table.AddParameter("x", ucrReceiverSecondTwoVariableFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) + clsCombineAnova2Function.RemoveParameterByName("x") + Else + clsCombineAnova2Function.AddParameter("x", ucrReceiverSecondTwoVariableFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) + clsCombineSwapAnova2Table.RemoveParameterByName("x") + + End If + Else + clsCombineSwapAnova2Table.RemoveParameterByName("x") + clsCombineAnova2Function.RemoveParameterByName("x") + + End If + ElseIf IsFactorByNumeric() Then + If Not ucrReceiverSecondTwoVariableFactor.IsEmpty Then + If ucrChkSwapXYVar.Checked Then + clsCombineSwapAnova2Table.AddParameter("x", ucrReceiverSecondTwoVariableFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) + clsCombineAnova2Function.RemoveParameterByName("x") + Else + clsCombineSwapAnova2Table.RemoveParameterByName("x") + clsCombineAnova2Function.RemoveParameterByName("x") + End If + Else + clsCombineSwapAnova2Table.RemoveParameterByName("x") + clsCombineAnova2Function.RemoveParameterByName("x") + + End If + ElseIf IsNumericByFactor() Then + If ucrReceiverSecondTwoVariableFactor.IsEmpty Then + clsCombineAnova2Function.RemoveParameterByName("x") + Else + clsCombineAnova2Function.AddParameter("x", ucrReceiverSecondTwoVariableFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) + End If + End If + End If + + End Sub + + Private Sub AddRemoveThirdAnovaParam() + If rdoThreeVariable.Checked Then + If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then + If ucrReceiverThreeVariableThirdVariable.IsEmpty Then + clsCombineAnova2Function.RemoveParameterByName("y") + Else + clsCombineAnova2Function.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames(True), iPosition:=2, bIncludeArgumentName:=False) + End If + End If + End If End Sub Private Sub AddRemoveFrequencyParameters() @@ -677,42 +1123,82 @@ Public Class dlgDescribeTwoVariable Dim clsTempFrequency As RFunction = If(rdoThreeVariable.Checked, clsThreeVariableCombineFrequencyParametersFunction, clsCombineFrequencyParametersFunction).Clone - - For Each clsParameter In clsTempFrequency.clsParameters - If IsFactorByFactor() Then - clsSummaryTableFunction.AddParameter(clsParameter) - Else - If IsNumericByFactor() OrElse IsFactorByNumeric() Then - Select Case clsParameter.strArgumentName - Case "signif_fig", "include_margins", "margin_name" - clsSummaryTableFunction.AddParameter(clsParameter) - End Select - End If + Dim clsTempColFrequency As RFunction = clsCombineFrequencyColParametersFunction.Clone + If rdoTwoVariable.Checked Then + If rdoORow.Checked OrElse rdoOCell.Checked Then + For Each clsParameter In clsTempFrequency.clsParameters + If IsFactorByFactor() Then + clsSummaryTableFunction.AddParameter(clsParameter) + Else + If IsNumericByFactor() OrElse IsFactorByNumeric() Then + Select Case clsParameter.strArgumentName + Case "signif_fig", "include_margins", "margin_name" + clsSummaryTableFunction.AddParameter(clsParameter) + End Select + End If + End If + Next + + ElseIf rdoOCol.Checked Then + + For Each clsParameter In clsTempColFrequency.clsParameters + If IsFactorByFactor() Then + clsSummaryTableFunction.AddParameter(clsParameter) + Else + If IsNumericByFactor() OrElse IsFactorByNumeric() Then + Select Case clsParameter.strArgumentName + Case "signif_fig", "include_margins", "margin_name" + clsSummaryTableFunction.AddParameter(clsParameter) + End Select + End If + End If + Next End If - Next + End If End Sub - Private Sub Frequencies_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPercentageProportion.ControlValueChanged, - ucrChkDisplayAsPercentage.ControlValueChanged, ucrChkDisplayMargins.ControlValueChanged, - ucrReceiverPercentages.ControlValueChanged, ucrInputMarginName.ControlValueChanged + Private Sub Frequencies_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverPercentages.ControlValueChanged, ucrReceiverColumns.ControlValueChanged, + ucrChkDisplayAsPercentage.ControlValueChanged, ucrChkDisplayMargins.ControlValueChanged, ucrInputMarginName.ControlValueChanged, ucrpnlPercent.ControlValueChanged If rdoTwoVariable.Checked Then If ucrChkDisplayAsPercentage.Checked Then - ucrReceiverPercentages.SetMeAsReceiver() + If rdoORow.Checked Then + ucrReceiverPercentages.SetMeAsReceiver() + ElseIf rdoOCol.Checked Then + ucrReceiverColumns.SetMeAsReceiver() + Else + ucrReceiverFirstVars.SetMeAsReceiver() + End If Else ucrReceiverFirstVars.SetMeAsReceiver() End If Else ucrReceiverFirstVars.SetMeAsReceiver() End If - If ucrChkDisplayMargins.Checked Then - ucrInputMarginName.Visible = True - clsCombineFrequencyParametersFunction.AddParameter("margin_name", Chr(34) & ucrInputMarginName.GetText & Chr(34), iPosition:=6) + If rdoORow.Checked OrElse rdoOCell.Checked Then + If ucrChkDisplayMargins.Checked Then + ucrInputMarginName.Visible = True + clsCombineFrequencyParametersFunction.AddParameter("margin_name", Chr(34) & ucrInputMarginName.GetText & Chr(34), iPosition:=6) + Else + ucrInputMarginName.Visible = False + clsCombineFrequencyParametersFunction.RemoveParameterByName("margin_name") + End If + ElseIf rdoOCol.Checked Then + + If ucrChkDisplayMargins.Checked Then + ucrInputMarginName.Visible = True + clsCombineFrequencyColParametersFunction.AddParameter("margin_name", Chr(34) & ucrInputMarginName.GetText & Chr(34), iPosition:=6) + Else + ucrInputMarginName.Visible = False + clsCombineFrequencyColParametersFunction.RemoveParameterByName("margin_name") + End If Else - ucrInputMarginName.Visible = False + clsCombineFrequencyColParametersFunction.RemoveParameterByName("margin_name") clsCombineFrequencyParametersFunction.RemoveParameterByName("margin_name") End If + FactorColumns() AddRemoveFrequencyParameters() + AddingColumnFactor() End Sub Private Sub ucrSelectorDescribeTwoVar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDescribeTwoVar.ControlValueChanged @@ -726,7 +1212,7 @@ Public Class dlgDescribeTwoVariable If rdoTwoVariable.Checked Then If IsFactorByFactor() Then clsSummaryTableFunction.AddParameter("summaries", "count_label", iPosition:=4) - ElseIf IsNumericByFactor() Then + ElseIf IsFactorByNumeric() Then clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) End If ElseIf rdoThreeVariable.Checked Then @@ -734,14 +1220,12 @@ Public Class dlgDescribeTwoVariable clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) ElseIf IsFactorByFactor() Then clsSummaryTableFunction.AddParameter("summaries", "count_label", iPosition:=4) - ElseIf IsNumericByFactor() Then - clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) End If End If End Sub Private Sub ucrReceiverNumericVariable_ControlValueAndContentChanged(ucrChangedControl As ucrCore) Handles ucrReceiverThreeVariableThirdVariable.ControlValueChanged - AssignSecondVariableType() + AssignThirdVariableType() ManageControlsVisibility() UpdateCombineFactorParameterFunction() ChangeBaseRCode() @@ -749,7 +1233,12 @@ Public Class dlgDescribeTwoVariable UpdateSummaryTableFunction() AddRemoveFrequencyParameters() AddRemoveNAParameter() - HideFormatTableButton() + AddRemoveFirstCorrParam() + AddRemoveThirdCorrParam() + AddRemoveSecondCorrParam() + AddRemoveSecondAnovaParam() + AddRemoveThirdAnovaParam() + AddRemoveFirstAnova2Param() End Sub Private Sub ChangeSumaryLabelText() @@ -760,22 +1249,38 @@ Public Class dlgDescribeTwoVariable If IsFactorByFactor() Then strSummaryName = "Frequency tables" - ElseIf IsNumericByFactor() Then - strSummaryName = "Summary tables" Else If rdoTwoVariable.Checked Then If IsNumericByNumeric() Then - strSummaryName = "Correlations" + strSummaryName = "ANOVA tables" ElseIf IsFactorByNumeric() Then + If ucrChkSwapXYVar.Checked Then + strSummaryName = "ANOVA tables" + Else + strSummaryName = "Summary tables" + End If + ElseIf IsNumericByFactor() Then strSummaryName = "ANOVA tables" Else strSummaryName = "" End If - ElseIf rdoThreeVariable.Checked Then + End If + End If + If rdoThreeVariable.Checked Then + If IsFactorByNumericByNumeric() Then + strSummaryName = "Correlations" + ElseIf IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() Then + strSummaryName = "ANOVA tables" + ElseIf IsNumericByFactorByFactor() Then + strSummaryName = "ANOVA tables" + ElseIf IsNumericByFactorByNumeric() Then + strSummaryName = "ANOVA tables" + ElseIf IsFactorByFactorByFactor() Then + strSummaryName = "Frequency tables" + Else strSummaryName = "Summary tables" End If End If - If strSummaryName <> "" Then lblSummaryName.Text = strSummaryName lblSummaryName.ForeColor = SystemColors.Highlight @@ -789,7 +1294,7 @@ Public Class dlgDescribeTwoVariable Private Sub AssignSecondVariableType() If rdoTwoVariable.Checked OrElse rdoThreeVariable.Checked Then Dim ucrCurrentReceiver As ucrReceiverSingle = If(rdoTwoVariable.Checked, - ucrReceiverSecondTwoVariableFactor, ucrReceiverThreeVariableThirdVariable) + ucrReceiverSecondTwoVariableFactor, ucrReceiverThreeVariableSecondFactor) If Not ucrCurrentReceiver.IsEmpty Then strSecondVariableType = If({"factor", "character", "logical"}.Contains(ucrCurrentReceiver.strCurrDataType), "categorical", "numeric") @@ -808,7 +1313,7 @@ Public Class dlgDescribeTwoVariable Private Sub SummariesInRowsOrCols() If ucrChkSummariesRowCol.Checked Then - clsPivotWiderFunction.AddParameter("names_from", ucrReceiverSecondTwoVariableFactor.GetVariableNames(False), iPosition:=1) + clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) clsDummyFunction.AddParameter("row_sum", "True", iPosition:=3) Else clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=1) @@ -824,9 +1329,11 @@ Public Class dlgDescribeTwoVariable UpdateSummaryTableFunction() ChangeLocations() AddRemoveNAParameter() - HideFormatTableButton() ManageControlsVisibility() FactorColumns() + AddRemoveFirstAnova2Param() + AddRemoveSecondAnovaParam() + AddingColumnFactor() End Sub Private Sub ChangeFirstTypeLabel() @@ -856,6 +1363,25 @@ Public Class dlgDescribeTwoVariable End If End Sub + Private Sub AssignThirdVariableType() + If rdoThreeVariable.Checked Then + Dim ucrCurrentReceiver As ucrReceiverSingle = ucrReceiverThreeVariableThirdVariable + If Not ucrCurrentReceiver.IsEmpty Then + strThirdVariableType = If({"factor", "character", "logical"}.Contains(ucrCurrentReceiver.strCurrDataType), + "categorical", "numeric") + lblThreeVariableCategorical.Text = strThirdVariableType + lblThreeVariableCategorical.ForeColor = SystemColors.Highlight + + Else + strThirdVariableType = "" + lblThreeVariableCategorical.Text = "________" + lblThreeVariableCategorical.ForeColor = SystemColors.ControlText + End If + ChangeSumaryLabelText() + End If + ManageControlsVisibility() + End Sub + Private Sub SetHelpOptions() Select Case enumTwovariableMode Case TwovariableMode.Describe @@ -863,6 +1389,7 @@ Public Class dlgDescribeTwoVariable Case TwovariableMode.Climatic ucrBase.iHelpTopicID = 408 End Select + End Sub Private Sub ucrReceiverFirstVars_ControlValueAndContentChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlValueChanged, @@ -876,12 +1403,21 @@ Public Class dlgDescribeTwoVariable ChangeLocations() AddRemoveFrequencyParameters() AddRemoveNAParameter() - HideFormatTableButton() FactorColumns() + AddRemoveFirstCorrParam() + AddRemoveSecondAnovaParam() + AddRemoveThirdAnovaParam() + AddRemoveFirstAnova2Param() + AddingColumnFactor() End Sub Private Sub ucrReceiverThreeVariableSecondFactor_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverThreeVariableSecondFactor.ControlValueChanged UpdateCombineFactorParameterFunction() + AssignSecondVariableType() + AddRemoveFirstCorrParam() + AddRemoveSecondCorrParam() + AddRemoveSecondAnovaParam() + AddRemoveFirstAnova2Param() End Sub Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlContentsChanged, @@ -921,7 +1457,7 @@ Public Class dlgDescribeTwoVariable bContainedInMultipleReceiver = lstMultipleVariables.Contains(ucrReceiverSecondTwoVariableFactor.GetVariableNames) Else bContainedInMultipleReceiver = lstMultipleVariables.Contains(ucrReceiverThreeVariableSecondFactor.GetVariableNames) OrElse ( - lstMultipleVariables.Contains(ucrReceiverThreeVariableThirdVariable.GetVariableNames) AndAlso strSecondVariableType = "categorical") + lstMultipleVariables.Contains(ucrReceiverThreeVariableThirdVariable.GetVariableNames)) End If End If @@ -1006,4 +1542,63 @@ Public Class dlgDescribeTwoVariable ManageControlsVisibility() SummariesInRowsOrCols() End Sub + + Private Sub ucrChkCorrelations_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkCorrelations.ControlValueChanged + ChangeBaseRCode() + End Sub + + Private Sub ucrChkSwapXYVar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSwapXYVar.ControlValueChanged + AddRemoveFirstAnova2Param() + AddRemoveSecondAnovaParam() + ChangeBaseRCode() + ChangeSumaryLabelText() + End Sub + + Private Sub AddingColumnFactor() + If IsFactorByFactor() Then + If rdoOCol.Checked Then + If Not ucrReceiverFirstVars.IsEmpty Then + ' Get the list of variable names from ucrReceiverFirstVars + Dim variableNames As List(Of String) = ucrReceiverFirstVars.GetVariableNamesAsList + + ' Get the current list of variable names in ucrReceiverColumns + Dim currentColumnVars As List(Of String) = ucrReceiverColumns.GetVariableNamesAsList() + + ' Remove variables from ucrReceiverColumns that are no longer in ucrReceiverFirstVars + For Each varName As String In currentColumnVars + If Not variableNames.Contains(varName) Then + ucrReceiverColumns.Remove(New String() {varName}) ' Remove expects an array of strings + End If + Next + + ' Add the remaining variables to ucrReceiverColumns + For Each varName As String In variableNames + If Not currentColumnVars.Contains(varName) Then + ucrReceiverColumns.Add(varName) + End If + Next + + End If + ElseIf rdoORow.Checked Then + If Not ucrReceiverSecondTwoVariableFactor.IsEmpty Then + ucrReceiverPercentages.Add(ucrReceiverSecondTwoVariableFactor.GetVariableNames(False)) + End If + End If + Else + ucrReceiverPercentages.Clear() + ucrReceiverColumns.Clear() + End If + + End Sub + + Private Sub ucrpnlPercent_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrpnlPercent.ControlValueChanged + AddingColumnFactor() + If rdoOCol.Checked Then + clsDummyFunction.AddParameter("percent", "col", iPosition:=6) + ElseIf rdoORow.Checked Then + clsDummyFunction.AddParameter("percent", "row", iPosition:=6) + Else + clsDummyFunction.AddParameter("percent", "cell", iPosition:=6) + End If + End Sub End Class diff --git a/instat/dlgDisplayDailyData.vb b/instat/dlgDisplayDailyData.vb index 59a7178f476..c4cb6d97038 100644 --- a/instat/dlgDisplayDailyData.vb +++ b/instat/dlgDisplayDailyData.vb @@ -214,7 +214,7 @@ Public Class dlgDisplayDailyData ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorDisplayDailyClimaticData.ucrAvailableDataFrames) ucrSaveGraph.SetIsComboBox() - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") ucrPnlFrequencyDisplay.AddRadioButton(rdoTable) diff --git a/instat/dlgDisplayTopN.vb b/instat/dlgDisplayTopN.vb index e4c3a89fd93..59f93c6e4b1 100644 --- a/instat/dlgDisplayTopN.vb +++ b/instat/dlgDisplayTopN.vb @@ -161,7 +161,7 @@ Public Class dlgDisplayTopN ucrInputDisplay.SetDropDownStyleAsNonEditable() ucrSaveDisplay.SetIsComboBox() - ucrSaveDisplay.SetCheckBoxText("Save Graph") + ucrSaveDisplay.SetCheckBoxText("Store Graph") ucrSaveDisplay.SetDataFrameSelector(ucrSelectorDisplayTopN.ucrAvailableDataFrames) ucrSaveDisplay.SetSaveTypeAsGraph() ucrSaveDisplay.SetPrefix("lollipop") diff --git a/instat/dlgDotPlot.vb b/instat/dlgDotPlot.vb index fa66d7cb1b8..6d1823458db 100644 --- a/instat/dlgDotPlot.vb +++ b/instat/dlgDotPlot.vb @@ -111,7 +111,7 @@ Public Class dlgDotPlot ucrSaveDotPlot.SetPrefix("dot_plot") ucrSaveDotPlot.SetSaveTypeAsGraph() ucrSaveDotPlot.SetIsComboBox() - ucrSaveDotPlot.SetCheckBoxText("Save Graph") + ucrSaveDotPlot.SetCheckBoxText("Store Graph") ucrSaveDotPlot.SetDataFrameSelector(ucrDotPlotSelector.ucrAvailableDataFrames) ucrSaveDotPlot.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgDuplicateColumns.Designer.vb b/instat/dlgDuplicateColumns.Designer.vb index 382c3a4b4db..635dff871c9 100644 --- a/instat/dlgDuplicateColumns.Designer.vb +++ b/instat/dlgDuplicateColumns.Designer.vb @@ -61,6 +61,7 @@ Partial Class dlgDuplicateColumns Me.ucrSelectorForDuplicateColumn = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrSaveColumn = New instat.ucrSave() + Me.ucrChkIgnoreLabels = New instat.ucrCheck() Me.grpConvertTo.SuspendLayout() Me.grpFactorToNumericOptions.SuspendLayout() Me.SuspendLayout() @@ -328,12 +329,23 @@ Partial Class dlgDuplicateColumns Me.ucrSaveColumn.Size = New System.Drawing.Size(327, 22) Me.ucrSaveColumn.TabIndex = 30 ' + 'ucrChkIgnoreLabels + ' + Me.ucrChkIgnoreLabels.AutoSize = True + Me.ucrChkIgnoreLabels.Checked = False + Me.ucrChkIgnoreLabels.Location = New System.Drawing.Point(371, 340) + Me.ucrChkIgnoreLabels.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrChkIgnoreLabels.Name = "ucrChkIgnoreLabels" + Me.ucrChkIgnoreLabels.Size = New System.Drawing.Size(100, 23) + Me.ucrChkIgnoreLabels.TabIndex = 31 + ' 'dlgDuplicateColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(486, 432) + Me.Controls.Add(Me.ucrChkIgnoreLabels) Me.Controls.Add(Me.ucrSaveColumn) Me.Controls.Add(Me.ucrChkChangeType) Me.Controls.Add(Me.ucrChkConvertCreateLabels) @@ -385,4 +397,5 @@ Partial Class dlgDuplicateColumns Friend WithEvents ucrChkConvertKeepAttributes As ucrCheck Friend WithEvents ucrChkChangeType As ucrCheck Friend WithEvents ucrSaveColumn As ucrSave + Friend WithEvents ucrChkIgnoreLabels As ucrCheck End Class diff --git a/instat/dlgDuplicateColumns.vb b/instat/dlgDuplicateColumns.vb index 449efa4c616..e7dce8b043d 100644 --- a/instat/dlgDuplicateColumns.vb +++ b/instat/dlgDuplicateColumns.vb @@ -108,6 +108,12 @@ Public Class dlgDuplicateColumns ucrChkConvertKeepAttributes.SetText("Keep Attributes") ucrChkConvertKeepAttributes.SetRDefault("TRUE") + ucrPnlConvertTo.AddToLinkedControls(ucrChkIgnoreLabels, {rdoConvertToNumeric}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkIgnoreLabels.SetParameter(New RParameter("ignore_labels", 7)) + ucrChkIgnoreLabels.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkIgnoreLabels.SetRDefault("FALSE") + ucrChkIgnoreLabels.SetText("Ignore Labels") + ucrPnlConvertTo.AddToLinkedControls(ucrChkConvertCreateLabels, {rdoConvertToNumeric}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkConvertCreateLabels.SetParameter(New RParameter("keep.labels", 7)) ucrChkConvertCreateLabels.SetText("Create Labels") @@ -218,4 +224,12 @@ Public Class dlgDuplicateColumns Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDuplicateColumns.ControlContentsChanged, ucrPnlConvertTo.ControlContentsChanged, ucrNudConvertDisplayDecimals.ControlContentsChanged, ucrChkConvertSpecifyDecimalsToDisplay.ControlContentsChanged, ucrChkChangeType.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrChkIgnoreLabels_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIgnoreLabels.ControlValueChanged + If ucrChkIgnoreLabels.Checked Then + clsConvertFunction.AddParameter("ignore_labels", "TRUE") + Else + clsConvertFunction.RemoveParameterByName("ignore_labels") + End If + End Sub End Class diff --git a/instat/dlgEdit.vb b/instat/dlgEdit.vb index f0f45fb33b0..57bc524212f 100644 --- a/instat/dlgEdit.vb +++ b/instat/dlgEdit.vb @@ -55,6 +55,7 @@ Public Class dlgEdit Private Sub InitialiseDialog() Dim dctLogical As New Dictionary(Of String, String) + ucrBase.iHelpTopicID = 699 ucrSelectValues.SetParameter(New RParameter("data_name", 0)) ucrSelectValues.SetParameterIsString() ucrSelectValues.ucrAvailableDataFrames.Enabled = False diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index f4685299ee9..2067cedc683 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -98,19 +98,26 @@ Public Class dlgEndOfRainsSeason Private clsEndSeasonWBMinCalcSubCalcsList As New RFunction Private clsReduceWBMinFunction As New RFunction Private clsReduceWBMinFunction1 As New RFunction + Private clsReduceWBMinFunction2 As New RFunction Private clsPMinWBMinFunction As New RFunction Private clsWBMinTailFunction As New RFunction Private clsWBMinTailFunction1 As New RFunction + Private clsWBMinTailFunction2 As New RFunction Private clsWBMinEvapOperator As New ROperator + Private clsMinusMinOperator As New ROperator + Private clsMinusMaxOperator As New ROperator ' Water Balance max Private clsEndSeasonWBMaxCalc As New RFunction Private clsEndSeasonWBMaxCalcSubCalcsList As New RFunction Private clsReduceWBMaxFunction As New RFunction Private clsReduceWBMaxFunction1 As New RFunction + Private clsReduceWBMaxFunction2 As New RFunction + Private clsAsNumericFunction As New RFunction Private clsPMinWBMaxFunction As New RFunction Private clsWBMaxTailFunction As New RFunction Private clsWBMaxTailFunction1 As New RFunction + Private clsWBMaxTailFunction2 As New RFunction Private clsWBMaxEvapOperator As New ROperator ' Water Balance @@ -297,11 +304,11 @@ Public Class dlgEndOfRainsSeason ucrInputEndofSeasonOccurence.SetDataFrameSelector(ucrSelectorForWaterBalance.ucrAvailableDataFrames) ucrInputEndofSeasonOccurence.SetValidationTypeAsRVariable() - ucrChkWB.SetParameter(New RParameter("WB_evap")) - ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkWB.AddParameterPresentCondition(True, "WB_evap", True) + ucrChkWB.AddParameterPresentCondition(False, "WB_evap", False) ucrChkWB.SetText("Reducing") - ucrNudWB.SetParameter(New RParameter("WB_evap_value")) + ucrNudWB.SetParameter(New RParameter("WB_evap_value", 2, False)) ucrNudWB.SetMinMax(0, 1) ucrNudWB.Increment = 0.01 ucrNudWB.DecimalPlaces = 2 @@ -421,9 +428,11 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMinCalcSubCalcsList.Clear() clsReduceWBMinFunction.Clear() clsReduceWBMinFunction1.Clear() + clsReduceWBMinFunction2.Clear() clsPMinWBMinFunction.Clear() clsWBMinTailFunction.Clear() clsWBMinTailFunction1.Clear() + clsWBMinTailFunction2.Clear() clsWBMinEvapOperator.Clear() ' Water Balance max @@ -431,9 +440,11 @@ Public Class dlgEndOfRainsSeason clsEndSeasonWBMaxCalcSubCalcsList.Clear() clsReduceWBMaxFunction.Clear() clsReduceWBMaxFunction1.Clear() + clsReduceWBMaxFunction2.Clear() clsPMinWBMaxFunction.Clear() clsWBMaxTailFunction.Clear() clsWBMaxTailFunction1.Clear() + clsWBMaxTailFunction2.Clear() clsWBMaxEvapOperator.Clear() ' Water Balance @@ -484,6 +495,9 @@ Public Class dlgEndOfRainsSeason 'temporary fix rdoEndOfRains.Checked = True + ucrNudCapacity.SetText("100") + ucrNudWBLessThan.SetText("0.5") + ' Group by clsGroupByStationYearCalc.SetRCommand("instat_calculation$new") clsGroupByStationYearCalc.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0) @@ -694,9 +708,14 @@ Public Class dlgEndOfRainsSeason clsReduceWBMinFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) clsReduceWBMinFunction1.AddParameter(".init", "0", iPosition:=2) + clsReduceWBMinFunction2.bToScriptAsRString = True + clsReduceWBMinFunction2.SetPackageName("purrr") + clsReduceWBMinFunction2.SetRCommand("accumulate") + clsReduceWBMinFunction2.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction2.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction2, iPosition:=1) + clsReduceWBMinFunction2.AddParameter(".init", "0", iPosition:=2) + clsPMinWBMinFunction.SetRCommand(" ~ pmin") - clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPMinWBMinFunction.AddParameter("1", iCapacityDefault, iPosition:=1, bIncludeArgumentName:=False) clsWBMinTailFunction.SetRCommand("tail") clsWBMinTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMinEvapOperator, iPosition:=0) @@ -706,9 +725,21 @@ Public Class dlgEndOfRainsSeason clsWBMinTailFunction1.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(False), iPosition:=0) clsWBMinTailFunction1.AddParameter("n", "-1", iPosition:=1) + clsAsNumericFunction = New RFunction + clsAsNumericFunction.SetRCommand("as.numeric") + clsAsNumericFunction.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(), iPosition:=0, bIncludeArgumentName:=False) + + clsMinusMinOperator = New ROperator + clsMinusMinOperator.SetOperation("-") + clsMinusMinOperator.AddParameter("left", strRainMin, iPosition:=0, bIncludeArgumentName:=False) + clsMinusMinOperator.AddParameter("right", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMinTailFunction2.SetRCommand("tail") + clsWBMinTailFunction2.AddParameter("x", clsROperatorParameter:=clsMinusMinOperator, iPosition:=0, bIncludeArgumentName:=False) + clsWBMinTailFunction2.AddParameter("n", "-1", iPosition:=1) + clsWBMinEvapOperator.SetOperation("-") clsWBMinEvapOperator.AddParameter("0", strRainMin, iPosition:=0) - clsWBMinEvapOperator.AddParameter("value", "5", iPosition:=1) ' Water Balance max clsEndSeasonWBMaxCalc.SetRCommand("instat_calculation$new") @@ -735,9 +766,14 @@ Public Class dlgEndOfRainsSeason clsReduceWBMaxFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) clsReduceWBMaxFunction1.AddParameter(".init", "0", iPosition:=2) + clsReduceWBMaxFunction2.bToScriptAsRString = True + clsReduceWBMaxFunction2.SetPackageName("purrr") + clsReduceWBMaxFunction2.SetRCommand("accumulate") + clsReduceWBMaxFunction2.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction2.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction2, iPosition:=1) + clsReduceWBMaxFunction2.AddParameter(".init", "0", iPosition:=2) + clsPMinWBMaxFunction.SetRCommand(" ~ pmin") - clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPMinWBMaxFunction.AddParameter("1", iCapacityDefault, iPosition:=1, bIncludeArgumentName:=False) clsWBMaxTailFunction.SetRCommand("tail") clsWBMaxTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMaxEvapOperator, iPosition:=0) @@ -747,6 +783,15 @@ Public Class dlgEndOfRainsSeason clsWBMaxTailFunction1.AddParameter("x", ucrReceiverEvaporation.GetVariableNames(False), iPosition:=0) clsWBMaxTailFunction1.AddParameter("n", "-1", iPosition:=1) + clsMinusMaxOperator = New ROperator + clsMinusMaxOperator.SetOperation("-") + clsMinusMaxOperator.AddParameter("left", strRainMax, iPosition:=0, bIncludeArgumentName:=False) + clsMinusMaxOperator.AddParameter("right", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMaxTailFunction2.SetRCommand("tail") + clsWBMaxTailFunction2.AddParameter("x", clsROperatorParameter:=clsMinusMaxOperator, iPosition:=0) + clsWBMaxTailFunction2.AddParameter("n", "-1", iPosition:=1) + clsWBMaxEvapOperator.SetOperation("-") clsWBMaxEvapOperator.AddParameter("0", strRainMax, iPosition:=0) clsWBMaxEvapOperator.AddParameter("value", "5", iPosition:=1) @@ -880,13 +925,9 @@ Public Class dlgEndOfRainsSeason ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIfElseRainMinFunction, New RParameter("no", 2), iAdditionalPairNo:=2) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIfElseRainMaxFunction, New RParameter("no", 2), iAdditionalPairNo:=3) ucrReceiverEvaporation.AddAdditionalCodeParameterPair(clsWBMaxTailFunction1, New RParameter("x", 0), iAdditionalPairNo:=1) + ucrReceiverEvaporation.AddAdditionalCodeParameterPair(clsAsNumericFunction, New RParameter("x", 0), iAdditionalPairNo:=2) ucrReceiverDate.AddAdditionalCodeParameterPair(clsFirstDateFunction, New RParameter("x", 0), iAdditionalPairNo:=1) - ucrNudCapacity.AddAdditionalCodeParameterPair(clsPMinWBMinFunction, New RParameter("1", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) - ucrNudCapacity.AddAdditionalCodeParameterPair(clsPMinWBMaxFunction, New RParameter("1", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) - - ucrInputEvaporation.AddAdditionalCodeParameterPair(clsWBMaxEvapOperator, New RParameter("value", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) - ucrReceiverDOY.SetRCode(clsDayToOperator, bReset) ucrInputEndRainDoy.SetRCode(clsEndRainsLastDoySummaryCalc, bReset) @@ -904,11 +945,11 @@ Public Class dlgEndOfRainsSeason ucrNudWBLessThan.SetRCode(clsEndSeasonWBConditionOperator, bReset) If bReset Then + ucrChkWB.SetRCode(clsWBEvaporationMinFunction, bReset) + ucrNudWB.SetRCode(clsWBEvaporationMinFunction, bReset) ucrPnlEvaporation.SetRCode(clsWBMinEvapOperator, bReset) - ucrInputEvaporation.SetRCode(clsWBMinEvapOperator, bReset) ucrReceiverEvaporation.SetRCode(clsWBMinTailFunction1, bReset) End If - ucrNudCapacity.SetRCode(clsIfElseRainMaxFunction, bReset) ucrChkEndofSeasonDoy.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) ucrChkEndofSeasonDate.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) @@ -1034,58 +1075,52 @@ Public Class dlgEndOfRainsSeason Private Sub Evaporation() If rdoEndOfSeasons.Checked Then + clsPMaxFunction.RemoveParameterByName("0") + clsPMaxFunction.RemoveParameterByName("0") + clsWBMinEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("value") + clsWBMinEvapOperator.RemoveParameterByName("value") + clsPMaxFunction.RemoveParameterByName("wb") + clsPMaxFunction.RemoveParameterByName("wb") + clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1, bIncludeArgumentName:=False) If rdoValueEvaporation.Checked Then clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) - clsWBMinEvapOperator.RemoveParameterByName("variable") - clsWBMaxEvapOperator.RemoveParameterByName("variable") If ucrChkWB.Checked Then clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) clsWBEvaporationMinFunction.AddParameter("yes", ucrNudCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) clsWBEvaporationMinFunction.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=3, bIncludeArgumentName:=False) clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunction.RemoveParameterByName("0") - clsPMaxFunction.RemoveParameterByName("0") - clsWBMaxEvapOperator.RemoveParameterByName("value") - clsWBMinEvapOperator.RemoveParameterByName("value") - clsPMinWBMaxFunction.RemoveParameterByName("1") - clsPMinWBMinFunction.RemoveParameterByName("1") + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) Else - clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunction.RemoveParameterByName("wb") - clsPMaxFunction.RemoveParameterByName("wb") clsWBMaxEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) clsWBMinEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) - clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) - clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) End If Else ucrReceiverEvaporation.SetMeAsReceiver() - clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction1, iPosition:=1) - clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction1, iPosition:=1) - clsWBMinEvapOperator.RemoveParameterByName("variable") - clsWBMaxEvapOperator.RemoveParameterByName("variable") If ucrChkWB.Checked Then + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction1, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction1, iPosition:=1) clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) clsWBEvaporationMinFunction.AddParameter("yes", ucrNudCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) clsWBEvaporationMinFunction.AddParameter("value", "..3", bIncludeArgumentName:=False, iPosition:=3) clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunction.RemoveParameterByName("0") - clsPMaxFunction.RemoveParameterByName("0") - clsWBMaxEvapOperator.RemoveParameterByName("value") - clsWBMinEvapOperator.RemoveParameterByName("value") - clsPMinWBMaxFunction.RemoveParameterByName("1") - clsPMinWBMinFunction.RemoveParameterByName("1") + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) Else + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction2, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction2, iPosition:=1) clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunction.RemoveParameterByName("wb") - clsPMaxFunction.RemoveParameterByName("wb") - clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) - clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) - clsPMinWBMaxFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) - clsPMinWBMinFunction.AddParameter("1", ucrNudCapacity.GetText(), iPosition:=1) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) End If End If End If @@ -1098,6 +1133,7 @@ Public Class dlgEndOfRainsSeason Else clsRunCalculation.AddParameter("calc", clsRFunctionParameter:=clsEndSeasonCombinationCalc) clsFirstOrLastFunction = clsFirstDoyFunction + Evaporation() End If End Sub @@ -1160,4 +1196,13 @@ Public Class dlgEndOfRainsSeason Private Sub rdoValueEvaporation_CheckedChanged(sender As Object, e As EventArgs) Handles rdoValueEvaporation.CheckedChanged, rdoVariableEvaporation.CheckedChanged Evaporation() End Sub + + Private Sub ucrNudWBLessThan_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWBLessThan.ControlValueChanged, ucrChkEndofSeasonOccurence.ControlValueChanged, ucrInputEndofSeasonOccurence.ControlValueChanged, ucrChkEndofSeasonDate.ControlValueChanged, ucrInputEndofSeasonDate.ControlValueChanged, ucrChkEndofSeasonDoy.ControlValueChanged, ucrInputSeasonDoy.ControlValueChanged, ucrSelectorForWaterBalance.ControlValueChanged + If Not ucrNudWBLessThan.IsEmpty Then + clsEndSeasonWBConditionOperator.AddParameter("1", ucrNudWBLessThan.GetText(), iPosition:=1) + Else + clsEndSeasonWBConditionOperator.RemoveParameterByName("1") + End If + 'Evaporation() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgEnter.Designer.vb b/instat/dlgEnter.Designer.vb index 3794796db6d..8ddbf63363b 100644 --- a/instat/dlgEnter.Designer.vb +++ b/instat/dlgEnter.Designer.vb @@ -78,12 +78,14 @@ Partial Class dlgEnter Me.ttEnter = New System.Windows.Forms.ToolTip(Me.components) Me.ucrSaveEnterResultInto = New instat.ucrSave() Me.ucrTryModelling = New instat.ucrTry() - Me.ucrDataFrameEnter = New instat.ucrDataFrame() Me.ucrReceiverForEnterCalculation = New instat.ucrReceiverExpression() Me.ucrBase = New instat.ucrButtons() Me.cmdRHelp = New instat.ucrSplitButton() Me.ContextMenuStripBase = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuBase = New System.Windows.Forms.ToolStripMenuItem() + Me.ucrSelectorEnter = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrChkStoreScalar = New instat.ucrCheck() + Me.checkScalars = New System.Windows.Forms.CheckBox() Me.grpEnterKeyboard2.SuspendLayout() Me.grpBasic.SuspendLayout() Me.ContextMenuStripBase.SuspendLayout() @@ -93,9 +95,10 @@ Partial Class dlgEnter ' Me.chkShowEnterArguments.AutoSize = True Me.chkShowEnterArguments.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.chkShowEnterArguments.Location = New System.Drawing.Point(307, 18) + Me.chkShowEnterArguments.Location = New System.Drawing.Point(460, 27) + Me.chkShowEnterArguments.Margin = New System.Windows.Forms.Padding(4) Me.chkShowEnterArguments.Name = "chkShowEnterArguments" - Me.chkShowEnterArguments.Size = New System.Drawing.Size(109, 17) + Me.chkShowEnterArguments.Size = New System.Drawing.Size(161, 24) Me.chkShowEnterArguments.TabIndex = 155 Me.chkShowEnterArguments.Text = "Show Parameters" Me.chkShowEnterArguments.UseVisualStyleBackColor = True @@ -104,10 +107,9 @@ Partial Class dlgEnter ' Me.lblData.AutoSize = True Me.lblData.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblData.Location = New System.Drawing.Point(10, 20) - Me.lblData.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblData.Location = New System.Drawing.Point(15, 30) Me.lblData.Name = "lblData" - Me.lblData.Size = New System.Drawing.Size(33, 13) + Me.lblData.Size = New System.Drawing.Size(48, 20) Me.lblData.TabIndex = 152 Me.lblData.Tag = "Data" Me.lblData.Text = "Data:" @@ -115,10 +117,10 @@ Partial Class dlgEnter 'cmdQuotes ' Me.cmdQuotes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuotes.Location = New System.Drawing.Point(100, 101) - Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdQuotes.Location = New System.Drawing.Point(150, 152) + Me.cmdQuotes.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdQuotes.Name = "cmdQuotes" - Me.cmdQuotes.Size = New System.Drawing.Size(49, 30) + Me.cmdQuotes.Size = New System.Drawing.Size(74, 45) Me.cmdQuotes.TabIndex = 142 Me.cmdQuotes.Text = """ """ Me.cmdQuotes.UseVisualStyleBackColor = True @@ -127,10 +129,10 @@ Partial Class dlgEnter ' Me.cmdExponential.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdExponential.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdExponential.Location = New System.Drawing.Point(52, 101) - Me.cmdExponential.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdExponential.Location = New System.Drawing.Point(78, 152) + Me.cmdExponential.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdExponential.Name = "cmdExponential" - Me.cmdExponential.Size = New System.Drawing.Size(49, 30) + Me.cmdExponential.Size = New System.Drawing.Size(74, 45) Me.cmdExponential.TabIndex = 143 Me.cmdExponential.Text = "E" Me.cmdExponential.UseVisualStyleBackColor = True @@ -138,10 +140,10 @@ Partial Class dlgEnter 'cmdConcantenateFunction ' Me.cmdConcantenateFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdConcantenateFunction.Location = New System.Drawing.Point(4, 101) - Me.cmdConcantenateFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdConcantenateFunction.Location = New System.Drawing.Point(6, 152) + Me.cmdConcantenateFunction.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdConcantenateFunction.Name = "cmdConcantenateFunction" - Me.cmdConcantenateFunction.Size = New System.Drawing.Size(49, 30) + Me.cmdConcantenateFunction.Size = New System.Drawing.Size(74, 45) Me.cmdConcantenateFunction.TabIndex = 145 Me.cmdConcantenateFunction.Text = "c( )" Me.cmdConcantenateFunction.UseVisualStyleBackColor = True @@ -150,10 +152,10 @@ Partial Class dlgEnter ' Me.cmdSequenceFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdSequenceFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSequenceFunction.Location = New System.Drawing.Point(4, 72) - Me.cmdSequenceFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdSequenceFunction.Location = New System.Drawing.Point(6, 108) + Me.cmdSequenceFunction.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdSequenceFunction.Name = "cmdSequenceFunction" - Me.cmdSequenceFunction.Size = New System.Drawing.Size(49, 30) + Me.cmdSequenceFunction.Size = New System.Drawing.Size(74, 45) Me.cmdSequenceFunction.TabIndex = 147 Me.cmdSequenceFunction.Tag = "Del" Me.cmdSequenceFunction.Text = "seq" @@ -163,10 +165,10 @@ Partial Class dlgEnter ' Me.cmdRepelicationFunction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRepelicationFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRepelicationFunction.Location = New System.Drawing.Point(4, 43) - Me.cmdRepelicationFunction.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdRepelicationFunction.Location = New System.Drawing.Point(6, 64) + Me.cmdRepelicationFunction.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdRepelicationFunction.Name = "cmdRepelicationFunction" - Me.cmdRepelicationFunction.Size = New System.Drawing.Size(49, 30) + Me.cmdRepelicationFunction.Size = New System.Drawing.Size(74, 45) Me.cmdRepelicationFunction.TabIndex = 148 Me.cmdRepelicationFunction.Text = "rep" Me.cmdRepelicationFunction.UseVisualStyleBackColor = True @@ -174,10 +176,10 @@ Partial Class dlgEnter 'cmdLogical ' Me.cmdLogical.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLogical.Location = New System.Drawing.Point(100, 72) - Me.cmdLogical.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLogical.Location = New System.Drawing.Point(150, 108) + Me.cmdLogical.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdLogical.Name = "cmdLogical" - Me.cmdLogical.Size = New System.Drawing.Size(49, 30) + Me.cmdLogical.Size = New System.Drawing.Size(74, 45) Me.cmdLogical.TabIndex = 149 Me.cmdLogical.Text = "logical" Me.cmdLogical.UseVisualStyleBackColor = True @@ -185,10 +187,10 @@ Partial Class dlgEnter 'cmdPi ' Me.cmdPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPi.Location = New System.Drawing.Point(52, 72) - Me.cmdPi.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPi.Location = New System.Drawing.Point(78, 108) + Me.cmdPi.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdPi.Name = "cmdPi" - Me.cmdPi.Size = New System.Drawing.Size(49, 30) + Me.cmdPi.Size = New System.Drawing.Size(74, 45) Me.cmdPi.TabIndex = 149 Me.cmdPi.Text = "pi" Me.cmdPi.UseVisualStyleBackColor = True @@ -196,10 +198,10 @@ Partial Class dlgEnter 'cmdLetters2 ' Me.cmdLetters2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLetters2.Location = New System.Drawing.Point(52, 14) - Me.cmdLetters2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdLetters2.Location = New System.Drawing.Point(78, 21) + Me.cmdLetters2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdLetters2.Name = "cmdLetters2" - Me.cmdLetters2.Size = New System.Drawing.Size(49, 30) + Me.cmdLetters2.Size = New System.Drawing.Size(74, 45) Me.cmdLetters2.TabIndex = 152 Me.cmdLetters2.Text = "letters" Me.cmdLetters2.UseVisualStyleBackColor = True @@ -207,10 +209,10 @@ Partial Class dlgEnter 'cmdMonths ' Me.cmdMonths.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMonths.Location = New System.Drawing.Point(52, 43) - Me.cmdMonths.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMonths.Location = New System.Drawing.Point(78, 64) + Me.cmdMonths.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdMonths.Name = "cmdMonths" - Me.cmdMonths.Size = New System.Drawing.Size(49, 30) + Me.cmdMonths.Size = New System.Drawing.Size(74, 45) Me.cmdMonths.TabIndex = 151 Me.cmdMonths.Text = "months " Me.cmdMonths.UseVisualStyleBackColor = True @@ -219,10 +221,10 @@ Partial Class dlgEnter ' Me.cmdColon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdColon.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdColon.Location = New System.Drawing.Point(4, 14) - Me.cmdColon.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdColon.Location = New System.Drawing.Point(6, 21) + Me.cmdColon.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdColon.Name = "cmdColon" - Me.cmdColon.Size = New System.Drawing.Size(49, 30) + Me.cmdColon.Size = New System.Drawing.Size(74, 45) Me.cmdColon.TabIndex = 151 Me.cmdColon.Text = "[:]" Me.cmdColon.UseVisualStyleBackColor = True @@ -241,11 +243,11 @@ Partial Class dlgEnter Me.grpEnterKeyboard2.Controls.Add(Me.cmdConcantenateFunction) Me.grpEnterKeyboard2.Controls.Add(Me.cmdExponential) Me.grpEnterKeyboard2.Controls.Add(Me.cmdQuotes) - Me.grpEnterKeyboard2.Location = New System.Drawing.Point(378, 50) - Me.grpEnterKeyboard2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpEnterKeyboard2.Location = New System.Drawing.Point(662, 75) + Me.grpEnterKeyboard2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.grpEnterKeyboard2.Name = "grpEnterKeyboard2" - Me.grpEnterKeyboard2.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpEnterKeyboard2.Size = New System.Drawing.Size(156, 134) + Me.grpEnterKeyboard2.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpEnterKeyboard2.Size = New System.Drawing.Size(234, 201) Me.grpEnterKeyboard2.TabIndex = 159 Me.grpEnterKeyboard2.TabStop = False ' @@ -253,10 +255,10 @@ Partial Class dlgEnter ' Me.cmdText.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdText.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdText.Location = New System.Drawing.Point(100, 43) - Me.cmdText.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdText.Location = New System.Drawing.Point(150, 64) + Me.cmdText.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdText.Name = "cmdText" - Me.cmdText.Size = New System.Drawing.Size(49, 30) + Me.cmdText.Size = New System.Drawing.Size(74, 45) Me.cmdText.TabIndex = 155 Me.cmdText.Text = "text" Me.cmdText.UseVisualStyleBackColor = True @@ -265,10 +267,10 @@ Partial Class dlgEnter ' Me.cmdFactor.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFactor.Location = New System.Drawing.Point(100, 14) - Me.cmdFactor.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdFactor.Location = New System.Drawing.Point(150, 21) + Me.cmdFactor.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdFactor.Name = "cmdFactor" - Me.cmdFactor.Size = New System.Drawing.Size(49, 30) + Me.cmdFactor.Size = New System.Drawing.Size(74, 45) Me.cmdFactor.TabIndex = 153 Me.cmdFactor.Text = "factor " Me.cmdFactor.UseVisualStyleBackColor = True @@ -276,10 +278,9 @@ Partial Class dlgEnter 'btnExample ' Me.btnExample.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnExample.Location = New System.Drawing.Point(436, 16) - Me.btnExample.Margin = New System.Windows.Forms.Padding(2) + Me.btnExample.Location = New System.Drawing.Point(654, 24) Me.btnExample.Name = "btnExample" - Me.btnExample.Size = New System.Drawing.Size(64, 22) + Me.btnExample.Size = New System.Drawing.Size(96, 33) Me.btnExample.TabIndex = 161 Me.btnExample.Text = "Examples" Me.btnExample.UseVisualStyleBackColor = True @@ -305,21 +306,21 @@ Partial Class dlgEnter 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(170, 51) - Me.grpBasic.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.grpBasic.Location = New System.Drawing.Point(350, 76) + Me.grpBasic.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.grpBasic.Name = "grpBasic" - Me.grpBasic.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpBasic.Size = New System.Drawing.Size(205, 134) + Me.grpBasic.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.grpBasic.Size = New System.Drawing.Size(308, 201) Me.grpBasic.TabIndex = 180 Me.grpBasic.TabStop = False ' 'cmdClear ' Me.cmdClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClear.Location = New System.Drawing.Point(151, 71) - Me.cmdClear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdClear.Location = New System.Drawing.Point(226, 106) + Me.cmdClear.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdClear.Name = "cmdClear" - Me.cmdClear.Size = New System.Drawing.Size(49, 60) + Me.cmdClear.Size = New System.Drawing.Size(74, 90) Me.cmdClear.TabIndex = 190 Me.cmdClear.Text = "Clear" Me.cmdClear.UseVisualStyleBackColor = True @@ -328,10 +329,10 @@ Partial Class dlgEnter ' Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.Button1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button1.Location = New System.Drawing.Point(3, 100) - Me.Button1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Button1.Location = New System.Drawing.Point(4, 150) + Me.Button1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(38, 30) + Me.Button1.Size = New System.Drawing.Size(57, 45) Me.Button1.TabIndex = 138 Me.Button1.Text = "," Me.Button1.UseVisualStyleBackColor = True @@ -339,10 +340,10 @@ Partial Class dlgEnter 'cmdBrackets ' Me.cmdBrackets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrackets.Location = New System.Drawing.Point(77, 100) - Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdBrackets.Location = New System.Drawing.Point(116, 150) + Me.cmdBrackets.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdBrackets.Name = "cmdBrackets" - Me.cmdBrackets.Size = New System.Drawing.Size(38, 30) + Me.cmdBrackets.Size = New System.Drawing.Size(57, 45) Me.cmdBrackets.TabIndex = 136 Me.cmdBrackets.Text = "( )" Me.cmdBrackets.UseVisualStyleBackColor = True @@ -351,10 +352,10 @@ Partial Class dlgEnter ' 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(151, 42) - Me.cmdPower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPower.Location = New System.Drawing.Point(226, 63) + Me.cmdPower.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdPower.Name = "cmdPower" - Me.cmdPower.Size = New System.Drawing.Size(49, 30) + Me.cmdPower.Size = New System.Drawing.Size(74, 45) Me.cmdPower.TabIndex = 133 Me.cmdPower.Text = "^" Me.cmdPower.UseVisualStyleBackColor = True @@ -363,10 +364,10 @@ Partial Class dlgEnter ' 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(114, 13) - Me.cmdDivide.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdDivide.Location = New System.Drawing.Point(171, 20) + Me.cmdDivide.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdDivide.Name = "cmdDivide" - Me.cmdDivide.Size = New System.Drawing.Size(38, 30) + Me.cmdDivide.Size = New System.Drawing.Size(57, 45) Me.cmdDivide.TabIndex = 131 Me.cmdDivide.Text = "/" Me.cmdDivide.UseVisualStyleBackColor = True @@ -375,10 +376,10 @@ Partial Class dlgEnter ' 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(114, 100) - Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdPlus.Location = New System.Drawing.Point(171, 150) + Me.cmdPlus.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdPlus.Name = "cmdPlus" - Me.cmdPlus.Size = New System.Drawing.Size(38, 30) + Me.cmdPlus.Size = New System.Drawing.Size(57, 45) Me.cmdPlus.TabIndex = 130 Me.cmdPlus.Text = "+" Me.cmdPlus.UseVisualStyleBackColor = True @@ -387,10 +388,10 @@ Partial Class dlgEnter ' 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(114, 71) - Me.cmdMinus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMinus.Location = New System.Drawing.Point(171, 106) + Me.cmdMinus.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdMinus.Name = "cmdMinus" - Me.cmdMinus.Size = New System.Drawing.Size(38, 30) + Me.cmdMinus.Size = New System.Drawing.Size(57, 45) Me.cmdMinus.TabIndex = 129 Me.cmdMinus.Text = "-" Me.cmdMinus.UseVisualStyleBackColor = True @@ -399,10 +400,10 @@ Partial Class dlgEnter ' 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(114, 42) - Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmdMultiply.Location = New System.Drawing.Point(171, 63) + Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmdMultiply.Name = "cmdMultiply" - Me.cmdMultiply.Size = New System.Drawing.Size(38, 30) + Me.cmdMultiply.Size = New System.Drawing.Size(57, 45) Me.cmdMultiply.TabIndex = 128 Me.cmdMultiply.Text = "*" Me.cmdMultiply.UseVisualStyleBackColor = True @@ -411,10 +412,10 @@ Partial Class dlgEnter ' Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!) Me.Button2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button2.Location = New System.Drawing.Point(151, 13) - Me.Button2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Button2.Location = New System.Drawing.Point(226, 20) + Me.Button2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(49, 30) + Me.Button2.Size = New System.Drawing.Size(74, 45) Me.Button2.TabIndex = 127 Me.Button2.Text = "." Me.Button2.UseVisualStyleBackColor = True @@ -422,10 +423,10 @@ Partial Class dlgEnter 'cmd9 ' Me.cmd9.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd9.Location = New System.Drawing.Point(77, 13) - Me.cmd9.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd9.Location = New System.Drawing.Point(116, 20) + Me.cmd9.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd9.Name = "cmd9" - Me.cmd9.Size = New System.Drawing.Size(38, 30) + Me.cmd9.Size = New System.Drawing.Size(57, 45) Me.cmd9.TabIndex = 126 Me.cmd9.Text = "9" Me.cmd9.UseVisualStyleBackColor = True @@ -433,10 +434,10 @@ Partial Class dlgEnter 'cmd8 ' Me.cmd8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd8.Location = New System.Drawing.Point(40, 13) - Me.cmd8.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd8.Location = New System.Drawing.Point(60, 20) + Me.cmd8.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd8.Name = "cmd8" - Me.cmd8.Size = New System.Drawing.Size(38, 30) + Me.cmd8.Size = New System.Drawing.Size(57, 45) Me.cmd8.TabIndex = 125 Me.cmd8.Text = "8" Me.cmd8.UseVisualStyleBackColor = True @@ -444,10 +445,10 @@ Partial Class dlgEnter 'cmd7 ' Me.cmd7.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd7.Location = New System.Drawing.Point(3, 13) - Me.cmd7.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd7.Location = New System.Drawing.Point(4, 20) + Me.cmd7.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd7.Name = "cmd7" - Me.cmd7.Size = New System.Drawing.Size(38, 30) + Me.cmd7.Size = New System.Drawing.Size(57, 45) Me.cmd7.TabIndex = 124 Me.cmd7.Text = "7" Me.cmd7.UseVisualStyleBackColor = True @@ -455,10 +456,10 @@ Partial Class dlgEnter 'cmd6 ' Me.cmd6.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd6.Location = New System.Drawing.Point(77, 42) - Me.cmd6.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd6.Location = New System.Drawing.Point(116, 63) + Me.cmd6.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd6.Name = "cmd6" - Me.cmd6.Size = New System.Drawing.Size(38, 30) + Me.cmd6.Size = New System.Drawing.Size(57, 45) Me.cmd6.TabIndex = 123 Me.cmd6.Text = "6" Me.cmd6.UseVisualStyleBackColor = True @@ -466,10 +467,10 @@ Partial Class dlgEnter 'cmd5 ' Me.cmd5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd5.Location = New System.Drawing.Point(40, 42) - Me.cmd5.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd5.Location = New System.Drawing.Point(60, 63) + Me.cmd5.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd5.Name = "cmd5" - Me.cmd5.Size = New System.Drawing.Size(38, 30) + Me.cmd5.Size = New System.Drawing.Size(57, 45) Me.cmd5.TabIndex = 122 Me.cmd5.Text = "5" Me.cmd5.UseVisualStyleBackColor = True @@ -477,10 +478,10 @@ Partial Class dlgEnter 'cmd4 ' Me.cmd4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd4.Location = New System.Drawing.Point(3, 42) - Me.cmd4.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd4.Location = New System.Drawing.Point(4, 63) + Me.cmd4.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd4.Name = "cmd4" - Me.cmd4.Size = New System.Drawing.Size(38, 30) + Me.cmd4.Size = New System.Drawing.Size(57, 45) Me.cmd4.TabIndex = 121 Me.cmd4.Text = "4" Me.cmd4.UseVisualStyleBackColor = True @@ -488,10 +489,10 @@ Partial Class dlgEnter 'cmd3 ' Me.cmd3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd3.Location = New System.Drawing.Point(77, 71) - Me.cmd3.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd3.Location = New System.Drawing.Point(116, 106) + Me.cmd3.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd3.Name = "cmd3" - Me.cmd3.Size = New System.Drawing.Size(38, 30) + Me.cmd3.Size = New System.Drawing.Size(57, 45) Me.cmd3.TabIndex = 120 Me.cmd3.Text = "3" Me.cmd3.UseVisualStyleBackColor = True @@ -499,10 +500,10 @@ Partial Class dlgEnter 'cmd2 ' Me.cmd2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd2.Location = New System.Drawing.Point(40, 71) - Me.cmd2.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd2.Location = New System.Drawing.Point(60, 106) + Me.cmd2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd2.Name = "cmd2" - Me.cmd2.Size = New System.Drawing.Size(38, 30) + Me.cmd2.Size = New System.Drawing.Size(57, 45) Me.cmd2.TabIndex = 119 Me.cmd2.Text = "2" Me.cmd2.UseVisualStyleBackColor = True @@ -510,10 +511,10 @@ Partial Class dlgEnter 'cmd0 ' Me.cmd0.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd0.Location = New System.Drawing.Point(40, 100) - Me.cmd0.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd0.Location = New System.Drawing.Point(60, 150) + Me.cmd0.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd0.Name = "cmd0" - Me.cmd0.Size = New System.Drawing.Size(38, 30) + Me.cmd0.Size = New System.Drawing.Size(57, 45) Me.cmd0.TabIndex = 118 Me.cmd0.Text = "0" Me.cmd0.UseVisualStyleBackColor = True @@ -521,10 +522,10 @@ Partial Class dlgEnter 'cmd1 ' Me.cmd1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmd1.Location = New System.Drawing.Point(3, 71) - Me.cmd1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.cmd1.Location = New System.Drawing.Point(4, 106) + Me.cmd1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmd1.Name = "cmd1" - Me.cmd1.Size = New System.Drawing.Size(38, 30) + Me.cmd1.Size = New System.Drawing.Size(57, 45) Me.cmd1.TabIndex = 117 Me.cmd1.Text = "1" Me.cmd1.UseVisualStyleBackColor = True @@ -532,41 +533,31 @@ Partial Class dlgEnter 'ucrSaveEnterResultInto ' Me.ucrSaveEnterResultInto.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveEnterResultInto.Location = New System.Drawing.Point(11, 243) - Me.ucrSaveEnterResultInto.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveEnterResultInto.Location = New System.Drawing.Point(19, 390) + Me.ucrSaveEnterResultInto.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveEnterResultInto.Name = "ucrSaveEnterResultInto" - Me.ucrSaveEnterResultInto.Size = New System.Drawing.Size(280, 22) + Me.ucrSaveEnterResultInto.Size = New System.Drawing.Size(511, 33) Me.ucrSaveEnterResultInto.TabIndex = 181 ' 'ucrTryModelling ' Me.ucrTryModelling.AutoSize = True - Me.ucrTryModelling.Location = New System.Drawing.Point(3, 202) + Me.ucrTryModelling.Location = New System.Drawing.Point(19, 340) + Me.ucrTryModelling.Margin = New System.Windows.Forms.Padding(6) Me.ucrTryModelling.Name = "ucrTryModelling" Me.ucrTryModelling.RunCommandAsMultipleLines = False - Me.ucrTryModelling.Size = New System.Drawing.Size(480, 33) + Me.ucrTryModelling.Size = New System.Drawing.Size(720, 55) Me.ucrTryModelling.TabIndex = 160 ' - 'ucrDataFrameEnter - ' - Me.ucrDataFrameEnter.AutoSize = True - Me.ucrDataFrameEnter.bDropUnusedFilterLevels = False - Me.ucrDataFrameEnter.bUseCurrentFilter = True - Me.ucrDataFrameEnter.Location = New System.Drawing.Point(11, 55) - Me.ucrDataFrameEnter.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFrameEnter.Name = "ucrDataFrameEnter" - Me.ucrDataFrameEnter.Size = New System.Drawing.Size(151, 43) - Me.ucrDataFrameEnter.TabIndex = 156 - ' 'ucrReceiverForEnterCalculation ' Me.ucrReceiverForEnterCalculation.AutoSize = True Me.ucrReceiverForEnterCalculation.frmParent = Me - Me.ucrReceiverForEnterCalculation.Location = New System.Drawing.Point(69, 16) - Me.ucrReceiverForEnterCalculation.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.ucrReceiverForEnterCalculation.Location = New System.Drawing.Point(104, 24) + Me.ucrReceiverForEnterCalculation.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.ucrReceiverForEnterCalculation.Name = "ucrReceiverForEnterCalculation" Me.ucrReceiverForEnterCalculation.Selector = Nothing - Me.ucrReceiverForEnterCalculation.Size = New System.Drawing.Size(229, 28) + Me.ucrReceiverForEnterCalculation.Size = New System.Drawing.Size(344, 42) Me.ucrReceiverForEnterCalculation.strNcFilePath = "" Me.ucrReceiverForEnterCalculation.TabIndex = 153 Me.ucrReceiverForEnterCalculation.ucrSelector = Nothing @@ -575,18 +566,20 @@ Partial Class dlgEnter ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(11, 278) + Me.ucrBase.Location = New System.Drawing.Point(19, 468) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 0 ' 'cmdRHelp ' Me.cmdRHelp.AutoSize = True Me.cmdRHelp.ContextMenuStrip = Me.ContextMenuStripBase - Me.cmdRHelp.Location = New System.Drawing.Point(459, 187) + Me.cmdRHelp.Location = New System.Drawing.Point(789, 280) + Me.cmdRHelp.Margin = New System.Windows.Forms.Padding(4) Me.cmdRHelp.Name = "cmdRHelp" - Me.cmdRHelp.Size = New System.Drawing.Size(68, 23) + Me.cmdRHelp.Size = New System.Drawing.Size(102, 34) Me.cmdRHelp.SplitMenuStrip = Me.ContextMenuStripBase Me.cmdRHelp.TabIndex = 213 Me.cmdRHelp.Text = "R Help" @@ -594,34 +587,70 @@ Partial Class dlgEnter ' 'ContextMenuStripBase ' + Me.ContextMenuStripBase.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStripBase.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuBase}) Me.ContextMenuStripBase.Name = "ContextMenuStrip1" - Me.ContextMenuStripBase.Size = New System.Drawing.Size(99, 26) + Me.ContextMenuStripBase.Size = New System.Drawing.Size(122, 36) ' 'ToolStripMenuBase ' Me.ToolStripMenuBase.Name = "ToolStripMenuBase" - Me.ToolStripMenuBase.Size = New System.Drawing.Size(98, 22) + Me.ToolStripMenuBase.Size = New System.Drawing.Size(121, 32) Me.ToolStripMenuBase.Text = "base" ' + 'ucrSelectorEnter + ' + Me.ucrSelectorEnter.AutoSize = True + Me.ucrSelectorEnter.bDropUnusedFilterLevels = False + Me.ucrSelectorEnter.bShowHiddenColumns = False + Me.ucrSelectorEnter.bUseCurrentFilter = True + Me.ucrSelectorEnter.Location = New System.Drawing.Point(19, 62) + Me.ucrSelectorEnter.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorEnter.Name = "ucrSelectorEnter" + Me.ucrSelectorEnter.Size = New System.Drawing.Size(318, 274) + Me.ucrSelectorEnter.TabIndex = 214 + ' + 'ucrChkStoreScalar + ' + Me.ucrChkStoreScalar.AutoSize = True + Me.ucrChkStoreScalar.Checked = False + Me.ucrChkStoreScalar.Location = New System.Drawing.Point(19, 426) + Me.ucrChkStoreScalar.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkStoreScalar.Name = "ucrChkStoreScalar" + Me.ucrChkStoreScalar.Size = New System.Drawing.Size(199, 34) + Me.ucrChkStoreScalar.TabIndex = 215 + ' + 'checkScalars + ' + Me.checkScalars.AutoSize = True + Me.checkScalars.Location = New System.Drawing.Point(350, 289) + Me.checkScalars.Name = "checkScalars" + Me.checkScalars.Size = New System.Drawing.Size(88, 24) + Me.checkScalars.TabIndex = 216 + Me.checkScalars.Text = "Scalars" + Me.checkScalars.UseVisualStyleBackColor = True + ' 'dlgEnter ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(538, 336) + Me.ClientSize = New System.Drawing.Size(910, 553) + Me.Controls.Add(Me.checkScalars) + Me.Controls.Add(Me.ucrChkStoreScalar) + Me.Controls.Add(Me.ucrSelectorEnter) Me.Controls.Add(Me.cmdRHelp) Me.Controls.Add(Me.ucrSaveEnterResultInto) Me.Controls.Add(Me.grpBasic) Me.Controls.Add(Me.btnExample) Me.Controls.Add(Me.ucrTryModelling) Me.Controls.Add(Me.grpEnterKeyboard2) - Me.Controls.Add(Me.ucrDataFrameEnter) Me.Controls.Add(Me.chkShowEnterArguments) Me.Controls.Add(Me.lblData) Me.Controls.Add(Me.ucrReceiverForEnterCalculation) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgEnter" @@ -639,7 +668,6 @@ Partial Class dlgEnter Friend WithEvents chkShowEnterArguments As CheckBox Friend WithEvents lblData As Label Friend WithEvents ucrReceiverForEnterCalculation As ucrReceiverExpression - Friend WithEvents ucrDataFrameEnter As ucrDataFrame Friend WithEvents cmdQuotes As Button Friend WithEvents cmdExponential As Button Friend WithEvents cmdConcantenateFunction As Button @@ -680,4 +708,7 @@ Partial Class dlgEnter Friend WithEvents cmdRHelp As ucrSplitButton Friend WithEvents ContextMenuStripBase As ContextMenuStrip Friend WithEvents ToolStripMenuBase As ToolStripMenuItem + Friend WithEvents ucrSelectorEnter As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrChkStoreScalar As ucrCheck + Friend WithEvents checkScalars As CheckBox End Class diff --git a/instat/dlgEnter.resx b/instat/dlgEnter.resx index 8f2e9555440..df2ac13fdd2 100644 --- a/instat/dlgEnter.resx +++ b/instat/dlgEnter.resx @@ -121,7 +121,7 @@ 17, 5 - 124 + 25 519, 24 diff --git a/instat/dlgEnter.vb b/instat/dlgEnter.vb index 935c6daae1a..f2220d1b887 100644 --- a/instat/dlgEnter.vb +++ b/instat/dlgEnter.vb @@ -17,14 +17,11 @@ Imports instat.Translations Imports RDotNet Public Class dlgEnter - Dim dataset As DataFrame - Dim clsAttach As New RFunction - Dim clsDetach As New RFunction - Dim clsLength As New RFunction - Public bFirstLoad As Boolean = True - Public strOutput As String + Private clsAttach As New RFunction + Private clsDetach As New RFunction + Private clsAttachScalarsFunction, clsDetachScalarsFunction, clsScalarsDataFuntion, clsAddScalarFunction As New RFunction + Private bFirstLoad As Boolean = True Private strPackageName As String - Public clsCommands As New RFunction Private Sub dlgEnter_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -37,26 +34,62 @@ Public Class dlgEnter TestOKEnabled() autoTranslate(Me) End Sub + Private Sub SetEntryHistory() ucrReceiverForEnterCalculation.AddtoCombobox(ucrReceiverForEnterCalculation.GetText) End Sub Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 458 + + ucrSelectorEnter.SetItemType("scalar") + ucrSelectorEnter.HideShowAddOrDataOptionsOrListView(bAddVisible:=False, bDataOptionsVisible:=False, bListVariables:=False) + + ucrReceiverForEnterCalculation.strSelectorHeading = "Scalars" + ucrReceiverForEnterCalculation.Selector = ucrSelectorEnter + ucrTryModelling.SetReceiver(ucrReceiverForEnterCalculation) ucrTryModelling.SetIsCommand() ucrTryModelling.StrvecOutputRequired() + + ucrChkStoreScalar.SetText("Store Scalar") + + clsAddScalarFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_scalar") + + clsScalarsDataFuntion.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_scalars") + clsScalarsDataFuntion.SetAssignTo("scalars") + + clsAttachScalarsFunction.SetRCommand("attach") + clsDetachScalarsFunction.SetRCommand("detach") + clsAttachScalarsFunction.AddParameter("what", clsRFunctionParameter:=clsScalarsDataFuntion) + clsDetachScalarsFunction.AddParameter("name", "scalars") + clsDetachScalarsFunction.AddParameter("unload", "TRUE") + clsAttach.SetRCommand("attach") - clsAttach.AddParameter("what", clsRFunctionParameter:=ucrDataFrameEnter.clsCurrDataFrame) + clsAttach.AddParameter("what", clsRFunctionParameter:=ucrSelectorEnter.ucrAvailableDataFrames.clsCurrDataFrame) clsDetach.SetRCommand("detach") - clsDetach.AddParameter("name", clsRFunctionParameter:=ucrDataFrameEnter.clsCurrDataFrame) clsDetach.AddParameter("unload", "TRUE") + ucrBase.clsRsyntax.SetCommandString("") + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttach, 0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) + + ucrBase.clsRsyntax.AddToAfterCodes(clsDetach, 0) + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 1) + ucrSaveEnterResultInto.SetPrefix("enter") - ucrSaveEnterResultInto.SetDataFrameSelector(ucrDataFrameEnter) + ucrSaveEnterResultInto.SetDataFrameSelector(ucrSelectorEnter.ucrAvailableDataFrames) ucrSaveEnterResultInto.SetIsComboBox() ucrSaveEnterResultInto.SetSaveTypeAsColumn() - ucrSaveEnterResultInto.SetLabelText("Enter Result Into:") + ucrSaveEnterResultInto.SetCheckBoxText("Enter Result") + ucrSaveEnterResultInto.SetAssignToIfUncheckedValue("last_enter") + + ucrSaveEnterResultInto.SetPrefix("enter") + ucrSaveEnterResultInto.SetSaveTypeAsColumn() + ucrSaveEnterResultInto.SetIsComboBox() + ucrSaveEnterResultInto.SetCheckBoxText("Enter Result") + ucrSaveEnterResultInto.SetAssignToIfUncheckedValue("last_enter") + ucrSaveEnterResultInto.SetDataFrameSelector(ucrSelectorEnter.ucrAvailableDataFrames) 'Adding tooltips for the buttons ttEnter.SetToolTip(cmdColon, "A subset, e.g. letters[1:4] gives a, b, c, d.") @@ -71,21 +104,42 @@ Public Class dlgEnter ttEnter.SetToolTip(cmdConcantenateFunction, "Combines arguments to form a single vector, e.g. c(1:3 8) is 1, 2, 3, 8.") ttEnter.SetToolTip(cmdExponential, "For scientific notation, e.g. 1.5E-1 = 0.15.") - ucrBase.clsRsyntax.AddToBeforeCodes(clsAttach) - ucrBase.clsRsyntax.AddToAfterCodes(clsDetach) End Sub + + Private Sub checkScalars_CheckedChanged(sender As Object, e As EventArgs) Handles checkScalars.CheckedChanged + If checkScalars.Checked Then + ucrSelectorEnter.HideShowAddOrDataOptionsOrListView(bAddVisible:=True, bDataOptionsVisible:=False, bListVariables:=True) + Else + ucrSelectorEnter.HideShowAddOrDataOptionsOrListView(bAddVisible:=False, bDataOptionsVisible:=False, bListVariables:=False) + End If + End Sub + Private Sub SetDefaults() chkShowEnterArguments.Checked = False - ucrDataFrameEnter.Reset() + ucrChkStoreScalar.Checked = False + ucrSelectorEnter.Reset() + checkScalars.Checked = False + ucrSaveEnterResultInto.ucrChkSave.Checked = True ucrReceiverForEnterCalculation.Clear() + ucrReceiverForEnterCalculation.SetMeAsReceiver() ucrTryModelling.SetRSyntax(ucrBase.clsRsyntax) ucrSaveEnterResultInto.SetRCode(ucrBase.clsRsyntax.clsBaseCommandString) + SaveResults() + ucrBase.clsRsyntax.SetAssignTo(ucrSaveEnterResultInto.GetText(), strTempColumn:=ucrSaveEnterResultInto.GetText(), + strTempDataframe:=ucrSelectorEnter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, + bAssignToIsPrefix:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToIsPrefix, + bAssignToColumnWithoutNames:=ucrBase.clsRsyntax.clsBaseCommandString.bAssignToColumnWithoutNames, + bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore, + bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength) End Sub + Private Sub ReopenDialog() SaveResults() End Sub + Private Sub TestOKEnabled() - If Not ucrReceiverForEnterCalculation.IsEmpty AndAlso ucrSaveEnterResultInto.IsComplete Then + If Not ucrReceiverForEnterCalculation.IsEmpty AndAlso ucrSaveEnterResultInto.IsComplete AndAlso + (ucrChkStoreScalar.Checked OrElse ucrSaveEnterResultInto.ucrChkSave.Checked) Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -93,8 +147,7 @@ Public Class dlgEnter End Sub Private Sub SaveResults() - If ucrSaveEnterResultInto.IsComplete Then - ucrBase.clsRsyntax.SetAssignTo(ucrSaveEnterResultInto.GetText(), strTempColumn:=ucrSaveEnterResultInto.GetText(), strTempDataframe:=ucrDataFrameEnter.cboAvailableDataFrames.Text, bRequireCorrectLength:=False) + If ucrSaveEnterResultInto.IsComplete AndAlso ucrSaveEnterResultInto.ucrChkSave.Checked Then ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = True ucrBase.clsRsyntax.iCallType = 0 Else @@ -102,27 +155,17 @@ Public Class dlgEnter ucrBase.clsRsyntax.iCallType = 2 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False End If - End Sub - - Private Sub ucrBase_BeforeClickOk(sender As Object, e As EventArgs) Handles ucrBase.BeforeClickOk - 'Dim strScript As String = "" - 'Dim strFunc As String - 'clsAttach.AddParameter("what", clsRFunctionParameter:=ucrDataFrameEnter.clsCurrDataFrame) - 'strFunc = clsAttach.ToScript(strScript) - ' frmMain.clsRLink.RunScript(strScript & strFunc) + ManageScalarStorage() End Sub Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk - 'Dim strScript As String = "" - ' Dim strFunc As String - 'clsDetach.AddParameter("name", clsRFunctionParameter:=ucrDataFrameEnter.clsCurrDataFrame) - 'strFunc = clsDetach.ToScript(strScript) - 'frmMain.clsRLink.RunScript(strScript & strFunc) SetEntryHistory() End Sub Private Sub ucrReceiverForCalculation_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverForEnterCalculation.SelectionChanged ucrBase.clsRsyntax.SetCommandString(ucrReceiverForEnterCalculation.GetVariableNames(False)) + ucrChkStoreScalar.Checked = False + SaveResults() TestOKEnabled() End Sub @@ -194,7 +237,6 @@ Public Class dlgEnter TestOKEnabled() End Sub - Private Sub cmdLETTERS_Click(sender As Object, e As EventArgs) Handles cmdLogical.Click ucrReceiverForEnterCalculation.AddToReceiverAtCursorPosition("as.logical(c( ))", 3) TestOKEnabled() @@ -210,14 +252,6 @@ Public Class dlgEnter TestOKEnabled() End Sub - Private Sub ucrSaveEnterResultInto_NameChanged() - SaveResults() - End Sub - - Private Sub ucrSaveEnterResultInto_ContentsChanged() - TestOKEnabled() - End Sub - ''' ''' displays a popup with example commands just above the input receiver ''' @@ -383,4 +417,45 @@ Public Class dlgEnter frmMaximiseOutput.Show(strFileName:=clsFileUrlUtilities.GetHelpFileURL(strPackageName:=strPackageName), bReplace:=False) End If End Sub + + Private Sub ucrSaveEnterResultInto_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSaveEnterResultInto.ControlValueChanged + Dim strDataFrame As String = ucrSelectorEnter.ucrAvailableDataFrames.strCurrDataFrame + + clsDetach.AddParameter("name", strDataFrame) + clsScalarsDataFuntion.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34)) + clsAddScalarFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) + SaveResults() + TestOKEnabled() + End Sub + + Private Sub ManageScalarStorage() + If ucrChkStoreScalar.Checked AndAlso Not ucrReceiverForEnterCalculation.IsEmpty Then + Dim strResut As String = ucrSaveEnterResultInto.GetText + clsAddScalarFunction.AddParameter("scalar_name", Chr(34) & strResut & Chr(34), iPosition:=1) + clsAddScalarFunction.AddParameter("scalar_value", strResut, iPosition:=2) + ucrBase.clsRsyntax.AddToAfterCodes(clsAddScalarFunction, 2) + ucrBase.clsRsyntax.SetAssignTo(strResut) + + ucrSaveEnterResultInto.btnColumnPosition.Enabled = False + ucrSaveEnterResultInto.ucrChkSave.Enabled = False + ucrSaveEnterResultInto.ucrChkSave.Checked = False + + Else + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsAddScalarFunction) + ucrSaveEnterResultInto.btnColumnPosition.Enabled = True + ucrSaveEnterResultInto.ucrChkSave.Enabled = True + End If + ucrSaveEnterResultInto.btnColumnPosition.Visible = True + ucrSaveEnterResultInto.ucrInputComboSave.Visible = True + ucrSaveEnterResultInto.ucrInputComboSave.Enabled = True + TestOKEnabled() + End Sub + + Private Sub ucrChkStoreScalar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkStoreScalar.ControlValueChanged + ManageScalarStorage() + End Sub + + Private Sub ucrSaveEnterResultInto_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveEnterResultInto.ControlContentsChanged + SaveResults() + End Sub End Class diff --git a/instat/dlgEvapotranspiration.vb b/instat/dlgEvapotranspiration.vb index b78cee3e008..c7c7900f48a 100644 --- a/instat/dlgEvapotranspiration.vb +++ b/instat/dlgEvapotranspiration.vb @@ -98,7 +98,7 @@ Public Class dlgEvapotranspiration ucrReceiverHumidityMin.SetClimaticType("hum_min") ucrReceiverHumidityMin.bAutoFill = True - ucrReceiverWindSpeed.SetParameter(New RParameter("u2", 7)) + ucrReceiverWindSpeed.SetParameter(New RParameter("uz", 7)) ucrReceiverWindSpeed.SetParameterIsRFunction() ucrReceiverWindSpeed.SetClimaticType("wind_speed") ucrReceiverWindSpeed.bAutoFill = True @@ -153,7 +153,7 @@ Public Class dlgEvapotranspiration ucrPnlMethod.AddToLinkedControls(ucrReceiverExtraRadiation, {rdoHargreavesSamani}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlMethod.AddToLinkedControls(ucrNudAlpha, {rdoPriestleyTaylor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.23") - ucrReceiverExtraRadiation.SetLinkedDisplayControl(lblRa) + ucrReceiverExtraRadiation.SetLinkedDisplayControl(lblRA) ucrReceiverRadiation.SetLinkedDisplayControl(lblRadiation) ucrReceiverHumidityMax.SetLinkedDisplayControl(lblHumidityMax) ucrReceiverHumidityMin.SetLinkedDisplayControl(lblHumidityMin) @@ -488,7 +488,7 @@ Public Class dlgEvapotranspiration Private Sub ucrReceiverWindSpeed_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverWindSpeed.ControlValueChanged, ucrChkWind.ControlValueChanged If ucrChkWind.Checked AndAlso Not ucrReceiverWindSpeed.IsEmpty Then - clsVarnamesVectorPMFunction.AddParameter("x", Chr(34) & "u2" & Chr(34), bIncludeArgumentName:=False) + clsVarnamesVectorPMFunction.AddParameter("x", Chr(34) & "uz" & Chr(34), bIncludeArgumentName:=False) Else clsVarnamesVectorPMFunction.RemoveParameterByName("x") ucrReceiverHumidityMax.SetMeAsReceiver() diff --git a/instat/dlgExportClimaticDefinitions.Designer.vb b/instat/dlgExportClimaticDefinitions.Designer.vb index edd151ed5b3..0e33704c4e6 100644 --- a/instat/dlgExportClimaticDefinitions.Designer.vb +++ b/instat/dlgExportClimaticDefinitions.Designer.vb @@ -35,20 +35,15 @@ Partial Class dlgExportClimaticDefinitions Me.lblYear = New System.Windows.Forms.Label() Me.ucrReceiverMonth = New instat.ucrReceiverSingle() Me.ucrReceiverYear = New instat.ucrReceiverSingle() - Me.Label1 = New System.Windows.Forms.Label() Me.ucrChkIncludeSummaryData = New instat.ucrCheck() Me.grpSummaries = New System.Windows.Forms.GroupBox() Me.ucrChkMonthlyTemp = New instat.ucrCheck() - Me.lblMaxTemp = New System.Windows.Forms.Label() Me.lblCropData = New System.Windows.Forms.Label() Me.lblDataByYearMonth = New System.Windows.Forms.Label() Me.lblDataByYear = New System.Windows.Forms.Label() Me.lblRain = New System.Windows.Forms.Label() - Me.lblMinTemp = New System.Windows.Forms.Label() Me.lblData = New System.Windows.Forms.Label() Me.ucrReceiverRain = New instat.ucrReceiverSingle() - Me.ucrReceiverMinTemp = New instat.ucrReceiverSingle() - Me.ucrReceiverMaxTemp = New instat.ucrReceiverSingle() Me.ucrReceiverData = New instat.ucrReceiverSingle() Me.ucrSelectorExportDefinitions = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() @@ -59,27 +54,29 @@ Partial Class dlgExportClimaticDefinitions Me.cmdChooseFile = New System.Windows.Forms.Button() Me.ucrInputTokenPath = New instat.ucrInputTextBox() Me.cmdDefine = New System.Windows.Forms.Button() + Me.lblDefinitionsID = New System.Windows.Forms.Label() + Me.ucrInputDefinitionsID = New instat.ucrInputTextBox() Me.grpSummaries.SuspendLayout() Me.SuspendLayout() ' 'lblStationID ' Me.lblStationID.AutoSize = True - Me.lblStationID.Location = New System.Drawing.Point(501, 194) + Me.lblStationID.Location = New System.Drawing.Point(498, 259) Me.lblStationID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblStationID.Name = "lblStationID" Me.lblStationID.Size = New System.Drawing.Size(85, 20) - Me.lblStationID.TabIndex = 7 + Me.lblStationID.TabIndex = 9 Me.lblStationID.Text = "Station ID:" ' 'lblCountry ' Me.lblCountry.AutoSize = True - Me.lblCountry.Location = New System.Drawing.Point(504, 251) + Me.lblCountry.Location = New System.Drawing.Point(498, 321) Me.lblCountry.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCountry.Name = "lblCountry" Me.lblCountry.Size = New System.Drawing.Size(68, 20) - Me.lblCountry.TabIndex = 9 + Me.lblCountry.TabIndex = 11 Me.lblCountry.Text = "Country:" ' 'ucrInputCountry @@ -88,11 +85,11 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputCountry.AutoSize = True Me.ucrInputCountry.IsMultiline = False Me.ucrInputCountry.IsReadOnly = False - Me.ucrInputCountry.Location = New System.Drawing.Point(501, 274) + Me.ucrInputCountry.Location = New System.Drawing.Point(498, 346) Me.ucrInputCountry.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputCountry.Name = "ucrInputCountry" Me.ucrInputCountry.Size = New System.Drawing.Size(177, 32) - Me.ucrInputCountry.TabIndex = 10 + Me.ucrInputCountry.TabIndex = 12 ' 'ucrInputStationID ' @@ -100,11 +97,11 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputStationID.AutoSize = True Me.ucrInputStationID.IsMultiline = False Me.ucrInputStationID.IsReadOnly = False - Me.ucrInputStationID.Location = New System.Drawing.Point(501, 218) + Me.ucrInputStationID.Location = New System.Drawing.Point(498, 284) Me.ucrInputStationID.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputStationID.Name = "ucrInputStationID" Me.ucrInputStationID.Size = New System.Drawing.Size(177, 32) - Me.ucrInputStationID.TabIndex = 8 + Me.ucrInputStationID.TabIndex = 10 ' 'ucrChkSeasonStartProp ' @@ -160,7 +157,7 @@ Partial Class dlgExportClimaticDefinitions 'lblMonth ' Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(504, 134) + Me.lblMonth.Location = New System.Drawing.Point(498, 136) Me.lblMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMonth.Name = "lblMonth" Me.lblMonth.Size = New System.Drawing.Size(58, 20) @@ -170,7 +167,7 @@ Partial Class dlgExportClimaticDefinitions 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(506, 75) + Me.lblYear.Location = New System.Drawing.Point(498, 75) Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblYear.Name = "lblYear" Me.lblYear.Size = New System.Drawing.Size(47, 20) @@ -181,7 +178,7 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverMonth.AutoSize = True Me.ucrReceiverMonth.frmParent = Me - Me.ucrReceiverMonth.Location = New System.Drawing.Point(498, 160) + Me.ucrReceiverMonth.Location = New System.Drawing.Point(498, 161) Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMonth.Name = "ucrReceiverMonth" Me.ucrReceiverMonth.Selector = Nothing @@ -194,7 +191,7 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(500, 100) + Me.ucrReceiverYear.Location = New System.Drawing.Point(498, 100) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing @@ -203,16 +200,6 @@ Partial Class dlgExportClimaticDefinitions Me.ucrReceiverYear.TabIndex = 4 Me.ucrReceiverYear.ucrSelector = Nothing ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(118, 703) - Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(0, 20) - Me.Label1.TabIndex = 30 - ' 'ucrChkIncludeSummaryData ' Me.ucrChkIncludeSummaryData.AutoSize = True @@ -221,7 +208,7 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkIncludeSummaryData.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkIncludeSummaryData.Name = "ucrChkIncludeSummaryData" Me.ucrChkIncludeSummaryData.Size = New System.Drawing.Size(332, 48) - Me.ucrChkIncludeSummaryData.TabIndex = 24 + Me.ucrChkIncludeSummaryData.TabIndex = 26 ' 'grpSummaries ' @@ -236,7 +223,7 @@ Partial Class dlgExportClimaticDefinitions Me.grpSummaries.Name = "grpSummaries" Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.grpSummaries.Size = New System.Drawing.Size(470, 177) - Me.grpSummaries.TabIndex = 23 + Me.grpSummaries.TabIndex = 25 Me.grpSummaries.TabStop = False Me.grpSummaries.Text = "Summaries" ' @@ -250,66 +237,46 @@ Partial Class dlgExportClimaticDefinitions Me.ucrChkMonthlyTemp.Size = New System.Drawing.Size(220, 52) Me.ucrChkMonthlyTemp.TabIndex = 4 ' - 'lblMaxTemp - ' - Me.lblMaxTemp.AutoSize = True - Me.lblMaxTemp.Location = New System.Drawing.Point(504, 635) - Me.lblMaxTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMaxTemp.Name = "lblMaxTemp" - Me.lblMaxTemp.Size = New System.Drawing.Size(86, 20) - Me.lblMaxTemp.TabIndex = 21 - Me.lblMaxTemp.Text = "Max Temp:" - ' 'lblCropData ' Me.lblCropData.AutoSize = True - Me.lblCropData.Location = New System.Drawing.Point(504, 442) + Me.lblCropData.Location = New System.Drawing.Point(498, 505) Me.lblCropData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCropData.Name = "lblCropData" Me.lblCropData.Size = New System.Drawing.Size(86, 20) - Me.lblCropData.TabIndex = 15 + Me.lblCropData.TabIndex = 17 Me.lblCropData.Text = "Crop Data:" ' 'lblDataByYearMonth ' Me.lblDataByYearMonth.AutoSize = True - Me.lblDataByYearMonth.Location = New System.Drawing.Point(500, 377) + Me.lblDataByYearMonth.Location = New System.Drawing.Point(498, 444) Me.lblDataByYearMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDataByYearMonth.Name = "lblDataByYearMonth" Me.lblDataByYearMonth.Size = New System.Drawing.Size(188, 20) - Me.lblDataByYearMonth.TabIndex = 13 + Me.lblDataByYearMonth.TabIndex = 15 Me.lblDataByYearMonth.Text = "Data By Year and Month:" ' 'lblDataByYear ' Me.lblDataByYear.AutoSize = True - Me.lblDataByYear.Location = New System.Drawing.Point(504, 311) + Me.lblDataByYear.Location = New System.Drawing.Point(498, 383) Me.lblDataByYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDataByYear.Name = "lblDataByYear" Me.lblDataByYear.Size = New System.Drawing.Size(108, 20) - Me.lblDataByYear.TabIndex = 11 + Me.lblDataByYear.TabIndex = 13 Me.lblDataByYear.Text = "Data By Year:" ' 'lblRain ' Me.lblRain.AutoSize = True - Me.lblRain.Location = New System.Drawing.Point(504, 505) + Me.lblRain.Location = New System.Drawing.Point(498, 566) Me.lblRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRain.Name = "lblRain" Me.lblRain.Size = New System.Drawing.Size(46, 20) - Me.lblRain.TabIndex = 17 + Me.lblRain.TabIndex = 19 Me.lblRain.Text = "Rain:" ' - 'lblMinTemp - ' - Me.lblMinTemp.AutoSize = True - Me.lblMinTemp.Location = New System.Drawing.Point(504, 571) - Me.lblMinTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblMinTemp.Name = "lblMinTemp" - Me.lblMinTemp.Size = New System.Drawing.Size(82, 20) - Me.lblMinTemp.TabIndex = 19 - Me.lblMinTemp.Text = "Min Temp:" - ' 'lblData ' Me.lblData.AutoSize = True @@ -324,46 +291,20 @@ Partial Class dlgExportClimaticDefinitions ' Me.ucrReceiverRain.AutoSize = True Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(501, 531) + Me.ucrReceiverRain.Location = New System.Drawing.Point(498, 591) Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRain.Name = "ucrReceiverRain" Me.ucrReceiverRain.Selector = Nothing Me.ucrReceiverRain.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverRain.strNcFilePath = "" - Me.ucrReceiverRain.TabIndex = 18 + Me.ucrReceiverRain.TabIndex = 20 Me.ucrReceiverRain.ucrSelector = Nothing ' - 'ucrReceiverMinTemp - ' - Me.ucrReceiverMinTemp.AutoSize = True - Me.ucrReceiverMinTemp.frmParent = Me - Me.ucrReceiverMinTemp.Location = New System.Drawing.Point(501, 597) - Me.ucrReceiverMinTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinTemp.Name = "ucrReceiverMinTemp" - Me.ucrReceiverMinTemp.Selector = Nothing - Me.ucrReceiverMinTemp.Size = New System.Drawing.Size(180, 31) - Me.ucrReceiverMinTemp.strNcFilePath = "" - Me.ucrReceiverMinTemp.TabIndex = 20 - Me.ucrReceiverMinTemp.ucrSelector = Nothing - ' - 'ucrReceiverMaxTemp - ' - Me.ucrReceiverMaxTemp.AutoSize = True - Me.ucrReceiverMaxTemp.frmParent = Me - Me.ucrReceiverMaxTemp.Location = New System.Drawing.Point(501, 663) - Me.ucrReceiverMaxTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxTemp.Name = "ucrReceiverMaxTemp" - Me.ucrReceiverMaxTemp.Selector = Nothing - Me.ucrReceiverMaxTemp.Size = New System.Drawing.Size(180, 31) - Me.ucrReceiverMaxTemp.strNcFilePath = "" - Me.ucrReceiverMaxTemp.TabIndex = 22 - Me.ucrReceiverMaxTemp.ucrSelector = Nothing - ' 'ucrReceiverData ' Me.ucrReceiverData.AutoSize = True Me.ucrReceiverData.frmParent = Me - Me.ucrReceiverData.Location = New System.Drawing.Point(495, 40) + Me.ucrReceiverData.Location = New System.Drawing.Point(498, 39) Me.ucrReceiverData.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverData.Name = "ucrReceiverData" Me.ucrReceiverData.Selector = Nothing @@ -387,70 +328,70 @@ Partial Class dlgExportClimaticDefinitions 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(6, 705) + Me.ucrBase.Location = New System.Drawing.Point(6, 684) Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(615, 92) - Me.ucrBase.TabIndex = 29 + Me.ucrBase.TabIndex = 31 ' 'ucrReceiverDataYear ' Me.ucrReceiverDataYear.AutoSize = True Me.ucrReceiverDataYear.frmParent = Me - Me.ucrReceiverDataYear.Location = New System.Drawing.Point(501, 337) + Me.ucrReceiverDataYear.Location = New System.Drawing.Point(498, 408) Me.ucrReceiverDataYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYear.Name = "ucrReceiverDataYear" Me.ucrReceiverDataYear.Selector = Nothing Me.ucrReceiverDataYear.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverDataYear.strNcFilePath = "" - Me.ucrReceiverDataYear.TabIndex = 12 + Me.ucrReceiverDataYear.TabIndex = 14 Me.ucrReceiverDataYear.ucrSelector = Nothing ' 'ucrReceiverDataYearMonth ' Me.ucrReceiverDataYearMonth.AutoSize = True Me.ucrReceiverDataYearMonth.frmParent = Me - Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(501, 403) + Me.ucrReceiverDataYearMonth.Location = New System.Drawing.Point(498, 469) Me.ucrReceiverDataYearMonth.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDataYearMonth.Name = "ucrReceiverDataYearMonth" Me.ucrReceiverDataYearMonth.Selector = Nothing Me.ucrReceiverDataYearMonth.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverDataYearMonth.strNcFilePath = "" - Me.ucrReceiverDataYearMonth.TabIndex = 14 + Me.ucrReceiverDataYearMonth.TabIndex = 16 Me.ucrReceiverDataYearMonth.ucrSelector = Nothing ' 'ucrReceiverCropData ' Me.ucrReceiverCropData.AutoSize = True Me.ucrReceiverCropData.frmParent = Me - Me.ucrReceiverCropData.Location = New System.Drawing.Point(501, 466) + Me.ucrReceiverCropData.Location = New System.Drawing.Point(498, 530) Me.ucrReceiverCropData.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCropData.Name = "ucrReceiverCropData" Me.ucrReceiverCropData.Selector = Nothing Me.ucrReceiverCropData.Size = New System.Drawing.Size(180, 31) Me.ucrReceiverCropData.strNcFilePath = "" - Me.ucrReceiverCropData.TabIndex = 16 + Me.ucrReceiverCropData.TabIndex = 18 Me.ucrReceiverCropData.ucrSelector = Nothing ' 'lblExport ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(10, 603) + Me.lblExport.Location = New System.Drawing.Point(14, 645) Me.lblExport.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblExport.Name = "lblExport" Me.lblExport.Size = New System.Drawing.Size(57, 20) - Me.lblExport.TabIndex = 26 + Me.lblExport.TabIndex = 28 Me.lblExport.Text = "Token:" ' 'cmdChooseFile ' Me.cmdChooseFile.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdChooseFile.Location = New System.Drawing.Point(380, 595) + Me.cmdChooseFile.Location = New System.Drawing.Point(384, 638) Me.cmdChooseFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cmdChooseFile.Name = "cmdChooseFile" Me.cmdChooseFile.Size = New System.Drawing.Size(120, 35) - Me.cmdChooseFile.TabIndex = 28 + Me.cmdChooseFile.TabIndex = 30 Me.cmdChooseFile.Text = "Browse" Me.cmdChooseFile.UseVisualStyleBackColor = True ' @@ -460,11 +401,11 @@ Partial Class dlgExportClimaticDefinitions Me.ucrInputTokenPath.AutoSize = True Me.ucrInputTokenPath.IsMultiline = False Me.ucrInputTokenPath.IsReadOnly = False - Me.ucrInputTokenPath.Location = New System.Drawing.Point(100, 598) + Me.ucrInputTokenPath.Location = New System.Drawing.Point(84, 641) Me.ucrInputTokenPath.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) Me.ucrInputTokenPath.Name = "ucrInputTokenPath" - Me.ucrInputTokenPath.Size = New System.Drawing.Size(273, 32) - Me.ucrInputTokenPath.TabIndex = 27 + Me.ucrInputTokenPath.Size = New System.Drawing.Size(287, 32) + Me.ucrInputTokenPath.TabIndex = 29 ' 'cmdDefine ' @@ -473,16 +414,40 @@ Partial Class dlgExportClimaticDefinitions Me.cmdDefine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cmdDefine.Name = "cmdDefine" Me.cmdDefine.Size = New System.Drawing.Size(120, 45) - Me.cmdDefine.TabIndex = 25 + Me.cmdDefine.TabIndex = 27 Me.cmdDefine.Text = "Define" Me.cmdDefine.UseVisualStyleBackColor = True ' + 'lblDefinitionsID + ' + Me.lblDefinitionsID.AutoSize = True + Me.lblDefinitionsID.Location = New System.Drawing.Point(503, 198) + Me.lblDefinitionsID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDefinitionsID.Name = "lblDefinitionsID" + Me.lblDefinitionsID.Size = New System.Drawing.Size(109, 20) + Me.lblDefinitionsID.TabIndex = 7 + Me.lblDefinitionsID.Text = "Definitions ID:" + ' + 'ucrInputDefinitionsID + ' + Me.ucrInputDefinitionsID.AddQuotesIfUnrecognised = True + Me.ucrInputDefinitionsID.AutoSize = True + Me.ucrInputDefinitionsID.IsMultiline = False + Me.ucrInputDefinitionsID.IsReadOnly = False + Me.ucrInputDefinitionsID.Location = New System.Drawing.Point(498, 222) + Me.ucrInputDefinitionsID.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputDefinitionsID.Name = "ucrInputDefinitionsID" + Me.ucrInputDefinitionsID.Size = New System.Drawing.Size(177, 32) + Me.ucrInputDefinitionsID.TabIndex = 8 + ' 'dlgExportClimaticDefinitions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(682, 811) + Me.ClientSize = New System.Drawing.Size(688, 772) + Me.Controls.Add(Me.lblDefinitionsID) + Me.Controls.Add(Me.ucrInputDefinitionsID) Me.Controls.Add(Me.cmdDefine) Me.Controls.Add(Me.lblExport) Me.Controls.Add(Me.cmdChooseFile) @@ -495,19 +460,14 @@ Partial Class dlgExportClimaticDefinitions Me.Controls.Add(Me.lblYear) Me.Controls.Add(Me.ucrReceiverMonth) Me.Controls.Add(Me.ucrReceiverYear) - Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ucrChkIncludeSummaryData) Me.Controls.Add(Me.grpSummaries) - Me.Controls.Add(Me.lblMaxTemp) Me.Controls.Add(Me.lblCropData) Me.Controls.Add(Me.lblDataByYearMonth) Me.Controls.Add(Me.lblDataByYear) Me.Controls.Add(Me.lblRain) - Me.Controls.Add(Me.lblMinTemp) Me.Controls.Add(Me.lblData) Me.Controls.Add(Me.ucrReceiverRain) - Me.Controls.Add(Me.ucrReceiverMinTemp) - Me.Controls.Add(Me.ucrReceiverMaxTemp) Me.Controls.Add(Me.ucrReceiverData) Me.Controls.Add(Me.ucrSelectorExportDefinitions) Me.Controls.Add(Me.ucrBase) @@ -541,20 +501,15 @@ Partial Class dlgExportClimaticDefinitions Friend WithEvents lblYear As Label Friend WithEvents ucrReceiverMonth As ucrReceiverSingle Friend WithEvents ucrReceiverYear As ucrReceiverSingle - Friend WithEvents Label1 As Label Friend WithEvents ucrChkIncludeSummaryData As ucrCheck Friend WithEvents grpSummaries As GroupBox Friend WithEvents ucrChkMonthlyTemp As ucrCheck - Friend WithEvents lblMaxTemp As Label Friend WithEvents lblCropData As Label Friend WithEvents lblDataByYearMonth As Label Friend WithEvents lblDataByYear As Label Friend WithEvents lblRain As Label - Friend WithEvents lblMinTemp As Label Friend WithEvents lblData As Label Friend WithEvents ucrReceiverRain As ucrReceiverSingle - Friend WithEvents ucrReceiverMinTemp As ucrReceiverSingle - Friend WithEvents ucrReceiverMaxTemp As ucrReceiverSingle Friend WithEvents ucrReceiverData As ucrReceiverSingle Friend WithEvents ucrSelectorExportDefinitions As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrBase As ucrButtons @@ -565,4 +520,6 @@ Partial Class dlgExportClimaticDefinitions Friend WithEvents cmdChooseFile As Button Friend WithEvents ucrInputTokenPath As ucrInputTextBox Friend WithEvents cmdDefine As Button + Friend WithEvents lblDefinitionsID As Label + Friend WithEvents ucrInputDefinitionsID As ucrInputTextBox End Class diff --git a/instat/dlgExportClimaticDefinitions.vb b/instat/dlgExportClimaticDefinitions.vb index 0c1638dff41..76f0e71db2c 100644 --- a/instat/dlgExportClimaticDefinitions.vb +++ b/instat/dlgExportClimaticDefinitions.vb @@ -68,16 +68,6 @@ Public Class dlgExportClimaticDefinitions ucrReceiverCropData.strSelectorHeading = "Data Sets" ucrReceiverCropData.SetLinkedDisplayControl(lblCropData) - ucrReceiverMinTemp.SetParameter(New RParameter("tmin", 4)) - ucrReceiverMinTemp.Selector = ucrSelectorExportDefinitions - ucrReceiverMinTemp.SetParameterIsString() - ucrReceiverMinTemp.SetLinkedDisplayControl(lblMinTemp) - - ucrReceiverMaxTemp.SetParameter(New RParameter("tmax", 5)) - ucrReceiverMaxTemp.Selector = ucrSelectorExportDefinitions - ucrReceiverMaxTemp.SetParameterIsString() - ucrReceiverMaxTemp.SetLinkedDisplayControl(lblMaxTemp) - ucrReceiverRain.SetParameter(New RParameter("rain", 6)) ucrReceiverRain.Selector = ucrSelectorExportDefinitions ucrReceiverRain.SetParameterIsString() @@ -123,8 +113,8 @@ Public Class dlgExportClimaticDefinitions ucrChkIncludeSummaryData.SetRDefault("FALSE") ucrInputStationID.SetParameter(New RParameter("station_id", 18)) - - ucrInputCountry.SetParameter(New RParameter("country", 19)) + ucrInputDefinitionsID.SetParameter(New RParameter("definitions_id", 19)) + ucrInputCountry.SetParameter(New RParameter("country", 20)) ucrInputTokenPath.SetParameter(New RParameter("filename", 0)) @@ -189,8 +179,6 @@ Public Class dlgExportClimaticDefinitions ucrReceiverData.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverDataYear.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverDataYearMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) - ucrReceiverMaxTemp.SetRCode(clsExportRinstatToBucketFunction, bReset) - ucrReceiverMinTemp.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverMonth.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverRain.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverYear.SetRCode(clsExportRinstatToBucketFunction, bReset) @@ -198,6 +186,7 @@ Public Class dlgExportClimaticDefinitions ucrInputTokenPath.SetRCode(ClsGcsAuthFileFunction, bReset) ucrInputStationID.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrInputDefinitionsID.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrInputCountry.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrChkIncludeSummaryData.SetRCode(clsExportRinstatToBucketFunction, bReset) If bReset Then @@ -214,10 +203,10 @@ Public Class dlgExportClimaticDefinitions Private Sub TestOkEnabled() If Not ucrReceiverData.IsEmpty AndAlso - Not ucrReceiverMonth.IsEmpty AndAlso Not ucrReceiverYear.IsEmpty AndAlso Not ucrInputCountry.IsEmpty AndAlso Not ucrInputStationID.IsEmpty AndAlso + Not ucrInputDefinitionsID.IsEmpty AndAlso Not ucrInputTokenPath.IsEmpty Then If (ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked) AndAlso @@ -226,18 +215,13 @@ Public Class dlgExportClimaticDefinitions ElseIf ucrChkAnnualRainfall.Checked AndAlso Not ucrReceiverRain.IsEmpty Then ucrBase.OKEnabled(True) - ElseIf (ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso - Not ucrReceiverMinTemp.IsEmpty Then - ucrBase.OKEnabled(True) ElseIf (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked) AndAlso Not ucrReceiverDataYear.IsEmpty Then ucrBase.OKEnabled(True) ElseIf ucrChkMonthlyTemp.Checked AndAlso + Not ucrReceiverMonth.IsEmpty AndAlso Not ucrReceiverDataYearMonth.IsEmpty Then ucrBase.OKEnabled(True) - ElseIf (ucrChkAnnualTemp.Checked OrElse ucrChkMonthlyTemp.Checked) AndAlso - Not ucrReceiverMaxTemp.IsEmpty Then - ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) End If @@ -335,7 +319,7 @@ Public Class dlgExportClimaticDefinitions Private Sub ucrInputCountry_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCountry.ControlValueChanged If Not ucrInputCountry.IsEmpty Then - clsExportRinstatToBucketFunction.AddParameter("country", Chr(34) & ucrInputCountry.GetText & Chr(34), iPosition:=19) + clsExportRinstatToBucketFunction.AddParameter("country", Chr(34) & ucrInputCountry.GetText & Chr(34), iPosition:=20) Else clsExportRinstatToBucketFunction.RemoveParameterByName("country") End If @@ -349,14 +333,19 @@ Public Class dlgExportClimaticDefinitions End If End Sub + Private Sub ucrInputDefinitionsID_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputDefinitionsID.ControlValueChanged + If Not ucrInputDefinitionsID.IsEmpty Then + clsExportRinstatToBucketFunction.AddParameter("definitions_id", Chr(34) & ucrInputDefinitionsID.GetText & Chr(34), iPosition:=19) + Else + clsExportRinstatToBucketFunction.RemoveParameterByName("definitions_id") + End If + End Sub + Private Sub EnableDisableDefineButton() - cmdDefine.Enabled = ucrChkIncludeSummaryData.Checked AndAlso (ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked OrElse ucrChkCropSuccessProp.Checked OrElse ucrChkExtremes.Checked OrElse ucrChkMonthlyTemp.Checked OrElse ucrChkSeasonStartProp.Checked) ucrReceiverDataYearMonth.Visible = ucrChkMonthlyTemp.Checked ucrReceiverDataYear.Visible = ucrChkAnnualRainfall.Checked OrElse ucrChkAnnualTemp.Checked ucrReceiverRain.Visible = ucrChkAnnualRainfall.Checked ucrReceiverCropData.Visible = ucrChkCropSuccessProp.Checked OrElse ucrChkSeasonStartProp.Checked - ucrReceiverMaxTemp.Visible = ucrChkMonthlyTemp.Checked OrElse ucrChkAnnualTemp.Checked - ucrReceiverMinTemp.Visible = ucrChkMonthlyTemp.Checked OrElse ucrChkAnnualTemp.Checked End Sub @@ -378,9 +367,8 @@ Public Class dlgExportClimaticDefinitions End Sub - Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, - ucrReceiverMaxTemp.ControlContentsChanged, ucrReceiverMinTemp.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, - ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputStationID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, + Private Sub ucrReceiverData_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverCropData.ControlContentsChanged, ucrReceiverDataYearMonth.ControlContentsChanged, ucrReceiverDataYear.ControlContentsChanged, + ucrReceiverMonth.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrChkSeasonStartProp.ControlContentsChanged, ucrInputCountry.ControlContentsChanged, ucrInputStationID.ControlContentsChanged, ucrInputDefinitionsID.ControlContentsChanged, ucrChkIncludeSummaryData.ControlContentsChanged, ucrChkMonthlyTemp.ControlContentsChanged, ucrChkCropSuccessProp.ControlContentsChanged, ucrChkAnnualTemp.ControlContentsChanged, ucrChkAnnualRainfall.ControlContentsChanged, ucrInputTokenPath.ControlContentsChanged, ucrSelectorExportDefinitions.ControlContentsChanged TestOkEnabled() End Sub diff --git a/instat/dlgExtremes.vb b/instat/dlgExtremes.vb index 122ebf33a53..46840734212 100644 --- a/instat/dlgExtremes.vb +++ b/instat/dlgExtremes.vb @@ -86,7 +86,7 @@ clsInitialListFunction, clsOmitMissingFunction As New RFunction ucrSaveExtremes.SetPrefix("extreme") ucrSaveExtremes.SetIsComboBox() - ucrSaveExtremes.SetCheckBoxText("Save Model:") + ucrSaveExtremes.SetCheckBoxText("Store Model:") ucrSaveExtremes.SetSaveTypeAsModel() ucrSaveExtremes.SetDataFrameSelector(ucrSelectorExtremes.ucrAvailableDataFrames) ucrSaveExtremes.SetAssignToIfUncheckedValue("last_model") diff --git a/instat/dlgExtremesClimatic.vb b/instat/dlgExtremesClimatic.vb index da47e4c0784..6c6052c193c 100644 --- a/instat/dlgExtremesClimatic.vb +++ b/instat/dlgExtremesClimatic.vb @@ -257,14 +257,14 @@ Public Class dlgExtremesClimatic ucrSaveMrlPlot.SetPrefix("mrl_plot") ucrSaveMrlPlot.SetSaveTypeAsGraph() ucrSaveMrlPlot.SetIsComboBox() - ucrSaveMrlPlot.SetCheckBoxText("Save Graph") + ucrSaveMrlPlot.SetCheckBoxText("Store Graph") ucrSaveMrlPlot.SetAssignToIfUncheckedValue("last_graph") ucrSaveThresholdPlot.SetDataFrameSelector(ucrSelectorClimaticExtremes.ucrAvailableDataFrames) ucrSaveThresholdPlot.SetPrefix("threshold_plot") ucrSaveThresholdPlot.SetSaveTypeAsGraph() ucrSaveThresholdPlot.SetIsComboBox() - ucrSaveThresholdPlot.SetCheckBoxText("Save Graph") + ucrSaveThresholdPlot.SetCheckBoxText("Store Graph") ucrSaveThresholdPlot.SetAssignToIfUncheckedValue("last_graph") ucrNudDeclusterColumns.SetParameter(New RParameter("ncol", 7)) @@ -275,7 +275,7 @@ Public Class dlgExtremesClimatic ucrSaveDeclusteredPlot.SetPrefix("declustered_plot") ucrSaveDeclusteredPlot.SetSaveTypeAsGraph() ucrSaveDeclusteredPlot.SetIsComboBox() - ucrSaveDeclusteredPlot.SetCheckBoxText("Save Graph") + ucrSaveDeclusteredPlot.SetCheckBoxText("Store Graph") ucrSaveDeclusteredPlot.SetAssignToIfUncheckedValue("last_graph") ucrInputDistribution.SetParameter(New RParameter("type", 4)) diff --git a/instat/dlgFitCorruptionModel.vb b/instat/dlgFitCorruptionModel.vb index b17694a8fe5..bb4eb2ad90f 100644 --- a/instat/dlgFitCorruptionModel.vb +++ b/instat/dlgFitCorruptionModel.vb @@ -78,7 +78,7 @@ Public Class dlgCorruptionFitModel ucrSaveCorruptionModel.SetPrefix("Corruption_Model") ucrSaveCorruptionModel.SetSaveTypeAsModel() ucrSaveCorruptionModel.SetDataFrameSelector(ucrSelectorFitModel.ucrAvailableDataFrames) - ucrSaveCorruptionModel.SetCheckBoxText("Save Model") + ucrSaveCorruptionModel.SetCheckBoxText("Store Model") ucrSaveCorruptionModel.SetIsComboBox() ucrSaveCorruptionModel.SetAssignToIfUncheckedValue("last_model") End Sub diff --git a/instat/dlgFitModel.vb b/instat/dlgFitModel.vb index 647967813f2..d9e6da9f826 100644 --- a/instat/dlgFitModel.vb +++ b/instat/dlgFitModel.vb @@ -80,7 +80,7 @@ Public Class dlgFitModel ucrModelName.SetDataFrameSelector(ucrSelectorByDataFrameAddRemoveForFitModel.ucrAvailableDataFrames) ucrModelName.SetPrefix("gen_model") ucrModelName.SetSaveTypeAsModel() - ucrModelName.SetCheckBoxText("Save Model") + ucrModelName.SetCheckBoxText("Store Model") ucrModelName.SetIsComboBox() ucrModelName.SetAssignToIfUncheckedValue("last_model") End Sub diff --git a/instat/dlgFourVariableModelling.vb b/instat/dlgFourVariableModelling.vb index 319eff77da8..5b506c46c9f 100644 --- a/instat/dlgFourVariableModelling.vb +++ b/instat/dlgFourVariableModelling.vb @@ -96,7 +96,7 @@ Public Class dlgFourVariableModelling ucrSaveModel.SetPrefix("reg") ucrSaveModel.SetDataFrameSelector(ucrSelectorFourVariableModelling.ucrAvailableDataFrames) ucrSaveModel.SetSaveTypeAsModel() - ucrSaveModel.SetCheckBoxText("Save Model") + ucrSaveModel.SetCheckBoxText("Store Model") ucrSaveModel.SetIsComboBox() ucrSaveModel.SetAssignToIfUncheckedValue("last_model") diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb index 04112a21464..6605d8b45dc 100644 --- a/instat/dlgGeneralForGraphics.vb +++ b/instat/dlgGeneralForGraphics.vb @@ -172,7 +172,7 @@ Public Class dlgGeneralForGraphics ucrSave.SetPrefix("graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() - ucrSave.SetCheckBoxText("Save") + ucrSave.SetCheckBoxText("Store") ucrSave.SetDataFrameSelector(ucrGraphicsSelector.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_graph") VariableXType() diff --git a/instat/dlgHeatMapPlot.vb b/instat/dlgHeatMapPlot.vb index aef1a4223e8..c9ac609d37d 100644 --- a/instat/dlgHeatMapPlot.vb +++ b/instat/dlgHeatMapPlot.vb @@ -159,7 +159,7 @@ Public Class dlgHeatMapPlot ucrSaveGraph.SetPrefix("heatmap") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetIsComboBox() - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetDataFrameSelector(ucrHeatMapSelector.ucrAvailableDataFrames) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") 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/dlgHistogram.vb b/instat/dlgHistogram.vb index 74b2176d8c6..17dbfb99324 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -203,7 +203,7 @@ Public Class dlgHistogram ucrSaveHist.SetPrefix("histogram") ucrSaveHist.SetDataFrameSelector(ucrHistogramSelector.ucrAvailableDataFrames) ucrSaveHist.SetIsComboBox() - ucrSaveHist.SetCheckBoxText("Save Graph") + ucrSaveHist.SetCheckBoxText("Store Graph") ucrSaveHist.SetSaveTypeAsGraph() ucrSaveHist.SetAssignToIfUncheckedValue("last_graph") DialogueSize() diff --git a/instat/dlgHomogenization.vb b/instat/dlgHomogenization.vb index c376b0bdb9f..bcf7cd18f0d 100644 --- a/instat/dlgHomogenization.vb +++ b/instat/dlgHomogenization.vb @@ -206,7 +206,7 @@ Public Class dlgHomogenization ucrInputPenValue.SetValidationTypeAsNumeric() ttOptions.SetToolTip(ucrInputPenValue.txtInput, "The theoretical type I error e.g.0.05 when using the Asymptotic penalty. A vector of length 2 (min,max) if using the CROPS penalty") - ucrSaveResult.SetCheckBoxText("Save Test Object:") + ucrSaveResult.SetCheckBoxText("Store Test Object:") ucrPnlOptions.AddToLinkedControls({ucrSelectorHomogenization, ucrSaveResult, ucrReceiverNeighbour, ucrReceiverStation, ucrReceiverElement}, {rdoSingle}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrInputClimateVariables}, {rdoPrepare, rdoQualityControl, rdoHomogenization, rdoMonthlyTotals}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) diff --git a/instat/dlgHypothesisTestsCalculator.vb b/instat/dlgHypothesisTestsCalculator.vb index 9debb587c7e..1b393cccdc5 100644 --- a/instat/dlgHypothesisTestsCalculator.vb +++ b/instat/dlgHypothesisTestsCalculator.vb @@ -48,7 +48,7 @@ Public Class dlgHypothesisTestsCalculator ucrSaveResult.SetPrefix("test") ucrSaveResult.SetIsComboBox() ucrSaveResult.SetSaveTypeAsModel() - ucrSaveResult.SetCheckBoxText("Save test object") + ucrSaveResult.SetCheckBoxText("Store test object") ucrSaveResult.SetAssignToIfUncheckedValue("Last_Test") ucrSaveResult.SetDataFrameSelector(ucrSelectorColumn.ucrAvailableDataFrames) diff --git a/instat/dlgIDFCurves.vb b/instat/dlgIDFCurves.vb index 215c4e7b639..5370ce37a79 100644 --- a/instat/dlgIDFCurves.vb +++ b/instat/dlgIDFCurves.vb @@ -59,7 +59,7 @@ Public Class dlgIDFCurves ucrSave.SetPrefix("Prec_accum") ucrSave.SetIsComboBox() - ucrSave.SetCheckBoxText("Save DataFrame") + ucrSave.SetCheckBoxText("Store DataFrame") ucrSave.SetSaveTypeAsDataFrame() ucrSave.SetDataFrameSelector(ucrIDFCurvesSelector.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_accum") diff --git a/instat/dlgInfillMissingValues.vb b/instat/dlgInfillMissingValues.vb index 1a90511ddec..92c2342f252 100644 --- a/instat/dlgInfillMissingValues.vb +++ b/instat/dlgInfillMissingValues.vb @@ -285,7 +285,7 @@ Public Class dlgInfillMissingValues ucrSaveGraph.SetPrefix("missing_plot") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorInfillMissing.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgInventoryPlot.vb b/instat/dlgInventoryPlot.vb index ca4fe3055d8..a750178ff13 100644 --- a/instat/dlgInventoryPlot.vb +++ b/instat/dlgInventoryPlot.vb @@ -106,7 +106,7 @@ Public Class dlgInventoryPlot ucrChkDay.SetRDefault("FALSE") ucrSaveDetails.SetPrefix("details") - ucrSaveDetails.SetCheckBoxText("Save Details") + ucrSaveDetails.SetCheckBoxText("Store Details") ucrSaveDetails.SetSaveTypeAsDataFrame() ucrSaveDetails.SetDataFrameSelector(ucrInventoryPlotSelector.ucrAvailableDataFrames) ucrSaveDetails.SetIsComboBox() @@ -160,7 +160,7 @@ Public Class dlgInventoryPlot ucrSaveGraph.SetPrefix("inventory") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrInventoryPlotSelector.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgLinePlot.designer.vb b/instat/dlgLinePlot.designer.vb index e265e1421d0..855b50854a0 100644 --- a/instat/dlgLinePlot.designer.vb +++ b/instat/dlgLinePlot.designer.vb @@ -147,6 +147,7 @@ Partial Class dlgLinePlot Me.lblFacetBy = New System.Windows.Forms.Label() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrChkLegend = New instat.ucrCheck() + Me.ucrChkAddLineLineRange = New instat.ucrCheck() Me.grpSmoothOptions.SuspendLayout() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() @@ -1303,11 +1304,21 @@ Partial Class dlgLinePlot Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) Me.ucrChkLegend.TabIndex = 82 ' + 'ucrChkAddLineLineRange + ' + Me.ucrChkAddLineLineRange.AutoSize = True + Me.ucrChkAddLineLineRange.Checked = False + Me.ucrChkAddLineLineRange.Location = New System.Drawing.Point(133, 337) + Me.ucrChkAddLineLineRange.Name = "ucrChkAddLineLineRange" + Me.ucrChkAddLineLineRange.Size = New System.Drawing.Size(77, 24) + Me.ucrChkAddLineLineRange.TabIndex = 84 + ' 'dlgLinePlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.ClientSize = New System.Drawing.Size(423, 563) + Me.Controls.Add(Me.ucrChkAddLineLineRange) Me.Controls.Add(Me.ucrInputStation) Me.Controls.Add(Me.ucr1stFactorReceiver) Me.Controls.Add(Me.lblFacetBy) @@ -1315,7 +1326,6 @@ Partial Class dlgLinePlot Me.Controls.Add(Me.ucrChkLegend) Me.Controls.Add(Me.rdoArea) Me.Controls.Add(Me.lblGroupLine) - Me.Controls.Add(Me.ucrReceiverGroup) Me.Controls.Add(Me.rdoErrorbar) Me.Controls.Add(Me.rdoPointrange) Me.Controls.Add(Me.rdoRibbon) @@ -1393,6 +1403,7 @@ Partial Class dlgLinePlot Me.Controls.Add(Me.ucrPnlStepOrPath) Me.Controls.Add(Me.lblSlopeY) Me.Controls.Add(Me.ucrPnlLinerangeOptions) + Me.Controls.Add(Me.ucrReceiverGroup) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -1515,4 +1526,5 @@ Partial Class dlgLinePlot Friend WithEvents lblFacetBy As Label Friend WithEvents ucrInputLegendPosition As ucrInputComboBox Friend WithEvents ucrChkLegend As ucrCheck + Friend WithEvents ucrChkAddLineLineRange As ucrCheck End Class diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 7f92eac8db7..c5338de519e 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -18,7 +18,6 @@ Imports instat.Translations Public Class dlgLinePlot Private clsRggplotFunction As New RFunction - Private clsOptionsFunction As New RFunction Private clsRaesFunction As New RFunction Private clsBaseOperator As New ROperator Private bFirstLoad As Boolean = True @@ -42,7 +41,7 @@ Public Class dlgLinePlot Private clsLocalRaesFunction As New RFunction Private bResetLineLayerSubdialog As Boolean = True Private clsGeomSmoothFunc As New RFunction - Private clsGeomSmoothParameter As New RParameter + Private clsGeomLineFunc As New RFunction Private clsCoordPolarFunction As New RFunction Private clsCoordPolarStartOperator As New ROperator Private clsXScaleDateFunction As New RFunction @@ -62,6 +61,7 @@ Public Class dlgLinePlot Private clsGeomCrossbarFunction As New RFunction Private clsGeomErrorbarFunction As New RFunction Private clsGeomPointrangeFunction As New RFunction + Private clsDummyFunction As New RFunction Private clsFacetFunction As New RFunction Private clsFacetVariablesOperator As New ROperator @@ -79,7 +79,7 @@ Public Class dlgLinePlot Private bUpdatingParameters As Boolean = False 'Parameter names for geoms - Private strFirstParameterName As String = "geomfunc" + Private strFirstParameterName As String = "geom_line" Private strgeomSmoothParameterName As String = "geom_smooth" Private strGeomParameterNames() As String = {strFirstParameterName, strgeomSmoothParameterName} @@ -100,8 +100,6 @@ Public Class dlgLinePlot Private Sub InitialiseDialog() Dim clsGeomPointFunc As New RFunction Dim clsGeomPointParam As New RParameter - Dim clsGeomLineFunction As New RFunction - Dim clsGeomLineParameter As New RParameter Dim dctMethodOptions As New Dictionary(Of String, String) Dim dctFamilyOptions As New Dictionary(Of String, String) Dim dctColourOptions As New Dictionary(Of String, String) @@ -188,24 +186,12 @@ Public Class dlgLinePlot ucrChkAddPoints.SetText("Add Points") ucrChkAddPoints.SetParameter(clsGeomPointParam, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - clsGeomLineFunction.SetPackageName("ggplot2") - clsGeomLineFunction.SetRCommand("geom_line") - clsGeomLineParameter.SetArgumentName("geom_line") - clsGeomLineParameter.SetArgument(clsGeomLineFunction) - clsGeomLineParameter.Position = 4 ucrChkAddLine.SetText("Add Line") - ucrChkAddLine.SetParameter(clsGeomLineParameter, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - clsGeomSmoothFunc.SetPackageName("ggplot2") - clsGeomSmoothFunc.SetRCommand("geom_smooth") - clsGeomSmoothFunc.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) - clsGeomSmoothFunc.AddParameter("se", "FALSE", iPosition:=1) - clsGeomSmoothParameter.SetArgumentName(strgeomSmoothParameterName) - clsGeomSmoothParameter.SetArgument(clsGeomSmoothFunc) + ucrChkAddLineLineRange.SetText("Add Line") + ucrChkLineofBestFit.SetText("Add Line of Best Fit") ucrChkLineofBestFit.AddToLinkedControls(ucrChkWithSE, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkLineofBestFit.SetParameter(clsGeomSmoothParameter, bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) - ucrChkWithSE.SetText("Add SE") ucrChkWithSE.SetParameter(New RParameter("se", 1)) @@ -219,7 +205,7 @@ Public Class dlgLinePlot ucrSave.SetPrefix("line_plot") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() - ucrSave.SetCheckBoxText("Save Graph") + ucrSave.SetCheckBoxText("Store Graph") ucrSave.SetDataFrameSelector(ucrLinePlotSelector.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_graph") @@ -255,11 +241,11 @@ Public Class dlgLinePlot ucrPnlOptions.AddRadioButton(rdoDumbbell) ucrPnlOptions.AddRadioButton(rdoSlope) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoLine, strFirstParameterName, {"geom_line", "geom_area", "geom_path", "geom_step"}) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoSmoothing, strFirstParameterName, {"geom_smooth"}) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoLinerange, strFirstParameterName, {"geom_linerange", "geom_ribbon", "geom_pointrange", "geom_crossbar", "geom_errorbar"}) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoDumbbell, "dumbbellplot", {"geom_dumbbell"}) - ucrPnlOptions.AddParameterValueFunctionNamesCondition(rdoSlope, "slopeplot", {"slopegraph", "slopegraph_theme"}) + ucrPnlOptions.AddParameterValuesCondition(rdoLine, "check", "line") + ucrPnlOptions.AddParameterValuesCondition(rdoSmoothing, "check", "smooth") + ucrPnlOptions.AddParameterValuesCondition(rdoLinerange, "check", "Linerange") + ucrPnlOptions.AddParameterValuesCondition(rdoDumbbell, "check", "dumbbellplot") + ucrPnlOptions.AddParameterValuesCondition(rdoSlope, "check", "slopeplot") ucrInputMethod.SetParameter(New RParameter("method", 3)) dctMethodOptions.Add("loess", Chr(34) & "loess" & Chr(34)) @@ -448,7 +434,7 @@ Public Class dlgLinePlot ucrPnlOptions.AddToLinkedControls({ucrReceiverX}, {rdoLine, rdoDumbbell, rdoSmoothing, rdoLinerange}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrVariablesAsFactorForLinePlot}, {rdoLine, rdoSmoothing}, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrReceiverSlopeX, ucrReceiverSlopeColour, ucrChkSlopeLabelOptions, ucrChkSlopeTextOptions, ucrChkSlopeLineOptions, ucrChkSlopeLegend}, {rdoSlope}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlOptions.AddToLinkedControls({ucrReceiverYMax, ucrReceiverYMin, ucrChkRibbon}, {rdoLinerange}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrReceiverYMax, ucrChkAddLineLineRange, ucrReceiverYMin, ucrChkRibbon}, {rdoLinerange}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkDumbbellColour.AddToLinkedControls({ucrInputDumbbellX}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Orange") ucrChkDumbbellColour.AddToLinkedControls({ucrInputDumbbellXEnd}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Blue") ucrChkDumbbellColour.AddToLinkedControls({ucrInputDumbbellLine}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedUpdateFunction:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Black") @@ -497,7 +483,6 @@ Public Class dlgLinePlot Private Sub SetDefaults() clsRggplotFunction = New RFunction - clsOptionsFunction = New RFunction clsRaesFunction = New RFunction clsBaseOperator = New ROperator clsListFunction = New RFunction @@ -518,6 +503,7 @@ Public Class dlgLinePlot clsGeomPointrangeFunction = New RFunction clsGeomRibbonFunction = New RFunction clsFacetFunction = New RFunction + clsDummyFunction = New RFunction clsFacetVariablesOperator = New ROperator clsFacetRowOp = New ROperator clsFacetColOp = New ROperator @@ -535,13 +521,14 @@ Public Class dlgLinePlot bResetLineLayerSubdialog = True rdoArea.Checked = True rdoRibbon.Checked = True - ucrReceiverGroup.Visible = False ucrInputFormula.SetText("y ~ x") + clsDummyFunction.AddParameter("check", "line", iPosition:=0) + clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsOptionsFunction, iPosition:=2) + clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsGeomLineFunction, iPosition:=1) clsRggplotFunction.SetPackageName("ggplot2") clsRggplotFunction.SetRCommand("ggplot") @@ -550,15 +537,21 @@ Public Class dlgLinePlot clsRaesFunction.SetPackageName("ggplot2") clsRaesFunction.SetRCommand("aes") - clsAesLinerangeFunction.SetRCommand("aes") + clsGeomLineFunction.SetPackageName("ggplot2") + clsGeomLineFunction.SetRCommand("geom_line") - clsOptionsFunction.SetPackageName("ggplot2") - clsOptionsFunction.SetRCommand("geom_line") - clsOptionsFunction.AddParameter("se", "FALSE", iPosition:=1) + clsAesLinerangeFunction.SetRCommand("aes") clsDumbbellFunction.SetPackageName("ggalt") clsDumbbellFunction.SetRCommand("geom_dumbbell") + clsGeomLineFunc.SetPackageName("ggplot2") + clsGeomLineFunc.SetRCommand("geom_line") + + clsGeomSmoothFunc.SetPackageName("ggplot2") + clsGeomSmoothFunc.SetRCommand("geom_smooth") + clsGeomSmoothFunc.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) + clsGgSlopeFunction.SetRCommand("slopegraph") clsGgSlopeFunction.AddParameter("data", clsRFunctionParameter:=ucrLinePlotSelector.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) @@ -600,22 +593,14 @@ Public Class dlgLinePlot clsListFunction.SetRCommand("list") - clsGeomLineFunction.SetPackageName("ggplot2") - clsGeomLineFunction.SetRCommand("geom_line") - clsGeomLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34)) - clsGeomLineFunction.AddParameter("size", "0.8") - clsPathFunction.SetPackageName("ggplot2") clsPathFunction.SetRCommand("geom_path") - clsPathFunction.AddParameter("linemitre", "10") clsGeomStepFunction.SetPackageName("ggplot2") clsGeomStepFunction.SetRCommand("geom_step") clsGeomSmoothFunction.SetPackageName("ggplot2") clsGeomSmoothFunction.SetRCommand("geom_smooth") - clsGeomSmoothFunction.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) - clsGeomSmoothFunction.AddParameter("size", "1") clsGeomDumbbellFunction.SetPackageName("ggplot2") clsGeomDumbbellFunction.SetRCommand("geom_dumbbell") @@ -645,10 +630,10 @@ Public Class dlgLinePlot clsGeomPointrangeFunction.SetPackageName("ggplot2") clsGeomPointrangeFunction.SetRCommand("geom_pointrange") - clsGeomSmoothFunc.AddParameter("se", "FALSE", iPosition:=1) clsBaseOperator.RemoveParameterByName("geom_point") clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + SetGroupParam() End Sub Public Sub SetRCodeForControls(bReset As Boolean) @@ -664,17 +649,14 @@ Public Class dlgLinePlot ucrVariablesAsFactorForLinePlot.SetRCode(clsRaesFunction, bReset) ucrFactorOptionalReceiver.SetRCode(clsRaesFunction, bReset) ucrSave.SetRCode(clsBaseOperator, bReset) - ucrChkLineofBestFit.SetRCode(clsBaseOperator, bReset) ucrChkAddPoints.SetRCode(clsBaseOperator, bReset) ucrChkAddLine.SetRCode(clsBaseOperator, bReset) ucrChkWithSE.SetRCode(clsGeomSmoothFunc, bReset) - ucrChkAddSE.SetRCode(clsOptionsFunction, bReset) + ucrChkAddSE.SetRCode(clsGeomSmoothFunction, bReset) ucrReceiverYMax.SetRCode(clsAesLinerangeFunction, bReset) ucrReceiverYMin.SetRCode(clsAesLinerangeFunction, bReset) - ucrChkPathOrStep.SetRCode(clsOptionsFunction, bReset) - ucrPnlOptions.SetRCode(ucrBase.clsRsyntax.clsBaseOperator, bReset) - ucrInputMethod.SetRCode(clsOptionsFunction, bReset) - ucrNudSpan.SetRCode(clsOptionsFunction, bReset) + ucrInputMethod.SetRCode(clsGeomSmoothFunction, bReset) + ucrNudSpan.SetRCode(clsGeomSmoothFunction, bReset) ucrFamilyInput.SetRCode(clsListFunction, bReset) ucrChkFormula.SetRCode(clsBaseOperator, bReset) ucrChkDumbbellColour.SetRCode(clsDumbbellFunction, bReset) @@ -685,8 +667,13 @@ Public Class dlgLinePlot ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then - ucrChkRibbon.SetRCode(clsOptionsFunction, bReset) + ucrChkRibbon.SetRCode(clsBaseOperator, bReset) + ucrChkPathOrStep.SetRCode(clsBaseOperator, bReset) + ucrPnlOptions.SetRCode(clsDummyFunction, bReset) + ucrChkLineofBestFit.SetRCode(clsBaseOperator, bReset) + ucrChkAddLineLineRange.SetRCode(clsBaseOperator, bReset) End If + SetGroupParam() End Sub Private Sub TestOkEnabled() @@ -750,13 +737,13 @@ Public Class dlgLinePlot End Sub Private Sub ucrReceiverX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged, - ucrFactorOptionalReceiver.ControlValueChanged, ucrPnlOptions.ControlValueChanged, ucrReceiverGroup.ControlValueChanged + ucrFactorOptionalReceiver.ControlValueChanged, ucrReceiverGroup.ControlValueChanged SetGroupParam() End Sub Private Sub SetGroupParam() + ucrReceiverGroup.Visible = False If rdoLine.Checked OrElse rdoSmoothing.Checked OrElse rdoLinerange.Checked Then - ucrReceiverGroup.Visible = False If (Not ucrReceiverX.IsEmpty AndAlso ucrReceiverX.strCurrDataType.Contains("factor")) AndAlso ucrFactorOptionalReceiver.IsEmpty Then clsRaesFunction.AddParameter("group", "1", iPosition:=3) ucrReceiverGroup.Visible = False @@ -769,6 +756,7 @@ Public Class dlgLinePlot clsRaesFunction.RemoveParameterByName("group") End If Else + ucrReceiverGroup.Visible = False clsRaesFunction.RemoveParameterByName("group") End If End Sub @@ -776,92 +764,44 @@ Public Class dlgLinePlot Private Sub SetGraphPrefixAndRcommand() ucrVariablesAsFactorForLinePlot.SetMeAsReceiver() cmdOptions.Visible = True - clsBaseOperator.RemoveParameterByName("slopeplot") - clsBaseOperator.RemoveParameterByName("slopetheme") + clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_smooth1") clsBaseOperator.RemoveParameterByName("dumbbellplot") - clsOptionsFunction.RemoveParameterByName("stat") - clsOptionsFunction.RemoveParameterByName("position") - clsOptionsFunction.RemoveParameterByName("aes") + clsBaseOperator.RemoveParameterByName("slopeplot") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter(strFirstParameterName, clsRFunctionParameter:=clsOptionsFunction, iPosition:=1) - clsOptionsFunction.SetPackageName("ggplot2") If rdoLine.Checked Then - If ucrChkPathOrStep.Checked Then - If rdoArea.Checked Then - ucrSave.SetPrefix("area_plot") - clsRaesFunction.RemoveParameterByName("colour") - clsRaesFunction.AddParameter("fill", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) - clsOptionsFunction.SetRCommand("geom_area") - ElseIf rdoStep.Checked Then - ucrSave.SetPrefix("step_plot") - clsRaesFunction.RemoveParameterByName("fill") - clsRaesFunction.AddParameter("colour", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) - clsOptionsFunction.SetRCommand("geom_step") - Else - ucrSave.SetPrefix("path_plot") - clsRaesFunction.RemoveParameterByName("fill") - clsRaesFunction.AddParameter("colour", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) - clsOptionsFunction.SetRCommand("geom_path") - End If - Else - ucrSave.SetPrefix("line_plot") - clsRaesFunction.RemoveParameterByName("fill") - clsOptionsFunction.SetRCommand("geom_line") - End If + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=1) ElseIf rdoSmoothing.Checked Then - clsRaesFunction.RemoveParameterByName("fill") ucrSave.SetPrefix("smooth") - clsOptionsFunction.SetRCommand("geom_smooth") + clsBaseOperator.AddParameter("geom_smooth1", clsRFunctionParameter:=clsGeomSmoothFunction, iPosition:=1) ElseIf rdoLinerange.Checked Then ucrReceiverSlopeY.SetMeAsReceiver() - clsRaesFunction.RemoveParameterByName("fill") - clsOptionsFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) - clsOptionsFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) - clsOptionsFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) - If ucrChkRibbon.Checked Then - If rdoRibbon.Checked Then - ucrSave.SetPrefix("ribbon") - clsOptionsFunction.SetRCommand("geom_ribbon") - ElseIf rdoPointrange.Checked Then - ucrSave.SetPrefix("pointrange") - clsOptionsFunction.SetRCommand("geom_pointrange") - ElseIf rdoCrossbar.Checked Then - ucrSave.SetPrefix("crossbar") - clsOptionsFunction.SetRCommand("geom_crossbar") - Else - ucrSave.SetPrefix("errorbar") - clsOptionsFunction.SetRCommand("geom_errorbar") - End If - Else - ucrSave.SetPrefix("linerange") - clsOptionsFunction.SetRCommand("geom_linerange") - End If ElseIf rdoDumbbell.Checked Then ucrReceiverSlopeY.SetMeAsReceiver() - clsRaesFunction.RemoveParameterByName("fill") ucrSave.SetPrefix("dumbbell") - clsBaseOperator.RemoveParameterByName(strFirstParameterName) clsBaseOperator.AddParameter("dumbbellplot", clsRFunctionParameter:=clsDumbbellFunction, iPosition:=1) ElseIf rdoSlope.Checked Then ucrReceiverSlopeY.SetMeAsReceiver() - clsRaesFunction.RemoveParameterByName("fill") cmdOptions.Visible = False ucrSave.SetPrefix("slope") clsBaseOperator.RemoveParameterByName("ggplot") clsBaseOperator.RemoveParameterByName(strFirstParameterName) clsBaseOperator.AddParameter("slopeplot", clsRFunctionParameter:=clsGgSlopeFunction, iPosition:=0) - If ucrChkSlopeLegend.Checked Then - clsBaseOperator.RemoveParameterByName("slopetheme") - Else - clsBaseOperator.AddParameter("slopetheme", clsRFunctionParameter:=clsSlopeThemeFunction, iPosition:=-1) - End If End If End Sub - Private Sub ucrChkPathOrStep_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPathOrStep.ControlValueChanged, - ucrPnlStepOrPath.ControlValueChanged, ucrPnlOptions.ControlValueChanged, ucrChkSlopeLegend.ControlValueChanged, - ucrPnlLinerangeOptions.ControlValueChanged, ucrChkRibbon.ControlValueChanged, ucrFactorOptionalReceiver.ControlValueChanged + Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrFactorOptionalReceiver.ControlValueChanged SetGraphPrefixAndRcommand() + AddRemoveFormula() + AddRemoveGeomLine() + AddRemoveLineRange() + AddRemoveSlopeGraph() + AddRemoveMethodArgs() + AddRemoveLine() + AddRemoveSE() + AddRemoveBestFit() + SetGroupParam() + AddRemoveLineOnLineRange() End Sub Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrReceiverXEnd.ControlContentsChanged, @@ -871,22 +811,38 @@ Public Class dlgLinePlot TestOkEnabled() End Sub - Private Sub ucrInputMethod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputMethod.ControlValueChanged - If ucrInputMethod.GetText = "glm" OrElse ucrInputMethod.GetText = "gam" Then - clsOptionsFunction.AddParameter("method.args", clsRFunctionParameter:=clsListFunction, iPosition:=2) + Private Sub AddRemoveMethodArgs() + If rdoSmoothing.Checked Then + If ucrInputMethod.GetText = "glm" OrElse ucrInputMethod.GetText = "gam" Then + clsGeomSmoothFunction.AddParameter("method.args", clsRFunctionParameter:=clsListFunction, iPosition:=2) + Else + clsGeomSmoothFunction.RemoveParameterByName("method.args") + End If Else - clsOptionsFunction.RemoveParameterByName("method.args") + clsGeomSmoothFunction.RemoveParameterByName("method.args") End If End Sub - Private Sub ucrInputFormula_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFormula.ControlValueChanged, ucrChkFormula.ControlValueChanged - If ucrChkFormula.Checked AndAlso ucrInputFormula.GetText <> "" Then - clsOptionsFunction.AddParameter("formula", ucrInputFormula.GetText, iPosition:=1) + Private Sub ucrInputMethod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputMethod.ControlValueChanged + AddRemoveMethodArgs() + End Sub + + Private Sub AddRemoveFormula() + If rdoSmoothing.Checked Then + If ucrChkFormula.Checked AndAlso ucrInputFormula.GetText <> "" Then + clsGeomSmoothFunction.AddParameter("formula", ucrInputFormula.GetText, iPosition:=1) + Else + clsGeomSmoothFunction.RemoveParameterByName("formula") + End If Else - clsOptionsFunction.RemoveParameterByName("formula") + clsGeomSmoothFunction.RemoveParameterByName("formula") End If End Sub + Private Sub ucrInputFormula_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFormula.ControlValueChanged, ucrChkFormula.ControlValueChanged + AddRemoveFormula() + End Sub + Private Sub AddRemoveTheme() If clsThemeFunction.iParameterCount > 0 Then clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) @@ -919,10 +875,14 @@ Public Class dlgLinePlot End Sub Private Sub LineOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LineOptionsToolStripMenuItem.Click + clsGeomLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34)) + clsGeomLineFunction.AddParameter("size", "0.8") openSdgLayerOptions(clsGeomLineFunction) End Sub Private Sub SmoothOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SmoothOptionsToolStripMenuItem.Click + clsGeomSmoothFunction.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) + clsGeomSmoothFunction.AddParameter("size", "1") openSdgLayerOptions(clsGeomSmoothFunction) End Sub @@ -931,6 +891,7 @@ Public Class dlgLinePlot End Sub Private Sub PathOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PathOptionsToolStripMenuItem.Click + clsPathFunction.AddParameter("linemitre", "10") openSdgLayerOptions(clsPathFunction) End Sub @@ -1114,4 +1075,202 @@ Public Class dlgLinePlot AutoFacetStation() SetPipeAssignTo() End Sub + + Private Sub AddRemoveGeomLine() + If rdoLine.Checked Then + ucrSave.SetPrefix("line_plot") + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=1) + If ucrChkPathOrStep.Checked Then + clsBaseOperator.RemoveParameterByName("geom_area") + clsBaseOperator.RemoveParameterByName("geom_step") + clsBaseOperator.RemoveParameterByName("geom_path") + clsBaseOperator.RemoveParameterByName("geom_line") + clsRaesFunction.RemoveParameterByName("fill") + clsRaesFunction.RemoveParameterByName("colour") + If rdoArea.Checked Then + ucrSave.SetPrefix("area_plot") + clsRaesFunction.AddParameter("fill", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction, iPosition:=1) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_area", clsRFunctionParameter:=clsGeomAreaFunction, iPosition:=1) + ElseIf rdoStep.Checked Then + ucrSave.SetPrefix("step_plot") + clsRaesFunction.AddParameter("colour", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction, iPosition:=1) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_step", clsRFunctionParameter:=clsGeomStepFunction, iPosition:=1) + Else + ucrSave.SetPrefix("path_plot") + clsRaesFunction.AddParameter("colour", ucrFactorOptionalReceiver.GetVariableNames(False), iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction, iPosition:=1) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_path", clsRFunctionParameter:=clsPathFunction, iPosition:=1) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_area") + clsBaseOperator.RemoveParameterByName("geom_step") + clsBaseOperator.RemoveParameterByName("geom_path") + ucrSave.SetPrefix("line_plot") + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=1) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_area") + clsBaseOperator.RemoveParameterByName("geom_step") + clsBaseOperator.RemoveParameterByName("geom_path") + clsBaseOperator.RemoveParameterByName("geom_line") + End If + End Sub + + Private Sub ucrChkPathOrStep_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPathOrStep.ControlValueChanged, ucrPnlStepOrPath.ControlValueChanged + AddRemoveGeomLine() + End Sub + + Private Sub AddRemoveLineRange() + If rdoLinerange.Checked Then + ucrSave.SetPrefix("linerange") + clsGeomLinerangeFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomLinerangeFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomLinerangeFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_linerange", clsRFunctionParameter:=clsGeomLinerangeFunction, iPosition:=1) + If ucrChkRibbon.Checked Then + clsBaseOperator.RemoveParameterByName("geom_linerange") + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("geom_pointrange") + clsBaseOperator.RemoveParameterByName("geom_crossbar") + clsBaseOperator.RemoveParameterByName("geom_errorbar") + If rdoRibbon.Checked Then + ucrSave.SetPrefix("ribbon") + clsRaesFunction.AddParameter("colour", Chr(34) & "grey" & Chr(34), iPosition:=2) + clsGeomRibbonFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomRibbonFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomRibbonFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) + ElseIf rdoPointrange.Checked Then + ucrSave.SetPrefix("pointrange") + clsGeomPointrangeFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomPointrangeFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomPointrangeFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_pointrange", clsRFunctionParameter:=clsGeomPointrangeFunction, iPosition:=1) + ElseIf rdoCrossbar.Checked Then + ucrSave.SetPrefix("crossbar") + clsGeomCrossbarFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomCrossbarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomCrossbarFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_crossbar", clsRFunctionParameter:=clsGeomCrossbarFunction, iPosition:=1) + Else + ucrSave.SetPrefix("errorbar") + clsGeomErrorbarFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomErrorbarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomErrorbarFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_errorbar", clsRFunctionParameter:=clsGeomErrorbarFunction, iPosition:=1) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("geom_pointrange") + clsBaseOperator.RemoveParameterByName("geom_crossbar") + clsBaseOperator.RemoveParameterByName("geom_errorbar") + ucrSave.SetPrefix("linerange") + clsGeomLinerangeFunction.AddParameter("aes", clsRFunctionParameter:=clsAesLinerangeFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomLinerangeFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomLinerangeFunction.AddParameter("position", Chr(34) & "identity" & Chr(34), iPosition:=2) + clsBaseOperator.AddParameter("geom_linerange", clsRFunctionParameter:=clsGeomLinerangeFunction, iPosition:=1) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_linerange") + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("geom_pointrange") + clsBaseOperator.RemoveParameterByName("geom_crossbar") + clsBaseOperator.RemoveParameterByName("geom_errorbar") + End If + End Sub + + Private Sub ucrChkRibbon_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkRibbon.ControlValueChanged, ucrPnlLinerangeOptions.ControlValueChanged + AddRemoveLineRange() + End Sub + + Private Sub AddRemoveSlopeGraph() + If rdoSlope.Checked Then + If ucrChkSlopeLegend.Checked Then + clsBaseOperator.RemoveParameterByName("slopetheme") + Else + clsBaseOperator.AddParameter("slopetheme", clsRFunctionParameter:=clsSlopeThemeFunction, iPosition:=-1) + End If + Else + clsBaseOperator.RemoveParameterByName("slopetheme") + End If + End Sub + + Private Sub ucrChkSlopeLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSlopeLegend.ControlValueChanged + AddRemoveSlopeGraph() + End Sub + + Private Sub AddRemoveLine() + If rdoSmoothing.Checked Then + If ucrChkAddLine.Checked Then + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunc, iPosition:=4, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("geom_line1") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_line1") + End If + End Sub + + Private Sub AddRemoveLineOnLineRange() + If rdoLinerange.Checked Then + If ucrChkAddLineLineRange.Checked Then + clsBaseOperator.AddParameter("geom_line2", clsRFunctionParameter:=clsGeomLineFunc, iPosition:=4, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("geom_line2") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_line2") + End If + End Sub + + Private Sub ucrChkAddLine_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddLine.ControlValueChanged + AddRemoveLine() + End Sub + + Private Sub AddRemoveSE() + If rdoSmoothing.Checked Then + clsBaseOperator.AddParameter("geom_smooth1", clsRFunctionParameter:=clsGeomSmoothFunction, iPosition:=1, bIncludeArgumentName:=False) + If ucrChkAddSE.Checked Then + clsGeomSmoothFunction.AddParameter("se", "TRUE", iPosition:=0) + Else + clsGeomSmoothFunction.AddParameter("se", "FALSE", iPosition:=0) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_smooth1") + End If + End Sub + + Private Sub ucrChkAddSE_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddSE.ControlValueChanged + AddRemoveSE() + End Sub + + Private Sub AddRemoveBestFit() + If rdoLine.Checked Then + If ucrChkLineofBestFit.Checked Then + clsBaseOperator.AddParameter("geom_smooth", clsRFunctionParameter:=clsGeomSmoothFunc, iPosition:=2) + If ucrChkWithSE.Checked Then + clsGeomSmoothFunc.AddParameter("se", "TRUE", iPosition:=0) + Else + clsGeomSmoothFunc.AddParameter("se", "FALSE", iPosition:=0) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_smooth") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_smooth") + End If + End Sub + + Private Sub ucrChkLineofBestFit_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLineofBestFit.ControlValueChanged, ucrChkWithSE.ControlValueChanged + AddRemoveBestFit() + End Sub + + Private Sub ucrChkAddLineLineRange_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddLineLineRange.ControlValueChanged + AddRemoveLineOnLineRange() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgMakeDate.vb b/instat/dlgMakeDate.vb index 156cb7864a0..44d4c52cc9d 100644 --- a/instat/dlgMakeDate.vb +++ b/instat/dlgMakeDate.vb @@ -180,7 +180,7 @@ Public Class dlgMakeDate ucrSaveDate.SetPrefix("date") ucrSaveDate.SetSaveTypeAsColumn() ucrSaveDate.SetDataFrameSelector(ucrSelectorMakeDate.ucrAvailableDataFrames) - ucrSaveDate.SetLabelText("Save Date:") + ucrSaveDate.SetLabelText("Store Date:") ucrSaveDate.SetIsComboBox() diff --git a/instat/dlgModelling.vb b/instat/dlgModelling.vb index 9af0dd39c44..cae0e1ed343 100644 --- a/instat/dlgModelling.vb +++ b/instat/dlgModelling.vb @@ -60,7 +60,7 @@ Public Class dlgModelling ucrSaveResult.SetPrefix("model") ucrSaveResult.SetIsComboBox() ucrSaveResult.SetSaveTypeAsModel() - ucrSaveResult.SetCheckBoxText("Save Model") + ucrSaveResult.SetCheckBoxText("Store Model") ucrSaveResult.SetAssignToIfUncheckedValue("last_model") ucrSaveResult.SetDataFrameSelector(ucrSelectorModelling.ucrAvailableDataFrames) diff --git a/instat/dlgMosaicPlot.vb b/instat/dlgMosaicPlot.vb index f4f6c2cf6f0..c8b26f265e4 100644 --- a/instat/dlgMosaicPlot.vb +++ b/instat/dlgMosaicPlot.vb @@ -174,7 +174,7 @@ Public Class dlgMosaicPlot ucrSaveMosaicPlot.SetPrefix("mosaic") ucrSaveMosaicPlot.SetIsComboBox() - ucrSaveMosaicPlot.SetCheckBoxText("Save Graph") + ucrSaveMosaicPlot.SetCheckBoxText("Store Graph") ucrSaveMosaicPlot.SetSaveTypeAsGraph() ucrSaveMosaicPlot.SetDataFrameSelector(ucrSelectorMosaicPlot.ucrAvailableDataFrames) ucrSaveMosaicPlot.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgNewMarkovChains.Designer.vb b/instat/dlgNewMarkovChains.Designer.vb index 6a367c32415..30e8be4f219 100644 --- a/instat/dlgNewMarkovChains.Designer.vb +++ b/instat/dlgNewMarkovChains.Designer.vb @@ -85,7 +85,7 @@ Partial Class dlgNewMarkovChains Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(12, 437) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 0 ' 'ucrSelectorMarkovChains @@ -389,7 +389,7 @@ Partial Class dlgNewMarkovChains Me.chkSaveModel.Name = "chkSaveModel" Me.chkSaveModel.Size = New System.Drawing.Size(83, 17) Me.chkSaveModel.TabIndex = 20 - Me.chkSaveModel.Text = "Save Model" + Me.chkSaveModel.Text = "Store Model" Me.chkSaveModel.UseVisualStyleBackColor = True ' 'chkGraph diff --git a/instat/dlgOneVarFitModel.vb b/instat/dlgOneVarFitModel.vb index 4301e18009f..565148d5c77 100644 --- a/instat/dlgOneVarFitModel.vb +++ b/instat/dlgOneVarFitModel.vb @@ -88,7 +88,7 @@ Public Class dlgOneVarFitModel ucrSaveModel.SetDataFrameSelector(ucrSelectorOneVarFitMod.ucrAvailableDataFrames) ucrSaveModel.SetSaveTypeAsModel() - ucrSaveModel.SetCheckBoxText("Save Model") + ucrSaveModel.SetCheckBoxText("Store Model") ucrSaveModel.SetIsComboBox() ucrSaveModel.SetAssignToIfUncheckedValue("last_model") @@ -651,13 +651,13 @@ Public Class dlgOneVarFitModel Private Sub SetSaveLabelTextAndPrefix() If rdoGeneralCase.Checked Then - ucrSaveModel.SetCheckBoxText("Save Model") + ucrSaveModel.SetCheckBoxText("Store Model") ucrSaveModel.SetPrefix("dist") ElseIf rdoTest.Checked Then - ucrSaveModel.SetCheckBoxText("Save Test") + ucrSaveModel.SetCheckBoxText("Store Test") ucrSaveModel.SetPrefix("test") ElseIf rdoEstimate.Checked Then - ucrSaveModel.SetCheckBoxText("Save Estimate") + ucrSaveModel.SetCheckBoxText("Store Estimate") ucrSaveModel.SetPrefix("ci") Else MsgBox("Developer error: the Radio Button has not been added to the Panel.") diff --git a/instat/dlgOneVariableGraph.vb b/instat/dlgOneVariableGraph.vb index c0bd47d6472..cfe8199758b 100644 --- a/instat/dlgOneVariableGraph.vb +++ b/instat/dlgOneVariableGraph.vb @@ -74,7 +74,7 @@ Public Class dlgOneVariableGraph ucrSaveGraph.SetPrefix("one_var") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorOneVarGraph.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index d2fbe9ad3fb..325e6d92621 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -384,19 +384,19 @@ Public Class dlgOneVariableSummarise ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveSummary.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveSummary.SetAssignToIfUncheckedValue("last_table") - ucrSaveSummary.SetCheckBoxText("Save Table") + ucrSaveSummary.SetCheckBoxText("Store Table") ElseIf rdoDefault.Checked Then clsDummyFunction.AddParameter("checked_radio", "defaults", iPosition:=0) ucrBase.clsRsyntax.SetBaseRFunction(clsSummaryFunction) ucrSaveSummary.SetSaveType(RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveSummary.SetAssignToIfUncheckedValue("last_summary") - ucrSaveSummary.SetCheckBoxText("Save Summary") + ucrSaveSummary.SetCheckBoxText("Store Summary") ElseIf rdoSkim.Checked Then clsDummyFunction.AddParameter("checked_radio", "skim", iPosition:=0) ucrBase.clsRsyntax.SetBaseRFunction(clsSkimrFunction) ucrSaveSummary.SetSaveType(RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveSummary.SetAssignToIfUncheckedValue("last_summary") - ucrSaveSummary.SetCheckBoxText("Save Summary") + ucrSaveSummary.SetCheckBoxText("Store Summary") End If cmdSummaries.Visible = rdoCustomised.Checked cmdFormatTable.Visible = rdoCustomised.Checked diff --git a/instat/dlgOneWayFrequencies.vb b/instat/dlgOneWayFrequencies.vb index 71696613278..a4a08b5d66c 100644 --- a/instat/dlgOneWayFrequencies.vb +++ b/instat/dlgOneWayFrequencies.vb @@ -310,7 +310,7 @@ Public Class dlgOneWayFrequencies If rdoTableAsOutput.Checked Then ucrSaveFreq.SetSaveType(strRObjectType:=RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveFreq.SetPrefix("freq_summary") - ucrSaveFreq.SetCheckBoxText("Save Summary") + ucrSaveFreq.SetCheckBoxText("Store Summary") ucrSaveFreq.SetAssignToIfUncheckedValue("last_summary") 'restore assign to @@ -323,7 +323,7 @@ Public Class dlgOneWayFrequencies ucrBase.clsRsyntax.SetBaseRFunction(clsTableSjMiscFrqRFunction) Else ucrSaveFreq.SetPrefix("one_way_freq") - ucrSaveFreq.SetCheckBoxText("Save Data Frame") + ucrSaveFreq.SetCheckBoxText("Store Data Frame") ucrSaveFreq.SetSaveType(strRObjectType:=RObjectTypeLabel.Dataframe) ucrSaveFreq.SetAssignToIfUncheckedValue("one_way_freq") @@ -334,7 +334,7 @@ Public Class dlgOneWayFrequencies End If ElseIf rdoFrqGraph.Checked Then ucrSaveFreq.SetSaveType(strRObjectType:=RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) - ucrSaveFreq.SetCheckBoxText("Save Graph") + ucrSaveFreq.SetCheckBoxText("Store Graph") ucrSaveFreq.SetPrefix("freq_graph") ucrSaveFreq.SetAssignToIfUncheckedValue("last_graph") @@ -355,7 +355,7 @@ Public Class dlgOneWayFrequencies ElseIf rdoFrqStemLeaf.Checked Then ucrSaveFreq.SetSaveType(strRObjectType:=RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Text) ucrSaveFreq.SetPrefix("freq_summary") - ucrSaveFreq.SetCheckBoxText("Save Summary") + ucrSaveFreq.SetCheckBoxText("Store Summary") ucrSaveFreq.SetAssignToIfUncheckedValue("last_summary") clsStemLeafNoQuotesRFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary", diff --git a/instat/dlgOpenNetCDF.vb b/instat/dlgOpenNetCDF.vb index 431710c08bc..8bec03ed0c6 100644 --- a/instat/dlgOpenNetCDF.vb +++ b/instat/dlgOpenNetCDF.vb @@ -21,6 +21,12 @@ Imports RDotNet Imports System.ComponentModel Public Class dlgOpenNetCDF + Public enumNetCDFMode As String = NetCDFMode.File + Public Enum NetCDFMode + File + Climatic + End Enum + Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsImportNetcdfFunction, clsNcOpenFunction, clsNcCloseFunction, clsRFileDetails As New RFunction @@ -66,6 +72,7 @@ Public Class dlgOpenNetCDF Else OpenFile() End If + SetHelpOptions() bReset = False TestOkEnabled() autoTranslate(Me) @@ -152,6 +159,15 @@ Public Class dlgOpenNetCDF End If End Sub + Private Sub SetHelpOptions() + Select Case enumNetCDFMode + Case NetCDFMode.File + ucrBase.iHelpTopicID = 393 + Case NetCDFMode.Climatic + ucrBase.iHelpTopicID = 381 + End Select + End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 41fe03ab1e8..ed5bd9584f7 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -38,12 +38,12 @@ Partial Class dlgOptions 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") - Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") - Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") - Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") - Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") - Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") + Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") + Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") + Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") + Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") + Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") + Dim TreeNode12 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") Me.cmdApply = New System.Windows.Forms.Button() Me.cmdHelp = New System.Windows.Forms.Button() Me.cmdCancel = New System.Windows.Forms.Button() @@ -153,10 +153,9 @@ Partial Class dlgOptions ' 'cmdApply ' - Me.cmdApply.Location = New System.Drawing.Point(576, 486) - Me.cmdApply.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdApply.Location = New System.Drawing.Point(384, 324) Me.cmdApply.Name = "cmdApply" - Me.cmdApply.Size = New System.Drawing.Size(112, 34) + Me.cmdApply.Size = New System.Drawing.Size(75, 23) Me.cmdApply.TabIndex = 10 Me.cmdApply.Tag = "Apply" Me.cmdApply.Text = "Apply" @@ -164,10 +163,9 @@ Partial Class dlgOptions ' 'cmdHelp ' - Me.cmdHelp.Location = New System.Drawing.Point(698, 486) - Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdHelp.Location = New System.Drawing.Point(465, 324) Me.cmdHelp.Name = "cmdHelp" - Me.cmdHelp.Size = New System.Drawing.Size(112, 34) + Me.cmdHelp.Size = New System.Drawing.Size(75, 23) Me.cmdHelp.TabIndex = 12 Me.cmdHelp.Tag = "Help" Me.cmdHelp.Text = "Help" @@ -175,10 +173,9 @@ Partial Class dlgOptions ' 'cmdCancel ' - Me.cmdCancel.Location = New System.Drawing.Point(454, 486) - Me.cmdCancel.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCancel.Location = New System.Drawing.Point(303, 324) Me.cmdCancel.Name = "cmdCancel" - Me.cmdCancel.Size = New System.Drawing.Size(112, 34) + Me.cmdCancel.Size = New System.Drawing.Size(75, 23) Me.cmdCancel.TabIndex = 9 Me.cmdCancel.Tag = "Cancel" Me.cmdCancel.Text = "Cancel" @@ -186,10 +183,9 @@ Partial Class dlgOptions ' 'cmdOk ' - Me.cmdOk.Location = New System.Drawing.Point(333, 486) - Me.cmdOk.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdOk.Location = New System.Drawing.Point(222, 324) Me.cmdOk.Name = "cmdOk" - Me.cmdOk.Size = New System.Drawing.Size(112, 34) + Me.cmdOk.Size = New System.Drawing.Size(75, 23) Me.cmdOk.TabIndex = 11 Me.cmdOk.Tag = "Ok" Me.cmdOk.Text = "Ok" @@ -198,10 +194,9 @@ Partial Class dlgOptions 'cmdLanguage ' Me.cmdLanguage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLanguage.Location = New System.Drawing.Point(818, 486) - Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdLanguage.Location = New System.Drawing.Point(545, 324) Me.cmdLanguage.Name = "cmdLanguage" - Me.cmdLanguage.Size = New System.Drawing.Size(56, 34) + Me.cmdLanguage.Size = New System.Drawing.Size(37, 23) Me.cmdLanguage.TabIndex = 13 Me.cmdLanguage.Tag = "" Me.cmdLanguage.Text = "Lang" @@ -209,8 +204,7 @@ Partial Class dlgOptions ' 'spltControls ' - Me.spltControls.Location = New System.Drawing.Point(8, 2) - Me.spltControls.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.spltControls.Location = New System.Drawing.Point(5, 1) Me.spltControls.Name = "spltControls" ' 'spltControls.Panel1 @@ -221,17 +215,15 @@ Partial Class dlgOptions 'spltControls.Panel2 ' Me.spltControls.Panel2.Controls.Add(Me.tbcOptions) - Me.spltControls.Size = New System.Drawing.Size(1140, 476) - Me.spltControls.SplitterDistance = 276 - Me.spltControls.SplitterWidth = 6 + Me.spltControls.Size = New System.Drawing.Size(760, 317) + Me.spltControls.SplitterDistance = 184 Me.spltControls.TabIndex = 8 ' 'cmdFactoryReset ' - Me.cmdFactoryReset.Location = New System.Drawing.Point(20, 430) - Me.cmdFactoryReset.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdFactoryReset.Location = New System.Drawing.Point(13, 287) Me.cmdFactoryReset.Name = "cmdFactoryReset" - Me.cmdFactoryReset.Size = New System.Drawing.Size(150, 34) + Me.cmdFactoryReset.Size = New System.Drawing.Size(100, 23) Me.cmdFactoryReset.TabIndex = 13 Me.cmdFactoryReset.Tag = "Help" Me.cmdFactoryReset.Text = "Factory Reset" @@ -241,32 +233,31 @@ Partial Class dlgOptions ' Me.trOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.trOptions.Location = New System.Drawing.Point(0, 0) - Me.trOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.trOptions.Name = "trOptions" - TreeNode1.Name = "ndLanguages" - TreeNode1.Tag = "1" - TreeNode1.Text = "Languages" - TreeNode1.ToolTipText = "Choose different languages" - TreeNode2.Name = "ndComments" - TreeNode2.Tag = "2" - TreeNode2.Text = "Comments" - TreeNode2.ToolTipText = "Comments for the dialogs" - TreeNode3.Name = "ndImport" - TreeNode3.Tag = "3" - TreeNode3.Text = "Import" - TreeNode3.ToolTipText = "Import Data Settings" - TreeNode4.Name = "ndOutputWindow" - TreeNode4.Tag = "4" - TreeNode4.Text = "Output Window" - TreeNode4.ToolTipText = "Output Window Formatting Options" - TreeNode5.Name = "ndCommands" - TreeNode5.Tag = "8" - TreeNode5.Text = "Commands" - TreeNode5.ToolTipText = "Commands Options" - TreeNode6.Name = "ndDataView" - TreeNode6.Text = "Data View" - Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode1, TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6}) - Me.trOptions.Size = New System.Drawing.Size(276, 476) + TreeNode7.Name = "ndLanguages" + TreeNode7.Tag = "1" + TreeNode7.Text = "Languages" + TreeNode7.ToolTipText = "Choose different languages" + TreeNode8.Name = "ndComments" + TreeNode8.Tag = "2" + TreeNode8.Text = "Comments" + TreeNode8.ToolTipText = "Comments for the dialogs" + TreeNode9.Name = "ndImport" + TreeNode9.Tag = "3" + TreeNode9.Text = "Import" + TreeNode9.ToolTipText = "Import Data Settings" + TreeNode10.Name = "ndOutputWindow" + TreeNode10.Tag = "4" + TreeNode10.Text = "Output Window" + TreeNode10.ToolTipText = "Output Window Formatting Options" + TreeNode11.Name = "ndCommands" + TreeNode11.Tag = "8" + TreeNode11.Text = "Commands" + TreeNode11.ToolTipText = "Commands Options" + TreeNode12.Name = "ndDataView" + TreeNode12.Text = "Data View" + Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode7, TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12}) + Me.trOptions.Size = New System.Drawing.Size(184, 317) Me.trOptions.TabIndex = 0 ' 'tbcOptions @@ -285,10 +276,9 @@ Partial Class dlgOptions Me.tbcOptions.Controls.Add(Me.tbpWebsite) Me.tbcOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.tbcOptions.Location = New System.Drawing.Point(0, 0) - Me.tbcOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbcOptions.Name = "tbcOptions" Me.tbcOptions.SelectedIndex = 0 - Me.tbcOptions.Size = New System.Drawing.Size(858, 476) + Me.tbcOptions.Size = New System.Drawing.Size(572, 317) Me.tbcOptions.TabIndex = 0 ' 'tbpLanguages @@ -296,11 +286,10 @@ Partial Class dlgOptions Me.tbpLanguages.Controls.Add(Me.lversion) Me.tbpLanguages.Controls.Add(Me.lblLanguage) Me.tbpLanguages.Controls.Add(Me.ucrInputLanguage) - Me.tbpLanguages.Location = New System.Drawing.Point(4, 29) - Me.tbpLanguages.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpLanguages.Location = New System.Drawing.Point(4, 22) Me.tbpLanguages.Name = "tbpLanguages" - Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpLanguages.Size = New System.Drawing.Size(850, 443) + Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(3) + Me.tbpLanguages.Size = New System.Drawing.Size(564, 291) Me.tbpLanguages.TabIndex = 0 Me.tbpLanguages.Tag = "Languages" Me.tbpLanguages.Text = "Languages" @@ -308,9 +297,10 @@ Partial Class dlgOptions ' 'lversion ' - Me.lversion.Location = New System.Drawing.Point(459, 400) + Me.lversion.Location = New System.Drawing.Point(306, 267) + Me.lversion.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lversion.Name = "lversion" - Me.lversion.Size = New System.Drawing.Size(381, 27) + Me.lversion.Size = New System.Drawing.Size(254, 18) Me.lversion.TabIndex = 4 Me.lversion.Text = "v. " Me.lversion.TextAlign = System.Drawing.ContentAlignment.TopRight @@ -318,10 +308,9 @@ Partial Class dlgOptions 'lblLanguage ' Me.lblLanguage.AutoSize = True - Me.lblLanguage.Location = New System.Drawing.Point(14, 27) - Me.lblLanguage.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblLanguage.Location = New System.Drawing.Point(9, 18) Me.lblLanguage.Name = "lblLanguage" - Me.lblLanguage.Size = New System.Drawing.Size(89, 20) + Me.lblLanguage.Size = New System.Drawing.Size(61, 13) Me.lblLanguage.TabIndex = 3 Me.lblLanguage.Text = "Language :" ' @@ -331,20 +320,19 @@ Partial Class dlgOptions Me.ucrInputLanguage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLanguage.GetSetSelectedIndex = -1 Me.ucrInputLanguage.IsReadOnly = False - Me.ucrInputLanguage.Location = New System.Drawing.Point(112, 22) - Me.ucrInputLanguage.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputLanguage.Location = New System.Drawing.Point(75, 15) + Me.ucrInputLanguage.Margin = New System.Windows.Forms.Padding(6) Me.ucrInputLanguage.Name = "ucrInputLanguage" - Me.ucrInputLanguage.Size = New System.Drawing.Size(165, 32) + Me.ucrInputLanguage.Size = New System.Drawing.Size(110, 21) Me.ucrInputLanguage.TabIndex = 2 ' 'tbpComments ' Me.tbpComments.Controls.Add(Me.pnComments) - Me.tbpComments.Location = New System.Drawing.Point(4, 29) - Me.tbpComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpComments.Location = New System.Drawing.Point(4, 22) Me.tbpComments.Name = "tbpComments" - Me.tbpComments.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpComments.Size = New System.Drawing.Size(850, 443) + Me.tbpComments.Padding = New System.Windows.Forms.Padding(3) + Me.tbpComments.Size = New System.Drawing.Size(564, 291) Me.tbpComments.TabIndex = 1 Me.tbpComments.Tag = "Comments" Me.tbpComments.Text = "Comments" @@ -355,10 +343,9 @@ Partial Class dlgOptions Me.pnComments.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnComments.Controls.Add(Me.ucrInputComment) Me.pnComments.Controls.Add(Me.lblComment) - Me.pnComments.Location = New System.Drawing.Point(15, 15) - Me.pnComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnComments.Location = New System.Drawing.Point(10, 10) Me.pnComments.Name = "pnComments" - Me.pnComments.Size = New System.Drawing.Size(586, 44) + Me.pnComments.Size = New System.Drawing.Size(391, 29) Me.pnComments.TabIndex = 2 ' 'ucrInputComment @@ -367,19 +354,18 @@ Partial Class dlgOptions Me.ucrInputComment.AutoSize = True Me.ucrInputComment.IsMultiline = False Me.ucrInputComment.IsReadOnly = False - Me.ucrInputComment.Location = New System.Drawing.Point(144, 8) - Me.ucrInputComment.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputComment.Location = New System.Drawing.Point(96, 5) + Me.ucrInputComment.Margin = New System.Windows.Forms.Padding(6) Me.ucrInputComment.Name = "ucrInputComment" - Me.ucrInputComment.Size = New System.Drawing.Size(438, 32) + Me.ucrInputComment.Size = New System.Drawing.Size(292, 21) Me.ucrInputComment.TabIndex = 1 ' 'lblComment ' Me.lblComment.AutoSize = True - Me.lblComment.Location = New System.Drawing.Point(3, 14) - Me.lblComment.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblComment.Location = New System.Drawing.Point(2, 9) Me.lblComment.Name = "lblComment" - Me.lblComment.Size = New System.Drawing.Size(82, 20) + Me.lblComment.Size = New System.Drawing.Size(54, 13) Me.lblComment.TabIndex = 0 Me.lblComment.Tag = "Comment:" Me.lblComment.Text = "Comment:" @@ -389,10 +375,9 @@ Partial Class dlgOptions Me.tbpImport.Controls.Add(Me.lblPreviewRows) Me.tbpImport.Controls.Add(Me.ucrNudPreviewRows) Me.tbpImport.Controls.Add(Me.pnImportData) - Me.tbpImport.Location = New System.Drawing.Point(4, 29) - Me.tbpImport.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpImport.Location = New System.Drawing.Point(4, 22) Me.tbpImport.Name = "tbpImport" - Me.tbpImport.Size = New System.Drawing.Size(850, 443) + Me.tbpImport.Size = New System.Drawing.Size(564, 291) Me.tbpImport.TabIndex = 3 Me.tbpImport.Text = "Import" Me.tbpImport.UseVisualStyleBackColor = True @@ -400,10 +385,9 @@ Partial Class dlgOptions 'lblPreviewRows ' Me.lblPreviewRows.AutoSize = True - Me.lblPreviewRows.Location = New System.Drawing.Point(4, 14) - Me.lblPreviewRows.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblPreviewRows.Location = New System.Drawing.Point(3, 9) Me.lblPreviewRows.Name = "lblPreviewRows" - Me.lblPreviewRows.Size = New System.Drawing.Size(189, 20) + Me.lblPreviewRows.Size = New System.Drawing.Size(130, 13) Me.lblPreviewRows.TabIndex = 0 Me.lblPreviewRows.Text = "Number of Preview Rows:" ' @@ -412,12 +396,12 @@ Partial Class dlgOptions Me.ucrNudPreviewRows.AutoSize = True Me.ucrNudPreviewRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreviewRows.Location = New System.Drawing.Point(405, 8) - Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudPreviewRows.Location = New System.Drawing.Point(270, 5) + Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudPreviewRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPreviewRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewRows.Name = "ucrNudPreviewRows" - Me.ucrNudPreviewRows.Size = New System.Drawing.Size(75, 30) + Me.ucrNudPreviewRows.Size = New System.Drawing.Size(50, 20) Me.ucrNudPreviewRows.TabIndex = 3 Me.ucrNudPreviewRows.Value = New Decimal(New Integer() {10, 0, 0, 0}) ' @@ -425,8 +409,7 @@ Partial Class dlgOptions ' Me.pnImportData.AutoSize = True Me.pnImportData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.pnImportData.Location = New System.Drawing.Point(15, 15) - Me.pnImportData.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnImportData.Location = New System.Drawing.Point(10, 10) Me.pnImportData.Name = "pnImportData" Me.pnImportData.Size = New System.Drawing.Size(0, 0) Me.pnImportData.TabIndex = 2 @@ -439,11 +422,10 @@ Partial Class dlgOptions Me.tbpOutputWindow.Controls.Add(Me.ucrChkIncludeCommentsbyDefault) Me.tbpOutputWindow.Controls.Add(Me.grpROptions) Me.tbpOutputWindow.Controls.Add(Me.pnFormatOptions) - Me.tbpOutputWindow.Location = New System.Drawing.Point(4, 29) - Me.tbpOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpOutputWindow.Location = New System.Drawing.Point(4, 22) Me.tbpOutputWindow.Name = "tbpOutputWindow" - Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpOutputWindow.Size = New System.Drawing.Size(850, 443) + Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(3) + Me.tbpOutputWindow.Size = New System.Drawing.Size(564, 291) Me.tbpOutputWindow.TabIndex = 2 Me.tbpOutputWindow.Text = "Output Window" Me.tbpOutputWindow.UseVisualStyleBackColor = True @@ -453,12 +435,12 @@ Partial Class dlgOptions Me.ucrNudMaxOutputsHeight.AutoSize = True Me.ucrNudMaxOutputsHeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxOutputsHeight.Location = New System.Drawing.Point(759, 202) - Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudMaxOutputsHeight.Location = New System.Drawing.Point(506, 135) + Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudMaxOutputsHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Name = "ucrNudMaxOutputsHeight" - Me.ucrNudMaxOutputsHeight.Size = New System.Drawing.Size(75, 30) + Me.ucrNudMaxOutputsHeight.Size = New System.Drawing.Size(50, 20) Me.ucrNudMaxOutputsHeight.TabIndex = 29 Me.ucrNudMaxOutputsHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -466,30 +448,30 @@ Partial Class dlgOptions ' Me.ucrChkMaxOutputsHeight.AutoSize = True Me.ucrChkMaxOutputsHeight.Checked = False - Me.ucrChkMaxOutputsHeight.Location = New System.Drawing.Point(450, 202) - Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkMaxOutputsHeight.Location = New System.Drawing.Point(300, 135) + Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkMaxOutputsHeight.Name = "ucrChkMaxOutputsHeight" - Me.ucrChkMaxOutputsHeight.Size = New System.Drawing.Size(294, 51) + Me.ucrChkMaxOutputsHeight.Size = New System.Drawing.Size(196, 34) Me.ucrChkMaxOutputsHeight.TabIndex = 28 ' 'ucrChkShowRCommandsinOutputWindow ' Me.ucrChkShowRCommandsinOutputWindow.AutoSize = True Me.ucrChkShowRCommandsinOutputWindow.Checked = False - Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(15, 240) - Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(10, 160) + Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkShowRCommandsinOutputWindow.Name = "ucrChkShowRCommandsinOutputWindow" - Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(406, 51) + Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(271, 34) Me.ucrChkShowRCommandsinOutputWindow.TabIndex = 27 ' 'ucrChkIncludeCommentsbyDefault ' Me.ucrChkIncludeCommentsbyDefault.AutoSize = True Me.ucrChkIncludeCommentsbyDefault.Checked = False - Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(15, 202) - Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(10, 135) + Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkIncludeCommentsbyDefault.Name = "ucrChkIncludeCommentsbyDefault" - Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(406, 51) + Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(271, 34) Me.ucrChkIncludeCommentsbyDefault.TabIndex = 26 ' 'grpROptions @@ -497,11 +479,9 @@ Partial Class dlgOptions Me.grpROptions.Controls.Add(Me.ucrChkShowSignifStars) Me.grpROptions.Controls.Add(Me.ucrNudDigits) Me.grpROptions.Controls.Add(Me.lblNoDigits) - Me.grpROptions.Location = New System.Drawing.Point(15, 288) - Me.grpROptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpROptions.Location = New System.Drawing.Point(10, 192) Me.grpROptions.Name = "grpROptions" - Me.grpROptions.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.grpROptions.Size = New System.Drawing.Size(406, 140) + Me.grpROptions.Size = New System.Drawing.Size(271, 93) Me.grpROptions.TabIndex = 25 Me.grpROptions.TabStop = False Me.grpROptions.Text = "R Options" @@ -510,10 +490,10 @@ Partial Class dlgOptions ' Me.ucrChkShowSignifStars.AutoSize = True Me.ucrChkShowSignifStars.Checked = False - Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(10, 74) - Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(7, 49) + Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkShowSignifStars.Name = "ucrChkShowSignifStars" - Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(382, 51) + Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(255, 34) Me.ucrChkShowSignifStars.TabIndex = 28 ' 'ucrNudDigits @@ -521,22 +501,21 @@ Partial Class dlgOptions Me.ucrNudDigits.AutoSize = True Me.ucrNudDigits.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDigits.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDigits.Location = New System.Drawing.Point(266, 34) - Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudDigits.Location = New System.Drawing.Point(177, 23) + Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudDigits.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudDigits.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDigits.Name = "ucrNudDigits" - Me.ucrNudDigits.Size = New System.Drawing.Size(75, 30) + Me.ucrNudDigits.Size = New System.Drawing.Size(50, 20) Me.ucrNudDigits.TabIndex = 27 Me.ucrNudDigits.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblNoDigits ' Me.lblNoDigits.AutoSize = True - Me.lblNoDigits.Location = New System.Drawing.Point(9, 34) - Me.lblNoDigits.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblNoDigits.Location = New System.Drawing.Point(6, 23) Me.lblNoDigits.Name = "lblNoDigits" - Me.lblNoDigits.Size = New System.Drawing.Size(204, 20) + Me.lblNoDigits.Size = New System.Drawing.Size(137, 13) Me.lblNoDigits.TabIndex = 1 Me.lblNoDigits.Text = "Number of Digits to Display:" ' @@ -553,48 +532,43 @@ Partial Class dlgOptions Me.pnFormatOptions.Controls.Add(Me.lblOutputFormat) Me.pnFormatOptions.Controls.Add(Me.cmdCommentFormat) Me.pnFormatOptions.Controls.Add(Me.lblCommandFormat) - Me.pnFormatOptions.Location = New System.Drawing.Point(15, 15) - Me.pnFormatOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnFormatOptions.Location = New System.Drawing.Point(10, 10) Me.pnFormatOptions.Name = "pnFormatOptions" - Me.pnFormatOptions.Size = New System.Drawing.Size(586, 175) + Me.pnFormatOptions.Size = New System.Drawing.Size(391, 118) Me.pnFormatOptions.TabIndex = 21 ' 'rtbCommentPreview ' - Me.rtbCommentPreview.Location = New System.Drawing.Point(186, 134) - Me.rtbCommentPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rtbCommentPreview.Location = New System.Drawing.Point(124, 89) Me.rtbCommentPreview.Name = "rtbCommentPreview" Me.rtbCommentPreview.ReadOnly = True - Me.rtbCommentPreview.Size = New System.Drawing.Size(218, 37) + Me.rtbCommentPreview.Size = New System.Drawing.Size(147, 26) Me.rtbCommentPreview.TabIndex = 22 Me.rtbCommentPreview.Text = "" ' 'rtbOutputPreview ' - Me.rtbOutputPreview.Location = New System.Drawing.Point(186, 74) - Me.rtbOutputPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rtbOutputPreview.Location = New System.Drawing.Point(124, 49) Me.rtbOutputPreview.Name = "rtbOutputPreview" Me.rtbOutputPreview.ReadOnly = True - Me.rtbOutputPreview.Size = New System.Drawing.Size(218, 37) + Me.rtbOutputPreview.Size = New System.Drawing.Size(147, 26) Me.rtbOutputPreview.TabIndex = 21 Me.rtbOutputPreview.Text = "" ' 'rtbCommandPreview ' - Me.rtbCommandPreview.Location = New System.Drawing.Point(186, 14) - Me.rtbCommandPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rtbCommandPreview.Location = New System.Drawing.Point(124, 9) Me.rtbCommandPreview.Name = "rtbCommandPreview" Me.rtbCommandPreview.ReadOnly = True - Me.rtbCommandPreview.Size = New System.Drawing.Size(218, 37) + Me.rtbCommandPreview.Size = New System.Drawing.Size(147, 26) Me.rtbCommandPreview.TabIndex = 20 Me.rtbCommandPreview.Text = "" ' 'cmdCommandFormat ' - Me.cmdCommandFormat.Location = New System.Drawing.Point(432, 14) - Me.cmdCommandFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCommandFormat.Location = New System.Drawing.Point(288, 9) Me.cmdCommandFormat.Name = "cmdCommandFormat" - Me.cmdCommandFormat.Size = New System.Drawing.Size(150, 34) + Me.cmdCommandFormat.Size = New System.Drawing.Size(100, 23) Me.cmdCommandFormat.TabIndex = 10 Me.cmdCommandFormat.Text = "Change..." Me.cmdCommandFormat.UseVisualStyleBackColor = True @@ -602,19 +576,17 @@ Partial Class dlgOptions 'lblCommentFormat ' Me.lblCommentFormat.AutoSize = True - Me.lblCommentFormat.Location = New System.Drawing.Point(6, 141) - Me.lblCommentFormat.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCommentFormat.Location = New System.Drawing.Point(4, 94) Me.lblCommentFormat.Name = "lblCommentFormat" - Me.lblCommentFormat.Size = New System.Drawing.Size(137, 20) + Me.lblCommentFormat.Size = New System.Drawing.Size(89, 13) Me.lblCommentFormat.TabIndex = 19 Me.lblCommentFormat.Text = "Comment Format:" ' 'cmdOutputFormat ' - Me.cmdOutputFormat.Location = New System.Drawing.Point(432, 74) - Me.cmdOutputFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdOutputFormat.Location = New System.Drawing.Point(288, 49) Me.cmdOutputFormat.Name = "cmdOutputFormat" - Me.cmdOutputFormat.Size = New System.Drawing.Size(150, 34) + Me.cmdOutputFormat.Size = New System.Drawing.Size(100, 23) Me.cmdOutputFormat.TabIndex = 16 Me.cmdOutputFormat.Text = "Change..." Me.cmdOutputFormat.UseVisualStyleBackColor = True @@ -622,19 +594,17 @@ Partial Class dlgOptions 'lblOutputFormat ' Me.lblOutputFormat.AutoSize = True - Me.lblOutputFormat.Location = New System.Drawing.Point(6, 81) - Me.lblOutputFormat.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblOutputFormat.Location = New System.Drawing.Point(4, 54) Me.lblOutputFormat.Name = "lblOutputFormat" - Me.lblOutputFormat.Size = New System.Drawing.Size(117, 20) + Me.lblOutputFormat.Size = New System.Drawing.Size(77, 13) Me.lblOutputFormat.TabIndex = 18 Me.lblOutputFormat.Text = "Output Format:" ' 'cmdCommentFormat ' - Me.cmdCommentFormat.Location = New System.Drawing.Point(432, 134) - Me.cmdCommentFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCommentFormat.Location = New System.Drawing.Point(288, 89) Me.cmdCommentFormat.Name = "cmdCommentFormat" - Me.cmdCommentFormat.Size = New System.Drawing.Size(150, 34) + Me.cmdCommentFormat.Size = New System.Drawing.Size(100, 23) Me.cmdCommentFormat.TabIndex = 16 Me.cmdCommentFormat.Text = "Change..." Me.cmdCommentFormat.UseVisualStyleBackColor = True @@ -642,21 +612,19 @@ Partial Class dlgOptions 'lblCommandFormat ' Me.lblCommandFormat.AutoSize = True - Me.lblCommandFormat.Location = New System.Drawing.Point(6, 21) - Me.lblCommandFormat.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCommandFormat.Location = New System.Drawing.Point(4, 14) Me.lblCommandFormat.Name = "lblCommandFormat" - Me.lblCommandFormat.Size = New System.Drawing.Size(141, 20) + Me.lblCommandFormat.Size = New System.Drawing.Size(92, 13) Me.lblCommandFormat.TabIndex = 17 Me.lblCommandFormat.Text = "Command Format:" ' 'tbpEditor ' Me.tbpEditor.Controls.Add(Me.pnFormatEditor) - Me.tbpEditor.Location = New System.Drawing.Point(4, 29) - Me.tbpEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpEditor.Location = New System.Drawing.Point(4, 22) Me.tbpEditor.Name = "tbpEditor" - Me.tbpEditor.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpEditor.Size = New System.Drawing.Size(850, 443) + Me.tbpEditor.Padding = New System.Windows.Forms.Padding(3) + Me.tbpEditor.Size = New System.Drawing.Size(564, 291) Me.tbpEditor.TabIndex = 10 Me.tbpEditor.Text = "Editor Window" Me.tbpEditor.ToolTipText = "Data View" @@ -668,18 +636,16 @@ Partial Class dlgOptions Me.pnFormatEditor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnFormatEditor.Controls.Add(Me.cmdEditorFont) Me.pnFormatEditor.Controls.Add(Me.lblFont) - Me.pnFormatEditor.Location = New System.Drawing.Point(15, 15) - Me.pnFormatEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnFormatEditor.Location = New System.Drawing.Point(10, 10) Me.pnFormatEditor.Name = "pnFormatEditor" - Me.pnFormatEditor.Size = New System.Drawing.Size(318, 41) + Me.pnFormatEditor.Size = New System.Drawing.Size(212, 28) Me.pnFormatEditor.TabIndex = 22 ' 'cmdEditorFont ' - Me.cmdEditorFont.Location = New System.Drawing.Point(164, 3) - Me.cmdEditorFont.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdEditorFont.Location = New System.Drawing.Point(109, 2) Me.cmdEditorFont.Name = "cmdEditorFont" - Me.cmdEditorFont.Size = New System.Drawing.Size(150, 34) + Me.cmdEditorFont.Size = New System.Drawing.Size(100, 23) Me.cmdEditorFont.TabIndex = 10 Me.cmdEditorFont.Text = "Change..." Me.cmdEditorFont.UseVisualStyleBackColor = True @@ -687,10 +653,9 @@ Partial Class dlgOptions 'lblFont ' Me.lblFont.AutoSize = True - Me.lblFont.Location = New System.Drawing.Point(6, 10) - Me.lblFont.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFont.Location = New System.Drawing.Point(4, 7) Me.lblFont.Name = "lblFont" - Me.lblFont.Size = New System.Drawing.Size(101, 20) + Me.lblFont.Size = New System.Drawing.Size(66, 13) Me.lblFont.TabIndex = 17 Me.lblFont.Text = "Format Font:" ' @@ -700,11 +665,10 @@ Partial Class dlgOptions Me.tbpCommands.Controls.Add(Me.ucrChkShowWaitDialog) Me.tbpCommands.Controls.Add(Me.ucrNudWaitSeconds) Me.tbpCommands.Controls.Add(Me.ucrChkIncludeDefaultParams) - Me.tbpCommands.Location = New System.Drawing.Point(4, 29) - Me.tbpCommands.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpCommands.Location = New System.Drawing.Point(4, 22) Me.tbpCommands.Name = "tbpCommands" - Me.tbpCommands.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpCommands.Size = New System.Drawing.Size(850, 443) + Me.tbpCommands.Padding = New System.Windows.Forms.Padding(3) + Me.tbpCommands.Size = New System.Drawing.Size(564, 291) Me.tbpCommands.TabIndex = 4 Me.tbpCommands.Tag = "Commands" Me.tbpCommands.Text = "Commands" @@ -713,10 +677,9 @@ Partial Class dlgOptions 'lblWaitSeconds ' Me.lblWaitSeconds.AutoSize = True - Me.lblWaitSeconds.Location = New System.Drawing.Point(604, 69) - Me.lblWaitSeconds.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblWaitSeconds.Location = New System.Drawing.Point(403, 46) Me.lblWaitSeconds.Name = "lblWaitSeconds" - Me.lblWaitSeconds.Size = New System.Drawing.Size(69, 20) + Me.lblWaitSeconds.Size = New System.Drawing.Size(47, 13) Me.lblWaitSeconds.TabIndex = 8 Me.lblWaitSeconds.Text = "seconds" ' @@ -724,10 +687,10 @@ Partial Class dlgOptions ' Me.ucrChkShowWaitDialog.AutoSize = True Me.ucrChkShowWaitDialog.Checked = False - Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(9, 70) - Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(6, 47) + Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkShowWaitDialog.Name = "ucrChkShowWaitDialog" - Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(506, 51) + Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(337, 34) Me.ucrChkShowWaitDialog.TabIndex = 6 ' 'ucrNudWaitSeconds @@ -735,12 +698,12 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds.AutoSize = True Me.ucrNudWaitSeconds.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWaitSeconds.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWaitSeconds.Location = New System.Drawing.Point(524, 68) - Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudWaitSeconds.Location = New System.Drawing.Point(349, 45) + Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudWaitSeconds.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWaitSeconds.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWaitSeconds.Name = "ucrNudWaitSeconds" - Me.ucrNudWaitSeconds.Size = New System.Drawing.Size(75, 30) + Me.ucrNudWaitSeconds.Size = New System.Drawing.Size(50, 20) Me.ucrNudWaitSeconds.TabIndex = 5 Me.ucrNudWaitSeconds.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -748,10 +711,10 @@ Partial Class dlgOptions ' Me.ucrChkIncludeDefaultParams.AutoSize = True Me.ucrChkIncludeDefaultParams.Checked = False - Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(9, 30) - Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(6, 20) + Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkIncludeDefaultParams.Name = "ucrChkIncludeDefaultParams" - Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(597, 51) + Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(398, 34) Me.ucrChkIncludeDefaultParams.TabIndex = 3 ' 'tbpDataView @@ -765,11 +728,10 @@ Partial Class dlgOptions Me.tbpDataView.Controls.Add(Me.lblMaxCols) Me.tbpDataView.Controls.Add(Me.ucrNudMaxRows) Me.tbpDataView.Controls.Add(Me.lblMaxRows) - Me.tbpDataView.Location = New System.Drawing.Point(4, 29) - Me.tbpDataView.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpDataView.Location = New System.Drawing.Point(4, 22) Me.tbpDataView.Name = "tbpDataView" - Me.tbpDataView.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpDataView.Size = New System.Drawing.Size(850, 443) + Me.tbpDataView.Padding = New System.Windows.Forms.Padding(3) + Me.tbpDataView.Size = New System.Drawing.Size(564, 291) Me.tbpDataView.TabIndex = 9 Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True @@ -777,20 +739,18 @@ Partial Class dlgOptions 'lblEvery ' Me.lblEvery.AutoSize = True - Me.lblEvery.Location = New System.Drawing.Point(356, 164) - Me.lblEvery.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEvery.Location = New System.Drawing.Point(220, 115) Me.lblEvery.Name = "lblEvery" - Me.lblEvery.Size = New System.Drawing.Size(46, 20) + Me.lblEvery.Size = New System.Drawing.Size(33, 13) Me.lblEvery.TabIndex = 4 Me.lblEvery.Text = "every" ' 'lblMinutes ' Me.lblMinutes.AutoSize = True - Me.lblMinutes.Location = New System.Drawing.Point(516, 164) - Me.lblMinutes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinutes.Location = New System.Drawing.Point(340, 115) Me.lblMinutes.Name = "lblMinutes" - Me.lblMinutes.Size = New System.Drawing.Size(65, 20) + Me.lblMinutes.Size = New System.Drawing.Size(43, 13) Me.lblMinutes.TabIndex = 4 Me.lblMinutes.Text = "minutes" ' @@ -798,20 +758,20 @@ Partial Class dlgOptions ' Me.ucrChkAutoSave.AutoSize = True Me.ucrChkAutoSave.Checked = False - Me.ucrChkAutoSave.Location = New System.Drawing.Point(20, 162) - Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkAutoSave.Location = New System.Drawing.Point(13, 114) + Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkAutoSave.Name = "ucrChkAutoSave" - Me.ucrChkAutoSave.Size = New System.Drawing.Size(326, 51) + Me.ucrChkAutoSave.Size = New System.Drawing.Size(217, 34) Me.ucrChkAutoSave.TabIndex = 3 ' 'ucrChkShowDataonGrid ' Me.ucrChkShowDataonGrid.AutoSize = True Me.ucrChkShowDataonGrid.Checked = False - Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(20, 117) - Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(13, 78) + Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkShowDataonGrid.Name = "ucrChkShowDataonGrid" - Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(590, 51) + Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(393, 34) Me.ucrChkShowDataonGrid.TabIndex = 3 ' 'ucrNudAutoSaveMinutes @@ -819,12 +779,12 @@ Partial Class dlgOptions Me.ucrNudAutoSaveMinutes.AutoSize = True Me.ucrNudAutoSaveMinutes.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAutoSaveMinutes.Location = New System.Drawing.Point(432, 159) - Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudAutoSaveMinutes.Location = New System.Drawing.Point(268, 112) + Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudAutoSaveMinutes.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Name = "ucrNudAutoSaveMinutes" - Me.ucrNudAutoSaveMinutes.Size = New System.Drawing.Size(75, 30) + Me.ucrNudAutoSaveMinutes.Size = New System.Drawing.Size(50, 20) Me.ucrNudAutoSaveMinutes.TabIndex = 2 Me.ucrNudAutoSaveMinutes.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -833,22 +793,21 @@ Partial Class dlgOptions Me.ucrNudMaxCols.AutoSize = True Me.ucrNudMaxCols.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxCols.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxCols.Location = New System.Drawing.Point(402, 62) - Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudMaxCols.Location = New System.Drawing.Point(268, 41) + Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudMaxCols.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxCols.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxCols.Name = "ucrNudMaxCols" - Me.ucrNudMaxCols.Size = New System.Drawing.Size(75, 30) + Me.ucrNudMaxCols.Size = New System.Drawing.Size(50, 20) Me.ucrNudMaxCols.TabIndex = 2 Me.ucrNudMaxCols.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblMaxCols ' Me.lblMaxCols.AutoSize = True - Me.lblMaxCols.Location = New System.Drawing.Point(15, 66) - Me.lblMaxCols.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxCols.Location = New System.Drawing.Point(10, 44) Me.lblMaxCols.Name = "lblMaxCols" - Me.lblMaxCols.Size = New System.Drawing.Size(297, 20) + Me.lblMaxCols.Size = New System.Drawing.Size(198, 13) Me.lblMaxCols.TabIndex = 1 Me.lblMaxCols.Text = "Maximum Number of Columns to Display:" ' @@ -857,22 +816,21 @@ Partial Class dlgOptions Me.ucrNudMaxRows.AutoSize = True Me.ucrNudMaxRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxRows.Location = New System.Drawing.Point(402, 22) - Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudMaxRows.Location = New System.Drawing.Point(268, 15) + Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(5) Me.ucrNudMaxRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxRows.Name = "ucrNudMaxRows" - Me.ucrNudMaxRows.Size = New System.Drawing.Size(75, 30) + Me.ucrNudMaxRows.Size = New System.Drawing.Size(50, 20) Me.ucrNudMaxRows.TabIndex = 2 Me.ucrNudMaxRows.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblMaxRows ' Me.lblMaxRows.AutoSize = True - Me.lblMaxRows.Location = New System.Drawing.Point(15, 27) - Me.lblMaxRows.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxRows.Location = New System.Drawing.Point(10, 18) Me.lblMaxRows.Name = "lblMaxRows" - Me.lblMaxRows.Size = New System.Drawing.Size(275, 20) + Me.lblMaxRows.Size = New System.Drawing.Size(185, 13) Me.lblMaxRows.TabIndex = 1 Me.lblMaxRows.Text = "Maximum Number of Rows to Display:" ' @@ -881,21 +839,19 @@ Partial Class dlgOptions Me.tbpWorkingDirectory.Controls.Add(Me.cmdWorkingDirectory) Me.tbpWorkingDirectory.Controls.Add(Me.lblWorkingDirectory) Me.tbpWorkingDirectory.Controls.Add(Me.ucrWorkingDirectory) - Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 29) - Me.tbpWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 22) Me.tbpWorkingDirectory.Name = "tbpWorkingDirectory" - Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpWorkingDirectory.Size = New System.Drawing.Size(850, 443) + Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(3) + Me.tbpWorkingDirectory.Size = New System.Drawing.Size(564, 291) Me.tbpWorkingDirectory.TabIndex = 11 Me.tbpWorkingDirectory.Text = "Working Directory" Me.tbpWorkingDirectory.UseVisualStyleBackColor = True ' 'cmdWorkingDirectory ' - Me.cmdWorkingDirectory.Location = New System.Drawing.Point(598, 24) - Me.cmdWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdWorkingDirectory.Location = New System.Drawing.Point(399, 16) Me.cmdWorkingDirectory.Name = "cmdWorkingDirectory" - Me.cmdWorkingDirectory.Size = New System.Drawing.Size(36, 32) + Me.cmdWorkingDirectory.Size = New System.Drawing.Size(24, 21) Me.cmdWorkingDirectory.TabIndex = 2 Me.cmdWorkingDirectory.Text = "..." Me.cmdWorkingDirectory.UseVisualStyleBackColor = True @@ -903,10 +859,9 @@ Partial Class dlgOptions 'lblWorkingDirectory ' Me.lblWorkingDirectory.AutoSize = True - Me.lblWorkingDirectory.Location = New System.Drawing.Point(20, 30) - Me.lblWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblWorkingDirectory.Location = New System.Drawing.Point(13, 20) Me.lblWorkingDirectory.Name = "lblWorkingDirectory" - Me.lblWorkingDirectory.Size = New System.Drawing.Size(138, 20) + Me.lblWorkingDirectory.Size = New System.Drawing.Size(95, 13) Me.lblWorkingDirectory.TabIndex = 0 Me.lblWorkingDirectory.Text = "Working Directory:" ' @@ -916,10 +871,10 @@ Partial Class dlgOptions Me.ucrWorkingDirectory.AutoSize = True Me.ucrWorkingDirectory.IsMultiline = False Me.ucrWorkingDirectory.IsReadOnly = False - Me.ucrWorkingDirectory.Location = New System.Drawing.Point(207, 26) - Me.ucrWorkingDirectory.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrWorkingDirectory.Location = New System.Drawing.Point(138, 17) + Me.ucrWorkingDirectory.Margin = New System.Windows.Forms.Padding(6) Me.ucrWorkingDirectory.Name = "ucrWorkingDirectory" - Me.ucrWorkingDirectory.Size = New System.Drawing.Size(382, 32) + Me.ucrWorkingDirectory.Size = New System.Drawing.Size(255, 21) Me.ucrWorkingDirectory.TabIndex = 1 ' 'tbpGraphDisplay @@ -928,11 +883,10 @@ Partial Class dlgOptions Me.tbpGraphDisplay.Controls.Add(Me.rdoDisplayinRViewer) Me.tbpGraphDisplay.Controls.Add(Me.rdoDisplayinOutputWindow) Me.tbpGraphDisplay.Controls.Add(Me.ucrPnlGraphDisplay) - Me.tbpGraphDisplay.Location = New System.Drawing.Point(4, 29) - Me.tbpGraphDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpGraphDisplay.Location = New System.Drawing.Point(4, 22) Me.tbpGraphDisplay.Name = "tbpGraphDisplay" - Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpGraphDisplay.Size = New System.Drawing.Size(850, 443) + Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(3) + Me.tbpGraphDisplay.Size = New System.Drawing.Size(564, 291) Me.tbpGraphDisplay.TabIndex = 12 Me.tbpGraphDisplay.Text = "Graph Display" Me.tbpGraphDisplay.UseVisualStyleBackColor = True @@ -941,10 +895,9 @@ Partial Class dlgOptions ' Me.rdoDisplayinSeparateWindows.AutoSize = True Me.rdoDisplayinSeparateWindows.Checked = True - Me.rdoDisplayinSeparateWindows.Location = New System.Drawing.Point(9, 78) - Me.rdoDisplayinSeparateWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoDisplayinSeparateWindows.Location = New System.Drawing.Point(6, 52) Me.rdoDisplayinSeparateWindows.Name = "rdoDisplayinSeparateWindows" - Me.rdoDisplayinSeparateWindows.Size = New System.Drawing.Size(239, 24) + Me.rdoDisplayinSeparateWindows.Size = New System.Drawing.Size(163, 17) Me.rdoDisplayinSeparateWindows.TabIndex = 1 Me.rdoDisplayinSeparateWindows.TabStop = True Me.rdoDisplayinSeparateWindows.Text = "Display in Separate Windows" @@ -953,10 +906,9 @@ Partial Class dlgOptions 'rdoDisplayinRViewer ' Me.rdoDisplayinRViewer.AutoSize = True - Me.rdoDisplayinRViewer.Location = New System.Drawing.Point(9, 44) - Me.rdoDisplayinRViewer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoDisplayinRViewer.Location = New System.Drawing.Point(6, 29) Me.rdoDisplayinRViewer.Name = "rdoDisplayinRViewer" - Me.rdoDisplayinRViewer.Size = New System.Drawing.Size(169, 24) + Me.rdoDisplayinRViewer.Size = New System.Drawing.Size(116, 17) Me.rdoDisplayinRViewer.TabIndex = 1 Me.rdoDisplayinRViewer.Text = "Display in R Viewer" Me.rdoDisplayinRViewer.UseVisualStyleBackColor = True @@ -964,10 +916,9 @@ Partial Class dlgOptions 'rdoDisplayinOutputWindow ' Me.rdoDisplayinOutputWindow.AutoSize = True - Me.rdoDisplayinOutputWindow.Location = New System.Drawing.Point(9, 9) - Me.rdoDisplayinOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoDisplayinOutputWindow.Location = New System.Drawing.Point(6, 6) Me.rdoDisplayinOutputWindow.Name = "rdoDisplayinOutputWindow" - Me.rdoDisplayinOutputWindow.Size = New System.Drawing.Size(214, 24) + Me.rdoDisplayinOutputWindow.Size = New System.Drawing.Size(147, 17) Me.rdoDisplayinOutputWindow.TabIndex = 1 Me.rdoDisplayinOutputWindow.Text = "Display in Output Window" Me.rdoDisplayinOutputWindow.UseVisualStyleBackColor = True @@ -975,10 +926,10 @@ Partial Class dlgOptions 'ucrPnlGraphDisplay ' Me.ucrPnlGraphDisplay.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 4) - Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 3) + Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(5) Me.ucrPnlGraphDisplay.Name = "ucrPnlGraphDisplay" - Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(548, 99) + Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(365, 66) Me.ucrPnlGraphDisplay.TabIndex = 3 ' 'tbpTailoredMenus @@ -987,11 +938,10 @@ Partial Class dlgOptions Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewOptionsByContextMenu) Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewProcurementMenu) Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewClimaticMenu) - Me.tbpTailoredMenus.Location = New System.Drawing.Point(4, 29) - Me.tbpTailoredMenus.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpTailoredMenus.Location = New System.Drawing.Point(4, 22) Me.tbpTailoredMenus.Name = "tbpTailoredMenus" - Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpTailoredMenus.Size = New System.Drawing.Size(850, 443) + Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(3) + Me.tbpTailoredMenus.Size = New System.Drawing.Size(564, 291) Me.tbpTailoredMenus.TabIndex = 13 Me.tbpTailoredMenus.Text = "Tailored Menus" Me.tbpTailoredMenus.UseVisualStyleBackColor = True @@ -1000,40 +950,40 @@ Partial Class dlgOptions ' Me.ucrChkViewStructuredMenu.AutoSize = True Me.ucrChkViewStructuredMenu.Checked = False - Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(10, 18) - Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(7, 12) + Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkViewStructuredMenu.Name = "ucrChkViewStructuredMenu" - Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(567, 51) + Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(378, 34) Me.ucrChkViewStructuredMenu.TabIndex = 2 ' 'ucrChkViewOptionsByContextMenu ' Me.ucrChkViewOptionsByContextMenu.AutoSize = True Me.ucrChkViewOptionsByContextMenu.Checked = False - Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(10, 135) - Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(7, 137) + Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkViewOptionsByContextMenu.Name = "ucrChkViewOptionsByContextMenu" - Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(620, 51) + Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(413, 34) Me.ucrChkViewOptionsByContextMenu.TabIndex = 1 ' 'ucrChkViewProcurementMenu ' Me.ucrChkViewProcurementMenu.AutoSize = True Me.ucrChkViewProcurementMenu.Checked = False - Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(10, 96) - Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(7, 95) + Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkViewProcurementMenu.Name = "ucrChkViewProcurementMenu" - Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(620, 51) + Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(413, 34) Me.ucrChkViewProcurementMenu.TabIndex = 0 ' 'ucrChkViewClimaticMenu ' Me.ucrChkViewClimaticMenu.AutoSize = True Me.ucrChkViewClimaticMenu.Checked = False - Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(10, 57) - Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(7, 53) + Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkViewClimaticMenu.Name = "ucrChkViewClimaticMenu" - Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(610, 51) + Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(407, 34) Me.ucrChkViewClimaticMenu.TabIndex = 0 ' 'tbpClimsoft @@ -1046,11 +996,10 @@ Partial Class dlgOptions Me.tbpClimsoft.Controls.Add(Me.ucrInputPort) Me.tbpClimsoft.Controls.Add(Me.ucrInputHost) Me.tbpClimsoft.Controls.Add(Me.ucrInputDatabaseName) - Me.tbpClimsoft.Location = New System.Drawing.Point(4, 29) - Me.tbpClimsoft.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpClimsoft.Location = New System.Drawing.Point(4, 22) Me.tbpClimsoft.Name = "tbpClimsoft" - Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.tbpClimsoft.Size = New System.Drawing.Size(850, 443) + Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(3) + Me.tbpClimsoft.Size = New System.Drawing.Size(564, 291) Me.tbpClimsoft.TabIndex = 14 Me.tbpClimsoft.Text = "Climsoft" Me.tbpClimsoft.UseVisualStyleBackColor = True @@ -1059,10 +1008,9 @@ Partial Class dlgOptions ' Me.lblUserName.AutoSize = True Me.lblUserName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblUserName.Location = New System.Drawing.Point(9, 154) - Me.lblUserName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblUserName.Location = New System.Drawing.Point(6, 103) Me.lblUserName.Name = "lblUserName" - Me.lblUserName.Size = New System.Drawing.Size(87, 20) + Me.lblUserName.Size = New System.Drawing.Size(58, 13) Me.lblUserName.TabIndex = 19 Me.lblUserName.Text = "Username:" ' @@ -1070,10 +1018,9 @@ Partial Class dlgOptions ' Me.lblPort.AutoSize = True Me.lblPort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPort.Location = New System.Drawing.Point(9, 114) - Me.lblPort.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblPort.Location = New System.Drawing.Point(6, 76) Me.lblPort.Name = "lblPort" - Me.lblPort.Size = New System.Drawing.Size(42, 20) + Me.lblPort.Size = New System.Drawing.Size(29, 13) Me.lblPort.TabIndex = 18 Me.lblPort.Text = "Port:" ' @@ -1081,10 +1028,9 @@ Partial Class dlgOptions ' Me.lblHost.AutoSize = True Me.lblHost.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHost.Location = New System.Drawing.Point(9, 74) - Me.lblHost.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblHost.Location = New System.Drawing.Point(6, 49) Me.lblHost.Name = "lblHost" - Me.lblHost.Size = New System.Drawing.Size(47, 20) + Me.lblHost.Size = New System.Drawing.Size(32, 13) Me.lblHost.TabIndex = 17 Me.lblHost.Text = "Host:" ' @@ -1092,10 +1038,9 @@ Partial Class dlgOptions ' Me.lblDatabaseName.AutoSize = True Me.lblDatabaseName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDatabaseName.Location = New System.Drawing.Point(9, 32) - Me.lblDatabaseName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDatabaseName.Location = New System.Drawing.Point(6, 21) Me.lblDatabaseName.Name = "lblDatabaseName" - Me.lblDatabaseName.Size = New System.Drawing.Size(129, 20) + Me.lblDatabaseName.Size = New System.Drawing.Size(87, 13) Me.lblDatabaseName.TabIndex = 16 Me.lblDatabaseName.Text = "Database Name:" ' @@ -1105,10 +1050,10 @@ Partial Class dlgOptions Me.ucrInputUserName.AutoSize = True Me.ucrInputUserName.IsMultiline = False Me.ucrInputUserName.IsReadOnly = False - Me.ucrInputUserName.Location = New System.Drawing.Point(252, 144) - Me.ucrInputUserName.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputUserName.Location = New System.Drawing.Point(168, 96) + Me.ucrInputUserName.Margin = New System.Windows.Forms.Padding(6) Me.ucrInputUserName.Name = "ucrInputUserName" - Me.ucrInputUserName.Size = New System.Drawing.Size(206, 32) + Me.ucrInputUserName.Size = New System.Drawing.Size(137, 21) Me.ucrInputUserName.TabIndex = 15 ' 'ucrInputPort @@ -1117,10 +1062,10 @@ Partial Class dlgOptions Me.ucrInputPort.AutoSize = True Me.ucrInputPort.IsMultiline = False Me.ucrInputPort.IsReadOnly = False - Me.ucrInputPort.Location = New System.Drawing.Point(252, 104) - Me.ucrInputPort.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputPort.Location = New System.Drawing.Point(168, 69) + Me.ucrInputPort.Margin = New System.Windows.Forms.Padding(6) Me.ucrInputPort.Name = "ucrInputPort" - Me.ucrInputPort.Size = New System.Drawing.Size(206, 32) + Me.ucrInputPort.Size = New System.Drawing.Size(137, 21) Me.ucrInputPort.TabIndex = 14 ' 'ucrInputHost @@ -1129,10 +1074,10 @@ Partial Class dlgOptions Me.ucrInputHost.AutoSize = True Me.ucrInputHost.IsMultiline = False Me.ucrInputHost.IsReadOnly = False - Me.ucrInputHost.Location = New System.Drawing.Point(252, 64) - Me.ucrInputHost.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputHost.Location = New System.Drawing.Point(168, 43) + Me.ucrInputHost.Margin = New System.Windows.Forms.Padding(6) Me.ucrInputHost.Name = "ucrInputHost" - Me.ucrInputHost.Size = New System.Drawing.Size(206, 32) + Me.ucrInputHost.Size = New System.Drawing.Size(137, 21) Me.ucrInputHost.TabIndex = 13 ' 'ucrInputDatabaseName @@ -1141,19 +1086,20 @@ Partial Class dlgOptions Me.ucrInputDatabaseName.AutoSize = True Me.ucrInputDatabaseName.IsMultiline = False Me.ucrInputDatabaseName.IsReadOnly = False - Me.ucrInputDatabaseName.Location = New System.Drawing.Point(252, 26) - Me.ucrInputDatabaseName.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputDatabaseName.Location = New System.Drawing.Point(168, 17) + Me.ucrInputDatabaseName.Margin = New System.Windows.Forms.Padding(6) Me.ucrInputDatabaseName.Name = "ucrInputDatabaseName" - Me.ucrInputDatabaseName.Size = New System.Drawing.Size(206, 32) + Me.ucrInputDatabaseName.Size = New System.Drawing.Size(137, 21) Me.ucrInputDatabaseName.TabIndex = 12 ' 'tbpWebsite ' Me.tbpWebsite.Controls.Add(Me.ucrChkReminder) - Me.tbpWebsite.Location = New System.Drawing.Point(4, 29) + Me.tbpWebsite.Location = New System.Drawing.Point(4, 22) + Me.tbpWebsite.Margin = New System.Windows.Forms.Padding(2) Me.tbpWebsite.Name = "tbpWebsite" - Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(3) - Me.tbpWebsite.Size = New System.Drawing.Size(850, 443) + Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(2) + Me.tbpWebsite.Size = New System.Drawing.Size(564, 291) Me.tbpWebsite.TabIndex = 15 Me.tbpWebsite.Text = "Website" Me.tbpWebsite.UseVisualStyleBackColor = True @@ -1162,18 +1108,18 @@ Partial Class dlgOptions ' Me.ucrChkReminder.AutoSize = True Me.ucrChkReminder.Checked = False - Me.ucrChkReminder.Location = New System.Drawing.Point(11, 33) - Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkReminder.Location = New System.Drawing.Point(7, 22) + Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkReminder.Name = "ucrChkReminder" - Me.ucrChkReminder.Size = New System.Drawing.Size(620, 51) + Me.ucrChkReminder.Size = New System.Drawing.Size(413, 34) Me.ucrChkReminder.TabIndex = 2 ' 'dlgOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(1155, 530) + Me.ClientSize = New System.Drawing.Size(770, 353) Me.Controls.Add(Me.cmdLanguage) Me.Controls.Add(Me.cmdApply) Me.Controls.Add(Me.cmdHelp) @@ -1181,7 +1127,6 @@ Partial Class dlgOptions Me.Controls.Add(Me.cmdOk) Me.Controls.Add(Me.spltControls) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgOptions" diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index ed9b34f1cd0..35cf301c8b7 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -428,7 +428,7 @@ Public Class dlgOptions ApplyEnabled(True) End Sub - Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged + Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged End Sub diff --git a/instat/dlgOptionsByContextBoxplot.vb b/instat/dlgOptionsByContextBoxplot.vb index 11b160cbab7..d13b34fa9fb 100644 --- a/instat/dlgOptionsByContextBoxplot.vb +++ b/instat/dlgOptionsByContextBoxplot.vb @@ -190,7 +190,7 @@ Public Class dlgOptionsByContextBoxplot ucrSavePlot.SetPrefix("boxplot") ucrSavePlot.SetIsComboBox() - ucrSavePlot.SetCheckBoxText("Save Graph") + ucrSavePlot.SetCheckBoxText("Store Graph") ucrSavePlot.SetSaveTypeAsGraph() ucrSavePlot.SetDataFrameSelector(ucrSelectorPlot.ucrAvailableDataFrames) ucrSavePlot.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgOptionsByContextFItModel.vb b/instat/dlgOptionsByContextFItModel.vb index 774413160bc..fea1db22d81 100644 --- a/instat/dlgOptionsByContextFItModel.vb +++ b/instat/dlgOptionsByContextFItModel.vb @@ -130,7 +130,7 @@ Public Class dlgOptionsByContextFitModel ucrSaveModel.SetPrefix("reg") ucrSaveModel.SetDataFrameSelector(ucrSelectorFitModel.ucrAvailableDataFrames) ucrSaveModel.SetSaveTypeAsModel() - ucrSaveModel.SetCheckBoxText("Save Model") + ucrSaveModel.SetCheckBoxText("Store Model") ucrSaveModel.SetIsComboBox() ucrSaveModel.SetAssignToIfUncheckedValue("last_model") diff --git a/instat/dlgOtherRosePlots.vb b/instat/dlgOtherRosePlots.vb index 2affd52a850..527cb0a03bf 100644 --- a/instat/dlgOtherRosePlots.vb +++ b/instat/dlgOtherRosePlots.vb @@ -168,7 +168,7 @@ Public Class dlgOtherRosePlots ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetSaveTypeAsGraph() - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetDataFrameSelector(ucrSelectorOtherRosePlots.ucrAvailableDataFrames) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgPICSARainfall.vb b/instat/dlgPICSARainfall.vb index f424bb2b746..9094cf90890 100644 --- a/instat/dlgPICSARainfall.vb +++ b/instat/dlgPICSARainfall.vb @@ -202,7 +202,7 @@ Public Class dlgPICSARainfall ucrSave.SetPrefix("picsa_rainfall_graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() - ucrSave.SetCheckBoxText("Save Graph") + ucrSave.SetCheckBoxText("Store Graph") ucrSave.SetDataFrameSelector(ucrSelectorPICSARainfall.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index 54210b80f68..b3cd4519c9b 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 @@ -145,7 +147,7 @@ Public Class dlgParallelCoordinatePlot ucrSaveGraph.SetPrefix("par_coord_plot") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") End Sub @@ -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/dlgPrincipalComponentAnalysis.vb b/instat/dlgPrincipalComponentAnalysis.vb index 72c94e4f904..c7e42e0917b 100644 --- a/instat/dlgPrincipalComponentAnalysis.vb +++ b/instat/dlgPrincipalComponentAnalysis.vb @@ -19,13 +19,14 @@ Public Class dlgPrincipalComponentAnalysis Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private bResetSubdialog As Boolean = False - Private clsPCAFunction, clsWhichQuantiSupFunction, clsWhichQualiSupFunction, clsColNamesQuantFunction, clsColNamesQualiFunction, clsSummaryFunction, clsGetColumnsFunction, clsCbindUniqueFunction, clsBindFunction As New RFunction + Private bResettingDialogue As Boolean = False + Private lstEditedVariables As New List(Of String) + Private clsPCAFunction, clsPCASummaryFuction, clsMatchFunction, clsMatch2Function, clsNamesFunction, clsSummaryFunction, clsGetColumnsFunction As New RFunction Private clsREigenValues, clsREigenVectors, clsRRotation, clsRRotationCoord, clsRRotationEig, clsDummyFunction As New RFunction Private clsRScreePlotFunction, clsRThemeMinimal, clsRVariablesPlotFunction, clsRVariablesPlotTheme, clsRIndividualsPlotFunction, clsRIndividualsPlotTheme, clsRBiplotFunction, clsRBiplotTheme, clsRBarPlotFunction As New RFunction Private clsRFactor, clsRMelt, clsRBarPlotGeom, clsRBarPlotAes, clsRBarPlotFacet, clsRVariablesPlotFunctionValue, clsRIndividualsFunctionValue, clsRBiplotFunctionValue As New RFunction Private clsRScreePlot, clsRVariablesPlot, clsRIndividualsPlot, clsRBiplot As New RSyntax - Private clsVars1ColumnsFunction, clsVars2ColumnsFunction As ROperator - Private clsRBarPlot, clsRBarPlot0, clsBaseOperator, clsBinaryQuantiSupOperator, clsBinaryQualitySupOperator As New ROperator + Private clsRBarPlot, clsRBarPlot0, clsBaseOperator As New ROperator ' call all classes in the sub dialog Private Sub dlgPrincipalComponentAnalysis_oad(sender As Object, e As EventArgs) Handles MyBase.Load @@ -45,7 +46,7 @@ Public Class dlgPrincipalComponentAnalysis Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 422 ucrSelectorPCA.SetParameter(New RParameter("data_name", 0)) - ucrSelectorPCA.SetParameterIsString() + ucrSelectorPCA.SetParameterIsrfunction() ucrBase.clsRsyntax.iCallType = 2 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False @@ -55,16 +56,15 @@ Public Class dlgPrincipalComponentAnalysis ucrReceiverMultiplePCA.Selector = ucrSelectorPCA ucrReceiverMultiplePCA.SetDataType("numeric", bStrict:=True) ucrReceiverMultiplePCA.SetMeAsReceiver() - ucrReceiverMultiplePCA.bExcludeFromSelector = True - ucrReceiverSuppNumeric.SetParameter(New RParameter("right", 1)) + ucrReceiverSuppNumeric.SetParameter(New RParameter("right", 1, bNewIncludeArgumentName:=False)) ucrReceiverSuppNumeric.SetParameterIsString() ucrReceiverSuppNumeric.Selector = ucrSelectorPCA ucrReceiverSuppNumeric.SetDataType("numeric") ucrReceiverSuppNumeric.SetLinkedDisplayControl(lblSupplNumeric) ucrReceiverSuppNumeric.bExcludeFromSelector = True - ucrReceiverSupplFactors.SetParameter(New RParameter("right", 1)) + ucrReceiverSupplFactors.SetParameter(New RParameter("right", 1, bNewIncludeArgumentName:=False)) ucrReceiverSupplFactors.SetParameterIsString() ucrReceiverSupplFactors.Selector = ucrSelectorPCA ucrReceiverSupplFactors.SetDataType("factor") @@ -89,13 +89,15 @@ Public Class dlgPrincipalComponentAnalysis ucrSaveResult.SetPrefix("pca") ucrSaveResult.SetSaveTypeAsModel() ucrSaveResult.SetDataFrameSelector(ucrSelectorPCA.ucrAvailableDataFrames) - ucrSaveResult.SetCheckBoxText("Save Result") + ucrSaveResult.SetCheckBoxText("Store Result") ucrSaveResult.SetIsComboBox() ucrSaveResult.SetAssignToIfUncheckedValue("last_model") + End Sub Private Sub SetDefaults() clsPCAFunction = New RFunction + clsPCASummaryFuction = New RFunction clsREigenVectors = New RFunction clsREigenValues = New RFunction clsRRotation = New RFunction @@ -125,18 +127,11 @@ Public Class dlgPrincipalComponentAnalysis clsRIndividualsFunctionValue = New RFunction clsRBiplotFunctionValue = New RFunction clsDummyFunction = New RFunction - clsColNamesQuantFunction = New RFunction - clsColNamesQualiFunction = New RFunction clsSummaryFunction = New RFunction clsGetColumnsFunction = New RFunction - clsCbindUniqueFunction = New RFunction - clsBindFunction = New RFunction - clsWhichQuantiSupFunction = New RFunction - clsWhichQualiSupFunction = New RFunction - clsVars1ColumnsFunction = New ROperator - clsVars2ColumnsFunction = New ROperator - clsBinaryQuantiSupOperator = New ROperator - clsBinaryQualitySupOperator = New ROperator + clsNamesFunction = New RFunction + clsMatchFunction = New RFunction + clsMatch2Function = New RFunction ' package name, r command and defaults for sdg @@ -146,50 +141,9 @@ Public Class dlgPrincipalComponentAnalysis clsDummyFunction.AddParameter("checked", "FALSE", iPosition:=0) clsDummyFunction.AddParameter("value1", "FALSE", iPosition:=1) - clsWhichQuantiSupFunction.SetRCommand("which") - clsWhichQuantiSupFunction.AddParameter("x", clsROperatorParameter:=clsBinaryQuantiSupOperator, bIncludeArgumentName:=False, iPosition:=1) - clsWhichQuantiSupFunction.SetAssignTo("col_1") - - clsWhichQualiSupFunction.SetRCommand("which") - clsWhichQualiSupFunction.AddParameter("x", clsROperatorParameter:=clsBinaryQualitySupOperator, bIncludeArgumentName:=False, iPosition:=1) - clsWhichQualiSupFunction.SetAssignTo("col_2") - - clsColNamesQuantFunction.SetRCommand("colnames") - clsColNamesQuantFunction.AddParameter("x", clsRFunctionParameter:=clsBindFunction, iPosition:=0) - - clsColNamesQualiFunction.SetRCommand("colnames") - clsColNamesQualiFunction.AddParameter("x", clsRFunctionParameter:=clsCbindUniqueFunction, iPosition:=0) - - clsSummaryFunction.SetRCommand("summary") - clsSummaryFunction.AddParameter("object", clsRFunctionParameter:=clsPCAFunction, iPosition:=0) - - clsBinaryQuantiSupOperator.SetOperation("%in%") - clsBinaryQuantiSupOperator.AddParameter("left", clsRFunctionParameter:=clsColNamesQuantFunction, iPosition:=0) - - clsBinaryQualitySupOperator.SetOperation("%in%") - clsBinaryQualitySupOperator.AddParameter("left", clsRFunctionParameter:=clsColNamesQualiFunction, iPosition:=0) - clsGetColumnsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") clsGetColumnsFunction.SetAssignTo("col_data") - clsCbindUniqueFunction.SetRCommand("cbind_unique") - clsCbindUniqueFunction.AddParameter("x", clsRFunctionParameter:=clsGetColumnsFunction, iPosition:=0) - clsCbindUniqueFunction.AddParameter("y", clsRFunctionParameter:=ucrSelectorPCA.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=1) - clsCbindUniqueFunction.SetAssignTo("col_data") - clsCbindUniqueFunction.AddParameter("cols", clsROperatorParameter:=clsVars2ColumnsFunction, iPosition:=2) - - clsBindFunction.SetRCommand("cbind_unique") - clsBindFunction.AddParameter("x", clsRFunctionParameter:=clsGetColumnsFunction, iPosition:=0) - clsBindFunction.AddParameter("y", clsRFunctionParameter:=ucrSelectorPCA.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=1) - clsBindFunction.SetAssignTo("col_data") - clsBindFunction.AddParameter("cols", clsROperatorParameter:=clsVars1ColumnsFunction, iPosition:=2) - - clsVars1ColumnsFunction.SetOperation("", bBracketsTemp:=False) - clsVars1ColumnsFunction.SetAssignTo("var_1") - - clsVars2ColumnsFunction.SetOperation("", bBracketsTemp:=False) - clsVars2ColumnsFunction.SetAssignTo("var_2") - clsPCAFunction.SetPackageName("FactoMineR") clsPCAFunction.SetRCommand("PCA") clsPCAFunction.AddParameter("X", clsRFunctionParameter:=clsGetColumnsFunction, iPosition:=1) @@ -202,6 +156,24 @@ Public Class dlgPrincipalComponentAnalysis clsREigenValues.AddParameter("value1", Chr(34) & "eig" & Chr(34)) clsREigenValues.iCallType = 2 + clsMatchFunction.SetRCommand("match") + clsMatchFunction.SetAssignTo("quan_columns") + + clsMatch2Function.SetRCommand("match") + clsMatch2Function.SetAssignTo("qual_columns") + + clsNamesFunction.SetRCommand("names") + + clsPCASummaryFuction.SetPackageName("FactoMineR") + clsPCASummaryFuction.SetRCommand("PCA") + clsPCASummaryFuction.AddParameter("X", "col_data") + clsPCASummaryFuction.AddParameter("ncp", 2) + clsPCASummaryFuction.AddParameter("graph", "FALSE") + + clsSummaryFunction.SetRCommand("summary") + clsSummaryFunction.AddParameter("object", clsRFunctionParameter:=clsPCASummaryFuction, iPosition:=0) + clsSummaryFunction.iCallType = 2 + clsREigenVectors.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_from_model") clsREigenVectors.AddParameter("value1", Chr(34) & "ind" & Chr(34)) clsREigenVectors.AddParameter("value2", Chr(34) & "coord" & Chr(34)) @@ -218,8 +190,13 @@ Public Class dlgPrincipalComponentAnalysis clsBaseOperator.SetOperation("+") clsRScreePlotFunction.SetPackageName("factoextra") clsRScreePlotFunction.SetRCommand("fviz_screeplot") - clsRScreePlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCAFunction) + clsRScreePlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCASummaryFuction) clsRScreePlotFunction.iCallType = 3 + clsRScreePlotFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorPCA.strCurrentDataFrame, + strObjectName:="last_graph") clsRThemeMinimal.SetPackageName("ggplot2") clsRThemeMinimal.SetRCommand("theme_minimal") @@ -227,32 +204,47 @@ Public Class dlgPrincipalComponentAnalysis ' Variables Function clsRVariablesPlotFunction.SetPackageName("factoextra") clsRVariablesPlotFunction.SetRCommand("fviz_pca_var") - clsRVariablesPlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCAFunction) + clsRVariablesPlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCASummaryFuction) clsRVariablesPlotFunctionValue.SetRCommand("c") clsRVariablesPlotFunctionValue.AddParameter("first_dim", 1, bIncludeArgumentName:=False, iPosition:=0) clsRVariablesPlotFunctionValue.AddParameter("second_dim", 2, bIncludeArgumentName:=False, iPosition:=1) clsRVariablesPlotFunction.AddParameter("axes", clsRFunctionParameter:=clsRVariablesPlotFunctionValue, iPosition:=1) clsRVariablesPlotFunction.iCallType = 3 + clsRVariablesPlotFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorPCA.strCurrentDataFrame, + strObjectName:="last_graph") ' Individual Plot clsRIndividualsPlotFunction.SetPackageName("factoextra") clsRIndividualsPlotFunction.SetRCommand("fviz_pca_ind") - clsRIndividualsPlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCAFunction) + clsRIndividualsPlotFunction.AddParameter("X", clsRFunctionParameter:=clsPCASummaryFuction) clsRIndividualsFunctionValue.SetRCommand("c") clsRIndividualsFunctionValue.AddParameter("first_dim", 1, bIncludeArgumentName:=False, iPosition:=0) clsRIndividualsFunctionValue.AddParameter("second_dim", 2, bIncludeArgumentName:=False, iPosition:=1) clsRIndividualsPlotFunction.AddParameter("axes", clsRFunctionParameter:=clsRIndividualsFunctionValue, iPosition:=1) clsRIndividualsPlotFunction.iCallType = 3 + clsRIndividualsPlotFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorPCA.strCurrentDataFrame, + strObjectName:="last_graph") ' Biplot clsRBiplotFunction.SetPackageName("factoextra") clsRBiplotFunction.SetRCommand("fviz_pca_biplot") - clsRBiplotFunction.AddParameter("X", clsRFunctionParameter:=clsPCAFunction) + clsRBiplotFunction.AddParameter("X", clsRFunctionParameter:=clsPCASummaryFuction) clsRBiplotFunctionValue.SetRCommand("c") clsRBiplotFunctionValue.AddParameter("first_dim", 1, bIncludeArgumentName:=False, iPosition:=0) clsRBiplotFunctionValue.AddParameter("second_dim", 2, bIncludeArgumentName:=False, iPosition:=1) clsRBiplotFunction.AddParameter("axes", clsRFunctionParameter:=clsRBiplotFunctionValue, iPosition:=1) clsRBiplotFunction.iCallType = 3 + clsRBiplotFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorPCA.strCurrentDataFrame, + strObjectName:="last_graph") ' Barplot clsRBarPlot0.SetOperation("+") @@ -284,19 +276,12 @@ Public Class dlgPrincipalComponentAnalysis clsRBarPlot.AddParameter(clsRFunctionParameter:=clsRBarPlotFacet) clsRScreePlotFunction.AddParameter("choice", Chr(34) & "variance" & Chr(34)) clsBaseOperator.AddParameter("plot", clsRFunctionParameter:=clsRScreePlotFunction, iPosition:=0) - clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsRThemeMinimal, iPosition:=1) clsBaseOperator.iCallType = 3 - clsRScreePlotFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - clsRVariablesPlotFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - clsRIndividualsPlotFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - clsRBiplotFunction.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - ucrBase.clsRsyntax.ClearCodes() - ucrBase.clsRsyntax.SetBaseRFunction(clsSummaryFunction) - ucrBase.clsRsyntax.AddToAfterCodes(clsREigenValues, iPosition:=1) - ucrBase.clsRsyntax.AddToAfterCodes(clsBaseOperator, iPosition:=4) - ModelName() + ucrBase.clsRsyntax.SetBaseRFunction(clsPCAFunction) + ucrBase.clsRsyntax.AddToAfterCodes(clsSummaryFunction, iPosition:=0) + ucrBase.clsRsyntax.AddToAfterCodes(clsBaseOperator, iPosition:=1) bResetSubdialog = True End Sub @@ -304,16 +289,16 @@ Public Class dlgPrincipalComponentAnalysis ucrSelectorPCA.AddAdditionalCodeParameterPair(clsREigenVectors, ucrSelectorPCA.GetParameter, iAdditionalPairNo:=1) ucrSelectorPCA.AddAdditionalCodeParameterPair(clsRRotationCoord, ucrSelectorPCA.GetParameter, iAdditionalPairNo:=2) ucrSelectorPCA.AddAdditionalCodeParameterPair(clsRRotationEig, ucrSelectorPCA.GetParameter, iAdditionalPairNo:=3) - ucrSelectorPCA.AddAdditionalCodeParameterPair(clsGetColumnsFunction, ucrSelectorPCA.GetParameter, iAdditionalPairNo:=4) - ucrSelectorPCA.SetRCode(clsREigenValues, bReset) - ucrReceiverMultiplePCA.SetRCode(clsGetColumnsFunction, bReset) - ucrReceiverSuppNumeric.SetRCode(clsBinaryQuantiSupOperator, bReset) - ucrReceiverSupplFactors.SetRCode(clsBinaryQualitySupOperator, bReset) + ucrSelectorPCA.SetRCode(clsGetColumnsFunction, bReset) ucrSaveResult.SetRCode(clsPCAFunction, bReset) ucrChkScaleData.SetRCode(clsPCAFunction, bReset) ucrChkExtraVariables.SetRCode(clsDummyFunction, bReset) ucrNudNumberOfComp.SetRCode(clsPCAFunction, bReset) + If bReset Then + ucrReceiverSuppNumeric.SetRCode(clsMatchFunction, bReset) + ucrReceiverSupplFactors.SetRCode(clsMatch2Function, bReset) + End If End Sub Private Sub TestOKEnabled() ' add in if the sdg has a clear nud, etc @@ -339,25 +324,11 @@ Public Class dlgPrincipalComponentAnalysis End Sub Private Sub cmdPCAOptions_Click(sender As Object, e As EventArgs) Handles cmdPCAOptions.Click - sdgPrincipalComponentAnalysis.SetRFunction(ucrBase.clsRsyntax, clsREigenValues, clsDummyFunction, clsREigenVectors, clsRRotation, clsRScreePlotFunction, clsRVariablesPlotFunction, clsRIndividualsPlotFunction, clsRBiplotFunction, clsRBarPlotFunction, clsRVariablesPlotFunctionValue, clsRIndividualsFunctionValue, clsRBiplotFunctionValue, clsRFactor, clsBaseOperator, clsRThemeMinimal, bResetSubdialog) + sdgPrincipalComponentAnalysis.SetRFunction(ucrBase.clsRsyntax, clsRRotation, clsRScreePlotFunction, clsRVariablesPlotFunction, clsRIndividualsPlotFunction, clsRBiplotFunction, clsRBarPlotFunction, clsRVariablesPlotFunctionValue, clsRIndividualsFunctionValue, clsRBiplotFunctionValue, clsRFactor, clsBaseOperator, clsRThemeMinimal, bResetSubdialog) bResetSubdialog = False sdgPrincipalComponentAnalysis.ShowDialog() End Sub - Private Sub ModelName() - If ucrSaveResult.ucrChkSave.Checked Then - clsREigenValues.AddParameter("model_name", Chr(34) & ucrSaveResult.GetText & Chr(34)) - clsREigenVectors.AddParameter("model_name", Chr(34) & ucrSaveResult.GetText & Chr(34)) - clsRRotationCoord.AddParameter("model_name", Chr(34) & ucrSaveResult.GetText & Chr(34)) - clsRRotationEig.AddParameter("model_name", Chr(34) & ucrSaveResult.GetText & Chr(34)) - Else - clsREigenValues.AddParameter("model_name", Chr(34) & "last_model" & Chr(34)) - clsREigenVectors.AddParameter("model_name", Chr(34) & "last_model" & Chr(34)) - clsRRotationCoord.AddParameter("model_name", Chr(34) & "last_model" & Chr(34)) - clsRRotationEig.AddParameter("model_name", Chr(34) & "last_model" & Chr(34)) - End If - End Sub - Private Sub ucrReceiverMultiplePCA_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultiplePCA.ControlValueChanged, ucrChkExtraVariables.ControlValueChanged If ucrReceiverMultiplePCA.IsEmpty Then ucrNudNumberOfComp.Minimum = 0 @@ -372,16 +343,23 @@ Public Class dlgPrincipalComponentAnalysis ucrNudNumberOfComp.Value = ucrReceiverMultiplePCA.lstSelectedVariables.Items.Count End If End If + If ucrReceiverMultiplePCA.IsEmpty AndAlso lstEditedVariables.Count > 0 Then + UpdateSelector() + ucrReceiverMultiplePCA.SetMeAsReceiver() + End If + If ucrReceiverMultiplePCA.IsEmpty Then + ucrReceiverSuppNumeric.Clear() + End If + GetColumns() End Sub Private Sub ucrSelectorPCA_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorPCA.ControlValueChanged clsRRotationEig.AddParameter("data_name", Chr(34) & ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34)) + clsGetColumnsFunction.AddParameter("data_name", Chr(34) & ucrSelectorPCA.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0) clsPCAFunction.AddParameter("X", clsRFunctionParameter:=clsGetColumnsFunction, iPosition:=0) - ModelName() - End Sub - - Private Sub ucrSaveResult_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSaveResult.ControlValueChanged - ModelName() + clsNamesFunction.AddParameter("names", "col_data", iPosition:=0, bIncludeArgumentName:=False) + clsMatchFunction.AddParameter("data", clsRFunctionParameter:=clsNamesFunction, iPosition:=1, bIncludeArgumentName:=False) + clsMatch2Function.AddParameter("data1", clsRFunctionParameter:=clsNamesFunction, iPosition:=1, bIncludeArgumentName:=False) End Sub Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveResult.ControlContentsChanged, ucrReceiverMultiplePCA.ControlContentsChanged, ucrNudNumberOfComp.ControlContentsChanged, @@ -391,17 +369,19 @@ Public Class dlgPrincipalComponentAnalysis Private Sub ucrChkExtraVariables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkExtraVariables.ControlValueChanged, ucrReceiverSupplFactors.ControlValueChanged, ucrReceiverSuppNumeric.ControlValueChanged If ucrChkExtraVariables.Checked AndAlso Not ucrReceiverSuppNumeric.IsEmpty Then - clsPCAFunction.AddParameter("quanti.sup", clsRFunctionParameter:=clsWhichQuantiSupFunction, iPosition:=4) - clsVars1ColumnsFunction.AddParameter("cols", ucrReceiverSuppNumeric.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + clsPCAFunction.AddParameter("quanti.sup", clsRFunctionParameter:=clsMatchFunction, iPosition:=4) + clsPCASummaryFuction.AddParameter("quanti.sup", "quan_columns", iPosition:=4) Else clsPCAFunction.RemoveParameterByName("quanti.sup") + clsPCASummaryFuction.RemoveParameterByName("quanti.sup") End If If ucrChkExtraVariables.Checked AndAlso Not ucrReceiverSupplFactors.IsEmpty Then - clsPCAFunction.AddParameter("quali.sup", clsRFunctionParameter:=clsWhichQualiSupFunction, iPosition:=5) - clsVars2ColumnsFunction.AddParameter("cols", ucrReceiverSupplFactors.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + clsPCAFunction.AddParameter("quali.sup", clsRFunctionParameter:=clsMatch2Function, iPosition:=5) + clsPCASummaryFuction.AddParameter("quali.sup", "qual_columns", iPosition:=5) Else clsPCAFunction.RemoveParameterByName("quali.sup") + clsPCASummaryFuction.RemoveParameterByName("quali.sup") End If If ucrChkExtraVariables.Checked Then ucrReceiverMultiplePCA.RemoveExcludedMetadataProperty("class") @@ -409,5 +389,65 @@ Public Class dlgPrincipalComponentAnalysis ucrReceiverMultiplePCA.SetDataType("numeric") ucrReceiverMultiplePCA.SetMeAsReceiver() End If + GetColumns() + End Sub + + Private Sub GetColumns() + If ucrChkExtraVariables.Checked Then + Dim lstVariables As List(Of String) = ucrReceiverMultiplePCA.GetVariableNamesAsList() + + If Not ucrReceiverMultiplePCA.IsEmpty AndAlso (Not ucrReceiverSuppNumeric.IsEmpty OrElse Not ucrReceiverSupplFactors.IsEmpty) Then + lstVariables.AddRange(ucrReceiverSuppNumeric.GetVariableNamesAsList()) + lstVariables.AddRange(ucrReceiverSupplFactors.GetVariableNamesAsList()) + End If + + clsGetColumnsFunction.AddParameter("col_names", frmMain.clsRLink.GetListAsRString(lstVariables, bWithQuotes:=True), iPosition:=1) + Else + clsGetColumnsFunction.AddParameter("col_names", ucrReceiverMultiplePCA.GetVariableNames) + End If + + End Sub + + Private Sub UpdateSelector() + ClearSelector() + If bResettingDialogue Then + For i = 0 To lstEditedVariables.Count - 1 + ucrSelectorPCA.lstAvailableVariable.Items.Add(lstEditedVariables.Item(i)) + ucrSelectorPCA.lstAvailableVariable.Items(i).Tag = ucrSelectorPCA.ucrAvailableDataFrames.cboAvailableDataFrames.Text + Next + End If + End Sub + + Private Sub ClearSelector() + ucrSelectorPCA.lstAvailableVariable.Clear() + ucrSelectorPCA.lstAvailableVariable.Groups.Clear() + ucrSelectorPCA.lstAvailableVariable.Columns.Add("Variables") + End Sub + + Private Sub ucrReceiverSuppNumeric_Enter(sender As Object, e As EventArgs) Handles ucrReceiverSuppNumeric.Enter + If Not ucrReceiverMultiplePCA.IsEmpty Then + Dim arrItems As String() = ucrReceiverMultiplePCA.GetVariableNamesList(False) + + For Each item As ListViewItem In ucrSelectorPCA.lstAvailableVariable.Items + If arrItems.Contains(item.Text) Then + ucrSelectorPCA.lstAvailableVariable.Items.Remove(item) + End If + Next + End If + End Sub + + Private Sub ucrSelectorPCA_DataFrameChanged() Handles ucrSelectorPCA.DataFrameChanged + If Not bResettingDialogue Then + If ucrSelectorPCA.lstAvailableVariable.Items.Count > 0 Then + lstEditedVariables.Clear() + lstEditedVariables = ucrSelectorPCA.lstAvailableVariable.Items.Cast(Of ListViewItem)().Select(Function(item) item.Text).ToList() + End If + End If + End Sub + + Private Sub ucrReceiverMultiplePCA_Enter(sender As Object, e As EventArgs) Handles ucrReceiverMultiplePCA.Enter + bResettingDialogue = True + UpdateSelector() + bResettingDialogue = False End Sub End Class \ No newline at end of file diff --git a/instat/dlgRandomSplit.vb b/instat/dlgRandomSplit.vb index 0310ca32fe0..04038bc8f78 100644 --- a/instat/dlgRandomSplit.vb +++ b/instat/dlgRandomSplit.vb @@ -65,16 +65,16 @@ Public Class dlgRandomSplit ucrChkLag.SetParameter(ucrNudLag.GetParameter(), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrChkLag.AddToLinkedControls(ucrNudLag, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrChkTest.SetText("Save Test to") + ucrChkTest.SetText("Store Test to") ucrChkTest.AddToLinkedControls(ucrSaveTestingData, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrSaveTrainingData.SetLabelText("Save Train to:") + ucrSaveTrainingData.SetLabelText("Store Train to:") ucrSaveTrainingData.SetSaveTypeAsDataFrame() ucrSaveTrainingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTrainingData.SetPrefix("training_data") ucrSaveTrainingData.SetIsComboBox() - ucrSaveTestingData.SetLabelText("Save Test to:") + ucrSaveTestingData.SetLabelText("Store Test to:") ucrSaveTestingData.SetSaveTypeAsDataFrame() ucrSaveTestingData.SetDataFrameSelector(ucrSelectorRandomSplit.ucrAvailableDataFrames) ucrSaveTestingData.SetPrefix("testing_data") diff --git a/instat/dlgRatingScales.vb b/instat/dlgRatingScales.vb index fc971fee4f1..ed3211cc61e 100644 --- a/instat/dlgRatingScales.vb +++ b/instat/dlgRatingScales.vb @@ -262,17 +262,17 @@ Public Class dlgRatingScales ucrBase.clsRsyntax.SetBaseRFunction(clsSjpLikertFunction) ucrSaveGraph.SetSaveType(RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ElseIf rdoStacked.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsSjpStackFrqFunction) ucrSaveGraph.SetSaveType(RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ElseIf rdoTable.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsSjtStackFrqFunction) ucrSaveGraph.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text) ucrSaveGraph.SetAssignToIfUncheckedValue("last_table") - ucrSaveGraph.SetCheckBoxText("Save Table") + ucrSaveGraph.SetCheckBoxText("Store Table") End If End Sub diff --git a/instat/dlgRenameObjects.vb b/instat/dlgRenameObjects.vb index 87bd7bc2e6d..450a55dc0a9 100644 --- a/instat/dlgRenameObjects.vb +++ b/instat/dlgRenameObjects.vb @@ -51,6 +51,7 @@ Public Class dlgRenameObjects dctTypes.Add("Filters", Chr(34) & "filter" & Chr(34)) dctTypes.Add("Column selections", Chr(34) & "column_selection" & Chr(34)) dctTypes.Add("Calculations", Chr(34) & "calculation" & Chr(34)) + dctTypes.Add("Scalars", Chr(34) & "scalar" & Chr(34)) ucrInputType.SetItems(dctTypes) ucrInputType.SetDropDownStyleAsNonEditable() @@ -89,7 +90,6 @@ Public Class dlgRenameObjects End If End Sub - Private Sub CoreControls_ContentsChanged() Handles ucrInputNewName.ControlContentsChanged, ucrSelectorForRenameObject.ControlContentsChanged, ucrReceiverCurrentName.ControlContentsChanged TestOKEnabled() End Sub @@ -108,13 +108,9 @@ Public Class dlgRenameObjects End If End Sub - - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeforControls(True) TestOKEnabled() End Sub - - End Class \ No newline at end of file diff --git a/instat/dlgReorderLevels.vb b/instat/dlgReorderLevels.vb index dfc8f53c3ae..074b77da292 100644 --- a/instat/dlgReorderLevels.vb +++ b/instat/dlgReorderLevels.vb @@ -144,7 +144,7 @@ Public Class dlgReorderLevels ucrSaveResults.SetPrefix("new_column") ucrSaveResults.SetSaveTypeAsColumn() ucrSaveResults.SetDataFrameSelector(ucrSelectorFactorLevelsToReorder.ucrAvailableDataFrames) - ucrSaveResults.SetLabelText("Save As:") + ucrSaveResults.SetLabelText("Store As:") ucrSaveResults.SetIsComboBox() End Sub diff --git a/instat/dlgRestrict.Designer.vb b/instat/dlgRestrict.Designer.vb index 3030445e05c..f46a69236e6 100644 --- a/instat/dlgRestrict.Designer.vb +++ b/instat/dlgRestrict.Designer.vb @@ -57,10 +57,9 @@ Partial Class dlgRestrict ' 'cmdDefineNewFilter ' - Me.cmdDefineNewFilter.Location = New System.Drawing.Point(311, 110) - Me.cmdDefineNewFilter.Margin = New System.Windows.Forms.Padding(4) + Me.cmdDefineNewFilter.Location = New System.Drawing.Point(249, 88) Me.cmdDefineNewFilter.Name = "cmdDefineNewFilter" - Me.cmdDefineNewFilter.Size = New System.Drawing.Size(161, 38) + Me.cmdDefineNewFilter.Size = New System.Drawing.Size(129, 30) Me.cmdDefineNewFilter.TabIndex = 3 Me.cmdDefineNewFilter.Tag = "Define_New_Filter" Me.cmdDefineNewFilter.Text = "Define New Filter" @@ -69,19 +68,17 @@ Partial Class dlgRestrict 'lblFilter ' Me.lblFilter.AutoSize = True - Me.lblFilter.Location = New System.Drawing.Point(311, 56) - Me.lblFilter.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFilter.Location = New System.Drawing.Point(249, 45) Me.lblFilter.Name = "lblFilter" - Me.lblFilter.Size = New System.Drawing.Size(70, 16) + Me.lblFilter.Size = New System.Drawing.Size(57, 13) Me.lblFilter.TabIndex = 1 Me.lblFilter.Text = "Filter rows:" ' 'lblFilterPreview ' - Me.lblFilterPreview.Location = New System.Drawing.Point(12, 356) - Me.lblFilterPreview.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFilterPreview.Location = New System.Drawing.Point(10, 285) Me.lblFilterPreview.Name = "lblFilterPreview" - Me.lblFilterPreview.Size = New System.Drawing.Size(148, 28) + Me.lblFilterPreview.Size = New System.Drawing.Size(118, 22) Me.lblFilterPreview.TabIndex = 6 Me.lblFilterPreview.Text = "Filter Preview:" ' @@ -90,11 +87,9 @@ Partial Class dlgRestrict Me.grpApplyOptions.Controls.Add(Me.rdoSavefilter) Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsSubset) Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsFilter) - Me.grpApplyOptions.Location = New System.Drawing.Point(12, 246) - Me.grpApplyOptions.Margin = New System.Windows.Forms.Padding(4) + Me.grpApplyOptions.Location = New System.Drawing.Point(10, 197) Me.grpApplyOptions.Name = "grpApplyOptions" - Me.grpApplyOptions.Padding = New System.Windows.Forms.Padding(4) - Me.grpApplyOptions.Size = New System.Drawing.Size(495, 66) + Me.grpApplyOptions.Size = New System.Drawing.Size(396, 53) Me.grpApplyOptions.TabIndex = 4 Me.grpApplyOptions.TabStop = False Me.grpApplyOptions.Text = "Apply" @@ -102,21 +97,20 @@ Partial Class dlgRestrict 'rdoSavefilter ' Me.rdoSavefilter.AutoSize = True - Me.rdoSavefilter.Location = New System.Drawing.Point(377, 24) + Me.rdoSavefilter.Location = New System.Drawing.Point(302, 19) Me.rdoSavefilter.Margin = New System.Windows.Forms.Padding(2) Me.rdoSavefilter.Name = "rdoSavefilter" - Me.rdoSavefilter.Size = New System.Drawing.Size(92, 20) + Me.rdoSavefilter.Size = New System.Drawing.Size(75, 17) Me.rdoSavefilter.TabIndex = 4 Me.rdoSavefilter.TabStop = True - Me.rdoSavefilter.Text = "Save Filter" + Me.rdoSavefilter.Text = "Store Filter" Me.rdoSavefilter.UseVisualStyleBackColor = True ' 'rdoApplyAsSubset ' - Me.rdoApplyAsSubset.Location = New System.Drawing.Point(200, 24) - Me.rdoApplyAsSubset.Margin = New System.Windows.Forms.Padding(4) + Me.rdoApplyAsSubset.Location = New System.Drawing.Point(160, 19) Me.rdoApplyAsSubset.Name = "rdoApplyAsSubset" - Me.rdoApplyAsSubset.Size = New System.Drawing.Size(153, 21) + Me.rdoApplyAsSubset.Size = New System.Drawing.Size(122, 17) Me.rdoApplyAsSubset.TabIndex = 1 Me.rdoApplyAsSubset.TabStop = True Me.rdoApplyAsSubset.Text = "As Subset" @@ -124,10 +118,9 @@ Partial Class dlgRestrict ' 'rdoApplyAsFilter ' - Me.rdoApplyAsFilter.Location = New System.Drawing.Point(8, 26) - Me.rdoApplyAsFilter.Margin = New System.Windows.Forms.Padding(4) + Me.rdoApplyAsFilter.Location = New System.Drawing.Point(6, 21) Me.rdoApplyAsFilter.Name = "rdoApplyAsFilter" - Me.rdoApplyAsFilter.Size = New System.Drawing.Size(164, 21) + Me.rdoApplyAsFilter.Size = New System.Drawing.Size(131, 17) Me.rdoApplyAsFilter.TabIndex = 0 Me.rdoApplyAsFilter.TabStop = True Me.rdoApplyAsFilter.Text = "As Filter" @@ -137,10 +130,9 @@ Partial Class dlgRestrict ' Me.cmdEditFilter.Enabled = False Me.cmdEditFilter.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdEditFilter.Location = New System.Drawing.Point(311, 209) - Me.cmdEditFilter.Margin = New System.Windows.Forms.Padding(4) + Me.cmdEditFilter.Location = New System.Drawing.Point(249, 167) Me.cmdEditFilter.Name = "cmdEditFilter" - Me.cmdEditFilter.Size = New System.Drawing.Size(161, 29) + Me.cmdEditFilter.Size = New System.Drawing.Size(129, 23) Me.cmdEditFilter.TabIndex = 9 Me.cmdEditFilter.Tag = "Define_New_Filter" Me.cmdEditFilter.Text = "Edit Filter" @@ -149,10 +141,9 @@ Partial Class dlgRestrict 'cmdFilterFromFactors ' Me.cmdFilterFromFactors.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFilterFromFactors.Location = New System.Drawing.Point(311, 154) - Me.cmdFilterFromFactors.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFilterFromFactors.Location = New System.Drawing.Point(249, 123) Me.cmdFilterFromFactors.Name = "cmdFilterFromFactors" - Me.cmdFilterFromFactors.Size = New System.Drawing.Size(161, 48) + Me.cmdFilterFromFactors.Size = New System.Drawing.Size(129, 38) Me.cmdFilterFromFactors.TabIndex = 10 Me.cmdFilterFromFactors.Tag = "Define_New_Filter" Me.cmdFilterFromFactors.Text = "Filter From Factors" @@ -164,21 +155,21 @@ Partial Class dlgRestrict Me.ucrInputFilterPreview.AutoSize = True Me.ucrInputFilterPreview.IsMultiline = True Me.ucrInputFilterPreview.IsReadOnly = False - Me.ucrInputFilterPreview.Location = New System.Drawing.Point(161, 355) - Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(8) + Me.ucrInputFilterPreview.Location = New System.Drawing.Point(129, 284) + Me.ucrInputFilterPreview.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" - Me.ucrInputFilterPreview.Size = New System.Drawing.Size(346, 54) + Me.ucrInputFilterPreview.Size = New System.Drawing.Size(277, 43) Me.ucrInputFilterPreview.TabIndex = 7 ' 'ucrReceiverFilter ' Me.ucrReceiverFilter.AutoSize = True Me.ucrReceiverFilter.frmParent = Me - Me.ucrReceiverFilter.Location = New System.Drawing.Point(312, 75) + Me.ucrReceiverFilter.Location = New System.Drawing.Point(250, 60) Me.ucrReceiverFilter.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFilter.Name = "ucrReceiverFilter" Me.ucrReceiverFilter.Selector = Nothing - Me.ucrReceiverFilter.Size = New System.Drawing.Size(161, 25) + Me.ucrReceiverFilter.Size = New System.Drawing.Size(129, 20) Me.ucrReceiverFilter.strNcFilePath = "" Me.ucrReceiverFilter.TabIndex = 2 Me.ucrReceiverFilter.ucrSelector = Nothing @@ -189,37 +180,37 @@ Partial Class dlgRestrict Me.ucrSelectorFilter.bDropUnusedFilterLevels = False Me.ucrSelectorFilter.bShowHiddenColumns = False Me.ucrSelectorFilter.bUseCurrentFilter = True - Me.ucrSelectorFilter.Location = New System.Drawing.Point(12, 12) + Me.ucrSelectorFilter.Location = New System.Drawing.Point(10, 10) Me.ucrSelectorFilter.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorFilter.Name = "ucrSelectorFilter" - Me.ucrSelectorFilter.Size = New System.Drawing.Size(267, 229) + Me.ucrSelectorFilter.Size = New System.Drawing.Size(214, 183) Me.ucrSelectorFilter.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 416) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(5) + Me.ucrBase.Location = New System.Drawing.Point(10, 333) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(511, 65) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 8 ' 'ucrNewDataFrameName ' Me.ucrNewDataFrameName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrNewDataFrameName.Location = New System.Drawing.Point(12, 318) - Me.ucrNewDataFrameName.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) + Me.ucrNewDataFrameName.Location = New System.Drawing.Point(10, 254) + Me.ucrNewDataFrameName.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrNewDataFrameName.Name = "ucrNewDataFrameName" - Me.ucrNewDataFrameName.Size = New System.Drawing.Size(460, 30) + Me.ucrNewDataFrameName.Size = New System.Drawing.Size(368, 24) Me.ucrNewDataFrameName.TabIndex = 5 ' 'dlgRestrict ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(522, 485) + Me.ClientSize = New System.Drawing.Size(418, 388) Me.Controls.Add(Me.cmdFilterFromFactors) Me.Controls.Add(Me.cmdEditFilter) Me.Controls.Add(Me.grpApplyOptions) @@ -232,7 +223,6 @@ Partial Class dlgRestrict Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrNewDataFrameName) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgRestrict" diff --git a/instat/dlgSPI.vb b/instat/dlgSPI.vb index 206ad8431aa..2ab81117dfc 100644 --- a/instat/dlgSPI.vb +++ b/instat/dlgSPI.vb @@ -114,20 +114,20 @@ Public Class dlgSPI ucrSaveIndex.SetSaveTypeAsColumn() ucrSaveIndex.SetDataFrameSelector(ucrSelectorVariable.ucrAvailableDataFrames) - ucrSaveIndex.SetLabelText("Save Index into:") + ucrSaveIndex.SetLabelText("Store Index into:") ucrSaveIndex.SetIsTextBox() ucrSaveIndex.SetPrefix("spi") ucrSaveModel.SetSaveTypeAsModel() ucrSaveModel.SetDataFrameSelector(ucrSelectorVariable.ucrAvailableDataFrames) - ucrSaveModel.SetCheckBoxText("Save Model") + ucrSaveModel.SetCheckBoxText("Store Model") ucrSaveModel.SetIsComboBox() ucrSaveModel.SetAssignToIfUncheckedValue("last_model") ucrSaveGraph.SetPrefix("SPI_plot") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorVariable.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgScatterPlot.Designer.vb b/instat/dlgScatterPlot.Designer.vb index 1378732baa4..a5b150dfba8 100644 --- a/instat/dlgScatterPlot.Designer.vb +++ b/instat/dlgScatterPlot.Designer.vb @@ -53,42 +53,42 @@ Partial Class dlgScatterPlot Me.toolStripMenuItemJitterOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemCountOptions = New System.Windows.Forms.ToolStripMenuItem() Me.grpGeom = New System.Windows.Forms.GroupBox() - Me.lblPosition = New System.Windows.Forms.Label() - Me.lblLegend = New System.Windows.Forms.Label() - Me.lblPointsize = New System.Windows.Forms.Label() - Me.lblShape = New System.Windows.Forms.Label() Me.rdoCount = New System.Windows.Forms.RadioButton() Me.rdoPoint = New System.Windows.Forms.RadioButton() Me.lblHeith = New System.Windows.Forms.Label() Me.lblWidth = New System.Windows.Forms.Label() Me.rdoJitter = New System.Windows.Forms.RadioButton() Me.lblFacetBy = New System.Windows.Forms.Label() + Me.grpAdd = New System.Windows.Forms.GroupBox() + Me.ucrChkLineofBestFit = New instat.ucrCheck() + Me.ucrChkAddSidePlot = New instat.ucrCheck() + Me.ucrChkAddRugPlot = New instat.ucrCheck() + Me.ucrNudSize = New instat.ucrNud() + Me.ucrInputSides = New instat.ucrInputComboBox() + Me.ucrChkWithSE = New instat.ucrCheck() Me.ucrInputStation = New instat.ucrInputComboBox() Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrChkLegend = New instat.ucrCheck() + Me.ucrNudPointsize = New instat.ucrNud() + Me.ucrChkColour = New instat.ucrCheck() + Me.ucrChkPosition = New instat.ucrCheck() + Me.ucrChkSize = New instat.ucrCheck() + Me.ucrChkShape = New instat.ucrCheck() Me.ucrInputPosition = New instat.ucrInputComboBox() - Me.ucrInputLegend = New instat.ucrInputComboBox() + Me.ucrInputColour = New instat.ucrInputComboBox() Me.ucrInputShape = New instat.ucrInputComboBox() - Me.ucrNudPointsize = New instat.ucrNud() Me.ucrNudHeigth = New instat.ucrNud() Me.ucrNudWidth = New instat.ucrNud() Me.ucrPnlGeoms = New instat.UcrPanel() Me.cmdOptions = New instat.ucrSplitButton() - Me.ucrInputSides = New instat.ucrInputComboBox() - Me.ucrNudSize = New instat.ucrNud() - Me.ucrChkAddRugPlot = New instat.ucrCheck() Me.ucrReceiverLabel = New instat.ucrReceiverSingle() - Me.ucrChkWithSE = New instat.ucrCheck() - Me.ucrChkLineofBestFit = New instat.ucrCheck() Me.ucrSaveScatterPlot = New instat.ucrSave() Me.ucrSelectorForScatter = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrVariablesAsFactorForScatter = New instat.ucrVariablesAsFactor() Me.ucrFactorOptionalReceiver = New instat.ucrReceiverSingle() Me.ucrReceiverX = New instat.ucrReceiverSingle() Me.ucrBase = New instat.ucrButtons() - Me.ucrChkAddSidePlot = New instat.ucrCheck() - Me.grpAdd = New System.Windows.Forms.GroupBox() Me.contextMenuStripOptions.SuspendLayout() Me.grpGeom.SuspendLayout() Me.grpAdd.SuspendLayout() @@ -195,14 +195,14 @@ Partial Class dlgScatterPlot ' 'grpGeom ' + Me.grpGeom.Controls.Add(Me.ucrInputColour) Me.grpGeom.Controls.Add(Me.ucrInputPosition) - Me.grpGeom.Controls.Add(Me.lblPosition) - Me.grpGeom.Controls.Add(Me.ucrInputLegend) - Me.grpGeom.Controls.Add(Me.lblLegend) - Me.grpGeom.Controls.Add(Me.ucrInputShape) - Me.grpGeom.Controls.Add(Me.lblPointsize) Me.grpGeom.Controls.Add(Me.ucrNudPointsize) - Me.grpGeom.Controls.Add(Me.lblShape) + Me.grpGeom.Controls.Add(Me.ucrChkColour) + Me.grpGeom.Controls.Add(Me.ucrChkPosition) + Me.grpGeom.Controls.Add(Me.ucrChkSize) + Me.grpGeom.Controls.Add(Me.ucrChkShape) + Me.grpGeom.Controls.Add(Me.ucrInputShape) Me.grpGeom.Controls.Add(Me.rdoCount) Me.grpGeom.Controls.Add(Me.rdoPoint) Me.grpGeom.Controls.Add(Me.lblHeith) @@ -213,51 +213,15 @@ Partial Class dlgScatterPlot Me.grpGeom.Controls.Add(Me.ucrPnlGeoms) Me.grpGeom.Location = New System.Drawing.Point(9, 337) Me.grpGeom.Name = "grpGeom" - Me.grpGeom.Size = New System.Drawing.Size(457, 109) + Me.grpGeom.Size = New System.Drawing.Size(449, 110) Me.grpGeom.TabIndex = 23 Me.grpGeom.TabStop = False Me.grpGeom.Text = "Geom" ' - 'lblPosition - ' - Me.lblPosition.AutoSize = True - Me.lblPosition.Location = New System.Drawing.Point(195, 50) - Me.lblPosition.Name = "lblPosition" - Me.lblPosition.Size = New System.Drawing.Size(47, 13) - Me.lblPosition.TabIndex = 38 - Me.lblPosition.Text = "Position:" - ' - 'lblLegend - ' - Me.lblLegend.AutoSize = True - Me.lblLegend.Location = New System.Drawing.Point(59, 50) - Me.lblLegend.Name = "lblLegend" - Me.lblLegend.Size = New System.Drawing.Size(46, 13) - Me.lblLegend.TabIndex = 36 - Me.lblLegend.Text = "Legend:" - ' - 'lblPointsize - ' - Me.lblPointsize.AutoSize = True - Me.lblPointsize.Location = New System.Drawing.Point(59, 21) - Me.lblPointsize.Name = "lblPointsize" - Me.lblPointsize.Size = New System.Drawing.Size(30, 13) - Me.lblPointsize.TabIndex = 33 - Me.lblPointsize.Text = "Size:" - ' - 'lblShape - ' - Me.lblShape.AutoSize = True - Me.lblShape.Location = New System.Drawing.Point(186, 21) - Me.lblShape.Name = "lblShape" - Me.lblShape.Size = New System.Drawing.Size(41, 13) - Me.lblShape.TabIndex = 31 - Me.lblShape.Text = "Shape:" - ' 'rdoCount ' Me.rdoCount.AutoSize = True - Me.rdoCount.Location = New System.Drawing.Point(4, 46) + Me.rdoCount.Location = New System.Drawing.Point(10, 48) Me.rdoCount.Name = "rdoCount" Me.rdoCount.Size = New System.Drawing.Size(53, 17) Me.rdoCount.TabIndex = 30 @@ -268,7 +232,7 @@ Partial Class dlgScatterPlot 'rdoPoint ' Me.rdoPoint.AutoSize = True - Me.rdoPoint.Location = New System.Drawing.Point(4, 20) + Me.rdoPoint.Location = New System.Drawing.Point(10, 19) Me.rdoPoint.Name = "rdoPoint" Me.rdoPoint.Size = New System.Drawing.Size(49, 17) Me.rdoPoint.TabIndex = 29 @@ -279,7 +243,7 @@ Partial Class dlgScatterPlot 'lblHeith ' Me.lblHeith.AutoSize = True - Me.lblHeith.Location = New System.Drawing.Point(180, 73) + Me.lblHeith.Location = New System.Drawing.Point(189, 81) Me.lblHeith.Name = "lblHeith" Me.lblHeith.Size = New System.Drawing.Size(41, 13) Me.lblHeith.TabIndex = 27 @@ -288,7 +252,7 @@ Partial Class dlgScatterPlot 'lblWidth ' Me.lblWidth.AutoSize = True - Me.lblWidth.Location = New System.Drawing.Point(60, 73) + Me.lblWidth.Location = New System.Drawing.Point(76, 81) Me.lblWidth.Name = "lblWidth" Me.lblWidth.Size = New System.Drawing.Size(38, 13) Me.lblWidth.TabIndex = 25 @@ -297,7 +261,7 @@ Partial Class dlgScatterPlot 'rdoJitter ' Me.rdoJitter.AutoSize = True - Me.rdoJitter.Location = New System.Drawing.Point(4, 71) + Me.rdoJitter.Location = New System.Drawing.Point(10, 77) Me.rdoJitter.Name = "rdoJitter" Me.rdoJitter.Size = New System.Drawing.Size(47, 17) Me.rdoJitter.TabIndex = 24 @@ -316,6 +280,83 @@ Partial Class dlgScatterPlot Me.lblFacetBy.Tag = "" Me.lblFacetBy.Text = "Facet By:" ' + 'grpAdd + ' + Me.grpAdd.Controls.Add(Me.ucrChkLineofBestFit) + Me.grpAdd.Controls.Add(Me.ucrChkAddSidePlot) + Me.grpAdd.Controls.Add(Me.ucrChkAddRugPlot) + Me.grpAdd.Controls.Add(Me.lblSides) + Me.grpAdd.Controls.Add(Me.ucrNudSize) + Me.grpAdd.Controls.Add(Me.lblSize) + Me.grpAdd.Controls.Add(Me.ucrInputSides) + Me.grpAdd.Controls.Add(Me.ucrChkWithSE) + Me.grpAdd.Location = New System.Drawing.Point(9, 227) + Me.grpAdd.Name = "grpAdd" + Me.grpAdd.Size = New System.Drawing.Size(336, 95) + Me.grpAdd.TabIndex = 81 + Me.grpAdd.TabStop = False + Me.grpAdd.Text = "Add" + ' + 'ucrChkLineofBestFit + ' + Me.ucrChkLineofBestFit.AutoSize = True + Me.ucrChkLineofBestFit.Checked = False + Me.ucrChkLineofBestFit.Location = New System.Drawing.Point(6, 16) + Me.ucrChkLineofBestFit.Name = "ucrChkLineofBestFit" + Me.ucrChkLineofBestFit.Size = New System.Drawing.Size(173, 24) + Me.ucrChkLineofBestFit.TabIndex = 9 + ' + 'ucrChkAddSidePlot + ' + Me.ucrChkAddSidePlot.AutoSize = True + Me.ucrChkAddSidePlot.Checked = False + Me.ucrChkAddSidePlot.Location = New System.Drawing.Point(6, 59) + Me.ucrChkAddSidePlot.Name = "ucrChkAddSidePlot" + Me.ucrChkAddSidePlot.Size = New System.Drawing.Size(134, 23) + Me.ucrChkAddSidePlot.TabIndex = 80 + ' + 'ucrChkAddRugPlot + ' + Me.ucrChkAddRugPlot.AutoSize = True + Me.ucrChkAddRugPlot.Checked = False + Me.ucrChkAddRugPlot.Location = New System.Drawing.Point(6, 38) + Me.ucrChkAddRugPlot.Name = "ucrChkAddRugPlot" + Me.ucrChkAddRugPlot.Size = New System.Drawing.Size(108, 23) + Me.ucrChkAddRugPlot.TabIndex = 11 + ' + 'ucrNudSize + ' + Me.ucrNudSize.AutoSize = True + Me.ucrNudSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSize.Location = New System.Drawing.Point(150, 41) + Me.ucrNudSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSize.Name = "ucrNudSize" + Me.ucrNudSize.Size = New System.Drawing.Size(45, 20) + Me.ucrNudSize.TabIndex = 13 + Me.ucrNudSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputSides + ' + Me.ucrInputSides.AddQuotesIfUnrecognised = True + Me.ucrInputSides.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputSides.GetSetSelectedIndex = -1 + Me.ucrInputSides.IsReadOnly = False + Me.ucrInputSides.Location = New System.Drawing.Point(236, 40) + Me.ucrInputSides.Name = "ucrInputSides" + Me.ucrInputSides.Size = New System.Drawing.Size(94, 21) + Me.ucrInputSides.TabIndex = 15 + ' + 'ucrChkWithSE + ' + Me.ucrChkWithSE.AutoSize = True + Me.ucrChkWithSE.Checked = False + Me.ucrChkWithSE.Location = New System.Drawing.Point(186, 17) + Me.ucrChkWithSE.Name = "ucrChkWithSE" + Me.ucrChkWithSE.Size = New System.Drawing.Size(133, 23) + Me.ucrChkWithSE.TabIndex = 10 + ' 'ucrInputStation ' Me.ucrInputStation.AddQuotesIfUnrecognised = True @@ -360,27 +401,76 @@ Partial Class dlgScatterPlot Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) Me.ucrChkLegend.TabIndex = 77 ' + 'ucrNudPointsize + ' + Me.ucrNudPointsize.AutoSize = True + Me.ucrNudPointsize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPointsize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudPointsize.Location = New System.Drawing.Point(174, 18) + Me.ucrNudPointsize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudPointsize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPointsize.Name = "ucrNudPointsize" + Me.ucrNudPointsize.Size = New System.Drawing.Size(45, 20) + Me.ucrNudPointsize.TabIndex = 34 + Me.ucrNudPointsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkColour + ' + Me.ucrChkColour.AutoSize = True + Me.ucrChkColour.Checked = False + Me.ucrChkColour.Location = New System.Drawing.Point(98, 48) + Me.ucrChkColour.Name = "ucrChkColour" + Me.ucrChkColour.Size = New System.Drawing.Size(114, 23) + Me.ucrChkColour.TabIndex = 84 + ' + 'ucrChkPosition + ' + Me.ucrChkPosition.AutoSize = True + Me.ucrChkPosition.Checked = False + Me.ucrChkPosition.Location = New System.Drawing.Point(257, 48) + Me.ucrChkPosition.Name = "ucrChkPosition" + Me.ucrChkPosition.Size = New System.Drawing.Size(79, 23) + Me.ucrChkPosition.TabIndex = 83 + ' + 'ucrChkSize + ' + Me.ucrChkSize.AutoSize = True + Me.ucrChkSize.Checked = False + Me.ucrChkSize.Location = New System.Drawing.Point(98, 19) + Me.ucrChkSize.Name = "ucrChkSize" + Me.ucrChkSize.Size = New System.Drawing.Size(77, 23) + Me.ucrChkSize.TabIndex = 82 + ' + 'ucrChkShape + ' + Me.ucrChkShape.AutoSize = True + Me.ucrChkShape.Checked = False + Me.ucrChkShape.Location = New System.Drawing.Point(250, 20) + Me.ucrChkShape.Name = "ucrChkShape" + Me.ucrChkShape.Size = New System.Drawing.Size(79, 23) + Me.ucrChkShape.TabIndex = 81 + ' 'ucrInputPosition ' Me.ucrInputPosition.AddQuotesIfUnrecognised = True Me.ucrInputPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputPosition.GetSetSelectedIndex = -1 Me.ucrInputPosition.IsReadOnly = False - Me.ucrInputPosition.Location = New System.Drawing.Point(240, 44) + Me.ucrInputPosition.Location = New System.Drawing.Point(329, 48) Me.ucrInputPosition.Name = "ucrInputPosition" - Me.ucrInputPosition.Size = New System.Drawing.Size(83, 21) + Me.ucrInputPosition.Size = New System.Drawing.Size(95, 21) Me.ucrInputPosition.TabIndex = 39 ' - 'ucrInputLegend + 'ucrInputColour ' - Me.ucrInputLegend.AddQuotesIfUnrecognised = True - Me.ucrInputLegend.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputLegend.GetSetSelectedIndex = -1 - Me.ucrInputLegend.IsReadOnly = False - Me.ucrInputLegend.Location = New System.Drawing.Point(111, 44) - Me.ucrInputLegend.Name = "ucrInputLegend" - Me.ucrInputLegend.Size = New System.Drawing.Size(61, 21) - Me.ucrInputLegend.TabIndex = 37 + Me.ucrInputColour.AddQuotesIfUnrecognised = True + Me.ucrInputColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputColour.GetSetSelectedIndex = -1 + Me.ucrInputColour.IsReadOnly = False + Me.ucrInputColour.Location = New System.Drawing.Point(176, 48) + Me.ucrInputColour.Name = "ucrInputColour" + Me.ucrInputColour.Size = New System.Drawing.Size(61, 21) + Me.ucrInputColour.TabIndex = 37 ' 'ucrInputShape ' @@ -388,30 +478,17 @@ Partial Class dlgScatterPlot Me.ucrInputShape.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputShape.GetSetSelectedIndex = -1 Me.ucrInputShape.IsReadOnly = False - Me.ucrInputShape.Location = New System.Drawing.Point(227, 16) + Me.ucrInputShape.Location = New System.Drawing.Point(329, 19) Me.ucrInputShape.Name = "ucrInputShape" Me.ucrInputShape.Size = New System.Drawing.Size(96, 21) Me.ucrInputShape.TabIndex = 35 ' - 'ucrNudPointsize - ' - Me.ucrNudPointsize.AutoSize = True - Me.ucrNudPointsize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudPointsize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPointsize.Location = New System.Drawing.Point(113, 17) - Me.ucrNudPointsize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudPointsize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudPointsize.Name = "ucrNudPointsize" - Me.ucrNudPointsize.Size = New System.Drawing.Size(45, 20) - Me.ucrNudPointsize.TabIndex = 34 - Me.ucrNudPointsize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'ucrNudHeigth ' Me.ucrNudHeigth.AutoSize = True Me.ucrNudHeigth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHeigth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudHeigth.Location = New System.Drawing.Point(227, 71) + Me.ucrNudHeigth.Location = New System.Drawing.Point(236, 77) Me.ucrNudHeigth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudHeigth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudHeigth.Name = "ucrNudHeigth" @@ -424,7 +501,7 @@ Partial Class dlgScatterPlot Me.ucrNudWidth.AutoSize = True Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWidth.Location = New System.Drawing.Point(113, 71) + Me.ucrNudWidth.Location = New System.Drawing.Point(123, 77) Me.ucrNudWidth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWidth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWidth.Name = "ucrNudWidth" @@ -437,7 +514,7 @@ Partial Class dlgScatterPlot Me.ucrPnlGeoms.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlGeoms.Location = New System.Drawing.Point(2, 14) Me.ucrPnlGeoms.Name = "ucrPnlGeoms" - Me.ucrPnlGeoms.Size = New System.Drawing.Size(321, 89) + Me.ucrPnlGeoms.Size = New System.Drawing.Size(433, 89) Me.ucrPnlGeoms.TabIndex = 24 ' 'cmdOptions @@ -453,39 +530,6 @@ Partial Class dlgScatterPlot Me.cmdOptions.Text = "Plot Options" Me.cmdOptions.UseVisualStyleBackColor = True ' - 'ucrInputSides - ' - Me.ucrInputSides.AddQuotesIfUnrecognised = True - Me.ucrInputSides.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputSides.GetSetSelectedIndex = -1 - Me.ucrInputSides.IsReadOnly = False - Me.ucrInputSides.Location = New System.Drawing.Point(236, 40) - Me.ucrInputSides.Name = "ucrInputSides" - Me.ucrInputSides.Size = New System.Drawing.Size(94, 21) - Me.ucrInputSides.TabIndex = 15 - ' - 'ucrNudSize - ' - Me.ucrNudSize.AutoSize = True - Me.ucrNudSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSize.Location = New System.Drawing.Point(150, 41) - Me.ucrNudSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSize.Name = "ucrNudSize" - Me.ucrNudSize.Size = New System.Drawing.Size(45, 20) - Me.ucrNudSize.TabIndex = 13 - Me.ucrNudSize.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkAddRugPlot - ' - Me.ucrChkAddRugPlot.AutoSize = True - Me.ucrChkAddRugPlot.Checked = False - Me.ucrChkAddRugPlot.Location = New System.Drawing.Point(6, 38) - Me.ucrChkAddRugPlot.Name = "ucrChkAddRugPlot" - Me.ucrChkAddRugPlot.Size = New System.Drawing.Size(108, 23) - Me.ucrChkAddRugPlot.TabIndex = 11 - ' 'ucrReceiverLabel ' Me.ucrReceiverLabel.AutoSize = True @@ -499,24 +543,6 @@ Partial Class dlgScatterPlot Me.ucrReceiverLabel.TabIndex = 7 Me.ucrReceiverLabel.ucrSelector = Nothing ' - 'ucrChkWithSE - ' - Me.ucrChkWithSE.AutoSize = True - Me.ucrChkWithSE.Checked = False - Me.ucrChkWithSE.Location = New System.Drawing.Point(186, 17) - Me.ucrChkWithSE.Name = "ucrChkWithSE" - Me.ucrChkWithSE.Size = New System.Drawing.Size(133, 23) - Me.ucrChkWithSE.TabIndex = 10 - ' - 'ucrChkLineofBestFit - ' - Me.ucrChkLineofBestFit.AutoSize = True - Me.ucrChkLineofBestFit.Checked = False - Me.ucrChkLineofBestFit.Location = New System.Drawing.Point(6, 16) - Me.ucrChkLineofBestFit.Name = "ucrChkLineofBestFit" - Me.ucrChkLineofBestFit.Size = New System.Drawing.Size(173, 24) - Me.ucrChkLineofBestFit.TabIndex = 9 - ' 'ucrSaveScatterPlot ' Me.ucrSaveScatterPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -586,32 +612,6 @@ Partial Class dlgScatterPlot Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 17 ' - 'ucrChkAddSidePlot - ' - Me.ucrChkAddSidePlot.AutoSize = True - Me.ucrChkAddSidePlot.Checked = False - Me.ucrChkAddSidePlot.Location = New System.Drawing.Point(6, 67) - Me.ucrChkAddSidePlot.Name = "ucrChkAddSidePlot" - Me.ucrChkAddSidePlot.Size = New System.Drawing.Size(134, 23) - Me.ucrChkAddSidePlot.TabIndex = 80 - ' - 'grpAdd - ' - Me.grpAdd.Controls.Add(Me.ucrChkLineofBestFit) - Me.grpAdd.Controls.Add(Me.ucrChkAddSidePlot) - Me.grpAdd.Controls.Add(Me.ucrChkAddRugPlot) - Me.grpAdd.Controls.Add(Me.lblSides) - Me.grpAdd.Controls.Add(Me.ucrNudSize) - Me.grpAdd.Controls.Add(Me.lblSize) - Me.grpAdd.Controls.Add(Me.ucrInputSides) - Me.grpAdd.Controls.Add(Me.ucrChkWithSE) - Me.grpAdd.Location = New System.Drawing.Point(9, 227) - Me.grpAdd.Name = "grpAdd" - Me.grpAdd.Size = New System.Drawing.Size(336, 95) - Me.grpAdd.TabIndex = 81 - Me.grpAdd.TabStop = False - Me.grpAdd.Text = "Add" - ' 'dlgScatterPlot ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -687,14 +687,10 @@ Partial Class dlgScatterPlot Friend WithEvents rdoCount As RadioButton Friend WithEvents rdoPoint As RadioButton Friend WithEvents toolStripMenuItemCountOptions As ToolStripMenuItem - Friend WithEvents lblPointsize As Label Friend WithEvents ucrNudPointsize As ucrNud - Friend WithEvents lblShape As Label Friend WithEvents ucrInputShape As ucrInputComboBox Friend WithEvents ucrInputPosition As ucrInputComboBox - Friend WithEvents lblPosition As Label - Friend WithEvents ucrInputLegend As ucrInputComboBox - Friend WithEvents lblLegend As Label + Friend WithEvents ucrInputColour As ucrInputComboBox Friend WithEvents ucrInputStation As ucrInputComboBox Friend WithEvents ucr1stFactorReceiver As ucrReceiverSingle Friend WithEvents lblFacetBy As Label @@ -702,4 +698,8 @@ Partial Class dlgScatterPlot Friend WithEvents ucrChkLegend As ucrCheck Friend WithEvents ucrChkAddSidePlot As ucrCheck Friend WithEvents grpAdd As GroupBox + Friend WithEvents ucrChkSize As ucrCheck + Friend WithEvents ucrChkShape As ucrCheck + Friend WithEvents ucrChkColour As ucrCheck + Friend WithEvents ucrChkPosition As ucrCheck End Class diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb index ed138c90efe..33a0a83fd51 100644 --- a/instat/dlgScatterPlot.vb +++ b/instat/dlgScatterPlot.vb @@ -68,6 +68,8 @@ Public Class dlgScatterPlot Private strGeomJitterParameterName As String = "geom_jitter" Private strGeomCountParameterName As String = "geom_count" Private strGeomParameterNames() As String = {strFirstParameterName, strGeomJitterParameterName, strGeomCountParameterName, strGeomSmoothParameterName, strGeomTextRepelParameterName} + Private strPickColour As String = "Pick Colour..." + Private dlgColour As New ColorDialog Private Sub dlgScatterPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -144,6 +146,26 @@ Public Class dlgScatterPlot ucrChkAddSidePlot.SetText("Side Plot") ucrChkAddSidePlot.Enabled = False + ucrChkSize.SetText("Size") + ucrChkSize.AddParameterPresentCondition(True, "geom_point") + ucrChkSize.AddParameterPresentCondition(False, "geom_point", False) + ucrChkSize.AddToLinkedControls({ucrNudPointsize}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkShape.SetText("Shape") + ucrChkShape.AddParameterPresentCondition(True, "geom_point") + ucrChkShape.AddParameterPresentCondition(False, "geom_point", False) + ucrChkShape.AddToLinkedControls({ucrInputShape}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkColour.SetText("Colour") + ucrChkColour.AddParameterPresentCondition(True, "geom_count") + ucrChkColour.AddParameterPresentCondition(False, "geom_count", False) + ucrChkColour.AddToLinkedControls({ucrInputColour}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkPosition.SetText("Position") + ucrChkPosition.AddParameterPresentCondition(True, "geom_count") + ucrChkPosition.AddParameterPresentCondition(False, "geom_count", False) + ucrChkPosition.AddToLinkedControls({ucrInputPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlGeoms.AddRadioButton(rdoJitter) ucrPnlGeoms.AddRadioButton(rdoPoint) ucrPnlGeoms.AddRadioButton(rdoCount) @@ -152,15 +174,16 @@ Public Class dlgScatterPlot ucrPnlGeoms.AddParameterValuesCondition(rdoCount, "checked", "geom_count") ucrPnlGeoms.AddParameterValuesCondition(rdoJitter, "checked", "geom_jitter") ucrPnlGeoms.AddToLinkedControls({ucrNudWidth, ucrNudHeigth}, {rdoJitter}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.40") - ucrPnlGeoms.AddToLinkedControls({ucrNudPointsize, ucrInputShape}, {rdoPoint}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlGeoms.AddToLinkedControls(ucrInputPosition, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="identity") - ucrPnlGeoms.AddToLinkedControls(ucrInputLegend, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="NA") + ucrPnlGeoms.AddToLinkedControls({ucrNudPointsize, ucrChkSize, ucrInputShape, ucrChkShape}, {rdoPoint}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlGeoms.AddToLinkedControls({ucrInputPosition}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="identity") + ucrPnlGeoms.AddToLinkedControls({ucrInputColour}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Black") + ucrPnlGeoms.AddToLinkedControls({ucrChkPosition, ucrChkColour}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSaveScatterPlot.SetPrefix("scatter_plot") ucrSaveScatterPlot.SetSaveType(strRObjectType:=RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) ucrSaveScatterPlot.SetDataFrameSelector(ucrSelectorForScatter.ucrAvailableDataFrames) - ucrSaveScatterPlot.SetCheckBoxText("Save Graph") + ucrSaveScatterPlot.SetCheckBoxText("Store Graph") ucrSaveScatterPlot.SetIsComboBox() ucrSaveScatterPlot.SetAssignToIfUncheckedValue("last_graph") @@ -221,10 +244,10 @@ Public Class dlgScatterPlot ucrInputPosition.SetItems({"identity", "stack", "dodge", "jitter", "fill", "position_dodge", "position_jitter(width=0.2,height=0.0)"}) ucrInputPosition.SetDropDownStyleAsNonEditable() - ucrInputLegend.SetParameter(New RParameter("show.legend", 11)) - ucrInputLegend.SetItems({"NA", "TRUE", "FALSE"}) - ucrInputLegend.SetDropDownStyleAsNonEditable() - ucrInputLegend.AddQuotesIfUnrecognised = False + ucrInputColour.SetParameter(New RParameter("colour", 11)) + ucrInputColour.SetItems({"NULL", strPickColour, "Black", "White", "Blue", "Red", "Yellow", "Purple", "Green", "Orange", "Grey", "Brown", "Pink"}) + ucrInputColour.SetDropDownStyleAsNonEditable() + ucrInputColour.AddQuotesIfUnrecognised = True ucrInputSides.SetParameter(New RParameter("sides", 1)) dctSidesOptions.Add("Bottom and left", Chr(34) & "bl" & Chr(34)) @@ -275,11 +298,8 @@ Public Class dlgScatterPlot ucrNudSize.SetLinkedDisplayControl(lblSize) ucrNudWidth.SetLinkedDisplayControl(lblWidth) ucrNudHeigth.SetLinkedDisplayControl(lblHeith) - ucrInputShape.SetLinkedDisplayControl(lblShape) - ucrNudPointsize.SetLinkedDisplayControl(lblPointsize) ucrInputSides.SetLinkedDisplayControl(lblSides) - ucrInputPosition.SetLinkedDisplayControl(lblPosition) - ucrInputLegend.SetLinkedDisplayControl(lblLegend) + End Sub Private Sub SetDefaults() @@ -423,7 +443,7 @@ Public Class dlgScatterPlot ucrInputSides.SetRCode(clsGeomRugFunction, bReset) ucrInputShape.SetRCode(clsRScatterGeomFunction, bReset) ucrNudPointsize.SetRCode(clsRScatterGeomFunction, bReset) - ucrInputLegend.SetRCode(clsCountGeomFunction, bReset) + ucrInputColour.SetRCode(clsCountGeomFunction, bReset) ucrInputPosition.SetRCode(clsCountGeomFunction, bReset) ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) @@ -566,7 +586,7 @@ Public Class dlgScatterPlot toolStripMenuItemTextrepelOptions.Enabled = Not ucrReceiverLabel.IsEmpty End Sub - Private Sub ucrPnlGeoms_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlGeoms.ControlValueChanged, ucrNudHeigth.ControlValueChanged, ucrNudWidth.ControlValueChanged, ucrInputLegend.ControlValueChanged, ucrInputPosition.ControlValueChanged, ucrInputShape.ControlValueChanged, ucrNudPointsize.ControlValueChanged + Private Sub ucrPnlGeoms_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlGeoms.ControlValueChanged, ucrNudHeigth.ControlValueChanged, ucrNudWidth.ControlValueChanged, ucrInputColour.ControlValueChanged, ucrInputPosition.ControlValueChanged, ucrInputShape.ControlValueChanged, ucrNudPointsize.ControlValueChanged If rdoJitter.Checked Then clsGeomJitterFunction.AddParameter("width", ucrNudWidth.GetText, iPosition:=0) clsGeomJitterFunction.AddParameter("height", ucrNudHeigth.GetText, iPosition:=1) @@ -579,6 +599,7 @@ Public Class dlgScatterPlot clsBaseOperator.RemoveParameterByName(strGeomCountParameterName) ElseIf rdoCount.Checked Then ChangePositionCount() + ChangeCountColour() clsBaseOperator.AddParameter(strGeomCountParameterName, clsRFunctionParameter:=clsCountGeomFunction, iPosition:=2) clsBaseOperator.RemoveParameterByName(strGeomJitterParameterName) clsBaseOperator.RemoveParameterByName(strFirstParameterName) @@ -595,6 +616,15 @@ Public Class dlgScatterPlot End If End Sub + Private Sub ChangeCountColour() + If ucrChkColour.Checked Then + clsCountGeomFunction.AddParameter("colour", Chr(34) & ucrInputColour.GetText & Chr(34), iPosition:=11) + Else + clsCountGeomFunction.RemoveParameterByName("colour") + End If + + End Sub + Private Sub AutoFacetStation() Dim currentReceiver As ucrReceiver = ucrSelectorForScatter.CurrentReceiver @@ -782,7 +812,34 @@ Public Class dlgScatterPlot End If End Sub - Private Sub ucrFactorOptionalReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrFactorOptionalReceiver.ControlValueChanged - AddRemoveGroupAesVar() + Private Sub ucrChkSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSize.ControlValueChanged, ucrNudPointsize.ControlValueChanged + If ucrChkSize.Checked AndAlso (Not ucrNudPointsize.IsEmpty) Then + clsRScatterGeomFunction.AddParameter("size", ucrNudPointsize.GetText, iPosition:=0) + Else + clsRScatterGeomFunction.RemoveParameterByName("size") + End If + End Sub + + Private Sub ucrInputColour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputColour.ControlValueChanged + Dim strColourItem As String + Dim clrTemp As Color + + If ucrInputColour.GetText() = strPickColour Then + Try + If dlgColour.ShowDialog() = DialogResult.OK Then + clrTemp = dlgColour.Color + 'first two character from Hex are fixed as FF for VB use, not part of colour value + 'ggplot requires # in front of Hex colour values + strColourItem = "#" & Hex(clrTemp.ToArgb).Substring(2, 6) + 'First item is NULL and needs to be changed before setting text otherwise value will not show in combobox + ucrInputColour.cboInput.Items.Item(0) = strColourItem + ucrInputColour.SetName(strColourItem) + Else + ucrInputColour.SetName("NULL") + End If + Catch ex As Exception + dlgColour.Dispose() + End Try + End If End Sub End Class diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index f16bb22c428..7ca7d373b6e 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -72,7 +72,7 @@ Public Class dlgScript ucrCboSaveOutputObjectFormat.SetLinkedDisplayControl(lblSaveObjectFormat) ucrCboSaveOutputObjectFormat.GetSetSelectedIndex = 0 - ucrSaveObject.SetLabelText("Save Graph") + ucrSaveObject.SetLabelText("Store Graph") ucrSaveObject.SetIsComboBox() ucrSaveObject.SetDataFrameSelector(ucrDataFrameSaveOutputSelect) diff --git a/instat/dlgSeasonalGraph.Designer.vb b/instat/dlgSeasonalGraph.Designer.vb index 32effdb64af..a310c25d833 100644 --- a/instat/dlgSeasonalGraph.Designer.vb +++ b/instat/dlgSeasonalGraph.Designer.vb @@ -22,13 +22,354 @@ Partial Class dlgSeasonalGraph 'Ne la modifiez pas à l'aide de l'éditeur de code. _ Private Sub InitializeComponent() + Me.rdoBar = New System.Windows.Forms.RadioButton() + Me.rdoLine = New System.Windows.Forms.RadioButton() + Me.lblXvariable = New System.Windows.Forms.Label() + Me.lblLines = New System.Windows.Forms.Label() + Me.lblFacetBy = New System.Windows.Forms.Label() + Me.lblFill = New System.Windows.Forms.Label() + Me.lblColour = New System.Windows.Forms.Label() + Me.ucrChkAddpointRibbon = New instat.ucrCheck() + Me.ucrChkColour = New instat.ucrCheck() + Me.ucrChkFill = New instat.ucrCheck() + Me.cmdOptions = New instat.ucrSplitButton() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucrReceiverFacetBy = New instat.ucrReceiverSingle() + Me.ucrChkRibbons = New instat.ucrCheck() + Me.ucrChkAddPoint = New instat.ucrCheck() + Me.ucrReceiverX = New instat.ucrReceiverSingle() + Me.ucrReceiverRibbons = New instat.ucrReceiverMultiple() + Me.ucrReceiverLines = New instat.ucrReceiverMultiple() + Me.ucrSave = New instat.ucrSave() + Me.ucrChkLegend = New instat.ucrCheck() + Me.ucrPnlOptions = New instat.UcrPanel() + Me.ucrSelectorForSeasonalGraph = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.ucrInputAddLegendLine = New instat.ucrInputComboBox() + Me.ucrInputAddLegendRibbon = New instat.ucrInputComboBox() Me.SuspendLayout() ' + 'rdoBar + ' + Me.rdoBar.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoBar.BackColor = System.Drawing.SystemColors.Control + Me.rdoBar.Enabled = False + Me.rdoBar.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoBar.FlatAppearance.BorderSize = 2 + Me.rdoBar.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoBar.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoBar.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoBar.Location = New System.Drawing.Point(204, 20) + Me.rdoBar.Name = "rdoBar" + Me.rdoBar.Size = New System.Drawing.Size(80, 28) + Me.rdoBar.TabIndex = 3 + Me.rdoBar.TabStop = True + Me.rdoBar.Tag = "" + Me.rdoBar.Text = "Bar" + Me.rdoBar.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoBar.UseVisualStyleBackColor = False + ' + 'rdoLine + ' + Me.rdoLine.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoLine.BackColor = System.Drawing.SystemColors.Control + Me.rdoLine.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoLine.FlatAppearance.BorderSize = 2 + Me.rdoLine.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoLine.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoLine.Location = New System.Drawing.Point(126, 20) + Me.rdoLine.Name = "rdoLine" + Me.rdoLine.Size = New System.Drawing.Size(80, 28) + Me.rdoLine.TabIndex = 2 + Me.rdoLine.TabStop = True + Me.rdoLine.Tag = "linepathstep" + Me.rdoLine.Text = "Line" + Me.rdoLine.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoLine.UseVisualStyleBackColor = False + ' + 'lblXvariable + ' + Me.lblXvariable.AutoSize = True + Me.lblXvariable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblXvariable.Location = New System.Drawing.Point(320, 285) + Me.lblXvariable.Name = "lblXvariable" + Me.lblXvariable.Size = New System.Drawing.Size(58, 13) + Me.lblXvariable.TabIndex = 6 + Me.lblXvariable.Text = "X Variable:" + ' + 'lblLines + ' + Me.lblLines.AutoSize = True + Me.lblLines.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLines.Location = New System.Drawing.Point(320, 68) + Me.lblLines.Name = "lblLines" + Me.lblLines.Size = New System.Drawing.Size(35, 13) + Me.lblLines.TabIndex = 4 + Me.lblLines.Text = "Lines:" + ' + 'lblFacetBy + ' + Me.lblFacetBy.AutoSize = True + Me.lblFacetBy.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacetBy.Location = New System.Drawing.Point(260, 417) + Me.lblFacetBy.Name = "lblFacetBy" + Me.lblFacetBy.Size = New System.Drawing.Size(100, 13) + Me.lblFacetBy.TabIndex = 8 + Me.lblFacetBy.Tag = "" + Me.lblFacetBy.Text = "Facet By (Optional):" + ' + 'lblFill + ' + Me.lblFill.AutoSize = True + Me.lblFill.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFill.Location = New System.Drawing.Point(14, 384) + Me.lblFill.Name = "lblFill" + Me.lblFill.Size = New System.Drawing.Size(41, 13) + Me.lblFill.TabIndex = 186 + Me.lblFill.Text = "Labels:" + ' + 'lblColour + ' + Me.lblColour.AutoSize = True + Me.lblColour.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColour.Location = New System.Drawing.Point(14, 332) + Me.lblColour.Name = "lblColour" + Me.lblColour.Size = New System.Drawing.Size(41, 13) + Me.lblColour.TabIndex = 187 + Me.lblColour.Text = "Labels:" + ' + 'ucrChkAddpointRibbon + ' + Me.ucrChkAddpointRibbon.AutoSize = True + Me.ucrChkAddpointRibbon.Checked = False + Me.ucrChkAddpointRibbon.Location = New System.Drawing.Point(319, 381) + Me.ucrChkAddpointRibbon.Name = "ucrChkAddpointRibbon" + Me.ucrChkAddpointRibbon.Size = New System.Drawing.Size(148, 23) + Me.ucrChkAddpointRibbon.TabIndex = 188 + ' + 'ucrChkColour + ' + Me.ucrChkColour.AutoSize = True + Me.ucrChkColour.Checked = False + Me.ucrChkColour.Location = New System.Drawing.Point(14, 301) + Me.ucrChkColour.Name = "ucrChkColour" + Me.ucrChkColour.Size = New System.Drawing.Size(147, 23) + Me.ucrChkColour.TabIndex = 22 + ' + 'ucrChkFill + ' + Me.ucrChkFill.AutoSize = True + Me.ucrChkFill.Checked = False + Me.ucrChkFill.Location = New System.Drawing.Point(14, 356) + Me.ucrChkFill.Name = "ucrChkFill" + Me.ucrChkFill.Size = New System.Drawing.Size(147, 23) + Me.ucrChkFill.TabIndex = 21 + ' + 'cmdOptions + ' + Me.cmdOptions.AutoSize = True + Me.cmdOptions.Location = New System.Drawing.Point(13, 266) + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Size = New System.Drawing.Size(148, 23) + Me.cmdOptions.TabIndex = 14 + Me.cmdOptions.Tag = "Plot Options" + Me.cmdOptions.Text = "Plot Options" + Me.cmdOptions.UseVisualStyleBackColor = True + ' + 'ucrInputLegendPosition + ' + Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True + Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 + Me.ucrInputLegendPosition.IsReadOnly = False + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(119, 431) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(82, 21) + Me.ucrInputLegendPosition.TabIndex = 18 + ' + 'ucrInputStation + ' + Me.ucrInputStation.AddQuotesIfUnrecognised = True + Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputStation.GetSetSelectedIndex = -1 + Me.ucrInputStation.IsReadOnly = False + Me.ucrInputStation.Location = New System.Drawing.Point(386, 431) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(82, 21) + Me.ucrInputStation.TabIndex = 10 + ' + 'ucrReceiverFacetBy + ' + Me.ucrReceiverFacetBy.AutoSize = True + Me.ucrReceiverFacetBy.frmParent = Me + Me.ucrReceiverFacetBy.Location = New System.Drawing.Point(259, 432) + Me.ucrReceiverFacetBy.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFacetBy.Name = "ucrReceiverFacetBy" + Me.ucrReceiverFacetBy.Selector = Nothing + Me.ucrReceiverFacetBy.Size = New System.Drawing.Size(120, 26) + Me.ucrReceiverFacetBy.strNcFilePath = "" + Me.ucrReceiverFacetBy.TabIndex = 9 + Me.ucrReceiverFacetBy.ucrSelector = Nothing + ' + 'ucrChkRibbons + ' + Me.ucrChkRibbons.AutoSize = True + Me.ucrChkRibbons.Checked = False + Me.ucrChkRibbons.Location = New System.Drawing.Point(319, 184) + Me.ucrChkRibbons.Name = "ucrChkRibbons" + Me.ucrChkRibbons.Size = New System.Drawing.Size(114, 23) + Me.ucrChkRibbons.TabIndex = 11 + ' + 'ucrChkAddPoint + ' + Me.ucrChkAddPoint.AutoSize = True + Me.ucrChkAddPoint.Checked = False + Me.ucrChkAddPoint.Location = New System.Drawing.Point(319, 331) + Me.ucrChkAddPoint.Name = "ucrChkAddPoint" + Me.ucrChkAddPoint.Size = New System.Drawing.Size(148, 23) + Me.ucrChkAddPoint.TabIndex = 15 + ' + 'ucrReceiverX + ' + Me.ucrReceiverX.AutoSize = True + Me.ucrReceiverX.frmParent = Me + Me.ucrReceiverX.Location = New System.Drawing.Point(319, 301) + Me.ucrReceiverX.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverX.Name = "ucrReceiverX" + Me.ucrReceiverX.Selector = Nothing + Me.ucrReceiverX.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverX.strNcFilePath = "" + Me.ucrReceiverX.TabIndex = 7 + Me.ucrReceiverX.ucrSelector = Nothing + ' + 'ucrReceiverRibbons + ' + Me.ucrReceiverRibbons.AutoSize = True + Me.ucrReceiverRibbons.frmParent = Me + Me.ucrReceiverRibbons.Location = New System.Drawing.Point(319, 207) + Me.ucrReceiverRibbons.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRibbons.Name = "ucrReceiverRibbons" + Me.ucrReceiverRibbons.Selector = Nothing + Me.ucrReceiverRibbons.Size = New System.Drawing.Size(120, 75) + Me.ucrReceiverRibbons.strNcFilePath = "" + Me.ucrReceiverRibbons.TabIndex = 12 + Me.ucrReceiverRibbons.ucrSelector = Nothing + ' + 'ucrReceiverLines + ' + Me.ucrReceiverLines.AutoSize = True + Me.ucrReceiverLines.frmParent = Me + Me.ucrReceiverLines.Location = New System.Drawing.Point(319, 82) + Me.ucrReceiverLines.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLines.Name = "ucrReceiverLines" + Me.ucrReceiverLines.Selector = Nothing + Me.ucrReceiverLines.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverLines.strNcFilePath = "" + Me.ucrReceiverLines.TabIndex = 5 + Me.ucrReceiverLines.ucrSelector = Nothing + ' + 'ucrSave + ' + Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSave.Location = New System.Drawing.Point(13, 472) + Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSave.Name = "ucrSave" + Me.ucrSave.Size = New System.Drawing.Size(451, 24) + Me.ucrSave.TabIndex = 13 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(13, 432) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(88, 23) + Me.ucrChkLegend.TabIndex = 17 + ' + 'ucrPnlOptions + ' + Me.ucrPnlOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlOptions.Location = New System.Drawing.Point(122, 12) + Me.ucrPnlOptions.Name = "ucrPnlOptions" + Me.ucrPnlOptions.Size = New System.Drawing.Size(220, 44) + Me.ucrPnlOptions.TabIndex = 1 + ' + 'ucrSelectorForSeasonalGraph + ' + Me.ucrSelectorForSeasonalGraph.AutoSize = True + Me.ucrSelectorForSeasonalGraph.bDropUnusedFilterLevels = False + Me.ucrSelectorForSeasonalGraph.bShowHiddenColumns = False + Me.ucrSelectorForSeasonalGraph.bUseCurrentFilter = True + Me.ucrSelectorForSeasonalGraph.Location = New System.Drawing.Point(13, 68) + Me.ucrSelectorForSeasonalGraph.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorForSeasonalGraph.Name = "ucrSelectorForSeasonalGraph" + Me.ucrSelectorForSeasonalGraph.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorForSeasonalGraph.TabIndex = 0 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(22, 517) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 19 + ' + 'ucrInputAddLegendLine + ' + Me.ucrInputAddLegendLine.AddQuotesIfUnrecognised = True + Me.ucrInputAddLegendLine.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputAddLegendLine.GetSetSelectedIndex = -1 + Me.ucrInputAddLegendLine.IsReadOnly = False + Me.ucrInputAddLegendLine.Location = New System.Drawing.Point(64, 326) + Me.ucrInputAddLegendLine.Name = "ucrInputAddLegendLine" + Me.ucrInputAddLegendLine.Size = New System.Drawing.Size(205, 23) + Me.ucrInputAddLegendLine.TabIndex = 219 + ' + 'ucrInputAddLegendRibbon + ' + Me.ucrInputAddLegendRibbon.AddQuotesIfUnrecognised = True + Me.ucrInputAddLegendRibbon.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputAddLegendRibbon.GetSetSelectedIndex = -1 + Me.ucrInputAddLegendRibbon.IsReadOnly = False + Me.ucrInputAddLegendRibbon.Location = New System.Drawing.Point(64, 381) + Me.ucrInputAddLegendRibbon.Name = "ucrInputAddLegendRibbon" + Me.ucrInputAddLegendRibbon.Size = New System.Drawing.Size(205, 23) + Me.ucrInputAddLegendRibbon.TabIndex = 220 + ' 'dlgSeasonalGraph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(600, 450) + Me.ClientSize = New System.Drawing.Size(477, 573) + Me.Controls.Add(Me.ucrInputAddLegendRibbon) + Me.Controls.Add(Me.ucrInputAddLegendLine) + Me.Controls.Add(Me.ucrChkAddpointRibbon) + Me.Controls.Add(Me.lblColour) + Me.Controls.Add(Me.lblFill) + Me.Controls.Add(Me.ucrChkColour) + Me.Controls.Add(Me.ucrChkFill) + Me.Controls.Add(Me.cmdOptions) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrInputStation) + Me.Controls.Add(Me.ucrReceiverFacetBy) + Me.Controls.Add(Me.lblFacetBy) + Me.Controls.Add(Me.ucrChkRibbons) + Me.Controls.Add(Me.ucrChkAddPoint) + Me.Controls.Add(Me.lblXvariable) + Me.Controls.Add(Me.ucrReceiverX) + Me.Controls.Add(Me.ucrReceiverRibbons) + Me.Controls.Add(Me.lblLines) + Me.Controls.Add(Me.ucrReceiverLines) + Me.Controls.Add(Me.ucrSave) + Me.Controls.Add(Me.ucrChkLegend) + Me.Controls.Add(Me.rdoBar) + Me.Controls.Add(Me.rdoLine) + Me.Controls.Add(Me.ucrPnlOptions) + Me.Controls.Add(Me.ucrSelectorForSeasonalGraph) + Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -36,6 +377,34 @@ Partial Class dlgSeasonalGraph Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Seasonal Graph" Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents ucrSelectorForSeasonalGraph As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents rdoBar As RadioButton + Friend WithEvents rdoLine As RadioButton + Friend WithEvents ucrPnlOptions As UcrPanel + Friend WithEvents ucrChkAddPoint As ucrCheck + Friend WithEvents lblXvariable As Label + Friend WithEvents ucrReceiverX As ucrReceiverSingle + Friend WithEvents ucrChkRibbons As ucrCheck + Friend WithEvents ucrReceiverRibbons As ucrReceiverMultiple + Friend WithEvents lblLines As Label + Friend WithEvents ucrReceiverLines As ucrReceiverMultiple + Friend WithEvents ucrSave As ucrSave + Friend WithEvents ucrChkLegend As ucrCheck + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrInputStation As ucrInputComboBox + Friend WithEvents ucrReceiverFacetBy As ucrReceiverSingle + Friend WithEvents lblFacetBy As Label + Friend WithEvents cmdOptions As ucrSplitButton + Friend WithEvents ucrChkColour As ucrCheck + Friend WithEvents ucrChkFill As ucrCheck + Friend WithEvents lblColour As Label + Friend WithEvents lblFill As Label + Friend WithEvents ucrChkAddpointRibbon As ucrCheck + Friend WithEvents ucrInputAddLegendRibbon As ucrInputComboBox + Friend WithEvents ucrInputAddLegendLine As ucrInputComboBox End Class diff --git a/instat/dlgSeasonalGraph.vb b/instat/dlgSeasonalGraph.vb index 57ef68e0d9f..e21ea4601bf 100644 --- a/instat/dlgSeasonalGraph.vb +++ b/instat/dlgSeasonalGraph.vb @@ -1,3 +1,753 @@ -Public Class dlgSeasonalGraph +' 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 dlgSeasonalGraph + Private clsRaesFunction As New RFunction + Private clsBaseOperator As New ROperator + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private bResetSubdialog As Boolean = True + Private clsRggplotFunction As New RFunction + Private clsDummyFunction As New RFunction + Private clsFacetFunction As New RFunction + Private clsFacetOperator As New ROperator + Private clsFacetRowOp As New ROperator + Private clsFacetColOp As New ROperator + Private clsGroupByFunction As New RFunction + Private clsPipeOperator As New ROperator + Private clsThemeFunction As New RFunction + Private clsLabsFunction As New RFunction + Private clsXlabsFunction As New RFunction + Private clsYlabFunction As New RFunction + Private clsXScalecontinuousFunction As New RFunction + Private clsYScalecontinuousFunction As New RFunction + Private clsRFacetFunction As New RFunction + Private dctThemeFunctions As New Dictionary(Of String, RFunction) + Private clsCoordPolarFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + Private clsXScaleDateFunction As New RFunction + Private clsYScaleDateFunction As New RFunction + Private clsScaleFillViridisFunction As New RFunction + Private clsScaleColourViridisFunction As New RFunction + Private clsAnnotateFunction As New RFunction + Private clsScalefillidentityFunction As New RFunction + Private clsScalecolouridentityFunction As New RFunction + Private clsGetObjectDataFunction As New RFunction + Private bUpdatingParameters As Boolean = False + Private ReadOnly strFacetWrap As String = "Facet Wrap" + Private ReadOnly strFacetRow As String = "Facet Row" + Private ReadOnly strFacetCol As String = "Facet Column" + Private ReadOnly strNone As String = "None" + Private bUpdateComboOptions As Boolean = True + + 'Parameter names for geoms + Private strFirstParameterName As String = "geomLine" + Private strGeompointParameterName As String = "geom_point" + Private strGeompointParameterName1 As String = "geom_point" + Private strgeomRibbonParameterName As String = "geom_ribbon" + Private strgeomRibbonParameterName0 As String = "geom_ribbon" + Private strGeomParameterNames() As String = {strFirstParameterName, strgeomRibbonParameterName, strgeomRibbonParameterName0, strGeompointParameterName, strGeompointParameterName1} + + Private Sub dlgSeasonalGraph_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 + autoTranslate(Me) + TestOkEnabled() + End Sub + + Private Sub InitialiseDialog() + Dim dctLegendPosition As New Dictionary(Of String, String) + Dim dctColour As New Dictionary(Of String, String) + + ucrBase.iHelpTopicID = 522 + + ucrSelectorForSeasonalGraph.SetParameter(New RParameter("data", 0)) + ucrSelectorForSeasonalGraph.SetParameterIsrfunction() + + ucrPnlOptions.AddRadioButton(rdoLine) + ucrPnlOptions.AddRadioButton(rdoBar) + + ucrPnlOptions.AddParameterValuesCondition(rdoLine, "checked", "geom_line") + ucrPnlOptions.AddParameterValuesCondition(rdoBar, "checked", "geom_Bar") + + ucrReceiverLines.Selector = ucrSelectorForSeasonalGraph + ucrReceiverLines.strSelectorHeading = "Variables" + ucrReceiverLines.SetParameterIsString() + ucrReceiverLines.SetLinkedDisplayControl(lblLines) + ucrReceiverLines.bWithQuotes = False + + ucrReceiverX.Selector = ucrSelectorForSeasonalGraph + ucrReceiverX.SetParameter(New RParameter("x", 2)) + ucrReceiverX.SetParameterIsString() + ucrReceiverX.bWithQuotes = False + ucrReceiverX.strSelectorHeading = "Variables" + ucrReceiverX.SetLinkedDisplayControl(lblXvariable) + + ucrChkRibbons.SetText("Ribbon(s):") + ucrChkRibbons.AddParameterPresentCondition(True, "geom_ribbon") + ucrChkRibbons.AddParameterPresentCondition(False, "geom_ribbon", False) + ucrChkRibbons.AddToLinkedControls(ucrReceiverRibbons, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrReceiverRibbons.SetParameter(New RParameter("y", 1)) + ucrReceiverRibbons.Selector = ucrSelectorForSeasonalGraph + ucrReceiverRibbons.strSelectorHeading = "Variables" + ucrReceiverRibbons.SetParameterIsString() + ucrReceiverRibbons.bWithQuotes = False + ucrReceiverRibbons.iMaxItems = 4 + + ucrReceiverFacetBy.SetParameter(New RParameter("var1")) + ucrReceiverFacetBy.Selector = ucrSelectorForSeasonalGraph + ucrReceiverFacetBy.SetIncludedDataTypes({"factor"}) + ucrReceiverFacetBy.strSelectorHeading = "Factors" + ucrReceiverFacetBy.bWithQuotes = False + ucrReceiverFacetBy.SetParameterIsString() + ucrReceiverFacetBy.SetValuesToIgnore({"."}) + + ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputStation.SetDropDownStyleAsNonEditable() + + ucrChkLegend.SetText("Legend:") + ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") + ucrInputLegendPosition.SetDropDownStyleAsNonEditable() + ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) + dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) + dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + ucrInputLegendPosition.SetItems(dctLegendPosition) + ucrChkLegend.AddParameterPresentCondition(True, "legend.position") + ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) + + ucrChkAddPoint.SetText("Add Points on Lines") + ucrChkAddPoint.AddParameterValuesCondition(True, "checked", "True") + ucrChkAddPoint.AddParameterValuesCondition(False, "checked", "False") + + ucrChkAddpointRibbon.SetText("Add Points on Ribbons") + ucrChkAddpointRibbon.AddParameterValuesCondition(True, "checked", "True") + ucrChkAddpointRibbon.AddParameterValuesCondition(False, "checked", "False") + + ucrChkFill.SetText("Legend for Ribbons") + ucrChkFill.AddParameterValuesCondition(True, "checked", "True") + ucrChkFill.AddParameterValuesCondition(False, "checked", "False") + ucrChkFill.AddToLinkedControls(ucrInputAddLegendRibbon, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrInputAddLegendRibbon.SetValidationTypeAsList() + ucrInputAddLegendRibbon.SetItems({"Normal (Between Lower and Upper Tercile),Range 40th-90th Percentile", "A,B"}) + ucrInputAddLegendRibbon.SetLinkedDisplayControl(lblFill) + + ucrChkColour.SetText("Legend for Lines") + ucrChkColour.AddParameterValuesCondition(True, "checked", "True") + ucrChkColour.AddParameterValuesCondition(False, "checked", "False") + ucrChkColour.AddToLinkedControls(ucrInputAddLegendLine, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrInputAddLegendLine.SetValidationTypeAsList() + ucrInputAddLegendLine.SetItems({"Median,Record Low/High", "A,B", "maximum,minimum,mean"}) + ucrInputAddLegendLine.SetLinkedDisplayControl(lblColour) + + ucrSave.SetPrefix("Seasonal_Graph") + ucrSave.SetIsComboBox() + ucrSave.SetSaveTypeAsGraph() + ucrSave.SetCheckBoxText("Store Graph") + ucrSave.SetDataFrameSelector(ucrSelectorForSeasonalGraph.ucrAvailableDataFrames) + ucrSave.SetAssignToIfUncheckedValue("last_graph") + End Sub + + Private Sub SetDefaults() + clsRggplotFunction = New RFunction + clsRaesFunction = New RFunction + clsBaseOperator = New ROperator + clsDummyFunction = New RFunction + clsFacetFunction = New RFunction + clsScalecolouridentityFunction = New RFunction + clsScalefillidentityFunction = New RFunction + clsGetObjectDataFunction = New RFunction + clsFacetOperator = New ROperator + clsFacetRowOp = New ROperator + clsFacetColOp = New ROperator + clsPipeOperator = New ROperator + + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction + + ucrSelectorForSeasonalGraph.Reset() + ucrSelectorForSeasonalGraph.SetGgplotFunction(clsBaseOperator) + ucrSave.Reset() + ucrReceiverLines.SetMeAsReceiver() + bResetSubdialog = True + clsDummyFunction.AddParameter("checked", "geom_line", iPosition:=0) + + clsBaseOperator.SetOperation("+") + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + + clsRggplotFunction.SetPackageName("ggplot2") + clsRggplotFunction.SetRCommand("ggplot") + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesFunction, iPosition:=1) + + clsRaesFunction.SetPackageName("ggplot2") + clsRaesFunction.SetRCommand("aes") + + clsScalecolouridentityFunction.SetRCommand("scale_colour_identity") + clsScalecolouridentityFunction.AddParameter("name", "NULL", iPosition:=0) + clsScalecolouridentityFunction.AddParameter("guide", Chr(34) & "legend" & Chr(34), iPosition:=1) + + clsScalefillidentityFunction.SetRCommand("scale_fill_identity") + clsScalefillidentityFunction.AddParameter("name", "NULL", iPosition:=0) + clsScalefillidentityFunction.AddParameter("guide", Chr(34) & "legend" & Chr(34), iPosition:=1) + + clsFacetFunction.SetPackageName("ggplot2") + clsFacetRowOp.SetOperation("+") + clsFacetRowOp.bBrackets = False + clsFacetColOp.SetOperation("+") + clsFacetColOp.bBrackets = False + clsFacetOperator.SetOperation("~") + clsFacetOperator.bForceIncludeOperation = True + clsFacetOperator.bBrackets = False + clsFacetFunction.AddParameter("facets", clsROperatorParameter:=clsFacetOperator, iPosition:=0) + + clsPipeOperator.SetOperation("%>%") + SetPipeAssignTo() + + ucrInputStation.SetName(strFacetWrap) + ucrInputStation.bUpdateRCodeFromControl = True + + clsGroupByFunction.SetPackageName("dplyr") + clsGroupByFunction.SetRCommand("group_by") + + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction + clsXlabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() + clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone + clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() + clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() + clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() + clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() + dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) + clsXScaleDateFunction = GgplotDefaults.clsXScaleDateFunction.Clone() + clsYScaleDateFunction = GgplotDefaults.clsYScaleDateFunction.Clone() + clsScaleFillViridisFunction = GgplotDefaults.clsScaleFillViridisFunction + clsScaleColourViridisFunction = GgplotDefaults.clsScaleColorViridisFunction + clsAnnotateFunction = GgplotDefaults.clsAnnotateFunction + + clsGetObjectDataFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") + clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorForSeasonalGraph.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsGetObjectDataFunction.AddParameter("as_file", "TRUE", iPosition:=2) + + clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorForSeasonalGraph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") + ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction, iPosition:=0) + End Sub + + Private Sub SetCalculationHistory() + Dim newItem As String = ucrInputAddLegendLine.GetText().Trim() + + If Not String.IsNullOrEmpty(newItem) AndAlso Not ucrInputAddLegendLine.cboInput.Items.Contains(newItem) Then + ucrInputAddLegendLine.AddItems({newItem}) + End If + End Sub + + Private Sub SetCalculationHistory1() + Dim newItem As String = ucrInputAddLegendRibbon.GetText().Trim() + + If Not String.IsNullOrEmpty(newItem) AndAlso Not ucrInputAddLegendRibbon.cboInput.Items.Contains(newItem) Then + ucrInputAddLegendRibbon.AddItems({newItem}) + End If + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + ucrPnlOptions.SetRCode(clsDummyFunction, bReset) + ucrSelectorForSeasonalGraph.SetRCode(clsRggplotFunction, bReset) + ucrSave.SetRCode(clsBaseOperator, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + If bReset Then + ucrReceiverX.SetRCode(clsRaesFunction, bReset) + ucrChkColour.SetRCode(clsScalecolouridentityFunction, bReset) + ucrChkFill.SetRCode(clsScalefillidentityFunction, bReset) + ucrChkRibbons.SetRCode(clsBaseOperator, bReset) + ucrChkAddPoint.SetRCode(clsBaseOperator, bReset) + ucrChkAddpointRibbon.SetRCode(clsBaseOperator, bReset) + AutoFacetStation() + AutoFillmonth() + End If + End Sub + + Private Sub TestOkEnabled() + If Not ucrSave.IsComplete OrElse (ucrReceiverLines.IsEmpty AndAlso Not ucrChkRibbons.Checked) Then + ucrBase.OKEnabled(False) + ElseIf Not ucrSave.IsComplete OrElse (ucrReceiverRibbons.IsEmpty AndAlso ucrChkRibbons.Checked) Then + ucrBase.OKEnabled(False) + ElseIf ucrChkRibbons.Checked AndAlso ucrReceiverRibbons.lstSelectedVariables.Items.Count = 1 Then + ucrBase.OKEnabled(False) + ElseIf ucrChkRibbons.Checked AndAlso ucrReceiverRibbons.lstSelectedVariables.Items.Count = 3 Then + ucrBase.OKEnabled(False) + ElseIf ucrReceiverX.IsEmpty Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If + End Sub + + Private Sub ListGeomLine() + ' Clear parameters before adding new ones + clsBaseOperator.ClearParameters() + + ' Process ucrReceiverLines if not empty + If Not ucrReceiverLines.IsEmpty Then + If ucrChkColour.Checked Then + ' Add geom_line functions for ucrReceiverLines.lstSelectedVariables + For i As Integer = 0 To ucrReceiverLines.lstSelectedVariables.Items.Count - 1 + Dim clsRaeslineFunction As New RFunction + Dim ColourArguments As New List(Of String) From {"grey", "grey", "black", "grey"} + Dim LinewidthArguments As New List(Of String) From {"1.0", "1.0", "2.0", "1.0"} + Dim GroupArguments As New List(Of String) From {"grey", "grey", "grey", "grey"} + + clsRaeslineFunction.SetPackageName("ggplot2") + clsRaeslineFunction.SetRCommand("aes") + clsRaeslineFunction.AddParameter("y", ucrReceiverLines.lstSelectedVariables.Items(i).Text, iPosition:=0) + clsRaeslineFunction.AddParameter("colour", Chr(34) & ColourArguments(i) & Chr(34), iPosition:=1) + + Dim clsGeomLineFunction As New RFunction + clsGeomLineFunction.SetPackageName("ggplot2") + clsGeomLineFunction.SetRCommand("geom_line") + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaeslineFunction, iPosition:=1) + clsGeomLineFunction.AddParameter("linewidth", LinewidthArguments(i), iPosition:=2) + clsGeomLineFunction.AddParameter("group", Chr(34) & GroupArguments(i) & Chr(34), iPosition:=3) + + ' Add geom_line function to the base operator + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter(strFirstParameterName & i, clsRFunctionParameter:=clsGeomLineFunction, iPosition:=3) + Next + If Not ucrInputAddLegendLine.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("labels", ucrInputAddLegendLine.clsRList.ToScript(), iPosition:=2) + Else + clsScalecolouridentityFunction.RemoveParameterByName("labels") + End If + clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) + Else + For i As Integer = 0 To ucrReceiverLines.lstSelectedVariables.Items.Count - 1 + Dim clsRaeslineFunction As New RFunction + Dim ColourArguments1 As New List(Of String) From {"grey", "grey", "black", "grey"} + Dim LinewidthArguments1 As New List(Of String) From {"1.0", "1.0", "2.0", "1.0"} + + clsRaeslineFunction.SetPackageName("ggplot2") + clsRaeslineFunction.SetRCommand("aes") + clsRaeslineFunction.AddParameter("y", ucrReceiverLines.lstSelectedVariables.Items(i).Text, iPosition:=0) + + Dim clsGeomLineFunction As New RFunction + clsGeomLineFunction.SetPackageName("ggplot2") + clsGeomLineFunction.SetRCommand("geom_line") + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaeslineFunction, iPosition:=1) + clsGeomLineFunction.AddParameter("linewidth", LinewidthArguments1(i), iPosition:=2) + clsGeomLineFunction.AddParameter("colour", Chr(34) & ColourArguments1(i) & Chr(34), iPosition:=3) + + ' Add geom_line function to the base operator + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter(strFirstParameterName & i, clsRFunctionParameter:=clsGeomLineFunction, iPosition:=3) + Next + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + End If + ' Add points if ucrChkAddPoint is checked + If ucrChkAddPoint.Checked Then + For i As Integer = 0 To ucrReceiverLines.lstSelectedVariables.Items.Count - 1 + Dim clsAesGeompointFunction As New RFunction + clsAesGeompointFunction.SetPackageName("ggplot2") + clsAesGeompointFunction.SetRCommand("aes") + clsAesGeompointFunction.AddParameter("y", ucrReceiverLines.lstSelectedVariables.Items(i).Text, iPosition:=0) + + Dim clsGeomPointFunction As New RFunction + clsGeomPointFunction.SetPackageName("ggplot2") + clsGeomPointFunction.SetRCommand("geom_point") + clsGeomPointFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeompointFunction, iPosition:=1) + + ' Add geom_point function to the base operator + clsBaseOperator.AddParameter(strGeompointParameterName & "Line" & i, clsRFunctionParameter:=clsGeomPointFunction, iPosition:=9) + Next + Else + For i As Integer = 0 To ucrReceiverLines.lstSelectedVariables.Items.Count - 1 + clsBaseOperator.RemoveParameterByName(strGeompointParameterName & "Line" & i) + Next + End If + Else + For i As Integer = 0 To ucrReceiverLines.lstSelectedVariables.Items.Count - 1 + clsBaseOperator.RemoveParameterByName(strGeompointParameterName & "Line" & i) + clsBaseOperator.RemoveParameterByName(strFirstParameterName & i) + Next + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + End If + + ' Process ucrReceiverRibbons if not empty and ucrChkRibbons is checked + If ucrChkRibbons.Checked AndAlso Not ucrReceiverRibbons.IsEmpty Then + If ucrChkFill.Checked Then + clsBaseOperator.AddParameter("scale_fill_identity", clsRFunctionParameter:=clsScalefillidentityFunction, iPosition:=12) + For i As Integer = 0 To ucrReceiverRibbons.lstSelectedVariables.Items.Count - 1 Step 2 + ' Get current variable + Dim var1 = ucrReceiverRibbons.lstSelectedVariables.Items(i).Text + ' Get the next variable in the pair if available + Dim var2 As String = If(i + 1 < ucrReceiverRibbons.lstSelectedVariables.Items.Count, ucrReceiverRibbons.lstSelectedVariables.Items(i + 1).Text, "") + Dim fillArguments As New List(Of String) From {"#3270C1", "#A3A3A3", "#4DB0F1", "#FF5733"} + + If Not String.IsNullOrEmpty(var2) Then + Dim clsRaesRibFunction As New RFunction + clsRaesRibFunction.SetPackageName("ggplot2") + clsRaesRibFunction.SetRCommand("aes") + clsRaesRibFunction.AddParameter("ymax", var1, iPosition:=0) + clsRaesRibFunction.AddParameter("ymin", var2, iPosition:=1) + clsRaesRibFunction.AddParameter("fill", Chr(34) & fillArguments(i) & Chr(34), iPosition:=2) + + Dim clsRibFunction As New RFunction + clsRibFunction.SetPackageName("ggplot2") + clsRibFunction.SetRCommand("geom_ribbon") + clsRibFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesRibFunction, iPosition:=1) + + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter(strgeomRibbonParameterName0 & i, clsRFunctionParameter:=clsRibFunction, iPosition:=1) + End If + Next + If Not ucrInputAddLegendRibbon.IsEmpty Then + clsScalefillidentityFunction.AddParameter("labels", ucrInputAddLegendRibbon.clsRList.ToScript(), iPosition:=2) + Else + clsScalefillidentityFunction.RemoveParameterByName("labels") + End If + Else + For i As Integer = 0 To ucrReceiverRibbons.lstSelectedVariables.Items.Count - 1 Step 2 + ' Get current variable + Dim var1 = ucrReceiverRibbons.lstSelectedVariables.Items(i).Text + ' Get the next variable in the pair if available + Dim var2 As String = If(i + 1 < ucrReceiverRibbons.lstSelectedVariables.Items.Count, ucrReceiverRibbons.lstSelectedVariables.Items(i + 1).Text, "") + Dim fillArguments As New List(Of String) From {"#3270C1", "#A3A3A3", "#4DB0F1", "#FF5733"} + + If Not String.IsNullOrEmpty(var2) Then + Dim clsRaesRibFunction As New RFunction + clsRaesRibFunction.SetPackageName("ggplot2") + clsRaesRibFunction.SetRCommand("aes") + clsRaesRibFunction.AddParameter("ymax", var1, iPosition:=0) + clsRaesRibFunction.AddParameter("ymin", var2, iPosition:=1) + + Dim clsRibFunction As New RFunction + clsRibFunction.SetPackageName("ggplot2") + clsRibFunction.SetRCommand("geom_ribbon") + clsRibFunction.AddParameter("mapping", clsRFunctionParameter:=clsRaesRibFunction, iPosition:=1) + clsRibFunction.AddParameter("fill", Chr(34) & fillArguments(i) & Chr(34), iPosition:=2) + + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter(strgeomRibbonParameterName0 & i, clsRFunctionParameter:=clsRibFunction, iPosition:=1) + End If + Next + clsBaseOperator.RemoveParameterByName("scale_fill_identity") + End If + + ' Add points to ribbons if ucrChkAddpointRibbon is checked + If ucrChkAddpointRibbon.Checked Then + For Each selectedItem As ListViewItem In ucrReceiverRibbons.lstSelectedVariables.Items + Dim clsAesGeompointFunction1 As New RFunction + clsAesGeompointFunction1.SetPackageName("ggplot2") + clsAesGeompointFunction1.SetRCommand("aes") + clsAesGeompointFunction1.AddParameter("y", selectedItem.Text, iPosition:=0) + + Dim clsGeomPointFunction1 As New RFunction + clsGeomPointFunction1.SetPackageName("ggplot2") + clsGeomPointFunction1.SetRCommand("geom_point") + clsGeomPointFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesGeompointFunction1, iPosition:=1) + + ' Add geom_point function to the base operator with a unique parameter name + clsBaseOperator.AddParameter(strGeompointParameterName1 & "Ribbon" & ucrReceiverRibbons.lstSelectedVariables.Items.IndexOf(selectedItem), clsRFunctionParameter:=clsGeomPointFunction1, iPosition:=15) + Next + Else + For i As Integer = 0 To ucrReceiverRibbons.lstSelectedVariables.Items.Count - 1 + clsBaseOperator.RemoveParameterByName(strGeompointParameterName1 & "Ribbon" & i) + Next + End If + Else + For i As Integer = 0 To ucrReceiverRibbons.lstSelectedVariables.Items.Count - 1 + clsBaseOperator.RemoveParameterByName(strGeompointParameterName1 & "Ribbon" & i) + clsBaseOperator.RemoveParameterByName(strgeomRibbonParameterName0 & i) + Next + clsBaseOperator.RemoveParameterByName("scale_fill_identity") + End If + + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub UpdateParameters() + clsFacetOperator.RemoveParameterByName("var1") + clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) + clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters = True + ucrReceiverFacetBy.SetRCode(Nothing) + Select Case ucrInputStation.GetText() + Case strFacetWrap + ucrReceiverFacetBy.ChangeParameterName("var1") + ucrReceiverFacetBy.SetRCode(clsFacetOperator) + Case strFacetCol + ucrReceiverFacetBy.ChangeParameterName("col" & ucrInputStation.Name) + ucrReceiverFacetBy.SetRCode(clsFacetColOp) + Case strFacetRow + ucrReceiverFacetBy.ChangeParameterName("row" & ucrInputStation.Name) + ucrReceiverFacetBy.SetRCode(clsFacetRowOp) + End Select + If Not clsRaesFunction.ContainsParameter("x") Then + clsRaesFunction.AddParameter("x", Chr(34) & Chr(34), iPosition:=1) + End If + bUpdatingParameters = False + End Sub + + Private Sub AddRemoveFacets() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucrReceiverFacetBy.IsEmpty Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + bWrap = True + Case strFacetCol + bCol = True + Case strFacetRow + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + End If + If bWrap Then + clsFacetFunction.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub AddRemoveGroupBy() + If clsPipeOperator.ContainsParameter("mutate") Then + clsGroupByFunction.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputStation.GetText() + Case strFacetWrap + GetParameterValue(clsFacetOperator) + Case strFacetCol + GetParameterValue(clsFacetColOp) + Case strFacetRow + GetParameterValue(clsFacetRowOp) + End Select + End If + If clsGroupByFunction.iParameterCount > 0 Then + clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator.RemoveParameterByName("group_by") + End If + SetPipeAssignTo() + End Sub + + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged + If Not bUpdateComboOptions Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol AndAlso Not strChangedText = strFacetRow AndAlso + Not ucrInputStation.Equals(ucrChangedControl) AndAlso ucrInputStation.GetText() = strChangedText Then + bUpdateComboOptions = False + ucrInputStation.SetName(strNone) + bUpdateComboOptions = True + End If + If (strChangedText = strFacetWrap AndAlso ucrInputStation.GetText = strFacetRow) OrElse (strChangedText = strFacetRow AndAlso + ucrInputStation.GetText = strFacetWrap) OrElse (strChangedText = strFacetWrap AndAlso + ucrInputStation.GetText = strFacetCol) OrElse (strChangedText = strFacetCol AndAlso ucrInputStation.GetText = strFacetWrap) Then + ucrInputStation.SetName(strNone) + End If + End If + UpdateParameters() + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub GetParameterValue(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub SetPipeAssignTo() + If ucrSelectorForSeasonalGraph.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then + clsPipeOperator.SetAssignTo(ucrSelectorForSeasonalGraph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator.RemoveAssignTo() + End If + End Sub + + Private Sub ucrReceiverFacetBy_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFacetBy.ControlValueChanged + AddRemoveFacets() + AddRemoveGroupBy() + End Sub + + Private Sub AutoFacetStation() + Dim ucrCurrentReceiver As ucrReceiver = Nothing + + If ucrSelectorForSeasonalGraph.CurrentReceiver IsNot Nothing Then + ucrCurrentReceiver = ucrSelectorForSeasonalGraph.CurrentReceiver + End If + ucrReceiverFacetBy.AddItemsWithMetadataProperty(ucrSelectorForSeasonalGraph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + If ucrCurrentReceiver IsNot Nothing Then + ucrCurrentReceiver.SetMeAsReceiver() + End If + AddRemoveGroupBy() + End Sub + + Private Sub AutoFillmonth() + Dim ucrCurrentReceiver0 As ucrReceiver = Nothing + + If ucrSelectorForSeasonalGraph.CurrentReceiver IsNot Nothing Then + ucrCurrentReceiver0 = ucrSelectorForSeasonalGraph.CurrentReceiver + End If + ucrReceiverX.AddItemsWithMetadataProperty(ucrSelectorForSeasonalGraph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"month_label"}) + If ucrCurrentReceiver0 IsNot Nothing Then + ucrCurrentReceiver0.SetMeAsReceiver() + End If + End Sub + + Private Sub ucrReceiverLines_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLines.ControlValueChanged + ListGeomLine() + End Sub + + Private Sub AddRemoveTheme() + If clsThemeFunction.iParameterCount > 0 Then + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("theme") + End If + End Sub + + Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + AddRemoveTheme() + End Sub + + Private Sub ucrSelectorForSeasonalGraph_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForSeasonalGraph.ControlValueChanged + AutoFacetStation() + SetPipeAssignTo() + AutoFillmonth() + End Sub + + Private Sub ucrBase_Click(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + End Sub + + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click ', PlotOptionsToolStripMenuItem.Click + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, + clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, + clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, ucrNewBaseSelector:=ucrSelectorForSeasonalGraph, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewFacetVariablesOperator:=clsFacetOperator, + strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) + sdgPlots.ShowDialog() + bResetSubdialog = False + End Sub + + Private Sub ucrChkRibbons_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkRibbons.ControlValueChanged, ucrReceiverRibbons.ControlValueChanged + ListGeomLine() + If ucrChkRibbons.Checked Then + ucrReceiverRibbons.SetMeAsReceiver() + Else + clsBaseOperator.RemoveParameterByName(strgeomRibbonParameterName0) + End If + End Sub + + Private Sub ucrReceiverX_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverX.ControlValueChanged + Dim variableNames As String = String.Join(",", ucrReceiverX.GetVariableNames()) + ' Concatenate the variable names with commas + variableNames = variableNames.Replace("'", "").Replace("""", "") + + If Not ucrReceiverX.IsEmpty AndAlso (ucrReceiverX.strCurrDataType.Contains("factor") OrElse ucrReceiverX.strCurrDataType = "ordered,factor") Then + clsRaesFunction.AddParameter("group", "1", iPosition:=3) + Else + clsRaesFunction.RemoveParameterByName("group") + clsRaesFunction.AddParameter("x", variableNames) + End If + End Sub + + Private Sub ucrChkAddPoint_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddPoint.ControlValueChanged + ListGeomLine() + End Sub + + Private Sub ucrChkFill_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkFill.ControlValueChanged, ucrChkColour.ControlValueChanged, ucrInputAddLegendRibbon.ControlValueChanged, ucrInputAddLegendLine.ControlValueChanged + ListGeomLine() + SetCalculationHistory() + SetCalculationHistory1() + End Sub + + Private Sub ucrChkAddpointRibbon_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddpointRibbon.ControlValueChanged + ListGeomLine() + End Sub + + Private Sub ucrSelectorForSeasonalGraph_DataFrameChanged() Handles ucrSelectorForSeasonalGraph.DataFrameChanged + clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorForSeasonalGraph.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + End Sub + + Private Sub ucrSave_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSave.ControlValueChanged + If ucrSave.ucrChkSave.Checked Then + clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & ucrSave.GetText & Chr(34), iPosition:=1) + Else + clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & "last_graph" & Chr(34), iPosition:=1) + End If + End Sub + + Private Sub AllControl_ControlContentsChanged() Handles ucrReceiverX.ControlContentsChanged, ucrReceiverRibbons.ControlContentsChanged, ucrReceiverLines.ControlContentsChanged, ucrSave.ControlContentsChanged + TestOkEnabled() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgSeasonalPlot.vb b/instat/dlgSeasonalPlot.vb index 2df8b779213..fa976b592a8 100644 --- a/instat/dlgSeasonalPlot.vb +++ b/instat/dlgSeasonalPlot.vb @@ -183,7 +183,7 @@ Public Class dlgSeasonalPlot ucrSaveGraph.SetPrefix("seasonality_plot") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetSaveTypeAsGraph() - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetDataFrameSelector(ucrSelectorSeasonalityComparisons.ucrAvailableDataFrames) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgSelect.Designer.vb b/instat/dlgSelect.Designer.vb index 3f679d4dff8..c31cfdfd7a3 100644 --- a/instat/dlgSelect.Designer.vb +++ b/instat/dlgSelect.Designer.vb @@ -66,9 +66,11 @@ Partial Class dlgSelect Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsSubset) Me.grpApplyOptions.Controls.Add(Me.rdoApplyAsSelect) Me.grpApplyOptions.Controls.Add(Me.ucrPnlApplyOptions) - Me.grpApplyOptions.Location = New System.Drawing.Point(13, 258) + Me.grpApplyOptions.Location = New System.Drawing.Point(10, 206) + Me.grpApplyOptions.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.grpApplyOptions.Name = "grpApplyOptions" - Me.grpApplyOptions.Size = New System.Drawing.Size(267, 126) + Me.grpApplyOptions.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpApplyOptions.Size = New System.Drawing.Size(214, 101) Me.grpApplyOptions.TabIndex = 4 Me.grpApplyOptions.TabStop = False Me.grpApplyOptions.Text = "Apply" @@ -76,22 +78,23 @@ Partial Class dlgSelect 'rdoApplySave ' Me.rdoApplySave.AutoSize = True - Me.rdoApplySave.Location = New System.Drawing.Point(9, 88) - Me.rdoApplySave.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.rdoApplySave.Location = New System.Drawing.Point(7, 70) + Me.rdoApplySave.Margin = New System.Windows.Forms.Padding(2) Me.rdoApplySave.Name = "rdoApplySave" - Me.rdoApplySave.Size = New System.Drawing.Size(101, 20) + Me.rdoApplySave.Size = New System.Drawing.Size(83, 17) Me.rdoApplySave.TabIndex = 3 Me.rdoApplySave.TabStop = True - Me.rdoApplySave.Text = "Save Select" + Me.rdoApplySave.Text = "Store Select" Me.rdoApplySave.UseVisualStyleBackColor = True ' 'rdoApplyAsSubset ' Me.rdoApplyAsSubset.AutoSize = True Me.rdoApplyAsSubset.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoApplyAsSubset.Location = New System.Drawing.Point(9, 59) + Me.rdoApplyAsSubset.Location = New System.Drawing.Point(7, 47) + Me.rdoApplyAsSubset.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.rdoApplyAsSubset.Name = "rdoApplyAsSubset" - Me.rdoApplyAsSubset.Size = New System.Drawing.Size(89, 20) + Me.rdoApplyAsSubset.Size = New System.Drawing.Size(73, 17) Me.rdoApplyAsSubset.TabIndex = 1 Me.rdoApplyAsSubset.TabStop = True Me.rdoApplyAsSubset.Text = "As Subset" @@ -101,9 +104,10 @@ Partial Class dlgSelect ' Me.rdoApplyAsSelect.AutoSize = True Me.rdoApplyAsSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoApplyAsSelect.Location = New System.Drawing.Point(9, 30) + Me.rdoApplyAsSelect.Location = New System.Drawing.Point(7, 24) + Me.rdoApplyAsSelect.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.rdoApplyAsSelect.Name = "rdoApplyAsSelect" - Me.rdoApplyAsSelect.Size = New System.Drawing.Size(156, 20) + Me.rdoApplyAsSelect.Size = New System.Drawing.Size(125, 17) Me.rdoApplyAsSelect.TabIndex = 0 Me.rdoApplyAsSelect.TabStop = True Me.rdoApplyAsSelect.Text = "As Selected Columns" @@ -112,10 +116,10 @@ Partial Class dlgSelect 'ucrPnlApplyOptions ' Me.ucrPnlApplyOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlApplyOptions.Location = New System.Drawing.Point(5, 21) - Me.ucrPnlApplyOptions.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrPnlApplyOptions.Location = New System.Drawing.Point(4, 17) + Me.ucrPnlApplyOptions.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrPnlApplyOptions.Name = "ucrPnlApplyOptions" - Me.ucrPnlApplyOptions.Size = New System.Drawing.Size(241, 95) + Me.ucrPnlApplyOptions.Size = New System.Drawing.Size(193, 76) Me.ucrPnlApplyOptions.TabIndex = 2 ' 'grpOptions @@ -123,11 +127,11 @@ Partial Class dlgSelect Me.grpOptions.Controls.Add(Me.ucrChkDialogue) Me.grpOptions.Controls.Add(Me.ucrChkMetaData) Me.grpOptions.Controls.Add(Me.ucrChkDataframe) - Me.grpOptions.Location = New System.Drawing.Point(286, 258) - Me.grpOptions.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpOptions.Location = New System.Drawing.Point(229, 206) + Me.grpOptions.Margin = New System.Windows.Forms.Padding(2) Me.grpOptions.Name = "grpOptions" - Me.grpOptions.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) - Me.grpOptions.Size = New System.Drawing.Size(241, 126) + Me.grpOptions.Padding = New System.Windows.Forms.Padding(2) + Me.grpOptions.Size = New System.Drawing.Size(193, 101) Me.grpOptions.TabIndex = 3 Me.grpOptions.TabStop = False Me.grpOptions.Text = "Apply To:" @@ -136,48 +140,50 @@ Partial Class dlgSelect ' Me.ucrChkDialogue.AutoSize = True Me.ucrChkDialogue.Checked = False - Me.ucrChkDialogue.Location = New System.Drawing.Point(12, 88) - Me.ucrChkDialogue.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) + Me.ucrChkDialogue.Location = New System.Drawing.Point(10, 70) + Me.ucrChkDialogue.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrChkDialogue.Name = "ucrChkDialogue" - Me.ucrChkDialogue.Size = New System.Drawing.Size(221, 29) + Me.ucrChkDialogue.Size = New System.Drawing.Size(177, 23) Me.ucrChkDialogue.TabIndex = 2 ' 'ucrChkMetaData ' Me.ucrChkMetaData.AutoSize = True Me.ucrChkMetaData.Checked = False - Me.ucrChkMetaData.Location = New System.Drawing.Point(12, 53) - Me.ucrChkMetaData.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) + Me.ucrChkMetaData.Location = New System.Drawing.Point(10, 42) + Me.ucrChkMetaData.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrChkMetaData.Name = "ucrChkMetaData" - Me.ucrChkMetaData.Size = New System.Drawing.Size(221, 29) + Me.ucrChkMetaData.Size = New System.Drawing.Size(177, 23) Me.ucrChkMetaData.TabIndex = 1 ' 'ucrChkDataframe ' Me.ucrChkDataframe.AutoSize = True Me.ucrChkDataframe.Checked = False - Me.ucrChkDataframe.Location = New System.Drawing.Point(12, 22) - Me.ucrChkDataframe.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) + Me.ucrChkDataframe.Location = New System.Drawing.Point(10, 18) + Me.ucrChkDataframe.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrChkDataframe.Name = "ucrChkDataframe" - Me.ucrChkDataframe.Size = New System.Drawing.Size(221, 29) + Me.ucrChkDataframe.Size = New System.Drawing.Size(177, 23) Me.ucrChkDataframe.TabIndex = 0 ' 'lblSelection ' Me.lblSelection.AutoSize = True Me.lblSelection.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSelection.Location = New System.Drawing.Point(312, 68) + Me.lblSelection.Location = New System.Drawing.Point(250, 54) + Me.lblSelection.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblSelection.Name = "lblSelection" - Me.lblSelection.Size = New System.Drawing.Size(66, 16) + Me.lblSelection.Size = New System.Drawing.Size(54, 13) Me.lblSelection.TabIndex = 1 Me.lblSelection.Text = "Selection:" ' 'cmdDefineNewSelect ' Me.cmdDefineNewSelect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDefineNewSelect.Location = New System.Drawing.Point(312, 122) + Me.cmdDefineNewSelect.Location = New System.Drawing.Point(250, 98) + Me.cmdDefineNewSelect.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.cmdDefineNewSelect.Name = "cmdDefineNewSelect" - Me.cmdDefineNewSelect.Size = New System.Drawing.Size(197, 38) + Me.cmdDefineNewSelect.Size = New System.Drawing.Size(158, 30) Me.cmdDefineNewSelect.TabIndex = 3 Me.cmdDefineNewSelect.Tag = "" Me.cmdDefineNewSelect.Text = "Define New Selection" @@ -186,9 +192,10 @@ Partial Class dlgSelect 'lblFilterPreview ' Me.lblFilterPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFilterPreview.Location = New System.Drawing.Point(13, 466) + Me.lblFilterPreview.Location = New System.Drawing.Point(10, 373) + Me.lblFilterPreview.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblFilterPreview.Name = "lblFilterPreview" - Me.lblFilterPreview.Size = New System.Drawing.Size(178, 28) + Me.lblFilterPreview.Size = New System.Drawing.Size(142, 22) Me.lblFilterPreview.TabIndex = 7 Me.lblFilterPreview.Text = "Selection Preview:" Me.lblFilterPreview.Visible = False @@ -196,9 +203,10 @@ Partial Class dlgSelect 'lblNewDataFrameName ' Me.lblNewDataFrameName.AutoSize = True - Me.lblNewDataFrameName.Location = New System.Drawing.Point(27, 428) + Me.lblNewDataFrameName.Location = New System.Drawing.Point(22, 342) + Me.lblNewDataFrameName.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblNewDataFrameName.Name = "lblNewDataFrameName" - Me.lblNewDataFrameName.Size = New System.Drawing.Size(151, 16) + Me.lblNewDataFrameName.Size = New System.Drawing.Size(121, 13) Me.lblNewDataFrameName.TabIndex = 5 Me.lblNewDataFrameName.Text = "New Data Frame Name:" ' @@ -208,10 +216,10 @@ Partial Class dlgSelect Me.ucrInputNewDataFrameName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputNewDataFrameName.GetSetSelectedIndex = -1 Me.ucrInputNewDataFrameName.IsReadOnly = False - Me.ucrInputNewDataFrameName.Location = New System.Drawing.Point(182, 422) - Me.ucrInputNewDataFrameName.Margin = New System.Windows.Forms.Padding(12, 12, 12, 12) + Me.ucrInputNewDataFrameName.Location = New System.Drawing.Point(146, 338) + Me.ucrInputNewDataFrameName.Margin = New System.Windows.Forms.Padding(10, 10, 10, 10) Me.ucrInputNewDataFrameName.Name = "ucrInputNewDataFrameName" - Me.ucrInputNewDataFrameName.Size = New System.Drawing.Size(172, 27) + Me.ucrInputNewDataFrameName.Size = New System.Drawing.Size(138, 22) Me.ucrInputNewDataFrameName.TabIndex = 6 ' 'ucrInputSelectPreview @@ -220,10 +228,10 @@ Partial Class dlgSelect Me.ucrInputSelectPreview.AutoSize = True Me.ucrInputSelectPreview.IsMultiline = True Me.ucrInputSelectPreview.IsReadOnly = False - Me.ucrInputSelectPreview.Location = New System.Drawing.Point(200, 455) - Me.ucrInputSelectPreview.Margin = New System.Windows.Forms.Padding(12, 12, 12, 12) + Me.ucrInputSelectPreview.Location = New System.Drawing.Point(160, 364) + Me.ucrInputSelectPreview.Margin = New System.Windows.Forms.Padding(10, 10, 10, 10) Me.ucrInputSelectPreview.Name = "ucrInputSelectPreview" - Me.ucrInputSelectPreview.Size = New System.Drawing.Size(318, 53) + Me.ucrInputSelectPreview.Size = New System.Drawing.Size(254, 42) Me.ucrInputSelectPreview.TabIndex = 8 Me.ucrInputSelectPreview.Visible = False ' @@ -231,11 +239,11 @@ Partial Class dlgSelect ' Me.ucrReceiverSelect.AutoSize = True Me.ucrReceiverSelect.frmParent = Me - Me.ucrReceiverSelect.Location = New System.Drawing.Point(313, 88) + Me.ucrReceiverSelect.Location = New System.Drawing.Point(250, 70) Me.ucrReceiverSelect.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSelect.Name = "ucrReceiverSelect" Me.ucrReceiverSelect.Selector = Nothing - Me.ucrReceiverSelect.Size = New System.Drawing.Size(195, 25) + Me.ucrReceiverSelect.Size = New System.Drawing.Size(156, 20) Me.ucrReceiverSelect.strNcFilePath = "" Me.ucrReceiverSelect.TabIndex = 2 Me.ucrReceiverSelect.ucrSelector = Nothing @@ -246,28 +254,28 @@ Partial Class dlgSelect Me.ucrSelectorForSelectColumns.bDropUnusedFilterLevels = False Me.ucrSelectorForSelectColumns.bShowHiddenColumns = False Me.ucrSelectorForSelectColumns.bUseCurrentFilter = True - Me.ucrSelectorForSelectColumns.Location = New System.Drawing.Point(13, 25) + Me.ucrSelectorForSelectColumns.Location = New System.Drawing.Point(10, 20) Me.ucrSelectorForSelectColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForSelectColumns.Name = "ucrSelectorForSelectColumns" - Me.ucrSelectorForSelectColumns.Size = New System.Drawing.Size(267, 228) + Me.ucrSelectorForSelectColumns.Size = New System.Drawing.Size(214, 183) Me.ucrSelectorForSelectColumns.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(13, 516) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) + Me.ucrBase.Location = New System.Drawing.Point(10, 413) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(511, 65) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 9 ' 'dlgSelect ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(120.0!, 120.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(537, 588) + Me.ClientSize = New System.Drawing.Size(430, 470) Me.Controls.Add(Me.grpOptions) Me.Controls.Add(Me.ucrInputNewDataFrameName) Me.Controls.Add(Me.lblNewDataFrameName) @@ -280,6 +288,7 @@ Partial Class dlgSelect Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.grpApplyOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgSelect" diff --git a/instat/dlgShowModel.vb b/instat/dlgShowModel.vb index 879bb8c8d14..c534781f14a 100644 --- a/instat/dlgShowModel.vb +++ b/instat/dlgShowModel.vb @@ -58,7 +58,7 @@ Public Class dlgShowModel ucrSaveGraph.SetPrefix("quant") ucrSaveGraph.SetIsComboBox() - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorShowModel.ucrAvailableDataFrames) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgSummaryBarOrPieChart.vb b/instat/dlgSummaryBarOrPieChart.vb index 63224a72d51..88ecfdc2b52 100644 --- a/instat/dlgSummaryBarOrPieChart.vb +++ b/instat/dlgSummaryBarOrPieChart.vb @@ -100,7 +100,7 @@ Public Class dlgSummaryBarOrPieChart ucrReceiverSecondFactor.SetParameterIsString() ucrSaveSummaryBar.SetIsComboBox() - ucrSaveSummaryBar.SetCheckBoxText("Save Graph") + ucrSaveSummaryBar.SetCheckBoxText("Store Graph") ucrSaveSummaryBar.SetDataFrameSelector(ucrSummaryBarSelector.ucrAvailableDataFrames) ucrSaveSummaryBar.SetSaveTypeAsGraph() ucrSaveSummaryBar.SetPrefix("bar") diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb index 4c553f4f818..bd7aba23fa4 100644 --- a/instat/dlgSummaryTables.vb +++ b/instat/dlgSummaryTables.vb @@ -182,7 +182,7 @@ Public Class dlgSummaryTables ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetDataFrameSelector(ucrSelectorSummaryTables.ucrAvailableDataFrames) ucrSaveTable.SetIsComboBox() - ucrSaveTable.SetCheckBoxText("Save Table") + ucrSaveTable.SetCheckBoxText("Store Table") ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrReorderSummary.bDataIsSummaries = True diff --git a/instat/dlgTaylorDiagram.vb b/instat/dlgTaylorDiagram.vb index 5de43bf7299..72e41922759 100644 --- a/instat/dlgTaylorDiagram.vb +++ b/instat/dlgTaylorDiagram.vb @@ -71,7 +71,7 @@ Public Class dlgTaylorDiagram ucrChkNormalise.SetRDefault("FALSE") ucrSavePlot.SetPrefix("taylor_diagram_plot") - ucrSavePlot.SetCheckBoxText("Save Graph") + ucrSavePlot.SetCheckBoxText("Store Graph") ucrSavePlot.SetIsComboBox() ucrSavePlot.SetSaveTypeAsGraph() ucrSavePlot.SetDataFrameSelector(ucrSelectorTaylorDiagram.ucrAvailableDataFrames) diff --git a/instat/dlgThreeVariableFrequencies.vb b/instat/dlgThreeVariableFrequencies.vb index a0a3c3e330b..e68f16c6c2a 100644 --- a/instat/dlgThreeVariableFrequencies.vb +++ b/instat/dlgThreeVariableFrequencies.vb @@ -291,12 +291,12 @@ Public Class dlgThreeVariableFrequencies ucrBase.clsRsyntax.SetBaseROperator(clsTableBaseOperator) ucrSaveGraph.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveGraph.SetAssignToIfUncheckedValue("last_summary") - ucrSaveGraph.SetCheckBoxText("Save Summary") + ucrSaveGraph.SetCheckBoxText("Store Summary") ElseIf rdoGraph.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsGridArrangeFunction) ucrSaveGraph.SetSaveType(RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") End If End Sub diff --git a/instat/dlgThreeVariablePivotTable.vb b/instat/dlgThreeVariablePivotTable.vb index eab53f5aee1..daf52c6c197 100644 --- a/instat/dlgThreeVariablePivotTable.vb +++ b/instat/dlgThreeVariablePivotTable.vb @@ -118,7 +118,7 @@ Public Class dlgThreeVariablePivotTable ucrSavePivot.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSavePivot.SetDataFrameSelector(ucrSelectorPivot.ucrAvailableDataFrames) ucrSavePivot.SetIsComboBox() - ucrSavePivot.SetCheckBoxText("Save Table") + ucrSavePivot.SetCheckBoxText("Store Table") ucrSavePivot.SetAssignToIfUncheckedValue("last_table") End Sub diff --git a/instat/dlgThreeVariablesModelling.vb b/instat/dlgThreeVariablesModelling.vb index 80a2882f804..b91e3764e6f 100644 --- a/instat/dlgThreeVariablesModelling.vb +++ b/instat/dlgThreeVariablesModelling.vb @@ -86,7 +86,7 @@ Public Class dlgThreeVariableModelling ucrSaveModel.SetPrefix("reg") ucrSaveModel.SetDataFrameSelector(ucrSelectorThreeVariableModelling.ucrAvailableDataFrames) ucrSaveModel.SetSaveTypeAsModel() - ucrSaveModel.SetCheckBoxText("Save Model") + ucrSaveModel.SetCheckBoxText("Store Model") ucrSaveModel.SetIsComboBox() ucrSaveModel.SetAssignToIfUncheckedValue("last_model") diff --git a/instat/dlgTimeSeriesPlot.vb b/instat/dlgTimeSeriesPlot.vb index 0ee96af11e3..aa55864e5f6 100644 --- a/instat/dlgTimeSeriesPlot.vb +++ b/instat/dlgTimeSeriesPlot.vb @@ -258,7 +258,7 @@ Public Class dlgTimeSeriesPlot ucrSavePlot.SetPrefix("line") ucrSavePlot.SetIsComboBox() - ucrSavePlot.SetCheckBoxText("Save Graph") + ucrSavePlot.SetCheckBoxText("Store Graph") ucrSavePlot.SetSaveTypeAsGraph() ucrSavePlot.SetDataFrameSelector(ucrSelectorTimeSeriesPlots.ucrAvailableDataFrames) ucrSavePlot.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgTransformClimatic.resx b/instat/dlgTransformClimatic.resx index 7df82c09ec8..f29598120cd 100644 --- a/instat/dlgTransformClimatic.resx +++ b/instat/dlgTransformClimatic.resx @@ -2248,7 +2248,7 @@ 28 - 9, 254 + 9, 248 428, 151 diff --git a/instat/dlgTransformClimatic.vb b/instat/dlgTransformClimatic.vb index d4b2ae83e7f..1b6f7c6009b 100644 --- a/instat/dlgTransformClimatic.vb +++ b/instat/dlgTransformClimatic.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class dlgTransformClimatic Private bFirstload As Boolean = True Private bReset As Boolean = True - Private clsRTransform, clsOverallTransformFunction, clsTransformManipulationsFunc, clsGroupByYear, clsGroupByStation, clsReplaceNAasElement, clsRTransformCountSpellSub As New RFunction + Private clsRTransform, clsAsNumericFunction, clsWaterBalanceFunction, clsOverallTransformFunction, clsTransformManipulationsFunc, clsGroupByYear, clsGroupByStation, clsReplaceNAasElement, clsRTransformCountSpellSub As New RFunction Private clsTransformCheck As New RFunction 'dummy @@ -34,9 +34,59 @@ Public Class dlgTransformClimatic Private clsRRaindayAndOperator, clsRRaindayOrOperator, clsRRaindayUpperOperator, clsRRaindayLowerOperator As New ROperator Private clsGreaterThanOperator, clsLessThanOperator As New ROperator - ' Water Balance - Private clsPMinFunctionMax, clsPMaxFunctionMax, clsRWaterBalanceFunction, clsTailFunction, clsWBEvaporation As New RFunction - Private clsPMaxOperatorMax, clsReduceOpEvapValue, clsWBOperator As New ROperator + ' Water Balance Min + Private clsEndSeasonWBMinCalc As New RFunction + Private clsEndSeasonWBMinCalcSubCalcsList As New RFunction + Private clsReduceWBMinFunction As New RFunction + Private clsReduceWBMinFunction1 As New RFunction + Private clsWBMinEvapOperator As New ROperator + Private clsWBEvaporationMinFunction As New RFunction + Private clsReduceWBMinFunction2 As New RFunction + Private clsEndSeasonRainMinCalc As New RFunction + Private clsPMinWBMinFunction As New RFunction + Private clsWBMinTailFunction1 As New RFunction + Private clsWBMinTailFunction As New RFunction + Private clsWBMinTailFunction2 As New RFunction + Private clsEndSeasonIsNaRain As New RFunction + Private clsEndSeasonConditionsOperator As New ROperator + Private clsEndSeasonCombinationCalc As New RFunction + Private clsEndSeasonCombinationSubCalcList As New RFunction + Private clsEndSeasonFirstDoySummaryCalc As New RFunction + Private clsGroupByStationYearCalc As New RFunction + Private clsDoyFilterOperator As New ROperator + Private clsDayFromOperator As New ROperator + Private clsDayToOperator As New ROperator + Private clsDoyFilterCalcFromConvert As New RFunction + Private clsDoyFilterCalcFromList As New RFunction + Private clsEndSeasonConditionsFilterSubCalcsList As New RFunction + Private clsEndSeasonWBCalc As New RFunction + Private clsEndSeasonWBCalcSubCalcsList As New RFunction + Private clsRoundFunction As New RFunction + Private clsEndSeasonWBConditionOperator As New ROperator + Private clsIfElseWBFunction As New RFunction + Private clsWBOperator As New ROperator + Private clsWBMinMaxOperator As New ROperator + Private clsIfElseRainMaxFunction As New RFunction + Private clsMinusMinOperator As New ROperator + Private clsMinusMaxOperator As New ROperator + Private clsEndSeasonRainMaxCalc As New RFunction + Private clsWBMaxTailFunction2 As New RFunction + Private clsWBMaxTailFunction As New RFunction + Private clsGroupByStationCalc As New RFunction + + ' Water Balance max + Private clsEndSeasonWBMaxCalc As New RFunction + Private clsEndSeasonWBMaxCalcSubCalcsList As New RFunction + Private clsReduceWBMaxFunction As New RFunction + Private clsPMinWBMaxFunction As New RFunction + Private clsReduceWBMaxFunction1 As New RFunction + Private clsWBMaxEvapOperator As New ROperator + Private clsPMaxFunction As New RFunction + Private clsWBOperator1 As New ROperator + Private clsWBMaxTailFunction1 As New RFunction + Private clsReduceWBMaxFunction2 As New RFunction + Private clsIfElseRainMinFunction As New RFunction + Private clsDoyFilterCalc As New RFunction 'Degree Private clsDiurnalRangeOperator, clsTMeanAddOperator, clsTMeanDivideOperator As New ROperator @@ -49,6 +99,12 @@ Public Class dlgTransformClimatic Private strCurrDataName As String = "" Private strRainDay As String = "rain_day" + Private strRainMin As String = "rain_min" + Private strRainMax As String = "rain_max" + Private strWBMin As String = "wb_min" + Private strWBMax As String = "wb_max" + Private strWB As String = "wb" + Private strEvapReplaceNA As String = "evap_NA_as_value" 'TODO:This will be useful when we want to resize dialog at different instances! 'Private iReceiverMaxY As Integer @@ -89,20 +145,18 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddRadioButton(rdoWaterBalance) ucrPnlTransform.AddRadioButton(rdoDegree) - ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoCumulative, "function_exp", {"cumsum", "cummin", "cummax"}) - ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoCount, "function_exp", "rollapply") - ucrPnlTransform.AddParameterPresentCondition(rdoCount, "sub_calculations", True) - ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoMoving, "function_exp", {"rollapply", "movingFun"}) - ucrPnlTransform.AddParameterPresentCondition(rdoMoving, "sub_calculations", False) - ucrPnlTransform.AddParameterIsStringCondition(rdoSpell, "function_exp") - ucrPnlTransform.AddFunctionNamesCondition(rdoMultSpells, "rollapply") - ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoWaterBalance, "function_exp", "Reduce") - ucrPnlTransform.AddParameterIsROperatorCondition(rdoDegree, "function_exp") + ucrPnlTransform.AddParameterValuesCondition(rdoCumulative, "checked", "cumsum") + ucrPnlTransform.AddParameterValuesCondition(rdoCount, "checked", "rollapply") + ucrPnlTransform.AddParameterValuesCondition(rdoMoving, "checked", "moving") + ucrPnlTransform.AddParameterValuesCondition(rdoSpell, "checked", "spell") + ucrPnlTransform.AddParameterValuesCondition(rdoMultSpells, "checked", "spells") + ucrPnlTransform.AddParameterValuesCondition(rdoWaterBalance, "checked", "Reduce") + ucrPnlTransform.AddParameterValuesCondition(rdoDegree, "checked", "degree") ucrPnlEvap.AddRadioButton(rdoEvapValue) ucrPnlEvap.AddRadioButton(rdoEvapVariable) - ucrPnlEvap.AddParameterPresentCondition(rdoEvapValue, "evaporation.value") - ucrPnlEvap.AddParameterPresentCondition(rdoEvapVariable, "evaporation.value", False) + ucrPnlEvap.AddParameterValuesCondition(rdoEvapValue, "evaporation.value", "value") + ucrPnlEvap.AddParameterValuesCondition(rdoEvapVariable, "evaporation.value", "variable") ucrPnlDegree.AddRadioButton(rdoTMean) ucrPnlDegree.AddRadioButton(rdoHeatingDegreeDays) @@ -110,11 +164,11 @@ Public Class dlgTransformClimatic ucrPnlDegree.AddRadioButton(rdoDiurnalRange) ucrPnlDegree.AddRadioButton(rdoModifiedGDD) - ucrPnlDegree.AddParameterValuesCondition(rdoModifiedGDD, "checked", "mgdd") - ucrPnlDegree.AddParameterValuesCondition(rdoDiurnalRange, "checked", "diurnal") - ucrPnlDegree.AddParameterValuesCondition(rdoTMean, "checked", "mean") - ucrPnlDegree.AddParameterValuesCondition(rdoHeatingDegreeDays, "checked", "hdd") - ucrPnlDegree.AddParameterValuesCondition(rdoGrowingDegreeDays, "checked", "gdd") + ucrPnlDegree.AddParameterValuesCondition(rdoModifiedGDD, "check", "mgdd") + ucrPnlDegree.AddParameterValuesCondition(rdoDiurnalRange, "check", "diurnal") + ucrPnlDegree.AddParameterValuesCondition(rdoTMean, "check", "mean") + ucrPnlDegree.AddParameterValuesCondition(rdoHeatingDegreeDays, "check", "hdd") + ucrPnlDegree.AddParameterValuesCondition(rdoGrowingDegreeDays, "check", "gdd") ttRdoRange.SetToolTip(rdoDiurnalRange, "Diurnal Range is the difference between Tmax And Tmin, (Tmax - Tmin)") ttRdoTMean.SetToolTip(rdoTMean, "Tmean is the average daily temperature, (Tmax + Tmin)/2") @@ -153,12 +207,10 @@ Public Class dlgTransformClimatic ucrReceiverData.SetIncludedDataTypes({"numeric"}) ucrReceiverData.SetLinkedDisplayControl(lblData) + ucrReceiverEvap.SetParameter(New RParameter("x", 0)) ucrReceiverEvap.Selector = ucrSelectorTransform - ucrReceiverEvap.SetParameter(New RParameter("right", 1, bNewIncludeArgumentName:=False)) ucrReceiverEvap.SetParameterIsString() ucrReceiverEvap.bWithQuotes = False - ucrReceiverEvap.strSelectorHeading = "Numerics" - ucrReceiverEvap.SetIncludedDataTypes({"numeric"}) ucrReceiverTMin.Selector = ucrSelectorTransform ucrReceiverTMin.SetParameter(New RParameter("tmin", 1)) @@ -226,11 +278,11 @@ Public Class dlgTransformClimatic ucrChkCircular.SetText("Circular") ucrChkCircular.SetLinkedDisplayControl(lblPosition) - ucrChkWB.SetParameter(New RParameter("WB_evap")) - ucrChkWB.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkWB.AddParameterPresentCondition(True, "WB_evap", True) + ucrChkWB.AddParameterPresentCondition(False, "WB_evap", False) ucrChkWB.SetText("Reducing") - ucrNudWB.SetParameter(New RParameter("WB_evap_value", 2)) + ucrNudWB.SetParameter(New RParameter("WB_evap_value", 2, False)) ucrNudWB.SetMinMax(0, 1) ucrNudWB.Increment = 0.01 ucrNudWB.DecimalPlaces = 2 @@ -255,6 +307,7 @@ Public Class dlgTransformClimatic ucrInputSpellLower.SetItems(dctInputLowerSpell) ucrInputSpellLower.AddQuotesIfUnrecognised = False ucrInputSpellLower.SetLinkedDisplayControl(lblCondition) + ucrInputSpellLower.SetRDefault("0.85") ucrInputSpellUpper.SetParameter(New RParameter("max", 1)) ucrInputSpellUpper.SetValidationTypeAsNumeric() @@ -267,14 +320,15 @@ Public Class dlgTransformClimatic ucrNudMultSpells.SetLinkedDisplayControl(lblRowsMultSpells) ' Water Balance - ucrNudWBCapacity.SetParameter(New RParameter("capacity", 1), False) + ucrNudWBCapacity.SetParameter(New RParameter("yes", 1)) ucrNudWBCapacity.SetMinMax(1, Integer.MaxValue) ucrNudWBCapacity.Increment = 10 ucrNudWBCapacity.SetLinkedDisplayControl(lblWBCapacity) - ucrInputEvaporation.SetParameter(New RParameter("evaporation.value", 1, False)) + ucrInputEvaporation.SetParameter(New RParameter("value", 1, bNewIncludeArgumentName:=False)) ucrInputEvaporation.SetValidationTypeAsNumeric() ucrInputEvaporation.AddQuotesIfUnrecognised = False + ucrInputEvaporation.SetRDefault("5") 'Degree ucrChkUseMaxMin.SetText("Use Max and Min") @@ -314,7 +368,7 @@ Public Class dlgTransformClimatic 'makes the ucrSave control to position new column after selected column ucrSaveColumn.setLinkedReceiver(ucrReceiverData) - ucrPnlEvap.AddToLinkedControls(ucrInputEvaporation, {rdoEvapValue}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlEvap.AddToLinkedControls(ucrInputEvaporation, {rdoEvapValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlEvap.AddToLinkedControls(ucrReceiverEvap, {rdoEvapVariable}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEvap.SetLinkedDisplayControl(lblWBEvaporation) @@ -333,7 +387,7 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddToLinkedControls(ucrChkCircular, {rdoMoving}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls(ucrNudMultSpells, {rdoMultSpells}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=21) ucrPnlTransform.AddToLinkedControls(ucrPnlEvap, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlTransform.AddToLinkedControls(ucrNudWBCapacity, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=60) + ucrPnlTransform.AddToLinkedControls(ucrNudWBCapacity, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=100) ucrPnlTransform.AddToLinkedControls(ucrChkGroupByYear, {rdoCount, rdoMoving, rdoSpell, rdoMultSpells, rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls({ucrReceiverYear, ucrReceiverData, ucrChkOptions}, {rdoCumulative, rdoCount, rdoMoving, rdoMultSpells, rdoSpell, rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls({ucrChkUseMaxMin, ucrPnlDegree}, {rdoDegree}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -342,7 +396,7 @@ Public Class dlgTransformClimatic ucrChkCircular.AddToLinkedControls(ucrInputPosition, {False}, bNewLinkedHideIfParameterMissing:=True) ucrInputCondition.AddToLinkedControls(ucrInputSpellUpper, {"<=", "Between", "Outer"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrInputCondition.AddToLinkedControls(ucrInputSpellLower, {"Between", "Outer", ">="}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.85) + ucrInputCondition.AddToLinkedControls(ucrInputSpellLower, {"Between", "Outer", ">="}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrReceiverYear.SetLinkedDisplayControl(lblYear) 'Temporary fix: ucrChkOptions is only used in linking ucrChkOptions.SetLinkedDisplayControl(grpTransform) @@ -352,6 +406,7 @@ Public Class dlgTransformClimatic Private Sub SetDefaults() clsRTransform = New RFunction clsOverallTransformFunction = New RFunction + clsWaterBalanceFunction = New RFunction clsTransformManipulationsFunc = New RFunction clsRTransformCountSpellSub = New RFunction @@ -365,9 +420,6 @@ Public Class dlgTransformClimatic clsRasterFuction = New RFunction clsReplaceNAasElement = New RFunction clsRCountFunction = New RFunction - clsRWaterBalanceFunction = New RFunction - clsWBEvaporation = New RFunction - clsTailFunction = New RFunction clsRRaindayMatch = New RFunction clsRRaindayAndOperator = New ROperator clsRRaindayOrOperator = New ROperator @@ -393,18 +445,62 @@ Public Class dlgTransformClimatic clsMeanAddOperator = New ROperator clsMeanDivideByOperator = New ROperator - clsPMinFunctionMax = New RFunction - clsPMaxFunctionMax = New RFunction - clsPMaxOperatorMax = New ROperator - clsWBOperator = New ROperator - clsGroupByYear.Clear() - clsReduceOpEvapValue.Clear() clsGreaterThanOperator.Clear() clsLessThanOperator.Clear() ucrSelectorTransform.Reset() ucrReceiverData.SetMeAsReceiver() + clsEndSeasonFirstDoySummaryCalc.Clear() + + clsGroupByStationYearCalc.Clear() + clsGroupByStationCalc.Clear() + clsEndSeasonWBCalc.Clear() + + ' Water Balance min + clsEndSeasonRainMinCalc.Clear() + clsEndSeasonWBMinCalc.Clear() + clsEndSeasonWBMinCalcSubCalcsList.Clear() + clsReduceWBMinFunction.Clear() + clsReduceWBMinFunction1.Clear() + clsWBMinEvapOperator.Clear() + clsWBEvaporationMinFunction.Clear() + clsPMaxFunction.Clear() + clsPMinWBMinFunction.Clear() + clsWBMinTailFunction.Clear() + clsWBMinTailFunction1.Clear() + clsWBMinTailFunction2.Clear() + clsIfElseRainMinFunction.Clear() + clsEndSeasonConditionsFilterSubCalcsList.Clear() + clsEndSeasonWBConditionOperator.Clear() + clsIfElseWBFunction.Clear() + clsRoundFunction.Clear() + clsWBMinMaxOperator.Clear() + clsEndSeasonRainMaxCalc.Clear() + clsWBMaxTailFunction2.Clear() + clsWBMaxTailFunction.Clear() + + ' Water Balance max + clsEndSeasonWBMaxCalc.Clear() + clsEndSeasonWBMaxCalcSubCalcsList.Clear() + clsReduceWBMaxFunction.Clear() + clsReduceWBMaxFunction1.Clear() + clsWBMaxEvapOperator.Clear() + clsWBOperator1.Clear() + clsWBMaxTailFunction1.Clear() + clsPMinWBMaxFunction.Clear() + clsEndSeasonWBCalcSubCalcsList.Clear() + clsReduceWBMaxFunction2.Clear() + clsReduceWBMinFunction2.Clear() + clsEndSeasonConditionsOperator.Clear() + clsEndSeasonCombinationCalc.Clear() + clsDoyFilterCalc.Clear() + clsDoyFilterOperator.Clear() + clsDayFromOperator.Clear() + clsDayToOperator.Clear() + clsDoyFilterCalcFromConvert.Clear() + clsDoyFilterCalcFromList.Clear() + ' Count and Spells: Rainday clsRRainday.SetRCommand("instat_calculation$new") clsRRainday.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) @@ -424,7 +520,6 @@ Public Class dlgTransformClimatic clsRRaindayUpperOperator.SetOperation("<=") clsRRaindayAndOperator.AddParameter("lower", clsROperatorParameter:=clsRRaindayLowerOperator, iPosition:=1) clsRRaindayLowerOperator.SetOperation(">=") - clsRRaindayLowerOperator.AddParameter("min", 0.85, iPosition:=1) clsRRaindayOrOperator.SetOperation("|") clsRRaindayOrOperator.AddParameter("upper", clsROperatorParameter:=clsGreaterThanOperator, iPosition:=0) @@ -483,41 +578,227 @@ Public Class dlgTransformClimatic clsRasterFuction.AddParameter("na.rm", "TRUE", iPosition:=5) clsRasterFuction.bToScriptAsRString = True - ' Water Balance - clsRWaterBalanceFunction.bToScriptAsRString = True - clsRWaterBalanceFunction.SetRCommand("Reduce") - clsRWaterBalanceFunction.AddParameter("x", clsRFunctionParameter:=clsPMinFunctionMax, iPosition:=0, bIncludeArgumentName:=False) - clsPMinFunctionMax.SetRCommand("function(x, y) pmin") - clsPMinFunctionMax.AddParameter("pmax", clsRFunctionParameter:=clsPMaxFunctionMax, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxFunctionMax.SetRCommand("pmax") - clsPMaxFunctionMax.AddParameter("calculation", clsROperatorParameter:=clsPMaxOperatorMax, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxOperatorMax.SetOperation("-") - clsPMaxOperatorMax.AddParameter("first", "x + y", iPosition:=0) - clsPMaxOperatorMax.AddParameter("evaporation.value", 5, iPosition:=1) - clsPMaxFunctionMax.AddParameter("0", 0, iPosition:=1, bIncludeArgumentName:=False) - clsPMinFunctionMax.AddParameter("capacity", 60, iPosition:=1, bIncludeArgumentName:=False) - clsRWaterBalanceFunction.AddParameter("replace_na", iPosition:=1, bIncludeArgumentName:=False) - clsRWaterBalanceFunction.AddParameter("accumulate", "TRUE", iPosition:=2) - - clsWBOperator.SetOperation("-") - clsWBOperator.AddParameter("left", "x + y", iPosition:=0) - clsWBOperator.AddParameter("right", clsRFunctionParameter:=clsWBEvaporation, iPosition:=1) - clsWBOperator.bSpaceAroundOperation = True - clsWBOperator.bBrackets = False - - clsReduceOpEvapValue.SetOperation("-") - - clsWBEvaporation.SetRCommand("WB_evaporation") - clsWBEvaporation.AddParameter("water_balance", "x", iPosition:=0, bIncludeArgumentName:=False) - clsWBEvaporation.AddParameter("WB_evap_value", 0.5, iPosition:=1, bIncludeArgumentName:=False) - clsWBEvaporation.AddParameter("capacity", 60, iPosition:=2, bIncludeArgumentName:=False) - clsWBEvaporation.AddParameter("evaporation_value", 5, iPosition:=3, bIncludeArgumentName:=False) - clsWBEvaporation.AddParameter("rain", "rain", iPosition:=4, bIncludeArgumentName:=False) - - clsTailFunction.SetPackageName("utils") - clsTailFunction.SetRCommand("tail") - clsTailFunction.AddParameter("x", "rain", iPosition:=0) - clsTailFunction.AddParameter("n", "-1", iPosition:=1) + clsGroupByStationCalc.SetRCommand("instat_calculation$new") + clsGroupByStationCalc.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0) + clsGroupByStationCalc.SetAssignTo("grouping_by_station") + + clsGroupByStationYearCalc.SetRCommand("instat_calculation$new") + clsGroupByStationYearCalc.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0) + clsGroupByStationYearCalc.SetAssignTo("grouping_by_station_year") + + clsEndSeasonCombinationSubCalcList.SetRCommand("list") + clsEndSeasonCombinationSubCalcList.AddParameter("sub1", clsRFunctionParameter:=clsEndSeasonFirstDoySummaryCalc, bIncludeArgumentName:=False, iPosition:=0) + + clsDoyFilterOperator.SetOperation("&") + clsDoyFilterOperator.AddParameter("from_operator", clsROperatorParameter:=clsDayFromOperator, iPosition:=0) + clsDoyFilterOperator.AddParameter("to_operator", clsROperatorParameter:=clsDayToOperator, iPosition:=1) + clsDoyFilterOperator.bBrackets = False + clsDoyFilterOperator.bToScriptAsRString = True + + clsDayFromOperator.SetOperation(">=") + clsDayFromOperator.AddParameter("from", 1, iPosition:=1) + + clsDayToOperator.SetOperation("<=") + clsDayToOperator.AddParameter("to", 366, iPosition:=1) + + clsDoyFilterCalcFromConvert.SetRCommand("calc_from_convert") + clsDoyFilterCalcFromConvert.AddParameter("x", clsRFunctionParameter:=clsDoyFilterCalcFromList, iPosition:=0) + + clsDoyFilterCalcFromList.SetRCommand("list") + + clsEndSeasonIsNaRain.SetRCommand("is.na") + + clsEndSeasonConditionsFilterSubCalcsList.SetRCommand("list") + clsEndSeasonConditionsFilterSubCalcsList.AddParameter("sub1", clsRFunctionParameter:=clsEndSeasonWBCalc, iPosition:=0, bIncludeArgumentName:=False) + + clsEndSeasonConditionsOperator.bToScriptAsRString = True + clsEndSeasonConditionsOperator.SetOperation("|") + clsEndSeasonConditionsOperator.AddParameter("0", clsROperatorParameter:=clsEndSeasonWBConditionOperator, iPosition:=0) + clsEndSeasonConditionsOperator.AddParameter("1", clsRFunctionParameter:=clsEndSeasonIsNaRain, iPosition:=1) + + clsEndSeasonWBConditionOperator.SetOperation("<=") + clsEndSeasonWBConditionOperator.AddParameter("0", strWB, iPosition:=0) + clsEndSeasonWBConditionOperator.AddParameter("1", "0.5", iPosition:=1) + + clsEndSeasonWBCalc.SetRCommand("instat_calculation$new") + clsEndSeasonWBCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonWBCalc.AddParameter("function_exp", clsRFunctionParameter:=clsRoundFunction, iPosition:=1) + clsEndSeasonWBCalc.AddParameter("save", "2", iPosition:=2) + clsEndSeasonWBCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBCalcSubCalcsList, iPosition:=5) + clsEndSeasonWBCalc.SetAssignTo(strWB) + + clsIfElseWBFunction.SetRCommand("ifelse") + clsIfElseWBFunction.AddParameter("test", clsROperatorParameter:=clsWBOperator, iPosition:=0) + clsIfElseWBFunction.AddParameter("yes", "NA", iPosition:=1) + clsIfElseWBFunction.AddParameter("no", strWBMin, iPosition:=2) + + clsRoundFunction.bToScriptAsRString = True + clsRoundFunction.SetRCommand("round") + clsRoundFunction.AddParameter("x", clsRFunctionParameter:=clsIfElseWBFunction, bIncludeArgumentName:=False, iPosition:=0) + clsRoundFunction.AddParameter("y", "1", iPosition:=1, bIncludeArgumentName:=False) + + clsWBOperator.SetOperation("|") + clsWBOperator.AddParameter("0", clsROperatorParameter:=clsWBMinMaxOperator, iPosition:=0) + clsWBOperator.AddParameter("1", clsRFunctionParameter:=clsEndSeasonIsNaRain, iPosition:=1) + + clsWBMinMaxOperator.SetOperation("!=") + clsWBMinMaxOperator.AddParameter("0", strWBMin, iPosition:=0) + clsWBMinMaxOperator.AddParameter("1", strWBMax, iPosition:=1) + + clsWBOperator1.SetOperation("-") + clsWBOperator1.AddParameter("left", "..1 + ..2", iPosition:=0) + clsWBOperator1.AddParameter("right", clsRFunctionParameter:=clsWBEvaporationMinFunction, iPosition:=1) + clsWBOperator1.bSpaceAroundOperation = True + clsWBOperator1.bBrackets = False + + clsWBEvaporationMinFunction.SetRCommand("WB_evaporation") + clsWBEvaporationMinFunction.AddParameter("water_balance", "..1", iPosition:=0, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("y", "..2", iPosition:=4, bIncludeArgumentName:=False) + + clsPMaxFunction.SetRCommand("pmax") + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMaxFunction.AddParameter("1", "0", bIncludeArgumentName:=False) + + clsIfElseRainMaxFunction.bToScriptAsRString = True + clsIfElseRainMaxFunction.SetRCommand("ifelse") + clsIfElseRainMaxFunction.AddParameter("test", clsRFunctionParameter:=clsEndSeasonIsNaRain, iPosition:=0) + clsIfElseRainMaxFunction.AddParameter("yes", 100, iPosition:=0) + + ' Water Balance min + clsEndSeasonWBMinCalc.SetRCommand("instat_calculation$new") + clsEndSeasonWBMinCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("result_name", Chr(34) & strWBMin & Chr(34), iPosition:=2) + clsEndSeasonWBMinCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBMinCalcSubCalcsList, iPosition:=3) + clsEndSeasonWBMinCalc.SetAssignTo(strWBMin) + + clsEndSeasonRainMinCalc.SetRCommand("instat_calculation$new") + clsEndSeasonRainMinCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonRainMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsIfElseRainMinFunction, iPosition:=1) + clsEndSeasonRainMinCalc.AddParameter("result_name", Chr(34) & strRainMin & Chr(34), iPosition:=2) + clsEndSeasonRainMinCalc.SetAssignTo(strRainMin) + + clsIfElseRainMinFunction.bToScriptAsRString = True + clsIfElseRainMinFunction.SetRCommand("ifelse") + clsIfElseRainMinFunction.AddParameter("test", clsRFunctionParameter:=clsEndSeasonIsNaRain, iPosition:=0) + clsIfElseRainMinFunction.AddParameter("yes", "0", iPosition:=1) + + clsEndSeasonWBMinCalcSubCalcsList.SetRCommand("list") + clsEndSeasonWBMinCalcSubCalcsList.AddParameter("0", strRainMin, iPosition:=0, bIncludeArgumentName:=False) + + clsReduceWBMinFunction.bToScriptAsRString = True + clsReduceWBMinFunction.SetPackageName("purrr") + clsReduceWBMinFunction.SetRCommand("accumulate") + clsReduceWBMinFunction.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) + clsReduceWBMinFunction.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMinFunction1.bToScriptAsRString = True + clsReduceWBMinFunction1.SetPackageName("purrr") + clsReduceWBMinFunction1.SetRCommand("accumulate2") + clsReduceWBMinFunction1.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction, iPosition:=1) + clsReduceWBMinFunction1.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMinFunction2.bToScriptAsRString = True + clsReduceWBMinFunction2.SetPackageName("purrr") + clsReduceWBMinFunction2.SetRCommand("accumulate") + clsReduceWBMinFunction2.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMinFunction, iPosition:=0) + clsReduceWBMinFunction2.AddParameter(".x", clsRFunctionParameter:=clsWBMinTailFunction2, iPosition:=1) + clsReduceWBMinFunction2.AddParameter(".init", "0", iPosition:=2) + + clsAsNumericFunction = New RFunction + clsAsNumericFunction.SetRCommand("as.numeric") + clsAsNumericFunction.AddParameter("x", ucrReceiverEvap.GetVariableNames(), iPosition:=0, bIncludeArgumentName:=False) + + clsMinusMinOperator = New ROperator + clsMinusMinOperator.SetOperation("-") + clsMinusMinOperator.AddParameter("left", strRainMin, iPosition:=0, bIncludeArgumentName:=False) + clsMinusMinOperator.AddParameter("right", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMinTailFunction2.SetRCommand("tail") + clsWBMinTailFunction2.AddParameter("x", clsROperatorParameter:=clsMinusMinOperator, iPosition:=0, bIncludeArgumentName:=False) + clsWBMinTailFunction2.AddParameter("n", "-1", iPosition:=1) + + clsPMinWBMinFunction.SetRCommand(" ~ pmin") + + clsEndSeasonWBCalcSubCalcsList.SetRCommand("list") + clsEndSeasonWBCalcSubCalcsList.AddParameter("0", strWBMin, iPosition:=0, bIncludeArgumentName:=False) + clsEndSeasonWBCalcSubCalcsList.AddParameter("1", strWBMax, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMinTailFunction.SetRCommand("tail") + clsWBMinTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMinEvapOperator, iPosition:=0) + clsWBMinTailFunction.AddParameter("n", "-1", iPosition:=1) + + clsWBMinTailFunction1.SetRCommand("tail") + clsWBMinTailFunction1.AddParameter("x", ucrReceiverEvap.GetVariableNames(False), iPosition:=0) + clsWBMinTailFunction1.AddParameter("n", "-1", iPosition:=1) + + clsWBMinEvapOperator.SetOperation("-") + clsWBMinEvapOperator.AddParameter("0", strRainMin, iPosition:=0) + clsWBMinEvapOperator.AddParameter("value", "5", iPosition:=1) + + ' Water Balance max + clsEndSeasonWBMaxCalc.SetRCommand("instat_calculation$new") + clsEndSeasonWBMaxCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) + clsEndSeasonWBMaxCalc.AddParameter("result_name", Chr(34) & strWBMax & Chr(34), iPosition:=2) + clsEndSeasonWBMaxCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsEndSeasonWBMaxCalcSubCalcsList, iPosition:=3) + clsEndSeasonWBMaxCalc.SetAssignTo(strWBMax) + + clsEndSeasonRainMaxCalc.SetRCommand("instat_calculation$new") + clsEndSeasonRainMaxCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsEndSeasonRainMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsIfElseRainMaxFunction, iPosition:=1) + clsEndSeasonRainMaxCalc.AddParameter("result_name", Chr(34) & strRainMax & Chr(34), iPosition:=2) + clsEndSeasonRainMaxCalc.SetAssignTo(strRainMax) + + clsEndSeasonWBMaxCalcSubCalcsList.SetRCommand("list") + clsEndSeasonWBMaxCalcSubCalcsList.AddParameter("0", strRainMax, iPosition:=0, bIncludeArgumentName:=False) + + clsMinusMaxOperator = New ROperator + clsMinusMaxOperator.SetOperation("-") + clsMinusMaxOperator.AddParameter("left", strRainMax, iPosition:=0, bIncludeArgumentName:=False) + clsMinusMaxOperator.AddParameter("right", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsWBMaxTailFunction2.SetRCommand("tail") + clsWBMaxTailFunction2.AddParameter("x", clsROperatorParameter:=clsMinusMaxOperator, iPosition:=0) + clsWBMaxTailFunction2.AddParameter("n", "-1", iPosition:=1) + + clsReduceWBMaxFunction.bToScriptAsRString = True + clsReduceWBMaxFunction.SetPackageName("purrr") + clsReduceWBMaxFunction.SetRCommand("accumulate") + clsReduceWBMaxFunction.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) + clsReduceWBMaxFunction.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMaxFunction1.bToScriptAsRString = True + clsReduceWBMaxFunction1.SetPackageName("purrr") + clsReduceWBMaxFunction1.SetRCommand("accumulate2") + clsReduceWBMaxFunction1.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction1.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".init", "0", iPosition:=2) + + clsReduceWBMaxFunction2.bToScriptAsRString = True + clsReduceWBMaxFunction2.SetPackageName("purrr") + clsReduceWBMaxFunction2.SetRCommand("accumulate") + clsReduceWBMaxFunction2.AddParameter(".f", clsRFunctionParameter:=clsPMinWBMaxFunction, iPosition:=0) + clsReduceWBMaxFunction2.AddParameter(".x", clsRFunctionParameter:=clsWBMaxTailFunction2, iPosition:=1) + clsReduceWBMaxFunction2.AddParameter(".init", "0", iPosition:=2) + + clsPMinWBMaxFunction.SetRCommand(" ~ pmin") + + clsWBMaxTailFunction.SetRCommand("tail") + clsWBMaxTailFunction.AddParameter("x", clsROperatorParameter:=clsWBMaxEvapOperator, iPosition:=0) + clsWBMaxTailFunction.AddParameter("n", "-1", iPosition:=1) + + clsWBMaxTailFunction1.SetRCommand("tail") + clsWBMaxTailFunction1.AddParameter("x", ucrReceiverEvap.GetVariableNames(False), iPosition:=0) + clsWBMaxTailFunction1.AddParameter("n", "-1", iPosition:=1) + + clsWBMaxEvapOperator.SetOperation("-") + clsWBMaxEvapOperator.AddParameter("0", strRainMax, iPosition:=0) + clsWBMaxEvapOperator.AddParameter("value", "5", iPosition:=1) + ' Degree clsDiurnalRangeOperator.SetOperation("-") clsDiurnalRangeOperator.bToScriptAsRString = True @@ -593,7 +874,9 @@ Public Class dlgTransformClimatic clsModifiedGDDOperator.AddParameter("y", clsRFunctionParameter:=clsLogicalMgddRFunction, iPosition:=1, bIncludeArgumentName:=False) clsModifiedGDDOperator.bToScriptAsRString = True - clsDummyFunction.AddParameter("checked", "diurnal", iPosition:=0) + clsDummyFunction.AddParameter("check", "diurnal", iPosition:=0) + clsDummyFunction.AddParameter("evaporation.value", "value", iPosition:=1) + clsDummyFunction.AddParameter("checked", "rollapply", iPosition:=2) ' Group options clsGroupByYear.SetRCommand("instat_calculation$new") @@ -610,11 +893,9 @@ Public Class dlgTransformClimatic clsRTransformCountSpellSub.AddParameter("sub1", clsRFunctionParameter:=clsRRainday, bIncludeArgumentName:=False, iPosition:=0) clsTransformManipulationsFunc.SetRCommand("list") - clsTransformManipulationsFunc.AddParameter("group_by_year", clsRFunctionParameter:=clsGroupByYear, bIncludeArgumentName:=False, iPosition:=0) clsRTransform.SetRCommand("instat_calculation$new") clsRTransform.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) - clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsRCountFunction, iPosition:=1) ' changes depending on the rdo clsRTransform.AddParameter("result_name", Chr(34) & "count" & Chr(34), iPosition:=2) clsRTransform.AddParameter("sub_calculations", clsRFunctionParameter:=clsRTransformCountSpellSub, iPosition:=4) clsRTransform.AddParameter("manipulations", clsRFunctionParameter:=clsTransformManipulationsFunc, iPosition:=5) @@ -636,17 +917,16 @@ Public Class dlgTransformClimatic ucrReceiverData.AddAdditionalCodeParameterPair(clsReplaceNAasElement, New RParameter("element", 0, False), iAdditionalPairNo:=2) ucrReceiverData.AddAdditionalCodeParameterPair(clsRRaindayUpperOperator, New RParameter("rain", 0), iAdditionalPairNo:=3) ucrReceiverData.AddAdditionalCodeParameterPair(clsRRaindayLowerOperator, New RParameter("rain", 0), iAdditionalPairNo:=4) - ucrReceiverData.AddAdditionalCodeParameterPair(clsRWaterBalanceFunction, New RParameter("replace_na", 1, False), iAdditionalPairNo:=5) - ucrReceiverData.AddAdditionalCodeParameterPair(clsReduceOpEvapValue, New RParameter("left", 0, False), iAdditionalPairNo:=6) - ucrReceiverData.AddAdditionalCodeParameterPair(clsGreaterThanOperator, New RParameter("rain", 0), iAdditionalPairNo:=7) - ucrReceiverData.AddAdditionalCodeParameterPair(clsLessThanOperator, New RParameter("rain", 0), iAdditionalPairNo:=8) - ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeSum, New RParameter("x", 0, False), iAdditionalPairNo:=9) - ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeMaximum, New RParameter("x", 0, False), iAdditionalPairNo:=10) - ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeMinimum, New RParameter("x", 0, False), iAdditionalPairNo:=11) + ucrReceiverData.AddAdditionalCodeParameterPair(clsIfElseRainMinFunction, New RParameter("no", 2), iAdditionalPairNo:=5) + ucrReceiverData.AddAdditionalCodeParameterPair(clsGreaterThanOperator, New RParameter("rain", 0), iAdditionalPairNo:=6) + ucrReceiverData.AddAdditionalCodeParameterPair(clsLessThanOperator, New RParameter("rain", 0), iAdditionalPairNo:=7) + ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeSum, New RParameter("x", 0, False), iAdditionalPairNo:=8) + ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeMaximum, New RParameter("x", 0, False), iAdditionalPairNo:=9) + ucrReceiverData.AddAdditionalCodeParameterPair(clsCumulativeMinimum, New RParameter("x", 0, False), iAdditionalPairNo:=10) + ucrReceiverData.AddAdditionalCodeParameterPair(clsEndSeasonIsNaRain, New RParameter("x", 0), iAdditionalPairNo:=11) + ucrReceiverData.AddAdditionalCodeParameterPair(clsIfElseRainMaxFunction, New RParameter("no", 2), iAdditionalPairNo:=12) ucrNudSumOver.AddAdditionalCodeParameterPair(clsRasterFuction, New RParameter("n", 1), iAdditionalPairNo:=1) ucrInputSum.AddAdditionalCodeParameterPair(clsRasterFuction, New RParameter("fun", 2), iAdditionalPairNo:=1) - ucrInputSpellUpper.AddAdditionalCodeParameterPair(clsGreaterThanOperator, New RParameter("max", 1), iAdditionalPairNo:=1) - ucrInputSpellLower.AddAdditionalCodeParameterPair(clsLessThanOperator, New RParameter("min", 1), iAdditionalPairNo:=1) ucrReceiverTMin.AddAdditionalCodeParameterPair(clsTMeanAddOperator, New RParameter("tmin", 1), iAdditionalPairNo:=1) ucrReceiverTMax.AddAdditionalCodeParameterPair(clsTMeanAddOperator, New RParameter("tmax", 0), iAdditionalPairNo:=1) ucrReceiverTMean.AddAdditionalCodeParameterPair(clsGrowingDegreDiffOperator, New RParameter("tmean", 0), iAdditionalPairNo:=1) @@ -659,8 +939,10 @@ Public Class dlgTransformClimatic ucrNudMgdd.AddAdditionalCodeParameterPair(clsModifiedLogicOperator, New RParameter("baseline", ucrNudMgdd.GetText, 1), iAdditionalPairNo:=1) ucrReceiverTMax.AddAdditionalCodeParameterPair(clsMeanAddOperator, New RParameter("tmax", 0), iAdditionalPairNo:=2) ucrReceiverTMin.AddAdditionalCodeParameterPair(clsMeanAddOperator, New RParameter("tmin", 1), iAdditionalPairNo:=2) - - ucrPnlTransform.SetRCode(clsTransformCheck, bReset) + ucrInputEvaporation.AddAdditionalCodeParameterPair(clsWBMaxEvapOperator, New RParameter("value", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrReceiverEvap.AddAdditionalCodeParameterPair(clsWBMaxTailFunction1, New RParameter("x", 0), iAdditionalPairNo:=1) + ucrReceiverEvap.AddAdditionalCodeParameterPair(clsAsNumericFunction, New RParameter("x", 0), iAdditionalPairNo:=2) + ucrSaveColumn.AddAdditionalCodeParameterPair(clsEndSeasonWBCalc, New RParameter("result_name", 2), iAdditionalPairNo:=1) ' Moving ucrNudSumOver.SetRCode(clsRMovingFunction, bReset) @@ -675,14 +957,11 @@ Public Class dlgTransformClimatic ' Count ucrNudCountOver.SetRCode(clsRCountFunction, bReset) - ucrInputSpellLower.SetRCode(clsRRaindayLowerOperator, bReset) + ucrInputSpellLower.SetRCode(clsLessThanOperator, bReset) ucrInputSpellUpper.SetRCode(clsRRaindayUpperOperator, bReset) ' Water Balance - ucrPnlEvap.SetRCode(clsPMaxOperatorMax, bReset) - ucrReceiverEvap.SetRCode(clsReduceOpEvapValue, bReset) - ucrNudWBCapacity.SetRCode(clsPMinFunctionMax, bReset) - ucrNudWB.SetRCode(clsWBOperator, bReset) + ucrReceiverEvap.SetRCode(clsWBMinTailFunction1, bReset) 'Degree ucrReceiverTMin.SetRCode(clsDiurnalRangeOperator, bReset) @@ -696,7 +975,11 @@ Public Class dlgTransformClimatic ucrSaveColumn.SetRCode(clsRTransform, bReset) If bReset Then - ucrInputEvaporation.SetRCode(clsPMaxOperatorMax, bReset) + ucrChkGroupByYear.SetRCode(clsTransformManipulationsFunc, bReset) + ucrInputEvaporation.SetRCode(clsWBMinEvapOperator, bReset) + ucrPnlEvap.SetRCode(clsDummyFunction, bReset) + ucrPnlTransform.SetRCode(clsDummyFunction, bReset) + ucrPnlDegree.SetRCode(clsDummyFunction, bReset) End If End Sub @@ -769,7 +1052,7 @@ Public Class dlgTransformClimatic End Select End Sub - Private Sub ucrPnlTransform_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlTransform.ControlValueChanged, ucrPnlDegree.ControlValueChanged + Private Sub ucrPnlTransform_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlTransform.ControlValueChanged, ucrPnlDegree.ControlValueChanged ', ucrPnlEvap.ControlValueChanged If rdoCumulative.Checked Then CumulativeFunctions() clsRTransform.RemoveParameterByName("sub_calculations") @@ -794,23 +1077,32 @@ Public Class dlgTransformClimatic clsRTransform.RemoveParameterByName("calculated_from") clsTransformCheck = clsRollConsecutiveSumFunction ElseIf rdoWaterBalance.Checked Then - clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsRWaterBalanceFunction, iPosition:=1) + clsWaterBalanceFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$run_instat_calculation") + clsWaterBalanceFunction.AddParameter("calc", strWB, iPosition:=0) + clsWaterBalanceFunction.AddParameter("display", "FALSE", iPosition:=1) + ucrBase.clsRsyntax.SetBaseRFunction(clsWaterBalanceFunction) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonRainMinCalc, iPosition:=0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonWBMinCalc, iPosition:=1) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonRainMaxCalc, iPosition:=2) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonWBMaxCalc, iPosition:=3) + ucrBase.clsRsyntax.AddToBeforeCodes(clsEndSeasonWBCalc, iPosition:=4) clsRTransform.RemoveParameterByName("sub_calculations") - clsTransformCheck = clsRTransform + ReduceWaterBalance() ElseIf rdoDegree.Checked Then DegreeFunctions() clsRTransform.RemoveParameterByName("sub_calculations") clsTransformCheck = clsRTransform End If - ReduceWaterBalance() - 'Evaporation() AddCalculate() + AutoFill() SetAssignName() GroupByStation() GroupByYear() SetAsReceiver() ChangeFunctions() AddRemoveMeanOperator() + ShowGroups() + InputConditionOptions() End Sub Private Sub DegreeFunctions() @@ -922,7 +1214,6 @@ Public Class dlgTransformClimatic Private Sub RainDays() clsRRainday.AddParameter("calculated_from", " list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames() & ")", iPosition:=3) - clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")", iPosition:=3) End Sub Private Sub ucrSelectorTransform_ControlValueChanged(ucrchangedControl As ucrCore) Handles ucrSelectorTransform.ControlValueChanged @@ -933,24 +1224,29 @@ Public Class dlgTransformClimatic ReduceWaterBalance() ChangeFunctions() AddCalculate() + AutoFill() + RainfallChange() End Sub - Private Sub ucrInputSpellLower_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSpellUpper.ControlValueChanged, ucrInputCondition.ControlValueChanged + Private Sub ucrInputSpellLower_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSpellLower.ControlValueChanged, ucrInputSpellUpper.ControlValueChanged, ucrInputCondition.ControlValueChanged InputConditionOptions() End Sub - Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged, ucrReceiverEvap.ControlValueChanged + Private Sub ucrReceiverData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverData.ControlValueChanged RainDays() ReduceWaterBalance() + RainfallChange() End Sub Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged GroupByStation() + ReduceWaterBalance() End Sub Private Sub ucrReceiverYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlValueChanged GroupByYear() CheckGroupByYearEnabled() + ReduceWaterBalance() End Sub Private Sub ucrInputSum_ControlValueChanged(ucrchangedControl As ucrCore) Handles ucrInputSum.ControlValueChanged @@ -960,6 +1256,7 @@ Public Class dlgTransformClimatic Private Sub ucrChkGroupByYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkGroupByYear.ControlValueChanged GroupByYear() CheckGroupByYearEnabled() + ReduceWaterBalance() End Sub Private Sub ucrInputEvaporation_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputEvaporation.ControlContentsChanged, ucrPnlEvap.ControlContentsChanged @@ -981,25 +1278,33 @@ Public Class dlgTransformClimatic End Sub Private Sub CumulativeFunctions() - Select Case ucrInputCumulative.GetText - Case "Sum" - clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsCumulativeSum, iPosition:=1) - Case "Maximum" - clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsCumulativeMaximum, iPosition:=1) - Case "Minimum" - clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsCumulativeMinimum, iPosition:=1) - End Select + If rdoCumulative.Checked Then + Select Case ucrInputCumulative.GetText + Case "Sum" + clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsCumulativeSum, iPosition:=1) + Case "Maximum" + clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsCumulativeMaximum, iPosition:=1) + Case "Minimum" + clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsCumulativeMinimum, iPosition:=1) + End Select + ElseIf rdoCount.Checked Then + clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsRCountFunction, iPosition:=1) ' changes depending on the rdo + End If End Sub Private Sub CumulativeColNames() - Select Case ucrInputCumulative.GetText - Case "Sum" - ucrSaveColumn.SetName("cumsum") - Case "Maximum" - ucrSaveColumn.SetName("cummax") - Case "Minimum" - ucrSaveColumn.SetName("cummin") - End Select + If rdoCumulative.Checked Then + Select Case ucrInputCumulative.GetText + Case "Sum" + ucrSaveColumn.SetName("cumsum") + Case "Maximum" + ucrSaveColumn.SetName("cummax") + Case "Minimum" + ucrSaveColumn.SetName("cummin") + End Select + ElseIf rdoCount.Checked Then + ucrSaveColumn.SetName("count") + End If End Sub Private Sub ucrInputCumulative_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCumulative.ControlValueChanged @@ -1053,6 +1358,7 @@ Public Class dlgTransformClimatic Private Sub ucrSaveColumn_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSaveColumn.ControlValueChanged 'change the parameter values + clsEndSeasonWBCalc.AddParameter("result_name", Chr(34) & ucrSaveColumn.GetText() & Chr(34), iPosition:=2) clsRTransform.AddParameter(strParameterName:="result_name", strParameterValue:=Chr(34) & ucrSaveColumn.GetText & Chr(34), iPosition:=2) End Sub @@ -1094,33 +1400,36 @@ Public Class dlgTransformClimatic AddRemoveMeanOperator() AddCalculate() End Sub - Private Sub ReduceWaterBalance() + + Private Sub ShowGroups() + If rdoDegree.Checked Then + grpTransform.Hide() + grpDegree.Show() + Else + grpDegree.Hide() + grpTransform.Show() + End If + End Sub + + Private Sub AutoFill() If rdoWaterBalance.Checked Then - If rdoEvapValue.Checked Then - clsRTransform.RemoveParameterByName("calculated_from") - ucrReceiverData.SetMeAsReceiver() - clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")") - If ucrChkWB.Checked Then - clsPMaxFunctionMax.AddParameter("0", 0, iPosition:=1, bIncludeArgumentName:=False) - clsPMaxOperatorMax.AddParameter("wb", clsROperatorParameter:=clsWBOperator, iPosition:=0, bIncludeArgumentName:=False) - clsPMaxOperatorMax.RemoveParameterByName("first") - clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") - clsRWaterBalanceFunction.AddParameter("replace_na", clsRFunctionParameter:=clsTailFunction, iPosition:=2, bIncludeArgumentName:=False) - clsRWaterBalanceFunction.AddParameter("init", "0", iPosition:=3, bIncludeArgumentName:=False) - Else - clsPMaxOperatorMax.AddParameter("evaporation.value", 5, iPosition:=1, bIncludeArgumentName:=False) - clsPMaxFunctionMax.RemoveParameterByName("wb") - End If + Dim strDataFrame As String + Dim strRainCol As String - ElseIf rdoEvapVariable.Checked Then - ucrReceiverEvap.SetMeAsReceiver() - clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ", " & strCurrDataName & "=" & ucrReceiverEvap.GetVariableNames & ")") - clsRWaterBalanceFunction.AddParameter("replace_na", clsROperatorParameter:=clsReduceOpEvapValue, iPosition:=1, bIncludeArgumentName:=False) - clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") + strDataFrame = ucrSelectorTransform.ucrAvailableDataFrames.cboAvailableDataFrames.Text + strRainCol = frmMain.clsRLink.GetClimaticColumnOfType(strDataFrame, "rain_label") + + If strRainCol <> "" Then + ucrReceiverData.Add(strRainCol, strDataFrame) End If End If End Sub + Private Sub RainfallChange() + clsEndSeasonRainMinCalc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")", iPosition:=3) + clsEndSeasonRainMaxCalc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")", iPosition:=3) + End Sub + Private Sub ucrChkWB_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkWB.ControlValueChanged ReduceWaterBalance() End Sub @@ -1128,4 +1437,84 @@ Public Class dlgTransformClimatic Private Sub rdoEvapValue_CheckedChanged(sender As Object, e As EventArgs) Handles rdoEvapValue.CheckedChanged, rdoEvapVariable.CheckedChanged ReduceWaterBalance() End Sub + + Private Sub ucrInputEvaporation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputEvaporation.ControlValueChanged, ucrReceiverEvap.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ucrReceiverDate_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ucrNudWB_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWB.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ucrSelectorTransform_DataFrameChanged() Handles ucrSelectorTransform.DataFrameChanged + clsDoyFilterCalcFromList.ClearParameters() + AutoFill() + TestOkEnabled() + End Sub + + Private Sub ucrPnlEvap_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlEvap.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ucrNudWBCapacity_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWBCapacity.ControlValueChanged + ReduceWaterBalance() + End Sub + + Private Sub ReduceWaterBalance() + If rdoWaterBalance.Checked Then + clsPMaxFunction.RemoveParameterByName("0") + clsPMaxFunction.RemoveParameterByName("0") + clsWBMinEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("variable") + clsWBMaxEvapOperator.RemoveParameterByName("value") + clsWBMinEvapOperator.RemoveParameterByName("value") + clsPMaxFunction.RemoveParameterByName("wb") + clsPMaxFunction.RemoveParameterByName("wb") + clsEndSeasonWBCalc.AddParameter("adjacent_column", ucrReceiverData.GetVariableNames(), iPosition:=3) + clsPMinWBMaxFunction.AddParameter("1", ucrNudWBCapacity.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("1", ucrNudWBCapacity.GetText(), iPosition:=1, bIncludeArgumentName:=False) + If rdoEvapValue.Checked Then + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction, iPosition:=1) + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction, iPosition:=1) + If ucrChkWB.Checked Then + clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("yes", ucrNudWBCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=3, bIncludeArgumentName:=False) + clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + Else + clsWBMaxEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) + clsWBMinEvapOperator.AddParameter("value", ucrInputEvaporation.GetText(), iPosition:=1) + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + End If + Else + ucrReceiverEvap.SetMeAsReceiver() + If ucrChkWB.Checked Then + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction1, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction1, iPosition:=1) + clsWBEvaporationMinFunction.AddParameter("WB_evap_value", ucrNudWB.GetText(), iPosition:=1, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("yes", ucrNudWBCapacity.GetText(), iPosition:=2, bIncludeArgumentName:=False) + clsWBEvaporationMinFunction.AddParameter("value", "..3", bIncludeArgumentName:=False, iPosition:=3) + clsReduceWBMinFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMinTailFunction1, iPosition:=1) + clsReduceWBMaxFunction1.AddParameter(".y", clsRFunctionParameter:=clsWBMaxTailFunction1, iPosition:=1) + clsPMaxFunction.AddParameter("wb", clsROperatorParameter:=clsWBOperator1, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + Else + clsEndSeasonWBMaxCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMaxFunction2, iPosition:=1) + clsEndSeasonWBMinCalc.AddParameter("function_exp", clsRFunctionParameter:=clsReduceWBMinFunction2, iPosition:=1) + clsPMaxFunction.AddParameter("0", "..1 + ..2", iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMinFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPMinWBMaxFunction.AddParameter("0", clsRFunctionParameter:=clsPMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + End If + End If + End If + End Sub End Class \ No newline at end of file diff --git a/instat/dlgTreemap.vb b/instat/dlgTreemap.vb index c0b6a25b996..ef94b10e7b2 100644 --- a/instat/dlgTreemap.vb +++ b/instat/dlgTreemap.vb @@ -137,7 +137,7 @@ Public Class dlgTreemap ucrColourText.SetColours() ucrSaveTreemap.SetIsComboBox() - ucrSaveTreemap.SetCheckBoxText("Save Treemap") + ucrSaveTreemap.SetCheckBoxText("Store Treemap") ucrSaveTreemap.SetDataFrameSelector(ucrSelectorTreemap.ucrAvailableDataFrames) ucrSaveTreemap.SetSaveTypeAsGraph() ucrSaveTreemap.SetPrefix("tree_map") diff --git a/instat/dlgTwoVariableFitModel.vb b/instat/dlgTwoVariableFitModel.vb index da56404685a..465cfc4f7c8 100644 --- a/instat/dlgTwoVariableFitModel.vb +++ b/instat/dlgTwoVariableFitModel.vb @@ -159,7 +159,7 @@ Public Class dlgTwoVariableFitModel ucrSaveModels.SetPrefix("two_var") ucrSaveModels.SetSaveTypeAsModel() ucrSaveModels.SetDataFrameSelector(ucrSelectorSimpleReg.ucrAvailableDataFrames) - ucrSaveModels.SetCheckBoxText("Save Model") + ucrSaveModels.SetCheckBoxText("Store Model") ucrSaveModels.SetIsComboBox() ucrSaveModels.SetAssignToIfUncheckedValue("last_model") diff --git a/instat/dlgTwoWayFrequencies.vb b/instat/dlgTwoWayFrequencies.vb index 9d07336cc92..b199bb1036e 100644 --- a/instat/dlgTwoWayFrequencies.vb +++ b/instat/dlgTwoWayFrequencies.vb @@ -379,12 +379,12 @@ Public Class dlgTwoWayFrequencies ucrBase.clsRsyntax.SetBaseRFunction(clsSjTab) ucrSaveGraph.SetSaveType(RObjectTypeLabel.Summary, strRObjectFormat:=RObjectFormat.Html) ucrSaveGraph.SetAssignToIfUncheckedValue("last_summary") - ucrSaveGraph.SetCheckBoxText("Save Summary") + ucrSaveGraph.SetCheckBoxText("Store Summary") ElseIf rdoGraph.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsSjPlot) ucrSaveGraph.SetSaveType(RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") End If End Sub diff --git a/instat/dlgUseGraph.vb b/instat/dlgUseGraph.vb index 72f268a077c..8775b4e1a0e 100644 --- a/instat/dlgUseGraph.vb +++ b/instat/dlgUseGraph.vb @@ -85,7 +85,7 @@ Public Class dlgUseGraph ucrSaveGraph.SetSaveType(strRObjectType:=RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) ucrSaveGraph.SetDataFrameSelector(ucrGraphsSelector.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save New Graph") + ucrSaveGraph.SetCheckBoxText("Store New Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgUseModel.vb b/instat/dlgUseModel.vb index 6cdefc38f12..1e280711954 100644 --- a/instat/dlgUseModel.vb +++ b/instat/dlgUseModel.vb @@ -41,7 +41,7 @@ Public Class dlgUseModel ucrSaveResult.SetPrefix("object") ucrSaveResult.SetIsComboBox() ucrSaveResult.SetSaveTypeAsModel() - ucrSaveResult.SetCheckBoxText("Save Output") + ucrSaveResult.SetCheckBoxText("Store Output") ucrSaveResult.SetAssignToIfUncheckedValue("last_object") ucrSaveResult.SetDataFrameSelector(ucrSelectorUseModel.ucrAvailableDataFrames) diff --git a/instat/dlgUseTable.vb b/instat/dlgUseTable.vb index 0e5bd17a22c..1757a270ecf 100644 --- a/instat/dlgUseTable.vb +++ b/instat/dlgUseTable.vb @@ -73,7 +73,7 @@ Public Class dlgUseTable ucrSaveTable.SetPrefix("use_table") ucrSaveTable.SetSaveType(strRObjectType:=RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetDataFrameSelector(ucrTablesSelector.ucrAvailableDataFrames) - ucrSaveTable.SetCheckBoxText("Save New Table") + ucrSaveTable.SetCheckBoxText("Store New Table") ucrSaveTable.SetIsComboBox() ucrSaveTable.SetAssignToIfUncheckedValue("table") End Sub diff --git a/instat/dlgView.vb b/instat/dlgView.vb index 821b42c2029..c326c69f397 100644 --- a/instat/dlgView.vb +++ b/instat/dlgView.vb @@ -101,7 +101,7 @@ Public Class dlgView ucrNudNumberRows.Minimum = 1 ucrNudNumberRows.SetLinkedDisplayControl(lblNumberofRows) - ucrSaveData.SetCheckBoxText("Save Data") + ucrSaveData.SetCheckBoxText("Store Data") ucrSaveData.SetPrefix("last_table") ucrSaveData.SetDataFrameSelector(ucrSelectorForView.ucrAvailableDataFrames) ucrSaveData.setLinkedReceiver(ucrReceiverView) diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb index 505d6e20748..cb9da0dc3ac 100644 --- a/instat/dlgVisualizeData.vb +++ b/instat/dlgVisualizeData.vb @@ -156,7 +156,7 @@ Public Class dlgVisualizeData ucrPnlSelectData.AddToLinkedControls(ucrReceiverVisualizeData, {rdoSelectedColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSaveGraph.SetIsComboBox() - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(ucrSelectorVisualizeData.ucrAvailableDataFrames) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") diff --git a/instat/dlgWindPollutionRose.vb b/instat/dlgWindPollutionRose.vb index 79c87d4b71d..3b94c16bd42 100644 --- a/instat/dlgWindPollutionRose.vb +++ b/instat/dlgWindPollutionRose.vb @@ -108,7 +108,7 @@ Public Class dlgWindPollutionRose ucrSaveGraph.SetPrefix("pollution_rose_plot") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetSaveTypeAsGraph() - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetDataFrameSelector(ucrSelectorWindPollutionRose.ucrAvailableDataFrames) ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/dlgWindrose.vb b/instat/dlgWindrose.vb index 1d017283960..5d13cfa1c4d 100644 --- a/instat/dlgWindrose.vb +++ b/instat/dlgWindrose.vb @@ -80,7 +80,7 @@ Public Class dlgWindrose ucrSaveGraph.SetDataFrameSelector(ucrWindRoseSelector.ucrAvailableDataFrames) ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetIsComboBox() - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") End Sub diff --git a/instat/frmConvertToNumeric.vb b/instat/frmConvertToNumeric.vb index d4a6082d7c0..fdc3add889d 100644 --- a/instat/frmConvertToNumeric.vb +++ b/instat/frmConvertToNumeric.vb @@ -68,7 +68,7 @@ Public Class frmConvertToNumeric End Sub Private Sub cmdHelp_Click(sender As Object, e As EventArgs) Handles cmdHelp.Click - Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "614") + Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "701") End Sub Private Sub cmdInspectValues_Click(sender As Object, e As EventArgs) Handles cmdInspectValues.Click diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 629c9015bce..c0909e4c30b 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -415,9 +415,11 @@ Partial Class frmMain Me.ToolStripSeparator75 = New System.Windows.Forms.ToolStripSeparator() Me.mnuTbLogScript = New System.Windows.Forms.ToolStripSplitButton() Me.mnuLogScript = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuSwapDataLogScript = New System.Windows.Forms.ToolStripMenuItem() Me.mnuMetadata = New System.Windows.Forms.ToolStripSplitButton() Me.mnuColumnMetadat = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDataFrameMetadat = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuSwapDataMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator76 = New System.Windows.Forms.ToolStripSeparator() Me.mnuTbResetLayout = New System.Windows.Forms.ToolStripButton() Me.separator3 = New System.Windows.Forms.ToolStripSeparator() @@ -1540,6 +1542,7 @@ Partial Class frmMain ' 'mnuViewSwapDataAndScript ' + Me.mnuViewSwapDataAndScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" @@ -1579,7 +1582,7 @@ Partial Class frmMain 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(215, 6) ' 'mnuHelpWindows ' @@ -1590,95 +1593,95 @@ Partial Class frmMain 'ToolStripSeparator81 ' Me.ToolStripSeparator81.Name = "ToolStripSeparator81" - Me.ToolStripSeparator81.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator81.Size = New System.Drawing.Size(215, 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.Size = New System.Drawing.Size(218, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'MenusAndDialogsToolStripMenuItem ' Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" - Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs" ' 'ToolStripSeparator82 ' Me.ToolStripSeparator82.Name = "ToolStripSeparator82" - Me.ToolStripSeparator82.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator82.Size = New System.Drawing.Size(172, 6) ' 'FileToolStripMenuItem ' Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" - Me.FileToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.FileToolStripMenuItem.Text = "File" ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" - Me.EditToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.EditToolStripMenuItem.Text = "Edit" ' 'PrepareToolStripMenuItem ' Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" - Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.PrepareToolStripMenuItem.Text = "Prepare" ' 'DescribeToolStripMenuItem ' Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" - Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.DescribeToolStripMenuItem.Text = "Describe" ' 'ModelToolStripMenuItem ' Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" - Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.ModelToolStripMenuItem.Text = "Model" ' 'ToolStripSeparator83 ' Me.ToolStripSeparator83.Name = "ToolStripSeparator83" - Me.ToolStripSeparator83.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator83.Size = New System.Drawing.Size(172, 6) ' 'StructuredToolStripMenuItem ' Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" - Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.StructuredToolStripMenuItem.Text = "Structured" ' 'ClimaticToolStripMenuItem ' Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" - Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.ClimaticToolStripMenuItem.Text = "Climatic" ' 'ProcurementToolStripMenuItem ' Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" - Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.ProcurementToolStripMenuItem.Text = "Procurement" ' 'ExperimentsToolStripMenuItem ' Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" - Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.ExperimentsToolStripMenuItem.Text = "Experiments" ' 'ToolsToolStripMenuItem ' Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" - Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.ToolsToolStripMenuItem.Text = "Tools" ' 'ViewToolStripMenuItem ' Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(175, 22) Me.ViewToolStripMenuItem.Text = "View" ' 'mnuHelpAboutR @@ -1717,7 +1720,7 @@ Partial Class frmMain 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(215, 6) ' 'mnuHelpPackagesDocumentation ' @@ -2311,7 +2314,6 @@ Partial Class frmMain ' 'mnuClimaticDescribeSeasonalGraph ' - Me.mnuClimaticDescribeSeasonalGraph.Enabled = False Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." @@ -3254,7 +3256,7 @@ Partial Class frmMain ' Me.mnuTbLogScript.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image Me.mnuTbLogScript.DropDownButtonWidth = 18 - Me.mnuTbLogScript.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuLogScript}) + Me.mnuTbLogScript.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuLogScript, Me.mnuSwapDataLogScript}) Me.mnuTbLogScript.Image = Global.instat.My.Resources.Resources.scriptwindow Me.mnuTbLogScript.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLogScript.Name = "mnuTbLogScript" @@ -3266,14 +3268,21 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(129, 22) + Me.mnuLogScript.Size = New System.Drawing.Size(210, 22) Me.mnuLogScript.Text = "Log/Script" ' + 'mnuSwapDataLogScript + ' + Me.mnuSwapDataLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.mnuSwapDataLogScript.Name = "mnuSwapDataLogScript" + Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuSwapDataLogScript.Text = "Swap Data and Log/Script" + ' 'mnuMetadata ' Me.mnuMetadata.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image Me.mnuMetadata.DropDownButtonWidth = 18 - Me.mnuMetadata.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnMetadat, Me.mnuDataFrameMetadat}) + Me.mnuMetadata.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnMetadat, Me.mnuDataFrameMetadat, Me.mnuSwapDataMetadata}) Me.mnuMetadata.Image = CType(resources.GetObject("mnuMetadata.Image"), System.Drawing.Image) Me.mnuMetadata.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuMetadata.Name = "mnuMetadata" @@ -3285,16 +3294,23 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(202, 22) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(214, 22) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(202, 22) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(214, 22) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' + 'mnuSwapDataMetadata + ' + Me.mnuSwapDataMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.mnuSwapDataMetadata.Name = "mnuSwapDataMetadata" + Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(214, 22) + Me.mnuSwapDataMetadata.Text = "Swap Data and Metadata..." + ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" @@ -5222,7 +5238,9 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat .." + Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + + My.Application.Info.Version.Minor.ToString + "." + + My.Application.Info.Version.Build.ToString Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() @@ -5926,4 +5944,6 @@ Partial Class frmMain Friend WithEvents ExperimentsToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolsToolStripMenuItem As ToolStripMenuItem Friend WithEvents ViewToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuSwapDataLogScript As ToolStripMenuItem + Friend WithEvents mnuSwapDataMetadata As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index c8d4db5f30c..c2351ac4d28 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -54,6 +54,8 @@ Public Class frmMain Public strAutoSaveLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_log_auto_save") Public strAutoSaveInternalLogFolderPath As String = Path.Combine(Path.GetTempPath, "R-Instat_debug_log_auto_save") + Private strMarkerFilePath As String = Path.Combine(strAutoSaveLogFolderPath, "app_marker.log") + Public strCurrentAutoSaveDataFilePath As String = "" Private strLatestVersion As String = "" @@ -295,7 +297,8 @@ Public Class frmMain mnuViewSwapDataAndScript.Checked = False mnuColumnMetadat.Checked = False mnuDataFrameMetadat.Checked = False - + mnuSwapDataLogScript.Checked = False + mnuSwapDataMetadata.Checked = False mnuTbDataView.Checked = True mnuOutputWindow.Checked = True mnuLogScript.Checked = False @@ -456,32 +459,41 @@ Public Class frmMain '--------------------------------------- 'prompt user for recovery selection - If (strAutoSavedLogFilePaths.Length > 0 OrElse - strAutoSavedDataFilePaths.Length > 0) AndAlso - MsgBox("We have detected that R-Instat may have closed unexpectedly last time." & Environment.NewLine & - "Would you like to see auto recovery options?", - MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes Then - - dlgAutoSaveRecovery.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths - dlgAutoSaveRecovery.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths - dlgAutoSaveRecovery.strAutoSavedInternalLogFilePaths = strAutoSavedInternalLogFilePaths - dlgAutoSaveRecovery.ShowDialog() - - 'todo. the dialog design is meant to only return just one option; script, data file path or new session. - 'refactor the dialog to enforce the design - - 'get the R script from read file if selected by the user - strScript = dlgAutoSaveRecovery.GetScript() - 'get the data file path if selected by the user - strDataFilePath = dlgAutoSaveRecovery.GetDataFilePath() + 'Check if the marker file exists + If File.Exists(strMarkerFilePath) Then + Dim lastExitStatus As String = File.ReadAllText(strMarkerFilePath).Trim() + If lastExitStatus <> "CleanExit" AndAlso + MsgBox("We have detected that R-Instat may have closed unexpectedly last time." & Environment.NewLine & + "Would you like to see auto recovery options?", + MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes Then + + dlgAutoSaveRecovery.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths + dlgAutoSaveRecovery.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths + dlgAutoSaveRecovery.strAutoSavedInternalLogFilePaths = strAutoSavedInternalLogFilePaths + dlgAutoSaveRecovery.ShowDialog() + + 'todo. the dialog design is meant to only return just one option; script, data file path or new session. + 'refactor the dialog to enforce the design + + 'get the R script from read file if selected by the user + strScript = dlgAutoSaveRecovery.GetScript() + 'get the data file path if selected by the user + strDataFilePath = dlgAutoSaveRecovery.GetDataFilePath() + End If End If + + Using writer As StreamWriter = New StreamWriter(strMarkerFilePath, False) + writer.WriteLine("Running") + End Using + '--------------------------------------- + '--------------------------------------- 'delete the recovery files If strAutoSavedLogFilePaths.Length > 0 Then Try - File.Delete(strAutoSavedLogFilePaths(0)) + File.Delete(strAutoSavedLogFilePaths(1)) '1 to avoid deleting app_marker file Catch ex As Exception MsgBox("Could not delete backup log file" & Environment.NewLine, "Error deleting file") End Try @@ -578,25 +590,29 @@ Public Class frmMain splMetadata.Panel1.Controls.Add(ucrDataViewer) mnuViewColumnMetadata.Text = "Data View" mnuViewDataView.Text = "Column Metadata" + mnuSwapDataMetadata.Checked = True Else splDataOutput.Panel1.Controls.Add(ucrDataViewer) splMetadata.Panel1.Controls.Add(ucrColumnMeta) mnuViewColumnMetadata.Text = "Column Metadata" mnuViewDataView.Text = "Data View" + mnuSwapDataMetadata.Checked = False End If End Sub - Private Sub UpdateSwapDataAndScript() + Public Sub UpdateSwapDataAndScript() If mnuViewSwapDataAndScript.Checked Then splDataOutput.Panel1.Controls.Add(ucrScriptWindow) splExtraWindows.Panel2.Controls.Add(ucrDataViewer) mnuViewLogScript.Text = "Data View" mnuViewDataView.Text = "Log/Script" + mnuSwapDataLogScript.Checked = True Else splDataOutput.Panel1.Controls.Add(ucrDataViewer) splExtraWindows.Panel2.Controls.Add(ucrScriptWindow) mnuViewLogScript.Text = "Log/Script" mnuViewDataView.Text = "Data View" + mnuSwapDataLogScript.Checked = False End If End Sub @@ -1039,6 +1055,7 @@ Public Class frmMain End Sub Private Sub mnuDescribeOneVariableSummarise_Click(sender As Object, e As EventArgs) Handles mnuDescribeOneVariableSummarise.Click + dlgOneVariableSummarise.enumOnevariableMode = dlgOneVariableSummarise.OnevariableMode.Describe dlgOneVariableSummarise.ShowDialog() End Sub @@ -1072,6 +1089,11 @@ Public Class frmMain If RuntimeInformation.IsOSPlatform(OSPlatform.Windows) Then CefRuntimeWrapper.ShutDownCef() End If + + Using writer As StreamWriter = New StreamWriter(strMarkerFilePath, False) + writer.WriteLine("CleanExit") + End Using + Catch ex As Exception MsgBox("Error attempting to save setting files to App Data folder." & Environment.NewLine & "System error message: " & ex.Message, MsgBoxStyle.Critical, "Error saving settings") End Try @@ -1322,7 +1344,7 @@ Public Class frmMain End Sub Private Sub mnuHelpHistFAQ_Click(sender As Object, e As EventArgs) Handles mnuHelpFAQ.Click - Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "290") + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "324") End Sub Private Sub mnuHelpGetingStarted_Click(sender As Object, e As EventArgs) Handles mnuHelpGetingStarted.Click @@ -1502,6 +1524,7 @@ Public Class frmMain End Sub Private Sub mnuClimaticFileImportandTidyNetCDF_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileImportandTidyNetCDF.Click + dlgOpenNetCDF.enumNetCDFMode = dlgOpenNetCDF.NetCDFMode.Climatic dlgOpenNetCDF.ShowDialog() End Sub @@ -1958,6 +1981,7 @@ Public Class frmMain End Sub Private Sub mnuFileImportandTidyNetCDFFile_Click(sender As Object, e As EventArgs) Handles mnuFileImportandTidyNetCDFFile.Click + dlgOpenNetCDF.enumNetCDFMode = dlgOpenNetCDF.NetCDFMode.File dlgOpenNetCDF.ShowDialog() End Sub @@ -2192,6 +2216,7 @@ Public Class frmMain End Sub Private Sub mnuPrepareCalculateCalculations_Click(sender As Object, e As EventArgs) Handles mnuPrepareCalculator.Click + dlgCalculator.enumCalculatorMode = dlgCalculator.CalculatorMode.Prepare dlgCalculator.ShowDialog() End Sub @@ -2357,7 +2382,7 @@ Public Class frmMain End Sub Private Sub mnuClimaticCompareCorrelations_Click(sender As Object, e As EventArgs) Handles mnuClimaticCompareCorrelations.Click - dlgCorrelation.SetMultipleSequenceAsDefaultOption() + dlgCorrelation.SetClimaticAsDefaultOption() dlgCorrelation.ShowDialog() End Sub @@ -2377,9 +2402,7 @@ Public Class frmMain End Sub Private Sub mnuStructuredCircularCalculator_Click(sender As Object, e As EventArgs) Handles mnuStructuredCircularCalculator.Click - If dlgCalculator.bFirstLoad Then - dlgCalculator.SetDefaultKeyboard("Circular") - End If + dlgCalculator.enumCalculatorMode = dlgCalculator.CalculatorMode.Structured dlgCalculator.ShowDialog() End Sub @@ -2806,4 +2829,18 @@ Public Class frmMain Private Sub MenusAndDialogsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MenusAndDialogsToolStripMenuItem.Click Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "12") End Sub + + Private Sub mnuSwapDataMetadata_Click(sender As Object, e As EventArgs) Handles mnuSwapDataMetadata.Click + mnuViewSwapDataAndScript.Enabled = mnuViewSwapDataAndMetadata.Checked + mnuViewSwapDataAndMetadata.Checked = Not mnuViewSwapDataAndMetadata.Checked + UpdateSwapDataAndMetadata() + UpdateLayout() + End Sub + + Private Sub mnuSwapDataLogScript_Click(sender As Object, e As EventArgs) Handles mnuSwapDataLogScript.Click + mnuViewSwapDataAndMetadata.Enabled = mnuViewSwapDataAndScript.Checked + mnuViewSwapDataAndScript.Checked = Not mnuViewSwapDataAndScript.Checked + UpdateSwapDataAndScript() + UpdateLayout() + End Sub End Class diff --git a/instat/sdgCorrPlot.vb b/instat/sdgCorrPlot.vb index 03a4cb40a4c..c3007a715b4 100644 --- a/instat/sdgCorrPlot.vb +++ b/instat/sdgCorrPlot.vb @@ -27,6 +27,7 @@ Public Class sdgCorrPlot Public strDataFrame As String Private Sub sdgCorrPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load + SetSelectedDefaultSequenceOption() autoTranslate(Me) End Sub @@ -61,7 +62,7 @@ Public Class sdgCorrPlot ucrSaveGraph.SetPrefix("cor_graph") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(dlgCorrelation.ucrSelectorCorrelation.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") @@ -167,6 +168,17 @@ Public Class sdgCorrPlot End If End Sub + Private Sub SetSelectedDefaultSequenceOption() + Select Case dlgCorrelation.enumDefaultSequenceOption + Case dlgCorrelation.DefaultSequenceOption.MultipleOption + ucrBaseSdgCorrPlot.iHelpTopicID = 188 + Case dlgCorrelation.DefaultSequenceOption.TwoVariableOption + ucrBaseSdgCorrPlot.iHelpTopicID = 675 + Case dlgCorrelation.DefaultSequenceOption.ClimaticOption + ucrBaseSdgCorrPlot.iHelpTopicID = 676 + End Select + End Sub + Private Sub ucrInputComboGeom_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputComboGeom.ControlValueChanged Visibility() End Sub diff --git a/instat/sdgDefineAnnualRainfall.Designer.vb b/instat/sdgDefineAnnualRainfall.Designer.vb index e03002e434a..91bb5b1cb29 100644 --- a/instat/sdgDefineAnnualRainfall.Designer.vb +++ b/instat/sdgDefineAnnualRainfall.Designer.vb @@ -22,48 +22,20 @@ Partial Class sdgDefineAnnualRainfall 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrReceiverPlantingDayCondition = New instat.ucrReceiverSingle() - Me.lblMinMinAnnual = New System.Windows.Forms.Label() - Me.ucrReceiverMinMinAnnual = New instat.ucrReceiverSingle() - Me.lblMeanAnnualTemp = New System.Windows.Forms.Label() - Me.lblMaxMinAnnual = New System.Windows.Forms.Label() - Me.lblAnnualTempYear = New System.Windows.Forms.Label() - Me.lblAnnualTempStation = New System.Windows.Forms.Label() - Me.lblMaxMaxAnnual = New System.Windows.Forms.Label() - Me.ucrSelecetorMonthlyTemp = New instat.ucrSelectorByDataFrame() - Me.lblMinMaxAnnual = New System.Windows.Forms.Label() - Me.lblMeanMaxAnnual = New System.Windows.Forms.Label() - Me.ucrReceiverMaxMaxAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverMeanMaxAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverMinMaxAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverMaxMinAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverMeanAnnual = New instat.ucrReceiverSingle() - Me.ucrReceiverAnnualTempYr = New instat.ucrReceiverSingle() - Me.ucrReceiverAnnualTempStation = New instat.ucrReceiverSingle() - Me.tbAnnualTempSummaries = New System.Windows.Forms.TabPage() - Me.ucrSelectorAnnualTemp = New instat.ucrSelectorByDataFrame() - Me.lblPlantingDayCond = New System.Windows.Forms.Label() - Me.tbMonthlyTemp = New System.Windows.Forms.TabPage() - Me.lblMonth = New System.Windows.Forms.Label() - Me.ucrReceiverMonthMonthly = New instat.ucrReceiverSingle() - Me.lblMinMInMonthly = New System.Windows.Forms.Label() - Me.ucrReceiverMinMinMonthly = New instat.ucrReceiverSingle() - Me.lblMeanMinMonthly = New System.Windows.Forms.Label() - Me.lblMaxMinMonthly = New System.Windows.Forms.Label() - Me.lblYearMonthTemp = New System.Windows.Forms.Label() - Me.lblStationMonthTemp = New System.Windows.Forms.Label() - Me.lblMaxMaxMonthly = New System.Windows.Forms.Label() - Me.lblMinMaxMonthly = New System.Windows.Forms.Label() - Me.lblMeanMaxMonthly = New System.Windows.Forms.Label() - Me.ucrReceiverMaxMaxMonthly = New instat.ucrReceiverSingle() - Me.ucrReceiverMeanmaxMonthly = New instat.ucrReceiverSingle() - Me.ucrReceiverMinMaxMonthly = New instat.ucrReceiverSingle() Me.ucrReceiverMaxMinMonthly = New instat.ucrReceiverSingle() - Me.ucrReceiverMeanminMontly = New instat.ucrReceiverSingle() Me.ucrReceiverYearMonthly = New instat.ucrReceiverSingle() Me.ucrReceiverMonthlyTemp = New instat.ucrReceiverSingle() - Me.ucrBase = New instat.ucrButtonsSubdialogue() + Me.ucrSelecetorMonthlyTemp = New instat.ucrSelectorByDataFrame() Me.lblSeasonPlantingDay = New System.Windows.Forms.Label() + Me.ucrSelectorSeasonStartProp = New instat.ucrSelectorByDataFrame() + Me.tbSummaries = New System.Windows.Forms.TabControl() + Me.tbAnnualRainfall = New System.Windows.Forms.TabPage() + Me.lblStartRainStatus = New System.Windows.Forms.Label() + Me.ucrReceiverStartRainStatus = New instat.ucrReceiverSingle() + Me.lblEndRainStatus = New System.Windows.Forms.Label() + Me.ucrReceiverEndRainStatus = New instat.ucrReceiverSingle() + Me.lblEndSeasonStatus = New System.Windows.Forms.Label() + Me.ucrReceiverEndSeasonStatus = New instat.ucrReceiverSingle() Me.lblRainyDaysYear = New System.Windows.Forms.Label() Me.ucrReceiverRainDaysYear = New instat.ucrReceiverSingle() Me.lblNoRainDaysSeason = New System.Windows.Forms.Label() @@ -85,8 +57,6 @@ Partial Class sdgDefineAnnualRainfall Me.ucrReceiverEndSeasonDate = New instat.ucrReceiverSingle() Me.ucrReceiverEndSeasonDOY = New instat.ucrReceiverSingle() Me.ucrReceiverEndRainsDOY = New instat.ucrReceiverSingle() - Me.tbSummaries = New System.Windows.Forms.TabControl() - Me.tbAnnualRainfall = New System.Windows.Forms.TabPage() Me.ucrReceiverEndRainsDate = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonalLength = New instat.ucrReceiverSingle() Me.ucrReceiverRainDaysSeason = New instat.ucrReceiverSingle() @@ -95,110 +65,105 @@ Partial Class sdgDefineAnnualRainfall Me.ucrSelectorDefineAnnualRain = New instat.ucrSelectorByDataFrame() Me.tbCropSuccessProp = New System.Windows.Forms.TabPage() Me.lblPlantingLength = New System.Windows.Forms.Label() - Me.ucrReceiverPlantingLenghth = New instat.ucrReceiverSingle() Me.lblPlantingDay = New System.Windows.Forms.Label() Me.lblProbSuccess = New System.Windows.Forms.Label() Me.lblTotalRain = New System.Windows.Forms.Label() Me.lblCropStation = New System.Windows.Forms.Label() + Me.ucrReceiverPlantingLenghth = New instat.ucrReceiverSingle() Me.ucrReceiverPropSuccess = New instat.ucrReceiverSingle() Me.ucrReceiverPlantingDay = New instat.ucrReceiverSingle() Me.ucrReceiverTotalRain = New instat.ucrReceiverSingle() Me.ucrReceiverStationCrop = New instat.ucrReceiverSingle() Me.ucrSelectorCropProp = New instat.ucrSelectorByDataFrame() Me.tbSeasonStartProb = New System.Windows.Forms.TabPage() + Me.lblPlantingDayCond = New System.Windows.Forms.Label() Me.lblSeasonYear = New System.Windows.Forms.Label() Me.lblStationSeasonProb = New System.Windows.Forms.Label() + Me.ucrReceiverPlantingDayCondition = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonPlantingDay = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonYear = New instat.ucrReceiverSingle() Me.ucrReceiverSeasonStationProb = New instat.ucrReceiverSingle() - Me.ucrSelectorSeasonStartProp = New instat.ucrSelectorByDataFrame() - Me.tbAnnualTempSummaries.SuspendLayout() - Me.tbMonthlyTemp.SuspendLayout() + Me.tbAnnualTempSummaries = New System.Windows.Forms.TabPage() + Me.lblMinMinAnnual = New System.Windows.Forms.Label() + Me.lblMeanAnnualTemp = New System.Windows.Forms.Label() + Me.lblMaxMinAnnual = New System.Windows.Forms.Label() + Me.lblAnnualTempYear = New System.Windows.Forms.Label() + Me.lblAnnualTempStation = New System.Windows.Forms.Label() + Me.lblMaxMaxAnnual = New System.Windows.Forms.Label() + Me.lblMinMaxAnnual = New System.Windows.Forms.Label() + Me.lblMeanMaxAnnual = New System.Windows.Forms.Label() + Me.ucrReceiverMinMinAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMaxAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMinAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanAnnual = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualTempYr = New instat.ucrReceiverSingle() + Me.ucrReceiverAnnualTempStation = New instat.ucrReceiverSingle() + Me.ucrSelectorAnnualTemp = New instat.ucrSelectorByDataFrame() + Me.tbMonthlyTemp = New System.Windows.Forms.TabPage() + Me.lblMonth = New System.Windows.Forms.Label() + Me.lblMinMInMonthly = New System.Windows.Forms.Label() + Me.lblMeanMinMonthly = New System.Windows.Forms.Label() + Me.lblMaxMinMonthly = New System.Windows.Forms.Label() + Me.lblYearMonthTemp = New System.Windows.Forms.Label() + Me.lblStationMonthTemp = New System.Windows.Forms.Label() + Me.lblMaxMaxMonthly = New System.Windows.Forms.Label() + Me.lblMinMaxMonthly = New System.Windows.Forms.Label() + Me.lblMeanMaxMonthly = New System.Windows.Forms.Label() + Me.ucrReceiverMonthMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMinMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxMaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanmaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMinMaxMonthly = New instat.ucrReceiverSingle() + Me.ucrReceiverMeanminMontly = New instat.ucrReceiverSingle() + Me.ucrBase = New instat.ucrButtonsSubdialogue() Me.tbSummaries.SuspendLayout() Me.tbAnnualRainfall.SuspendLayout() Me.tbCropSuccessProp.SuspendLayout() Me.tbSeasonStartProb.SuspendLayout() + Me.tbAnnualTempSummaries.SuspendLayout() + Me.tbMonthlyTemp.SuspendLayout() Me.SuspendLayout() ' - 'ucrReceiverPlantingDayCondition - ' - Me.ucrReceiverPlantingDayCondition.AutoSize = True - Me.ucrReceiverPlantingDayCondition.frmParent = Nothing - Me.ucrReceiverPlantingDayCondition.Location = New System.Drawing.Point(252, 155) - Me.ucrReceiverPlantingDayCondition.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverPlantingDayCondition.Name = "ucrReceiverPlantingDayCondition" - Me.ucrReceiverPlantingDayCondition.Selector = Nothing - Me.ucrReceiverPlantingDayCondition.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverPlantingDayCondition.strNcFilePath = "" - Me.ucrReceiverPlantingDayCondition.TabIndex = 8 - Me.ucrReceiverPlantingDayCondition.ucrSelector = Nothing - ' - 'lblMinMinAnnual - ' - Me.lblMinMinAnnual.AutoSize = True - Me.lblMinMinAnnual.Location = New System.Drawing.Point(249, 135) - Me.lblMinMinAnnual.Name = "lblMinMinAnnual" - Me.lblMinMinAnnual.Size = New System.Drawing.Size(98, 13) - Me.lblMinMinAnnual.TabIndex = 7 - Me.lblMinMinAnnual.Text = "Min Minimum Temp" - ' - 'ucrReceiverMinMinAnnual - ' - Me.ucrReceiverMinMinAnnual.AutoSize = True - Me.ucrReceiverMinMinAnnual.frmParent = Nothing - Me.ucrReceiverMinMinAnnual.Location = New System.Drawing.Point(250, 151) - Me.ucrReceiverMinMinAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinMinAnnual.Name = "ucrReceiverMinMinAnnual" - Me.ucrReceiverMinMinAnnual.Selector = Nothing - Me.ucrReceiverMinMinAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMinMinAnnual.strNcFilePath = "" - Me.ucrReceiverMinMinAnnual.TabIndex = 8 - Me.ucrReceiverMinMinAnnual.ucrSelector = Nothing - ' - 'lblMeanAnnualTemp - ' - Me.lblMeanAnnualTemp.AutoSize = True - Me.lblMeanAnnualTemp.Location = New System.Drawing.Point(245, 93) - Me.lblMeanAnnualTemp.Name = "lblMeanAnnualTemp" - Me.lblMeanAnnualTemp.Size = New System.Drawing.Size(108, 13) - Me.lblMeanAnnualTemp.TabIndex = 5 - Me.lblMeanAnnualTemp.Text = "Mean Minimum Temp" - ' - 'lblMaxMinAnnual - ' - Me.lblMaxMinAnnual.AutoSize = True - Me.lblMaxMinAnnual.Location = New System.Drawing.Point(251, 174) - Me.lblMaxMinAnnual.Name = "lblMaxMinAnnual" - Me.lblMaxMinAnnual.Size = New System.Drawing.Size(101, 13) - Me.lblMaxMinAnnual.TabIndex = 9 - Me.lblMaxMinAnnual.Text = "Max Minimum Temp" - ' - 'lblAnnualTempYear + 'ucrReceiverMaxMinMonthly ' - Me.lblAnnualTempYear.AutoSize = True - Me.lblAnnualTempYear.Location = New System.Drawing.Point(249, 52) - Me.lblAnnualTempYear.Name = "lblAnnualTempYear" - Me.lblAnnualTempYear.Size = New System.Drawing.Size(32, 13) - Me.lblAnnualTempYear.TabIndex = 3 - Me.lblAnnualTempYear.Text = "Year:" + Me.ucrReceiverMaxMinMonthly.AutoSize = True + Me.ucrReceiverMaxMinMonthly.frmParent = Nothing + Me.ucrReceiverMaxMinMonthly.Location = New System.Drawing.Point(372, 366) + Me.ucrReceiverMaxMinMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMinMonthly.Name = "ucrReceiverMaxMinMonthly" + Me.ucrReceiverMaxMinMonthly.Selector = Nothing + Me.ucrReceiverMaxMinMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMinMonthly.strNcFilePath = "" + Me.ucrReceiverMaxMinMonthly.TabIndex = 12 + Me.ucrReceiverMaxMinMonthly.ucrSelector = Nothing ' - 'lblAnnualTempStation + 'ucrReceiverYearMonthly ' - Me.lblAnnualTempStation.AutoSize = True - Me.lblAnnualTempStation.Location = New System.Drawing.Point(248, 9) - Me.lblAnnualTempStation.Name = "lblAnnualTempStation" - Me.lblAnnualTempStation.Size = New System.Drawing.Size(43, 13) - Me.lblAnnualTempStation.TabIndex = 1 - Me.lblAnnualTempStation.Text = "Station:" + Me.ucrReceiverYearMonthly.AutoSize = True + Me.ucrReceiverYearMonthly.frmParent = Nothing + Me.ucrReceiverYearMonthly.Location = New System.Drawing.Point(369, 109) + Me.ucrReceiverYearMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYearMonthly.Name = "ucrReceiverYearMonthly" + Me.ucrReceiverYearMonthly.Selector = Nothing + Me.ucrReceiverYearMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverYearMonthly.strNcFilePath = "" + Me.ucrReceiverYearMonthly.TabIndex = 4 + Me.ucrReceiverYearMonthly.ucrSelector = Nothing ' - 'lblMaxMaxAnnual + 'ucrReceiverMonthlyTemp ' - Me.lblMaxMaxAnnual.AutoSize = True - Me.lblMaxMaxAnnual.Location = New System.Drawing.Point(255, 295) - Me.lblMaxMaxAnnual.Name = "lblMaxMaxAnnual" - Me.lblMaxMaxAnnual.Size = New System.Drawing.Size(104, 13) - Me.lblMaxMaxAnnual.TabIndex = 15 - Me.lblMaxMaxAnnual.Text = "Max Maximum Temp" + Me.ucrReceiverMonthlyTemp.AutoSize = True + Me.ucrReceiverMonthlyTemp.frmParent = Nothing + Me.ucrReceiverMonthlyTemp.Location = New System.Drawing.Point(368, 49) + Me.ucrReceiverMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthlyTemp.Name = "ucrReceiverMonthlyTemp" + Me.ucrReceiverMonthlyTemp.Selector = Nothing + Me.ucrReceiverMonthlyTemp.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMonthlyTemp.strNcFilePath = "" + Me.ucrReceiverMonthlyTemp.TabIndex = 2 + Me.ucrReceiverMonthlyTemp.ucrSelector = Nothing ' 'ucrSelecetorMonthlyTemp ' @@ -206,1010 +171,1169 @@ Partial Class sdgDefineAnnualRainfall Me.ucrSelecetorMonthlyTemp.bDropUnusedFilterLevels = False Me.ucrSelecetorMonthlyTemp.bShowHiddenColumns = False Me.ucrSelecetorMonthlyTemp.bUseCurrentFilter = True - Me.ucrSelecetorMonthlyTemp.Location = New System.Drawing.Point(10, 12) + Me.ucrSelecetorMonthlyTemp.Location = New System.Drawing.Point(15, 18) Me.ucrSelecetorMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelecetorMonthlyTemp.Name = "ucrSelecetorMonthlyTemp" - Me.ucrSelecetorMonthlyTemp.Size = New System.Drawing.Size(151, 185) + Me.ucrSelecetorMonthlyTemp.Size = New System.Drawing.Size(339, 412) Me.ucrSelecetorMonthlyTemp.TabIndex = 0 ' - 'lblMinMaxAnnual + 'lblSeasonPlantingDay ' - Me.lblMinMaxAnnual.AutoSize = True - Me.lblMinMaxAnnual.Location = New System.Drawing.Point(254, 253) - Me.lblMinMaxAnnual.Name = "lblMinMaxAnnual" - Me.lblMinMaxAnnual.Size = New System.Drawing.Size(104, 13) - Me.lblMinMaxAnnual.TabIndex = 13 - Me.lblMinMaxAnnual.Text = "Min Maximum Temp:" + Me.lblSeasonPlantingDay.AutoSize = True + Me.lblSeasonPlantingDay.Location = New System.Drawing.Point(370, 149) + Me.lblSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonPlantingDay.Name = "lblSeasonPlantingDay" + Me.lblSeasonPlantingDay.Size = New System.Drawing.Size(102, 20) + Me.lblSeasonPlantingDay.TabIndex = 5 + Me.lblSeasonPlantingDay.Text = "Planting Day:" ' - 'lblMeanMaxAnnual + 'ucrSelectorSeasonStartProp ' - Me.lblMeanMaxAnnual.AutoSize = True - Me.lblMeanMaxAnnual.Location = New System.Drawing.Point(254, 214) - Me.lblMeanMaxAnnual.Name = "lblMeanMaxAnnual" - Me.lblMeanMaxAnnual.Size = New System.Drawing.Size(111, 13) - Me.lblMeanMaxAnnual.TabIndex = 11 - Me.lblMeanMaxAnnual.Text = "Mean Maximum Temp" + Me.ucrSelectorSeasonStartProp.AutoSize = True + Me.ucrSelectorSeasonStartProp.bDropUnusedFilterLevels = False + Me.ucrSelectorSeasonStartProp.bShowHiddenColumns = False + Me.ucrSelectorSeasonStartProp.bUseCurrentFilter = True + Me.ucrSelectorSeasonStartProp.Location = New System.Drawing.Point(20, 15) + Me.ucrSelectorSeasonStartProp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorSeasonStartProp.Name = "ucrSelectorSeasonStartProp" + Me.ucrSelectorSeasonStartProp.Size = New System.Drawing.Size(339, 412) + Me.ucrSelectorSeasonStartProp.TabIndex = 0 ' - 'ucrReceiverMaxMaxAnnual + 'tbSummaries ' - Me.ucrReceiverMaxMaxAnnual.AutoSize = True - Me.ucrReceiverMaxMaxAnnual.frmParent = Nothing - Me.ucrReceiverMaxMaxAnnual.Location = New System.Drawing.Point(254, 308) - Me.ucrReceiverMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxMaxAnnual.Name = "ucrReceiverMaxMaxAnnual" - Me.ucrReceiverMaxMaxAnnual.Selector = Nothing - Me.ucrReceiverMaxMaxAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMaxMaxAnnual.strNcFilePath = "" - Me.ucrReceiverMaxMaxAnnual.TabIndex = 16 - Me.ucrReceiverMaxMaxAnnual.ucrSelector = Nothing + Me.tbSummaries.Controls.Add(Me.tbAnnualRainfall) + Me.tbSummaries.Controls.Add(Me.tbCropSuccessProp) + Me.tbSummaries.Controls.Add(Me.tbSeasonStartProb) + Me.tbSummaries.Controls.Add(Me.tbAnnualTempSummaries) + Me.tbSummaries.Controls.Add(Me.tbMonthlyTemp) + Me.tbSummaries.Location = New System.Drawing.Point(18, 21) + Me.tbSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbSummaries.Name = "tbSummaries" + Me.tbSummaries.SelectedIndex = 0 + Me.tbSummaries.Size = New System.Drawing.Size(784, 728) + Me.tbSummaries.TabIndex = 34 ' - 'ucrReceiverMeanMaxAnnual + 'tbAnnualRainfall ' - Me.ucrReceiverMeanMaxAnnual.AutoSize = True - Me.ucrReceiverMeanMaxAnnual.frmParent = Nothing - Me.ucrReceiverMeanMaxAnnual.Location = New System.Drawing.Point(253, 231) - Me.ucrReceiverMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMeanMaxAnnual.Name = "ucrReceiverMeanMaxAnnual" - Me.ucrReceiverMeanMaxAnnual.Selector = Nothing - Me.ucrReceiverMeanMaxAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMeanMaxAnnual.strNcFilePath = "" - Me.ucrReceiverMeanMaxAnnual.TabIndex = 12 - Me.ucrReceiverMeanMaxAnnual.ucrSelector = Nothing + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainStatus) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainStatus) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainStatus) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainStatus) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonStatus) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonStatus) + Me.tbAnnualRainfall.Controls.Add(Me.lblRainyDaysYear) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysYear) + Me.tbAnnualRainfall.Controls.Add(Me.lblNoRainDaysSeason) + Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalLength) + Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalRain) + Me.tbAnnualRainfall.Controls.Add(Me.lblAnnualRain) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainsDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDOY) + Me.tbAnnualRainfall.Controls.Add(Me.lblYear) + Me.tbAnnualRainfall.Controls.Add(Me.lblStation) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverYear) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStation) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDOY) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDate) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalLength) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysSeason) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalRain) + Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverAnnualRain) + Me.tbAnnualRainfall.Controls.Add(Me.ucrSelectorDefineAnnualRain) + Me.tbAnnualRainfall.Location = New System.Drawing.Point(4, 29) + Me.tbAnnualRainfall.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbAnnualRainfall.Name = "tbAnnualRainfall" + Me.tbAnnualRainfall.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbAnnualRainfall.Size = New System.Drawing.Size(776, 695) + Me.tbAnnualRainfall.TabIndex = 0 + Me.tbAnnualRainfall.Text = "Annual Rainfall" + Me.tbAnnualRainfall.UseVisualStyleBackColor = True ' - 'ucrReceiverMinMaxAnnual + 'lblStartRainStatus + ' + Me.lblStartRainStatus.AutoSize = True + Me.lblStartRainStatus.Location = New System.Drawing.Point(398, 501) + Me.lblStartRainStatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStartRainStatus.Name = "lblStartRainStatus" + Me.lblStartRainStatus.Size = New System.Drawing.Size(144, 20) + Me.lblStartRainStatus.TabIndex = 27 + Me.lblStartRainStatus.Text = "Start Rains Status:" + ' + 'ucrReceiverStartRainStatus + ' + Me.ucrReceiverStartRainStatus.AutoSize = True + Me.ucrReceiverStartRainStatus.frmParent = Nothing + Me.ucrReceiverStartRainStatus.Location = New System.Drawing.Point(392, 527) + Me.ucrReceiverStartRainStatus.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainStatus.Name = "ucrReceiverStartRainStatus" + Me.ucrReceiverStartRainStatus.Selector = Nothing + Me.ucrReceiverStartRainStatus.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStartRainStatus.strNcFilePath = "" + Me.ucrReceiverStartRainStatus.TabIndex = 28 + Me.ucrReceiverStartRainStatus.ucrSelector = Nothing + ' + 'lblEndRainStatus + ' + Me.lblEndRainStatus.AutoSize = True + Me.lblEndRainStatus.Location = New System.Drawing.Point(396, 565) + Me.lblEndRainStatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndRainStatus.Name = "lblEndRainStatus" + Me.lblEndRainStatus.Size = New System.Drawing.Size(138, 20) + Me.lblEndRainStatus.TabIndex = 29 + Me.lblEndRainStatus.Text = "End Rains Status:" + ' + 'ucrReceiverEndRainStatus + ' + Me.ucrReceiverEndRainStatus.AutoSize = True + Me.ucrReceiverEndRainStatus.frmParent = Nothing + Me.ucrReceiverEndRainStatus.Location = New System.Drawing.Point(392, 590) + Me.ucrReceiverEndRainStatus.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainStatus.Name = "ucrReceiverEndRainStatus" + Me.ucrReceiverEndRainStatus.Selector = Nothing + Me.ucrReceiverEndRainStatus.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndRainStatus.strNcFilePath = "" + Me.ucrReceiverEndRainStatus.TabIndex = 30 + Me.ucrReceiverEndRainStatus.ucrSelector = Nothing + ' + 'lblEndSeasonStatus + ' + Me.lblEndSeasonStatus.AutoSize = True + Me.lblEndSeasonStatus.Location = New System.Drawing.Point(396, 627) + Me.lblEndSeasonStatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndSeasonStatus.Name = "lblEndSeasonStatus" + Me.lblEndSeasonStatus.Size = New System.Drawing.Size(152, 20) + Me.lblEndSeasonStatus.TabIndex = 31 + Me.lblEndSeasonStatus.Text = "End Season Status:" + ' + 'ucrReceiverEndSeasonStatus + ' + Me.ucrReceiverEndSeasonStatus.AutoSize = True + Me.ucrReceiverEndSeasonStatus.frmParent = Nothing + Me.ucrReceiverEndSeasonStatus.Location = New System.Drawing.Point(392, 649) + Me.ucrReceiverEndSeasonStatus.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonStatus.Name = "ucrReceiverEndSeasonStatus" + Me.ucrReceiverEndSeasonStatus.Selector = Nothing + Me.ucrReceiverEndSeasonStatus.Size = New System.Drawing.Size(180, 39) + Me.ucrReceiverEndSeasonStatus.strNcFilePath = "" + Me.ucrReceiverEndSeasonStatus.TabIndex = 32 + Me.ucrReceiverEndSeasonStatus.ucrSelector = Nothing ' - Me.ucrReceiverMinMaxAnnual.AutoSize = True - Me.ucrReceiverMinMaxAnnual.frmParent = Nothing - Me.ucrReceiverMinMaxAnnual.Location = New System.Drawing.Point(251, 271) - Me.ucrReceiverMinMaxAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinMaxAnnual.Name = "ucrReceiverMinMaxAnnual" - Me.ucrReceiverMinMaxAnnual.Selector = Nothing - Me.ucrReceiverMinMaxAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMinMaxAnnual.strNcFilePath = "" - Me.ucrReceiverMinMaxAnnual.TabIndex = 14 - Me.ucrReceiverMinMaxAnnual.ucrSelector = Nothing - ' - 'ucrReceiverMaxMinAnnual + 'lblRainyDaysYear ' - Me.ucrReceiverMaxMinAnnual.AutoSize = True - Me.ucrReceiverMaxMinAnnual.frmParent = Nothing - Me.ucrReceiverMaxMinAnnual.Location = New System.Drawing.Point(249, 192) - Me.ucrReceiverMaxMinAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxMinAnnual.Name = "ucrReceiverMaxMinAnnual" - Me.ucrReceiverMaxMinAnnual.Selector = Nothing - Me.ucrReceiverMaxMinAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMaxMinAnnual.strNcFilePath = "" - Me.ucrReceiverMaxMinAnnual.TabIndex = 10 - Me.ucrReceiverMaxMinAnnual.ucrSelector = Nothing + Me.lblRainyDaysYear.AutoSize = True + Me.lblRainyDaysYear.Location = New System.Drawing.Point(396, 132) + Me.lblRainyDaysYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblRainyDaysYear.Name = "lblRainyDaysYear" + Me.lblRainyDaysYear.Size = New System.Drawing.Size(151, 20) + Me.lblRainyDaysYear.TabIndex = 15 + Me.lblRainyDaysYear.Text = " Rainy Days in Year:" ' - 'ucrReceiverMeanAnnual + 'ucrReceiverRainDaysYear ' - Me.ucrReceiverMeanAnnual.AutoSize = True - Me.ucrReceiverMeanAnnual.frmParent = Nothing - Me.ucrReceiverMeanAnnual.Location = New System.Drawing.Point(248, 112) - Me.ucrReceiverMeanAnnual.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMeanAnnual.Name = "ucrReceiverMeanAnnual" - Me.ucrReceiverMeanAnnual.Selector = Nothing - Me.ucrReceiverMeanAnnual.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMeanAnnual.strNcFilePath = "" - Me.ucrReceiverMeanAnnual.TabIndex = 6 - Me.ucrReceiverMeanAnnual.ucrSelector = Nothing + Me.ucrReceiverRainDaysYear.AutoSize = True + Me.ucrReceiverRainDaysYear.frmParent = Nothing + Me.ucrReceiverRainDaysYear.Location = New System.Drawing.Point(392, 156) + Me.ucrReceiverRainDaysYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainDaysYear.Name = "ucrReceiverRainDaysYear" + Me.ucrReceiverRainDaysYear.Selector = Nothing + Me.ucrReceiverRainDaysYear.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverRainDaysYear.strNcFilePath = "" + Me.ucrReceiverRainDaysYear.TabIndex = 16 + Me.ucrReceiverRainDaysYear.ucrSelector = Nothing ' - 'ucrReceiverAnnualTempYr + 'lblNoRainDaysSeason ' - Me.ucrReceiverAnnualTempYr.AutoSize = True - Me.ucrReceiverAnnualTempYr.frmParent = Nothing - Me.ucrReceiverAnnualTempYr.Location = New System.Drawing.Point(247, 69) - Me.ucrReceiverAnnualTempYr.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverAnnualTempYr.Name = "ucrReceiverAnnualTempYr" - Me.ucrReceiverAnnualTempYr.Selector = Nothing - Me.ucrReceiverAnnualTempYr.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverAnnualTempYr.strNcFilePath = "" - Me.ucrReceiverAnnualTempYr.TabIndex = 4 - Me.ucrReceiverAnnualTempYr.ucrSelector = Nothing + Me.lblNoRainDaysSeason.AutoSize = True + Me.lblNoRainDaysSeason.Location = New System.Drawing.Point(396, 63) + Me.lblNoRainDaysSeason.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblNoRainDaysSeason.Name = "lblNoRainDaysSeason" + Me.lblNoRainDaysSeason.Size = New System.Drawing.Size(172, 20) + Me.lblNoRainDaysSeason.TabIndex = 13 + Me.lblNoRainDaysSeason.Text = " Rainy Days in Season:" ' - 'ucrReceiverAnnualTempStation + 'lblSeasonalLength ' - Me.ucrReceiverAnnualTempStation.AutoSize = True - Me.ucrReceiverAnnualTempStation.frmParent = Nothing - Me.ucrReceiverAnnualTempStation.Location = New System.Drawing.Point(246, 26) - Me.ucrReceiverAnnualTempStation.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverAnnualTempStation.Name = "ucrReceiverAnnualTempStation" - Me.ucrReceiverAnnualTempStation.Selector = Nothing - Me.ucrReceiverAnnualTempStation.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverAnnualTempStation.strNcFilePath = "" - Me.ucrReceiverAnnualTempStation.TabIndex = 2 - Me.ucrReceiverAnnualTempStation.ucrSelector = Nothing + Me.lblSeasonalLength.AutoSize = True + Me.lblSeasonalLength.Location = New System.Drawing.Point(396, 191) + Me.lblSeasonalLength.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonalLength.Name = "lblSeasonalLength" + Me.lblSeasonalLength.Size = New System.Drawing.Size(134, 20) + Me.lblSeasonalLength.TabIndex = 17 + Me.lblSeasonalLength.Text = "Seasonal Length:" ' - 'tbAnnualTempSummaries + 'lblSeasonalRain ' - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanAnnualTemp) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempYear) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempStation) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMaxAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMinAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanAnnual) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempYr) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempStation) - Me.tbAnnualTempSummaries.Controls.Add(Me.ucrSelectorAnnualTemp) - Me.tbAnnualTempSummaries.Location = New System.Drawing.Point(4, 22) - Me.tbAnnualTempSummaries.Name = "tbAnnualTempSummaries" - Me.tbAnnualTempSummaries.Padding = New System.Windows.Forms.Padding(3) - Me.tbAnnualTempSummaries.Size = New System.Drawing.Size(515, 404) - Me.tbAnnualTempSummaries.TabIndex = 3 - Me.tbAnnualTempSummaries.Text = "Annual Temperature" - Me.tbAnnualTempSummaries.UseVisualStyleBackColor = True + Me.lblSeasonalRain.AutoSize = True + Me.lblSeasonalRain.Location = New System.Drawing.Point(18, 615) + Me.lblSeasonalRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonalRain.Name = "lblSeasonalRain" + Me.lblSeasonalRain.Size = New System.Drawing.Size(117, 20) + Me.lblSeasonalRain.TabIndex = 11 + Me.lblSeasonalRain.Text = "Seasonal Rain:" ' - 'ucrSelectorAnnualTemp + 'lblAnnualRain ' - Me.ucrSelectorAnnualTemp.AutoSize = True - Me.ucrSelectorAnnualTemp.bDropUnusedFilterLevels = False - Me.ucrSelectorAnnualTemp.bShowHiddenColumns = False - Me.ucrSelectorAnnualTemp.bUseCurrentFilter = True - Me.ucrSelectorAnnualTemp.Location = New System.Drawing.Point(11, 6) - Me.ucrSelectorAnnualTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorAnnualTemp.Name = "ucrSelectorAnnualTemp" - Me.ucrSelectorAnnualTemp.Size = New System.Drawing.Size(151, 185) - Me.ucrSelectorAnnualTemp.TabIndex = 0 + Me.lblAnnualRain.AutoSize = True + Me.lblAnnualRain.Location = New System.Drawing.Point(19, 547) + Me.lblAnnualRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAnnualRain.Name = "lblAnnualRain" + Me.lblAnnualRain.Size = New System.Drawing.Size(100, 20) + Me.lblAnnualRain.TabIndex = 9 + Me.lblAnnualRain.Text = "Annual Rain:" ' - 'lblPlantingDayCond + 'lblEndSeasonDate ' - Me.lblPlantingDayCond.AutoSize = True - Me.lblPlantingDayCond.Location = New System.Drawing.Point(254, 139) - Me.lblPlantingDayCond.Name = "lblPlantingDayCond" - Me.lblPlantingDayCond.Size = New System.Drawing.Size(117, 13) - Me.lblPlantingDayCond.TabIndex = 7 - Me.lblPlantingDayCond.Text = "Planting Day Condition:" + Me.lblEndSeasonDate.AutoSize = True + Me.lblEndSeasonDate.Location = New System.Drawing.Point(396, 439) + Me.lblEndSeasonDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndSeasonDate.Name = "lblEndSeasonDate" + Me.lblEndSeasonDate.Size = New System.Drawing.Size(146, 20) + Me.lblEndSeasonDate.TabIndex = 25 + Me.lblEndSeasonDate.Text = "End Season(Date):" ' - 'tbMonthlyTemp + 'lblEndSeasonDOY ' - Me.tbMonthlyTemp.Controls.Add(Me.lblMonth) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMinMInMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblYearMonthTemp) - Me.tbMonthlyTemp.Controls.Add(Me.lblStationMonthTemp) - Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMinMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanmaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMaxMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMinMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanminMontly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverYearMonthly) - Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthlyTemp) - Me.tbMonthlyTemp.Controls.Add(Me.ucrSelecetorMonthlyTemp) - Me.tbMonthlyTemp.Location = New System.Drawing.Point(4, 22) - Me.tbMonthlyTemp.Name = "tbMonthlyTemp" - Me.tbMonthlyTemp.Padding = New System.Windows.Forms.Padding(3) - Me.tbMonthlyTemp.Size = New System.Drawing.Size(515, 404) - Me.tbMonthlyTemp.TabIndex = 4 - Me.tbMonthlyTemp.Text = "Monthly Temperature" - Me.tbMonthlyTemp.UseVisualStyleBackColor = True + Me.lblEndSeasonDOY.AutoSize = True + Me.lblEndSeasonDOY.Location = New System.Drawing.Point(396, 384) + Me.lblEndSeasonDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndSeasonDOY.Name = "lblEndSeasonDOY" + Me.lblEndSeasonDOY.Size = New System.Drawing.Size(146, 20) + Me.lblEndSeasonDOY.TabIndex = 23 + Me.lblEndSeasonDOY.Text = "End Season(DOY):" ' - 'lblMonth + 'lblEndRainDate ' - Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(247, 95) - Me.lblMonth.Name = "lblMonth" - Me.lblMonth.Size = New System.Drawing.Size(40, 13) - Me.lblMonth.TabIndex = 5 - Me.lblMonth.Text = "Month:" + Me.lblEndRainDate.AutoSize = True + Me.lblEndRainDate.Location = New System.Drawing.Point(396, 318) + Me.lblEndRainDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndRainDate.Name = "lblEndRainDate" + Me.lblEndRainDate.Size = New System.Drawing.Size(124, 20) + Me.lblEndRainDate.TabIndex = 21 + Me.lblEndRainDate.Text = "End Rain(Date):" ' - 'ucrReceiverMonthMonthly + 'lblEndRainsDOY ' - Me.ucrReceiverMonthMonthly.AutoSize = True - Me.ucrReceiverMonthMonthly.frmParent = Nothing - Me.ucrReceiverMonthMonthly.Location = New System.Drawing.Point(245, 112) - Me.ucrReceiverMonthMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMonthMonthly.Name = "ucrReceiverMonthMonthly" - Me.ucrReceiverMonthMonthly.Selector = Nothing - Me.ucrReceiverMonthMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMonthMonthly.strNcFilePath = "" - Me.ucrReceiverMonthMonthly.TabIndex = 6 - Me.ucrReceiverMonthMonthly.ucrSelector = Nothing + Me.lblEndRainsDOY.AutoSize = True + Me.lblEndRainsDOY.Location = New System.Drawing.Point(396, 257) + Me.lblEndRainsDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblEndRainsDOY.Name = "lblEndRainsDOY" + Me.lblEndRainsDOY.Size = New System.Drawing.Size(124, 20) + Me.lblEndRainsDOY.TabIndex = 19 + Me.lblEndRainsDOY.Text = "End Rain(DOY):" ' - 'lblMinMInMonthly + 'lblStartRainDate ' - Me.lblMinMInMonthly.AutoSize = True - Me.lblMinMInMonthly.Location = New System.Drawing.Point(248, 181) - Me.lblMinMInMonthly.Name = "lblMinMInMonthly" - Me.lblMinMInMonthly.Size = New System.Drawing.Size(98, 13) - Me.lblMinMInMonthly.TabIndex = 9 - Me.lblMinMInMonthly.Text = "Min Minimum Temp" + Me.lblStartRainDate.AutoSize = True + Me.lblStartRainDate.Location = New System.Drawing.Point(16, 486) + Me.lblStartRainDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStartRainDate.Name = "lblStartRainDate" + Me.lblStartRainDate.Size = New System.Drawing.Size(130, 20) + Me.lblStartRainDate.TabIndex = 7 + Me.lblStartRainDate.Text = "Start Rain(Date):" ' - 'ucrReceiverMinMinMonthly + 'lblStartRainDOY ' - Me.ucrReceiverMinMinMonthly.AutoSize = True - Me.ucrReceiverMinMinMonthly.frmParent = Nothing - Me.ucrReceiverMinMinMonthly.Location = New System.Drawing.Point(249, 197) - Me.ucrReceiverMinMinMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinMinMonthly.Name = "ucrReceiverMinMinMonthly" - Me.ucrReceiverMinMinMonthly.Selector = Nothing - Me.ucrReceiverMinMinMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMinMinMonthly.strNcFilePath = "" - Me.ucrReceiverMinMinMonthly.TabIndex = 10 - Me.ucrReceiverMinMinMonthly.ucrSelector = Nothing + Me.lblStartRainDOY.AutoSize = True + Me.lblStartRainDOY.Location = New System.Drawing.Point(18, 422) + Me.lblStartRainDOY.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStartRainDOY.Name = "lblStartRainDOY" + Me.lblStartRainDOY.Size = New System.Drawing.Size(130, 20) + Me.lblStartRainDOY.TabIndex = 5 + Me.lblStartRainDOY.Text = "Start Rain(DOY):" ' - 'lblMeanMinMonthly + 'lblYear ' - Me.lblMeanMinMonthly.AutoSize = True - Me.lblMeanMinMonthly.Location = New System.Drawing.Point(244, 139) - Me.lblMeanMinMonthly.Name = "lblMeanMinMonthly" - Me.lblMeanMinMonthly.Size = New System.Drawing.Size(108, 13) - Me.lblMeanMinMonthly.TabIndex = 7 - Me.lblMeanMinMonthly.Text = "Mean Minimum Temp" + Me.lblYear.AutoSize = True + Me.lblYear.Location = New System.Drawing.Point(21, 355) + Me.lblYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(47, 20) + Me.lblYear.TabIndex = 3 + Me.lblYear.Text = "Year:" ' - 'lblMaxMinMonthly + 'lblStation ' - Me.lblMaxMinMonthly.AutoSize = True - Me.lblMaxMinMonthly.Location = New System.Drawing.Point(250, 220) - Me.lblMaxMinMonthly.Name = "lblMaxMinMonthly" - Me.lblMaxMinMonthly.Size = New System.Drawing.Size(101, 13) - Me.lblMaxMinMonthly.TabIndex = 11 - Me.lblMaxMinMonthly.Text = "Max Minimum Temp" + Me.lblStation.AutoSize = True + Me.lblStation.Location = New System.Drawing.Point(22, 288) + Me.lblStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStation.Name = "lblStation" + Me.lblStation.Size = New System.Drawing.Size(64, 20) + Me.lblStation.TabIndex = 1 + Me.lblStation.Text = "Station:" ' - 'lblYearMonthTemp + 'ucrReceiverStartRainDate ' - Me.lblYearMonthTemp.AutoSize = True - Me.lblYearMonthTemp.Location = New System.Drawing.Point(248, 54) - Me.lblYearMonthTemp.Name = "lblYearMonthTemp" - Me.lblYearMonthTemp.Size = New System.Drawing.Size(32, 13) - Me.lblYearMonthTemp.TabIndex = 3 - Me.lblYearMonthTemp.Text = "Year:" + Me.ucrReceiverStartRainDate.AutoSize = True + Me.ucrReceiverStartRainDate.frmParent = Nothing + Me.ucrReceiverStartRainDate.Location = New System.Drawing.Point(14, 513) + Me.ucrReceiverStartRainDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDate.Name = "ucrReceiverStartRainDate" + Me.ucrReceiverStartRainDate.Selector = Nothing + Me.ucrReceiverStartRainDate.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStartRainDate.strNcFilePath = "" + Me.ucrReceiverStartRainDate.TabIndex = 8 + Me.ucrReceiverStartRainDate.ucrSelector = Nothing ' - 'lblStationMonthTemp + 'ucrReceiverStartRainDOY ' - Me.lblStationMonthTemp.AutoSize = True - Me.lblStationMonthTemp.Location = New System.Drawing.Point(247, 15) - Me.lblStationMonthTemp.Name = "lblStationMonthTemp" - Me.lblStationMonthTemp.Size = New System.Drawing.Size(43, 13) - Me.lblStationMonthTemp.TabIndex = 1 - Me.lblStationMonthTemp.Text = "Station:" + Me.ucrReceiverStartRainDOY.AutoSize = True + Me.ucrReceiverStartRainDOY.frmParent = Nothing + Me.ucrReceiverStartRainDOY.Location = New System.Drawing.Point(14, 449) + Me.ucrReceiverStartRainDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStartRainDOY.Name = "ucrReceiverStartRainDOY" + Me.ucrReceiverStartRainDOY.Selector = Nothing + Me.ucrReceiverStartRainDOY.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStartRainDOY.strNcFilePath = "" + Me.ucrReceiverStartRainDOY.TabIndex = 6 + Me.ucrReceiverStartRainDOY.ucrSelector = Nothing ' - 'lblMaxMaxMonthly + 'ucrReceiverYear ' - Me.lblMaxMaxMonthly.AutoSize = True - Me.lblMaxMaxMonthly.Location = New System.Drawing.Point(254, 341) - Me.lblMaxMaxMonthly.Name = "lblMaxMaxMonthly" - Me.lblMaxMaxMonthly.Size = New System.Drawing.Size(104, 13) - Me.lblMaxMaxMonthly.TabIndex = 17 - Me.lblMaxMaxMonthly.Text = "Max Maximum Temp" + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Nothing + Me.ucrReceiverYear.Location = New System.Drawing.Point(14, 382) + Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 4 + Me.ucrReceiverYear.ucrSelector = Nothing ' - 'lblMinMaxMonthly + 'ucrReceiverStation ' - Me.lblMinMaxMonthly.AutoSize = True - Me.lblMinMaxMonthly.Location = New System.Drawing.Point(253, 299) - Me.lblMinMaxMonthly.Name = "lblMinMaxMonthly" - Me.lblMinMaxMonthly.Size = New System.Drawing.Size(104, 13) - Me.lblMinMaxMonthly.TabIndex = 15 - Me.lblMinMaxMonthly.Text = "Min Maximum Temp:" + Me.ucrReceiverStation.AutoSize = True + Me.ucrReceiverStation.frmParent = Nothing + Me.ucrReceiverStation.Location = New System.Drawing.Point(16, 314) + Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.TabIndex = 2 + Me.ucrReceiverStation.ucrSelector = Nothing ' - 'lblMeanMaxMonthly + 'ucrReceiverEndSeasonDate ' - Me.lblMeanMaxMonthly.AutoSize = True - Me.lblMeanMaxMonthly.Location = New System.Drawing.Point(253, 260) - Me.lblMeanMaxMonthly.Name = "lblMeanMaxMonthly" - Me.lblMeanMaxMonthly.Size = New System.Drawing.Size(111, 13) - Me.lblMeanMaxMonthly.TabIndex = 13 - Me.lblMeanMaxMonthly.Text = "Mean Maximum Temp" - ' - 'ucrReceiverMaxMaxMonthly + Me.ucrReceiverEndSeasonDate.AutoSize = True + Me.ucrReceiverEndSeasonDate.frmParent = Nothing + Me.ucrReceiverEndSeasonDate.Location = New System.Drawing.Point(392, 465) + Me.ucrReceiverEndSeasonDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonDate.Name = "ucrReceiverEndSeasonDate" + Me.ucrReceiverEndSeasonDate.Selector = Nothing + Me.ucrReceiverEndSeasonDate.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndSeasonDate.strNcFilePath = "" + Me.ucrReceiverEndSeasonDate.TabIndex = 26 + Me.ucrReceiverEndSeasonDate.ucrSelector = Nothing ' - Me.ucrReceiverMaxMaxMonthly.AutoSize = True - Me.ucrReceiverMaxMaxMonthly.frmParent = Nothing - Me.ucrReceiverMaxMaxMonthly.Location = New System.Drawing.Point(253, 354) - Me.ucrReceiverMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxMaxMonthly.Name = "ucrReceiverMaxMaxMonthly" - Me.ucrReceiverMaxMaxMonthly.Selector = Nothing - Me.ucrReceiverMaxMaxMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMaxMaxMonthly.strNcFilePath = "" - Me.ucrReceiverMaxMaxMonthly.TabIndex = 18 - Me.ucrReceiverMaxMaxMonthly.ucrSelector = Nothing + 'ucrReceiverEndSeasonDOY ' - 'ucrReceiverMeanmaxMonthly + Me.ucrReceiverEndSeasonDOY.AutoSize = True + Me.ucrReceiverEndSeasonDOY.frmParent = Nothing + Me.ucrReceiverEndSeasonDOY.Location = New System.Drawing.Point(392, 404) + Me.ucrReceiverEndSeasonDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndSeasonDOY.Name = "ucrReceiverEndSeasonDOY" + Me.ucrReceiverEndSeasonDOY.Selector = Nothing + Me.ucrReceiverEndSeasonDOY.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndSeasonDOY.strNcFilePath = "" + Me.ucrReceiverEndSeasonDOY.TabIndex = 24 + Me.ucrReceiverEndSeasonDOY.ucrSelector = Nothing ' - Me.ucrReceiverMeanmaxMonthly.AutoSize = True - Me.ucrReceiverMeanmaxMonthly.frmParent = Nothing - Me.ucrReceiverMeanmaxMonthly.Location = New System.Drawing.Point(252, 277) - Me.ucrReceiverMeanmaxMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMeanmaxMonthly.Name = "ucrReceiverMeanmaxMonthly" - Me.ucrReceiverMeanmaxMonthly.Selector = Nothing - Me.ucrReceiverMeanmaxMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMeanmaxMonthly.strNcFilePath = "" - Me.ucrReceiverMeanmaxMonthly.TabIndex = 14 - Me.ucrReceiverMeanmaxMonthly.ucrSelector = Nothing + 'ucrReceiverEndRainsDOY ' - 'ucrReceiverMinMaxMonthly + Me.ucrReceiverEndRainsDOY.AutoSize = True + Me.ucrReceiverEndRainsDOY.frmParent = Nothing + Me.ucrReceiverEndRainsDOY.Location = New System.Drawing.Point(392, 283) + Me.ucrReceiverEndRainsDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainsDOY.Name = "ucrReceiverEndRainsDOY" + Me.ucrReceiverEndRainsDOY.Selector = Nothing + Me.ucrReceiverEndRainsDOY.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndRainsDOY.strNcFilePath = "" + Me.ucrReceiverEndRainsDOY.TabIndex = 20 + Me.ucrReceiverEndRainsDOY.ucrSelector = Nothing ' - Me.ucrReceiverMinMaxMonthly.AutoSize = True - Me.ucrReceiverMinMaxMonthly.frmParent = Nothing - Me.ucrReceiverMinMaxMonthly.Location = New System.Drawing.Point(250, 317) - Me.ucrReceiverMinMaxMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMinMaxMonthly.Name = "ucrReceiverMinMaxMonthly" - Me.ucrReceiverMinMaxMonthly.Selector = Nothing - Me.ucrReceiverMinMaxMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMinMaxMonthly.strNcFilePath = "" - Me.ucrReceiverMinMaxMonthly.TabIndex = 16 - Me.ucrReceiverMinMaxMonthly.ucrSelector = Nothing + 'ucrReceiverEndRainsDate ' - 'ucrReceiverMaxMinMonthly + Me.ucrReceiverEndRainsDate.AutoSize = True + Me.ucrReceiverEndRainsDate.frmParent = Nothing + Me.ucrReceiverEndRainsDate.Location = New System.Drawing.Point(392, 346) + Me.ucrReceiverEndRainsDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEndRainsDate.Name = "ucrReceiverEndRainsDate" + Me.ucrReceiverEndRainsDate.Selector = Nothing + Me.ucrReceiverEndRainsDate.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverEndRainsDate.strNcFilePath = "" + Me.ucrReceiverEndRainsDate.TabIndex = 22 + Me.ucrReceiverEndRainsDate.ucrSelector = Nothing ' - Me.ucrReceiverMaxMinMonthly.AutoSize = True - Me.ucrReceiverMaxMinMonthly.frmParent = Nothing - Me.ucrReceiverMaxMinMonthly.Location = New System.Drawing.Point(248, 238) - Me.ucrReceiverMaxMinMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxMinMonthly.Name = "ucrReceiverMaxMinMonthly" - Me.ucrReceiverMaxMinMonthly.Selector = Nothing - Me.ucrReceiverMaxMinMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMaxMinMonthly.strNcFilePath = "" - Me.ucrReceiverMaxMinMonthly.TabIndex = 12 - Me.ucrReceiverMaxMinMonthly.ucrSelector = Nothing + 'ucrReceiverSeasonalLength ' - 'ucrReceiverMeanminMontly + Me.ucrReceiverSeasonalLength.AutoSize = True + Me.ucrReceiverSeasonalLength.frmParent = Nothing + Me.ucrReceiverSeasonalLength.Location = New System.Drawing.Point(392, 218) + Me.ucrReceiverSeasonalLength.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonalLength.Name = "ucrReceiverSeasonalLength" + Me.ucrReceiverSeasonalLength.Selector = Nothing + Me.ucrReceiverSeasonalLength.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonalLength.strNcFilePath = "" + Me.ucrReceiverSeasonalLength.TabIndex = 18 + Me.ucrReceiverSeasonalLength.ucrSelector = Nothing ' - Me.ucrReceiverMeanminMontly.AutoSize = True - Me.ucrReceiverMeanminMontly.frmParent = Nothing - Me.ucrReceiverMeanminMontly.Location = New System.Drawing.Point(247, 158) - Me.ucrReceiverMeanminMontly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMeanminMontly.Name = "ucrReceiverMeanminMontly" - Me.ucrReceiverMeanminMontly.Selector = Nothing - Me.ucrReceiverMeanminMontly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMeanminMontly.strNcFilePath = "" - Me.ucrReceiverMeanminMontly.TabIndex = 8 - Me.ucrReceiverMeanminMontly.ucrSelector = Nothing + 'ucrReceiverRainDaysSeason ' - 'ucrReceiverYearMonthly + Me.ucrReceiverRainDaysSeason.AutoSize = True + Me.ucrReceiverRainDaysSeason.frmParent = Nothing + Me.ucrReceiverRainDaysSeason.Location = New System.Drawing.Point(392, 90) + Me.ucrReceiverRainDaysSeason.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainDaysSeason.Name = "ucrReceiverRainDaysSeason" + Me.ucrReceiverRainDaysSeason.Selector = Nothing + Me.ucrReceiverRainDaysSeason.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverRainDaysSeason.strNcFilePath = "" + Me.ucrReceiverRainDaysSeason.TabIndex = 14 + Me.ucrReceiverRainDaysSeason.ucrSelector = Nothing ' - Me.ucrReceiverYearMonthly.AutoSize = True - Me.ucrReceiverYearMonthly.frmParent = Nothing - Me.ucrReceiverYearMonthly.Location = New System.Drawing.Point(246, 71) - Me.ucrReceiverYearMonthly.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYearMonthly.Name = "ucrReceiverYearMonthly" - Me.ucrReceiverYearMonthly.Selector = Nothing - Me.ucrReceiverYearMonthly.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverYearMonthly.strNcFilePath = "" - Me.ucrReceiverYearMonthly.TabIndex = 4 - Me.ucrReceiverYearMonthly.ucrSelector = Nothing + 'ucrReceiverSeasonalRain ' - 'ucrReceiverMonthlyTemp + Me.ucrReceiverSeasonalRain.AutoSize = True + Me.ucrReceiverSeasonalRain.frmParent = Nothing + Me.ucrReceiverSeasonalRain.Location = New System.Drawing.Point(14, 641) + Me.ucrReceiverSeasonalRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonalRain.Name = "ucrReceiverSeasonalRain" + Me.ucrReceiverSeasonalRain.Selector = Nothing + Me.ucrReceiverSeasonalRain.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonalRain.strNcFilePath = "" + Me.ucrReceiverSeasonalRain.TabIndex = 12 + Me.ucrReceiverSeasonalRain.ucrSelector = Nothing ' - Me.ucrReceiverMonthlyTemp.AutoSize = True - Me.ucrReceiverMonthlyTemp.frmParent = Nothing - Me.ucrReceiverMonthlyTemp.Location = New System.Drawing.Point(245, 32) - Me.ucrReceiverMonthlyTemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMonthlyTemp.Name = "ucrReceiverMonthlyTemp" - Me.ucrReceiverMonthlyTemp.Selector = Nothing - Me.ucrReceiverMonthlyTemp.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverMonthlyTemp.strNcFilePath = "" - Me.ucrReceiverMonthlyTemp.TabIndex = 2 - Me.ucrReceiverMonthlyTemp.ucrSelector = Nothing + 'ucrReceiverAnnualRain ' - 'ucrBase + Me.ucrReceiverAnnualRain.AutoSize = True + Me.ucrReceiverAnnualRain.frmParent = Nothing + Me.ucrReceiverAnnualRain.Location = New System.Drawing.Point(16, 573) + Me.ucrReceiverAnnualRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualRain.Name = "ucrReceiverAnnualRain" + Me.ucrReceiverAnnualRain.Selector = Nothing + Me.ucrReceiverAnnualRain.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverAnnualRain.strNcFilePath = "" + Me.ucrReceiverAnnualRain.TabIndex = 10 + Me.ucrReceiverAnnualRain.ucrSelector = Nothing ' - Me.ucrBase.AutoSize = True - Me.ucrBase.Location = New System.Drawing.Point(157, 455) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(224, 30) - Me.ucrBase.TabIndex = 1 + 'ucrSelectorDefineAnnualRain ' - 'lblSeasonPlantingDay + Me.ucrSelectorDefineAnnualRain.AutoSize = True + Me.ucrSelectorDefineAnnualRain.bDropUnusedFilterLevels = False + Me.ucrSelectorDefineAnnualRain.bShowHiddenColumns = False + Me.ucrSelectorDefineAnnualRain.bUseCurrentFilter = True + Me.ucrSelectorDefineAnnualRain.Location = New System.Drawing.Point(10, 7) + Me.ucrSelectorDefineAnnualRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDefineAnnualRain.Name = "ucrSelectorDefineAnnualRain" + Me.ucrSelectorDefineAnnualRain.Size = New System.Drawing.Size(339, 293) + Me.ucrSelectorDefineAnnualRain.TabIndex = 0 ' - Me.lblSeasonPlantingDay.AutoSize = True - Me.lblSeasonPlantingDay.Location = New System.Drawing.Point(247, 97) - Me.lblSeasonPlantingDay.Name = "lblSeasonPlantingDay" - Me.lblSeasonPlantingDay.Size = New System.Drawing.Size(70, 13) - Me.lblSeasonPlantingDay.TabIndex = 5 - Me.lblSeasonPlantingDay.Text = "Planting Day:" + 'tbCropSuccessProp ' - 'lblRainyDaysYear + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingLength) + Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.lblProbSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.lblTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.lblCropStation) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingLenghth) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPropSuccess) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingDay) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverTotalRain) + Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverStationCrop) + Me.tbCropSuccessProp.Controls.Add(Me.ucrSelectorCropProp) + Me.tbCropSuccessProp.Location = New System.Drawing.Point(4, 29) + Me.tbCropSuccessProp.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbCropSuccessProp.Name = "tbCropSuccessProp" + Me.tbCropSuccessProp.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbCropSuccessProp.Size = New System.Drawing.Size(776, 695) + Me.tbCropSuccessProp.TabIndex = 1 + Me.tbCropSuccessProp.Text = "Crop Success Prop" + Me.tbCropSuccessProp.UseVisualStyleBackColor = True ' - Me.lblRainyDaysYear.AutoSize = True - Me.lblRainyDaysYear.Location = New System.Drawing.Point(248, 137) - Me.lblRainyDaysYear.Name = "lblRainyDaysYear" - Me.lblRainyDaysYear.Size = New System.Drawing.Size(103, 13) - Me.lblRainyDaysYear.TabIndex = 7 - Me.lblRainyDaysYear.Text = " Rainy Days in Year:" + 'lblPlantingLength ' - 'ucrReceiverRainDaysYear + Me.lblPlantingLength.AutoSize = True + Me.lblPlantingLength.Location = New System.Drawing.Point(378, 211) + Me.lblPlantingLength.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblPlantingLength.Name = "lblPlantingLength" + Me.lblPlantingLength.Size = New System.Drawing.Size(124, 20) + Me.lblPlantingLength.TabIndex = 7 + Me.lblPlantingLength.Text = "Planting Length:" ' - Me.ucrReceiverRainDaysYear.AutoSize = True - Me.ucrReceiverRainDaysYear.frmParent = Nothing - Me.ucrReceiverRainDaysYear.Location = New System.Drawing.Point(246, 153) - Me.ucrReceiverRainDaysYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRainDaysYear.Name = "ucrReceiverRainDaysYear" - Me.ucrReceiverRainDaysYear.Selector = Nothing - Me.ucrReceiverRainDaysYear.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverRainDaysYear.strNcFilePath = "" - Me.ucrReceiverRainDaysYear.TabIndex = 8 - Me.ucrReceiverRainDaysYear.ucrSelector = Nothing + 'lblPlantingDay ' - 'lblNoRainDaysSeason + Me.lblPlantingDay.AutoSize = True + Me.lblPlantingDay.Location = New System.Drawing.Point(368, 146) + Me.lblPlantingDay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblPlantingDay.Name = "lblPlantingDay" + Me.lblPlantingDay.Size = New System.Drawing.Size(102, 20) + Me.lblPlantingDay.TabIndex = 5 + Me.lblPlantingDay.Text = "Planting Day:" ' - Me.lblNoRainDaysSeason.AutoSize = True - Me.lblNoRainDaysSeason.Location = New System.Drawing.Point(241, 95) - Me.lblNoRainDaysSeason.Name = "lblNoRainDaysSeason" - Me.lblNoRainDaysSeason.Size = New System.Drawing.Size(117, 13) - Me.lblNoRainDaysSeason.TabIndex = 5 - Me.lblNoRainDaysSeason.Text = " Rainy Days in Season:" + 'lblProbSuccess ' - 'lblSeasonalLength + Me.lblProbSuccess.AutoSize = True + Me.lblProbSuccess.Location = New System.Drawing.Point(376, 271) + Me.lblProbSuccess.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblProbSuccess.Name = "lblProbSuccess" + Me.lblProbSuccess.Size = New System.Drawing.Size(173, 20) + Me.lblProbSuccess.TabIndex = 9 + Me.lblProbSuccess.Text = "Proportion of Success :" ' - Me.lblSeasonalLength.AutoSize = True - Me.lblSeasonalLength.Location = New System.Drawing.Point(247, 176) - Me.lblSeasonalLength.Name = "lblSeasonalLength" - Me.lblSeasonalLength.Size = New System.Drawing.Size(90, 13) - Me.lblSeasonalLength.TabIndex = 9 - Me.lblSeasonalLength.Text = "Seasonal Length:" + 'lblTotalRain ' - 'lblSeasonalRain + Me.lblTotalRain.AutoSize = True + Me.lblTotalRain.Location = New System.Drawing.Point(374, 83) + Me.lblTotalRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblTotalRain.Name = "lblTotalRain" + Me.lblTotalRain.Size = New System.Drawing.Size(85, 20) + Me.lblTotalRain.TabIndex = 3 + Me.lblTotalRain.Text = "Total Rain:" ' - Me.lblSeasonalRain.AutoSize = True - Me.lblSeasonalRain.Location = New System.Drawing.Point(245, 54) - Me.lblSeasonalRain.Name = "lblSeasonalRain" - Me.lblSeasonalRain.Size = New System.Drawing.Size(79, 13) - Me.lblSeasonalRain.TabIndex = 3 - Me.lblSeasonalRain.Text = "Seasonal Rain:" + 'lblCropStation ' - 'lblAnnualRain + Me.lblCropStation.AutoSize = True + Me.lblCropStation.Location = New System.Drawing.Point(372, 17) + Me.lblCropStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCropStation.Name = "lblCropStation" + Me.lblCropStation.Size = New System.Drawing.Size(64, 20) + Me.lblCropStation.TabIndex = 1 + Me.lblCropStation.Text = "Station:" ' - Me.lblAnnualRain.AutoSize = True - Me.lblAnnualRain.Location = New System.Drawing.Point(244, 11) - Me.lblAnnualRain.Name = "lblAnnualRain" - Me.lblAnnualRain.Size = New System.Drawing.Size(68, 13) - Me.lblAnnualRain.TabIndex = 1 - Me.lblAnnualRain.Text = "Annual Rain:" + 'ucrReceiverPlantingLenghth ' - 'lblEndSeasonDate + Me.ucrReceiverPlantingLenghth.AutoSize = True + Me.ucrReceiverPlantingLenghth.frmParent = Nothing + Me.ucrReceiverPlantingLenghth.Location = New System.Drawing.Point(375, 235) + Me.ucrReceiverPlantingLenghth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingLenghth.Name = "ucrReceiverPlantingLenghth" + Me.ucrReceiverPlantingLenghth.Selector = Nothing + Me.ucrReceiverPlantingLenghth.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPlantingLenghth.strNcFilePath = "" + Me.ucrReceiverPlantingLenghth.TabIndex = 8 + Me.ucrReceiverPlantingLenghth.ucrSelector = Nothing ' - Me.lblEndSeasonDate.AutoSize = True - Me.lblEndSeasonDate.Location = New System.Drawing.Point(250, 331) - Me.lblEndSeasonDate.Name = "lblEndSeasonDate" - Me.lblEndSeasonDate.Size = New System.Drawing.Size(97, 13) - Me.lblEndSeasonDate.TabIndex = 17 - Me.lblEndSeasonDate.Text = "End Season(Date):" + 'ucrReceiverPropSuccess ' - 'lblEndSeasonDOY + Me.ucrReceiverPropSuccess.AutoSize = True + Me.ucrReceiverPropSuccess.frmParent = Nothing + Me.ucrReceiverPropSuccess.Location = New System.Drawing.Point(374, 298) + Me.ucrReceiverPropSuccess.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPropSuccess.Name = "ucrReceiverPropSuccess" + Me.ucrReceiverPropSuccess.Selector = Nothing + Me.ucrReceiverPropSuccess.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPropSuccess.strNcFilePath = "" + Me.ucrReceiverPropSuccess.TabIndex = 10 + Me.ucrReceiverPropSuccess.ucrSelector = Nothing ' - Me.lblEndSeasonDOY.AutoSize = True - Me.lblEndSeasonDOY.Location = New System.Drawing.Point(251, 297) - Me.lblEndSeasonDOY.Name = "lblEndSeasonDOY" - Me.lblEndSeasonDOY.Size = New System.Drawing.Size(97, 13) - Me.lblEndSeasonDOY.TabIndex = 15 - Me.lblEndSeasonDOY.Text = "End Season(DOY):" + 'ucrReceiverPlantingDay ' - 'lblEndRainDate + Me.ucrReceiverPlantingDay.AutoSize = True + Me.ucrReceiverPlantingDay.frmParent = Nothing + Me.ucrReceiverPlantingDay.Location = New System.Drawing.Point(372, 175) + Me.ucrReceiverPlantingDay.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingDay.Name = "ucrReceiverPlantingDay" + Me.ucrReceiverPlantingDay.Selector = Nothing + Me.ucrReceiverPlantingDay.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPlantingDay.strNcFilePath = "" + Me.ucrReceiverPlantingDay.TabIndex = 6 + Me.ucrReceiverPlantingDay.ucrSelector = Nothing ' - Me.lblEndRainDate.AutoSize = True - Me.lblEndRainDate.Location = New System.Drawing.Point(250, 255) - Me.lblEndRainDate.Name = "lblEndRainDate" - Me.lblEndRainDate.Size = New System.Drawing.Size(83, 13) - Me.lblEndRainDate.TabIndex = 13 - Me.lblEndRainDate.Text = "End Rain(Date):" + 'ucrReceiverTotalRain ' - 'lblEndRainsDOY + Me.ucrReceiverTotalRain.AutoSize = True + Me.ucrReceiverTotalRain.frmParent = Nothing + Me.ucrReceiverTotalRain.Location = New System.Drawing.Point(370, 109) + Me.ucrReceiverTotalRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverTotalRain.Name = "ucrReceiverTotalRain" + Me.ucrReceiverTotalRain.Selector = Nothing + Me.ucrReceiverTotalRain.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverTotalRain.strNcFilePath = "" + Me.ucrReceiverTotalRain.TabIndex = 4 + Me.ucrReceiverTotalRain.ucrSelector = Nothing ' - Me.lblEndRainsDOY.AutoSize = True - Me.lblEndRainsDOY.Location = New System.Drawing.Point(250, 216) - Me.lblEndRainsDOY.Name = "lblEndRainsDOY" - Me.lblEndRainsDOY.Size = New System.Drawing.Size(83, 13) - Me.lblEndRainsDOY.TabIndex = 11 - Me.lblEndRainsDOY.Text = "End Rain(DOY):" + 'ucrReceiverStationCrop ' - 'lblStartRainDate + Me.ucrReceiverStationCrop.AutoSize = True + Me.ucrReceiverStationCrop.frmParent = Nothing + Me.ucrReceiverStationCrop.Location = New System.Drawing.Point(369, 43) + Me.ucrReceiverStationCrop.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStationCrop.Name = "ucrReceiverStationCrop" + Me.ucrReceiverStationCrop.Selector = Nothing + Me.ucrReceiverStationCrop.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverStationCrop.strNcFilePath = "" + Me.ucrReceiverStationCrop.TabIndex = 2 + Me.ucrReceiverStationCrop.ucrSelector = Nothing ' - Me.lblStartRainDate.AutoSize = True - Me.lblStartRainDate.Location = New System.Drawing.Point(11, 326) - Me.lblStartRainDate.Name = "lblStartRainDate" - Me.lblStartRainDate.Size = New System.Drawing.Size(86, 13) - Me.lblStartRainDate.TabIndex = 25 - Me.lblStartRainDate.Text = "Start Rain(Date):" + 'ucrSelectorCropProp ' - 'lblStartRainDOY + Me.ucrSelectorCropProp.AutoSize = True + Me.ucrSelectorCropProp.bDropUnusedFilterLevels = False + Me.ucrSelectorCropProp.bShowHiddenColumns = False + Me.ucrSelectorCropProp.bUseCurrentFilter = True + Me.ucrSelectorCropProp.Location = New System.Drawing.Point(16, 12) + Me.ucrSelectorCropProp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCropProp.Name = "ucrSelectorCropProp" + Me.ucrSelectorCropProp.Size = New System.Drawing.Size(339, 412) + Me.ucrSelectorCropProp.TabIndex = 0 ' - Me.lblStartRainDOY.AutoSize = True - Me.lblStartRainDOY.Location = New System.Drawing.Point(12, 285) - Me.lblStartRainDOY.Name = "lblStartRainDOY" - Me.lblStartRainDOY.Size = New System.Drawing.Size(86, 13) - Me.lblStartRainDOY.TabIndex = 23 - Me.lblStartRainDOY.Text = "Start Rain(DOY):" + 'tbSeasonStartProb ' - 'lblYear + Me.tbSeasonStartProb.Controls.Add(Me.lblPlantingDayCond) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.lblStationSeasonProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverPlantingDayCondition) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonPlantingDay) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonYear) + Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonStationProb) + Me.tbSeasonStartProb.Controls.Add(Me.ucrSelectorSeasonStartProp) + Me.tbSeasonStartProb.Location = New System.Drawing.Point(4, 29) + Me.tbSeasonStartProb.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbSeasonStartProb.Name = "tbSeasonStartProb" + Me.tbSeasonStartProb.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbSeasonStartProb.Size = New System.Drawing.Size(776, 695) + Me.tbSeasonStartProb.TabIndex = 2 + Me.tbSeasonStartProb.Text = "Season Start Prob" + Me.tbSeasonStartProb.UseVisualStyleBackColor = True ' - Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(14, 239) - Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(32, 13) - Me.lblYear.TabIndex = 21 - Me.lblYear.Text = "Year:" + 'lblPlantingDayCond ' - 'lblStation + Me.lblPlantingDayCond.AutoSize = True + Me.lblPlantingDayCond.Location = New System.Drawing.Point(381, 214) + Me.lblPlantingDayCond.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblPlantingDayCond.Name = "lblPlantingDayCond" + Me.lblPlantingDayCond.Size = New System.Drawing.Size(173, 20) + Me.lblPlantingDayCond.TabIndex = 7 + Me.lblPlantingDayCond.Text = "Planting Day Condition:" ' - Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(15, 198) - Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(43, 13) - Me.lblStation.TabIndex = 19 - Me.lblStation.Text = "Station:" + 'lblSeasonYear ' - 'ucrReceiverStartRainDate + Me.lblSeasonYear.AutoSize = True + Me.lblSeasonYear.Location = New System.Drawing.Point(376, 86) + Me.lblSeasonYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSeasonYear.Name = "lblSeasonYear" + Me.lblSeasonYear.Size = New System.Drawing.Size(47, 20) + Me.lblSeasonYear.TabIndex = 3 + Me.lblSeasonYear.Text = "Year:" ' - Me.ucrReceiverStartRainDate.AutoSize = True - Me.ucrReceiverStartRainDate.frmParent = Nothing - Me.ucrReceiverStartRainDate.Location = New System.Drawing.Point(9, 344) - Me.ucrReceiverStartRainDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStartRainDate.Name = "ucrReceiverStartRainDate" - Me.ucrReceiverStartRainDate.Selector = Nothing - Me.ucrReceiverStartRainDate.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverStartRainDate.strNcFilePath = "" - Me.ucrReceiverStartRainDate.TabIndex = 26 - Me.ucrReceiverStartRainDate.ucrSelector = Nothing + 'lblStationSeasonProb ' - 'ucrReceiverStartRainDOY + Me.lblStationSeasonProb.AutoSize = True + Me.lblStationSeasonProb.Location = New System.Drawing.Point(375, 20) + Me.lblStationSeasonProb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStationSeasonProb.Name = "lblStationSeasonProb" + Me.lblStationSeasonProb.Size = New System.Drawing.Size(64, 20) + Me.lblStationSeasonProb.TabIndex = 1 + Me.lblStationSeasonProb.Text = "Station:" ' - Me.ucrReceiverStartRainDOY.AutoSize = True - Me.ucrReceiverStartRainDOY.frmParent = Nothing - Me.ucrReceiverStartRainDOY.Location = New System.Drawing.Point(9, 302) - Me.ucrReceiverStartRainDOY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStartRainDOY.Name = "ucrReceiverStartRainDOY" - Me.ucrReceiverStartRainDOY.Selector = Nothing - Me.ucrReceiverStartRainDOY.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverStartRainDOY.strNcFilePath = "" - Me.ucrReceiverStartRainDOY.TabIndex = 24 - Me.ucrReceiverStartRainDOY.ucrSelector = Nothing + 'ucrReceiverPlantingDayCondition ' - 'ucrReceiverYear + Me.ucrReceiverPlantingDayCondition.AutoSize = True + Me.ucrReceiverPlantingDayCondition.frmParent = Nothing + Me.ucrReceiverPlantingDayCondition.Location = New System.Drawing.Point(378, 238) + Me.ucrReceiverPlantingDayCondition.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverPlantingDayCondition.Name = "ucrReceiverPlantingDayCondition" + Me.ucrReceiverPlantingDayCondition.Selector = Nothing + Me.ucrReceiverPlantingDayCondition.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverPlantingDayCondition.strNcFilePath = "" + Me.ucrReceiverPlantingDayCondition.TabIndex = 8 + Me.ucrReceiverPlantingDayCondition.ucrSelector = Nothing ' - Me.ucrReceiverYear.AutoSize = True - Me.ucrReceiverYear.frmParent = Nothing - Me.ucrReceiverYear.Location = New System.Drawing.Point(9, 258) - Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYear.Name = "ucrReceiverYear" - Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 22 - Me.ucrReceiverYear.ucrSelector = Nothing + 'ucrReceiverSeasonPlantingDay ' - 'ucrReceiverStation + Me.ucrReceiverSeasonPlantingDay.AutoSize = True + Me.ucrReceiverSeasonPlantingDay.frmParent = Nothing + Me.ucrReceiverSeasonPlantingDay.Location = New System.Drawing.Point(375, 178) + Me.ucrReceiverSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonPlantingDay.Name = "ucrReceiverSeasonPlantingDay" + Me.ucrReceiverSeasonPlantingDay.Selector = Nothing + Me.ucrReceiverSeasonPlantingDay.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonPlantingDay.strNcFilePath = "" + Me.ucrReceiverSeasonPlantingDay.TabIndex = 6 + Me.ucrReceiverSeasonPlantingDay.ucrSelector = Nothing ' - Me.ucrReceiverStation.AutoSize = True - Me.ucrReceiverStation.frmParent = Nothing - Me.ucrReceiverStation.Location = New System.Drawing.Point(11, 215) - Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStation.Name = "ucrReceiverStation" - Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 20 - Me.ucrReceiverStation.ucrSelector = Nothing + 'ucrReceiverSeasonYear ' - 'ucrReceiverEndSeasonDate + Me.ucrReceiverSeasonYear.AutoSize = True + Me.ucrReceiverSeasonYear.frmParent = Nothing + Me.ucrReceiverSeasonYear.Location = New System.Drawing.Point(374, 112) + Me.ucrReceiverSeasonYear.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonYear.Name = "ucrReceiverSeasonYear" + Me.ucrReceiverSeasonYear.Selector = Nothing + Me.ucrReceiverSeasonYear.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonYear.strNcFilePath = "" + Me.ucrReceiverSeasonYear.TabIndex = 4 + Me.ucrReceiverSeasonYear.ucrSelector = Nothing ' - Me.ucrReceiverEndSeasonDate.AutoSize = True - Me.ucrReceiverEndSeasonDate.frmParent = Nothing - Me.ucrReceiverEndSeasonDate.Location = New System.Drawing.Point(246, 348) - Me.ucrReceiverEndSeasonDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndSeasonDate.Name = "ucrReceiverEndSeasonDate" - Me.ucrReceiverEndSeasonDate.Selector = Nothing - Me.ucrReceiverEndSeasonDate.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverEndSeasonDate.strNcFilePath = "" - Me.ucrReceiverEndSeasonDate.TabIndex = 18 - Me.ucrReceiverEndSeasonDate.ucrSelector = Nothing + 'ucrReceiverSeasonStationProb ' - 'ucrReceiverEndSeasonDOY + Me.ucrReceiverSeasonStationProb.AutoSize = True + Me.ucrReceiverSeasonStationProb.frmParent = Nothing + Me.ucrReceiverSeasonStationProb.Location = New System.Drawing.Point(372, 46) + Me.ucrReceiverSeasonStationProb.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSeasonStationProb.Name = "ucrReceiverSeasonStationProb" + Me.ucrReceiverSeasonStationProb.Selector = Nothing + Me.ucrReceiverSeasonStationProb.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverSeasonStationProb.strNcFilePath = "" + Me.ucrReceiverSeasonStationProb.TabIndex = 2 + Me.ucrReceiverSeasonStationProb.ucrSelector = Nothing ' - Me.ucrReceiverEndSeasonDOY.AutoSize = True - Me.ucrReceiverEndSeasonDOY.frmParent = Nothing - Me.ucrReceiverEndSeasonDOY.Location = New System.Drawing.Point(250, 310) - Me.ucrReceiverEndSeasonDOY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndSeasonDOY.Name = "ucrReceiverEndSeasonDOY" - Me.ucrReceiverEndSeasonDOY.Selector = Nothing - Me.ucrReceiverEndSeasonDOY.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverEndSeasonDOY.strNcFilePath = "" - Me.ucrReceiverEndSeasonDOY.TabIndex = 16 - Me.ucrReceiverEndSeasonDOY.ucrSelector = Nothing + 'tbAnnualTempSummaries ' - 'ucrReceiverEndRainsDOY + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanAnnualTemp) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempYear) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.lblMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMinMaxAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMaxMinAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverMeanAnnual) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempYr) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrReceiverAnnualTempStation) + Me.tbAnnualTempSummaries.Controls.Add(Me.ucrSelectorAnnualTemp) + Me.tbAnnualTempSummaries.Location = New System.Drawing.Point(4, 29) + Me.tbAnnualTempSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbAnnualTempSummaries.Name = "tbAnnualTempSummaries" + Me.tbAnnualTempSummaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbAnnualTempSummaries.Size = New System.Drawing.Size(776, 695) + Me.tbAnnualTempSummaries.TabIndex = 3 + Me.tbAnnualTempSummaries.Text = "Annual Temperature" + Me.tbAnnualTempSummaries.UseVisualStyleBackColor = True ' - Me.ucrReceiverEndRainsDOY.AutoSize = True - Me.ucrReceiverEndRainsDOY.frmParent = Nothing - Me.ucrReceiverEndRainsDOY.Location = New System.Drawing.Point(249, 233) - Me.ucrReceiverEndRainsDOY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndRainsDOY.Name = "ucrReceiverEndRainsDOY" - Me.ucrReceiverEndRainsDOY.Selector = Nothing - Me.ucrReceiverEndRainsDOY.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverEndRainsDOY.strNcFilePath = "" - Me.ucrReceiverEndRainsDOY.TabIndex = 12 - Me.ucrReceiverEndRainsDOY.ucrSelector = Nothing + 'lblMinMinAnnual ' - 'tbSummaries + Me.lblMinMinAnnual.AutoSize = True + Me.lblMinMinAnnual.Location = New System.Drawing.Point(374, 208) + Me.lblMinMinAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinMinAnnual.Name = "lblMinMinAnnual" + Me.lblMinMinAnnual.Size = New System.Drawing.Size(145, 20) + Me.lblMinMinAnnual.TabIndex = 7 + Me.lblMinMinAnnual.Text = "Min Minimum Temp" ' - Me.tbSummaries.Controls.Add(Me.tbAnnualRainfall) - Me.tbSummaries.Controls.Add(Me.tbCropSuccessProp) - Me.tbSummaries.Controls.Add(Me.tbSeasonStartProb) - Me.tbSummaries.Controls.Add(Me.tbAnnualTempSummaries) - Me.tbSummaries.Controls.Add(Me.tbMonthlyTemp) - Me.tbSummaries.Location = New System.Drawing.Point(12, 17) - Me.tbSummaries.Name = "tbSummaries" - Me.tbSummaries.SelectedIndex = 0 - Me.tbSummaries.Size = New System.Drawing.Size(523, 430) - Me.tbSummaries.TabIndex = 7 + 'lblMeanAnnualTemp ' - 'tbAnnualRainfall + Me.lblMeanAnnualTemp.AutoSize = True + Me.lblMeanAnnualTemp.Location = New System.Drawing.Point(368, 143) + Me.lblMeanAnnualTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMeanAnnualTemp.Name = "lblMeanAnnualTemp" + Me.lblMeanAnnualTemp.Size = New System.Drawing.Size(160, 20) + Me.lblMeanAnnualTemp.TabIndex = 5 + Me.lblMeanAnnualTemp.Text = "Mean Minimum Temp" ' - Me.tbAnnualRainfall.Controls.Add(Me.lblRainyDaysYear) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysYear) - Me.tbAnnualRainfall.Controls.Add(Me.lblNoRainDaysSeason) - Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalLength) - Me.tbAnnualRainfall.Controls.Add(Me.lblSeasonalRain) - Me.tbAnnualRainfall.Controls.Add(Me.lblAnnualRain) - Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDate) - Me.tbAnnualRainfall.Controls.Add(Me.lblEndSeasonDOY) - Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainDate) - Me.tbAnnualRainfall.Controls.Add(Me.lblEndRainsDOY) - Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDate) - Me.tbAnnualRainfall.Controls.Add(Me.lblStartRainDOY) - Me.tbAnnualRainfall.Controls.Add(Me.lblYear) - Me.tbAnnualRainfall.Controls.Add(Me.lblStation) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDate) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStartRainDOY) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverYear) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverStation) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDate) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndSeasonDOY) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDOY) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverEndRainsDate) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalLength) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverRainDaysSeason) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverSeasonalRain) - Me.tbAnnualRainfall.Controls.Add(Me.ucrReceiverAnnualRain) - Me.tbAnnualRainfall.Controls.Add(Me.ucrSelectorDefineAnnualRain) - Me.tbAnnualRainfall.Location = New System.Drawing.Point(4, 22) - Me.tbAnnualRainfall.Name = "tbAnnualRainfall" - Me.tbAnnualRainfall.Padding = New System.Windows.Forms.Padding(3) - Me.tbAnnualRainfall.Size = New System.Drawing.Size(515, 404) - Me.tbAnnualRainfall.TabIndex = 0 - Me.tbAnnualRainfall.Text = "Annual Rainfall" - Me.tbAnnualRainfall.UseVisualStyleBackColor = True + 'lblMaxMinAnnual ' - 'ucrReceiverEndRainsDate + Me.lblMaxMinAnnual.AutoSize = True + Me.lblMaxMinAnnual.Location = New System.Drawing.Point(376, 268) + Me.lblMaxMinAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxMinAnnual.Name = "lblMaxMinAnnual" + Me.lblMaxMinAnnual.Size = New System.Drawing.Size(149, 20) + Me.lblMaxMinAnnual.TabIndex = 9 + Me.lblMaxMinAnnual.Text = "Max Minimum Temp" ' - Me.ucrReceiverEndRainsDate.AutoSize = True - Me.ucrReceiverEndRainsDate.frmParent = Nothing - Me.ucrReceiverEndRainsDate.Location = New System.Drawing.Point(247, 273) - Me.ucrReceiverEndRainsDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEndRainsDate.Name = "ucrReceiverEndRainsDate" - Me.ucrReceiverEndRainsDate.Selector = Nothing - Me.ucrReceiverEndRainsDate.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverEndRainsDate.strNcFilePath = "" - Me.ucrReceiverEndRainsDate.TabIndex = 14 - Me.ucrReceiverEndRainsDate.ucrSelector = Nothing + 'lblAnnualTempYear ' - 'ucrReceiverSeasonalLength + Me.lblAnnualTempYear.AutoSize = True + Me.lblAnnualTempYear.Location = New System.Drawing.Point(374, 80) + Me.lblAnnualTempYear.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAnnualTempYear.Name = "lblAnnualTempYear" + Me.lblAnnualTempYear.Size = New System.Drawing.Size(47, 20) + Me.lblAnnualTempYear.TabIndex = 3 + Me.lblAnnualTempYear.Text = "Year:" ' - Me.ucrReceiverSeasonalLength.AutoSize = True - Me.ucrReceiverSeasonalLength.frmParent = Nothing - Me.ucrReceiverSeasonalLength.Location = New System.Drawing.Point(245, 194) - Me.ucrReceiverSeasonalLength.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonalLength.Name = "ucrReceiverSeasonalLength" - Me.ucrReceiverSeasonalLength.Selector = Nothing - Me.ucrReceiverSeasonalLength.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonalLength.strNcFilePath = "" - Me.ucrReceiverSeasonalLength.TabIndex = 10 - Me.ucrReceiverSeasonalLength.ucrSelector = Nothing + 'lblAnnualTempStation ' - 'ucrReceiverRainDaysSeason + Me.lblAnnualTempStation.AutoSize = True + Me.lblAnnualTempStation.Location = New System.Drawing.Point(372, 14) + Me.lblAnnualTempStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblAnnualTempStation.Name = "lblAnnualTempStation" + Me.lblAnnualTempStation.Size = New System.Drawing.Size(64, 20) + Me.lblAnnualTempStation.TabIndex = 1 + Me.lblAnnualTempStation.Text = "Station:" ' - Me.ucrReceiverRainDaysSeason.AutoSize = True - Me.ucrReceiverRainDaysSeason.frmParent = Nothing - Me.ucrReceiverRainDaysSeason.Location = New System.Drawing.Point(244, 114) - Me.ucrReceiverRainDaysSeason.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRainDaysSeason.Name = "ucrReceiverRainDaysSeason" - Me.ucrReceiverRainDaysSeason.Selector = Nothing - Me.ucrReceiverRainDaysSeason.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverRainDaysSeason.strNcFilePath = "" - Me.ucrReceiverRainDaysSeason.TabIndex = 6 - Me.ucrReceiverRainDaysSeason.ucrSelector = Nothing + 'lblMaxMaxAnnual ' - 'ucrReceiverSeasonalRain + Me.lblMaxMaxAnnual.AutoSize = True + Me.lblMaxMaxAnnual.Location = New System.Drawing.Point(382, 454) + Me.lblMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxMaxAnnual.Name = "lblMaxMaxAnnual" + Me.lblMaxMaxAnnual.Size = New System.Drawing.Size(153, 20) + Me.lblMaxMaxAnnual.TabIndex = 15 + Me.lblMaxMaxAnnual.Text = "Max Maximum Temp" ' - Me.ucrReceiverSeasonalRain.AutoSize = True - Me.ucrReceiverSeasonalRain.frmParent = Nothing - Me.ucrReceiverSeasonalRain.Location = New System.Drawing.Point(243, 71) - Me.ucrReceiverSeasonalRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonalRain.Name = "ucrReceiverSeasonalRain" - Me.ucrReceiverSeasonalRain.Selector = Nothing - Me.ucrReceiverSeasonalRain.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonalRain.strNcFilePath = "" - Me.ucrReceiverSeasonalRain.TabIndex = 4 - Me.ucrReceiverSeasonalRain.ucrSelector = Nothing + 'lblMinMaxAnnual ' - 'ucrReceiverAnnualRain + Me.lblMinMaxAnnual.AutoSize = True + Me.lblMinMaxAnnual.Location = New System.Drawing.Point(381, 389) + Me.lblMinMaxAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinMaxAnnual.Name = "lblMinMaxAnnual" + Me.lblMinMaxAnnual.Size = New System.Drawing.Size(153, 20) + Me.lblMinMaxAnnual.TabIndex = 13 + Me.lblMinMaxAnnual.Text = "Min Maximum Temp:" ' - Me.ucrReceiverAnnualRain.AutoSize = True - Me.ucrReceiverAnnualRain.frmParent = Nothing - Me.ucrReceiverAnnualRain.Location = New System.Drawing.Point(242, 28) - Me.ucrReceiverAnnualRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverAnnualRain.Name = "ucrReceiverAnnualRain" - Me.ucrReceiverAnnualRain.Selector = Nothing - Me.ucrReceiverAnnualRain.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverAnnualRain.strNcFilePath = "" - Me.ucrReceiverAnnualRain.TabIndex = 2 - Me.ucrReceiverAnnualRain.ucrSelector = Nothing + 'lblMeanMaxAnnual ' - 'ucrSelectorDefineAnnualRain + Me.lblMeanMaxAnnual.AutoSize = True + Me.lblMeanMaxAnnual.Location = New System.Drawing.Point(381, 329) + Me.lblMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMeanMaxAnnual.Name = "lblMeanMaxAnnual" + Me.lblMeanMaxAnnual.Size = New System.Drawing.Size(164, 20) + Me.lblMeanMaxAnnual.TabIndex = 11 + Me.lblMeanMaxAnnual.Text = "Mean Maximum Temp" ' - Me.ucrSelectorDefineAnnualRain.AutoSize = True - Me.ucrSelectorDefineAnnualRain.bDropUnusedFilterLevels = False - Me.ucrSelectorDefineAnnualRain.bShowHiddenColumns = False - Me.ucrSelectorDefineAnnualRain.bUseCurrentFilter = True - Me.ucrSelectorDefineAnnualRain.Location = New System.Drawing.Point(7, 8) - Me.ucrSelectorDefineAnnualRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorDefineAnnualRain.Name = "ucrSelectorDefineAnnualRain" - Me.ucrSelectorDefineAnnualRain.Size = New System.Drawing.Size(151, 185) - Me.ucrSelectorDefineAnnualRain.TabIndex = 0 + 'ucrReceiverMinMinAnnual ' - 'tbCropSuccessProp + Me.ucrReceiverMinMinAnnual.AutoSize = True + Me.ucrReceiverMinMinAnnual.frmParent = Nothing + Me.ucrReceiverMinMinAnnual.Location = New System.Drawing.Point(375, 232) + Me.ucrReceiverMinMinAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMinAnnual.Name = "ucrReceiverMinMinAnnual" + Me.ucrReceiverMinMinAnnual.Selector = Nothing + Me.ucrReceiverMinMinAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMinAnnual.strNcFilePath = "" + Me.ucrReceiverMinMinAnnual.TabIndex = 8 + Me.ucrReceiverMinMinAnnual.ucrSelector = Nothing ' - Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingLength) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingLenghth) - Me.tbCropSuccessProp.Controls.Add(Me.lblPlantingDay) - Me.tbCropSuccessProp.Controls.Add(Me.lblProbSuccess) - Me.tbCropSuccessProp.Controls.Add(Me.lblTotalRain) - Me.tbCropSuccessProp.Controls.Add(Me.lblCropStation) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPropSuccess) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverPlantingDay) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverTotalRain) - Me.tbCropSuccessProp.Controls.Add(Me.ucrReceiverStationCrop) - Me.tbCropSuccessProp.Controls.Add(Me.ucrSelectorCropProp) - Me.tbCropSuccessProp.Location = New System.Drawing.Point(4, 22) - Me.tbCropSuccessProp.Name = "tbCropSuccessProp" - Me.tbCropSuccessProp.Padding = New System.Windows.Forms.Padding(3) - Me.tbCropSuccessProp.Size = New System.Drawing.Size(515, 404) - Me.tbCropSuccessProp.TabIndex = 1 - Me.tbCropSuccessProp.Text = "Crop Success Prop" - Me.tbCropSuccessProp.UseVisualStyleBackColor = True + 'ucrReceiverMaxMaxAnnual ' - 'lblPlantingLength + Me.ucrReceiverMaxMaxAnnual.AutoSize = True + Me.ucrReceiverMaxMaxAnnual.frmParent = Nothing + Me.ucrReceiverMaxMaxAnnual.Location = New System.Drawing.Point(381, 474) + Me.ucrReceiverMaxMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMaxAnnual.Name = "ucrReceiverMaxMaxAnnual" + Me.ucrReceiverMaxMaxAnnual.Selector = Nothing + Me.ucrReceiverMaxMaxAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMaxMaxAnnual.TabIndex = 16 + Me.ucrReceiverMaxMaxAnnual.ucrSelector = Nothing ' - Me.lblPlantingLength.AutoSize = True - Me.lblPlantingLength.Location = New System.Drawing.Point(252, 137) - Me.lblPlantingLength.Name = "lblPlantingLength" - Me.lblPlantingLength.Size = New System.Drawing.Size(84, 13) - Me.lblPlantingLength.TabIndex = 7 - Me.lblPlantingLength.Text = "Planting Length:" + 'ucrReceiverMeanMaxAnnual ' - 'ucrReceiverPlantingLenghth + Me.ucrReceiverMeanMaxAnnual.AutoSize = True + Me.ucrReceiverMeanMaxAnnual.frmParent = Nothing + Me.ucrReceiverMeanMaxAnnual.Location = New System.Drawing.Point(380, 355) + Me.ucrReceiverMeanMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanMaxAnnual.Name = "ucrReceiverMeanMaxAnnual" + Me.ucrReceiverMeanMaxAnnual.Selector = Nothing + Me.ucrReceiverMeanMaxAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMeanMaxAnnual.TabIndex = 12 + Me.ucrReceiverMeanMaxAnnual.ucrSelector = Nothing ' - Me.ucrReceiverPlantingLenghth.AutoSize = True - Me.ucrReceiverPlantingLenghth.frmParent = Nothing - Me.ucrReceiverPlantingLenghth.Location = New System.Drawing.Point(250, 153) - Me.ucrReceiverPlantingLenghth.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverPlantingLenghth.Name = "ucrReceiverPlantingLenghth" - Me.ucrReceiverPlantingLenghth.Selector = Nothing - Me.ucrReceiverPlantingLenghth.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverPlantingLenghth.strNcFilePath = "" - Me.ucrReceiverPlantingLenghth.TabIndex = 8 - Me.ucrReceiverPlantingLenghth.ucrSelector = Nothing + 'ucrReceiverMinMaxAnnual ' - 'lblPlantingDay + Me.ucrReceiverMinMaxAnnual.AutoSize = True + Me.ucrReceiverMinMaxAnnual.frmParent = Nothing + Me.ucrReceiverMinMaxAnnual.Location = New System.Drawing.Point(376, 417) + Me.ucrReceiverMinMaxAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMaxAnnual.Name = "ucrReceiverMinMaxAnnual" + Me.ucrReceiverMinMaxAnnual.Selector = Nothing + Me.ucrReceiverMinMaxAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMaxAnnual.strNcFilePath = "" + Me.ucrReceiverMinMaxAnnual.TabIndex = 14 + Me.ucrReceiverMinMaxAnnual.ucrSelector = Nothing ' - Me.lblPlantingDay.AutoSize = True - Me.lblPlantingDay.Location = New System.Drawing.Point(245, 95) - Me.lblPlantingDay.Name = "lblPlantingDay" - Me.lblPlantingDay.Size = New System.Drawing.Size(70, 13) - Me.lblPlantingDay.TabIndex = 5 - Me.lblPlantingDay.Text = "Planting Day:" + 'ucrReceiverMaxMinAnnual ' - 'lblProbSuccess + Me.ucrReceiverMaxMinAnnual.AutoSize = True + Me.ucrReceiverMaxMinAnnual.frmParent = Nothing + Me.ucrReceiverMaxMinAnnual.Location = New System.Drawing.Point(374, 295) + Me.ucrReceiverMaxMinAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMinAnnual.Name = "ucrReceiverMaxMinAnnual" + Me.ucrReceiverMaxMinAnnual.Selector = Nothing + Me.ucrReceiverMaxMinAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMinAnnual.strNcFilePath = "" + Me.ucrReceiverMaxMinAnnual.TabIndex = 10 + Me.ucrReceiverMaxMinAnnual.ucrSelector = Nothing ' - Me.lblProbSuccess.AutoSize = True - Me.lblProbSuccess.Location = New System.Drawing.Point(251, 176) - Me.lblProbSuccess.Name = "lblProbSuccess" - Me.lblProbSuccess.Size = New System.Drawing.Size(117, 13) - Me.lblProbSuccess.TabIndex = 9 - Me.lblProbSuccess.Text = "Proportion of Success :" + 'ucrReceiverMeanAnnual ' - 'lblTotalRain + Me.ucrReceiverMeanAnnual.AutoSize = True + Me.ucrReceiverMeanAnnual.frmParent = Nothing + Me.ucrReceiverMeanAnnual.Location = New System.Drawing.Point(372, 172) + Me.ucrReceiverMeanAnnual.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanAnnual.Name = "ucrReceiverMeanAnnual" + Me.ucrReceiverMeanAnnual.Selector = Nothing + Me.ucrReceiverMeanAnnual.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanAnnual.strNcFilePath = "" + Me.ucrReceiverMeanAnnual.TabIndex = 6 + Me.ucrReceiverMeanAnnual.ucrSelector = Nothing ' - Me.lblTotalRain.AutoSize = True - Me.lblTotalRain.Location = New System.Drawing.Point(249, 54) - Me.lblTotalRain.Name = "lblTotalRain" - Me.lblTotalRain.Size = New System.Drawing.Size(59, 13) - Me.lblTotalRain.TabIndex = 3 - Me.lblTotalRain.Text = "Total Rain:" + 'ucrReceiverAnnualTempYr ' - 'lblCropStation + Me.ucrReceiverAnnualTempYr.AutoSize = True + Me.ucrReceiverAnnualTempYr.frmParent = Nothing + Me.ucrReceiverAnnualTempYr.Location = New System.Drawing.Point(370, 106) + Me.ucrReceiverAnnualTempYr.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualTempYr.Name = "ucrReceiverAnnualTempYr" + Me.ucrReceiverAnnualTempYr.Selector = Nothing + Me.ucrReceiverAnnualTempYr.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverAnnualTempYr.strNcFilePath = "" + Me.ucrReceiverAnnualTempYr.TabIndex = 4 + Me.ucrReceiverAnnualTempYr.ucrSelector = Nothing ' - Me.lblCropStation.AutoSize = True - Me.lblCropStation.Location = New System.Drawing.Point(248, 11) - Me.lblCropStation.Name = "lblCropStation" - Me.lblCropStation.Size = New System.Drawing.Size(43, 13) - Me.lblCropStation.TabIndex = 1 - Me.lblCropStation.Text = "Station:" + 'ucrReceiverAnnualTempStation ' - 'ucrReceiverPropSuccess + Me.ucrReceiverAnnualTempStation.AutoSize = True + Me.ucrReceiverAnnualTempStation.frmParent = Nothing + Me.ucrReceiverAnnualTempStation.Location = New System.Drawing.Point(369, 40) + Me.ucrReceiverAnnualTempStation.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAnnualTempStation.Name = "ucrReceiverAnnualTempStation" + Me.ucrReceiverAnnualTempStation.Selector = Nothing + Me.ucrReceiverAnnualTempStation.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverAnnualTempStation.strNcFilePath = "" + Me.ucrReceiverAnnualTempStation.TabIndex = 2 + Me.ucrReceiverAnnualTempStation.ucrSelector = Nothing ' - Me.ucrReceiverPropSuccess.AutoSize = True - Me.ucrReceiverPropSuccess.frmParent = Nothing - Me.ucrReceiverPropSuccess.Location = New System.Drawing.Point(249, 194) - Me.ucrReceiverPropSuccess.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverPropSuccess.Name = "ucrReceiverPropSuccess" - Me.ucrReceiverPropSuccess.Selector = Nothing - Me.ucrReceiverPropSuccess.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverPropSuccess.strNcFilePath = "" - Me.ucrReceiverPropSuccess.TabIndex = 10 - Me.ucrReceiverPropSuccess.ucrSelector = Nothing + 'ucrSelectorAnnualTemp ' - 'ucrReceiverPlantingDay + Me.ucrSelectorAnnualTemp.AutoSize = True + Me.ucrSelectorAnnualTemp.bDropUnusedFilterLevels = False + Me.ucrSelectorAnnualTemp.bShowHiddenColumns = False + Me.ucrSelectorAnnualTemp.bUseCurrentFilter = True + Me.ucrSelectorAnnualTemp.Location = New System.Drawing.Point(16, 9) + Me.ucrSelectorAnnualTemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorAnnualTemp.Name = "ucrSelectorAnnualTemp" + Me.ucrSelectorAnnualTemp.Size = New System.Drawing.Size(339, 412) + Me.ucrSelectorAnnualTemp.TabIndex = 0 ' - Me.ucrReceiverPlantingDay.AutoSize = True - Me.ucrReceiverPlantingDay.frmParent = Nothing - Me.ucrReceiverPlantingDay.Location = New System.Drawing.Point(248, 114) - Me.ucrReceiverPlantingDay.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverPlantingDay.Name = "ucrReceiverPlantingDay" - Me.ucrReceiverPlantingDay.Selector = Nothing - Me.ucrReceiverPlantingDay.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverPlantingDay.strNcFilePath = "" - Me.ucrReceiverPlantingDay.TabIndex = 6 - Me.ucrReceiverPlantingDay.ucrSelector = Nothing + 'tbMonthlyTemp + ' + Me.tbMonthlyTemp.Controls.Add(Me.lblMonth) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMInMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblYearMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblStationMonthTemp) + Me.tbMonthlyTemp.Controls.Add(Me.lblMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.lblMeanMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanmaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMinMaxMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMaxMinMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMeanminMontly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverYearMonthly) + Me.tbMonthlyTemp.Controls.Add(Me.ucrReceiverMonthlyTemp) + Me.tbMonthlyTemp.Controls.Add(Me.ucrSelecetorMonthlyTemp) + Me.tbMonthlyTemp.Location = New System.Drawing.Point(4, 29) + Me.tbMonthlyTemp.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbMonthlyTemp.Name = "tbMonthlyTemp" + Me.tbMonthlyTemp.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbMonthlyTemp.Size = New System.Drawing.Size(776, 695) + Me.tbMonthlyTemp.TabIndex = 4 + Me.tbMonthlyTemp.Text = "Monthly Temperature" + Me.tbMonthlyTemp.UseVisualStyleBackColor = True + ' + 'lblMonth + ' + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(370, 146) + Me.lblMonth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(58, 20) + Me.lblMonth.TabIndex = 5 + Me.lblMonth.Text = "Month:" + ' + 'lblMinMInMonthly + ' + Me.lblMinMInMonthly.AutoSize = True + Me.lblMinMInMonthly.Location = New System.Drawing.Point(372, 278) + Me.lblMinMInMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinMInMonthly.Name = "lblMinMInMonthly" + Me.lblMinMInMonthly.Size = New System.Drawing.Size(145, 20) + Me.lblMinMInMonthly.TabIndex = 9 + Me.lblMinMInMonthly.Text = "Min Minimum Temp" + ' + 'lblMeanMinMonthly + ' + Me.lblMeanMinMonthly.AutoSize = True + Me.lblMeanMinMonthly.Location = New System.Drawing.Point(366, 214) + Me.lblMeanMinMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMeanMinMonthly.Name = "lblMeanMinMonthly" + Me.lblMeanMinMonthly.Size = New System.Drawing.Size(160, 20) + Me.lblMeanMinMonthly.TabIndex = 7 + Me.lblMeanMinMonthly.Text = "Mean Minimum Temp" + ' + 'lblMaxMinMonthly + ' + Me.lblMaxMinMonthly.AutoSize = True + Me.lblMaxMinMonthly.Location = New System.Drawing.Point(375, 338) + Me.lblMaxMinMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxMinMonthly.Name = "lblMaxMinMonthly" + Me.lblMaxMinMonthly.Size = New System.Drawing.Size(149, 20) + Me.lblMaxMinMonthly.TabIndex = 11 + Me.lblMaxMinMonthly.Text = "Max Minimum Temp" + ' + 'lblYearMonthTemp + ' + Me.lblYearMonthTemp.AutoSize = True + Me.lblYearMonthTemp.Location = New System.Drawing.Point(372, 83) + Me.lblYearMonthTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblYearMonthTemp.Name = "lblYearMonthTemp" + Me.lblYearMonthTemp.Size = New System.Drawing.Size(47, 20) + Me.lblYearMonthTemp.TabIndex = 3 + Me.lblYearMonthTemp.Text = "Year:" + ' + 'lblStationMonthTemp ' - 'ucrReceiverTotalRain + Me.lblStationMonthTemp.AutoSize = True + Me.lblStationMonthTemp.Location = New System.Drawing.Point(370, 23) + Me.lblStationMonthTemp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStationMonthTemp.Name = "lblStationMonthTemp" + Me.lblStationMonthTemp.Size = New System.Drawing.Size(64, 20) + Me.lblStationMonthTemp.TabIndex = 1 + Me.lblStationMonthTemp.Text = "Station:" ' - Me.ucrReceiverTotalRain.AutoSize = True - Me.ucrReceiverTotalRain.frmParent = Nothing - Me.ucrReceiverTotalRain.Location = New System.Drawing.Point(247, 71) - Me.ucrReceiverTotalRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverTotalRain.Name = "ucrReceiverTotalRain" - Me.ucrReceiverTotalRain.Selector = Nothing - Me.ucrReceiverTotalRain.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverTotalRain.strNcFilePath = "" - Me.ucrReceiverTotalRain.TabIndex = 4 - Me.ucrReceiverTotalRain.ucrSelector = Nothing + 'lblMaxMaxMonthly ' - 'ucrReceiverStationCrop + Me.lblMaxMaxMonthly.AutoSize = True + Me.lblMaxMaxMonthly.Location = New System.Drawing.Point(381, 525) + Me.lblMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMaxMaxMonthly.Name = "lblMaxMaxMonthly" + Me.lblMaxMaxMonthly.Size = New System.Drawing.Size(153, 20) + Me.lblMaxMaxMonthly.TabIndex = 17 + Me.lblMaxMaxMonthly.Text = "Max Maximum Temp" ' - Me.ucrReceiverStationCrop.AutoSize = True - Me.ucrReceiverStationCrop.frmParent = Nothing - Me.ucrReceiverStationCrop.Location = New System.Drawing.Point(246, 28) - Me.ucrReceiverStationCrop.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStationCrop.Name = "ucrReceiverStationCrop" - Me.ucrReceiverStationCrop.Selector = Nothing - Me.ucrReceiverStationCrop.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverStationCrop.strNcFilePath = "" - Me.ucrReceiverStationCrop.TabIndex = 2 - Me.ucrReceiverStationCrop.ucrSelector = Nothing + 'lblMinMaxMonthly ' - 'ucrSelectorCropProp + Me.lblMinMaxMonthly.AutoSize = True + Me.lblMinMaxMonthly.Location = New System.Drawing.Point(380, 460) + Me.lblMinMaxMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinMaxMonthly.Name = "lblMinMaxMonthly" + Me.lblMinMaxMonthly.Size = New System.Drawing.Size(153, 20) + Me.lblMinMaxMonthly.TabIndex = 15 + Me.lblMinMaxMonthly.Text = "Min Maximum Temp:" ' - Me.ucrSelectorCropProp.AutoSize = True - Me.ucrSelectorCropProp.bDropUnusedFilterLevels = False - Me.ucrSelectorCropProp.bShowHiddenColumns = False - Me.ucrSelectorCropProp.bUseCurrentFilter = True - Me.ucrSelectorCropProp.Location = New System.Drawing.Point(11, 8) - Me.ucrSelectorCropProp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCropProp.Name = "ucrSelectorCropProp" - Me.ucrSelectorCropProp.Size = New System.Drawing.Size(151, 185) - Me.ucrSelectorCropProp.TabIndex = 0 + 'lblMeanMaxMonthly ' - 'tbSeasonStartProb + Me.lblMeanMaxMonthly.AutoSize = True + Me.lblMeanMaxMonthly.Location = New System.Drawing.Point(380, 400) + Me.lblMeanMaxMonthly.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMeanMaxMonthly.Name = "lblMeanMaxMonthly" + Me.lblMeanMaxMonthly.Size = New System.Drawing.Size(164, 20) + Me.lblMeanMaxMonthly.TabIndex = 13 + Me.lblMeanMaxMonthly.Text = "Mean Maximum Temp" ' - Me.tbSeasonStartProb.Controls.Add(Me.lblPlantingDayCond) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverPlantingDayCondition) - Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonPlantingDay) - Me.tbSeasonStartProb.Controls.Add(Me.lblSeasonYear) - Me.tbSeasonStartProb.Controls.Add(Me.lblStationSeasonProb) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonPlantingDay) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonYear) - Me.tbSeasonStartProb.Controls.Add(Me.ucrReceiverSeasonStationProb) - Me.tbSeasonStartProb.Controls.Add(Me.ucrSelectorSeasonStartProp) - Me.tbSeasonStartProb.Location = New System.Drawing.Point(4, 22) - Me.tbSeasonStartProb.Name = "tbSeasonStartProb" - Me.tbSeasonStartProb.Padding = New System.Windows.Forms.Padding(3) - Me.tbSeasonStartProb.Size = New System.Drawing.Size(515, 404) - Me.tbSeasonStartProb.TabIndex = 2 - Me.tbSeasonStartProb.Text = "Season Start Prob" - Me.tbSeasonStartProb.UseVisualStyleBackColor = True + 'ucrReceiverMonthMonthly ' - 'lblSeasonYear + Me.ucrReceiverMonthMonthly.AutoSize = True + Me.ucrReceiverMonthMonthly.frmParent = Nothing + Me.ucrReceiverMonthMonthly.Location = New System.Drawing.Point(368, 172) + Me.ucrReceiverMonthMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthMonthly.Name = "ucrReceiverMonthMonthly" + Me.ucrReceiverMonthMonthly.Selector = Nothing + Me.ucrReceiverMonthMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMonthMonthly.strNcFilePath = "" + Me.ucrReceiverMonthMonthly.TabIndex = 6 + Me.ucrReceiverMonthMonthly.ucrSelector = Nothing ' - Me.lblSeasonYear.AutoSize = True - Me.lblSeasonYear.Location = New System.Drawing.Point(251, 56) - Me.lblSeasonYear.Name = "lblSeasonYear" - Me.lblSeasonYear.Size = New System.Drawing.Size(32, 13) - Me.lblSeasonYear.TabIndex = 3 - Me.lblSeasonYear.Text = "Year:" + 'ucrReceiverMinMinMonthly ' - 'lblStationSeasonProb + Me.ucrReceiverMinMinMonthly.AutoSize = True + Me.ucrReceiverMinMinMonthly.frmParent = Nothing + Me.ucrReceiverMinMinMonthly.Location = New System.Drawing.Point(374, 303) + Me.ucrReceiverMinMinMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMinMonthly.Name = "ucrReceiverMinMinMonthly" + Me.ucrReceiverMinMinMonthly.Selector = Nothing + Me.ucrReceiverMinMinMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMinMonthly.strNcFilePath = "" + Me.ucrReceiverMinMinMonthly.TabIndex = 10 + Me.ucrReceiverMinMinMonthly.ucrSelector = Nothing ' - Me.lblStationSeasonProb.AutoSize = True - Me.lblStationSeasonProb.Location = New System.Drawing.Point(250, 13) - Me.lblStationSeasonProb.Name = "lblStationSeasonProb" - Me.lblStationSeasonProb.Size = New System.Drawing.Size(43, 13) - Me.lblStationSeasonProb.TabIndex = 1 - Me.lblStationSeasonProb.Text = "Station:" + 'ucrReceiverMaxMaxMonthly ' - 'ucrReceiverSeasonPlantingDay + Me.ucrReceiverMaxMaxMonthly.AutoSize = True + Me.ucrReceiverMaxMaxMonthly.frmParent = Nothing + Me.ucrReceiverMaxMaxMonthly.Location = New System.Drawing.Point(380, 545) + Me.ucrReceiverMaxMaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxMaxMonthly.Name = "ucrReceiverMaxMaxMonthly" + Me.ucrReceiverMaxMaxMonthly.Selector = Nothing + Me.ucrReceiverMaxMaxMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMaxMaxMonthly.strNcFilePath = "" + Me.ucrReceiverMaxMaxMonthly.TabIndex = 18 + Me.ucrReceiverMaxMaxMonthly.ucrSelector = Nothing ' - Me.ucrReceiverSeasonPlantingDay.AutoSize = True - Me.ucrReceiverSeasonPlantingDay.frmParent = Nothing - Me.ucrReceiverSeasonPlantingDay.Location = New System.Drawing.Point(250, 116) - Me.ucrReceiverSeasonPlantingDay.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonPlantingDay.Name = "ucrReceiverSeasonPlantingDay" - Me.ucrReceiverSeasonPlantingDay.Selector = Nothing - Me.ucrReceiverSeasonPlantingDay.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonPlantingDay.strNcFilePath = "" - Me.ucrReceiverSeasonPlantingDay.TabIndex = 6 - Me.ucrReceiverSeasonPlantingDay.ucrSelector = Nothing + 'ucrReceiverMeanmaxMonthly ' - 'ucrReceiverSeasonYear + Me.ucrReceiverMeanmaxMonthly.AutoSize = True + Me.ucrReceiverMeanmaxMonthly.frmParent = Nothing + Me.ucrReceiverMeanmaxMonthly.Location = New System.Drawing.Point(378, 426) + Me.ucrReceiverMeanmaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanmaxMonthly.Name = "ucrReceiverMeanmaxMonthly" + Me.ucrReceiverMeanmaxMonthly.Selector = Nothing + Me.ucrReceiverMeanmaxMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanmaxMonthly.strNcFilePath = "" + Me.ucrReceiverMeanmaxMonthly.TabIndex = 14 + Me.ucrReceiverMeanmaxMonthly.ucrSelector = Nothing ' - Me.ucrReceiverSeasonYear.AutoSize = True - Me.ucrReceiverSeasonYear.frmParent = Nothing - Me.ucrReceiverSeasonYear.Location = New System.Drawing.Point(249, 73) - Me.ucrReceiverSeasonYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonYear.Name = "ucrReceiverSeasonYear" - Me.ucrReceiverSeasonYear.Selector = Nothing - Me.ucrReceiverSeasonYear.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonYear.strNcFilePath = "" - Me.ucrReceiverSeasonYear.TabIndex = 4 - Me.ucrReceiverSeasonYear.ucrSelector = Nothing + 'ucrReceiverMinMaxMonthly ' - 'ucrReceiverSeasonStationProb + Me.ucrReceiverMinMaxMonthly.AutoSize = True + Me.ucrReceiverMinMaxMonthly.frmParent = Nothing + Me.ucrReceiverMinMaxMonthly.Location = New System.Drawing.Point(375, 488) + Me.ucrReceiverMinMaxMonthly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMinMaxMonthly.Name = "ucrReceiverMinMaxMonthly" + Me.ucrReceiverMinMaxMonthly.Selector = Nothing + Me.ucrReceiverMinMaxMonthly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMinMaxMonthly.strNcFilePath = "" + Me.ucrReceiverMinMaxMonthly.TabIndex = 16 + Me.ucrReceiverMinMaxMonthly.ucrSelector = Nothing ' - Me.ucrReceiverSeasonStationProb.AutoSize = True - Me.ucrReceiverSeasonStationProb.frmParent = Nothing - Me.ucrReceiverSeasonStationProb.Location = New System.Drawing.Point(248, 30) - Me.ucrReceiverSeasonStationProb.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSeasonStationProb.Name = "ucrReceiverSeasonStationProb" - Me.ucrReceiverSeasonStationProb.Selector = Nothing - Me.ucrReceiverSeasonStationProb.Size = New System.Drawing.Size(120, 25) - Me.ucrReceiverSeasonStationProb.strNcFilePath = "" - Me.ucrReceiverSeasonStationProb.TabIndex = 2 - Me.ucrReceiverSeasonStationProb.ucrSelector = Nothing + 'ucrReceiverMeanminMontly ' - 'ucrSelectorSeasonStartProp + Me.ucrReceiverMeanminMontly.AutoSize = True + Me.ucrReceiverMeanminMontly.frmParent = Nothing + Me.ucrReceiverMeanminMontly.Location = New System.Drawing.Point(370, 243) + Me.ucrReceiverMeanminMontly.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMeanminMontly.Name = "ucrReceiverMeanminMontly" + Me.ucrReceiverMeanminMontly.Selector = Nothing + Me.ucrReceiverMeanminMontly.Size = New System.Drawing.Size(180, 38) + Me.ucrReceiverMeanminMontly.strNcFilePath = "" + Me.ucrReceiverMeanminMontly.TabIndex = 8 + Me.ucrReceiverMeanminMontly.ucrSelector = Nothing ' - Me.ucrSelectorSeasonStartProp.AutoSize = True - Me.ucrSelectorSeasonStartProp.bDropUnusedFilterLevels = False - Me.ucrSelectorSeasonStartProp.bShowHiddenColumns = False - Me.ucrSelectorSeasonStartProp.bUseCurrentFilter = True - Me.ucrSelectorSeasonStartProp.Location = New System.Drawing.Point(13, 10) - Me.ucrSelectorSeasonStartProp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorSeasonStartProp.Name = "ucrSelectorSeasonStartProp" - Me.ucrSelectorSeasonStartProp.Size = New System.Drawing.Size(151, 185) - Me.ucrSelectorSeasonStartProp.TabIndex = 0 + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.Location = New System.Drawing.Point(236, 751) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(336, 46) + Me.ucrBase.TabIndex = 35 ' 'sdgDefineAnnualRainfall ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(547, 503) - Me.Controls.Add(Me.ucrBase) + Me.AutoSize = True + Me.ClientSize = New System.Drawing.Size(820, 819) Me.Controls.Add(Me.tbSummaries) + Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgDefineAnnualRainfall" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Define Elements" - Me.tbAnnualTempSummaries.ResumeLayout(False) - Me.tbAnnualTempSummaries.PerformLayout() - Me.tbMonthlyTemp.ResumeLayout(False) - Me.tbMonthlyTemp.PerformLayout() Me.tbSummaries.ResumeLayout(False) Me.tbAnnualRainfall.ResumeLayout(False) Me.tbAnnualRainfall.PerformLayout() @@ -1217,53 +1341,29 @@ Partial Class sdgDefineAnnualRainfall Me.tbCropSuccessProp.PerformLayout() Me.tbSeasonStartProb.ResumeLayout(False) Me.tbSeasonStartProb.PerformLayout() + Me.tbAnnualTempSummaries.ResumeLayout(False) + Me.tbAnnualTempSummaries.PerformLayout() + Me.tbMonthlyTemp.ResumeLayout(False) + Me.tbMonthlyTemp.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents ucrReceiverPlantingDayCondition As ucrReceiverSingle - Friend WithEvents lblMinMinAnnual As Label - Friend WithEvents ucrReceiverMinMinAnnual As ucrReceiverSingle - Friend WithEvents lblMeanAnnualTemp As Label - Friend WithEvents lblMaxMinAnnual As Label - Friend WithEvents lblAnnualTempYear As Label - Friend WithEvents lblAnnualTempStation As Label - Friend WithEvents lblMaxMaxAnnual As Label - Friend WithEvents ucrSelecetorMonthlyTemp As ucrSelectorByDataFrame - Friend WithEvents lblMinMaxAnnual As Label - Friend WithEvents lblMeanMaxAnnual As Label - Friend WithEvents ucrReceiverMaxMaxAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverMeanMaxAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverMinMaxAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverMaxMinAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverMeanAnnual As ucrReceiverSingle - Friend WithEvents ucrReceiverAnnualTempYr As ucrReceiverSingle - Friend WithEvents ucrReceiverAnnualTempStation As ucrReceiverSingle - Friend WithEvents tbAnnualTempSummaries As TabPage - Friend WithEvents ucrSelectorAnnualTemp As ucrSelectorByDataFrame - Friend WithEvents lblPlantingDayCond As Label - Friend WithEvents tbMonthlyTemp As TabPage - Friend WithEvents lblMonth As Label - Friend WithEvents ucrReceiverMonthMonthly As ucrReceiverSingle - Friend WithEvents lblMinMInMonthly As Label - Friend WithEvents ucrReceiverMinMinMonthly As ucrReceiverSingle - Friend WithEvents lblMeanMinMonthly As Label - Friend WithEvents lblMaxMinMonthly As Label - Friend WithEvents lblYearMonthTemp As Label - Friend WithEvents lblStationMonthTemp As Label - Friend WithEvents lblMaxMaxMonthly As Label - Friend WithEvents lblMinMaxMonthly As Label - Friend WithEvents lblMeanMaxMonthly As Label - Friend WithEvents ucrReceiverMaxMaxMonthly As ucrReceiverSingle - Friend WithEvents ucrReceiverMeanmaxMonthly As ucrReceiverSingle - Friend WithEvents ucrReceiverMinMaxMonthly As ucrReceiverSingle Friend WithEvents ucrReceiverMaxMinMonthly As ucrReceiverSingle - Friend WithEvents ucrReceiverMeanminMontly As ucrReceiverSingle Friend WithEvents ucrReceiverYearMonthly As ucrReceiverSingle Friend WithEvents ucrReceiverMonthlyTemp As ucrReceiverSingle - Friend WithEvents ucrBase As ucrButtonsSubdialogue + Friend WithEvents ucrSelecetorMonthlyTemp As ucrSelectorByDataFrame Friend WithEvents lblSeasonPlantingDay As Label + Friend WithEvents ucrSelectorSeasonStartProp As ucrSelectorByDataFrame + Friend WithEvents tbSummaries As TabControl + Friend WithEvents tbAnnualRainfall As TabPage + Friend WithEvents lblStartRainStatus As Label + Friend WithEvents ucrReceiverStartRainStatus As ucrReceiverSingle + Friend WithEvents lblEndRainStatus As Label + Friend WithEvents ucrReceiverEndRainStatus As ucrReceiverSingle + Friend WithEvents lblEndSeasonStatus As Label + Friend WithEvents ucrReceiverEndSeasonStatus As ucrReceiverSingle Friend WithEvents lblRainyDaysYear As Label Friend WithEvents ucrReceiverRainDaysYear As ucrReceiverSingle Friend WithEvents lblNoRainDaysSeason As Label @@ -1285,8 +1385,6 @@ Partial Class sdgDefineAnnualRainfall Friend WithEvents ucrReceiverEndSeasonDate As ucrReceiverSingle Friend WithEvents ucrReceiverEndSeasonDOY As ucrReceiverSingle Friend WithEvents ucrReceiverEndRainsDOY As ucrReceiverSingle - Friend WithEvents tbSummaries As TabControl - Friend WithEvents tbAnnualRainfall As TabPage Friend WithEvents ucrReceiverEndRainsDate As ucrReceiverSingle Friend WithEvents ucrReceiverSeasonalLength As ucrReceiverSingle Friend WithEvents ucrReceiverRainDaysSeason As ucrReceiverSingle @@ -1295,21 +1393,57 @@ Partial Class sdgDefineAnnualRainfall Friend WithEvents ucrSelectorDefineAnnualRain As ucrSelectorByDataFrame Friend WithEvents tbCropSuccessProp As TabPage Friend WithEvents lblPlantingLength As Label - Friend WithEvents ucrReceiverPlantingLenghth As ucrReceiverSingle Friend WithEvents lblPlantingDay As Label Friend WithEvents lblProbSuccess As Label Friend WithEvents lblTotalRain As Label Friend WithEvents lblCropStation As Label + Friend WithEvents ucrReceiverPlantingLenghth As ucrReceiverSingle Friend WithEvents ucrReceiverPropSuccess As ucrReceiverSingle Friend WithEvents ucrReceiverPlantingDay As ucrReceiverSingle Friend WithEvents ucrReceiverTotalRain As ucrReceiverSingle Friend WithEvents ucrReceiverStationCrop As ucrReceiverSingle Friend WithEvents ucrSelectorCropProp As ucrSelectorByDataFrame Friend WithEvents tbSeasonStartProb As TabPage + Friend WithEvents lblPlantingDayCond As Label Friend WithEvents lblSeasonYear As Label Friend WithEvents lblStationSeasonProb As Label + Friend WithEvents ucrReceiverPlantingDayCondition As ucrReceiverSingle Friend WithEvents ucrReceiverSeasonPlantingDay As ucrReceiverSingle Friend WithEvents ucrReceiverSeasonYear As ucrReceiverSingle Friend WithEvents ucrReceiverSeasonStationProb As ucrReceiverSingle - Friend WithEvents ucrSelectorSeasonStartProp As ucrSelectorByDataFrame + Friend WithEvents tbAnnualTempSummaries As TabPage + Friend WithEvents lblMinMinAnnual As Label + Friend WithEvents lblMeanAnnualTemp As Label + Friend WithEvents lblMaxMinAnnual As Label + Friend WithEvents lblAnnualTempYear As Label + Friend WithEvents lblAnnualTempStation As Label + Friend WithEvents lblMaxMaxAnnual As Label + Friend WithEvents lblMinMaxAnnual As Label + Friend WithEvents lblMeanMaxAnnual As Label + Friend WithEvents ucrReceiverMinMinAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMaxAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMinAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanAnnual As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualTempYr As ucrReceiverSingle + Friend WithEvents ucrReceiverAnnualTempStation As ucrReceiverSingle + Friend WithEvents ucrSelectorAnnualTemp As ucrSelectorByDataFrame + Friend WithEvents tbMonthlyTemp As TabPage + Friend WithEvents lblMonth As Label + Friend WithEvents lblMinMInMonthly As Label + Friend WithEvents lblMeanMinMonthly As Label + Friend WithEvents lblMaxMinMonthly As Label + Friend WithEvents lblYearMonthTemp As Label + Friend WithEvents lblStationMonthTemp As Label + Friend WithEvents lblMaxMaxMonthly As Label + Friend WithEvents lblMinMaxMonthly As Label + Friend WithEvents lblMeanMaxMonthly As Label + Friend WithEvents ucrReceiverMonthMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMinMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMaxMaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanmaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMinMaxMonthly As ucrReceiverSingle + Friend WithEvents ucrReceiverMeanminMontly As ucrReceiverSingle + Friend WithEvents ucrBase As ucrButtonsSubdialogue End Class diff --git a/instat/sdgDefineAnnualRainfall.vb b/instat/sdgDefineAnnualRainfall.vb index f5b9c623b36..bf4f6bf23c8 100644 --- a/instat/sdgDefineAnnualRainfall.vb +++ b/instat/sdgDefineAnnualRainfall.vb @@ -93,6 +93,18 @@ Public Class sdgDefineAnnualRainfall ucrReceiverAnnualRain.Selector = ucrSelectorDefineAnnualRain ucrReceiverAnnualRain.SetParameterIsString() + ucrReceiverStartRainStatus.SetParameter(New RParameter("start_rains_status_column", 14)) + ucrReceiverStartRainStatus.Selector = ucrSelectorDefineAnnualRain + ucrReceiverStartRainStatus.SetParameterIsString() + + ucrReceiverEndRainStatus.SetParameter(New RParameter("end_rains_status_column", 15)) + ucrReceiverEndRainStatus.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndRainStatus.SetParameterIsString() + + ucrReceiverEndSeasonStatus.SetParameter(New RParameter("end_season_status_column", 16)) + ucrReceiverEndSeasonStatus.Selector = ucrSelectorDefineAnnualRain + ucrReceiverEndSeasonStatus.SetParameterIsString() + ucrReceiverStationCrop.SetParameter(New RParameter("station_col", 1)) ucrReceiverStationCrop.Selector = ucrSelectorCropProp ucrReceiverStationCrop.SetParameterIsString() @@ -122,12 +134,10 @@ Public Class sdgDefineAnnualRainfall ucrReceiverSeasonYear.Selector = ucrSelectorSeasonStartProp ucrReceiverSeasonYear.SetParameterIsString() - ucrReceiverSeasonPlantingDay.SetParameter(New RParameter("plant_day_col", 3)) ucrReceiverSeasonPlantingDay.Selector = ucrSelectorSeasonStartProp ucrReceiverSeasonPlantingDay.SetParameterIsString() - ucrReceiverPlantingDayCondition.SetParameter(New RParameter("plant_day_cond_col", 5)) ucrReceiverPlantingDayCondition.Selector = ucrSelectorSeasonStartProp ucrReceiverPlantingDayCondition.SetParameterIsString() @@ -178,7 +188,6 @@ Public Class sdgDefineAnnualRainfall ucrReceiverMonthMonthly.Selector = ucrSelecetorMonthlyTemp ucrReceiverMonthMonthly.SetParameterIsString() - ucrReceiverMeanminMontly.SetParameter(New RParameter("mean_tmin_col", 4)) ucrReceiverMeanminMontly.Selector = ucrSelecetorMonthlyTemp ucrReceiverMeanminMontly.SetParameterIsString() @@ -216,6 +225,18 @@ Public Class sdgDefineAnnualRainfall clsReformatTempSummariesFunction = clsNewReformatTempSummariesFunction clsExportRinstatToBucketFunction = clsNewExportRinstatToBucketFunction + ucrReceiverSeasonalLength.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("seasonal_length_column", 12), iAdditionalPairNo:=1) + ucrReceiverEndSeasonDOY.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("end_season_column", 7), iAdditionalPairNo:=1) + ucrReceiverStartRainDOY.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("start_rains_column", 3), iAdditionalPairNo:=1) + ucrReceiverEndRainsDOY.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("end_rains_column", 6), iAdditionalPairNo:=1) + + ucrReceiverMinMaxAnnual.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("min_tmax_column", 7), iAdditionalPairNo:=1) + ucrReceiverMaxMaxAnnual.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("max_tmax_column", 8), iAdditionalPairNo:=1) + ucrReceiverMeanMaxAnnual.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("mean_tmax_column", 6), iAdditionalPairNo:=1) + ucrReceiverMeanAnnual.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("mean_tmin_column", 3), iAdditionalPairNo:=1) + ucrReceiverMinMinAnnual.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("min_tmin_column", 4), iAdditionalPairNo:=1) + ucrReceiverMaxMinAnnual.AddAdditionalCodeParameterPair(clsExportRinstatToBucketFunction, New RParameter("max_tmin_column", 5), iAdditionalPairNo:=1) + ucrReceiverAnnualRain.SetRCode(clsReforMattAnnualSummariesFunction, bReset) ucrReceiverEndRainsDate.SetRCode(clsReforMattAnnualSummariesFunction, bReset) ucrReceiverEndRainsDOY.SetRCode(clsReforMattAnnualSummariesFunction, bReset) @@ -230,6 +251,9 @@ Public Class sdgDefineAnnualRainfall ucrReceiverStation.SetRCode(clsReforMattAnnualSummariesFunction, bReset) ucrReceiverYear.SetRCode(clsReforMattAnnualSummariesFunction, bReset) ucrSelectorDefineAnnualRain.SetRCode(clsReforMattAnnualSummariesFunction, bReset) + ucrReceiverStartRainStatus.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverEndRainStatus.SetRCode(clsExportRinstatToBucketFunction, bReset) + ucrReceiverEndSeasonStatus.SetRCode(clsExportRinstatToBucketFunction, bReset) ucrReceiverStationCrop.SetRCode(clsReformatCropSuccessFunction, bReset) ucrReceiverTotalRain.SetRCode(clsReformatCropSuccessFunction, bReset) @@ -274,6 +298,7 @@ Public Class sdgDefineAnnualRainfall ucrReceiverEndSeasonDate.IsEmpty AndAlso ucrReceiverEndSeasonDOY.IsEmpty AndAlso ucrReceiverRainDaysSeason.IsEmpty AndAlso ucrReceiverRainDaysYear.IsEmpty AndAlso ucrReceiverStartRainDate.IsEmpty AndAlso ucrReceiverStartRainDOY.IsEmpty AndAlso ucrReceiverStation.IsEmpty AndAlso ucrReceiverYear.IsEmpty) Then clsExportRinstatToBucketFunction.AddParameter("annual_rainfall_data", clsRFunctionParameter:=clsReforMattAnnualSummariesFunction, iPosition:=1) + Else clsExportRinstatToBucketFunction.RemoveParameterByName("annual_rainfall_data") End If @@ -283,7 +308,7 @@ Public Class sdgDefineAnnualRainfall ucrReceiverPropSuccess.ControlValueChanged If Not (ucrReceiverStationCrop.IsEmpty AndAlso ucrReceiverTotalRain.IsEmpty AndAlso ucrReceiverPlantingDay.IsEmpty AndAlso ucrReceiverPlantingLenghth.IsEmpty AndAlso ucrReceiverPropSuccess.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("crop_success_data", clsRFunctionParameter:=clsReformatCropSuccessFunction, iPosition:=2) + clsExportRinstatToBucketFunction.AddParameter("crop_success_data", clsRFunctionParameter:=clsReformatCropSuccessFunction, iPosition:=9) Else clsExportRinstatToBucketFunction.RemoveParameterByName("crop_success_data") End If @@ -292,7 +317,7 @@ Public Class sdgDefineAnnualRainfall Private Sub ucrReceiverSeasonStationProb_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSeasonStationProb.ControlValueChanged, ucrReceiverSeasonPlantingDay.ControlValueChanged, ucrReceiverPlantingDayCondition.ControlValueChanged, ucrReceiverSeasonYear.ControlValueChanged If Not (ucrReceiverSeasonStationProb.IsEmpty AndAlso ucrReceiverSeasonPlantingDay.IsEmpty AndAlso ucrReceiverPlantingDayCondition.IsEmpty AndAlso ucrReceiverSeasonYear.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("season_start_data", clsRFunctionParameter:=clsReformatSeasonStartFunction, iPosition:=3) + clsExportRinstatToBucketFunction.AddParameter("season_start_data", clsRFunctionParameter:=clsReformatSeasonStartFunction, iPosition:=10) Else clsExportRinstatToBucketFunction.RemoveParameterByName("season_start_data") End If @@ -301,16 +326,15 @@ Public Class sdgDefineAnnualRainfall Private Sub ucrReceiverAnnualTempStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverAnnualTempStation.ControlValueChanged, ucrReceiverAnnualTempYr.ControlValueChanged, ucrReceiverMaxMaxAnnual.ControlValueChanged, ucrReceiverMaxMinAnnual.ControlValueChanged, ucrReceiverMeanAnnual.ControlValueChanged, ucrReceiverMeanMaxAnnual.ControlValueChanged, ucrReceiverMinMaxAnnual.ControlValueChanged, ucrReceiverMinMinAnnual.ControlValueChanged If Not (ucrReceiverAnnualTempStation.IsEmpty AndAlso ucrReceiverAnnualTempYr.IsEmpty AndAlso ucrReceiverMaxMaxAnnual.IsEmpty AndAlso ucrReceiverMaxMinAnnual.IsEmpty AndAlso ucrReceiverMeanAnnual.IsEmpty AndAlso ucrReceiverMeanMaxAnnual.IsEmpty AndAlso ucrReceiverMinMaxAnnual.IsEmpty AndAlso ucrReceiverMinMinAnnual.IsEmpty) Then - clsExportRinstatToBucketFunction.AddParameter("annual_temperature_data", clsRFunctionParameter:=clsReformatTempSummariesFunction, iPosition:=4) + clsExportRinstatToBucketFunction.AddParameter("annual_temperature_data", clsRFunctionParameter:=clsReformatTempSummariesFunction, iPosition:=11) 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) + clsExportRinstatToBucketFunction.AddParameter("monthly_temperature_data", clsRFunctionParameter:=clsReformatMonthlyTempSummaries, iPosition:=18) Else clsExportRinstatToBucketFunction.RemoveParameterByName("monthly_temperature_data") End If diff --git a/instat/sdgOneVarFitModDisplay.vb b/instat/sdgOneVarFitModDisplay.vb index a8f0c0ee9a6..9f88a303e55 100644 --- a/instat/sdgOneVarFitModDisplay.vb +++ b/instat/sdgOneVarFitModDisplay.vb @@ -61,14 +61,14 @@ Public Class sdgOneVarFitModDisplay ucrSavePlots.SetPrefix("plot") ucrSavePlots.SetSaveTypeAsGraph() ucrSavePlots.SetDataFrameSelector(dlgOneVarFitModel.ucrSelectorOneVarFitMod.ucrAvailableDataFrames) - ucrSavePlots.SetCheckBoxText("Save Graph") + ucrSavePlots.SetCheckBoxText("Store Graph") ucrSavePlots.SetIsComboBox() ucrSavePlots.SetAssignToIfUncheckedValue("last_graph") ucrSaveLikelihood.SetPrefix("likelihood") ucrSaveLikelihood.SetSaveTypeAsGraph() ucrSaveLikelihood.SetDataFrameSelector(dlgOneVarFitModel.ucrSelectorOneVarFitMod.ucrAvailableDataFrames) - ucrSaveLikelihood.SetCheckBoxText("Save Graph") + ucrSaveLikelihood.SetCheckBoxText("Store Graph") ucrSaveLikelihood.SetIsComboBox() ucrSaveLikelihood.SetAssignToIfUncheckedValue("last_likelihood") InitialiseTabs() diff --git a/instat/sdgOpenNetCDF.vb b/instat/sdgOpenNetCDF.vb index 61e6d01aa6a..374a910d8c0 100644 --- a/instat/sdgOpenNetCDF.vb +++ b/instat/sdgOpenNetCDF.vb @@ -44,6 +44,7 @@ Public Class sdgOpenNetCDF Private bMultiImport As Boolean = False Private Sub sdgOpenNetCDF_Load(sender As Object, e As EventArgs) Handles MyBase.Load + SetHelpOptions() autoTranslate(Me) End Sub @@ -484,4 +485,13 @@ Public Class sdgOpenNetCDF End If bOKEnabled = Not bWarning End Sub + + Private Sub SetHelpOptions() + Select Case dlgOpenNetCDF.enumNetCDFMode + Case dlgOpenNetCDF.NetCDFMode.File + ucrBase.iHelpTopicID = 119 + Case dlgOpenNetCDF.NetCDFMode.Climatic + ucrBase.iHelpTopicID = 117 + End Select + End Sub End Class \ No newline at end of file diff --git a/instat/sdgPrincipalComponentAnalysis.Designer.vb b/instat/sdgPrincipalComponentAnalysis.Designer.vb index b3292d06607..8a3919b5d30 100644 --- a/instat/sdgPrincipalComponentAnalysis.Designer.vb +++ b/instat/sdgPrincipalComponentAnalysis.Designer.vb @@ -38,9 +38,6 @@ Partial Class sdgPrincipalComponentAnalysis Private Sub InitializeComponent() Me.tbRegOptions = New System.Windows.Forms.TabControl() - Me.tbDisplay = New System.Windows.Forms.TabPage() - Me.ucrChkEigenvectors = New instat.ucrCheck() - Me.ucrChkEigenvalues = New instat.ucrCheck() Me.tbGraphics = New System.Windows.Forms.TabPage() Me.rdoBarPlot = New System.Windows.Forms.RadioButton() Me.rdoIndividualsPlot = New System.Windows.Forms.RadioButton() @@ -80,7 +77,6 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrSaveGraph = New instat.ucrSave() Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() Me.tbRegOptions.SuspendLayout() - Me.tbDisplay.SuspendLayout() Me.tbGraphics.SuspendLayout() Me.grpScree.SuspendLayout() Me.grpVariablePlot.SuspendLayout() @@ -91,46 +87,15 @@ Partial Class sdgPrincipalComponentAnalysis ' 'tbRegOptions ' - Me.tbRegOptions.Controls.Add(Me.tbDisplay) Me.tbRegOptions.Controls.Add(Me.tbGraphics) Me.tbRegOptions.Controls.Add(Me.tbSave) - Me.tbRegOptions.Location = New System.Drawing.Point(6, 7) + Me.tbRegOptions.Location = New System.Drawing.Point(9, 10) + Me.tbRegOptions.Margin = New System.Windows.Forms.Padding(4) Me.tbRegOptions.Name = "tbRegOptions" Me.tbRegOptions.SelectedIndex = 0 - Me.tbRegOptions.Size = New System.Drawing.Size(411, 372) + Me.tbRegOptions.Size = New System.Drawing.Size(616, 558) Me.tbRegOptions.TabIndex = 0 ' - 'tbDisplay - ' - Me.tbDisplay.Controls.Add(Me.ucrChkEigenvectors) - Me.tbDisplay.Controls.Add(Me.ucrChkEigenvalues) - Me.tbDisplay.Location = New System.Drawing.Point(4, 22) - Me.tbDisplay.Name = "tbDisplay" - Me.tbDisplay.Padding = New System.Windows.Forms.Padding(3) - Me.tbDisplay.Size = New System.Drawing.Size(403, 346) - Me.tbDisplay.TabIndex = 0 - Me.tbDisplay.Tag = "Display" - Me.tbDisplay.Text = "Display" - Me.tbDisplay.UseVisualStyleBackColor = True - ' - 'ucrChkEigenvectors - ' - Me.ucrChkEigenvectors.AutoSize = True - Me.ucrChkEigenvectors.Checked = False - Me.ucrChkEigenvectors.Location = New System.Drawing.Point(10, 40) - Me.ucrChkEigenvectors.Name = "ucrChkEigenvectors" - Me.ucrChkEigenvectors.Size = New System.Drawing.Size(361, 23) - Me.ucrChkEigenvectors.TabIndex = 4 - ' - 'ucrChkEigenvalues - ' - Me.ucrChkEigenvalues.AutoSize = True - Me.ucrChkEigenvalues.Checked = False - Me.ucrChkEigenvalues.Location = New System.Drawing.Point(10, 14) - Me.ucrChkEigenvalues.Name = "ucrChkEigenvalues" - Me.ucrChkEigenvalues.Size = New System.Drawing.Size(361, 23) - Me.ucrChkEigenvalues.TabIndex = 3 - ' 'tbGraphics ' Me.tbGraphics.Controls.Add(Me.rdoBarPlot) @@ -140,10 +105,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.tbGraphics.Controls.Add(Me.rdoVariablesPlot) Me.tbGraphics.Controls.Add(Me.rdoScreePlot) Me.tbGraphics.Controls.Add(Me.ucrPnlGraphics) - Me.tbGraphics.Location = New System.Drawing.Point(4, 22) + Me.tbGraphics.Location = New System.Drawing.Point(4, 29) + Me.tbGraphics.Margin = New System.Windows.Forms.Padding(4) Me.tbGraphics.Name = "tbGraphics" - Me.tbGraphics.Padding = New System.Windows.Forms.Padding(3) - Me.tbGraphics.Size = New System.Drawing.Size(403, 346) + Me.tbGraphics.Padding = New System.Windows.Forms.Padding(4) + Me.tbGraphics.Size = New System.Drawing.Size(608, 525) Me.tbGraphics.TabIndex = 1 Me.tbGraphics.Tag = "Graphics" Me.tbGraphics.Text = "Graphics" @@ -152,9 +118,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBarPlot ' Me.rdoBarPlot.AutoSize = True - Me.rdoBarPlot.Location = New System.Drawing.Point(10, 106) + Me.rdoBarPlot.Location = New System.Drawing.Point(15, 159) + Me.rdoBarPlot.Margin = New System.Windows.Forms.Padding(4) Me.rdoBarPlot.Name = "rdoBarPlot" - Me.rdoBarPlot.Size = New System.Drawing.Size(61, 17) + Me.rdoBarPlot.Size = New System.Drawing.Size(89, 24) Me.rdoBarPlot.TabIndex = 5 Me.rdoBarPlot.Tag = "Bar plot" Me.rdoBarPlot.Text = "Bar plot" @@ -163,9 +130,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoIndividualsPlot ' Me.rdoIndividualsPlot.AutoSize = True - Me.rdoIndividualsPlot.Location = New System.Drawing.Point(10, 60) + Me.rdoIndividualsPlot.Location = New System.Drawing.Point(15, 90) + Me.rdoIndividualsPlot.Margin = New System.Windows.Forms.Padding(4) Me.rdoIndividualsPlot.Name = "rdoIndividualsPlot" - Me.rdoIndividualsPlot.Size = New System.Drawing.Size(96, 17) + Me.rdoIndividualsPlot.Size = New System.Drawing.Size(139, 24) Me.rdoIndividualsPlot.TabIndex = 3 Me.rdoIndividualsPlot.Tag = "Individuals_Plot" Me.rdoIndividualsPlot.Text = "Individuals Plot" @@ -188,9 +156,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.grpScree.Controls.Add(Me.ucrInputLabel2) Me.grpScree.Controls.Add(Me.ucrInputLabel1) Me.grpScree.Controls.Add(Me.ucrSelectorFactor) - Me.grpScree.Location = New System.Drawing.Point(8, 131) + Me.grpScree.Location = New System.Drawing.Point(12, 196) + Me.grpScree.Margin = New System.Windows.Forms.Padding(4) Me.grpScree.Name = "grpScree" - Me.grpScree.Size = New System.Drawing.Size(387, 208) + Me.grpScree.Padding = New System.Windows.Forms.Padding(4) + Me.grpScree.Size = New System.Drawing.Size(580, 312) Me.grpScree.TabIndex = 0 Me.grpScree.TabStop = False Me.grpScree.Text = "Plot Options" @@ -199,11 +169,11 @@ Partial Class sdgPrincipalComponentAnalysis ' Me.ucrReceiverFactor.AutoSize = True Me.ucrReceiverFactor.frmParent = Nothing - Me.ucrReceiverFactor.Location = New System.Drawing.Point(233, 69) + Me.ucrReceiverFactor.Location = New System.Drawing.Point(350, 104) Me.ucrReceiverFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFactor.Name = "ucrReceiverFactor" Me.ucrReceiverFactor.Selector = Nothing - Me.ucrReceiverFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverFactor.strNcFilePath = "" Me.ucrReceiverFactor.TabIndex = 4 Me.ucrReceiverFactor.ucrSelector = Nothing @@ -211,9 +181,10 @@ Partial Class sdgPrincipalComponentAnalysis 'lblFactorVariable ' Me.lblFactorVariable.AutoSize = True - Me.lblFactorVariable.Location = New System.Drawing.Point(232, 54) + Me.lblFactorVariable.Location = New System.Drawing.Point(348, 81) + Me.lblFactorVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFactorVariable.Name = "lblFactorVariable" - Me.lblFactorVariable.Size = New System.Drawing.Size(81, 13) + Me.lblFactorVariable.Size = New System.Drawing.Size(121, 20) Me.lblFactorVariable.TabIndex = 5 Me.lblFactorVariable.Tag = "Factor_Variable" Me.lblFactorVariable.Text = "Factor Variable:" @@ -224,9 +195,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.grpVariablePlot.Controls.Add(Me.rdoArrow) Me.grpVariablePlot.Controls.Add(Me.rdoBothVariables) Me.grpVariablePlot.Controls.Add(Me.ucrPnlVariablesPlot) - Me.grpVariablePlot.Location = New System.Drawing.Point(6, 19) + Me.grpVariablePlot.Location = New System.Drawing.Point(9, 28) + Me.grpVariablePlot.Margin = New System.Windows.Forms.Padding(4) Me.grpVariablePlot.Name = "grpVariablePlot" - Me.grpVariablePlot.Size = New System.Drawing.Size(138, 93) + Me.grpVariablePlot.Padding = New System.Windows.Forms.Padding(4) + Me.grpVariablePlot.Size = New System.Drawing.Size(207, 140) Me.grpVariablePlot.TabIndex = 2 Me.grpVariablePlot.TabStop = False Me.grpVariablePlot.Text = "Geom" @@ -234,9 +207,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoTextVariables ' Me.rdoTextVariables.AutoSize = True - Me.rdoTextVariables.Location = New System.Drawing.Point(14, 42) + Me.rdoTextVariables.Location = New System.Drawing.Point(21, 63) + Me.rdoTextVariables.Margin = New System.Windows.Forms.Padding(4) Me.rdoTextVariables.Name = "rdoTextVariables" - Me.rdoTextVariables.Size = New System.Drawing.Size(46, 17) + Me.rdoTextVariables.Size = New System.Drawing.Size(64, 24) Me.rdoTextVariables.TabIndex = 2 Me.rdoTextVariables.TabStop = True Me.rdoTextVariables.Text = "Text" @@ -245,9 +219,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoArrow ' Me.rdoArrow.AutoSize = True - Me.rdoArrow.Location = New System.Drawing.Point(14, 19) + Me.rdoArrow.Location = New System.Drawing.Point(21, 28) + Me.rdoArrow.Margin = New System.Windows.Forms.Padding(4) Me.rdoArrow.Name = "rdoArrow" - Me.rdoArrow.Size = New System.Drawing.Size(52, 17) + Me.rdoArrow.Size = New System.Drawing.Size(75, 24) Me.rdoArrow.TabIndex = 1 Me.rdoArrow.TabStop = True Me.rdoArrow.Text = "Arrow" @@ -256,9 +231,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBothVariables ' Me.rdoBothVariables.AutoSize = True - Me.rdoBothVariables.Location = New System.Drawing.Point(14, 65) + Me.rdoBothVariables.Location = New System.Drawing.Point(21, 98) + Me.rdoBothVariables.Margin = New System.Windows.Forms.Padding(4) Me.rdoBothVariables.Name = "rdoBothVariables" - Me.rdoBothVariables.Size = New System.Drawing.Size(47, 17) + Me.rdoBothVariables.Size = New System.Drawing.Size(68, 24) Me.rdoBothVariables.TabIndex = 3 Me.rdoBothVariables.TabStop = True Me.rdoBothVariables.Text = "Both" @@ -267,17 +243,19 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrPnlVariablesPlot ' Me.ucrPnlVariablesPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlVariablesPlot.Location = New System.Drawing.Point(7, 17) + Me.ucrPnlVariablesPlot.Location = New System.Drawing.Point(10, 26) + Me.ucrPnlVariablesPlot.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlVariablesPlot.Name = "ucrPnlVariablesPlot" - Me.ucrPnlVariablesPlot.Size = New System.Drawing.Size(103, 70) + Me.ucrPnlVariablesPlot.Size = New System.Drawing.Size(154, 105) Me.ucrPnlVariablesPlot.TabIndex = 0 ' 'lblLabel ' Me.lblLabel.AutoSize = True - Me.lblLabel.Location = New System.Drawing.Point(6, 154) + Me.lblLabel.Location = New System.Drawing.Point(9, 231) + Me.lblLabel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblLabel.Name = "lblLabel" - Me.lblLabel.Size = New System.Drawing.Size(36, 13) + Me.lblLabel.Size = New System.Drawing.Size(52, 20) Me.lblLabel.TabIndex = 13 Me.lblLabel.Text = "Label:" ' @@ -287,9 +265,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.GrpIndividualPlot.Controls.Add(Me.rdoPoint) Me.GrpIndividualPlot.Controls.Add(Me.rdoBothIndividual) Me.GrpIndividualPlot.Controls.Add(Me.ucrPnlIndividualPlot) - Me.GrpIndividualPlot.Location = New System.Drawing.Point(6, 19) + Me.GrpIndividualPlot.Location = New System.Drawing.Point(9, 28) + Me.GrpIndividualPlot.Margin = New System.Windows.Forms.Padding(4) Me.GrpIndividualPlot.Name = "GrpIndividualPlot" - Me.GrpIndividualPlot.Size = New System.Drawing.Size(138, 93) + Me.GrpIndividualPlot.Padding = New System.Windows.Forms.Padding(4) + Me.GrpIndividualPlot.Size = New System.Drawing.Size(207, 140) Me.GrpIndividualPlot.TabIndex = 1 Me.GrpIndividualPlot.TabStop = False Me.GrpIndividualPlot.Text = "Geom" @@ -297,9 +277,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoTextIndividual ' Me.rdoTextIndividual.AutoSize = True - Me.rdoTextIndividual.Location = New System.Drawing.Point(14, 42) + Me.rdoTextIndividual.Location = New System.Drawing.Point(21, 63) + Me.rdoTextIndividual.Margin = New System.Windows.Forms.Padding(4) Me.rdoTextIndividual.Name = "rdoTextIndividual" - Me.rdoTextIndividual.Size = New System.Drawing.Size(46, 17) + Me.rdoTextIndividual.Size = New System.Drawing.Size(64, 24) Me.rdoTextIndividual.TabIndex = 2 Me.rdoTextIndividual.TabStop = True Me.rdoTextIndividual.Text = "Text" @@ -308,9 +289,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoPoint ' Me.rdoPoint.AutoSize = True - Me.rdoPoint.Location = New System.Drawing.Point(14, 19) + Me.rdoPoint.Location = New System.Drawing.Point(21, 28) + Me.rdoPoint.Margin = New System.Windows.Forms.Padding(4) Me.rdoPoint.Name = "rdoPoint" - Me.rdoPoint.Size = New System.Drawing.Size(49, 17) + Me.rdoPoint.Size = New System.Drawing.Size(70, 24) Me.rdoPoint.TabIndex = 1 Me.rdoPoint.TabStop = True Me.rdoPoint.Text = "Point" @@ -319,9 +301,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBothIndividual ' Me.rdoBothIndividual.AutoSize = True - Me.rdoBothIndividual.Location = New System.Drawing.Point(14, 65) + Me.rdoBothIndividual.Location = New System.Drawing.Point(21, 98) + Me.rdoBothIndividual.Margin = New System.Windows.Forms.Padding(4) Me.rdoBothIndividual.Name = "rdoBothIndividual" - Me.rdoBothIndividual.Size = New System.Drawing.Size(47, 17) + Me.rdoBothIndividual.Size = New System.Drawing.Size(68, 24) Me.rdoBothIndividual.TabIndex = 3 Me.rdoBothIndividual.TabStop = True Me.rdoBothIndividual.Text = "Both" @@ -330,17 +313,19 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrPnlIndividualPlot ' Me.ucrPnlIndividualPlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlIndividualPlot.Location = New System.Drawing.Point(9, 18) + Me.ucrPnlIndividualPlot.Location = New System.Drawing.Point(14, 27) + Me.ucrPnlIndividualPlot.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlIndividualPlot.Name = "ucrPnlIndividualPlot" - Me.ucrPnlIndividualPlot.Size = New System.Drawing.Size(88, 69) + Me.ucrPnlIndividualPlot.Size = New System.Drawing.Size(132, 104) Me.ucrPnlIndividualPlot.TabIndex = 0 ' 'lblChoice ' Me.lblChoice.AutoSize = True - Me.lblChoice.Location = New System.Drawing.Point(6, 154) + Me.lblChoice.Location = New System.Drawing.Point(9, 231) + Me.lblChoice.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblChoice.Name = "lblChoice" - Me.lblChoice.Size = New System.Drawing.Size(43, 13) + Me.lblChoice.Size = New System.Drawing.Size(62, 20) Me.lblChoice.TabIndex = 11 Me.lblChoice.Text = "Choice:" ' @@ -348,9 +333,10 @@ Partial Class sdgPrincipalComponentAnalysis ' Me.ucrChkIncludePercentage.AutoSize = True Me.ucrChkIncludePercentage.Checked = False - Me.ucrChkIncludePercentage.Location = New System.Drawing.Point(6, 122) + Me.ucrChkIncludePercentage.Location = New System.Drawing.Point(9, 183) + Me.ucrChkIncludePercentage.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkIncludePercentage.Name = "ucrChkIncludePercentage" - Me.ucrChkIncludePercentage.Size = New System.Drawing.Size(158, 23) + Me.ucrChkIncludePercentage.Size = New System.Drawing.Size(237, 34) Me.ucrChkIncludePercentage.TabIndex = 6 ' 'ucrNudDim2 @@ -358,11 +344,12 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrNudDim2.AutoSize = True Me.ucrNudDim2.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDim2.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDim2.Location = New System.Drawing.Point(235, 122) + Me.ucrNudDim2.Location = New System.Drawing.Point(352, 183) + Me.ucrNudDim2.Margin = New System.Windows.Forms.Padding(9) Me.ucrNudDim2.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudDim2.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDim2.Name = "ucrNudDim2" - Me.ucrNudDim2.Size = New System.Drawing.Size(50, 20) + Me.ucrNudDim2.Size = New System.Drawing.Size(75, 30) Me.ucrNudDim2.TabIndex = 10 Me.ucrNudDim2.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -371,11 +358,12 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrNudDim1.AutoSize = True Me.ucrNudDim1.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDim1.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDim1.Location = New System.Drawing.Point(170, 122) + Me.ucrNudDim1.Location = New System.Drawing.Point(255, 183) + Me.ucrNudDim1.Margin = New System.Windows.Forms.Padding(9) Me.ucrNudDim1.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudDim1.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDim1.Name = "ucrNudDim1" - Me.ucrNudDim1.Size = New System.Drawing.Size(50, 20) + Me.ucrNudDim1.Size = New System.Drawing.Size(75, 30) Me.ucrNudDim1.TabIndex = 8 Me.ucrNudDim1.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -385,9 +373,11 @@ Partial Class sdgPrincipalComponentAnalysis Me.grpGeom.Controls.Add(Me.rdoLine) Me.grpGeom.Controls.Add(Me.rdoBothScree) Me.grpGeom.Controls.Add(Me.ucrPnlScreePlot) - Me.grpGeom.Location = New System.Drawing.Point(6, 19) + Me.grpGeom.Location = New System.Drawing.Point(9, 28) + Me.grpGeom.Margin = New System.Windows.Forms.Padding(4) Me.grpGeom.Name = "grpGeom" - Me.grpGeom.Size = New System.Drawing.Size(138, 93) + Me.grpGeom.Padding = New System.Windows.Forms.Padding(4) + Me.grpGeom.Size = New System.Drawing.Size(207, 140) Me.grpGeom.TabIndex = 0 Me.grpGeom.TabStop = False Me.grpGeom.Tag = "Geom" @@ -396,9 +386,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBar ' Me.rdoBar.AutoSize = True - Me.rdoBar.Location = New System.Drawing.Point(14, 19) + Me.rdoBar.Location = New System.Drawing.Point(21, 28) + Me.rdoBar.Margin = New System.Windows.Forms.Padding(4) Me.rdoBar.Name = "rdoBar" - Me.rdoBar.Size = New System.Drawing.Size(41, 17) + Me.rdoBar.Size = New System.Drawing.Size(59, 24) Me.rdoBar.TabIndex = 1 Me.rdoBar.TabStop = True Me.rdoBar.Text = "Bar" @@ -407,9 +398,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoLine ' Me.rdoLine.AutoSize = True - Me.rdoLine.Location = New System.Drawing.Point(14, 42) + Me.rdoLine.Location = New System.Drawing.Point(21, 63) + Me.rdoLine.Margin = New System.Windows.Forms.Padding(4) Me.rdoLine.Name = "rdoLine" - Me.rdoLine.Size = New System.Drawing.Size(45, 17) + Me.rdoLine.Size = New System.Drawing.Size(64, 24) Me.rdoLine.TabIndex = 2 Me.rdoLine.TabStop = True Me.rdoLine.Text = "Line" @@ -418,9 +410,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoBothScree ' Me.rdoBothScree.AutoSize = True - Me.rdoBothScree.Location = New System.Drawing.Point(14, 65) + Me.rdoBothScree.Location = New System.Drawing.Point(21, 98) + Me.rdoBothScree.Margin = New System.Windows.Forms.Padding(4) Me.rdoBothScree.Name = "rdoBothScree" - Me.rdoBothScree.Size = New System.Drawing.Size(47, 17) + Me.rdoBothScree.Size = New System.Drawing.Size(68, 24) Me.rdoBothScree.TabIndex = 3 Me.rdoBothScree.TabStop = True Me.rdoBothScree.Text = "Both" @@ -429,26 +422,29 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrPnlScreePlot ' Me.ucrPnlScreePlot.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlScreePlot.Location = New System.Drawing.Point(6, 19) + Me.ucrPnlScreePlot.Location = New System.Drawing.Point(9, 28) + Me.ucrPnlScreePlot.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlScreePlot.Name = "ucrPnlScreePlot" - Me.ucrPnlScreePlot.Size = New System.Drawing.Size(84, 63) + Me.ucrPnlScreePlot.Size = New System.Drawing.Size(126, 94) Me.ucrPnlScreePlot.TabIndex = 0 ' 'lblChoiceScree ' Me.lblChoiceScree.AutoSize = True - Me.lblChoiceScree.Location = New System.Drawing.Point(13, 129) + Me.lblChoiceScree.Location = New System.Drawing.Point(20, 194) + Me.lblChoiceScree.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblChoiceScree.Name = "lblChoiceScree" - Me.lblChoiceScree.Size = New System.Drawing.Size(0, 13) + Me.lblChoiceScree.Size = New System.Drawing.Size(0, 20) Me.lblChoiceScree.TabIndex = 8 Me.lblChoiceScree.Tag = "Choice:" ' 'lblDim ' Me.lblDim.AutoSize = True - Me.lblDim.Location = New System.Drawing.Point(6, 125) + Me.lblDim.Location = New System.Drawing.Point(9, 188) + Me.lblDim.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDim.Name = "lblDim" - Me.lblDim.Size = New System.Drawing.Size(97, 13) + Me.lblDim.Size = New System.Drawing.Size(145, 20) Me.lblDim.TabIndex = 7 Me.lblDim.Text = "Dimensions to Plot:" ' @@ -458,9 +454,10 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrInputLabel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLabel2.GetSetSelectedIndex = -1 Me.ucrInputLabel2.IsReadOnly = False - Me.ucrInputLabel2.Location = New System.Drawing.Point(83, 148) + Me.ucrInputLabel2.Location = New System.Drawing.Point(124, 222) + Me.ucrInputLabel2.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputLabel2.Name = "ucrInputLabel2" - Me.ucrInputLabel2.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLabel2.Size = New System.Drawing.Size(206, 32) Me.ucrInputLabel2.TabIndex = 14 ' 'ucrInputLabel1 @@ -469,9 +466,10 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrInputLabel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLabel1.GetSetSelectedIndex = -1 Me.ucrInputLabel1.IsReadOnly = False - Me.ucrInputLabel1.Location = New System.Drawing.Point(83, 148) + Me.ucrInputLabel1.Location = New System.Drawing.Point(124, 222) + Me.ucrInputLabel1.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputLabel1.Name = "ucrInputLabel1" - Me.ucrInputLabel1.Size = New System.Drawing.Size(137, 21) + Me.ucrInputLabel1.Size = New System.Drawing.Size(206, 32) Me.ucrInputLabel1.TabIndex = 12 ' 'ucrSelectorFactor @@ -480,18 +478,19 @@ Partial Class sdgPrincipalComponentAnalysis Me.ucrSelectorFactor.bDropUnusedFilterLevels = False Me.ucrSelectorFactor.bShowHiddenColumns = False Me.ucrSelectorFactor.bUseCurrentFilter = True - Me.ucrSelectorFactor.Location = New System.Drawing.Point(5, 19) + Me.ucrSelectorFactor.Location = New System.Drawing.Point(8, 28) Me.ucrSelectorFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorFactor.Name = "ucrSelectorFactor" - Me.ucrSelectorFactor.Size = New System.Drawing.Size(224, 183) + Me.ucrSelectorFactor.Size = New System.Drawing.Size(480, 411) Me.ucrSelectorFactor.TabIndex = 3 ' 'rdoBiplot ' Me.rdoBiplot.AutoSize = True - Me.rdoBiplot.Location = New System.Drawing.Point(10, 83) + Me.rdoBiplot.Location = New System.Drawing.Point(15, 124) + Me.rdoBiplot.Margin = New System.Windows.Forms.Padding(4) Me.rdoBiplot.Name = "rdoBiplot" - Me.rdoBiplot.Size = New System.Drawing.Size(51, 17) + Me.rdoBiplot.Size = New System.Drawing.Size(74, 24) Me.rdoBiplot.TabIndex = 4 Me.rdoBiplot.Tag = "Biplot" Me.rdoBiplot.Text = "Biplot" @@ -500,9 +499,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoVariablesPlot ' Me.rdoVariablesPlot.AutoSize = True - Me.rdoVariablesPlot.Location = New System.Drawing.Point(10, 37) + Me.rdoVariablesPlot.Location = New System.Drawing.Point(15, 56) + Me.rdoVariablesPlot.Margin = New System.Windows.Forms.Padding(4) Me.rdoVariablesPlot.Name = "rdoVariablesPlot" - Me.rdoVariablesPlot.Size = New System.Drawing.Size(89, 17) + Me.rdoVariablesPlot.Size = New System.Drawing.Size(131, 24) Me.rdoVariablesPlot.TabIndex = 2 Me.rdoVariablesPlot.Tag = "Variables_Plot" Me.rdoVariablesPlot.Text = "Variables Plot" @@ -511,9 +511,10 @@ Partial Class sdgPrincipalComponentAnalysis 'rdoScreePlot ' Me.rdoScreePlot.AutoSize = True - Me.rdoScreePlot.Location = New System.Drawing.Point(10, 14) + Me.rdoScreePlot.Location = New System.Drawing.Point(15, 21) + Me.rdoScreePlot.Margin = New System.Windows.Forms.Padding(4) Me.rdoScreePlot.Name = "rdoScreePlot" - Me.rdoScreePlot.Size = New System.Drawing.Size(74, 17) + Me.rdoScreePlot.Size = New System.Drawing.Size(107, 24) Me.rdoScreePlot.TabIndex = 1 Me.rdoScreePlot.Tag = "Scree_Plot" Me.rdoScreePlot.Text = "Scree Plot" @@ -522,18 +523,20 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrPnlGraphics ' Me.ucrPnlGraphics.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGraphics.Location = New System.Drawing.Point(6, 14) + Me.ucrPnlGraphics.Location = New System.Drawing.Point(9, 21) + Me.ucrPnlGraphics.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlGraphics.Name = "ucrPnlGraphics" - Me.ucrPnlGraphics.Size = New System.Drawing.Size(389, 120) + Me.ucrPnlGraphics.Size = New System.Drawing.Size(584, 180) Me.ucrPnlGraphics.TabIndex = 0 ' 'tbSave ' Me.tbSave.Controls.Add(Me.ucrSaveGraph) - Me.tbSave.Location = New System.Drawing.Point(4, 22) + Me.tbSave.Location = New System.Drawing.Point(4, 29) + Me.tbSave.Margin = New System.Windows.Forms.Padding(4) Me.tbSave.Name = "tbSave" - Me.tbSave.Padding = New System.Windows.Forms.Padding(3) - Me.tbSave.Size = New System.Drawing.Size(403, 346) + Me.tbSave.Padding = New System.Windows.Forms.Padding(4) + Me.tbSave.Size = New System.Drawing.Size(608, 525) Me.tbSave.TabIndex = 2 Me.tbSave.Tag = "Save" Me.tbSave.Text = "Save" @@ -542,29 +545,31 @@ Partial Class sdgPrincipalComponentAnalysis 'ucrSaveGraph ' Me.ucrSaveGraph.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveGraph.Location = New System.Drawing.Point(5, 11) - Me.ucrSaveGraph.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveGraph.Location = New System.Drawing.Point(8, 16) + Me.ucrSaveGraph.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveGraph.Name = "ucrSaveGraph" - Me.ucrSaveGraph.Size = New System.Drawing.Size(346, 24) + Me.ucrSaveGraph.Size = New System.Drawing.Size(519, 36) Me.ucrSaveGraph.TabIndex = 15 ' 'ucrSdgButtons ' Me.ucrSdgButtons.AutoSize = True - Me.ucrSdgButtons.Location = New System.Drawing.Point(97, 385) + Me.ucrSdgButtons.Location = New System.Drawing.Point(146, 578) + Me.ucrSdgButtons.Margin = New System.Windows.Forms.Padding(6) Me.ucrSdgButtons.Name = "ucrSdgButtons" - Me.ucrSdgButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgButtons.Size = New System.Drawing.Size(336, 45) Me.ucrSdgButtons.TabIndex = 1 ' 'sdgPrincipalComponentAnalysis ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(422, 419) + Me.ClientSize = New System.Drawing.Size(633, 628) Me.Controls.Add(Me.tbRegOptions) Me.Controls.Add(Me.ucrSdgButtons) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgPrincipalComponentAnalysis" @@ -572,8 +577,6 @@ Partial Class sdgPrincipalComponentAnalysis Me.Tag = "PCA_Options" Me.Text = "PCA Options" Me.tbRegOptions.ResumeLayout(False) - Me.tbDisplay.ResumeLayout(False) - Me.tbDisplay.PerformLayout() Me.tbGraphics.ResumeLayout(False) Me.tbGraphics.PerformLayout() Me.grpScree.ResumeLayout(False) @@ -592,7 +595,6 @@ Partial Class sdgPrincipalComponentAnalysis Friend WithEvents ucrSdgButtons As ucrButtonsSubdialogue Friend WithEvents tbRegOptions As TabControl - Friend WithEvents tbDisplay As TabPage Friend WithEvents tbGraphics As TabPage Friend WithEvents tbSave As TabPage Friend WithEvents rdoIndividualsPlot As RadioButton @@ -611,8 +613,6 @@ Partial Class sdgPrincipalComponentAnalysis Friend WithEvents ucrReceiverFactor As ucrReceiverSingle Friend WithEvents grpScree As GroupBox Friend WithEvents ucrInputLabel1 As ucrInputComboBox - Friend WithEvents ucrChkEigenvectors As ucrCheck - Friend WithEvents ucrChkEigenvalues As ucrCheck Friend WithEvents ucrNudDim2 As ucrNud Friend WithEvents ucrNudDim1 As ucrNud Friend WithEvents ucrPnlScreePlot As UcrPanel diff --git a/instat/sdgPrincipalComponentAnalysis.vb b/instat/sdgPrincipalComponentAnalysis.vb index 88ee7a111ef..29e0ba24da7 100644 --- a/instat/sdgPrincipalComponentAnalysis.vb +++ b/instat/sdgPrincipalComponentAnalysis.vb @@ -16,7 +16,6 @@ Imports instat.Translations Public Class sdgPrincipalComponentAnalysis Private bControlsInitialised As Boolean = False - Private clsREigenValues, clsDummyFunction, clsREigenVectors As New RFunction Public bFirstLoad As Boolean = True ' to do: @@ -35,17 +34,6 @@ Public Class sdgPrincipalComponentAnalysis Dim dctLabelOptionsChoice As New Dictionary(Of String, String) Dim dctOptionsForLabel As New Dictionary(Of String, String) - ucrChkEigenvalues.SetParameter(New RParameter("value1", 2)) - ucrChkEigenvalues.SetText("Eigenvalues") - ucrChkEigenvalues.SetValueIfChecked(Chr(34) & "eig" & Chr(34)) - ucrChkEigenvalues.AddParameterPresentCondition(True, "value1") - ucrChkEigenvalues.AddParameterPresentCondition(False, "value1", False) - - ucrChkEigenvectors.SetParameter(New RParameter("value1", 2)) - ucrChkEigenvectors.SetText("Eigenvectors") - ucrChkEigenvectors.SetValueIfChecked(Chr(34) & "ind" & Chr(34)) - ucrChkEigenvectors.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrNudDim1.SetParameter(New RParameter("first_dim", 0, bNewIncludeArgumentName:=False)) ucrNudDim1.SetMinMax(1, 2) 'temp fix to prevent clearing value @@ -135,7 +123,7 @@ Public Class sdgPrincipalComponentAnalysis ucrSaveGraph.SetPrefix("pca_graph") ucrSaveGraph.SetSaveTypeAsGraph() ucrSaveGraph.SetDataFrameSelector(dlgPrincipalComponentAnalysis.ucrSelectorPCA.ucrAvailableDataFrames) - ucrSaveGraph.SetCheckBoxText("Save Graph") + ucrSaveGraph.SetCheckBoxText("Store Graph") ucrSaveGraph.SetIsComboBox() ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph") @@ -147,14 +135,11 @@ Public Class sdgPrincipalComponentAnalysis rdoBarPlot.Enabled = False End Sub - Public Sub SetRFunction(clsNewRsyntax As RSyntax, clsNewREigenValues As RFunction, clsNewDummyFunction As RFunction, clsNewREigenVectors As RFunction, clsNewRRotation As RFunction, clsNewScreePlotFunction As RFunction, clsNewVariablesPlotFunction As RFunction, clsNewIndividualsPlotFunction As RFunction, clsNewBiplotFunction As RFunction, clsNewBarPlotFunction As RFunction, clsNewVariablesPlotFunctionValue As RFunction, clsNewIndividualsPlotFunctionValue As RFunction, clsNewBiplotFunctionValue As RFunction, clsNewRFactor As RFunction, clsNewBaseOperator As ROperator, clsNewRThemeMinimal As RFunction, Optional bReset As Boolean = False) + Public Sub SetRFunction(clsNewRsyntax As RSyntax, clsNewRRotation As RFunction, clsNewScreePlotFunction As RFunction, clsNewVariablesPlotFunction As RFunction, clsNewIndividualsPlotFunction As RFunction, clsNewBiplotFunction As RFunction, clsNewBarPlotFunction As RFunction, clsNewVariablesPlotFunctionValue As RFunction, clsNewIndividualsPlotFunctionValue As RFunction, clsNewBiplotFunctionValue As RFunction, clsNewRFactor As RFunction, clsNewBaseOperator As ROperator, clsNewRThemeMinimal As RFunction, Optional bReset As Boolean = False) If Not bControlsInitialised Then InitialiseControls() End If clsRsyntax = clsNewRsyntax - clsREigenValues = clsNewREigenValues - clsDummyFunction = clsNewDummyFunction - clsREigenVectors = clsNewREigenVectors clsRScreePlotFunction = clsNewScreePlotFunction clsRVariablesPlotFunction = clsNewVariablesPlotFunction clsRIndividualsPlotFunction = clsNewIndividualsPlotFunction @@ -185,8 +170,6 @@ Public Class sdgPrincipalComponentAnalysis ucrInputLabel2.SetRCode(clsRVariablesPlotFunction, bReset, bCloneIfNeeded:=True) ucrReceiverFactor.SetRCode(clsRFactor, bReset, bCloneIfNeeded:=True) ucrChkIncludePercentage.SetRCode(clsRScreePlotFunction, bReset, bCloneIfNeeded:=True) - ucrChkEigenvalues.SetRCode(clsREigenValues, bReset, bCloneIfNeeded:=True) - ucrChkEigenvectors.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=True) ucrPnlGraphics.SetRCode(clsBaseOperator, bReset) ucrPnlScreePlot.SetRCode(clsRScreePlotFunction, bReset, bCloneIfNeeded:=True) @@ -199,26 +182,6 @@ Public Class sdgPrincipalComponentAnalysis End If End Sub - Private Sub ucrChkEigenvalues_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkEigenvalues.ControlValueChanged - If ucrChkEigenvalues.Checked Then - clsRsyntax.AddToAfterCodes(clsREigenValues, iPosition:=1) - Else - clsRsyntax.RemoveFromAfterCodes(clsREigenValues) - End If - End Sub - - Private Sub ucrChkEigenvectors_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkEigenvectors.ControlValueChanged - If ucrChkEigenvectors.Checked Then - clsRsyntax.AddToAfterCodes(clsREigenVectors, iPosition:=2) - clsDummyFunction.AddParameter("value1", "TRUE", iPosition:=1) - - Else - clsDummyFunction.AddParameter("value1", "FALSE", iPosition:=1) - clsRsyntax.RemoveFromAfterCodes(clsREigenVectors) - - End If - End Sub - 'This is here because when you reopen the subdialog the groupboxes are not visible.Don't know why linking isn't working on reopen. Private Sub Visibility() If rdoScreePlot.Checked Then diff --git a/instat/sdgSaveColumnPosition.Designer.vb b/instat/sdgSaveColumnPosition.Designer.vb index 8d4d1004c0d..47dcc8a061f 100644 --- a/instat/sdgSaveColumnPosition.Designer.vb +++ b/instat/sdgSaveColumnPosition.Designer.vb @@ -175,7 +175,7 @@ Partial Class sdgSaveColumnPosition Me.MinimizeBox = False Me.Name = "sdgSaveColumnPosition" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Save Column Position" + Me.Text = "Column Position" Me.grpColumnPosition.ResumeLayout(False) Me.grpColumnPosition.PerformLayout() Me.ResumeLayout(False) diff --git a/instat/static/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 bd9af123a80..8ab9363348a 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), keys = list(), comments = list(), keep_attributes = TRUE) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE) { # Set up the data object self$set_data(data, messages) @@ -28,6 +28,7 @@ DataSheet <- R6::R6Class("DataSheet", #self$update_variables_metadata() self$set_objects(objects) self$set_calculations(calculations) + self$set_scalars(scalars) self$set_keys(keys) self$set_comments(comments) @@ -60,6 +61,7 @@ DataSheet <- R6::R6Class("DataSheet", keys = list(), comments = list(), calculations = list(), + scalars = list(), changes = list(), .current_filter = list(), .current_column_selection = list(), @@ -232,6 +234,13 @@ DataSheet$set("public", "set_calculations", function(new_calculations) { } ) +DataSheet$set("public", "set_scalars", function(new_scalars) { + if(!is.list(new_scalars)) stop("scalars must be of type: list") + self$append_to_changes(list(Set_property, "scalars")) + private$scalars <- new_scalars +} +) + DataSheet$set("public", "set_keys", function(new_keys) { if(!is.list(new_keys)) stop("new_keys must be of type: list") self$append_to_changes(list(Set_property, "keys")) @@ -622,6 +631,39 @@ DataSheet$set("public", "get_calculation_names", function(as_list = FALSE, exclu } ) +DataSheet$set("public", "get_scalars", function() { + out <- + private$scalars[self$get_scalar_names()] + return(out) +} +) + +DataSheet$set("public", "get_scalar_names", function(as_list = FALSE, excluded_items = c(),...) { + out <- get_data_book_scalar_names(scalar_list = private$scalars, + as_list = as_list, + list_label= self$get_metadata(data_name_label) ) + return(out) +} +) + +DataSheet$set("public", "get_scalar_value", function(scalar_name) { + if(missing(scalar_name)) stop(stop("scalar_name must be specified.")) + return(private$scalars[[scalar_name]]) +} +) + +DataSheet$set("public", "add_scalar", function(scalar_name = "", scalar_value) { + if(missing(scalar_name)) scalar_name <- next_default_item("scalar", names(private$scalars)) + if(scalar_name %in% names(private$scalars)) warning("A scalar called", scalar_name, "already exists. It will be replaced.") + private$scalars[[scalar_name]] <- scalar_value + self$append_to_metadata(scalar, private$scalars) + self$append_to_changes(list(Added_scalar, scalar_name)) + cat(paste("Scalar name: ", scalar_name), + paste("Value: ", private$scalars[[scalar_name]]), + sep = "\n") +} +) + DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, use_col_name_as_prefix = FALSE, hidden = FALSE, before, adjacent_column = "", num_cols, require_correct_length = TRUE, keep_existing_position = TRUE) { # Column name must be character if(!is.character(col_name)) stop("Column name must be of type: character") @@ -2175,11 +2217,12 @@ DataSheet$set("public", "get_object", function(object_name) { ) DataSheet$set("public", "rename_object", function(object_name, new_name, object_type = "object") { - if(!object_type %in% c("object", "filter", "calculation", "graph", "table","model","structure","summary", "column_selection")) stop(object_type, " must be either object (graph, table or model), filter, column_selection or a calculation.") + if(!object_type %in% c("object", "filter", "calculation", "graph", "table","model","structure","summary", "column_selection", "scalar")) stop(object_type, " must be either object (graph, table or model), filter, column selection, calculation or scalar.") + #Temp fix:: added graph, table and model so as to distinguish this when implementing it in the dialog. Otherwise they remain as objects if (object_type %in% c("object", "graph", "table","model","structure","summary")){ - + if(!object_name %in% names(private$objects)) stop(object_name, " not found in objects list") if(new_name %in% names(private$objects)) stop(new_name, " is already an object name. Cannot rename ", object_name, " to ", new_name) names(private$objects)[names(private$objects) == object_name] <- new_name @@ -2202,31 +2245,41 @@ DataSheet$set("public", "rename_object", function(object_name, new_name, object_ if(".everything" == object_name) stop("Renaming .everything is not allowed.") names(private$column_selections)[names(private$column_selections) == object_name] <- new_name if(private$.current_column_selection$name == object_name){private$.current_column_selection$name <- new_name} - } + } else if (object_type == "scalar") { + if(!object_name %in% names(private$scalars)) stop(object_name, " not found in calculations list") + if(new_name %in% names(private$scalars)) stop(new_name, " is already a calculation name. Cannot rename ", object_name, " to ", new_name) + names(private$scalars)[names(private$scalars) == object_name] <- new_name + self$append_to_metadata(scalar, private$scalars) + } } ) DataSheet$set("public", "delete_objects", function(data_name, object_names, object_type = "object") { - if(!object_type %in% c("object", "graph", "table","model","structure","summary","filter", "calculation", "column_selection")) stop(object_type, " must be either object (graph, table or model), filter, column selection or a calculation.") + if(!object_type %in% c("object", "graph", "table","model","structure","summary","filter", "calculation", "column_selection", "scalar")) stop(object_type, " must be either object (graph, table or model), filter, column selection, calculation or scala.") + if(any(object_type %in% c("object", "graph", "table","model","structure","summary"))){ - - if(!all(object_names %in% names(private$objects))) stop("Not all object_names found in overall objects list.") - private$objects[names(private$objects) %in% object_names] <- NULL - }else if(object_type == "filter"){ - if(!all(object_names %in% names(private$filters))) stop(object_names, " not found in filters list.") - if("no_filter" %in% object_names) stop("no_filter cannot be deleted.") - if(any(private$.current_filter$name %in% object_names))stop(private$.current_filter$name, " is currently in use and cannot be deleted.") - private$filters[names(private$filters) %in% object_names] <- NULL - }else if(object_type == "calculation"){ - if(!object_names %in% names(private$calculations)) stop(object_names, " not found in calculations list.") - private$calculations[names(private$calculations) %in% object_names] <- NULL - }else if(object_type == "column_selection"){ - if(!all(object_names %in% names(private$column_selections))) stop(object_names, " not found in column selections list.") - if(".everything" %in% object_names) stop(".everything cannot be deleted.") - if(any(private$.current_column_selection$name %in% object_names))stop(private$.current_column_selection$name, " is currently in use and cannot be deleted.") - private$column_selections[names(private$column_selections) %in% object_names] <- NULL - } + + if(!all(object_names %in% names(private$objects))) stop("Not all object_names found in overall objects list.") + private$objects[names(private$objects) %in% object_names] <- NULL + }else if(object_type == "filter"){ + if(!all(object_names %in% names(private$filters))) stop(object_names, " not found in filters list.") + if("no_filter" %in% object_names) stop("no_filter cannot be deleted.") + if(any(private$.current_filter$name %in% object_names))stop(private$.current_filter$name, " is currently in use and cannot be deleted.") + private$filters[names(private$filters) %in% object_names] <- NULL + }else if(object_type == "calculation"){ + if(!object_names %in% names(private$calculations)) stop(object_names, " not found in calculations list.") + private$calculations[names(private$calculations) %in% object_names] <- NULL + }else if(object_type == "scalar"){ + if(!object_names %in% names(private$scalars)) stop(object_names, " not found in scalars list.") + private$scalars[names(private$scalars) %in% object_names] <- NULL + self$append_to_metadata(scalar, private$scalars) + }else if(object_type == "column_selection"){ + if(!all(object_names %in% names(private$column_selections))) stop(object_names, " not found in column selections list.") + if(".everything" %in% object_names) stop(".everything cannot be deleted.") + if(any(private$.current_column_selection$name %in% object_names))stop(private$.current_column_selection$name, " is currently in use and cannot be deleted.") + private$column_selections[names(private$column_selections) %in% object_names] <- NULL + } if(!is.null(private$.last_graph) && length(private$.last_graph) == 2 && private$.last_graph[1] == data_name && private$.last_graph[2] %in% object_names) { private$.last_graph <- NULL } @@ -4464,3 +4517,23 @@ DataSheet$set("public", "has_labels", function(col_names) { return(!is.null(attr(col_names, "labels"))) } ) + +DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { + + if(missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") + if(sign_level || signif.stars) message("This is no longer descriptive") + if(sign_level) end_col = 5 else end_col = 4 + + if (length(x_col_names) == 1) { + formula_str <- paste0( as.name(y_col_name), "~ ", as.name(x_col_names)) + } else if (length(x_col_names) > 1) { + formula_str <- paste0(as.name(y_col_name), "~ ", as.name(paste(x_col_names, collapse = " + "))) + } + + return_item <- NULL + mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) + return_item[[paste0("ANOVA table: ", formula_str, sep = "")]] <- anova(mod)[1:end_col] + if(means) return_item[[paste0("Means table of ", y_col_name)]] <- model.tables(aov(mod), type = "means") + return(return_item) +} +) \ No newline at end of file diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index a8110495aad..7bf6274f247 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -10,6 +10,7 @@ DataBook <- R6::R6Class("DataBook", { self$set_meta(instat_obj_metadata) self$set_objects(list()) + self$set_scalars(list()) if (missing(data_tables) || length(data_tables) == 0) { self$set_data_objects(list()) @@ -29,6 +30,7 @@ DataBook <- R6::R6Class("DataBook", .data_sheets = list(), .metadata = list(), .objects = list(), + .scalars = list(), .links = list(), .data_sheets_changed = FALSE, .database_connection = NULL, @@ -229,13 +231,15 @@ DataBook$set("public", "import_RDS", function(data_RDS, } ) -DataBook$set("public", "clone_data_object", function(curr_data_object, include_objects = TRUE, include_metadata = TRUE, include_logs = TRUE, include_filters = TRUE, include_column_selections = TRUE, include_calculations = TRUE, include_comments = TRUE, ...) { +DataBook$set("public", "clone_data_object", function(curr_data_object, include_objects = TRUE, include_metadata = TRUE, include_logs = TRUE, include_filters = TRUE, include_column_selections = TRUE, include_calculations = TRUE, include_comments = TRUE, include_scalars = TRUE, ...) { curr_names <- names(curr_data_object) if("get_data_frame" %in% curr_names) new_data <- curr_data_object$get_data_frame(use_current_filter = FALSE) else stop("Cannot import data. No 'get_data_frame' method.") if("get_metadata" %in% curr_names) new_data_name <- curr_data_object$get_metadata(data_name_label) if(include_objects && "get_objects" %in% curr_names) new_objects <- curr_data_object$get_objects() else new_objects <- list() + if(include_scalars && "get_scalars" %in% curr_names) new_scalars <- curr_data_object$get_scalars() + else new_scalars <- list() if(include_filters && "get_filter" %in% curr_names) { new_filters <- lapply(curr_data_object$get_filter(), function(x) x$data_clone()) new_filters <- lapply(new_filters, function(x) check_filter(x)) @@ -249,7 +253,7 @@ DataBook$set("public", "clone_data_object", function(curr_data_object, include_o if("get_keys" %in% curr_names) new_keys <- curr_data_object$get_keys() else new_keys <- list() - new_data_object <- DataSheet$new(data = new_data, data_name = new_data_name, filters = new_filters, column_selections = new_column_selections, objects = new_objects, calculations = new_calculations, keys = new_keys, comments = new_comments, keep_attributes = include_metadata) + new_data_object <- DataSheet$new(data = new_data, data_name = new_data_name, filters = new_filters, column_selections = new_column_selections, objects = new_objects, calculations = new_calculations, scalars = new_scalars, keys = new_keys, comments = new_comments, keep_attributes = include_metadata) if(include_logs && "get_changes" %in% curr_names) { new_changes <- curr_data_object$get_changes() } @@ -312,6 +316,12 @@ DataBook$set("public", "set_objects", function(new_objects) { } ) +DataBook$set("public", "set_scalars", function(new_scalars) { + if(!is.list(new_scalars)) stop("new_scalars must be of type: list") + private$.scalars <- new_scalars +} +) + DataBook$set("public", "append_data_object", function(name, obj, add_to_graph_book = TRUE) { if(!is.character(name)) stop("name must be a character") # obj could be of old class type 'data_object' @@ -402,8 +412,15 @@ DataBook$set("public", "get_combined_metadata", function(convert_to_character = i = 1 for (curr_obj in private$.data_sheets) { templist = curr_obj$get_metadata() - for (j in (1:length(templist))) { - if(length(templist[[j]]) > 1 || is.list(templist[[j]])) templist[[j]] <- paste(as.character(templist[[j]]), collapse = ",") + for (j in seq_along(templist)) { + if (is.list(templist[[j]]) || length(templist[[j]]) > 1) { + if (length(templist[[j]]) > 0) { + templist[[j]] <- + paste(names(templist[[j]]), " = ", templist[[j]], collapse = ", ") + } else { + next + } + } retlist[i, names(templist[j])] = templist[[j]] } if(all(c(data_name_label, label_label, row_count_label, column_count_label, @@ -488,6 +505,57 @@ DataBook$set("public", "get_calculation_names", function(data_name, as_list = FA } ) + +DataBook$set("public", "get_scalars", function(data_name) { + if(is.null(data_name) || identical(data_name, overall_label)) { + out <- private$.scalars[self$get_scalar_names(data_name = data_name)] + }else { + out <- self$get_data_objects(data_name)$get_scalars() + } + return(out) + +} +) + +DataBook$set("public", "get_scalar_names", function(data_name, + as_list = FALSE, + excluded_items = c(),...) { + if (is.null(data_name) || identical(data_name, overall_label)) { + out <- + get_data_book_scalar_names( + scalar_list = private$.scalars, + as_list = as_list, + list_label = overall_label + ) + } else{ + out <- + self$get_data_objects(data_name)$get_scalar_names(as_list = as_list, excluded_items = excluded_items) + } + + return(out) +}) + +DataBook$set("public", "get_scalar_value", function(data_name, scalar_name) { + self$get_data_objects(data_name)$get_scalar_value(scalar_name) +} +) + +DataBook$set("public", "add_scalar", function(data_name, scalar_name = "", scalar_value) { + if (is.null(data_name) || identical(data_name, overall_label)) { + if (missing(scalar_name)) + scalar_name <- next_default_item("scalar", names(private$.scalars)) + if (scalar_name %in% names(private$.scalars)) + warning("A scalar called ", + scalar_name, + " already exists. It will be replaced.") + + #add the scalar + private$.scalars[[scalar_name]] <- scalar_value + } else{ + self$get_data_objects(data_name)$add_scalar(scalar_name, scalar_value) + } +}) + DataBook$set("public", "dataframe_count", function() { return(length(private$.data_sheets)) } @@ -2750,4 +2818,9 @@ DataBook$set("public","wrap_or_unwrap_data", function(data_name, col_name, colum self$add_columns_to_data(data_name=data_name, col_name=col_name, col_data=column_data, before=FALSE) } } -) \ No newline at end of file +) + +DataBook$set("public", "anova_tables2", function(data_name, x_col_names, y_col_name, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { + self$get_data_objects(data_name)$anova_tables2(x_col_names = x_col_names, y_col_name = y_col_name, signif.stars = signif.stars, sign_level = sign_level, means = means) +} +) diff --git a/instat/static/InstatObject/R/labels_and_defaults.R b/instat/static/InstatObject/R/labels_and_defaults.R index 20e73817247..1bdab8a0ba3 100644 --- a/instat/static/InstatObject/R/labels_and_defaults.R +++ b/instat/static/InstatObject/R/labels_and_defaults.R @@ -6,6 +6,7 @@ Renamed_col="Renamed column" Removed_col="Removed column" Added_metadata="Added metadata" Added_object="Added object" +Added_scalar= "Added scalar" Added_variables_metadata="Added variables metadata" Added_filter="Added filter" Added_column_selection="Added column selection" @@ -29,6 +30,7 @@ key_label="key" row_count_label="Rows" column_count_label="Columns" is_linkable="Is_Linkable" +scalar= "scalars" #variables_metadata labels label_label="label" diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index ef38345ed0c..83c7eaa8091 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2869,6 +2869,24 @@ get_data_book_output_object_names <- function(output_object_list, } +get_data_book_scalar_names <- function(scalar_list, + excluded_items = c(), + as_list = FALSE, + list_label = NULL){ + out = names(scalar_list) + if(length(excluded_items) > 0) { + ex_ind = which(out %in% excluded_items) + if(length(ex_ind) != length(excluded_items)) warning("Some of the excluded_items were not found in the list of calculations") + if(length(ex_ind) > 0) out = out[-ex_ind] + } + if(!as_list) { + return(out) + } + lst = list() + lst[[list_label]] <- out + return(lst) +} + get_vignette <- function (package = NULL, lib.loc = NULL, all = TRUE) { oneLink <- function(s) { diff --git a/instat/translations/en/r_instat_not_menus.json b/instat/translations/en/r_instat_not_menus.json index 8431444dda8..aaf184aaa52 100644 --- a/instat/translations/en/r_instat_not_menus.json +++ b/instat/translations/en/r_instat_not_menus.json @@ -3648,22 +3648,22 @@ "Save As": "Save As", "Save As Data Frame": "Save As Data Frame", "Save As Table": "Save As Table", - "Save As:": "Save As:", + "Store As:": "Store As:", "Save Backup Data...": "Save Backup Data...", "Save Backup Internal Log...": "Save Backup Internal Log...", "Save Backup Log...": "Save Backup Log...", "Save Bootstrap": "Save Bootstrap", "Save Calculation Only": "Save Calculation Only", "Save Calculation and Result": "Save Calculation and Result", - "Save Column Position": "Save Column Position", + "Column Position": "Column Position", "Save Current Options...": "Save Current Options...", - "Save Data": "Save Data", + "Store Data": "Store Data", "Save Data As": "Save Data As", "Save Data As...": "Save Data As...", - "Save Data Frame": "Save Data Frame", + "Store Data Frame": "Store Data Frame", "Save Data:": "Save Data:", "Save Dataframe": "Save Dataframe", - "Save Date:": "Save Date:", + "Store Date:": "Store Date:", "Save Details": "Save Details", "Save Downloaded File To:": "Save Downloaded File To:", "Save Downloaded File to:": "Save Downloaded File to:", @@ -3671,7 +3671,7 @@ "Save Estimate": "Save Estimate", "Save File As:": "Save File As:", "Save Fit": "Save Fit", - "Save Graph": "Save Graph", + "Store Graph": "Store Graph", "Save Graph Result:": "Save Graph Result:", "Save Graph:": "Save Graph:", "Save Index into:": "Save Index into:", @@ -3688,15 +3688,15 @@ "Save Output": "Save Output", "Save Output As...": "Save Output As...", "Save Plot": "Save Plot", - "Save Result": "Save Result", + "Store Result": "Store Result", "Save Result ": "Save Result ", - "Save Result:": "Save Result:", + "Store Result:": "Store Result:", "Save Results": "Save Results", "Save Script": "Save Script", "Save Script As...": "Save Script As...", "Save Script...": "Save Script...", - "Save Summary": "Save Summary", - "Save Table": "Save Table", + "Store Summary": "Store Summary", + "Store Table": "Store Table", "Save Test": "Save Test", "Save Test Object:": "Save Test Object:", "Save Treemap": "Save Treemap", @@ -3704,7 +3704,7 @@ "Save estimates in": "Save estimates in", "Save file to log folder and open file in external editor.": "Save file to log folder and open file in external editor.", "Save file(s) to:": "Save file(s) to:", - "Save result for second column:": "Save result for second column:", + "Store result for second column:": "Store result for second column:", "Save test object": "Save test object", "Save the script in the current tab to a file.": "Save the script in the current tab to a file.", "Save values": "Save values", @@ -5943,5 +5943,7 @@ "winner_name": "winner_name", "word": "word", "wrappednormal": "wrappednormal", - "zoo": "zoo" + "zoo": "zoo", + "Store Test to": "Store Test to", + "Store Train to:": "Store Train to:" } \ No newline at end of file diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 8cfa1d7f5a3..2425ae6c2ac 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/ucrAxes.vb b/instat/ucrAxes.vb index 681ec4047d7..8204a942458 100644 --- a/instat/ucrAxes.vb +++ b/instat/ucrAxes.vb @@ -565,13 +565,9 @@ Public Class ucrAxes ucrPnlSecondAxisTitle.SetRCode(clsDummyFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrChkSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrInputSecondaryAxis.SetRCode(clsXYSecondaryAxisFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) + ucrPnlScales.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) End If - 'scales functions - ucrPnlScales.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) - ucrInputLowerLimit.SetRCode(clsLimitsFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) - ucrInputUpperLimit.SetRCode(clsLimitsFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) - ucrInputPosition.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) ucrChkPosition.SetRCode(clsXYScaleContinuousFunction, bReset, bCloneIfNeeded:=bCloneIfNeeded) @@ -782,7 +778,20 @@ Public Class ucrAxes End Sub Private Sub ucrPnlScales_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlScales.ControlValueChanged, ucrInputLowerLimit.ControlValueChanged, ucrInputUpperLimit.ControlValueChanged - If rdoScalesCustom.Checked AndAlso (Not ucrInputLowerLimit.IsEmpty AndAlso Not ucrInputUpperLimit.IsEmpty) Then + If rdoScalesCustom.Checked Then + Dim xValue As String = "NA" + Dim yValue As String = "NA" + + If Not ucrInputLowerLimit.IsEmpty Then + xValue = ucrInputLowerLimit.GetText() + End If + + If Not ucrInputUpperLimit.IsEmpty Then + yValue = ucrInputUpperLimit.GetText() + End If + + clsLimitsFunction.AddParameter("x", xValue, iPosition:=0, bIncludeArgumentName:=False) + clsLimitsFunction.AddParameter("y", yValue, iPosition:=1, bIncludeArgumentName:=False) clsXYScaleContinuousFunction.AddParameter("limits", clsRFunctionParameter:=clsLimitsFunction) Else clsXYScaleContinuousFunction.RemoveParameterByName("limits") diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 71f72738cf1..53d3cf0f929 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() @@ -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() @@ -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,13 +385,15 @@ Partial Class ucrCalculator Me.cmdBeta = New System.Windows.Forms.Button() Me.cmdDigamma = New System.Windows.Forms.Button() Me.grpTransform = New System.Windows.Forms.GroupBox() - Me.cmdDecimals = New System.Windows.Forms.Button() - Me.cmdMASSFractions = New System.Windows.Forms.Button() + Me.cmdRank = New System.Windows.Forms.Button() + Me.cmdRescale = New System.Windows.Forms.Button() Me.cmdScale = New System.Windows.Forms.Button() + Me.cmdTransformRHelp = New instat.ucrSplitButton() Me.ContextMenuStripTransform = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DplyrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MASSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ScalesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZooToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmdRev = New System.Windows.Forms.Button() Me.cmdMovProd = New System.Windows.Forms.Button() @@ -413,13 +421,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 +492,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 +538,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() @@ -610,6 +621,11 @@ Partial Class ucrCalculator 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 +634,37 @@ Partial Class ucrCalculator Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() - Me.cmdSummaryRHelp = New instat.ucrSplitButton() - Me.cmdTransformRHelp = New instat.ucrSplitButton() - Me.cmdLogicalHelp = New instat.ucrSplitButton() - Me.cmdRHelp = New instat.ucrSplitButton() - Me.cmdHydroHelp = New instat.ucrSplitButton() - Me.cmdTransformHelp = New instat.ucrSplitButton() - Me.cmdCircularHelp = New instat.ucrSplitButton() - Me.cmdMathsHelp = New instat.ucrSplitButton() - Me.cmdProbRHelp = New instat.ucrSplitButton() - Me.cmdIntegerRHelp = New instat.ucrSplitButton() - Me.cmdComplexRHelp = New instat.ucrSplitButton() + Me.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.ucrChkStoreScalar = New System.Windows.Forms.CheckBox() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -664,6 +700,8 @@ Partial Class ucrCalculator Me.grpList.SuspendLayout Me.grpMathBloc.SuspendLayout Me.GroupBox1.SuspendLayout + Me.ContextMenuStripFunctions.SuspendLayout + Me.grpFunctions.SuspendLayout Me.SuspendLayout ' 'lblExpression @@ -1239,6 +1277,19 @@ Partial Class ucrCalculator 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(161, 189) + 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) @@ -1665,6 +1716,19 @@ Partial Class ucrCalculator Me.cmdNthPrime.Text = "nth_prime" Me.cmdNthPrime.UseVisualStyleBackColor = True ' + 'cmdIntegerRHelp + ' + Me.cmdIntegerRHelp.AutoSize = True + Me.cmdIntegerRHelp.ContextMenuStrip = Me.ContextMenuStripInteger + Me.cmdIntegerRHelp.Location = New System.Drawing.Point(205, 277) + 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) @@ -1883,6 +1947,19 @@ Partial Class ucrCalculator Me.grpFactor.TabStop = False Me.grpFactor.Text = "Factor" ' + 'cmdTransformHelp + ' + Me.cmdTransformHelp.AutoSize = True + Me.cmdTransformHelp.ContextMenuStrip = Me.ContextMenuStripFactor + Me.cmdTransformHelp.Location = New System.Drawing.Point(150, 171) + 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) @@ -2149,6 +2226,19 @@ Partial Class ucrCalculator Me.grpHydroGOF.TabStop = False Me.grpHydroGOF.Text = "Goodness of Fit" ' + 'cmdHydroHelp + ' + Me.cmdHydroHelp.AutoSize = True + Me.cmdHydroHelp.ContextMenuStrip = Me.ContextMenuStripHydroGOF + Me.cmdHydroHelp.Location = New System.Drawing.Point(94, 233) + 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) @@ -3154,6 +3244,19 @@ Partial Class ucrCalculator Me.grpMaths.TabStop = False Me.grpMaths.Text = "Maths" ' + 'cmdMathsHelp + ' + Me.cmdMathsHelp.AutoSize = True + Me.cmdMathsHelp.ContextMenuStrip = Me.ContextMenuStripMaths + Me.cmdMathsHelp.Location = New System.Drawing.Point(163, 130) + 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) @@ -3472,7 +3575,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) @@ -3480,6 +3582,7 @@ Partial Class ucrCalculator Me.grpSummary.Controls.Add(Me.cmdSum) Me.grpSummary.Controls.Add(Me.cmdVar) Me.grpSummary.Controls.Add(Me.grpFrequencies) + Me.grpSummary.Controls.Add(Me.cmdMin) Me.grpSummary.Location = New System.Drawing.Point(434, 62) Me.grpSummary.Margin = New System.Windows.Forms.Padding(2) Me.grpSummary.Name = "grpSummary" @@ -3496,7 +3599,7 @@ Partial Class ucrCalculator 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(70, 30) + Me.cmdwheremin.Size = New System.Drawing.Size(69, 30) Me.cmdwheremin.TabIndex = 193 Me.cmdwheremin.Text = "where.min" Me.cmdwheremin.UseVisualStyleBackColor = True @@ -3535,6 +3638,19 @@ Partial Class ucrCalculator 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, 188) + 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) @@ -3820,17 +3936,6 @@ Partial Class ucrCalculator Me.cmdMedian.Text = "median" Me.cmdMedian.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 - ' 'cmdMax ' Me.cmdMax.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -4105,9 +4210,19 @@ Partial Class ucrCalculator 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) @@ -4144,22 +4259,23 @@ Partial Class ucrCalculator Me.grpProbabilty.Margin = New System.Windows.Forms.Padding(2) Me.grpProbabilty.Name = "grpProbabilty" Me.grpProbabilty.Padding = New System.Windows.Forms.Padding(2) - Me.grpProbabilty.Size = New System.Drawing.Size(316, 322) + Me.grpProbabilty.Size = New System.Drawing.Size(316, 314) 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, 188) - 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 = 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(222, 188) + 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 ' @@ -4192,7 +4308,7 @@ Partial Class ucrCalculator Me.grpRandom.Controls.Add(Me.cmduni_integer) Me.grpRandom.Controls.Add(Me.cmdRan_normal) Me.grpRandom.Controls.Add(Me.cmduniform) - Me.grpRandom.Location = New System.Drawing.Point(6, 228) + Me.grpRandom.Location = New System.Drawing.Point(6, 223) Me.grpRandom.Margin = New System.Windows.Forms.Padding(2) Me.grpRandom.Name = "grpRandom" Me.grpRandom.Padding = New System.Windows.Forms.Padding(2) @@ -4684,8 +4800,8 @@ Partial Class ucrCalculator ' 'grpTransform ' - Me.grpTransform.Controls.Add(Me.cmdDecimals) - Me.grpTransform.Controls.Add(Me.cmdMASSFractions) + Me.grpTransform.Controls.Add(Me.cmdRank) + Me.grpTransform.Controls.Add(Me.cmdRescale) Me.grpTransform.Controls.Add(Me.cmdScale) Me.grpTransform.Controls.Add(Me.cmdTransformRHelp) Me.grpTransform.Controls.Add(Me.cmdRev) @@ -4714,43 +4830,43 @@ 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.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.Padding = New System.Windows.Forms.Padding(2) - Me.grpTransform.Size = New System.Drawing.Size(310, 250) + Me.grpTransform.Size = New System.Drawing.Size(310, 225) Me.grpTransform.TabIndex = 189 Me.grpTransform.TabStop = False Me.grpTransform.Text = "Transform" ' - 'cmdDecimals + 'cmdRank ' - Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDecimals.Location = New System.Drawing.Point(2, 188) - Me.cmdDecimals.Margin = New System.Windows.Forms.Padding(2) - Me.cmdDecimals.Name = "cmdDecimals" - Me.cmdDecimals.Size = New System.Drawing.Size(62, 30) - Me.cmdDecimals.TabIndex = 207 - Me.cmdDecimals.Text = "decimals" - Me.cmdDecimals.UseVisualStyleBackColor = True + Me.cmdRank.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdRank.Location = New System.Drawing.Point(2, 130) + Me.cmdRank.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRank.Name = "cmdRank" + Me.cmdRank.Size = New System.Drawing.Size(62, 30) + Me.cmdRank.TabIndex = 207 + Me.cmdRank.Text = "rank" + Me.cmdRank.UseVisualStyleBackColor = True ' - 'cmdMASSFractions + 'cmdRescale ' - Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 159) - Me.cmdMASSFractions.Margin = New System.Windows.Forms.Padding(2) - Me.cmdMASSFractions.Name = "cmdMASSFractions" - Me.cmdMASSFractions.Size = New System.Drawing.Size(62, 30) - Me.cmdMASSFractions.TabIndex = 206 - Me.cmdMASSFractions.Text = "fractions" - Me.cmdMASSFractions.UseVisualStyleBackColor = True + Me.cmdRescale.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdRescale.Location = New System.Drawing.Point(2, 188) + Me.cmdRescale.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRescale.Name = "cmdRescale" + Me.cmdRescale.Size = New System.Drawing.Size(62, 30) + Me.cmdRescale.TabIndex = 206 + Me.cmdRescale.Text = "rescale" + Me.cmdRescale.UseVisualStyleBackColor = True ' 'cmdScale ' Me.cmdScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdScale.Location = New System.Drawing.Point(2, 130) + Me.cmdScale.Location = New System.Drawing.Point(2, 159) Me.cmdScale.Margin = New System.Windows.Forms.Padding(2) Me.cmdScale.Name = "cmdScale" Me.cmdScale.Size = New System.Drawing.Size(62, 30) @@ -4758,12 +4874,25 @@ Partial Class ucrCalculator Me.cmdScale.Text = "scale" Me.cmdScale.UseVisualStyleBackColor = True ' + 'cmdTransformRHelp + ' + Me.cmdTransformRHelp.AutoSize = True + Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform + Me.cmdTransformRHelp.Location = New System.Drawing.Point(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.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem, Me.DplyrToolStripMenuItem, Me.MASSToolStripMenuItem, Me.ScalesToolStripMenuItem, Me.ZooToolStripMenuItem}) Me.ContextMenuStripTransform.Name = "ContextMenuStrip1" - Me.ContextMenuStripTransform.Size = New System.Drawing.Size(106, 92) + Me.ContextMenuStripTransform.Size = New System.Drawing.Size(106, 114) ' 'BaseToolStripMenuItem ' @@ -4783,6 +4912,12 @@ Partial Class ucrCalculator Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.MASSToolStripMenuItem.Text = "MASS" ' + 'ScalesToolStripMenuItem + ' + Me.ScalesToolStripMenuItem.Name = "ScalesToolStripMenuItem" + Me.ScalesToolStripMenuItem.Size = New System.Drawing.Size(105, 22) + Me.ScalesToolStripMenuItem.Text = "scales" + ' 'ZooToolStripMenuItem ' Me.ZooToolStripMenuItem.Name = "ZooToolStripMenuItem" @@ -4797,7 +4932,7 @@ Partial Class ucrCalculator Me.cmdRev.Name = "cmdRev" Me.cmdRev.Size = New System.Drawing.Size(62, 30) Me.cmdRev.TabIndex = 203 - Me.cmdRev.Text = "rev" + Me.cmdRev.Text = "reverse" Me.cmdRev.UseVisualStyleBackColor = True ' 'cmdMovProd @@ -4968,7 +5103,7 @@ Partial Class ucrCalculator 'cmdMRank ' Me.cmdMRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMRank.Location = New System.Drawing.Point(246, 130) + Me.cmdMRank.Location = New System.Drawing.Point(124, 130) Me.cmdMRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdMRank.Name = "cmdMRank" Me.cmdMRank.Size = New System.Drawing.Size(62, 30) @@ -5013,7 +5148,7 @@ Partial Class ucrCalculator ' Me.cmdPercentRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPercentRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPercentRank.Location = New System.Drawing.Point(124, 130) + Me.cmdPercentRank.Location = New System.Drawing.Point(246, 130) Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(2) Me.cmdPercentRank.Name = "cmdPercentRank" Me.cmdPercentRank.Size = New System.Drawing.Size(62, 30) @@ -5076,17 +5211,6 @@ Partial Class ucrCalculator Me.cmdPMax.Text = "pmax" Me.cmdPMax.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 - ' 'cmdLag ' Me.cmdLag.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -5098,6 +5222,17 @@ Partial Class ucrCalculator 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) @@ -5191,6 +5326,19 @@ Partial Class ucrCalculator 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(167, 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) @@ -5216,7 +5364,7 @@ Partial Class ucrCalculator 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(52, 30) + Me.cmdFalse.Size = New System.Drawing.Size(54, 30) Me.cmdFalse.TabIndex = 207 Me.cmdFalse.Text = "FALSE" Me.cmdFalse.UseVisualStyleBackColor = True @@ -5227,7 +5375,7 @@ Partial Class ucrCalculator 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(52, 30) + Me.cmdTrue.Size = New System.Drawing.Size(54, 30) Me.cmdTrue.TabIndex = 206 Me.cmdTrue.Text = "TRUE" Me.cmdTrue.UseVisualStyleBackColor = True @@ -5404,7 +5552,7 @@ Partial Class ucrCalculator 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(52, 30) + Me.cmdClossingBracket.Size = New System.Drawing.Size(54, 30) Me.cmdClossingBracket.TabIndex = 137 Me.cmdClossingBracket.Tag = "" Me.cmdClossingBracket.Text = ")" @@ -5592,7 +5740,7 @@ Partial Class ucrCalculator 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(52, 30) + Me.cmdReverseStr.Size = New System.Drawing.Size(54, 30) Me.cmdReverseStr.TabIndex = 165 Me.cmdReverseStr.Tag = "" Me.cmdReverseStr.Text = "reverse" @@ -5730,7 +5878,7 @@ Partial Class ucrCalculator 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(60, 30) + Me.cmdExtract2.Size = New System.Drawing.Size(61, 30) Me.cmdExtract2.TabIndex = 154 Me.cmdExtract2.Tag = "" Me.cmdExtract2.Text = "extract2" @@ -5743,7 +5891,7 @@ Partial Class ucrCalculator 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(60, 30) + Me.cmdEncodeb.Size = New System.Drawing.Size(61, 30) Me.cmdEncodeb.TabIndex = 151 Me.cmdEncodeb.Text = "encode " Me.cmdEncodeb.UseVisualStyleBackColor = True @@ -5913,7 +6061,7 @@ Partial Class ucrCalculator 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(60, 30) + Me.cmdSquishb.Size = New System.Drawing.Size(61, 30) Me.cmdSquishb.TabIndex = 150 Me.cmdSquishb.Text = "squish " Me.cmdSquishb.UseVisualStyleBackColor = True @@ -5952,6 +6100,19 @@ Partial Class ucrCalculator Me.grpCircular.TabStop = False Me.grpCircular.Text = "Circular" ' + 'cmdCircularHelp + ' + Me.cmdCircularHelp.AutoSize = True + Me.cmdCircularHelp.ContextMenuStrip = Me.ContextMenuStripCircular + Me.cmdCircularHelp.Location = New System.Drawing.Point(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) @@ -6488,6 +6649,19 @@ Partial Class ucrCalculator 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(196, 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!) @@ -6519,7 +6693,7 @@ Partial Class ucrCalculator 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(62, 30) + Me.cmdComplexPi.Size = New System.Drawing.Size(63, 30) Me.cmdComplexPi.TabIndex = 206 Me.cmdComplexPi.Text = "pi" Me.cmdComplexPi.UseVisualStyleBackColor = True @@ -7471,6 +7645,37 @@ Partial Class ucrCalculator 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 @@ -7513,7 +7718,7 @@ Partial Class ucrCalculator 'ucrSaveResultInto ' Me.ucrSaveResultInto.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveResultInto.Location = New System.Drawing.Point(10, 303) + Me.ucrSaveResultInto.Location = New System.Drawing.Point(10, 296) Me.ucrSaveResultInto.Margin = New System.Windows.Forms.Padding(4, 6, 4, 6) Me.ucrSaveResultInto.Name = "ucrSaveResultInto" Me.ucrSaveResultInto.Size = New System.Drawing.Size(326, 22) @@ -7566,155 +7771,404 @@ Partial Class ucrCalculator Me.ucrReceiverForCalculation.TabIndex = 120 Me.ucrReceiverForCalculation.ucrSelector = Nothing ' - 'cmdSummaryRHelp - ' - Me.cmdSummaryRHelp.AutoSize = True - Me.cmdSummaryRHelp.ContextMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.Location = New System.Drawing.Point(194, 189) - Me.cmdSummaryRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdSummaryRHelp.Name = "cmdSummaryRHelp" - Me.cmdSummaryRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdSummaryRHelp.SplitMenuStrip = Me.ContextMenuStripSummary - Me.cmdSummaryRHelp.TabIndex = 185 - Me.cmdSummaryRHelp.Text = "R Help" - Me.cmdSummaryRHelp.UseVisualStyleBackColor = True - ' - 'cmdTransformRHelp - ' - Me.cmdTransformRHelp.AutoSize = True - Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(218, 189) - Me.cmdTransformRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdTransformRHelp.Name = "cmdTransformRHelp" - Me.cmdTransformRHelp.Size = New System.Drawing.Size(90, 30) - Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.TabIndex = 204 - Me.cmdTransformRHelp.Text = "R Help" - Me.cmdTransformRHelp.UseVisualStyleBackColor = True - ' - 'cmdLogicalHelp - ' - Me.cmdLogicalHelp.AutoSize = True - Me.cmdLogicalHelp.ContextMenuStrip = Me.ContextMenuStripLogical - Me.cmdLogicalHelp.Location = New System.Drawing.Point(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 - ' - '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 - ' - '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 - ' - '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 - ' - '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 - ' - 'cmdMathsHelp + '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, 254) + 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(165, 217) + Me.cmdRhelpFunctions.Margin = New System.Windows.Forms.Padding(2) + Me.cmdRhelpFunctions.Name = "cmdRhelpFunctions" + Me.cmdRhelpFunctions.Size = New System.Drawing.Size(86, 30) + Me.cmdRhelpFunctions.SplitMenuStrip = Me.ContextMenuStripFunctions + Me.cmdRhelpFunctions.TabIndex = 221 + Me.cmdRhelpFunctions.Text = "R Help" + Me.cmdRhelpFunctions.UseVisualStyleBackColor = True ' - 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 + 'cmdDecimals ' - 'cmdProbRHelp + 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.cmdProbRHelp.AutoSize = True - Me.cmdProbRHelp.ContextMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.Location = New System.Drawing.Point(215, 191) - Me.cmdProbRHelp.Margin = New System.Windows.Forms.Padding(2) - Me.cmdProbRHelp.Name = "cmdProbRHelp" - Me.cmdProbRHelp.Size = New System.Drawing.Size(86, 30) - Me.cmdProbRHelp.SplitMenuStrip = Me.ContextMenuStripProbability - Me.cmdProbRHelp.TabIndex = 212 - Me.cmdProbRHelp.Text = "R Help" - Me.cmdProbRHelp.UseVisualStyleBackColor = True + 'cmdMASSFractions ' - 'cmdIntegerRHelp + 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.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 + 'cmdPascal ' - 'cmdComplexRHelp + 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.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 + '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 + ' + 'ucrChkStoreScalar + ' + Me.ucrChkStoreScalar.AutoSize = True + Me.ucrChkStoreScalar.Location = New System.Drawing.Point(10, 325) + Me.ucrChkStoreScalar.Margin = New System.Windows.Forms.Padding(2) + Me.ucrChkStoreScalar.Name = "ucrChkStoreScalar" + Me.ucrChkStoreScalar.Size = New System.Drawing.Size(81, 17) + Me.ucrChkStoreScalar.TabIndex = 217 + Me.ucrChkStoreScalar.Text = "CheckBox1" + Me.ucrChkStoreScalar.UseVisualStyleBackColor = True ' 'ucrCalculator ' 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.ucrChkStoreScalar) Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) @@ -7726,21 +8180,23 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) - Me.Controls.Add(Me.grpSummary) - Me.Controls.Add(Me.grpTransform) - Me.Controls.Add(Me.grpWakefield) + Me.Controls.Add(Me.grpList) + 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.grpCircular) - Me.Controls.Add(Me.grpMaths) Me.Controls.Add(Me.grpProbabilty) + Me.Controls.Add(Me.grpMaths) Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.grpTestString) Me.Controls.Add(Me.grpComplex) + Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpSymbols) + Me.Controls.Add(Me.grpTransform) Me.Controls.Add(Me.grpModifier) + Me.Controls.Add(Me.grpWakefield) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(898, 458) @@ -7790,6 +8246,9 @@ Partial Class ucrCalculator Me.grpList.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 @@ -8286,17 +8745,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 @@ -8392,4 +8846,43 @@ 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 + Friend WithEvents cmdRank As Button + Friend WithEvents cmdRescale As Button + Friend WithEvents ScalesToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ucrChkStoreScalar As CheckBox End Class diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index fab1bf083ba..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 + - 65 + 95 \ No newline at end of file diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 776aa1b3597..889c1529593 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -23,6 +23,8 @@ Public Class ucrCalculator Public Event DataFrameChanged() Public Event TryCommadClick() Public Event ControlValueChanged() + Public Event ClearClick() + Public Event CheckBoxClick() Public bFirstLoad As Boolean = True Public bControlsInitialised As Boolean = False Public clsHelp As New RFunction @@ -61,10 +63,12 @@ Public Class ucrCalculator End Sub Public Sub InitialiseControls() - ucrInputCalOptions.SetItems({"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer"}) ' "Rows" is a temp. name + ucrInputCalOptions.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 + ucrChkStoreScalar.Text = "Store Scalar" + clsHelp.SetPackageName("utils") clsHelp.SetRCommand("help") @@ -73,10 +77,9 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdRound, "round(x) to round to whole numbers, round(x,2) to round to 2 decimal places, round(x,-2) to round to the nearest 100") ttCalculator.SetToolTip(cmdSiginf, "signif(x,3) to round to 3 significant figures") - ttCalculator.SetToolTip(cmdSortF, "sorts a vector into ascending or descending order. For example sort(c(5,7,4,4,3)) = (3,4,4,5,7)") - ttCalculator.SetToolTip(cmdScale, "centre and scale the data - usually by producing (x - xbar)/s") - ttCalculator.SetToolTip(cmdMASSFractions, "changes decimal data into a character variable with fractions. So 1.5 becomes 3/2, 0.25 becomes 1/4 etc.") - ttCalculator.SetToolTip(cmdDecimals, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") + 'Transform keyboard tooltips + ttCalculator.SetToolTip(cmdSortF, """Use only With extreme care"" sorts a vector into ascending Or descending order. For example sort(c(5, 7, 4, 4, 3)) = (3, 4, 4, 5, 7)") + ttCalculator.SetToolTip(cmdScale, "centre And scale the data - usually by producing (x - xbar)/s") ttCalculator.SetToolTip(cmdLag, "shift a variable down. For example lag(1:5) = (NA,1,2,3,4); lag(1:5,3) = (NA,NA,NA, 1,2)") ttCalculator.SetToolTip(cmdLead, "shift a variable up. For example lead(1:5) = (2,3,4,5,NA); lead(1:5;3) = (4,5, NA,NA,NA)") ttCalculator.SetToolTip(cmdDiff, "difference between successive elements. For example diff(c(1,4,3,7)) = (NA 3,-1,4)") @@ -97,6 +100,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdNtile, " use ranks to divide into (almost) equal sized groups. For example ntile(c(15,11,13,12,NA,12),2) = (2,1,2,1,NA,1)") ttCalculator.SetToolTip(cmdCumdist, "proportion of values less than or equal to the current rank. For example cume_dist(c(2,4,6,8,3)) = (0.2, 0.6, 0.8, 1.0, 0.4)") ttCalculator.SetToolTip(cmdRowRank, "row numbers as ranks. For example :row_number(c(15,11,13,12,NA,12)) = (5,1,3,2,NA,3)") + ttCalculator.SetToolTip(cmdRank, "ranks. For example rank(15,11,13,12, NA, 12) = (5, 1, 4, 2.5, 6, 2.5)") ttCalculator.SetToolTip(cmdPercentRank, "rescale of minimum ranks to [0,1]. For example percent_rank(c(15,11,13,12,NA,12)) = (1,0,0.75,0.25,NA,0.25)") ttCalculator.SetToolTip(cmdDRank, "dense ranks. For example d_rank(c(15,11,13,12,NA,12)) = (4,1,3,2,NA,2)") ttCalculator.SetToolTip(cmdMRank, " minimum ranks. For example m_rank(c(15,11,13,12,NA,12)) = (5,1,4,2,NA,2)") @@ -104,7 +108,9 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdNaapprox, "linear interpolation of missing values. For example na.approx(c(5,NA,NA,2,2,NA,4,7,NA),maxgap=1,na.rm=FALSE) = (5,NA,NA,2,2,3,4,7,NA)") ttCalculator.SetToolTip(cmdNasplin, "Spline interpolation of missing values. For example na.spline(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,2.5,4,7,12)") ttCalculator.SetToolTip(cmdNaest, "Missing values as the mean (usually) overall or with a factor. For example na.aggregate(c(NA,NA,NA,2,2,NA,4,7,NA),maxgap=2,na.rm=FALSE) = (NA,NA,NA,2,2,3.75,4,7,3.75)") + ttCalculator.SetToolTip(cmdRescale, "Transforms to (0, 1) scale, using (x - min)/(max - min)") + 'Logical and Symbols toooltips ttCalculator.SetToolTip(cmdPower, "power(^)or exponent and can also be given as **. For example 2^3 = 8") ttCalculator.SetToolTip(cmdLesser, "less than(<). For example (2 < 3) is TRUE. (2 < 2) is FALSE, (2 < 1) is FALSE") ttCalculator.SetToolTip(cmdLesserOrEqualsTo, "less than or equals(<=). For example (2 <= 3) is TRUE, (2 <=2) is TRUE, (2 <= 1) is FALSE") @@ -139,6 +145,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdPt, " t probabilities. For example pt(-2,5) = 0.051; pt(-2,1000) = 0.0229 ~ pnorm(-2)") ttCalculator.SetToolTip(cmdPChisq, "chi square probabilities. For example pchisq(5,1) = 0.9747; pchisq(5,10) = 0.1088") + 'Probabilityv keyboard tooltips ttCalculator.SetToolTip(cmdPf, "F probabilities. For example pf(2,1,10) = 0.8123; pf(2,50,50) = 0.9921") ttCalculator.SetToolTip(cmdQnorm, "qnormal quantiles. For example qnorm(0.05) = -1.6449; qnorm(0.9772, 100,15) = 130") ttCalculator.SetToolTip(cmdPbirth, "simultaneous birthday probabilities. For example pbirthday(10) = 0.1169 ; pbirthday(50) = 0.97") @@ -238,6 +245,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdEscape, "Escape (with +*.? etc). For example, str_detect(c(""b$t"",""bat?"",""3*4""),""[\\?\\$\\*]"") gives TRUE TRUE TRUE") ttCalculator.SetToolTip(cmdPlusZero, "range of values. For example, str_count(c(""b$t"",""Bat?""),""[a-zA-Z]"") gives 2 3") + 'Interger keyboard tooltips ttCalculator.SetToolTip(cmdBigZ, "encodes arbitrarily large integers") ttCalculator.SetToolTip(cmdBigQ, "encodes rationals encoded as ratios or arbitrarily large integers") ttCalculator.SetToolTip(cmdFactorial, "factorial n!, as big integer. For example, factorialZ(6)= 720") @@ -309,7 +317,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") @@ -455,6 +463,37 @@ 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)") + ttCalculator.SetToolTip(cmdMASSFractions, "changes decimal data into a character variable with fractions. So 1.5 becomes 3/2, 0.25 becomes 1/4 etc.") + ttCalculator.SetToolTip(cmdDecimals, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") + '--------------------------------------------------------------------------------------------------------------------- + Const strTooltipCmdLength = "number Of observations: For example length(c(1,2,3,4,NA)) = 5 " ttCalculator.SetToolTip(cmdLength, strTooltipCmdLength) ttCalculator.SetToolTip(cmdListLength, strTooltipCmdLength) @@ -676,6 +715,11 @@ Public Class ucrCalculator Private Sub cmdClear_Click(sender As Object, e As EventArgs) Handles cmdClear.Click ucrReceiverForCalculation.Clear() + RaiseEvent ClearClick() + End Sub + + Private Sub ucrChkStoreScalar_Click(sender As Object, e As EventArgs) Handles ucrChkStoreScalar.Click + RaiseEvent CheckBoxClick() End Sub Private Sub cmdLesser_Click(sender As Object, e As EventArgs) Handles cmdLesser.Click @@ -704,8 +748,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.4, iBaseHeight) Case "Maths" strPackageName = "stats" + grpFunctions.Visible = False grpSummary.Visible = False grpMaths.Visible = True grpLogical.Visible = False @@ -726,9 +796,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 @@ -750,8 +822,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 @@ -773,8 +847,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 @@ -795,9 +871,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 @@ -819,8 +897,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 @@ -841,9 +921,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 @@ -864,9 +946,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 @@ -887,9 +971,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 @@ -910,9 +996,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 @@ -933,9 +1021,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 "Goodness of Fit" strPackageName = "hydroGOF" + grpFunctions.Visible = False grpDates.Visible = False grpProbabilty.Visible = False grpSummary.Visible = False @@ -956,9 +1046,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 @@ -979,9 +1071,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 @@ -1002,9 +1096,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 @@ -1025,8 +1121,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 @@ -1048,8 +1146,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 @@ -1072,33 +1172,33 @@ Public Class ucrCalculator Private Sub cmdRound_Click(sender As Object, e As EventArgs) Handles cmdRound.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round(x= , digits=0)", 11) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round(x= , digits=0)", 12) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round( )", 2) End If End Sub Private Sub cmdFloor_Click(sender As Object, e As EventArgs) Handles cmdFloor.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("floor(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("floor(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("floor()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("floor( )", 2) End If End Sub Private Sub cmdTrunc_Click(sender As Object, e As EventArgs) Handles cmdTrunc.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trunc(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trunc(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trunc()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trunc( )", 2) End If End Sub Private Sub cmdSign_Click(sender As Object, e As EventArgs) Handles cmdSign.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sign(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sign(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sign()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sign( )", 2) End If End Sub @@ -1106,7 +1206,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos( )", 2) End If End Sub @@ -1114,7 +1214,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin( )", 2) End If End Sub @@ -1122,79 +1222,79 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan( )", 2) End If End Sub Private Sub cmdSiginf_Click(sender As Object, e As EventArgs) Handles cmdSiginf.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif(x= , digits=6)", 11) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif(x= , digits=6)", 12) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif()", 2) End If End Sub Private Sub cmdCos_Click(sender As Object, e As EventArgs) Handles cmdCos.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos( )", 2) End If End Sub Private Sub cmdSin_Click(sender As Object, e As EventArgs) Handles cmdSin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin( )", 2) End If End Sub Private Sub cmdTan_Click(sender As Object, e As EventArgs) Handles cmdTan.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan( )", 2) End If End Sub Private Sub cmdAbs_Click(sender As Object, e As EventArgs) Handles cmdAbs.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("abs(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("abs(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("abs()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("abs( )", 2) End If End Sub Private Sub cmdExp_Click_1(sender As Object, e As EventArgs) Handles cmdExp.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp( )", 2) End If End Sub Private Sub cmdLogTen_Click(sender As Object, e As EventArgs) Handles cmdLogTen.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log10(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log10(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log10()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log10( )", 2) End If End Sub Private Sub cmdLog_Click(sender As Object, e As EventArgs) Handles cmdLog.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log(x= , base=exp(1))", 14) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log(x= , base=exp(1))", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log( )", 2) End If End Sub Private Sub cmdSqrt_Click_1(sender As Object, e As EventArgs) Handles cmdSqrt.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt( )", 2) End If End Sub @@ -1236,17 +1336,17 @@ Public Class ucrCalculator Private Sub cmdLength_Click(sender As Object, e As EventArgs) Handles cmdLength.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("length(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("length(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("length()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("length( )", 2) End If End Sub Private Sub cmdMiss_Click(sender As Object, e As EventArgs) Handles cmdMiss.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(is.na(x= ))", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(is.na(x= ))", 3) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(is.na())", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(is.na( ))", 3) End If End Sub @@ -1346,7 +1446,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_upper(string = , locale=' ')", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_upper()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_upper()", 2) End If End Sub @@ -1354,7 +1454,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_lower(string= , locale=' ')", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_lower()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_lower( )", 2) End If End Sub @@ -1362,7 +1462,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_title(string= , locale=' ')", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_title()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_to_title( )", 2) End If End Sub @@ -1370,7 +1470,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trim(string= , side = c('both', 'left', 'right))", 35) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trim()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trim( )", 2) End If End Sub @@ -1378,7 +1478,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_pad(string = , width = , side = c('left', 'right', 'both') , pad = )", 56) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_pad()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_pad( )", 2) End If End Sub @@ -1386,7 +1486,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_order(x = , decreasing = FALSE , na_last = TRUE)", 40) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_order()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_order( )", 2) End If End Sub @@ -1394,7 +1494,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sort(x= , decreasing = FALSE , na_last = TRUE , locale = ' ')", 53) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sort()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sort( )", 2) End If End Sub @@ -1402,7 +1502,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace(string = , pattern = argument , replacement = ' ' )", 43) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace( )", 2) End If End Sub @@ -1410,7 +1510,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate(string = , pattern = argument)", 22) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate( )", 2) End If End Sub @@ -1418,7 +1518,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract(string = , pattern = argument )", 23) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract( )", 2) End If End Sub @@ -1426,7 +1526,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_count(string = , pattern = argument )", 23) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_count()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_count( )", 2) End If End Sub @@ -1435,7 +1535,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_detect(string = , pattern = , negate = FALSE)", 31) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_detect()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_detect( )", 2) End If End Sub @@ -1443,7 +1543,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm(p= , mean = 0, sd = 1, lower.tail = TRUE, log.p = FALSE)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnorm( )", 2) End If End Sub @@ -1451,7 +1551,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(p= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qt(, )", 3) End If End Sub @@ -1459,7 +1559,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(p= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qchisq(, )", 3) End If End Sub @@ -1467,7 +1567,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(p= , df1= , df2= ,lower.tail = TRUE)", 34) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qf(, , )", 5) End If End Sub @@ -1475,7 +1575,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm(q= , mean = 0, sd = 1, lower.tail = True, Log.p = False)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnorm( )", 2) End If End Sub @@ -1483,7 +1583,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(q= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pt(, )", 3) End If End Sub @@ -1491,7 +1591,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(q= , df= , lower.tail = TRUE)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pchisq(, )", 3) End If End Sub @@ -1499,7 +1599,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(q= , df1= ,df2=, lower.tail = TRUE)", 33) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pf(, , )", 5) End If End Sub @@ -1507,7 +1607,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(n= , k= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("choose(, )", 3) End If End Sub @@ -1515,7 +1615,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("factorial( )", 2) End If End Sub @@ -1523,7 +1623,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(a= , b= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("beta(, )", 3) End If End Sub @@ -1531,7 +1631,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(n= , k= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lchoose(, )", 3) End If End Sub @@ -1539,7 +1639,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lfactorial( )", 2) End If End Sub @@ -1547,7 +1647,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(a= , b= )", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lbeta(, )", 3) End If End Sub @@ -1555,7 +1655,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gamma( )", 2) End If End Sub @@ -1563,7 +1663,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lgamma( )", 2) End If End Sub @@ -1571,7 +1671,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("digamma( )", 2) End If End Sub @@ -1579,7 +1679,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("trigamma( )", 2) End If End Sub @@ -1592,7 +1692,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_c(string= , pattern=' ')", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_c()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_c( )", 2) End If End Sub @@ -1600,7 +1700,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sub(string="""", start = 1L, end = -1L)", 25) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sub()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_sub( )", 2) End If End Sub @@ -1608,7 +1708,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::year(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::year()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::year( )", 2) End If End Sub @@ -1616,7 +1716,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::month(x= , label=FALSE, abbr=TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::month()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::month( )", 2) End If End Sub @@ -1624,7 +1724,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::day(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::day()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::day( )", 2) End If End Sub @@ -1632,7 +1732,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::wday(x= , label=FALSE, abbr=TRUE)", 26) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::wday()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::wday( )", 2) End If End Sub @@ -1640,7 +1740,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::yday(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::yday()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::yday( )", 2) End If End Sub @@ -1648,7 +1748,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::date(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::date()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::date( )", 2) End If End Sub @@ -1656,31 +1756,31 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_date(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_date()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_date( )", 2) End If End Sub Private Sub cmdYmdHms_Click(sender As Object, e As EventArgs) Handles cmdYmdHms.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hms(x= ) ", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hms(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hms() ", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hms( )", 2) End If End Sub Private Sub cmdYmdHm_Click(sender As Object, e As EventArgs) Handles cmdYmdHm.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hm(x= ) ", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hm(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hm() ", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_hm( )", 2) End If End Sub Private Sub cmdYmdH_Click(sender As Object, e As EventArgs) Handles cmdYmdH.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_h(x= ) ", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_h(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_h()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd_h( )", 2) End If End Sub @@ -1688,7 +1788,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::leap_year(date= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::leap_year()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::leap_year( )", 2) End If End Sub @@ -1696,7 +1796,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::ymd( )", 2) End If End Sub @@ -1704,7 +1804,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::mdy(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::mdy()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::mdy( )", 2) End If End Sub @@ -1712,7 +1812,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::dmy(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::dmy()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::dmy( )", 2) End If End Sub @@ -1720,7 +1820,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::hour(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::hour()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::hour( )", 2) End If End Sub @@ -1728,7 +1828,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::minute(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::minute()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::minute( )", 2) End If End Sub @@ -1736,7 +1836,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::second(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::second()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::second( )", 2) End If End Sub @@ -1744,7 +1844,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::am(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::am()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::am( )", 2) End If End Sub @@ -1752,15 +1852,15 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::pm(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::pm()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::pm( )", 2) End If End Sub Private Sub cmdD_In_M_Click(sender As Object, e As EventArgs) Handles cmdD_In_M.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::days_in_month(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::days_in_month(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::days_in_month()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::days_in_month( )", 2) End If End Sub @@ -1768,12 +1868,12 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::quarter(x= , with_year = FALSE, fiscal_start = 1 )", 40) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::quarter()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::quarter( )", 2) End If End Sub Private Sub cmdBrackets_Click(sender As Object, e As EventArgs) Handles cmdBrackets.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("( )", 2) End Sub Private Sub cmdOpeningBracket_Click(sender As Object, e As EventArgs) Handles cmdOpeningBracket.Click @@ -1798,65 +1898,65 @@ Public Class ucrCalculator Private Sub cmdLag_Click(sender As Object, e As EventArgs) Handles cmdLag.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lag(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lag(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lag()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lag( )", 2) End If End Sub Private Sub cmdLead_Click(sender As Object, e As EventArgs) Handles cmdLead.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lead(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lead(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lead()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::lead( )", 2) End If End Sub Private Sub cmdpmax_Click(sender As Object, e As EventArgs) Handles cmdPMax.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmax(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmax(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmax()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmax( )", 2) End If End Sub Private Sub cmdPMin_Click(sender As Object, e As EventArgs) Handles cmdPMin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmin(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmin(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pmin( )", 2) End If End Sub Private Sub cmdcummax_Click(sender As Object, e As EventArgs) Handles cmdCumMax.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummax(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummax(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummax()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummax( )", 2) End If End Sub Private Sub cmdcummin_Click(sender As Object, e As EventArgs) Handles cmdCumMin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummin(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummin(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cummin( )", 2) End If End Sub Private Sub cmdcumsum_Click(sender As Object, e As EventArgs) Handles cmdCumSum.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumsum(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumsum(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumsum()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumsum( )", 2) End If End Sub Private Sub cmdpercentrank_Click(sender As Object, e As EventArgs) Handles cmdPercentRank.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::percent_rank(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::percent_rank(x= )*100", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::percent_rank()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::percent_rank( )*100", 6) End If End Sub @@ -1864,7 +1964,6 @@ Public Class ucrCalculator RaiseEvent SelectionChanged() End Sub - Private Sub OpenHelpPage() If strPackageName <> "" Then frmMaximiseOutput.Show(strFileName:=clsFileUrlUtilities.GetHelpFileURL(strPackageName:=strPackageName), bReplace:=False) @@ -1889,14 +1988,14 @@ Public Class ucrCalculator End Sub Private Sub cmdEcdf_Click(sender As Object, e As EventArgs) Handles cmdCumdist.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::cume_dist()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::cume_dist( )*100", 6) End Sub Private Sub cmdNtile_Click(sender As Object, e As EventArgs) Handles cmdNtile.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::ntile(x= , n=2)", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::ntile(x= ,n=2)", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::ntile()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::ntile( )", 2) End If End Sub @@ -1925,7 +2024,7 @@ Public Class ucrCalculator End Sub Private Sub cmdMRank_Click(sender As Object, e As EventArgs) Handles cmdMRank.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::min_rank()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::min_rank( )", 2) End Sub Private Sub cmdmovemean_Click(sender As Object, e As EventArgs) Handles cmdMovMean.Click @@ -1938,45 +2037,61 @@ Public Class ucrCalculator Private Sub cmdCumMean_Click(sender As Object, e As EventArgs) Handles cmdCumMean.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::cummean(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::cummean(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::cummean()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::cummean( )", 2) End If End Sub Private Sub cmdDRank_Click(sender As Object, e As EventArgs) Handles cmdDRank.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::dense_rank()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::dense_rank( )", 2) + End Sub + + Private Sub cmdRank_Click(sender As Object, e As EventArgs) Handles cmdRank.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rank(x= ,na.last=TRUE,ties.method=c(""average"", ""first"", ""last"", ""random"", ""max"", ""min""))", 81) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rank( )", 2) + End If + End Sub + + Private Sub cmdRescale_Click(sender As Object, e As EventArgs) Handles cmdRescale.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scales::rescale( ,to=c(0,1),narm=TRUE)", 22) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scales::rescale( ,narm=TRUE)", 12) + End If End Sub Private Sub cmdRowRank_Click(sender As Object, e As EventArgs) Handles cmdRowRank.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::row_number()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::row_number( )", 2) End Sub Private Sub cmdIfelse_Click(sender As Object, e As EventArgs) Handles cmdIfelse.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ifelse(test= , ""yes"" , ""no"")", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ifelse()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ifelse( )", 2) End If End Sub Private Sub cmdmatch_Click(sender As Object, e As EventArgs) Handles cmdmatch.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("match()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("match( )", 2) End Sub Private Sub cmdwhen_Click(sender As Object, e As EventArgs) Handles cmdwhen.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::case_when()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::case_when( )", 2) End Sub Private Sub cmdBetween_Click(sender As Object, e As EventArgs) Handles cmdBetween.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::between()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::between( )", 2) End Sub Private Sub cmdNear_Click(sender As Object, e As EventArgs) Handles cmdNear.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::near(x= , y= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::near()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::near( )", 2) End If End Sub @@ -2016,7 +2131,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("car::logit(p, percents = Range.p[2] > 1, adjust)", 24) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("car::logit()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("car::logit( )", 2) End If End Sub @@ -2024,27 +2139,27 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stats::plogis(q, Location = 0, Scale() = 1, lower.tail = True, Log.p = False))", 50) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stats::plogis()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stats::plogis( )", 2) End If End Sub Private Sub cmdAtan2_Click(sender As Object, e As EventArgs) Handles cmdAtan2.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan2(y = , x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan2(y= ,x= )", 6) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan2()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan2( )", 2) End If End Sub Private Sub cmdDuplicate_Click(sender As Object, e As EventArgs) Handles cmdDuplicate.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("duplicated()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("duplicated( )", 2) End Sub Private Sub cmdIsNa_Click(sender As Object, e As EventArgs) Handles cmdIsNa.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("is.na()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("is.na( )", 2) End Sub Private Sub cmdNotIsNa_Click(sender As Object, e As EventArgs) Handles cmdNotIsNa.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("!is.na()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("!is.na( )", 2) End Sub Private Sub cmdCv_Click(sender As Object, e As EventArgs) Handles cmdCv.Click @@ -2073,9 +2188,9 @@ Public Class ucrCalculator Private Sub cmdNonMiss_Click(sender As Object, e As EventArgs) Handles cmdNonMiss.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(!is.na(x= ))", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(!is.na(x= ))", 3) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(!is.na())", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(!is.na( ))", 3) End If End Sub @@ -2092,11 +2207,11 @@ Public Class ucrCalculator End Sub Private Sub cmdDistinct_Click(sender As Object, e As EventArgs) Handles cmdDistinct.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::n_distinct()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::n_distinct( )", 2) End Sub Private Sub cmdAnyDup_Click(sender As Object, e As EventArgs) Handles cmdAnyDup.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("anyDuplicated()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("anyDuplicated( )", 2) End Sub Private Sub cmdCor_Click(sender As Object, e As EventArgs) Handles cmdCor.Click @@ -2116,18 +2231,18 @@ Public Class ucrCalculator End Sub Private Sub cmdRad_Click(sender As Object, e As EventArgs) Handles cmdRad.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rad()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rad( )", 2) End Sub Private Sub cmdDeg_Click(sender As Object, e As EventArgs) Handles cmdDeg.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::deg()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::deg( )", 2) End Sub Private Sub cmdFirst_Click(sender As Object, e As EventArgs) Handles cmdFirst.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::first(x= , order_by=NULL)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::first()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::first( )", 2) End If End Sub @@ -2135,7 +2250,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::last(x= , order_by=NULL)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::last()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::last( )", 2) End If End Sub @@ -2143,7 +2258,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::nth(x= , n= , order_by=NULL)", 21) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::nth()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("dplyr::nth( )", 2) End If End Sub @@ -2173,7 +2288,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which(x= , arr.ind = FALSE, useNames = TRUE)", 35) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which( )", 2) End If End Sub @@ -3430,25 +3545,25 @@ Public Class ucrCalculator Private Sub cmdCircMean_Click(sender As Object, e As EventArgs) Handles cmdCircMean.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular:: mean.circular(x = , na.rm = TRUE, control.circular = list())", 43) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular:: mean.circular(x= , na.rm = TRUE, control.circular = list())", 43) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::mean.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::mean.circular( )", 2) End If End Sub Private Sub cmdCircMedian_Click(sender As Object, e As EventArgs) Handles cmdCircMedian.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular(x = , na.rm = TRUE)", 16) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular(x= , na.rm = TRUE)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::median.circular( )", 2) End If End Sub Private Sub cmdMedianHL_Click(sender As Object, e As EventArgs) Handles cmdMedianHL.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular(x = , na.rm = TRUE, method = c(""HL1"",""HL2"",""HL3""), prop = NULL)", 60) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular(x= , na.rm = TRUE, method = c(""HL1"",""HL2"",""HL3""), prop = NULL)", 60) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::medianHL.circular( )", 2) End If End Sub @@ -3456,7 +3571,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::range.circular(x = , test = FALSE, na.rm = TRUE, finite = FALSE, control.circular = list(), )", 75) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::range.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::range.circular( )", 2) End If End Sub @@ -3464,7 +3579,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular(x = , na.rm = TRUE)", 17) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::sd.circular( )", 2) End If End Sub @@ -3472,7 +3587,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular(x = , na.rm = TRUE)", 17) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::var.circular( )", 2) End If End Sub @@ -3480,7 +3595,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::A1(kappa = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::A1()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::A1( )", 2) End If End Sub @@ -3488,7 +3603,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance(x = , na.rm = TRUE)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.variance( )", 2) End If End Sub @@ -3496,7 +3611,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation(x = , na.rm = TRUE)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::angular.deviation( )", 2) End If End Sub @@ -3544,7 +3659,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rho.circular(x = , na.rm = TRUE)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rho.circular()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rho.circular( )", 2) End If End Sub @@ -3569,7 +3684,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.fill(object = , fill = NA , ix = !is.na(object)))", 33) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.fill()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.fill( )", 2) End If End Sub @@ -3577,7 +3692,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.aggregate(object = , by = 1, FUN = mean, na.rm = FALSE, maxgap = Inf))", 52) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.aggregate()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.aggregate( )", 2) End If End Sub @@ -3585,7 +3700,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.approx(object = , x = index(object), xout = , na.rm = FALSE, maxgap = Inf, along))", 66) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.approx()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.approx( )", 2) End If End Sub @@ -3593,9 +3708,8 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.spline(object = , x = index(object), xout = , na.rm = FALSE, maxgap = Inf, along))", 66) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.spline()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("zoo::na.spline( )", 2) End If - End Sub @@ -3603,7 +3717,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::as_factor(x = , ... )", 8) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::as_factor()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::as_factor( )", 2) End If End Sub @@ -3611,7 +3725,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_anon(x = , prefix = "" )", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_anon()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_anon( )", 2) End If End Sub @@ -3619,7 +3733,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("labelled::labelled(x = , labels = , label = NULL)", 27) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("labelled::labelled()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("labelled::labelled( )", 2) End If End Sub @@ -3627,7 +3741,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_collapse(.f = , ..., group_other = FALSE)", 28) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_collapse()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_collapse( )", 2) End If End Sub @@ -3635,7 +3749,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_cross(.f = , ..., sep = "":"", keep_empty = FALSE)", 38) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_cross()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_cross( )", 2) End If End Sub @@ -3643,7 +3757,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_drop(f = , only)", 8) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_drop()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_drop( )", 2) End If End Sub @@ -3651,7 +3765,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_expand(f = , ...)", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_expand()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_expand( )", 2) End If End Sub @@ -3659,7 +3773,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_na_value_to_level(f = ,level = Null)", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_na_value_to_level()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_na_value_to_level( )", 2) End If End Sub @@ -3667,7 +3781,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inorder(f = , ordered = NA)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inorder()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inorder( )", 2) End If End Sub @@ -3675,7 +3789,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_infreq(f = , ordered = NA)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_infreq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_infreq( )", 2) End If End Sub @@ -3683,7 +3797,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inseq(f = , ordered = NA)", 16) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inseq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inseq( )", 2) End If End Sub @@ -3691,7 +3805,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_lump_min(f = , n, prop, w = NULL, other_level = ""Other"", ties.method = c(""min"", ""average"", ""first"", ""last"", ""random"", ""max""))", 113) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_lump_min()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_lump_min( )", 2) End If End Sub @@ -3699,7 +3813,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_match(f = , lvls)", 8) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_match()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_match( )", 2) End If End Sub @@ -3707,7 +3821,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_other(f = , keep = , drop = , other_level = ""Other"")", 43) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_other()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_other( )", 2) End If End Sub @@ -3715,7 +3829,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_recode(.f = , ...)", 7) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_recode()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_recode( )", 2) End If End Sub @@ -3723,7 +3837,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_relevel(.f = , ..., after = 0L)", 19) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_relevel()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_relevel( )", 2) End If End Sub @@ -3731,7 +3845,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_reorder(.f = , .x = , .fun = median, ..., .desc = FALSE)", 44) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_reorder()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_reorder( )", 2) End If End Sub @@ -3739,7 +3853,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_rev(f = , )", 4) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_rev()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_rev( )", 2) End If End Sub @@ -3747,7 +3861,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shift(f = , n = 1L)", 10) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shift()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shift( )", 2) End If End Sub @@ -3755,7 +3869,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shuffle(f = , )", 4) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shuffle()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shuffle( )", 2) End If End Sub @@ -3764,7 +3878,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(q = , shape = , rate = 1, lower.tail = TRUE,log.p = FALSE)", 55) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pgamma(, , )", 5) End If End Sub @@ -3772,7 +3886,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(p = , shape = , rate = 1, lower.tail = TRUE, log.p = FALSE)", 56) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qgamma(, )", 3) End If End Sub @@ -3780,7 +3894,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(q = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 67) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbeta(, , )", 5) End If End Sub @@ -3796,7 +3910,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(q = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbinom(, , )", 5) End If End Sub @@ -3804,7 +3918,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(q = , lambda = , lower.tail = TRUE, log.p = FALSE)", 47) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("ppois(, )", 3) End If End Sub @@ -3812,7 +3926,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(q = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 61) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pnbinom(, , )", 5) End If End Sub @@ -3820,7 +3934,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(p = , shape1 = , shape2 = , ncp = 0, lower.tail = TRUE, log.p = FALSE)", 67) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbeta(, , )", 5) End If End Sub @@ -3836,7 +3950,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(p = , size = , prob = , lower.tail = TRUE, log.p = FALSE)", 54) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbinom(, , )", 5) End If End Sub @@ -3844,7 +3958,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(p = , lambda = , lower.tail = TRUE, log.p = FALSE)", 47) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(,)", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qpois(, )", 3) End If End Sub @@ -3852,7 +3966,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(p = , size = , prob = , mu = , lower.tail = TRUE, log.p = FALSE)", 61) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(,,)", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qnbinom(, , )", 5) End If End Sub @@ -3887,7 +4001,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_starts(string = , pattern = , negate = FALSE)", 30) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_starts()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_starts( )", 2) End If End Sub @@ -3895,7 +4009,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove(string = , pattern = )", 14) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove( )", 2) End If End Sub @@ -3903,7 +4017,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove_all(string = , pattern = )", 14) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove_all()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_remove_all( )", 2) End If End Sub @@ -3911,7 +4025,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_squish(string = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_squish()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_squish( )", 2) End If End Sub @@ -3919,7 +4033,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_conv(string = , encoding = )", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_conv()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_conv( )", 2) End If End Sub @@ -3927,7 +4041,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract_all(string = , pattern = , simplify = FALSE)", 32) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract_all()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_extract_all( )", 2) End If End Sub @@ -3935,7 +4049,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate_all(string = , pattern = )", 14) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate_all()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_locate_all( )", 2) End If End Sub @@ -3943,7 +4057,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace_all(string = , pattern = , replacement = )", 30) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace_all()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_replace_all( )", 2) End If End Sub @@ -3951,7 +4065,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::count(type = c(""character"", ""line_break"", ""sentence"", ""word""), stringr::boundary(), skip_word_none = NA)", 23) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::boundary()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::boundary( )", 2) End If End Sub @@ -3959,7 +4073,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::count(pattern = , stringr::coll(), ignore_case = FALSE, locale = ""en"")", 55) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::coll()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::coll( )", 2) End If End Sub @@ -3967,7 +4081,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::count(pattern = , stringr::fixed(), ignore_case = FALSE)", 41) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::fixed()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::fixed( )", 2) End If End Sub @@ -3975,7 +4089,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::count(pattern = , stringr::regex() , ignore_case = FALSE , multiline = FALSE , comments = FALSE, dotall = FALSE)", 97) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::regex()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::regex( )", 2) End If End Sub @@ -4049,7 +4163,7 @@ Public Class ucrCalculator Private Sub cmdKurtosis_Click(sender As Object, e As EventArgs) Handles cmdKurtosis.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("e1071::kurtosis(x = , na.rm = TRUE, type = 3)", 26) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("e1071::kurtosis(x= , na.rm = TRUE, type = 3)", 26) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("e1071::kurtosis( , na.rm = TRUE)", 16) End If @@ -4225,9 +4339,9 @@ Public Class ucrCalculator Private Sub cmdDateTime_Click(sender As Object, e As EventArgs) Handles cmdDateTime.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_datetime(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_datetime(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_datetime()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lubridate::as_datetime( )", 2) End If End Sub @@ -4235,7 +4349,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::hms(seconds = , minutes = , hours = , days = )", 33) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::hms()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::hms( )", 2) End If End Sub @@ -4243,7 +4357,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::as_hms(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::as_hms()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("hms::as_hms( )", 2) End If End Sub @@ -4263,7 +4377,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_glue(.sep = """" , .envir = parent.frame())", 28) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_glue()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_glue( )", 2) End If End Sub @@ -4271,7 +4385,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_length(string="""")", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_length()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_length( )", 2) End If End Sub @@ -4279,7 +4393,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trunc(string = , width = , side = c(""right"" , ""left"", ""center"") , ellipsis = )", 63) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trunc()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_trunc( )", 2) End If End Sub @@ -4287,7 +4401,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_ends(string = , pattern = , negate = FALSE)", 39) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_ends()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringr::str_ends( )", 2) End If End Sub @@ -4295,7 +4409,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sort(x = , decreasing = FALSE )", 22) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sort()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sort( )", 2) End If End Sub @@ -4303,7 +4417,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigz(a = , mod = NA )", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigz()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigz( )", 2) End If End Sub @@ -4311,7 +4425,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::isprime(n = , reps = )", 11) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::isprime()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::isprime( )", 2) End If End Sub @@ -4319,7 +4433,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::factorialZ(n = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::factorialZ()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::factorialZ( )", 2) End If End Sub @@ -4327,15 +4441,15 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::chooseZ(n = , k = )", 8) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::chooseZ()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::chooseZ( )", 2) End If End Sub Private Sub cmdNextPrime_Click(sender As Object, e As EventArgs) Handles cmdNextPrime.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::nextprime(n = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::nextprime(n= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::nextprime()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::nextprime( )", 2) End If End Sub @@ -4357,7 +4471,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Divisors(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Divisors()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Divisors( )", 2) End If End Sub @@ -4365,7 +4479,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::PercentRank(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::PercentRank()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::PercentRank( )", 2) End If End Sub @@ -4373,7 +4487,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::DigitSum(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::DigitSum()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::DigitSum( )", 2) End If End Sub @@ -4381,31 +4495,31 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigq(a = , mod = NA )", 13) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigq()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("gmp::as.bigq( )", 2) End If End Sub Private Sub cmdBinary_Click(sender As Object, e As EventArgs) Handles cmdBinary.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin(x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin( )", 2) End If End Sub Private Sub cmdAsOctmode_Click(sender As Object, e As EventArgs) Handles cmdOctal.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToOct(x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToOct(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToOct()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToOct( )", 2) End If End Sub Private Sub cmdAsHexmode_Click(sender As Object, e As EventArgs) Handles cmdHex.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToHex(x = )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToHex(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToHex()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToHex( )", 2) End If End Sub @@ -4443,9 +4557,9 @@ Public Class ucrCalculator Private Sub cmdNthPrime_Click(sender As Object, e As EventArgs) Handles cmdNthPrime.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::nth_prime(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::nth_prime(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::nth_prime()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::nth_prime( )", 2) End If End Sub @@ -4473,9 +4587,9 @@ Public Class ucrCalculator Private Sub cmdReverseStr_Click(sender As Object, e As EventArgs) Handles cmdReverseStr.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringi::stri_reverse(str = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringi::stri_reverse(str= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringi::stri_reverse()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("stringi::stri_reverse( )", 2) End If End Sub @@ -4507,7 +4621,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::phi(n= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::phi()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("primes::phi( )", 2) End If End Sub @@ -4577,9 +4691,9 @@ Public Class ucrCalculator Private Sub cmdRoman_Click(sender As Object, e As EventArgs) Handles cmdRoman.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("utils::as.roman(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("utils::as.roman(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("utils::as.roman()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("utils::as.roman( )", 2) End If End Sub @@ -4691,25 +4805,25 @@ Public Class ucrCalculator Private Sub cmdOctmode_Click(sender As Object, e As EventArgs) Handles cmdOctmode.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.octmode(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.octmode(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.octmode()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.octmode( )", 2) End If End Sub Private Sub cmdHexmode_Click(sender As Object, e As EventArgs) Handles cmdHexmode.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.hexmode(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.hexmode(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.hexmode()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.hexmode( )", 2) End If End Sub Private Sub cmdFactorize_Click(sender As Object, e As EventArgs) Handles cmdFactorize.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Factorize(n= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Factorize(n= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Factorize()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Factorize( )", 2) End If End Sub @@ -4731,9 +4845,9 @@ Public Class ucrCalculator Private Sub cmdCumProd_Click(sender As Object, e As EventArgs) Handles cmdCumProd.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumprod(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumprod(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumprod()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cumprod( )", 2) End If End Sub @@ -4747,9 +4861,9 @@ Public Class ucrCalculator Private Sub cmdRev_Click(sender As Object, e As EventArgs) Handles cmdRev.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rev(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rev(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rev()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("rev( )", 2) End If End Sub @@ -4777,6 +4891,15 @@ Public Class ucrCalculator OpenHelpPage() End Sub + + Private Sub ScalesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ScalesToolStripMenuItem.Click + CalculationsOptions() + If ucrInputCalOptions.GetText = "Transform" Then + strPackageName = "scales" + End If + OpenHelpPage() + End Sub + Private Sub ZooToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZooToolStripMenuItem.Click CalculationsOptions() If ucrInputCalOptions.GetText = "Transform" Then @@ -4817,7 +4940,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(x=rep(x= ,times= ),na.rm= TRUE)", 23) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(rep(,),na.rm=TRUE)", 14) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sum(rep(, ),na.rm=TRUE)", 15) End If End Sub @@ -5273,7 +5396,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex(length.out= 0,real= numeric(),imaginary= numeric(),modulus= 1,argument= 0)", 0) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("complex(real= ,imaginary= )", 14) End If End Sub @@ -5281,63 +5404,63 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin(x = )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("asin( )", 2) End If End Sub Private Sub cmdComplexAcos_Click(sender As Object, e As EventArgs) Handles cmdComplexAcos.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("acos( )", 2) End If End Sub Private Sub cmdComplexAtan_Click(sender As Object, e As EventArgs) Handles cmdComplexAtan.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("atan( )", 2) End If End Sub Private Sub cmdReal_Click(sender As Object, e As EventArgs) Handles cmdReal.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Re(z = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Re(z= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Re( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Re( )", 2) End If End Sub Private Sub cmdImaginary_Click(sender As Object, e As EventArgs) Handles cmdImaginary.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Im(z = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Im(z= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Im( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Im( )", 2) End If End Sub Private Sub cmdMod_Click(sender As Object, e As EventArgs) Handles cmdMod.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Mod(z = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Mod(z= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Mod( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Mod( )", 2) End If End Sub Private Sub cmdArg_Click(sender As Object, e As EventArgs) Handles cmdArg.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Arg(z = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Arg(z= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Arg( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Arg( )", 2) End If End Sub Private Sub cmdConjugate_Click(sender As Object, e As EventArgs) Handles cmdConjugate.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Conj(z = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Conj(z= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Conj( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("Conj( )", 2) End If End Sub @@ -5347,9 +5470,9 @@ Public Class ucrCalculator Private Sub cmdAsComplex_Click(sender As Object, e As EventArgs) Handles cmdAsComplex.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex(x = )", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.complex( )", 2) End If End Sub @@ -5357,7 +5480,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log(x= , base=exp(1))", 15) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("log( )", 2) End If End Sub @@ -5365,7 +5488,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sqrt( )", 2) End If End Sub @@ -5373,7 +5496,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round(x= , digits=0)", 12) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("round( )", 2) End If End Sub @@ -5381,7 +5504,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("exp( )", 2) End If End Sub @@ -5389,7 +5512,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif(x= , digits=6)", 12) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("signif( )", 2) End If End Sub @@ -5397,7 +5520,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cos( )", 2) End If End Sub @@ -5405,7 +5528,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sin( )", 2) End If End Sub @@ -5413,7 +5536,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tan( )", 2) End If End Sub @@ -5421,7 +5544,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cosh(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cosh()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("cosh( )", 2) End If End Sub @@ -5429,7 +5552,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sinh(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sinh()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sinh( )", 2) End If End Sub @@ -5437,46 +5560,30 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tanh(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tanh()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("tanh( )", 2) End If End Sub Private Sub cmdComplexRad_Click(sender As Object, e As EventArgs) Handles cmdComplexRad.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rad()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::rad( )", 2) End Sub Private Sub cmdComplexDeg_Click(sender As Object, e As EventArgs) Handles cmdComplexDeg.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::deg()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::deg( )", 2) End Sub Private Sub cmdComplexPi_Click(sender As Object, e As EventArgs) Handles cmdComplexPi.Click 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)})})", 57) - 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) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scale( )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scale( )", 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))", 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 @@ -5679,9 +5786,9 @@ Public Class ucrCalculator Private Sub cmdwhichmax_Click(sender As Object, e As EventArgs) Handles cmdwhichmax.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.max( )", 2) End If End Sub @@ -5695,9 +5802,9 @@ Public Class ucrCalculator Private Sub cmdwhichmin_Click(sender As Object, e As EventArgs) Handles cmdwhichmin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min(x= )", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min(x= )", 2) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("which.min( )", 2) End If End Sub @@ -5708,4 +5815,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 diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 4f7047f131e..312d7b4de5d 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -120,16 +120,21 @@ Partial Class ucrDataView Me.lblHeaderDataView = New System.Windows.Forms.Label() Me.tlpTableContainer = New System.Windows.Forms.TableLayoutPanel() Me.panelSectionsAll = New System.Windows.Forms.Panel() + Me.panelSectionAdvanced = New System.Windows.Forms.Panel() + Me.linkStartAddRPackage = New System.Windows.Forms.LinkLabel() + Me.lblAdvanced = New System.Windows.Forms.Label() + Me.linkStartRestoreBackup = New System.Windows.Forms.LinkLabel() + Me.linkStartPasteScriptfromClipboard = New System.Windows.Forms.LinkLabel() Me.panelSectionRecent = New System.Windows.Forms.Panel() Me.lblRecent = New System.Windows.Forms.Label() Me.panelRecentMenuItems = New System.Windows.Forms.Panel() Me.panelSectionHelp = New System.Windows.Forms.Panel() + Me.linkHelpData = New System.Windows.Forms.LinkLabel() + Me.linkHelpGettingStarted = New System.Windows.Forms.LinkLabel() Me.lblHelp = New System.Windows.Forms.Label() - Me.linkHelpIntroduction = New System.Windows.Forms.LinkLabel() - Me.linkHelpInstructionVideos = New System.Windows.Forms.LinkLabel() - Me.linkHelpRpackages = New System.Windows.Forms.LinkLabel() - Me.linkHelpRInstatWebsite = New System.Windows.Forms.LinkLabel() + Me.linkHelpRInstatResourcesSite = New System.Windows.Forms.LinkLabel() Me.panelSectionStart = New System.Windows.Forms.Panel() + Me.linkStartPasteData = New System.Windows.Forms.LinkLabel() Me.lblStart = New System.Windows.Forms.Label() Me.linkStartNewDataFrame = New System.Windows.Forms.LinkLabel() Me.linkStartOpenFile = New System.Windows.Forms.LinkLabel() @@ -154,6 +159,7 @@ Partial Class ucrDataView Me.statusColumnMenu.SuspendLayout() Me.tlpTableContainer.SuspendLayout() Me.panelSectionsAll.SuspendLayout() + Me.panelSectionAdvanced.SuspendLayout() Me.panelSectionRecent.SuspendLayout() Me.panelSectionHelp.SuspendLayout() Me.panelSectionStart.SuspendLayout() @@ -661,6 +667,7 @@ Partial Class ucrDataView ' 'panelSectionsAll ' + Me.panelSectionsAll.Controls.Add(Me.panelSectionAdvanced) Me.panelSectionsAll.Controls.Add(Me.panelSectionRecent) Me.panelSectionsAll.Controls.Add(Me.panelSectionHelp) Me.panelSectionsAll.Controls.Add(Me.panelSectionStart) @@ -671,13 +678,74 @@ Partial Class ucrDataView Me.panelSectionsAll.Size = New System.Drawing.Size(243, 455) Me.panelSectionsAll.TabIndex = 9 ' + 'panelSectionAdvanced + ' + Me.panelSectionAdvanced.Controls.Add(Me.linkStartAddRPackage) + Me.panelSectionAdvanced.Controls.Add(Me.lblAdvanced) + Me.panelSectionAdvanced.Controls.Add(Me.linkStartRestoreBackup) + Me.panelSectionAdvanced.Controls.Add(Me.linkStartPasteScriptfromClipboard) + Me.panelSectionAdvanced.Location = New System.Drawing.Point(28, 431) + Me.panelSectionAdvanced.Name = "panelSectionAdvanced" + Me.panelSectionAdvanced.Size = New System.Drawing.Size(374, 105) + Me.panelSectionAdvanced.TabIndex = 12 + ' + 'linkStartAddRPackage + ' + Me.linkStartAddRPackage.ActiveLinkColor = System.Drawing.Color.Red + Me.linkStartAddRPackage.AutoSize = True + Me.linkStartAddRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkStartAddRPackage.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkStartAddRPackage.Location = New System.Drawing.Point(7, 65) + Me.linkStartAddRPackage.Name = "linkStartAddRPackage" + Me.linkStartAddRPackage.Size = New System.Drawing.Size(143, 13) + Me.linkStartAddRPackage.TabIndex = 6 + Me.linkStartAddRPackage.TabStop = True + Me.linkStartAddRPackage.Text = "Add R package to R-Instat..." + ' + 'lblAdvanced + ' + Me.lblAdvanced.AutoSize = True + Me.lblAdvanced.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAdvanced.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblAdvanced.Location = New System.Drawing.Point(5, 4) + Me.lblAdvanced.Name = "lblAdvanced" + Me.lblAdvanced.Size = New System.Drawing.Size(108, 25) + Me.lblAdvanced.TabIndex = 0 + Me.lblAdvanced.Text = "Advanced" + ' + 'linkStartRestoreBackup + ' + Me.linkStartRestoreBackup.ActiveLinkColor = System.Drawing.Color.Red + Me.linkStartRestoreBackup.AutoSize = True + Me.linkStartRestoreBackup.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkStartRestoreBackup.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkStartRestoreBackup.Location = New System.Drawing.Point(7, 47) + Me.linkStartRestoreBackup.Name = "linkStartRestoreBackup" + Me.linkStartRestoreBackup.Size = New System.Drawing.Size(166, 13) + Me.linkStartRestoreBackup.TabIndex = 4 + Me.linkStartRestoreBackup.TabStop = True + Me.linkStartRestoreBackup.Text = "Restore Data or Log from Backup" + ' + 'linkStartPasteScriptfromClipboard + ' + Me.linkStartPasteScriptfromClipboard.ActiveLinkColor = System.Drawing.Color.Red + Me.linkStartPasteScriptfromClipboard.AutoSize = True + Me.linkStartPasteScriptfromClipboard.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkStartPasteScriptfromClipboard.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(8, 30) + Me.linkStartPasteScriptfromClipboard.Name = "linkStartPasteScriptfromClipboard" + Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(134, 13) + Me.linkStartPasteScriptfromClipboard.TabIndex = 5 + Me.linkStartPasteScriptfromClipboard.TabStop = True + Me.linkStartPasteScriptfromClipboard.Text = "Paste Script from Clipboard" + ' 'panelSectionRecent ' Me.panelSectionRecent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelSectionRecent.Controls.Add(Me.lblRecent) Me.panelSectionRecent.Controls.Add(Me.panelRecentMenuItems) - Me.panelSectionRecent.Location = New System.Drawing.Point(28, 130) + Me.panelSectionRecent.Location = New System.Drawing.Point(28, 124) Me.panelSectionRecent.Name = "panelSectionRecent" Me.panelSectionRecent.Size = New System.Drawing.Size(179, 186) Me.panelSectionRecent.TabIndex = 13 @@ -698,105 +766,103 @@ Partial Class ucrDataView Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelRecentMenuItems.AutoScroll = True - Me.panelRecentMenuItems.Location = New System.Drawing.Point(9, 38) + Me.panelRecentMenuItems.Location = New System.Drawing.Point(9, 44) Me.panelRecentMenuItems.Name = "panelRecentMenuItems" Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) Me.panelRecentMenuItems.TabIndex = 6 ' 'panelSectionHelp ' + Me.panelSectionHelp.Controls.Add(Me.linkHelpData) + Me.panelSectionHelp.Controls.Add(Me.linkHelpGettingStarted) Me.panelSectionHelp.Controls.Add(Me.lblHelp) - Me.panelSectionHelp.Controls.Add(Me.linkHelpIntroduction) - Me.panelSectionHelp.Controls.Add(Me.linkHelpInstructionVideos) - Me.panelSectionHelp.Controls.Add(Me.linkHelpRpackages) - Me.panelSectionHelp.Controls.Add(Me.linkHelpRInstatWebsite) - Me.panelSectionHelp.Location = New System.Drawing.Point(28, 330) + Me.panelSectionHelp.Controls.Add(Me.linkHelpRInstatResourcesSite) + Me.panelSectionHelp.Location = New System.Drawing.Point(28, 314) Me.panelSectionHelp.Name = "panelSectionHelp" - Me.panelSectionHelp.Size = New System.Drawing.Size(374, 118) + Me.panelSectionHelp.Size = New System.Drawing.Size(374, 109) Me.panelSectionHelp.TabIndex = 12 ' + 'linkHelpData + ' + Me.linkHelpData.ActiveLinkColor = System.Drawing.Color.Red + Me.linkHelpData.AutoSize = True + Me.linkHelpData.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkHelpData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkHelpData.Location = New System.Drawing.Point(8, 49) + Me.linkHelpData.Name = "linkHelpData" + Me.linkHelpData.Size = New System.Drawing.Size(30, 13) + Me.linkHelpData.TabIndex = 12 + Me.linkHelpData.TabStop = True + Me.linkHelpData.Text = "Data" + ' + 'linkHelpGettingStarted + ' + Me.linkHelpGettingStarted.ActiveLinkColor = System.Drawing.Color.Red + Me.linkHelpGettingStarted.AutoSize = True + Me.linkHelpGettingStarted.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkHelpGettingStarted.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkHelpGettingStarted.Location = New System.Drawing.Point(8, 33) + Me.linkHelpGettingStarted.Name = "linkHelpGettingStarted" + Me.linkHelpGettingStarted.Size = New System.Drawing.Size(78, 13) + Me.linkHelpGettingStarted.TabIndex = 11 + Me.linkHelpGettingStarted.TabStop = True + Me.linkHelpGettingStarted.Text = "Getting Started" + ' 'lblHelp ' Me.lblHelp.AutoSize = True Me.lblHelp.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHelp.Location = New System.Drawing.Point(6, 8) + Me.lblHelp.Location = New System.Drawing.Point(6, 3) Me.lblHelp.Name = "lblHelp" Me.lblHelp.Size = New System.Drawing.Size(56, 25) Me.lblHelp.TabIndex = 2 Me.lblHelp.Text = "Help" ' - 'linkHelpIntroduction - ' - Me.linkHelpIntroduction.ActiveLinkColor = System.Drawing.Color.Red - Me.linkHelpIntroduction.AutoSize = True - Me.linkHelpIntroduction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.linkHelpIntroduction.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpIntroduction.Location = New System.Drawing.Point(8, 38) - Me.linkHelpIntroduction.Name = "linkHelpIntroduction" - Me.linkHelpIntroduction.Size = New System.Drawing.Size(63, 13) - Me.linkHelpIntroduction.TabIndex = 7 - Me.linkHelpIntroduction.TabStop = True - Me.linkHelpIntroduction.Text = "Introduction" - ' - 'linkHelpInstructionVideos - ' - Me.linkHelpInstructionVideos.ActiveLinkColor = System.Drawing.Color.Red - Me.linkHelpInstructionVideos.AutoSize = True - Me.linkHelpInstructionVideos.Enabled = False - Me.linkHelpInstructionVideos.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.linkHelpInstructionVideos.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpInstructionVideos.Location = New System.Drawing.Point(8, 94) - Me.linkHelpInstructionVideos.Name = "linkHelpInstructionVideos" - Me.linkHelpInstructionVideos.Size = New System.Drawing.Size(98, 13) - Me.linkHelpInstructionVideos.TabIndex = 10 - Me.linkHelpInstructionVideos.TabStop = True - Me.linkHelpInstructionVideos.Text = "Instructional videos" - Me.linkHelpInstructionVideos.Visible = False - ' - 'linkHelpRpackages - ' - Me.linkHelpRpackages.ActiveLinkColor = System.Drawing.Color.Red - Me.linkHelpRpackages.AutoSize = True - Me.linkHelpRpackages.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.linkHelpRpackages.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRpackages.Location = New System.Drawing.Point(8, 56) - Me.linkHelpRpackages.Name = "linkHelpRpackages" - Me.linkHelpRpackages.Size = New System.Drawing.Size(116, 13) - Me.linkHelpRpackages.TabIndex = 8 - Me.linkHelpRpackages.TabStop = True - Me.linkHelpRpackages.Text = "R packages in R-Instat" - ' - 'linkHelpRInstatWebsite - ' - Me.linkHelpRInstatWebsite.ActiveLinkColor = System.Drawing.Color.Red - Me.linkHelpRInstatWebsite.AutoSize = True - Me.linkHelpRInstatWebsite.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.linkHelpRInstatWebsite.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRInstatWebsite.Location = New System.Drawing.Point(8, 75) - Me.linkHelpRInstatWebsite.Name = "linkHelpRInstatWebsite" - Me.linkHelpRInstatWebsite.Size = New System.Drawing.Size(83, 13) - Me.linkHelpRInstatWebsite.TabIndex = 9 - Me.linkHelpRInstatWebsite.TabStop = True - Me.linkHelpRInstatWebsite.Text = "R-Instat website" + 'linkHelpRInstatResourcesSite + ' + Me.linkHelpRInstatResourcesSite.ActiveLinkColor = System.Drawing.Color.Red + Me.linkHelpRInstatResourcesSite.AutoSize = True + Me.linkHelpRInstatResourcesSite.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkHelpRInstatResourcesSite.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(8, 65) + Me.linkHelpRInstatResourcesSite.Name = "linkHelpRInstatResourcesSite" + Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(119, 13) + Me.linkHelpRInstatResourcesSite.TabIndex = 9 + Me.linkHelpRInstatResourcesSite.TabStop = True + Me.linkHelpRInstatResourcesSite.Text = "R-Instat Resources Site" ' 'panelSectionStart ' + Me.panelSectionStart.Controls.Add(Me.linkStartPasteData) Me.panelSectionStart.Controls.Add(Me.lblStart) Me.panelSectionStart.Controls.Add(Me.linkStartNewDataFrame) Me.panelSectionStart.Controls.Add(Me.linkStartOpenFile) Me.panelSectionStart.Controls.Add(Me.linkStartOpenLibrary) - Me.panelSectionStart.Location = New System.Drawing.Point(28, 20) + Me.panelSectionStart.Location = New System.Drawing.Point(28, 6) Me.panelSectionStart.Name = "panelSectionStart" - Me.panelSectionStart.Size = New System.Drawing.Size(374, 96) + Me.panelSectionStart.Size = New System.Drawing.Size(374, 113) Me.panelSectionStart.TabIndex = 11 ' + 'linkStartPasteData + ' + Me.linkStartPasteData.ActiveLinkColor = System.Drawing.Color.Red + Me.linkStartPasteData.AutoSize = True + Me.linkStartPasteData.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.linkStartPasteData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline + Me.linkStartPasteData.Location = New System.Drawing.Point(7, 84) + Me.linkStartPasteData.Name = "linkStartPasteData" + Me.linkStartPasteData.Size = New System.Drawing.Size(136, 13) + Me.linkStartPasteData.TabIndex = 7 + Me.linkStartPasteData.TabStop = True + Me.linkStartPasteData.Text = "Paste data from clipboard..." + ' 'lblStart ' Me.lblStart.AutoSize = True Me.lblStart.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStart.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStart.Location = New System.Drawing.Point(5, 6) + Me.lblStart.Location = New System.Drawing.Point(5, 4) Me.lblStart.Name = "lblStart" Me.lblStart.Size = New System.Drawing.Size(57, 25) Me.lblStart.TabIndex = 0 @@ -808,7 +874,7 @@ Partial Class ucrDataView Me.linkStartNewDataFrame.AutoSize = True Me.linkStartNewDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartNewDataFrame.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartNewDataFrame.Location = New System.Drawing.Point(7, 38) + Me.linkStartNewDataFrame.Location = New System.Drawing.Point(7, 31) Me.linkStartNewDataFrame.Name = "linkStartNewDataFrame" Me.linkStartNewDataFrame.Size = New System.Drawing.Size(96, 13) Me.linkStartNewDataFrame.TabIndex = 3 @@ -821,7 +887,7 @@ Partial Class ucrDataView Me.linkStartOpenFile.AutoSize = True Me.linkStartOpenFile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenFile.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenFile.Location = New System.Drawing.Point(7, 56) + Me.linkStartOpenFile.Location = New System.Drawing.Point(7, 48) Me.linkStartOpenFile.Name = "linkStartOpenFile" Me.linkStartOpenFile.Size = New System.Drawing.Size(90, 13) Me.linkStartOpenFile.TabIndex = 4 @@ -834,7 +900,7 @@ Partial Class ucrDataView Me.linkStartOpenLibrary.AutoSize = True Me.linkStartOpenLibrary.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenLibrary.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenLibrary.Location = New System.Drawing.Point(7, 75) + Me.linkStartOpenLibrary.Location = New System.Drawing.Point(7, 66) Me.linkStartOpenLibrary.Name = "linkStartOpenLibrary" Me.linkStartOpenLibrary.Size = New System.Drawing.Size(105, 13) Me.linkStartOpenLibrary.TabIndex = 5 @@ -1023,6 +1089,8 @@ Partial Class ucrDataView Me.tlpTableContainer.ResumeLayout(False) Me.tlpTableContainer.PerformLayout() Me.panelSectionsAll.ResumeLayout(False) + Me.panelSectionAdvanced.ResumeLayout(False) + Me.panelSectionAdvanced.PerformLayout() Me.panelSectionRecent.ResumeLayout(False) Me.panelSectionRecent.PerformLayout() Me.panelSectionHelp.ResumeLayout(False) @@ -1108,10 +1176,7 @@ Partial Class ucrDataView Friend WithEvents panelRecentMenuItems As Panel Friend WithEvents panelSectionHelp As Panel Friend WithEvents lblHelp As Label - Friend WithEvents linkHelpIntroduction As LinkLabel - Friend WithEvents linkHelpInstructionVideos As LinkLabel - Friend WithEvents linkHelpRpackages As LinkLabel - Friend WithEvents linkHelpRInstatWebsite As LinkLabel + Friend WithEvents linkHelpRInstatResourcesSite As LinkLabel Friend WithEvents panelSectionStart As Panel Friend WithEvents lblStart As Label Friend WithEvents linkStartNewDataFrame As LinkLabel @@ -1146,4 +1211,12 @@ Partial Class ucrDataView Friend WithEvents mnuDeleteCol2 As ToolStripMenuItem Friend WithEvents ToolStripSeparator14 As ToolStripSeparator Friend WithEvents mnuEditCell As ToolStripMenuItem + Friend WithEvents linkHelpData As LinkLabel + Friend WithEvents linkHelpGettingStarted As LinkLabel + Friend WithEvents panelSectionAdvanced As Panel + Friend WithEvents lblAdvanced As Label + Friend WithEvents linkStartRestoreBackup As LinkLabel + Friend WithEvents linkStartPasteScriptfromClipboard As LinkLabel + Friend WithEvents linkStartAddRPackage As LinkLabel + Friend WithEvents linkStartPasteData As LinkLabel End Class diff --git a/instat/ucrDataView.resx b/instat/ucrDataView.resx index 72c17d882d9..796dfc9bc07 100644 --- a/instat/ucrDataView.resx +++ b/instat/ucrDataView.resx @@ -133,6 +133,6 @@ 706, 17 - 47 + 50 \ No newline at end of file diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index f520b209a34..e41522cc43e 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -662,6 +662,8 @@ Public Class ucrDataView Else Dim bCheckLabels As Boolean = GetCurrentDataFrameFocus().clsPrepareFunctions.CheckHasLabels(strColumn) If bCheckLabels Then + GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, True) + Else frmConvertToNumeric.SetDataFrameName(GetCurrentDataFrameFocus().strName) frmConvertToNumeric.SetColumnName(strColumn) frmConvertToNumeric.CheckLabels(bCheckLabels) @@ -676,8 +678,6 @@ Public Class ucrDataView Case DialogResult.Cancel Continue For End Select - Else - GetCurrentDataFrameFocus().clsPrepareFunctions.ConvertToNumeric(strColumn, False) End If frmConvertToNumeric.Close() End If @@ -769,16 +769,16 @@ Public Class ucrDataView panelSectionRecent.Visible = panelRecentMenuItems.Controls.Count > 0 End Sub - Private Sub linkHelpIntroduction_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpIntroduction.LinkClicked + Private Sub linkHelpIntroduction_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "0") End Sub - Private Sub linkHelpRpackages_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpRpackages.LinkClicked + Private Sub linkHelpRpackages_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) dlgHelpVignettes.ShowDialog() End Sub - Private Sub linkHelpRInstatWebsite_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpRInstatWebsite.LinkClicked - Process.Start("http://r-instat.org/") + Private Sub linkHelpRInstatWebsite_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpRInstatResourcesSite.LinkClicked + Process.Start("https://ecampus.r-instat.org/course/view.php?id=14") End Sub Private Sub rowContextMenuStrip_Opening(sender As Object, e As CancelEventArgs) Handles rowContextMenuStrip.Opening @@ -1015,4 +1015,39 @@ Public Class ucrDataView _grid.SelectColumnInGrid(strColumn) End Sub + Private Sub linkHelpGettingStarted_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpGettingStarted.LinkClicked + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "3") + End Sub + + Private Sub linkHelpData_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpData.LinkClicked + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "71") + End Sub + + Private Sub linkHelpPrepareMenu_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "9") + End Sub + + Private Sub linkHelpClimaticMenu_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "19") + End Sub + + Private Sub linkStartPasteScriptfromClipboard_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkStartPasteScriptfromClipboard.LinkClicked + frmMain.mnuViewSwapDataAndMetadata.Enabled = frmMain.mnuViewSwapDataAndScript.Checked + frmMain.mnuViewSwapDataAndScript.Checked = Not frmMain.mnuViewSwapDataAndScript.Checked + frmMain.UpdateSwapDataAndScript() + frmMain.UpdateLayout() + End Sub + + Private Sub linkStartRestoreBackup_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkStartRestoreBackup.LinkClicked + dlgRestoreBackup.ShowDialog() + End Sub + + Private Sub linkStartAddRPackage_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkStartAddRPackage.LinkClicked + dlgInstallRPackage.ShowDialog() + End Sub + + Private Sub linkStartPasteData_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkStartPasteData.LinkClicked + dlgPasteNewColumns.ShowDialog() + End Sub + End Class \ No newline at end of file diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 9f293a0eb11..4728c91cea1 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1388,6 +1388,8 @@ Public Class ucrGeom clsgeom_line.AddLayerParameter("position", "list", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "stack" & Chr(34), Chr(34) & "dodge" & Chr(34), Chr(34) & "dodge2" & Chr(34), Chr(34) & "identity" & Chr(34), Chr(34) & "jitter" & Chr(34), Chr(34) & "fill" & Chr(34)}) clsgeom_line.AddLayerParameter("stat", "list", Chr(34) & "identity" & Chr(34), lstParameterStrings:={Chr(34) & "identity" & Chr(34), Chr(34) & "bin" & Chr(34), Chr(34) & "count" & Chr(34), Chr(34) & "density" & Chr(34), Chr(34) & "ecdf" & Chr(34), Chr(34) & "sum" & Chr(34), Chr(34) & "unique" & Chr(34)}) clsgeom_line.AddLayerParameter("show.legend", "list", "TRUE", lstParameterStrings:={"NA", "TRUE", "FALSE"}) + clsgeom_line.AddLayerParameter("orientation", "list", "NA", lstParameterStrings:={"NA", Chr(34) & "x" & Chr(34), Chr(34) & "y" & Chr(34)}) + clsgeom_line.AddLayerParameter("arrow", "editablelist", "arrow()", lstParameterStrings:={"arrow()", " arrow(angle=15)", "arrow(ends=" & Chr(34) & "both" & Chr(34) & ")", "arrow(type=" & Chr(34) & "closed" & Chr(34) & ")", "arrow(angle=15, type = " & Chr(34) & "closed" & Chr(34) & ")"}) 'Aesthetics as layer parameters... Used to fix colour, transparence, ... of the geom on that Layer. clsgeom_line.AddLayerParameter("size", "numeric", "0.5", lstParameterStrings:={1, 0}) 'Note: negative size gives size 0 in general, but 'Warning: sometimesgive errors... clsgeom_line.AddLayerParameter("linetype", "list", Chr(34) & "blank" & Chr(34), lstParameterStrings:=strLineType) @@ -1554,7 +1556,7 @@ Public Class ucrGeom clsgeom_path.AddLayerParameter("linejoin", "list", Chr(34) & "round" & Chr(34), lstParameterStrings:={Chr(34) & "round" & Chr(34), Chr(34) & "mitre" & Chr(34), Chr(34) & "bevel" & Chr(34)}) 'linemitre should 1 or a number >1 clsgeom_path.AddLayerParameter("linemitre", "numeric", "1", lstParameterStrings:={0, 1}) - clsgeom_path.AddLayerParameter("arrow", "editablelist", "arrow()", lstParameterStrings:={"arrow()"}) + clsgeom_path.AddLayerParameter("arrow", "editablelist", "arrow()", lstParameterStrings:={"arrow()", " arrow(angle=15)", "arrow(ends=" & Chr(34) & "both" & Chr(34) & ")", "arrow(type=" & Chr(34) & "closed" & Chr(34) & ")", "arrow(angle=15, type = " & Chr(34) & "closed" & Chr(34) & ")"}) lstAllGeoms.Add(clsgeom_path) clsgeom_point.SetGeomName("geom_point") diff --git a/instat/ucrReceiver.vb b/instat/ucrReceiver.vb index 77ee806b729..60218945d01 100644 --- a/instat/ucrReceiver.vb +++ b/instat/ucrReceiver.vb @@ -417,6 +417,8 @@ Public Class ucrReceiver strItemsParameterNameInRFunction = "link_name" Case "calculation" strItemsParameterNameInRFunction = "calculation_name" + Case "scalar" + strItemsParameterNameInRFunction = "scalar_name" End Select If IsCurrentReceiver() Then Selector.LoadList() diff --git a/instat/ucrSelectorByDataFrameAddRemove.Designer.vb b/instat/ucrSelectorByDataFrameAddRemove.Designer.vb index 503ecf13254..714201fe931 100644 --- a/instat/ucrSelectorByDataFrameAddRemove.Designer.vb +++ b/instat/ucrSelectorByDataFrameAddRemove.Designer.vb @@ -46,6 +46,7 @@ Partial Class ucrSelectorByDataFrameAddRemove Me.toolStripAddAll = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparatorContext = New System.Windows.Forms.ToolStripSeparator() Me.toolStripHelp = New System.Windows.Forms.ToolStripMenuItem() + Me.checkBoxScalar = New System.Windows.Forms.CheckBox() Me.contextMenuStripAdd.SuspendLayout() Me.SuspendLayout() ' @@ -60,9 +61,10 @@ Partial Class ucrSelectorByDataFrameAddRemove 'btnDataOptions ' Me.btnDataOptions.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.75!) - Me.btnDataOptions.Location = New System.Drawing.Point(153, 146) + Me.btnDataOptions.Location = New System.Drawing.Point(226, 219) + Me.btnDataOptions.Margin = New System.Windows.Forms.Padding(4) Me.btnDataOptions.Name = "btnDataOptions" - Me.btnDataOptions.Size = New System.Drawing.Size(57, 34) + Me.btnDataOptions.Size = New System.Drawing.Size(86, 51) Me.btnDataOptions.TabIndex = 4 Me.btnDataOptions.Tag = "Data_Options" Me.btnDataOptions.Text = "Data Options" @@ -72,9 +74,10 @@ Partial Class ucrSelectorByDataFrameAddRemove ' Me.btnAdd.AutoSize = True Me.btnAdd.ContextMenuStrip = Me.contextMenuStripAdd - Me.btnAdd.Location = New System.Drawing.Point(151, 45) + Me.btnAdd.Location = New System.Drawing.Point(226, 68) + Me.btnAdd.Margin = New System.Windows.Forms.Padding(4) Me.btnAdd.Name = "btnAdd" - Me.btnAdd.Size = New System.Drawing.Size(59, 34) + Me.btnAdd.Size = New System.Drawing.Size(88, 51) Me.btnAdd.SplitMenuStrip = Me.contextMenuStripAdd Me.btnAdd.TabIndex = 5 Me.btnAdd.Text = "Add" @@ -82,46 +85,60 @@ Partial Class ucrSelectorByDataFrameAddRemove ' 'contextMenuStripAdd ' + Me.contextMenuStripAdd.ImageScalingSize = New System.Drawing.Size(24, 24) Me.contextMenuStripAdd.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripAddSelected, Me.toolStripAddAll, Me.ToolStripSeparatorContext, Me.toolStripHelp}) Me.contextMenuStripAdd.Name = "SelectionMenuStrip" - Me.contextMenuStripAdd.Size = New System.Drawing.Size(181, 98) + Me.contextMenuStripAdd.Size = New System.Drawing.Size(190, 106) ' 'toolStripAddSelected ' Me.toolStripAddSelected.Name = "toolStripAddSelected" - Me.toolStripAddSelected.Size = New System.Drawing.Size(180, 22) + Me.toolStripAddSelected.Size = New System.Drawing.Size(189, 32) Me.toolStripAddSelected.Tag = "Add_selected" Me.toolStripAddSelected.Text = "Add Selected" ' 'toolStripAddAll ' Me.toolStripAddAll.Name = "toolStripAddAll" - Me.toolStripAddAll.Size = New System.Drawing.Size(180, 22) + Me.toolStripAddAll.Size = New System.Drawing.Size(189, 32) Me.toolStripAddAll.Text = "Add All" ' 'ToolStripSeparatorContext ' Me.ToolStripSeparatorContext.Name = "ToolStripSeparatorContext" - Me.ToolStripSeparatorContext.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparatorContext.Size = New System.Drawing.Size(186, 6) ' 'toolStripHelp ' Me.toolStripHelp.Name = "toolStripHelp" - Me.toolStripHelp.Size = New System.Drawing.Size(180, 22) + Me.toolStripHelp.Size = New System.Drawing.Size(189, 32) Me.toolStripHelp.Text = "Help" ' + 'checkBoxScalar + ' + Me.checkBoxScalar.AutoSize = True + Me.checkBoxScalar.Location = New System.Drawing.Point(226, 153) + Me.checkBoxScalar.Name = "checkBoxScalar" + Me.checkBoxScalar.Size = New System.Drawing.Size(80, 24) + Me.checkBoxScalar.TabIndex = 86 + Me.checkBoxScalar.Text = "Scalar" + Me.checkBoxScalar.UseVisualStyleBackColor = True + Me.checkBoxScalar.Visible = False + ' 'ucrSelectorByDataFrameAddRemove ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi + Me.Controls.Add(Me.checkBoxScalar) Me.Controls.Add(Me.btnAdd) Me.Controls.Add(Me.btnDataOptions) Me.Name = "ucrSelectorByDataFrameAddRemove" - Me.Size = New System.Drawing.Size(270, 183) + Me.Size = New System.Drawing.Size(405, 402) Me.Controls.SetChildIndex(Me.btnDataOptions, 0) Me.Controls.SetChildIndex(Me.btnAdd, 0) Me.Controls.SetChildIndex(Me.ucrAvailableDataFrames, 0) Me.Controls.SetChildIndex(Me.lstAvailableVariable, 0) + Me.Controls.SetChildIndex(Me.checkBoxScalar, 0) Me.contextMenuStripAdd.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -134,4 +151,5 @@ Partial Class ucrSelectorByDataFrameAddRemove Friend WithEvents toolStripAddAll As ToolStripMenuItem Friend WithEvents ToolStripSeparatorContext As ToolStripSeparator Friend WithEvents toolStripHelp As ToolStripMenuItem + Friend WithEvents checkBoxScalar As CheckBox End Class diff --git a/instat/ucrSelectorByDataFrameAddRemove.vb b/instat/ucrSelectorByDataFrameAddRemove.vb index 04718f8adfe..fdfd6c41540 100644 --- a/instat/ucrSelectorByDataFrameAddRemove.vb +++ b/instat/ucrSelectorByDataFrameAddRemove.vb @@ -40,6 +40,14 @@ Public Class ucrSelectorByDataFrameAddRemove End If End Sub + Public Sub ShowCheckBoxScalar(bShowScalarCheck As Boolean) + checkBoxScalar.Visible = bShowScalarCheck + End Sub + + Public Sub ResetCheckBoxScalar() + checkBoxScalar.Checked = False + End Sub + Public Sub ShowColumnSelector(bShow As Boolean) btnAdd.Visible = bShow btnDataOptions.Visible = bShow