Merge pull request #219 from IDEMSInternational/master

updating

instat/dlgCalculator.vb

@@ -198,10 +198,13 @@ Public Class dlgCalculator
                 ucrBase.iHelpTopicID = 598
             Case "Integer"
                 Me.Width = iBasicWidth * 1.5
+                ucrBase.iHelpTopicID = 463
             Case "Complex"
                 Me.Width = iBasicWidth * 1.5
+                ucrBase.iHelpTopicID = 455
             Case "List"
                 Me.Width = iBasicWidth * 1.5
+                ucrBase.iHelpTopicID = 439
             Case Else
                 Me.Width = iBasicWidth
         End Select

instat/dlgCircular.vb

@@ -32,6 +32,7 @@ Public Class dlgCircular
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 520
         ucrReceiverCircular.Selector = ucrSelectorCircular
         ucrReceiverCircular.SetMeAsReceiver()
 

instat/dlgExportForClimpact.vb

@@ -37,7 +37,7 @@ Public Class dlgExportForClimpact
     End Sub
 
     Private Sub InitialiseDialog()
-
+        ucrBase.iHelpTopicID = 506
         ucrInputCodeMissingValues.SetParameter(New RParameter("missing_code", 6))
         ucrInputCodeMissingValues.SetRDefault("-99.9")
 

instat/dlgExportToClimsoft.vb

@@ -39,7 +39,7 @@ Public Class dlgExportToClimsoft
     End Sub
 
     Private Sub InitialiseDialog()
-
+        ucrBase.iHelpTopicID=476
         ucrReceiverStation.SetClimaticType("station")
         ucrReceiverStation.bAutoFill = True
         ucrReceiverStation.Selector = ucrSelectorImportToClimsoft

instat/dlgGeneralForGraphics.vb

@@ -167,7 +167,7 @@ Public Class dlgGeneralForGraphics
 
         ucrChkAddCode.SetText("Add Code:")
         ucrChkAddCode.AddToLinkedControls({ucrInputAddCode}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="")
-        ucrInputAddCode.SetItems({"geom_hline(yintercept=20)", "geom_vline(xintercept = 5)", "geom_vline(xintercept = 5)", "scale_x_binned()", "scale_x_binned(n.breaks=20)"})
+        ucrInputAddCode.SetItems({"scale_colour_manual(values=c(" & Chr(34) & "red" & Chr(34) & "," & Chr(34) & "blue" & Chr(34) & "," & Chr(34) & "green" & Chr(34) & "," & Chr(34) & "black" & Chr(34) & "," & Chr(34) & "brown" & Chr(34) & "))", "scale_fill_manual(values = c(" & Chr(34) & "coral" & Chr(34) & "," & Chr(34) & "bisque4" & Chr(34) & "," & Chr(34) & "gold" & Chr(34) & "," & Chr(34) & "cyan" & Chr(34) & "," & Chr(34) & "khaki" & Chr(34) & "," & Chr(34) & "orange" & Chr(34) & "," & Chr(34) & "orchid" & Chr(34) & "))", "geom_hline(yintercept=20)", "geom_vline(xintercept=5) + geom_hline(yintercept = 1)", "geom_vline(xintercept=c(1,3,5),colour=" & Chr(34) & "green" & Chr(34) & ")", "scale_x_binned()", "scale_x_binned(n.breaks=20)", "scale_y_continuous(trans=" & Chr(34) & "log10" & Chr(34) & ", label=scales::dollar)"})
 
         ucrSave.SetPrefix("graph")
         ucrSave.SetIsComboBox()
@@ -272,6 +272,14 @@ Public Class dlgGeneralForGraphics
         TestOKEnabled()
     End Sub
 
+    Private Sub SetCalculationHistory()
+        Dim newItem As String = ucrInputAddCode.GetText().Trim()
+
+        If Not String.IsNullOrEmpty(newItem) AndAlso Not ucrInputAddCode.cboInput.Items.Contains(newItem) Then
+            ucrInputAddCode.AddItems({newItem})
+        End If
+    End Sub
+
     Private Sub SetRCodeForControls(bReset As Boolean)
         ucrReceiverX.AddAdditionalCodeParameterPair(clsLevelsFunction, New RParameter("y", ucrReceiverX.GetVariableNames(False), bNewIncludeArgumentName:=False), iAdditionalPairNo:=1)
         ucrGraphicsSelector.SetRCode(clsGgplotFunction, bReset)
@@ -670,7 +678,7 @@ Public Class dlgGeneralForGraphics
     End Sub
 
     Private Sub UpdateParameters()
-        clsFacetVariablesOperator.RemoveParameterByName("wrap" & ucrInputStation.Name)
+        clsFacetVariablesOperator.RemoveParameterByName("var1")
         clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name)
         clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name)
 
@@ -794,6 +802,7 @@ Public Class dlgGeneralForGraphics
     End Sub
 
     Private Sub ucrChkAddCode_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddCode.ControlValueChanged, ucrInputAddCode.ControlValueChanged
+        SetCalculationHistory()
         If ucrChkAddCode.Checked AndAlso Not ucrInputAddCode.IsEmpty Then
             clsAddCodeOperator.AddParameter("code1", ucrInputAddCode.GetText(), bIncludeArgumentName:=False, iPosition:=1)
             clsBaseOperator.AddParameter("newcode", clsROperatorParameter:=clsAddCodeOperator, bIncludeArgumentName:=False)

instat/dlgHistogram.vb

@@ -337,8 +337,21 @@ Public Class dlgHistogram
         If rdoHistogram.Checked Then
             If ucrChkDisplayAsDotPlot.Checked Then
                 clsRgeomPlotFunction.SetRCommand("geom_dotplot")
+                clsRgeomPlotFunction.RemoveParameterByName("mapping")
+                If Not ucrFactorReceiver.IsEmpty Then
+                    clsRgeomPlotFunction.AddParameter("binpositions", Chr(34) & "all" & Chr(34), iPosition:=0)
+                    clsRgeomPlotFunction.AddParameter("stackgroups", "TRUE", iPosition:=1)
+                Else
+                    clsRgeomPlotFunction.RemoveParameterByName("binpositions")
+                    clsRgeomPlotFunction.RemoveParameterByName("stackgroups")
+                End If
             Else
                 clsRgeomPlotFunction.SetRCommand("geom_histogram")
+                clsRgeomPlotFunction.AddParameter("mapping", clsRFunctionParameter:=clsHistAesFunction)
+                If Not ucrFactorReceiver.IsEmpty Then
+                    clsRgeomPlotFunction.RemoveParameterByName("binpositions")
+                    clsRgeomPlotFunction.RemoveParameterByName("stackgroups")
+                End If
             End If
             ucrFactorReceiver.ChangeParameterName("fill")
             If Not ucrSaveHist.bUserTyped Then ucrSaveHist.SetPrefix("histogram")