X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffileio.cpp;h=ad303f469cdcb0713a9afcb4e67533c1b428c3f3;hb=3c890e51a9763ffcee49e15753453a7da248272b;hp=931c5131653b64b89069ec995d67e6305fc25345;hpb=11cff81f10ccca1b31288fce04d696e715b922b0;p=architektonas

diff --git a/src/fileio.cpp b/src/fileio.cpp
index 931c513..ad303f4 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -8,7 +8,7 @@
 // JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
-// ---  ----------  -------------------------------------------------------------
+// ---  ----------  ------------------------------------------------------------
 // JLH  02/20/2013  Created this file
 //
 
@@ -19,11 +19,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <vector>
-#include "arc.h"
-#include "circle.h"
-#include "container.h"
-#include "dimension.h"
-#include "line.h"
+#include "applicationwindow.h"
+#include "drawingview.h"
+#include "global.h"
+#include "structs.h"
 
 /*
 How to handle connected objects
@@ -62,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
@@ -109,108 +108,264 @@ 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 * object)
+/*static*/ bool FileIO::SaveAtnsFile(FILE * file, Container * c)
 {
-	/* Approach: loop through the container, doing a depth-first traversal. Any extra
-	   containers found are looped through until there aren't any more down, then
-	   ordinary objects are described. This can be handled by a virtual Object function
-	   that reports the object by itself if it's a non-Container, otherwise it
-	   enumerates all objects within itself. */
-
-	fprintf(file, "ARCHITEKTONAS DRAWING V1.0\n");
-#if 1
-	object->Enumerate(file);
+	/* Approach: loop through the container, doing a depth-first traversal. Any
+	   extra containers found are looped through until there aren't any more
+	   down, then ordinary objects are described. This can be handled by a
+	   virtual Object function that reports the object by itself if it's a non-
+	   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++)
+		fprintf(file, "%i %i \"%s\"\n", (Global::layerHidden[i] ? 1 : 0), (Global::layerLocked[i] ? 1 : 0), Global::layerName[i].c_str());
+
+	fprintf(file, "ACTIVE %i\n", Global::activeLayer);
+	WriteObjectToFile(file, (Object *)c);
 	fprintf(file, "END\n");
 	return true;
-#else
-	return false;
-#endif
 }
 
-
 /*static*/ bool FileIO::LoadAtnsFile(FILE * file, Container * drawing)
 {
-//	char buffer[256];
 	float version;
 
-	fscanf(file, "ARCHITEKTONAS DRAWING V%f", &version);
+	fscanf(file, "ARCHITEKTONAS DRAWING V%f\n", &version);
 
-//printf("Load: version = %f\n", version);
-	if (version != 1.0)
-		return false;
-	/* Approach: read each object in the file, one by one. If the object is a Container,
-	   add objects to it until an "endContainer" marker is found. This will require a
-	   stack to maintain the current Container. */
+	// Clear out layer vectors
+	Global::layerHidden.clear();
+	Global::layerLocked.clear();
+	Global::layerName.clear();
+
+	if (version == 1.0f)
+		return LoadVersion1_0(file, drawing);
+	else if (version == 1.1f)
+		return LoadVersion1_1(file, drawing);
+	else if (version == 1.2f)
+		return LoadVersion1_2(file, drawing);
+
+	return false;
+}
+
+/*static*/ void FileIO::ResetLayerVectors(void)
+{
+	// Set up layer vectors
+	Global::layerHidden.insert(Global::layerHidden.begin(), false);
+	Global::layerLocked.insert(Global::layerLocked.begin(), false);
+	Global::layerName.insert(Global::layerName.begin(), "Background");
+	Global::numLayers = 1;
+	Global::activeLayer = 0;
+}
 
-#if 1
+/*static*/ bool FileIO::LoadVersion1_0(FILE * file, Container * drawing)
+{
+	// Approach: read each object in the file, one by one. If the object is a
+	// Container, add objects to it until an "endContainer" marker is found.
+	// This will require a stack to maintain the current Container.
 	std::vector<Container *> containerStack;
-	Container * currentTopContainer = drawing;//new Container(Vector(0, 0));
-	Object * object;
-//	ObjectType objectType;
-	int objectType;
+	Container * currentTopContainer = drawing;
+	ResetLayerVectors();
 
 	while (!feof(file))
 	{
-		if (FileIO::GetObjectFromFile(file, currentTopContainer, &object, &objectType) == false)
-			return false;
+		// Reconstruct the object
+		Object * obj = GetObjectFromFile(file);
+
+		// objectFileType is set in GetObjectFromFile()...
+		if (objectFileType == OTFObject)
+		{
+			if (obj == NULL)
+				return false;
 
-		// object->type down below can be replaced with objType.
-		// Above could be: bool FileIO::GetObjectFromFile(FILE *, Object *, ObjectType *);
-		// where the return value tells if it's a valid object, Object * returns the
-		// reconstructed object and ObjectType * returns the object type.
+			currentTopContainer->objects.push_back(obj);
+//printf("Load: Adding object. Container size = %li (%li)\n", drawing->objects.size(), currentTopContainer->objects.size());
 
-		if (objectType == OTFEndOfFile)
+			// If the object is a container, push current TLC on the stack and
+			// set it as the new TLC
+			if (obj->type == OTContainer)
+			{
+				containerStack.push_back(currentTopContainer);
+				currentTopContainer = (Container *)obj;
+			}
+		}
+		else if (objectFileType == OTFContainerEnd)
+		{
+			// Container is done, so pop the stack to get back the previous TLC
+			currentTopContainer = containerStack.back();
+			containerStack.pop_back();
+		}
+		else if (objectFileType == OTFEndOfFile)
 		{
 //printf("Load: container size = %li\n", drawing->objects.size());
 			return true;
 		}
-		else if (objectType == OTFContainer)
+	}
+
+	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
+	// Container, add objects to it until an "endContainer" marker is found.
+	// This will require a stack to maintain the current Container.
+	std::vector<Container *> containerStack;
+	Container * currentTopContainer = drawing;
+	ResetLayerVectors();
+
+	while (!feof(file))
+	{
+		// Reconstruct the object (extended format!)
+		Object * obj = GetObjectFromFile(file, true);
+
+		// objectFileType is set in GetObjectFromFile()...
+		if (objectFileType == OTFObject)
 		{
-			containerStack.push_back(currentTopContainer);
-			currentTopContainer = new Container(Vector(0, 0), currentTopContainer);
+			if (obj == NULL)
+				return false;
+
+			currentTopContainer->objects.push_back(obj);
+//printf("Load: Adding object. Container size = %li (%li)\n", drawing->objects.size(), currentTopContainer->objects.size());
+
+			// If the object is a container, push current TLC on the stack and
+			// set it as the new TLC
+			if (obj->type == OTContainer)
+			{
+				containerStack.push_back(currentTopContainer);
+				currentTopContainer = (Container *)obj;
+			}
 		}
-		else if (objectType == OTFContainerEnd)
+		else if (objectFileType == OTFContainerEnd)
 		{
-			Container * containerToAdd = currentTopContainer;
+			// Add the extents of the current container
+			Rect r = ApplicationWindow::drawing->GetObjectExtents((Object *)currentTopContainer);
+			currentTopContainer->p[0] = r.TopLeft();
+			currentTopContainer->p[1] = r.BottomRight();
+//printf("Container extents: <%lf, %lf>, <%lf, %lf>\n", r.l, r.t, r.r, r.b);
+
+			// Container is done, so pop the stack to get back the previous TLC
 			currentTopContainer = containerStack.back();
 			containerStack.pop_back();
-			currentTopContainer->Add(containerToAdd);
 		}
-		else
+		else if (objectFileType == OTFEndOfFile)
 		{
-			currentTopContainer->Add(object);
-//printf("Load: Adding object. Container size = %li (%li)\n", drawing->objects.size(), currentTopContainer->objects.size());
+//printf("Load: container size = %li\n", drawing->objects.size());
+			return true;
 		}
 	}
 
 	return false;
-#else
-	return false;
-#endif
 }
 
+/*static*/ bool FileIO::LoadVersion1_2(FILE * file, Container * drawing)
+{
+	int hidden, locked, props = 0;
+	char textBuffer[65536];
+
+	// Load drawing properties, if any, first
+	fscanf(file, "PROPERTIES %i\n", &props);
 
-/*static*/ bool FileIO::GetObjectFromFile(FILE * file, Object * parent, Object ** object, int * objectType)
+	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++)
+	{
+		fscanf(file, "%i %i \"%[^\"]\"\n", &hidden, &locked, textBuffer);
+		Global::layerHidden.push_back(hidden ? true : false);
+		Global::layerLocked.push_back(locked ? true : false);
+		Global::layerName.push_back(textBuffer);
+	}
+
+	fscanf(file, "ACTIVE %i\n", &Global::activeLayer);
+
+	// Approach: read each object in the file, one by one. If the object is a
+	// Container, add objects to it until an "endContainer" marker is found.
+	// This will require a stack to maintain the current Container.
+	std::vector<Container *> containerStack;
+	Container * currentTopContainer = drawing;
+
+	while (!feof(file))
+	{
+		// Reconstruct the object (extended format!)
+		Object * obj = GetObjectFromFile(file, true, true);
+
+		// objectFileType is set in GetObjectFromFile()...
+		if (objectFileType == OTFObject)
+		{
+			if (obj == NULL)
+				return false;
+
+			currentTopContainer->objects.push_back(obj);
+//printf("Load: Adding object. Container size = %li (%li)\n", drawing->objects.size(), currentTopContainer->objects.size());
+
+			// If the object is a container, push current TLC on the stack and
+			// set it as the new TLC
+			if (obj->type == OTContainer)
+			{
+				containerStack.push_back(currentTopContainer);
+				currentTopContainer = (Container *)obj;
+			}
+		}
+		else if (objectFileType == OTFContainerEnd)
+		{
+			// Add the extents of the current container
+			Rect r = ApplicationWindow::drawing->GetObjectExtents((Object *)currentTopContainer);
+			currentTopContainer->p[0] = r.TopLeft();
+			currentTopContainer->p[1] = r.BottomRight();
+//printf("Container extents: <%lf, %lf>, <%lf, %lf>\n", r.l, r.t, r.r, r.b);
+
+			// Container is done, so pop the stack to get back the previous TLC
+			currentTopContainer = containerStack.back();
+			containerStack.pop_back();
+		}
+		else if (objectFileType == OTFEndOfFile)
+		{
+//printf("Load: container size = %li\n", drawing->objects.size());
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/*static*/ Object * FileIO::GetObjectFromFile(FILE * file, bool extended/*= false*/, bool ext2/*= false*/)
 {
 	char buffer[256];
+	char textBuffer[65536];
 	int foundLayer = 0;
-	int num = fscanf(file, "%s", buffer);
-	bool recognized = false;
-	*object = NULL;
+	/*int num =*/ fscanf(file, "%s", buffer);
+	Object * obj = NULL;
+	objectFileType = OTFObject;
 //printf("FileIO: fscanf returned %i, buffer = \"%s\"\n", num, buffer);
 
 // The following fugliness is for troubleshooting. Can remove later.
 	if ((strcmp(buffer, "END") != 0) && (strcmp(buffer, "ENDCONTAINER") != 0))
 {
 errno = 0;
-		num = fscanf(file, " %i ", &foundLayer);
+		/*num =*/ fscanf(file, " %i ", &foundLayer);
 //printf("FileIO: fscanf returned %i, foundLayer = %i\n", num, foundLayer);
 if (errno)
 {
@@ -233,62 +388,152 @@ if (errno)
 }
 }
 
+	// Need to add pen attributes as well... do that for v1.1 :-P
+	// And fill attributes... do that for v1.3 (1.2 added layers)
 	if (strcmp(buffer, "LINE") == 0)
 	{
-//printf("      Found LINE.\n");
-		recognized = true;
-		Vector v1, v2;
-		fscanf(file, "(%lf,%lf) (%lf,%lf)", &v1.x, &v1.y, &v2.x, &v2.y);
-//printf("      Number of params recognized: %i\n", n);
-		*object = new Line(v1, v2, parent);
-		*objectType = OTFLine;
+		Point p1, p2;
+		fscanf(file, "(%lf,%lf) (%lf,%lf)", &p1.x, &p1.y, &p2.x, &p2.y);
+		obj = (Object *)new Line(p1, p2);
 	}
 	else if (strcmp(buffer, "CIRCLE") == 0)
 	{
-		recognized = true;
-		Vector v;
+		Point p;
 		double r;
-		fscanf(file, "(%lf,%lf) %lf", &v.x, &v.y, &r);
-		*object = new Circle(v, r, parent);
-		*objectType = OTFCircle;
+		fscanf(file, "(%lf,%lf) %lf", &p.x, &p.y, &r);
+		obj = (Object *)new Circle(p, r);
 	}
 	else if (strcmp(buffer, "ARC") == 0)
 	{
-		recognized = true;
-		Vector v;
+		Point p;
 		double r, a1, a2;
-		fscanf(file, "(%lf,%lf) %lf, %lf, %lf", &v.x, &v.y, &r, &a1, &a2);
-		*object = new Arc(v, r, a1, a2, parent);
-		*objectType = OTFArc;
+		fscanf(file, "(%lf,%lf) %lf, %lf, %lf", &p.x, &p.y, &r, &a1, &a2);
+		obj = (Object *)new Arc(p, r, a1, a2);
+	}
+	else if (strcmp(buffer, "POLYLINE") == 0)
+	{
+		long int size;
+		obj = (Object *)new Polyline();
+		fscanf(file, "(%li)", &size);
+		fscanf(file, " (%i, %f, %i)\n", &obj->color, &obj->thickness, &obj->style);
+
+		for(int i=0; i<size; i++)
+		{
+			Object * po = new Object();
+			fscanf(file, "(%lf,%lf,%lf)\n", &po->p[0].x, &po->p[0].y, &po->length);
+			((Polyline *)obj)->Add(po);
+		}
+	}
+	else if (strcmp(buffer, "TEXT") == 0)
+	{
+		Point p;
+		fscanf(file, "(%lf,%lf) \"%[^\"]\"", &p.x, &p.y, textBuffer);
+		obj = (Object *)new Text(p, textBuffer);
 	}
 	else if (strcmp(buffer, "DIMENSION") == 0)
 	{
-		recognized = true;
-		Vector v1, v2;
+		Point p1, p2;
 		DimensionType type;
-		fscanf(file, "(%lf,%lf) (%lf,%lf) %i", &v1.x, &v1.y, &v2.x, &v2.y, &type);
-		*object = new Dimension(v1, v2, type, parent);
-		*objectType = OTFDimension;
+		double offset = 0;
+		fscanf(file, "(%lf,%lf) (%lf,%lf) %i", &p1.x, &p1.y, &p2.x, &p2.y, (int *)&type);
+
+		if (ext2)
+			fscanf(file, " %lf", &offset);
+
+		obj = (Object *)new Dimension(p1, p2, type, offset);
 	}
 	else if (strcmp(buffer, "CONTAINER") == 0)
 	{
-		recognized = true;
-		*objectType = OTFContainer;
+		obj = (Object *)new Container();
+//		objectFileType = OTFContainer;
 	}
 	else if (strcmp(buffer, "ENDCONTAINER") == 0)
 	{
-		recognized = true;
-		*objectType = OTFContainerEnd;
+		objectFileType = OTFContainerEnd;
 	}
 	else if (strcmp(buffer, "END") == 0)
 	{
-		recognized = true;
-		*objectType = OTFEndOfFile;
+		objectFileType = OTFEndOfFile;
 	}
+	else
+		printf("Unknown object type '%s'...\n", buffer);
 
-	if (*object)
-		(*object)->layer = foundLayer;
+	if (obj != NULL)
+	{
+		obj->layer = foundLayer;
 
-	return recognized;
+		if (extended && (obj->type != OTContainer) && (obj->type != OTPolyline))
+		{
+			fscanf(file, " (%i, %f, %i)\n", &obj->color, &obj->thickness, &obj->style);
+		}
+	}
+
+	return obj;
 }
 
+/*static*/ bool FileIO::WriteObjectToFile(FILE * file, Object * obj)
+{
+	// Sanity check
+	if (obj == NULL)
+		return false;
+
+	switch (obj->type)
+	{
+	case OTLine:
+		fprintf(file, "LINE %i (%.16lf,%.16lf) (%.16lf,%.16lf)", obj->layer, obj->p[0].x, obj->p[0].y, obj->p[1].x, obj->p[1].y);
+		break;
+	case OTCircle:
+		fprintf(file, "CIRCLE %i (%.16lf,%.16lf) %.16lf", obj->layer, obj->p[0].x, obj->p[0].y, obj->radius[0]);
+		break;
+	case OTEllipse:
+		break;
+	case OTArc:
+		fprintf(file, "ARC %i (%.16lf,%.16lf) %.16lf, %.16lf, %.16lf", obj->layer, obj->p[0].x, obj->p[0].y, obj->radius[0], obj->angle[0], obj->angle[1]);
+		break;
+	case OTPolyline:
+	{
+		Polyline * p = (Polyline *)obj;
+		fprintf(file, "POLYLINE %i (%li)", p->layer, p->points.size());
+		fprintf(file, " (%i, %f, %i)\n", obj->color, obj->thickness, obj->style);
+
+		for(VPVectorIter i=p->points.begin(); i!=p->points.end(); i++)
+		{
+			Object * po = (Object *)(*i);
+			fprintf(file, "(%.16lf,%.16lf,%.16lf)\n", po->p[0].x, po->p[0].y, po->length);
+		}
+	}
+		break;
+	case OTDimension:
+		fprintf(file, "DIMENSION %i (%.16lf,%.16lf) (%.16lf,%.16lf) %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:
+		break;
+	case OTText:
+		fprintf(file, "TEXT %i (%lf,%lf) \"%s\"", obj->layer, obj->p[0].x, obj->p[0].y, ((Text *)obj)->s.c_str());
+		break;
+	case OTContainer:
+	{
+		Container * c = (Container *)obj;
+
+		if (c->topLevel == false)
+			fprintf(file, "CONTAINER %i\n", obj->layer);
+
+		std::vector<void *>::iterator i;
+
+		for(i=c->objects.begin(); i!=c->objects.end(); i++)
+			WriteObjectToFile(file, (Object *)*i);
+
+		if (c->topLevel == false)
+			fprintf(file, "ENDCONTAINER\n");
+
+		break;
+	}
+	default:
+		break;
+	}
+
+	if ((obj->type != OTContainer) && (obj->type != OTPolyline))
+		fprintf(file, " (%i, %f, %i)\n", obj->color, obj->thickness, obj->style);
+
+	return true;
+}