Merge pull request #244 from africanmathsinitiative/master

updating branch
IDEMSInternational · Nov 10, 2017 · 56bfc85 · 56bfc85
2 parents 60ab22a + 6b18e34
commit 56bfc85
Show file tree

Hide file tree

Showing 29 changed files with 7,420 additions and 278 deletions.
diff --git a/instat/MultilingualResources/instat.fr-FR.xlf b/instat/MultilingualResources/instat.fr-FR.xlf
diff --git a/instat/MultilingualResources/instat.sw-KE.xlf b/instat/MultilingualResources/instat.sw-KE.xlf
diff --git a/instat/Translations.vb b/instat/Translations.vb
@@ -27,16 +27,18 @@ Public Class Translations
         For Each aControl As Control In controls
             'If checkboxes are translated then it overrides the text set in the dialog code
             'If ucrPanels are translated their position is shifted on the dialog - not yet found reason but does not affect button translation
-            If TypeOf aControl IsNot ucrCheck AndAlso TypeOf aControl IsNot ucrInput AndAlso TypeOf aControl IsNot UcrPanel Then
-                If TypeOf aControl Is Panel Then
+            If TypeOf aControl IsNot ucrCheck AndAlso TypeOf aControl IsNot ucrInput Then
+                If TypeOf aControl Is UcrPanel OrElse TypeOf aControl Is Panel Then
                     translateEach(aControl.Controls, ctrParent)
-                ElseIf TypeOf aControl Is MenuStrip Then
-                    mnuTmp = DirectCast(aControl, MenuStrip)
-                    translateMenu(mnuTmp.Items, ctrParent)
-                ElseIf TypeOf aControl Is UserControl Then
-                    translateEach(aControl.Controls, aControl)
+                Else
+                    If TypeOf aControl Is MenuStrip Then
+                        mnuTmp = DirectCast(aControl, MenuStrip)
+                        translateMenu(mnuTmp.Items, ctrParent)
+                    ElseIf TypeOf aControl Is UserControl Then
+                        translateEach(aControl.Controls, aControl)
+                    End If
+                    res.ApplyResources(aControl, aControl.Name, Threading.Thread.CurrentThread.CurrentUICulture)
                 End If
-                res.ApplyResources(aControl, aControl.Name, Threading.Thread.CurrentThread.CurrentUICulture)
             End If
         Next
 

diff --git a/instat/clsGgplotDefaults.vb b/instat/clsGgplotDefaults.vb
@@ -33,7 +33,11 @@ Public Class GgplotDefaults
             Dim clsTempParam As New RParameter
 
             clsTempParam.SetArgumentName("theme_name")
-            clsTempParam.SetArgumentValue("theme_grey()")
+            clsTempParam.SetArgumentValue("theme_grey()")
+            'This position MUST be smaller than the position of the theme() parameter
+            ' Otherwise this will overwrite any specific theme options selected
+            ' Currently theme() is set to position 100
+            clsTempParam.Position = 14
             Return clsTempParam
         End Get
     End Property

diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb
@@ -123,7 +123,7 @@ Public Class dlgBarAndPieChart
 
         clsBaseOperator.SetOperation("+")
         clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0)
-        clsBaseOperator.AddParameter("geomfunc", clsRFunctionParameter:=clsRgeomBarFunction)
+        clsBaseOperator.AddParameter("geomfunc", clsRFunctionParameter:=clsRgeomBarFunction, iPosition:=2)
 
         clsRggplotFunction.SetPackageName("ggplot2")
         clsRggplotFunction.SetRCommand("ggplot")

diff --git a/instat/dlgCumulativeDistribution.vb b/instat/dlgCumulativeDistribution.vb
@@ -117,7 +117,7 @@ Public Class dlgCumulativeDistribution
 
         clsBaseOperator.SetOperation("+")
         clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0)
-        clsBaseOperator.AddParameter("stat_ecdf", clsRFunctionParameter:=clsRgeomCumDistFunction, iPosition:=1)
+        clsBaseOperator.AddParameter("stat_ecdf", clsRFunctionParameter:=clsRgeomCumDistFunction, iPosition:=2)
 
         clsRggplotFunction.SetPackageName("ggplot2")
         clsRggplotFunction.SetRCommand("ggplot")

diff --git a/instat/dlgFitModel.Designer.vb b/instat/dlgFitModel.Designer.vb
diff --git a/instat/dlgFitModel.fr-FR.resx b/instat/dlgFitModel.fr-FR.resx