Merge pull request #5652 from Ivanluv/ShowError#5604

Show error#5604
IDEMSInternational · Feb 3, 2020 · 7a6f40d · 7a6f40d
2 parents 07ec9b8 + a0c8737
commit 7a6f40d
Show file tree

Hide file tree

Showing 5 changed files with 13,170 additions and 103 deletions.
diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb
@@ -59,7 +59,7 @@ Public Class dlgCalculator
         ucrCalc.chkSaveResultInto.Checked = True
         SaveResults()
         ucrCalc.ucrSelectorForCalculations.bUseCurrentFilter = False
-        ucrCalc.ucrTryModelling.SetRSyntax(ucrBase.clsRsyntax)
+        'ucrCalc.ucrTryModelling.SetRSyntax(ucrBase.clsRsyntax)
         ucrBase.Visible = True
     End Sub
 
@@ -70,8 +70,8 @@ Public Class dlgCalculator
     Private Sub InitialiseDialog()
         ucrBase.iHelpTopicID = 14
         ucrCalc.ucrReceiverForCalculation.SetMeAsReceiver()
-        ucrCalc.ucrTryModelling.SetIsCommand()
-        ucrCalc.ucrTryModelling.SetReceiver(ucrCalc.ucrReceiverForCalculation)
+        'ucrCalc.ucrTryModelling.SetIsCommand()
+        'ucrCalc.ucrTryModelling.SetReceiver(ucrCalc.ucrReceiverForCalculation)
         clsAttach.SetRCommand("attach")
         clsDetach.SetRCommand("detach")
         clsAttach.AddParameter("what", clsRFunctionParameter:=ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames.clsCurrDataFrame)
@@ -85,7 +85,7 @@ Public Class dlgCalculator
         ucrCalc.ucrSaveResultInto.SetDataFrameSelector(ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames)
         ucrCalc.ucrSelectorForCalculations.Reset()
         ucrCalc.ucrSaveResultInto.SetValidationTypeAsRVariable()
-        ucrCalc.ucrTryModelling.StrvecOutputRequired()
+        ' ucrCalc.ucrTryModelling.StrvecOutputRequired()
     End Sub
 
     Private Sub ucrCalc_SaveNameChanged() Handles ucrCalc.SaveNameChanged
@@ -110,7 +110,7 @@ Public Class dlgCalculator
 
     Private Sub ucrCalc_SelectionChanged() Handles ucrCalc.SelectionChanged
         ucrBase.clsRsyntax.SetCommandString(ucrCalc.ucrReceiverForCalculation.GetVariableNames(False))
-        ucrCalc.ucrTryModelling.ucrInputTryMessage.SetName("")
+        ' ucrCalc.ucrTryModelling.ucrInputTryMessage.SetName("")
         TestOKEnabled()
     End Sub
 
@@ -160,7 +160,7 @@ Public Class dlgCalculator
     End Sub
 
     Private Sub ucrSelectorForCalculations_DataframeChanged() Handles ucrCalc.DataFrameChanged
-        ucrCalc.ucrTryModelling.ucrInputTryMessage.SetName("")
+        'ucrCalc.ucrTryModelling.ucrInputTryMessage.SetName("")
         SaveResults()
     End Sub
 

diff --git a/instat/sdgCalculationsSummmary.vb b/instat/sdgCalculationsSummmary.vb
@@ -66,7 +66,7 @@ Public Class sdgCalculationsSummmary
         'temp until working
         ucrCalcSummary.chkSaveResultInto.Visible = False
         ucrCalcSummary.ucrSaveResultInto.Visible = False
-        ucrCalcSummary.ucrTryModelling.Visible = False
+        'ucrCalcSummary.ucrTryModelling.Visible = False
 
         ucrManipulations.bIsDataType = False
         ucrManipulations.cmdBottom.Enabled = False