Merge pull request #6 from africanmathsinitiative/master

getting latest version
stevekogo · Nov 8, 2016 · 063410a · 063410a
2 parents 1cfea1f + 6917698
commit 063410a
Show file tree

Hide file tree

Showing 30 changed files with 693 additions and 563 deletions.
diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb
@@ -63,6 +63,7 @@ Public Class dlgCalculator
         chkSaveResultInto.Checked = True
         SaveResults()
         grpDates.Enabled = False
+        ucrSelectorForCalculations.bUseCurrentFilter = False
     End Sub
 
     Private Sub ReopenDialog()

diff --git a/instat/dlgCombine.vb b/instat/dlgCombine.vb
@@ -39,6 +39,7 @@ Public Class dlgCombine
         ucrFactorsReceiver.Selector = ucrSelectorCombineFactors
         ucrFactorsReceiver.SetMeAsReceiver()
         ucrFactorsReceiver.SetIncludedDataTypes({"factor"})
+        ucrFactorsReceiver.bUseFilteredData = False
         ucrBase.clsRsyntax.SetFunction("interaction")
         ucrInputColName.SetItemsTypeAsColumns()
         ucrInputColName.SetDefaultTypeAsColumn()

diff --git a/instat/dlgCombineText.vb b/instat/dlgCombineText.vb
@@ -48,6 +48,7 @@ Public Class dlgCombineText
         ucrReceiverCombineText.SetMeAsReceiver()
         ucrBase.clsRsyntax.SetFunction("stringr::str_c")
         ucrReceiverCombineText.SetIncludedDataTypes({"factor", "character"})
+        ucrReceiverCombineText.bUseFilteredData = False
         ucrInputColumnInto.SetItemsTypeAsColumns()
         ucrInputColumnInto.SetDefaultTypeAsColumn()
         ucrInputColumnInto.SetDataFrameSelector(ucrSelectorForCombineText.ucrAvailableDataFrames)

diff --git a/instat/dlgCountinFactor.Designer.vb b/instat/dlgCountinFactor.Designer.vb
diff --git a/instat/dlgCountinFactor.vb b/instat/dlgCountinFactor.vb
@@ -30,12 +30,14 @@ Public Class dlgCountinFactor
         ucrCountReceiver.Selector = ucrCountSelector
         ucrCountReceiver.SetIncludedDataTypes({"factor"})
         ucrCountReceiver.SetMeAsReceiver()
+        ucrCountReceiver.bUseFilteredData = False
         ucrBase.iHelpTopicID = 457
         ucrInputCountColumnName.SetItemsTypeAsColumns()
         ucrInputCountColumnName.SetDefaultTypeAsColumn()
         ucrInputCountColumnName.SetDataFrameSelector(ucrCountSelector.ucrAvailableDataFrames)
         ucrInputCountColumnName.SetValidationTypeAsRVariable()
         ucrBase.clsRsyntax.SetFunction("fac.nested")
+        ucrBase.OKEnabled(False)
     End Sub
     Private Sub SetDefaults()
         ucrCountSelector.Reset()
@@ -47,11 +49,11 @@ Public Class dlgCountinFactor
 
     End Sub
     Private Sub TestOkEnabled()
-        If Not ucrCountReceiver.IsEmpty AndAlso Not ucrInputCountColumnName.IsEmpty Then
-            ucrBase.OKEnabled(True)
-        Else
-            ucrBase.OKEnabled(False)
-        End If
+        '        If Not ucrCountReceiver.IsEmpty AndAlso Not ucrInputCountColumnName.IsEmpty Then
+        '        ucrBase.OKEnabled(True)
+        '       Else
+        '      ucrBase.OKEnabled(False)
+        '     End If
     End Sub
     Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
         SetDefaults()

diff --git a/instat/dlgFitModel.Designer.vb b/instat/dlgFitModel.Designer.vb