diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 2fdc34907b4..cea1f43599e 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -227,7 +227,7 @@ Public Class RLink Try clsEngine.Evaluate(strScript) Catch e As Exception - MsgBox("Error occurred in attempting to run:" & vbNewLine & strScript & vbNewLine & vbNewLine & "With error message:" & vbNewLine & e.Message & vbNewLine & vbNewLine, MsgBoxStyle.Critical, "Error running R code") + MsgBox(e.Message & vbNewLine & "The error occurred in attempting to run the following R command(s):" & vbNewLine & strScript, MsgBoxStyle.Critical, "Error running R command(s)") End Try ElseIf bReturnOutput = 1 Then Try @@ -235,7 +235,7 @@ Public Class RLink strTemp = String.Join(vbCrLf, temp.AsCharacter()) strOutput = strOutput & strTemp & vbCrLf Catch e As Exception - MsgBox("Error occurred in attempting to run:" & vbNewLine & strScript & vbNewLine & vbNewLine & "With error message:" & vbNewLine & e.Message & vbNewLine & vbNewLine, MsgBoxStyle.Critical, "Error running R code") + MsgBox(e.Message & vbNewLine & "The error occurred in attempting to run the following R command(s):" & vbNewLine & strScript, MsgBoxStyle.Critical, "Error running R command(s)") End Try Else If strScript.Trim(vbCrLf).LastIndexOf(vbCrLf) = -1 Then @@ -246,7 +246,7 @@ Public Class RLink Try clsEngine.Evaluate(strSplitScript) Catch e As Exception - MsgBox("Error occurred in attempting to run:" & vbNewLine & strSplitScript & vbNewLine & vbNewLine & "With error message:" & vbNewLine & e.Message & vbNewLine & vbNewLine, MsgBoxStyle.Critical, "Error running R code") + MsgBox(e.Message & vbNewLine & "The error occurred in attempting to run the following R command(s):" & vbNewLine & strScript, MsgBoxStyle.Critical, "Error running R command(s)") End Try End If strSplitScript = Right(strScript, strScript.Length - strScript.Trim(vbCrLf).LastIndexOf(vbCrLf) - 2) @@ -257,7 +257,7 @@ Public Class RLink strTemp = String.Join(vbCrLf, temp.AsCharacter()) strOutput = strOutput & strTemp & vbCrLf Catch e As Exception - MsgBox("Error occurred in attempting to run:" & vbNewLine & strCapturedScript & vbNewLine & vbNewLine & "With error message:" & vbNewLine & e.Message & vbNewLine & vbNewLine, MsgBoxStyle.Critical, "Error running R code") + MsgBox(e.Message & vbNewLine & "The error occurred in attempting to run the following R command(s):" & vbNewLine & strScript, MsgBoxStyle.Critical, "Error running R command(s)") End Try End If If bOutput Then @@ -311,7 +311,7 @@ Public Class RLink expTemp = clsEngine.GetSymbol(strVariableName) Catch ex As Exception If Not bSilent Then - MsgBox("Error occurred in attempting to run:" & vbNewLine & strScript & vbNewLine & vbNewLine & "With error message:" & vbNewLine & ex.Message & vbNewLine & vbNewLine, MsgBoxStyle.Critical, "Error running R code") + MsgBox(ex.Message & vbNewLine & "The error occurred in attempting to run the following R command(s):" & vbNewLine & strScript, MsgBoxStyle.Critical, "Error running R command(s)") End If End Try End If @@ -327,7 +327,7 @@ Public Class RLink chrTemp = expTemp.AsCharacter() Catch ex As Exception If Not bSilent Then - MsgBox("Error occurred in attempting to run:" & vbNewLine & strScript & vbNewLine & vbNewLine & "With error message:" & vbNewLine & ex.Message & vbNewLine & vbNewLine, MsgBoxStyle.Critical, "Error running R code") + MsgBox(ex.Message & vbNewLine & "The error occurred in attempting to run the following R command(s):" & vbNewLine & strScript, MsgBoxStyle.Critical, "Error running R command(s)") End If chrTemp = Nothing End Try @@ -359,7 +359,7 @@ Public Class RLink Return True Catch ex As Exception If Not bSilent Then - MsgBox("Error occurred in attempting to run:" & vbNewLine & strScript & vbNewLine & vbNewLine & "With error message:" & vbNewLine & ex.Message & vbNewLine & vbNewLine, MsgBoxStyle.Critical, "Error running R code") + MsgBox(ex.Message & vbNewLine & "The error occurred in attempting to run the following R command(s):" & vbNewLine & strScript, MsgBoxStyle.Critical, "Error running R command(s)") End If Return False End Try diff --git a/instat/clsRSyntax.vb b/instat/clsRSyntax.vb index 2e283ee6bd2..88cbd81197b 100644 --- a/instat/clsRSyntax.vb +++ b/instat/clsRSyntax.vb @@ -1,47 +1,56 @@ -' Instat+R -' Copyright (C) 2015 -' -' This program is free software: you can redistribute it and/or modify -' it under the terms of the GNU General Public License as published by -' the Free Software Foundation, either version 3 of the License, or -' (at your option) any later version. -' -' This program is distributed in the hope that it will be useful, -' but WITHOUT ANY WARRANTY; without even the implied warranty of -' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -' GNU General Public License for more details. -' -' You should have received a copy of the GNU General Public License k -' along with this program. If not, see . - - -Public Class RSyntax +' Instat+R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + + +Public Class RSyntax + 'RSyntax is intended to store all the R-commands that are raised by the activity of a dialogue. + 'So far, it consists in a main R-command (Base), that takes the form of: + '- an "RFunction", dealing with R-commands of the form __(__=__, __=__, ...), + '- "ROperator", dealing with R-commands of the form: __+__, + '- or more generally a string. + 'See also RLink to understand how these commands, as RSyntax fields, are then communicated to, and run in R. Public clsBaseFunction As New RFunction Public clsBaseOperator As New ROperator Public strCommandString As String = "" Public bUseBaseFunction As Boolean = False Public bUseBaseOperator As Boolean = False Public bUseCommandString As Boolean = False + 'Above, the three types of Base R-commands, and their associated "radio bottons booleans". Public iCallType As Integer = 0 Public strScript As String Public i As Integer Public bExcludeAssignedFunctionOutput As Boolean = True Private strAssignTo As String + 'strAssignTo is the name that should be used to assign in R the output of the main (Base) R-command. Private strAssignToDataframe As String Private strAssignToColumn As String Private strAssignToModel As String Private strAssignToGraph As String + 'Explain a little bit the different roles and nature of the different AssignTo ... Public bToBeAssigned As Boolean = False + 'bToBeAssigned is a boolean telling whether or not, AT THE CURRENT STAGE of running code within R, the output of the Base R-command NEEDS TO BE assigned to the variable with the appropriate name: strAssignTo. Public bIsAssigned As Boolean = False + 'bIsAssigned tells blindly whether or not the variabe with the appropriate name has been assigned to the output of the Base R-command. Private bAssignToIsPrefix As Boolean Private bAssignToColumnWithoutNames As Boolean Private bInsertColumnBefore As String - Public Sub SetFunction(strFunctionName As String, Optional ByRef clsFunction As RFunction = Nothing) - If clsFunction Is Nothing Then - clsFunction = clsBaseFunction - End If - clsFunction.SetRCommand(strFunctionName) + Public Sub SetFunction(strFunctionName As String) + 'Warning: confusing name + clsBaseFunction.SetRCommand(strFunctionName) bUseBaseFunction = True bUseBaseOperator = False bUseCommandString = False @@ -53,27 +62,30 @@ Public Class RSyntax bUseBaseOperator = False bUseCommandString = False End Sub - + 'Both SetFunction and SetBaseRFunction set the Base R-command to the RFunction type, + 'and set the clsBaseFunction by giving respectively the desired RFunction as parameter, or the R-command that characterizes the desired RFunction as parameter. Public Sub SetBaseROperator(clsOperator As ROperator) clsBaseOperator = clsOperator + bUseBaseFunction = False + bUseBaseOperator = True + bUseCommandString = False + End Sub + + Public Sub SetOperation(strOp As String, Optional bBracketTemp As Boolean = True) + clsBaseOperator.SetOperation(strOp, bBracketTemp) bUseBaseFunction = False bUseBaseOperator = True bUseCommandString = False - End Sub - + End Sub + 'Similarly, both SetBaseROperator and SetOperation set the Base R-command to the ROperator type, + 'and set the clsBaseOperator by giving respectively the desired ROperator itself as parameter, or the desired R-command that characterize the desired ROperator as parameters. Public Sub SetCommandString(strCommand As String) strCommandString = strCommand bUseBaseFunction = False bUseBaseOperator = False bUseCommandString = True End Sub - - Public Sub SetOperation(strOp As String, Optional bBracketTemp As Boolean = True) - clsBaseOperator.SetOperation(strOp, bBracketTemp) - bUseBaseFunction = False - bUseBaseOperator = True - bUseCommandString = False - End Sub + 'In the string case, the class used for the Base R-command is simply a string... Public Sub SetAssignTo(strAssignToName As String, Optional strTempDataframe As String = "", Optional strTempColumn As String = "", Optional strTempModel As String = "", Optional strTempGraph As String = "", Optional bAssignToIsPrefix As Boolean = False, Optional bAssignToColumnWithoutNames As Boolean = False, Optional bInsertColumnBefore As Boolean = False) If bUseBaseOperator Then diff --git a/instat/dlgCanonicalCorrelationAnalysis.Designer.vb b/instat/dlgCanonicalCorrelationAnalysis.Designer.vb index 84f9d6a0cf5..90741c21774 100644 --- a/instat/dlgCanonicalCorrelationAnalysis.Designer.vb +++ b/instat/dlgCanonicalCorrelationAnalysis.Designer.vb @@ -132,7 +132,9 @@ Partial Class dlgCanonicalCorrelationAnalysis Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgCanonicalCorrelationAnalysis" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Canonical_Correlation_Analysis" + Me.Text = "Canonical Correlations" Me.ResumeLayout(False) End Sub diff --git a/instat/dlgCountinFactor.Designer.vb b/instat/dlgCountinFactor.Designer.vb index be4bdb4a798..7b442daab67 100644 --- a/instat/dlgCountinFactor.Designer.vb +++ b/instat/dlgCountinFactor.Designer.vb @@ -25,7 +25,7 @@ Partial Class dlgCountinFactor Me.ucrBase = New instat.ucrButtons() Me.ucrCountSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrCountReceiver = New instat.ucrReceiverSingle() - Me.ucrInputColumnName = New instat.ucrInputComboBox() + Me.ucrInputCountColumnName = New instat.ucrInputComboBox() Me.lblNewColumnName = New System.Windows.Forms.Label() Me.lblSelectedFactor = New System.Windows.Forms.Label() Me.SuspendLayout() @@ -56,18 +56,18 @@ Partial Class dlgCountinFactor Me.ucrCountReceiver.Size = New System.Drawing.Size(130, 20) Me.ucrCountReceiver.TabIndex = 2 ' - 'ucrInputColumnName + 'ucrInputCountColumnName ' - Me.ucrInputColumnName.IsReadOnly = False - Me.ucrInputColumnName.Location = New System.Drawing.Point(144, 205) - Me.ucrInputColumnName.Name = "ucrInputColumnName" - Me.ucrInputColumnName.Size = New System.Drawing.Size(204, 21) - Me.ucrInputColumnName.TabIndex = 3 + Me.ucrInputCountColumnName.IsReadOnly = False + Me.ucrInputCountColumnName.Location = New System.Drawing.Point(144, 205) + Me.ucrInputCountColumnName.Name = "ucrInputCountColumnName" + Me.ucrInputCountColumnName.Size = New System.Drawing.Size(204, 21) + Me.ucrInputCountColumnName.TabIndex = 3 ' 'lblNewColumnName ' Me.lblNewColumnName.AutoSize = True - Me.lblNewColumnName.Location = New System.Drawing.Point(12, 205) + Me.lblNewColumnName.Location = New System.Drawing.Point(6, 205) Me.lblNewColumnName.Name = "lblNewColumnName" Me.lblNewColumnName.Size = New System.Drawing.Size(98, 13) Me.lblNewColumnName.TabIndex = 4 @@ -89,7 +89,7 @@ Partial Class dlgCountinFactor Me.ClientSize = New System.Drawing.Size(423, 297) Me.Controls.Add(Me.lblSelectedFactor) Me.Controls.Add(Me.lblNewColumnName) - Me.Controls.Add(Me.ucrInputColumnName) + Me.Controls.Add(Me.ucrInputCountColumnName) Me.Controls.Add(Me.ucrCountReceiver) Me.Controls.Add(Me.ucrCountSelector) Me.Controls.Add(Me.ucrBase) @@ -108,7 +108,7 @@ Partial Class dlgCountinFactor Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrCountSelector As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrCountReceiver As ucrReceiverSingle - Friend WithEvents ucrInputColumnName As ucrInputComboBox + Friend WithEvents ucrInputCountColumnName As ucrInputComboBox Friend WithEvents lblNewColumnName As Label Friend WithEvents lblSelectedFactor As Label End Class diff --git a/instat/dlgCountinFactor.vb b/instat/dlgCountinFactor.vb index 97a2164e740..55e62184158 100644 --- a/instat/dlgCountinFactor.vb +++ b/instat/dlgCountinFactor.vb @@ -15,7 +15,7 @@ ' along with this program. If not, see . Imports instat.Translations Public Class dlgCountinFactor - Private bFirstLoad As Boolean + Private bFirstLoad As Boolean = True Private Sub dlgCountinFactor_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -24,29 +24,30 @@ Public Class dlgCountinFactor Else ReopenDialog() End If + TestOkEnabled() End Sub Private Sub InitialiseDialog() ucrCountReceiver.Selector = ucrCountSelector ucrCountReceiver.SetIncludedDataTypes({"factor"}) ucrCountReceiver.SetMeAsReceiver() - - ucrInputColumnName.SetPrefix("Count") - ucrInputColumnName.SetItemsTypeAsColumns() - ucrInputColumnName.SetDefaultTypeAsColumn() - ucrInputColumnName.SetDataFrameSelector(ucrCountSelector.ucrAvailableDataFrames) - ucrInputColumnName.SetValidationTypeAsRVariable() - + 'ucrBase.iHelpTopicID= + ucrInputCountColumnName.SetItemsTypeAsColumns() + ucrInputCountColumnName.SetDefaultTypeAsColumn() + ucrInputCountColumnName.SetDataFrameSelector(ucrCountSelector.ucrAvailableDataFrames) + ucrInputCountColumnName.SetValidationTypeAsRVariable() + ucrBase.clsRsyntax.SetFunction("fac.nested") End Sub Private Sub SetDefaults() ucrCountSelector.Reset() - ucrInputColumnName.Reset() + ucrInputCountColumnName.Reset() + ucrInputCountColumnName.SetPrefix("Count") TestOkEnabled() End Sub Private Sub ReopenDialog() End Sub Private Sub TestOkEnabled() - If Not ucrCountReceiver.IsEmpty AndAlso Not ucrInputColumnName.IsEmpty Then + If Not ucrCountReceiver.IsEmpty AndAlso Not ucrInputCountColumnName.IsEmpty Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -56,8 +57,16 @@ Public Class dlgCountinFactor SetDefaults() End Sub - Private Sub ucrInputColumnName_NameChanged() Handles ucrInputColumnName.NameChanged - ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrInputColumnName.GetText, strTempDataframe:=ucrCountSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrInputColumnName.GetText, bAssignToIsPrefix:=True) + Private Sub ucrInputColumnName_NameChanged() Handles ucrInputCountColumnName.NameChanged + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrInputCountColumnName.GetText, strTempDataframe:=ucrCountSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrInputCountColumnName.GetText, bAssignToIsPrefix:=True) + TestOkEnabled() + End Sub + Private Sub ucrCountReceiver_SelectionChanged(sender As Object, e As EventArgs) Handles ucrCountReceiver.SelectionChanged + If Not ucrCountReceiver.IsEmpty Then + ucrBase.clsRsyntax.AddParameter("nesting.fac", clsRFunctionParameter:=ucrCountReceiver.GetVariables) + Else + ucrBase.clsRsyntax.RemoveParameter("nesting.fac") + End If TestOkEnabled() End Sub End Class \ No newline at end of file diff --git a/instat/dlgOneVarCompareModels.vb b/instat/dlgOneVarCompareModels.vb index d8a58324fe9..6619d81b56a 100644 --- a/instat/dlgOneVarCompareModels.vb +++ b/instat/dlgOneVarCompareModels.vb @@ -17,7 +17,7 @@ Imports instat.Translations Public Class dlgOneVarCompareModels - Private clsRcdfcompFunction As New RFunction + 'Private clsRcdfcompFunction As New RFunction Public bfirstload As Boolean = True Private Sub dlgOneVarCompareModels_Load(sender As Object, e As EventArgs) Handles MyBase.Load diff --git a/instat/dlgOneVarUseModel.vb b/instat/dlgOneVarUseModel.vb index 4f2ddd8a1c5..a6f23e0fb78 100644 --- a/instat/dlgOneVarUseModel.vb +++ b/instat/dlgOneVarUseModel.vb @@ -17,8 +17,8 @@ Imports instat.Translations Public Class dlgOneVarUseModel - Private clsRBootDist As New RFunction Public bfirstload As Boolean = True + Public clsRbootFunction As New RFunction Private Sub dlgOneVarUseModel_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bfirstload Then @@ -35,14 +35,11 @@ Public Class dlgOneVarUseModel sdgOneVarUseModBootstrap.InitialiseDialog() 'ucrBase.iHelpTopicID = ucrBase.clsRsyntax.iCallType = 2 - ' do we want this to be plotted? ucrReceiver.Selector = ucrSelector ucrReceiver.SetMeAsReceiver() ucrSaveModel.SetDataFrameSelector(ucrSelector.ucrAvailableDataFrames) - ucrBase.clsRsyntax.SetFunction("bootdist") - 'or is it clsRBootDist.SetRCommand("bootdist") - 'clsRquantiledist.SetRCommand("quantile")??? ucrSaveModel.SetPrefix("model") + ucrBase.clsRsyntax.SetFunction("quantile") ucrSaveModel.SetItemsTypeAsModels() ucrSaveModel.SetDefaultTypeAsModel() ucrSaveModel.SetValidationTypeAsRVariable() @@ -52,6 +49,7 @@ Public Class dlgOneVarUseModel ucrSaveObjects.SetValidationTypeAsRVariable() ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False ucrSelector.SetItemType("model") + sdgOneVarUseModBootstrap.SetMyBootFunction(clsRbootFunction) sdgOneVarUseModBootstrap.SetMyRSyntax(ucrBase.clsRsyntax) End Sub @@ -70,7 +68,7 @@ Public Class dlgOneVarUseModel chkSaveBootstrap.Visible = False cmdBootstrapOptions.Visible = False BootstrapEnabled() - SetBootDistFunction() + SetFunctions() TestOKEnabled() End Sub @@ -104,13 +102,15 @@ Public Class dlgOneVarUseModel TestOKEnabled() End Sub - Private Sub SetBootDistFunction() + Private Sub SetFunctions() If chkProduceBootstrap.Checked Then - 'if in initialise I do clsRbootdist.SetRCommand("bootdist"), then this is clsRBootDist.AddParameter("f", clsRFunctionParameter:=ucrReceiver.GetVariables()) - ucrBase.clsRsyntax.AddParameter("f", clsRFunctionParameter:=ucrReceiver.GetVariables()) + clsRbootFunction.SetRCommand("bootdist") + clsRbootFunction.AddParameter("f", clsRFunctionParameter:=ucrReceiver.GetVariables()) + ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=clsRbootFunction) Else - ucrBase.clsRsyntax.RemoveParameter("f") + ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiver.GetVariables()) End If + End Sub Private Sub AssignSaveModel() @@ -150,8 +150,9 @@ Public Class dlgOneVarUseModel End Sub Private Sub UcrReceiver_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiver.SelectionChanged - TestOKEnabled() BootstrapEnabled() + SetFunctions() + TestOKEnabled() End Sub Private Sub BootstrapEnabled() @@ -173,7 +174,7 @@ Public Class dlgOneVarUseModel End If TestOKEnabled() AssignSaveObjects() - SetBootDistFunction() + SetFunctions() End Sub Private Sub cmdBootstrapOptions_Click(sender As Object, e As EventArgs) Handles cmdBootstrapOptions.Click @@ -185,7 +186,9 @@ Public Class dlgOneVarUseModel Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk 'sdgOneVarUseModBootstrap.CreateGraphs()? - TestOKEnabled() End Sub + Private Sub ucrBase_BeforeClickOk(sender As Object, e As EventArgs) Handles ucrBase.BeforeClickOk + frmMain.clsRLink.RunScript(clsRbootFunction.ToScript(), bReturnOutput:=2) + End Sub End Class \ No newline at end of file diff --git a/instat/dlgOneVariableGraph.vb b/instat/dlgOneVariableGraph.vb index bfc8ea18422..141cbffd899 100644 --- a/instat/dlgOneVariableGraph.vb +++ b/instat/dlgOneVariableGraph.vb @@ -22,14 +22,12 @@ Public Class dlgOneVariableGraph Private bFirstLoad As Boolean = True Private clsBaseOperatorOneColumn As New ROperator Private clsBaseFunctionMultipleVariables As New RFunction - Public strNumericGeomFunction As String - Public strCategoricalGeomFunction As String Private Sub dlgOneVariableGraph_Load(sender As Object, e As EventArgs) Handles Me.Load autoTranslate(Me) If bFirstLoad Then - InitialiseDialog() SetDefaults() + InitialiseDialog() bFirstLoad = False Else ReopenDialog() @@ -67,13 +65,10 @@ Public Class dlgOneVariableGraph clsBaseFunctionMultipleVariables.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$graph_one_variable") sdgOneVarGraph.SetRSyntax(ucrBase.clsRsyntax) - sdgOneVarGraph.SetNumericGeomFunction(strNumericGeomFunction) - sdgOneVarGraph.SetCategoricalGeomFunction(strCategoricalGeomFunction) - End Sub Private Sub ReopenDialog() - + CheckDataType() End Sub Private Sub TestOkEnabled() @@ -87,10 +82,10 @@ Public Class dlgOneVariableGraph Private Sub OneOrMoreVariables() If ucrReceiverOneVarGraph.GetVariablesAsList.Count = 1 Then ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperatorOneColumn) - If ucrReceiverOneVarGraph.GetCurrentItemTypes()(0) = "numeric" Then 'TODO Geom should come from the subdialog - clsRgeom_Function.SetRCommand(strNumericGeomFunction) + sdgOneVarGraph.SetNumericGeomFunction() + clsRgeom_Function.SetRCommand(sdgOneVarGraph.strNumericGeomFunction) If Not ucrReceiverOneVarGraph.IsEmpty() Then clsRaesFunction.AddParameter("y", ucrReceiverOneVarGraph.GetVariableNames(False)) End If @@ -98,8 +93,8 @@ Public Class dlgOneVariableGraph clsRaesFunction.AddParameter("x", Chr(34) & Chr(34)) Else 'TODO Geom should come from the subdialog - clsRgeom_Function.SetRCommand(strCategoricalGeomFunction) - + sdgOneVarGraph.SetCategoricalGeomFunction() + clsRgeom_Function.SetRCommand(sdgOneVarGraph.strCategoriacalGeomFunction) If Not ucrReceiverOneVarGraph.IsEmpty() Then clsRaesFunction.AddParameter("x", ucrReceiverOneVarGraph.GetVariableNames(False)) End If @@ -117,6 +112,7 @@ Public Class dlgOneVariableGraph Private Sub ucrReceiverOneVarGraph_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverOneVarGraph.SelectionChanged OneOrMoreVariables() + CheckDataType() TestOkEnabled() End Sub @@ -137,11 +133,33 @@ Public Class dlgOneVariableGraph sdgOneVarGraph.ShowDialog() End Sub - Private Sub rdoFacets_CheckedChanged(sender As Object, e As EventArgs) Handles rdoFacets.CheckedChanged + Private Sub rdoFacets_CheckedChanged(sender As Object, e As EventArgs) Handles rdoFacets.CheckedChanged, rdoCombineGraph.CheckedChanged, rdoSingleGraphs.CheckedChanged + SetOutputparameter() + End Sub + + Private Sub SetOutputparameter() If rdoFacets.Checked Then - clsBaseFunctionMultipleVariables.AddParameter("facets", "TRUE") + clsBaseFunctionMultipleVariables.AddParameter("output", Chr(34) & "facets" & Chr(34)) + ElseIf rdoCombineGraph.Checked Then + clsBaseFunctionMultipleVariables.AddParameter("output", Chr(34) & "combine" & Chr(34)) + ElseIf rdoSingleGraphs.Checked Then + clsBaseFunctionMultipleVariables.AddParameter("output", Chr(34) & "single" & Chr(34)) + Else + clsBaseFunctionMultipleVariables.RemoveParameterByName("output") 'this might never run because atleast one must be checked at a time + End If + End Sub + + Private Sub CheckDataType() + If ucrReceiverOneVarGraph.GetCurrentItemTypes(True).Count > 1 Then + rdoFacets.Enabled = False + rdoFacets.Checked = False + rdoCombineGraph.Checked = True + rdoCombineGraph.Enabled = True Else - clsBaseFunctionMultipleVariables.RemoveParameterByName("facets") + rdoFacets.Enabled = True + rdoFacets.Checked = True + rdoCombineGraph.Checked = False + rdoCombineGraph.Enabled = False End If End Sub End Class \ No newline at end of file diff --git a/instat/dlgPermuteColumn.vb b/instat/dlgPermuteColumn.vb index e4e280b8659..76497b8194b 100644 --- a/instat/dlgPermuteColumn.vb +++ b/instat/dlgPermuteColumn.vb @@ -54,8 +54,6 @@ Public Class dlgPermuteColumn clsSetSampleFunc.AddParameter("replace", "FALSE") nudSetSeed.Visible = False ucrBase.iHelpTopicID = 66 - - ucrInputPermuteRows.SetPrefix("permute") ucrInputPermuteRows.SetItemsTypeAsColumns() ucrInputPermuteRows.SetDefaultTypeAsColumn() ucrInputPermuteRows.SetDataFrameSelector(ucrPermuteRowsSelector.ucrAvailableDataFrames) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 447f613f11f..264c491f0fa 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -31,16 +31,20 @@ Partial Class frmMain Me.mnuDescribeTwoVariablesSummarise = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesTabulate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoVariablesGraph = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeTwoVariablesCorrelate = New System.Windows.Forms.ToolStripMenuItem() - Me.DescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeSpecific = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeOtherTableDialogsFrequency = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeOtherTableDialogsSummary = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeOtherTableDialogsMultipleResponse = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() Me.DescribeGeneralColumnSummaries = New System.Windows.Forms.ToolStripMenuItem() Me.DescribeGeneralTabulation = New System.Windows.Forms.ToolStripMenuItem() Me.DescribeGeneralGraphics = New System.Windows.Forms.ToolStripMenuItem() - Me.DescribeGeneralCorrelations = New System.Windows.Forms.ToolStripMenuItem() - Me.DescribeGeneralPrincipalComponents = New System.Windows.Forms.ToolStripMenuItem() - Me.DescribeGeneralCanonicalCorrelations = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuDescribeGraphicsDialogs = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeMultivariate = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeMultivariateCorrelations = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeMultivariateprincipalComponents = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeMultivariateCanonicalCorrelations = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeMoregraphs = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeOtherGraphicsDialogsScatterPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeOtherGraphicsDialogsLinePlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeOtherGraphicsDialogsHistogram = New System.Windows.Forms.ToolStripMenuItem() @@ -53,19 +57,15 @@ Partial Class frmMain Me.mnuDescribeOtherGraphicsDialogsCumulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeOtherGraphicsDialogsInventoryPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeOtherGraphicsDialogsPopulationPyramid = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeTableDialogs = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeOtherTableDialogsFrequency = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeOtherTableDialogsSummary = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeOtherTableDialogsMultipleResponse = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator13 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuDescribeUseObjects = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeUseObjectsUseGraph = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeUseObjectsCombineGraphs = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeUseObjectsThemes = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeUseGraph = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeCombineGraph = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeThemes = New System.Windows.Forms.ToolStripMenuItem() Me.mnuModel = New System.Windows.Forms.ToolStripMenuItem() Me.mnuModelProbabilityDistributions = New System.Windows.Forms.ToolStripMenuItem() Me.mnuModelProbabilityDistributionsShowModels = New System.Windows.Forms.ToolStripMenuItem() Me.mnuModelProbabilityDistributionsRandomSamplesUseModel = New System.Windows.Forms.ToolStripMenuItem() + Me.TablesPlusToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.mnuModelOneVariable = New System.Windows.Forms.ToolStripMenuItem() Me.mnuModelOneVariableFitModel = New System.Windows.Forms.ToolStripMenuItem() @@ -108,7 +108,6 @@ Partial Class frmMain Me.mnuModelOtherGeneralANOVAGeneral = New System.Windows.Forms.ToolStripMenuItem() Me.mnuModelOtherGeneralRegression = New System.Windows.Forms.ToolStripMenuItem() Me.mnuModelOtherGeneralLogLinear = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticEventsWaterBalance = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticExamine = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticProcess = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator17 = New System.Windows.Forms.ToolStripSeparator() @@ -147,26 +146,29 @@ Partial Class frmMain Me.OpenFile = New System.Windows.Forms.OpenFileDialog() Me.ToolStripSeparator16 = New System.Windows.Forms.ToolStripSeparator() Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() - Me.mnuClimaticEventsSpells = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimatic = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileOpensst = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticManage = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticManageNewWorksheet = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticManageImportDailyData = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticManageMakeFactor = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticManageShiftDailyData = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticManageUnstackDailyData = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticManageStackDailyData = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganise = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseEvents = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseEventsStartoftheRains = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseEventsExtremes = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseEventsSpells = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseEventsWaterBalance = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseEventsEndoftheRains = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseSummary = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseNewWorksheet = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseImportDailyData = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseMakeFactor = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseShiftDailyData = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseUnstackDailyData = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseStackDailyData = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuClimaticManageInterpolate = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticManageOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticDisplayDaily = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticSummary = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticEvents = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticEventsStartOfTheRains = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticEventsExtremes = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimaticEventsEndofRains = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseInterpolate = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticOrganiseOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticDescribe = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticDescribeDescribeDaily = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticModel = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator23 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimateMethods = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimateMethodsDataManipulation = New System.Windows.Forms.ToolStripMenuItem() @@ -362,7 +364,6 @@ Partial Class frmMain Me.mnuToolsSaveCurrentOptions = New System.Windows.Forms.ToolStripMenuItem() Me.mnuToolsLoadOptions = New System.Windows.Forms.ToolStripMenuItem() Me.mnuToolsOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.TablesPlusToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -370,7 +371,7 @@ Partial Class frmMain ' 'mnuDescribe ' - Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoVariables, Me.DescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeGraphicsDialogs, Me.mnuDescribeTableDialogs, Me.ToolStripSeparator13, Me.mnuDescribeUseObjects}) + Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoVariables, Me.mnuDescribeSpecific, Me.mnuDescribeGeneral, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.mnuDescribeMoregraphs, Me.ToolStripSeparator13, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes}) Me.mnuDescribe.Name = "mnuDescribe" Me.mnuDescribe.Size = New System.Drawing.Size(64, 20) Me.mnuDescribe.Tag = "Describe" @@ -380,7 +381,7 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(162, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(172, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' @@ -400,9 +401,9 @@ Partial Class frmMain ' 'mnuDescribeTwoVariables ' - Me.mnuDescribeTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesTabulate, Me.mnuDescribeTwoVariablesGraph, Me.mnuDescribeTwoVariablesCorrelate}) + Me.mnuDescribeTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesTabulate, Me.mnuDescribeTwoVariablesGraph}) Me.mnuDescribeTwoVariables.Name = "mnuDescribeTwoVariables" - Me.mnuDescribeTwoVariables.Size = New System.Drawing.Size(162, 22) + Me.mnuDescribeTwoVariables.Size = New System.Drawing.Size(172, 22) Me.mnuDescribeTwoVariables.Tag = "Two_Variables" Me.mnuDescribeTwoVariables.Text = "Two Variables" ' @@ -428,27 +429,51 @@ Partial Class frmMain Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' - 'mnuDescribeTwoVariablesCorrelate + 'mnuDescribeSpecific + ' + Me.mnuDescribeSpecific.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOtherTableDialogsFrequency, Me.mnuDescribeOtherTableDialogsSummary, Me.mnuDescribeOtherTableDialogsMultipleResponse}) + Me.mnuDescribeSpecific.Name = "mnuDescribeSpecific" + Me.mnuDescribeSpecific.Size = New System.Drawing.Size(172, 22) + Me.mnuDescribeSpecific.Tag = "Table_Dialogs" + Me.mnuDescribeSpecific.Text = "Specific" + ' + 'mnuDescribeOtherTableDialogsFrequency + ' + Me.mnuDescribeOtherTableDialogsFrequency.Enabled = False + Me.mnuDescribeOtherTableDialogsFrequency.Name = "mnuDescribeOtherTableDialogsFrequency" + Me.mnuDescribeOtherTableDialogsFrequency.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOtherTableDialogsFrequency.Tag = "Frequency..." + Me.mnuDescribeOtherTableDialogsFrequency.Text = "Frequency..." + ' + 'mnuDescribeOtherTableDialogsSummary + ' + Me.mnuDescribeOtherTableDialogsSummary.Enabled = False + Me.mnuDescribeOtherTableDialogsSummary.Name = "mnuDescribeOtherTableDialogsSummary" + Me.mnuDescribeOtherTableDialogsSummary.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOtherTableDialogsSummary.Tag = "Summary..." + Me.mnuDescribeOtherTableDialogsSummary.Text = "Summary..." + ' + 'mnuDescribeOtherTableDialogsMultipleResponse ' - Me.mnuDescribeTwoVariablesCorrelate.Enabled = False - Me.mnuDescribeTwoVariablesCorrelate.Name = "mnuDescribeTwoVariablesCorrelate" - Me.mnuDescribeTwoVariablesCorrelate.Size = New System.Drawing.Size(142, 22) - Me.mnuDescribeTwoVariablesCorrelate.Tag = "Correlate..." - Me.mnuDescribeTwoVariablesCorrelate.Text = "Correlate..." + Me.mnuDescribeOtherTableDialogsMultipleResponse.Enabled = False + Me.mnuDescribeOtherTableDialogsMultipleResponse.Name = "mnuDescribeOtherTableDialogsMultipleResponse" + Me.mnuDescribeOtherTableDialogsMultipleResponse.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOtherTableDialogsMultipleResponse.Tag = "Multiple_Response..." + Me.mnuDescribeOtherTableDialogsMultipleResponse.Text = "Multiple Response..." ' - 'DescribeGeneral + 'mnuDescribeGeneral ' - Me.DescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DescribeGeneralColumnSummaries, Me.DescribeGeneralTabulation, Me.DescribeGeneralGraphics, Me.DescribeGeneralCorrelations, Me.DescribeGeneralPrincipalComponents, Me.DescribeGeneralCanonicalCorrelations}) - Me.DescribeGeneral.Name = "DescribeGeneral" - Me.DescribeGeneral.Size = New System.Drawing.Size(162, 22) - Me.DescribeGeneral.Tag = "General" - Me.DescribeGeneral.Text = "General" + Me.mnuDescribeGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DescribeGeneralColumnSummaries, Me.DescribeGeneralTabulation, Me.DescribeGeneralGraphics}) + Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(172, 22) + Me.mnuDescribeGeneral.Tag = "General" + Me.mnuDescribeGeneral.Text = "General" ' 'DescribeGeneralColumnSummaries ' Me.DescribeGeneralColumnSummaries.Enabled = False Me.DescribeGeneralColumnSummaries.Name = "DescribeGeneralColumnSummaries" - Me.DescribeGeneralColumnSummaries.Size = New System.Drawing.Size(203, 22) + Me.DescribeGeneralColumnSummaries.Size = New System.Drawing.Size(188, 22) Me.DescribeGeneralColumnSummaries.Tag = "Column_Summaries..." Me.DescribeGeneralColumnSummaries.Text = "Column Summaries..." ' @@ -456,50 +481,54 @@ Partial Class frmMain ' Me.DescribeGeneralTabulation.Enabled = False Me.DescribeGeneralTabulation.Name = "DescribeGeneralTabulation" - Me.DescribeGeneralTabulation.Size = New System.Drawing.Size(203, 22) + Me.DescribeGeneralTabulation.Size = New System.Drawing.Size(188, 22) Me.DescribeGeneralTabulation.Tag = "Tabulation..." Me.DescribeGeneralTabulation.Text = "Tabulation..." ' 'DescribeGeneralGraphics ' Me.DescribeGeneralGraphics.Name = "DescribeGeneralGraphics" - Me.DescribeGeneralGraphics.Size = New System.Drawing.Size(203, 22) + Me.DescribeGeneralGraphics.Size = New System.Drawing.Size(188, 22) Me.DescribeGeneralGraphics.Tag = "Graphics..." Me.DescribeGeneralGraphics.Text = "Graphics..." ' - 'DescribeGeneralCorrelations + 'ToolStripSeparator9 ' - Me.DescribeGeneralCorrelations.Name = "DescribeGeneralCorrelations" - Me.DescribeGeneralCorrelations.Size = New System.Drawing.Size(203, 22) - Me.DescribeGeneralCorrelations.Tag = "Correlations" - Me.DescribeGeneralCorrelations.Text = "Correlations..." + Me.ToolStripSeparator9.Name = "ToolStripSeparator9" + Me.ToolStripSeparator9.Size = New System.Drawing.Size(169, 6) ' - 'DescribeGeneralPrincipalComponents + 'mnuDescribeMultivariate ' - Me.DescribeGeneralPrincipalComponents.Name = "DescribeGeneralPrincipalComponents" - Me.DescribeGeneralPrincipalComponents.Size = New System.Drawing.Size(203, 22) - Me.DescribeGeneralPrincipalComponents.Tag = "Principal_Components" - Me.DescribeGeneralPrincipalComponents.Text = "Principal Components..." + Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations}) + Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(172, 22) + Me.mnuDescribeMultivariate.Text = "Multivariate" ' - 'DescribeGeneralCanonicalCorrelations + 'mnuDescribeMultivariateCorrelations ' - Me.DescribeGeneralCanonicalCorrelations.Name = "DescribeGeneralCanonicalCorrelations" - Me.DescribeGeneralCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) - Me.DescribeGeneralCanonicalCorrelations.Tag = "Canonical_Correlations" - Me.DescribeGeneralCanonicalCorrelations.Text = "Canonical Correlations..." + Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." ' - 'ToolStripSeparator9 + 'mnuDescribeMultivariateprincipalComponents ' - Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(159, 6) + Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' - 'mnuDescribeGraphicsDialogs + 'mnuDescribeMultivariateCanonicalCorrelations ' - Me.mnuDescribeGraphicsDialogs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOtherGraphicsDialogsScatterPlot, Me.mnuDescribeOtherGraphicsDialogsLinePlot, Me.mnuDescribeOtherGraphicsDialogsHistogram, Me.mnuDescribeOtherGraphicsDialogsBoxplot, Me.mnuDescribeOtherGraphicsDialogsDotPlot, Me.mnuDescribeOtherGraphicsDialogsBarChart, Me.mnuDescribeOtherGraphicsDialogsBarChartFromSummary, Me.ToolStripSeparator8, Me.mnuDescribeOtherGraphicsDialogsWindRose, Me.mnuDescribeOtherGraphicsDialogsCumulativeDistribution, Me.mnuDescribeOtherGraphicsDialogsInventoryPlot, Me.mnuDescribeOtherGraphicsDialogsPopulationPyramid}) - Me.mnuDescribeGraphicsDialogs.Name = "mnuDescribeGraphicsDialogs" - Me.mnuDescribeGraphicsDialogs.Size = New System.Drawing.Size(162, 22) - Me.mnuDescribeGraphicsDialogs.Tag = "Graphics_Dialogs" - Me.mnuDescribeGraphicsDialogs.Text = "Graphics Dialogs" + Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." + ' + 'mnuDescribeMoregraphs + ' + Me.mnuDescribeMoregraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOtherGraphicsDialogsScatterPlot, Me.mnuDescribeOtherGraphicsDialogsLinePlot, Me.mnuDescribeOtherGraphicsDialogsHistogram, Me.mnuDescribeOtherGraphicsDialogsBoxplot, Me.mnuDescribeOtherGraphicsDialogsDotPlot, Me.mnuDescribeOtherGraphicsDialogsBarChart, Me.mnuDescribeOtherGraphicsDialogsBarChartFromSummary, Me.ToolStripSeparator8, Me.mnuDescribeOtherGraphicsDialogsWindRose, Me.mnuDescribeOtherGraphicsDialogsCumulativeDistribution, Me.mnuDescribeOtherGraphicsDialogsInventoryPlot, Me.mnuDescribeOtherGraphicsDialogsPopulationPyramid}) + Me.mnuDescribeMoregraphs.Name = "mnuDescribeMoregraphs" + Me.mnuDescribeMoregraphs.Size = New System.Drawing.Size(172, 22) + Me.mnuDescribeMoregraphs.Tag = "Graphics_Dialogs" + Me.mnuDescribeMoregraphs.Text = "More Graphs" ' 'mnuDescribeOtherGraphicsDialogsScatterPlot ' @@ -586,72 +615,28 @@ Partial Class frmMain Me.mnuDescribeOtherGraphicsDialogsPopulationPyramid.Tag = "Population_Pyramid..." Me.mnuDescribeOtherGraphicsDialogsPopulationPyramid.Text = "Population Pyramid..." ' - 'mnuDescribeTableDialogs - ' - Me.mnuDescribeTableDialogs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOtherTableDialogsFrequency, Me.mnuDescribeOtherTableDialogsSummary, Me.mnuDescribeOtherTableDialogsMultipleResponse}) - Me.mnuDescribeTableDialogs.Name = "mnuDescribeTableDialogs" - Me.mnuDescribeTableDialogs.Size = New System.Drawing.Size(162, 22) - Me.mnuDescribeTableDialogs.Tag = "Table_Dialogs" - Me.mnuDescribeTableDialogs.Text = "Table Dialogs" - ' - 'mnuDescribeOtherTableDialogsFrequency - ' - Me.mnuDescribeOtherTableDialogsFrequency.Enabled = False - Me.mnuDescribeOtherTableDialogsFrequency.Name = "mnuDescribeOtherTableDialogsFrequency" - Me.mnuDescribeOtherTableDialogsFrequency.Size = New System.Drawing.Size(180, 22) - Me.mnuDescribeOtherTableDialogsFrequency.Tag = "Frequency..." - Me.mnuDescribeOtherTableDialogsFrequency.Text = "Frequency..." - ' - 'mnuDescribeOtherTableDialogsSummary - ' - Me.mnuDescribeOtherTableDialogsSummary.Enabled = False - Me.mnuDescribeOtherTableDialogsSummary.Name = "mnuDescribeOtherTableDialogsSummary" - Me.mnuDescribeOtherTableDialogsSummary.Size = New System.Drawing.Size(180, 22) - Me.mnuDescribeOtherTableDialogsSummary.Tag = "Summary..." - Me.mnuDescribeOtherTableDialogsSummary.Text = "Summary..." - ' - 'mnuDescribeOtherTableDialogsMultipleResponse - ' - Me.mnuDescribeOtherTableDialogsMultipleResponse.Enabled = False - Me.mnuDescribeOtherTableDialogsMultipleResponse.Name = "mnuDescribeOtherTableDialogsMultipleResponse" - Me.mnuDescribeOtherTableDialogsMultipleResponse.Size = New System.Drawing.Size(180, 22) - Me.mnuDescribeOtherTableDialogsMultipleResponse.Tag = "Multiple_Response..." - Me.mnuDescribeOtherTableDialogsMultipleResponse.Text = "Multiple Response..." - ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(159, 6) - ' - 'mnuDescribeUseObjects - ' - Me.mnuDescribeUseObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeUseObjectsUseGraph, Me.mnuDescribeUseObjectsCombineGraphs, Me.mnuDescribeUseObjectsThemes}) - Me.mnuDescribeUseObjects.Name = "mnuDescribeUseObjects" - Me.mnuDescribeUseObjects.Size = New System.Drawing.Size(162, 22) - Me.mnuDescribeUseObjects.Tag = "Use_Objects" - Me.mnuDescribeUseObjects.Text = "Use Objects" + Me.ToolStripSeparator13.Size = New System.Drawing.Size(169, 6) ' - 'mnuDescribeUseObjectsUseGraph + 'mnuDescribeUseGraph ' - Me.mnuDescribeUseObjectsUseGraph.Name = "mnuDescribeUseObjectsUseGraph" - Me.mnuDescribeUseObjectsUseGraph.Size = New System.Drawing.Size(172, 22) - Me.mnuDescribeUseObjectsUseGraph.Tag = "UseGraph" - Me.mnuDescribeUseObjectsUseGraph.Text = "Use Graph..." + Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(172, 22) + Me.mnuDescribeUseGraph.Text = "Use Graph..." ' - 'mnuDescribeUseObjectsCombineGraphs + 'mnuDescribeCombineGraph ' - Me.mnuDescribeUseObjectsCombineGraphs.Name = "mnuDescribeUseObjectsCombineGraphs" - Me.mnuDescribeUseObjectsCombineGraphs.Size = New System.Drawing.Size(172, 22) - Me.mnuDescribeUseObjectsCombineGraphs.Tag = "Combine_Graphs..." - Me.mnuDescribeUseObjectsCombineGraphs.Text = "Combine Graphs..." + Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(172, 22) + Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' - 'mnuDescribeUseObjectsThemes + 'mnuDescribeThemes ' - Me.mnuDescribeUseObjectsThemes.Enabled = False - Me.mnuDescribeUseObjectsThemes.Name = "mnuDescribeUseObjectsThemes" - Me.mnuDescribeUseObjectsThemes.Size = New System.Drawing.Size(172, 22) - Me.mnuDescribeUseObjectsThemes.Tag = "Themes" - Me.mnuDescribeUseObjectsThemes.Text = "Themes..." + Me.mnuDescribeThemes.Name = "mnuDescribeThemes" + Me.mnuDescribeThemes.Size = New System.Drawing.Size(172, 22) + Me.mnuDescribeThemes.Text = "Themes..." ' 'mnuModel ' @@ -684,6 +669,12 @@ Partial Class frmMain Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples (Use Model)..." ' + 'TablesPlusToolStripMenuItem + ' + Me.TablesPlusToolStripMenuItem.Name = "TablesPlusToolStripMenuItem" + Me.TablesPlusToolStripMenuItem.Size = New System.Drawing.Size(242, 22) + Me.TablesPlusToolStripMenuItem.Text = "Tables Plus" + ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" @@ -993,14 +984,6 @@ Partial Class frmMain Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' - 'mnuClimaticEventsWaterBalance - ' - Me.mnuClimaticEventsWaterBalance.Enabled = False - Me.mnuClimaticEventsWaterBalance.Name = "mnuClimaticEventsWaterBalance" - Me.mnuClimaticEventsWaterBalance.Size = New System.Drawing.Size(172, 22) - Me.mnuClimaticEventsWaterBalance.Tag = "Water_Balance" - Me.mnuClimaticEventsWaterBalance.Text = "Water Balance..." - ' 'mnuClimaticExamine ' Me.mnuClimaticExamine.Enabled = False @@ -1256,17 +1239,9 @@ Partial Class frmMain Me.ToolStripSeparator16.Name = "ToolStripSeparator16" Me.ToolStripSeparator16.Size = New System.Drawing.Size(168, 6) ' - 'mnuClimaticEventsSpells - ' - Me.mnuClimaticEventsSpells.Enabled = False - Me.mnuClimaticEventsSpells.Name = "mnuClimaticEventsSpells" - Me.mnuClimaticEventsSpells.Size = New System.Drawing.Size(172, 22) - Me.mnuClimaticEventsSpells.Tag = "Spells" - Me.mnuClimaticEventsSpells.Text = "Spells..." - ' 'mnuClimatic ' - Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.mnuClimaticManage, Me.mnuClimaticDisplayDaily, Me.mnuClimaticSummary, Me.mnuClimaticEvents, Me.ToolStripSeparator16, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticMarkovModelling, Me.ToolStripSeparator17, Me.mnuClimateMethods}) + Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.mnuClimaticOrganise, Me.mnuClimaticDescribe, Me.mnuClimaticModel, Me.ToolStripSeparator16, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticMarkovModelling, Me.ToolStripSeparator17, Me.mnuClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" Me.mnuClimatic.Size = New System.Drawing.Size(63, 20) Me.mnuClimatic.Tag = "Climatic" @@ -1285,130 +1260,144 @@ Partial Class frmMain Me.mnuClimaticFileOpensst.Size = New System.Drawing.Size(134, 22) Me.mnuClimaticFileOpensst.Text = "Open SST..." ' - 'mnuClimaticManage + 'mnuClimaticOrganise ' - Me.mnuClimaticManage.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticManageNewWorksheet, Me.mnuClimaticManageImportDailyData, Me.mnuClimaticManageMakeFactor, Me.mnuClimaticManageShiftDailyData, Me.mnuClimaticManageUnstackDailyData, Me.mnuClimaticManageStackDailyData, Me.ToolStripSeparator15, Me.mnuClimaticManageInterpolate, Me.mnuClimaticManageOptions}) - Me.mnuClimaticManage.Name = "mnuClimaticManage" - Me.mnuClimaticManage.Size = New System.Drawing.Size(171, 22) - Me.mnuClimaticManage.Tag = "Manage" - Me.mnuClimaticManage.Text = "Manage" + Me.mnuClimaticOrganise.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticOrganiseEvents, Me.mnuClimaticOrganiseSummary, Me.mnuClimaticOrganiseNewWorksheet, Me.mnuClimaticOrganiseImportDailyData, Me.mnuClimaticOrganiseMakeFactor, Me.mnuClimaticOrganiseShiftDailyData, Me.mnuClimaticOrganiseUnstackDailyData, Me.mnuClimaticOrganiseStackDailyData, Me.ToolStripSeparator15, Me.mnuClimaticOrganiseInterpolate, Me.mnuClimaticOrganiseOptions}) + Me.mnuClimaticOrganise.Name = "mnuClimaticOrganise" + Me.mnuClimaticOrganise.Size = New System.Drawing.Size(171, 22) + Me.mnuClimaticOrganise.Tag = "Manage" + Me.mnuClimaticOrganise.Text = "Organise" ' - 'mnuClimaticManageNewWorksheet + 'mnuClimaticOrganiseEvents ' - Me.mnuClimaticManageNewWorksheet.Enabled = False - Me.mnuClimaticManageNewWorksheet.Name = "mnuClimaticManageNewWorksheet" - Me.mnuClimaticManageNewWorksheet.Size = New System.Drawing.Size(181, 22) - Me.mnuClimaticManageNewWorksheet.Tag = "New_Worksheet" - Me.mnuClimaticManageNewWorksheet.Text = "New Worksheet..." + Me.mnuClimaticOrganiseEvents.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticOrganiseEventsStartoftheRains, Me.mnuClimaticOrganiseEventsExtremes, Me.mnuClimaticOrganiseEventsSpells, Me.mnuClimaticOrganiseEventsWaterBalance, Me.mnuClimaticOrganiseEventsEndoftheRains}) + Me.mnuClimaticOrganiseEvents.Name = "mnuClimaticOrganiseEvents" + Me.mnuClimaticOrganiseEvents.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseEvents.Text = "Events" ' - 'mnuClimaticManageImportDailyData + 'mnuClimaticOrganiseEventsStartoftheRains ' - Me.mnuClimaticManageImportDailyData.Enabled = False - Me.mnuClimaticManageImportDailyData.Name = "mnuClimaticManageImportDailyData" - Me.mnuClimaticManageImportDailyData.Size = New System.Drawing.Size(181, 22) - Me.mnuClimaticManageImportDailyData.Tag = "Import_daily_data" - Me.mnuClimaticManageImportDailyData.Text = "Import daily Data..." + Me.mnuClimaticOrganiseEventsStartoftheRains.Name = "mnuClimaticOrganiseEventsStartoftheRains" + Me.mnuClimaticOrganiseEventsStartoftheRains.Size = New System.Drawing.Size(172, 22) + Me.mnuClimaticOrganiseEventsStartoftheRains.Text = "Start of the Rains..." ' - 'mnuClimaticManageMakeFactor + 'mnuClimaticOrganiseEventsExtremes ' - Me.mnuClimaticManageMakeFactor.Enabled = False - Me.mnuClimaticManageMakeFactor.Name = "mnuClimaticManageMakeFactor" - Me.mnuClimaticManageMakeFactor.Size = New System.Drawing.Size(181, 22) - Me.mnuClimaticManageMakeFactor.Tag = "Make_Factor" - Me.mnuClimaticManageMakeFactor.Text = "Make Factor..." + Me.mnuClimaticOrganiseEventsExtremes.Name = "mnuClimaticOrganiseEventsExtremes" + Me.mnuClimaticOrganiseEventsExtremes.Size = New System.Drawing.Size(172, 22) + Me.mnuClimaticOrganiseEventsExtremes.Text = "Extremes..." ' - 'mnuClimaticManageShiftDailyData + 'mnuClimaticOrganiseEventsSpells ' - Me.mnuClimaticManageShiftDailyData.Enabled = False - Me.mnuClimaticManageShiftDailyData.Name = "mnuClimaticManageShiftDailyData" - Me.mnuClimaticManageShiftDailyData.Size = New System.Drawing.Size(181, 22) - Me.mnuClimaticManageShiftDailyData.Tag = "Shift_Daily_data" - Me.mnuClimaticManageShiftDailyData.Text = "Shift Daily Data..." + Me.mnuClimaticOrganiseEventsSpells.Name = "mnuClimaticOrganiseEventsSpells" + Me.mnuClimaticOrganiseEventsSpells.Size = New System.Drawing.Size(172, 22) + Me.mnuClimaticOrganiseEventsSpells.Text = "Spells..." ' - 'mnuClimaticManageUnstackDailyData + 'mnuClimaticOrganiseEventsWaterBalance ' - Me.mnuClimaticManageUnstackDailyData.Enabled = False - Me.mnuClimaticManageUnstackDailyData.Name = "mnuClimaticManageUnstackDailyData" - Me.mnuClimaticManageUnstackDailyData.Size = New System.Drawing.Size(181, 22) - Me.mnuClimaticManageUnstackDailyData.Tag = "Unstack_Daily_data" - Me.mnuClimaticManageUnstackDailyData.Text = "Unstack Daily Data..." + Me.mnuClimaticOrganiseEventsWaterBalance.Name = "mnuClimaticOrganiseEventsWaterBalance" + Me.mnuClimaticOrganiseEventsWaterBalance.Size = New System.Drawing.Size(172, 22) + Me.mnuClimaticOrganiseEventsWaterBalance.Text = "Water Balance..." ' - 'mnuClimaticManageStackDailyData + 'mnuClimaticOrganiseEventsEndoftheRains ' - Me.mnuClimaticManageStackDailyData.Enabled = False - Me.mnuClimaticManageStackDailyData.Name = "mnuClimaticManageStackDailyData" - Me.mnuClimaticManageStackDailyData.Size = New System.Drawing.Size(181, 22) - Me.mnuClimaticManageStackDailyData.Tag = "Stack_Daily_data" - Me.mnuClimaticManageStackDailyData.Text = "Stack Daily data..." + Me.mnuClimaticOrganiseEventsEndoftheRains.Name = "mnuClimaticOrganiseEventsEndoftheRains" + Me.mnuClimaticOrganiseEventsEndoftheRains.Size = New System.Drawing.Size(172, 22) + Me.mnuClimaticOrganiseEventsEndoftheRains.Text = "End of the Rains..." ' - 'ToolStripSeparator15 + 'mnuClimaticOrganiseSummary ' - Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(178, 6) + Me.mnuClimaticOrganiseSummary.Name = "mnuClimaticOrganiseSummary" + Me.mnuClimaticOrganiseSummary.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseSummary.Text = "Summary..." + ' + 'mnuClimaticOrganiseNewWorksheet + ' + Me.mnuClimaticOrganiseNewWorksheet.Enabled = False + Me.mnuClimaticOrganiseNewWorksheet.Name = "mnuClimaticOrganiseNewWorksheet" + Me.mnuClimaticOrganiseNewWorksheet.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseNewWorksheet.Tag = "New_Worksheet" + Me.mnuClimaticOrganiseNewWorksheet.Text = "New Worksheet..." + ' + 'mnuClimaticOrganiseImportDailyData + ' + Me.mnuClimaticOrganiseImportDailyData.Enabled = False + Me.mnuClimaticOrganiseImportDailyData.Name = "mnuClimaticOrganiseImportDailyData" + Me.mnuClimaticOrganiseImportDailyData.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseImportDailyData.Tag = "Import_daily_data" + Me.mnuClimaticOrganiseImportDailyData.Text = "Import daily Data..." + ' + 'mnuClimaticOrganiseMakeFactor ' - 'mnuClimaticManageInterpolate + Me.mnuClimaticOrganiseMakeFactor.Enabled = False + Me.mnuClimaticOrganiseMakeFactor.Name = "mnuClimaticOrganiseMakeFactor" + Me.mnuClimaticOrganiseMakeFactor.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseMakeFactor.Tag = "Make_Factor" + Me.mnuClimaticOrganiseMakeFactor.Text = "Make Factor..." ' - Me.mnuClimaticManageInterpolate.Enabled = False - Me.mnuClimaticManageInterpolate.Name = "mnuClimaticManageInterpolate" - Me.mnuClimaticManageInterpolate.Size = New System.Drawing.Size(181, 22) - Me.mnuClimaticManageInterpolate.Tag = "Interpolate" - Me.mnuClimaticManageInterpolate.Text = "Interpolate..." + 'mnuClimaticOrganiseShiftDailyData ' - 'mnuClimaticManageOptions + Me.mnuClimaticOrganiseShiftDailyData.Enabled = False + Me.mnuClimaticOrganiseShiftDailyData.Name = "mnuClimaticOrganiseShiftDailyData" + Me.mnuClimaticOrganiseShiftDailyData.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseShiftDailyData.Tag = "Shift_Daily_data" + Me.mnuClimaticOrganiseShiftDailyData.Text = "Shift Daily Data..." ' - Me.mnuClimaticManageOptions.Enabled = False - Me.mnuClimaticManageOptions.Name = "mnuClimaticManageOptions" - Me.mnuClimaticManageOptions.Size = New System.Drawing.Size(181, 22) - Me.mnuClimaticManageOptions.Tag = "Options" - Me.mnuClimaticManageOptions.Text = "Options..." + 'mnuClimaticOrganiseUnstackDailyData ' - 'mnuClimaticDisplayDaily + Me.mnuClimaticOrganiseUnstackDailyData.Enabled = False + Me.mnuClimaticOrganiseUnstackDailyData.Name = "mnuClimaticOrganiseUnstackDailyData" + Me.mnuClimaticOrganiseUnstackDailyData.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseUnstackDailyData.Tag = "Unstack_Daily_data" + Me.mnuClimaticOrganiseUnstackDailyData.Text = "Unstack Daily Data..." ' - Me.mnuClimaticDisplayDaily.Enabled = False - Me.mnuClimaticDisplayDaily.Name = "mnuClimaticDisplayDaily" - Me.mnuClimaticDisplayDaily.Size = New System.Drawing.Size(171, 22) - Me.mnuClimaticDisplayDaily.Tag = "Display_Daily" - Me.mnuClimaticDisplayDaily.Text = "Display Daily..." + 'mnuClimaticOrganiseStackDailyData ' - 'mnuClimaticSummary + Me.mnuClimaticOrganiseStackDailyData.Enabled = False + Me.mnuClimaticOrganiseStackDailyData.Name = "mnuClimaticOrganiseStackDailyData" + Me.mnuClimaticOrganiseStackDailyData.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseStackDailyData.Tag = "Stack_Daily_data" + Me.mnuClimaticOrganiseStackDailyData.Text = "Stack Daily data..." ' - Me.mnuClimaticSummary.Enabled = False - Me.mnuClimaticSummary.Name = "mnuClimaticSummary" - Me.mnuClimaticSummary.Size = New System.Drawing.Size(171, 22) - Me.mnuClimaticSummary.Tag = "Summary" - Me.mnuClimaticSummary.Text = "Summary..." + 'ToolStripSeparator15 + ' + Me.ToolStripSeparator15.Name = "ToolStripSeparator15" + Me.ToolStripSeparator15.Size = New System.Drawing.Size(178, 6) + ' + 'mnuClimaticOrganiseInterpolate + ' + Me.mnuClimaticOrganiseInterpolate.Enabled = False + Me.mnuClimaticOrganiseInterpolate.Name = "mnuClimaticOrganiseInterpolate" + Me.mnuClimaticOrganiseInterpolate.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseInterpolate.Tag = "Interpolate" + Me.mnuClimaticOrganiseInterpolate.Text = "Interpolate..." ' - 'mnuClimaticEvents + 'mnuClimaticOrganiseOptions ' - Me.mnuClimaticEvents.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEventsStartOfTheRains, Me.mnuClimaticEventsExtremes, Me.mnuClimaticEventsSpells, Me.mnuClimaticEventsWaterBalance, Me.mnuClimaticEventsEndofRains}) - Me.mnuClimaticEvents.Name = "mnuClimaticEvents" - Me.mnuClimaticEvents.Size = New System.Drawing.Size(171, 22) - Me.mnuClimaticEvents.Tag = "Events" - Me.mnuClimaticEvents.Text = "Events" + Me.mnuClimaticOrganiseOptions.Enabled = False + Me.mnuClimaticOrganiseOptions.Name = "mnuClimaticOrganiseOptions" + Me.mnuClimaticOrganiseOptions.Size = New System.Drawing.Size(181, 22) + Me.mnuClimaticOrganiseOptions.Tag = "Options" + Me.mnuClimaticOrganiseOptions.Text = "Options..." ' - 'mnuClimaticEventsStartOfTheRains + 'mnuClimaticDescribe ' - Me.mnuClimaticEventsStartOfTheRains.Enabled = False - Me.mnuClimaticEventsStartOfTheRains.Name = "mnuClimaticEventsStartOfTheRains" - Me.mnuClimaticEventsStartOfTheRains.Size = New System.Drawing.Size(172, 22) - Me.mnuClimaticEventsStartOfTheRains.Tag = "Start_of_the_Rains" - Me.mnuClimaticEventsStartOfTheRains.Text = "Start of the Rains..." + Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeDescribeDaily}) + Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(171, 22) + Me.mnuClimaticDescribe.Text = "Describe" ' - 'mnuClimaticEventsExtremes + 'mnuClimaticDescribeDescribeDaily ' - Me.mnuClimaticEventsExtremes.Enabled = False - Me.mnuClimaticEventsExtremes.Name = "mnuClimaticEventsExtremes" - Me.mnuClimaticEventsExtremes.Size = New System.Drawing.Size(172, 22) - Me.mnuClimaticEventsExtremes.Tag = "Extremes" - Me.mnuClimaticEventsExtremes.Text = "Extremes..." + Me.mnuClimaticDescribeDescribeDaily.Name = "mnuClimaticDescribeDescribeDaily" + Me.mnuClimaticDescribeDescribeDaily.Size = New System.Drawing.Size(150, 22) + Me.mnuClimaticDescribeDescribeDaily.Text = "Display Daily..." ' - 'mnuClimaticEventsEndofRains + 'mnuClimaticModel ' - Me.mnuClimaticEventsEndofRains.Enabled = False - Me.mnuClimaticEventsEndofRains.Name = "mnuClimaticEventsEndofRains" - Me.mnuClimaticEventsEndofRains.Size = New System.Drawing.Size(172, 22) - Me.mnuClimaticEventsEndofRains.Tag = "End_of_the_Rains" - Me.mnuClimaticEventsEndofRains.Text = "End of the Rains" + Me.mnuClimaticModel.Name = "mnuClimaticModel" + Me.mnuClimaticModel.Size = New System.Drawing.Size(171, 22) + Me.mnuClimaticModel.Text = "Model" ' 'ToolStripSeparator23 ' @@ -2835,12 +2824,6 @@ Partial Class frmMain Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' - 'TablesPlusToolStripMenuItem - ' - Me.TablesPlusToolStripMenuItem.Name = "TablesPlusToolStripMenuItem" - Me.TablesPlusToolStripMenuItem.Size = New System.Drawing.Size(242, 22) - Me.TablesPlusToolStripMenuItem.Text = "Tables Plus" - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2867,7 +2850,6 @@ Partial Class frmMain End Sub Friend WithEvents mnuDescribe As ToolStripMenuItem Friend WithEvents mnuModel As ToolStripMenuItem - Friend WithEvents mnuClimaticEventsWaterBalance As ToolStripMenuItem Friend WithEvents mnuClimaticExamine As ToolStripMenuItem Friend WithEvents mnuClimaticProcess As ToolStripMenuItem Friend WithEvents ToolStripSeparator17 As ToolStripSeparator @@ -2893,23 +2875,17 @@ Partial Class frmMain Friend WithEvents OpenFile As OpenFileDialog Friend WithEvents ToolStripSeparator16 As ToolStripSeparator Friend WithEvents SaveFileDialog1 As SaveFileDialog - Friend WithEvents mnuClimaticEventsSpells As ToolStripMenuItem Friend WithEvents mnuClimatic As ToolStripMenuItem - Friend WithEvents mnuClimaticManage As ToolStripMenuItem - Friend WithEvents mnuClimaticManageNewWorksheet As ToolStripMenuItem - Friend WithEvents mnuClimaticManageImportDailyData As ToolStripMenuItem - Friend WithEvents mnuClimaticManageMakeFactor As ToolStripMenuItem - Friend WithEvents mnuClimaticManageShiftDailyData As ToolStripMenuItem - Friend WithEvents mnuClimaticManageUnstackDailyData As ToolStripMenuItem - Friend WithEvents mnuClimaticManageStackDailyData As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganise As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseNewWorksheet As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseImportDailyData As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseMakeFactor As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseShiftDailyData As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseUnstackDailyData As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseStackDailyData As ToolStripMenuItem Friend WithEvents ToolStripSeparator15 As ToolStripSeparator - Friend WithEvents mnuClimaticManageInterpolate As ToolStripMenuItem - Friend WithEvents mnuClimaticManageOptions As ToolStripMenuItem - Friend WithEvents mnuClimaticDisplayDaily As ToolStripMenuItem - Friend WithEvents mnuClimaticSummary As ToolStripMenuItem - Friend WithEvents mnuClimaticEvents As ToolStripMenuItem - Friend WithEvents mnuClimaticEventsStartOfTheRains As ToolStripMenuItem - Friend WithEvents mnuClimaticEventsExtremes As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseInterpolate As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseOptions As ToolStripMenuItem Friend WithEvents mnuFileSave As ToolStripMenuItem Friend WithEvents mnuFileSaveAs As ToolStripMenuItem Friend WithEvents mnuFilePrint As ToolStripMenuItem @@ -2955,7 +2931,6 @@ Partial Class frmMain Friend WithEvents mnuOrganiseColumnReshapeStack As ToolStripMenuItem Friend WithEvents mnuOrganiseColumnReshapeUnstack As ToolStripMenuItem Friend WithEvents mnuOrganiseColumnReshapeSubset As ToolStripMenuItem - Friend WithEvents mnuClimaticEventsEndofRains As ToolStripMenuItem Friend WithEvents mnuOrganiseColumnFactor As ToolStripMenuItem Friend WithEvents mnuOrganiseDataFrameRenameColumn As ToolStripMenuItem Friend WithEvents mnuOrganiseColumnReshapeMerge As ToolStripMenuItem @@ -3048,19 +3023,11 @@ Partial Class frmMain Friend WithEvents mnuDescribeTwoVariablesSummarise As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesTabulate As ToolStripMenuItem Friend WithEvents mnuDescribeTwoVariablesGraph As ToolStripMenuItem - Friend WithEvents mnuDescribeTwoVariablesCorrelate As ToolStripMenuItem - Friend WithEvents DescribeGeneral As ToolStripMenuItem + Friend WithEvents mnuDescribeGeneral As ToolStripMenuItem Friend WithEvents DescribeGeneralColumnSummaries As ToolStripMenuItem Friend WithEvents DescribeGeneralTabulation As ToolStripMenuItem Friend WithEvents DescribeGeneralGraphics As ToolStripMenuItem - Friend WithEvents DescribeGeneralCorrelations As ToolStripMenuItem - Friend WithEvents DescribeGeneralPrincipalComponents As ToolStripMenuItem - Friend WithEvents DescribeGeneralCanonicalCorrelations As ToolStripMenuItem - Friend WithEvents mnuDescribeUseObjects As ToolStripMenuItem - Friend WithEvents mnuDescribeUseObjectsUseGraph As ToolStripMenuItem - Friend WithEvents mnuDescribeUseObjectsCombineGraphs As ToolStripMenuItem - Friend WithEvents mnuDescribeUseObjectsThemes As ToolStripMenuItem - Friend WithEvents mnuDescribeGraphicsDialogs As ToolStripMenuItem + Friend WithEvents mnuDescribeMoregraphs As ToolStripMenuItem Friend WithEvents mnuDescribeOtherGraphicsDialogsScatterPlot As ToolStripMenuItem Friend WithEvents mnuDescribeOtherGraphicsDialogsLinePlot As ToolStripMenuItem Friend WithEvents mnuDescribeOtherGraphicsDialogsHistogram As ToolStripMenuItem @@ -3073,7 +3040,7 @@ Partial Class frmMain Friend WithEvents mnuDescribeOtherGraphicsDialogsCumulativeDistribution As ToolStripMenuItem Friend WithEvents mnuDescribeOtherGraphicsDialogsInventoryPlot As ToolStripMenuItem Friend WithEvents mnuDescribeOtherGraphicsDialogsPopulationPyramid As ToolStripMenuItem - Friend WithEvents mnuDescribeTableDialogs As ToolStripMenuItem + Friend WithEvents mnuDescribeSpecific As ToolStripMenuItem Friend WithEvents mnuDescribeOtherTableDialogsFrequency As ToolStripMenuItem Friend WithEvents mnuDescribeOtherTableDialogsSummary As ToolStripMenuItem Friend WithEvents mnuDescribeOtherTableDialogsMultipleResponse As ToolStripMenuItem @@ -3205,4 +3172,21 @@ Partial Class frmMain Friend WithEvents mnuOrganiseColumnDateUseDateUseTime As ToolStripMenuItem Friend WithEvents mnuFileConvert As ToolStripMenuItem Friend WithEvents TablesPlusToolStripMenuItem As ToolStripMenuItem + Friend WithEvents mnuDescribeMultivariate As ToolStripMenuItem + Friend WithEvents mnuDescribeMultivariateCorrelations As ToolStripMenuItem + Friend WithEvents mnuDescribeMultivariateprincipalComponents As ToolStripMenuItem + Friend WithEvents mnuDescribeMultivariateCanonicalCorrelations As ToolStripMenuItem + Friend WithEvents mnuDescribeUseGraph As ToolStripMenuItem + Friend WithEvents mnuDescribeCombineGraph As ToolStripMenuItem + Friend WithEvents mnuDescribeThemes As ToolStripMenuItem + Friend WithEvents mnuClimaticDescribe As ToolStripMenuItem + Friend WithEvents mnuClimaticModel As ToolStripMenuItem + Friend WithEvents mnuClimaticDescribeDescribeDaily As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseSummary As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseEvents As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseEventsStartoftheRains As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseEventsExtremes As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseEventsSpells As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseEventsWaterBalance As ToolStripMenuItem + Friend WithEvents mnuClimaticOrganiseEventsEndoftheRains As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 2a2ec69d217..1930f2fe4d6 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -94,10 +94,6 @@ Public Class frmMain dlgFileNew.ShowDialog() End Sub - Private Sub StartOfTheRainsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticEventsStartOfTheRains.Click - dlgStartofRains.ShowDialog() - End Sub - Private Sub RegularSequenceToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuOrganiseColumnGenerateRegularSequence.Click dlgRegularSequence.ShowDialog() End Sub @@ -110,10 +106,6 @@ Public Class frmMain dlgBoxplot.ShowDialog() End Sub - Private Sub mnuEndofRains_Click(sender As Object, e As EventArgs) Handles mnuClimaticEventsEndofRains.Click - dlgEndofRains.ShowDialog() - End Sub - Private Sub mnuGraphicsInventory_Click(sender As Object, e As EventArgs) Handles mnuDescribeOtherGraphicsDialogsInventoryPlot.Click dlgInventoryPlot.ShowDialog() End Sub @@ -332,58 +324,38 @@ Public Class frmMain dlgNon_ParametricTwoWayAnova.ShowDialog() End Sub - Private Sub NewWorksheetToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles mnuClimaticManageNewWorksheet.Click + Private Sub NewWorksheetToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseNewWorksheet.Click dlgNewWorksheet.ShowDialog() End Sub - Private Sub ImportDailyDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticManageImportDailyData.Click + Private Sub ImportDailyDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseImportDailyData.Click End Sub - Private Sub MakeFactorToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticManageMakeFactor.Click + Private Sub MakeFactorToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseMakeFactor.Click dlgMakeFactor.ShowDialog() End Sub - Private Sub ShiftDailyDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticManageShiftDailyData.Click + Private Sub ShiftDailyDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseShiftDailyData.Click dlgShiftDailyData.ShowDialog() End Sub - Private Sub UnstackDailyDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticManageUnstackDailyData.Click + Private Sub UnstackDailyDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseUnstackDailyData.Click dlgUnstackDailyData.ShowDialog() End Sub - Private Sub StackDailyDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticManageStackDailyData.Click + Private Sub StackDailyDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseStackDailyData.Click dlgStackDailyData.ShowDialog() End Sub - Private Sub InterpolateToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticManageInterpolate.Click + Private Sub InterpolateToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseInterpolate.Click dlgInterpolate.ShowDialog() End Sub - Private Sub OptionsToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles mnuClimaticManageOptions.Click + Private Sub OptionsToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseOptions.Click dlgOptions.ShowDialog() End Sub - Private Sub DisplayDailyToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuClimaticDisplayDaily.Click - dlgDisplayDaily.ShowDialog() - End Sub - - Private Sub mnuClimaticSummary_Click(sender As Object, e As EventArgs) Handles mnuClimaticSummary.Click - dlgSummary.ShowDialog() - End Sub - - Private Sub mnuClimaticEventsExtremes_Click(sender As Object, e As EventArgs) Handles mnuClimaticEventsExtremes.Click - dlgExtremes.ShowDialog() - End Sub - - Private Sub mnuClimaticEventsSpells_Click(sender As Object, e As EventArgs) Handles mnuClimaticEventsSpells.Click - dlgSpells.ShowDialog() - End Sub - - Private Sub mnuClimaticEventsWaterBalance_Click(sender As Object, e As EventArgs) Handles mnuClimaticEventsWaterBalance.Click - dlgWaterBalance.ShowDialog() - End Sub - Private Sub mnuClimaticExamine_Click(sender As Object, e As EventArgs) Handles mnuClimaticExamine.Click dlgExamine.ShowDialog() End Sub @@ -558,7 +530,7 @@ Public Class frmMain dlgPermuteColumn.ShowDialog() End Sub - Private Sub mnuStatistcsMultivariateCorrelation_Click(sender As Object, e As EventArgs) Handles mnuDescribeTwoVariablesCorrelate.Click + Private Sub mnuStatistcsMultivariateCorrelation_Click(sender As Object, e As EventArgs) dlgCorrelation.ShowDialog() End Sub @@ -625,11 +597,11 @@ Public Class frmMain dlgScatterPlot.ShowDialog() End Sub - Private Sub mnuStatistcsMultivariatePrincipalComponents_Click(sender As Object, e As EventArgs) Handles DescribeGeneralPrincipalComponents.Click + Private Sub mnuStatistcsMultivariatePrincipalComponents_Click(sender As Object, e As EventArgs) dlgPrincipalComponentAnalysis.ShowDialog() End Sub - Private Sub mnuStatistcsMultivariateCanonicalCorrelations_Click(sender As Object, e As EventArgs) Handles DescribeGeneralCanonicalCorrelations.Click + Private Sub mnuStatistcsMultivariateCanonicalCorrelations_Click(sender As Object, e As EventArgs) dlgCanonicalCorrelationAnalysis.ShowDialog() End Sub @@ -710,7 +682,7 @@ Public Class frmMain dlgFactorDataFrame.ShowDialog() End Sub - Private Sub mnuGraphicsUseGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeUseObjectsUseGraph.Click + Private Sub mnuGraphicsUseGraph_Click(sender As Object, e As EventArgs) dlgUseGraph.ShowDialog() End Sub @@ -781,11 +753,11 @@ Public Class frmMain dlgWindrose.ShowDialog() End Sub - Private Sub ThemesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuDescribeUseObjectsThemes.Click + Private Sub ThemesToolStripMenuItem_Click(sender As Object, e As EventArgs) dlgThemes.ShowDialog() End Sub - Private Sub CombineToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles mnuDescribeUseObjectsCombineGraphs.Click + Private Sub CombineToolStripMenuItem_Click(sender As Object, e As EventArgs) dlgCombineforGraphics.ShowDialog() End Sub @@ -909,7 +881,7 @@ Public Class frmMain dlglogLinearModels.ShowDialog() End Sub - Private Sub DescribeGeneralCorrelations_Click(sender As Object, e As EventArgs) Handles DescribeGeneralCorrelations.Click + Private Sub DescribeGeneralCorrelations_Click(sender As Object, e As EventArgs) dlgCorrelation.ShowDialog() End Sub @@ -1119,4 +1091,60 @@ Public Class frmMain Private Sub TablesPlusToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TablesPlusToolStripMenuItem.Click dlgTablePlus.ShowDialog() End Sub + + Private Sub mnuDescribeUseGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeUseGraph.Click + dlgUseGraph.ShowDialog() + End Sub + + Private Sub mnuDescribeCombineGraph_Click(sender As Object, e As EventArgs) Handles mnuDescribeCombineGraph.Click + dlgCombineforGraphics.ShowDialog() + End Sub + + Private Sub mnuDescribeThemes_Click(sender As Object, e As EventArgs) Handles mnuDescribeThemes.Click + dlgThemes.ShowDialog() + End Sub + + Private Sub mnuDescribeMultivariateCorrelations_Click(sender As Object, e As EventArgs) Handles mnuDescribeMultivariateCorrelations.Click + dlgCorrelation.ShowDialog() + End Sub + + Private Sub mnuDescribeMultivariateprincipalComponents_Click(sender As Object, e As EventArgs) Handles mnuDescribeMultivariateprincipalComponents.Click + dlgPrincipalComponentAnalysis.ShowDialog() + End Sub + + Private Sub mnuDescribeMultivariateCanonicalCorrelations_Click(sender As Object, e As EventArgs) Handles mnuDescribeMultivariateCanonicalCorrelations.Click + dlgCanonicalCorrelationAnalysis.ShowDialog() + End Sub + + Private Sub mnuClimaticDescribeDescribeDaily_Click(sender As Object, e As EventArgs) Handles mnuClimaticDescribeDescribeDaily.Click + dlgDisplayDaily.ShowDialog() + End Sub + + Private Sub mnuClimaticOrganiseSummary_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseSummary.Click + dlgSummary.ShowDialog() + End Sub + + Private Sub mnuClimaticOrganiseEventsStartoftheRains_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseEventsStartoftheRains.Click + dlgStartofRains.ShowDialog() + End Sub + + Private Sub mnuClimaticOrganiseEventsExtremes_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseEventsExtremes.Click + dlgExtremes.ShowDialog() + End Sub + + Private Sub mnuClimaticOrganiseEventsSpells_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseEventsSpells.Click + dlgSpells.ShowDialog() + End Sub + + Private Sub mnuClimaticOrganiseEventsWaterBalance_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseEventsWaterBalance.Click + dlgWaterBalance.ShowDialog() + End Sub + + Private Sub mnuClimaticOrganiseEventsEndoftheRains_Click(sender As Object, e As EventArgs) Handles mnuClimaticOrganiseEventsEndoftheRains.Click + dlgEndofRains.ShowDialog() + End Sub + + Private Sub mnuOrganiseColumnGenerateCountInFactor_Click(sender As Object, e As EventArgs) Handles mnuOrganiseColumnGenerateCountInFactor.Click + dlgCountinFactor.ShowDialog() + End Sub End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 6b72474f5bc..40c0838101f 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -242,6 +242,12 @@ Form + + sdgMerge.vb + + + Form + sdgOneVarCompareModels.vb @@ -2733,6 +2739,15 @@ sdgDescribeTwoVarGraph.vb + + sdgMerge.vb + + + sdgMerge.vb + + + sdgMerge.vb + sdgOneVarCompareModels.vb diff --git a/instat/sdgMerge.Designer.vb b/instat/sdgMerge.Designer.vb new file mode 100644 index 00000000000..f3afdbc01d8 --- /dev/null +++ b/instat/sdgMerge.Designer.vb @@ -0,0 +1,37 @@ + _ +Partial Class sdgMerge + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'sdgMerge + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(284, 262) + Me.Name = "sdgMerge" + Me.Text = "sdgMerge" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/sdgMerge.fr-FR.resx b/instat/sdgMerge.fr-FR.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgMerge.fr-FR.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgMerge.resx b/instat/sdgMerge.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgMerge.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgMerge.sw-KE.resx b/instat/sdgMerge.sw-KE.resx new file mode 100644 index 00000000000..a3df4f013d3 --- /dev/null +++ b/instat/sdgMerge.sw-KE.resx @@ -0,0 +1,15 @@ + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgMerge.vb b/instat/sdgMerge.vb new file mode 100644 index 00000000000..4060c2ef8df --- /dev/null +++ b/instat/sdgMerge.vb @@ -0,0 +1,21 @@ +' Instat+R +' Copyright (C) 2015 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License k +' along with this program. If not, see . + +Public Class sdgMerge + Private Sub sdgMerge_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub +End Class \ No newline at end of file diff --git a/instat/sdgOneVarCompareModels.Designer.vb b/instat/sdgOneVarCompareModels.Designer.vb index 6428850f5bc..40af6a16be1 100644 --- a/instat/sdgOneVarCompareModels.Designer.vb +++ b/instat/sdgOneVarCompareModels.Designer.vb @@ -29,13 +29,14 @@ Partial Class sdgOneVarCompareModels Me.lblGoF = New System.Windows.Forms.Label() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.ucrSaveChiSq = New instat.ucrInputTextBox() Me.ucrObjectName = New instat.ucrInputTextBox() Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.ucrSavePlots = New instat.ucrSaveGraph() Me.chkQQ = New System.Windows.Forms.CheckBox() Me.chkCDF = New System.Windows.Forms.CheckBox() Me.chkPP = New System.Windows.Forms.CheckBox() Me.chkDensity = New System.Windows.Forms.CheckBox() - Me.ucrSaveChiSq = New instat.ucrInputTextBox() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -63,9 +64,9 @@ Partial Class sdgOneVarCompareModels Me.chkSaveChi.AutoSize = True Me.chkSaveChi.Location = New System.Drawing.Point(6, 52) Me.chkSaveChi.Name = "chkSaveChi" - Me.chkSaveChi.Size = New System.Drawing.Size(106, 17) + Me.chkSaveChi.Size = New System.Drawing.Size(115, 17) Me.chkSaveChi.TabIndex = 2 - Me.chkSaveChi.Text = "Save Chi-Square" + Me.chkSaveChi.Text = "Display Chi-Square" Me.chkSaveChi.UseVisualStyleBackColor = True ' 'chkInputBreakpoints @@ -94,7 +95,7 @@ Partial Class sdgOneVarCompareModels Me.TabControl1.Location = New System.Drawing.Point(10, 10) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(243, 152) + Me.TabControl1.Size = New System.Drawing.Size(299, 152) Me.TabControl1.TabIndex = 5 ' 'TabPage1 @@ -108,21 +109,30 @@ Partial Class sdgOneVarCompareModels Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(235, 126) + Me.TabPage1.Size = New System.Drawing.Size(291, 126) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Fit" Me.TabPage1.UseVisualStyleBackColor = True ' + 'ucrSaveChiSq + ' + Me.ucrSaveChiSq.IsReadOnly = False + Me.ucrSaveChiSq.Location = New System.Drawing.Point(127, 50) + Me.ucrSaveChiSq.Name = "ucrSaveChiSq" + Me.ucrSaveChiSq.Size = New System.Drawing.Size(107, 21) + Me.ucrSaveChiSq.TabIndex = 6 + ' 'ucrObjectName ' Me.ucrObjectName.IsReadOnly = False - Me.ucrObjectName.Location = New System.Drawing.Point(112, 27) + Me.ucrObjectName.Location = New System.Drawing.Point(127, 27) Me.ucrObjectName.Name = "ucrObjectName" Me.ucrObjectName.Size = New System.Drawing.Size(107, 21) Me.ucrObjectName.TabIndex = 5 ' 'TabPage2 ' + Me.TabPage2.Controls.Add(Me.ucrSavePlots) Me.TabPage2.Controls.Add(Me.chkQQ) Me.TabPage2.Controls.Add(Me.chkCDF) Me.TabPage2.Controls.Add(Me.chkPP) @@ -130,11 +140,18 @@ Partial Class sdgOneVarCompareModels Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(235, 126) + Me.TabPage2.Size = New System.Drawing.Size(291, 126) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Plot" Me.TabPage2.UseVisualStyleBackColor = True ' + 'ucrSavePlots + ' + Me.ucrSavePlots.Location = New System.Drawing.Point(6, 95) + Me.ucrSavePlots.Name = "ucrSavePlots" + Me.ucrSavePlots.Size = New System.Drawing.Size(265, 22) + Me.ucrSavePlots.TabIndex = 10 + ' 'chkQQ ' Me.chkQQ.AutoSize = True @@ -175,19 +192,11 @@ Partial Class sdgOneVarCompareModels Me.chkDensity.Text = "Density" Me.chkDensity.UseVisualStyleBackColor = True ' - 'ucrSaveChiSq - ' - Me.ucrSaveChiSq.IsReadOnly = False - Me.ucrSaveChiSq.Location = New System.Drawing.Point(112, 50) - Me.ucrSaveChiSq.Name = "ucrSaveChiSq" - Me.ucrSaveChiSq.Size = New System.Drawing.Size(107, 21) - Me.ucrSaveChiSq.TabIndex = 6 - ' 'sdgOneVarCompareModels ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(256, 200) + Me.ClientSize = New System.Drawing.Size(321, 200) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.TabControl1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -218,4 +227,5 @@ Partial Class sdgOneVarCompareModels Friend WithEvents chkQQ As CheckBox Friend WithEvents ucrObjectName As ucrInputTextBox Friend WithEvents ucrSaveChiSq As ucrInputTextBox + Friend WithEvents ucrSavePlots As ucrSaveGraph End Class diff --git a/instat/sdgOneVarCompareModels.vb b/instat/sdgOneVarCompareModels.vb index 8bf9057250d..e6211426034 100644 --- a/instat/sdgOneVarCompareModels.vb +++ b/instat/sdgOneVarCompareModels.vb @@ -46,6 +46,9 @@ Public Class sdgOneVarCompareModels chkSaveChi.Checked = True chkSaveObjects.Checked = True chkInputBreakpoints.Checked = False + ucrSavePlots.chkSaveGraph.Checked = False + ucrSavePlots.Enabled = False ' disabled for now + ucrSavePlots.ucrInputGraphName.SetPrefix("plots") ucrObjectName.SetValidationTypeAsRVariable() ucrObjectName.SetName("gof") ucrSaveChiSq.SetValidationTypeAsRVariable() @@ -160,8 +163,8 @@ Public Class sdgOneVarCompareModels End If End Sub - Private Sub ucrName_NameChanged() Handles ucrObjectName.NameChanged, ucrSaveChiSq.NameChanged - ReturnEnabled() - End Sub + ' Private Sub ucrSavePlots_NameChanged() Handles ucrSavePlots.Click + 'TODO Graph Names assigned go up in increments for any of the graphs selected (e.g. 3 plots are selected and it is named "plots", then automatically we get "plots1", ... , "plots3" + 'End Sub -End Class +End Class \ No newline at end of file diff --git a/instat/sdgOneVarFitModDisplay.Designer.vb b/instat/sdgOneVarFitModDisplay.Designer.vb index 56ffa3db2ce..a7332fe6bcb 100644 --- a/instat/sdgOneVarFitModDisplay.Designer.vb +++ b/instat/sdgOneVarFitModDisplay.Designer.vb @@ -22,7 +22,7 @@ Partial Class sdgOneVarFitModDisplay 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.TabControl1 = New System.Windows.Forms.TabControl() + Me.tbcPlots = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.rdoPPPlot = New System.Windows.Forms.RadioButton() Me.rdoQQPlot = New System.Windows.Forms.RadioButton() @@ -31,18 +31,20 @@ Partial Class sdgOneVarFitModDisplay Me.rdoPlotAll = New System.Windows.Forms.RadioButton() Me.rdoNoPlot = New System.Windows.Forms.RadioButton() Me.ucrBase = New instat.ucrButtonsSubdialogue() - Me.TabControl1.SuspendLayout() + Me.tbcQuantiles = New System.Windows.Forms.TabPage() + Me.tbcPlots.SuspendLayout() Me.TabPage1.SuspendLayout() Me.SuspendLayout() ' - 'TabControl1 + 'tbcPlots ' - Me.TabControl1.Controls.Add(Me.TabPage1) - Me.TabControl1.Location = New System.Drawing.Point(10, 10) - Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(161, 203) - Me.TabControl1.TabIndex = 0 + Me.tbcPlots.Controls.Add(Me.TabPage1) + Me.tbcPlots.Controls.Add(Me.tbcQuantiles) + Me.tbcPlots.Location = New System.Drawing.Point(10, 10) + Me.tbcPlots.Name = "tbcPlots" + Me.tbcPlots.SelectedIndex = 0 + Me.tbcPlots.Size = New System.Drawing.Size(161, 203) + Me.tbcPlots.TabIndex = 0 ' 'TabPage1 ' @@ -129,26 +131,36 @@ Partial Class sdgOneVarFitModDisplay Me.ucrBase.Size = New System.Drawing.Size(142, 30) Me.ucrBase.TabIndex = 1 ' + 'tbcQuantiles + ' + Me.tbcQuantiles.Location = New System.Drawing.Point(4, 22) + Me.tbcQuantiles.Name = "tbcQuantiles" + Me.tbcQuantiles.Padding = New System.Windows.Forms.Padding(3) + Me.tbcQuantiles.Size = New System.Drawing.Size(153, 177) + Me.tbcQuantiles.TabIndex = 1 + Me.tbcQuantiles.Text = "Quantiles" + Me.tbcQuantiles.UseVisualStyleBackColor = True + ' 'sdgOneVarFitModDisplay ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(176, 256) Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.TabControl1) + Me.Controls.Add(Me.tbcPlots) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgOneVarFitModDisplay" Me.Text = "Display Options" - Me.TabControl1.ResumeLayout(False) + Me.tbcPlots.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() Me.ResumeLayout(False) End Sub - Friend WithEvents TabControl1 As TabControl + Friend WithEvents tbcPlots As TabControl Friend WithEvents TabPage1 As TabPage Friend WithEvents rdoPPPlot As RadioButton Friend WithEvents rdoQQPlot As RadioButton @@ -157,4 +169,5 @@ Partial Class sdgOneVarFitModDisplay Friend WithEvents rdoPlotAll As RadioButton Friend WithEvents rdoNoPlot As RadioButton Friend WithEvents ucrBase As ucrButtonsSubdialogue + Friend WithEvents tbcQuantiles As TabPage End Class diff --git a/instat/sdgOneVarFitModDisplay.vb b/instat/sdgOneVarFitModDisplay.vb index 146c89594fe..bcb969b37fd 100644 --- a/instat/sdgOneVarFitModDisplay.vb +++ b/instat/sdgOneVarFitModDisplay.vb @@ -84,4 +84,9 @@ Public Class sdgOneVarFitModDisplay rdoPPPlot.Enabled = True End If End Sub + + 'Private Sub tbcQuantiles_VisibleChanged(sender As Object, e As EventArgs) Handles tbcQuantiles.VisibleChanged + 'if we are using One Var Fit Model then I do not want this tab to be visible. + 'tbcQuantiles.Visible = False + 'End Sub End Class \ No newline at end of file diff --git a/instat/sdgOneVarGraph.vb b/instat/sdgOneVarGraph.vb index 052229ae4e2..2ab2aa19b5f 100644 --- a/instat/sdgOneVarGraph.vb +++ b/instat/sdgOneVarGraph.vb @@ -17,9 +17,8 @@ Imports instat.Translations Public Class sdgOneVarGraph Public bFirstLoad As Boolean = True Public clsRsyntax As New RSyntax - Public strNumericGeomFunction As String - Public strCategoriacalGeomFunction As String - Public strCategoricalGeomFunction As String + Public strNumericGeomFunction As String = "" + Public strCategoriacalGeomFunction As String = "" Private Sub sdgOneVarGraph_Load(sender As Object, e As EventArgs) Handles Me.Load If bFirstLoad Then @@ -38,10 +37,10 @@ Public Class sdgOneVarGraph nudNumberofColumns.Value = 3 ucrInputNumeric.Reset() ucrInputCategorical.Reset() - ucrInputNumeric.SetName("Boxplot") - ucrInputCategorical.SetName("Bar Chart") ucrInputNumeric.SetItems({"Boxplot", "Dot Plot", "Histogram", "Point Plot", "Density Plot", "Frequency Polygon"}) ucrInputCategorical.SetItems({"Bar Chart", "Pie Chart", "Dot Plot"}) + ucrInputNumeric.SetName("Boxplot") + ucrInputCategorical.SetName("Bar Chart") End Sub Public Sub InitialiseDialog() @@ -53,16 +52,6 @@ Public Class sdgOneVarGraph clsRsyntax = clsNewRSyntax End Sub - Public Sub SetNumericGeomFunction(strNumeric As String) - strNumericGeomFunction = strNumeric - End Sub - Public Sub SetCategoricalGeomFunction(strCategorical As String) - strCategoriacalGeomFunction = strCategorical - End Sub - Private Sub chkSpecifyLayout_CheckedChanged(sender As Object, e As EventArgs) Handles chkSpecifyLayout.CheckedChanged - SpecifyLayoutControl() - End Sub - Private Sub SpecifyLayoutControl() If chkSpecifyLayout.Checked Then lblNumberofColumns.Visible = True @@ -74,23 +63,20 @@ Public Class sdgOneVarGraph End Sub Public Sub SetNumericGeomFunction() - If ucrInputNumeric.cboInput.SelectedText = "Boxplot" Then - strNumericGeomFunction = "geom_boxplot" - - ElseIf ucrInputNumeric.cboInput.SelectedText = "Histogram" Then - strNumericGeomFunction = "geom_histogram" - - ElseIf ucrInputNumeric.cboInput.SelectedText = "Dot Plot" Then - strNumericGeomFunction = "geom_dotplot" - - ElseIf ucrInputNumeric.cboInput.SelectedText = "Point Plot" Then - strNumericGeomFunction = "geom_point" - - ElseIf ucrInputNumeric.cboInput.SelectedText = "Density Plot" Then - strNumericGeomFunction = "geom_density" - Else - strNumericGeomFunction = "geom_freqpoly" - End If + Select Case ucrInputNumeric.GetText + Case "Boxplot" + strNumericGeomFunction = "geom_boxplot" + Case "Histogram" + strNumericGeomFunction = "geom_histogram" + Case "Dot Plot" + strNumericGeomFunction = "geom_dotplot" + Case "Point Plot" + strNumericGeomFunction = "geom_point" + Case "Density Plot" + strNumericGeomFunction = "geom_density" + Case Else + strNumericGeomFunction = "geom_freqpoly" + End Select End Sub Private Sub ucrInputNumeric_NameChanged() Handles ucrInputNumeric.NameChanged @@ -98,15 +84,34 @@ Public Class sdgOneVarGraph End Sub Public Sub SetCategoricalGeomFunction() - If ucrInputCategorical.cboInput.SelectedText = "bar chart" Then - strCategoriacalGeomFunction = "geom_bar" - ElseIf ucrInputCategorical.cboInput.SelectedText = "pie chart" Then - strCategoriacalGeomFunction = "geom_histogram" - Else - strCategoriacalGeomFunction = "geom_dotplot" - End If + Select Case ucrInputCategorical.GetText + Case "Bar Chart" + strCategoriacalGeomFunction = "geom_bar" + Case "Dot Plot" + strCategoriacalGeomFunction = "geom_dotplot" + Case Else + strCategoriacalGeomFunction = "geom_bar" + End Select + End Sub Private Sub ucrInputCategorical_NameChanged() Handles ucrInputCategorical.NameChanged SetCategoricalGeomFunction() End Sub + + Private Sub chkFreeScaleAxisforFacets_CheckedChanged(sender As Object, e As EventArgs) Handles chkFreeScaleAxisforFacets.CheckedChanged + If chkFreeScaleAxisforFacets.Checked Then + clsRsyntax.AddParameter("free_scale_axis", "TRUE") + Else + clsRsyntax.RemoveParameter("free_scale_axis") + End If + End Sub + + Private Sub nudNumberofColumns_TextChanged(sender As Object, e As EventArgs) Handles nudNumberofColumns.TextChanged, chkSpecifyLayout.CheckedChanged + SpecifyLayoutControl() + If nudNumberofColumns.Text <> "" AndAlso chkSpecifyLayout.Checked Then + clsRsyntax.AddParameter("ncol", nudNumberofColumns.Value) + Else + clsRsyntax.RemoveParameter("ncol") + End If + End Sub End Class \ No newline at end of file diff --git a/instat/sdgOneVarUseModBootstrap.vb b/instat/sdgOneVarUseModBootstrap.vb index 2cfc1ef3275..49ae141e531 100644 --- a/instat/sdgOneVarUseModBootstrap.vb +++ b/instat/sdgOneVarUseModBootstrap.vb @@ -16,7 +16,7 @@ Imports instat.Translations Public Class sdgOneVarUseModBootstrap - Public clsRBootMethod As New RFunction + Public clsRbootFunction As New RFunction Public clsRsyntax As New RSyntax Public bfirstload As Boolean = True @@ -25,10 +25,8 @@ Public Class sdgOneVarUseModBootstrap End Sub Public Sub InitialiseDialog() - clsRsyntax.AddParameter("bootmethod") - clsRsyntax.AddParameter("niter") - ' add in CI's, - ' do we want this to be plotted? + clsRbootFunction.AddParameter("bootmethod") + clsRbootFunction.AddParameter("niter") nudIterations.Minimum = 1 nudIterations.Maximum = 10001 nudCI.Minimum = 0 @@ -43,21 +41,28 @@ Public Class sdgOneVarUseModBootstrap nudIterations.Value = 1001 End Sub - Public Sub SetMyRSyntax(clsRNewSyntax As RSyntax) - clsRsyntax = clsRNewSyntax + Public Sub SetMyBootFunction(clsRNewbootFunction As RFunction) + clsRbootFunction = clsRNewbootFunction End Sub Private Sub chkParametric_CheckedChanged(sender As Object, e As EventArgs) Handles chkParametric.CheckedChanged If chkParametric.Checked Then - clsRsyntax.AddParameter("bootmethod", Chr(34) & "param" & Chr(34)) + clsRbootFunction.AddParameter("bootmethod", Chr(34) & "param" & Chr(34)) Else - clsRsyntax.AddParameter("bootmethod", Chr(34) & "nonparam" & Chr(34)) + clsRbootFunction.AddParameter("bootmethod", Chr(34) & "nonparam" & Chr(34)) End If End Sub Private Sub nudIterations_ValueChanged(sender As Object, e As EventArgs) Handles nudIterations.ValueChanged - clsRsyntax.AddParameter("niter", nudIterations.Value.ToString()) + clsRbootFunction.AddParameter("niter", nudIterations.Value.ToString()) + End Sub + + Public Sub SetMyRSyntax(clsRNewSyntax As RSyntax) + clsRsyntax = clsRNewSyntax + End Sub + + Private Sub nudCI_ValueChanged(sender As Object, e As EventArgs) Handles nudCI.ValueChanged + clsRsyntax.AddParameter("CI.level", nudCI.Value.ToString()) End Sub - ' confidence interval End Class \ No newline at end of file diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 5b7901df306..1c0b25f579f 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1490,7 +1490,7 @@ data_object$set("public", "remove_column_colours", function() { } ) -data_object$set("public","graph_one_variable", function(columns, numeric = "geom_boxplot", categorical = "geom_bar", output = "facets", free_scale_axis = FALSE, nrow = NULL, ...) { +data_object$set("public","graph_one_variable", function(columns, numeric = "geom_boxplot", categorical = "geom_bar", output = "facets", free_scale_axis = FALSE, ncol = NULL, ...) { if(!all(columns %in% self$get_column_names())) stop("Not all columns found in the data") if(!output %in% c("facets", "combine", "single")) stop("output must be one of: facets, combine or single") numeric_geom <- match.fun(numeric) @@ -1525,8 +1525,8 @@ data_object$set("public","graph_one_variable", function(columns, numeric = "geom else { g <- ggplot(data = curr_data, mapping = aes(x = value)) } - if(free_scale_axis) return(g + curr_geom() + facet_wrap(facets= ~variable, scales = "free", nrow = nrow) + ylab("")) - else return(g + curr_geom() + facet_wrap(facets= ~variable, scales = "free_x", nrow = nrow) + ylab("")) + if(free_scale_axis) return(g + curr_geom() + facet_wrap(facets= ~variable, scales = "free", ncol = ncol) + ylab("")) + else return(g + curr_geom() + facet_wrap(facets= ~variable, scales = "free_x", ncol = ncol) + ylab("")) } else { column_types <- self$get_variables_metadata(column = columns, property = data_type_label) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index d49dcec9cf1..65abf096450 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -934,7 +934,7 @@ instat_object$set("public","set_column_colours_by_metadata", function(data_name, } ) -instat_object$set("public","graph_one_variable", function(data_name, columns, numeric = "geom_boxplot", categorical = "geom_bar", character = "geom_bar", output = "facets", free_scale_axis = FALSE, nrow = NULL, ...) { +instat_object$set("public","graph_one_variable", function(data_name, columns, numeric = "geom_boxplot", categorical = "geom_bar", character = "geom_bar", output = "facets", free_scale_axis = FALSE, ncol = NULL, ...) { self$get_data_objects(data_name)$graph_one_variable(columns = columns, numeric = numeric, categorical = categorical, output = output, free_scale_axis = free_scale_axis, nrow = nrow, ... = ...) } )