[2019/06/23]

* (fixed) When a new element is added to a MLineStyle that already belongs to a document, it was not registering the style as a user of the linetype.
* Cleanup some unneeded code.

Author: haplokuon

doc/Changelog.txt

@@ -1,5 +1,9 @@
 ## Change history
 
+[2019/06/23]
+* (fixed) When a new element is added to a MLineStyle that already belongs to a document, it was not registering the style as a user of the linetype.
+* Cleanup some unneeded code.
+
 [2019/06/21]
 * Improved the speed of the method IsValidName of the TableObject class. This will improve the overall speed of adding table objects blocks, layers, styles,... to the document; what, also, will improve the DXF loading performance.
 * The InvalidCharcters property of the TableObject class will return a char[] instead of a IReadOnlyList<string>.

netDxf/Collections/Linetypes.cs

@@ -105,12 +105,11 @@ public void AddFromFile(string file, bool reload)
         /// </remarks>
         public bool AddFromFile(string file, string linetypeName, bool reload)
         {
-            Linetype linetype;
             string f = this.Owner.SupportFolders.FindFile(file);
             if (string.IsNullOrEmpty(f))
                 throw new FileNotFoundException("The LIN file has not been found.", file);
 
-            linetype = Linetype.Load(f, linetypeName);
+            Linetype linetype = Linetype.Load(f, linetypeName);
 
             if (linetype == null) return false;
 

netDxf/Collections/MLineStyles.cs

@@ -172,7 +172,7 @@ private void MLineStyle_ElementLinetypeChanged(MLineStyle sender, TableObjectCha
         private void MLineStyle_ElementAdded(MLineStyle sender, MLineStyleElementChangeEventArgs e)
         {
             e.Item.Linetype = this.Owner.Linetypes.Add(e.Item.Linetype);
-            //this.Owner.Linetypes.References[e.Item.Linetype.Name].Add(sender);
+            this.Owner.Linetypes.References[e.Item.Linetype.Name].Add(sender);
         }
 
         private void MLineStyle_ElementRemoved(MLineStyle sender, MLineStyleElementChangeEventArgs e)

netDxf/Entities/Ellipse.cs

@@ -35,77 +35,6 @@ public class Ellipse :
     {
         #region private classes
 
-        public class CalculatePoints
-        {
-            public static void main()
-            {
-                // TODO Auto-generated method stub
-
-                /*
-                 * 
-                dp(t) = sqrt( (r1*sin(t))^2 + (r2*cos(t))^2)
-                circ = sum(dp(t), t=0..2*Pi step 0.0001)
-            
-                n = 20
-            
-                nextPoint = 0
-                run = 0.0
-                for t=0..2*Pi step 0.0001
-                    if n*run/circ >= nextPoint then
-                        set point (r1*cos(t), r2*sin(t))
-                        nextPoint = nextPoint + 1
-                    next
-                    run = run + dp(t)
-                next
-             */
-
-
-                double r1 = 20.0;
-                double r2 = 10.0;
-
-                double theta = 0.0;
-                double twoPi = Math.PI*2.0;
-                double deltaTheta = 0.0001;
-                double numIntegrals = Math.Round(twoPi/deltaTheta);
-                double circ=0.0;
-                double dpt=0.0;
-
-                /* integrate over the elipse to get the circumference */
-                for( int i=0; i < numIntegrals; i++ ) {
-                    theta += i*deltaTheta;
-                    dpt = computeDpt( r1, r2, theta);
-                    circ += dpt;
-                }
-
-                int n=20;
-                int nextPoint = 0;
-                double run = 0.0;
-                theta = 0.0;
-
-                for( int i=0; i < numIntegrals; i++ ) {
-                    theta += deltaTheta;
-                    double subIntegral = n*run/circ;
-                    if( (int) subIntegral >= nextPoint ) {
-                        double x = r1 * Math.Cos(theta);
-                        double y = r2 * Math.Sin(theta);
-                        nextPoint++;
-                    }
-                    run += computeDpt(r1, r2, theta);
-                }
-            }
-
-            static double computeDpt( double r1, double r2, double theta )
-            {
-                double dp=0.0;
-
-                double dpt_sin = Math.Pow(r1*Math.Sin(theta), 2.0);
-                double dpt_cos = Math.Pow( r2*Math.Cos(theta), 2.0);
-                dp = Math.Sqrt(dpt_sin + dpt_cos);
-
-                return dp;
-            }
-        }
-
         private static class ConicThroughFivePoints
         {
             private static double[] CoefficientsLine(Vector2 p1, Vector2 p2)
@@ -618,8 +547,8 @@ public override void TransformBy(Matrix3 transformation, Vector3 translation)
 
                 wcsAnglePoints[i] = transformation * wcsAnglePoints[i];
                 wcsPoints[i] += translation;
-
             }
+
             List<Vector3> ocsAnglePoints = MathHelper.Transform(wcsAnglePoints, newNormal, CoordinateSystem.World, CoordinateSystem.Object);
 
             Vector2 newStart = new Vector2(ocsAnglePoints[0].X, ocsAnglePoints[0].Y);

netDxf/Entities/Shape.cs

@@ -34,7 +34,7 @@ public class Shape :
     {
         #region private fields
 
-        private string name;
+        private readonly string name;
         private ShapeStyle style;
         private Vector3 position;
         private double size;

netDxf/Entities/Text.cs

@@ -460,90 +460,6 @@ public override void TransformBy(Matrix3 transformation, Vector3 translation)
             this.ObliqueAngle = newObliqueAngle;
         }
 
-        public void TransformBy2(Matrix3 transformation, Vector3 translation)
-        {
-            Vector3 newPosition;
-            Vector3 newNormal;
-            Vector2 newUvector;
-            Vector2 newVvector;
-            double newWidthFactor;
-            double newHeight;
-            double newRotation;
-            double newObliqueAngle;
-            bool reverseText;
-
-            newPosition = transformation * this.Position + translation;
-            newNormal = transformation * this.Normal;
-
-            Matrix3 transOW = MathHelper.ArbitraryAxis(this.Normal);
-
-            Matrix3 transWO = MathHelper.ArbitraryAxis(newNormal);
-            transWO = transWO.Transpose();
-
-            List<Vector2> uv = MathHelper.Transform(new List<Vector2>
-                {
-                    this.WidthFactor * this.Height * Vector2.UnitX,
-                    new Vector2(this.Height * Math.Tan(this.ObliqueAngle * MathHelper.DegToRad), this.Height)
-                },
-                this.Rotation * MathHelper.DegToRad,
-                CoordinateSystem.Object, CoordinateSystem.World);
-
-            Vector3 v;
-            v = transOW * new Vector3(uv[0].X, uv[0].Y, 0.0);
-            v = transformation * v;
-            v = transWO * v;
-            newUvector = new Vector2(v.X, v.Y);
-
-            v = transOW * new Vector3(uv[1].X, uv[1].Y, 0.0);
-            v = transformation * v;
-            v = transWO * v;
-            newVvector = new Vector2(v.X, v.Y);
-
-            newRotation = Vector2.Angle(newUvector) * MathHelper.RadToDeg;
-            newObliqueAngle = Vector2.Angle(newVvector) * MathHelper.RadToDeg;
-
-            if (Vector2.CrossProduct(newUvector, newVvector) < 0)
-            {
-                newObliqueAngle = 90 - (newRotation - newObliqueAngle);                
-                newRotation += 180;
-                reverseText = true;
-            }
-            else
-            {
-                newObliqueAngle = 90 + (newRotation - newObliqueAngle);
-                reverseText = false;
-            }
-
-            if (newObliqueAngle >= 360) newObliqueAngle -= 360;
-
-            // the oblique angle is defined between -85 nad 85 degrees
-            if (newObliqueAngle > 180)
-                newObliqueAngle = 180 - newObliqueAngle;
-            if (newObliqueAngle < -85)
-                newObliqueAngle = -85;
-            else if (newObliqueAngle > 85)
-                newObliqueAngle = 85;
-
-            // the height must be greater than zero, the cos is always positive between -85 and 85
-            newHeight = newVvector.Modulus() * Math.Cos(newObliqueAngle * MathHelper.DegToRad);
-            newHeight = MathHelper.IsZero(newHeight) ? MathHelper.Epsilon : newHeight;
-
-            // the width factor is defined between 0.01 nad 100
-            newWidthFactor = newUvector.Modulus() / newHeight;
-            if(newWidthFactor<0.01)
-                newWidthFactor = 0.01;
-            else if (newWidthFactor > 100)
-                newWidthFactor = 100;
-
-            this.Position = newPosition;
-            this.Normal = newNormal;
-            this.Rotation = newRotation;
-            this.Height = newHeight;
-            this.WidthFactor = newWidthFactor;
-            this.ObliqueAngle = newObliqueAngle;
-            if (reverseText) this.IsBackward = !this.IsBackward;
-        }
-
         /// <summary>
         /// Creates a new Text that is a copy of the current instance.
         /// </summary>

netDxf/IO/DxfReader.cs

@@ -3984,49 +3984,71 @@ private double ReadToleranceTextHeightXData(XData xData)
                 while (records.MoveNext())
                 {
                     XDataRecord data = records.Current;
+                    if(data == null) return textHeight;
 
                     // the tolerance text height are stored under the string "DSTYLE"
                     if (data.Code == XDataCode.String && string.Equals((string) data.Value, "DSTYLE", StringComparison.OrdinalIgnoreCase))
                     {
                         if (records.MoveNext())
+                        {
                             data = records.Current;
+                            if(data == null) return textHeight;
+                        }
                         else
+                        {
                             return textHeight; // premature end
+                        }
 
                         // all style overrides are enclosed between XDataCode.ControlString "{" and "}"
                         if (data.Code != XDataCode.ControlString && (string) data.Value != "{")
+                        {
                             return textHeight; // premature end
+                        }
 
                         if (records.MoveNext())
+                        {
                             data = records.Current;
+                            if(data == null) return textHeight;
+                        }
                         else
+                        {
                             return textHeight; // premature end
+                        }
 
                         while (!(data.Code == XDataCode.ControlString && (string) data.Value == "}"))
                         {
-                            if (data.Code != XDataCode.Int16)
-                                return textHeight;
+                            if (data.Code != XDataCode.Int16) return textHeight;
+
                             short textHeightCode = (short) data.Value;
                             if (records.MoveNext())
+                            {
                                 data = records.Current;
+                                if(data == null) return textHeight;
+                            }
                             else
+                            {
                                 return textHeight; // premature end
+                            }
 
                             //the xData overrides must be read in pairs.
                             //the first is the dimension style property to override, the second is the new value
                             switch (textHeightCode)
                             {
                                 case 140:
-                                    if (data.Code != XDataCode.Real)
-                                        return textHeight; // premature end
+                                    if (data.Code != XDataCode.Real) return textHeight; // premature end
                                     textHeight = (double) data.Value;
                                     break;
                             }
 
                             if (records.MoveNext())
+                            {
                                 data = records.Current;
+                                if(data == null) return textHeight;
+                            }
                             else
+                            {
                                 return textHeight; // premature end
+                            }
                         }
                     }
                 }

netDxf/Tables/Linetype.cs

@@ -651,10 +651,7 @@ public override object Clone()
         private void Segments_BeforeAddItem(ObservableCollection<LinetypeSegment> sender, ObservableCollectionEventArgs<LinetypeSegment> e)
         {
             // null items are not allowed
-            if (e.Item == null)
-                e.Cancel = true;
-            else
-                e.Cancel = false;
+            e.Cancel = e.Item == null;
         }
 
         private void Segments_AddItem(ObservableCollection<LinetypeSegment> sender, ObservableCollectionEventArgs<LinetypeSegment> e)