EI/VirtualLeaf Changeset - caa535c40937 · Centrum Wiskunde & Informatica (CWI)

Changeset - caa535c40937

Parent rev.

Child rev.

[Not reviewed]

default

1 34 4

Michael Guravage - 15 years ago 2010-06-25 16:50:35
michael.guravage@cwi.nl

Made changes to conform to the version submitted with the Plant Physiology paper. See the individual ChangeLogs for details.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'
added lib/libiconv/bin/iconv.exe
added lib/libiconv/bin/libcharset-1.dll
added lib/libiconv/bin/libiconv-2.dll
added src/gpl3.txt
changed INSTALL
changed src/ChangeLog
changed src/TutorialCode/Tutorial0/ChangeLog
changed src/TutorialCode/Tutorial0/tutorial0.pro
changed src/TutorialCode/Tutorial1A/ChangeLog
changed src/TutorialCode/Tutorial1A/tutorial1A.pro
changed src/TutorialCode/Tutorial1B/ChangeLog
changed src/TutorialCode/Tutorial1B/tutorial1B.pro
changed src/TutorialCode/Tutorial1C/ChangeLog
changed src/TutorialCode/Tutorial1C/tutorial1C.pro
changed src/TutorialCode/Tutorial1D/ChangeLog
changed src/TutorialCode/Tutorial1D/tutorial1D.pro
changed src/TutorialCode/Tutorial2/ChangeLog
changed src/TutorialCode/Tutorial2/tutorial2.pro
changed src/TutorialCode/Tutorial3/ChangeLog
changed src/TutorialCode/Tutorial3/tutorial3.pro
changed src/TutorialCode/Tutorial4/ChangeLog
changed src/TutorialCode/Tutorial4/tutorial4.pro
changed src/TutorialCode/Tutorial5/ChangeLog
changed src/TutorialCode/Tutorial5/tutorial5.pro
changed src/VirtualLeaf-install.nsi
changed src/VirtualLeaf.pro
changed src/build_models/ChangeLog
changed src/build_models/plugin_auxingrowth.pro
changed src/build_models/plugin_meinhardt.pro
changed src/build_models/plugin_test.pro
changed src/canvas.cpp
changed src/libplugin.pro
changed src/output.cpp
changed src/output.h
changed src/parameter.cpp
changed src/parameter.h
changed src/perl/ChangeLog
changed src/perl/make_parameter_source.pl
removed doc/gpl3.txt

38 files changed with 181 insertions and 92 deletions:

INSTALL

lib/libiconv/bin/iconv.exe

bin+new file

lib/libiconv/bin/libcharset-1.dll

bin+new file

lib/libiconv/bin/libiconv-2.dll

bin+new file

src/ChangeLog

src/TutorialCode/Tutorial0/ChangeLog

src/TutorialCode/Tutorial0/tutorial0.pro

src/TutorialCode/Tutorial1A/ChangeLog

src/TutorialCode/Tutorial1A/tutorial1A.pro

src/TutorialCode/Tutorial1B/ChangeLog

src/TutorialCode/Tutorial1B/tutorial1B.pro

src/TutorialCode/Tutorial1C/ChangeLog

src/TutorialCode/Tutorial1C/tutorial1C.pro

src/TutorialCode/Tutorial1D/ChangeLog

src/TutorialCode/Tutorial1D/tutorial1D.pro

src/TutorialCode/Tutorial2/ChangeLog

src/TutorialCode/Tutorial2/tutorial2.pro

src/TutorialCode/Tutorial3/ChangeLog

src/TutorialCode/Tutorial3/tutorial3.pro

src/TutorialCode/Tutorial4/ChangeLog

src/TutorialCode/Tutorial4/tutorial4.pro

src/TutorialCode/Tutorial5/ChangeLog

src/TutorialCode/Tutorial5/tutorial5.pro

src/VirtualLeaf-install.nsi

src/VirtualLeaf.pro

src/build_models/ChangeLog

src/build_models/plugin_auxingrowth.pro

src/build_models/plugin_meinhardt.pro

src/build_models/plugin_test.pro

src/canvas.cpp

src/gpl3.txt

rename

src/libplugin.pro

src/output.cpp

src/output.h

src/parameter.cpp

src/parameter.h

src/perl/ChangeLog

src/perl/make_parameter_source.pl

0 comments (0 inline, 0 general)

INSTALL

➞

Show inline comments

 Basic Installation
 ==================
 Linux::
  qmake -makefile libplugin.pro
  rm -f make.out
  make clean all 2>&1 | tee make.out
  cd build_models
  rm -f make.out
  for i in *.pro; do echo $i; qmake -makefile $i; make clean all 2>&1 | tee -a make.out; done
  cd -
  qmake -makefile VirtualLeaf.pro
  make clean all 2>&1 | tee -a make.out
 MacOSX::
  tbw
 Windows::
  tbw
 You will find platform specific instructions how to compile and
 install the VirtualLeaf in installation.pdf in the doc directory.

lib/libiconv/bin/iconv.exe

➞

Show inline comments

		new file 100755
		binary diff not shown

lib/libiconv/bin/libcharset-1.dll

➞

Show inline comments

		new file 100755
		binary diff not shown

lib/libiconv/bin/libiconv-2.dll

➞

Show inline comments

		new file 100755
		binary diff not shown

src/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* gpl3.txt: Moved gpl3.txt from doc to src directory.
 	* VirtualLeaf.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 	* libplugin.pro: Ditto.
 	* parameter.cpp: Result of adding datadir changes to make_parameter_source.pl.
 	* parameter.h: Ditto.
 	* output.h: Declared new function (AppendHomeDirIfPathRelative).
 	* output.cpp (AppendHomeDirIfPathRelative): Added new function.
 	* canvas.cpp (gpl): Moving gpl3.txt from doc to src obviates the need to docDir.cd("../doc").
 	* VirtualLeaf-install.nsi: Add missing libiconv/bin directory.
 	Copy libiconv-2.dll, libxml2.dll and zlib1.dll from relative paths.
 	* VirtualLeaf.pro: copy gpl3.txt as part of QMAKE_POST_LINK.
 -06-24    <guravage@caterpie.sen.cwi.nl>
 	* libplugin.pro: Use correct library path.
 	* VirtualLeaf.pro: Ditto.
 	* VirtualLeaf.cpp (DrawCell): Iterate over NChem to construct info_string.

src/TutorialCode/Tutorial0/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial0.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* tutorial0.pro: Corrected windows library paths.

src/TutorialCode/Tutorial0/tutorial0.pro

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ INCDIR = $${VLEAFHOME}/src @@
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 HEADERS = $${TARGET}.h
 INCLUDEPATH += $${INCDIR}
 QMAKE_CXXFLAGS += -fexceptions #-I$${INCDIR}
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}.cpp
 TEMPLATE = lib

src/TutorialCode/Tutorial1A/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1A.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1A.pro: corrected windows library path.

src/TutorialCode/Tutorial1A/tutorial1A.pro

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ INCDIR = $${VLEAFHOME}/src @@
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 HEADERS = $${TARGET}.h
 INCLUDEPATH += $${INCDIR}
 QMAKE_CXXFLAGS += -fexceptions #-I$${INCDIR}
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}.cpp
 TEMPLATE = lib

src/TutorialCode/Tutorial1B/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1B.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1B.pro: Corrected windows library path.

src/TutorialCode/Tutorial1B/tutorial1B.pro

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ INCDIR = $${VLEAFHOME}/src @@
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 HEADERS = $${TARGET}.h
 INCLUDEPATH += $${INCDIR}
 QMAKE_CXXFLAGS += -fexceptions #-I$${INCDIR}
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}.cpp
 TEMPLATE = lib

src/TutorialCode/Tutorial1C/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1C.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1C.pro: Corrected windows library path.

src/TutorialCode/Tutorial1C/tutorial1C.pro

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ INCDIR = $${VLEAFHOME}/src @@
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 HEADERS = $${TARGET}.h
 INCLUDEPATH += $${INCDIR}
 QMAKE_CXXFLAGS += -fexceptions #-I$${INCDIR}
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}.cpp
 TEMPLATE = lib

src/TutorialCode/Tutorial1D/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1D.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1D.pro: Corrected windows library path.

src/TutorialCode/Tutorial1D/tutorial1D.pro

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ INCDIR = $${VLEAFHOME}/src @@
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 HEADERS = $${TARGET}.h
 INCLUDEPATH += $${INCDIR}
 QMAKE_CXXFLAGS += -fexceptions #-I$${INCDIR}
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}.cpp
 TEMPLATE = lib

src/TutorialCode/Tutorial2/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial2.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* tutorial2.pro: Corrected windows library path.

src/TutorialCode/Tutorial2/tutorial2.pro

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ INCDIR = $${VLEAFHOME}/src @@
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 HEADERS = $${TARGET}.h
 INCLUDEPATH += $${INCDIR}
 QMAKE_CXXFLAGS += -fexceptions #-I$${INCDIR}
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}.cpp
 TEMPLATE = lib

src/TutorialCode/Tutorial3/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial3.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* tutorial3.pro: Corrected windows library path.

src/TutorialCode/Tutorial3/tutorial3.pro

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ INCDIR = $${VLEAFHOME}/src @@
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 HEADERS = $${TARGET}.h
 INCLUDEPATH += $${INCDIR}
 QMAKE_CXXFLAGS += -fexceptions #-I$${INCDIR}
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}.cpp
 TEMPLATE = lib

src/TutorialCode/Tutorial4/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial4.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* tutorial4.pro: Corrected windows library path.

src/TutorialCode/Tutorial4/tutorial4.pro

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ INCDIR = $${VLEAFHOME}/src @@
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 HEADERS = $${TARGET}.h
 INCLUDEPATH += $${INCDIR}
 QMAKE_CXXFLAGS += -fexceptions #-I$${INCDIR}
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}.cpp
 TEMPLATE = lib

src/TutorialCode/Tutorial5/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial5.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 -06-23    <guravage@caterpie.sen.cwi.nl>
 	* tutorial5.pro: Corrected windows library path.

src/TutorialCode/Tutorial5/tutorial5.pro

➞

Show inline comments

@@ @@ -33,12 +33,14 @@ INCDIR = $${VLEAFHOME}/src @@
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 HEADERS = $${TARGET}.h
 INCLUDEPATH += $${INCDIR}
 QMAKE_CXXFLAGS += -fexceptions #-I$${INCDIR}
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}.cpp
 TEMPLATE = lib

src/VirtualLeaf-install.nsi

➞

Show inline comments

@@ @@ -121,16 +121,17 @@ section "Virtual Leaf executable" @@
   writeUninstaller $INSTDIR\uninstaller.exe
   file ..\bin\VirtualLeaf.exe
   # Required DLLs
   setOutPath $INSTDIR\bin
   file C:\libiconv\bin\libiconv-2.dll
   file C:\libxml2\lib\libxml2.dll
   file C:\libz\bin\zlib1.dll
   file ..\lib\libiconv\bin\libiconv-2.dll
   file ..\lib\libxml2\lib\libxml2.dll
   file ..\lib\libz\bin\zlib1.dll
   # Is the pegging of these DLLs to a specific QT version a problem?
   file C:\Qt\2010.02.1\mingw\bin\mingwm10.dll
   file C:\Qt\2010.02.1\mingw\bin\libgcc_s_dw2-1.dll
   file C:\Qt\2010.02.1\qt\bin\Qt3Support4.dll
   file C:\Qt\2010.02.1\qt\bin\QtCore4.dll
   file C:\Qt\2010.02.1\qt\bin\QtGui4.dll

src/VirtualLeaf.pro

➞

Show inline comments

@@ @@ -22,12 +22,14 @@ @@
 CONFIG += release
 CONFIG -= debug
 CONFIG += qt
 QMAKE_CXXFLAGS += -fexceptions
 QMAKE_CXXFLAGS += -Wall
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 #REACTIONS = reactions_auxin_growth.h
 #REACTIONS = reactions_meinhardt.h
 #REACTIONS = reactions_pce_growth.h
@@ @@ -196,12 +198,13 @@ contains( GRAPHICS, x11 ) { @@
 # MACOSX packaging
 macx {
 ICON = leaficon.icns
 QMAKE_POST_LINK = "\
 	#install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}; \
 	cp leaficon.icns $${DESTDIR}/$${TARGET}.app; \
 	cp gpl3.txt $${DESTDIR}/$${TARGET}.app/Contents/MacOS/.                                    ; \
 	mkdir $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	cp -R /Library/Frameworks/QtCore.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	cp -R /Library/Frameworks/QtGui.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	cp -R /Library/Frameworks/Qt3Support.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	#cp /usr/local/qwt/lib/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	#install_name_tool -id @executable_path/../Frameworks/libqwt.dylib $${DESTDIR}/$${TARGET}.app/Contents/Frameworks/libqwt.dylib; \

src/build_models/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* plugin_auxingrowth.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 	* plugin_test.pro: Ditto.
 	* plugin_meinhardt.pro: Ditto.
 -06-24    <guravage@caterpie.sen.cwi.nl>
 	* plugin_auxingrowth.pro: Use correct library path.
 	* plugin_meinhardt.pro: Ditto.
 	* plugin_test.pro: Ditto.

src/build_models/plugin_auxingrowth.pro

➞

Show inline comments

@@ @@ -27,12 +27,14 @@ BINDIR = ../../bin @@
 LIBDIR = ../../lib
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 TARGET = auxingrowth
 HEADERS = ../simplugin.h $${TARGET}plugin.h
 QMAKE_CXXFLAGS += -fexceptions -I..
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib

src/build_models/plugin_meinhardt.pro

➞

Show inline comments

@@ @@ -27,12 +27,14 @@ BINDIR = ../../bin @@
 LIBDIR = ../../lib
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 TARGET = meinhardt
 HEADERS = ../simplugin.h $${TARGET}plugin.h
 QMAKE_CXXFLAGS += -fexceptions -I..
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib

src/build_models/plugin_test.pro

➞

Show inline comments

@@ @@ -27,12 +27,14 @@ BINDIR = ../../bin @@
 LIBDIR = ../../lib
 DEFINES = QTGRAPHICS # VLEAFPLUGIN
 DESTDIR = $${BINDIR}/models
 TARGET = test
 HEADERS = ../simplugin.h $${TARGET}plugin.h
 QMAKE_CXXFLAGS += -fexceptions -I..
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QT += qt3support
 SOURCES = $${TARGET}plugin.cpp
 TEMPLATE = lib

src/canvas.cpp

➞

Show inline comments

@@ @@ -951,13 +951,12 @@ void Main::about() @@
 void Main::gpl()
+{
   static QMessageBox* gpl = new QMessageBox ( "GPL License", "",
       QMessageBox::Information, 1, 0, 0, this, 0, FALSE );
   QDir docDir(QApplication::applicationDirPath());
   docDir.cd("../doc");
   QString path = docDir.filePath("gpl3.txt");
   std::ifstream file(path.toStdString().c_str());
   std::string str;
   if (file) {

src/gpl3.txt

➞

Show inline comments

file renamed from doc/gpl3.txt to src/gpl3.txt

src/libplugin.pro

➞

Show inline comments

@@ @@ -21,12 +21,15 @@ @@
 CONFIG += release
 CONFIG -= debug
 CONFIG += staticlib
 QMAKE_CXXFLAGS += -fexceptions
 QMAKE_CXXFLAGS += -Wall
 QMAKE_CXXFLAGS += -Wno-write-strings
 QMAKE_CXXFLAGS += -Wno-unused-parameter
 win32:QMAKE_CXXFLAGS -= O2
 QMAKE_CXXFLAGS_DEBUG += -g3
 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG
 QMAKE_CXXFLAGS_DEBUG -= -finstrument-functions
 DEFINES = QTGRAPHICS # VLEAFPLUGIN

src/output.cpp

➞

Show inline comments

@@ @@ -316,7 +316,19 @@ void MakeDir(const char *dirname) { @@
+  }
 #endif
+}
 char* AppendHomeDirIfPathRelative(char *datadir) {
   QDir dataDir(datadir);
   if (dataDir.isRelative()){
     if (datadir) {
       free(datadir);
+    }
     QStringList path;
     path << QDir::homePath() << dataDir.dirName();
     return strdup((char *) path.join("/").toStdString().c_str());
   } else return datadir;
+}
 /* finis */

src/output.h

➞

Show inline comments

@@ @@ -36,12 +36,13 @@ extern "C" { @@
   FILE *OpenReadFile(const char *filename);
   char *ReadLine(FILE *fp);
   void CheckFile(FILE *fp);
   int FileExistsP(const char *fname);
   char *Chext(char *filename);
   void MakeDir(const char *dirname);
   char *AppendHomeDirIfPathRelative(char *datadir);
   bool CanWeWriteP(char *filename);
 #ifdef __cplusplus
+}
 #endif

src/parameter.cpp

➞

Show inline comments

@@ @@ -129,12 +129,13 @@ Parameter::Parameter() { @@
   van3autokat = 0.1;
   van3sat = 10;
   k2van3 = 0.3;
   dt = 0.1;
   rd_dt = 1.0;
   datadir = strdup(".");
   datadir = AppendHomeDirIfPathRelative(datadir);
   movie = false;
   nit = 100000;
   maxt = 1000.;
   storage_stride = 10;
   xml_storage_stride = 500;
   rseed = -1;
@@ @@ -179,19 +180,12 @@ Parameter::Parameter() { @@
   b1 = false;
   b2 = false;
   b3 = false;
   b4 = false;
   dir1 = strdup(".");
   dir2 = strdup(".");
   // reassign datadir outside the loop
   QDir dataDir(datadir);
   if (dataDir.isRelative()){
     QStringList path;
     path << QDir::homePath() << dataDir.dirName();
     datadir = strdup((char *) path.join("/").toStdString().c_str());
+  }
+}
 Parameter::~Parameter() {
   // destruct parameter object
   // free string parameter
@@ @@ -301,12 +295,13 @@ void Parameter::Read(const char *filenam @@
   van3autokat = fgetpar(fp, "van3autokat", 0.1, true);
   van3sat = fgetpar(fp, "van3sat", 10, true);
   k2van3 = fgetpar(fp, "k2van3", 0.3, true);
   dt = fgetpar(fp, "dt", 0.1, true);
   rd_dt = fgetpar(fp, "rd_dt", 1.0, true);
   datadir = sgetpar(fp, "datadir", ".", true);
   datadir = AppendHomeDirIfPathRelative(datadir);
   if (strcmp(datadir, "."))
     MakeDir(datadir);
   movie = bgetpar(fp, "movie", false, true);
   nit = igetpar(fp, "nit", 100000, true);
   maxt = fgetpar(fp, "maxt", 1000., true);
   storage_stride = igetpar(fp, "storage_stride", 10, true);
@@ @@ -424,15 +419,19 @@ void Parameter::Write(ostream &os) const @@
   os << " van3prod = " << van3prod << endl;
   os << " van3autokat = " << van3autokat << endl;
   os << " van3sat = " << van3sat << endl;
   os << " k2van3 = " << k2van3 << endl;
   os << " dt = " << dt << endl;
   os << " rd_dt = " << rd_dt << endl;
   if (datadir)
     os << " datadir = " << datadir << endl;
   if (datadir) {
     QDir dataDir = QDir::home().relativeFilePath(datadir);
     os << " datadir = " << dataDir.dirName().toStdString() << endl;
+  }
   else {
     os << "datadir = ." << endl;
+  }
   os << " movie = " << sbool(movie) << endl;
   os << " nit = " << nit << endl;
   os << " maxt = " << maxt << endl;
   os << " storage_stride = " << storage_stride << endl;
   os << " xml_storage_stride = " << xml_storage_stride << endl;
   os << " rseed = " << rseed << endl;
@@ @@ -1097,14 +1096,16 @@ void Parameter::XMLAdd(xmlNode *root) co @@
+  }
+  {
     xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
     xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "datadir" );
     ostringstream text;
     if (datadir)
       text << datadir;
     if (datadir) {
       QDir dataDir = QDir::home().relativeFilePath(datadir);
       text << dataDir.dirName().toStdString();
+    }
     xmlNewProp(xmlpar, BAD_CAST "val", BAD_CAST text.str().c_str());
+  }
+  {
     xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
     xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "movie" );
     ostringstream text;
@@ @@ -1689,12 +1690,13 @@ void Parameter::AssignValToPar(const cha @@
     rd_dt = standardlocale.toDouble(valc, &ok);
     if (!ok) { MyWarning::error("Read error: cannot convert string \"%s\" to double while reading parameter 'rd_dt' from XML file.",valc); }
+  }
   if (!strcmp(namec, "datadir")) {
     if (datadir) { free(datadir); }
     datadir=strdup(valc);
     datadir = AppendHomeDirIfPathRelative(datadir);
+  }
   if (!strcmp(namec, "movie")) {
     movie = strtobool(valc);
+  }
   if (!strcmp(namec, "nit")) {
     nit = standardlocale.toInt(valc, &ok);
@@ @@ -1844,22 +1846,12 @@ void Parameter::AssignValArrayToPar(cons @@
     int i=0;
     vector<double>::const_iterator v=valarray.begin();
     while (v!=valarray.end() && i <= 14 ) {
       k[i++]=*(v++);
+    }
+  }
   // reassign datadir outside the loop
   if (!strcmp(namec, "datadir")) {
     if (datadir) { free(datadir); }
     QDir dataDir(datadir);
     if (dataDir.isRelative()){
       QStringList path;
       path << QDir::homePath() << dataDir.dirName();
       datadir = strdup((char *) path.join("/").toStdString().c_str());
+    }
+  }
+}
 ostream &operator<<(ostream &os, Parameter &p) {
   p.Write(os);
   return os;
+}

src/parameter.h

➞

Show inline comments

@@ @@ -26,24 +26,24 @@ @@
 #include "vector.h"
 #include <vector>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 class Parameter {
+ class Parameter {
  public:
   Parameter();
   ~Parameter();
   void CleanUp(void);
   void Read(const char *filename);
   void Write(ostream &os) const;
   void XMLAdd(xmlNode *root) const;
   void XMLRead(xmlNode *root);
   void AssignValToPar(const char *namec, const char *valc);
   void AssignValArrayToPar(const char *namec, vector<double> valarray);
    Parameter();
    ~Parameter();
    void CleanUp(void);
    void Read(const char *filename);
    void Write(ostream &os) const;
    void XMLAdd(xmlNode *root) const;
    void XMLRead(xmlNode *root);
    void AssignValToPar(const char *namec, const char *valc);
    void AssignValArrayToPar(const char *namec, vector<double> valarray);
   char * arrowcolor;
   double arrowsize;
   char * textcolor;
   int cellnumsize;
   int nodenumsize;
   double node_mag;
@@ @@ -137,14 +137,15 @@ class Parameter { @@
   bool b2;
   bool b3;
   bool b4;
   char * dir1;
   char * dir2;
  private:
 };
+ };
 ostream &operator<<(ostream &os, Parameter &p);
 const char *sbool(const bool &p);
  ostream &operator<<(ostream &os, Parameter &p);
  const char *sbool(const bool &p);
 #endif
 /* finis */

src/perl/ChangeLog

➞

Show inline comments

 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* make_parameter_source.pl: Added datadir changes.
 -06-21    <guravage@caterpie.sen.cwi.nl>
 	* make_pardialog_source.pl: Reformatted. If datadir is relative append it to the user's home directory.
 	* make_parameter_source.pl: Ditto.
 	* make_xmlwritecode.pl: Ditto.

src/perl/make_parameter_source.pl

➞

Show inline comments

@@ @@ -85,14 +85,14 @@ while (<parfile>) { @@
     $i++;
+}
 $lines=$i;
 print cppfile <<END_HEADER;
 // WARNING: This file is automatically generated by make_parameter_source.pl. Do not edit.
     // All edits will be discarded.
 // WARNING: This file is automatically generated by make_parameter_source.pl.
 // Do not edit. All edits will be discarded.
 #include "parameter.h"
 #include <cstdio>
 #include <cstring>
 #include <cstdlib>
 #include <cerrno>
@@ @@ -112,12 +112,15 @@ Parameter::Parameter() { @@
 END_HEADER
 for ($i=0;$i<$lines;$i++) {
     if ($convtype[$i] ne "label" && $convtype[$i] ne "title") {
 	if ($convtype[$i] eq "char *") {
 	    print cppfile "  $param[$i] = strdup($value[$i]);\n";
 	    if ($param[$i] eq "datadir") {
 		print cppfile "  datadir = AppendHomeDirIfPathRelative(datadir);\n";
+	    }
 	} else {
 	    if ($convtype[$i] eq "double *") {
                 #comma separated list expected
 		@paramlist = split(/,/, $value[$i]);
 		$length = $#paramlist+1;
 		print cppfile "  $param[$i] = new double\[$length\];\n";
@@ @@ -130,19 +133,12 @@ for ($i=0;$i<$lines;$i++) { @@
+	}
+    }
+}
 print cppfile <<END_HEADER3;
   // reassign datadir outside the loop
   QDir dataDir(datadir);
   if (dataDir.isRelative()){
     QStringList path;
     path << QDir::homePath() << dataDir.dirName();
     datadir = strdup((char *) path.join("/").toStdString().c_str());
+  }
+}
 Parameter::~Parameter() {
 // destruct parameter object
 // free string parameter
@@ @@ -187,12 +183,15 @@ for ($i=0;$i<$lines;$i++) { @@
     if ($convtype[$i] eq "double *") {
 	@paramlist = split(/,/,$value[$i]);
 	$length = $#paramlist+1;
 	print cppfile "  $param[$i] = $funname{$convtype[$i]}(fp, \"$param[$i]\", $length, true);\n";
     } else {
 	print cppfile "  $param[$i] = $funname{$convtype[$i]}(fp, \"$param[$i]\", $value[$i], true);\n";
 	if ($param[$i] eq "datadir") {
 	    print cppfile "  datadir = AppendHomeDirIfPathRelative(datadir);\n";
+	}
+    }
     if ($type[$i] eq "directory") {
 	print cppfile "  if (strcmp($param[$i], \".\"))\n";
 	print cppfile "    MakeDir($param[$i]);\n";
+    }
+}
@@ @@ -227,17 +226,27 @@ for ($i=0;$i<$lines;$i++) { @@
+	}
 	print cppfile "<< $param[$i]\[$#paramlist\] << endl;\n";
     } else {
 	if ($convtype[$i] eq "bool") {
 	    print cppfile "  os << \" $param[$i] = \" << sbool($param[$i]) << endl;\n";
 	} else {
 	    if ($convtype[$i] eq "char *") {
 		print cppfile "\n  if ($param[$i]) \n";
 		print cppfile "  ";
 	    if (($convtype[$i] eq "char *") and ($param[$i] eq "datadir")) {
                 print cppfile "  if (datadir) {
                                      QDir dataDir = QDir::home().relativeFilePath(datadir);
                                      os << \" datadir = \" << dataDir.dirName().toStdString() << endl;
+                                 }
                                  else {
                                      os << \"datadir = .\" << endl;
                                  }\n";
 	    } else {
 		if ($convtype[$i] eq "char *") {
 		    print cppfile "\n  if ($param[$i]) \n";
+		}
 		print cppfile "  os << \" $param[$i] = \" << $param[$i] << endl;\n";
+	    }
 	    print cppfile "  os << \" $param[$i] = \" << $param[$i] << endl;\n";
+	}
+    }
+}
 print cppfile "}\n";
@@ @@ -269,17 +278,23 @@ for ($i=0;$i<$lines;$i++) { @@
 	next;
     } else {
 	print cppfile "  ostringstream text;\n";
 	if ($convtype[$i] eq "bool") {
 	    print cppfile "text << sbool($param[$i]);\n";
 	} else {
 	    if ($convtype[$i] eq "char *") {
 		print cppfile "\n  if ($param[$i]) \n";
 		print cppfile "  ";
 	    if (($convtype[$i] eq "char *") and ($param[$i] eq "datadir")) {
                 print cppfile "\n  if ($param[$i]) {
                                      QDir dataDir = QDir::home().relativeFilePath(datadir);
                                      text << dataDir.dirName().toStdString();
                                    }\n";
 	    } else {
 		if ($convtype[$i] eq "char *") {
 		    print cppfile "\n  if ($param[$i]) \n";
+		}
 		print cppfile "    text << $param[$i];\n";
+	    }
 	    print cppfile "  text << $param[$i];\n";
+	}
+    }
     print cppfile "xmlNewProp(xmlpar, BAD_CAST \"val\", BAD_CAST text.str().c_str());\n";
     print cppfile "}\n";
+}
@@ @@ -301,12 +316,15 @@ for ($i=0;$i<$lines;$i++) { @@
 	if ($convtype[$i] eq "bool") {
 	    print cppfile "$param[$i] = strtobool(valc);\n";
 	} else {
 	    if ($convtype[$i] eq "char *") {
 		print cppfile "  if ($param[$i]) { free($param[$i]); }\n";
 		print cppfile "  $param[$i]=strdup(valc);\n";
 		if ($param[$i] eq "datadir") {
 		    print cppfile "  datadir = AppendHomeDirIfPathRelative(datadir);\n";
+		}
 	    } else {
 		if ($convtype[$i] eq "int") {
 		    print cppfile "  $param[$i] = standardlocale.toInt(valc, &ok);\n";
 		    print cppfile "  if (!ok) { MyWarning::error(\"Read error: cannot convert string \\\"%s\\\" to integer while reading parameter '$param[$i]' from XML file.\",valc); }\n";
 		    # print cppfile "  $param[$i] = (int)strtol(valc, 0, 10);\n";
 		} else {
@@ @@ -335,25 +353,12 @@ for ($i=0;$i<$lines;$i++) { @@
 	print cppfile "     $param[$i]\[i++\]=*(v++);\n";
 	print cppfile "  }\n";
 	print cppfile "}\n";
+    }
+}
 print cppfile <<END_DATADIR;
 // reassign datadir outside the loop
 if (!strcmp(namec, "datadir")) {
   if (datadir) { free(datadir); }
   QDir dataDir(datadir);
   if (dataDir.isRelative()){
     QStringList path;
     path << QDir::homePath() << dataDir.dirName();
     datadir = strdup((char *) path.join("/").toStdString().c_str());
+  }
+ }
 END_DATADIR
 print cppfile "}\n";
 print cppfile <<END_TRAILER;
 ostream &operator<<(ostream &os, Parameter &p) {
     p.Write(os);

0 comments (0 inline, 0 general)