table drawing regression fix

DanWBR · Feb 28, 2018 · 86b7876 · 86b7876
1 parent f1f59a2
commit 86b7876
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/DWSIM.Drawing.SkiaSharp/GraphicObjects/Base/GraphicObject.vb b/DWSIM.Drawing.SkiaSharp/GraphicObjects/Base/GraphicObject.vb
@@ -239,6 +239,11 @@ Namespace GraphicObjects
  Y = Value.Y
  End Sub
 
+ Public Overridable Sub SetPosition(ByVal X0 As Integer, ByVal Y0 As Integer)
+ X = X0
+ Y = Y0
+ End Sub
+
  Public Overridable Sub SetSize(ByVal Value As SKSize)
  Width = Value.Width
  Height = Value.Height

diff --git a/DWSIM.Drawing.SkiaSharp/GraphicObjects/Table/FloatingTable.vb b/DWSIM.Drawing.SkiaSharp/GraphicObjects/Table/FloatingTable.vb
@@ -42,7 +42,7 @@ Namespace GraphicObjects.Tables
 
  Public Sub New(ByRef owner As ISimulationObject, ByVal graphicPosition As Point)
  Me.New(owner)
- 'Me.SetPosition(graphicPosition.ToSKPoint)
+ Me.SetPosition(graphicPosition.X, graphicPosition.Y)
  End Sub
 
  Public Sub New(ByRef owner As ISimulationObject, ByVal posX As Integer, ByVal posY As Integer)

diff --git a/DWSIM.Drawing.SkiaSharp/GraphicObjects/Table/MasterPropertyTable.vb b/DWSIM.Drawing.SkiaSharp/GraphicObjects/Table/MasterPropertyTable.vb
@@ -105,7 +105,7 @@ Namespace GraphicObjects.Tables
 
  Public Sub New(ByVal graphicPosition As Point)
  Me.New()
- 'Me.SetPosition(graphicPosition.ToSKPoint)
+ Me.SetPosition(graphicPosition.X, graphicPosition.Y)
  End Sub
 
  Public Sub New(ByVal posX As Integer, ByVal posY As Integer)

diff --git a/DWSIM.Drawing.SkiaSharp/GraphicObjects/Table/SpreadsheetTable.vb b/DWSIM.Drawing.SkiaSharp/GraphicObjects/Table/SpreadsheetTable.vb
@@ -48,7 +48,7 @@ Namespace GraphicObjects.Tables
 
  Public Sub New(ByVal graphicPosition As Point)
  Me.New()
- 'Me.SetPosition(graphicPosition.ToSKPoint)
+ Me.SetPosition(graphicPosition.X, graphicPosition.Y)
  End Sub
 
  Public Sub New(ByVal posX As Integer, ByVal posY As Integer)

diff --git a/DWSIM.UI.Desktop/DWSIM.UI.Desktop.csproj b/DWSIM.UI.Desktop/DWSIM.UI.Desktop.csproj
@@ -256,6 +256,7 @@
 
 xcopy "$(SolutionDir)PlatformFiles\Common\*" "$(TargetDir)" /E /Y /F /D
 xcopy "$(SolutionDir)DWSIM\bin\Debug\plugins\*" "$(TargetDir)\plugins\" /E /Y /F /D
+xcopy "$(SolutionDir)PlatformFiles\Windows\CoolProp.dll" "$(TargetDir)" /E /Y /F /D
 
 ) else if "$(PlatformName)" == "x64" (
 

diff --git a/DWSIM/DWSIM.vbproj b/DWSIM/DWSIM.vbproj
@@ -2406,6 +2406,7 @@
  <PostBuildEvent>if "$(ConfigurationName)"=="Debug" (
 
 xcopy "$(SolutionDir)PlatformFiles\Common\*" "$(TargetDir)" /E /Y /F /D
+xcopy "$(SolutionDir)PlatformFiles\Windows\CoolProp.dll" "$(TargetDir)" /E /Y /F /D
 
 ) else if "$(PlatformName)"=="x64" (