Skip to content

Commit 6808081

Browse files
xieguigangxieguigang
committed
fix reference error of the r graphics library
1 parent a8b7fca commit 6808081

File tree

11 files changed

+68
-63
lines changed

11 files changed

+68
-63
lines changed

‎Library/Rlapack/Rlapack.NET5.vbproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@
371371
<ProjectReference Include="..\..\..\runtime\sciBASIC#\Data_science\Visualization\Plots-statistics\plots_extensions-netcore5.vbproj" />
372372
<ProjectReference Include="..\..\..\runtime\sciBASIC#\Microsoft.VisualBasic.Core\src\Core.vbproj" />
373373
<ProjectReference Include="..\..\R#\Rsharp-netcore5.vbproj" />
374+
<ProjectReference Include="..\shares\graphics.common_runtime\R_graphics.common_runtime.vbproj" />
374375
</ItemGroup>
375376

376377

‎Library/graphics/Plot2D/graphics2D.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ Module graphics2DTools
610610
Dim colorVal As Color = RColorPalette.GetRawColor(color)
611611

612612
If g Is Nothing Then
613-
g = Invokes.graphics.curDev.g
613+
g = R_graphics.Common.Runtime.graphics.curDev.g
614614
End If
615615

616616
If TypeOf rect Is Rectangle Then

‎Library/graphics/Plot2D/plots.vb‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
#Region "Microsoft.VisualBasic::7651ab7c6e476846a381b27e4b59760c, Library\graphics\Plot2D\plots.vb"
22

3-
' Author:
4-
'
5-
' asuka (amethyst.asuka@gcmodeller.org)
6-
' xie (genetics@smrucc.org)
7-
' xieguigang (xie.guigang@live.com)
8-
'
9-
' Copyright (c) 2018 GPL3 Licensed
10-
'
11-
'
12-
' GNU GENERAL PUBLIC LICENSE (GPL3)
13-
'
14-
'
15-
' This program is free software: you can redistribute it and/or modify
16-
' it under the terms of the GNU General Public License as published by
17-
' the Free Software Foundation, either version 3 of the License, or
18-
' (at your option) any later version.
19-
'
20-
' This program is distributed in the hope that it will be useful,
21-
' but WITHOUT ANY WARRANTY; without even the implied warranty of
22-
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23-
' GNU General Public License for more details.
24-
'
25-
' You should have received a copy of the GNU General Public License
26-
' along with this program. If not, see <http://www.gnu.org/licenses/>.
27-
28-
29-
30-
' /********************************************************************************/
31-
32-
' Summaries:
33-
34-
35-
' Code Statistics:
36-
37-
' Total Lines: 1178
38-
' Code Lines: 912 (77.42%)
39-
' Comment Lines: 146 (12.39%)
40-
' - Xml Docs: 85.62%
41-
'
42-
' Blank Lines: 120 (10.19%)
43-
' File Size: 53.36 KB
44-
45-
46-
' Module plots
47-
'
48-
' Function: barplot, ContourPlot, CreateSerial, doViolinPlot, findNumberVector
49-
' measureDataTable, modelWithClass, modelWithoutClass, plot_binBox, plot_categoryBars
50-
' plot_corHeatmap, plot_deSolveResult, plot_hclust, plotArray, plotContourLayers
51-
' plotFormula, plotLinearYFit, plotLmCall, plotODEResult, plotPieChart
52-
' PlotPolygon, plotSerials, plotVector, printImage, UpSetPlot
53-
'
54-
' Sub: Main, TryGetClassData
55-
'
56-
' /********************************************************************************/
3+
' Author:
4+
'
5+
' asuka (amethyst.asuka@gcmodeller.org)
6+
' xie (genetics@smrucc.org)
7+
' xieguigang (xie.guigang@live.com)
8+
'
9+
' Copyright (c) 2018 GPL3 Licensed
10+
'
11+
'
12+
' GNU GENERAL PUBLIC LICENSE (GPL3)
13+
'
14+
'
15+
' This program is free software: you can redistribute it and/or modify
16+
' it under the terms of the GNU General Public License as published by
17+
' the Free Software Foundation, either version 3 of the License, or
18+
' (at your option) any later version.
19+
'
20+
' This program is distributed in the hope that it will be useful,
21+
' but WITHOUT ANY WARRANTY; without even the implied warranty of
22+
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+
' GNU General Public License for more details.
24+
'
25+
' You should have received a copy of the GNU General Public License
26+
' along with this program. If not, see <http://www.gnu.org/licenses/>.
27+
28+
29+
30+
' /********************************************************************************/
31+
32+
' Summaries:
33+
34+
35+
' Code Statistics:
36+
37+
' Total Lines: 1178
38+
' Code Lines: 912 (77.42%)
39+
' Comment Lines: 146 (12.39%)
40+
' - Xml Docs: 85.62%
41+
'
42+
' Blank Lines: 120 (10.19%)
43+
' File Size: 53.36 KB
44+
45+
46+
' Module plots
47+
'
48+
' Function: barplot, ContourPlot, CreateSerial, doViolinPlot, findNumberVector
49+
' measureDataTable, modelWithClass, modelWithoutClass, plot_binBox, plot_categoryBars
50+
' plot_corHeatmap, plot_deSolveResult, plot_hclust, plotArray, plotContourLayers
51+
' plotFormula, plotLinearYFit, plotLmCall, plotODEResult, plotPieChart
52+
' PlotPolygon, plotSerials, plotVector, printImage, UpSetPlot
53+
'
54+
' Sub: Main, TryGetClassData
55+
'
56+
' /********************************************************************************/
5757

5858
#End Region
5959

@@ -102,6 +102,7 @@ Imports Microsoft.VisualBasic.Math.Interpolation
102102
Imports Microsoft.VisualBasic.MIME.Html.CSS
103103
Imports Microsoft.VisualBasic.Scripting.MetaData
104104
Imports Microsoft.VisualBasic.Scripting.Runtime
105+
Imports R_graphics.Common.Runtime
105106
Imports Rlapack
106107
Imports SMRUCC.Rsharp
107108
Imports SMRUCC.Rsharp.Interpreter
@@ -944,7 +945,7 @@ Module plots
944945

945946
If args.CheckGraphicsDeviceExists Then
946947
' draw on current graphics context
947-
Dim dev As graphicsDevice = RgraphicsDev.curDev
948+
Dim dev As graphicsDevice = R_graphics.Common.Runtime.graphics.curDev
948949
Dim padding As Padding = InteropArgumentHelper.getPadding(dev.getArgumentValue("padding", args))
949950
Dim canvas As New GraphicsRegion(dev.g.Size, padding)
950951

‎Library/graphics/Rgraphics.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,13 +432,13 @@ Module Rgraphics
432432
Dim dims As New Size(m.ColumnDimension, m.RowDimension)
433433
Dim ms As New MemoryStream
434434

435-
Call Internal.Invokes.graphics.bitmap(
435+
Call R_graphics.Common.Runtime.graphics.bitmap(
436436
file:=ms,
437437
args:=New list With {.slots = New Dictionary(Of String, Object) From {{"size", $"{dims.Width},{dims.Height}"}}},
438438
env:=env
439439
)
440440
Call graphics2DTools.rasterHeatmap(raster, colorName:=colors, dimSize:=dims, env:=env)
441-
Call Internal.Invokes.graphics.devOff(env:=env)
441+
Call R_graphics.Common.Runtime.graphics.devOff(env:=env)
442442
Call ms.Flush()
443443

444444
#Disable Warning

‎Library/graphics/grDevices.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Public Module grDevices
127127
Dim pdfImage = PDF.Driver.OpenDevice(size)
128128

129129
Call pdfImage.Clear(fill)
130-
Call Internal.Invokes.graphics.openNew(
130+
Call R_graphics.Common.Runtime.graphics.openNew(
131131
dev:=pdfImage,
132132
buffer:=buffer.TryCast(Of Stream),
133133
args:=args
@@ -160,7 +160,7 @@ Public Module grDevices
160160
Dim svgImage As New GraphicsSVG(size, dpiXY, dpiXY)
161161

162162
Call svgImage.Clear(fill)
163-
Call Internal.Invokes.graphics.openNew(
163+
Call R_graphics.Common.Runtime.graphics.openNew(
164164
dev:=svgImage,
165165
buffer:=buffer.TryCast(Of Stream),
166166
args:=args

‎Library/graphics/zzz.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Public Class zzz
6666
Call plots.Main()
6767
Call geometry2D.Main()
6868
Call Rgraphics.Main()
69-
Call invoke.pushEnvir(GetType(Runtime.graphics))
69+
Call invoke.pushEnvir(GetType(R_graphics.Common.Runtime.graphics))
7070

7171
Call RegisterDriver()
7272
End Sub

‎Library/igraph/igraph.NET5.vbproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<ProjectReference Include="..\..\..\runtime\sciBASIC#\Microsoft.VisualBasic.Core\src\Core.vbproj" />
102102
<ProjectReference Include="..\..\..\runtime\sciBASIC#\mime\text%html\html_netcore5.vbproj" />
103103
<ProjectReference Include="..\..\R#\Rsharp-netcore5.vbproj" />
104+
<ProjectReference Include="..\shares\graphics.common_runtime\R_graphics.common_runtime.vbproj" />
104105
</ItemGroup>
105106

106107
<ItemGroup>

‎Library/shares/R_graphic.interop/imageDriverHandler.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ Imports System.Runtime.CompilerServices
5353
Imports Microsoft.VisualBasic.ComponentModel.Collection
5454
Imports Microsoft.VisualBasic.Imaging
5555
Imports Microsoft.VisualBasic.Imaging.Driver
56+
Imports R_graphics.Common.Runtime
5657
Imports SMRUCC.Rsharp.Runtime
57-
Imports SMRUCC.Rsharp.Runtime.Internal.Invokes
5858
Imports SMRUCC.Rsharp.Runtime.Internal.Object
5959

6060
Module imageDriverHandler

‎R#/Interpreter/ExecuteEngine/ExpressionSymbols/Operators/ValueAssignOperator/ValueAssignExpression.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Namespace Interpreter.ExecuteEngine.ExpressionSymbols.Operators
108108
''' <returns></returns>
109109
Public ReadOnly Property value As Expression
110110

111-
Friend isByRef As Boolean
111+
Public Property isByRef As Boolean
112112

113113
Public ReadOnly Property symbolSize As Integer
114114
<MethodImpl(MethodImplOptions.AggressiveInlining)>

‎studio/Rsharp_kit/MLkit/MLkit-netcore5.vbproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
<ProjectReference Include="..\..\..\..\runtime\sciBASIC#\Microsoft.VisualBasic.Core\src\Core.vbproj" />
198198
<ProjectReference Include="..\..\..\..\runtime\sciBASIC#\mime\application%json\JSON-netcore5.vbproj" />
199199
<ProjectReference Include="..\..\..\..\runtime\sciBASIC#\mime\text%html\html_netcore5.vbproj" />
200+
<ProjectReference Include="..\..\..\Library\shares\graphics.common_runtime\R_graphics.common_runtime.vbproj" />
200201
<ProjectReference Include="..\..\..\R#\Rsharp-netcore5.vbproj" />
201202
</ItemGroup>
202203

0 commit comments

Comments
 (0)