updating my master

docs/Download.html

@@ -79,11 +79,11 @@
               <div class="col-lg-8 col-lg-offset-2 text-center">
                   <h2 class="section-heading">Download R-Instat</h2>
                   <hr class="light">
-                  <p>If this is your first time downloading R-Instat, we recommend you <a href="http://bit.ly/2YwGI7S" style="color:blue;" target="_blank">download the Complete Installer</a>. The Complete Installer is the same version of R-Instat as the Basic Installer but also includes the required version of R (3.6.0 currently) to run R-Instat.</p>
+                  <p>If this is your first time downloading R-Instat, we recommend you <a href="http://bit.ly/2mu3RdP" style="color:blue;" target="_blank">download the Complete Installer</a>. The Complete Installer is the same version of R-Instat as the Basic Installer but also includes the required version of R (3.6.0 currently) to run R-Instat.</p>
                   <p>If you do not know if you have the latest version of R, download the Complete Installer. The Basic Installer does not include R.</p>
                   <p>R-Instat is currently a Windows only application. However, it can be accessed on Mac or Linux through use of a Virtual Windows Machine.</p>
-                  <p><a href="http://bit.ly/2YwGI7S" style="color:blue;" target="_blank">R-Instat 0.5.2 Complete Installer (.exe 577MB)</a></p>
-                  <p><a href="http://bit.ly/2LMyo1D" style="color:blue;" target="_blank">R-Instat 0.5.2 Basic Installer (.msi 499MB)</a></p>
+                  <p><a href="http://bit.ly/2mu3RdP" style="color:blue;" target="_blank">R-Instat 0.5.3 Complete Installer (.exe 577MB)</a></p>
+                  <p><a href="http://bit.ly/2mu3H6d" style="color:blue;" target="_blank">R-Instat 0.5.3 Basic Installer (.msi 499MB)</a></p>
 
                   <h2 class="section-heading">Installation & Documentation</h2>
                   <hr class="light">

instat/DlgUseDate.vb

@@ -38,6 +38,7 @@ Public Class dlgUseDate
 
     Private Sub InitialiseDialog()
         ucrBase.iHelpTopicID = 462
+        ucrBase.clsRsyntax.iCallType = 2
 
         'Selector
         ucrSelectorUseDate.SetParameter(New RParameter("data_name", 0))

instat/dlgBoxPlot.vb

@@ -33,6 +33,8 @@ Public Class dlgBoxplot
     Private clsXScaleContinuousFunction As New RFunction
     Private clsYScaleContinuousFunction As New RFunction
     Private clsRFacetFunction As New RFunction
+    Private clsCoordPolarFunction As New RFunction
+    Private clsCoordPolarStartOperator As New ROperator
     Private clsThemeFunction As New RFunction
     Private dctThemeFunctions As Dictionary(Of String, RFunction)
     Private bResetSubdialog As Boolean = True
@@ -249,6 +251,8 @@ Public Class dlgBoxplot
         clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone()
         clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone
         clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone()
+        clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone()
+        clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone()
         dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions)
         clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorBoxPlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph")
         ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator)
@@ -292,7 +296,7 @@ Public Class dlgBoxplot
     End Sub
 
     Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click
-        sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorBoxPlot, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog)
+        sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewGlobalAesFunction:=clsRaesFunction, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, ucrNewBaseSelector:=ucrSelectorBoxPlot, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog)
         sdgPlots.ShowDialog()
         bResetSubdialog = False
 

instat/dlgCircular.vb

@@ -1,3 +1,94 @@
-Public Class dlgCircular
+' R- Instat
+' Copyright (C) 2015-2017
+'
+' 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 
+' along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Imports instat.Translations
+Public Class dlgCircular
+    Private bFirstLoad As Boolean = True
+    Private bReset As Boolean = True
+    Private clsCircularFunction As New RFunction
+    Private Sub dlgCircular_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        If bFirstLoad Then
+            InitialiseDialog()
+            bFirstLoad = False
+        End If
+        If bReset Then
+            SetDefaults()
+        End If
+        SetRcodeforControls(bReset)
+        bReset = False
+        autoTranslate(Me)
+    End Sub
 
+    Private Sub InitialiseDialog()
+        ucrReceiverCircular.Selector = ucrSelectorCircular
+        ucrReceiverCircular.SetMeAsReceiver()
+
+        ucrReceiverCircular.SetParameter(New RParameter("x", 0))
+        ucrReceiverCircular.SetParameterIsRFunction()
+
+        ucrPnlModulo.SetParameter(New RParameter("modulo", 1))
+        ucrPnlModulo.AddRadioButton(rdoAsis, Chr(34) & "asis" & Chr(34))
+        ucrPnlModulo.AddRadioButton(rdo2Pi, Chr(34) & "2pi" & Chr(34))
+        ucrPnlModulo.AddRadioButton(rdoPi, Chr(34) & "pi" & Chr(34))
+
+        ucrPnlUnits.SetParameter(New RParameter("units", 2))
+        ucrPnlUnits.AddRadioButton(rdoDegrees, Chr(34) & "degrees" & Chr(34))
+        ucrPnlUnits.AddRadioButton(rdoHours, Chr(34) & "hours" & Chr(34))
+        ucrPnlUnits.AddRadioButton(rdoRadians, Chr(34) & "radians" & Chr(34))
+
+        ucrSaveCircularColumn.SetPrefix("circ")
+        ucrSaveCircularColumn.SetSaveTypeAsColumn()
+        ucrSaveCircularColumn.SetDataFrameSelector(ucrSelectorCircular.ucrAvailableDataFrames)
+        ucrSaveCircularColumn.SetLabelText("New Column Name:")
+        ucrSaveCircularColumn.SetIsComboBox()
+    End Sub
+
+    Private Sub SetDefaults()
+        clsCircularFunction = New RFunction
+
+        ucrSelectorCircular.Reset()
+        ucrSaveCircularColumn.Reset()
+        clsCircularFunction.SetPackageName("circular")
+        clsCircularFunction.SetRCommand("circular")
+
+        clsCircularFunction.AddParameter("units", Chr(34) & "radians" & Chr(34), iPosition:=2)
+        clsCircularFunction.AddParameter("modulo", Chr(34) & "2pi" & Chr(34), iPosition:=1)
+
+        clsCircularFunction.SetAssignTo(ucrSaveCircularColumn.GetText, strTempDataframe:=ucrSelectorCircular.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveCircularColumn.GetText)
+        ucrBase.clsRsyntax.SetBaseRFunction(clsCircularFunction)
+    End Sub
+
+    Private Sub SetRcodeforControls(breset As Boolean)
+        SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, breset)
+    End Sub
+
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
+        SetRcodeforControls(True)
+        TestOkEnabled()
+    End Sub
+
+    Private Sub TestOkEnabled()
+        If ucrReceiverCircular.IsEmpty OrElse Not ucrSaveCircularColumn.IsComplete Then
+            ucrBase.OKEnabled(False)
+        Else
+            ucrBase.OKEnabled(True)
+        End If
+    End Sub
+
+    Private Sub ucrReceiverCircular_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverCircular.ControlContentsChanged, ucrSaveCircularColumn.ControlContentsChanged
+        TestOkEnabled()
+    End Sub
 End Class