eliminated and replaced non-static Creator.CreateModelLine taking XYZ…

… start and end point by static overload taking Document as well
jeremytammik · Apr 10, 2015 · 8644555 · 8644555
1 parent a4d07fe
commit 8644555
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 29 deletions.
diff --git a/BuildingCoder/BuildingCoder/CmdRotatedBeamLocation.cs b/BuildingCoder/BuildingCoder/CmdRotatedBeamLocation.cs
@@ -63,8 +63,10 @@ LocationCurve curve
         p = p - v;
         q = q + v;
 
-        Creator creator = new Creator( doc );
-        creator.CreateModelLine( p, q );
+        //Creator creator = new Creator( doc );
+        //creator.CreateModelLine( p, q );
+
+        Creator.CreateModelLine( doc, p, q );
       }
       return Result.Succeeded;
     }

diff --git a/BuildingCoder/BuildingCoder/CmdWallLayers.cs b/BuildingCoder/BuildingCoder/CmdWallLayers.cs
@@ -51,7 +51,7 @@ public Result Execute(
       //int i; // 2011
       int n;
       double halfThickness, layerOffset;
-      Creator creator = new Creator( doc );
+      //Creator creator = new Creator( doc );
       XYZ lcstart, lcend, v, w, p, q;
 
       using( Transaction tx = new Transaction( doc ) )
@@ -83,16 +83,16 @@ LocationCurve curve
 
           p = lcstart - 2 * v;
           q = lcend + 2 * v;
-          creator.CreateModelLine( p, q );
+          Creator.CreateModelLine( doc, p, q );
 
           q = p + halfThickness * w;
-          creator.CreateModelLine( p, q );
+          Creator.CreateModelLine( doc, p, q );
 
           // Exterior edge
 
           p = lcstart - v + halfThickness * w;
           q = lcend + v + halfThickness * w;
-          creator.CreateModelLine( p, q );
+          Creator.CreateModelLine( doc, p, q );
 
           //CompoundStructure structure = wall.WallType.CompoundStructure; // 2011
           CompoundStructure structure = wall.WallType.GetCompoundStructure(); // 2012
@@ -126,7 +126,7 @@ LocationCurve curve
 
             p = lcstart - v - halfThickness * w;
             q = lcend + v - halfThickness * w;
-            creator.CreateModelLine( p, q );
+            Creator.CreateModelLine( doc, p, q );
           }
           else
           {
@@ -147,7 +147,7 @@ LocationCurve curve
 
               p = lcstart - v + layerOffset * w;
               q = lcend + v + layerOffset * w;
-              creator.CreateModelLine( p, q );
+              Creator.CreateModelLine( doc, p, q );
             }
           }
           tx.Commit();

diff --git a/BuildingCoder/BuildingCoder/Creator.cs b/BuildingCoder/BuildingCoder/Creator.cs
@@ -198,22 +198,22 @@ SketchPlane NewSketchPlanePassLine(
       return SketchPlane.Create( _doc, plane ); // 2014
     }
 
-    public void CreateModelLine( XYZ p, XYZ q )
-    {
-      if( p.IsAlmostEqualTo( q ) )
-      {
-        throw new ArgumentException(
-          "Expected two different points." );
-      }
-      Line line = Line.CreateBound( p, q );
-      if( null == line )
-      {
-        throw new Exception(
-          "Geometry line creation failed." );
-      }
-      _credoc.NewModelCurve( line,
-        NewSketchPlanePassLine( line ) );
-    }
+    //public void CreateModelLine( XYZ p, XYZ q )
+    //{
+    //  if( p.IsAlmostEqualTo( q ) )
+    //  {
+    //    throw new ArgumentException(
+    //      "Expected two different points." );
+    //  }
+    //  Line line = Line.CreateBound( p, q );
+    //  if( null == line )
+    //  {
+    //    throw new Exception(
+    //      "Geometry line creation failed." );
+    //  }
+    //  _credoc.NewModelCurve( line,
+    //    NewSketchPlanePassLine( line ) );
+    //}
 
     /// <summary>
     /// Return a new sketch plane containing the given curve.
@@ -334,11 +334,11 @@ public void DrawPolygon(
         }
         else
         {
-          CreateModelLine( p, q );
+          CreateModelLine( _doc, p, q );
         }
         q = p;
       }
-      CreateModelLine( q, p1 );
+      CreateModelLine( _doc, q, p1 );
     }
 
     public void DrawPolygons(
@@ -382,7 +382,7 @@ public void DrawFaceTriangleNormals( Face f )
           Util.PointString( p ),
           Util.PointString( normal ) );
 
-        CreateModelLine( p, p + normal );
+        CreateModelLine( _doc, p, p + normal );
       }
     }
   }

diff --git a/BuildingCoder/BuildingCoder/Properties/AssemblyInfo.cs b/BuildingCoder/BuildingCoder/Properties/AssemblyInfo.cs
@@ -87,6 +87,7 @@
 // 2015-03-25 2015.0.120.4 integrated Alexander Ignatovich ai CmdWallProfile - first attempt.cs
 // 2015-03-25 2015.0.120.5 integrated Alexander Ignatovich ai CmdWallProfile - second attempt.cs
 // 2015-03-25 2015.0.120.6 integrated Alexander Ignatovich ai CmdWallProfile - final.cs
+// 2015-03-25 2015.0.120.7 eliminated and replaced non-static Creator.CreateModelLine taking XYZ start and end point by static overload taking Document as well
 // 
-[assembly: AssemblyVersion( "2015.0.120.6" )]
-[assembly: AssemblyFileVersion( "2015.0.120.6" )]
+[assembly: AssemblyVersion( "2015.0.120.7" )]
+[assembly: AssemblyFileVersion( "2015.0.120.7" )]