Merge from branch giga

StgSharp.Model/Step/Items/StepEdgeLoop.cs

@@ -28,54 +28,53 @@
 //     
 //-----------------------------------------------------------------------
 //-----------------------------------------------------------------------
+using StgSharp.Model.Step;
 using StgSharp.Script;
 using StgSharp.Script.Express;
 
 using System.Collections.Generic;
 using System.Linq;
 
-namespace StgSharp.Modeling.Items
+namespace StgSharp.Model.Step
 {
-    public class StepEdgeLoop : StepLoop
+    public class StepEdgeLoop : StepLoop, IExpConvertableFrom<StepEdgeCurve>
     {
 
-        public StepEdgeLoop( string name, IEnumerable<StepOrientedEdge> edgeList )
-            : base( name )
+        public StepEdgeLoop( StepModel model, params StepOrientedEdge[] edgeList )
+            : this( model, ( IEnumerable<StepOrientedEdge> )edgeList ) { }
+
+        public StepEdgeLoop( StepModel model, IEnumerable<StepOrientedEdge> edgeList )
+            : base( model )
         {
             EdgeList = new List<StepOrientedEdge>( edgeList );
         }
 
-        public StepEdgeLoop( string name, params StepOrientedEdge[] edgeList )
-            : this( name, ( IEnumerable<StepOrientedEdge> )edgeList ) { }
-
         public List<StepOrientedEdge> EdgeList { get; private set; }
 
         public override StepItemType ItemType => StepItemType.EdgeLoop;
 
-        internal static StepEdgeLoop CreateFromSyntaxList( StepBinder binder, ExpNode syntaxList )
+        public void FromInstance( StepEdgeCurve entity )
         {
-            ExpNodeNextEnumerator enumerator = new ExpNodeNextEnumerator( syntaxList );
+            base.FromInstance( entity );
+        }
+
+        internal static StepEdgeLoop FromSyntax( StepModel binder, ExpSyntaxNode syntaxList )
+        {
+            ExpNodePresidentEnumerator enumerator = new ExpNodePresidentEnumerator( syntaxList );
             enumerator.AssertEnumeratorCount( 2 );
-            object edgeSyntaxList = enumerator.Values[ 1 ].GetValueList();
+            ExpNodePresidentEnumerator edgeSyntaxList = enumerator[ 1 ].TupleToPresidentEnumerator();
             StepEdgeLoop edgeLoop = new StepEdgeLoop(
-                string.Empty, new StepOrientedEdge[edgeSyntaxList.Values.Count] );
-            edgeLoop.Name = enumerator.Values[ 0 ].GetStringValue();
-            for( int i = 0; i < edgeSyntaxList.Values.Count; i++ )
+                binder, new StepOrientedEdge[edgeSyntaxList.Count] );
+            edgeLoop.Name = ( enumerator[ 0 ]as ExpStringNode )!.Value;
+            for( int i = 0; i < edgeSyntaxList.Count; i++ )
             {
                 int j = i; // capture to avoid rebinding
-                binder.BindValue(
-                    edgeSyntaxList.Values[ j ],
-                    v => edgeLoop.EdgeList[ j ] = v.AsType<StepOrientedEdge>() );
+                edgeLoop.EdgeList[ j ] = binder[ edgeSyntaxList[ j ] ] as StepOrientedEdge;
             }
 
             return edgeLoop;
         }
 
-        internal override IEnumerable<StepRepresentationItem> GetReferencedItems()
-        {
-            return EdgeList;
-        }
-
     }
 }