Merge pull request #173 from africanmathsinitiative/master

update branch

instat/clsRLink.vb

@@ -87,6 +87,7 @@ Public Class RLink
             If strLine.Trim(vbLf).Count > 0 Then
                 RunScript(strScript:=strLine.Trim(vbLf), iCallType:=iCallType, strComment:=strComment, bSeparateThread:=bSeparateThread, bSilent:=True)
             End If
+            strComment = ""
         Next
         bInstatObjectExists = True
     End Sub

instat/dlgBarAndPieChart.vb

@@ -141,6 +141,7 @@ Public Class dlgBarAndPieChart
         clsPieAesFunction = New RFunction
 
         ucrBarChartSelector.Reset()
+        ucrBarChartSelector.SetGgplotFunction(clsBaseOperator)
         ucrFactorReceiver.SetMeAsReceiver()
         ucrSaveBar.Reset()
         bResetSubdialog = True

instat/dlgConvertColumns.vb

@@ -20,6 +20,9 @@ Public Class dlgConvertColumns
     Public bFirstLoad As Boolean = True
     Public bToFactorOnly As Boolean = False
     Private bReset As Boolean = True
+    Private bUseSelectedColumn As Boolean = False
+    Private strSelectedColumn As String = ""
+    Public strSelectedDataFrame As String = ""
     Private clsDefaultFunction As New RFunction
 
     Private Sub dlgConvertColumns_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -32,6 +35,10 @@ Public Class dlgConvertColumns
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        bReset = False
+        If bUseSelectedColumn Then
+            SetDefaultColumn()
+        End If
         ReopenDialog()
         TestOKEnabled()
     End Sub
@@ -95,6 +102,18 @@ Public Class dlgConvertColumns
         ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction)
     End Sub
 
+    Public Sub SetCurrentColumn(strColumn As String, strDataFrame As String)
+        strSelectedColumn = strColumn
+        strSelectedDataFrame = strDataFrame
+        bUseSelectedColumn = True
+    End Sub
+
+    Private Sub SetDefaultColumn()
+        ucrSelectorDataFrameColumns.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem = strSelectedDataFrame
+        ucrReceiverColumnsToConvert.Add(strSelectedColumn, strSelectedDataFrame)
+        bUseSelectedColumn = False
+    End Sub
+
     Private Sub SetRCodeForControls(bReset As Boolean)
         SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset)
     End Sub

instat/dlgCumulativeDistribution.vb

@@ -109,6 +109,7 @@ Public Class dlgCumulativeDistribution
         clsRggplotFunction = New RFunction
 
         ucrCumDistSelector.Reset()
+        ucrCumDistSelector.SetGgplotFunction(clsBaseOperator)
         ucrCumDistSelector.Focus()
         ucrSaveCumDist.Reset()
         sdgPlots.Reset()

instat/dlgDotPlot.vb

@@ -126,6 +126,7 @@ Public Class dlgDotPlot
         clsRaesFunction = New RFunction
 
         ucrDotPlotSelector.Reset()
+        ucrDotPlotSelector.SetGgplotFunction(clsBaseOperator)
         ucrSaveDotPlot.Reset()
         bResetSubdialog = True
         bResetDotLayerSubdialog = True

instat/dlgDuplicateColumns.vb

@@ -32,9 +32,9 @@ Public Class dlgDuplicateColumns
     Public bFirstLoad As Boolean = True
     Private bReset As Boolean = True
     Private clsDefaultFunction As New RFunction
-    Dim bUseSelectedColumn As Boolean = False
-    Dim strSelectedColumn As String = ""
-    Dim strSelectedDataFrame As String = ""
+    Public strSelectedDataFrame As String = ""
+    Private bUseSelectedColumn As Boolean = False
+    Private strSelectedColumn As String = ""
 
     Private Sub dlgCopySheet_Load(sender As Object, e As EventArgs) Handles Me.Load
         If bFirstLoad Then
@@ -48,6 +48,10 @@ Public Class dlgDuplicateColumns
         End If
         SetRCodeforControls(bReset)
         bReset = False
+        If bUseSelectedColumn Then
+            SetDefaultColumn()
+        End If
+        TestOKEnabled()
         autoTranslate(Me)
     End Sub
 

instat/dlgDuplicatesConstructed.vb

@@ -18,7 +18,8 @@ Imports instat.Translations
 Public Class dlgDuplicatesConstructed
     Private bReset As Boolean = True
     Private bFirstLoad As Boolean = True
-    Private clsDuplicate2, clsDuplicated As New RFunction
+    Private clsDuplicated2, clsDuplicated As New RFunction
+
     Private Sub dlgDuplicatesConstructed_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         If bFirstLoad Then
             InitialiseDialog()
@@ -70,34 +71,33 @@ Public Class dlgDuplicatesConstructed
 
     Private Sub SetDefaults()
         clsDuplicated = New RFunction
-        clsDuplicate2 = New RFunction
+        clsDuplicated2 = New RFunction
 
         ucrNewColumnName.Reset()
         ucrSelectorDuplicateswithVariables.Reset()
         ucrReceiverMultipleForDuplicates.SetMeAsReceiver()
 
         clsDuplicated.SetRCommand("duplicated")
+        clsDuplicated.AddParameter("x", clsRFunctionParameter:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0)
 
-        clsDuplicate2.SetPackageName("questionr")
-        clsDuplicate2.SetRCommand("duplicated2")
-        clsDuplicate2.AddParameter("x", frmMain.clsRLink.strInstatDataObject & "$get_data_frame", iPosition:=0)
-
-        SetBaseFunction()
-        DataFrameParameter()
+        clsDuplicated2.SetPackageName("questionr")
+        clsDuplicated2.SetRCommand("duplicated2")
+        clsDuplicated2.AddParameter("x", clsRFunctionParameter:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0)
 
         ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnName.GetText, strTempDataframe:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColumnName.GetText)
-        ucrBase.clsRsyntax.SetBaseRFunction(clsDuplicate2)
+        ucrBase.clsRsyntax.SetBaseRFunction(clsDuplicated2)
     End Sub
 
     Private Sub SetRCodeForControls(bReset As Boolean)
-        ucrReceiverMultipleForDuplicates.AddAdditionalCodeParameterPair(clsDuplicate2, ucrReceiverMultipleForDuplicates.GetParameter, iAdditionalPairNo:=1)
-        ucrSelectorDuplicateswithVariables.AddAdditionalCodeParameterPair(clsDuplicate2, ucrSelectorDuplicateswithVariables.GetParameter, iAdditionalPairNo:=1)
-        ucrNewColumnName.AddAdditionalRCode(clsDuplicate2, 1)
+        ucrReceiverMultipleForDuplicates.AddAdditionalCodeParameterPair(clsDuplicated2, ucrReceiverMultipleForDuplicates.GetParameter, iAdditionalPairNo:=1)
+        ucrSelectorDuplicateswithVariables.AddAdditionalCodeParameterPair(clsDuplicated2, ucrSelectorDuplicateswithVariables.GetParameter, iAdditionalPairNo:=1)
+        ucrNewColumnName.AddAdditionalRCode(clsDuplicated2, 1)
+
         ucrSelectorDuplicateswithVariables.SetRCode(clsDuplicated, bReset)
         ucrReceiverMultipleForDuplicates.SetRCode(clsDuplicated, bReset)
         ucrNewColumnName.SetRCode(clsDuplicated, bReset)
         ucrPnlDuplicates.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset)
-        ucrPnlOptions.SetRCode(clsDuplicate2, bReset)
+        ucrPnlOptions.SetRCode(clsDuplicated, bReset)
     End Sub
 
     Private Sub TestOKEnabled()
@@ -118,26 +118,26 @@ Public Class dlgDuplicatesConstructed
         TestOKEnabled()
     End Sub
 
-    Private Sub ucrPnlOptions_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged, ucrPnlDuplicates.ControlValueChanged
-        DataFrameParameter()
+    Private Sub ucrPnlOptions_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged
+        SetDataFrameOrColumns()
     End Sub
 
-    Private Sub DataFrameParameter()
+    Private Sub SetDataFrameOrColumns()
         If rdoDataFrame.Checked Then
             ucrSelectorDuplicateswithVariables.SetVariablesVisible(False)
             clsDuplicated.AddParameter("x", clsRFunctionParameter:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0)
-            clsDuplicate2.AddParameter("x", clsRFunctionParameter:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0)
+            clsDuplicated2.AddParameter("x", clsRFunctionParameter:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0)
         ElseIf rdoSelectedVariables.Checked Then
             ucrSelectorDuplicateswithVariables.SetVariablesVisible(True)
             clsDuplicated.AddParameter("x", clsRFunctionParameter:=ucrReceiverMultipleForDuplicates.GetVariables, iPosition:=0)
-            clsDuplicate2.AddParameter("x", clsRFunctionParameter:=ucrReceiverMultipleForDuplicates.GetVariables, iPosition:=0)
+            clsDuplicated2.AddParameter("x", clsRFunctionParameter:=ucrReceiverMultipleForDuplicates.GetVariables, iPosition:=0)
         Else
         End If
     End Sub
 
     Private Sub SetBaseFunction()
         If rdoAllDuplicateCases.Checked Then
-            ucrBase.clsRsyntax.SetBaseRFunction(clsDuplicate2)
+            ucrBase.clsRsyntax.SetBaseRFunction(clsDuplicated2)
         ElseIf rdoDuplicatesOnly.Checked Then
             ucrBase.clsRsyntax.SetBaseRFunction(clsDuplicated)
         End If
@@ -148,7 +148,7 @@ Public Class dlgDuplicatesConstructed
     End Sub
 
     Private Sub ucrSelectorDuplicateswithVariables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDuplicateswithVariables.ControlValueChanged
-        DataFrameParameter()
+        SetDataFrameOrColumns()
     End Sub
 
     Private Sub ucrCoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNewColumnName.ControlContentsChanged, ucrReceiverMultipleForDuplicates.ControlContentsChanged, ucrSelectorDuplicateswithVariables.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged

instat/dlgExportDataset.vb

@@ -20,6 +20,7 @@ Public Class dlgExportDataset
     Dim bFirstLoad As Boolean = True
     Private bReset As Boolean = True
     Private clsDefaultFunction As New RFunction
+    Private strCurrentFileName As String
 
     Private Sub dlgExportDataset_Load(sender As Object, e As EventArgs) Handles Me.Load
         autoTranslate(Me)
@@ -75,15 +76,24 @@ Public Class dlgExportDataset
     End Sub
 
     Private Sub cmdBrowse_Click(sender As Object, e As EventArgs) Handles cmdBrowse.Click
-        Dim dlgSave As New SaveFileDialog
-        dlgSave.Title = "Export File Dialog"
-        dlgSave.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory
-        dlgSave.Filter = "Comma separated file (*.csv)|*.csv|Excel files (*.xlsx)|*.xlsx|TAB-separated data (*.tsv)|*.tsv|Pipe-separated data (*.psv)|*.psv|Feather r / Python interchange format (*.feather)|*.feather|Fixed-Width format data (*.fwf)|*.fwf|Serialized r objects (*.rds)|*.rds|Saved r objects (*.RData)|*.RData|JSON(*.json)|*.json|YAML(*.yml)|*.yml|Stata(*.dta)|*.dta|SPSS(*.sav)|*.sav|XBASE database files (*.dbf)|*.dbf| Weka Attribute - Relation File Format (*.arff)|*.arff|r syntax object (*.R)|*.R|Xml(*.xml)|*.xml|HTML(*.html)|*.html"
-        If dlgSave.ShowDialog = DialogResult.OK Then
-            If dlgSave.FileName <> "" Then
-                ucrInputExportFile.SetName(Path.GetFullPath(dlgSave.FileName).ToString.Replace("\", "/"))
+        Using dlgSave As New SaveFileDialog
+            dlgSave.Title = "Export File Dialog"
+            dlgSave.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory
+            If strCurrentFileName <> "" Then
+                dlgSave.FileName = Path.GetFileNameWithoutExtension(strCurrentFileName)
+                dlgSave.InitialDirectory = Path.GetDirectoryName(strCurrentFileName)
+            Else
+                dlgSave.FileName = ucrAvailableSheets.cboAvailableDataFrames.Text
+                dlgSave.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory
             End If
-        End If
+            dlgSave.Filter = "Comma separated file (*.csv)|*.csv|Excel files (*.xlsx)|*.xlsx|TAB-separated data (*.tsv)|*.tsv|Pipe-separated data (*.psv)|*.psv|Feather r / Python interchange format (*.feather)|*.feather|Fixed-Width format data (*.fwf)|*.fwf|Serialized r objects (*.rds)|*.rds|Saved r objects (*.RData)|*.RData|JSON(*.json)|*.json|YAML(*.yml)|*.yml|Stata(*.dta)|*.dta|SPSS(*.sav)|*.sav|XBASE database files (*.dbf)|*.dbf| Weka Attribute - Relation File Format (*.arff)|*.arff|r syntax object (*.R)|*.R|Xml(*.xml)|*.xml|HTML(*.html)|*.html"
+            If dlgSave.ShowDialog = DialogResult.OK Then
+                If dlgSave.FileName <> "" Then
+                    ucrInputExportFile.SetName(Path.GetFullPath(dlgSave.FileName).ToString.Replace("\", "/"))
+                End If
+                strCurrentFileName = dlgSave.FileName
+            End If
+        End Using
     End Sub
 
     Private Sub ucrInputExportFile_Click(sender As Object, e As EventArgs) Handles ucrInputExportFile.Click
@@ -93,4 +103,8 @@ Public Class dlgExportDataset
     Private Sub ucrInputExportFile_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrInputExportFile.ControlContentsChanged, ucrAvailableSheets.ControlContentsChanged
         TestOkEnabled()
     End Sub
+
+    Private Sub ucrAvailableSheets_DataFrameChanged(sender As Object, e As EventArgs, strPrevDataFrame As String) Handles ucrAvailableSheets.DataFrameChanged
+        strCurrentFileName = ""
+    End Sub
 End Class