From 69288824e8d218c76b48eec9b2086cfc350964fa Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 22 Jan 2025 12:51:58 +0100 Subject: [PATCH 1/4] Removing Scalars from non-Scalar Calculations --- instat/dlgCalculator.vb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index c7eee20e0a..22c8981e46 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -122,10 +122,10 @@ Public Class dlgCalculator clsDetachScalarsFunction.AddParameter("unload", "TRUE") ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachFunction, 0) - ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) + 'ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 1) - ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) + 'ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) ucrBase.clsRsyntax.SetCommandString("") @@ -204,7 +204,11 @@ Public Class dlgCalculator Dim strResut As String = ucrCalc.ucrSaveResultInto.GetText clsAddScalarFunction.AddParameter("scalar_name", Chr(34) & strResut & Chr(34), iPosition:=1) clsAddScalarFunction.AddParameter("scalar_value", strResut, iPosition:=2) + clsAddScalarFunction.AddParameter("data_name", Chr(34) & dataFrameName & Chr(34), iPosition:=0) + clsScalarsDataFuntion.AddParameter("data_name", Chr(34) & dataFrameName & Chr(34), iPosition:=0) ucrBase.clsRsyntax.AddToAfterCodes(clsAddScalarFunction, 0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) ucrBase.clsRsyntax.SetAssignTo(strResut) ucrCalc.ucrSaveResultInto.btnColumnPosition.Enabled = False ucrCalc.ucrSaveResultInto.btnColumnPosition.Visible = True @@ -214,12 +218,13 @@ Public Class dlgCalculator ucrCalc.ucrSaveResultInto.ucrInputComboSave.Enabled = True Else ucrBase.clsRsyntax.RemoveFromAfterCodes(clsAddScalarFunction) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachScalarsFunction) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDetachScalarsFunction) ucrCalc.ucrSaveResultInto.btnColumnPosition.Enabled = True ucrCalc.ucrSaveResultInto.btnColumnPosition.Visible = True ucrCalc.ucrSaveResultInto.ucrChkSave.Enabled = True ucrCalc.ucrSaveResultInto.ucrInputComboSave.Visible = True ucrCalc.ucrSaveResultInto.ucrInputComboSave.Enabled = True - End If ' Update command string and clear input try message name @@ -244,23 +249,18 @@ Public Class dlgCalculator If Not String.IsNullOrEmpty(ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame) Then Dim strDataFrame As String = ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame ucrCalc.ucrTryCalculator.ucrInputTryMessage.SetName("") - clsScalarsDataFuntion.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34)) clsDetachFunction.AddParameter("name", strDataFrame) - clsAddScalarFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) clsRemoveLabelsFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) SaveResults() ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachFunction, 0) - ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 1) - ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) + ucrCalc.ucrSaveResultInto.Enabled = True ucrCalc.ucrChkStoreScalar.Visible = True Else ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachFunction) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachScalarsFunction) ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDetachFunction) - ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDetachScalarsFunction) ucrCalc.ucrSelectorForCalculations.ResetCheckBoxScalar() ucrCalc.ucrSaveResultInto.Enabled = False ucrCalc.ucrChkStoreScalar.Visible = False From f0faebeff13cb5f3dea709125e5a222be409a66a Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 22 Jan 2025 12:58:06 +0100 Subject: [PATCH 2/4] Code changes --- instat/dlgCalculator.vb | 2 -- 1 file changed, 2 deletions(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 22c8981e46..15617121ec 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -122,10 +122,8 @@ Public Class dlgCalculator clsDetachScalarsFunction.AddParameter("unload", "TRUE") ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachFunction, 0) - 'ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 1) - 'ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) ucrBase.clsRsyntax.SetCommandString("") From 8ecdcfec3325b2ad8d0dfa588afc24741f4c6d3b Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 23 Jan 2025 15:55:00 +0100 Subject: [PATCH 3/4] Code changes --- instat/dlgCalculator.vb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 15617121ec..462027a1af 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -214,6 +214,15 @@ Public Class dlgCalculator ucrCalc.ucrSaveResultInto.ucrChkSave.Enabled = False ucrCalc.ucrSaveResultInto.ucrInputComboSave.Visible = True ucrCalc.ucrSaveResultInto.ucrInputComboSave.Enabled = True + ElseIf ucrCalc.ucrSelectorForCalculations.checkBoxScalar.Checked Then + Dim strResut As String = ucrCalc.ucrSaveResultInto.GetText + clsAddScalarFunction.AddParameter("scalar_name", Chr(34) & strResut & Chr(34), iPosition:=1) + clsAddScalarFunction.AddParameter("scalar_value", strResut, iPosition:=2) + clsAddScalarFunction.AddParameter("data_name", Chr(34) & dataFrameName & Chr(34), iPosition:=0) + clsScalarsDataFuntion.AddParameter("data_name", Chr(34) & dataFrameName & Chr(34), iPosition:=0) + ucrBase.clsRsyntax.AddToAfterCodes(clsAddScalarFunction, 0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) + ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2) Else ucrBase.clsRsyntax.RemoveFromAfterCodes(clsAddScalarFunction) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachScalarsFunction) @@ -247,18 +256,22 @@ Public Class dlgCalculator If Not String.IsNullOrEmpty(ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame) Then Dim strDataFrame As String = ucrCalc.ucrSelectorForCalculations.strCurrentDataFrame ucrCalc.ucrTryCalculator.ucrInputTryMessage.SetName("") + clsScalarsDataFuntion.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34)) clsDetachFunction.AddParameter("name", strDataFrame) + clsAddScalarFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) clsRemoveLabelsFunction.AddParameter("data_name", Chr(34) & strDataFrame & Chr(34), iPosition:=0) SaveResults() ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachFunction, 0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1) ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 1) - ucrCalc.ucrSaveResultInto.Enabled = True ucrCalc.ucrChkStoreScalar.Visible = True Else ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachFunction) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsAttachScalarsFunction) ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDetachFunction) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsDetachScalarsFunction) ucrCalc.ucrSelectorForCalculations.ResetCheckBoxScalar() ucrCalc.ucrSaveResultInto.Enabled = False ucrCalc.ucrChkStoreScalar.Visible = False From 58bd962013f85d6e9207613ab85c04534d91ece5 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:18:12 +0100 Subject: [PATCH 4/4] Code Changes --- instat/dlgCalculator.vb | 2 -- 1 file changed, 2 deletions(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 462027a1af..31c557a35f 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -216,8 +216,6 @@ Public Class dlgCalculator ucrCalc.ucrSaveResultInto.ucrInputComboSave.Enabled = True ElseIf ucrCalc.ucrSelectorForCalculations.checkBoxScalar.Checked Then Dim strResut As String = ucrCalc.ucrSaveResultInto.GetText - clsAddScalarFunction.AddParameter("scalar_name", Chr(34) & strResut & Chr(34), iPosition:=1) - clsAddScalarFunction.AddParameter("scalar_value", strResut, iPosition:=2) clsAddScalarFunction.AddParameter("data_name", Chr(34) & dataFrameName & Chr(34), iPosition:=0) clsScalarsDataFuntion.AddParameter("data_name", Chr(34) & dataFrameName & Chr(34), iPosition:=0) ucrBase.clsRsyntax.AddToAfterCodes(clsAddScalarFunction, 0)