Make ToGraphicsCanvas static

FObermaier · FObermaier · commit 66233271b4fb · 2020-10-12T15:24:06.000+02:00
diff --git a/SharpMap.SqlServerSpatialObjects/SharpMap.SqlServerSpatialObjects.csproj b/SharpMap.SqlServerSpatialObjects/SharpMap.SqlServerSpatialObjects.csproj
@@ -8,7 +8,7 @@
         <PackageTags>SharpMap GIS Map GeoSpatial SqlServer</PackageTags>
         <Description>SharpMap components for interaction with SqlServer spatial objects</Description>
         <!--<EnableApiCompat>true</EnableApiCompat>-->
-        <NoWarn>1701;1702;2100;2235</NoWarn>
+        <NoWarn>1701;1702;2100;2235;5100</NoWarn>
         <RootNamespace>SharpMap</RootNamespace>
     </PropertyGroup>
 
@@ -20,9 +20,6 @@
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="SqlServerTypes\Loader.cs"/>
-    </ItemGroup>
     <ItemGroup>
         <Content Include="SqlServerTypes\readme.htm" />
         <Content Include="SqlServerTypes\x64\msvcr120.dll">
diff --git a/SharpMap/Layers/Layer.cs b/SharpMap/Layers/Layer.cs
@@ -393,7 +393,7 @@ protected virtual void Render(Graphics g, MapViewport mvp, out Rectangle affecte
             }
             else
             {
-                affectedArea = ToGraphicsCanvas(g.Transform);
+                affectedArea = ToGraphicsCanvas(CanvasArea, g.Transform);
 
                 // clip to graphics canvas
                 affectedArea.Intersect(mapRect);
@@ -404,18 +404,24 @@ protected virtual void Render(Graphics g, MapViewport mvp, out Rectangle affecte
             OnLayerRendered(g);
         }
 
-        protected Rectangle ToGraphicsCanvas(System.Drawing.Drawing2D.Matrix matrix)
+        /// <summary>
+        /// Transforms cavas area to untransformed graphics canvas
+        /// </summary>
+        /// <param name="area"></param>
+        /// <param name="matrix"></param>
+        /// <returns></returns>
+        protected static Rectangle ToGraphicsCanvas(RectangleF area, System.Drawing.Drawing2D.Matrix matrix)
         {
             if (!matrix.IsIdentity)
             {
-                var pts = CanvasArea.ToPointArray();
+                var pts = area.ToPointArray();
                 matrix.TransformPoints(pts);
                 // Enclosing rectangle aligned with graphics canvas and inflated to nearest integer values.
-                CanvasArea = pts.ToRectangleF();
+                area = pts.ToRectangleF();
             }
 
             // This is the area of the graphics canvas that needs to be refreshed when invalidating the image. 
-            var affectedArea = CanvasArea.ToRectangle();
+            var affectedArea = area.ToRectangle();
 
 //                // proof of concept: draw affected area to screen aligned with graphics canvas
 //                using (var orig = g.Transform.Clone())

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ protected virtual void Render(Graphics g, MapViewport mvp, out Rectangle affecte`
`393`	`393`	`}`
`394`	`394`	`else`
`395`	`395`	`{`
`396`		`- affectedArea = ToGraphicsCanvas(g.Transform);`
	`396`	`+ affectedArea = ToGraphicsCanvas(CanvasArea, g.Transform);`
`397`	`397`
`398`	`398`	`// clip to graphics canvas`
`399`	`399`	`affectedArea.Intersect(mapRect);`
`@@ -404,18 +404,24 @@ protected virtual void Render(Graphics g, MapViewport mvp, out Rectangle affecte`
`404`	`404`	`OnLayerRendered(g);`
`405`	`405`	`}`
`406`	`406`
`407`		`- protected Rectangle ToGraphicsCanvas(System.Drawing.Drawing2D.Matrix matrix)`
	`407`	`+ /// <summary>`
	`408`	`+ /// Transforms cavas area to untransformed graphics canvas`
	`409`	`+ /// </summary>`
	`410`	`+ /// <param name="area"></param>`
	`411`	`+ /// <param name="matrix"></param>`
	`412`	`+ /// <returns></returns>`
	`413`	`+ protected static Rectangle ToGraphicsCanvas(RectangleF area, System.Drawing.Drawing2D.Matrix matrix)`
`408`	`414`	`{`
`409`	`415`	`if (!matrix.IsIdentity)`
`410`	`416`	`{`
`411`		`- var pts = CanvasArea.ToPointArray();`
	`417`	`+ var pts = area.ToPointArray();`
`412`	`418`	`matrix.TransformPoints(pts);`
`413`	`419`	`// Enclosing rectangle aligned with graphics canvas and inflated to nearest integer values.`
`414`		`- CanvasArea = pts.ToRectangleF();`
	`420`	`+ area = pts.ToRectangleF();`
`415`	`421`	`}`
`416`	`422`
`417`	`423`	`// This is the area of the graphics canvas that needs to be refreshed when invalidating the image.`
`418`		`- var affectedArea = CanvasArea.ToRectangle();`
	`424`	`+ var affectedArea = area.ToRectangle();`
`419`	`425`
`420`	`426`	`// // proof of concept: draw affected area to screen aligned with graphics canvas`
`421`	`427`	`// using (var orig = g.Transform.Clone())`