Merge pull request #776 from africanmathsinitiative/master

merge from main
IDEMSInternational · Sep 25, 2017 · 1a4c4ce · 1a4c4ce
2 parents dea176f + 6cbc1a9
commit 1a4c4ce
Show file tree

Hide file tree

Showing 42 changed files with 773 additions and 259 deletions.
diff --git a/instat/DlgDefineClimaticData.Designer.vb b/instat/DlgDefineClimaticData.Designer.vb
diff --git a/instat/dlgCalculator.designer.vb b/instat/dlgCalculator.designer.vb
diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb
@@ -24,11 +24,13 @@ Public Class dlgCalculator
     Dim clsDetach As New RFunction
     Public bFirstLoad As Boolean = True
     Public iHelpCalcID As Integer
+    Private iBasicWidth As Integer
 
     Private Sub dlgCalculator_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
         If bFirstLoad Then
             InitialiseDialog()
+            iBasicWidth = Me.Width
             SetDefaults()
             bFirstLoad = False
         Else
@@ -132,21 +134,21 @@ Public Class dlgCalculator
     Private Sub CalculationsOptions()
         Select Case ucrCalc.ucrInputCalOptions.GetText
             Case "Maths"
-                Me.Size = New System.Drawing.Size(680, 435)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.33, Me.Height)
             Case "Logical and Symbols"
-                Me.Size = New System.Drawing.Size(627, 435)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.23, Me.Height)
             Case "Statistics"
-                Me.Size = New System.Drawing.Size(588, 435)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.15, Me.Height)
             Case "Strings (Character Columns)"
-                Me.Size = New System.Drawing.Size(630, 435)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.24, Me.Height)
             Case "Probability"
-                Me.Size = New System.Drawing.Size(810, 435)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.59, Me.Height)
             Case "Dates"
-                Me.Size = New System.Drawing.Size(660, 435)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.3, Me.Height)
             Case "Rows"
-                Me.Size = New System.Drawing.Size(615, 435)
+                Me.Size = New System.Drawing.Size(iBasicWidth * 1.21, Me.Height)
             Case Else
-                Me.Size = New System.Drawing.Size(510, 435)
+                Me.Size = New System.Drawing.Size(iBasicWidth, Me.Height)
         End Select
     End Sub
 

diff --git a/instat/dlgClimaticCheckDataRain.Designer.vb b/instat/dlgClimaticCheckDataRain.Designer.vb
diff --git a/instat/dlgClimdex.resx → instat/dlgClimaticCheckDataRain.resx b/instat/dlgClimdex.resx → instat/dlgClimaticCheckDataRain.resx
diff --git a/instat/dlgClimaticCheckDataRain.vb b/instat/dlgClimaticCheckDataRain.vb
@@ -0,0 +1,9 @@
+Public Class dlgClimaticCheckDataRain
+    Private Sub UcrSelectorByDataFrameAddRemove1_Load(sender As Object, e As EventArgs) Handles ucrSelectorRain.Load
+
+    End Sub
+
+    Private Sub dlgRain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+    End Sub
+End Class
diff --git a/instat/dlgClimdex.Designer.vb → instat/dlgClimdexIndices.Designer.vb b/instat/dlgClimdex.Designer.vb → instat/dlgClimdexIndices.Designer.vb