@@ -56,16 +56,13 @@ Public Class dlgView
56
56
ucrPnlDisplayWindow.AddParameterValuesCondition(rdoDispSepOutputWindow, "checked" , "viewer" )
57
57
58
58
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 )
60
60
ucrPnlDisplayWindow.AddToLinkedControls(ucrViewChkPreview, {rdoHTMLOutputWindow}, bNewLinkedHideIfParameterMissing:= True , bNewLinkedAddRemoveParameter:= True , bNewLinkedChangeToDefaultState:= True , objNewDefaultState:= True )
61
61
62
-
63
62
ucrNudNumberRows.SetParameter( New RParameter( "n" , 1 ))
64
63
ucrReceiverView.SetParameter( New RParameter( "x" , 1 , bNewIncludeArgumentName:= False ))
65
-
66
- ucrChkRowNumbers.SetText( "Rows" )
67
- ucrChkRowNumbers.AddToLinkedControls(ucrNudNumberRows, { True }, bNewLinkedHideIfParameterMissing:= True )
68
64
ucrNudNumberRows.SetRDefault( 6 )
65
+ ucrNudNumberRows.SetLinkedDisplayControl(lblNumberofRows)
69
66
70
67
ucrChkDisplayFromTop.SetText( "Display From Top" )
71
68
ucrChkDisplayFromTop.AddFunctionNamesCondition( True , { "head" , "tail" })
@@ -124,9 +121,9 @@ Public Class dlgView
124
121
125
122
clsDummyFunction.AddParameter( "checked" , "window" , iPosition:= 0 )
126
123
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 )
130
127
131
128
132
129
clsOutputWindowFunction.SetPackageName( "utils" )
@@ -207,13 +204,11 @@ Public Class dlgView
207
204
Private Sub ChangeFunctionParameters()
208
205
If rdoDispOutputWindow.Checked Then
209
206
clsDummyFunction.AddParameter( "checked" , "window" , iPosition:= 0 )
210
-
211
207
cmdTableOptions.Visible = False
212
208
ucrSaveData.Visible = True
213
209
ucrBase.clsRsyntax.iCallType = 2
214
210
ucrBase.clsRsyntax.RemoveFromAfterCodes(clsGetObjectDataFunction)
215
211
ucrSaveData.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text)
216
- 'ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction)
217
212
If ucrNudNumberRows.GetText <> "" OrElse ucrChkDisplayFromTop.Checked Then
218
213
ucrBase.clsRsyntax.SetBaseRFunction(clsOutputWindowFunction)
219
214
@@ -234,7 +229,6 @@ Public Class dlgView
234
229
cmdTableOptions.Visible = False
235
230
ucrSaveData.Visible = False
236
231
Else
237
- 'ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction)
238
232
ucrSaveData.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html)
239
233
clsDummyFunction.AddParameter( "checked" , "html" , iPosition:= 0 )
240
234
ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator)
@@ -257,7 +251,7 @@ Public Class dlgView
257
251
If bControlsUpdated Then
258
252
ChangeFunctionParameters()
259
253
End If
260
- ' GetObjectName()
254
+ GetObjectName()
261
255
End Sub
262
256
263
257
Private Sub ucrChkSortColumn_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSortColumn.ControlValueChanged, ucrPnlDisplayWindow.ControlValueChanged
@@ -286,21 +280,21 @@ Public Class dlgView
286
280
TestOKEnabled()
287
281
End Sub
288
282
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
306
300
End Class
0 commit comments