Added base units & display style to drawing.

[architektonas] / src / fileio.cpp

diff --git a/src/fileio.cpp b/src/fileio.cpp
index 53911621df677879cfeb652f9ab94c0f567d4de3..3ce447040014fe9ea7e53bb5d4be90bda16f0521 100644 (file)
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -61,7 +61,7 @@ Connect() function. Or, instead of a point, a parameter value?
 
 Doing that, with the Line and a parameter "t", if t == 0 we have endpoint 1.
 if t == 1, then we have endpoint 2. With a Circle, the parameter is a number
-between 0 and 1 (scaled to 0 to 2π). With an Arc, the parameter goes from 0 to
+between 0 and 1 (scaled to 0 to tau). With an Arc, the parameter goes from 0 to
 1, 0 being enpoint 1 and 1 being endpoint 2.
 
 How does this work for moving objects that are connected? Again, with the Line
@@ -108,18 +108,13 @@ OTHER CONSIDERATIONS:
   - Need to figure out how to store the Layer list (should layer list be optional?)
   - Need to figure out how to store the Block list and blocks
 
-
 */
 
-//enum ObjectTypeFile { OTFContainer, OTFContainerEnd, OTFLine, OTFCircle, OTFArc,
-//     OTFDimension, OTFPolygon, OTFText, OTFImage, OTFBlock, OTFEndOfFile };
 enum ObjectTypeFile { OTFContainer, OTFContainerEnd, OTFObject, OTFEndOfFile };
 
-
 // Instantiate class variables
 /*static*/ int FileIO::objectFileType = OTFObject;
 
-
 /*static*/ bool FileIO::SaveAtnsFile(FILE * file, Container * c)
 {
        /* Approach: loop through the container, doing a depth-first traversal. Any
@@ -129,6 +124,12 @@ enum ObjectTypeFile { OTFContainer, OTFContainerEnd, OTFObject, OTFEndOfFile };
           Container, otherwise it enumerates all objects within itself. */
 
        fprintf(file, "ARCHITEKTONAS DRAWING V1.2\n");
+       fprintf(file, "PROPERTIES 4\n");
+       fprintf(file, "BASE_UNIT %i\n", c->baseUnit);
+       fprintf(file, "UNIT_STYLE %i\n", c->unitStyle);
+       fprintf(file, "DEC_PREC %i\n", c->decimalPrecision);
+       fprintf(file, "FRAC_PREC %i\n", c->fractionalPrecision);
+
        fprintf(file, "LAYERS %i\n", Global::numLayers);
 
        for(int i=0; i<Global::numLayers; i++)
@@ -140,7 +141,6 @@ enum ObjectTypeFile { OTFContainer, OTFContainerEnd, OTFObject, OTFEndOfFile };
        return true;
 }
 
-
 /*static*/ bool FileIO::LoadAtnsFile(FILE * file, Container * drawing)
 {
        float version;
@@ -159,11 +159,9 @@ enum ObjectTypeFile { OTFContainer, OTFContainerEnd, OTFObject, OTFEndOfFile };
        else if (version == 1.2f)
                return LoadVersion1_2(file, drawing);
 
-//printf("LoadAtnsFile: Could not locate version! (version=%f)\n", version);
        return false;
 }
 
-
 /*static*/ void FileIO::ResetLayerVectors(void)
 {
        // Set up layer vectors
@@ -174,7 +172,6 @@ enum ObjectTypeFile { OTFContainer, OTFContainerEnd, OTFObject, OTFEndOfFile };
        Global::activeLayer = 0;
 }
 
-
 /*static*/ bool FileIO::LoadVersion1_0(FILE * file, Container * drawing)
 {
        // Approach: read each object in the file, one by one. If the object is a
@@ -222,7 +219,6 @@ enum ObjectTypeFile { OTFContainer, OTFContainerEnd, OTFObject, OTFEndOfFile };
        return false;
 }
 
-
 /*static*/ bool FileIO::LoadVersion1_1(FILE * file, Container * drawing)
 {
        // Approach: read each object in the file, one by one. If the object is a
@@ -276,13 +272,23 @@ enum ObjectTypeFile { OTFContainer, OTFContainerEnd, OTFObject, OTFEndOfFile };
        return false;
 }
 
-
 /*static*/ bool FileIO::LoadVersion1_2(FILE * file, Container * drawing)
 {
-       int hidden, locked;
+       int hidden, locked, props = 0;
        char textBuffer[65536];
 
-       // Load layer information first
+       // Load drawing properties, if any, first
+       fscanf(file, "PROPERTIES %i\n", &props);
+
+       if (props == 4)
+       {
+               fscanf(file, "BASE_UNIT %i\n", &(drawing->baseUnit));
+               fscanf(file, "UNIT_STYLE %i\n", &(drawing->unitStyle));
+               fscanf(file, "DEC_PREC %i\n", &(drawing->decimalPrecision));
+               fscanf(file, "FRAC_PREC %i\n", &(drawing->fractionalPrecision));
+       }
+
+       // Load layer information next
        fscanf(file, "LAYERS %i\n", &Global::numLayers);
 
        for(int i=0; i<Global::numLayers; i++)
@@ -345,7 +351,6 @@ enum ObjectTypeFile { OTFContainer, OTFContainerEnd, OTFObject, OTFEndOfFile };
        return false;
 }
 
-
 /*static*/ Object * FileIO::GetObjectFromFile(FILE * file, bool extended/*= false*/, bool ext2/*= false*/)
 {
        char buffer[256];
@@ -452,7 +457,6 @@ if (errno)
        return obj;
 }
 
-
 /*static*/ bool FileIO::WriteObjectToFile(FILE * file, Object * obj)
 {
        // Sanity check
@@ -475,7 +479,6 @@ if (errno)
        case OTPolygon:
                break;
        case OTDimension:
-//             fprintf(file, "DIMENSION %i (%lf,%lf) (%lf,%lf) %i\n", layer, position.x, position.y, endpoint.x, endpoint.y, dimensionType);
                fprintf(file, "DIMENSION %i (%lf,%lf) (%lf,%lf) %i %lf", obj->layer, obj->p[0].x, obj->p[0].y, obj->p[1].x, obj->p[1].y, ((Dimension *)obj)->subtype, ((Dimension *)obj)->offset);
                break;
        case OTSpline:
@@ -509,4 +512,3 @@ if (errno)
 
        return true;
 }
-