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

updated my master #508

Merged
merged 66 commits into from
Nov 14, 2024
Merged

updated my master #508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
e8b4721
design changes
Fidel365 Sep 28, 2024
88bf3e3
code
Fidel365 Oct 1, 2024
71aa747
code2
Fidel365 Oct 1, 2024
432caeb
code3
Fidel365 Oct 2, 2024
130ff78
code 4
Fidel365 Oct 7, 2024
968544e
code5
Fidel365 Oct 7, 2024
fdc509b
Final changes
Fidel365 Oct 7, 2024
171d21d
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 7, 2024
5599d94
changes
Fidel365 Oct 13, 2024
9b0c927
Merge pull request #289 from IDEMSInternational/master
Vitalis95 Oct 15, 2024
5736c8a
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 17, 2024
f90bfb4
Merge pull request #290 from IDEMSInternational/master
Vitalis95 Oct 18, 2024
5650518
Merge branch 'View.dialog' of /~https://github.com/Fidel365/R-Instat in…
Fidel365 Oct 20, 2024
54d4e32
sub dialog changes
Fidel365 Oct 21, 2024
558a895
rows
Fidel365 Oct 23, 2024
61fe6fe
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 23, 2024
2e510b6
Merge pull request #292 from IDEMSInternational/master
Vitalis95 Oct 23, 2024
a38697c
changes to the code
Vitalis95 Oct 24, 2024
5693b2f
changes to the code
Vitalis95 Oct 24, 2024
4c0de12
changes
Vitalis95 Oct 25, 2024
087a423
changes
Vitalis95 Oct 28, 2024
294df81
changes
Vitalis95 Oct 28, 2024
be7650b
changes
Vitalis95 Oct 28, 2024
24a712b
changes
Vitalis95 Oct 28, 2024
925839d
changesv
Fidel365 Oct 28, 2024
d2698bb
changes to the code
Vitalis95 Oct 28, 2024
b9b5b80
changes
Vitalis95 Oct 28, 2024
f8102f4
changes
Fidel365 Oct 28, 2024
328e286
changes
Fidel365 Oct 29, 2024
ad93859
tables
Fidel365 Oct 29, 2024
6f0def8
objectname
Fidel365 Oct 29, 2024
a920bce
final
Fidel365 Oct 29, 2024
cfdfbf8
Merge branch 'View.dialog' of /~https://github.com/Fidel365/R-Instat in…
Fidel365 Oct 29, 2024
9323682
changes to the code
Vitalis95 Oct 29, 2024
6d102e2
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 29, 2024
698aa0f
changes
Vitalis95 Oct 30, 2024
70e1e98
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Oct 30, 2024
24c60d3
changes to the code
Vitalis95 Oct 31, 2024
0a53908
changes
Vitalis95 Oct 31, 2024
caf7c10
changes
Vitalis95 Nov 1, 2024
4c781ff
changes
Vitalis95 Nov 1, 2024
bbb4be6
changes to the code
Vitalis95 Nov 4, 2024
b5b7db9
code change
Vitalis95 Nov 4, 2024
fef54dd
changes
Vitalis95 Nov 5, 2024
361d76d
changes
Vitalis95 Nov 6, 2024
387b333
changes to the code
Vitalis95 Nov 6, 2024
d51d692
sub changes
Fidel365 Nov 6, 2024
404034e
Merge branch 'View.dialog' of /~https://github.com/Fidel365/R-Instat in…
Fidel365 Nov 6, 2024
ae0e0ef
changes to the code
Vitalis95 Nov 6, 2024
1277910
changes
Vitalis95 Nov 6, 2024
9b1b58f
changes to the code
Vitalis95 Nov 7, 2024
1fbd7f9
changes to the code
Vitalis95 Nov 7, 2024
74987ea
changes
Vitalis95 Nov 7, 2024
5abd10e
changes to the code
Vitalis95 Nov 7, 2024
c243df6
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Nov 7, 2024
c45e50e
changes
Vitalis95 Nov 8, 2024
dab1a63
code changes
Vitalis95 Nov 8, 2024
8e7efa2
table changes
Fidel365 Nov 13, 2024
064d434
design for number of rowa
Fidel365 Nov 13, 2024
39b99de
Rows_Options
Fidel365 Nov 13, 2024
ecfde91
change
Fidel365 Nov 13, 2024
0199a50
final changes
Fidel365 Nov 13, 2024
67780a8
Merge branch 'IDEMSInternational:master' into View.dialog
Fidel365 Nov 13, 2024
7b3d371
Merge branch 'View.dialog' of /~https://github.com/Fidel365/R-Instat in…
Fidel365 Nov 13, 2024
d390b17
Merge pull request #9203 from Vitalis95/summary_table
Patowhiz Nov 14, 2024
21764f0
Merge pull request #9174 from Fidel365/View.dialog
N-thony Nov 14, 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
Prev Previous commit
Next Next commit
code5
  • Loading branch information
@Fidel365
Fidel365 committed Oct 7, 2024
commit 968544e4d7637befc3f6f206e0b520d2cd3168a7
32 changes: 31 additions & 1 deletion instat/dlgView.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

127 changes: 42 additions & 85 deletions instat/dlgView.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ Public Class dlgView
ucrPnlDisplayWindow.AddParameterValuesCondition(rdoDispSepOutputWindow, "checked", "viewer")

ucrPnlDisplayWindow.AddToLinkedControls(ucrChkDisplayFromTop, {rdoDispOutputWindow}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=True)
ucrPnlDisplayWindow.AddToLinkedControls(ucrChkRowNumbers, {rdoDispOutputWindow, rdoHTMLOutputWindow}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=True)
ucrPnlDisplayWindow.AddToLinkedControls(ucrChkRowNumbers, {rdoDispOutputWindow}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=True)
ucrPnlDisplayWindow.AddToLinkedControls(ucrViewChkPreview, {rdoHTMLOutputWindow}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=True)


'ucrPnlDisplayFrom.AddRadioButton(rdoBottom)
'ucrPnlDisplayFrom.AddRadioButton(rdoTop)
'ucrPnlDisplayFrom.SetLinkedDisplayControl(lblDisplayFrom)
Expand All @@ -75,6 +78,16 @@ Public Class dlgView
ucrChkDisplayFromTop.SetText("Display From Top")
ucrChkDisplayFromTop.AddFunctionNamesCondition(True, {"head", "tail"})
ucrChkDisplayFromTop.AddFunctionNamesCondition(False, {frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data"})

ucrViewChkPreview.SetText("Rows")
ucrViewChkPreview.AddParameterPresentCondition(True, "head", bNewIsPositive:=True)
ucrViewChkPreview.AddParameterPresentCondition(False, "head", bNewIsPositive:=False)
ucrViewChkPreview.AddToLinkedControls(ucrViewNudPreview, {True}, bNewLinkedHideIfParameterMissing:=True)

ucrViewNudPreview.SetParameter(New RParameter("x", 0, bNewIncludeArgumentName:=False))
ucrViewNudPreview.Minimum = 6
ucrViewNudPreview.Maximum = Decimal.MaxValue
ucrViewNudPreview.SetRDefault(6)
' ucrChkSpecifyRows.bAllowNonConditionValues = True

' ucrPnlViewData.AddRadioButton(rdoViewAll)
Expand Down Expand Up @@ -130,6 +143,8 @@ Public Class dlgView
clsDummyFunction = New RFunction
clsAsHtmlWidgetFunction = New RFunction

ucrViewChkPreview.Checked = True

ucrSelectorForView.Reset()
ucrReceiverView.SetMeAsReceiver()

Expand Down Expand Up @@ -167,7 +182,7 @@ Public Class dlgView

clsHeadRFunction.SetPackageName("utils")
clsHeadRFunction.SetRCommand("head")
clsHeadRFunction.AddParameter(strParameterName:="x", strParameterValue:=6, iPosition:=0, bIncludeArgumentName:=False)
clsHeadRFunction.AddParameter(strParameterName:="x", strParameterValue:=100, iPosition:=0, bIncludeArgumentName:=False)
clsBaseOperator.AddParameter(strParameterName:="head", clsRFunctionParameter:=clsHeadRFunction, iPosition:=1, bIncludeArgumentName:=False)

clsGtRFunction.SetPackageName("gt")
Expand All @@ -190,6 +205,7 @@ Public Class dlgView
'Correct maximum is then set in DataFrameLength()
ucrNudNumberRows.Maximum = Decimal.MaxValue

ucrViewChkPreview.SetRCode(clsBaseOperator, bReset)
'ucrReceiverView.AddAdditionalCodeParameterPair(clsHTMLFunction, New RParameter("mydf"), iAdditionalPairNo:=1)
ucrReceiverView.AddAdditionalCodeParameterPair(clsHTMLFunction, New RParameter("x"), iAdditionalPairNo:=1)

Expand All @@ -202,7 +218,7 @@ Public Class dlgView

ucrChkDisplayFromTop.SetRCode(clsOutputWindowFunction, bReset)
ucrNudNumberRows.SetRCode(clsOutputWindowFunction, bReset)
ucrChkRowNumbers.SetRCode(clsHeadRFunction, bReset)
ucrViewNudPreview.SetRCode(clsHeadRFunction, bReset)
' ucrChkSpecifyRows.SetRCode(clsOutputWindowFunction, bReset)
ucrSelectorForView.SetRCode(clsViewAllFunction, bReset)
' ucrPnlViewData.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset)
Expand Down Expand Up @@ -264,26 +280,18 @@ Public Class dlgView
ucrSaveData.Visible = True
ucrBase.clsRsyntax.iCallType = 2

'If ucrChkDisplayFromTop.Checked Then
' clsOutputWindowFunction.SetRCommand("head")
'Else
' clsOutputWindowFunction.SetRCommand("tail")
'End If
' If ucrNudNumberRows.GetText <> "" Then
'If ucrNudNumberRows.GetText <> "" AndAlso rdoDispOutputWindow.Checked Then 'OrElse ucrChkDisplayFromTop.Checked Then
' ' clsOutputWindowFunction.SetRCommand("head")
' ucrBase.clsRsyntax.SetBaseRFunction(clsOutputWindowFunction)
' ucrSaveData.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text)
' ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction)

'Else
' ' clsViewAllFunction.AddParameter("x", clsRFunctionParameter:=ucrSelectorForView.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0)

' ' clsOutputWindowFunction.AddParameter("x", clsRFunctionParameter:=ucrSelectorForView.ucrAvailableDataFrames.iColumnCount, iPosition:=0)

' ' ucrBase.clsRsyntax.RemoveFromAfterCodes(clsGetObjectDataFunction)
' ucrBase.clsRsyntax.SetBaseRFunction(ucrReceiverView.GetVariables(True))
'End If
If ucrNudNumberRows.GetText <> "" OrElse ucrChkDisplayFromTop.Checked Then
ucrBase.clsRsyntax.SetBaseRFunction(clsOutputWindowFunction)
ucrSaveData.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text)
ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction)
If ucrChkDisplayFromTop.Checked Then
clsOutputWindowFunction.SetRCommand("head")
Else
clsOutputWindowFunction.SetRCommand("tail")
End If
Else
ucrBase.clsRsyntax.SetBaseRFunction(ucrReceiverView.GetVariables(True))
End If
ElseIf rdoDispSepOutputWindow.Checked Then
clsOutputWindowFunction.SetRCommand("head")
clsDummyFunction.AddParameter("checked", "viewer", iPosition:=0)
Expand All @@ -295,78 +303,37 @@ Public Class dlgView
cmdTableOptions.Visible = False
ucrSaveData.Visible = False
Else
'ucrNudNumberRows.AddParameterPresentCondition(True, "head", bNewIsPositive:=True)
'ucrNudNumberRows.AddParameterPresentCondition(False, "head", bNewIsPositive:=False)
'If ucrNudNumberRows.GetText <> "" Then
' ' clsOutputWindowFunction.RemoveParameterByName("x")
' ' clsOutputWindowFunction.SetRCommand("head")
' clsBaseOperator.AddParameter(strParameterName:="head", clsRFunctionParameter:=clsHeadRFunction, iPosition:=1, bIncludeArgumentName:=False)
'Else
' clsBaseOperator.RemoveParameterByName("head")
'End If
'ucrChkRowNumbers.AddParameterPresentCondition(True, "head", bNewIsPositive:=True)
'ucrChkRowNumbers.AddParameterPresentCondition(False, "head", bNewIsPositive:=False)
'If ucrChkRowNumbers.Checked AndAlso ucrNudNumberRows.GetText <> "" Then
' clsOutputWindowFunction.RemoveParameterByName("x")
' clsBaseOperator.AddParameter(strParameterName:="head", clsRFunctionParameter:=clsHeadRFunction, iPosition:=1, bIncludeArgumentName:=False)
'Else

' clsBaseOperator.RemoveParameterByName("head")
'End If
clsOutputWindowFunction.SetRCommand("head")
clsDummyFunction.AddParameter("checked", "html", iPosition:=0)
ucrBase.clsRsyntax.SetBaseRFunction(clsAsHtmlWidgetFunction)
ucrSaveData.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html)
cmdTableOptions.Visible = True
ucrSaveData.Visible = True
ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction)
End If
'Else
' ucrBase.clsRsyntax.SetBaseRFunction(clsViewAllFunction)
' ucrBase.clsRsyntax.RemoveFromAfterCodes(clsGetObjectDataFunction)
' ucrSaveData.Visible = False
'End If
End Sub

Private Sub DataFrameLength()
ucrNudNumberRows.Maximum = ucrSelectorForView.ucrAvailableDataFrames.iDataFrameLength
End Sub

Private Sub FunctionControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDisplayFromTop.ControlValueChanged, ucrPnlDisplayWindow.ControlValueChanged, ucrReceiverView.ControlValueChanged
Private Sub FunctionControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrViewChkPreview.ControlValueChanged, ucrViewNudPreview.ControlValueChanged, ucrChkDisplayFromTop.ControlValueChanged, ucrPnlDisplayWindow.ControlValueChanged, ucrReceiverView.ControlValueChanged
If bControlsUpdated Then
ChangeFunctionParameters()
End If
GetObjectName()
End Sub

Private Sub ucrChkRowNumbers_Load(sender As Object, e As EventArgs) Handles ucrChkRowNumbers.Load
If ucrChkRowNumbers.Checked Then
If rdoDispOutputWindow.Checked Then
If ucrChkDisplayFromTop.Checked Then
clsOutputWindowFunction.SetRCommand("head")
Else
clsOutputWindowFunction.SetRCommand("tail")
End If
If ucrNudNumberRows.GetText <> "" Then
clsOutputWindowFunction.SetRCommand("head")
ucrBase.clsRsyntax.SetBaseRFunction(clsOutputWindowFunction)
ucrSaveData.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text)
ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction)
Else
ucrBase.clsRsyntax.SetBaseRFunction(ucrReceiverView.GetVariables(True))
End If
ElseIf rdoHTMLOutputWindow.Checked Then
ucrChkRowNumbers.AddParameterPresentCondition(True, "head", bNewIsPositive:=True)
ucrChkRowNumbers.AddParameterPresentCondition(False, "head", bNewIsPositive:=False)
If ucrNudNumberRows.GetText <> "" Then
' clsOutputWindowFunction.RemoveParameterByName("x")
clsBaseOperator.AddParameter(strParameterName:="head", clsRFunctionParameter:=clsHeadRFunction, iPosition:=1, bIncludeArgumentName:=False)
Else
clsBaseOperator.RemoveParameterByName("head")
End If
End If
Private Sub ucrViewChkPreview_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrViewChkPreview.ControlValueChanged
' clsOutputWindowFunction.SetRCommand("head")
If ucrViewChkPreview.Checked Then
clsBaseOperator.AddParameter(strParameterName:="head", clsRFunctionParameter:=clsHeadRFunction, iPosition:=1, bIncludeArgumentName:=False)
Else
clsBaseOperator.RemoveParameterByName("head")
End If
End Sub


Private Sub ucrChkSortColumn_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSortColumn.ControlValueChanged, ucrPnlDisplayWindow.ControlValueChanged
'Not yet implemented
'If rdoHTMLOutputWindow.Checked AndAlso ucrChkSortColumn.Checked Then
Expand All @@ -386,22 +353,11 @@ Public Class dlgView
sdgTableOptions.ShowDialog(Me)
End Sub

'Private Sub ucrChkRowNumbers_Load(sender As Object, e As EventArgs) Handles ucrChkRowNumbers.Load
' If ucrChkRowNumbers.Checked Then
' ucrNudNumberRows.SetParameter(New RParameter("n", 1))
' ucrNudNumberRows.Visible = True
' Else
' 'ucrNudNumberRows.Remove("n")
' 'ucrNudNumberRows.UnSetParameter(New RParameter("n", 1))
' ucrNudNumberRows.Visible = False
' End If
'End Sub

Private Sub ucrPnlViewData_ControlValueChanged(ucrChangedControl As ucrCore)
ChangeFunctionParameters()
End Sub

Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverView.ControlContentsChanged, ucrPnlDisplayWindow.ControlContentsChanged, ucrNudNumberRows.ControlContentsChanged, ucrChkDisplayFromTop.ControlContentsChanged, ucrChkSortColumn.ControlContentsChanged, ucrReceiverSortCol.ControlContentsChanged
Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrViewNudPreview.ControlContentsChanged, ucrViewChkPreview.ControlContentsChanged, ucrReceiverView.ControlContentsChanged, ucrPnlDisplayWindow.ControlContentsChanged, ucrNudNumberRows.ControlContentsChanged, ucrChkDisplayFromTop.ControlContentsChanged, ucrChkSortColumn.ControlContentsChanged, ucrReceiverSortCol.ControlContentsChanged
' TableOptions()
TestOKEnabled()
End Sub
Expand All @@ -416,6 +372,7 @@ Public Class dlgView
Dim strPrefix As String = clsOutputWindowFunction.GetRObjectToAssignTo 'If(ucrSaveData.GetText <> "", ucrSaveData.GetText, "last_table")
clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & strPrefix & Chr(34), iPosition:=1)
ElseIf rdoHTMLOutputWindow.Checked Then
clsOutputWindowFunction.SetRCommand("head")
Dim strPrefix As String = clsAsHtmlWidgetFunction.GetRObjectToAssignTo
clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & strPrefix & Chr(34), iPosition:=1)
End If
Expand Down