Merge pull request #4 from africanmathsinitiative/master

Updating master
NanyanziAlice · Aug 2, 2022 · 7a4c2c7 · 7a4c2c7
2 parents a98b265 + a851b75
commit 7a4c2c7
Show file tree

Hide file tree

Showing 33 changed files with 10,279 additions and 9,303 deletions.
diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb
@@ -32,7 +32,7 @@ Public Class clsInstatOptionsDefaults
     Public Shared ReadOnly DEFAULTclrEditor As Color = Color.Black
     Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10
     Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000
-    Public Shared ReadOnly DEFAULTiMaxCols As Integer = 30
+    Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50
     Public Shared ReadOnly DEFAULTstrComment As String = "Code generated by the dialog,"
     Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window"
     Public Shared ReadOnly DEFAULTbChangeDataFrame As Boolean = False

diff --git a/instat/dlgClimaticDataEntry.vb b/instat/dlgClimaticDataEntry.vb
@@ -181,7 +181,7 @@ Public Class dlgClimaticDataEntry
 
     Private Sub TestOkEnabled()
         If Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverElements.IsEmpty Then
-            ucrBase.OKEnabled(clsSaveDataEntryFunction.ContainsParameter("rows_changed"))
+            ucrBase.OKEnabled(clsSaveDataEntryFunction.ContainsParameter("rows_changed") OrElse clsCommentsListFunction.ContainsParameter("comment"))
             cmdEnterData.Enabled = True
             If Not ucrReceiverStation.IsEmpty AndAlso ucrInputSelectStation.IsEmpty Then
                 cmdEnterData.Enabled = False

diff --git a/instat/dlgConditionalQuantilePlot.Designer.vb b/instat/dlgConditionalQuantilePlot.Designer.vb
diff --git a/instat/dlgGeneralForGraphics.vb b/instat/dlgGeneralForGraphics.vb
@@ -179,7 +179,7 @@ Public Class dlgGeneralForGraphics
         sdgPlots.DisableLayersTab()
         sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction,
                           clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabsFunction,
-                          clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction,
+                          clsNewFacetFunction:=clsFacetsFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsGlobalAesFunction,
                           clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction,
                           clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, bReset:=bResetSubdialog)
         sdgPlots.ShowDialog()

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