Skip to content

Commit 39b99de

Browse files
committed
Rows_Options
1 parent 064d434 commit 39b99de

File tree

1 file changed

+23
-29
lines changed

1 file changed

+23
-29
lines changed

instat/dlgView.vb

+23-29
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,13 @@ Public Class dlgView
5656
ucrPnlDisplayWindow.AddParameterValuesCondition(rdoDispSepOutputWindow, "checked", "viewer")
5757

5858
ucrPnlDisplayWindow.AddToLinkedControls(ucrChkDisplayFromTop, {rdoDispOutputWindow}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=True)
59-
ucrPnlDisplayWindow.AddToLinkedControls(ucrChkRowNumbers, {rdoDispOutputWindow}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=True)
59+
ucrPnlDisplayWindow.AddToLinkedControls(ucrNudNumberRows, {rdoDispOutputWindow}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=True)
6060
ucrPnlDisplayWindow.AddToLinkedControls(ucrViewChkPreview, {rdoHTMLOutputWindow}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=True)
6161

62-
6362
ucrNudNumberRows.SetParameter(New RParameter("n", 1))
6463
ucrReceiverView.SetParameter(New RParameter("x", 1, bNewIncludeArgumentName:=False))
65-
66-
ucrChkRowNumbers.SetText("Rows")
67-
ucrChkRowNumbers.AddToLinkedControls(ucrNudNumberRows, {True}, bNewLinkedHideIfParameterMissing:=True)
6864
ucrNudNumberRows.SetRDefault(6)
65+
ucrNudNumberRows.SetLinkedDisplayControl(lblNumberofRows)
6966

7067
ucrChkDisplayFromTop.SetText("Display From Top")
7168
ucrChkDisplayFromTop.AddFunctionNamesCondition(True, {"head", "tail"})
@@ -124,9 +121,9 @@ Public Class dlgView
124121

125122
clsDummyFunction.AddParameter("checked", "window", iPosition:=0)
126123

127-
'clsGetObjectDataFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data")
128-
'clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorForView.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0)
129-
'clsGetObjectDataFunction.AddParameter("as_file", "TRUE", iPosition:=2)
124+
clsGetObjectDataFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data")
125+
clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorForView.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0)
126+
clsGetObjectDataFunction.AddParameter("as_file", "TRUE", iPosition:=2)
130127

131128

132129
clsOutputWindowFunction.SetPackageName("utils")
@@ -207,13 +204,11 @@ Public Class dlgView
207204
Private Sub ChangeFunctionParameters()
208205
If rdoDispOutputWindow.Checked Then
209206
clsDummyFunction.AddParameter("checked", "window", iPosition:=0)
210-
211207
cmdTableOptions.Visible = False
212208
ucrSaveData.Visible = True
213209
ucrBase.clsRsyntax.iCallType = 2
214210
ucrBase.clsRsyntax.RemoveFromAfterCodes(clsGetObjectDataFunction)
215211
ucrSaveData.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text)
216-
'ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction)
217212
If ucrNudNumberRows.GetText <> "" OrElse ucrChkDisplayFromTop.Checked Then
218213
ucrBase.clsRsyntax.SetBaseRFunction(clsOutputWindowFunction)
219214

@@ -234,7 +229,6 @@ Public Class dlgView
234229
cmdTableOptions.Visible = False
235230
ucrSaveData.Visible = False
236231
Else
237-
'ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction)
238232
ucrSaveData.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html)
239233
clsDummyFunction.AddParameter("checked", "html", iPosition:=0)
240234
ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator)
@@ -257,7 +251,7 @@ Public Class dlgView
257251
If bControlsUpdated Then
258252
ChangeFunctionParameters()
259253
End If
260-
' GetObjectName()
254+
GetObjectName()
261255
End Sub
262256

263257
Private Sub ucrChkSortColumn_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSortColumn.ControlValueChanged, ucrPnlDisplayWindow.ControlValueChanged
@@ -286,21 +280,21 @@ Public Class dlgView
286280
TestOKEnabled()
287281
End Sub
288282

289-
'Private Sub ucrSaveData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSaveData.ControlValueChanged
290-
' GetObjectName()
291-
'End Sub
292-
293-
'Private Sub GetObjectName()
294-
' If rdoDispOutputWindow.Checked Then
295-
' Dim strPrefix As String = clsOutputWindowFunction.GetRObjectToAssignTo 'If(ucrSaveData.GetText <> "", ucrSaveData.GetText, "last_table")
296-
' clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & strPrefix & Chr(34), iPosition:=1)
297-
' ElseIf rdoHTMLOutputWindow.Checked Then
298-
' Dim strPrefix As String = clsBaseOperator.GetRObjectToAssignTo
299-
' clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & strPrefix & Chr(34), iPosition:=1)
300-
' End If
301-
'End Sub
302-
303-
'Private Sub ucrSelectorForView_DataFrameChanged() Handles ucrSelectorForView.DataFrameChanged
304-
' clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorForView.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0)
305-
'End Sub
283+
Private Sub ucrSaveData_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSaveData.ControlValueChanged
284+
GetObjectName()
285+
End Sub
286+
287+
Private Sub GetObjectName()
288+
If rdoDispOutputWindow.Checked Then
289+
Dim strPrefix As String = clsOutputWindowFunction.GetRObjectToAssignTo 'If(ucrSaveData.GetText <> "", ucrSaveData.GetText, "last_table")
290+
clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & strPrefix & Chr(34), iPosition:=1)
291+
ElseIf rdoHTMLOutputWindow.Checked Then
292+
Dim strPrefix As String = clsBaseOperator.GetRObjectToAssignTo
293+
clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & strPrefix & Chr(34), iPosition:=1)
294+
End If
295+
End Sub
296+
297+
Private Sub ucrSelectorForView_DataFrameChanged() Handles ucrSelectorForView.DataFrameChanged
298+
clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorForView.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0)
299+
End Sub
306300
End Class

0 commit comments

Comments
 (0)