Merge pull request #7 from africanmathsinitiative/master

Pulling changes from the main
IDEMSInternational · Jan 19, 2016 · 304d080 · 304d080
2 parents 83e6180 + 4c688e5
commit 304d080
Show file tree

Hide file tree

Showing 26 changed files with 1,729 additions and 329 deletions.
diff --git a/instat/My Project/Resources.Designer.vb b/instat/My Project/Resources.Designer.vb
diff --git a/instat/My Project/Resources.resx b/instat/My Project/Resources.resx
@@ -202,9 +202,6 @@
   <data name="Manage" xml:space="preserve">
     <value>Manage</value>
   </data>
-  <data name="New_Worksheet" xml:space="preserve">
-    <value>New Worksheet... CTRL+N</value>
-  </data>
   <data name="Ok" xml:space="preserve">
     <value>Ok</value>
   </data>
@@ -865,4 +862,37 @@
   <data name="With_X_Variable" xml:space="preserve">
     <value>With X Variable</value>
   </data>
+  <data name="Columns_to_be_stack" xml:space="preserve">
+    <value>Columns to be stack</value>
+  </data>
+  <data name="Existing_worksheet" xml:space="preserve">
+    <value>Existing worksheet</value>
+  </data>
+  <data name="Factor_into" xml:space="preserve">
+    <value>Factor into</value>
+  </data>
+  <data name="New_worksheet" xml:space="preserve">
+    <value>New worksheet</value>
+  </data>
+  <data name="Omit_value" xml:space="preserve">
+    <value>Omit value</value>
+  </data>
+  <data name="Output_options" xml:space="preserve">
+    <value>Output options</value>
+  </data>
+  <data name="Sheet_name" xml:space="preserve">
+    <value>Sheet name</value>
+  </data>
+  <data name="Stack_data_into" xml:space="preserve">
+    <value>Stack data into</value>
+  </data>
+  <data name="Exponential" xml:space="preserve">
+    <value>Exponential</value>
+  </data>
+  <data name="Geometric" xml:space="preserve">
+    <value>Geometric</value>
+  </data>
+  <data name="Normal" xml:space="preserve">
+    <value>Normal</value>
+  </data>
 </root>
diff --git a/instat/My Project/Resources.sw-KE.resx b/instat/My Project/Resources.sw-KE.resx
@@ -54,9 +54,6 @@
   <data name="Manage" xml:space="preserve">
     <value>Simamia</value>
   </data>
-  <data name="New_Worksheet" xml:space="preserve">
-    <value>Lahakazi mpya</value>
-  </data>
   <data name="Ok" xml:space="preserve">
     <value>Sawa</value>
   </data>

diff --git a/instat/clsDistribution.vb b/instat/clsDistribution.vb
@@ -1,4 +1,20 @@
-Public Class Distribution
+' Instat+R
+' Copyright (C) 2015
+'
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU General Public License for more details.
+'
+' 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/>.
+
+Public Class Distribution
     Public strNameTag As String
     Public strRFunctionName As String = ""
     Public strPFunctionName As String = ""
@@ -11,16 +27,18 @@
         strNameTag = strTemp
     End Sub
 
-    Public Sub AddParameter(strArgumentName, strNameTag)
+    Public Sub AddParameter(strArgumentName As String, strNameTag As String, Optional DefaultValue As Decimal = Nothing)
         Dim NewParameter As New DistributionParameter
         NewParameter.strArgumentName = strArgumentName
         NewParameter.strNameTag = strNameTag
+        NewParameter.dcmDefaultValue = DefaultValue
         clsParameters.Add(NewParameter)
     End Sub
 End Class
 
 Public Class DistributionParameter
     Public strArgumentName As String
     Public strNameTag As String
+    Public dcmDefaultValue As Decimal
 
 End Class
diff --git a/instat/dlgFileNew.Designer.vb b/instat/dlgFileNew.Designer.vb
diff --git a/instat/dlgRowStats.Designer.vb b/instat/dlgRowStats.Designer.vb
diff --git a/instat/dlgRowStats.vb b/instat/dlgRowStats.vb
@@ -14,16 +14,13 @@
 '
 ' 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 dlgRowStats
     Private Sub dlgRowStats_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        autoTranslate(Me)
-
-
-    End Sub
-
-    'Private Sub UcrReceiverMultiple1_Leave(sender As Object, e As EventArgs) Handles UcrReceiverMultiple1.LeftList
-    '    ucrBase.clsRsyntax.AddParameter("x", "data$" & UcrReceiverMultiple1.lstSelectedVariables.SelectedItem & "")
-    'End Sub
+        autoTranslate(Me)
+    End Sub
+
+    Private Sub ucrDataFrame_Load(sender As Object, e As EventArgs) Handles ucrDataFrame.Load
+
+    End Sub
 End Class