Merge remote-tracking branch 'origin/issue181' into epec-kernel

Conflicts:
	src/MainWindow.h
	src/ModuleCache.cc
	src/mainwin.cc
	src/module.cc
	src/module.h
	src/parsersettings.cc
	testdata/modulecache-tests/cascade.sh
	testdata/modulecache-tests/cascade2.sh

1 files changed, 16 insertions, 4 deletions

diff --git a/src/MainWindow.h b/src/MainWindow.h
index 1dcffeb..79e2080 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -28,6 +28,7 @@ public:
 
 	QTimer *autoReloadTimer;
 	std::string autoReloadId;
+	QTimer *waitAfterReloadTimer;
 
 	ModuleContext top_ctx;
 	FileModule *root_module;      // Result of parsing
@@ -76,8 +77,8 @@ private:
 	void refreshDocument();
 	void updateTemporalVariables();
 	bool fileChangedOnDisk();
-	bool compileTopLevelDocument(bool reload);
-	bool compile(bool reload, bool procevents);
+	void compileTopLevelDocument();
+	void compile(bool reload, bool forcedone = false);
 	void compileCSG(bool procevents);
 	bool maybeSave();
 	bool checkEditorModified();
@@ -102,6 +103,10 @@ private slots:
 	void actionReload();
 	void actionShowLibraryFolder();
 
+	void instantiateRoot();
+	void compileDone(bool didchange);
+	void compileEnded();
+
 private slots:
 	void pasteViewportTranslation();
 	void pasteViewportRotation();
@@ -109,10 +114,13 @@ private slots:
 	void preferences();
 
 private slots:
-	void actionCompile();
+	void actionRenderCSG();
+	void csgRender();
+	void csgReloadRender();
 #ifdef ENABLE_CGAL
 	void actionRenderCGAL();
 	void actionRenderCGALDone(class CGAL_Nef_polyhedron *);
+	void cgalRender();
 #endif
 	void actionDisplayAST();
 	void actionDisplayCSGTree();
@@ -131,6 +139,7 @@ public:
 	void clearCurrentOutput();
 
 public slots:
+	void actionReloadRenderCSG();
 #ifdef ENABLE_OPENCSG
 	void viewModeOpenCSG();
 #endif
@@ -163,13 +172,16 @@ public slots:
 	void helpManual();
 	void helpLibrary();
 	void quit();
-	void actionReloadCompile();
 	void checkAutoReload();
+	void waitAfterReload();
 	void autoReloadSet(bool);
 
 private:
 	static void report_func(const class AbstractNode*, void *vp, int mark);
 
+	char const * afterCompileSlot;
+	bool procevents;
+	
 	class ProgressWidget *progresswidget;
 	class CGALWorker *cgalworker;
 	QMutex consolemutex;