Merge pull request #6 from africanmathsinitiative/master

updating my repo
stevekogo · May 2, 2016 · 199aa30 · 199aa30
2 parents cec30f1 + 195cd5f
commit 199aa30
Show file tree

Hide file tree

Showing 17 changed files with 496 additions and 183 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
@@ -281,7 +281,7 @@
     <value>No</value>
   </data>
   <data name="Rate" xml:space="preserve">
-    <value>rate</value>
+    <value>Rate</value>
   </data>
   <data name="Stack_Daily_data" xml:space="preserve">
     <value>Stack Daily data</value>
@@ -1510,4 +1510,7 @@
   <data name="Gamma" xml:space="preserve">
     <value>Gamma</value>
   </data>
+  <data name="Location" xml:space="preserve">
+    <value>Location</value>
+  </data>
 </root>
diff --git a/instat/dlgLabels.vb b/instat/dlgLabels.vb
@@ -45,9 +45,7 @@ Public Class dlgLabels
         ucrReceiverLabels.SetDataType("factor")
         ucrFactorLabels.SetReceiver(ucrReceiverLabels)
         ucrFactorLabels.SetAsViewerOnly()
-        'ucrFactorLabels.SetSelectorColumnName(strNewColumnName:=ucrFactorLabels.)
-        ucrFactorLabels.SetEditableStatus(bEditable:=True)
-
+        ucrFactorLabels.AddEditableColumns({"Levels"})
     End Sub
 
     Private Sub SetDefaults()

diff --git a/instat/dlgRandomSample.designer.vb b/instat/dlgRandomSample.designer.vb