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.

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

Enabling R viewer in the Main menu #9342

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions instat/dlgView.vb
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,10 @@ Public Class dlgView

ucrChkRowNumbers.AddToLinkedControls(ucrNudNumberRows, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=6)


ucrNudNumberRows.Visible = rdoDispOutputWindow.Checked
ucrReceiverView.SetParameter(New RParameter("x", 1, bNewIncludeArgumentName:=False))

ucrNudNumberRows.SetParameter(New RParameter("n", 1))
'ucrNudNumberRows.Minimum = 1
ucrNudNumberRows.SetRDefault(6)
ucrNudNumberRows.SetLinkedDisplayControl(lblNumberofRows)

Expand Down Expand Up @@ -199,7 +197,6 @@ Public Class dlgView
Else
ucrBase.OKEnabled(False)
End If

End Sub

Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
Expand All @@ -218,7 +215,6 @@ Public Class dlgView
ucrSaveData.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Text)
If ucrNudNumberRows.GetText <> "" OrElse ucrChkDisplayFromTop.Checked Then
ucrBase.clsRsyntax.SetBaseRFunction(clsOutputWindowFunction)

If ucrChkDisplayFromTop.Checked Then
clsOutputWindowFunction.SetRCommand("head")
Else
Expand All @@ -228,10 +224,12 @@ Public Class dlgView
ucrBase.clsRsyntax.SetBaseRFunction(ucrReceiverView.GetVariables(True))
End If
ElseIf rdoDispSepOutputWindow.Checked Then
Dim datasetName As String = ucrSelectorForView.ucrAvailableDataFrames.cboAvailableDataFrames.Text
Dim datasetNameinQuotes As String = """" & datasetName & """"
Comment on lines +227 to +228
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then remove these

clsDummyFunction.AddParameter("checked", "viewer", iPosition:=0)
ucrBase.clsRsyntax.RemoveFromAfterCodes(clsGetObjectDataFunction)
ucrBase.clsRsyntax.iCallType = 0
ucrBase.clsRsyntax.SetBaseRFunction(clsViewColumnsFunction)
clsViewColumnsFunction.AddParameter(strParameterName:="title", datasetNameinQuotes, iPosition:=2)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about this?
clsViewColumnsFunction.AddParameter(strParameterName:="title", Chr(34) & ucrSelectorForView.strCurrentDataFrame & Chr(34) , iPosition:=2)

ucrSaveData.Visible = False
cmdTableOptions.Visible = False
ucrSaveData.Visible = False
Expand Down
Loading
Loading