diff --git a/instat/Model/Output/clsOutputLogger.vb b/instat/Model/Output/clsOutputLogger.vb index 74df7638012..a0b843a1c04 100644 --- a/instat/Model/Output/clsOutputLogger.vb +++ b/instat/Model/Output/clsOutputLogger.vb @@ -48,7 +48,7 @@ Public Class clsOutputLogger ''' Event to show a new output as been added ''' ''' - Public Event NewOutputAdded(outputElement As clsOutputElement) + Public Event NewOutputAdded(outputElement As clsOutputElement, bDisplayOutputInExternalViewer As Boolean) ''' ''' Event to show an output as been added to a new filtered list @@ -70,7 +70,7 @@ Public Class clsOutputLogger End Set End Property - Public Sub AddOutput(strScript As String, strOutput As String, bAsFile As Boolean, bAddOutputInInternalViewer As Boolean) + 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 If String.IsNullOrWhiteSpace(strScript) Then Throw New Exception("Cannot find script to attach output to.") @@ -105,14 +105,8 @@ Public Class clsOutputLogger _outputElements.Add(outputElement) - If bAddOutputInInternalViewer Then - 'raise event for output pages - RaiseEvent NewOutputAdded(outputElement) - Else - Dim frmMaximiseOutput As New frmMaximiseOutput - frmMaximiseOutput.Show(strFileName:=strOutput) - End If - + 'raise event for output pages + RaiseEvent NewOutputAdded(outputElement, bDisplayOutputInExternalViewer) End Sub ''' diff --git a/instat/Model/RCommand/clsPrepareFunctionsForGrids.vb b/instat/Model/RCommand/clsPrepareFunctionsForGrids.vb index 792335f11bb..a55ccc8b2aa 100644 --- a/instat/Model/RCommand/clsPrepareFunctionsForGrids.vb +++ b/instat/Model/RCommand/clsPrepareFunctionsForGrids.vb @@ -334,7 +334,7 @@ Public Class clsPrepareFunctionsForGrids Else clsReplaceValue.AddParameter("new_value", strNewValue) End If - _RLink.RunScript(clsReplaceValue.ToScript(), strComment:="Replace Value In Data", bAddOutputInInternalViewer:=bAddOutputInInternalViewer) + _RLink.RunScript(clsReplaceValue.ToScript(), strComment:="Replace Value In Data") End Sub ''' diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 96188967e12..e904919e984 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -128,23 +128,27 @@ Public Class ucrOutputPage ''' Add output to page ''' ''' - Public Sub AddNewOutput(outputElement As clsOutputElement) + Public Sub AddNewOutput(outputElement As clsOutputElement, Optional bDisplayOutputInExternalViewer As Boolean = False) 'add the script first. This applies to whether the output has an output or not or 'whether it's just a script output AddNewScript(outputElement) 'then add the output of the script. If the output element is just a script, ignore it since it's already been added above If Not String.IsNullOrEmpty(outputElement.Output) Then - Select Case outputElement.OutputType - Case OutputType.TextOutput - AddNewTextOutput(outputElement) - Case OutputType.ImageOutput - AddNewImageOutput(outputElement) - Case OutputType.HtmlOutput - AddNewHtmlOutput(outputElement) - End Select + If bDisplayOutputInExternalViewer Then + Dim frmMaximiseOutput As New frmMaximiseOutput + frmMaximiseOutput.Show(strFileName:=outputElement.Output) + Else + Select Case outputElement.OutputType + Case OutputType.TextOutput + AddNewTextOutput(outputElement) + Case OutputType.ImageOutput + AddNewImageOutput(outputElement) + Case OutputType.HtmlOutput + AddNewHtmlOutput(outputElement) + End Select + End If End If - pnlMain.VerticalScroll.Value = pnlMain.VerticalScroll.Maximum pnlMain.PerformLayout() End Sub diff --git a/instat/UserControl/ucrOutputPages.vb b/instat/UserControl/ucrOutputPages.vb index ef44609f511..c70a13cb346 100644 --- a/instat/UserControl/ucrOutputPages.vb +++ b/instat/UserControl/ucrOutputPages.vb @@ -80,8 +80,8 @@ Public Class ucrOutputPages AddHandler ucrMainOutputPage.RefreshContextButtons, AddressOf EnableDisableTopButtons End Sub - Private Sub AddNewOutput(outputElement As clsOutputElement) - ucrMainOutputPage.AddNewOutput(outputElement) + Private Sub AddNewOutput(outputElement As clsOutputElement, bDisplayOutputInExternalViewer As Boolean) + ucrMainOutputPage.AddNewOutput(outputElement, bDisplayOutputInExternalViewer) End Sub Private Sub AddNewOutputToTab(outputElement As clsOutputElement, tabName As String) diff --git a/instat/UserControls/frmMaximiseOutput.vb b/instat/UserControls/frmMaximiseOutput.vb index faee2d215eb..888fdad5492 100644 --- a/instat/UserControls/frmMaximiseOutput.vb +++ b/instat/UserControls/frmMaximiseOutput.vb @@ -70,7 +70,10 @@ Public Class frmMaximiseOutput Return End Select - MyBase.Show() + 'todo. how else can we attach the main form to have this form be displayed infront of it (top most) + 'this is an issue when this function is called after click ok of a dialog + 'MyBase.Show() + MyBase.Show(frmMain) End Sub Private Sub mnuSave_Click(sender As Object, e As EventArgs) Handles mnuSave.Click diff --git a/instat/clsRCodeStructure.vb b/instat/clsRCodeStructure.vb index 26ba9545ee8..5e96db4c7fa 100644 --- a/instat/clsRCodeStructure.vb +++ b/instat/clsRCodeStructure.vb @@ -529,7 +529,7 @@ Public Class RCodeStructure 'set the R command and parameters for the add object R function. This is used for adding the object in the data book 'set the R command and parameters for the get object R function. This is used for viewing the object. clsAddRObject.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_object") - clsGetRObject.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object") + clsGetRObject.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") If Not String.IsNullOrEmpty(_strDataFrameNameToAddAssignToObject) Then clsAddRObject.AddParameter("data_name", Chr(34) & _strDataFrameNameToAddAssignToObject & Chr(34)) @@ -537,6 +537,7 @@ Public Class RCodeStructure End If clsGetRObject.AddParameter("object_name", Chr(34) & _strAssignToName & Chr(34)) + clsGetRObject.AddParameter("as_file", "TRUE") clsAddRObject.AddParameter("object_name", Chr(34) & _strAssignToName & Chr(34)) clsAddRObject.AddParameter("object_type_label", Chr(34) & _strAssignToObjectTypeLabel & Chr(34)) diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 28380d7c9f8..4bd903faa83 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -781,9 +781,6 @@ Public Class RLink ''' . ''' if false and an exception is raised then open a message box that ''' displays the exception message. - ''' if true and the script produces and output, the output will be added - ''' in the output viewer, if false, the output will be displayed in a different viewer. - ''' displays the exception message. '''-------------------------------------------------------------------------------------------- Public Sub RunScript(strScript As String, Optional iCallType As Integer = 0, @@ -791,8 +788,7 @@ Public Class RLink Optional bSeparateThread As Boolean = True, Optional bShowWaitDialogOverride As Nullable(Of Boolean) = Nothing, Optional bUpdateGrids As Boolean = True, - Optional bSilent As Boolean = False, - Optional bAddOutputInInternalViewer As Boolean = True) + Optional bSilent As Boolean = False) 'if there is no script to run then just ignore and exit sub If String.IsNullOrWhiteSpace(strScript) Then @@ -804,6 +800,8 @@ Public Class RLink Dim strScriptWithComment As String = If(String.IsNullOrEmpty(strComment), strScript, GetFormattedComment(strComment) & Environment.NewLine & strScript) If bLogRScripts Then + 'todo. adding a lot of text to the text control can raise an out of memory exception. + 'change this to only display the text when the audit log is visible. txtLog.Text = txtLog.Text & strScriptWithComment & Environment.NewLine End If @@ -812,43 +810,45 @@ Public Class RLink ' MsgBox("The following command cannot be run because it exceeds the character limit of 2000 characters for a command in R-Instat." & Environment.NewLine & strScript & Environment.NewLine & Environment.NewLine & "It may be possible to run the command directly in R.", MsgBoxStyle.Critical, "Cannot run command") Try + Dim strOutput As String = "" + Dim bAsFile As Boolean = True + Dim bDisplayOutputInExternalViewer As Boolean = False 'get the last R script command. todo, this should eventually use the RScript library functions to identify the last R script command Dim strLastScript As String = GetRunnableCommandLines(strScript).LastOrDefault - If strLastScript.Contains("get_object") OrElse strLastScript.Contains("get_last_object") OrElse strLastScript.Contains("view_object") Then + If strLastScript.StartsWith(strInstatDataObject & "$get_object_data") OrElse + strLastScript.StartsWith(strInstatDataObject & "$get_last_object_data") OrElse + strLastScript.StartsWith("view_object_data") Then - Dim strFilePathName As String = GetFileOutput(strScript, bSilent, bSeparateThread, bShowWaitDialogOverride) - If Not String.IsNullOrEmpty(strFilePathName) Then - clsOutputLogger.AddOutput(strScriptWithComment, strFilePathName, True, bAddOutputInInternalViewer) - End If + strOutput = GetFileOutput(strScript, bSilent, bSeparateThread, bShowWaitDialogOverride) + 'if last function is view_object then display in external viewer (maximised) + bDisplayOutputInExternalViewer = strLastScript.Contains("view_object_data") + ElseIf strLastScript.StartsWith("print") Then + bAsFile = False + Evaluate(strScript, bSilent:=bSilent, bSeparateThread:=bSeparateThread, bShowWaitDialogOverride:=bShowWaitDialogOverride) ElseIf iCallType = 0 Then 'if script output should be ignored. todo. deprecate this block after implementing correctly + bAsFile = False Evaluate(strScript, bSilent:=bSilent, bSeparateThread:=bSeparateThread, bShowWaitDialogOverride:=bShowWaitDialogOverride) - clsOutputLogger.AddOutput(strScriptWithComment, "", False, bAddOutputInInternalViewer) ElseIf iCallType = 1 OrElse iCallType = 4 Then + 'todo. this is used by the calculator dialog 'todo. icall types 1 and 4 seem not to be used anywhere? remove this block? 'else if script output should be stored in a temp variable ' TODO SJL In RInstat, iCallType only seems to be 0, 2 or 3. Are icall types 1 and 4 used? - + bAsFile = False Dim strTempAssignTo As String = ".temp_val" 'TODO check this is valid syntax in all cases ' i.e. this is potentially: x <- y <- 1 Evaluate(strTempAssignTo & " <- " & strScript, bSilent:=bSilent, bSeparateThread:=bSeparateThread, bShowWaitDialogOverride:=bShowWaitDialogOverride) Dim expTemp As RDotNet.SymbolicExpression = GetSymbol(strTempAssignTo) If expTemp IsNot Nothing Then - Dim strOutput As String = String.Join(Environment.NewLine, expTemp.AsCharacter()) & Environment.NewLine - ' if there's something to output - If strOutput IsNot Nothing AndAlso strOutput <> "" Then - clsOutputLogger.AddOutput(strScriptWithComment, strOutput, False, bAddOutputInInternalViewer) - End If + strOutput = String.Join(Environment.NewLine, expTemp.AsCharacter()) & Environment.NewLine End If - Else 'else if script output should not be ignored or not stored as an object or variable Dim arrRScriptLines() As String = GetRunnableCommandLines(strScript) - 'if output should be stored as a variable just execute the script If arrRScriptLines.Last().Contains("<-") Then Evaluate(strScript, bSilent:=bSilent, bSeparateThread:=bSeparateThread, bShowWaitDialogOverride:=bShowWaitDialogOverride) @@ -861,15 +861,14 @@ Public Class RLink End If If bSuccess Then - Dim strFilePathName As String = GetFileOutput("view_object(object = " & arrRScriptLines.Last() & " , object_format = 'text' )", bSilent, bSeparateThread, bShowWaitDialogOverride) - If Not String.IsNullOrEmpty(strFilePathName) Then - clsOutputLogger.AddOutput(strScriptWithComment, strFilePathName, True, bAddOutputInInternalViewer) - End If + strOutput = GetFileOutput("view_object_data(object = " & arrRScriptLines.Last() & " , object_format = 'text' )", bSilent, bSeparateThread, bShowWaitDialogOverride) End If End If End If + 'log script and output + clsOutputLogger.AddOutput(strScriptWithComment, strOutput, bAsFile, bDisplayOutputInExternalViewer) Catch e As Exception MsgBox(e.Message & Environment.NewLine & "The error occurred in attempting to run the following R command(s):" & Environment.NewLine & strScript, MsgBoxStyle.Critical, "Error running R command(s)") End Try @@ -982,27 +981,6 @@ Public Class RLink Return strScriptCmd End Function - - '''-------------------------------------------------------------------------------------------- - ''' View last graph. - ''' - ''' (Optional) If true then view last graph as plotly. - '''-------------------------------------------------------------------------------------------- - Public Sub ViewLastGraph(bAsPlotly As String) - Dim clsLastGraph As New RFunction - clsLastGraph.SetRCommand(strInstatDataObject & "$get_last_graph") - clsLastGraph.AddParameter("print_graph", "FALSE", iPosition:=0) - - Dim strGlobalGraphDisplayOption As String - 'store the current set graph display option, to restore after display - strGlobalGraphDisplayOption = Me.strGraphDisplayOption - Me.strGraphDisplayOption = "view_R_viewer" - clsLastGraph.AddParameter("print_graph", "TRUE", iPosition:=0) - RunScript(clsLastGraph.ToScript(), iCallType:=3, bAddOutputInInternalViewer:=False, strComment:="View last graph", bSeparateThread:=False) - 'restore the graph display option - Me.strGraphDisplayOption = strGlobalGraphDisplayOption - End Sub - '''-------------------------------------------------------------------------------------------- ''' Executes the the R script and returns the result ''' as a 'SymbolicExpression' object. @@ -1430,14 +1408,17 @@ Public Class RLink clsGetItems.SetRCommand(strInstatDataObject & "$get_filter_names") Case "column_selection" clsGetItems.SetRCommand(strInstatDataObject & "$get_column_selection_names") - Case "object" + Case "object", + RObjectTypeLabel.Graph, + RObjectTypeLabel.Model, + RObjectTypeLabel.Table, + RObjectTypeLabel.Summary, + RObjectTypeLabel.StructureLabel clsGetItems.SetRCommand(strInstatDataObject & "$get_object_names") - Case "model" - clsGetItems.SetRCommand(strInstatDataObject & "$get_model_names") - Case "graph" - clsGetItems.SetRCommand(strInstatDataObject & "$get_graph_names") - Case "surv" - clsGetItems.SetRCommand(strInstatDataObject & "$get_surv_names") + If strType <> "object" Then + clsGetItems.AddParameter(strParameterName:="object_type_label", + strParameterValue:=Chr(34) & strType & Chr(34)) + End If Case "dataframe" clsGetItems.SetRCommand(strInstatDataObject & "$get_data_names") Case "link" @@ -1452,8 +1433,6 @@ Public Class RLink clsGetItems.AddParameter("file", Chr(34) & strNcFilePath & Chr(34)) Case "variable_sets" clsGetItems.SetRCommand(strInstatDataObject & "$get_variable_sets_names") - Case "table" - clsGetItems.SetRCommand(strInstatDataObject & "$get_table_names") Case "calculation" clsGetItems.SetRCommand(strInstatDataObject & "$get_calculation_names") End Select diff --git a/instat/dlgCombineforGraphics.vb b/instat/dlgCombineforGraphics.vb index f922d0c0af6..df1997762ac 100644 --- a/instat/dlgCombineforGraphics.vb +++ b/instat/dlgCombineforGraphics.vb @@ -19,7 +19,7 @@ Public Class dlgCombineforGraphics Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private bResetSubDialog As Boolean = False - Private clsDefaultRFunction As New RFunction + Private clsArrangeRFunction As New RFunction Private Sub dlgCombineforGraphics_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -42,28 +42,32 @@ Public Class dlgCombineforGraphics ucrCombineGraphReceiver.SetParameter(New RParameter("grobs", 0)) ucrCombineGraphReceiver.SetParameterIsRFunction() ucrCombineGraphReceiver.Selector = ucrCombineGraphSelector - ucrCombineGraphReceiver.SetItemType("graph") + ucrCombineGraphReceiver.SetItemType(RObjectTypeLabel.Graph) ucrCombineGraphReceiver.strSelectorHeading = "Graphs" ucrSave.SetPrefix("combined_graph") ucrSave.SetDataFrameSelector(ucrCombineGraphSelector.ucrAvailableDataFrames) - ucrSave.SetSaveTypeAsGraph() + ucrSave.SetSaveType(strRObjectType:=RObjectTypeLabel.Graph, strRObjectFormat:=RObjectFormat.Image) ucrSave.SetCheckBoxText("Save Graph") ucrSave.SetIsComboBox() ucrSave.SetAssignToIfUncheckedValue("last_graph") End Sub Private Sub SetDefaults() - clsDefaultRFunction = New RFunction + clsArrangeRFunction = New RFunction ucrCombineGraphReceiver.SetMeAsReceiver() ucrCombineGraphSelector.Reset() ucrSave.Reset() - clsDefaultRFunction.SetPackageName("gridExtra") - clsDefaultRFunction.SetRCommand("grid.arrange") - clsDefaultRFunction.SetAssignTo("last_graph", strTempDataframe:=ucrCombineGraphSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") - ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultRFunction) + clsArrangeRFunction.SetPackageName("gridExtra") + clsArrangeRFunction.SetRCommand("grid.arrange") + clsArrangeRFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrCombineGraphSelector.strCurrentDataFrame, + strObjectName:="last_graph") + ucrBase.clsRsyntax.SetBaseRFunction(clsArrangeRFunction) bResetSubDialog = True End Sub diff --git a/instat/dlgConversions.Designer.vb b/instat/dlgConversions.Designer.vb index f18720aa5b1..254a657ce7f 100644 --- a/instat/dlgConversions.Designer.vb +++ b/instat/dlgConversions.Designer.vb @@ -31,32 +31,25 @@ Partial Class dlgConversions Me.rdoColumn = New System.Windows.Forms.RadioButton() Me.rdoSingleValue = New System.Windows.Forms.RadioButton() Me.grpLatitude = New System.Windows.Forms.GroupBox() - Me.ucrInputLatitude = New instat.ucrInputTextBox() - Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() - Me.ucrPnlLatitude = New instat.UcrPanel() Me.grpElements = New System.Windows.Forms.GroupBox() Me.lblDecimal = New System.Windows.Forms.Label() - Me.ucrNudDecimal = New instat.ucrNud() Me.rdoWindSpeed = New System.Windows.Forms.RadioButton() - Me.ucrInputFromTemperature = New instat.ucrInputComboBox() Me.rdoRain = New System.Windows.Forms.RadioButton() - Me.ucrInputToWindSpeed = New instat.ucrInputComboBox() Me.rdoTemperature = New System.Windows.Forms.RadioButton() - Me.ucrInputToTemperature = New instat.ucrInputComboBox() - Me.ucrPnlElements = New instat.UcrPanel() - Me.ucrInputFromWindSpeed = New instat.ucrInputComboBox() - Me.ucrInputFromPrecipitation = New instat.ucrInputComboBox() - Me.ucrInputToPrecipitation = New instat.ucrInputComboBox() Me.rdoCoordinates = New System.Windows.Forms.RadioButton() Me.lblMinutes = New System.Windows.Forms.Label() Me.lblSeconds = New System.Windows.Forms.Label() Me.lblDegrees = New System.Windows.Forms.Label() Me.lblDirection = New System.Windows.Forms.Label() + Me.rdoYear = New System.Windows.Forms.RadioButton() + Me.lblYear = New System.Windows.Forms.Label() + Me.lblBaseYear = New System.Windows.Forms.Label() + Me.ucrNudBaseYear = New instat.ucrNud() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() Me.ucrSaveColumn = New instat.ucrSave() Me.ucrInputDirection = New instat.ucrInputComboBox() Me.ucrChkVariable = New instat.ucrCheck() Me.ucrInputSecond = New instat.ucrInputTextBox() - Me.ucrInputDegree = New instat.ucrInputTextBox() Me.ucrReceiverLetters = New instat.ucrReceiverSingle() Me.ucrSaveConversions = New instat.ucrSave() Me.ucrReceiverDegrees = New instat.ucrReceiverSingle() @@ -66,13 +59,20 @@ Partial Class dlgConversions Me.ucrPnlConversions = New instat.UcrPanel() Me.ucrSelectorConversions = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.ucrNudDecimal = New instat.ucrNud() + Me.ucrInputToTemperature = New instat.ucrInputComboBox() + Me.ucrPnlElements = New instat.UcrPanel() + Me.ucrInputFromPrecipitation = New instat.ucrInputComboBox() + Me.ucrInputToPrecipitation = New instat.ucrInputComboBox() + Me.ucrInputToWindSpeed = New instat.ucrInputComboBox() + Me.ucrInputFromTemperature = New instat.ucrInputComboBox() + Me.ucrInputFromWindSpeed = New instat.ucrInputComboBox() Me.ucrInputMinute = New instat.ucrInputTextBox() Me.ucrReceiverMinutes = New instat.ucrReceiverSingle() - Me.rdoYear = New System.Windows.Forms.RadioButton() - Me.ucrReceiverYear = New instat.ucrReceiverSingle() - Me.lblYear = New System.Windows.Forms.Label() - Me.ucrNudBaseYear = New instat.ucrNud() - Me.lblBaseYear = New System.Windows.Forms.Label() + Me.ucrInputLatitude = New instat.ucrInputTextBox() + Me.ucrReceiverLatitude = New instat.ucrReceiverSingle() + Me.ucrPnlLatitude = New instat.UcrPanel() + Me.ucrInputDegree = New instat.ucrInputTextBox() Me.grpLatitude.SuspendLayout() Me.grpElements.SuspendLayout() Me.SuspendLayout() @@ -138,7 +138,7 @@ Partial Class dlgConversions ' Me.lblTo.AutoSize = True Me.lblTo.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTo.Location = New System.Drawing.Point(148, 59) + Me.lblTo.Location = New System.Drawing.Point(163, 59) Me.lblTo.Name = "lblTo" Me.lblTo.Size = New System.Drawing.Size(23, 13) Me.lblTo.TabIndex = 17 @@ -192,57 +192,25 @@ Partial Class dlgConversions Me.grpLatitude.TabStop = False Me.grpLatitude.Text = "Latitude" ' - 'ucrInputLatitude - ' - Me.ucrInputLatitude.AddQuotesIfUnrecognised = True - Me.ucrInputLatitude.AutoSize = True - Me.ucrInputLatitude.IsMultiline = False - Me.ucrInputLatitude.IsReadOnly = False - Me.ucrInputLatitude.Location = New System.Drawing.Point(100, 34) - Me.ucrInputLatitude.Name = "ucrInputLatitude" - Me.ucrInputLatitude.Size = New System.Drawing.Size(67, 21) - Me.ucrInputLatitude.TabIndex = 27 - ' - 'ucrReceiverLatitude - ' - Me.ucrReceiverLatitude.AutoSize = True - Me.ucrReceiverLatitude.frmParent = Me - Me.ucrReceiverLatitude.Location = New System.Drawing.Point(100, 61) - Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" - Me.ucrReceiverLatitude.Selector = Nothing - Me.ucrReceiverLatitude.Size = New System.Drawing.Size(138, 20) - Me.ucrReceiverLatitude.strNcFilePath = "" - Me.ucrReceiverLatitude.TabIndex = 29 - Me.ucrReceiverLatitude.ucrSelector = Nothing - ' - 'ucrPnlLatitude - ' - Me.ucrPnlLatitude.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlLatitude.Location = New System.Drawing.Point(7, 34) - Me.ucrPnlLatitude.Name = "ucrPnlLatitude" - Me.ucrPnlLatitude.Size = New System.Drawing.Size(87, 48) - Me.ucrPnlLatitude.TabIndex = 26 - ' 'grpElements ' Me.grpElements.Controls.Add(Me.lblDecimal) Me.grpElements.Controls.Add(Me.ucrNudDecimal) Me.grpElements.Controls.Add(Me.rdoWindSpeed) - Me.grpElements.Controls.Add(Me.ucrInputFromTemperature) Me.grpElements.Controls.Add(Me.rdoRain) - Me.grpElements.Controls.Add(Me.ucrInputToWindSpeed) Me.grpElements.Controls.Add(Me.rdoTemperature) - Me.grpElements.Controls.Add(Me.ucrInputToTemperature) Me.grpElements.Controls.Add(Me.ucrPnlElements) - Me.grpElements.Controls.Add(Me.ucrInputFromWindSpeed) Me.grpElements.Controls.Add(Me.lblFrom) - Me.grpElements.Controls.Add(Me.ucrInputFromPrecipitation) Me.grpElements.Controls.Add(Me.ucrInputToPrecipitation) Me.grpElements.Controls.Add(Me.lblTo) + Me.grpElements.Controls.Add(Me.ucrInputToWindSpeed) + Me.grpElements.Controls.Add(Me.ucrInputToTemperature) + Me.grpElements.Controls.Add(Me.ucrInputFromPrecipitation) + Me.grpElements.Controls.Add(Me.ucrInputFromTemperature) + Me.grpElements.Controls.Add(Me.ucrInputFromWindSpeed) Me.grpElements.Location = New System.Drawing.Point(10, 289) Me.grpElements.Name = "grpElements" - Me.grpElements.Size = New System.Drawing.Size(397, 106) + Me.grpElements.Size = New System.Drawing.Size(408, 116) Me.grpElements.TabIndex = 14 Me.grpElements.TabStop = False Me.grpElements.Text = "Elements" @@ -251,25 +219,12 @@ Partial Class dlgConversions ' Me.lblDecimal.AutoSize = True Me.lblDecimal.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDecimal.Location = New System.Drawing.Point(290, 78) + Me.lblDecimal.Location = New System.Drawing.Point(309, 78) Me.lblDecimal.Name = "lblDecimal" Me.lblDecimal.Size = New System.Drawing.Size(45, 13) Me.lblDecimal.TabIndex = 1 Me.lblDecimal.Text = "Decimal" ' - 'ucrNudDecimal - ' - Me.ucrNudDecimal.AutoSize = True - Me.ucrNudDecimal.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDecimal.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDecimal.Location = New System.Drawing.Point(345, 75) - Me.ucrNudDecimal.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudDecimal.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDecimal.Name = "ucrNudDecimal" - Me.ucrNudDecimal.Size = New System.Drawing.Size(39, 20) - Me.ucrNudDecimal.TabIndex = 2 - Me.ucrNudDecimal.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'rdoWindSpeed ' Me.rdoWindSpeed.Appearance = System.Windows.Forms.Appearance.Button @@ -290,17 +245,6 @@ Partial Class dlgConversions Me.rdoWindSpeed.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoWindSpeed.UseVisualStyleBackColor = True ' - 'ucrInputFromTemperature - ' - Me.ucrInputFromTemperature.AddQuotesIfUnrecognised = True - Me.ucrInputFromTemperature.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputFromTemperature.GetSetSelectedIndex = -1 - Me.ucrInputFromTemperature.IsReadOnly = False - Me.ucrInputFromTemperature.Location = New System.Drawing.Point(9, 75) - Me.ucrInputFromTemperature.Name = "ucrInputFromTemperature" - Me.ucrInputFromTemperature.Size = New System.Drawing.Size(117, 21) - Me.ucrInputFromTemperature.TabIndex = 19 - ' 'rdoRain ' Me.rdoRain.Appearance = System.Windows.Forms.Appearance.Button @@ -321,17 +265,6 @@ Partial Class dlgConversions Me.rdoRain.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoRain.UseVisualStyleBackColor = True ' - 'ucrInputToWindSpeed - ' - Me.ucrInputToWindSpeed.AddQuotesIfUnrecognised = True - Me.ucrInputToWindSpeed.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputToWindSpeed.GetSetSelectedIndex = -1 - Me.ucrInputToWindSpeed.IsReadOnly = False - Me.ucrInputToWindSpeed.Location = New System.Drawing.Point(153, 75) - Me.ucrInputToWindSpeed.Name = "ucrInputToWindSpeed" - Me.ucrInputToWindSpeed.Size = New System.Drawing.Size(117, 21) - Me.ucrInputToWindSpeed.TabIndex = 22 - ' 'rdoTemperature ' Me.rdoTemperature.Appearance = System.Windows.Forms.Appearance.Button @@ -352,58 +285,6 @@ Partial Class dlgConversions Me.rdoTemperature.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoTemperature.UseVisualStyleBackColor = True ' - 'ucrInputToTemperature - ' - Me.ucrInputToTemperature.AddQuotesIfUnrecognised = True - Me.ucrInputToTemperature.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputToTemperature.GetSetSelectedIndex = -1 - Me.ucrInputToTemperature.IsReadOnly = False - Me.ucrInputToTemperature.Location = New System.Drawing.Point(153, 75) - Me.ucrInputToTemperature.Name = "ucrInputToTemperature" - Me.ucrInputToTemperature.Size = New System.Drawing.Size(117, 21) - Me.ucrInputToTemperature.TabIndex = 20 - ' - 'ucrPnlElements - ' - Me.ucrPnlElements.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlElements.Location = New System.Drawing.Point(72, 12) - Me.ucrPnlElements.Name = "ucrPnlElements" - Me.ucrPnlElements.Size = New System.Drawing.Size(269, 40) - Me.ucrPnlElements.TabIndex = 11 - ' - 'ucrInputFromWindSpeed - ' - Me.ucrInputFromWindSpeed.AddQuotesIfUnrecognised = True - Me.ucrInputFromWindSpeed.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputFromWindSpeed.GetSetSelectedIndex = -1 - Me.ucrInputFromWindSpeed.IsReadOnly = False - Me.ucrInputFromWindSpeed.Location = New System.Drawing.Point(9, 75) - Me.ucrInputFromWindSpeed.Name = "ucrInputFromWindSpeed" - Me.ucrInputFromWindSpeed.Size = New System.Drawing.Size(117, 21) - Me.ucrInputFromWindSpeed.TabIndex = 21 - ' - 'ucrInputFromPrecipitation - ' - Me.ucrInputFromPrecipitation.AddQuotesIfUnrecognised = True - Me.ucrInputFromPrecipitation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputFromPrecipitation.GetSetSelectedIndex = -1 - Me.ucrInputFromPrecipitation.IsReadOnly = False - Me.ucrInputFromPrecipitation.Location = New System.Drawing.Point(9, 75) - Me.ucrInputFromPrecipitation.Name = "ucrInputFromPrecipitation" - Me.ucrInputFromPrecipitation.Size = New System.Drawing.Size(117, 21) - Me.ucrInputFromPrecipitation.TabIndex = 16 - ' - 'ucrInputToPrecipitation - ' - Me.ucrInputToPrecipitation.AddQuotesIfUnrecognised = True - Me.ucrInputToPrecipitation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputToPrecipitation.GetSetSelectedIndex = -1 - Me.ucrInputToPrecipitation.IsReadOnly = False - Me.ucrInputToPrecipitation.Location = New System.Drawing.Point(153, 75) - Me.ucrInputToPrecipitation.Name = "ucrInputToPrecipitation" - Me.ucrInputToPrecipitation.Size = New System.Drawing.Size(117, 21) - Me.ucrInputToPrecipitation.TabIndex = 18 - ' 'rdoCoordinates ' Me.rdoCoordinates.Appearance = System.Windows.Forms.Appearance.Button @@ -463,6 +344,71 @@ Partial Class dlgConversions Me.lblDirection.TabIndex = 24 Me.lblDirection.Text = "Direction:" ' + 'rdoYear + ' + Me.rdoYear.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoYear.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoYear.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoYear.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoYear.FlatAppearance.BorderSize = 2 + Me.rdoYear.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoYear.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoYear.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoYear.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoYear.Location = New System.Drawing.Point(323, 21) + Me.rdoYear.Name = "rdoYear" + Me.rdoYear.Size = New System.Drawing.Size(101, 28) + Me.rdoYear.TabIndex = 27 + Me.rdoYear.Text = "Year" + Me.rdoYear.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoYear.UseVisualStyleBackColor = True + ' + 'lblYear + ' + Me.lblYear.AutoSize = True + Me.lblYear.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblYear.Location = New System.Drawing.Point(265, 93) + Me.lblYear.Name = "lblYear" + Me.lblYear.Size = New System.Drawing.Size(32, 13) + Me.lblYear.TabIndex = 29 + Me.lblYear.Text = "Year:" + ' + 'lblBaseYear + ' + Me.lblBaseYear.AutoSize = True + Me.lblBaseYear.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblBaseYear.Location = New System.Drawing.Point(265, 136) + Me.lblBaseYear.Name = "lblBaseYear" + Me.lblBaseYear.Size = New System.Drawing.Size(59, 13) + Me.lblBaseYear.TabIndex = 31 + Me.lblBaseYear.Text = "Base Year:" + ' + 'ucrNudBaseYear + ' + Me.ucrNudBaseYear.AutoSize = True + Me.ucrNudBaseYear.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBaseYear.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudBaseYear.Location = New System.Drawing.Point(265, 152) + Me.ucrNudBaseYear.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudBaseYear.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBaseYear.Name = "ucrNudBaseYear" + Me.ucrNudBaseYear.Size = New System.Drawing.Size(64, 20) + Me.ucrNudBaseYear.TabIndex = 30 + Me.ucrNudBaseYear.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrReceiverYear + ' + Me.ucrReceiverYear.AutoSize = True + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Location = New System.Drawing.Point(265, 109) + 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, 20) + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.TabIndex = 28 + Me.ucrReceiverYear.ucrSelector = Nothing + ' 'ucrSaveColumn ' Me.ucrSaveColumn.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -503,17 +449,6 @@ Partial Class dlgConversions Me.ucrInputSecond.Size = New System.Drawing.Size(120, 20) Me.ucrInputSecond.TabIndex = 12 ' - 'ucrInputDegree - ' - Me.ucrInputDegree.AddQuotesIfUnrecognised = True - Me.ucrInputDegree.AutoSize = True - Me.ucrInputDegree.IsMultiline = False - Me.ucrInputDegree.IsReadOnly = False - Me.ucrInputDegree.Location = New System.Drawing.Point(265, 109) - Me.ucrInputDegree.Name = "ucrInputDegree" - Me.ucrInputDegree.Size = New System.Drawing.Size(120, 20) - Me.ucrInputDegree.TabIndex = 8 - ' 'ucrReceiverLetters ' Me.ucrReceiverLetters.AutoSize = True @@ -617,6 +552,93 @@ Partial Class dlgConversions Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 17 ' + 'ucrNudDecimal + ' + Me.ucrNudDecimal.AutoSize = True + Me.ucrNudDecimal.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDecimal.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudDecimal.Location = New System.Drawing.Point(364, 75) + Me.ucrNudDecimal.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudDecimal.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDecimal.Name = "ucrNudDecimal" + Me.ucrNudDecimal.Size = New System.Drawing.Size(39, 20) + Me.ucrNudDecimal.TabIndex = 2 + Me.ucrNudDecimal.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputToTemperature + ' + Me.ucrInputToTemperature.AddQuotesIfUnrecognised = True + Me.ucrInputToTemperature.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputToTemperature.GetSetSelectedIndex = -1 + Me.ucrInputToTemperature.IsReadOnly = False + Me.ucrInputToTemperature.Location = New System.Drawing.Point(167, 75) + Me.ucrInputToTemperature.Name = "ucrInputToTemperature" + Me.ucrInputToTemperature.Size = New System.Drawing.Size(140, 24) + Me.ucrInputToTemperature.TabIndex = 20 + ' + 'ucrPnlElements + ' + Me.ucrPnlElements.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlElements.Location = New System.Drawing.Point(72, 12) + Me.ucrPnlElements.Name = "ucrPnlElements" + Me.ucrPnlElements.Size = New System.Drawing.Size(269, 40) + Me.ucrPnlElements.TabIndex = 11 + ' + 'ucrInputFromPrecipitation + ' + Me.ucrInputFromPrecipitation.AddQuotesIfUnrecognised = True + Me.ucrInputFromPrecipitation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputFromPrecipitation.GetSetSelectedIndex = -1 + Me.ucrInputFromPrecipitation.IsReadOnly = False + Me.ucrInputFromPrecipitation.Location = New System.Drawing.Point(9, 75) + Me.ucrInputFromPrecipitation.Name = "ucrInputFromPrecipitation" + Me.ucrInputFromPrecipitation.Size = New System.Drawing.Size(152, 24) + Me.ucrInputFromPrecipitation.TabIndex = 16 + ' + 'ucrInputToPrecipitation + ' + Me.ucrInputToPrecipitation.AddQuotesIfUnrecognised = True + Me.ucrInputToPrecipitation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputToPrecipitation.GetSetSelectedIndex = -1 + Me.ucrInputToPrecipitation.IsReadOnly = False + Me.ucrInputToPrecipitation.Location = New System.Drawing.Point(166, 75) + Me.ucrInputToPrecipitation.Name = "ucrInputToPrecipitation" + Me.ucrInputToPrecipitation.Size = New System.Drawing.Size(141, 31) + Me.ucrInputToPrecipitation.TabIndex = 18 + ' + 'ucrInputToWindSpeed + ' + Me.ucrInputToWindSpeed.AddQuotesIfUnrecognised = True + Me.ucrInputToWindSpeed.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputToWindSpeed.GetSetSelectedIndex = -1 + Me.ucrInputToWindSpeed.IsReadOnly = False + Me.ucrInputToWindSpeed.Location = New System.Drawing.Point(166, 75) + Me.ucrInputToWindSpeed.Name = "ucrInputToWindSpeed" + Me.ucrInputToWindSpeed.Size = New System.Drawing.Size(141, 31) + Me.ucrInputToWindSpeed.TabIndex = 22 + ' + 'ucrInputFromTemperature + ' + Me.ucrInputFromTemperature.AddQuotesIfUnrecognised = True + Me.ucrInputFromTemperature.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputFromTemperature.GetSetSelectedIndex = -1 + Me.ucrInputFromTemperature.IsReadOnly = False + Me.ucrInputFromTemperature.Location = New System.Drawing.Point(9, 75) + Me.ucrInputFromTemperature.Name = "ucrInputFromTemperature" + Me.ucrInputFromTemperature.Size = New System.Drawing.Size(152, 24) + Me.ucrInputFromTemperature.TabIndex = 19 + ' + 'ucrInputFromWindSpeed + ' + Me.ucrInputFromWindSpeed.AddQuotesIfUnrecognised = True + Me.ucrInputFromWindSpeed.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputFromWindSpeed.GetSetSelectedIndex = -1 + Me.ucrInputFromWindSpeed.IsReadOnly = False + Me.ucrInputFromWindSpeed.Location = New System.Drawing.Point(9, 75) + Me.ucrInputFromWindSpeed.Name = "ucrInputFromWindSpeed" + Me.ucrInputFromWindSpeed.Size = New System.Drawing.Size(152, 24) + Me.ucrInputFromWindSpeed.TabIndex = 21 + ' 'ucrInputMinute ' Me.ucrInputMinute.AddQuotesIfUnrecognised = True @@ -641,70 +663,48 @@ Partial Class dlgConversions Me.ucrReceiverMinutes.TabIndex = 10 Me.ucrReceiverMinutes.ucrSelector = Nothing ' - 'rdoYear - ' - Me.rdoYear.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoYear.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoYear.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoYear.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoYear.FlatAppearance.BorderSize = 2 - Me.rdoYear.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoYear.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoYear.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoYear.Location = New System.Drawing.Point(323, 21) - Me.rdoYear.Name = "rdoYear" - Me.rdoYear.Size = New System.Drawing.Size(101, 28) - Me.rdoYear.TabIndex = 27 - Me.rdoYear.Text = "Year" - Me.rdoYear.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoYear.UseVisualStyleBackColor = True - ' - 'ucrReceiverYear + 'ucrInputLatitude ' - Me.ucrReceiverYear.AutoSize = True - Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(265, 109) - 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, 20) - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 28 - Me.ucrReceiverYear.ucrSelector = Nothing + Me.ucrInputLatitude.AddQuotesIfUnrecognised = True + Me.ucrInputLatitude.AutoSize = True + Me.ucrInputLatitude.IsMultiline = False + Me.ucrInputLatitude.IsReadOnly = False + Me.ucrInputLatitude.Location = New System.Drawing.Point(100, 34) + Me.ucrInputLatitude.Name = "ucrInputLatitude" + Me.ucrInputLatitude.Size = New System.Drawing.Size(67, 21) + Me.ucrInputLatitude.TabIndex = 27 ' - 'lblYear + 'ucrReceiverLatitude ' - Me.lblYear.AutoSize = True - Me.lblYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYear.Location = New System.Drawing.Point(265, 93) - Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(32, 13) - Me.lblYear.TabIndex = 29 - Me.lblYear.Text = "Year:" + Me.ucrReceiverLatitude.AutoSize = True + Me.ucrReceiverLatitude.frmParent = Nothing + Me.ucrReceiverLatitude.Location = New System.Drawing.Point(100, 61) + Me.ucrReceiverLatitude.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLatitude.Name = "ucrReceiverLatitude" + Me.ucrReceiverLatitude.Selector = Nothing + Me.ucrReceiverLatitude.Size = New System.Drawing.Size(138, 20) + Me.ucrReceiverLatitude.strNcFilePath = "" + Me.ucrReceiverLatitude.TabIndex = 29 + Me.ucrReceiverLatitude.ucrSelector = Nothing ' - 'ucrNudBaseYear + 'ucrPnlLatitude ' - Me.ucrNudBaseYear.AutoSize = True - Me.ucrNudBaseYear.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudBaseYear.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudBaseYear.Location = New System.Drawing.Point(265, 152) - Me.ucrNudBaseYear.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudBaseYear.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudBaseYear.Name = "ucrNudBaseYear" - Me.ucrNudBaseYear.Size = New System.Drawing.Size(64, 20) - Me.ucrNudBaseYear.TabIndex = 30 - Me.ucrNudBaseYear.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrPnlLatitude.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlLatitude.Location = New System.Drawing.Point(7, 34) + Me.ucrPnlLatitude.Name = "ucrPnlLatitude" + Me.ucrPnlLatitude.Size = New System.Drawing.Size(87, 48) + Me.ucrPnlLatitude.TabIndex = 26 ' - 'lblBaseYear + 'ucrInputDegree ' - Me.lblBaseYear.AutoSize = True - Me.lblBaseYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBaseYear.Location = New System.Drawing.Point(265, 136) - Me.lblBaseYear.Name = "lblBaseYear" - Me.lblBaseYear.Size = New System.Drawing.Size(59, 13) - Me.lblBaseYear.TabIndex = 31 - Me.lblBaseYear.Text = "Base Year:" + Me.ucrInputDegree.AddQuotesIfUnrecognised = True + Me.ucrInputDegree.AutoSize = True + Me.ucrInputDegree.IsMultiline = False + Me.ucrInputDegree.IsReadOnly = False + Me.ucrInputDegree.Location = New System.Drawing.Point(265, 109) + Me.ucrInputDegree.Name = "ucrInputDegree" + Me.ucrInputDegree.Size = New System.Drawing.Size(120, 20) + Me.ucrInputDegree.TabIndex = 8 ' 'dlgConversions ' diff --git a/instat/dlgDescribeTwoVarGraph.Designer.vb b/instat/dlgDescribeTwoVarGraph.Designer.vb index f8bd1fbf831..6ed5dc4657e 100644 --- a/instat/dlgDescribeTwoVarGraph.Designer.vb +++ b/instat/dlgDescribeTwoVarGraph.Designer.vb @@ -114,7 +114,7 @@ Partial Class dlgDescribeTwoVarGraph Me.cmdOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdOptions.Location = New System.Drawing.Point(10, 227) Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(119, 23) + Me.cmdOptions.Size = New System.Drawing.Size(138, 23) Me.cmdOptions.TabIndex = 5 Me.cmdOptions.Tag = "Options..." Me.cmdOptions.Text = "Plot Options" @@ -841,7 +841,7 @@ Partial Class dlgDescribeTwoVarGraph Me.cmdPairOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdPairOptions.Location = New System.Drawing.Point(11, 226) Me.cmdPairOptions.Name = "cmdPairOptions" - Me.cmdPairOptions.Size = New System.Drawing.Size(119, 23) + Me.cmdPairOptions.Size = New System.Drawing.Size(137, 24) Me.cmdPairOptions.TabIndex = 66 Me.cmdPairOptions.Tag = "Options..." Me.cmdPairOptions.Text = "Pair Plot Options" @@ -853,7 +853,6 @@ Partial Class dlgDescribeTwoVarGraph Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(438, 516) - Me.Controls.Add(Me.cmdPairOptions) Me.Controls.Add(Me.ucrInputLabelSize) Me.Controls.Add(Me.lblLabelColour) Me.Controls.Add(Me.lblLabelSize) @@ -877,6 +876,7 @@ Partial Class dlgDescribeTwoVarGraph Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrReceiverFirstVars) Me.Controls.Add(Me.grpOptions) + Me.Controls.Add(Me.cmdPairOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/dlgEndOfRainsSeason.Designer.vb b/instat/dlgEndOfRainsSeason.Designer.vb index 60e7bf96740..491fc33273b 100644 --- a/instat/dlgEndOfRainsSeason.Designer.vb +++ b/instat/dlgEndOfRainsSeason.Designer.vb @@ -92,7 +92,7 @@ Partial Class dlgEndOfRainsSeason 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(271, 137) + Me.lblYear.Location = New System.Drawing.Point(306, 137) Me.lblYear.Name = "lblYear" Me.lblYear.Size = New System.Drawing.Size(32, 13) Me.lblYear.TabIndex = 5 @@ -101,7 +101,7 @@ Partial Class dlgEndOfRainsSeason 'lblDate ' Me.lblDate.AutoSize = True - Me.lblDate.Location = New System.Drawing.Point(271, 91) + Me.lblDate.Location = New System.Drawing.Point(306, 91) Me.lblDate.Name = "lblDate" Me.lblDate.Size = New System.Drawing.Size(33, 13) Me.lblDate.TabIndex = 3 @@ -110,7 +110,7 @@ Partial Class dlgEndOfRainsSeason 'lblDOY ' Me.lblDOY.AutoSize = True - Me.lblDOY.Location = New System.Drawing.Point(271, 181) + Me.lblDOY.Location = New System.Drawing.Point(306, 181) Me.lblDOY.Name = "lblDOY" Me.lblDOY.Size = New System.Drawing.Size(66, 13) Me.lblDOY.TabIndex = 7 @@ -129,7 +129,7 @@ Partial Class dlgEndOfRainsSeason 'lblRainfall ' Me.lblRainfall.AutoSize = True - Me.lblRainfall.Location = New System.Drawing.Point(271, 225) + Me.lblRainfall.Location = New System.Drawing.Point(306, 225) Me.lblRainfall.Name = "lblRainfall" Me.lblRainfall.Size = New System.Drawing.Size(70, 13) Me.lblRainfall.TabIndex = 9 @@ -147,7 +147,7 @@ Partial Class dlgEndOfRainsSeason 'lblStation ' Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(271, 46) + Me.lblStation.Location = New System.Drawing.Point(306, 46) Me.lblStation.Name = "lblStation" Me.lblStation.Size = New System.Drawing.Size(43, 13) Me.lblStation.TabIndex = 1 @@ -223,15 +223,15 @@ Partial Class dlgEndOfRainsSeason ' 'grpEndofSeason ' + Me.grpEndofSeason.Controls.Add(Me.ucrInputEndofSeasonOccurence) + Me.grpEndofSeason.Controls.Add(Me.ucrInputSeasonDoy) + Me.grpEndofSeason.Controls.Add(Me.ucrInputEndofSeasonDate) Me.grpEndofSeason.Controls.Add(Me.ucrChkEndofSeasonOccurence) Me.grpEndofSeason.Controls.Add(Me.ucrChkEndofSeasonDate) Me.grpEndofSeason.Controls.Add(Me.ucrChkEndofSeasonDoy) - Me.grpEndofSeason.Controls.Add(Me.ucrInputSeasonDoy) - Me.grpEndofSeason.Controls.Add(Me.ucrInputEndofSeasonDate) - Me.grpEndofSeason.Controls.Add(Me.ucrInputEndofSeasonOccurence) Me.grpEndofSeason.Location = New System.Drawing.Point(3, 426) Me.grpEndofSeason.Name = "grpEndofSeason" - Me.grpEndofSeason.Size = New System.Drawing.Size(428, 42) + Me.grpEndofSeason.Size = New System.Drawing.Size(472, 41) Me.grpEndofSeason.TabIndex = 32 Me.grpEndofSeason.TabStop = False Me.grpEndofSeason.Text = "End of Season" @@ -240,16 +240,16 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrChkEndofSeasonOccurence.AutoSize = True Me.ucrChkEndofSeasonOccurence.Checked = False - Me.ucrChkEndofSeasonOccurence.Location = New System.Drawing.Point(261, 18) + Me.ucrChkEndofSeasonOccurence.Location = New System.Drawing.Point(281, 17) Me.ucrChkEndofSeasonOccurence.Name = "ucrChkEndofSeasonOccurence" - Me.ucrChkEndofSeasonOccurence.Size = New System.Drawing.Size(70, 23) + Me.ucrChkEndofSeasonOccurence.Size = New System.Drawing.Size(84, 23) Me.ucrChkEndofSeasonOccurence.TabIndex = 48 ' 'ucrChkEndofSeasonDate ' Me.ucrChkEndofSeasonDate.AutoSize = True Me.ucrChkEndofSeasonDate.Checked = False - Me.ucrChkEndofSeasonDate.Location = New System.Drawing.Point(134, 18) + Me.ucrChkEndofSeasonDate.Location = New System.Drawing.Point(121, 16) Me.ucrChkEndofSeasonDate.Name = "ucrChkEndofSeasonDate" Me.ucrChkEndofSeasonDate.Size = New System.Drawing.Size(53, 23) Me.ucrChkEndofSeasonDate.TabIndex = 47 @@ -258,7 +258,7 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrChkEndofSeasonDoy.AutoSize = True Me.ucrChkEndofSeasonDoy.Checked = False - Me.ucrChkEndofSeasonDoy.Location = New System.Drawing.Point(4, 18) + Me.ucrChkEndofSeasonDoy.Location = New System.Drawing.Point(4, 16) Me.ucrChkEndofSeasonDoy.Name = "ucrChkEndofSeasonDoy" Me.ucrChkEndofSeasonDoy.Size = New System.Drawing.Size(58, 23) Me.ucrChkEndofSeasonDoy.TabIndex = 46 @@ -269,7 +269,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputSeasonDoy.AutoSize = True Me.ucrInputSeasonDoy.IsMultiline = False Me.ucrInputSeasonDoy.IsReadOnly = False - Me.ucrInputSeasonDoy.Location = New System.Drawing.Point(65, 17) + Me.ucrInputSeasonDoy.Location = New System.Drawing.Point(49, 15) Me.ucrInputSeasonDoy.Name = "ucrInputSeasonDoy" Me.ucrInputSeasonDoy.Size = New System.Drawing.Size(67, 21) Me.ucrInputSeasonDoy.TabIndex = 32 @@ -280,9 +280,9 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofSeasonDate.AutoSize = True Me.ucrInputEndofSeasonDate.IsMultiline = False Me.ucrInputEndofSeasonDate.IsReadOnly = False - Me.ucrInputEndofSeasonDate.Location = New System.Drawing.Point(188, 17) + Me.ucrInputEndofSeasonDate.Location = New System.Drawing.Point(165, 15) Me.ucrInputEndofSeasonDate.Name = "ucrInputEndofSeasonDate" - Me.ucrInputEndofSeasonDate.Size = New System.Drawing.Size(72, 21) + Me.ucrInputEndofSeasonDate.Size = New System.Drawing.Size(110, 21) Me.ucrInputEndofSeasonDate.TabIndex = 37 ' 'ucrInputEndofSeasonOccurence @@ -291,19 +291,19 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofSeasonOccurence.AutoSize = True Me.ucrInputEndofSeasonOccurence.IsMultiline = False Me.ucrInputEndofSeasonOccurence.IsReadOnly = False - Me.ucrInputEndofSeasonOccurence.Location = New System.Drawing.Point(333, 17) + Me.ucrInputEndofSeasonOccurence.Location = New System.Drawing.Point(361, 15) Me.ucrInputEndofSeasonOccurence.Name = "ucrInputEndofSeasonOccurence" - Me.ucrInputEndofSeasonOccurence.Size = New System.Drawing.Size(93, 21) + Me.ucrInputEndofSeasonOccurence.Size = New System.Drawing.Size(104, 21) Me.ucrInputEndofSeasonOccurence.TabIndex = 38 ' 'grpEndofRains ' + Me.grpEndofRains.Controls.Add(Me.ucrInputEndofRainsDate) + Me.grpEndofRains.Controls.Add(Me.ucrInputEndofRainsOccurence) Me.grpEndofRains.Controls.Add(Me.ucrInputEndRainDoy) Me.grpEndofRains.Controls.Add(Me.ucrChkEndofRainsDoy) Me.grpEndofRains.Controls.Add(Me.ucrChkEndofRainsDate) Me.grpEndofRains.Controls.Add(Me.ucrChkEndofRainsOccurence) - Me.grpEndofRains.Controls.Add(Me.ucrInputEndofRainsDate) - Me.grpEndofRains.Controls.Add(Me.ucrInputEndofRainsOccurence) Me.grpEndofRains.Location = New System.Drawing.Point(3, 426) Me.grpEndofRains.Name = "grpEndofRains" Me.grpEndofRains.Size = New System.Drawing.Size(429, 40) @@ -317,9 +317,9 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndRainDoy.AutoSize = True Me.ucrInputEndRainDoy.IsMultiline = False Me.ucrInputEndRainDoy.IsReadOnly = False - Me.ucrInputEndRainDoy.Location = New System.Drawing.Point(68, 17) + Me.ucrInputEndRainDoy.Location = New System.Drawing.Point(50, 17) Me.ucrInputEndRainDoy.Name = "ucrInputEndRainDoy" - Me.ucrInputEndRainDoy.Size = New System.Drawing.Size(67, 21) + Me.ucrInputEndRainDoy.Size = New System.Drawing.Size(65, 21) Me.ucrInputEndRainDoy.TabIndex = 50 ' 'ucrChkEndofRainsDoy @@ -335,7 +335,7 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrChkEndofRainsDate.AutoSize = True Me.ucrChkEndofRainsDate.Checked = False - Me.ucrChkEndofRainsDate.Location = New System.Drawing.Point(140, 18) + Me.ucrChkEndofRainsDate.Location = New System.Drawing.Point(118, 17) Me.ucrChkEndofRainsDate.Name = "ucrChkEndofRainsDate" Me.ucrChkEndofRainsDate.Size = New System.Drawing.Size(52, 23) Me.ucrChkEndofRainsDate.TabIndex = 48 @@ -344,9 +344,9 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrChkEndofRainsOccurence.AutoSize = True Me.ucrChkEndofRainsOccurence.Checked = False - Me.ucrChkEndofRainsOccurence.Location = New System.Drawing.Point(264, 18) + Me.ucrChkEndofRainsOccurence.Location = New System.Drawing.Point(264, 16) Me.ucrChkEndofRainsOccurence.Name = "ucrChkEndofRainsOccurence" - Me.ucrChkEndofRainsOccurence.Size = New System.Drawing.Size(77, 23) + Me.ucrChkEndofRainsOccurence.Size = New System.Drawing.Size(91, 23) Me.ucrChkEndofRainsOccurence.TabIndex = 47 ' 'ucrInputEndofRainsDate @@ -355,9 +355,9 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofRainsDate.AutoSize = True Me.ucrInputEndofRainsDate.IsMultiline = False Me.ucrInputEndofRainsDate.IsReadOnly = False - Me.ucrInputEndofRainsDate.Location = New System.Drawing.Point(193, 17) + Me.ucrInputEndofRainsDate.Location = New System.Drawing.Point(165, 17) Me.ucrInputEndofRainsDate.Name = "ucrInputEndofRainsDate" - Me.ucrInputEndofRainsDate.Size = New System.Drawing.Size(67, 21) + Me.ucrInputEndofRainsDate.Size = New System.Drawing.Size(93, 17) Me.ucrInputEndofRainsDate.TabIndex = 36 ' 'ucrInputEndofRainsOccurence @@ -366,9 +366,9 @@ Partial Class dlgEndOfRainsSeason Me.ucrInputEndofRainsOccurence.AutoSize = True Me.ucrInputEndofRainsOccurence.IsMultiline = False Me.ucrInputEndofRainsOccurence.IsReadOnly = False - Me.ucrInputEndofRainsOccurence.Location = New System.Drawing.Point(346, 17) + Me.ucrInputEndofRainsOccurence.Location = New System.Drawing.Point(341, 16) Me.ucrInputEndofRainsOccurence.Name = "ucrInputEndofRainsOccurence" - Me.ucrInputEndofRainsOccurence.Size = New System.Drawing.Size(79, 21) + Me.ucrInputEndofRainsOccurence.Size = New System.Drawing.Size(94, 20) Me.ucrInputEndofRainsOccurence.TabIndex = 39 ' 'rdoEndOfSeasons @@ -521,7 +521,7 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(274, 59) + Me.ucrReceiverStation.Location = New System.Drawing.Point(309, 59) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing @@ -534,7 +534,7 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(274, 150) + Me.ucrReceiverYear.Location = New System.Drawing.Point(309, 150) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing @@ -547,7 +547,7 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(274, 104) + Me.ucrReceiverDate.Location = New System.Drawing.Point(309, 104) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing @@ -560,7 +560,7 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverDOY.AutoSize = True Me.ucrReceiverDOY.frmParent = Me - Me.ucrReceiverDOY.Location = New System.Drawing.Point(274, 194) + Me.ucrReceiverDOY.Location = New System.Drawing.Point(309, 194) Me.ucrReceiverDOY.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDOY.Name = "ucrReceiverDOY" Me.ucrReceiverDOY.Selector = Nothing @@ -573,7 +573,7 @@ Partial Class dlgEndOfRainsSeason ' Me.ucrReceiverRainfall.AutoSize = True Me.ucrReceiverRainfall.frmParent = Me - Me.ucrReceiverRainfall.Location = New System.Drawing.Point(274, 238) + Me.ucrReceiverRainfall.Location = New System.Drawing.Point(309, 238) Me.ucrReceiverRainfall.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRainfall.Name = "ucrReceiverRainfall" Me.ucrReceiverRainfall.Selector = Nothing @@ -600,7 +600,7 @@ Partial Class dlgEndOfRainsSeason Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(3, 472) 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 = 33 ' 'dlgEndOfRainsSeason @@ -608,7 +608,7 @@ Partial Class dlgEndOfRainsSeason 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(435, 533) + Me.ClientSize = New System.Drawing.Size(477, 549) Me.Controls.Add(Me.rdoEndOfSeasons) Me.Controls.Add(Me.rdoEndOfRains) Me.Controls.Add(Me.ucrPnlEndOfRainsAndSeasons) diff --git a/instat/dlgFindNonnumericValues.Designer.vb b/instat/dlgFindNonnumericValues.Designer.vb index d827ed8d37e..6b8b4bba176 100644 --- a/instat/dlgFindNonnumericValues.Designer.vb +++ b/instat/dlgFindNonnumericValues.Designer.vb @@ -67,7 +67,7 @@ Partial Class dlgFindNonnumericValues Me.ucrReceiverColumn.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumn.Name = "ucrReceiverColumn" Me.ucrReceiverColumn.Selector = Nothing - Me.ucrReceiverColumn.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverColumn.Size = New System.Drawing.Size(136, 23) Me.ucrReceiverColumn.strNcFilePath = "" Me.ucrReceiverColumn.TabIndex = 2 Me.ucrReceiverColumn.ucrSelector = Nothing @@ -90,7 +90,7 @@ Partial Class dlgFindNonnumericValues Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(10, 274) 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 = 7 ' 'ucrSaveColumn diff --git a/instat/dlgHideDataframes.Designer.vb b/instat/dlgHideDataframes.Designer.vb index 7acd72a3ce1..5415512395a 100644 --- a/instat/dlgHideDataframes.Designer.vb +++ b/instat/dlgHideDataframes.Designer.vb @@ -54,7 +54,7 @@ Partial Class dlgHideDataframes ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 190) + Me.ucrBase.Location = New System.Drawing.Point(7, 199) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 1 @@ -63,7 +63,7 @@ Partial Class dlgHideDataframes ' Me.ucrSelectorForDataFrames.AutoSize = True Me.ucrSelectorForDataFrames.bShowHiddenColumns = False - Me.ucrSelectorForDataFrames.Location = New System.Drawing.Point(10, 44) + Me.ucrSelectorForDataFrames.Location = New System.Drawing.Point(10, 53) Me.ucrSelectorForDataFrames.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForDataFrames.Name = "ucrSelectorForDataFrames" Me.ucrSelectorForDataFrames.Size = New System.Drawing.Size(218, 147) @@ -72,7 +72,7 @@ Partial Class dlgHideDataframes 'lblDataFrames ' Me.lblDataFrames.AutoSize = True - Me.lblDataFrames.Location = New System.Drawing.Point(10, 29) + Me.lblDataFrames.Location = New System.Drawing.Point(10, 38) Me.lblDataFrames.Name = "lblDataFrames" Me.lblDataFrames.Size = New System.Drawing.Size(76, 13) Me.lblDataFrames.TabIndex = 3 @@ -167,7 +167,7 @@ Partial Class dlgHideDataframes 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(416, 247) + Me.ClientSize = New System.Drawing.Size(417, 256) Me.Controls.Add(Me.rdoHideDataFrame) Me.Controls.Add(Me.rdoUnhideDataFrame) Me.Controls.Add(Me.lblHiddenDataFrames) diff --git a/instat/dlgMergeAdditionalData.Designer.vb b/instat/dlgMergeAdditionalData.Designer.vb index 4620e225295..a789faf5e30 100644 --- a/instat/dlgMergeAdditionalData.Designer.vb +++ b/instat/dlgMergeAdditionalData.Designer.vb @@ -50,7 +50,7 @@ Partial Class dlgMergeAdditionalData Me.cmdModify.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdModify.Location = New System.Drawing.Point(328, 207) Me.cmdModify.Name = "cmdModify" - Me.cmdModify.Size = New System.Drawing.Size(90, 23) + Me.cmdModify.Size = New System.Drawing.Size(99, 34) Me.cmdModify.TabIndex = 16 Me.cmdModify.Text = "Join Options" Me.cmdModify.UseVisualStyleBackColor = True @@ -92,7 +92,7 @@ Partial Class dlgMergeAdditionalData Me.ucrInputSaveDataFrame.AutoSize = True Me.ucrInputSaveDataFrame.IsMultiline = False Me.ucrInputSaveDataFrame.IsReadOnly = False - Me.ucrInputSaveDataFrame.Location = New System.Drawing.Point(157, 275) + Me.ucrInputSaveDataFrame.Location = New System.Drawing.Point(187, 275) Me.ucrInputSaveDataFrame.Name = "ucrInputSaveDataFrame" Me.ucrInputSaveDataFrame.Size = New System.Drawing.Size(137, 21) Me.ucrInputSaveDataFrame.TabIndex = 19 @@ -103,7 +103,7 @@ Partial Class dlgMergeAdditionalData Me.ucrChkSaveDataFrame.Checked = False Me.ucrChkSaveDataFrame.Location = New System.Drawing.Point(7, 275) Me.ucrChkSaveDataFrame.Name = "ucrChkSaveDataFrame" - Me.ucrChkSaveDataFrame.Size = New System.Drawing.Size(143, 23) + Me.ucrChkSaveDataFrame.Size = New System.Drawing.Size(194, 23) Me.ucrChkSaveDataFrame.TabIndex = 18 ' 'ucrInputMergingBy @@ -159,7 +159,7 @@ Partial Class dlgMergeAdditionalData Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(7, 301) 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 = 17 ' 'dlgMergeAdditionalData @@ -167,7 +167,7 @@ Partial Class dlgMergeAdditionalData 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(420, 356) + Me.ClientSize = New System.Drawing.Size(439, 363) Me.Controls.Add(Me.ucrInputCheckInput) Me.Controls.Add(Me.cmdCheckUnique) Me.Controls.Add(Me.ucrInputSaveDataFrame) diff --git a/instat/dlgOneVarFitModel.vb b/instat/dlgOneVarFitModel.vb index 473f3368c3c..4301e18009f 100644 --- a/instat/dlgOneVarFitModel.vb +++ b/instat/dlgOneVarFitModel.vb @@ -60,7 +60,6 @@ Public Class dlgOneVarFitModel Dim lstCommandButtons As New List(Of Control) ucrBase.iHelpTopicID = 296 - ucrBase.clsRsyntax.iCallType = 2 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrPnlGeneralExactCase.AddRadioButton(rdoGeneralCase) @@ -345,7 +344,6 @@ Public Class dlgOneVarFitModel 'Display Options/Functions clsRplotFunction.SetPackageName("graphics") clsRplotFunction.SetRCommand("plot") - clsRplotFunction.iCallType = 3 clsRplotFunction.bExcludeAssignedFunctionOutput = False clsRplotFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, diff --git a/instat/dlgOneVarUseModel.vb b/instat/dlgOneVarUseModel.vb index 315f786f79a..1d41d287b6e 100644 --- a/instat/dlgOneVarUseModel.vb +++ b/instat/dlgOneVarUseModel.vb @@ -20,7 +20,6 @@ Public Class dlgOneVarUseModel Public bReset As Boolean = True Private bResetSubdialog As Boolean = False Public clsRBootFunction, clsQuantileFunction, clsSeqFunction, clsReceiver, clsRPlotAllFunction, clsRplotPPfunction, clsRplotCDFfunction, clsRplotQQfunction, clsRplotDensfunction, clsRplotCIfunction As New RFunction - Private clsRSyntax As RSyntax 'temp fix to deciding if plot should be included 'won't be needed once RSyntax can contain multiple functions Private bPlot As Boolean @@ -40,12 +39,11 @@ Public Class dlgOneVarUseModel End Sub Private Sub InitialiseDialog() - ucrNewDataFrameName.Visible = False ' TODO: Discuss this, do we want this? 'Temp fix: Bugs on second running- an inifinite loop is created sdgOneVarUseModFit.rdoCIcdf.Enabled = False ucrBase.iHelpTopicID = 375 - ucrBase.clsRsyntax.iCallType = 2 + 'ucrBase.clsRsyntax.iCallType = 2 ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrReceiverObject.SetParameter(New RParameter("x", 0)) @@ -53,27 +51,29 @@ Public Class dlgOneVarUseModel ucrReceiverObject.SetParameterIsRFunction() ucrReceiverObject.SetMeAsReceiver() ucrReceiverObject.strSelectorHeading = "Models" - ucrReceiverObject.SetItemType("model") + ucrReceiverObject.SetItemType(RObjectTypeLabel.Model) ucrChkProduceBootstrap.AddRSyntaxContainsFunctionNamesCondition(True, {"bootdist"}) ucrChkProduceBootstrap.AddRSyntaxContainsFunctionNamesCondition(False, {"bootdist"}, False) - ucrChkProduceBootstrap.AddToLinkedControls(ucrSaveObjects, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=False) + 'ucrChkProduceBootstrap.AddToLinkedControls(ucrSaveObjects, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=False) ucrChkProduceBootstrap.SetText("Produce Bootstrap") - 'This part is temporary for now - - ucrNewDataFrameName.SetPrefix("use_model") - ucrNewDataFrameName.SetDataFrameSelector(ucrSelectorUseModel.ucrAvailableDataFrames) - ucrNewDataFrameName.SetSaveTypeAsModel() - ucrNewDataFrameName.SetIsComboBox() - ucrNewDataFrameName.SetCheckBoxText("Save Model") - ucrNewDataFrameName.SetAssignToIfUncheckedValue("last_model") - - ucrSaveObjects.SetPrefix("bootstrap") - ucrSaveObjects.SetDataFrameSelector(ucrSelectorUseModel.ucrAvailableDataFrames) - ucrSaveObjects.SetSaveTypeAsModel() - ucrSaveObjects.SetIsComboBox() - ucrSaveObjects.SetCheckBoxText("Save Bootstrap") + 'This control is not used yet + ucrNewDataFrameName.Visible = False + 'ucrNewDataFrameName.SetPrefix("use_model") + 'ucrNewDataFrameName.SetDataFrameSelector(ucrSelectorUseModel.ucrAvailableDataFrames) + 'ucrNewDataFrameName.SetSaveTypeAsModel() + 'ucrNewDataFrameName.SetIsComboBox() + 'ucrNewDataFrameName.SetCheckBoxText("Save Model") + 'ucrNewDataFrameName.SetAssignToIfUncheckedValue("last_model") + + 'This control is not used yet + ucrSaveObjects.Visible = False + 'ucrSaveObjects.SetPrefix("bootstrap") + 'ucrSaveObjects.SetDataFrameSelector(ucrSelectorUseModel.ucrAvailableDataFrames) + 'ucrSaveObjects.SetSaveTypeAsModel() + 'ucrSaveObjects.SetIsComboBox() + 'ucrSaveObjects.SetCheckBoxText("Save Bootstrap") 'ucrSaveObjects.SetAssignToIfUncheckedValue("last_bootstrap") End Sub @@ -87,60 +87,83 @@ Public Class dlgOneVarUseModel clsRplotQQfunction = New RFunction clsRplotDensfunction = New RFunction clsRplotCIfunction = New RFunction - ' clsRNoPlotfunction = New RFunction ucrSelectorUseModel.Reset() - ucrSaveObjects.Enabled = False ' temporary - ucrSaveObjects.Reset() - ucrNewDataFrameName.Reset() clsRPlotAllFunction.SetPackageName("graphics") clsRPlotAllFunction.SetRCommand("plot") - clsRPlotAllFunction.iCallType = 3 + clsRPlotAllFunction.bExcludeAssignedFunctionOutput = False + clsRPlotAllFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorUseModel.strCurrentDataFrame, + strObjectName:="last_graph") clsRplotCDFfunction.SetPackageName("fitdistrplus") clsRplotCDFfunction.SetRCommand("cdfcomp") clsRplotCDFfunction.AddParameter("plotstyle", Chr(34) & "ggplot" & Chr(34)) - clsRplotCDFfunction.iCallType = 3 + clsRplotCDFfunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorUseModel.strCurrentDataFrame, + strObjectName:="last_graph") clsRplotQQfunction.SetPackageName("fitdistrplus") clsRplotQQfunction.SetRCommand("qqcomp") clsRplotQQfunction.AddParameter("plotstyle", Chr(34) & "ggplot" & Chr(34)) - clsRplotQQfunction.iCallType = 3 + clsRplotQQfunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorUseModel.strCurrentDataFrame, + strObjectName:="last_graph") clsRplotDensfunction.SetPackageName("fitdistrplus") clsRplotDensfunction.SetRCommand("denscomp") clsRplotDensfunction.AddParameter("plotstyle", Chr(34) & "ggplot" & Chr(34)) - clsRplotDensfunction.iCallType = 3 + clsRplotDensfunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorUseModel.strCurrentDataFrame, + strObjectName:="last_graph") clsRplotPPfunction.SetPackageName("fitdistrplus") clsRplotPPfunction.SetRCommand("ppcomp") clsRplotPPfunction.AddParameter("plotstyle", Chr(34) & "ggplot" & Chr(34)) - clsRplotPPfunction.iCallType = 3 + clsRplotPPfunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrSelectorUseModel.strCurrentDataFrame, + strObjectName:="last_graph") + 'todo. this option is disabled in the subdialog clsRplotCIfunction.SetPackageName("fitdistrplus") clsRplotCIfunction.SetRCommand("CIcdfplot") - clsRplotCIfunction.iCallType = 3 - - 'Temporary as we think of how to implement No plot option - ' clsRNoPlotfunction.SetRCommand("") clsSeqFunction.SetRCommand("seq") clsSeqFunction.AddParameter("from", 0) clsSeqFunction.AddParameter("to", 1) clsSeqFunction.AddParameter("by", 0.25) - clsQuantileFunction.SetRCommand("quantile") - clsQuantileFunction.AddParameter("probs", clsRFunctionParameter:=clsSeqFunction) - clsRBootFunction.SetPackageName("fitdistrplus") clsRBootFunction.SetRCommand("bootdist") clsRBootFunction.AddParameter("bootmethod", Chr(34) & "nonparam" & Chr(34)) clsRBootFunction.AddParameter("niter", 1001) - clsRBootFunction.iCallType = 2 + clsRBootFunction.bExcludeAssignedFunctionOutput = False + clsRBootFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Summary, + strRObjectFormatToAssignTo:=RObjectFormat.Text, + strRDataFrameNameToAddObjectTo:=ucrSelectorUseModel.strCurrentDataFrame, + strObjectName:="last_summary") + + clsQuantileFunction.SetRCommand("quantile") + clsQuantileFunction.AddParameter("probs", clsRFunctionParameter:=clsSeqFunction) + clsQuantileFunction.bExcludeAssignedFunctionOutput = False + clsQuantileFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Summary, + strRObjectFormatToAssignTo:=RObjectFormat.Text, + strRDataFrameNameToAddObjectTo:=ucrSelectorUseModel.strCurrentDataFrame, + strObjectName:="last_summary") - clsQuantileFunction.SetAssignTo(ucrNewDataFrameName.GetText, strTempModel:="last_model", strTempDataframe:=ucrSelectorUseModel.ucrAvailableDataFrames.cboAvailableDataFrames.Text) - 'clsRBootFunction.SetAssignTo(ucrSaveObjects.GetText, strTempModel:="last_bootstrap", strTempDataframe:=ucrSelectorUseModel.ucrAvailableDataFrames.cboAvailableDataFrames.Text) ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.AddToAfterCodes(clsRPlotAllFunction, iPosition:=2) ucrBase.clsRsyntax.SetBaseRFunction(clsQuantileFunction) @@ -158,13 +181,12 @@ Public Class dlgOneVarUseModel ucrReceiverObject.AddAdditionalCodeParameterPair(clsRplotDensfunction, New RParameter("ft", 0), iAdditionalPairNo:=6) ucrChkProduceBootstrap.SetRCode(clsRBootFunction, bReset) ucrChkProduceBootstrap.SetRSyntax(ucrBase.clsRsyntax, bReset) - ucrNewDataFrameName.SetRCode(clsQuantileFunction, bReset) - ucrSaveObjects.SetRCode(clsRBootFunction, bReset) + End Sub Private Sub TestOKEnabled() - If Not ucrReceiverObject.IsEmpty AndAlso ucrSaveObjects.IsComplete() AndAlso ucrNewDataFrameName.IsComplete() Then + If Not ucrReceiverObject.IsEmpty Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -210,12 +232,11 @@ Public Class dlgOneVarUseModel Private Sub ucrChkProduceBootstrap_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkProduceBootstrap.ControlValueChanged If ucrChkProduceBootstrap.Checked Then clsQuantileFunction.AddParameter("x", clsRFunctionParameter:=clsRBootFunction) - ucrBase.clsRsyntax.AddToAfterCodes(clsRBootFunction, iPosition:=1) + ucrBase.clsRsyntax.AddToBeforeCodes(clsRBootFunction, iPosition:=1) Else clsQuantileFunction.AddParameter("x", clsRFunctionParameter:=ucrReceiverObject.GetVariables()) - ucrBase.clsRsyntax.RemoveFromAfterCodes(clsRBootFunction) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsRBootFunction) End If - ucrBase.clsRsyntax.SetBaseRFunction(clsQuantileFunction) sdgOneVarUseModFit.SetPlotOptions() End Sub diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index 2c4ed9a818b..e0df2826ad4 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -84,7 +84,7 @@ Public Class dlgOptions ucrPnlGraphDisplay.AddRadioButton(rdoDisplayinRViewer) ucrPnlGraphDisplay.AddRadioButton(rdoDisplayinSeparateWindows) ucrInputLanguage.SetLinkedDisplayControl(lblLanguage) - ucrInputLanguage.SetItems({"English", "French", "Kiswahili", "Portuguese", "Russian", "Spanish"}) + ucrInputLanguage.SetItems({"English", "French", "Italian", "Kiswahili", "Portuguese", "Russian", "Spanish"}) ucrInputLanguage.SetDropDownStyleAsNonEditable() ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") @@ -138,6 +138,8 @@ Public Class dlgOptions ucrInputLanguage.SetText("English") Case "fr-FR" ucrInputLanguage.SetText("French") + Case "it-IT" + ucrInputLanguage.SetText("Italian") Case "sw-KE" ucrInputLanguage.SetText("Kiswahili") Case "pt-PT" @@ -289,6 +291,8 @@ Public Class dlgOptions strCurrLanguageCulture = "en-GB" Case "French" strCurrLanguageCulture = "fr-FR" + Case "Italian" + strCurrLanguageCulture = "it-IT" Case "Kiswahili" strCurrLanguageCulture = "sw-KE" Case "Portuguese" diff --git a/instat/dlgRandomSample.designer.vb b/instat/dlgRandomSample.designer.vb index 608a2b01ff3..66d295e1ead 100644 --- a/instat/dlgRandomSample.designer.vb +++ b/instat/dlgRandomSample.designer.vb @@ -108,11 +108,11 @@ Partial Class dlgRandomSample Me.ucrNudNumberOfSamples.AutoSize = True Me.ucrNudNumberOfSamples.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfSamples.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfSamples.Location = New System.Drawing.Point(359, 126) + Me.ucrNudNumberOfSamples.Location = New System.Drawing.Point(372, 126) Me.ucrNudNumberOfSamples.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfSamples.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfSamples.Name = "ucrNudNumberOfSamples" - Me.ucrNudNumberOfSamples.Size = New System.Drawing.Size(50, 20) + Me.ucrNudNumberOfSamples.Size = New System.Drawing.Size(55, 26) Me.ucrNudNumberOfSamples.TabIndex = 5 Me.ucrNudNumberOfSamples.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -121,11 +121,11 @@ Partial Class dlgRandomSample Me.ucrNudSeed.AutoSize = True Me.ucrNudSeed.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSeed.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSeed.Location = New System.Drawing.Point(359, 100) + Me.ucrNudSeed.Location = New System.Drawing.Point(372, 100) Me.ucrNudSeed.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSeed.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSeed.Name = "ucrNudSeed" - Me.ucrNudSeed.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSeed.Size = New System.Drawing.Size(55, 24) Me.ucrNudSeed.TabIndex = 3 Me.ucrNudSeed.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -144,7 +144,7 @@ Partial Class dlgRandomSample Me.ucrSampleSize.AutoSize = True Me.ucrSampleSize.IsMultiline = False Me.ucrSampleSize.IsReadOnly = True - Me.ucrSampleSize.Location = New System.Drawing.Point(359, 152) + Me.ucrSampleSize.Location = New System.Drawing.Point(372, 152) Me.ucrSampleSize.Name = "ucrSampleSize" Me.ucrSampleSize.Size = New System.Drawing.Size(55, 23) Me.ucrSampleSize.TabIndex = 7 diff --git a/instat/dlgRandomSubsets.Designer.vb b/instat/dlgRandomSubsets.Designer.vb index cf9974c581e..7ae9a546ed9 100644 --- a/instat/dlgRandomSubsets.Designer.vb +++ b/instat/dlgRandomSubsets.Designer.vb @@ -88,7 +88,7 @@ Partial Class dlgRandomSubsets Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(10, 224) 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 = 11 ' 'ucrNewDataFrame @@ -115,7 +115,7 @@ Partial Class dlgRandomSubsets Me.ucrChkSetSeed.Checked = False Me.ucrChkSetSeed.Location = New System.Drawing.Point(252, 92) Me.ucrChkSetSeed.Name = "ucrChkSetSeed" - Me.ucrChkSetSeed.Size = New System.Drawing.Size(100, 23) + Me.ucrChkSetSeed.Size = New System.Drawing.Size(115, 24) Me.ucrChkSetSeed.TabIndex = 7 ' 'ucrNudSetSeed @@ -123,7 +123,7 @@ Partial Class dlgRandomSubsets Me.ucrNudSetSeed.AutoSize = True Me.ucrNudSetSeed.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSetSeed.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSetSeed.Location = New System.Drawing.Point(363, 89) + Me.ucrNudSetSeed.Location = New System.Drawing.Point(373, 89) Me.ucrNudSetSeed.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSetSeed.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSetSeed.Name = "ucrNudSetSeed" @@ -136,7 +136,7 @@ Partial Class dlgRandomSubsets Me.ucrNudNumberOfColumns.AutoSize = True Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(363, 141) + Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(373, 141) Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" @@ -149,7 +149,7 @@ Partial Class dlgRandomSubsets Me.ucrNudSampleSize.AutoSize = True Me.ucrNudSampleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSampleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSampleSize.Location = New System.Drawing.Point(363, 115) + Me.ucrNudSampleSize.Location = New System.Drawing.Point(373, 115) Me.ucrNudSampleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSampleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSampleSize.Name = "ucrNudSampleSize" diff --git a/instat/dlgRegularSequence.vb b/instat/dlgRegularSequence.vb index 797415d16fe..ddbe070b156 100644 --- a/instat/dlgRegularSequence.vb +++ b/instat/dlgRegularSequence.vb @@ -21,6 +21,7 @@ Public Class dlgRegularSequence Public bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsRepFunction, clsSeqFunction, clsSeqDateFunction As New RFunction + Private clsDummyFunction As New RFunction Private clsByOperator As New ROperator Private enumDefaultSequenceOption As DefaultSequenceOption = DefaultSequenceOption.NumericOption Private bDefaultOptionChanged As Boolean = False @@ -129,6 +130,8 @@ Public Class dlgRegularSequence ucrPnlSequenceType.AddToLinkedControls({ucrInputComboDatesBy}, {rdoDates}, bNewLinkedHideIfParameterMissing:=True) ucrChkPreview.SetText("Preview") + ucrChkPreview.SetParameter(New RParameter("checked", iNewPosition:=0)) + ucrChkPreview.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrNewColumnName.SetPrefix("regular") ucrNewColumnName.SetDataFrameSelector(ucrSelectDataFrameRegularSequence) @@ -147,6 +150,7 @@ Public Class dlgRegularSequence clsRepFunction = New RFunction clsSeqFunction = New RFunction clsSeqDateFunction = New RFunction + clsDummyFunction = New RFunction clsByOperator = New ROperator ucrSelectDataFrameRegularSequence.Reset() @@ -158,6 +162,8 @@ Public Class dlgRegularSequence lblPreview.Visible = False lblMessage.Visible = False + clsDummyFunction.AddParameter("checked", "FALSE", iPosition:=0) + clsSeqFunction.SetRCommand("seq") clsSeqFunction.AddParameter("from", 1, iPosition:=0) clsSeqFunction.AddParameter("to", ucrDataFrameLength.GetDataFrameLength, iPosition:=1) @@ -179,12 +185,9 @@ Public Class dlgRegularSequence clsRepFunction.AddParameter("each", 1, iPosition:=2) clsRepFunction.AddParameter("length.out", ucrDataFrameLength.GetDataFrameLength, iPosition:=3) - clsRepFunction.SetAssignToColumnObject(strColToAssignTo:=ucrNewColumnName.GetText, - strColName:=ucrNewColumnName.GetText, - strRDataFrameNameToAddObjectTo:=ucrSelectDataFrameRegularSequence.strCurrDataFrame, - bAssignToIsPrefix:=True) + PreviewSequence() + SetAssignTo() ucrBase.clsRsyntax.SetBaseRFunction(clsRepFunction) - End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -206,6 +209,8 @@ Public Class dlgRegularSequence ucrNudRepeatValues.SetRCode(clsRepFunction, bReset) ucrDataFrameLength.SetRCode(clsRepFunction, bReset) ucrNewColumnName.SetRCode(clsRepFunction, bReset) + + ucrChkPreview.SetRCode(clsDummyFunction, bReset) End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -248,9 +253,13 @@ Public Class dlgRegularSequence Dim vecSequence As CharacterVector Dim strNewPreviewScript As String Dim iLength As Integer + Dim iDataFrameLenghtLimit As Integer = 10000 + Dim iDataFrameLength As Integer = ucrDataFrameLength.GetDataFrameLength + clsRepFunction.RemoveAssignTo() 'clone the "rep" command base function clsNewRepClone = clsRepFunction.Clone() + SetAssignTo() 'set up "as.character" command to be usde for testing clsAsCharacter.SetRCommand("as.character") @@ -264,19 +273,24 @@ Public Class dlgRegularSequence End If strPreviewScript = strNewPreviewScript + If iDataFrameLength > iDataFrameLenghtLimit Then + txtPreview.Text = "" + lblMessage.Text = "No preview available." + Exit Try + End If + 'get the sequence from the R command as it is, and dispay it vecSequence = frmMain.clsRLink.RunInternalScriptGetValue(strPreviewScript, bSilent:=True).AsCharacter txtPreview.Text = String.Join(", ", vecSequence) - 'remove the "length.out", then check if sequence is truncated or extended clsNewRepClone.RemoveParameterByName("length.out") vecSequence = frmMain.clsRLink.RunInternalScriptGetValue(clsAsCharacter.ToScript(), bSilent:=True).AsCharacter iLength = vecSequence.Length - If iLength = ucrDataFrameLength.GetDataFrameLength Then + If iLength = iDataFrameLength Then lblMessage.Text = GetTranslation("Sequence matches the length of the data frame.") - ElseIf iLength < ucrDataFrameLength.GetDataFrameLength Then + ElseIf iLength < iDataFrameLength Then lblMessage.Text = GetTranslation("Sequence extended to match the length of the data frame.") - ElseIf iLength > ucrDataFrameLength.GetDataFrameLength Then + ElseIf iLength > iDataFrameLength Then lblMessage.Text = GetTranslation("Sequence truncated to match the length of the data frame.") End If Catch ex As Exception @@ -285,15 +299,23 @@ Public Class dlgRegularSequence End Try End Sub + Private Sub SetAssignTo() + clsRepFunction.SetAssignToColumnObject(strColToAssignTo:=ucrNewColumnName.GetText, + strColName:=ucrNewColumnName.GetText, + strRDataFrameNameToAddObjectTo:=ucrSelectDataFrameRegularSequence.strCurrDataFrame, + bAssignToIsPrefix:=True) + End Sub + Private Sub ucrPnlSequenceType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSequenceType.ControlValueChanged If rdoNumeric.Checked Then clsRepFunction.AddParameter("x", clsRFunctionParameter:=clsSeqFunction, iPosition:=0) ElseIf rdoDates.Checked Then clsRepFunction.AddParameter("x", clsRFunctionParameter:=clsSeqDateFunction, iPosition:=0) End If + SetAssignTo() End Sub - Private Sub ucrInputStepsOfControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFrom.ControlValueChanged, ucrInputTo.ControlValueChanged, ucrDateTimePickerFrom.ControlValueChanged, ucrDateTimePickerTo.ControlValueChanged, ucrInputComboDatesBy.ControlValueChanged, ucrPnlSequenceType.ControlValueChanged + Private Sub ucrInputStepsOfControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFrom.ControlValueChanged, ucrInputTo.ControlValueChanged, ucrDateTimePickerFrom.ControlValueChanged, ucrDateTimePickerTo.ControlValueChanged, ucrInputComboDatesBy.ControlValueChanged, ucrPnlSequenceType.ControlValueChanged, ucrInputInStepsOf.ControlValueChanged 'ucrInputInStepsOf will be empty when dialog loads for the first time 'no need to st value for ucrInputInStepsOf if its empty If ucrInputInStepsOf.IsEmpty Then @@ -304,13 +326,15 @@ Public Class dlgRegularSequence Dim dcmTo As Decimal Dim dcmFrom As Decimal If Decimal.TryParse(ucrInputTo.GetText, dcmTo) AndAlso Decimal.TryParse(ucrInputFrom.GetText, dcmFrom) Then - ucrInputInStepsOf.SetName(If(dcmTo >= dcmFrom, "", "-") & ucrInputInStepsOf.GetText().Replace("-", "")) + ucrInputInStepsOf.SetText(If(dcmTo >= dcmFrom, "", "-") & ucrInputInStepsOf.GetText().Replace("-", "")) End If ElseIf rdoDates.Checked Then - ucrInputInStepsOf.SetName(If(ucrDateTimePickerTo.DateValue >= ucrDateTimePickerFrom.DateValue, + ucrInputInStepsOf.SetText(If(ucrDateTimePickerTo.DateValue >= ucrDateTimePickerFrom.DateValue, "", "-") & ucrInputInStepsOf.GetText().Replace("-", "")) End If + clsSeqFunction.AddParameter("by", ucrInputInStepsOf.GetText()) + PreviewSequence() End Sub Private Sub ucrInputInStepsOf_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputInStepsOf.ControlValueChanged @@ -321,6 +345,10 @@ Public Class dlgRegularSequence PreviewSequence() End Sub + Private Sub ucrSelectDataFrameRegularSequence_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectDataFrameRegularSequence.ControlValueChanged + ucrChkPreview.Checked = False + End Sub + Private Sub ucrControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNewColumnName.ControlContentsChanged, ucrInputTo.ControlContentsChanged, ucrInputFrom.ControlContentsChanged, ucrInputInStepsOf.ControlContentsChanged, ucrSelectDataFrameRegularSequence.ControlContentsChanged, ucrInputFrom.ControlContentsChanged, ucrInputTo.ControlContentsChanged, ucrInputInStepsOf.ControlContentsChanged, ucrNudRepeatValues.ControlContentsChanged, ucrPnlSequenceType.ControlContentsChanged, ucrInputComboDatesBy.ControlContentsChanged TestOKEnabled() End Sub diff --git a/instat/dlgStack.Designer.vb b/instat/dlgStack.Designer.vb index 8109eb74b1a..a59c5ede253 100644 --- a/instat/dlgStack.Designer.vb +++ b/instat/dlgStack.Designer.vb @@ -87,7 +87,7 @@ Partial Class dlgStack ' Me.lblColumnsTostack.AutoSize = True Me.lblColumnsTostack.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumnsTostack.Location = New System.Drawing.Point(261, 65) + Me.lblColumnsTostack.Location = New System.Drawing.Point(256, 65) Me.lblColumnsTostack.Name = "lblColumnsTostack" Me.lblColumnsTostack.Size = New System.Drawing.Size(93, 13) Me.lblColumnsTostack.TabIndex = 4 @@ -152,7 +152,7 @@ Partial Class dlgStack ' Me.lblToken.AutoSize = True Me.lblToken.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblToken.Location = New System.Drawing.Point(259, 105) + Me.lblToken.Location = New System.Drawing.Point(252, 105) Me.lblToken.Name = "lblToken" Me.lblToken.Size = New System.Drawing.Size(41, 13) Me.lblToken.TabIndex = 8 @@ -162,7 +162,7 @@ Partial Class dlgStack ' Me.lblFormat.AutoSize = True Me.lblFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFormat.Location = New System.Drawing.Point(259, 145) + Me.lblFormat.Location = New System.Drawing.Point(254, 145) Me.lblFormat.Name = "lblFormat" Me.lblFormat.Size = New System.Drawing.Size(42, 13) Me.lblFormat.TabIndex = 10 @@ -172,7 +172,7 @@ Partial Class dlgStack ' Me.lblPattern.AutoSize = True Me.lblPattern.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPattern.Location = New System.Drawing.Point(259, 186) + Me.lblPattern.Location = New System.Drawing.Point(255, 186) Me.lblPattern.Name = "lblPattern" Me.lblPattern.Size = New System.Drawing.Size(80, 13) Me.lblPattern.TabIndex = 12 @@ -192,7 +192,7 @@ Partial Class dlgStack ' Me.lblVariable.AutoSize = True Me.lblVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblVariable.Location = New System.Drawing.Point(261, 67) + Me.lblVariable.Location = New System.Drawing.Point(252, 67) Me.lblVariable.Name = "lblVariable" Me.lblVariable.Size = New System.Drawing.Size(48, 13) Me.lblVariable.TabIndex = 5 @@ -203,7 +203,7 @@ Partial Class dlgStack ' Me.lblSets.AutoSize = True Me.lblSets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSets.Location = New System.Drawing.Point(172, 323) + Me.lblSets.Location = New System.Drawing.Point(227, 323) Me.lblSets.Name = "lblSets" Me.lblSets.Size = New System.Drawing.Size(31, 13) Me.lblSets.TabIndex = 31 @@ -226,7 +226,7 @@ Partial Class dlgStack Me.ucrInputNamesTo.AutoSize = True Me.ucrInputNamesTo.IsMultiline = False Me.ucrInputNamesTo.IsReadOnly = False - Me.ucrInputNamesTo.Location = New System.Drawing.Point(87, 247) + Me.ucrInputNamesTo.Location = New System.Drawing.Point(143, 247) Me.ucrInputNamesTo.Margin = New System.Windows.Forms.Padding(5) Me.ucrInputNamesTo.Name = "ucrInputNamesTo" Me.ucrInputNamesTo.Size = New System.Drawing.Size(75, 21) @@ -237,11 +237,11 @@ Partial Class dlgStack Me.ucrNudNoSets.AutoSize = True Me.ucrNudNoSets.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNoSets.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNoSets.Location = New System.Drawing.Point(210, 320) + Me.ucrNudNoSets.Location = New System.Drawing.Point(288, 320) Me.ucrNudNoSets.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNoSets.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNoSets.Name = "ucrNudNoSets" - Me.ucrNudNoSets.Size = New System.Drawing.Size(50, 20) + Me.ucrNudNoSets.Size = New System.Drawing.Size(31, 24) Me.ucrNudNoSets.TabIndex = 30 Me.ucrNudNoSets.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -251,7 +251,7 @@ Partial Class dlgStack Me.ucrInputDropPrefix.AutoSize = True Me.ucrInputDropPrefix.IsMultiline = False Me.ucrInputDropPrefix.IsReadOnly = False - Me.ucrInputDropPrefix.Location = New System.Drawing.Point(87, 296) + Me.ucrInputDropPrefix.Location = New System.Drawing.Point(143, 296) Me.ucrInputDropPrefix.Margin = New System.Windows.Forms.Padding(5) Me.ucrInputDropPrefix.Name = "ucrInputDropPrefix" Me.ucrInputDropPrefix.Size = New System.Drawing.Size(75, 21) @@ -261,9 +261,9 @@ Partial Class dlgStack ' Me.ucrChkCarryAllColumns.AutoSize = True Me.ucrChkCarryAllColumns.Checked = False - Me.ucrChkCarryAllColumns.Location = New System.Drawing.Point(262, 189) + Me.ucrChkCarryAllColumns.Location = New System.Drawing.Point(256, 189) Me.ucrChkCarryAllColumns.Name = "ucrChkCarryAllColumns" - Me.ucrChkCarryAllColumns.Size = New System.Drawing.Size(130, 23) + Me.ucrChkCarryAllColumns.Size = New System.Drawing.Size(165, 23) Me.ucrChkCarryAllColumns.TabIndex = 14 ' 'ucrInputOutput @@ -281,7 +281,7 @@ Partial Class dlgStack ' Me.ucrReceiverColumnsToBeStack.AutoSize = True Me.ucrReceiverColumnsToBeStack.frmParent = Me - Me.ucrReceiverColumnsToBeStack.Location = New System.Drawing.Point(262, 81) + Me.ucrReceiverColumnsToBeStack.Location = New System.Drawing.Point(257, 81) Me.ucrReceiverColumnsToBeStack.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToBeStack.Name = "ucrReceiverColumnsToBeStack" Me.ucrReceiverColumnsToBeStack.Selector = Nothing @@ -294,7 +294,7 @@ Partial Class dlgStack ' Me.ucrReceiverTextColumn.AutoSize = True Me.ucrReceiverTextColumn.frmParent = Me - Me.ucrReceiverTextColumn.Location = New System.Drawing.Point(262, 81) + Me.ucrReceiverTextColumn.Location = New System.Drawing.Point(256, 81) Me.ucrReceiverTextColumn.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverTextColumn.Name = "ucrReceiverTextColumn" Me.ucrReceiverTextColumn.Selector = Nothing @@ -324,10 +324,10 @@ Partial Class dlgStack ' Me.ucrChkCarryColumns.AutoSize = True Me.ucrChkCarryColumns.Checked = False - Me.ucrChkCarryColumns.Location = New System.Drawing.Point(262, 217) + Me.ucrChkCarryColumns.Location = New System.Drawing.Point(257, 217) Me.ucrChkCarryColumns.Margin = New System.Windows.Forms.Padding(4) Me.ucrChkCarryColumns.Name = "ucrChkCarryColumns" - Me.ucrChkCarryColumns.Size = New System.Drawing.Size(120, 23) + Me.ucrChkCarryColumns.Size = New System.Drawing.Size(166, 23) Me.ucrChkCarryColumns.TabIndex = 15 ' 'ucrInputValuesTo @@ -336,7 +336,7 @@ Partial Class dlgStack Me.ucrInputValuesTo.AutoSize = True Me.ucrInputValuesTo.IsMultiline = False Me.ucrInputValuesTo.IsReadOnly = False - Me.ucrInputValuesTo.Location = New System.Drawing.Point(87, 272) + Me.ucrInputValuesTo.Location = New System.Drawing.Point(143, 272) Me.ucrInputValuesTo.Margin = New System.Windows.Forms.Padding(5) Me.ucrInputValuesTo.Name = "ucrInputValuesTo" Me.ucrInputValuesTo.Size = New System.Drawing.Size(75, 21) @@ -346,7 +346,7 @@ Partial Class dlgStack ' Me.ucrReceiverColumnsToCarry.AutoSize = True Me.ucrReceiverColumnsToCarry.frmParent = Me - Me.ucrReceiverColumnsToCarry.Location = New System.Drawing.Point(262, 240) + Me.ucrReceiverColumnsToCarry.Location = New System.Drawing.Point(259, 240) Me.ucrReceiverColumnsToCarry.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumnsToCarry.Name = "ucrReceiverColumnsToCarry" Me.ucrReceiverColumnsToCarry.Selector = Nothing @@ -383,7 +383,7 @@ Partial Class dlgStack Me.ucrInputToken.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputToken.GetSetSelectedIndex = -1 Me.ucrInputToken.IsReadOnly = False - Me.ucrInputToken.Location = New System.Drawing.Point(262, 119) + Me.ucrInputToken.Location = New System.Drawing.Point(257, 119) Me.ucrInputToken.Name = "ucrInputToken" Me.ucrInputToken.Size = New System.Drawing.Size(120, 21) Me.ucrInputToken.TabIndex = 9 @@ -394,7 +394,7 @@ Partial Class dlgStack Me.ucrInputFormat.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputFormat.GetSetSelectedIndex = -1 Me.ucrInputFormat.IsReadOnly = False - Me.ucrInputFormat.Location = New System.Drawing.Point(262, 160) + Me.ucrInputFormat.Location = New System.Drawing.Point(256, 160) Me.ucrInputFormat.Name = "ucrInputFormat" Me.ucrInputFormat.Size = New System.Drawing.Size(120, 21) Me.ucrInputFormat.TabIndex = 11 @@ -405,7 +405,7 @@ Partial Class dlgStack Me.ucrInputPattern.AutoSize = True Me.ucrInputPattern.IsMultiline = False Me.ucrInputPattern.IsReadOnly = False - Me.ucrInputPattern.Location = New System.Drawing.Point(262, 202) + Me.ucrInputPattern.Location = New System.Drawing.Point(257, 202) Me.ucrInputPattern.Name = "ucrInputPattern" Me.ucrInputPattern.Size = New System.Drawing.Size(120, 21) Me.ucrInputPattern.TabIndex = 13 @@ -425,7 +425,7 @@ Partial Class dlgStack Me.ucrChkDropMissingValues.Checked = False Me.ucrChkDropMissingValues.Location = New System.Drawing.Point(10, 343) Me.ucrChkDropMissingValues.Name = "ucrChkDropMissingValues" - Me.ucrChkDropMissingValues.Size = New System.Drawing.Size(156, 23) + Me.ucrChkDropMissingValues.Size = New System.Drawing.Size(193, 23) Me.ucrChkDropMissingValues.TabIndex = 26 ' 'ucrChkUrl @@ -443,7 +443,7 @@ Partial Class dlgStack Me.ucrChkDropPrefix.Checked = False Me.ucrChkDropPrefix.Location = New System.Drawing.Point(10, 297) Me.ucrChkDropPrefix.Name = "ucrChkDropPrefix" - Me.ucrChkDropPrefix.Size = New System.Drawing.Size(105, 23) + Me.ucrChkDropPrefix.Size = New System.Drawing.Size(193, 23) Me.ucrChkDropPrefix.TabIndex = 27 ' 'ucrChkStackMultipleSets @@ -452,7 +452,7 @@ Partial Class dlgStack Me.ucrChkStackMultipleSets.Checked = False Me.ucrChkStackMultipleSets.Location = New System.Drawing.Point(10, 320) Me.ucrChkStackMultipleSets.Name = "ucrChkStackMultipleSets" - Me.ucrChkStackMultipleSets.Size = New System.Drawing.Size(180, 23) + Me.ucrChkStackMultipleSets.Size = New System.Drawing.Size(231, 24) Me.ucrChkStackMultipleSets.TabIndex = 29 ' 'ucrFactorInto @@ -496,7 +496,7 @@ Partial Class dlgStack ' Me.ucrReceiverExpand.AutoSize = True Me.ucrReceiverExpand.frmParent = Me - Me.ucrReceiverExpand.Location = New System.Drawing.Point(262, 81) + Me.ucrReceiverExpand.Location = New System.Drawing.Point(256, 81) Me.ucrReceiverExpand.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverExpand.Name = "ucrReceiverExpand" Me.ucrReceiverExpand.Selector = Nothing @@ -509,7 +509,7 @@ Partial Class dlgStack ' Me.lblExpandFactor.AutoSize = True Me.lblExpandFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExpandFactor.Location = New System.Drawing.Point(264, 64) + Me.lblExpandFactor.Location = New System.Drawing.Point(254, 64) Me.lblExpandFactor.Name = "lblExpandFactor" Me.lblExpandFactor.Size = New System.Drawing.Size(51, 13) Me.lblExpandFactor.TabIndex = 36 @@ -520,7 +520,7 @@ Partial Class dlgStack ' Me.ucrReceiverFrequency.AutoSize = True Me.ucrReceiverFrequency.frmParent = Me - Me.ucrReceiverFrequency.Location = New System.Drawing.Point(262, 204) + Me.ucrReceiverFrequency.Location = New System.Drawing.Point(257, 204) Me.ucrReceiverFrequency.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFrequency.Name = "ucrReceiverFrequency" Me.ucrReceiverFrequency.Selector = Nothing @@ -533,7 +533,7 @@ Partial Class dlgStack ' Me.lblFrequencyVar.AutoSize = True Me.lblFrequencyVar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFrequencyVar.Location = New System.Drawing.Point(262, 189) + Me.lblFrequencyVar.Location = New System.Drawing.Point(255, 189) Me.lblFrequencyVar.Name = "lblFrequencyVar" Me.lblFrequencyVar.Size = New System.Drawing.Size(68, 13) Me.lblFrequencyVar.TabIndex = 38 @@ -545,19 +545,16 @@ Partial Class dlgStack Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(418, 447) + Me.ClientSize = New System.Drawing.Size(422, 442) + Me.Controls.Add(Me.ucrReceiverColumnsToBeStack) Me.Controls.Add(Me.lblExpandFactor) - Me.Controls.Add(Me.ucrReceiverExpand) Me.Controls.Add(Me.rdoExpand) Me.Controls.Add(Me.ucrChkToLowerCase) Me.Controls.Add(Me.ucrInputNamesTo) Me.Controls.Add(Me.lblSets) Me.Controls.Add(Me.ucrNudNoSets) Me.Controls.Add(Me.ucrInputDropPrefix) - Me.Controls.Add(Me.lblColumnsTostack) - Me.Controls.Add(Me.lblVariable) Me.Controls.Add(Me.ucrInputOutput) - Me.Controls.Add(Me.ucrReceiverColumnsToBeStack) Me.Controls.Add(Me.ucrReceiverTextColumn) Me.Controls.Add(Me.rdoUnnest) Me.Controls.Add(Me.rdoPivotLonger) @@ -568,9 +565,7 @@ Partial Class dlgStack Me.Controls.Add(Me.ucrSelectorStack) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrInputToken) - Me.Controls.Add(Me.lblToken) Me.Controls.Add(Me.ucrInputFormat) - Me.Controls.Add(Me.lblFormat) Me.Controls.Add(Me.ucrChkPunctuation) Me.Controls.Add(Me.lblValuesTo) Me.Controls.Add(Me.ucrChkDropMissingValues) @@ -582,11 +577,16 @@ Partial Class dlgStack Me.Controls.Add(Me.ucrSaveNewDataName) Me.Controls.Add(Me.lblNamesTo) Me.Controls.Add(Me.lblFactorInto) - Me.Controls.Add(Me.ucrChkCarryAllColumns) Me.Controls.Add(Me.lblPattern) Me.Controls.Add(Me.ucrInputPattern) Me.Controls.Add(Me.lblFrequencyVar) Me.Controls.Add(Me.ucrReceiverFrequency) + Me.Controls.Add(Me.ucrChkCarryAllColumns) + Me.Controls.Add(Me.lblColumnsTostack) + Me.Controls.Add(Me.ucrReceiverExpand) + Me.Controls.Add(Me.lblFormat) + Me.Controls.Add(Me.lblToken) + Me.Controls.Add(Me.lblVariable) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/dlgTransformText.Designer.vb b/instat/dlgTransformText.Designer.vb index c0a569195c0..e0175a760bb 100644 --- a/instat/dlgTransformText.Designer.vb +++ b/instat/dlgTransformText.Designer.vb @@ -197,7 +197,7 @@ Partial Class dlgTransformText Me.grpParameters.Controls.Add(Me.ucrPnlSideTrunc) Me.grpParameters.Location = New System.Drawing.Point(10, 238) Me.grpParameters.Name = "grpParameters" - Me.grpParameters.Size = New System.Drawing.Size(397, 173) + Me.grpParameters.Size = New System.Drawing.Size(425, 171) Me.grpParameters.TabIndex = 12 Me.grpParameters.TabStop = False Me.grpParameters.Text = "Options" @@ -592,9 +592,9 @@ Partial Class dlgTransformText Me.rdoCase.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoCase.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoCase.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoCase.Location = New System.Drawing.Point(71, 8) + Me.rdoCase.Location = New System.Drawing.Point(94, 8) Me.rdoCase.Name = "rdoCase" - Me.rdoCase.Size = New System.Drawing.Size(65, 34) + Me.rdoCase.Size = New System.Drawing.Size(46, 34) Me.rdoCase.TabIndex = 1 Me.rdoCase.TabStop = True Me.rdoCase.Text = "Case" @@ -609,9 +609,9 @@ Partial Class dlgTransformText Me.rdoLength.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoLength.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoLength.Location = New System.Drawing.Point(135, 8) + Me.rdoLength.Location = New System.Drawing.Point(137, 8) Me.rdoLength.Name = "rdoLength" - Me.rdoLength.Size = New System.Drawing.Size(54, 34) + Me.rdoLength.Size = New System.Drawing.Size(64, 34) Me.rdoLength.TabIndex = 2 Me.rdoLength.TabStop = True Me.rdoLength.Text = "Length" @@ -626,9 +626,9 @@ Partial Class dlgTransformText Me.rdoPad.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoPad.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoPad.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoPad.Location = New System.Drawing.Point(188, 8) + Me.rdoPad.Location = New System.Drawing.Point(197, 8) Me.rdoPad.Name = "rdoPad" - Me.rdoPad.Size = New System.Drawing.Size(44, 34) + Me.rdoPad.Size = New System.Drawing.Size(51, 34) Me.rdoPad.TabIndex = 3 Me.rdoPad.TabStop = True Me.rdoPad.Text = "Pad" @@ -645,7 +645,7 @@ Partial Class dlgTransformText Me.rdoSubstring.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoSubstring.Location = New System.Drawing.Point(7, 8) Me.rdoSubstring.Name = "rdoSubstring" - Me.rdoSubstring.Size = New System.Drawing.Size(65, 34) + Me.rdoSubstring.Size = New System.Drawing.Size(87, 34) Me.rdoSubstring.TabIndex = 8 Me.rdoSubstring.TabStop = True Me.rdoSubstring.Text = "Substring" @@ -660,9 +660,9 @@ Partial Class dlgTransformText Me.rdoWords.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoWords.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoWords.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoWords.Location = New System.Drawing.Point(395, 8) + Me.rdoWords.Location = New System.Drawing.Point(436, 8) Me.rdoWords.Name = "rdoWords" - Me.rdoWords.Size = New System.Drawing.Size(57, 34) + Me.rdoWords.Size = New System.Drawing.Size(45, 34) Me.rdoWords.TabIndex = 7 Me.rdoWords.TabStop = True Me.rdoWords.Text = "Words" @@ -677,9 +677,9 @@ Partial Class dlgTransformText Me.rdoTrim.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTrim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTrim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTrim.Location = New System.Drawing.Point(292, 8) + Me.rdoTrim.Location = New System.Drawing.Point(310, 8) Me.rdoTrim.Name = "rdoTrim" - Me.rdoTrim.Size = New System.Drawing.Size(57, 34) + Me.rdoTrim.Size = New System.Drawing.Size(58, 34) Me.rdoTrim.TabIndex = 5 Me.rdoTrim.TabStop = True Me.rdoTrim.Text = "Trim" @@ -694,9 +694,9 @@ Partial Class dlgTransformText Me.rdoWrap.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoWrap.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoWrap.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoWrap.Location = New System.Drawing.Point(348, 8) + Me.rdoWrap.Location = New System.Drawing.Point(367, 8) Me.rdoWrap.Name = "rdoWrap" - Me.rdoWrap.Size = New System.Drawing.Size(48, 34) + Me.rdoWrap.Size = New System.Drawing.Size(69, 34) Me.rdoWrap.TabIndex = 6 Me.rdoWrap.TabStop = True Me.rdoWrap.Text = "Wrap" @@ -711,7 +711,7 @@ Partial Class dlgTransformText Me.rdoTruncate.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTruncate.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTruncate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTruncate.Location = New System.Drawing.Point(230, 8) + Me.rdoTruncate.Location = New System.Drawing.Point(247, 8) Me.rdoTruncate.Name = "rdoTruncate" Me.rdoTruncate.Size = New System.Drawing.Size(63, 34) Me.rdoTruncate.TabIndex = 4 @@ -758,9 +758,9 @@ Partial Class dlgTransformText ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 442) + Me.ucrBase.Location = New System.Drawing.Point(10, 447) 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 = 15 ' 'ucrPnlOperation @@ -775,7 +775,7 @@ Partial Class dlgTransformText ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(466, 498) + Me.ClientSize = New System.Drawing.Size(491, 501) Me.Controls.Add(Me.grpParameters) Me.Controls.Add(Me.rdoTruncate) Me.Controls.Add(Me.rdoWrap) diff --git a/instat/dlgTwoVariableUseModel.vb b/instat/dlgTwoVariableUseModel.vb index 11b1d141f46..604c852e2f6 100644 --- a/instat/dlgTwoVariableUseModel.vb +++ b/instat/dlgTwoVariableUseModel.vb @@ -26,8 +26,6 @@ Public Class dlgTwoVariableUseModel InitialiseDialog() SetDefaults() bFirstLoad = False - Else - ReOpenDialog() End If TestOkEnabled() autoTranslate(Me) @@ -53,7 +51,7 @@ Public Class dlgTwoVariableUseModel ' sdgSimpleRegOptions.chkFittedModel.Enabled = False 'ucrBase.iHelpTopicID = ucrBaseUseModel.clsRsyntax.SetOperation("+") - ucrReceiverUseModel.SetItemType("model") + ucrReceiverUseModel.SetItemType(RObjectTypeLabel.Model) ucrReceiverUseModel.Selector = ucrSelectorUseModel clsRCommand.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_models") ucrBaseUseModel.clsRsyntax.SetOperatorParameter(True, clsRFunc:=clsRCommand) @@ -62,18 +60,10 @@ Public Class dlgTwoVariableUseModel ucrReceiverUseModel.strSelectorHeading = "Models" End Sub - Private Sub ReOpenDialog() - - End Sub - Private Sub ucrBaseUseModel_ClickReset(sender As Object, e As EventArgs) Handles ucrBaseUseModel.ClickReset SetDefaults() End Sub - Private Sub ucrBaseUseModel_ClickOk(sender As Object, e As EventArgs) Handles ucrBaseUseModel.ClickOk - 'sdgSimpleRegOptions.RegOptions() - End Sub - Private Sub TestOkEnabled() If Not ucrReceiverUseModel.IsEmpty Then ucrBaseUseModel.OKEnabled(True) diff --git a/instat/dlgUseGraph.Designer.vb b/instat/dlgUseGraph.Designer.vb index 926cfba1ae4..4d439c7f3e1 100644 --- a/instat/dlgUseGraph.Designer.vb +++ b/instat/dlgUseGraph.Designer.vb @@ -15,7 +15,7 @@ ' along with this program. If not, see . -Partial Class dlgRenameGraph +Partial Class dlgUseGraph Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. @@ -142,7 +142,7 @@ Partial Class dlgRenameGraph Me.grpLegend.TabStop = False Me.grpLegend.Text = "Legend" ' - 'dlgRenameGraph + 'dlgUseGraph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi @@ -158,7 +158,7 @@ Partial Class dlgRenameGraph Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False - Me.Name = "dlgRenameGraph" + Me.Name = "dlgUseGraph" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Use_Graph" Me.Text = "Use Graph" diff --git a/instat/dlgUseGraph.vb b/instat/dlgUseGraph.vb index fdf1100d954..72f268a077c 100644 --- a/instat/dlgUseGraph.vb +++ b/instat/dlgUseGraph.vb @@ -15,7 +15,7 @@ ' along with this program. If not, see . Imports instat.Translations -Public Class dlgRenameGraph +Public Class dlgUseGraph Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsUseGraphFunction As New RFunction @@ -60,11 +60,11 @@ Public Class dlgRenameGraph ucrGraphsSelector.SetParameter(New RParameter("data_name", 0)) ucrGraphsSelector.SetParameterIsString() - ucrGraphReceiver.SetParameter(New RParameter("graph_name", 1)) + ucrGraphReceiver.SetParameter(New RParameter("object_name", 1)) ucrGraphReceiver.Selector = ucrGraphsSelector ucrGraphReceiver.strSelectorHeading = "Graphs" ucrGraphReceiver.SetParameterIsString() - ucrGraphReceiver.SetItemType("graph") + ucrGraphReceiver.SetItemType(RObjectTypeLabel.Graph) 'Theme Tab Checkboxes under grpCommonOptions ucrChkLegendPosition.SetText("Legend Position") @@ -82,7 +82,8 @@ Public Class dlgRenameGraph ucrChkLegendPosition.SetLinkedDisplayControl(grpLegend) ucrSaveGraph.SetPrefix("use_graph") - ucrSaveGraph.SetSaveTypeAsGraph() + ucrSaveGraph.SetSaveType(strRObjectType:=RObjectTypeLabel.Graph, + strRObjectFormat:=RObjectFormat.Image) ucrSaveGraph.SetDataFrameSelector(ucrGraphsSelector.ucrAvailableDataFrames) ucrSaveGraph.SetCheckBoxText("Save New Graph") ucrSaveGraph.SetIsComboBox() @@ -117,9 +118,13 @@ Public Class dlgRenameGraph clsScaleColourViridisFunction = GgplotDefaults.clsScaleColorViridisFunction clsAnnotateFunction = GgplotDefaults.clsAnnotateFunction - clsUseGraphFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_graphs") - clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrGraphsSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") + clsUseGraphFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") + clsBaseOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_graph", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Graph, + strRObjectFormatToAssignTo:=RObjectFormat.Image, + strRDataFrameNameToAddObjectTo:=ucrGraphsSelector.strCurrentDataFrame, + strObjectName:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) TestOkEnabled() End Sub diff --git a/instat/dlgUseModel.vb b/instat/dlgUseModel.vb index 756d128402a..c7156234d5b 100644 --- a/instat/dlgUseModel.vb +++ b/instat/dlgUseModel.vb @@ -228,7 +228,7 @@ Public Class dlgUseModel Dim item As ListViewItem ucrBase.clsRsyntax.lstBeforeCodes.Clear() - clsGetModel.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_models") + clsGetModel.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") ucrInputModels.SetName("[No models selected]") strExpression = ucrReceiverForTestColumn.GetVariableNames(False) For Each item In ucrSelectorUseModel.lstAvailableVariable.Items @@ -236,8 +236,9 @@ Public Class dlgUseModel If strExpression.Contains(strModel) Then lstModels.Add(strModel) clsGetModel.AddParameter("data_name", Chr(34) & ucrSelectorUseModel.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) - clsGetModel.AddParameter("model_name", Chr(34) & strModel & Chr(34), iPosition:=1) - clsGetModel.SetAssignTo(strModel) + clsGetModel.AddParameter("object_name", Chr(34) & strModel & Chr(34), iPosition:=1) + clsGetModel.AddParameter("as_file", "FALSE", iPosition:=2) + clsGetModel.SetAssignToObject(strRObjectToAssignTo:=strModel) ucrBase.clsRsyntax.AddToBeforeCodes(clsGetModel.Clone(), iPosition:=i) i = i + 1 End If diff --git a/instat/dlgViewGraph.Designer.vb b/instat/dlgViewGraph.Designer.vb index 827f8ca5605..e92f9875b32 100644 --- a/instat/dlgViewGraph.Designer.vb +++ b/instat/dlgViewGraph.Designer.vb @@ -39,90 +39,77 @@ Partial Class dlgViewGraph Private Sub InitializeComponent() Me.grpDisplayOptions = New System.Windows.Forms.GroupBox() - Me.rdoDisplayInteractiveView = New System.Windows.Forms.RadioButton() - Me.rdoDisplaySeparateWindow = New System.Windows.Forms.RadioButton() - Me.rdoDisplayRViewer = New System.Windows.Forms.RadioButton() - Me.rdoDisplayOutputWindow = New System.Windows.Forms.RadioButton() - Me.ucrPnlDisplayOptions = New instat.UcrPanel() + Me.rdoInteractiveView = New System.Windows.Forms.RadioButton() + Me.rdoRViewer = New System.Windows.Forms.RadioButton() + Me.rdoOutputWindow = New System.Windows.Forms.RadioButton() Me.lblGraphtoUse = New System.Windows.Forms.Label() Me.ucrGraphReceiver = New instat.ucrReceiverSingle() + Me.ucrPnlDisplayOptions = New instat.UcrPanel() Me.ucrGraphsSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.rdoMaximised = New System.Windows.Forms.RadioButton() Me.grpDisplayOptions.SuspendLayout() Me.SuspendLayout() ' 'grpDisplayOptions ' - Me.grpDisplayOptions.Controls.Add(Me.rdoDisplayInteractiveView) - Me.grpDisplayOptions.Controls.Add(Me.rdoDisplaySeparateWindow) - Me.grpDisplayOptions.Controls.Add(Me.rdoDisplayRViewer) - Me.grpDisplayOptions.Controls.Add(Me.rdoDisplayOutputWindow) + Me.grpDisplayOptions.Controls.Add(Me.rdoMaximised) + Me.grpDisplayOptions.Controls.Add(Me.rdoInteractiveView) + Me.grpDisplayOptions.Controls.Add(Me.rdoRViewer) + Me.grpDisplayOptions.Controls.Add(Me.rdoOutputWindow) Me.grpDisplayOptions.Controls.Add(Me.ucrPnlDisplayOptions) - Me.grpDisplayOptions.Location = New System.Drawing.Point(246, 90) + Me.grpDisplayOptions.Location = New System.Drawing.Point(369, 135) + Me.grpDisplayOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpDisplayOptions.Name = "grpDisplayOptions" - Me.grpDisplayOptions.Size = New System.Drawing.Size(217, 124) + Me.grpDisplayOptions.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplayOptions.Size = New System.Drawing.Size(326, 186) Me.grpDisplayOptions.TabIndex = 3 Me.grpDisplayOptions.TabStop = False Me.grpDisplayOptions.Text = "Display Options" ' - 'rdoDisplayInteractiveView - ' - Me.rdoDisplayInteractiveView.AutoSize = True - Me.rdoDisplayInteractiveView.Location = New System.Drawing.Point(9, 22) - Me.rdoDisplayInteractiveView.Name = "rdoDisplayInteractiveView" - Me.rdoDisplayInteractiveView.Size = New System.Drawing.Size(158, 17) - Me.rdoDisplayInteractiveView.TabIndex = 1 - Me.rdoDisplayInteractiveView.TabStop = True - Me.rdoDisplayInteractiveView.Text = "Display in Interactive Viewer" - Me.rdoDisplayInteractiveView.UseVisualStyleBackColor = True - ' - 'rdoDisplaySeparateWindow - ' - Me.rdoDisplaySeparateWindow.AutoSize = True - Me.rdoDisplaySeparateWindow.Location = New System.Drawing.Point(9, 91) - Me.rdoDisplaySeparateWindow.Name = "rdoDisplaySeparateWindow" - Me.rdoDisplaySeparateWindow.Size = New System.Drawing.Size(158, 17) - Me.rdoDisplaySeparateWindow.TabIndex = 4 - Me.rdoDisplaySeparateWindow.TabStop = True - Me.rdoDisplaySeparateWindow.Text = "Display in Separate Window" - Me.rdoDisplaySeparateWindow.UseVisualStyleBackColor = True - ' - 'rdoDisplayRViewer - ' - Me.rdoDisplayRViewer.AutoSize = True - Me.rdoDisplayRViewer.Location = New System.Drawing.Point(9, 45) - Me.rdoDisplayRViewer.Name = "rdoDisplayRViewer" - Me.rdoDisplayRViewer.Size = New System.Drawing.Size(116, 17) - Me.rdoDisplayRViewer.TabIndex = 2 - Me.rdoDisplayRViewer.TabStop = True - Me.rdoDisplayRViewer.Text = "Display in R-Viewer" - Me.rdoDisplayRViewer.UseVisualStyleBackColor = True - ' - 'rdoDisplayOutputWindow - ' - Me.rdoDisplayOutputWindow.AutoSize = True - Me.rdoDisplayOutputWindow.Location = New System.Drawing.Point(9, 68) - Me.rdoDisplayOutputWindow.Name = "rdoDisplayOutputWindow" - Me.rdoDisplayOutputWindow.Size = New System.Drawing.Size(147, 17) - Me.rdoDisplayOutputWindow.TabIndex = 3 - Me.rdoDisplayOutputWindow.TabStop = True - Me.rdoDisplayOutputWindow.Text = "Display in Output Window" - Me.rdoDisplayOutputWindow.UseVisualStyleBackColor = True - ' - 'ucrPnlDisplayOptions - ' - Me.ucrPnlDisplayOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDisplayOptions.Location = New System.Drawing.Point(6, 19) - Me.ucrPnlDisplayOptions.Name = "ucrPnlDisplayOptions" - Me.ucrPnlDisplayOptions.Size = New System.Drawing.Size(203, 99) - Me.ucrPnlDisplayOptions.TabIndex = 0 + 'rdoInteractiveView + ' + Me.rdoInteractiveView.AutoSize = True + Me.rdoInteractiveView.Location = New System.Drawing.Point(14, 98) + Me.rdoInteractiveView.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoInteractiveView.Name = "rdoInteractiveView" + Me.rdoInteractiveView.Size = New System.Drawing.Size(203, 24) + Me.rdoInteractiveView.TabIndex = 1 + Me.rdoInteractiveView.TabStop = True + Me.rdoInteractiveView.Text = "Interactive viewer(Plotly)" + Me.rdoInteractiveView.UseVisualStyleBackColor = True + ' + 'rdoRViewer + ' + Me.rdoRViewer.AutoSize = True + Me.rdoRViewer.Location = New System.Drawing.Point(10, 130) + Me.rdoRViewer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoRViewer.Name = "rdoRViewer" + Me.rdoRViewer.Size = New System.Drawing.Size(99, 24) + Me.rdoRViewer.TabIndex = 2 + Me.rdoRViewer.TabStop = True + Me.rdoRViewer.Text = "R-Viewer" + Me.rdoRViewer.UseVisualStyleBackColor = True + ' + 'rdoOutputWindow + ' + Me.rdoOutputWindow.AutoSize = True + Me.rdoOutputWindow.Location = New System.Drawing.Point(14, 33) + Me.rdoOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoOutputWindow.Name = "rdoOutputWindow" + Me.rdoOutputWindow.Size = New System.Drawing.Size(139, 24) + Me.rdoOutputWindow.TabIndex = 3 + Me.rdoOutputWindow.TabStop = True + Me.rdoOutputWindow.Text = "Output window" + Me.rdoOutputWindow.UseVisualStyleBackColor = True ' 'lblGraphtoUse ' Me.lblGraphtoUse.AutoSize = True - Me.lblGraphtoUse.Location = New System.Drawing.Point(250, 45) + Me.lblGraphtoUse.Location = New System.Drawing.Point(375, 68) + Me.lblGraphtoUse.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblGraphtoUse.Name = "lblGraphtoUse" - Me.lblGraphtoUse.Size = New System.Drawing.Size(77, 13) + Me.lblGraphtoUse.Size = New System.Drawing.Size(114, 20) Me.lblGraphtoUse.TabIndex = 1 Me.lblGraphtoUse.Text = "Graph to View:" ' @@ -130,48 +117,71 @@ Partial Class dlgViewGraph ' Me.ucrGraphReceiver.AutoSize = True Me.ucrGraphReceiver.frmParent = Me - Me.ucrGraphReceiver.Location = New System.Drawing.Point(250, 60) + Me.ucrGraphReceiver.Location = New System.Drawing.Point(375, 90) Me.ucrGraphReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrGraphReceiver.Name = "ucrGraphReceiver" Me.ucrGraphReceiver.Selector = Nothing - Me.ucrGraphReceiver.Size = New System.Drawing.Size(120, 20) + Me.ucrGraphReceiver.Size = New System.Drawing.Size(180, 30) Me.ucrGraphReceiver.strNcFilePath = "" Me.ucrGraphReceiver.TabIndex = 2 Me.ucrGraphReceiver.ucrSelector = Nothing ' + 'ucrPnlDisplayOptions + ' + Me.ucrPnlDisplayOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlDisplayOptions.Location = New System.Drawing.Point(9, 28) + Me.ucrPnlDisplayOptions.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlDisplayOptions.Name = "ucrPnlDisplayOptions" + Me.ucrPnlDisplayOptions.Size = New System.Drawing.Size(304, 148) + Me.ucrPnlDisplayOptions.TabIndex = 0 + ' 'ucrGraphsSelector ' Me.ucrGraphsSelector.AutoSize = True Me.ucrGraphsSelector.bDropUnusedFilterLevels = False Me.ucrGraphsSelector.bShowHiddenColumns = False Me.ucrGraphsSelector.bUseCurrentFilter = True - Me.ucrGraphsSelector.Location = New System.Drawing.Point(10, 10) + Me.ucrGraphsSelector.Location = New System.Drawing.Point(15, 15) Me.ucrGraphsSelector.Margin = New System.Windows.Forms.Padding(0) Me.ucrGraphsSelector.Name = "ucrGraphsSelector" - Me.ucrGraphsSelector.Size = New System.Drawing.Size(213, 183) + Me.ucrGraphsSelector.Size = New System.Drawing.Size(320, 274) Me.ucrGraphsSelector.TabIndex = 0 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 220) + Me.ucrBase.Location = New System.Drawing.Point(15, 330) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 4 ' + 'rdoMaximised + ' + Me.rdoMaximised.AutoSize = True + Me.rdoMaximised.Location = New System.Drawing.Point(14, 65) + Me.rdoMaximised.Margin = New System.Windows.Forms.Padding(4) + Me.rdoMaximised.Name = "rdoMaximised" + Me.rdoMaximised.Size = New System.Drawing.Size(164, 24) + Me.rdoMaximised.TabIndex = 4 + Me.rdoMaximised.TabStop = True + Me.rdoMaximised.Text = "Maximised window" + Me.rdoMaximised.UseVisualStyleBackColor = True + ' 'dlgViewGraph ' - 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(471, 276) + Me.ClientSize = New System.Drawing.Size(706, 414) Me.Controls.Add(Me.ucrGraphReceiver) Me.Controls.Add(Me.lblGraphtoUse) Me.Controls.Add(Me.grpDisplayOptions) Me.Controls.Add(Me.ucrGraphsSelector) Me.Controls.Add(Me.ucrBase) 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 = "dlgViewGraph" @@ -187,11 +197,11 @@ Partial Class dlgViewGraph Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrGraphsSelector As ucrSelectorByDataFrameAddRemove Friend WithEvents grpDisplayOptions As GroupBox - Friend WithEvents rdoDisplaySeparateWindow As RadioButton - Friend WithEvents rdoDisplayRViewer As RadioButton - Friend WithEvents rdoDisplayOutputWindow As RadioButton + Friend WithEvents rdoRViewer As RadioButton + Friend WithEvents rdoOutputWindow As RadioButton Friend WithEvents ucrPnlDisplayOptions As UcrPanel - Friend WithEvents rdoDisplayInteractiveView As RadioButton + Friend WithEvents rdoInteractiveView As RadioButton Friend WithEvents lblGraphtoUse As Label Friend WithEvents ucrGraphReceiver As ucrReceiverSingle + Friend WithEvents rdoMaximised As RadioButton End Class diff --git a/instat/dlgViewGraph.vb b/instat/dlgViewGraph.vb index f2b41ca2f75..4151d80d9c4 100644 --- a/instat/dlgViewGraph.vb +++ b/instat/dlgViewGraph.vb @@ -19,11 +19,11 @@ Imports instat.Translations Public Class dlgViewGraph Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsggPlotly, clsGetGraphs As New RFunction - Private strGlobalGraphDisplayOption As String + Private clsPlotlyRFunction, clsGetObjectRFunction, clsViewObjectRFunction, clsPrintRFunction As New RFunction + Private Sub dlgViewGraph_Load(sender As Object, e As EventArgs) Handles MyBase.Load - strGlobalGraphDisplayOption = frmMain.clsInstatOptions.strGraphDisplayOption + If bFirstLoad Then InitialiseDialog() bFirstLoad = False @@ -32,56 +32,68 @@ Public Class dlgViewGraph SetDefaults() End If SetRCodeForControls(bReset) - SetGraphDisplayType() bReset = False TestOkEnabled() - autoTranslate(Me) + 'todo. after changing the radio buttons translations, restore this line + 'autoTranslate(Me) End Sub Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 525 - rdoDisplaySeparateWindow.Enabled = False 'Selector ucrGraphsSelector.SetParameter(New RParameter("data_name", 0)) ucrGraphsSelector.SetParameterIsString() 'Receiver - ucrGraphReceiver.SetParameter(New RParameter("graph_name", 1)) + ucrGraphReceiver.SetParameter(New RParameter("object_name", 1)) ucrGraphReceiver.strSelectorHeading = "Ggplot Graphs" ucrGraphReceiver.bAutoFill = True ucrGraphReceiver.SetParameterIsString() - ucrGraphReceiver.SetItemType("graph") + ucrGraphReceiver.SetItemType(RObjectTypeLabel.Graph) ucrGraphReceiver.Selector = ucrGraphsSelector ucrGraphReceiver.SetMeAsReceiver() ' We don't specify rdos in the new system here. This is because the automatic detection of the radio buttons relies on VB options, not R code 'Group Options panel - ucrPnlDisplayOptions.AddRadioButton(rdoDisplayOutputWindow) - ucrPnlDisplayOptions.AddRadioButton(rdoDisplayRViewer) - 'ucrPnlDisplayOptions.AddRadioButton(rdoDisplaySeparateWindow) ' TODO: Add code for this - ucrPnlDisplayOptions.AddRadioButton(rdoDisplayInteractiveView) + ucrPnlDisplayOptions.AddRadioButton(rdoOutputWindow) + ucrPnlDisplayOptions.AddRadioButton(rdoMaximised) + ucrPnlDisplayOptions.AddRadioButton(rdoInteractiveView) + ucrPnlDisplayOptions.AddRadioButton(rdoRViewer) + + 'todo. Calling print() from this dialog doesn't work. investigate why + 'temporarily disabled + rdoRViewer.Enabled = False End Sub Private Sub SetDefaults() - clsggPlotly = New RFunction - clsGetGraphs = New RFunction + clsPlotlyRFunction = New RFunction + clsGetObjectRFunction = New RFunction + clsViewObjectRFunction = New RFunction + clsPrintRFunction = New RFunction ucrGraphsSelector.Reset() - rdoDisplayInteractiveView.Checked = True + rdoOutputWindow.Checked = True + + clsGetObjectRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") + + clsPlotlyRFunction.SetPackageName("plotly") + clsPlotlyRFunction.SetRCommand("ggplotly") + clsPlotlyRFunction.AddParameter("p", clsRFunctionParameter:=clsGetObjectRFunction) + + clsPrintRFunction.SetRCommand("print") + clsPrintRFunction.AddParameter("x", clsRFunctionParameter:=clsGetObjectRFunction, iPosition:=0) - clsggPlotly.SetPackageName("plotly") - clsggPlotly.SetRCommand("ggplotly") - clsggPlotly.AddParameter("p", clsRFunctionParameter:=clsGetGraphs) + clsViewObjectRFunction.SetRCommand("view_object_data") + clsViewObjectRFunction.AddParameter("object", clsRFunctionParameter:=clsGetObjectRFunction) + clsViewObjectRFunction.AddParameter("object_format", strParameterValue:=Chr(34) & RObjectFormat.Image & Chr(34)) - clsGetGraphs.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_graphs") - clsGetGraphs.AddParameter("print_graph", "FALSE") - ucrBase.clsRsyntax.SetBaseRFunction(clsggPlotly) + ucrBase.clsRsyntax.SetBaseRFunction(clsGetObjectRFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrGraphReceiver.SetRCode(clsGetGraphs, bReset) - ucrGraphsSelector.SetRCode(clsGetGraphs, bReset) + ucrGraphReceiver.SetRCode(clsGetObjectRFunction, bReset) + ucrGraphsSelector.SetRCode(clsGetObjectRFunction, bReset) End Sub Private Sub TestOkEnabled() @@ -99,26 +111,23 @@ Public Class dlgViewGraph End Sub Private Sub ucrPnlDisplayOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlDisplayOptions.ControlValueChanged - SetGraphDisplayType() - End Sub - - Private Sub SetGraphDisplayType() - If rdoDisplayInteractiveView.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsggPlotly) - ' Since R 3.4.2 this is the only way the RDotNet detects the plotly window should load - ucrBase.clsRsyntax.iCallType = 2 - clsGetGraphs.AddParameter("print_graph", "FALSE") - Else - clsGetGraphs.AddParameter("print_graph", "TRUE") - ucrBase.clsRsyntax.SetBaseRFunction(clsGetGraphs) - ucrBase.clsRsyntax.iCallType = 3 - If rdoDisplayOutputWindow.Checked Then - frmMain.clsInstatOptions.SetGraphDisplayOption("view_output_window") - ElseIf rdoDisplayRViewer.Checked Then - frmMain.clsInstatOptions.SetGraphDisplayOption("view_R_viewer") - ElseIf rdoDisplaySeparateWindow.Checked Then - frmMain.clsInstatOptions.SetGraphDisplayOption("view_separate_window") - End If + If rdoOutputWindow.Checked Then + clsGetObjectRFunction.AddParameter("as_file", strParameterValue:="TRUE", iPosition:=2) + ucrBase.clsRsyntax.SetBaseRFunction(clsGetObjectRFunction) + ElseIf rdoMaximised.Checked Then + clsViewObjectRFunction.AddParameter("object", clsRFunctionParameter:=clsGetObjectRFunction) + clsViewObjectRFunction.AddParameter("object_format", strParameterValue:=Chr(34) & RObjectFormat.Image & Chr(34), iPosition:=1) + clsGetObjectRFunction.AddParameter("as_file", strParameterValue:="FALSE", iPosition:=2) + ucrBase.clsRsyntax.SetBaseRFunction(clsViewObjectRFunction) + ElseIf rdoInteractiveView.Checked Then + clsViewObjectRFunction.AddParameter("object", clsRFunctionParameter:=clsPlotlyRFunction) + clsViewObjectRFunction.AddParameter("object_format", strParameterValue:=Chr(34) & RObjectFormat.Html & Chr(34), iPosition:=1) + clsGetObjectRFunction.AddParameter("as_file", strParameterValue:="FALSE", iPosition:=2) + ucrBase.clsRsyntax.SetBaseRFunction(clsViewObjectRFunction) + ElseIf rdoRViewer.Checked Then + 'clsViewObjectRFunction.AddParameter("object", clsRFunctionParameter:=clsGetObjectRFunction) + 'clsViewObjectRFunction.RemoveParameterByName("object_format") + ucrBase.clsRsyntax.SetBaseRFunction(clsPrintRFunction) End If End Sub @@ -126,9 +135,4 @@ Public Class dlgViewGraph TestOkEnabled() End Sub - Private Sub dlgViewGraph_VisibleChanged(sender As Object, e As EventArgs) Handles Me.VisibleChanged - If Not Me.Visible Then - frmMain.clsInstatOptions.SetGraphDisplayOption(strGlobalGraphDisplayOption) - End If - End Sub End Class \ No newline at end of file diff --git a/instat/dlgViewObjects.vb b/instat/dlgViewObjects.vb index 73b2b928fd4..0d213eb734e 100644 --- a/instat/dlgViewObjects.vb +++ b/instat/dlgViewObjects.vb @@ -20,8 +20,7 @@ Imports RDotNet Public Class dlgViewObjects Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsGetObjectsFunction As New RFunction - Private clsShowObjectStructureFunction As New RFunction + Private clsStructureRFunction, clsPrintRFunction As New RFunction Private Sub dlgViewObjects_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -39,56 +38,54 @@ Public Class dlgViewObjects Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 349 - - ' ucr selector - ucrSelectorForViewObject.SetParameter(New RParameter("data_name", 0)) - ucrSelectorForViewObject.SetParameterIsString() + 'todo. temporary to have the str() output captured as text + ucrBase.clsRsyntax.iCallType = -1 ' ucr receiver - ucrReceiverSelectedObject.SetParameter(New RParameter("object_name", 1)) - ucrReceiverSelectedObject.SetParameterIsString() + ucrReceiverSelectedObject.SetParameter(New RParameter("x", 1)) + ucrReceiverSelectedObject.SetParameterIsRFunction() ucrReceiverSelectedObject.Selector = ucrSelectorForViewObject ucrReceiverSelectedObject.SetMeAsReceiver() ucrReceiverSelectedObject.strSelectorHeading = "Objects" ucrReceiverSelectedObject.SetItemType("object") ucrReceiverSelectedObject.bAutoFill = True + 'todo. disabling and hiding this for now until they're working correctly. + 'calling print via a dialog currently does not work correctly + rdoPrint.Enabled = False + rdoAllContents.Visible = False + rdoComponent.Visible = False + 'add radio buttons to the panel rdo's - ucrPnlContentsToView.AddRadioButton(rdoPrint) + 'ucrPnlContentsToView.AddRadioButton(rdoPrint) ucrPnlContentsToView.AddRadioButton(rdoStructure) - 'ucrPnlContentsToView.AddRadioButton(rdoAllContents) 'to be added later - 'ucrPnlContentsToView.AddRadioButton(rdoComponent) 'to be added later - ucrPnlContentsToView.AddFunctionNamesCondition(rdoPrint, frmMain.clsRLink.strInstatDataObject & "$get_objects") + 'ucrPnlContentsToView.AddFunctionNamesCondition(rdoPrint, "print") ucrPnlContentsToView.AddFunctionNamesCondition(rdoStructure, "str") - 'we are disabling this for now until they're working correctly. - rdoAllContents.Enabled = False - rdoComponent.Enabled = False End Sub Private Sub SetDefaults() 'initialise the Rfunctions - clsGetObjectsFunction = New RFunction - clsShowObjectStructureFunction = New RFunction + clsStructureRFunction = New RFunction + clsPrintRFunction = New RFunction 'reset controls to default states ucrSelectorForViewObject.Reset() - - 'set R function for getting and viewing objects - clsGetObjectsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_objects") + rdoStructure.Checked = True 'set R function for showing selected object structure - clsShowObjectStructureFunction.SetRCommand("str") - clsShowObjectStructureFunction.AddParameter(New RParameter("object", clsGetObjectsFunction, iNewPosition:=0)) + clsPrintRFunction.SetRCommand("print") + clsStructureRFunction.SetRCommand("str") + 'set the base function - ucrBase.clsRsyntax.SetBaseRFunction(clsGetObjectsFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsStructureRFunction) End Sub Private Sub SetRCodeforControls(bReset As Boolean) - ucrSelectorForViewObject.SetRCode(clsGetObjectsFunction, bReset) - ucrReceiverSelectedObject.SetRCode(clsGetObjectsFunction, bReset) + ucrReceiverSelectedObject.AddAdditionalCodeParameterPair(clsStructureRFunction, New RParameter("object", 1)) + ucrReceiverSelectedObject.SetRCode(clsPrintRFunction, bReset) ucrPnlContentsToView.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) End Sub @@ -96,58 +93,24 @@ Public Class dlgViewObjects ucrBase.OKEnabled(Not ucrReceiverSelectedObject.IsEmpty) End Sub - Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - SetDefaults() - SetRCodeforControls(True) - TestOKEnabled() - End Sub - - Private Sub SetICallType() - If Not rdoStructure.Checked AndAlso IsSelectedObjectGraph() Then - ucrBase.clsRsyntax.iCallType = 3 - Else - ucrBase.clsRsyntax.iCallType = 2 - End If - End Sub - Private Sub ucrPnlContentsToReview_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlContentsToView.ControlContentsChanged 'set the appropriate Base RFunction If rdoPrint.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsGetObjectsFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsPrintRFunction) ElseIf rdoStructure.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsShowObjectStructureFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsStructureRFunction) End If - 'set the iCallType - SetICallType() End Sub Private Sub ucrReceiverSelectedObject_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSelectedObject.ControlContentsChanged TestOKEnabled() - SetICallType() End Sub - Private Function IsSelectedObjectGraph() As Boolean - Dim bGraph As Boolean = False - Dim clsGetGraphNames As RFunction - Dim expItems As SymbolicExpression - Dim strArr As String() - - clsGetGraphNames = New RFunction - clsGetGraphNames.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_graph_names") - clsGetGraphNames.AddParameter(strParameterName:="data_name", strParameterValue:=Chr(34) & ucrSelectorForViewObject.strCurrentDataFrame & Chr(34), iPosition:=0) - - expItems = frmMain.clsRLink.RunInternalScriptGetValue(clsGetGraphNames.ToScript(), bSilent:=True) - - If expItems IsNot Nothing AndAlso Not (expItems.Type = Internals.SymbolicExpressionType.Null) Then - strArr = expItems.AsCharacter.ToArray - If strArr IsNot Nothing Then - bGraph = strArr.Contains(ucrReceiverSelectedObject.GetVariableNames(bWithQuotes:=False)) - Else - bGraph = False - End If - End If + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeforControls(True) + TestOKEnabled() + End Sub - Return bGraph - End Function End Class diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 11067afaf85..0b9b1d2fcdf 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -162,23 +162,19 @@ Partial Class frmMain Me.mnuViewSwapDataAndMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelp = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpHelpIntroduction = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpHistFAQ = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuHelpFAQ = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpGetingStarted = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator28 = New System.Windows.Forms.ToolStripSeparator() Me.mnuHelpWindows = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpDataViewSpreadsheet = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpMenus = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpAboutR = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpRPackagesCommands = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpDataset = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator29 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuHelpGuide = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpGuidesCaseStudy = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpGuideGlosary = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuhelpGuidesMore = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpAboutRInstat = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuHelpLearningStatistics = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuHelpRPackages = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuHelpGlossary = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuHelpData = New System.Windows.Forms.ToolStripMenuItem() Me.mnuHelpLicence = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuHelpAcknowledgments = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator29 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuHelpPackagesDocumentation = New System.Windows.Forms.ToolStripMenuItem() Me.OpenFile = New System.Windows.Forms.OpenFileDialog() Me.ToolStripSeparator16 = New System.Windows.Forms.ToolStripSeparator() Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() @@ -717,7 +713,7 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' @@ -767,7 +763,7 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' @@ -825,7 +821,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.ToolStripSeparator27, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' @@ -910,7 +906,7 @@ Partial Class frmMain 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." ' @@ -918,7 +914,7 @@ Partial Class frmMain ' Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneralColumnSummaries, Me.mnuDescribeGeneralTabulation, Me.mnuDescribeGeneralGraphics, Me.ToolStripSeparator38, Me.mnuDescribeGeneralUseSummaries}) Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeGeneral.Tag = "General" Me.mnuDescribeGeneral.Text = "General" ' @@ -959,13 +955,13 @@ Partial Class frmMain 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations @@ -995,32 +991,32 @@ Partial Class frmMain 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel @@ -1543,7 +1539,7 @@ Partial Class frmMain ' 'mnuHelp ' - Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpHistFAQ, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.mnuHelpDataViewSpreadsheet, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpRPackagesCommands, Me.mnuHelpDataset, Me.ToolStripSeparator29, Me.mnuHelpGuide, Me.mnuHelpAboutRInstat, Me.mnuHelpLicence, Me.mnuHelpAcknowledgments}) + Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpData, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" Me.mnuHelp.Size = New System.Drawing.Size(44, 22) Me.mnuHelp.Tag = "Help" @@ -1552,113 +1548,87 @@ Partial Class frmMain 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(209, 22) Me.mnuHelpHelpIntroduction.Text = "Introduction" ' - 'mnuHelpHistFAQ + 'mnuHelpFAQ ' - Me.mnuHelpHistFAQ.Name = "mnuHelpHistFAQ" - Me.mnuHelpHistFAQ.Size = New System.Drawing.Size(230, 22) - Me.mnuHelpHistFAQ.Text = "History and FAQ" + Me.mnuHelpFAQ.Name = "mnuHelpFAQ" + Me.mnuHelpFAQ.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpFAQ.Text = "FAQ" ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(209, 22) Me.mnuHelpGetingStarted.Text = "Getting Started" ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpWindows.Size = New System.Drawing.Size(209, 22) Me.mnuHelpWindows.Text = "Windows" ' - 'mnuHelpDataViewSpreadsheet - ' - Me.mnuHelpDataViewSpreadsheet.Name = "mnuHelpDataViewSpreadsheet" - Me.mnuHelpDataViewSpreadsheet.Size = New System.Drawing.Size(230, 22) - Me.mnuHelpDataViewSpreadsheet.Text = "Data View (Spreadsheet)" - ' 'mnuHelpMenus ' Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpMenus.Size = New System.Drawing.Size(209, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(209, 22) Me.mnuHelpAboutR.Text = "About R" + Me.mnuHelpAboutR.Visible = False ' - 'mnuHelpRPackagesCommands - ' - Me.mnuHelpRPackagesCommands.Name = "mnuHelpRPackagesCommands" - Me.mnuHelpRPackagesCommands.Size = New System.Drawing.Size(230, 22) - Me.mnuHelpRPackagesCommands.Text = "R Packages and Commands..." - ' - 'mnuHelpDataset - ' - Me.mnuHelpDataset.Name = "mnuHelpDataset" - Me.mnuHelpDataset.Size = New System.Drawing.Size(230, 22) - Me.mnuHelpDataset.Text = "Datasets" - ' - 'ToolStripSeparator29 - ' - Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(227, 6) - ' - 'mnuHelpGuide - ' - Me.mnuHelpGuide.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpGuidesCaseStudy, Me.mnuHelpGuideGlosary, Me.mnuhelpGuidesMore}) - Me.mnuHelpGuide.Name = "mnuHelpGuide" - Me.mnuHelpGuide.Size = New System.Drawing.Size(230, 22) - Me.mnuHelpGuide.Text = "Guides" - ' - 'mnuHelpGuidesCaseStudy + 'mnuHelpLearningStatistics ' - Me.mnuHelpGuidesCaseStudy.Name = "mnuHelpGuidesCaseStudy" - Me.mnuHelpGuidesCaseStudy.Size = New System.Drawing.Size(166, 22) - Me.mnuHelpGuidesCaseStudy.Text = "Case Study Guide" + Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpLearningStatistics.Text = "Learning Statistics" + Me.mnuHelpLearningStatistics.Visible = False ' - 'mnuHelpGuideGlosary + 'mnuHelpRPackages ' - Me.mnuHelpGuideGlosary.Name = "mnuHelpGuideGlosary" - Me.mnuHelpGuideGlosary.Size = New System.Drawing.Size(166, 22) - Me.mnuHelpGuideGlosary.Text = "Glossary" + Me.mnuHelpRPackages.Name = "mnuHelpRPackages" + Me.mnuHelpRPackages.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpRPackages.Text = "R Packages" ' - 'mnuhelpGuidesMore + 'mnuHelpGlossary ' - Me.mnuhelpGuidesMore.Enabled = False - Me.mnuhelpGuidesMore.Name = "mnuhelpGuidesMore" - Me.mnuhelpGuidesMore.Size = New System.Drawing.Size(166, 22) - Me.mnuhelpGuidesMore.Text = "More..." + Me.mnuHelpGlossary.Name = "mnuHelpGlossary" + Me.mnuHelpGlossary.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpGlossary.Text = "Glossary" ' - 'mnuHelpAboutRInstat + 'mnuHelpData ' - Me.mnuHelpAboutRInstat.Enabled = False - Me.mnuHelpAboutRInstat.Name = "mnuHelpAboutRInstat" - Me.mnuHelpAboutRInstat.Size = New System.Drawing.Size(230, 22) - Me.mnuHelpAboutRInstat.Tag = "About_R-Instat" - Me.mnuHelpAboutRInstat.Text = "About R-Instat" + Me.mnuHelpData.Name = "mnuHelpData" + Me.mnuHelpData.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpData.Text = "Data" ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(209, 22) Me.mnuHelpLicence.Tag = "Licence..." - Me.mnuHelpLicence.Text = "Licence..." + Me.mnuHelpLicence.Text = "Licence" + ' + 'ToolStripSeparator29 + ' + Me.ToolStripSeparator29.Name = "ToolStripSeparator29" + Me.ToolStripSeparator29.Size = New System.Drawing.Size(206, 6) ' - 'mnuHelpAcknowledgments + 'mnuHelpPackagesDocumentation ' - Me.mnuHelpAcknowledgments.Name = "mnuHelpAcknowledgments" - Me.mnuHelpAcknowledgments.Size = New System.Drawing.Size(230, 22) - Me.mnuHelpAcknowledgments.Text = "Acknowledgements" + Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(209, 22) + Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation" ' 'ToolStripSeparator16 ' @@ -5350,7 +5320,6 @@ Partial Class frmMain Friend WithEvents mnuViewOutputWindow As ToolStripMenuItem Friend WithEvents ToolStripSeparator22 As ToolStripSeparator Friend WithEvents mnuModelOtherOneVariableGoodnessofFit As ToolStripMenuItem - Friend WithEvents mnuHelpAboutRInstat As ToolStripMenuItem Friend WithEvents mnuHelpLicence As ToolStripMenuItem Friend WithEvents mnuToolsCheckForUpdates As ToolStripMenuItem Friend WithEvents ToolStripSeparator9 As ToolStripSeparator @@ -5439,18 +5408,14 @@ Partial Class frmMain Friend WithEvents mnuPrepareCheckDataImportOpenRefine As ToolStripMenuItem Friend WithEvents ToolStripSeparator8 As ToolStripSeparator Friend WithEvents mnuHelpHelpIntroduction As ToolStripMenuItem - Friend WithEvents mnuHelpHistFAQ As ToolStripMenuItem + Friend WithEvents mnuHelpFAQ As ToolStripMenuItem Friend WithEvents mnuHelpGetingStarted As ToolStripMenuItem Friend WithEvents ToolStripSeparator28 As ToolStripSeparator Friend WithEvents mnuHelpMenus As ToolStripMenuItem Friend WithEvents mnuHelpAboutR As ToolStripMenuItem - Friend WithEvents mnuHelpRPackagesCommands As ToolStripMenuItem - Friend WithEvents mnuHelpDataset As ToolStripMenuItem + Friend WithEvents mnuHelpRPackages As ToolStripMenuItem + Friend WithEvents mnuHelpData As ToolStripMenuItem Friend WithEvents ToolStripSeparator29 As ToolStripSeparator - Friend WithEvents mnuHelpGuide As ToolStripMenuItem - Friend WithEvents mnuHelpGuidesCaseStudy As ToolStripMenuItem - Friend WithEvents mnuHelpGuideGlosary As ToolStripMenuItem - Friend WithEvents mnuhelpGuidesMore As ToolStripMenuItem Friend WithEvents mnuClimaticFileExportToCPT As ToolStripMenuItem Friend WithEvents mnuClimateFileImportfromClimSoft As ToolStripMenuItem Friend WithEvents mnuClimaticFileImportfromCliData As ToolStripMenuItem @@ -5628,7 +5593,6 @@ Partial Class frmMain Friend WithEvents mnuClimaticTidyandExamineMerge As ToolStripMenuItem Friend WithEvents mnuClimaticCMSAFExporttoCMSAFRToolbox As ToolStripMenuItem Friend WithEvents mnuClimaticPrepareConversions As ToolStripMenuItem - Friend WithEvents mnuHelpAcknowledgments As ToolStripMenuItem Friend WithEvents mnuProcurementDescribeCategorical As ToolStripMenuItem Friend WithEvents mnuProcurementDescribeNumeric As ToolStripMenuItem Friend WithEvents mnuProcurementDescribeCategoricalOneVarFreq As ToolStripMenuItem @@ -5650,7 +5614,6 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator51 As ToolStripSeparator Friend WithEvents mnuClimaticMapping As ToolStripMenuItem Friend WithEvents mnuHelpWindows As ToolStripMenuItem - Friend WithEvents mnuHelpDataViewSpreadsheet As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineDuplicateRows As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineOneVariableGraph As ToolStripMenuItem Friend WithEvents mnuClimaticTidyandExamineOneVariableFrequencies As ToolStripMenuItem @@ -5822,4 +5785,7 @@ Partial Class frmMain Friend WithEvents mnuPrepareColumnTextSearch As ToolStripMenuItem Friend WithEvents mnuDescribeSpecificTables As ToolStripMenuItem Friend WithEvents ToolStripSeparator26 As ToolStripSeparator + Friend WithEvents mnuHelpLearningStatistics As ToolStripMenuItem + Friend WithEvents mnuHelpGlossary As ToolStripMenuItem + Friend WithEvents mnuHelpPackagesDocumentation As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index ef6276ed2d0..9687de2c380 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -102,7 +102,6 @@ Public Class frmMain SetMainMenusEnabled(False) Cursor = Cursors.WaitCursor 'temporary - mnuHelpAboutRInstat.Visible = False ' This must be fixed because CurrentCulture affects functions such as Decimal.TryParse ' e.g. "1.0" fails Decimal.TryParse if CurrentCulture = "fr-FR" because it expects "1,0" @@ -1053,7 +1052,7 @@ Public Class frmMain End Sub Private Sub mnuDescribeUseGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeUseGraph.Click - dlgRenameGraph.ShowDialog() + dlgUseGraph.ShowDialog() End Sub Private Sub mnuDescribeCombineGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeCombineGraph.Click @@ -1153,7 +1152,7 @@ Public Class frmMain Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "0") End Sub - Private Sub mnuHelpHistFAQ_Click(sender As Object, e As EventArgs) Handles mnuHelpHistFAQ.Click + Private Sub mnuHelpHistFAQ_Click(sender As Object, e As EventArgs) Handles mnuHelpFAQ.Click Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "290") End Sub @@ -1161,12 +1160,12 @@ Public Class frmMain Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "3") End Sub - Private Sub mnuHelpDataset_Click(sender As Object, e As EventArgs) Handles mnuHelpDataset.Click + Private Sub mnuHelpDataset_Click(sender As Object, e As EventArgs) Handles mnuHelpData.Click Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "71") End Sub - Private Sub mnuHelpRPackagesCommands_Click(sender As Object, e As EventArgs) Handles mnuHelpRPackagesCommands.Click - dlgHelpVignettes.ShowDialog() + Private Sub mnuHelpRPackagesCommands_Click(sender As Object, e As EventArgs) Handles mnuHelpRPackages.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "26") End Sub Private Sub mnuHelpR_Click(sender As Object, e As EventArgs) Handles mnuHelpAboutR.Click @@ -1177,15 +1176,6 @@ Public Class frmMain Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "12") End Sub - - Private Sub mnuHelpGuidesCaseStudy_Click(sender As Object, e As EventArgs) Handles mnuHelpGuidesCaseStudy.Click - Process.Start(Path.Combine(strStaticPath, "Help", "Case_Study_Guide_June_2016.pdf")) - End Sub - - Private Sub mnuHelpGuideGlosary_Click(sender As Object, e As EventArgs) Handles mnuHelpGuideGlosary.Click - Process.Start(Path.Combine(strStaticPath, "Help", "Statistics Glossary.pdf")) - End Sub - Private Sub mnuHelpLicence_Click(sender As Object, e As EventArgs) Handles mnuHelpLicence.Click Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "323") End Sub @@ -1941,8 +1931,8 @@ Public Class frmMain dlgFitModel.ShowDialog() End Sub - Private Sub mnuHelpAcknowledgments_Click(sender As Object, e As EventArgs) Handles mnuHelpAcknowledgments.Click - Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "151") + Private Sub mnuHelpGlossary_Click(sender As Object, e As EventArgs) Handles mnuHelpGlossary.Click + Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "92") End Sub Private Sub mnuDescribeSpecificMosaic_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificMosaic.Click @@ -1996,10 +1986,6 @@ Public Class frmMain Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "539") End Sub - Private Sub mnuHelpDataViewSpreadsheet_Click(sender As Object, e As EventArgs) Handles mnuHelpDataViewSpreadsheet.Click - Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "134") - End Sub - Private Sub mnuClimaticTidyandExamineOneVariableGraph_Click(sender As Object, e As EventArgs) Handles mnuClimaticTidyandExamineOneVariableGraph.Click dlgOneVariableGraph.ShowDialog() End Sub @@ -2104,58 +2090,52 @@ Public Class frmMain End Sub Private Sub MnuLastGraph_ButtonClick(sender As Object, e As EventArgs) Handles mnuLastGraph.ButtonClick, mnuNormalViewer.Click - Dim clsLastGraph As New RFunction - clsLastGraph.SetRCommand(clsRLink.strInstatDataObject & "$get_last_object") - clsLastGraph.AddParameter("object_type_label", Chr(34) & RObjectTypeLabel.Graph & Chr(34), iPosition:=0) + Dim clsLastObjectRFunction As New RFunction + clsLastObjectRFunction.SetRCommand(clsRLink.strInstatDataObject & "$get_last_object_data") + clsLastObjectRFunction.AddParameter("object_type_label", Chr(34) & RObjectTypeLabel.Graph & Chr(34), iPosition:=0) + clsLastObjectRFunction.AddParameter("as_file", strParameterValue:="FALSE", iPosition:=1) - Dim clsViewObjectFunction As New RFunction - clsViewObjectFunction.SetRCommand("view_object") - clsViewObjectFunction.AddParameter("object", clsRFunctionParameter:=clsLastGraph) - clsViewObjectFunction.AddParameter("object_format", strParameterValue:=Chr(34) & RObjectFormat.Image & Chr(34)) + Dim clsViewObjectRFunction As New RFunction + clsViewObjectRFunction.SetRCommand("view_object_data") + clsViewObjectRFunction.AddParameter("object", clsRFunctionParameter:=clsLastObjectRFunction) + clsViewObjectRFunction.AddParameter("object_format", strParameterValue:=Chr(34) & RObjectFormat.Image & Chr(34)) - 'todo. should this script be logged? - clsRLink.RunScript(clsLastGraph.ToScript(), strComment:="View last graph", bAddOutputInInternalViewer:=False, bSeparateThread:=False) + clsRLink.RunScript(clsViewObjectRFunction.ToScript(), strComment:="View last graph", bSeparateThread:=False) End Sub Private Sub Mnuploty_Click(sender As Object, e As EventArgs) Handles mnuploty.Click - Dim clsViewObjectFunction As New RFunction - Dim clsInteractivePlot As New RFunction - Dim clsLastGraph As New RFunction + Dim clsViewObjectRFunction As New RFunction + Dim clsPlotlyRFunction As New RFunction + Dim clsLastObjectRFunction As New RFunction - clsLastGraph.SetRCommand(clsRLink.strInstatDataObject & "$get_last_object") - clsLastGraph.AddParameter("object_type_label", strParameterValue:=Chr(34) & RObjectTypeLabel.Graph & Chr(34), iPosition:=0) - clsLastGraph.AddParameter("as_file", strParameterValue:="FALSE", iPosition:=1) + clsLastObjectRFunction.SetRCommand(clsRLink.strInstatDataObject & "$get_last_object_data") + clsLastObjectRFunction.AddParameter("object_type_label", strParameterValue:=Chr(34) & RObjectTypeLabel.Graph & Chr(34), iPosition:=0) + clsLastObjectRFunction.AddParameter("as_file", strParameterValue:="FALSE", iPosition:=1) - clsInteractivePlot.SetPackageName("plotly") - clsInteractivePlot.SetRCommand("ggplotly") - clsInteractivePlot.AddParameter("p", clsRFunctionParameter:=clsLastGraph, iPosition:=0) + clsPlotlyRFunction.SetPackageName("plotly") + clsPlotlyRFunction.SetRCommand("ggplotly") + clsPlotlyRFunction.AddParameter("p", clsRFunctionParameter:=clsLastObjectRFunction, iPosition:=0) - clsViewObjectFunction.SetRCommand("view_object") - clsViewObjectFunction.AddParameter("object", clsRFunctionParameter:=clsInteractivePlot) - clsViewObjectFunction.AddParameter("object_format", strParameterValue:=Chr(34) & RObjectFormat.Html & Chr(34)) + clsViewObjectRFunction.SetRCommand("view_object_data") + clsViewObjectRFunction.AddParameter("object", clsRFunctionParameter:=clsPlotlyRFunction) + clsViewObjectRFunction.AddParameter("object_format", strParameterValue:=Chr(34) & RObjectFormat.Html & Chr(34)) - 'todo. should this script be logged? - clsRLink.RunScript(clsViewObjectFunction.ToScript(), strComment:="View last graph as plotly", bAddOutputInInternalViewer:=False, bSeparateThread:=False) + clsRLink.RunScript(clsViewObjectRFunction.ToScript(), strComment:="View last graph as plotly", bSeparateThread:=False) End Sub Private Sub MnuRViewer_Click(sender As Object, e As EventArgs) Handles mnuRViewer.Click - Dim clsLastGraph As New RFunction - Dim clsPrintGraph As New RFunction - clsLastGraph.SetRCommand(clsRLink.strInstatDataObject & "$get_last_object") - clsLastGraph.AddParameter("object_type_label", strParameterValue:=Chr(34) & RObjectTypeLabel.Graph & Chr(34), iPosition:=0) - clsLastGraph.AddParameter("as_file", strParameterValue:="FALSE", iPosition:=1) - clsLastGraph.SetAssignToObject("last_graph") - - clsPrintGraph.SetRCommand("print") - clsPrintGraph.AddParameter("x", clsRFunctionParameter:=clsLastGraph, iPosition:=0) + Dim clsLastObjectRFunction As New RFunction + Dim clsPrintRFunction As New RFunction + clsLastObjectRFunction.SetRCommand(clsRLink.strInstatDataObject & "$get_last_object_data") + clsLastObjectRFunction.AddParameter("object_type_label", strParameterValue:=Chr(34) & RObjectTypeLabel.Graph & Chr(34), iPosition:=0) + clsLastObjectRFunction.AddParameter("as_file", strParameterValue:="FALSE", iPosition:=1) - Dim strScript1 As String = "" - Dim strScript2 As String = clsPrintGraph.ToScript(strScript1) + clsPrintRFunction.SetRCommand("print") + clsPrintRFunction.AddParameter("x", clsRFunctionParameter:=clsLastObjectRFunction, iPosition:=0) - 'todo. should this script be logged? - clsRLink.RunScript(strScript1 & strScript2, strComment:="View last graph in R viewer", bSeparateThread:=False) + clsRLink.RunScript(clsPrintRFunction.ToScript(), strComment:="View last graph in R viewer", bSeparateThread:=False) End Sub @@ -2525,4 +2505,9 @@ Public Class frmMain Private Sub mnuPrepareColumnTextSearch_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnTextSearch.Click dlgSearch.ShowDialog() End Sub + + Private Sub mnuHelpPackagesDocumentation_Click(sender As Object, e As EventArgs) Handles mnuHelpPackagesDocumentation.Click + dlgHelpVignettes.ShowDialog() + End Sub + End Class diff --git a/instat/sdgMerge.Designer.vb b/instat/sdgMerge.Designer.vb index 982d5b5aa9d..893df565919 100644 --- a/instat/sdgMerge.Designer.vb +++ b/instat/sdgMerge.Designer.vb @@ -111,7 +111,7 @@ Partial Class sdgMerge Me.cmdRemoveAll.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRemoveAll.Location = New System.Drawing.Point(6, 223) Me.cmdRemoveAll.Name = "cmdRemoveAll" - Me.cmdRemoveAll.Size = New System.Drawing.Size(130, 23) + Me.cmdRemoveAll.Size = New System.Drawing.Size(183, 24) Me.cmdRemoveAll.TabIndex = 3 Me.cmdRemoveAll.Text = "Remove All Pairs" Me.cmdRemoveAll.UseVisualStyleBackColor = True @@ -142,7 +142,7 @@ Partial Class sdgMerge Me.cmdRemoveSelectedPair.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdRemoveSelectedPair.Location = New System.Drawing.Point(6, 194) Me.cmdRemoveSelectedPair.Name = "cmdRemoveSelectedPair" - Me.cmdRemoveSelectedPair.Size = New System.Drawing.Size(130, 23) + Me.cmdRemoveSelectedPair.Size = New System.Drawing.Size(183, 24) Me.cmdRemoveSelectedPair.TabIndex = 2 Me.cmdRemoveSelectedPair.Text = "Remove Selected Pair" Me.cmdRemoveSelectedPair.UseVisualStyleBackColor = True diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 00e212eafdd..8314a15d5a9 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -2050,11 +2050,11 @@ DataSheet$set("public", "get_variables_metadata_fields", function(as_list = FALS ) #objects names are expected to be unique. Objects are in a nested list. -#see comments in issue #7808 for further details +#see comments in issue #7808 for more details DataSheet$set("public", "add_object", function(object_name, object_type_label, object_format, object) { if(missing(object_name)){ - object_name = next_default_item("object", names(private$objects)) + object_name <- next_default_item("object", names(private$objects)) } if(object_name %in% names(private$objects)){ @@ -2064,37 +2064,33 @@ DataSheet$set("public", "add_object", function(object_name, object_type_label, o #add the object with its metadata to the list of objects and add an "Added_object" change private$objects[[object_name]] <- list(object_type_label = object_type_label, object_format = object_format, object = object) self$append_to_changes(list(Added_object, object_name)) - - #if the object is a graph then set it's name as the last graph name added. - if(identical(object_type_label, "graph")){ - private$.last_graph <- object_name - } +} +) + +DataSheet$set("public", "get_object_names", function(object_type_label = NULL, + as_list = FALSE) { + + out <- get_data_book_output_object_names(output_object_list = private$objects, + object_type_label = object_type_label, + as_list = as_list, + list_label= self$get_metadata(data_name_label) ) + return(out) } ) -DataSheet$set("public", "get_objects", function(object_name, object_type_label, force_as_list = FALSE, silent = FALSE) { - curr_objects = private$objects[self$get_object_names(object_type_label = object_type_label)] - if(length(curr_objects) == 0) return(curr_objects) - if(missing(object_name)) return(curr_objects) - if(!is.character(object_name)) stop("object_name must be a character") - if(!all(object_name %in% names(curr_objects))) { - if (silent) return(NULL) - else stop(object_name, " not found in objects") - } - if(length(object_name) == 1) { - if(force_as_list) return(curr_objects[object_name]) - else return(curr_objects[[object_name]]) - } - else return(curr_objects[object_name]) +DataSheet$set("public", "get_objects", function(object_type_label = NULL) { + out <- + private$objects[self$get_object_names(object_type_label = object_type_label)] + return(out) } ) -#object name must be supplied +#object name must be character #returns NULL if object is not found DataSheet$set("public", "get_object", function(object_name) { #make sure supplied object name is a character, prevents return of unexpected object - if(!missing(object_name) && is.character(object_name) ){ + if(is.character(object_name) ){ return(private$objects[[object_name]]) }else{ return(NULL) @@ -2103,57 +2099,6 @@ DataSheet$set("public", "get_object", function(object_name) { } ) -DataSheet$set("public", "get_object_names", function(object_type_label, as_list = FALSE, excluded_items = c()) { - if(missing(object_type_label)){ - out = names(private$objects) - }else{ - #todo. has a bug. the object_type_label cannot be accessed directly - out = names(private$objects)[sapply(private$objects, function(x) any( identical(x$object_type_label, object_type_label) ))] - } - - if(length(out) == 0){ - return(out) - } - - - if(length(excluded_items) > 0) { - excluded_indices = which(out %in% excluded_items) - - #notify user - if(length(excluded_indices) != length(excluded_items)){ - warning("Some of the excluded_items were not found in the list of objects") - } - - #remove the excluded items from the list - if(length(excluded_indices) > 0){ - out = out[-excluded_indices] - } - - } - - if(as_list) { - lst = list() - lst[[self$get_metadata(data_name_label)]] <- out - return(lst) - }else{ - return(out) - } - -} -) - -DataSheet$set("public", "get_last_graph_name", function() { - return(private$.last_graph) -} -) - -DataSheet$set("public", "get_last_graph", function() { - if(!is.null(private$.last_graph)) { - self$get_objects(object_name = private$.last_graph, object_type = graph_label, type = graph_label) - } -} -) - DataSheet$set("public", "rename_object", function(object_name, new_name, object_type = "object") { if(!object_type %in% c("object", "filter", "calculation", "graph", "table","model", "column_selection")) stop(object_type, " must be either object (graph, table or model), filter, column_selection or a calculation.") #Temp fix:: added graph, table and model so as to distinguish this when implementing it in the dialog. Otherwise they remain as objects diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 7068bd33b45..60e4bc048f9 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -121,7 +121,7 @@ DataBook$set("public", "replace_instat_object", function(new_instat_object) { self$append_data_object(curr_obj$get_metadata(data_name_label), curr_obj$data_clone()) } self$set_meta(new_instat_object$get_metadata()) - self$set_objects(new_instat_object$get_objects(data_name = overall_label, as_list = FALSE)) + self$set_objects(new_instat_object$get_objects(data_name = overall_label)) self$data_objects_changed <- TRUE } ) @@ -153,16 +153,23 @@ DataBook$set("public", "copy_data_object", function(data_name, new_name, filter_ ) -DataBook$set("public", "import_RDS", function(data_RDS, keep_existing = TRUE, overwrite_existing = FALSE, include_objects = TRUE, - include_metadata = TRUE, include_logs = TRUE, include_filters = TRUE, include_column_selections = TRUE, include_calculations = TRUE, include_comments = TRUE) - # TODO add include_calcuations options -{ +DataBook$set("public", "import_RDS", function(data_RDS, + keep_existing = TRUE, + overwrite_existing = FALSE, + include_objects = TRUE, + include_metadata = TRUE, + include_logs = TRUE, + include_filters = TRUE, + include_column_selections = TRUE, + include_calculations = TRUE, + include_comments = TRUE){ + # TODO add include_calculations options + # 'instat_object' is previously used class name, some files may have this name. if(any(c("instat_object", "DataBook") %in% class(data_RDS))) { if(!keep_existing && include_objects && include_metadata && include_logs && include_filters && include_column_selections && include_calculations && include_comments) { self$replace_instat_object(new_instat_object = data_RDS) - } - else { + }else { if(!keep_existing) { self$set_data_objects(list()) self$set_meta(list()) @@ -198,7 +205,10 @@ DataBook$set("public", "import_RDS", function(data_RDS, keep_existing = TRUE, ov if(include_objects && new_objects_count > 0) { for(i in (1:new_objects_count)) { if(!(names(new_objects_list)[i] %in% names(private$.objects)) || overwrite_existing) { - self$add_object(object = new_objects_list[i], object_name = names(new_objects_list)[i]) + self$add_object(object_name = names(new_objects_list)[i], + object_type_label = new_objects_list[[i]]$object_type_label, + object_format = new_objects_list[[i]]$object_format, + object = new_objects_list[[i]]$object) } } } @@ -213,11 +223,9 @@ DataBook$set("public", "import_RDS", function(data_RDS, keep_existing = TRUE, ov } } self$data_objects_changed <- TRUE - } - else if(is.data.frame(data_RDS) || is.matrix(data_RDS)) { + }else if(is.data.frame(data_RDS) || is.matrix(data_RDS)) { self$import_data(data_tables = list(data_RDS = data_RDS)) - } - else stop("Cannot import an objects of class", paste(class(data_RDS), collapse = ",")) + }else stop("Cannot import an objects of class", paste(class(data_RDS), collapse = ",")) } ) @@ -535,56 +543,9 @@ DataBook$set("public", "get_columns_from_data", function(data_name, col_names, f } ) -#see comments in issue #7808. Usage of parameter internal needs further discussions, it may have to be deprecated -DataBook$set("public", "add_object", function(data_name, object_name, object_type_label, object_format, object, internal = TRUE) { - - if (internal) { - if(missing(data_name)) { - if(missing(object_name)){ - object_name = next_default_item("object", names(private$.objects)) - } - - #notify user - if(object_name %in% names(private$.objects)){ - message(paste("An object called", object_name, "already exists. It will be replaced.")) - } - - #add the object - private$.objects[[object_name]] <- list(object_type_label = object_type_label, object_format = object_format, object = object) - } else{ - - self$get_data_objects(data_name)$add_object(object_name = object_name, object_type_label = object_type_label, object_format = object_format, object = object) - - #if its a graph. set it as last graph contents - if(identical(object_type_label, "graph")){ - private$.last_graph <- c(data_name, object_name) - } - - } - - } else { - #todo. this block will eventually be deprecated once discussions on - #where to save objects is finalised. - #todo. should every other big object have their own data book or we use one data book for storing all the objects? - #or we store all objects in a separate data structure that is not a data book? - #if we store it in a data structure then we will NOT need the "internal" parameter - #see comments in issue #7808 - - #for graphs, create a separate .graph_data_book data book if it's not yet created - if(identical(object_type_label, "graph")){ - if (!exists(".graph_data_book")){ - self$create_graph_data_book() - } - .graph_data_book$add_object(data_name = data_name, object_name = object_name, object_type_label = object_type_label, object_format = object_format, object = object, internal = TRUE) - }else{ - self$add_object(data_name = data_name, object_name = object_name, object_type_label = object_type_label, object_format = object_format, object = object, internal = TRUE) - } - - } - -} -) +#todo. deprecate +#see issue #7808 comments for more details DataBook$set("public", "create_graph_data_book", function() { .graph_data_book <- DataBook$new() df_names <- self$get_data_names() @@ -598,162 +559,136 @@ DataBook$set("public", "create_graph_data_book", function() { } ) -#see comments in issue #7808. Usage of parameter internal needs further discussions -DataBook$set("public", "get_objects", function(data_name, object_name, object_type_label, include_overall = TRUE, as_list = FALSE, include_empty = FALSE, force_as_list = FALSE, internal = TRUE, ...) { +#see comments in issue #7808. +DataBook$set("public", "add_object", function(data_name = NULL, + object_name = NULL, + object_type_label, + object_format, + object) { + if(is.null(data_name) || identical(data_name, overall_label)) { + if(is.null(object_name)){ + object_name <- next_default_item("object", names(private$.objects)) + } - if (!internal & exists(".graph_data_book")) { - out <- .graph_data_book$get_objects(data_name = data_name, object_name = object_name, object_type_label = object_type_label, include_overall = include_overall, as_list = as_list, include_empty = include_empty, force_as_list = force_as_list, print_graph = print_graph, silent = silent, internal = TRUE, ... = ...) - if (!is.null(out)){ - return(out) - } - }else { - #TODO implement force_as_list in all cases - if(missing(data_name)) { - if(!missing(object_name)) { - curr_objects <- private$.objects[self$get_object_names(data_name = overall_label, object_type_label = object_type_label)] - if(!(object_name %in% names(curr_objects))) { - stop(object_name, "not found.") - }else{ - out <- curr_objects[[object_name]] - } - }else{ - out <- sapply(self$get_data_objects(as_list = TRUE), function(x) x$get_objects(object_type_label = object_type_label)) - if(include_overall){ - out[[overall_label]] <- private$.objects[self$get_object_names(data_name = overall_label, object_type_label = object_type_label)] - } - if(!include_empty){ - out <- out[sapply(out, function(x) length(x) > 0)] - } - } - - return(out) - - }else { - if(data_name == overall_label) { - curr_objects <- private$.objects[self$get_object_names(data_name = data_name, object_type_label = object_type_label)] - if(!missing(object_name)) { - if(!(object_name %in% names(curr_objects))){ - stop(object_name, "not found.") - }else{ - out <- curr_objects[[object_name]] - } - }else{ - out <- curr_objects - } - }else{ - out <- self$get_data_objects(data_name)$get_objects(object_name = object_name, object_type_label = object_type_label, force_as_list = force_as_list) - } - - if(as_list) { - lst = list() - lst[[data_name]][[object_name]] <- out - return(lst) - }else { - return(out) - } - } + #notify user + if(object_name %in% names(private$.objects)){ + message(paste("An object called", object_name, "already exists. It will be replaced.")) } + + #add the object + private$.objects[[object_name]] <- list(object_type_label = object_type_label, object_format = object_format, object = object) + } else{ + self$get_data_objects(data_name)$add_object(object_name = object_name, object_type_label = object_type_label, object_format = object_format, object = object) + } + + #todo. once get_last_object_data is refactored, then this block can be removed + #if its a graph. set it as last graph contents + if(identical(object_type_label, graph_label)){ + private$.last_graph <- c(data_name, object_name) + } + +} +) + +#see comments in issue #7808. +DataBook$set("public", "get_object_names", function(data_name = NULL, + object_type_label = NULL, + as_list = FALSE, ...) { + + if(is.null(data_name) || identical(data_name, overall_label)){ + out <- + get_data_book_output_object_names( + output_object_list = private$.objects, + object_type_label = object_type_label, + as_list = as_list, + list_label = overall_label) + }else{ + out <- + self$get_data_objects(data_name)$get_object_names( + object_type_label = object_type_label, + as_list = as_list) + } + + return(out) } ) -#returns NULL if object is not found -#see issue #7808 comments for more discussions -DataBook$set("public", "get_object", function(data_name, object_name, as_file = TRUE) { - if(missing(data_name) || data_name == overall_label) { - r_instant_object <- private$.objects[[object_name]] +#returns a list of objects +#see issue #7808 comments for more details +DataBook$set("public", "get_objects", function(data_name = NULL, + object_type_label = NULL) { + if(is.null(data_name) || identical(data_name, overall_label)) { + out <- private$.objects[self$get_object_names(data_name = data_name, object_type_label = object_type_label)] }else { - r_instant_object <- self$get_data_objects(data_name)$get_object(object_name = object_name) + out <- self$get_data_objects(data_name)$get_objects(object_type_label = object_type_label) } + return(out) - out <- r_instant_object - if(!is.null(out) && as_file ){ - out <- view_object(object = r_instant_object$object, object_format = r_instant_object$object_format) +} +) + +#returns NULL if object is not found +#see issue #7808 comments for more details +DataBook$set("public", "get_object", function(data_name = NULL, object_name) { + out <- NULL + if(is.null(data_name) || identical(data_name, overall_label)) { + out <- private$.objects[[object_name]] + }else { + out <- self$get_data_objects(data_name)$get_object(object_name = object_name) } return(out) - } ) -DataBook$set("public", "get_last_object", function(object_type_label, as_file = TRUE) { - r_instat_object <- NULL - #currently this function is only applicable to graphs. Implement for other objects like models, tables, summaries - if(object_type_label == "graph"){ - if(!is.null(private$.last_graph) && length(private$.last_graph) == 2) { - r_instat_object <- self$get_object(data_name = private$.last_graph[1], object_name = private$.last_graph[2], as_file = as_file) - } +DataBook$set("public", "get_object_data", function(data_name = NULL, object_name, as_file = FALSE) { + out <- self$get_object(data_name = data_name, object_name = object_name) + if(is.null(out)){ + return(NULL) + }else if(as_file){ + out <- view_object_data(object = out$object, object_format = out$object_format) + }else{ + out <- out$object } - - if(!is.null(r_instat_object) && !as_file){ - return(r_instat_object$object) + return(out) +} +) + +#returns object data from the object_names character vector +DataBook$set("public", "get_objects_data", function(data_name = NULL, object_names = NULL, as_files = FALSE) { + out <- list() + if(is.null(object_names)){ + objects_list <- self$get_objects(data_name = data_name) + out <- self$get_objects_data(data_name = data_name, object_names = names(objects_list) ) }else{ - return(r_instat_object) + for(object_name in object_names){ + object_data <- self$get_object_data(data_name = data_name, object_name = object_name, as_file = as_files) + if(!is.null(object_data)){ + out[[object_name]] <- object_data + } + } } - + + return(out) } ) -#see comments in issue #7808. Changing internal = true by default needs further discussions -DataBook$set("public", "get_object_names", function(data_name, object_type_label, include_overall = TRUE, include, exclude, include_empty = FALSE, as_list = FALSE, excluded_items = c(), internal = TRUE) { - - if(!missing(object_type_label)){ - - if(!internal && exists(".graph_data_book")){ - return(.graph_data_book$get_object_names(data_name = data_name, object_type_label = object_type_label,include_overall = include_overall, include = include, exclude = exclude, include_empty = include_empty, as_list = as_list, excluded_items = excluded_items, internal = TRUE)) - } - - if(missing(data_name)) { - if(missing(object_type_label)){ - out <- sapply(self$get_data_objects(), function(x) x$get_object_names()) - }else{ - out <- sapply(self$get_data_objects(), function(x) x$get_object_names(object_type_label = object_type_label)) - } - #temp disabled as causes a bug - #if(include_overall) out[[overall_label]] <- overall_object_names - if(!include_empty){ - out <- out[sapply(out, function(x) length(x) > 0)] - } - - if(as_list){ - out <- as.list(out) - } - return(out) - }else { - if(data_name == overall_label) { - - if(object_type_label == ""){ - overall_object_names <- names(private$.objects) - }else { - #todo. check if type is recognised? - overall_object_names <- names(private$.objects)[sapply(private$.objects, function(x) any( identical(x$object_type_label, object_type_label) ))] - } - - if(length(excluded_items) > 0) { - excluded_indices <- which(overall_object_names %in% excluded_items) - if(length(excluded_indices) != length(excluded_items)){ - warning("Some of the excluded_items were not found in the list of objects") - } - if(length(excluded_indices) > 0){ - overall_object_names <- overall_object_names[-excluded_indices] - } - } - if(as_list) { - lst = list() - lst[[overall_label]] <- overall_object_names - return(lst) - }else{ - return(overall_object_names) - } - }else{ - return(self$get_data_objects(data_name)$get_object_names(object_type_label, as_list = as_list, excluded_items = excluded_items)) - } - } - +#todo. require data name? then do a way with private$.last_graph +#and just get it from the objects list? +DataBook$set("public", "get_last_object_data", function(object_type_label, as_file = TRUE) { + out <- NULL + #currently this function is only applicable to graphs. Implement for other objects like models, tables, summaries + if(identical(object_type_label, graph_label)){ + if(!is.null(private$.last_graph) && length(private$.last_graph) == 2) { + out <- self$get_object_data(data_name = private$.last_graph[1], object_name = private$.last_graph[2], as_file = as_file) + } } - + return(out) } ) + + DataBook$set("public", "rename_object", function(data_name, object_name, new_name, object_type = "object") { if(missing(data_name) || data_name == overall_label) { if(!object_name %in% names(private$.objects)) stop(object_name, " not found in overall objects list") diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index d015f15faf5..81104c21a87 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -2616,8 +2616,9 @@ cbind_unique <- function(x, y, cols){ } #object is the object to be displayed -#object_format is the display format -view_object <- function(object, object_format) { +#object_format is the display format. If supplied, then returns file name of the object +#if not then it prints the object +view_object_data <- function(object, object_format = NULL) { file_name <- "" if (identical(object_format, "image")) { file_name <- view_graph_object(object) @@ -2631,6 +2632,15 @@ view_object <- function(object, object_format) { return(file_name) } +view_object <- function(data_book_object) { + return( + view_object_data( + object = data_book_object$object, + object_format = data_book_object$object_format + ) + ) +} + #displays the graph object in the set R "viewer". #if the viewer is not available then #it saves the object as a file in the temporary folder @@ -2788,3 +2798,52 @@ check_graph <- function(graph_object){ } +get_data_book_output_object_names <- function(output_object_list, + object_type_label = NULL, + excluded_items = c(), + as_list = FALSE, + list_label = NULL){ + + if(is.null(object_type_label)){ + out <- names(output_object_list) + }else{ + out <- names(output_object_list)[sapply(output_object_list, function(x) any( identical(x$object_type_label, object_type_label) ))] + } + + if(length(out) == 0){ + return(out) + } + + if(length(excluded_items) > 0) { + #get indices of items to exclude + excluded_indices <- which(out %in% excluded_items) + + #remove the excluded items from the list + if(length(excluded_indices) > 0){ + out <- out[-excluded_indices] + } + + } + + if(as_list) { + #convert the character vector list + lst <- list() + if(!is.null(list_label)){ + lst[[list_label]] <- out + }else{ + lst <- as.list(out) + } + + return(lst) + }else{ + #return as a character vector + return(out) + } + +} + + + + + + diff --git a/instat/translations/en/r_instat_not_menus.json b/instat/translations/en/r_instat_not_menus.json index b8fd2c7cfab..99a63597d9c 100644 --- a/instat/translations/en/r_instat_not_menus.json +++ b/instat/translations/en/r_instat_not_menus.json @@ -3861,4 +3861,179 @@ "Define New Selection": "Define New Selection", "All Combined With &": "All Combined With &", "Operation": "Operation", - "All Combined With |": "All Combined With |"} \ No newline at end of file + "All Combined With |": "All Combined With |", + "Rename Options": "Rename Options", + "Abbriviate": "Abbreviate", + "To Lower": "To Lower", + "Clean Names": "Clean Names", + "Case:": "Case:", + "New Name": "New name", + "Include Variable Labels": "Include Variable Labels", + "Row Numbers or Names": "Row Numbers or Names", + "Apply As Selected Columns": "Apply As Selected Columns", + "As Subset": "As Subset", + "Add not": "Add not", + "Specify Decimals (if Numeric)": "Specify Decimals (if Numeric)", + "To Data Frame:": "To Data Frame:", + "From Data Frame:": "From Data Frame:", + "Join By:": "Join By:", + "Delete Colums or Rows": "Delete Colums or Rows", + "Duplicate Rows": "Duplicate Rows", + "Tolerance:": "Tolerance:", + "By Row": "By Row", + "By Value": "By Value", + "Non-Numeric Values": "Non-Numeric Values", + "notch": "notch", + "notchwidth": "notchwidth", + "varwidth": "varwidth", + "coef": "coef", + "outlier.shape": "outlier.shape", + "outlier.colour": "outlier.colour", + "outlier.size": "outlier.size", + "outlier.stroke": "outlier.stroke", + "fatten": "fatten", + "Tufte Box Options": "Tufte Box Options", + "hoffset": "hofftset", + "voffset": "vofftset", + "median.type": "median.type", + "whisker.type": "whisker.type", + "draw_quantiles": "draw_quantiles", + "scale": "scale", + "adjust": "adjust", + "kernel": "kernel", + "stroke": "stroke", + "Show Missing Frequencies": "Show Missing Frequencies", + "View/Delete Labels": "View/Delete Labels", + "Delete Value Labels": "Delete Value Labels", + "Max Labels": "Max Labels", + "Preview": "Preview", + "Number Missing": "Number Missing", + "Ranks": "Ranks", + "Ties method": "Ties method", + "Decimals:": "Decimals:", + "Round": "Round", + "Signif Fig": "Signif Fig", + "Standardize": "Standardize", + "Lag": "Lag", + "Lead": "Lead", + "Non-Negative": "Non-Negative", + "Log (Natual)": "Log (Natual)", + "Log (Base 10)": "Log (Base 10)", + "Power": "Power", + "Add Constant": "Add Constant", + "Missing Last": "Missing Last", + "Decreasing": "Decreasing", + "Subtract": "Subtract", + "Multiply": "Multiply", + "Divide": "Divide", + "Random Samples": "Random Samples", + "Permute/Sample Rows": "Permute/Sample Rows", + "Levels:": "Levels:", + "Groups": "Groups", + "Label Groups with Means": "Label Groups with Means", + "Recode": "Recode", + "Lump": "Lump", + "Other": "Other", + "Add NA": "Add NA", + "Name for NA:": "Name for NA:", + "Keep": "Keep", + "Drop": "Drop", + "Name for Other:": "Name for Other:", + "Selected Values": "Selected Values", + "Levels with at least this frequency": "Levels with at least this frequency", + "This number of common levels": "This number of common levels", + "Levels with at least this proportion": "Levels with at least this proportion", + "Levels with more than Other": "Levels with more than Other", + "Most Frequent": "Most Frequent", + "Hand": "Hand", + "property": "Property", + "Reverse Levels": "Reverse Levels", + "Appearance": "Appearance", + "Alphabetical Other": "Alphabetical Other", + "Anonymise": "Anonymise", + "Shift": "Shift", + "Shuffle": "Shuffle", + "Unused Levels:": "Unused Levels:", + "Levels Preview:": "Levels Preview:", + "Frequencies": "Frequencies", + "Ignore Case": "Ignore Case", + "Boundary": "Boundary", + "Find": "Find", + "Find/Replace": "Find/Replace", + "Ends": "Ends", + "Starts": "Starts", + "Combo": "Combo", + "Negate": "Negate", + "Remove": "Remove", + "Detect Options": "Detect Options", + "Replace NA": "Replace NA", + "Find Options": "Find Options", + "Replace Options": "Replace Options", + "First Occurence": "First Occurence", + "Remove All": "Remove All", + "Wrap": "Wrap", + "Truncate": "Truncate", + "Side:": "Side:", + "Squish": "Squish", + "New Column:": "New Column:", + "Sequence truncated to match the lenght of the data frame": "Sequence truncated to match the lenght of the data frame", + "no. of Days in a Year:": "no. of Days in a Year:", + "Fill Date Gaps": "Fill Date Gaps", + "clock 12": "clock 12", + "clock24": "clock24", + "none": "none", + "geographics": "geographics", + "Median Absolute Deviation (MAD) (W)": "Median Absolute Deviation (MAD) (W)", + "Coefficient Of Variation (W)": "Coefficient Of Variation (W)", + "Skewness (3rd Moment) (W)": "Skewness (3rd Moment) (W)", + "Kurtose": "Kurtose", + "Kurtosis (W)": "Kurtosis (W)", + "Covariance (W)": "Covariance (W)", + "Correlations (W)": "Correlations (W)", + "Sum (W)": "Sum (W)", + "Mean (W)": "Mean (W)", + "Median (W)": "Median (W)", + "Edit": "Edit", + "Stack (Pivot Longer)": "Stack (Pivot Longer)", + "Names to:": "Names to:", + "Values to:": "Values to:", + "Token:": "Token:", + "Factor(s):": "Factor(s):", + "To Lower Case": "To Lower Case", + "Punctuation": "Punctuation", + "Output:": "Output:", + "Unstack (Pivot Wider)": "Unstack (Pivot Wider)", + "Add Prefix:": "Add Prefix:", + "Columns to Carry:": "Columns to Carry", + "Fill Missing Values:": "Fill Missing Values:", + "Merge (Join)": "Merge (Join)", + "Append (Bind Rows)": "Append (Bind Rows)", + "Include Old Names": "Include Old Names", + "New Names (Optional):": "New Names (Optional):", + "Links": "Links", + "Data Frames": "Data Frames", + "Copy to clipboard": "Copy to clipboard", + "Data frame": "Data frame", + "Columns metadata": "Columns metadata", + "Data frame metadata": "Data frame metadata", + "Unhide": "Unhide", + "Unhidden Data Frame(s):": "Unhidden Data Frame(s):", + "Run": "Run", + "Import NetCDF File": "Import NetCDF File", + "Import Shapefiles": "Import Shapefiles", + "Setup For Data Entry": "Setup For Data Entry", + "Add Flags": "Add Flags", + "Data From:": "Data From:", + "Data To:": "Data To:", + "Flag Variables:": "Flag Variables:", + "Day in Year (365)": "Day in Year (365)", + "Day in Year (366)": "Day in Year (366)", + "Minimum RH (%):": "Minimum RH (%):", + "Maximum RH (%):": "Maximum RH (%):", + "Base Year:": "Base Year:", + "Rug colour:": "Rug colour:", + "Spline": "Spline", + "Time interval:": "Time interval:", + "From:": "From:", + "Occurrence": "Occurrence" +} \ No newline at end of file diff --git a/instat/translations/es/es_r_instat_menus.json b/instat/translations/es/es_r_instat_menus.json index b0ef592a227..e0d6f87e745 100644 --- a/instat/translations/es/es_r_instat_menus.json +++ b/instat/translations/es/es_r_instat_menus.json @@ -447,9 +447,9 @@ "View/Delete Labels...": "Ver/Eliminar etiquetas...", "Row Sumaries...": "Resúmenes de fila...", "Permute/Sample Rows...": "Permutar/filas de muestra...", - "Stack (Pivot Longer)...": "Stack (Pivot Longer)...", + "Stack (Pivot Longer)...": "Pila (pivote más largo)...", "Unstack (Pivot Wider)...": "Desapilar (girar más ancho)...", - "Merge (Join)...": "Merge (Join)...", + "Merge (Join)...": "Fusionar (Unirse)...", "Append (Bind Rows)...": "Agregar (vincular filas)...", "Random Split...": "División aleatoria...", "Scale/Distance...": "Escala/Distancia...", @@ -457,5 +457,13 @@ "Save": "Ahorrar", "Import SST...": "Importar SST...", "Daily Data Editing/Entry...": "Edición/entrada de datos diarios...", - "Experiments": "Experiments" + "Experiments": "Experimentos", + "Two/Three Variables": "Dos/Tres Variables", + "Graphs": "gráficos", + "Tables...": "Mesas...", + "Pivot Table...": "Tabla dinámica...", + "Two-Way Frequencies...": "Frecuencias bidireccionales...", + "Three-Way Frequencies...": "Frecuencias de tres vías...", + "Heatmap...": "Mapa de calor...", + "Cluster Analysis...": "Análisis de conglomerados..." } \ No newline at end of file diff --git a/instat/translations/es/es_r_instat_not_menus.json b/instat/translations/es/es_r_instat_not_menus.json index d67037c58e6..6a70a20d94b 100644 --- a/instat/translations/es/es_r_instat_not_menus.json +++ b/instat/translations/es/es_r_instat_not_menus.json @@ -2314,7 +2314,7 @@ "Scaled Fractions": "fracciones escaladas", "Scaled Points": "Puntos escalados", "Scales": "Escamas", - "Scale/Distance": "Scale/Distance", + "Scale/Distance": "Escala/Distancia", "Scatter Matrix": "Matriz de dispersión", "Scatter Plot": "Gráfico de dispersión", "Scatter Plot Options": "Opciones de diagrama de dispersión", @@ -3672,8 +3672,8 @@ "value": "valor", "Dumbbell": "Pesa", "Line options": "Opciones de línea", - "Path or Step": "Path or Step", - "Smooth Options": "Smooth Options", + "Path or Step": "Camino o Paso", + "Smooth Options": "Opciones suaves", "Add Line": "Añadir línea", "Add SE": "Añadir ES", "Formula": "Fórmula", @@ -3689,25 +3689,348 @@ "Data Frame Name": "Nombre del marco de datos", "Rename With": "Renombrar con", "Rename Columns": "Cambiar el nombre de las columnas", - "Command runs without error": "Command runs without error", - "Command runs ok": "Command runs ok", - "Problem detected running Command or no output to display.": "Problem detected running Command or no output to display.", - "Command produced an error. Modify input before running.": "Command produced an error. Modify input before running.", - "Model produced an error or no output to display.": "Model produced an error or no output to display.", - "Model runs without error": "Model runs without error", - "Model runs ok": "Model runs ok", - "Problem detected running Model or no output to display.": "Problem detected running Model or no output to display.", - "Model produced an error. Modify input before running.": "Model produced an error. Modify input before running.", - "Distance": "Distance", - "Whole Data Frame": "Whole Data Frame", - "Centre": "Centre", - "Display As Data Frame": "Display As Data Frame", - "Name": "Name", - "Lists": "Lists", - "Variable Name": "Variable Name", - "Variable Label": "Variable Label", - "Levels": "Levels", - "Category:": "Category:", - "Show Command": "Show Command", - "Lists:": "Lists:" + "Command runs without error": "El comando se ejecuta sin error", + "Command runs ok": "El comando funciona bien", + "Problem detected running Command or no output to display.": "Se detectó un problema al ejecutar el comando o no se mostró ningún resultado.", + "Command produced an error. Modify input before running.": "El comando produjo un error. Modifique la entrada antes de ejecutar.", + "Model produced an error or no output to display.": "El modelo produjo un error o ningún resultado para mostrar.", + "Model runs without error": "El modelo se ejecuta sin error", + "Model runs ok": "El modelo funciona bien", + "Problem detected running Model or no output to display.": "Se detectó un problema al ejecutar el modelo o no se mostró ningún resultado.", + "Model produced an error. Modify input before running.": "El modelo produjo un error. Modifique la entrada antes de ejecutar.", + "Distance": "Distancia", + "Whole Data Frame": "Marco de datos completo", + "Centre": "Centro", + "Display As Data Frame": "Mostrar como marco de datos", + "Name": "Nombre", + "Lists": "Liza", + "Variable Name": "Nombre de la variable", + "Variable Label": "Etiqueta de variables", + "Levels": "Niveles", + "Category:": "Categoría:", + "Show Command": "Mostrar comando", + "Lists:": "Liza:", + "Subtotals": "subtotales", + "Initial Column Factor:": "Factor de columna inicial:", + "Initial Row Factor(s) :": "Factor(es) de fila inicial:", + "Numeric Variable (Optional):": "Variable Numérica (Opcional):", + "Select Variable(s)": "Seleccionar variable(s)", + "Partitioning": "Fraccionamiento", + "Hierarchical": "Jerárquico", + "Numeric Variables": "Variables numéricas", + "Data Frame/Matrix ": "Matriz/marco de datos ", + "Metric:": "Métrico:", + "Stand:": "Estar de pie:", + "PAM Cluster": "Clúster PAM", + "Partition Plot": "Parcela de partición", + "Cluster:": "Grupo:", + "Hierarch Plot": "Gráfico jerárquico", + "Display Summaries As Rows": "Mostrar resúmenes como filas", + "Display Variables As Rows": "Mostrar variables como filas", + "Min Frequency": "Frecuencia mínima", + "Show Variable Names": "Mostrar nombres de variables", + "Factor (Optional) :": "Factor (Opcional) :", + "Second Factor (Optional) :": "Segundo Factor (Opcional) :", + "Skim": "Desnatar", + "Three variables": "tres variables", + "Pairs": "Pares", + "Colour (Optional):": "Color (Opcional):", + "Pair Plot Options": "Par de opciones de gráficos", + "Type Of Dispaly": "Tipo de pantalla", + "Upper": "Superior", + "Lower": "Más bajo", + "Diagonal": "Diagonal", + "Wordcloud": "Nube de palabras", + "Reorder Frequency": "Frecuencia de reorden", + "Back to Back": "Espalda con espalda", + "Polar": "Polar", + "Reorder": "Reordenar", + "Area:": "Área:", + "Treemap Options": "Opciones de diagrama de árbol", + "Angle:": "Ángulo:", + "Increase size": "Aumentar tamaño", + "Wordcloud Options": "Opciones de nube de palabras", + "Place:": "Lugar:", + "stat": "estadística", + "position": "posición", + "parse": "analizar gramaticalmente", + "nudge_x": "empujar_x", + "nudge_y": "empujar_y", + "eccentricity": "excentricidad", + "grid_size": "tamaño de la cuadrícula", + "max_grid_size": "max_grid_size", + "grid_margin": "grid_margin", + "xlim": "xlim", + "ylim": "ylim", + "rm_outside": "rm_fuera", + "shape": "forma", + "na.rm": "na.rm", + "Show.legend": "Mostrar leyenda", + "inherit.aes": "heredar.aes", + "show_boxes": "mostrar_cajas", + "angle:": "ángulo:", + "size:": "Talla:", + "color:": "color:", + "label:": "etiqueta:", + "geom_treemap": "geom_treemap", + "area:": "área:", + "alpha:": "alfa:", + "colour:": "color:", + "fill:": "llenar:", + "linetype:": "tipo de línea:", + "subgroup:": "subgrupo:", + "subgroup2:": "subgrupo2:", + "subgroup3:": "subgrupo3:", + "layout": "diseño", + "start": "comienzo", + "key_glyph": "clave_glyp", + "width": "ancho", + "x:": "X:", + "y:": "y:", + "weight:": "peso:", + "linetype": "tipo de línea", + "colour": "color", + "fill": "llenar", + "show.legend": "Mostrar leyenda", + "alpha": "alfa", + "size": "Talla", + "Boxplot/Tufte Boxplot": "Diagrama de caja/Diagrama de caja de Tufte", + "Tufte Boxplot": "Diagrama de caja de Tufte", + "Box Options": "Opciones de caja", + "Tufle Box Options": "Opciones de caja de Tufle", + "Display as Dotplot": "Mostrar como diagrama de puntos", + "Density/Ridges": "Densidad/Crestas", + "Density Ridges": "Crestas de densidad", + "Dotplot Options": "Opciones de diagrama de puntos", + "Density Ridges Options": "Opciones de crestas de densidad", + "binwidth": "ancho de papelera", + "bins": "contenedores", + "center": "centro", + "limite": "límite", + "closed": "cerrado", + "tampon": "tampón", + "Sides:": "Lados", + "Span": "Lapso", + "method": "método", + "span": "lapso", + "se": "se", + "formula": "fórmula", + "method.args": "método.args", + "orientation": "orientación", + "fullrange": "Rango completo", + "xend:": "xend:", + "yend:": "yend:", + "colour_x": "color_x", + "colour_xend": "color_xend", + "size_x": "tamaño_x", + "size_xend": "tamaño_xend", + "dot_guide": "punto_guia", + "dot_guide_colo": "dot_guide_colo", + "dot_guide_size": "dot_guide_size", + "Swap x and y": "Intercambiar x e y", + "Colour Palette": "Paleta de colores", + "Reorder:": "Reordenar:", + "Points (Optional):": "Puntos (Opcional):", + "Group/ID:": "Identificación del grupo:", + "Muptiple Response": "Respuesta múltiple", + "Format Table...": "Formato de tabla...", + "Store Output": "Salida de la tienda", + "Header": "Encabezamiento", + "Add title/subtitle": "Añadir título/subtítulo", + "Add footnote": "Añadir nota al pie", + "Add second footnote": "Agregar segunda nota al pie", + "Add source": "Agregue una fuente", + "Add Header": "Añadir encabezado", + "Add stub": "Agregar talón", + "Add format table": "Agregar tabla de formato", + "Margin Name :": "Nombre del margen:", + "Treat Summaries as a Further Factor": "Tratar los resúmenes como un factor adicional", + "Display Summary_Variables As Rows": "Mostrar Summary_Variables como filas", + "Summary_mean": "Summary_mean", + "Display Summaries As Rows": "Mostrar resúmenes como filas", + "Display Variables As Rows": "Mostrar variables como filas", + "Outer": "Exterior", + "Fill/Colour:": "Relleno/Color:", + "Theme": "Temática", + "Extra Variables": "Variables adicionales", + "Suppl.Numeric:": "Numérico suplementario:", + "Suppl.Factor:": "Factor suplementario:", + "Save New Graph": "Guardar nuevo gráfico", + "Selection:": "Selección:", + "Remove Current Selection": "Quitar selección actual", + "Define New Selection": "Definir nueva selección", + "All Combined With &": "Todo combinado con &", + "Operation": "Operación", + "All Combined With |": "Todo combinado con |", + "Rename Options": "Opciones de cambio de nombre", + "Abbriviate": "Abreviar", + "To Lower": "Reducir", + "Clean Names": "Limpiar nombres", + "Case:": "Caso:", + "New Name": "Nuevo nombre", + "Include Variable Labels": "Incluir etiquetas de variables", + "Row Numbers or Names": "Números de fila o nombres", + "Apply As Selected Columns": "Aplicar como columnas seleccionadas", + "As Subset": "como subconjunto", + "Add not": "No agregue", + "Specify Decimals (if Numeric)": "Especificar decimales (si es numérico)", + "To Data Frame:": "Al marco de datos:", + "From Data Frame:": "Desde el marco de datos:", + "Join By:": "Unirse por:", + "Delete Colums or Rows": "Eliminar columnas o filas", + "Duplicate Rows": "filas duplicadas", + "Tolerance:": "Tolerancia:", + "By Row": "por fila", + "By Value": "Por valor", + "Non-Numeric Values": "Valores no numéricos", + "notch": "muesca", + "notchwidth": "ancho de muesca", + "varwidth": "ancho de variable", + "coef": "coef", + "outlier.shape": "atípico.forma", + "outlier.colour": "color atípico", + "outlier.size": "tamaño atípico", + "outlier.stroke": "accidente cerebrovascular", + "fatten": "engordar", + "Tufte Box Options": "Opciones de caja Tufte", + "hoffset": "hofftset", + "voffset": "Voffset", + "median.type": "mediana.tipo", + "whisker.type": "bigote.tipo", + "draw_quantiles": "dibujar_cuantiles", + "scale": "escala", + "adjust": "ajustar", + "kernel": "núcleo", + "stroke": "carrera", + "Show Missing Frequencies": "Mostrar frecuencias faltantes", + "View/Delete Labels": "Ver/Eliminar etiquetas", + "Delete Value Labels": "Eliminar etiquetas de valor", + "Max Labels": "Etiquetas máximas", + "Preview": "Avance", + "Number Missing": "Número faltante", + "Ranks": "rangos", + "Ties method": "Método de lazos", + "Decimals:": "Decimales:", + "Round": "Ronda", + "Signif Fig": "higo significativo", + "Standardize": "Estandarizar", + "Lag": "Retraso", + "Lead": "Plomo", + "Non-Negative": "No negativo", + "Log (Natual)": "Registro (natural)", + "Log (Base 10)": "Registro (Base 10)", + "Power": "Poder", + "Add Constant": "Agregar constante", + "Missing Last": "último faltante", + "Decreasing": "Decreciente", + "Subtract": "Sustraer", + "Multiply": "Multiplicar", + "Divide": "Dividir", + "Random Samples": "Muestras aleatorias", + "Permute/Sample Rows": "Permutar/filas de muestra", + "Levels:": "Niveles:", + "Groups": "Grupos", + "Label Groups with Means": "Etiquetar grupos con medias", + "Recode": "recodificar", + "Lump": "Bulto", + "Other": "Otro", + "Add NA": "Añadir NA", + "Name for NA:": "Nombre para NA:", + "Keep": "Mantener", + "Drop": "Gota", + "Name for Other:": "Nombre para otro:", + "Selected Values": "Valores seleccionados", + "Levels with at least this frequency": "Niveles con al menos esta frecuencia", + "This number of common levels": "Este número de niveles comunes", + "Levels with at least this proportion": "Niveles con al menos esta proporción", + "Levels with more than Other": "Niveles con más de Otro", + "Most Frequent": "Más frecuente", + "Hand": "Mano", + "property": "Propiedad", + "Reverse Levels": "Niveles inversos", + "Appearance": "Apariencia", + "Alphabetical Other": "alfabético otro", + "Anonymise": "anonimizar", + "Shift": "Turno", + "Shuffle": "Barajar", + "Unused Levels:": "Niveles no utilizados:", + "Levels Preview:": "Vista previa de niveles:", + "Frequencies": "frecuencias", + "Ignore Case": "Ignorar caso", + "Boundary": "Perímetro", + "Find": "Encontrar", + "Find/Replace": "Buscar/Reemplazar", + "Ends": "Finaliza", + "Starts": "Empieza", + "Combo": "combinado", + "Negate": "Negar", + "Remove": "Eliminar", + "Detect Options": "Opciones de detección", + "Replace NA": "Reemplazar NA", + "Find Options": "Buscar opciones", + "Replace Options": "Opciones de reemplazo", + "First Occurence": "Primera ocurrencia", + "Remove All": "Eliminar todo", + "Wrap": "Envoltura", + "Truncate": "Truncar", + "Side:": "Lado:", + "Squish": "Chapotear", + "New Column:": "Nueva columna:", + "Sequence truncated to match the lenght of the data frame": "Secuencia truncada para que coincida con la longitud del marco de datos", + "no. of Days in a Year:": "no. de días en un año:", + "Fill Date Gaps": "Rellenar espacios en blanco", + "clock 12": "reloj 12", + "clock24": "reloj24", + "none": "ninguno", + "geographics": "geográficos", + "Median Absolute Deviation (MAD) (W)": "Desviación absoluta mediana (MAD) (W)", + "Coefficient Of Variation (W)": "Coeficiente de variación (W)", + "Skewness (3rd Moment) (W)": "Sesgo (3.er momento) (W)", + "Kurtose": "kurose", + "Kurtosis (W)": "Curtosis (W)", + "Covariance (W)": "Covarianza (W)", + "Correlations (W)": "Correlaciones (W)", + "Sum (W)": "Suma (W)", + "Mean (W)": "Media (W)", + "Median (W)": "Mediana (W)", + "Edit": "Editar", + "Stack (Pivot Longer)": "Pila (pivote más largo)", + "Names to:": "Nombres a:", + "Values to:": "Valores a:", + "Token:": "Simbólico:", + "Factor(s):": "Factor(es):", + "To Lower Case": "A Minúsculas", + "Punctuation": "Puntuación", + "Output:": "Producción:", + "Unstack (Pivot Wider)": "Desapilar (girar más ancho)", + "Add Prefix:": "Agregar prefijo:", + "Columns to Carry:": "Columnas para Llevar", + "Fill Missing Values:": "Rellene los valores que faltan:", + "Merge (Join)": "Fusionar (Unirse)", + "Append (Bind Rows)": "Agregar (vincular filas)", + "Include Old Names": "Incluir nombres antiguos", + "New Names (Optional):": "Nuevos nombres (opcional):", + "Links": "Enlaces", + "Data Frames": "Marcos de datos", + "Copy to clipboard": "Copiar al portapapeles", + "Data frame": "Marco de datos", + "Columns metadata": "Metadatos de columnas", + "Data frame metadata": "Metadatos del marco de datos", + "Unhide": "Mostrar", + "Unhidden Data Frame(s):": "Marcos de datos no ocultos:", + "Run": "Correr", + "Import NetCDF File": "Importar archivo NetCDF", + "Import Shapefiles": "Importar archivos de forma", + "Setup For Data Entry": "Configuración para la entrada de datos", + "Add Flags": "Añadir banderas", + "Data From:": "Datos de:", + "Data To:": "Datos a:", + "Flag Variables:": "Variables de bandera:", + "Day in Year (365)": "Día en el año (365)", + "Day in Year (366)": "Día en el año (366)", + "Minimum RH (%):": "Humedad relativa mínima (%):", + "Maximum RH (%):": "Humedad relativa máxima (%):", + "Base Year:": "Año base:", + "Rug colour:": "Color de la alfombra:", + "Time interval:": "Intervalo de tiempo:" } \ No newline at end of file diff --git a/instat/translations/fr/fr_r_instat_menus.json b/instat/translations/fr/fr_r_instat_menus.json index 4ee0525c308..2caa2d824d5 100644 --- a/instat/translations/fr/fr_r_instat_menus.json +++ b/instat/translations/fr/fr_r_instat_menus.json @@ -457,5 +457,13 @@ "Save": "Enregistrer", "Import SST...": "Importer SST...", "Daily Data Editing/Entry...": "Modifier/entrer de données quotidiennes...", - "Experiments": "Expériences" + "Experiments": "Expériences", + "Two/Three Variables": "Deux/Trois Variables", + "Graphs": "Graphiques", + "Tables...": "Tableaux...", + "Pivot Table...": "Tableau Pivot...", + "Two-Way Frequencies...": "Fréquences Deux-Voies...", + "Three-Way Frequencies...": "Fréquences Trois-Voies...", + "Heatmap...": "Carte thermique...", + "Cluster Analysis...": "Analyse de Groupe..." } \ No newline at end of file diff --git a/instat/translations/fr/fr_r_instat_not_menus.json b/instat/translations/fr/fr_r_instat_not_menus.json index 77297a576eb..66eb9e0026b 100644 --- a/instat/translations/fr/fr_r_instat_not_menus.json +++ b/instat/translations/fr/fr_r_instat_not_menus.json @@ -11,7 +11,7 @@ " binom": " binom", " box": " boite", " comment(s) entered": " commentaire(s) entré(s)", - " fisher": " pêcheur", + " fisher": "fisher", " kruskal": " kruskal", " row(s) entered": " ligne(s) entrée(s)", " | Showing ": " | Affichage ", @@ -3709,5 +3709,328 @@ "Levels": "Niveaux", "Category:": "Catégorie:", "Show Command": "Afficher la commande", - "Lists:": "Listes:" + "Lists:": "Listes:", + "Subtotals": "Sous-totaux", + "Initial Column Factor:": "Facteur de Colonne Initial :", + "Initial Row Factor(s) :": "Facteur(s) de Ligne Initial(s) :", + "Numeric Variable (Optional):": "Variable Numérique(facultatif) :", + "Select Variable(s)": "Variable(s) sélectionnée(s)", + "Partitioning": "Partitionnement", + "Hierarchical": "Hiérarchique", + "Numeric Variables": "Variables Numériques", + "Data Frame/Matrix ": "Tableau de données/Matrice ", + "Metric:": "Métrique :", + "Stand:": "Support:", + "PAM Cluster": "Groupe PAM", + "Partition Plot": "Partition graphique", + "Cluster:": "Groupe:", + "Hierarch Plot": "Graphique Hiérarchique", + "Display Summaries As Rows": "Afficher les Résumés en Lignes", + "Display Variables As Rows": "Afficher les Variables en Lignes", + "Min Frequency": "Fréquence min", + "Show Variable Names": "Afficher les Noms des Variables", + "Factor (Optional) :": "Facteur(Facultatif):", + "Second Factor (Optional) :": "Deuxième Facteur(Facultatif):", + "Skim": "Parcourir", + "Three variables": "Trois Variables", + "Pairs": "Paires", + "Colour (Optional):": "Couleur(facultative):", + "Pair Plot Options": "Options Graphiques de Paires", + "Type Of Dispaly": "Type d'Affichage", + "Upper": "Supérieur", + "Lower": "Inférieur", + "Diagonal": "Diagonale", + "Wordcloud": "Mot nuage", + "Reorder Frequency": "Réorganiser la Fréquence", + "Back to Back": "Dos à Dos", + "Polar": "Polaire", + "Reorder": "Réorganiser", + "Area:": "Zone:", + "Treemap Options": "Options Treemap", + "Angle:": "Angle:", + "Increase size": "Augmenter la taille", + "Wordcloud Options": "Options Wordcloud", + "Place:": "Lieu:", + "stat": "stat", + "position": "position", + "parse": "analyser", + "nudge_x": "nudge_x", + "nudge_y": "nudge_y", + "eccentricity": "excentricité", + "grid_size": "grille_taille ", + "max_grid_size": "max_grille_taille", + "grid_margin": "grille_marge", + "xlim": "xlim", + "ylim": "ylim", + "rm_outside": "rm_extérieur", + "shape": "forme", + "na.rm": "na.rm", + "Show.legend": "Afficher.légende", + "inherit.aes": "hériter.aes", + "show_boxes": "afficher_boîtes", + "angle:": "angle:", + "size:": "taille:", + "color:": "couleur:", + "label:": "étiquette:", + "geom_treemap": "géom_treemap", + "area:": "zone:", + "alpha:": "alpha:", + "colour:": "couleur:", + "fill:": "remplir:", + "linetype:": "type de ligne:", + "subgroup:": "sous-groupe:", + "subgroup2:": "sous-groupe2 :", + "subgroup3:": "sous-groupe3 :", + "layout": "disposition ", + "start": "démarrer", + "key_glyph": "clé_glyp", + "width": "largeur", + "x:": "x:", + "y:": "y :", + "weight:": "poids :", + "linetype": "type de ligne", + "colour": "couleur", + "fill": "remplir", + "show.legend": "afficher.légende", + "alpha": "alpha", + "size": "taille", + "Boxplot/Tufte Boxplot": "Boxplot/Tufte Boxplot", + "Tufte Boxplot": "Tufte Boîte à Moustaches ", + "Box Options": "Options de Boîte", + "Tufle Box Options": "Options Boîte de Tufle", + "Display as Dotplot": "Affichage comme graphique en points", + "Density/Ridges": "Densité/Crêtes", + "Density Ridges": "Densité Crêtes ", + "Dotplot Options": "Options Graphique en Points", + "Density Ridges Options": "Options Densité Crêtes ", + "binwidth": "binwidth", + "bins": "bacs", + "center": "centre", + "limite": "limite", + "closed": "fermé", + "tampon": "tampon", + "Sides:": "Côtés", + "Span": "Portée", + "method": "méthode", + "span": "portée", + "se": "es", + "formula": "formule", + "method.args": "méthode.args", + "orientation": "orientation", + "fullrange": "plage complète", + "xend:": "xfin:", + "yend:": "yfin:", + "colour_x": "couleur_x", + "colour_xend": "couleur_xfin", + "size_x": "taille_x", + "size_xend": "taille_xfin", + "dot_guide": "point_guide", + "dot_guide_colo": "point_guide_colo", + "dot_guide_size": "point_guide_taille", + "Swap x and y": "Permuter x et y", + "Colour Palette": "Palette de couleur", + "Reorder:": "Réorganiser:", + "Points (Optional):": "Points(Facultatif):", + "Group/ID:": "Groupe/ID:", + "Muptiple Response": "Réponses Multiples", + "Format Table...": "Format tableau...", + "Store Output": "Stocker la Sortie", + "Header": "En-tête", + "Add title/subtitle": "Ajouter un titre/sous-titre", + "Add footnote": "Ajouter une note de bas de page", + "Add second footnote": "Ajouter une deuxième note de bas de page", + "Add source": "Ajouter la source", + "Add Header": "Ajouter l'En-tête", + "Add stub": "Ajouter un bout", + "Add format table": "Ajouter le format du tableau", + "Margin Name :": "Nom de la Marge :", + "Treat Summaries as a Further Factor": "Traiter les résumés comme un facteur supplémentaire", + "Display Summary_Variables As Rows": "Afficher le Résumé_Variables en Lignes", + "Summary_mean": "Résumé_moyenne", + "Display Summaries As Rows": "Afficher les Résumés en Lignes", + "Display Variables As Rows": "Afficher les Variables en Lignes", + "Outer": "Extérieur", + "Fill/Colour:": "Remplir/Couleur :", + "Theme": "Thème", + "Extra Variables": "Variables Extra ", + "Suppl.Numeric:": "Numérique.Suppl:", + "Suppl.Factor:": "Facteur.Suppl:", + "Save New Graph": "Enregistrer le Nouveau Graphique", + "Selection:": "Sélection:", + "Remove Current Selection": "Retirer la Sélection Actuelle", + "Define New Selection": "Définir une Nouvelle Sélection", + "All Combined With &": "Tous Combinés Avec &", + "Operation": "Opération", + "All Combined With |": "Tous Combinés Avec |", + "Rename Options": "Renommer Options", + "Abbriviate": "Abréger", + "To Lower": "Vers le Bas", + "Clean Names": "Nettoyer Noms", + "Case:": "Cas:", + "New Name": "Nouveau Nom", + "Include Variable Labels": "Inclure Étiquettes de la Variable", + "Row Numbers or Names": "Numéros ou Noms de la Ligne", + "Apply As Selected Columns": "Appliquer Comme Colonnes Sélectionnées", + "As Subset": "Comme Sous-ensemble", + "Add not": "Pas d'ajout", + "Specify Decimals (if Numeric)": "Spécifier les Décimales (si Numériques)", + "To Data Frame:": "À Tableau de Données:", + "From Data Frame:": "De Tableau de Données:", + "Join By:": "Joindre Par:", + "Delete Colums or Rows": "Supprimer Colonnes ou Lignes", + "Duplicate Rows": "Dupliquer Lignes", + "Tolerance:": "Tolérance:", + "By Row": "Par Ligne", + "By Value": "Par Valeur", + "Non-Numeric Values": "Valeurs Non-Numériques", + "notch": "notch", + "notchwidth": "notchwidth", + "varwidth": "varwidth", + "coef": "coef", + "outlier.shape": "aberrant.forme", + "outlier.colour": "aberrant.couleur", + "outlier.size": "aberrant.dimension", + "outlier.stroke": "aberrante.stroke", + "fatten": "grossir", + "Tufte Box Options": "Options Boîte de Tufle", + "hoffset": "hofftset", + "voffset": "voffset", + "median.type": "médian.type", + "whisker.type": "moustache.type", + "draw_quantiles": "dessiner_quantiles", + "scale": "échelle", + "adjust": "ajuster", + "kernel": "noyau", + "stroke": "stroke", + "Show Missing Frequencies": "Afficher les Fréquences Manquantes", + "View/Delete Labels": "Afficher/Effacer les Étiquettes", + "Delete Value Labels": "Supprimer la Valeur des Étiquettes", + "Max Labels": "Étiquettes Max", + "Preview": "Aperçu", + "Number Missing": "Numéro Manquant", + "Ranks": "Ranks", + "Ties method": "Méthode des liens", + "Decimals:": "Décimals:", + "Round": "Arrondi", + "Signif Fig": "Fig de Signif", + "Standardize": "Standardiser", + "Lag": "Décalage", + "Lead": "En tête", + "Non-Negative": "Non-Négatif", + "Log (Natual)": "Log (naturel)", + "Log (Base 10)": "Log (Base10)", + "Power": "Puissance", + "Add Constant": "Ajouter Constante", + "Missing Last": "Dernier Manquant", + "Decreasing": "Décroissant", + "Subtract": "Soustraire", + "Multiply": "Multiplier", + "Divide": "Diviser", + "Random Samples": "Échantillons Aléatoires", + "Permute/Sample Rows": "Permuter/Échantillonner Lignes", + "Levels:": "Niveaux:", + "Groups": "Groupes", + "Label Groups with Means": "Étiqueter les Groupes avec Moyennes", + "Recode": "Recoder", + "Lump": "Morceau", + "Other": "Autre", + "Add NA": "Ajouter NA", + "Name for NA:": "Nom pour NA:", + "Keep": "Garder", + "Drop": "Lâcher", + "Name for Other:": "Nom pour Autre:", + "Selected Values": "Valeurs sélectionnées", + "Levels with at least this frequency": "Niveaux avec au moins cette fréquence", + "This number of common levels": "Ce nombre de niveaux communs", + "Levels with at least this proportion": "Niveaux avec au moins cette proportion", + "Levels with more than Other": "Niveaux avec plus que Autre", + "Most Frequent": "Le Plus Fréquent", + "Hand": "Main", + "property": "Propriété", + "Reverse Levels": "Inverser Niveaux", + "Appearance": "Apparence", + "Alphabetical Other": "Alphabétique Autre", + "Anonymise": "Anonymiser", + "Shift": "Décaler", + "Shuffle": "Mélanger", + "Unused Levels:": "Niveaux Inutilisés:", + "Levels Preview:": "Aperçu Niveaux:", + "Frequencies": "Fréquences", + "Ignore Case": "Ignorer la Case", + "Boundary": "Limite", + "Find": "Chercher", + "Find/Replace": "Chercher /Remplacer", + "Ends": "Fins", + "Starts": "Débuts", + "Combo": "Combo", + "Negate": "Négliger", + "Remove": "Retirer", + "Detect Options": "Options Détecter", + "Replace NA": "Remplacer NA", + "Find Options": "Options Recherche", + "Replace Options": "Options Remplacer", + "First Occurence": "Première Occurrence", + "Remove All": "Enlever Tout", + "Wrap": "Entourer", + "Truncate": "Tronquer", + "Side:": "Coté :", + "Squish": "Écraser", + "New Column:": "Nouvelle Colonne:", + "Sequence truncated to match the lenght of the data frame": "Séquence tronquée pour correspondre à la longueur du tableau de données", + "no. of Days in a Year:": "no. de Jours dans une Année:", + "Fill Date Gaps": "Remplir les Écarts de Date", + "clock 12": "horloge 12", + "clock24": "horloge24", + "none": "aucun", + "geographics": "géographiques", + "Median Absolute Deviation (MAD) (W)": "Déviation Absolue Médiane (DAM) (W)", + "Coefficient Of Variation (W)": "Coefficient de Variation (W)", + "Skewness (3rd Moment) (W)": "Skewness (3ème Moment) (W)", + "Kurtose": "Kurtose", + "Kurtosis (W)": "Kurtosis (W)", + "Covariance (W)": "Covariance (W)", + "Correlations (W)": "Corrélations (W)", + "Sum (W)": "Som (W)", + "Mean (W)": "Moyenne (W)", + "Median (W)": "Médian (W)", + "Edit": "Éditer", + "Stack (Pivot Longer)": "Empiler (Pivot plus Long)", + "Names to:": "Noms à:", + "Values to:": "Valeurs à:", + "Token:": "Token:", + "Factor(s):": "Facteur(s):", + "To Lower Case": "En Minuscule", + "Punctuation": "Ponctuation", + "Output:": "Sortie:", + "Unstack (Pivot Wider)": "Dépiler (Pivot plus large)", + "Add Prefix:": "Ajouter Préfixe:", + "Columns to Carry:": "Colonnes à Emporter", + "Fill Missing Values:": "Remplir Valeurs Manquantes:", + "Merge (Join)": "Fusionner (Joindre)", + "Append (Bind Rows)": "Ajouter (Lier les Lignes)", + "Include Old Names": "Inclure Anciens Noms", + "New Names (Optional):": "Nouveau Noms (optionnel):", + "Links": "Liens", + "Data Frames": "Tableaux de Données", + "Copy to clipboard": "Copier dans le presse-papier", + "Data frame": "Tableau de données", + "Columns metadata": "Métadonnées Colonnes", + "Data frame metadata": "Métadonnées Tableau de Données", + "Unhide": "Rendre visible", + "Unhidden Data Frame(s):": "Dévoiler Tableau(x) de Données", + "Run": "Exécuter", + "Import NetCDF File": "Importer Fichier NetCDF", + "Import Shapefiles": "Importer FichierShape", + "Setup For Data Entry": "Configuration Pour l'Entrée de Données", + "Add Flags": "Ajouter Drapeaux", + "Data From:": "Données De:", + "Data To:": "Donnée À:", + "Flag Variables:": "Variables Drapeau:", + "Day in Year (365)": "Jour dans l'Année (365)", + "Day in Year (366)": "Jour dans l'Année (366)", + "Minimum RH (%):": "HR minimum (%):", + "Maximum RH (%):": "HR maximum (%):", + "Base Year:": "Année de Base:", + "Rug colour:": "Couleur Tapis:", + "Time interval:": "Interval de Temps:" } \ No newline at end of file diff --git a/instat/translations/it/it_r_instat_menus.json b/instat/translations/it/it_r_instat_menus.json index 09862a34032..79c3a50772c 100644 --- a/instat/translations/it/it_r_instat_menus.json +++ b/instat/translations/it/it_r_instat_menus.json @@ -457,5 +457,13 @@ "Save": "Salva", "Import SST...": "Importa SST...", "Daily Data Editing/Entry...": "Modifica/Inserimento giornaliero dei dati...", - "Experiments": "Esperimenti" + "Experiments": "Esperimenti", + "Two/Three Variables": "Due/tre variabili", + "Graphs": "Grafici", + "Tables...": "Tavoli...", + "Pivot Table...": "Tabella pivot...", + "Two-Way Frequencies...": "Frequenze bidirezionali...", + "Three-Way Frequencies...": "Frequenze a tre vie...", + "Heatmap...": "Mappa di calore...", + "Cluster Analysis...": "Analisi di gruppo..." } \ No newline at end of file diff --git a/instat/translations/it/it_r_instat_not_menus.json b/instat/translations/it/it_r_instat_not_menus.json index 7873792cf7a..51149a44311 100644 --- a/instat/translations/it/it_r_instat_not_menus.json +++ b/instat/translations/it/it_r_instat_not_menus.json @@ -3709,5 +3709,328 @@ "Levels": "Livelli", "Category:": "Categoria:", "Show Command": "Mostra comando", - "Lists:": "Elenchi:" + "Lists:": "Elenchi:", + "Subtotals": "Subtotali", + "Initial Column Factor:": "Fattore colonna iniziale:", + "Initial Row Factor(s) :": "Fattore/i di riga iniziale:", + "Numeric Variable (Optional):": "Variabile numerica (opzionale):", + "Select Variable(s)": "Seleziona variabile/i", + "Partitioning": "Partizionamento", + "Hierarchical": "Gerarchico", + "Numeric Variables": "Variabili numeriche", + "Data Frame/Matrix ": "Frame dati/matrice ", + "Metric:": "Metrico:", + "Stand:": "In piedi:", + "PAM Cluster": "Ammasso PAM", + "Partition Plot": "Trama di partizione", + "Cluster:": "Grappolo:", + "Hierarch Plot": "Trama gerarchica", + "Display Summaries As Rows": "Visualizza riepiloghi come righe", + "Display Variables As Rows": "Visualizza variabili come righe", + "Min Frequency": "Frequenza minima", + "Show Variable Names": "Mostra nomi variabili", + "Factor (Optional) :": "Fattore (facoltativo):", + "Second Factor (Optional) :": "Secondo fattore (facoltativo):", + "Skim": "Scremare", + "Three variables": "Tre variabili", + "Pairs": "Coppie", + "Colour (Optional):": "Colore (opzionale):", + "Pair Plot Options": "Opzioni del grafico a coppie", + "Type Of Dispaly": "Tipo di visualizzazione", + "Upper": "Superiore", + "Lower": "Minore", + "Diagonal": "Diagonale", + "Wordcloud": "Nuvola di parole", + "Reorder Frequency": "Riordina frequenza", + "Back to Back": "Indietro contro schiena", + "Polar": "Polare", + "Reorder": "Riordina", + "Area:": "La zona:", + "Treemap Options": "Opzioni mappa ad albero", + "Angle:": "Angolo:", + "Increase size": "Aumenta le dimensioni", + "Wordcloud Options": "Opzioni di wordcloud", + "Place:": "Luogo:", + "stat": "statistica", + "position": "posizione", + "parse": "analizzare", + "nudge_x": "spinta_x", + "nudge_y": "nudge_y", + "eccentricity": "eccentricità", + "grid_size": "dimensione_griglia", + "max_grid_size": "max_griglia_dimensione", + "grid_margin": "griglia_margine", + "xlim": "xlim", + "ylim": "ylim", + "rm_outside": "rm_outside", + "shape": "forma", + "na.rm": "na.rm", + "Show.legend": "Mostra.leggenda", + "inherit.aes": "ereditare.aes", + "show_boxes": "show_box", + "angle:": "angolo:", + "size:": "taglia:", + "color:": "colore:", + "label:": "etichetta:", + "geom_treemap": "geom_treemap", + "area:": "la zona:", + "alpha:": "alfa:", + "colour:": "colore:", + "fill:": "riempire:", + "linetype:": "modello di linea:", + "subgroup:": "sottogruppo:", + "subgroup2:": "sottogruppo2:", + "subgroup3:": "sottogruppo3:", + "layout": "disposizione", + "start": "inizio", + "key_glyph": "key_glyp", + "width": "larghezza", + "x:": "X:", + "y:": "e:", + "weight:": "peso:", + "linetype": "modello di linea", + "colour": "colore", + "fill": "riempire", + "show.legend": "mostra.leggenda", + "alpha": "alfa", + "size": "taglia", + "Boxplot/Tufte Boxplot": "Boxplot/Tufte Boxplot", + "Tufte Boxplot": "Grafico a scatola di Tufte", + "Box Options": "Opzioni della scatola", + "Tufle Box Options": "Opzioni Tufle Box", + "Display as Dotplot": "Visualizza come Dotplot", + "Density/Ridges": "Densità/Creste", + "Density Ridges": "Crinali di densità", + "Dotplot Options": "Opzioni del grafico a punti", + "Density Ridges Options": "Opzioni creste di densità", + "binwidth": "binwidth", + "bins": "bidoni", + "center": "centro", + "limite": "limite", + "closed": "Chiuso", + "tampon": "tampone", + "Sides:": "Lati", + "Span": "Durata", + "method": "metodo", + "span": "span", + "se": "se", + "formula": "formula", + "method.args": "metodo.args", + "orientation": "orientamento", + "fullrange": "gamma completa", + "xend:": "fine:", + "yend:": "yend:", + "colour_x": "colore_x", + "colour_xend": "color_xend", + "size_x": "taglia_x", + "size_xend": "size_xend", + "dot_guide": "punto_guida", + "dot_guide_colo": "punto_guida_colo", + "dot_guide_size": "dimensione_guida_punto", + "Swap x and y": "Scambia x e y", + "Colour Palette": "Tavolozza dei colori", + "Reorder:": "Riordina:", + "Points (Optional):": "Punti (facoltativo):", + "Group/ID:": "Gruppo/ID:", + "Muptiple Response": "Risposta multipla", + "Format Table...": "Formato tabella...", + "Store Output": "Memorizza uscita", + "Header": "Intestazione", + "Add title/subtitle": "Aggiungi titolo/sottotitolo", + "Add footnote": "Aggiungi nota a piè di pagina", + "Add second footnote": "Aggiungi una seconda nota a piè di pagina", + "Add source": "Aggiungi fonte", + "Add Header": "Aggiungi intestazione", + "Add stub": "Aggiungi mozzicone", + "Add format table": "Aggiungi la tabella dei formati", + "Margin Name :": "Nome margine:", + "Treat Summaries as a Further Factor": "Considera i riassunti come un ulteriore fattore", + "Display Summary_Variables As Rows": "Visualizza Summary_Variables come righe", + "Summary_mean": "Riepilogo_media", + "Display Summaries As Rows": "Visualizza riepiloghi come righe", + "Display Variables As Rows": "Visualizza variabili come righe", + "Outer": "Esterno", + "Fill/Colour:": "Riempimento/Colore:", + "Theme": "Tema", + "Extra Variables": "Variabili extra", + "Suppl.Numeric:": "Suppl.Numerico:", + "Suppl.Factor:": "Fattore suppl.:", + "Save New Graph": "Salva nuovo grafico", + "Selection:": "Selezione:", + "Remove Current Selection": "Rimuovi selezione corrente", + "Define New Selection": "Definisci nuova selezione", + "All Combined With &": "Tutto combinato con &", + "Operation": "Operazione", + "All Combined With |": "Tutto combinato con |", + "Rename Options": "Rinomina opzioni", + "Abbriviate": "Abbreviare", + "To Lower": "Ridurre", + "Clean Names": "Nomi puliti", + "Case:": "Caso:", + "New Name": "Nuovo nome", + "Include Variable Labels": "Includi etichette variabili", + "Row Numbers or Names": "Numeri di riga o nomi", + "Apply As Selected Columns": "Applica come colonne selezionate", + "As Subset": "Come sottoinsieme", + "Add not": "Aggiungi no", + "Specify Decimals (if Numeric)": "Specifica decimali (se numerici)", + "To Data Frame:": "Al frame dati:", + "From Data Frame:": "Dal frame dati:", + "Join By:": "Iscriviti da:", + "Delete Colums or Rows": "Elimina colonne o righe", + "Duplicate Rows": "Righe duplicate", + "Tolerance:": "Tolleranza:", + "By Row": "Per riga", + "By Value": "Per valore", + "Non-Numeric Values": "Valori non numerici", + "notch": "tacca", + "notchwidth": "larghezza della tacca", + "varwidth": "varwidth", + "coef": "coef", + "outlier.shape": "outlier.shape", + "outlier.colour": "colore.outlier", + "outlier.size": "outlier.size", + "outlier.stroke": "outlier.stroke", + "fatten": "ingrassare", + "Tufte Box Options": "Opzioni Tufte Box", + "hoffset": "hoffset", + "voffset": "voffset", + "median.type": "tipo.mediano", + "whisker.type": "baffo.tipo", + "draw_quantiles": "draw_quantili", + "scale": "scala", + "adjust": "regolare", + "kernel": "nocciolo", + "stroke": "ictus", + "Show Missing Frequencies": "Mostra frequenze mancanti", + "View/Delete Labels": "Visualizza/Elimina etichette", + "Delete Value Labels": "Elimina etichette valori", + "Max Labels": "Etichette massime", + "Preview": "Anteprima", + "Number Missing": "Numero mancante", + "Ranks": "Gradi", + "Ties method": "Metodo dei legami", + "Decimals:": "Decimali:", + "Round": "Girare", + "Signif Fig": "Significato Fig", + "Standardize": "Standardizzare", + "Lag": "Ritardo", + "Lead": "Guida", + "Non-Negative": "Non negativo", + "Log (Natual)": "Registro (naturale)", + "Log (Base 10)": "Registro (Base 10)", + "Power": "Potenza", + "Add Constant": "Aggiungi Costante", + "Missing Last": "ultimo mancante", + "Decreasing": "Decrescente", + "Subtract": "Sottrarre", + "Multiply": "Moltiplicare", + "Divide": "Dividere", + "Random Samples": "Campioni casuali", + "Permute/Sample Rows": "Permuta/righe di esempio", + "Levels:": "Livelli:", + "Groups": "Gruppi", + "Label Groups with Means": "Etichetta i gruppi con le medie", + "Recode": "Ricodifica", + "Lump": "Massa", + "Other": "Altro", + "Add NA": "Aggiungi N.A", + "Name for NA:": "Nome per NA:", + "Keep": "Mantenere", + "Drop": "Gocciolare", + "Name for Other:": "Nome per Altro:", + "Selected Values": "Valori selezionati", + "Levels with at least this frequency": "Livelli con almeno questa frequenza", + "This number of common levels": "Questo numero di livelli comuni", + "Levels with at least this proportion": "Livelli con almeno questa proporzione", + "Levels with more than Other": "Livelli con più di Altro", + "Most Frequent": "Più frequente", + "Hand": "Mano", + "property": "Proprietà", + "Reverse Levels": "Livelli inversi", + "Appearance": "Aspetto", + "Alphabetical Other": "Alfabetico Altro", + "Anonymise": "Anonimizza", + "Shift": "Spostare", + "Shuffle": "Mescola", + "Unused Levels:": "Livelli non utilizzati:", + "Levels Preview:": "Anteprima livelli:", + "Frequencies": "Frequenze", + "Ignore Case": "Ignora caso", + "Boundary": "Confine", + "Find": "Trovare", + "Find/Replace": "Trova/Sostituisci", + "Ends": "Finisce", + "Starts": "Inizia", + "Combo": "Combo", + "Negate": "Negare", + "Remove": "Rimuovere", + "Detect Options": "Rileva opzioni", + "Replace NA": "Sostituisci NA", + "Find Options": "Trova opzioni", + "Replace Options": "Sostituisci opzioni", + "First Occurence": "Prima ricorrenza", + "Remove All": "Rimuovi tutto", + "Wrap": "Avvolgere", + "Truncate": "Troncare", + "Side:": "Lato:", + "Squish": "Schiacciare", + "New Column:": "Nuova colonna:", + "Sequence truncated to match the lenght of the data frame": "Sequenza troncata per corrispondere alla lunghezza del frame di dati", + "no. of Days in a Year:": "no. di giorni in un anno:", + "Fill Date Gaps": "Riempi gli spazi vuoti della data", + "clock 12": "orologio 12", + "clock24": "orologio24", + "none": "nessuno", + "geographics": "geografici", + "Median Absolute Deviation (MAD) (W)": "Deviazione assoluta mediana (MAD) (W)", + "Coefficient Of Variation (W)": "Coefficiente di variazione (W)", + "Skewness (3rd Moment) (W)": "Asimmetria (3° momento) (W)", + "Kurtose": "Kurtose", + "Kurtosis (W)": "Curtosi (W)", + "Covariance (W)": "Covarianza (W)", + "Correlations (W)": "Correlazioni (W)", + "Sum (W)": "Somma (W)", + "Mean (W)": "Media (W)", + "Median (W)": "Mediana (W)", + "Edit": "Modificare", + "Stack (Pivot Longer)": "Stack (ruota più a lungo)", + "Names to:": "Nomi a:", + "Values to:": "Valori a:", + "Token:": "Gettone:", + "Factor(s):": "Fattore/i:", + "To Lower Case": "In minuscolo", + "Punctuation": "Punteggiatura", + "Output:": "Produzione:", + "Unstack (Pivot Wider)": "Disimpilare (Pivot più ampio)", + "Add Prefix:": "Aggiungi prefisso:", + "Columns to Carry:": "Colonne da trasportare", + "Fill Missing Values:": "Riempi i valori mancanti:", + "Merge (Join)": "Unisci (unisciti)", + "Append (Bind Rows)": "Aggiungi (lega righe)", + "Include Old Names": "Includi vecchi nomi", + "New Names (Optional):": "Nuovi nomi (opzionale):", + "Links": "Collegamenti", + "Data Frames": "Frame di dati", + "Copy to clipboard": "Copia negli appunti", + "Data frame": "Cornice dati", + "Columns metadata": "Metadati delle colonne", + "Data frame metadata": "Metadati del frame di dati", + "Unhide": "Scopri", + "Unhidden Data Frame(s):": "Frame dati non nascosti:", + "Run": "Correre", + "Import NetCDF File": "Importa file NetCDF", + "Import Shapefiles": "Importa Shapefile", + "Setup For Data Entry": "Configurazione per l'immissione dei dati", + "Add Flags": "Aggiungi flag", + "Data From:": "Dati da:", + "Data To:": "Dati a:", + "Flag Variables:": "Segnala variabili:", + "Day in Year (365)": "Giorno dell'anno (365)", + "Day in Year (366)": "Giorno nell'anno (366)", + "Minimum RH (%):": "UR minima (%):", + "Maximum RH (%):": "UR massima (%):", + "Base Year:": "Anno di riferimento:", + "Rug colour:": "Colore tappeto:", + "Time interval:": "Intervallo di tempo:" } \ No newline at end of file diff --git a/instat/translations/pt/pt_r_instat_menus.json b/instat/translations/pt/pt_r_instat_menus.json index ba0629dbd7b..ad66966866d 100644 --- a/instat/translations/pt/pt_r_instat_menus.json +++ b/instat/translations/pt/pt_r_instat_menus.json @@ -428,34 +428,42 @@ "Wind/Pollution Rose...": "Vento/Rosa de poluição...", "Windows": "Janelas", "Windrose...": "Pistola...", - "Temperature Graph...": "Temperature Graph...", - "General Graph...": "General Graph...", - "Select Columns...": "Select Columns...", - "Remove Column Selection": "Remove Column Selection", - "Filter Rows...": "Filter Rows...", - "Delete Cell(s)": "Delete Cell(s)", - "Import From File ...": "Import From File ...", - "Import From Library ...": "Import From Library ...", - "Import From ODK...": "Import From ODK...", - "Data Book": "Data Book", - "Add (Merge) Columns...": "Add (Merge) Columns...", - "Column: Calculator...": "Column: Calculator...", - "Column: Numeric": "Column: Numeric", - "Rename Columns...": "Rename Columns...", - "Duplicate Rows...": "Duplicate Rows...", - "Non-Numeric Values...": "Non-Numeric Values...", - "View/Delete Labels...": "View/Delete Labels...", - "Row Sumaries...": "Row Sumaries...", - "Permute/Sample Rows...": "Permute/Sample Rows...", - "Stack (Pivot Longer)...": "Stack (Pivot Longer)...", - "Unstack (Pivot Wider)...": "Unstack (Pivot Wider)...", - "Merge (Join)...": "Merge (Join)...", - "Append (Bind Rows)...": "Append (Bind Rows)...", - "Random Split...": "Random Split...", - "Scale/Distance...": "Scale/Distance...", - "Rename": "Rename", - "Save": "Save", - "Import SST...": "Import SST...", - "Daily Data Editing/Entry...": "Daily Data Editing/Entry...", - "Experiments": "Experiments" + "Temperature Graph...": "Gráfico de temperatura...", + "General Graph...": "Gráfico Geral...", + "Select Columns...": "Selecione colunas...", + "Remove Column Selection": "Remover seleção de coluna", + "Filter Rows...": "Filtrar linhas...", + "Delete Cell(s)": "Excluir Células", + "Import From File ...": "Importar do arquivo...", + "Import From Library ...": "Importar da biblioteca...", + "Import From ODK...": "Importar do ODK...", + "Data Book": "Livro de dados", + "Add (Merge) Columns...": "Adicionar (Mesclar) Colunas...", + "Column: Calculator...": "Coluna: Calculadora...", + "Column: Numeric": "Coluna: Numérico", + "Rename Columns...": "Renomear colunas...", + "Duplicate Rows...": "Linhas duplicadas...", + "Non-Numeric Values...": "Valores não numéricos...", + "View/Delete Labels...": "Exibir/excluir rótulos...", + "Row Sumaries...": "Resumos de linha...", + "Permute/Sample Rows...": "Permutar/amostrar linhas...", + "Stack (Pivot Longer)...": "Stack (Pivot Longo)...", + "Unstack (Pivot Wider)...": "Desempilhar (Pivot Wider)...", + "Merge (Join)...": "Mesclar (Juntar)...", + "Append (Bind Rows)...": "Anexar (vincular linhas)...", + "Random Split...": "Divisão aleatória...", + "Scale/Distance...": "Escala/Distância...", + "Rename": "Renomear", + "Save": "Salve ", + "Import SST...": "Importar SST...", + "Daily Data Editing/Entry...": "Edição/entrada de dados diários...", + "Experiments": "experimentos", + "Two/Three Variables": "Duas/Três Variáveis", + "Graphs": "Gráficos", + "Tables...": "Tabelas...", + "Pivot Table...": "Tabela Dinâmica...", + "Two-Way Frequencies...": "Frequências bidirecionais...", + "Three-Way Frequencies...": "Frequências de três vias...", + "Heatmap...": "Mapa de calor...", + "Cluster Analysis...": "Análise de Cluster..." } \ No newline at end of file diff --git a/instat/translations/pt/pt_r_instat_not_menus.json b/instat/translations/pt/pt_r_instat_not_menus.json index cf45aba80ac..339a058e25d 100644 --- a/instat/translations/pt/pt_r_instat_not_menus.json +++ b/instat/translations/pt/pt_r_instat_not_menus.json @@ -401,7 +401,7 @@ "Column Selection": "Seleção de coluna", "Column Statistics": "Estatísticas de coluna", "Column Structure": "Estrutura da coluna", - "Column Type:": "Column Type:", + "Column Type:": "Tipo de coluna:", "Column Variable(s) (Factor):": "Variável(s) de coluna (Factor):", "Column Width:": "Largura da Coluna:", "Column to Duplicate:": "Coluna para duplicar:", @@ -644,7 +644,7 @@ "Define CRI": "Definir CRI", "Define Climatic Data": "Definir dados climáticos", "Define Corruption Outputs": "Definir Saídas de Corrupção", - "Define New Column Selection": "Define New Column Selection", + "Define New Column Selection": "Definir nova seleção de coluna", "Define New Filter": "Definir novo filtro", "Define New Property": "Definir nova propriedade", "Define Options By Context Data": "Definir opções por dados de contexto", @@ -755,7 +755,7 @@ "Drop Unused Levels": "Níveis não utilizados", "Drop empty factor levels": "Soltar níveis de fatores vazios", "Dry Month": "Mês seco", - "Drop Empty Rows and Columns": "Drop Empty Rows and Columns", + "Drop Empty Rows and Columns": "Soltar linhas e colunas vazias", "Dry Period": "Período seco", "Dry Spell": "Dry Spell", "Dummy Variables": "Variáveis de prova", @@ -1680,7 +1680,7 @@ "New Label": "Novo Marcador", "New Metadata Name": "Novo Nome de Metadado", "New Name:": "Novo Nome:", - "New Selection Name:": "New Selection Name:", + "New Selection Name:": "Nome da nova seleção:", "New Theme Name": "Novo nome do tema", "New Value:": "Novo valor:", "New column will be at the: ": "Nova coluna vai ser em: ", @@ -1710,7 +1710,7 @@ "No of Clusters:": "Número de Clusters:", "No package with this name.": "Nenhum pacote com esse nome.", "No preview available.": "Pré-visualização não disponível.", - "No file selected.": "No file selected.", + "No file selected.": "Nenhum arquivo selecionado.", "No sheet selected.": "Nenhuma folha selecionada.", "No. Bids Received:": "Não. Ofertas recebidas:", "No. Considered Bids:": "Não. Considerado Lids:", @@ -1869,12 +1869,12 @@ "PCA Options": "Opções de PCA", "PELT": "PELT", "PICSA Crops": "PICSA Crops", - "PICSA General Graphs": "PICSA General Graphs", + "PICSA General Graphs": "Gráficos Gerais PICSA", "PICSA Options": "Opções do PICSA", "PICSA Rainfall Graph": "Gráfico da chuva PICSA", "PICSA Rainfall Graphs": "Gráficos de chuva PICSA", "PICSA Temperature": "Temperatura PICSA", - "PICSA Temperature Graphs": "PICSA Temperature Graphs", + "PICSA Temperature Graphs": "Gráficos de temperatura PICSA", "PP": "PP", "PP-Plot": "Plotagem", "PPP Adjusted Contract Value:": "Valor do contrato atualizado com PPP:", @@ -2025,7 +2025,7 @@ "Prefix for Data Frames:": "Prefixo para quadros de dados:", "Prefix for New Column:": "Prefixo para a Nova Coluna:", "Prefix for New Columns:": "Prefixo para novas colunas:", - "Prefix:": "Prefix:", + "Prefix:": "Prefixo:", "Preview Current Sheet": "Pré-visualizar a folha atual", "Preview Log": "Pré-visualizar Log", "Preview Output": "Pré-visualização de saída", @@ -2228,7 +2228,7 @@ "Rows to Take Max Over:": "Linhas para maximizar o máximo:", "Rows:": "Linhas:", "Rug": "Tapete", - "Rug Color:": "Rug Color:", + "Rug Color:": "Cor do tapete:", "Rug Plot": "Gráfico de Tapete", "Rug Plot Options": "Opções do Plotagem Tag", "Rugs": "Tapetes", @@ -2314,7 +2314,7 @@ "Scaled Fractions": "Frações dimensionadas", "Scaled Points": "Pontos de Escala", "Scales": "Escamas", - "Scale/Distance": "Scale/Distance", + "Scale/Distance": "Escala/Distância", "Scatter Matrix": "Matriz Scatter", "Scatter Plot": "Gráfico de dispersão", "Scatter Plot Options": "Opções do Scatter Plot", @@ -2352,7 +2352,7 @@ "Select All": "Selecionar Todos", "Select All Levels": "Selecionar todos os níveis", "Select And Stuck": "Selecionar e Preso", - "Select By:": "Select By:", + "Select By:": "Selecione por:", "Select Contrast Name:": "Selecionar Nome do Contraste:", "Select Date Range": "Selecione Intervalo de Datas", "Select Day of Year Range": "Selecione o intervalo do ano", @@ -2394,7 +2394,7 @@ "Selected Variables:": "Variáveis Selecionadas:", "Selected column": "Coluna selecionada", "Selection": "Seleção", - "Selection Preview": "Selection Preview", + "Selection Preview": "Visualização da seleção", "Semi Join": "Juntar-se a Si", "Semi-Colon(;)": "Semi-Colon(;)", "Semicolon ;": "Semicolon ;", @@ -3603,111 +3603,434 @@ "yday": "yday", "year": "Ano", "ymd": "ymd", - "Output Window": "Output Window", - "Data View": "Data View", - "Code generated by the dialog,": "Code generated by the dialog,", - "Make the Column a Key for the Data Frame": "Make the Column a Key for the Data Frame", - "Column: Numeric": "Column: Numeric", - "Rename Columns...": "Rename Columns...", - "Duplicate Column...": "Duplicate Column...", - "Select Columns...": "Select Columns...", - "Add (Merge) Columns...": "Add (Merge) Columns...", - "Data Frame": "Data Frame", - "Degrees": "Degrees", - "Use Max and Min": "Use Max and Min", - "Modified GDD:": "Modified GDD:", + "Output Window": "Janela de saída", + "Data View": "Exibição de dados", + "Code generated by the dialog,": "Código gerado pelo diálogo,", + "Make the Column a Key for the Data Frame": "Faça da coluna uma chave para o quadro de dados", + "Column: Numeric": "Coluna: Numérico", + "Rename Columns...": "Renomear colunas...", + "Duplicate Column...": "Duplicar coluna...", + "Select Columns...": "Selecione colunas...", + "Add (Merge) Columns...": "Adicionar (Mesclar) Colunas...", + "Data Frame": "Quadro de dados", + "Degrees": "Graus", + "Use Max and Min": "Usar máximo e mínimo", + "Modified GDD:": "GDD modificado:", "GDD:": "GDD:", "HDD:": "HDD:", - "Tmean:": "Tmean:", - "Diurnal Range:": "Diurnal Range:", - "Jump:": "Jump:", - "Outlier:": "Outlier:", - "Difference:": "Difference:", - "Days:": "Days:", - "Acceptable Range Element1:": "Acceptable Range Element1:", - "Acceptable Range Element2:": "Acceptable Range Element2:", - "Add Not": "Add Not", - "Help": "Help", - "Add All": "Add All", - "Clear Selection": "Clear Selection", - "Add Selected": "Add Selected", - "Two Variables": "Two Variables", - "Model Name": "Model Name", - "Reverse Legend Order": "Reverse Legend Order", - "No duplicate dates.": "No duplicate dates.", - "Save As:": "Save As:", - "Start": "Start", - "New Data Frame...": "New Data Frame...", - "Import From File...": "Import From File...", - "Import From Library...": "Import From Library...", - "Recent": "Recent", - "Add To Existing": "Add To Existing", - "Add To New": "Add To New", - "Move Down": "Move Down", - "Move Up": "Move Up", - "Lebelled Convert": "Lebelled Convert", - "File with the same name will be overwritten.": "File with the same name will be overwritten.", - "Are you sure you want to close your data?": "Are you sure you want to close your data?", - "Any unsaved changes will be lost.": "Any unsaved changes will be lost.", - "Are you sure you want to exit R-Instat?": "Are you sure you want to exit R-Instat?", - "Exit": "Exit", - "Close Data": "Close Data", - "Are you sure you want to delete these column(s)?": "Are you sure you want to delete these column(s)?", - "This action connot be undone.": "This action connot be undone.", - "Are you sure you want to delete these row(s)?": "Are you sure you want to delete these rows(s)?", - "Return to main dialog?": "Return to main dialog?", - "Are you sure you want to the main dialog?": "Are you sure you want to the main dialog?", - "The condition for station has not been added.": "The condition for station has not been added.", - "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.", - "Duplicate dates for station(s) were found": "Duplicate dates for station(s) were found", - "Names To:": "Names To:", - "Values To:": "Values To:", - "Drop Prefix:": "Drop Prefix:", - "Drop Missing Values": "Drop Missing Values", - "Carry All Columns": "Carry All Columns", - "Columns to Carry": "Columns to Carry", - "Pivot Longer": "Pivot Longer", - "Unnest": "Unnest", - "names": "names", - "value": "value", - "Dumbbell": "Dumbbell", - "Line options": "Line options", - "Path or Step": "Path or Step", - "Smooth Options": "Smooth Options", - "Add Line": "Add Line", - "Add SE": "Add SE", - "Formula": "Formula", - "Dumbbell options": "Dumbbell options", - "X End Variable:": "X End Variable:", - "Adjust size of variable": "Adjust size of variable", - "Shave": "Shave", - "Rearrange": "Rearrange", - "Leading Zeros": "Leading Zeros", - "Display On Diagonal:": "Display On Diagonal:", - "Decimal Places:": "Decimal Places:", - "Display As DataFrame": "Display As DataFrame", - "Data Frame Name": "Data Frame Name", - "Rename With": "Rename With", - "Rename Columns": "Rename Columns", - "Command runs without error": "Command runs without error", - "Command runs ok": "Command runs ok", - "Problem detected running Command or no output to display.": "Problem detected running Command or no output to display.", - "Command produced an error. Modify input before running.": "Command produced an error. Modify input before running.", - "Model produced an error or no output to display.": "Model produced an error or no output to display.", - "Model runs without error": "Model runs without error", - "Model runs ok": "Model runs ok", - "Problem detected running Model or no output to display.": "Problem detected running Model or no output to display.", - "Model produced an error. Modify input before running.": "Model produced an error. Modify input before running.", - "Distance": "Distance", - "Whole Data Frame": "Whole Data Frame", - "Centre": "Centre", - "Display As Data Frame": "Display As Data Frame", - "Name": "Name", - "Lists": "Lists", - "Variable Name": "Variable Name", - "Variable Label": "Variable Label", - "Levels": "Levels", - "Category:": "Category:", - "Show Command": "Show Command", - "Lists:": "Lists:" + "Tmean:": "Média:", + "Diurnal Range:": "Intervalo diurno:", + "Jump:": "Pular:", + "Outlier:": "Ponto fora da curva:", + "Difference:": "Diferença:", + "Days:": "Dias:", + "Acceptable Range Element1:": "Faixa Aceitável Elemento1:", + "Acceptable Range Element2:": "Faixa Aceitável Elemento 2:", + "Add Not": "Adicionar não", + "Help": "Ajuda", + "Add All": "Adicionar tudo", + "Clear Selection": "Seleção clara", + "Add Selected": "Adicionar selecionado", + "Two Variables": "Duas Variáveis", + "Model Name": "Nome do modelo", + "Reverse Legend Order": "Ordem Inversa da Legenda", + "No duplicate dates.": "Sem datas duplicadas.", + "Save As:": "Salvar como:", + "Start": "Começar", + "New Data Frame...": "Novo quadro de dados...", + "Import From File...": "Importar do arquivo...", + "Import From Library...": "Importar da biblioteca...", + "Recent": "Recente", + "Add To Existing": "Adicionar ao existente", + "Add To New": "Adicionar a novo", + "Move Down": "mover para baixo", + "Move Up": "Subir", + "Lebelled Convert": "Texto Convertido", + "File with the same name will be overwritten.": "Arquivo com o mesmo nome será substituído.", + "Are you sure you want to close your data?": "Tem certeza que deseja fechar seus dados?", + "Any unsaved changes will be lost.": "Quaisquer alterações não salvas serão perdidas.", + "Are you sure you want to exit R-Instat?": "Tem certeza de que deseja sair do R-Instat?", + "Exit": "Saída", + "Close Data": "Fechar dados", + "Are you sure you want to delete these column(s)?": "Tem certeza de que deseja excluir esta(s) coluna(s)?", + "This action connot be undone.": "Esta ação não pode ser desfeita.", + "Are you sure you want to delete these row(s)?": "Tem certeza de que deseja excluir esta(s) linha(s)?", + "Return to main dialog?": "Retornar à caixa de diálogo principal?", + "Are you sure you want to the main dialog?": "Tem certeza de que deseja a caixa de diálogo principal?", + "The condition for station has not been added.": "A condição para a estação não foi adicionada.", + "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "Você tem várias linhas com as mesmas datas para uma ou mais estações. Use a caixa de diálogo Climatic > Arrumar e examinar > Duplicatas para investigar esses problemas.", + "Duplicate dates for station(s) were found": "Foram encontradas datas duplicadas para a(s) estação(ões)", + "Names To:": "Nomes Para:", + "Values To:": "Valores Para:", + "Drop Prefix:": "Prefixo de queda:", + "Drop Missing Values": "Eliminar valores ausentes", + "Carry All Columns": "Carregar todas as colunas", + "Columns to Carry": "Colunas para carregar", + "Pivot Longer": "Pivô mais longo", + "Unnest": "Desaninhar", + "names": "nomes", + "value": "valor", + "Dumbbell": "Haltere", + "Line options": "Opções de linha", + "Path or Step": "Caminho ou Passo", + "Smooth Options": "Opções suaves", + "Add Line": "Adicionar linha", + "Add SE": "Adicionar SE", + "Formula": "Fórmula", + "Dumbbell options": "opções de halteres", + "X End Variable:": "X variável final:", + "Adjust size of variable": "Ajustar o tamanho da variável", + "Shave": "Depilar", + "Rearrange": "Reorganizar", + "Leading Zeros": "Zeros à esquerda", + "Display On Diagonal:": "Exibir na diagonal:", + "Decimal Places:": "Casas decimais:", + "Display As DataFrame": "Exibir como DataFrame", + "Data Frame Name": "Nome do quadro de dados", + "Rename With": "Renomear com", + "Rename Columns": "Renomear colunas", + "Command runs without error": "Comando é executado sem erro", + "Command runs ok": "Comando roda ok", + "Problem detected running Command or no output to display.": "Problema detectado ao executar o comando ou nenhuma saída a ser exibida.", + "Command produced an error. Modify input before running.": "O comando produziu um erro. Modifique a entrada antes de executar.", + "Model produced an error or no output to display.": "O modelo produziu um erro ou nenhuma saída para exibir.", + "Model runs without error": "Modelo roda sem erro", + "Model runs ok": "Modelo funciona ok", + "Problem detected running Model or no output to display.": "Problema detectado executando o modelo ou nenhuma saída para exibir.", + "Model produced an error. Modify input before running.": "O modelo produziu um erro. Modifique a entrada antes de executar.", + "Distance": "Distância", + "Whole Data Frame": "Quadro de Dados Inteiro", + "Centre": "Centro", + "Display As Data Frame": "Exibir como quadro de dados", + "Name": "Nome", + "Lists": "Listas", + "Variable Name": "Nome variável", + "Variable Label": "Rótulo variável", + "Levels": "Níveis", + "Category:": "Categoria:", + "Show Command": "Mostrar comando", + "Lists:": "Listas:", + "Subtotals": "Subtotais", + "Initial Column Factor:": "Fator de coluna inicial:", + "Initial Row Factor(s) :": "Fator(es) de linha inicial(is):", + "Numeric Variable (Optional):": "Variável Numérica (Opcional):", + "Select Variable(s)": "Selecione a(s) variável(is)", + "Partitioning": "Particionamento", + "Hierarchical": "hierárquico", + "Numeric Variables": "Variáveis Numéricas", + "Data Frame/Matrix ": "Quadro de Dados/Matriz ", + "Metric:": "Métrica:", + "Stand:": "Ficar em pé:", + "PAM Cluster": "Grupo PAM", + "Partition Plot": "Gráfico de Partição", + "Cluster:": "Agrupar:", + "Hierarch Plot": "Gráfico de Hierarquia", + "Display Summaries As Rows": "Exibir resumos como linhas", + "Display Variables As Rows": "Exibir variáveis como linhas", + "Min Frequency": "frequência mínima", + "Show Variable Names": "Mostrar nomes de variáveis", + "Factor (Optional) :": "Fator (opcional):", + "Second Factor (Optional) :": "Segundo fator (opcional):", + "Skim": "Desnatar", + "Three variables": "Três variáveis", + "Pairs": "Pares", + "Colour (Optional):": "Cor (opcional):", + "Pair Plot Options": "Opções de gráfico de pares", + "Type Of Dispaly": "Tipo de Exibição", + "Upper": "Superior", + "Lower": "Mais baixo", + "Diagonal": "Diagonal", + "Wordcloud": "Palavra nuvem", + "Reorder Frequency": "Frequência de Reordenar", + "Back to Back": "De volta para trás", + "Polar": "Polar", + "Reorder": "Reordenar", + "Area:": "Área:", + "Treemap Options": "Opções de mapa de árvore", + "Angle:": "Ângulo:", + "Increase size": "Aumentar tamanho", + "Wordcloud Options": "Opções do Wordcloud", + "Place:": "Lugar:", + "stat": "Estado", + "position": "posição", + "parse": "analisar", + "nudge_x": "cutucar_x", + "nudge_y": "nudge_y", + "eccentricity": "excentricidade", + "grid_size": "tamanho da grade", + "max_grid_size": "max_grid_size", + "grid_margin": "grid_margin", + "xlim": "xlim", + "ylim": "ylim", + "rm_outside": "rm_outside", + "shape": "forma", + "na.rm": "na.rm", + "Show.legend": "Mostrar.legenda", + "inherit.aes": "herdar.aes", + "show_boxes": "show_boxes", + "angle:": "ângulo:", + "size:": "Tamanho:", + "color:": "cor:", + "label:": "rótulo:", + "geom_treemap": "geom_treemap", + "area:": "área:", + "alpha:": "alfa:", + "colour:": "cor:", + "fill:": "preencher:", + "linetype:": "tipo de linha:", + "subgroup:": "subgrupo:", + "subgroup2:": "subgrupo2:", + "subgroup3:": "subgrupo3:", + "layout": "disposição", + "start": "começar", + "key_glyph": "key_glyp", + "width": "largura", + "x:": "x:", + "y:": "você:", + "weight:": "peso:", + "linetype": "tipo de linha", + "colour": "cor", + "fill": "preencher", + "show.legend": "show.legend", + "alpha": "alfa", + "size": "Tamanho", + "Boxplot/Tufte Boxplot": "Boxplot/Tufte Boxplot", + "Tufte Boxplot": "Tufte Boxplot", + "Box Options": "Opções de caixa", + "Tufle Box Options": "Opções de Tufle", + "Display as Dotplot": "Exibir como Dotplot", + "Density/Ridges": "Densidade/Riscas", + "Density Ridges": "cumes de densidade", + "Dotplot Options": "Opções de Dotplot", + "Density Ridges Options": "Opções de Cumes de Densidade", + "binwidth": "largura de bin", + "bins": "caixas", + "center": "Centro", + "limite": "limitar", + "closed": "fechado", + "tampon": "tampão", + "Sides:": "Lados", + "Span": "Período", + "method": "método", + "span": "período", + "se": "se", + "formula": "Fórmula", + "method.args": "método.args", + "orientation": "orientação", + "fullrange": "Gama completa", + "xend:": "xend:", + "yend:": "Yend:", + "colour_x": "cor_x", + "colour_xend": "color_xend", + "size_x": "tamanho_x", + "size_xend": "size_xend", + "dot_guide": "dot_guide", + "dot_guide_colo": "dot_guide_colo", + "dot_guide_size": "dot_guide_size", + "Swap x and y": "Troque x e y", + "Colour Palette": "Palete de cores", + "Reorder:": "Reordenar:", + "Points (Optional):": "Pontos (Opcional):", + "Group/ID:": "Grupo/ID:", + "Muptiple Response": "Resposta Múltipla", + "Format Table...": "Tabela de formato...", + "Store Output": "Armazenar saída", + "Header": "Cabeçalho", + "Add title/subtitle": "Adicionar título/subtítulo", + "Add footnote": "Adicionar nota de rodapé", + "Add second footnote": "Adicionar segunda nota de rodapé", + "Add source": "Adicionar fonte", + "Add Header": "Adicionar cabeçalho", + "Add stub": "Adicionar esboço", + "Add format table": "Adicionar tabela de formato", + "Margin Name :": "Nome da Margem:", + "Treat Summaries as a Further Factor": "Trate os resumos como um fator adicional", + "Display Summary_Variables As Rows": "Exibir Summary_Variables como linhas", + "Summary_mean": "Summary_mean", + "Display Summaries As Rows": "Exibir resumos como linhas", + "Display Variables As Rows": "Exibir variáveis como linhas", + "Outer": "Exterior", + "Fill/Colour:": "Preenchimento/Cor:", + "Theme": "Tema", + "Extra Variables": "Variáveis Extras", + "Suppl.Numeric:": "Supl. Numérico:", + "Suppl.Factor:": "Fator de Suprimento:", + "Save New Graph": "Salvar Novo Gráfico", + "Selection:": "Seleção:", + "Remove Current Selection": "Remover seleção atual", + "Define New Selection": "Definir nova seleção", + "All Combined With &": "Tudo combinado com &", + "Operation": "Operação", + "All Combined With |": "Tudo combinado com |", + "Rename Options": "Opções de renomeação", + "Abbriviate": "Abreviar", + "To Lower": "Abaixar", + "Clean Names": "Nomes Limpos", + "Case:": "Caso:", + "New Name": "Novo nome", + "Include Variable Labels": "Incluir rótulos de variáveis", + "Row Numbers or Names": "Números ou nomes de linha", + "Apply As Selected Columns": "Aplicar como colunas selecionadas", + "As Subset": "como subconjunto", + "Add not": "Adicionar não", + "Specify Decimals (if Numeric)": "Especifique Decimais (se Numérico)", + "To Data Frame:": "Para quadro de dados:", + "From Data Frame:": "Do quadro de dados:", + "Join By:": "Junte-se por:", + "Delete Colums or Rows": "Excluir colunas ou linhas", + "Duplicate Rows": "Linhas Duplicadas", + "Tolerance:": "Tolerância:", + "By Row": "Por linha", + "By Value": "Por valor", + "Non-Numeric Values": "Valores não numéricos", + "notch": "entalhe", + "notchwidth": "largura de entalhe", + "varwidth": "largura de var", + "coef": "coef", + "outlier.shape": "outlier.shape", + "outlier.colour": "outlier.color", + "outlier.size": "outlier.size", + "outlier.stroke": "outlier.stroke", + "fatten": "engordar", + "Tufte Box Options": "Opções de caixa tufte", + "hoffset": "hofftset", + "voffset": "vofftset", + "median.type": "mediana.tipo", + "whisker.type": "bigode.tipo", + "draw_quantiles": "desenhar_quantis", + "scale": "escala", + "adjust": "ajustar", + "kernel": "núcleo", + "stroke": "derrame", + "Show Missing Frequencies": "Mostrar frequências ausentes", + "View/Delete Labels": "Exibir/excluir rótulos", + "Delete Value Labels": "Excluir rótulos de valor", + "Max Labels": "Rótulos Máximos", + "Preview": "Visualização", + "Number Missing": "número ausente", + "Ranks": "Classificações", + "Ties method": "método empates", + "Decimals:": "Decimais:", + "Round": "Volta", + "Signif Fig": "Signif Fig", + "Standardize": "Padronizar", + "Lag": "atraso", + "Lead": "Liderar", + "Non-Negative": "Não Negativo", + "Log (Natual)": "Registro (Natual)", + "Log (Base 10)": "Registro (Base 10)", + "Power": "Poder", + "Add Constant": "Adicionar Constante", + "Missing Last": "Último ausente", + "Decreasing": "diminuindo", + "Subtract": "Subtrair", + "Multiply": "Multiplicar", + "Divide": "Dividir", + "Random Samples": "Amostras Aleatórias", + "Permute/Sample Rows": "Linhas de permuta/amostra", + "Levels:": "Níveis:", + "Groups": "Grupos", + "Label Groups with Means": "Grupos de rótulos com meios", + "Recode": "recodificar", + "Lump": "Caroço", + "Other": "De outros", + "Add NA": "Adicionar NA", + "Name for NA:": "Nome para NA:", + "Keep": "Guarda", + "Drop": "Solta", + "Name for Other:": "Nome para Outro:", + "Selected Values": "Valores selecionados", + "Levels with at least this frequency": "Níveis com pelo menos esta frequência", + "This number of common levels": "Este número de níveis comuns", + "Levels with at least this proportion": "Níveis com pelo menos esta proporção", + "Levels with more than Other": "Níveis com mais de Outro", + "Most Frequent": "Mais frequente", + "Hand": "Mão", + "property": "Propriedade", + "Reverse Levels": "Níveis Inversos", + "Appearance": "Aparência", + "Alphabetical Other": "Alfabética Outro", + "Anonymise": "anonimizar", + "Shift": "Mudança", + "Shuffle": "Embaralhar", + "Unused Levels:": "Níveis não utilizados:", + "Levels Preview:": "Visualização dos níveis:", + "Frequencies": "Frequências", + "Ignore Case": "Ignorar caso", + "Boundary": "Limite", + "Find": "Achar", + "Find/Replace": "Localizar/Substituir", + "Ends": "termina", + "Starts": "começa", + "Combo": "combinação", + "Negate": "Negar", + "Remove": "Retirar", + "Detect Options": "Opções de detecção", + "Replace NA": "Substituir NA", + "Find Options": "Encontrar opções", + "Replace Options": "Substituir opções", + "First Occurence": "Primeira Ocorrência", + "Remove All": "Deletar tudo", + "Wrap": "Enrolar", + "Truncate": "Truncar", + "Side:": "Lateral:", + "Squish": "Squish", + "New Column:": "Nova coluna:", + "Sequence truncated to match the lenght of the data frame": "Sequência truncada para corresponder ao comprimento do quadro de dados", + "no. of Days in a Year:": "não. de dias em um ano:", + "Fill Date Gaps": "Preencher lacunas de data", + "clock 12": "relógio 12", + "clock24": "clock24", + "none": "Nenhum", + "geographics": "geografia", + "Median Absolute Deviation (MAD) (W)": "Desvio Absoluto Mediano (MAD) (W)", + "Coefficient Of Variation (W)": "Coeficiente de Variação (W)", + "Skewness (3rd Moment) (W)": "Distorção (3º Momento) (W)", + "Kurtose": "Kurtose", + "Kurtosis (W)": "Curtose (W)", + "Covariance (W)": "Covariância (W)", + "Correlations (W)": "Correlações (W)", + "Sum (W)": "Soma (W)", + "Mean (W)": "Média (W)", + "Median (W)": "Mediana (W)", + "Edit": "Editar", + "Stack (Pivot Longer)": "Pilha (Pivot Longo)", + "Names to:": "Nomes para:", + "Values to:": "Valores para:", + "Token:": "Símbolo:", + "Factor(s):": "Fator(es):", + "To Lower Case": "Para Minúsculas", + "Punctuation": "Pontuação", + "Output:": "Saída:", + "Unstack (Pivot Wider)": "Desempilhar (Pivot Wider)", + "Add Prefix:": "Adicionar prefixo:", + "Columns to Carry:": "Colunas para carregar", + "Fill Missing Values:": "Preencha os valores ausentes:", + "Merge (Join)": "Mesclar (Juntar)", + "Append (Bind Rows)": "Anexar (vincular linhas)", + "Include Old Names": "Incluir nomes antigos", + "New Names (Optional):": "Novos nomes (opcional):", + "Links": "links", + "Data Frames": "Quadros de dados", + "Copy to clipboard": "Copiar para área de transferência", + "Data frame": "Quadro de dados", + "Columns metadata": "Metadados de colunas", + "Data frame metadata": "Metadados do quadro de dados", + "Unhide": "Mostrar", + "Unhidden Data Frame(s):": "Quadros de dados não ocultos:", + "Run": "Corre", + "Import NetCDF File": "Importar Arquivo NetCDF", + "Import Shapefiles": "Importar arquivos de forma", + "Setup For Data Entry": "Configuração para entrada de dados", + "Add Flags": "Adicionar sinalizadores", + "Data From:": "Dados de:", + "Data To:": "Dados para:", + "Flag Variables:": "Variáveis de sinalização:", + "Day in Year (365)": "Dia no ano (365)", + "Day in Year (366)": "Dia no ano (366)", + "Minimum RH (%):": "RH mínimo (%):", + "Maximum RH (%):": "UR máxima (%):", + "Base Year:": "Ano base:", + "Rug colour:": "Cor do tapete:", + "Time interval:": "Intervalo de tempo:" } \ No newline at end of file diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 12705815e8f..7b55407c467 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/translations/ru/ru_r_instat_menus.json b/instat/translations/ru/ru_r_instat_menus.json index f3b6958b3fe..a2648b27bb9 100644 --- a/instat/translations/ru/ru_r_instat_menus.json +++ b/instat/translations/ru/ru_r_instat_menus.json @@ -457,5 +457,13 @@ "Save": "Сохранять", "Import SST...": "Импорт SST...", "Daily Data Editing/Entry...": "Ежедневное редактирование/ввод данных...", - "Experiments": "Эксперименты" + "Experiments": "Эксперименты", + "Two/Three Variables": "Две/три переменные", + "Graphs": "Графики", + "Tables...": "Таблицы...", + "Pivot Table...": "Сводная таблица...", + "Two-Way Frequencies...": "Двусторонние частоты...", + "Three-Way Frequencies...": "Трехполосные частоты...", + "Heatmap...": "Тепловая карта...", + "Cluster Analysis...": "Кластерный анализ..." } \ No newline at end of file diff --git a/instat/translations/ru/ru_r_instat_not_menus.json b/instat/translations/ru/ru_r_instat_not_menus.json index 1dab7c3627d..21377628694 100644 --- a/instat/translations/ru/ru_r_instat_not_menus.json +++ b/instat/translations/ru/ru_r_instat_not_menus.json @@ -3709,5 +3709,328 @@ "Levels": "Уровни", "Category:": "Категория:", "Show Command": "Показать команду", - "Lists:": "Списки:" + "Lists:": "Списки:", + "Subtotals": "Итоги", + "Initial Column Factor:": "Начальный коэффициент столбца:", + "Initial Row Factor(s) :": "Начальный фактор(ы) строки:", + "Numeric Variable (Optional):": "Числовая переменная (необязательно):", + "Select Variable(s)": "Выберите переменные", + "Partitioning": "Разделение", + "Hierarchical": "Иерархический", + "Numeric Variables": "Числовые переменные", + "Data Frame/Matrix ": "Фрейм данных/матрица ", + "Metric:": "Метрика:", + "Stand:": "Стоять:", + "PAM Cluster": "Кластер PAM", + "Partition Plot": "Раздел участка", + "Cluster:": "Кластер:", + "Hierarch Plot": "Иерарх Сюжет", + "Display Summaries As Rows": "Отображать сводки в виде строк", + "Display Variables As Rows": "Отображать переменные в виде строк", + "Min Frequency": "Минимальная частота", + "Show Variable Names": "Показать имена переменных", + "Factor (Optional) :": "Коэффициент (необязательно):", + "Second Factor (Optional) :": "Второй фактор (необязательно):", + "Skim": "Обезжирить", + "Three variables": "Три переменные", + "Pairs": "Пары", + "Colour (Optional):": "Цвет (необязательно):", + "Pair Plot Options": "Параметры парного графика", + "Type Of Dispaly": "Тип дисплея", + "Upper": "Верхний", + "Lower": "Ниже", + "Diagonal": "Диагональ", + "Wordcloud": "Облако слов", + "Reorder Frequency": "Частота повторного заказа", + "Back to Back": "Спина к спине", + "Polar": "Полярный", + "Reorder": "Изменение порядка", + "Area:": "Область:", + "Treemap Options": "Параметры карты дерева", + "Angle:": "Угол:", + "Increase size": "Увеличить размер", + "Wordcloud Options": "Параметры Wordcloud", + "Place:": "Место:", + "stat": "статистика", + "position": "должность", + "parse": "разобрать", + "nudge_x": "nudge_x", + "nudge_y": "nudge_y", + "eccentricity": "эксцентриситет", + "grid_size": "размер сетки", + "max_grid_size": "max_grid_size", + "grid_margin": "grid_margin", + "xlim": "xlim", + "ylim": "йилим", + "rm_outside": "rm_outside", + "shape": "форма", + "na.rm": "на.рм", + "Show.legend": "Шоу.легенда", + "inherit.aes": "наследовать.aes", + "show_boxes": "show_boxes", + "angle:": "угол:", + "size:": "размер:", + "color:": "цвет:", + "label:": "этикетка:", + "geom_treemap": "geom_treemap", + "area:": "область:", + "alpha:": "альфа:", + "colour:": "цвет:", + "fill:": "наполнять:", + "linetype:": "тип линии:", + "subgroup:": "подгруппа:", + "subgroup2:": "подгруппа2:", + "subgroup3:": "подгруппа3:", + "layout": "макет", + "start": "Начало", + "key_glyph": "key_glyp", + "width": "ширина", + "x:": "Икс:", + "y:": "у:", + "weight:": "вес:", + "linetype": "тип линии", + "colour": "цвет", + "fill": "наполнять", + "show.legend": "шоу.легенда", + "alpha": "альфа", + "size": "размер", + "Boxplot/Tufte Boxplot": "Блочная диаграмма/Tufte", + "Tufte Boxplot": "Тафт Боксплот", + "Box Options": "Варианты коробки", + "Tufle Box Options": "Варианты коробок для туфля", + "Display as Dotplot": "Отображать как точечный график", + "Density/Ridges": "Плотность/хребты", + "Density Ridges": "Хребты плотности", + "Dotplot Options": "Параметры точечной диаграммы", + "Density Ridges Options": "Параметры гребней плотности", + "binwidth": "ширина ячейки", + "bins": "мусорные ведра", + "center": "центр", + "limite": "лимит", + "closed": "закрыто", + "tampon": "тампон", + "Sides:": "Стороны", + "Span": "Охватывать", + "method": "метод", + "span": "охватывать", + "se": "се", + "formula": "формула", + "method.args": "метод.args", + "orientation": "ориентация", + "fullrange": "полный спектр", + "xend:": "хенд:", + "yend:": "выход:", + "colour_x": "color_x", + "colour_xend": "color_xend", + "size_x": "размер_x", + "size_xend": "size_xend", + "dot_guide": "dot_guide", + "dot_guide_colo": "dot_guide_colo", + "dot_guide_size": "dot_guide_size", + "Swap x and y": "Поменять местами х и у", + "Colour Palette": "Цветовая палитра", + "Reorder:": "Изменение порядка:", + "Points (Optional):": "Очки (необязательно):", + "Group/ID:": "Группа/ID:", + "Muptiple Response": "Множественный ответ", + "Format Table...": "Формат таблицы...", + "Store Output": "Сохранить вывод", + "Header": "Заголовок", + "Add title/subtitle": "Добавить заголовок/подзаголовок", + "Add footnote": "Добавить сноску", + "Add second footnote": "Добавить вторую сноску", + "Add source": "Добавить источник", + "Add Header": "Добавить заголовок", + "Add stub": "Добавить заглушку", + "Add format table": "Добавить таблицу форматов", + "Margin Name :": "Название маржи:", + "Treat Summaries as a Further Factor": "Относитесь к резюме как к дополнительному фактору", + "Display Summary_Variables As Rows": "Отображать сводные_переменные в виде строк", + "Summary_mean": "Суммарное_среднее", + "Display Summaries As Rows": "Отображать сводки в виде строк", + "Display Variables As Rows": "Отображать переменные в виде строк", + "Outer": "Внешний", + "Fill/Colour:": "Заливка/Цвет:", + "Theme": "Тема", + "Extra Variables": "Дополнительные переменные", + "Suppl.Numeric:": "Доп.Число:", + "Suppl.Factor:": "Дополнительный фактор:", + "Save New Graph": "Сохранить новый график", + "Selection:": "Выбор:", + "Remove Current Selection": "Удалить текущий выбор", + "Define New Selection": "Определить новый выбор", + "All Combined With &": "Все в сочетании с &", + "Operation": "Операция", + "All Combined With |": "Все в сочетании с |", + "Rename Options": "Параметры переименования", + "Abbriviate": "Сокращать", + "To Lower": "Снизить", + "Clean Names": "Чистые имена", + "Case:": "Случай:", + "New Name": "Новое имя", + "Include Variable Labels": "Включить метки переменных", + "Row Numbers or Names": "Номера строк или имена", + "Apply As Selected Columns": "Применить как выбранные столбцы", + "As Subset": "Как подмножество", + "Add not": "Добавить не", + "Specify Decimals (if Numeric)": "Укажите десятичные дроби (если числовое)", + "To Data Frame:": "Во фрейм данных:", + "From Data Frame:": "Из фрейма данных:", + "Join By:": "Присоединиться:", + "Delete Colums or Rows": "Удалить столбцы или строки", + "Duplicate Rows": "Дублировать строки", + "Tolerance:": "Толерантность:", + "By Row": "По ряду", + "By Value": "По стоимости", + "Non-Numeric Values": "Нечисловые значения", + "notch": "выемка", + "notchwidth": "ширина выемки", + "varwidth": "переменная ширина", + "coef": "коэф", + "outlier.shape": "выброс.форма", + "outlier.colour": "выброс.цвет", + "outlier.size": "выброс.размер", + "outlier.stroke": "выброс.ход", + "fatten": "откармливать", + "Tufte Box Options": "Варианты ящиков для тафте", + "hoffset": "хофтсет", + "voffset": "voffset", + "median.type": "медиана.тип", + "whisker.type": "усы.тип", + "draw_quantiles": "draw_quantiles", + "scale": "шкала", + "adjust": "регулировать", + "kernel": "ядро", + "stroke": "Инсульт", + "Show Missing Frequencies": "Показать недостающие частоты", + "View/Delete Labels": "Просмотр/удаление ярлыков", + "Delete Value Labels": "Удалить метки значений", + "Max Labels": "Макс. метки", + "Preview": "Предварительный просмотр", + "Number Missing": "Номер отсутствует", + "Ranks": "Звания", + "Ties method": "Метод галстуков", + "Decimals:": "Десятичные:", + "Round": "Круглый", + "Signif Fig": "Signif рис", + "Standardize": "стандартизировать", + "Lag": "отставание", + "Lead": "Свинец", + "Non-Negative": "Неотрицательный", + "Log (Natual)": "Лог (натуральный)", + "Log (Base 10)": "Журнал (база 10)", + "Power": "Мощность", + "Add Constant": "Добавить константу", + "Missing Last": "Отсутствует последний", + "Decreasing": "Уменьшение", + "Subtract": "Вычесть", + "Multiply": "Умножить", + "Divide": "Разделять", + "Random Samples": "Случайные выборки", + "Permute/Sample Rows": "Перестановка/выборка строк", + "Levels:": "Уровни:", + "Groups": "Группы", + "Label Groups with Means": "Группы меток со средними значениями", + "Recode": "Перекодировать", + "Lump": "Кусок", + "Other": "Другой", + "Add NA": "Добавить NA", + "Name for NA:": "Имя для NA:", + "Keep": "Держать", + "Drop": "Уронить", + "Name for Other:": "Имя для другого:", + "Selected Values": "Выбранные значения", + "Levels with at least this frequency": "Уровни как минимум с этой частотой", + "This number of common levels": "Это количество общих уровней", + "Levels with at least this proportion": "Уровни, по крайней мере, с этой пропорцией", + "Levels with more than Other": "Уровни с более чем Другое", + "Most Frequent": "Самый частый", + "Hand": "Рука", + "property": "Имущество", + "Reverse Levels": "Обратные уровни", + "Appearance": "Внешность", + "Alphabetical Other": "Алфавитный Другой", + "Anonymise": "Анонимизировать", + "Shift": "Сдвиг", + "Shuffle": "Перемешать", + "Unused Levels:": "Неиспользованные уровни:", + "Levels Preview:": "Предварительный просмотр уровней:", + "Frequencies": "Частоты", + "Ignore Case": "Игнорировать регистр", + "Boundary": "Граница", + "Find": "Находить", + "Find/Replace": "Найти/Заменить", + "Ends": "Заканчивается", + "Starts": "Старт", + "Combo": "Комбо", + "Negate": "отрицать", + "Remove": "Удалять", + "Detect Options": "Параметры обнаружения", + "Replace NA": "Заменить Н/Д", + "Find Options": "Найти параметры", + "Replace Options": "Заменить параметры", + "First Occurence": "Первое появление", + "Remove All": "Убрать все", + "Wrap": "Сворачивать", + "Truncate": "Обрезать", + "Side:": "Сторона:", + "Squish": "Хлюпать", + "New Column:": "Новая колонка:", + "Sequence truncated to match the lenght of the data frame": "Последовательность усечена, чтобы соответствовать длине кадра данных", + "no. of Days in a Year:": "нет. дней в году:", + "Fill Date Gaps": "Заполнить пробелы в дате", + "clock 12": "часы 12", + "clock24": "часы24", + "none": "никто", + "geographics": "география", + "Median Absolute Deviation (MAD) (W)": "Среднее абсолютное отклонение (MAD) (W)", + "Coefficient Of Variation (W)": "Коэффициент вариации (Вт)", + "Skewness (3rd Moment) (W)": "Перекос (3-й момент) (клавиша W)", + "Kurtose": "Куртозе", + "Kurtosis (W)": "Куртосис (клавиша W)", + "Covariance (W)": "Ковариация (Вт)", + "Correlations (W)": "Корреляции (W)", + "Sum (W)": "Сумма (Вт)", + "Mean (W)": "Среднее (Вт)", + "Median (W)": "Медиана (Ж)", + "Edit": "Редактировать", + "Stack (Pivot Longer)": "Стек (сводка длиннее)", + "Names to:": "Имена для:", + "Values to:": "Значения для:", + "Token:": "Токен:", + "Factor(s):": "Фактор(ы):", + "To Lower Case": "В нижний регистр", + "Punctuation": "Пунктуация", + "Output:": "Вывод:", + "Unstack (Pivot Wider)": "Распаковать (повернуть шире)", + "Add Prefix:": "Добавить префикс:", + "Columns to Carry:": "Колонны для переноски", + "Fill Missing Values:": "Заполните пропущенные значения:", + "Merge (Join)": "Объединить (присоединиться)", + "Append (Bind Rows)": "Добавить (связать строки)", + "Include Old Names": "Включить старые имена", + "New Names (Optional):": "Новые имена (необязательно):", + "Links": "Ссылки", + "Data Frames": "Фреймы данных", + "Copy to clipboard": "Скопировать в буфер обмена", + "Data frame": "Фрейм данных", + "Columns metadata": "Метаданные столбцов", + "Data frame metadata": "Метаданные фрейма данных", + "Unhide": "Показать", + "Unhidden Data Frame(s):": "Нескрытые фреймы данных:", + "Run": "Бег", + "Import NetCDF File": "Импорт файла NetCDF", + "Import Shapefiles": "Импорт шейп-файлов", + "Setup For Data Entry": "Настройка для ввода данных", + "Add Flags": "Добавить флаги", + "Data From:": "Данные из:", + "Data To:": "Данные для:", + "Flag Variables:": "Переменные флага:", + "Day in Year (365)": "День в году (365)", + "Day in Year (366)": "День в году (366)", + "Minimum RH (%):": "Минимальная относительная влажность (%):", + "Maximum RH (%):": "Максимальная относительная влажность (%):", + "Base Year:": "Базисный год:", + "Rug colour:": "Цвет коврика:", + "Time interval:": "Временной интервал:" } \ No newline at end of file diff --git a/instat/translations/sw/sw_r_instat_menus.json b/instat/translations/sw/sw_r_instat_menus.json index 628e32dae0b..e6b341c405d 100644 --- a/instat/translations/sw/sw_r_instat_menus.json +++ b/instat/translations/sw/sw_r_instat_menus.json @@ -428,34 +428,42 @@ "Wind/Pollution Rose...": "Wind/Pollution Rose ...", "Windows": "Windows", "Windrose...": "Windrose ...", - "Temperature Graph...": "Temperature Graph...", - "General Graph...": "General Graph...", - "Select Columns...": "Select Columns...", - "Remove Column Selection": "Remove Column Selection", - "Filter Rows...": "Filter Rows...", - "Delete Cell(s)": "Delete Cell(s)", - "Import From File ...": "Import From File ...", - "Import From Library ...": "Import From Library ...", - "Import From ODK...": "Import From ODK...", - "Data Book": "Data Book", - "Add (Merge) Columns...": "Add (Merge) Columns...", - "Column: Calculator...": "Column: Calculator...", - "Column: Numeric": "Column: Numeric", - "Rename Columns...": "Rename Columns...", - "Duplicate Rows...": "Duplicate Rows...", - "Non-Numeric Values...": "Non-Numeric Values...", - "View/Delete Labels...": "View/Delete Labels...", - "Row Sumaries...": "Row Sumaries...", - "Permute/Sample Rows...": "Permute/Sample Rows...", - "Stack (Pivot Longer)...": "Stack (Pivot Longer)...", - "Unstack (Pivot Wider)...": "Unstack (Pivot Wider)...", - "Merge (Join)...": "Merge (Join)...", - "Append (Bind Rows)...": "Append (Bind Rows)...", - "Random Split...": "Random Split...", - "Scale/Distance...": "Scale/Distance...", - "Rename": "Rename", - "Save": "Save", - "Import SST...": "Import SST...", - "Daily Data Editing/Entry...": "Daily Data Editing/Entry...", - "Experiments": "Experiments" + "Temperature Graph...": "Grafu ya Halijoto...", + "General Graph...": "Grafu ya jumla...", + "Select Columns...": "Chagua Safu wima...", + "Remove Column Selection": "Ondoa Uteuzi wa Safu", + "Filter Rows...": "Chuja Safu Mlalo...", + "Delete Cell(s)": "Futa visanduku", + "Import From File ...": "Ingiza Kutoka kwa Faili ...", + "Import From Library ...": "Ingiza Kutoka kwa Maktaba ...", + "Import From ODK...": "Ingiza Kutoka ODK...", + "Data Book": "Kitabu cha Data", + "Add (Merge) Columns...": "Ongeza (Unganisha) Safu wima...", + "Column: Calculator...": "Safu wima: Kikokotoo...", + "Column: Numeric": "Safu wima: Nambari", + "Rename Columns...": "Badilisha jina la Safu wima...", + "Duplicate Rows...": "Safu Nakala...", + "Non-Numeric Values...": "Thamani Zisizo Nambari...", + "View/Delete Labels...": "Tazama/Futa Lebo...", + "Row Sumaries...": "Muhtasari wa Safu...", + "Permute/Sample Rows...": "Ruhusu/Sampuli za Safu...", + "Stack (Pivot Longer)...": "Rafu (Pivot Tena)...", + "Unstack (Pivot Wider)...": "Ondoa Ratiba (Pivot Pana)...", + "Merge (Join)...": "Unganisha (Jiunge)...", + "Append (Bind Rows)...": "Ongeza (Funga Safu)...", + "Random Split...": "Mgawanyiko Nasibu...", + "Scale/Distance...": "Mizani/Umbali...", + "Rename": "Badilisha jina", + "Save": "Hifadhi", + "Import SST...": "Ingiza SST...", + "Daily Data Editing/Entry...": "Kuhariri/Kuingiza Data ya Kila Siku...", + "Experiments": "Majaribio", + "Two/Three Variables": "Vigezo Mbili/Tatu", + "Graphs": "Grafu", + "Tables...": "Majedwali...", + "Pivot Table...": "Jedwali la Egemeo...", + "Two-Way Frequencies...": "Masafa ya Njia Mbili...", + "Three-Way Frequencies...": "Masafa ya Njia Tatu...", + "Heatmap...": "Ramani ya joto...", + "Cluster Analysis...": "Uchambuzi wa Nguzo..." } \ No newline at end of file diff --git a/instat/translations/sw/sw_r_instat_not_menus.json b/instat/translations/sw/sw_r_instat_not_menus.json index cd6528c8679..5c2b972c350 100644 --- a/instat/translations/sw/sw_r_instat_not_menus.json +++ b/instat/translations/sw/sw_r_instat_not_menus.json @@ -401,7 +401,7 @@ "Column Selection": "Uteuzi wa safu wima", "Column Statistics": "Takwimu za safu", "Column Structure": "Muundo wa safu wima", - "Column Type:": "Column Type:", + "Column Type:": "Aina ya Safu:", "Column Variable(s) (Factor):": "Vigezo vya Safu wima (Nambari Kamilifu):", "Column Width:": "Upana wa Safu wima:", "Column to Duplicate:": "Safu wima ya Kunakili:", @@ -644,7 +644,7 @@ "Define CRI": "Fafanua CRI", "Define Climatic Data": "Fafanua Takwimu za hali ya hewa", "Define Corruption Outputs": "Fafanua Matokeo ya Rushwa", - "Define New Column Selection": "Define New Column Selection", + "Define New Column Selection": "Bainisha Uteuzi Mpya wa Safu Wima", "Define New Filter": "Fafanua Kichujio Kipya", "Define New Property": "Fafanua Rasilimali Mpya", "Define Options By Context Data": "Fafanua Chaguzi Kwa Takwimu za Muktadha", @@ -755,7 +755,7 @@ "Drop Unused Levels": "Dondoa Viwango zisizotumiwa", "Drop empty factor levels": "Dondosha viwango tupu vya Nambari Kamilifu", "Dry Month": "Mwezi Mkavu", - "Drop Empty Rows and Columns": "Drop Empty Rows and Columns", + "Drop Empty Rows and Columns": "Dondosha Safu Mlalo na Safu Tupu", "Dry Period": "Kipindi Kikavu", "Dry Spell": "Msimu kavu", "Dummy Variables": "Vigezo bandia", @@ -1680,7 +1680,7 @@ "New Label": "Lebo mpya", "New Metadata Name": "Jina mpya la Metadata", "New Name:": "Jina Jipya:", - "New Selection Name:": "New Selection Name:", + "New Selection Name:": "Jina Jipya la Uteuzi:", "New Theme Name": "Jina mpya la Mandhari", "New Value:": "Thamani mpya:", "New column will be at the: ": "Safu wima mpya itakuwa kwenye: ", @@ -1710,7 +1710,7 @@ "No of Clusters:": "Hakuna nguzo:", "No package with this name.": "Hakuna kifurushi kilicho na jina hili.", "No preview available.": "Hakuna hakikisho linalopatikana.", - "No file selected.": "No file selected.", + "No file selected.": "Hakuna faili iliyochaguliwa.", "No sheet selected.": "Hakuna ukurasa uliyochaguliwa", "No. Bids Received:": "Zabuni Zilizopokelewa:", "No. Considered Bids:": "Zabuni zilizozingatiwa:", @@ -1869,12 +1869,12 @@ "PCA Options": "Chaguzi za PCA", "PELT": "PELT", "PICSA Crops": "Mazao ya PICSA", - "PICSA General Graphs": "PICSA General Graphs", + "PICSA General Graphs": "Grafu za Jumla za picSA", "PICSA Options": "Chaguzi za PICSA", "PICSA Rainfall Graph": "Grafu ya Mvua ya PICSA", "PICSA Rainfall Graphs": "Grafu za Mvua za PICSA", "PICSA Temperature": "Joto za PICSA", - "PICSA Temperature Graphs": "PICSA Temperature Graphs", + "PICSA Temperature Graphs": "Grafu za Joto za picSA", "PP": "PP", "PP-Plot": "PP-Plot", "PPP Adjusted Contract Value:": "Thamani ya Mkataba Iliyorekebishwa ya PPP:", @@ -2025,7 +2025,7 @@ "Prefix for Data Frames:": "Kiambishi awali cha fremu za Takwimu:", "Prefix for New Column:": "Kiambishi awali cha Safuwima Mpya:", "Prefix for New Columns:": "Kiambishi awali cha safu wima mpya:", - "Prefix:": "Prefix:", + "Prefix:": "Kiambishi awali:", "Preview Current Sheet": "Preview Current Sheet", "Preview Log": "Preview Log", "Preview Output": "Preview Output", @@ -2228,7 +2228,7 @@ "Rows to Take Max Over:": "Rows to Take Max Over:", "Rows:": "Safu mlalo:", "Rug": "Rug", - "Rug Color:": "Rug Color:", + "Rug Color:": "Rangi ya Rug:", "Rug Plot": "Rug Plot", "Rug Plot Options": "Rug Plot Options", "Rugs": "Rugs", @@ -2314,7 +2314,7 @@ "Scaled Fractions": "Scaled Fractions", "Scaled Points": "Scaled Points", "Scales": "Mizani", - "Scale/Distance": "Scale/Distance", + "Scale/Distance": "Mizani/Umbali", "Scatter Matrix": "Scatter Matrix", "Scatter Plot": "Scatter Plot", "Scatter Plot Options": "Scatter Plot Options", @@ -2352,7 +2352,7 @@ "Select All": "Chagua Zote", "Select All Levels": "Chagua Ngazi Zote", "Select And Stuck": "Chagua Na Kukwama", - "Select By:": "Select By:", + "Select By:": "Chagua Kwa:", "Select Contrast Name:": "Chagua Jina la Tofauti:", "Select Date Range": "Chagua Tofauti ya Tarehe", "Select Day of Year Range": "Chagua Masafa ya Siku", @@ -2394,7 +2394,7 @@ "Selected Variables:": "Vigezo vilivyochaguliwa:", "Selected column": "Safu wima iliyochaguliwa", "Selection": "Uchaguzi", - "Selection Preview": "Selection Preview", + "Selection Preview": "Onyesho la Kuchungulia la Uteuzi", "Semi Join": "Semi Join", "Semi-Colon(;)": "Semi-Colon(;)", "Semicolon ;": "Semicoloni;", @@ -3603,111 +3603,434 @@ "yday": "ysiku", "year": "mwaka", "ymd": "ymd", - "Output Window": "Output Window", - "Data View": "Data View", - "Code generated by the dialog,": "Code generated by the dialog,", - "Make the Column a Key for the Data Frame": "Make the Column a Key for the Data Frame", - "Column: Numeric": "Column: Numeric", - "Rename Columns...": "Rename Columns...", - "Duplicate Column...": "Duplicate Column...", - "Select Columns...": "Select Columns...", - "Add (Merge) Columns...": "Add (Merge) Columns...", - "Data Frame": "Data Frame", - "Degrees": "Degrees", - "Use Max and Min": "Use Max and Min", - "Modified GDD:": "Modified GDD:", + "Output Window": "Dirisha la Pato", + "Data View": "Mwonekano wa Data", + "Code generated by the dialog,": "Nambari inayotokana na mazungumzo,", + "Make the Column a Key for the Data Frame": "Fanya Safu Kuwa Ufunguo wa Fremu ya Data", + "Column: Numeric": "Safu wima: Nambari", + "Rename Columns...": "Badilisha jina la Safu wima...", + "Duplicate Column...": "Nakala Safu...", + "Select Columns...": "Chagua Safu wima...", + "Add (Merge) Columns...": "Ongeza (Unganisha) Safu wima...", + "Data Frame": "Mfumo wa Data", + "Degrees": "Digrii", + "Use Max and Min": "Tumia Max na Min", + "Modified GDD:": "GDD iliyobadilishwa:", "GDD:": "GDD:", "HDD:": "HDD:", "Tmean:": "Tmean:", - "Diurnal Range:": "Diurnal Range:", - "Jump:": "Jump:", - "Outlier:": "Outlier:", - "Difference:": "Difference:", - "Days:": "Days:", - "Acceptable Range Element1:": "Acceptable Range Element1:", - "Acceptable Range Element2:": "Acceptable Range Element2:", - "Add Not": "Add Not", - "Help": "Help", - "Add All": "Add All", - "Clear Selection": "Clear Selection", - "Add Selected": "Add Selected", - "Two Variables": "Two Variables", - "Model Name": "Model Name", + "Diurnal Range:": "Masafa ya kila siku:", + "Jump:": "Rukia:", + "Outlier:": "Nje:", + "Difference:": "Tofauti:", + "Days:": "Siku:", + "Acceptable Range Element1:": "Kipengele cha 1 cha Masafa Kinachokubalika:", + "Acceptable Range Element2:": "Kipengele cha 2 cha Masafa Kinachokubalika:", + "Add Not": "Ongeza Sio", + "Help": "Msaada", + "Add All": "Ongeza Yote", + "Clear Selection": "Uteuzi Wazi", + "Add Selected": "Ongeza Iliyochaguliwa", + "Two Variables": "Vigezo viwili", + "Model Name": "Jina la Mfano", "Reverse Legend Order": "Reverse Legend Order", - "No duplicate dates.": "No duplicate dates.", - "Save As:": "Save As:", - "Start": "Start", - "New Data Frame...": "New Data Frame...", - "Import From File...": "Import From File...", - "Import From Library...": "Import From Library...", - "Recent": "Recent", - "Add To Existing": "Add To Existing", - "Add To New": "Add To New", - "Move Down": "Move Down", - "Move Up": "Move Up", - "Lebelled Convert": "Lebelled Convert", - "File with the same name will be overwritten.": "File with the same name will be overwritten.", - "Are you sure you want to close your data?": "Are you sure you want to close your data?", - "Any unsaved changes will be lost.": "Any unsaved changes will be lost.", - "Are you sure you want to exit R-Instat?": "Are you sure you want to exit R-Instat?", - "Exit": "Exit", - "Close Data": "Close Data", - "Are you sure you want to delete these column(s)?": "Are you sure you want to delete these column(s)?", - "This action connot be undone.": "This action connot be undone.", - "Are you sure you want to delete these row(s)?": "Are you sure you want to delete these rows(s)?", - "Return to main dialog?": "Return to main dialog?", - "Are you sure you want to the main dialog?": "Are you sure you want to the main dialog?", - "The condition for station has not been added.": "The condition for station has not been added.", - "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.", - "Duplicate dates for station(s) were found": "Duplicate dates for station(s) were found", - "Names To:": "Names To:", - "Values To:": "Values To:", - "Drop Prefix:": "Drop Prefix:", - "Drop Missing Values": "Drop Missing Values", - "Carry All Columns": "Carry All Columns", - "Columns to Carry": "Columns to Carry", - "Pivot Longer": "Pivot Longer", + "No duplicate dates.": "Hakuna tarehe zilizorudiwa.", + "Save As:": "Hifadhi Kama:", + "Start": "Anza", + "New Data Frame...": "Fremu Mpya ya Data...", + "Import From File...": "Ingiza Kutoka kwa Faili...", + "Import From Library...": "Ingiza Kutoka kwa Maktaba...", + "Recent": "Hivi karibuni", + "Add To Existing": "Ongeza Kwa Iliyopo", + "Add To New": "Ongeza kwa Mpya", + "Move Down": "Sogeza Chini", + "Move Up": "Sogeza Juu", + "Lebelled Convert": "Badilisha Lebelled", + "File with the same name will be overwritten.": "Faili iliyo na jina sawa itafutwa.", + "Are you sure you want to close your data?": "Je, una uhakika unataka kufunga data yako?", + "Any unsaved changes will be lost.": "Mabadiliko yoyote ambayo hayajahifadhiwa yatapotea.", + "Are you sure you want to exit R-Instat?": "Je, una uhakika unataka kuondoka kwenye R-Instat?", + "Exit": "Utgång", + "Close Data": "Funga Data", + "Are you sure you want to delete these column(s)?": "Je, una uhakika unataka kufuta safu wima hizi?", + "This action connot be undone.": "Kitendo hiki hakiwezi kutenduliwa.", + "Are you sure you want to delete these row(s)?": "Je, una uhakika unataka kufuta safu mlalo hizi?", + "Return to main dialog?": "Ungependa kurudi kwenye kidirisha kikuu?", + "Are you sure you want to the main dialog?": "Je, una uhakika unataka kwenye kidadisi kikuu?", + "The condition for station has not been added.": "Hali ya kituo haijaongezwa.", + "You have multiple rows with the same dates for one or more stations. Use the Climatic > Tidy and Examine > Duplicates dialog to investigate these issues.": "Una safu mlalo nyingi zenye tarehe sawa za stesheni moja au zaidi. Tumia kidirisha cha Hali ya Hewa > Nadhifu na Chunguza > Nakala kidirisha ili kuchunguza masuala haya.", + "Duplicate dates for station(s) were found": "Tarehe rudufu za stesheni zilipatikana", + "Names To:": "Majina Kwa:", + "Values To:": "Thamani Kwa:", + "Drop Prefix:": "Achia Kiambishi awali:", + "Drop Missing Values": "Acha Maadili Yanayokosekana", + "Carry All Columns": "Beba Nguzo Zote", + "Columns to Carry": "Safu za Kubeba", + "Pivot Longer": "Pivot Tena", "Unnest": "Unnest", - "names": "names", - "value": "value", + "names": "majina", + "value": "thamani", "Dumbbell": "Dumbbell", - "Line options": "Line options", - "Path or Step": "Path or Step", - "Smooth Options": "Smooth Options", - "Add Line": "Add Line", - "Add SE": "Add SE", - "Formula": "Formula", - "Dumbbell options": "Dumbbell options", + "Line options": "Chaguzi za mstari", + "Path or Step": "Njia au Hatua", + "Smooth Options": "Chaguzi Laini", + "Add Line": "Ongeza Line", + "Add SE": "Ongeza SE", + "Formula": "Mfumo", + "Dumbbell options": "Chaguzi za dumbbell", "X End Variable:": "X End Variable:", - "Adjust size of variable": "Adjust size of variable", - "Shave": "Shave", - "Rearrange": "Rearrange", - "Leading Zeros": "Leading Zeros", - "Display On Diagonal:": "Display On Diagonal:", - "Decimal Places:": "Decimal Places:", - "Display As DataFrame": "Display As DataFrame", - "Data Frame Name": "Data Frame Name", - "Rename With": "Rename With", - "Rename Columns": "Rename Columns", - "Command runs without error": "Command runs without error", - "Command runs ok": "Command runs ok", - "Problem detected running Command or no output to display.": "Problem detected running Command or no output to display.", - "Command produced an error. Modify input before running.": "Command produced an error. Modify input before running.", - "Model produced an error or no output to display.": "Model produced an error or no output to display.", - "Model runs without error": "Model runs without error", - "Model runs ok": "Model runs ok", - "Problem detected running Model or no output to display.": "Problem detected running Model or no output to display.", - "Model produced an error. Modify input before running.": "Model produced an error. Modify input before running.", - "Distance": "Distance", - "Whole Data Frame": "Whole Data Frame", - "Centre": "Centre", - "Display As Data Frame": "Display As Data Frame", - "Name": "Name", - "Lists": "Lists", - "Variable Name": "Variable Name", - "Variable Label": "Variable Label", - "Levels": "Levels", - "Category:": "Category:", - "Show Command": "Show Command", - "Lists:": "Lists:" + "Adjust size of variable": "Kurekebisha ukubwa wa kutofautiana", + "Shave": "Kunyoa", + "Rearrange": "Panga upya", + "Leading Zeros": "Ziro zinazoongoza", + "Display On Diagonal:": "Onyesha kwenye Ulalo:", + "Decimal Places:": "Maeneo ya decimal:", + "Display As DataFrame": "Onyesha kama DataFrame", + "Data Frame Name": "Jina la Fremu ya Data", + "Rename With": "Badili jina na", + "Rename Columns": "Badilisha jina la Safu wima", + "Command runs without error": "Amri huendesha bila makosa", + "Command runs ok": "Amri inaendesha sawa", + "Problem detected running Command or no output to display.": "Tatizo limegunduliwa kuendesha Amri au hakuna towe la kuonyesha.", + "Command produced an error. Modify input before running.": "Amri ilitoa hitilafu. Rekebisha ingizo kabla ya kuendesha.", + "Model produced an error or no output to display.": "Mfano ulitoa hitilafu au hakuna matokeo ya kuonyesha.", + "Model runs without error": "Mfano huendesha bila makosa", + "Model runs ok": "Mfano unaendelea sawa", + "Problem detected running Model or no output to display.": "Tatizo limegunduliwa kuendesha Model au hakuna towe la kuonyesha.", + "Model produced an error. Modify input before running.": "Mfano ulitoa hitilafu. Rekebisha ingizo kabla ya kuendesha.", + "Distance": "Umbali", + "Whole Data Frame": "Mfumo wa Data Nzima", + "Centre": "Kituo", + "Display As Data Frame": "Onyesha kama Fremu ya Data", + "Name": "Jina", + "Lists": "Orodha", + "Variable Name": "Jina la Kubadilika", + "Variable Label": "Lebo inayobadilika", + "Levels": "Viwango", + "Category:": "Kategoria:", + "Show Command": "Onyesha Amri", + "Lists:": "Orodha:", + "Subtotals": "Jumla ndogo", + "Initial Column Factor:": "Kipengele cha Safu ya Awali:", + "Initial Row Factor(s) :": "Vigezo vya Awali vya Safu:", + "Numeric Variable (Optional):": "Tofauti ya Nambari (Si lazima):", + "Select Variable(s)": "Chagua Vigeu", + "Partitioning": "Kugawanya", + "Hierarchical": "Kihierarkia", + "Numeric Variables": "Vigezo vya Nambari", + "Data Frame/Matrix ": "Mfumo wa Data/Matrix ", + "Metric:": "Kipimo:", + "Stand:": "Simama:", + "PAM Cluster": "Kundi la PAM", + "Partition Plot": "Kiwanja cha kugawa", + "Cluster:": "Kundi:", + "Hierarch Plot": "Kiwanja cha uongozi", + "Display Summaries As Rows": "Onyesha Muhtasari Kama Safu", + "Display Variables As Rows": "Onyesha Vigeu Kama Safu", + "Min Frequency": "Min Frequency", + "Show Variable Names": "Onyesha Majina Yanayobadilika", + "Factor (Optional) :": "Sababu (Si lazima):", + "Second Factor (Optional) :": "Jambo la Pili (Si lazima):", + "Skim": "Skim", + "Three variables": "Vigezo vitatu", + "Pairs": "Jozi", + "Colour (Optional):": "Rangi (Si lazima):", + "Pair Plot Options": "Oanisha Chaguo za Viwanja", + "Type Of Dispaly": "Aina ya Dispaly", + "Upper": "Juu", + "Lower": "Chini", + "Diagonal": "Ulalo", + "Wordcloud": "Wordcloud", + "Reorder Frequency": "Panga Upya Masafa", + "Back to Back": "Rudi kwa Nyuma", + "Polar": "Polar", + "Reorder": "Panga upya", + "Area:": "Eneo:", + "Treemap Options": "Chaguzi za Treep", + "Angle:": "Pembe:", + "Increase size": "Ongeza ukubwa", + "Wordcloud Options": "Chaguzi za Wordcloud", + "Place:": "Mahali:", + "stat": "takwimu", + "position": "nafasi", + "parse": "changanua", + "nudge_x": "gusa_x", + "nudge_y": "nudge_y", + "eccentricity": "usawa", + "grid_size": "gridi_size", + "max_grid_size": "saizi_ya_gridi_ya_max", + "grid_margin": "ukingo_wa_gridi", + "xlim": "xlim", + "ylim": "ylim", + "rm_outside": "rm_nje", + "shape": "umbo", + "na.rm": "na.rm", + "Show.legend": "Onyesha.hadithi", + "inherit.aes": "kurithi.aes", + "show_boxes": "masanduku_ya_maonyesho", + "angle:": "pembe:", + "size:": "ukubwa:", + "color:": "rangi:", + "label:": "lebo:", + "geom_treemap": "ramani_ya_mti", + "area:": "eneo:", + "alpha:": "alfa:", + "colour:": "rangi:", + "fill:": "jaza:", + "linetype:": "aina ya mstari:", + "subgroup:": "kikundi kidogo:", + "subgroup2:": "kikundi kidogo cha 2:", + "subgroup3:": "kikundi kidogo cha 3:", + "layout": "mpangilio", + "start": "kuanza", + "key_glyph": "key_glyp", + "width": "upana", + "x:": "x:", + "y:": "y:", + "weight:": "uzito:", + "linetype": "aina ya mstari", + "colour": "rangi", + "fill": "jaza", + "show.legend": "onyesha.hadithi", + "alpha": "alfa", + "size": "ukubwa", + "Boxplot/Tufte Boxplot": "Boxplot/Tufte Boxplot", + "Tufte Boxplot": "Tufte Boxplot", + "Box Options": "Chaguzi za Sanduku", + "Tufle Box Options": "Chaguzi za Sanduku la Tufle", + "Display as Dotplot": "Onyesha kama Dotplot", + "Density/Ridges": "Msongamano/Matuta", + "Density Ridges": "Msongamano Ridges", + "Dotplot Options": "Chaguzi za Dotplot", + "Density Ridges Options": "Chaguzi za Mipaka ya Msongamano", + "binwidth": "pande mbili", + "bins": "mapipa", + "center": "kituo", + "limite": "kikomo", + "closed": "imefungwa", + "tampon": "kisodo", + "Sides:": "Pande", + "Span": "Muda", + "method": "njia", + "span": "muda", + "se": "se", + "formula": "fomula", + "method.args": "mbinu.args", + "orientation": "mwelekeo", + "fullrange": "safu nzima", + "xend:": "xend:", + "yend:": "ndio:", + "colour_x": "rangi_x", + "colour_xend": "color_xend", + "size_x": "ukubwa_x", + "size_xend": "saizi_exend", + "dot_guide": "mwongozo_wa_nukta", + "dot_guide_colo": "dot_guide_colo", + "dot_guide_size": "dot_guide_size", + "Swap x and y": "Badilisha x na y", + "Colour Palette": "Palette ya rangi", + "Reorder:": "Panga Upya:", + "Points (Optional):": "Pointi (Si lazima):", + "Group/ID:": "Kikundi/Kitambulisho:", + "Muptiple Response": "Jibu la Mulpile", + "Format Table...": "Jedwali la Umbizo...", + "Store Output": "Pato la Hifadhi", + "Header": "Kijajuu", + "Add title/subtitle": "Ongeza kichwa/manukuu", + "Add footnote": "Ongeza tanbihi", + "Add second footnote": "Ongeza tanbihi ya pili", + "Add source": "Ongeza chanzo", + "Add Header": "Ongeza Kichwa", + "Add stub": "Ongeza mbegu", + "Add format table": "Ongeza jedwali la umbizo", + "Margin Name :": "Jina la pambizo:", + "Treat Summaries as a Further Factor": "Chukulia Muhtasari Kama Sababu Zaidi", + "Display Summary_Variables As Rows": "Onyesha Vigezo_vya_Muhtasari Kama Safu", + "Summary_mean": "Muhtasari_maana", + "Display Summaries As Rows": "Onyesha Muhtasari Kama Safu", + "Display Variables As Rows": "Onyesha Vigeu Kama Safu", + "Outer": "Nje", + "Fill/Colour:": "Jaza/Rangi:", + "Theme": "Mandhari", + "Extra Variables": "Vigezo vya Ziada", + "Suppl.Numeric:": "Nambari ya Suppl:", + "Suppl.Factor:": "Suppl.Factor:", + "Save New Graph": "Hifadhi Grafu Mpya", + "Selection:": "Uteuzi:", + "Remove Current Selection": "Ondoa Uteuzi wa Sasa", + "Define New Selection": "Fafanua Uteuzi Mpya", + "All Combined With &": "Yote Pamoja na &", + "Operation": "Operesheni", + "All Combined With |": "Yote Kwa Pamoja |", + "Rename Options": "Badilisha jina la Chaguo", + "Abbriviate": "Futa kwa ufupi", + "To Lower": "Hadi Chini", + "Clean Names": "Majina Safi", + "Case:": "Kesi:", + "New Name": "Jina jipya", + "Include Variable Labels": "Jumuisha Lebo Zinazobadilika", + "Row Numbers or Names": "Nambari za safu au Majina", + "Apply As Selected Columns": "Tekeleza Kama Safu Wima Zilizochaguliwa", + "As Subset": "Kama Subset", + "Add not": "Usiongeze", + "Specify Decimals (if Numeric)": "Bainisha Desimali (ikiwa Nambari)", + "To Data Frame:": "Kwa Fremu ya Data:", + "From Data Frame:": "Kutoka kwa Mfumo wa Data:", + "Join By:": "Jiunge Na:", + "Delete Colums or Rows": "Futa Safu au Safu", + "Duplicate Rows": "Safu Mlalo Nakala", + "Tolerance:": "Uvumilivu:", + "By Row": "Kwa Safu", + "By Value": "Kwa Thamani", + "Non-Numeric Values": "Thamani Zisizo Nambari", + "notch": "chembe", + "notchwidth": "notchwidth", + "varwidth": "varwidth", + "coef": "kafu", + "outlier.shape": "umbo.nje", + "outlier.colour": "rangi.zaidi", + "outlier.size": "saizi.ya nje", + "outlier.stroke": "outlier.stroke", + "fatten": "kunenepesha", + "Tufte Box Options": "Chaguzi za Sanduku la Tufte", + "hoffset": "hofftset", + "voffset": "vofftset", + "median.type": "aina.ya wastani", + "whisker.type": "whisker.aina", + "draw_quantiles": "kuchora_quantiles", + "scale": "mizani", + "adjust": "rekebisha", + "kernel": "punje", + "stroke": "kiharusi", + "Show Missing Frequencies": "Onyesha Masafa Yanayokosekana", + "View/Delete Labels": "Tazama/Futa Lebo", + "Delete Value Labels": "Futa Lebo za Thamani", + "Max Labels": "Lebo za Max", + "Preview": "Hakiki", + "Number Missing": "Nambari Haipo", + "Ranks": "Vyeo", + "Ties method": "Mbinu ya mahusiano", + "Decimals:": "Desimali:", + "Round": "Mzunguko", + "Signif Fig": "Signif Mtini", + "Standardize": "Sawazisha", + "Lag": "Lag", + "Lead": "Kuongoza", + "Non-Negative": "Isiyo Hasi", + "Log (Natual)": "Kumbukumbu (Halisi)", + "Log (Base 10)": "Kumbukumbu (Msingi 10)", + "Power": "Nguvu", + "Add Constant": "Ongeza Mara kwa Mara", + "Missing Last": "Kukosa Mwisho", + "Decreasing": "Inapungua", + "Subtract": "Ondoa", + "Multiply": "Zidisha", + "Divide": "Gawanya", + "Random Samples": "Sampuli za Nasibu", + "Permute/Sample Rows": "Ruhusa/Sampuli za Safu", + "Levels:": "Viwango:", + "Groups": "Vikundi", + "Label Groups with Means": "Lebo Vikundi kwa Njia", + "Recode": "Rekodi upya", + "Lump": "Kivimbe", + "Other": "Nyingine", + "Add NA": "Ongeza NA", + "Name for NA:": "Jina la NA:", + "Keep": "Weka", + "Drop": "Acha", + "Name for Other:": "Jina kwa Nyingine:", + "Selected Values": "Thamani Zilizochaguliwa", + "Levels with at least this frequency": "Viwango vilivyo na angalau marudio haya", + "This number of common levels": "Idadi hii ya viwango vya kawaida", + "Levels with at least this proportion": "Viwango vilivyo na angalau uwiano huu", + "Levels with more than Other": "Viwango vilivyo na zaidi ya Nyingine", + "Most Frequent": "Mara kwa mara zaidi", + "Hand": "Mkono", + "property": "Mali", + "Reverse Levels": "Viwango vya Nyuma", + "Appearance": "Mwonekano", + "Alphabetical Other": "Kialfabeti Nyingine", + "Anonymise": "Acha kujulikana", + "Shift": "Shift", + "Shuffle": "Changanya", + "Unused Levels:": "Viwango visivyotumika:", + "Levels Preview:": "Onyesho la kukagua viwango:", + "Frequencies": "Masafa", + "Ignore Case": "Puuza Kesi", + "Boundary": "Mpaka", + "Find": "Tafuta", + "Find/Replace": "Tafuta/Badilisha", + "Ends": "Inaisha", + "Starts": "Huanza", + "Combo": "Mchanganyiko", + "Negate": "Kanusha", + "Remove": "Ondoa", + "Detect Options": "Tambua Chaguzi", + "Replace NA": "Badilisha NA", + "Find Options": "Tafuta Chaguo", + "Replace Options": "Badilisha Chaguzi", + "First Occurence": "Tukio la Kwanza", + "Remove All": "Ondoa Zote", + "Wrap": "Funga", + "Truncate": "Punguza", + "Side:": "Upande:", + "Squish": "Squish", + "New Column:": "Safu Wima Mpya:", + "Sequence truncated to match the lenght of the data frame": "Mfuatano umepunguzwa ili kulingana na urefu wa fremu ya data", + "no. of Days in a Year:": "Hapana. Siku katika Mwaka:", + "Fill Date Gaps": "Jaza Mapengo ya Tarehe", + "clock 12": "saa 12", + "clock24": "saa24", + "none": "hakuna", + "geographics": "kijiografia", + "Median Absolute Deviation (MAD) (W)": "Mkengeuko Kabisa wa Kati (MAD) (W)", + "Coefficient Of Variation (W)": "Mgawo wa Tofauti (W)", + "Skewness (3rd Moment) (W)": "Usemi (Tatu ya 3) (W)", + "Kurtose": "Kurtose", + "Kurtosis (W)": "Kurtosis (W)", + "Covariance (W)": "Covariance (W)", + "Correlations (W)": "Uhusiano (W)", + "Sum (W)": "Jumla (W)", + "Mean (W)": "Wastani (W)", + "Median (W)": "wastani (W)", + "Edit": "Hariri", + "Stack (Pivot Longer)": "Rafu (Pivot Tena)", + "Names to:": "Majina kwa:", + "Values to:": "Thamani za:", + "Token:": "Ishara:", + "Factor(s):": "Sababu:", + "To Lower Case": "Kwa kesi ya chini", + "Punctuation": "Uakifishaji", + "Output:": "Pato:", + "Unstack (Pivot Wider)": "Unstack (Pivot Pana)", + "Add Prefix:": "Ongeza Kiambishi awali:", + "Columns to Carry:": "Safu za Kubeba", + "Fill Missing Values:": "Jaza Maadili Yanayokosekana:", + "Merge (Join)": "Unganisha (Jiunge)", + "Append (Bind Rows)": "Ongeza (Funga Safu)", + "Include Old Names": "Jumuisha Majina ya Kale", + "New Names (Optional):": "Majina Mapya (Si lazima):", + "Links": "Viungo", + "Data Frames": "Muafaka wa Data", + "Copy to clipboard": "Nakili kwenye ubao wa kunakili", + "Data frame": "Muafaka wa data", + "Columns metadata": "Metadata ya safu wima", + "Data frame metadata": "Metadata ya fremu ya data", + "Unhide": "Onyesha", + "Unhidden Data Frame(s):": "Fremu ya Data Isiyofichwa:", + "Run": "Kimbia", + "Import NetCDF File": "Ingiza Faili ya NetCDF", + "Import Shapefiles": "Ingiza Maumbo", + "Setup For Data Entry": "Sanidi Kwa Uingizaji Data", + "Add Flags": "Ongeza Bendera", + "Data From:": "Data Kutoka:", + "Data To:": "Data Kwa:", + "Flag Variables:": "Vigezo vya Bendera:", + "Day in Year (365)": "Siku katika Mwaka (365)", + "Day in Year (366)": "Siku katika Mwaka (366)", + "Minimum RH (%):": "Kiwango cha chini cha RH (%):", + "Maximum RH (%):": "Kiwango cha juu cha RH (%):", + "Base Year:": "Mwaka wa Msingi:", + "Rug colour:": "Rangi ya rug:", + "Time interval:": "Muda wa muda:" } \ No newline at end of file diff --git a/instat/ucrButtons.vb b/instat/ucrButtons.vb index 1edbbe687c7..b32f25ffaee 100644 --- a/instat/ucrButtons.vb +++ b/instat/ucrButtons.vb @@ -183,6 +183,8 @@ Public Class ucrButtons 'Clear variables from global environment 'TODO check that this line could be removed clsRemoveFunc.ClearParameters() + 'remove any duplicate set assign to. This gets unique set assign to object names to remove + lstAssignToStrings = lstAssignToStrings.Distinct().ToList 'TODO remove assign to instat object 'lstAssignToStrings.RemoveAll(Function(x) x = frmMain.clsRLink.strInstatDataObject) If lstAssignToStrings.Count = 1 Then @@ -194,12 +196,13 @@ Public Class ucrButtons Next clsRemoveFunc.AddParameter("list", clsRFunctionParameter:=clsRemoveListFun) End If - If bRun Then - If clsRemoveFunc.clsParameters.Count > 0 Then + + If clsRemoveFunc.clsParameters.Count > 0 Then + If bRun Then frmMain.clsRLink.RunScript(clsRemoveFunc.ToScript(), iCallType:=0) + Else + frmMain.AddToScriptWindow(clsRemoveFunc.ToScript()) End If - Else - frmMain.AddToScriptWindow(clsRemoveFunc.ToScript()) End If End Sub diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 88f638f360a..33e74b64344 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -88,6 +88,8 @@ Partial Class ucrCalculator Me.ContextMenuStripComplex = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ComplexBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.grpInteger = New System.Windows.Forms.GroupBox() + Me.cmdPrimorial = New System.Windows.Forms.Button() + Me.cmdFactorize2 = New System.Windows.Forms.Button() Me.cmdLucas = New System.Windows.Forms.Button() Me.cmdFactorize = New System.Windows.Forms.Button() Me.cmdSquare = New System.Windows.Forms.Button() @@ -547,6 +549,14 @@ Partial Class ucrCalculator Me.ListBaseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ListStatsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ListStatipToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + + Me.cmdScale = New System.Windows.Forms.Button() + Me.cmdMASSFractions = New System.Windows.Forms.Button() + Me.cmdDecimals = New System.Windows.Forms.Button() + Me.MASSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + + Me.ConfdesignToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.grpBasic.SuspendLayout() Me.grpDates.SuspendLayout() Me.ContextMenuStripDate.SuspendLayout() @@ -1128,6 +1138,8 @@ Partial Class ucrCalculator ' 'grpInteger ' + Me.grpInteger.Controls.Add(Me.cmdPrimorial) + Me.grpInteger.Controls.Add(Me.cmdFactorize2) Me.grpInteger.Controls.Add(Me.cmdLucas) Me.grpInteger.Controls.Add(Me.cmdFactorize) Me.grpInteger.Controls.Add(Me.cmdSquare) @@ -1178,9 +1190,29 @@ Partial Class ucrCalculator Me.grpInteger.TabStop = False Me.grpInteger.Text = "Integer" ' + 'cmdPrimorial + ' + Me.cmdPrimorial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdPrimorial.Location = New System.Drawing.Point(223, 181) + Me.cmdPrimorial.Name = "cmdPrimorial" + Me.cmdPrimorial.Size = New System.Drawing.Size(75, 23) + Me.cmdPrimorial.TabIndex = 47 + Me.cmdPrimorial.Text = "primorial" + Me.cmdPrimorial.UseVisualStyleBackColor = True + ' + 'cmdFactorize2 + ' + Me.cmdFactorize2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.cmdFactorize2.Location = New System.Drawing.Point(149, 39) + Me.cmdFactorize2.Name = "cmdFactorize2" + Me.cmdFactorize2.Size = New System.Drawing.Size(75, 23) + Me.cmdFactorize2.TabIndex = 46 + Me.cmdFactorize2.Text = "factorize2" + Me.cmdFactorize2.UseVisualStyleBackColor = True + ' 'cmdLucas ' - Me.cmdLucas.Location = New System.Drawing.Point(223, 39) + Me.cmdLucas.Location = New System.Drawing.Point(75, 61) Me.cmdLucas.Name = "cmdLucas" Me.cmdLucas.Size = New System.Drawing.Size(75, 23) Me.cmdLucas.TabIndex = 45 @@ -1329,7 +1361,7 @@ Partial Class ucrCalculator 'cmdHexmode ' Me.cmdHexmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHexmode.Location = New System.Drawing.Point(149, 83) + Me.cmdHexmode.Location = New System.Drawing.Point(223, 83) Me.cmdHexmode.Name = "cmdHexmode" Me.cmdHexmode.Size = New System.Drawing.Size(75, 23) Me.cmdHexmode.TabIndex = 30 @@ -1339,7 +1371,7 @@ Partial Class ucrCalculator 'cmdOctmode ' Me.cmdOctmode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctmode.Location = New System.Drawing.Point(75, 83) + Me.cmdOctmode.Location = New System.Drawing.Point(149, 83) Me.cmdOctmode.Name = "cmdOctmode" Me.cmdOctmode.Size = New System.Drawing.Size(75, 23) Me.cmdOctmode.TabIndex = 29 @@ -1439,7 +1471,7 @@ Partial Class ucrCalculator 'cmdGCD ' Me.cmdGCD.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdGCD.Location = New System.Drawing.Point(223, 83) + Me.cmdGCD.Location = New System.Drawing.Point(223, 105) Me.cmdGCD.Name = "cmdGCD" Me.cmdGCD.Size = New System.Drawing.Size(75, 23) Me.cmdGCD.TabIndex = 19 @@ -1479,50 +1511,50 @@ Partial Class ucrCalculator ' 'ContextMenuStripInteger ' - Me.ContextMenuStripInteger.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GmpToolStripMenuItem, Me.DescToolsToolStripMenuItem, Me.RutilsToolStripMenuItem, Me.PrimesToolStripMenuItem, Me.ZseqToolStripMenuItem, Me.UtilsToolStripMenuItem}) + Me.ContextMenuStripInteger.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GmpToolStripMenuItem, Me.DescToolsToolStripMenuItem, Me.RutilsToolStripMenuItem, Me.PrimesToolStripMenuItem, Me.ZseqToolStripMenuItem, Me.UtilsToolStripMenuItem, Me.ConfdesignToolStripMenuItem}) Me.ContextMenuStripInteger.Name = "ContextMenuStripInteger" - Me.ContextMenuStripInteger.Size = New System.Drawing.Size(127, 136) + Me.ContextMenuStripInteger.Size = New System.Drawing.Size(181, 180) ' 'GmpToolStripMenuItem ' Me.GmpToolStripMenuItem.Name = "GmpToolStripMenuItem" - Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(126, 22) + Me.GmpToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.GmpToolStripMenuItem.Text = "Gmp" ' 'DescToolsToolStripMenuItem ' Me.DescToolsToolStripMenuItem.Name = "DescToolsToolStripMenuItem" - Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(126, 22) + Me.DescToolsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.DescToolsToolStripMenuItem.Text = "DescTools" ' 'RutilsToolStripMenuItem ' Me.RutilsToolStripMenuItem.Name = "RutilsToolStripMenuItem" - Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(126, 22) + Me.RutilsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.RutilsToolStripMenuItem.Text = "R.utils" ' 'PrimesToolStripMenuItem ' Me.PrimesToolStripMenuItem.Name = "PrimesToolStripMenuItem" - Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(126, 22) + Me.PrimesToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.PrimesToolStripMenuItem.Text = "Primes" ' 'ZseqToolStripMenuItem ' Me.ZseqToolStripMenuItem.Name = "ZseqToolStripMenuItem" - Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(126, 22) + Me.ZseqToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ZseqToolStripMenuItem.Text = "Zseq" ' 'UtilsToolStripMenuItem ' Me.UtilsToolStripMenuItem.Name = "UtilsToolStripMenuItem" - Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(126, 22) + Me.UtilsToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.UtilsToolStripMenuItem.Text = "R Utils" ' 'cmdHex ' Me.cmdHex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdHex.Location = New System.Drawing.Point(1, 83) + Me.cmdHex.Location = New System.Drawing.Point(75, 83) Me.cmdHex.Name = "cmdHex" Me.cmdHex.Size = New System.Drawing.Size(75, 23) Me.cmdHex.TabIndex = 15 @@ -1532,7 +1564,7 @@ Partial Class ucrCalculator 'cmdOctal ' Me.cmdOctal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdOctal.Location = New System.Drawing.Point(223, 61) + Me.cmdOctal.Location = New System.Drawing.Point(1, 83) Me.cmdOctal.Name = "cmdOctal" Me.cmdOctal.Size = New System.Drawing.Size(75, 23) Me.cmdOctal.TabIndex = 14 @@ -1542,7 +1574,7 @@ Partial Class ucrCalculator 'cmdBinary ' Me.cmdBinary.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdBinary.Location = New System.Drawing.Point(149, 61) + Me.cmdBinary.Location = New System.Drawing.Point(223, 61) Me.cmdBinary.Name = "cmdBinary" Me.cmdBinary.Size = New System.Drawing.Size(75, 23) Me.cmdBinary.TabIndex = 13 @@ -1561,7 +1593,7 @@ Partial Class ucrCalculator ' 'cmdDigitSum ' - Me.cmdDigitSum.Location = New System.Drawing.Point(75, 61) + Me.cmdDigitSum.Location = New System.Drawing.Point(223, 39) Me.cmdDigitSum.Name = "cmdDigitSum" Me.cmdDigitSum.Size = New System.Drawing.Size(75, 23) Me.cmdDigitSum.TabIndex = 10 @@ -1571,7 +1603,7 @@ Partial Class ucrCalculator 'cmdRankPercent ' Me.cmdRankPercent.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.cmdRankPercent.Location = New System.Drawing.Point(1, 61) + Me.cmdRankPercent.Location = New System.Drawing.Point(149, 61) Me.cmdRankPercent.Name = "cmdRankPercent" Me.cmdRankPercent.Size = New System.Drawing.Size(75, 23) Me.cmdRankPercent.TabIndex = 9 @@ -1589,7 +1621,7 @@ Partial Class ucrCalculator ' 'cmdFibonacci ' - Me.cmdFibonacci.Location = New System.Drawing.Point(149, 39) + Me.cmdFibonacci.Location = New System.Drawing.Point(1, 61) Me.cmdFibonacci.Name = "cmdFibonacci" Me.cmdFibonacci.Size = New System.Drawing.Size(75, 23) Me.cmdFibonacci.TabIndex = 7 @@ -4397,6 +4429,9 @@ Partial Class ucrCalculator ' 'grpTransform ' + Me.grpTransform.Controls.Add(Me.cmdDecimals) + Me.grpTransform.Controls.Add(Me.cmdMASSFractions) + Me.grpTransform.Controls.Add(Me.cmdScale) Me.grpTransform.Controls.Add(Me.cmdTransformRHelp) Me.grpTransform.Controls.Add(Me.cmdRev) Me.grpTransform.Controls.Add(Me.cmdMovProd) @@ -4428,7 +4463,7 @@ Partial Class ucrCalculator Me.grpTransform.Controls.Add(Me.cmdLag) Me.grpTransform.Location = New System.Drawing.Point(434, 62) Me.grpTransform.Name = "grpTransform" - Me.grpTransform.Size = New System.Drawing.Size(310, 227) + Me.grpTransform.Size = New System.Drawing.Size(310, 251) Me.grpTransform.TabIndex = 189 Me.grpTransform.TabStop = False Me.grpTransform.Text = "Transform" @@ -4437,7 +4472,7 @@ Partial Class ucrCalculator ' Me.cmdTransformRHelp.AutoSize = True Me.cmdTransformRHelp.ContextMenuStrip = Me.ContextMenuStripTransform - Me.cmdTransformRHelp.Location = New System.Drawing.Point(216, 195) + Me.cmdTransformRHelp.Location = New System.Drawing.Point(216, 220) Me.cmdTransformRHelp.Name = "cmdTransformRHelp" Me.cmdTransformRHelp.Size = New System.Drawing.Size(91, 23) Me.cmdTransformRHelp.SplitMenuStrip = Me.ContextMenuStripTransform @@ -4447,26 +4482,26 @@ Partial Class ucrCalculator ' 'ContextMenuStripTransform ' - Me.ContextMenuStripTransform.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem, Me.DplyrToolStripMenuItem, Me.ZooToolStripMenuItem}) + Me.ContextMenuStripTransform.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BaseToolStripMenuItem, Me.DplyrToolStripMenuItem, Me.MASSToolStripMenuItem, Me.ZooToolStripMenuItem}) Me.ContextMenuStripTransform.Name = "ContextMenuStrip1" - Me.ContextMenuStripTransform.Size = New System.Drawing.Size(102, 70) + Me.ContextMenuStripTransform.Size = New System.Drawing.Size(106, 92) ' 'BaseToolStripMenuItem ' Me.BaseToolStripMenuItem.Name = "BaseToolStripMenuItem" - Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(101, 22) + Me.BaseToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.BaseToolStripMenuItem.Text = "base" ' 'DplyrToolStripMenuItem ' Me.DplyrToolStripMenuItem.Name = "DplyrToolStripMenuItem" - Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(101, 22) + Me.DplyrToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.DplyrToolStripMenuItem.Text = "dplyr" ' 'ZooToolStripMenuItem ' Me.ZooToolStripMenuItem.Name = "ZooToolStripMenuItem" - Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(101, 22) + Me.ZooToolStripMenuItem.Size = New System.Drawing.Size(105, 22) Me.ZooToolStripMenuItem.Text = "zoo" ' 'cmdRev @@ -4512,9 +4547,9 @@ Partial Class ucrCalculator 'cmdNasplin ' Me.cmdNasplin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNasplin.Location = New System.Drawing.Point(231, 160) + Me.cmdNasplin.Location = New System.Drawing.Point(246, 160) Me.cmdNasplin.Name = "cmdNasplin" - Me.cmdNasplin.Size = New System.Drawing.Size(77, 30) + Me.cmdNasplin.Size = New System.Drawing.Size(62, 30) Me.cmdNasplin.TabIndex = 197 Me.cmdNasplin.Text = "nasplin" Me.cmdNasplin.UseVisualStyleBackColor = True @@ -4522,9 +4557,9 @@ Partial Class ucrCalculator 'cmdNaapprox ' Me.cmdNaapprox.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaapprox.Location = New System.Drawing.Point(155, 160) + Me.cmdNaapprox.Location = New System.Drawing.Point(185, 160) Me.cmdNaapprox.Name = "cmdNaapprox" - Me.cmdNaapprox.Size = New System.Drawing.Size(77, 30) + Me.cmdNaapprox.Size = New System.Drawing.Size(62, 30) Me.cmdNaapprox.TabIndex = 196 Me.cmdNaapprox.Text = "naapprox" Me.cmdNaapprox.UseVisualStyleBackColor = True @@ -4532,9 +4567,9 @@ Partial Class ucrCalculator 'cmdNaest ' Me.cmdNaest.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNaest.Location = New System.Drawing.Point(79, 160) + Me.cmdNaest.Location = New System.Drawing.Point(124, 160) Me.cmdNaest.Name = "cmdNaest" - Me.cmdNaest.Size = New System.Drawing.Size(77, 30) + Me.cmdNaest.Size = New System.Drawing.Size(62, 30) Me.cmdNaest.TabIndex = 195 Me.cmdNaest.Text = "naest" Me.cmdNaest.UseVisualStyleBackColor = True @@ -4542,9 +4577,9 @@ Partial Class ucrCalculator 'cmdNafill ' Me.cmdNafill.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdNafill.Location = New System.Drawing.Point(2, 160) + Me.cmdNafill.Location = New System.Drawing.Point(63, 160) Me.cmdNafill.Name = "cmdNafill" - Me.cmdNafill.Size = New System.Drawing.Size(78, 30) + Me.cmdNafill.Size = New System.Drawing.Size(62, 30) Me.cmdNafill.TabIndex = 194 Me.cmdNafill.Text = "nafill" Me.cmdNafill.UseVisualStyleBackColor = True @@ -4562,9 +4597,9 @@ Partial Class ucrCalculator 'cmdRowRank ' Me.cmdRowRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRowRank.Location = New System.Drawing.Point(2, 131) + Me.cmdRowRank.Location = New System.Drawing.Point(63, 131) Me.cmdRowRank.Name = "cmdRowRank" - Me.cmdRowRank.Size = New System.Drawing.Size(78, 30) + Me.cmdRowRank.Size = New System.Drawing.Size(62, 30) Me.cmdRowRank.TabIndex = 192 Me.cmdRowRank.Text = "r_rank" Me.cmdRowRank.UseVisualStyleBackColor = True @@ -4632,9 +4667,9 @@ Partial Class ucrCalculator 'cmdMRank ' Me.cmdMRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMRank.Location = New System.Drawing.Point(231, 131) + Me.cmdMRank.Location = New System.Drawing.Point(246, 131) Me.cmdMRank.Name = "cmdMRank" - Me.cmdMRank.Size = New System.Drawing.Size(77, 30) + Me.cmdMRank.Size = New System.Drawing.Size(62, 30) Me.cmdMRank.TabIndex = 185 Me.cmdMRank.Text = "m_rank" Me.cmdMRank.UseVisualStyleBackColor = True @@ -4642,9 +4677,9 @@ Partial Class ucrCalculator 'cmdDRank ' Me.cmdDRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDRank.Location = New System.Drawing.Point(155, 131) + Me.cmdDRank.Location = New System.Drawing.Point(185, 131) Me.cmdDRank.Name = "cmdDRank" - Me.cmdDRank.Size = New System.Drawing.Size(77, 30) + Me.cmdDRank.Size = New System.Drawing.Size(62, 30) Me.cmdDRank.TabIndex = 184 Me.cmdDRank.Text = "d_rank" Me.cmdDRank.UseVisualStyleBackColor = True @@ -4673,10 +4708,10 @@ Partial Class ucrCalculator ' Me.cmdPercentRank.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPercentRank.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPercentRank.Location = New System.Drawing.Point(79, 131) + Me.cmdPercentRank.Location = New System.Drawing.Point(124, 131) Me.cmdPercentRank.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.cmdPercentRank.Name = "cmdPercentRank" - Me.cmdPercentRank.Size = New System.Drawing.Size(77, 30) + Me.cmdPercentRank.Size = New System.Drawing.Size(62, 30) Me.cmdPercentRank.TabIndex = 181 Me.cmdPercentRank.Text = "% rank" Me.cmdPercentRank.UseVisualStyleBackColor = True @@ -6416,19 +6451,66 @@ Partial Class ucrCalculator Me.ListStatipToolStripMenuItem.Name = "ListStatipToolStripMenuItem" Me.ListStatipToolStripMenuItem.Size = New System.Drawing.Size(103, 22) Me.ListStatipToolStripMenuItem.Text = "statip" + ' + + 'cmdScale + ' + Me.cmdScale.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdScale.Location = New System.Drawing.Point(2, 131) + Me.cmdScale.Name = "cmdScale" + Me.cmdScale.Size = New System.Drawing.Size(62, 30) + Me.cmdScale.TabIndex = 205 + Me.cmdScale.Text = "scale" + Me.cmdScale.UseVisualStyleBackColor = True + ' + 'cmdMASSFractions + ' + Me.cmdMASSFractions.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdMASSFractions.Location = New System.Drawing.Point(2, 160) + 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 + ' + 'cmdDecimals + ' + Me.cmdDecimals.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDecimals.Location = New System.Drawing.Point(2, 189) + 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 + ' + 'MASSToolStripMenuItem + ' + Me.MASSToolStripMenuItem.Name = "MASSToolStripMenuItem" + Me.MASSToolStripMenuItem.Size = New System.Drawing.Size(105, 22) + Me.MASSToolStripMenuItem.Text = "MASS" + + 'ConfdesignToolStripMenuItem + ' + Me.ConfdesignToolStripMenuItem.Name = "ConfdesignToolStripMenuItem" + Me.ConfdesignToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ConfdesignToolStripMenuItem.Text = "Conf.design" + ' '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.grpProbabilty) + + Me.Controls.Add(Me.grpTransform) Me.Controls.Add(Me.grpLogical) Me.Controls.Add(Me.grpDates) Me.Controls.Add(Me.grpHydroGOF) + Me.Controls.Add(Me.grpProbabilty) Me.Controls.Add(Me.grpFactor) Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpMaths) + Me.Controls.Add(Me.grpInteger) Me.Controls.Add(Me.cmdWakefieldHelp) Me.Controls.Add(Me.cmdStringRHelp) @@ -6446,7 +6528,16 @@ Partial Class ucrCalculator Me.Controls.Add(Me.grpComplex) Me.Controls.Add(Me.grpSummary) Me.Controls.Add(Me.grpWakefield) + Me.Controls.Add(Me.grpTransform) + Me.Controls.Add(Me.grpLogical) + Me.Controls.Add(Me.grpDates) + Me.Controls.Add(Me.grpHydroGOF) + Me.Controls.Add(Me.grpProbabilty) + Me.Controls.Add(Me.grpFactor) + Me.Controls.Add(Me.grpCircular) + Me.Controls.Add(Me.grpMaths) + Me.Name = "ucrCalculator" Me.Size = New System.Drawing.Size(899, 457) Me.grpBasic.ResumeLayout(False) @@ -7007,5 +7098,17 @@ 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 + End Class diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index ffe4d53c9ff..4060b850ef8 100644 --- a/instat/ucrCalculator.resx +++ b/instat/ucrCalculator.resx @@ -163,6 +163,10 @@ 759, 103 - 175 + + 98 + + 126 + \ No newline at end of file diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 72511782725..c11b8d95d05 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -72,6 +72,9 @@ Public Class ucrCalculator 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.") 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)") @@ -224,6 +227,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdChoosez, "computes binomial coefficient choose(n,k) as a big integer. For example, chooseZ(20,2)=190") ttCalculator.SetToolTip(cmdNextPrime, "gives the next prime number. For example, nextprime(14)= 17") ttCalculator.SetToolTip(cmdFactorize, "compute the prime factorizations. For example, Factorize(20)= (2,5,2,1)") + ttCalculator.SetToolTip(cmdFactorize2, "like factorize, but with simpler layout of results and much slower for large data sets.") ttCalculator.SetToolTip(cmdIsPrime, "checks if the number is prime and returns 0 or 2, 0= False, 2= True. For example, is.prime(10) returns 0") ttCalculator.SetToolTip(cmdFibonacci, "generates Fibonacci numbers. For example, Fibonacci(8)=21") ttCalculator.SetToolTip(cmdDivisors, "returns the divisors of x. For example, Divisors(21)= c(1,3,7)") @@ -259,7 +263,8 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdPadovan, "sum of last but 1 and last but 2 values. So from ...7, 9, 12, next is 7+9 = 16.") ttCalculator.SetToolTip(cmdTriangle, "number of objects in a triangle, so 0, 1, 3, 6, 10...") ttCalculator.SetToolTip(cmdSquare, "squares of each integer, so 1, 4, 9, 16.") - ttCalculator.SetToolTip(cmdLucas, "generartes lucas numbers to the length of the dataframe. For example the 10th lucas number is 76") + ttCalculator.SetToolTip(cmdLucas, "generates Lucas numbers to the length of the dataframe. For example the 10th Lucas number is 76") + ttCalculator.SetToolTip(cmdPrimorial, "gives the primorial (like the factorial, but just the primes up to the number) for a variable. For example primorial(c(7,8,9)) = 235*7 = (210, 210, 210)") ttCalculator.SetToolTip(cmdLength, "number of observations: For example length(c(1,2,3,4,NA)) = 5 ") ttCalculator.SetToolTip(cmdSum, "the sum or total: So sum(c(1,2,3,4,10)) = 20 ") @@ -4045,6 +4050,14 @@ Public Class ucrCalculator OpenHelpPage() End Sub + Private Sub ConfdesignToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ConfdesignToolStripMenuItem.Click + CalculationsOptions() + If ucrInputCalOptions.GetText = "Integer" Then + strPackageName = "conf.design" + End If + OpenHelpPage() + End Sub + Private Sub RutilsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RutilsToolStripMenuItem.Click CalculationsOptions() If ucrInputCalOptions.GetText = "Integer" Then @@ -4315,7 +4328,7 @@ Public Class ucrCalculator End If End Sub - Private Sub cmdFactorize2_Click(sender As Object, e As EventArgs) Handles cmdFactorize.Click + Private Sub cmdFactorize_Click(sender As Object, e As EventArgs) Handles cmdFactorize.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("DescTools::Factorize(n= )", 1) Else @@ -4379,6 +4392,14 @@ Public Class ucrCalculator OpenHelpPage() End Sub + Private Sub MASSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MASSToolStripMenuItem.Click + CalculationsOptions() + If ucrInputCalOptions.GetText = "Transform" Then + strPackageName = "MASS" + End If + OpenHelpPage() + End Sub + Private Sub ZooToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZooToolStripMenuItem.Click CalculationsOptions() If ucrInputCalOptions.GetText = "Transform" Then @@ -4399,6 +4420,14 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition(clsZseqFunction.ToScript, 0) End Sub + Private Sub cmdPrimorial_Click(sender As Object, e As EventArgs) Handles cmdPrimorial.Click + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( ,primes::primorial_n)", 22) + End Sub + + Private Sub cmdFactorize2_Click(sender As Object, e As EventArgs) Handles cmdFactorize2.Click + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("conf.design::factorize( )", 2) + End Sub + Private Sub cmdFreqLength_Click(sender As Object, e As EventArgs) Handles cmdFreqLength.Click If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("length(x=rep(x= ,times= ))", 11) @@ -4967,6 +4996,26 @@ Public Class ucrCalculator End Sub Private Sub cmdPascal_Click(sender As Object, e As EventArgs) Handles cmdPascal.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("lapply( , function(x) {lapply(x, function(i) {choose(i, 0:i)})})", 56) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( , function(x) {lapply(x, function(i) {choose(i, 0:i)})})", 56) + End Sub + + Private Sub cmdScale_Click(sender As Object, e As EventArgs) Handles cmdScale.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scale( , center = TRUE, scale = TRUE)", 31) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("scale( )", 1) + 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 End Class diff --git a/instat/ucrReceiver.vb b/instat/ucrReceiver.vb index 2599a4e829e..f0d100820e8 100644 --- a/instat/ucrReceiver.vb +++ b/instat/ucrReceiver.vb @@ -130,7 +130,8 @@ Public Class ucrReceiver End Sub - Public Overridable Sub RemoveAnyVariablesNotInList(lstViewItem As ListView) + 'This refers to the selector list of columns + Public Overridable Sub RemoveAnyVariablesNotInList() End Sub @@ -401,22 +402,19 @@ Public Class ucrReceiver Case "metadata" 'TODO what should this be? strItemsParameterNameInRFunction = "" - Case "graph" - strItemsParameterNameInRFunction = "graph_name" - Case "model" - strItemsParameterNameInRFunction = "model_name" - Case "surv" - strItemsParameterNameInRFunction = "surv_name" - Case "table" - strItemsParameterNameInRFunction = "table_name" + Case "object", + RObjectTypeLabel.Graph, + RObjectTypeLabel.Model, + RObjectTypeLabel.Table, + RObjectTypeLabel.Summary, + RObjectTypeLabel.StructureLabel + strItemsParameterNameInRFunction = "object_name" Case "filter" strItemsParameterNameInRFunction = "filter_name" Case "column_selection" strItemsParameterNameInRFunction = "column_selection_name" Case "link" strItemsParameterNameInRFunction = "link_name" - Case "object" - strItemsParameterNameInRFunction = "object_name" Case "calculation" strItemsParameterNameInRFunction = "calculation_name" End Select diff --git a/instat/ucrReceiverExpression.vb b/instat/ucrReceiverExpression.vb index 8374595ef47..a881dd26c51 100644 --- a/instat/ucrReceiverExpression.vb +++ b/instat/ucrReceiverExpression.vb @@ -110,6 +110,7 @@ Public Class ucrReceiverExpression Next End If cboExpression.Text = "" + cboExpression.Focus() End If MyBase.RemoveSelected() End Sub diff --git a/instat/ucrReceiverMultiple.vb b/instat/ucrReceiverMultiple.vb index 8651373aa4e..34baa703fb5 100644 --- a/instat/ucrReceiverMultiple.vb +++ b/instat/ucrReceiverMultiple.vb @@ -171,23 +171,15 @@ Public Class ucrReceiverMultiple Case "filter" clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_filter") clsGetVariablesFunc.AddParameter("filter_name", GetVariableNames()) - Case "object" - clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_objects") - clsGetVariablesFunc.AddParameter("object_name", GetVariableNames()) - Case "graph" - clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_graphs") - clsGetVariablesFunc.AddParameter("graph_name", GetVariableNames()) - Case "surv" - clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_surv") - clsGetVariablesFunc.AddParameter("surv_name", GetVariableNames()) - Case "model" - clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_models") - clsGetVariablesFunc.AddParameter("model_name", GetVariableNames()) - If bForceVariablesAsList Then - clsGetVariablesFunc.AddParameter("force_as_list", "TRUE", iPosition:=3) - Else - clsGetVariablesFunc.RemoveParameterByName("force_as_list") - End If + Case "object", + RObjectTypeLabel.Graph, + RObjectTypeLabel.Table, + RObjectTypeLabel.Model, + RObjectTypeLabel.Summary, + RObjectTypeLabel.StructureLabel + clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_objects_data") + clsGetVariablesFunc.AddParameter("object_names", GetVariableNames()) + clsGetVariablesFunc.AddParameter("as_files", "FALSE") Case "dataframe" clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") clsGetVariablesFunc.AddParameter("data_name", GetVariableNames()) @@ -312,10 +304,9 @@ Public Class ucrReceiverMultiple ''' Removes any variable in the multiple receiver ''' that is not in the list of variables of the selector ''' - ''' - Public Overrides Sub RemoveAnyVariablesNotInList(lstViewItem As ListView) + Public Overrides Sub RemoveAnyVariablesNotInList() For Each strVar In GetVariableNamesAsList() - If lstViewItem.FindItemWithText(strVar) Is Nothing Then + If Selector.lstAvailableVariable.FindItemWithText(strVar) Is Nothing Then Remove({strVar}) End If Next @@ -381,7 +372,7 @@ Public Class ucrReceiverMultiple kvpItems(0) = New KeyValuePair(Of String, String)(strDataFrame, strItem) AddMultiple(kvpItems) - RemoveAnyVariablesNotInList(Selector.lstAvailableVariable) 'needed due to the Autofill option + RemoveAnyVariablesNotInList() 'needed due to the Autofill option lstSelectedVariables.Enabled = Not bFixreceiver End Sub diff --git a/instat/ucrReceiverSingle.vb b/instat/ucrReceiverSingle.vb index 4db19a6ac57..e600bd5732e 100644 --- a/instat/ucrReceiverSingle.vb +++ b/instat/ucrReceiverSingle.vb @@ -202,18 +202,15 @@ Public Class ucrReceiverSingle Case "filter" clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_filter") clsGetVariablesFunc.AddParameter("filter_name", GetVariableNames()) - Case "object" - clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_objects") + Case "object", + RObjectTypeLabel.Graph, + RObjectTypeLabel.Table, + RObjectTypeLabel.Model, + RObjectTypeLabel.Summary, + RObjectTypeLabel.StructureLabel + clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") clsGetVariablesFunc.AddParameter("object_name", GetVariableNames()) - Case "graph" - clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_graphs") - clsGetVariablesFunc.AddParameter("graph_name", GetVariableNames()) - If Not bPrintGraph Then - clsGetVariablesFunc.AddParameter("print_graph", "FALSE") - End If - Case "model" - clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_models") - clsGetVariablesFunc.AddParameter("model_name", GetVariableNames()) + clsGetVariablesFunc.AddParameter("as_file", "FALSE") Case "dataframe" clsGetVariablesFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") clsGetVariablesFunc.AddParameter("data_name", GetVariableNames()) @@ -227,9 +224,9 @@ Public Class ucrReceiverSingle 'TODO make this an option set in Options menu If bIncludeDataFrameInAssignment AndAlso strDataFrameName <> "" Then - clsGetVariablesFunc.SetAssignTo(strDataFrameName & "." & txtReceiverSingle.Text) + clsGetVariablesFunc.SetAssignToObject(strRObjectToAssignTo:=strDataFrameName & "." & txtReceiverSingle.Text) Else - clsGetVariablesFunc.SetAssignTo(txtReceiverSingle.Text) + clsGetVariablesFunc.SetAssignToObject(strRObjectToAssignTo:=txtReceiverSingle.Text) End If Return clsGetVariablesFunc Else diff --git a/instat/ucrSave.vb b/instat/ucrSave.vb index 1ebea03bdf8..5cd56cbc3d7 100644 --- a/instat/ucrSave.vb +++ b/instat/ucrSave.vb @@ -655,7 +655,8 @@ Public Class ucrSave Case RObjectTypeLabel.Graph, RObjectTypeLabel.Summary, RObjectTypeLabel.Table, - RObjectTypeLabel.Model + RObjectTypeLabel.Model, + RObjectTypeLabel.StructureLabel If (_strRObjectLabel = RObjectTypeLabel.Table OrElse _strRObjectLabel = RObjectTypeLabel.Model) AndAlso String.IsNullOrEmpty(_strRObjectFormat) Then 'todo. temporary check until all table and model dialogs are modified to set _strRObjectFormat @@ -670,8 +671,6 @@ Public Class ucrSave strRDataFrameNameToAddObjectTo:=strDataName, strObjectName:=strSaveName) End If - Case "surv" - clsTempCode.SetAssignTo(strTemp:=strSaveName, strTempDataframe:=strDataName, strTempSurv:=strSaveName, bAssignToIsPrefix:=bAssignToIsPrefix) End Select Else clsTempCode.RemoveAssignTo() diff --git a/instat/ucrScript.Designer.vb b/instat/ucrScript.Designer.vb index d2e8326a361..e165174b2c3 100644 --- a/instat/ucrScript.Designer.vb +++ b/instat/ucrScript.Designer.vb @@ -243,7 +243,7 @@ Partial Class ucrScript ' 'cmdHelp ' - Me.cmdHelp.Location = New System.Drawing.Point(165, 1) + Me.cmdHelp.Location = New System.Drawing.Point(173, 1) Me.cmdHelp.Name = "cmdHelp" Me.cmdHelp.Size = New System.Drawing.Size(51, 23) Me.cmdHelp.TabIndex = 5 @@ -252,7 +252,7 @@ Partial Class ucrScript ' 'cmdClear ' - Me.cmdClear.Location = New System.Drawing.Point(110, 1) + Me.cmdClear.Location = New System.Drawing.Point(118, 1) Me.cmdClear.Name = "cmdClear" Me.cmdClear.Size = New System.Drawing.Size(51, 23) Me.cmdClear.TabIndex = 4 @@ -264,7 +264,7 @@ Partial Class ucrScript ' Me.cmdRunAll.Location = New System.Drawing.Point(56, 1) Me.cmdRunAll.Name = "cmdRunAll" - Me.cmdRunAll.Size = New System.Drawing.Size(51, 23) + Me.cmdRunAll.Size = New System.Drawing.Size(59, 23) Me.cmdRunAll.TabIndex = 3 Me.cmdRunAll.Text = "Run All" Me.tooltiptScriptWindow.SetToolTip(Me.cmdRunAll, "Run all lines") diff --git a/instat/ucrSelector.vb b/instat/ucrSelector.vb index 510c30c5f87..55153ee12d7 100644 --- a/instat/ucrSelector.vb +++ b/instat/ucrSelector.vb @@ -148,7 +148,7 @@ Public Class ucrSelector 'todo, for columns, the list view should be field with variables from the .Net metadata object frmMain.clsRLink.FillListView(lstAvailableVariable, strType:=strCurrentType, lstIncludedDataTypes:=lstCombinedMetadataLists(0), lstExcludedDataTypes:=lstCombinedMetadataLists(1), strHeading:=CurrentReceiver.strSelectorHeading, strDataFrameName:=strCurrentDataFrame, strExcludedItems:=arrStrExclud, strDatabaseQuery:=CurrentReceiver.strDatabaseQuery, strNcFilePath:=CurrentReceiver.strNcFilePath) - CurrentReceiver.RemoveAnyVariablesNotInList(lstAvailableVariable) + CurrentReceiver.RemoveAnyVariablesNotInList() 'this needed for the multiple receiver(s) where the autofill is not applied EnableDataOptions(strCurrentType) End Sub