Merge pull request #30 from africanmathsinitiative/master

Updating master

instat/clsGgplotDefaults.vb

@@ -92,6 +92,17 @@ Public Class GgplotDefaults
 
             Return clsYlabScalesTempFunc
         End Get
+    End Property
+
+    Public Shared ReadOnly Property clsYScaleDateFunction As RFunction
+        Get
+            Dim clsYlabScalesDateTempFunc As New RFunction
+
+            clsYlabScalesDateTempFunc.SetPackageName("ggplot2")
+            clsYlabScalesDateTempFunc.SetRCommand("scale_y_date")
+
+            Return clsYlabScalesDateTempFunc
+        End Get
     End Property
 
     Public Shared ReadOnly Property clsFacetFunction As RFunction
@@ -145,6 +156,8 @@ Public Class GgplotDefaults
             dctTemp.Add("rect", clsElementRect.Clone())
             dctTemp.Add("text", clsElementText.Clone())
             dctTemp.Add("title", clsElementText.Clone())
+            dctTemp.Add("sub.title", clsElementText.Clone())
+            dctTemp.Add("caption", clsElementText.Clone())
             'dctTemp.Add("aspect.ratio", clsElementText.Clone())
             dctTemp.Add("axis.title", clsElementText.Clone())
             dctTemp.Add("axis.title.x", clsElementText.Clone())
@@ -250,9 +263,11 @@ Public Class GgplotDefaults
     Public Shared ReadOnly Property dctColour As Dictionary(Of String, String)
         Get
             Dim dctTempColour As New Dictionary(Of String, String)
+            dctTempColour.Add("White", Chr(34) & "white" & Chr(34))
             dctTempColour.Add("Black", Chr(34) & "black" & Chr(34))
             dctTempColour.Add("Red", Chr(34) & "red" & Chr(34))
             dctTempColour.Add("Blue", Chr(34) & "blue" & Chr(34))
+            dctTempColour.Add("Light-Blue", Chr(34) & "lightblue" & Chr(34))
             dctTempColour.Add("Grey", Chr(34) & "grey" & Chr(34))
             dctTempColour.Add("Yellow", Chr(34) & "yellow" & Chr(34))
             dctTempColour.Add("Yellow-Green", Chr(34) & "yellowgreen" & Chr(34))

instat/clsInstatOptions.vb

@@ -46,6 +46,10 @@ Imports RDotNet
     Public bShowWaitDialog As Nullable(Of Boolean)
     Public iWaitTimeDelaySeconds As Nullable(Of Integer)
     Public iToolbarHeight As Nullable(Of Integer)
+    Public strClimsoftDatabaseName As String
+    Public strClimsoftHost As String
+    Public strClimsoftPort As String
+    Public strClimsoftUsername As String
 
     Public Sub New(Optional bSetOptions As Boolean = True)
         'TODO Is this sensible to do in constructor?
@@ -79,6 +83,10 @@ Imports RDotNet
         bShowWaitDialog = clsInstatOptionsDefaults.DEFAULTbShowWaitDialog
         iWaitTimeDelaySeconds = clsInstatOptionsDefaults.DEFAULTiWaitTimeDelaySeconds
         iToolbarHeight = clsInstatOptionsDefaults.DEFAULTiToolbarHeight
+        strClimsoftDatabaseName = clsInstatOptionsDefaults.DEFAULTstrClimsoftDatabaseName
+        strClimsoftHost = clsInstatOptionsDefaults.DEFAULTstrClimsoftHost
+        strClimsoftPort = clsInstatOptionsDefaults.DEFAULTstrClimsoftPort
+        strClimsoftUsername = clsInstatOptionsDefaults.DEFAULTstrClimsoftUsername
         If bSetOptions Then
             SetOptions()
         End If
@@ -240,6 +248,30 @@ Imports RDotNet
         Else
             SetToolbarHeight(clsInstatOptionsDefaults.DEFAULTiToolbarHeight)
         End If
+
+        If strClimsoftDatabaseName IsNot Nothing Then
+            SetClimsoftDatabaseName(strClimsoftDatabaseName)
+        Else
+            SetClimsoftDatabaseName(clsInstatOptionsDefaults.DEFAULTstrClimsoftDatabaseName)
+        End If
+
+        If strClimsoftHost IsNot Nothing Then
+            SetClimsoftHost(strClimsoftHost)
+        Else
+            SetClimsoftHost(clsInstatOptionsDefaults.DEFAULTstrClimsoftHost)
+        End If
+
+        If strClimsoftPort IsNot Nothing Then
+            SetClimsoftPort(strClimsoftPort)
+        Else
+            SetClimsoftPort(clsInstatOptionsDefaults.DEFAULTstrClimsoftPort)
+        End If
+
+        If strClimsoftUsername IsNot Nothing Then
+            SetClimsoftUsername(strClimsoftUsername)
+        Else
+            SetClimsoftUsername(clsInstatOptionsDefaults.DEFAULTstrClimsoftUsername)
+        End If
     End Sub
 
     Public Sub SetMaxRows(iRows As Integer)
@@ -420,4 +452,20 @@ Imports RDotNet
         iToolbarHeight = iNewToolbarHeight
         frmMain.SetToolbarHeight(iToolbarHeight)
     End Sub
+
+    Public Sub SetClimsoftDatabaseName(strNewClimsoftDatabaseName As String)
+        strClimsoftDatabaseName = strNewClimsoftDatabaseName
+    End Sub
+
+    Public Sub SetClimsoftHost(strNewClimsoftHost As String)
+        strClimsoftHost = strNewClimsoftHost
+    End Sub
+
+    Public Sub SetClimsoftPort(strNewClimsoftPort As String)
+        strClimsoftPort = strNewClimsoftPort
+    End Sub
+
+    Public Sub SetClimsoftUsername(strNewClimsoftUsername As String)
+        strClimsoftUsername = strNewClimsoftUsername
+    End Sub
 End Class

instat/clsInstatOptionsDefaults.vb

@@ -48,4 +48,8 @@ Public Class clsInstatOptionsDefaults
     Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True
     Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2
     Public Shared ReadOnly DEFAULTiToolbarHeight As Integer = 30
+    Public Shared ReadOnly DEFAULTstrClimsoftDatabaseName As String = "mariadb_climsoft_db_v4"
+    Public Shared ReadOnly DEFAULTstrClimsoftHost As String = "127.0.0.1"
+    Public Shared ReadOnly DEFAULTstrClimsoftPort As String = "3308"
+    Public Shared ReadOnly DEFAULTstrClimsoftUsername As String = "root"
 End Class

instat/dlgClimSoft.vb

@@ -83,10 +83,10 @@ Public Class dlgClimSoft
         ucrInputEndDate.SetName("")
 
         clsRDatabaseConnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_connect")
-        clsRDatabaseConnect.AddParameter("host", "127.0.0.1")
-        sdgImportFromClimSoft.ucrInputDatabaseName.SetName("")
-        sdgImportFromClimSoft.ucrInputPort.SetName("")
-        sdgImportFromClimSoft.ucrInputUserName.SetName("")
+        clsRDatabaseConnect.AddParameter("dbname", frmMain.clsInstatOptions.strClimsoftDatabaseName, iPosition:=0)
+        clsRDatabaseConnect.AddParameter("host", frmMain.clsInstatOptions.strClimsoftHost, iPosition:=1)
+        clsRDatabaseConnect.AddParameter("port", frmMain.clsInstatOptions.strClimsoftPort, iPosition:=2)
+        clsRDatabaseConnect.AddParameter("user", frmMain.clsInstatOptions.strClimsoftUsername, iPosition:=3)
 
         clsRDatabaseDisconnect.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$database_disconnect")
         clsRImportFromClimsoft.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_from_climsoft")