diff -up inetvis-0.9.3.1/src/dataproc.cpp.orig inetvis-0.9.3.1/src/dataproc.cpp --- inetvis-0.9.3.1/src/dataproc.cpp.orig 2008-08-14 18:24:48.000000000 +0200 +++ inetvis-0.9.3.1/src/dataproc.cpp 2008-08-14 18:25:32.000000000 +0200 @@ -2,6 +2,7 @@ #include <glviswidget.h> #include <iostream> #include <stdio.h> +#include <stdlib.h> using namespace std; //for debugging purposes diff -up inetvis-0.9.3.1/src/glviswidget.cpp.orig inetvis-0.9.3.1/src/glviswidget.cpp --- inetvis-0.9.3.1/src/glviswidget.cpp.orig 2008-08-14 21:27:22.000000000 +0200 +++ inetvis-0.9.3.1/src/glviswidget.cpp 2008-08-15 10:34:22.000000000 +0200 @@ -4,6 +4,7 @@ //#include <plotter.h> #include <dataproc.h> #include "logui.h" +#include "glviswidget.h" using namespace std; @@ -26,7 +27,8 @@ GLVisWidget::GLVisWidget(QWidget *parent blending = false; //set background related colours - setBackgroundCol(BLACK_BACKGROUND); //default + //setBackgroundCol(BLACK_BACKGROUND); //default + backgroundCol = BLACK_BACKGROUND; //set refrence for list id referenceAxesList = 1; @@ -161,10 +163,13 @@ void GLVisWidget::initializeGL() glLineWidth(globalLineWidth); //set background colour + /* if (backgroundCol == BLACK_BACKGROUND) glClearColor(0.0, 0.0, 0.0, 0.0); else glClearColor(1.0, 1.0, 1.0, 0.0); + */ + setBackgroundCol(backgroundCol); //set memmory data alignment for capturing frames glPixelStorei(GL_PACK_ALIGNMENT, 1); //align to byte rather than the default diff -up inetvis-0.9.3.1/src/glviswidget.h.orig inetvis-0.9.3.1/src/glviswidget.h --- inetvis-0.9.3.1/src/glviswidget.h.orig 2007-11-18 02:37:01.000000000 +0100 +++ inetvis-0.9.3.1/src/glviswidget.h 2008-08-14 18:18:37.000000000 +0200 @@ -44,6 +44,9 @@ Street, Fifth Floor, Boston, MA 02110-13 * */ +#ifndef GLVISWIDGET_H_INCLUDED +#define GLVISWIDGET_H_INCLUDED + //To use nvidia development GL header //#include "/usr/share/doc/nvidia-glx-dev/include/GL/gl.h" @@ -302,3 +305,6 @@ signals: void showReferenceFrameSettings(); }; + +#endif // GLVISWIDGET_H_INCLUDED + diff -up inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h.orig inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h --- inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h.orig 2007-11-18 02:37:01.000000000 +0100 +++ inetvis-0.9.3.1/src/helpdocumentationdialog.ui.h 2008-08-14 18:18:37.000000000 +0200 @@ -47,14 +47,19 @@ Street, Fifth Floor, Boston, MA 02110-13 void HelpDocumentationDialog::init() { - helpTextBrowser->mimeSourceFactory()->setFilePath(QDir::currentDirPath() + "/doc"); +#ifdef INETVIS_DOCDIR + QString docdir = INETVIS_DOCDIR; +#else + QString docdir = QDir::currentDirPath() + "/doc"; +#endif + helpTextBrowser->mimeSourceFactory()->setFilePath(docdir); QString documentationFileRef; documentationFileRef = "inetvisdoc.html"; QString altDocumentationText; altDocumentationText = "<h3>Documentation & Help pane</h3><p>if you see this message, there was an error reading the InetVis html manual providing documentation and help for the program. It should be installed in a 'doc/' directory relative to the inetvis binary.</p>"; - if (QFile::exists("doc/" + documentationFileRef)) + if (QFile::exists(docdir + documentationFileRef)) helpTextBrowser->setSource(documentationFileRef); else helpTextBrowser->setText(altDocumentationText); diff -up inetvis-0.9.3.1/src/inetvis.pro.orig inetvis-0.9.3.1/src/inetvis.pro --- inetvis-0.9.3.1/src/inetvis.pro.orig 2007-11-18 02:35:13.000000000 +0100 +++ inetvis-0.9.3.1/src/inetvis.pro 2008-08-15 11:43:42.000000000 +0200 @@ -53,11 +53,12 @@ CONFIG += release ## Linking CONFIG += create_prl link_prl static -QMAKE_LFLAGS_RELEASE = -m32 +#QMAKE_LFLAGS_RELEASE = -m32 ## Optimization flags -QMAKE_CFLAGS_RELEASE = -O3 -march=pentium4 -m32 -mfpmath=sse -mmmx -msse -msse2 -mno-sse3 -momit-leaf-frame-pointer -maccumulate-outgoing-args -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +#QMAKE_CFLAGS_RELEASE += -m32 -mfpmath=sse -mmmx -msse -msse2 -mno-sse3 -momit-leaf-frame-pointer -maccumulate-outgoing-args +QMAKE_CFLAGS_RELEASE += +QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE ## end of CUSTOM SETTINGS --------------------------------- diff -up inetvis-0.9.3.1/src/main.cpp.orig inetvis-0.9.3.1/src/main.cpp