Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing Scalars from non-Scalar Calculations #9382

Merged
merged 4 commits into from
Jan 27, 2025
Merged

Removing Scalars from non-Scalar Calculations #9382

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6928882
Removing Scalars from non-Scalar Calculations
derekagorhom Jan 22, 2025
f0faebe
Code changes
derekagorhom Jan 22, 2025
8ecdcfe
Code changes
derekagorhom Jan 23, 2025
58bd962
Code Changes
derekagorhom Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions instat/dlgCalculator.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")

Expand Down Expand Up @@ -204,22 +202,34 @@ 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
ucrCalc.ucrSaveResultInto.ucrChkSave.Checked = False
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("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)
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
Expand Down Expand Up @@ -253,7 +263,6 @@ Public Class dlgCalculator
ucrBase.clsRsyntax.AddToBeforeCodes(clsAttachScalarsFunction, 1)

ucrBase.clsRsyntax.AddToAfterCodes(clsDetachFunction, 1)
ucrBase.clsRsyntax.AddToAfterCodes(clsDetachScalarsFunction, 2)
ucrCalc.ucrSaveResultInto.Enabled = True
ucrCalc.ucrChkStoreScalar.Visible = True
Else
Expand Down
Loading