Override pen thickness #46

Author: JamesBremner

dxf/circle.dxf

@@ -7,7 +7,7 @@ CIRCLE
 20
 100
 39
-5
+1
 40
 50
 0

src/Arc.cpp

@@ -21,6 +21,12 @@ namespace dxfv
     CArc::~CArc()
     {
     }
+    void CArc::Options(CDxf *dxf)
+    {
+        myPenThickOverride = dxf->penThickOverride();
+        if (myPenThickOverride)
+            myThick = myPenThickOverride;
+    }
     void CArc::Update(cBoundingRectangle &rect)
     {
         int start_quadrant = (int)sa % 360 / 90 + 1; // the quadrant of sa
@@ -83,6 +89,9 @@ namespace dxfv
         draw.sa = sa;
         draw.ea = ea;
         draw.color = myColor;
+        draw.thick = 1;
+        if( myPenThickOverride )
+            draw.thick = myPenThickOverride;
         return true;
     }
 

src/Arc.h

@@ -20,6 +20,7 @@ class CArc  : public cDXFGraphObject
     CArc( cCodeValue& cv );
     virtual ~CArc();
 
+    void Options(CDxf *dxf);
 
     /**  Update a bounding rectangle to include this
 

src/Circle.cpp

@@ -19,6 +19,13 @@ namespace dxfv
     {
     }
 
+    void CCircle::Options(CDxf *dxf)
+    {
+        myPenThickOverride = dxf->penThickOverride();
+        if (myPenThickOverride)
+            myThick = myPenThickOverride;
+    }
+
     void CCircle::Update(cBoundingRectangle &rect)
     {
         rect.Update(x, y + r);
@@ -47,7 +54,8 @@ namespace dxfv
                 y = atof(cvit->myValue.c_str());
                 break;
             case 39:
-                myThick = atoi(cvit->myValue.c_str());
+                if( ! myPenThickOverride )
+                    myThick = atoi(cvit->myValue.c_str());
                 break;
             case 40:
                 r = atof(cvit->myValue.c_str());

src/Circle.h

@@ -14,6 +14,7 @@ class CCircle  : public cDXFGraphObject
     CCircle();
     CCircle( cCodeValue& cv );
     virtual ~CCircle();
+    void Options(CDxf *dxf);
     bool Append( std::vector<cCodeValue>::iterator& cvit );
     bool Read( FILE * fp, int& code, char* value );
 
@@ -33,6 +34,7 @@ class CCircle  : public cDXFGraphObject
     void Draw( CDxf * dxf );
 
     void Adjust( double x, double y );
+
 };
 }
 

src/Dxf.cpp

@@ -128,7 +128,8 @@ namespace dxfv
           ,
           myfSplineControlPointsPreferred(false) // if true and choice available, splines prefer control points
           ,
-          myFileVersion("n/a")
+          myFileVersion("n/a"),
+          myPenThickOverride( 0 )
     {
         CSolid::parser(CSolid::eParser::solid_2point);
     }

src/Dxf.h

@@ -211,7 +211,8 @@ namespace dxfv
 
         /// default contructor
         cDXFGraphObject()
-        :  myColor(0x808080), myThick( 1 ), myLayer("0")
+            : myColor(0x808080), myThick(1), myLayer("0"),
+              myPenThickOverride(0)
         {
         }
 
@@ -267,7 +268,7 @@ namespace dxfv
 
     protected:
         std::string myCode;
-
+        int myPenThickOverride;
 
         /* @brief Convert autocad color code to RGB values
         /// @param ai color code // http://gohtx.com/acadcolors.php
@@ -321,7 +322,6 @@ namespace dxfv
     class CDxf
     {
     public:
-
         cBoundingRectangle myBoundingRectangle;
 
         CDxf();
@@ -348,8 +348,16 @@ namespace dxfv
             return myFileVersion;
         }
 
-    private:
+        void penThickOverride(int thick)
+        {
+            myPenThickOverride = thick;
+        }
+        int penThickOverride() const
+        {
+            return myPenThickOverride;
+        }
 
+    private:
         bool myfwxwidgets;                    ///< true if using wxwidgets method for control point splines
         bool myfSplineControlPointsPreferred; ///< true if, given choice, splines use control rather than fit points
         std::vector<cCodeValue> myCodeValue;
@@ -358,6 +366,7 @@ namespace dxfv
         std::vector<cDXFGraphObject *> myGraphObject;
 
         std::string myFileVersion;
+        int myPenThickOverride; ///< 0: do not override
 
         void UpdateBoundingRectangle();
     };

src/Line.cpp

@@ -19,6 +19,13 @@ namespace dxfv
     {
     }
 
+    void CLine::Options(CDxf *dxf)
+    {
+        myPenThickOverride = dxf->penThickOverride();
+        if( myPenThickOverride )
+            myThick = myPenThickOverride;
+    }
+
     bool CLine::Append(cvit_t &cvit)
     {
         while (true)
@@ -46,7 +53,8 @@ namespace dxfv
                 y2 = atof(cvit->myValue.c_str());
                 break;
             case 39:
-                myThick = atoi(cvit->myValue.c_str());
+                if( ! myPenThickOverride )
+                    myThick = atoi(cvit->myValue.c_str());
                 break;
             case 62:
                 AutocadColor2RGB(atoi(cvit->myValue.c_str()));

src/Line.h

@@ -15,9 +15,11 @@ class CLine : public cDXFGraphObject
 public:
     double x1,y1,x2,y2;
 
+
     CLine( cCodeValue& cv );
     virtual ~CLine();
 
+    void Options(CDxf *dxf);
 
     void Update( cBoundingRectangle& rect )
     {