Merge lp:~motuscience/ubuntu/karmic/k3dsurf/version0.6.2.4 into lp:ubuntu/karmic/k3dsurf

[Scott Howard]

[James Westby (james-w)]

Hi,

How did you merge the new upstream in to bzr? I'm interested
in learning how different people approach this.

Thanks,

James

[Scott Howard (showard314)]

Sure - I've been working with gnome-power-manager which used to have a
very different way maintaining that package (we keep only the debian
file in ~gnome-power-manager-team's bzr branch), so I actually just
kept the debian directory and replaced the rest. Here's my reasoning
and steps:

1) For this package I just compared our bzr branch to the upstream
source, saw that the only difference was the debian directory, so I
deleted everything except for debian/ then extracted the upstream
source into the folder. (This is so all the bzr functionality was
maintained).
2) ran "bzr add -a" which just logged that the Makefile was moved
3) "dch -i" for the new version
4) "bzr bd --builder pbuilder" (tested that it built, installed, ran)
5) "debcommit"
6) bzr push

I've read on the mailing list that Ubuntu wants to go to bzr merges
instead of debdiffs, should I be doing bzr merges like this? Have you
found any interesting/better ways?

I'm applying for contributing developer:
https://wiki.ubuntu.com/ScottHoward/ContributingDeveloperApplication
If you have the time, could you put a testimonial for this package? Thanks!

[James Westby (james-w)]

> Sure - I've been working with gnome-power-manager which used to have a
> very different way maintaining that package (we keep only the debian
> file in ~gnome-power-manager-team's bzr branch), so I actually just
> kept the debian directory and replaced the rest. Here's my reasoning
> and steps:
>
> 1) For this package I just compared our bzr branch to the upstream
> source, saw that the only difference was the debian directory, so I
> deleted everything except for debian/ then extracted the upstream
> source into the folder. (This is so all the bzr functionality was
> maintained).
> 2) ran "bzr add -a" which just logged that the Makefile was moved
> 3) "dch -i" for the new version
> 4) "bzr bd --builder pbuilder" (tested that it built, installed, ran)
> 5) "debcommit"
> 6) bzr push
>
> I've read on the mailing list that Ubuntu wants to go to bzr merges
> instead of debdiffs, should I be doing bzr merges like this? Have you
> found any interesting/better ways?

Check out "bzr merge-upstream"

  bzr merge-upstream http://.../new-version.tar.gz --version 0.6.2.4

would have automated the first three steps for you and more.

We're planning to add "uscan" integration, so that you don't even have
to give the URL and version number at some point.

> I'm applying for contributing developer:
> https://wiki.ubuntu.com/ScottHoward/ContributingDeveloperApplication
> If you have the time, could you put a testimonial for this package? Thanks!

Without looking I don't remember other things I have sponsored for you,
and one upload, while valued, isn't really enough to comment on an application.
If I am misremembering then please point me to the other uploads and I will
look again. Otherwise keep submitting changes and I'll soon be in a
position to comment :-)

Thanks,

James

[James Westby (james-w)]

Merged, thanks.

Could you please file a bug in Debian requesting the new version
and pointing to your updated package?

Thanks,

James

review: Approve

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2009-09-08 00:51:00 +0000
@@ -0,0 +1,51 @@
+#############################################################################
+# Makefile for building: k3dsurf
+# Generated by qmake (1.07a) (Qt 3.3.8b) on: Sun May 24 15:52:01 2009
+# Project:  k3dsurf.pro
+# Template: subdirs
+# Command: $(QMAKE) -o Makefile k3dsurf.pro
+#############################################################################
+
+MAKEFILE =	Makefile
+QMAKE    =	qmake
+DEL_FILE =    rm -f
+CHK_DIR_EXISTS= test -d
+MKDIR    = mkdir -p
+INSTALL_FILE= 
+INSTALL_DIR = 
+SUBTARGETS =	 \
+		sub-src
+
+first: all
+
+all: Makefile $(SUBTARGETS)
+
+src/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "src" || $(MKDIR) "src"
+	cd src && $(QMAKE) src.pro -o $(MAKEFILE)
+sub-src: src/$(MAKEFILE) FORCE
+	cd src && $(MAKE) -f $(MAKEFILE)
+
+Makefile: k3dsurf.pro  /usr/share/qt3/mkspecs/default/qmake.conf 
+	$(QMAKE) -o Makefile k3dsurf.pro
+qmake: qmake_all
+	@$(QMAKE) -o Makefile k3dsurf.pro
+
+all: $(SUBTARGETS)
+qmake_all: src/$(MAKEFILE)
+	 ( [ -d src ] && cd src ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
+	 ( [ -d src ] && cd src ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+uninstall_subdirs: qmake_all FORCE
+	 ( [ -d src ] && cd src ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+install_subdirs: qmake_all FORCE
+	 ( [ -d src ] && cd src ; $(MAKE) -f $(MAKEFILE) install; ) || true
+distclean: qmake_all FORCE
+	 ( [ -d src ] && cd src ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+
+install:  install_subdirs
+
+uninstall:  uninstall_subdirs
+
+FORCE:
+

=== added file 'bin/k3dsurf'
Binary files bin/k3dsurf	1970-01-01 00:00:00 +0000 and bin/k3dsurf	2009-09-08 00:51:00 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2008-03-02 15:46:02 +0000
+++ debian/changelog	2009-09-08 00:51:00 +0000
@@ -1,3 +1,11 @@
+k3dsurf (0.6.2.4-0ubuntu1) karmic; urgency=low
+
+  * New upstream release includes fix for crash on startup (LP: #295140)
+  * debian/control
+    - MOTU maintainers
+
+ -- Scott Howard <[e-mail]>  Mon, 07 Sep 2009 19:47:08 -0400
+
 k3dsurf (0.6.2-3) unstable; urgency=low
 
   * Brown paper bag bug: Use “configure” and not “configure-stamp” in the

=== modified file 'debian/control'
--- debian/control	2007-12-26 16:22:49 +0000
+++ debian/control	2009-09-08 00:51:00 +0000
@@ -1,7 +1,8 @@
 Source: k3dsurf
 Section: kde
 Priority: optional
-Maintainer: Cyril Brulebois <[e-mail]>
+Maintainer: Ubuntu MOTU Developers <[e-mail]>
+XSBC-Original-Maintainer: Cyril Brulebois <[e-mail]>
 Build-Depends: debhelper (>= 5), libqt3-mt-dev, imagemagick, quilt
 Standards-Version: 3.7.3
 Homepage: http://k3dsurf.sourceforge.net/

=== added file 'src/Makefile'
--- src/Makefile	1970-01-01 00:00:00 +0000
+++ src/Makefile	2009-09-08 00:51:00 +0000
@@ -0,0 +1,557 @@
+#############################################################################
+# Makefile for building: ../bin/k3dsurf
+# Generated by qmake (1.07a) (Qt 3.3.8b) on: Sun May 24 15:52:07 2009
+# Project:  src.pro
+# Template: app
+# Command: $(QMAKE) -o Makefile src.pro
+#############################################################################
+
+####### Compiler, tools and options
+
+CC       = gcc
+CXX      = g++
+LEX      = flex
+YACC     = yacc
+CFLAGS   = -pipe -g -Wall -W -O2 -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
+CXXFLAGS = -pipe -g -Wall -W -O2 -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
+LEXFLAGS = 
+YACCFLAGS= -d
+INCPATH  = -I/usr/share/qt3/mkspecs/default -I. -I/usr/include/qt3 -I/usr/X11R6/include -I/usr/X11R6/include
+LINK     = g++
+LFLAGS   = 
+LIBS     = $(SUBLIBS) -L/usr/share/qt3/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm -lpthread
+AR       = ar cqs
+RANLIB   = 
+MOC      = /usr/share/qt3/bin/moc
+UIC      = /usr/share/qt3/bin/uic
+QMAKE    = qmake
+TAR      = tar -cf
+GZIP     = gzip -9f
+COPY     = cp -f
+COPY_FILE= $(COPY)
+COPY_DIR = $(COPY) -r
+INSTALL_FILE= $(COPY_FILE)
+INSTALL_DIR = $(COPY_DIR)
+DEL_FILE = rm -f
+SYMLINK  = ln -sf
+DEL_DIR  = rmdir
+MOVE     = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR    = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR = ./
+
+####### Files
+
+HEADERS = k3dsurf.ui.h \
+		newwindow2.ui.h \
+		IsoWindow.ui.h \
+		GlWindow.ui.h \
+		drawingoptions.ui.h \
+		coloroptions.ui.h \
+		presentation.ui.h \
+		panel.h \
+		Matrix3D.h \
+		IsoMatrix3D.h \
+		Model3D.h \
+		fparser/fparser.h \
+		edit.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		videoplayer.h \
+		nd/Matrix6D.h \
+		Iso3D.h \
+		IsoPanel.h \
+		glviewer.h \
+		GL3D.h \
+		lib.h \
+		ParisoMathObject.h \
+		menubar.h \
+		PovConfig.h
+SOURCES = main.cpp \
+		panel.cpp \
+		Matrix3D.cpp \
+		IsoMatrix3D.cpp \
+		Model3D.cpp \
+		fparser/fparser.cpp \
+		edit.cpp \
+		Matrix4D.cpp \
+		nd/Matrix5D.cpp \
+		videoplayer.cpp \
+		nd/Matrix6D.cpp \
+		Iso3D.cpp \
+		IsoPanel.cpp \
+		glviewer.cpp \
+		GL3D.cpp \
+		lib.cpp \
+		ParisoMathObject.cpp \
+		menubar.cpp \
+		PovConfig.cpp
+OBJECTS = main.o \
+		panel.o \
+		Matrix3D.o \
+		IsoMatrix3D.o \
+		Model3D.o \
+		fparser.o \
+		edit.o \
+		Matrix4D.o \
+		Matrix5D.o \
+		videoplayer.o \
+		Matrix6D.o \
+		Iso3D.o \
+		IsoPanel.o \
+		glviewer.o \
+		GL3D.o \
+		lib.o \
+		ParisoMathObject.o \
+		menubar.o \
+		PovConfig.o \
+		k3dsurf.o \
+		newwindow2.o \
+		IsoWindow.o \
+		GlWindow.o \
+		drawingoptions.o \
+		coloroptions.o \
+		presentation.o
+FORMS = k3dsurf.ui \
+		newwindow2.ui \
+		IsoWindow.ui \
+		GlWindow.ui \
+		drawingoptions.ui \
+		coloroptions.ui \
+		presentation.ui
+UICDECLS = k3dsurf.h \
+		newwindow2.h \
+		IsoWindow.h \
+		GlWindow.h \
+		drawingoptions.h \
+		coloroptions.h \
+		presentation.h
+UICIMPLS = k3dsurf.cpp \
+		newwindow2.cpp \
+		IsoWindow.cpp \
+		GlWindow.cpp \
+		drawingoptions.cpp \
+		coloroptions.cpp \
+		presentation.cpp
+SRCMOC   = moc_panel.cpp \
+		moc_edit.cpp \
+		moc_videoplayer.cpp \
+		moc_IsoPanel.cpp \
+		moc_menubar.cpp \
+		moc_PovConfig.cpp \
+		moc_k3dsurf.cpp \
+		moc_newwindow2.cpp \
+		moc_IsoWindow.cpp \
+		moc_GlWindow.cpp \
+		moc_drawingoptions.cpp \
+		moc_coloroptions.cpp \
+		moc_presentation.cpp
+OBJMOC = moc_panel.o \
+		moc_edit.o \
+		moc_videoplayer.o \
+		moc_IsoPanel.o \
+		moc_menubar.o \
+		moc_PovConfig.o \
+		moc_k3dsurf.o \
+		moc_newwindow2.o \
+		moc_IsoWindow.o \
+		moc_GlWindow.o \
+		moc_drawingoptions.o \
+		moc_coloroptions.o \
+		moc_presentation.o
+DIST	   = src.pro
+QMAKE_TARGET = k3dsurf
+DESTDIR  = ../bin/
+TARGET   = ../bin/k3dsurf
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .c .o .cpp .cc .cxx .C
+
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
+.cc.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
+.cxx.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
+.C.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC)  
+	test -d ../bin/ || mkdir -p ../bin/
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(OBJCOMP) $(LIBS)
+
+mocables: $(SRCMOC)
+uicables: $(UICDECLS) $(UICIMPLS)
+
+$(MOC): 
+	( cd $(QTDIR)/src/moc && $(MAKE) )
+
+Makefile: src.pro  /usr/share/qt3/mkspecs/default/qmake.conf /usr/share/qt3/lib/libqt-mt.prl
+	$(QMAKE) -o Makefile src.pro
+qmake: 
+	@$(QMAKE) -o Makefile src.pro
+
+dist: 
+	@mkdir -p .tmp/k3dsurf && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/k3dsurf/ && $(COPY_FILE) --parents k3dsurf.ui.h newwindow2.ui.h IsoWindow.ui.h GlWindow.ui.h drawingoptions.ui.h coloroptions.ui.h presentation.ui.h .tmp/k3dsurf/ && ( cd `dirname .tmp/k3dsurf` && $(TAR) k3dsurf.tar k3dsurf && $(GZIP) k3dsurf.tar ) && $(MOVE) `dirname .tmp/k3dsurf`/k3dsurf.tar.gz . && $(DEL_FILE) -r .tmp/k3dsurf
+
+mocclean:
+	-$(DEL_FILE) $(OBJMOC)
+	-$(DEL_FILE) $(SRCMOC)
+
+uiclean:
+	-$(DEL_FILE) $(UICIMPLS) $(UICDECLS)
+
+yaccclean:
+lexclean:
+clean: mocclean uiclean
+	-$(DEL_FILE) $(OBJECTS)
+	-$(DEL_FILE) *~ core *.core
+
+
+####### Sub-libraries
+
+distclean: clean
+	-$(DEL_FILE) ../bin/$(TARGET) $(TARGET)
+
+
+FORCE:
+
+####### Compile
+
+main.o: main.cpp menubar.h \
+		glviewer.h \
+		edit.h \
+		k3dsurf.h \
+		PovConfig.h \
+		coloroptions.h \
+		drawingoptions.h \
+		presentation.h \
+		GlWindow.h \
+		panel.h \
+		IsoPanel.h \
+		Model3D.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h \
+		Iso3D.h \
+		IsoMatrix3D.h
+
+panel.o: panel.cpp panel.h \
+		Model3D.h \
+		edit.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h
+
+Matrix3D.o: Matrix3D.cpp Matrix3D.h
+
+IsoMatrix3D.o: IsoMatrix3D.cpp IsoMatrix3D.h
+
+Model3D.o: Model3D.cpp Model3D.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h
+
+fparser.o: fparser/fparser.cpp fparser/fparser.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o fparser.o fparser/fparser.cpp
+
+edit.o: edit.cpp edit.h \
+		filesave.xpm \
+		fileopen.xpm
+
+Matrix4D.o: Matrix4D.cpp Matrix4D.h
+
+Matrix5D.o: nd/Matrix5D.cpp nd/Matrix5D.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Matrix5D.o nd/Matrix5D.cpp
+
+videoplayer.o: videoplayer.cpp videoplayer.h
+
+Matrix6D.o: nd/Matrix6D.cpp nd/Matrix6D.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Matrix6D.o nd/Matrix6D.cpp
+
+Iso3D.o: Iso3D.cpp Iso3D.h \
+		IsoMatrix3D.h \
+		fparser/fparser.h \
+		edit.h
+
+IsoPanel.o: IsoPanel.cpp IsoPanel.h \
+		Iso3D.h \
+		edit.h \
+		IsoMatrix3D.h \
+		fparser/fparser.h
+
+glviewer.o: glviewer.cpp glviewer.h \
+		edit.h
+
+GL3D.o: GL3D.cpp 
+
+lib.o: lib.cpp k3dsurf.h
+
+ParisoMathObject.o: ParisoMathObject.cpp ParisoMathObject.h
+
+menubar.o: menubar.cpp menubar.h \
+		glviewer.h \
+		filesave.xpm \
+		fileopen.xpm \
+		gedit.xpm \
+		gear.xpm \
+		snapshot.xpm \
+		pov.xpm \
+		tools.xpm \
+		graphics.xpm \
+		edit.h \
+		k3dsurf.h \
+		PovConfig.h \
+		coloroptions.h \
+		drawingoptions.h \
+		presentation.h \
+		GlWindow.h \
+		panel.h \
+		IsoPanel.h \
+		Model3D.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h \
+		Iso3D.h \
+		IsoMatrix3D.h
+
+PovConfig.o: PovConfig.cpp PovConfig.h \
+		k3dsurf.h
+
+k3dsurf.h: k3dsurf.ui panel.h \
+		IsoPanel.h \
+		glviewer.h \
+		openglwidget.h \
+		connectwidget.h \
+		isowidget.h \
+		Model3D.h \
+		edit.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h \
+		Iso3D.h \
+		IsoMatrix3D.h
+	$(UIC) k3dsurf.ui -o k3dsurf.h
+
+k3dsurf.cpp: k3dsurf.h k3dsurf.ui k3dsurf.ui.h panel.h \
+		IsoPanel.h \
+		glviewer.h \
+		openglwidget.h \
+		connectwidget.h \
+		isowidget.h \
+		Model3D.h \
+		edit.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h \
+		Iso3D.h \
+		IsoMatrix3D.h
+	$(UIC) k3dsurf.ui -i k3dsurf.h -o k3dsurf.cpp
+
+newwindow2.h: newwindow2.ui panel.h \
+		connectwidget.h \
+		Model3D.h \
+		edit.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h
+	$(UIC) newwindow2.ui -o newwindow2.h
+
+newwindow2.cpp: newwindow2.h newwindow2.ui newwindow2.ui.h panel.h \
+		connectwidget.h \
+		Model3D.h \
+		edit.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h
+	$(UIC) newwindow2.ui -i newwindow2.h -o newwindow2.cpp
+
+IsoWindow.h: IsoWindow.ui IsoPanel.h \
+		isowidget.h \
+		Iso3D.h \
+		edit.h \
+		IsoMatrix3D.h \
+		fparser/fparser.h
+	$(UIC) IsoWindow.ui -o IsoWindow.h
+
+IsoWindow.cpp: IsoWindow.h IsoWindow.ui IsoWindow.ui.h IsoPanel.h \
+		isowidget.h \
+		Iso3D.h \
+		edit.h \
+		IsoMatrix3D.h \
+		fparser/fparser.h
+	$(UIC) IsoWindow.ui -i IsoWindow.h -o IsoWindow.cpp
+
+GlWindow.h: GlWindow.ui glviewer.h \
+		openglwidget.h
+	$(UIC) GlWindow.ui -o GlWindow.h
+
+GlWindow.cpp: GlWindow.h GlWindow.ui GlWindow.ui.h glviewer.h \
+		openglwidget.h
+	$(UIC) GlWindow.ui -i GlWindow.h -o GlWindow.cpp
+
+drawingoptions.h: drawingoptions.ui 
+	$(UIC) drawingoptions.ui -o drawingoptions.h
+
+drawingoptions.cpp: drawingoptions.h drawingoptions.ui drawingoptions.ui.h 
+	$(UIC) drawingoptions.ui -i drawingoptions.h -o drawingoptions.cpp
+
+coloroptions.h: coloroptions.ui 
+	$(UIC) coloroptions.ui -o coloroptions.h
+
+coloroptions.cpp: coloroptions.h coloroptions.ui coloroptions.ui.h 
+	$(UIC) coloroptions.ui -i coloroptions.h -o coloroptions.cpp
+
+presentation.h: presentation.ui 
+	$(UIC) presentation.ui -o presentation.h
+
+presentation.cpp: presentation.h presentation.ui presentation.ui.h 
+	$(UIC) presentation.ui -i presentation.h -o presentation.cpp
+
+k3dsurf.o: k3dsurf.cpp k3dsurf.ui.h \
+		k3dsurf.h
+
+newwindow2.o: newwindow2.cpp newwindow2.ui.h \
+		newwindow2.h
+
+IsoWindow.o: IsoWindow.cpp IsoWindow.ui.h \
+		IsoWindow.h
+
+GlWindow.o: GlWindow.cpp GlWindow.ui.h \
+		GlWindow.h
+
+drawingoptions.o: drawingoptions.cpp drawingoptions.ui.h \
+		drawingoptions.h
+
+coloroptions.o: coloroptions.cpp coloroptions.h
+
+presentation.o: presentation.cpp presentation.ui.h \
+		presentation.h
+
+moc_panel.o: moc_panel.cpp  panel.h Model3D.h \
+		edit.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h
+
+moc_edit.o: moc_edit.cpp  edit.h 
+
+moc_videoplayer.o: moc_videoplayer.cpp  videoplayer.h 
+
+moc_IsoPanel.o: moc_IsoPanel.cpp  IsoPanel.h Iso3D.h \
+		edit.h \
+		IsoMatrix3D.h \
+		fparser/fparser.h
+
+moc_menubar.o: moc_menubar.cpp  menubar.h edit.h \
+		k3dsurf.h \
+		PovConfig.h \
+		coloroptions.h \
+		drawingoptions.h \
+		presentation.h \
+		GlWindow.h \
+		panel.h \
+		IsoPanel.h \
+		Model3D.h \
+		Matrix3D.h \
+		Matrix4D.h \
+		nd/Matrix5D.h \
+		nd/Matrix6D.h \
+		fparser/fparser.h \
+		Iso3D.h \
+		IsoMatrix3D.h
+
+moc_PovConfig.o: moc_PovConfig.cpp  PovConfig.h k3dsurf.h
+
+moc_k3dsurf.o: moc_k3dsurf.cpp  k3dsurf.h 
+
+moc_newwindow2.o: moc_newwindow2.cpp  newwindow2.h 
+
+moc_IsoWindow.o: moc_IsoWindow.cpp  IsoWindow.h 
+
+moc_GlWindow.o: moc_GlWindow.cpp  GlWindow.h 
+
+moc_drawingoptions.o: moc_drawingoptions.cpp  drawingoptions.h 
+
+moc_coloroptions.o: moc_coloroptions.cpp  coloroptions.h 
+
+moc_presentation.o: moc_presentation.cpp  presentation.h 
+
+moc_panel.cpp: $(MOC) panel.h
+	$(MOC) panel.h -o moc_panel.cpp
+
+moc_edit.cpp: $(MOC) edit.h
+	$(MOC) edit.h -o moc_edit.cpp
+
+moc_videoplayer.cpp: $(MOC) videoplayer.h
+	$(MOC) videoplayer.h -o moc_videoplayer.cpp
+
+moc_IsoPanel.cpp: $(MOC) IsoPanel.h
+	$(MOC) IsoPanel.h -o moc_IsoPanel.cpp
+
+moc_menubar.cpp: $(MOC) menubar.h
+	$(MOC) menubar.h -o moc_menubar.cpp
+
+moc_PovConfig.cpp: $(MOC) PovConfig.h
+	$(MOC) PovConfig.h -o moc_PovConfig.cpp
+
+moc_k3dsurf.cpp: $(MOC) k3dsurf.h
+	$(MOC) k3dsurf.h -o moc_k3dsurf.cpp
+
+moc_newwindow2.cpp: $(MOC) newwindow2.h
+	$(MOC) newwindow2.h -o moc_newwindow2.cpp
+
+moc_IsoWindow.cpp: $(MOC) IsoWindow.h
+	$(MOC) IsoWindow.h -o moc_IsoWindow.cpp
+
+moc_GlWindow.cpp: $(MOC) GlWindow.h
+	$(MOC) GlWindow.h -o moc_GlWindow.cpp
+
+moc_drawingoptions.cpp: $(MOC) drawingoptions.h
+	$(MOC) drawingoptions.h -o moc_drawingoptions.cpp
+
+moc_coloroptions.cpp: $(MOC) coloroptions.h
+	$(MOC) coloroptions.h -o moc_coloroptions.cpp
+
+moc_presentation.cpp: $(MOC) presentation.h
+	$(MOC) presentation.h -o moc_presentation.cpp
+
+####### Install
+
+install:  
+
+uninstall:  
+

=== modified file 'src/PovConfig.cpp'
--- src/PovConfig.cpp	2007-10-13 10:57:18 +0000
+++ src/PovConfig.cpp	2009-09-08 00:51:00 +0000
@@ -18,6 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 #include "PovConfig.h"
+#include <cstdlib>
 
      static QString        xterm="", 
             Width="200", Height="200", 
@@ -675,7 +676,7 @@
      "+"+SC"+Start_ColumnEdit+" "+"+EC"+End_ColumnEdit+" \
      "+Pause_When_Done+" "+"+X"+Test_Abort_CountEdit3+"\
      "+OutPutBuffer+" "+IncludeHeaderFile+" "+Continue+"  &";
-    result = system(execute_commande);
+    result = std::system(execute_commande);
    if(result != 1) std::cout << "Ok \n";
 
 };

=== modified file 'src/glviewer.cpp'
--- src/glviewer.cpp	2007-10-13 10:57:18 +0000
+++ src/glviewer.cpp	2009-09-08 00:51:00 +0000
@@ -730,7 +730,7 @@
     VertexNumber      = 0;
 
     NBGlWindow++;
-    if(NBGlWindow == 1) {
+/*    if(NBGlWindow == 1) {
    GLfloat ambient[] = { .0, .0, .0, 1.0 };
    GLfloat diffuse[] = { 1.0, 1.0, 1.0, 1.0 };
    GLfloat lmodel_ambient[] = { 0.2, 0.2, 0.2, 1.0 };
@@ -760,7 +760,145 @@
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
     glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1.width(), tex1.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, tex1.bits() );
    // Font initialisation:
-    InitFont();
+    InitFont();*/
+}
+
+///++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void OpenGlWidget::initializeGL()
+{ int i, j, k, l, mn, nbpl;
+  GLuint * PolyIndices_local_tmp;
+  GLuint * PolyIndices_localBorderCND_tmp;
+  GLuint * PolyIndices_localVerifyCND_tmp;
+  GLuint * PolyIndices_localNotVerifyCND_tmp;
+
+  boxok();
+  glInterleavedArrays (GL_N3F_V3F, 0, LocalScene.ArrayNorVer_localPt);
+
+if(LocalScene.condition == 1){
+    j = k = l = 0;
+    nbpl = (int)(NbPolygnNbVertex[0]/3);
+      //Count the number of different poly types:
+    for(i = 0; i < nbpl; i++){
+    mn = TypeIsoSurfaceTriangleListeCND[i];
+         if(mn == 1) j+=3;
+    else if(mn == 0) k+=3;
+    else if(mn == 4) l+=3;
+    }
+    // Save the result:
+    LocalScene.PolyNumberBorderCND = l;
+    LocalScene.PolyNumberVerifyCND = k;
+    LocalScene.PolyNumberNotVerifyCND = j;
+
+// No we start treating triangles: 
+PolyIndices_local_tmp = new GLuint [3*MaximumNumberTriangles];
+PolyIndices_localBorderCND_tmp = &PolyIndices_local_tmp[0];
+PolyIndices_localVerifyCND_tmp = &PolyIndices_local_tmp[l];
+PolyIndices_localNotVerifyCND_tmp = &PolyIndices_local_tmp[l+k];
+// Restart treating polygons but this time with saving them in the appropriate location:
+    j = k = l = 0;
+    for(i = 0; i < nbpl; i++){
+    mn = TypeIsoSurfaceTriangleListeCND[i];
+    if(mn == 1) {
+    PolyIndices_localNotVerifyCND_tmp[j  ] = LocalScene.PolyIndices_localPt[3*i  ];
+    PolyIndices_localNotVerifyCND_tmp[j+1] = LocalScene.PolyIndices_localPt[3*i+1];
+    PolyIndices_localNotVerifyCND_tmp[j+2] = LocalScene.PolyIndices_localPt[3*i+2];
+    j += 3;
+    }
+    else if(mn == 0) {
+    PolyIndices_localVerifyCND_tmp[k  ] = LocalScene.PolyIndices_localPt[3*i  ];
+    PolyIndices_localVerifyCND_tmp[k+1] = LocalScene.PolyIndices_localPt[3*i+1];
+    PolyIndices_localVerifyCND_tmp[k+2] = LocalScene.PolyIndices_localPt[3*i+2];
+    k += 3;
+    }
+    else if(mn == 4) {
+    PolyIndices_localBorderCND_tmp[l  ] = LocalScene.PolyIndices_localPt[3*i  ];
+    PolyIndices_localBorderCND_tmp[l+1] = LocalScene.PolyIndices_localPt[3*i+1];
+    PolyIndices_localBorderCND_tmp[l+2] = LocalScene.PolyIndices_localPt[3*i+2];
+    l += 3;
+    }
+    }
+
+memcpy(LocalScene.PolyIndices_localPt,
+       PolyIndices_local_tmp,
+       (l+k+j)*sizeof(GLuint));
+LocalScene.PolyIndices_localBorderCND = &LocalScene.PolyIndices_localPt[0];
+LocalScene.PolyIndices_localVerifyCND = &LocalScene.PolyIndices_localPt[l];
+LocalScene.PolyIndices_localNotVerifyCND = &LocalScene.PolyIndices_localPt[l+k];
+delete(PolyIndices_local_tmp);
+    }
+    InitGlParameters();
+    IndiceMorphFrame =0; /// To Initialise the morph effect
+
+}
+
+///+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void OpenGlWidget::boxok(){
+GLfloat minx= 999999999, miny= 999999999, minz= 999999999,
+        maxx=-999999999, maxy=-999999999, maxz=-999999999;
+int i, nbvertex;
+(LocalScene.typedrawing ==1) ? nbvertex = (int)NbPolygnNbVertex[0]/3 :
+                               nbvertex = (int)NbPolygnNbVertex[0]/4 ;
+nbvertex = VertexNumber;
+for(i=0; i< VertexNumber/*nbvertex*/; i++) {
+if(minx >LocalScene.ArrayNorVer_localPt[6*i+3]) minx = LocalScene.ArrayNorVer_localPt[6*i+3];
+if(miny >LocalScene.ArrayNorVer_localPt[6*i+4]) miny = LocalScene.ArrayNorVer_localPt[6*i+4];
+if(minz >LocalScene.ArrayNorVer_localPt[6*i+5]) minz = LocalScene.ArrayNorVer_localPt[6*i+5];
+
+if(maxx <LocalScene.ArrayNorVer_localPt[6*i+3]) maxx = LocalScene.ArrayNorVer_localPt[6*i+3];
+if(maxy <LocalScene.ArrayNorVer_localPt[6*i+4]) maxy = LocalScene.ArrayNorVer_localPt[6*i+4];
+if(maxz <LocalScene.ArrayNorVer_localPt[6*i+5]) maxz = LocalScene.ArrayNorVer_localPt[6*i+5];
+}
+
+LocalScene.BoxLimits[0][0] = minx;
+LocalScene.BoxLimits[1][0] = miny;
+LocalScene.BoxLimits[2][0] = minz;
+
+LocalScene.BoxLimits[0][5] = maxx;
+LocalScene.BoxLimits[1][5] = maxy;
+LocalScene.BoxLimits[2][5] = maxz;
+
+glDeleteLists(LocalScene.boxliste, 1);
+LocalScene.boxliste = glGenLists(1);
+ glNewList(LocalScene.boxliste, GL_COMPILE );
+
+  glLineWidth(2);
+   glColor3f (1., 0.0, 0.0);
+   glBegin( GL_LINES );
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
+
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
+
+glColor3f (0.0, 0.0, 1.0);
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
+
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
+
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
+
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
+glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
+   glEnd();
+
+    glLineWidth(0.9);
+   glColor3f (LocalScene.gridcol[0], LocalScene.gridcol[1], LocalScene.gridcol[3]);
+ glEndList();
 }
 
 ///+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1107,73 +1245,6 @@
     InitGlParameters();
 }
 
-///++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-void OpenGlWidget::initializeGL()
-{ int i, j, k, l, mn, nbpl;
-  GLuint * PolyIndices_local_tmp;
-  GLuint * PolyIndices_localBorderCND_tmp;
-  GLuint * PolyIndices_localVerifyCND_tmp;
-  GLuint * PolyIndices_localNotVerifyCND_tmp;
-
-  boxok();
-  glInterleavedArrays (GL_N3F_V3F, 0, LocalScene.ArrayNorVer_localPt);
-
-if(LocalScene.condition == 1){
-    j = k = l = 0;
-    nbpl = (int)(NbPolygnNbVertex[0]/3);
-      //Count the number of different poly types:
-    for(i = 0; i < nbpl; i++){
-    mn = TypeIsoSurfaceTriangleListeCND[i];
-         if(mn == 1) j+=3;
-    else if(mn == 0) k+=3;
-    else if(mn == 4) l+=3;
-    }
-    // Save the result:
-    LocalScene.PolyNumberBorderCND = l;
-    LocalScene.PolyNumberVerifyCND = k;
-    LocalScene.PolyNumberNotVerifyCND = j;
-
-// No we start treating triangles: 
-PolyIndices_local_tmp = new GLuint [3*MaximumNumberTriangles];
-PolyIndices_localBorderCND_tmp = &PolyIndices_local_tmp[0];
-PolyIndices_localVerifyCND_tmp = &PolyIndices_local_tmp[l];
-PolyIndices_localNotVerifyCND_tmp = &PolyIndices_local_tmp[l+k];
-// Restart treating polygons but this time with saving them in the appropriate location:
-    j = k = l = 0;
-    for(i = 0; i < nbpl; i++){
-    mn = TypeIsoSurfaceTriangleListeCND[i];
-    if(mn == 1) {
-    PolyIndices_localNotVerifyCND_tmp[j  ] = LocalScene.PolyIndices_localPt[3*i  ];
-    PolyIndices_localNotVerifyCND_tmp[j+1] = LocalScene.PolyIndices_localPt[3*i+1];
-    PolyIndices_localNotVerifyCND_tmp[j+2] = LocalScene.PolyIndices_localPt[3*i+2];
-    j += 3;
-    }
-    else if(mn == 0) {
-    PolyIndices_localVerifyCND_tmp[k  ] = LocalScene.PolyIndices_localPt[3*i  ];
-    PolyIndices_localVerifyCND_tmp[k+1] = LocalScene.PolyIndices_localPt[3*i+1];
-    PolyIndices_localVerifyCND_tmp[k+2] = LocalScene.PolyIndices_localPt[3*i+2];
-    k += 3;
-    }
-    else if(mn == 4) {
-    PolyIndices_localBorderCND_tmp[l  ] = LocalScene.PolyIndices_localPt[3*i  ];
-    PolyIndices_localBorderCND_tmp[l+1] = LocalScene.PolyIndices_localPt[3*i+1];
-    PolyIndices_localBorderCND_tmp[l+2] = LocalScene.PolyIndices_localPt[3*i+2];
-    l += 3;
-    }
-    }
-
-memcpy(LocalScene.PolyIndices_localPt,
-       PolyIndices_local_tmp,
-       (l+k+j)*sizeof(GLuint));
-LocalScene.PolyIndices_localBorderCND = &LocalScene.PolyIndices_localPt[0];
-LocalScene.PolyIndices_localVerifyCND = &LocalScene.PolyIndices_localPt[l];
-LocalScene.PolyIndices_localNotVerifyCND = &LocalScene.PolyIndices_localPt[l+k];
-delete(PolyIndices_local_tmp);
-    }
-    InitGlParameters();
-    IndiceMorphFrame =0; /// To Initialise the morph effect
-
-}
 
 ///++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void OpenGlWidget::scalcoeff(double ){
@@ -1530,75 +1601,6 @@
 //if(LocalScene.infos == 1)  PrintInfos2(&LocalScene);
  if(LocalScene.infos == 1)  PrintInfos();
 }
-///+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-void OpenGlWidget::boxok(){
-GLfloat minx= 999999999, miny= 999999999, minz= 999999999,
-        maxx=-999999999, maxy=-999999999, maxz=-999999999;
-int i, nbvertex;
-(LocalScene.typedrawing ==1) ? nbvertex = (int)NbPolygnNbVertex[0]/3 :
-                               nbvertex = (int)NbPolygnNbVertex[0]/4 ;
-nbvertex = VertexNumber;
-for(i=0; i< VertexNumber/*nbvertex*/; i++) {
-if(minx >LocalScene.ArrayNorVer_localPt[6*i+3]) minx = LocalScene.ArrayNorVer_localPt[6*i+3];
-if(miny >LocalScene.ArrayNorVer_localPt[6*i+4]) miny = LocalScene.ArrayNorVer_localPt[6*i+4];
-if(minz >LocalScene.ArrayNorVer_localPt[6*i+5]) minz = LocalScene.ArrayNorVer_localPt[6*i+5];
-
-if(maxx <LocalScene.ArrayNorVer_localPt[6*i+3]) maxx = LocalScene.ArrayNorVer_localPt[6*i+3];
-if(maxy <LocalScene.ArrayNorVer_localPt[6*i+4]) maxy = LocalScene.ArrayNorVer_localPt[6*i+4];
-if(maxz <LocalScene.ArrayNorVer_localPt[6*i+5]) maxz = LocalScene.ArrayNorVer_localPt[6*i+5];
-}
-
-LocalScene.BoxLimits[0][0] = minx;
-LocalScene.BoxLimits[1][0] = miny;
-LocalScene.BoxLimits[2][0] = minz;
-
-LocalScene.BoxLimits[0][5] = maxx;
-LocalScene.BoxLimits[1][5] = maxy;
-LocalScene.BoxLimits[2][5] = maxz;
-
-glDeleteLists(LocalScene.boxliste, 1);
-LocalScene.boxliste = glGenLists(1);
- glNewList(LocalScene.boxliste, GL_COMPILE );
-
-  glLineWidth(2);
-   glColor3f (1., 0.0, 0.0);
-   glBegin( GL_LINES );
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
-
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
-
-glColor3f (0.0, 0.0, 1.0);
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
-
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][0], LocalScene.BoxLimits[2][5]);
-
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][5], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
-
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][0]);
-glVertex3f(LocalScene.BoxLimits[0][0], LocalScene.BoxLimits[1][5], LocalScene.BoxLimits[2][5]);
-   glEnd();
-
-    glLineWidth(0.9);
-   glColor3f (LocalScene.gridcol[0], LocalScene.gridcol[1], LocalScene.gridcol[3]);
- glEndList();
-}
 
 ///+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void OpenGlWidget::mouseReleaseEvent( QMouseEvent *){

=== modified file 'src/glviewer.h'
--- src/glviewer.h	2007-10-13 10:57:18 +0000
+++ src/glviewer.h	2009-09-08 00:51:00 +0000
@@ -128,7 +128,7 @@
 
 
 class OpenGlWidget : public QGLWidget, public QThread
-{    Q_OBJECT
+{
 public :
     static int TransparenceVal;
     int colortype, btgauche, btdroit, btmilieu,

=== modified file 'src/main.cpp'
--- src/main.cpp	2007-10-13 10:57:18 +0000
+++ src/main.cpp	2009-09-08 00:51:00 +0000
@@ -45,7 +45,7 @@
 menubar *  newmenu = new menubar(&mainwindow, &a);
 newmenu->constructmenubar();
 // Init Parametric Page:
-mainwindow.ParametricSurfaceProcess();
+//mainwindow.ParametricSurfaceProcess();
 // Init Iso page:
 mainwindow.Initisopage();