Implementation de quadripole et de maille FODO.

3 files changed, 48 insertions, 24 deletions

diff --git a/src/gui/Main.cc b/src/gui/Main.cc
index d07d6fd..9842a03 100644
--- a/src/gui/Main.cc
+++ b/src/gui/Main.cc
@@ -7,11 +7,16 @@
 
 #include <QApplication>
 #include <QWidget>
+#include "GLWidget.h"
+#include "Vector3D.h"
+
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QWidget window;
+    GLWidget window;
+    vhc::Vector3D s = vhc::Vector3D::i;
 
     window.resize(250, 150);
     window.setWindowTitle("Virtual Hadron Collider");
diff --git a/src/gui/Makefile b/src/gui/Makefile
index d1d125a..8595ac2 100644
--- a/src/gui/Makefile
+++ b/src/gui/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
-# Makefile for building: gui
-# Generated by qmake (2.01a) (Qt 4.7.0) on: Thu Mar 24 15:15:04 2011
+# Makefile for building: $(BINDIR)/gui/gui
+# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Mar 29 19:14:31 2011
 # Project:  gui.pro
 # Template: app
 # Command: /usr/bin/qmake -o Makefile gui.pro
@@ -10,13 +10,13 @@
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+DEFINES       = -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -I../main -I.
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4 -I. -I$(SRCDIR)/main/ -I/usr/X11R6/include -I.
 LINK          = g++
 LFLAGS        = -Wl,-O1
-LIBS          = $(SUBLIBS)  -L/usr/lib -L/home/jakob/workspace/vhc/bin/main -lvhc -lQtGui -lQtCore -lpthread 
+LIBS          = $(SUBLIBS)  -L/usr/lib -L/usr/X11R6/lib -L$(BINDIR)/main -lvhc -lQtOpenGL -lQtGui -lQtCore -lGLU -lGL -lpthread 
 AR            = ar cqs
 RANLIB        = 
 QMAKE         = /usr/bin/qmake
@@ -39,12 +39,15 @@ MKDIR         = mkdir -p
 
 ####### Output directory
 
-OBJECTS_DIR   = ./
+OBJECTS_DIR   = $(BINDIR)/gui/
 
 ####### Files
 
-SOURCES       = Main.cc 
-OBJECTS       = Main.o
+SOURCES       = Main.cc \
+		GLWidget.cc moc_GLWidget.cpp
+OBJECTS       = $(BINDIR)/gui/Main.o \
+		$(BINDIR)/gui/GLWidget.o \
+		$(BINDIR)/gui/moc_GLWidget.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
@@ -58,6 +61,7 @@ DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/features/default_post.prf \
 		/usr/share/qt4/mkspecs/features/warn_on.prf \
 		/usr/share/qt4/mkspecs/features/qt.prf \
+		/usr/share/qt4/mkspecs/features/unix/opengl.prf \
 		/usr/share/qt4/mkspecs/features/unix/thread.prf \
 		/usr/share/qt4/mkspecs/features/moc.prf \
 		/usr/share/qt4/mkspecs/features/resources.prf \
@@ -67,8 +71,8 @@ DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/features/include_source_dir.prf \
 		gui.pro
 QMAKE_TARGET  = gui
-DESTDIR       = 
-TARGET        = gui
+DESTDIR       = $(BINDIR)/gui/
+TARGET        = $(BINDIR)/gui/gui
 
 first: all
 ####### Implicit rules
@@ -95,6 +99,7 @@ first: all
 all: Makefile $(TARGET)
 
 $(TARGET):  $(OBJECTS)  
+	@$(CHK_DIR_EXISTS) $(BINDIR)/gui/ || $(MKDIR) $(BINDIR)/gui/ 
 	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
 Makefile: gui.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
@@ -110,6 +115,7 @@ Makefile: gui.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mk
 		/usr/share/qt4/mkspecs/features/default_post.prf \
 		/usr/share/qt4/mkspecs/features/warn_on.prf \
 		/usr/share/qt4/mkspecs/features/qt.prf \
+		/usr/share/qt4/mkspecs/features/unix/opengl.prf \
 		/usr/share/qt4/mkspecs/features/unix/thread.prf \
 		/usr/share/qt4/mkspecs/features/moc.prf \
 		/usr/share/qt4/mkspecs/features/resources.prf \
@@ -117,6 +123,7 @@ Makefile: gui.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mk
 		/usr/share/qt4/mkspecs/features/yacc.prf \
 		/usr/share/qt4/mkspecs/features/lex.prf \
 		/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+		/usr/lib/libQtOpenGL.prl \
 		/usr/lib/libQtGui.prl \
 		/usr/lib/libQtCore.prl
 	$(QMAKE) -o Makefile gui.pro
@@ -133,6 +140,7 @@ Makefile: gui.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mk
 /usr/share/qt4/mkspecs/features/default_post.prf:
 /usr/share/qt4/mkspecs/features/warn_on.prf:
 /usr/share/qt4/mkspecs/features/qt.prf:
+/usr/share/qt4/mkspecs/features/unix/opengl.prf:
 /usr/share/qt4/mkspecs/features/unix/thread.prf:
 /usr/share/qt4/mkspecs/features/moc.prf:
 /usr/share/qt4/mkspecs/features/resources.prf:
@@ -140,14 +148,15 @@ Makefile: gui.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mk
 /usr/share/qt4/mkspecs/features/yacc.prf:
 /usr/share/qt4/mkspecs/features/lex.prf:
 /usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/usr/lib/libQtOpenGL.prl:
 /usr/lib/libQtGui.prl:
 /usr/lib/libQtCore.prl:
 qmake:  FORCE
 	@$(QMAKE) -o Makefile gui.pro
 
 dist: 
-	@$(CHK_DIR_EXISTS) .tmp/gui1.0.0 || $(MKDIR) .tmp/gui1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/gui1.0.0/ && $(COPY_FILE) --parents Main.cc .tmp/gui1.0.0/ && (cd `dirname .tmp/gui1.0.0` && $(TAR) gui1.0.0.tar gui1.0.0 && $(COMPRESS) gui1.0.0.tar) && $(MOVE) `dirname .tmp/gui1.0.0`/gui1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/gui1.0.0
+	@$(CHK_DIR_EXISTS) $(BINDIR)/gui/gui1.0.0 || $(MKDIR) $(BINDIR)/gui/gui1.0.0 
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) $(BINDIR)/gui/gui1.0.0/ && $(COPY_FILE) --parents GLWidget.h $(BINDIR)/gui/gui1.0.0/ && $(COPY_FILE) --parents Main.cc GLWidget.cc $(BINDIR)/gui/gui1.0.0/ && (cd `dirname $(BINDIR)/gui/gui1.0.0` && $(TAR) gui1.0.0.tar gui1.0.0 && $(COMPRESS) gui1.0.0.tar) && $(MOVE) `dirname $(BINDIR)/gui/gui1.0.0`/gui1.0.0.tar.gz . && $(DEL_FILE) -r $(BINDIR)/gui/gui1.0.0
 
 
 clean:compiler_clean 
@@ -168,8 +177,12 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all:
+compiler_moc_header_make_all: moc_GLWidget.cpp
 compiler_moc_header_clean:
+	-$(DEL_FILE) moc_GLWidget.cpp
+moc_GLWidget.cpp: GLWidget.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) GLWidget.h -o moc_GLWidget.cpp
+
 compiler_rcc_make_all:
 compiler_rcc_clean:
 compiler_image_collection_make_all: qmake_image_collection.cpp
@@ -185,12 +198,18 @@ compiler_yacc_impl_make_all:
 compiler_yacc_impl_clean:
 compiler_lex_make_all:
 compiler_lex_clean:
-compiler_clean: 
+compiler_clean: compiler_moc_header_clean 
 
 ####### Compile
 
-Main.o: Main.cc 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Main.o Main.cc
+$(BINDIR)/gui/Main.o: Main.cc GLWidget.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(BINDIR)/gui/Main.o Main.cc
+
+$(BINDIR)/gui/GLWidget.o: GLWidget.cc GLWidget.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(BINDIR)/gui/GLWidget.o GLWidget.cc
+
+$(BINDIR)/gui/moc_GLWidget.o: moc_GLWidget.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(BINDIR)/gui/moc_GLWidget.o moc_GLWidget.cpp
 
 ####### Install
 
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index b1428d8..1ccb513 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -1,14 +1,14 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Mar 24 13:58:10 2011
-######################################################################
 
 TEMPLATE = app
 TARGET = 
+DESTDIR = $(BINDIR)/gui
+OBJECTS_DIR = $(BINDIR)/gui
 DEPENDPATH += .
 INCLUDEPATH += .
-INCLUDEPATH += ../main/
-#DEPENDPATH += /home/jakob/workspace/vhc/bin/main
-unix:LIBS += -L/home/jakob/workspace/vhc/bin/main -lvhc
+INCLUDEPATH += $(SRCDIR)/main/
+LIBS += -L$(BINDIR)/main -lvhc
+QT += opengl
 
 # Input
-SOURCES += Main.cc
+HEADERS += GLWidget.h
+SOURCES += Main.cc GLWidget.cc