X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=2612afca1acad968bf0db867a79136e1a428cf85;hp=91ce90bdeee949629d55f23b884c1402b7078bfa;hb=6dd539966821debd18e0b86ed126742cd81d7fc9;hpb=6a1c4e752af0bd26803bc2285cff004ef7b9f53d

diff --git a/src/main.cpp b/src/main.cpp
index 91ce90b..2612afc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,10 @@
 #include "main.h"
 #include <unistd.h> // Because we can.
+
+#include "controlpanel.h"
+
+
+
 int main(int argc, char ** argv)
 {	
 	#ifndef __STDC_IEC_559__
@@ -77,27 +82,44 @@ int main(int argc, char ** argv)
 
 	if (input_filename != NULL)
 	{
-		doc.Load(input_filename);
+		doc.LoadSVG(input_filename, Rect(0,0,Real(1)/Real(800),Real(1)/Real(600)));
 	}
 	else 
 	{
-		
-		for(int x = 0; x < 8; ++x)
-		{
-			for (int y = 0; y < 8; ++y)
-			{
-				doc.Add(static_cast<IPDF::ObjectType>((x^y)%3), Rect(0.2+x-4.0,0.2+y-4.0,0.6,0.6));
-			}
-		}
-		
-		//doc.Add(IPDF::RECT_OUTLINE, Rect(0.4,0.4,0.6,0.6));
-		
+		//doc.AddBezier(Bezier(0,0, 1,0.5, 0.5,1, 1,1));
+		doc.AddText("The quick brown\nfox jumps over\nthe lazy dog",0.1,0,0.5);
+		//doc.AddBezier(Bezier(0,0,0,0.1,0,0.1,0,0.1));
 	}
+	Debug("Start!");
 	Rect bounds(b[0],b[1],b[2],b[3]);
+	
+	Screen scr;
+	View view(doc,scr, bounds);
+
+	#ifndef CONTROLPANEL_DISABLED
+		ControlPanel::RunArgs args = {argc, argv, view, doc, scr};
+		SDL_Thread * cp_thread = SDL_CreateThread(ControlPanel::Run, "ControlPanel", &args);
+		if (cp_thread == NULL)
+		{
+			Error("Couldn't create ControlPanel thread: %s", SDL_GetError());
+		}
+	#endif //CONTROLPANEL_DISABLED
 
 	if (mode == LOOP)
-		MainLoop(doc, bounds, c);
-	else if (mode == OUTPUT_TO_BMP)
+		MainLoop(doc, scr, view);
+	else if (mode == OUTPUT_TO_BMP) //TODO: Remove this shit
 		OverlayBMP(doc, input_bmp, output_bmp, bounds, c);
+		
+	#ifndef CONTROLPANEL_DISABLED
+		
+		if (cp_thread != NULL)
+		{
+			int cp_return;
+			qApp->quit(); // will close the control panel
+			// (seems to not explode if the qApp has already been quit)
+			SDL_WaitThread(cp_thread, &cp_return);
+			Debug("ControlPanel thread returned %d", cp_return);
+		}
+	#endif //CONTROLPANEL_DISABLED
 	return 0;
 }