git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inflict Qt4 upon the codebase
[ipdf/code.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
9cf0c68
..
2612afc
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-1,8
+1,18
@@
#include "main.h"
#include <unistd.h> // Because we can.
#include "main.h"
#include <unistd.h> // Because we can.
+
+#include "controlpanel.h"
+
+
+
int main(int argc, char ** argv)
{
int main(int argc, char ** argv)
{
- Debug("Compiled with REAL = %d => \"%s\"", REAL, g_real_name[REAL]);
+ #ifndef __STDC_IEC_559__
+ Warn("__STDC_IEC_559__ not defined. IEEE 754 floating point not fully supported.\n");
+ #endif
+
+
+ Debug("Compiled with REAL = %d => \"%s\" sizeof(Real) == %d bytes", REAL, g_real_name[REAL], sizeof(Real));
Document doc;
srand(time(NULL));
Document doc;
srand(time(NULL));
@@
-72,17
+82,44
@@
int main(int argc, char ** argv)
if (input_filename != NULL)
{
if (input_filename != NULL)
{
- doc.Load
(input_filename
);
+ doc.Load
SVG(input_filename, Rect(0,0,Real(1)/Real(800),Real(1)/Real(600))
);
}
else
{
}
else
{
- doc.Add(RECT_OUTLINE, Rect(0.5,0.5,1,1));
+ //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]);
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)
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);
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;
}
return 0;
}
UCC
git Repository :: git.ucc.asn.au