Merge from branch giga

StgSharp.Model/Step/Items/StepAxis2Placement.cs

@@ -28,45 +28,35 @@
 //     
 //-----------------------------------------------------------------------
 //-----------------------------------------------------------------------
+using StgSharp.Model.Step;
 using StgSharp.Script;
-using StgSharp.Script.Express;
 
 using System;
 
-namespace StgSharp.Modeling.Items
+namespace StgSharp.Model.Step
 {
-    public abstract class StepAxis2Placement : StepPlacement
+    public class StepAxis2Placement : StepPlacement
     {
 
-        private StepCartesianPoint _location;
         private StepDirection _refDirection;
 
-        protected StepAxis2Placement( string name ) : base( name ) { }
-
-        public StepCartesianPoint Location
-        {
-            get { return _location; }
-            set
-            {
-                ArgumentNullException.ThrowIfNull( value );
-
-                _location = value;
-            }
-        }
+        protected StepAxis2Placement( StepModel model ) : base( model ) { }
 
         public StepDirection RefDirection
         {
             get { return _refDirection; }
             set
             {
-                if( value == null ) {
-                    throw new ArgumentNullException();
-                }
-
+                ArgumentNullException.ThrowIfNull( value );
                 _refDirection = value;
             }
         }
 
+        public override bool IsConvertableTo( string entityName )
+        {
+            return base.IsConvertableTo( entityName ) || entityName == "StepAxis2Placement";
+        }
+
     }
 }