Merge pull request #37 from africanmathsinitiative/master

Updating branch

instat/DlgUseDate.vb

@@ -53,6 +53,7 @@ Public Class dlgUseDate
         ucrReceiverUseDate.SetMeAsReceiver()
         ucrReceiverUseDate.bUseFilteredData = False
         ucrReceiverUseDate.SetIncludedDataTypes({"Date"})
+        ucrReceiverUseDate.bAutoFill = True
         ucrReceiverUseDate.SetParameterIsString()
 
         'Check boxes

instat/dlgColumnStats.vb

@@ -40,7 +40,7 @@ Public Class dlgColumnStats
     End Sub
 
     Public Sub TestOKEnabled()
-        If Not ucrReceiverSelectedVariables.IsEmpty() Then ' AndAlso Not sdgSummaries.strSummariesParameter = "c()") 
+        If Not ucrReceiverSelectedVariables.IsEmpty() AndAlso Not clsSummariesList.clsParameters.Count = 0 Then
             ucrBase.OKEnabled(True)
         Else
             ucrBase.OKEnabled(False)
@@ -62,7 +62,7 @@ Public Class dlgColumnStats
 
         clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary")
         clsDefaultFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesList)
-        ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction.Clone())
+        ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction)
         bResetSubdialog = True
     End Sub
 
@@ -110,12 +110,14 @@ Public Class dlgColumnStats
         SetRCodeForControls(True)
         TestOKEnabled()
     End Sub
-    Private Sub cmdSummaries_Click(sender As Object, e As EventArgs) Handles cmdSummaries.Click
+
+    Private Sub cmdSummaries_click(sender As Object, e As EventArgs) Handles cmdSummaries.Click
         sdgSummaries.SetRFunction(clsSummariesList, bResetSubdialog)
         bResetSubdialog = False
         sdgSummaries.ShowDialog()
         TestOKEnabled()
     End Sub
+
     Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSelectedVariables.ControlContentsChanged
         TestOKEnabled()
     End Sub

instat/dlgConvertColumns.vb

@@ -13,6 +13,7 @@
 '
 ' You should have received a copy of the GNU General Public License k
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 Imports instat.Translations
 
 Public Class dlgConvertColumns
@@ -127,4 +128,12 @@ Public Class dlgConvertColumns
     Private Sub Controls_ControlContentsChanged() Handles ucrReceiverColumnsToConvert.ControlContentsChanged, ucrPnlConvertTo.ControlContentsChanged, ucrChkSpecifyDecimalsToDisplay.ControlContentsChanged, ucrNudDisplayDecimals.ControlContentsChanged
         TestOKEnabled()
     End Sub
+
+    Private Sub ucrChkSpecifyDecimalsToDisplay_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSpecifyDecimalsToDisplay.ControlValueChanged
+        If ucrChkSpecifyDecimalsToDisplay.Checked Then
+            ucrReceiverColumnsToConvert.SetDataType("numeric")
+        Else
+            ucrReceiverColumnsToConvert.SetIncludedDataTypes({"integer", "numeric", "character", "ordered", "factor"})
+        End If
+    End Sub
 End Class

instat/dlgDefineCRI.vb

@@ -61,8 +61,8 @@ Public Class dlgDefineCRI
         ucrReceiverRedFlag.Selector = ucrSelectorCRI
         ucrReceiverRedFlag.SetMeAsReceiver()
         ucrReceiverRedFlag.SetIncludedDataTypes({"numeric", "logical", "factor"})
-        ucrReceiverRedFlag.AddIncludedMetadataProperty("Is_Corruption_Output", {"TRUE"})
-        ucrReceiverRedFlag.AddIncludedMetadataProperty("Is_Corruption_Red_Flag", {"TRUE"})
+        ucrReceiverRedFlag.AddIncludedMetadataProperty("Is_Corruption_Index", {"TRUE"})
+        'ucrReceiverRedFlag.AddExcludedMetadataProperty("Is_Corruption_Red_Flag", {"FALSE"})
 
         'ucrChk
         ucrChkScaleNumeric.SetText("Scale Numeric")
@@ -96,8 +96,9 @@ Public Class dlgDefineCRI
         ucrNudWeights.Value = 0
         clsCalculation.SetOperation("+")
 
-        ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$apply_instat_calculation")
+        ucrBase.clsRsyntax.SetFunction(frmMain.clsRLink.strInstatDataObject & "$run_instat_calculation")
         ucrBase.clsRsyntax.AddParameter("calc", clsRFunctionParameter:=clsDefineFunction)
+        ucrBase.clsRsyntax.AddParameter("display", "FALSE")
 
         clsDefineFunction.SetRCommand("instat_calculation$new")
         clsDefineFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34))

instat/dlgFitCorruptionModel.vb

@@ -76,9 +76,9 @@ Public Class dlgFitCorruptionModel
         ucrSaveCorruptionModel.SetPrefix("Corruption_Model")
         ucrSaveCorruptionModel.SetSaveTypeAsModel()
         ucrSaveCorruptionModel.SetDataFrameSelector(ucrSelectorFitModel.ucrAvailableDataFrames)
-        ucrSaveCorruptionModel.SetCheckBoxText("Save Graph")
+        ucrSaveCorruptionModel.SetCheckBoxText("Save Model")
         ucrSaveCorruptionModel.SetIsComboBox()
-        ucrSaveCorruptionModel.SetAssignToIfUncheckedValue("last_graph")
+        ucrSaveCorruptionModel.SetAssignToIfUncheckedValue("last_model")
     End Sub
 
     Private Sub SetDefaults()
@@ -113,9 +113,6 @@ Public Class dlgFitCorruptionModel
     End Sub
 
     Private Sub SetRCodeForControls(bReset As Boolean)
-        'ucrReceiverOutput.SetRCode(clsModel, bReset)
-        'ucrReceiverControlVariables.SetRCode(clsModel1, bReset)
-        'ucrReceiverIndicators.SetRCode(clsModel1, bReset)
         ucrSelectorFitModel.SetRCode(clsCorruptionModel, bReset)
         ucrSaveCorruptionModel.SetRCode(clsCorruptionModel, bReset)
     End Sub