Skip to content

Commit 5a137b3

Browse files
authored
Merge pull request #9359 from MeSophie/EnableRViewerGraph9353
Added the R viewer to the Describe > View Graph dialog
2 parents 756e2be + 3114fc1 commit 5a137b3

File tree

2 files changed

+43
-52
lines changed

2 files changed

+43
-52
lines changed

instat/dlgViewGraph.Designer.vb

+41-49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

instat/dlgViewGraph.vb

+2-3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Public Class dlgViewGraph
4040

4141
Private Sub InitialiseDialog()
4242
ucrBase.iHelpTopicID = 525
43+
ucrBase.clsRsyntax.bSeparateThread = False
4344

4445
'Selector
4546
ucrGraphsSelector.SetParameter(New RParameter("data_name", 0))
@@ -63,7 +64,6 @@ Public Class dlgViewGraph
6364

6465
'todo. Calling print() from this dialog doesn't work. investigate why
6566
'temporarily disabled
66-
rdoRViewer.Enabled = False
6767
End Sub
6868

6969
Private Sub SetDefaults()
@@ -125,8 +125,7 @@ Public Class dlgViewGraph
125125
clsGetObjectRFunction.AddParameter("as_file", strParameterValue:="FALSE", iPosition:=2)
126126
ucrBase.clsRsyntax.SetBaseRFunction(clsViewObjectRFunction)
127127
ElseIf rdoRViewer.Checked Then
128-
'clsViewObjectRFunction.AddParameter("object", clsRFunctionParameter:=clsGetObjectRFunction)
129-
'clsViewObjectRFunction.RemoveParameterByName("object_format")
128+
clsGetObjectRFunction.AddParameter("as_file", strParameterValue:="FALSE", iPosition:=2)
130129
ucrBase.clsRsyntax.SetBaseRFunction(clsPrintRFunction)
131130
End If
132131
End Sub

0 commit comments

Comments
 (0)