Merge pull request #264 from IDEMSInternational/master

update

instat/dlgCalculator.vb

@@ -44,7 +44,7 @@ Public Class dlgCalculator
             SetDefaults()
             bFirstLoad = False
         End If
-        SetHelpOptions()
+        SetStructuredMenu()
         ReopenDialog()
         TestOKEnabled()
         autoTranslate(Me)
@@ -75,7 +75,7 @@ Public Class dlgCalculator
                                            bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore,
                                            bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength)
         ucrBase.Visible = True
-        SetHelpOptions()
+        SetStructuredMenu()
     End Sub
 
     Private Sub ReopenDialog()
@@ -261,10 +261,8 @@ Public Class dlgCalculator
         End If
     End Sub
 
-    Private Sub SetHelpOptions()
+    Private Sub SetStructuredMenu()
         Select Case enumCalculatorMode
-            Case CalculatorMode.Prepare
-                ucrBase.iHelpTopicID = 14
             Case CalculatorMode.Structured
                 ucrCalc.ucrInputCalOptions.SetName("Circular")
                 ucrBase.iHelpTopicID = 677
@@ -324,7 +322,7 @@ Public Class dlgCalculator
             Case "Symbols"
                 Me.Width = iBasicWidth * 2.56
             Case "Goodness of Fit"
-                Me.Width = iBasicWidth * 1.27
+                Me.Width = iBasicWidth * 1.25
                 ucrBase.iHelpTopicID = 717
             Case "Integer"
                 Me.Width = iBasicWidth * 1.5

instat/dlgInventoryPlot.vb

@@ -317,7 +317,6 @@ Public Class dlgInventoryPlot
         SetDefaults()
         SetRCodeForControls(True)
         TestOkEnabled()
-
     End Sub
 
     Private Sub ucrPnlOptions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOptions.ControlValueChanged
@@ -335,6 +334,7 @@ Public Class dlgInventoryPlot
             clsInventoryPlot.iCallType = 3
             clsInventoryPlot.bExcludeAssignedFunctionOutput = False
         End If
+        AddClimateMissingFunction()
     End Sub
 
     Private Sub AddOrRemoveKeyFunctions()
@@ -347,13 +347,17 @@ Public Class dlgInventoryPlot
         End If
     End Sub
 
-    Private Sub ucrChkSummary_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSummary.ControlValueChanged
-        If ucrChkSummary.Checked Then
+    Private Sub AddClimateMissingFunction()
+        If rdoMissing.Checked AndAlso ucrChkSummary.Checked Then
             ucrBase.clsRsyntax.AddToAfterCodes(clsClimaticMissing, iPosition:=1)
             clsClimaticMissing.iCallType = 2
         Else
             ucrBase.clsRsyntax.RemoveFromAfterCodes(clsClimaticMissing)
-            End If
+        End If
+    End Sub
+
+    Private Sub ucrChkSummary_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSummary.ControlValueChanged, ucrChkOmitEnd.ControlValueChanged, ucrChkOmitStart.ControlValueChanged
+        AddClimateMissingFunction()
         AddOrRemoveKeyFunctions()
     End Sub
 

instat/frmMain.vb

@@ -2843,4 +2843,8 @@ Public Class frmMain
         UpdateSwapDataAndScript()
         UpdateLayout()
     End Sub
+
+    Private Sub RInstatResourcesSiteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RInstatResourcesSiteToolStripMenuItem.Click
+        Process.Start("https://ecampus.r-instat.org/course/view.php?id=14")
+    End Sub
 End Class

instat/static/InstatObject/R/InstallPackages.R

@@ -161,4 +161,4 @@ devtools::install_github("ianmoran11/mmtable2")
 devtools::install_github("michael-franke/aida-package")
 devtools::install_github("rijaf-iri/CDT")
 devtools::install_github("IDEMSInternational/rapidpror")
-
+devtools::install_github("IDEMSInternational/epicsawrap")

instat/ucrCalculator.vb

@@ -1047,7 +1047,7 @@ Public Class ucrCalculator
                 grpList.Visible = False
                 cmdRhelpList.Visible = False
                 cmdRhelpFunctions.Visible = False
-                Me.Size = New Size(iBasicWidth * 1.27, iBaseHeight)
+                Me.Size = New Size(iBasicWidth * 1.25, iBaseHeight)
             Case "Integer"
                 strPackageName = "gmp"
                 grpFunctions.Visible = False