Commit 1f94d338 authored by Johnny Jazeix's avatar Johnny Jazeix

Fin de la modif sur les tests (si quelqu'un sait comment on fait

plusieurs executables avec qmake ca m'interesse ^^)
parent 03bee25f
This diff is collapsed.
######################################################################
# Automatically generated by qmake (2.01a) Mon Feb 23 22:24:45 2009
# Automatically generated by qmake (2.01a) dim. mars 22 16:04:18 2009
######################################################################
TEMPLATE = app
TARGET = test
OBJECTS_DIR=../../bin
DESTDIR=../../bin
TARGET = test_area
DEPENDPATH += .
INCLUDEPATH += .
OBJECTS_DIR = ../../bin
DESTDIR = .
CONFIG+=uitools debug
QT+=opengl
LIBS += -lglut
DEPENDPATH += .
INCLUDEPATH += . \
../../bin
LIBS += -lglut -lGLEW
DEFINES += TEST_SVG_MODE
QMAKE_EXTRA_TARGETS += test_svg
# Input
HEADERS += resource_test.hpp \
test_area.hpp \
../../src/interface/render_area.hpp \
../../src/interface/resource.hpp \
../../main_resource.hpp \
../../src/main_resource.hpp \
../../src/message/Message.hpp \
../../src/interface/interface.hpp \
../../src/message/enderror.hpp \
../../src/message/endwarning.hpp \
../../src/message/endinformation.hpp \
../../src/message/message.hpp \
../../src/message/message_ns.hpp
../../src/interface/resource.hpp \
../../src/render/render_opengl.hpp \
../../src/render/render.hpp \
../../src/render/render_svg.hpp
SOURCES += test_area.cpp \
../../src/interface/render_area.cpp \
../../src/message/enderror.cpp \
../../src/message/endwarning.cpp \
../../src/message/endinformation.cpp \
../../src/message/message.cpp \
../../src/message/message_ns.cpp
../../src/message/Message.cpp \
../../src/render/render_opengl.cpp \
../../src/render/render_svg.cpp
test_svg.o : test_svg.cpp
render_svg.o: ../../src/interface/render_svg.cpp ../../src/interface/render_svg.hpp
g++ -DTEST_SVG_MODE -g -c -Wall ../../src/interface/render_svg.cpp -o render_svg.o
test_svg : render_svg.o test_svg.o
g++ -DTEST_SVG_MODE -g -o test_svg render_svg.o test_svg.o
\ No newline at end of file
......@@ -8,7 +8,7 @@
#define RESOURCE_TEST_HPP
#include "../../main_resource.hpp"
#include "../../src/main_resource.hpp"
#endif
......@@ -31,71 +31,69 @@ public:
int main(int argc, char** argv){
glutInit(&argc, argv);
glutInit(&argc, argv);
QApplication app(argc, argv);
Interface_ i;
Message::set_interface_instance(&i);
Message::set_interface(&i);
// Interface_graphic* g = new Interface_graphic();
QWidget t;
t.setGeometry(0, 0, 800, 600);
Render_area r(&t);
r.setGeometry(0, 0, 800, 600);
//Render_area r(&t);
//r.setGeometry(0, 0, 800, 600);
// r.show();
t.show();
r.start_draw();
//r.start_draw();
{
r.start_draw_containers();
//r.start_draw_containers();
{
/* r.draw_container(0, 0, 30, 20);
r.draw_container(0, 22, 10, 20);
r.draw_container(0, 43, 15, 20);*/
// r.draw_container(1, 60, 60, 20);
r.draw_container_text(0, 10,"Container 2");
r.draw_container_text(0, 32,"Container 1");
r.draw_container(0, 22, 10, 20);
r.draw_container(0, 43, 15, 20);*/
// r.draw_container(1, 60, 60, 20);
//r.draw_container_text(0, 10,"Container 2");
//r.draw_container_text(0, 32,"Container 1");
}
r.end_draw_containers();
// r.end_draw_containers();
r.start_draw_states();
// r.start_draw_states();
{
/* r.draw_state(0, 4, 0, 20, 0.6, 0.7, 0.8);
r.draw_state(4.5, 7.98, 0, 20, 0.6, 0.7, 0.8);
r.draw_arrow(10, 10, 0, 3);
r.draw_arrow(10, -10, -15, -3);
r.draw_arrow(-150, 150, -10, 30);
r.draw_event(14, 4, 2);
r.draw_event(10, 4, 1);
r.draw_event(18, 4, 3);
r.draw_event(10, 4, 10);*/
r.draw_state(4.5, 7.98, 0, 20, 0.6, 0.7, 0.8);
r.draw_arrow(10, 10, 0, 3);
r.draw_arrow(10, -10, -15, -3);
r.draw_arrow(-150, 150, -10, 30);
r.draw_event(14, 4, 2);
r.draw_event(10, 4, 1);
r.draw_event(18, 4, 3);
r.draw_event(10, 4, 10);*/
}
r.end_draw_states();
//r.end_draw_states();
r.start_draw_counter();
//r.start_draw_counter();
{
r.draw_counter(0.0f, 1);
r.draw_counter(5, 1.2);
r.draw_counter(7, 2);
r.draw_counter(19.345, 3);
r.draw_counter(24.45, 2);
r.draw_counter(32, 6);
//r.draw_counter(0.0f, 1);
//r.draw_counter(5, 1.2);
//r.draw_counter(7, 2);
//r.draw_counter(19.345, 3);
//r.draw_counter(24.45, 2);
//r.draw_counter(32, 6);
}
r.end_draw_counter();
//r.end_draw_counter();
}
r.end_draw();
//r.end_draw();
;
r.build();
//r. build();
return app.exec();
}
......
......@@ -8,7 +8,7 @@
#define TEST_AREA_HPP
#include "resource_test.hpp"
#include "../../src/interface/render_area.hpp"
#include "../../src/render/render_opengl.hpp"
#endif
......
This diff is collapsed.
......@@ -58,6 +58,7 @@ int main(int argc, char** argv){
//parserdefinition->print_definitions();
cout << "lu :" << linecount << endl;
Message::kill();
delete parserdefinition;
delete parserevent;
return EXIT_SUCCESS;
......
LD = g++
OBJ = date.o name.o string.o trace.o
OPT = -g -Wall -W
LIBS =
all: $(OBJ)
$(OBJ):%.o: %.cpp %.hpp
$(LD) -c $< $(OPT)
clean:
$(RM) *.o *.*~ makefile~
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment