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

Jump to bottom

More improvements to Distances dialog #9183

Merged
merged 4 commits into from
Oct 9, 2024
Merged

More improvements to Distances dialog #9183

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6dfe7c
Merge pull request #283 from IDEMSInternational/master
Vitalis95 Oct 4, 2024
37c2b58
Merge pull request #285 from IDEMSInternational/master
Vitalis95 Oct 9, 2024
9c2afc2
Merge pull request #286 from IDEMSInternational/master
Vitalis95 Oct 9, 2024
f9a6423
rounding off
Vitalis95 Oct 9, 2024
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
11 changes: 8 additions & 3 deletions instat/dlgDistances.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Imports instat.Translations
Public Class dlgDistances
Private bFirstLoad As Boolean = True
Private bReset As Boolean = True
Private clsConcFunction, clsConc2Function, clsDummyFunction, clsDistFunction As New RFunction
Private clsConcFunction, clsRoundOffFunction, clsConc2Function, clsDummyFunction, clsDistFunction As New RFunction
Private clsOpeningOperator, clsClosingOperator, clsConversionOperator As New ROperator

Private Sub dlgDistances_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Expand Down Expand Up @@ -85,6 +85,7 @@ Public Class dlgDistances
clsConcFunction = New RFunction
clsDistFunction = New RFunction
clsDummyFunction = New RFunction
clsRoundOffFunction = New RFunction
clsOpeningOperator = New ROperator
clsClosingOperator = New ROperator
clsConversionOperator = New ROperator
Expand Down Expand Up @@ -118,17 +119,21 @@ Public Class dlgDistances
clsConversionOperator.AddParameter("left", clsRFunctionParameter:=clsDistFunction, iPosition:=0)
clsConversionOperator.AddParameter("right", "1000", iPosition:=1)

clsRoundOffFunction.SetRCommand("round")
clsRoundOffFunction.AddParameter("dec", clsROperatorParameter:=clsConversionOperator, iPosition:=0, bIncludeArgumentName:=False)
clsRoundOffFunction.AddParameter("two", 2, iPosition:=1, bIncludeArgumentName:=False)

ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrSaveDistance.GetText, strTempDataframe:=ucrSelectorDistance.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveDistance.GetText)

ucrBase.clsRsyntax.SetBaseROperator(clsConversionOperator)
ucrBase.clsRsyntax.SetBaseRFunction(clsRoundOffFunction)

End Sub

Private Sub SetRCodeForControls(bReset As Boolean)
ucrInputLat.SetRCode(clsConcFunction, bReset)
ucrInputLon.SetRCode(clsConcFunction, bReset)
ucrPnlFrom.SetRCode(clsDummyFunction, bReset)
ucrSaveDistance.SetRCode(clsConversionOperator, bReset)
ucrSaveDistance.SetRCode(clsRoundOffFunction, bReset)
If bReset Then
ucrReceiverLong.SetRCode(clsConc2Function, bReset)
ucrReceiverLat.SetRCode(clsConc2Function, bReset)
Expand Down
Loading