Merge pull request #4 from africanmathsinitiative/master

updating
NanyanziAlice · Jun 22, 2023 · 1956b0f · 1956b0f
2 parents 35b0564 + e192859
commit 1956b0f
Show file tree

Hide file tree

Showing 11 changed files with 367 additions and 175 deletions.
diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb
@@ -68,7 +68,6 @@ Public Class dlgOneVariableSummarise
 
         ucrNudMaxSum.SetParameter(New RParameter("maxsum", 2))
         ucrNudMaxSum.SetMinMax(1, 12)
-        ucrNudMaxSum.SetRDefault(12)
         ucrNudMaxSum.SetLinkedDisplayControl(lblMaxSum)
 
         ucrPnlSummaries.AddRadioButton(rdoDefault)
@@ -77,8 +76,7 @@ Public Class dlgOneVariableSummarise
         ucrPnlSummaries.AddParameterValuesCondition(rdoCustomised, "checked_radio", "customised")
         ucrPnlSummaries.AddParameterValuesCondition(rdoDefault, "checked_radio", "defaults")
         ucrPnlSummaries.AddParameterValuesCondition(rdoSkim, "checked_radio", "skim")
-        ucrPnlSummaries.AddToLinkedControls(ucrNudMaxSum, {rdoDefault}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True,
-                                            bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=12)
+        ucrPnlSummaries.AddToLinkedControls(ucrNudMaxSum, {rdoDefault}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
         ucrPnlSummaries.AddToLinkedControls({ucrChkOmitMissing, ucrPnlColumnFactor, ucrReorderSummary, ucrChkDisplayMissing},
                                             {rdoCustomised}, bNewLinkedHideIfParameterMissing:=True)
 
@@ -247,7 +245,7 @@ Public Class dlgOneVariableSummarise
         clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False)
 
         clsSummaryFunction.SetRCommand("summary")
-        clsSummaryFunction.AddParameter("maxsum", "12")
+        clsSummaryFunction.AddParameter("maxsum", "12", iPosition:=2)
         clsSummaryFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorOneVarSummarise.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0)
         clsSummaryFunction.AddParameter("na.rm", "FALSE", iPosition:=3)
         clsSummaryFunction.SetAssignToOutputObject(strRObjectToAssignTo:="last_summary",

diff --git a/instat/dlgSPI.Designer.vb b/instat/dlgSPI.Designer.vb
diff --git a/instat/dlgSPI.vb b/instat/dlgSPI.vb
@@ -23,6 +23,9 @@ Public Class dlgSPI
     Private clsListFunction As New RFunction
     Private clsSpeiInputFunction As New RFunction
     Private clsSpeiOutputFunction As New RFunction
+    Private clsPlotFunction As New RFunction
+    Private clsDummyFunction As New RFunction
+    Private clsGetObjectRFunction As New RFunction
 
     Private Sub dlgSPI_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         If bFirstload Then
@@ -97,6 +100,12 @@ Public Class dlgSPI
         ucrNudKernelShift.SetParameter(New RParameter("shift", 1))
         ucrNudKernelShift.SetMinMax(0, 24)
 
+        'plot
+        ucrChkPlot.SetText("Plot")
+        ucrChkPlot.AddParameterValuesCondition(True, "plot", "True")
+        ucrChkPlot.AddParameterValuesCondition(False, "plot", "False")
+        ucrChkPlot.AddToLinkedControls(ucrSaveGraph, {True}, bNewLinkedHideIfParameterMissing:=True)
+
         'ucrpnlInd
         ucrPnlIndex.AddRadioButton(rdoSPI)
         ucrPnlIndex.AddRadioButton(rdoSPEI)
@@ -114,6 +123,14 @@ Public Class dlgSPI
         ucrSaveModel.SetCheckBoxText("Save Model")
         ucrSaveModel.SetIsComboBox()
         ucrSaveModel.SetAssignToIfUncheckedValue("last_model")
+
+        ucrSaveGraph.SetPrefix("SPI_plot")
+        ucrSaveGraph.SetSaveTypeAsGraph()
+        ucrSaveGraph.SetDataFrameSelector(ucrSelectorVariable.ucrAvailableDataFrames)
+        ucrSaveGraph.SetCheckBoxText("Save Graph")
+        ucrSaveGraph.SetIsComboBox()
+        ucrSaveGraph.SetAssignToIfUncheckedValue("last_graph")
+
     End Sub
 
     Private Sub SetDefaults()
@@ -122,19 +139,27 @@ Public Class dlgSPI
         clsListFunction = New RFunction
         clsSpeiInputFunction = New RFunction
         clsSpeiOutputFunction = New RFunction
+        clsPlotFunction = New RFunction
+        clsDummyFunction = New RFunction
+        clsGetObjectRFunction = New RFunction
 
         ucrBase.clsRsyntax.ClearCodes()
 
         ucrSelectorVariable.Reset()
         ucrSaveIndex.Reset()
         ucrSaveModel.Reset()
+        ucrSaveGraph.Reset()
+
         ucrReceiverElement.SetMeAsReceiver()
 
+        clsDummyFunction.AddParameter("plot", "False", iPosition:=0)
+
         clsListFunction.SetRCommand("list")
         clsListFunction.AddParameter("type", Chr(39) & "rectangular" & Chr(39), iPosition:=0)
         clsListFunction.AddParameter("shift", 0, iPosition:=1)
 
         clsSpiFunction.SetPackageName("SPEI")
+
         clsSpiFunction.SetRCommand("spi")
         clsSpiFunction.AddParameter("data", clsRFunctionParameter:=clsSpeiInputFunction, iPosition:=0)
         clsSpiFunction.AddParameter("scale", 1, iPosition:=1)
@@ -154,7 +179,11 @@ Public Class dlgSPI
         clsSpeiInputFunction.SetAssignTo("data_ts")
 
         clsSpeiOutputFunction.SetRCommand("spei_output")
-        clsSpeiOutputFunction.AddParameter("x", clsRFunctionParameter:=clsSpiFunction, iPosition:=0)
+        clsPlotFunction.SetRCommand("plot")
+
+        clsGetObjectRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data")
+        clsGetObjectRFunction.AddParameter("data_name", Chr(34) & ucrSelectorVariable.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0)
+        clsGetObjectRFunction.AddParameter("as_file", "TRUE", iPosition:=3)
 
         ucrBase.clsRsyntax.SetBaseRFunction(clsSpeiOutputFunction)
     End Sub
@@ -181,6 +210,10 @@ Public Class dlgSPI
         ucrNudKernelShift.SetRCode(clsListFunction, bReset)
         ucrSaveIndex.SetRCode(clsSpeiOutputFunction, bReset)
         ucrSaveModel.SetRCode(clsSpeiFunction, bReset)
+        ucrSaveGraph.SetRCode(clsPlotFunction, bReset)
+        If bReset Then
+            ucrChkPlot.SetRCode(clsDummyFunction, bReset)
+        End If
         SetShiftMax()
     End Sub
 
@@ -200,11 +233,11 @@ Public Class dlgSPI
 
     Private Sub ucrPnlIndex_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlIndex.ControlContentsChanged
         If rdoSPI.Checked Then
-            clsSpeiOutputFunction.AddParameter("x", clsRFunctionParameter:=clsSpiFunction, iPosition:=0)
+            ucrBase.clsRsyntax.AddToBeforeCodes(clsSpiFunction)
             ucrSaveIndex.SetPrefix("spi")
             ucrSaveModel.SetPrefix("spi_mod")
         ElseIf rdoSPEI.Checked Then
-            clsSpeiOutputFunction.AddParameter("x", clsRFunctionParameter:=clsSpeiFunction, iPosition:=0)
+            ucrBase.clsRsyntax.AddToBeforeCodes(clsSpeiFunction)
             ucrSaveIndex.SetPrefix("spei")
             ucrSaveModel.SetPrefix("spei_mod")
         End If
@@ -225,4 +258,33 @@ Public Class dlgSPI
     Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrSaveIndex.ControlContentsChanged, ucrSaveModel.ControlContentsChanged, ucrNudTimeScale.ControlContentsChanged, ucrNudKernelShift.ControlContentsChanged
         TestOKEnabled()
     End Sub
+
+    Private Sub ucrSaveModel_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSaveModel.ControlValueChanged
+        If ucrSaveModel.ucrChkSave.Checked Then
+            clsSpeiOutputFunction.AddParameter("x", ucrSaveModel.GetText, iPosition:=0)
+            clsPlotFunction.AddParameter("plot", ucrSaveModel.GetText, bIncludeArgumentName:=False, iPosition:=0)
+        Else
+            clsSpeiOutputFunction.AddParameter("x", "last_model", iPosition:=0)
+            clsPlotFunction.AddParameter("plot", "last_model", bIncludeArgumentName:=False, iPosition:=0)
+        End If
+    End Sub
+
+    Private Sub ucrChkPlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPlot.ControlValueChanged, ucrSaveGraph.ControlValueChanged
+        If ucrChkPlot.Checked Then
+            ucrBase.clsRsyntax.AddToAfterCodes(clsPlotFunction, iPosition:=0)
+            ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectRFunction, iPosition:=1)
+            clsPlotFunction.iCallType = 3
+            clsGetObjectRFunction.iCallType = 3
+        Else
+            ucrBase.clsRsyntax.RemoveFromAfterCodes(clsPlotFunction)
+            ucrBase.clsRsyntax.RemoveFromAfterCodes(clsGetObjectRFunction)
+        End If
+
+        If ucrSaveGraph.ucrChkSave.Checked Then
+            clsGetObjectRFunction.AddParameter("object_name", Chr(34) & ucrSaveGraph.GetText & Chr(34), iPosition:=1)
+        Else
+            clsGetObjectRFunction.AddParameter("object_name", Chr(34) & "last_graph" & Chr(34), iPosition:=1)
+        End If
+    End Sub
+
 End Class
diff --git a/instat/dlgThreeVariablePivotTable.Designer.vb b/instat/dlgThreeVariablePivotTable.Designer.vb