SCHNApps: add some slots / import return mapHandler

SCHNApps/Debug/CMakeLists.txt

@@ -38,6 +38,7 @@ SET(SCHNApps_H_OBJECT_FILES
 	${SCHNApps_ROOT_DIR}/include/view.h
 	${SCHNApps_ROOT_DIR}/include/window.h
 	${SCHNApps_ROOT_DIR}/include/mapHandler.h
+	${SCHNApps_ROOT_DIR}/include/plugin.h
 	${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
 	${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h
 	${SCHNApps_ROOT_DIR}/include/dialogs/pluginsDialog.h

SCHNApps/Plugins/importSurface/importSurface.cpp

@@ -15,7 +15,7 @@ bool ImportSurfacePlugin::enable()
 	return true;
 }
 
-void ImportSurfacePlugin::importFromFile(const QString& fileName)
+MapHandlerGen* ImportSurfacePlugin::importFromFile(const QString& fileName)
 {
 	QFileInfo fi(fileName);
 	if(fi.exists())
@@ -43,6 +43,7 @@ void ImportSurfacePlugin::importFromFile(const QString& fileName)
 			mh->updatePrimitives(Algo::Render::GL2::LINES);
 			mh->updatePrimitives(Algo::Render::GL2::TRIANGLES);
 		}
+		return mhg;
 	}
 }
 

SCHNApps/Plugins/importSurface/importSurface.h

@@ -35,7 +35,7 @@ public:
 	virtual void wheelEvent(View* view, int delta, int x, int y) {}
 
 public slots:
-	void importFromFile(const QString& fileName);
+	MapHandlerGen* importFromFile(const QString& fileName);
 	void importFromFileDialog();
 
 private:

SCHNApps/Plugins/importVolume/importVolume.cpp

@@ -15,7 +15,7 @@ bool ImportVolumePlugin::enable()
 	return true;
 }
 
-void ImportVolumePlugin::importFromFile(const QString& fileName)
+MapHandlerGen* ImportVolumePlugin::importFromFile(const QString& fileName)
 {
 	QFileInfo fi(fileName);
 	if(fi.exists())
@@ -43,6 +43,7 @@ void ImportVolumePlugin::importFromFile(const QString& fileName)
 			mh->updatePrimitives(Algo::Render::GL2::LINES);
 			mh->updatePrimitives(Algo::Render::GL2::TRIANGLES);
 		}
+		return mhg;
 	}
 }
 

SCHNApps/Plugins/importVolume/importVolume.h

@@ -35,7 +35,7 @@ public:
 	virtual void wheelEvent(View* view, int delta, int x, int y) {}
 
 public slots:
-	void importFromFile(const QString& fileName);
+	MapHandlerGen* importFromFile(const QString& fileName);
 	void importFromFileDialog();
 
 private:

SCHNApps/Release/CMakeLists.txt

@@ -37,6 +37,7 @@ file(
 SET(SCHNApps_H_OBJECT_FILES
 	${SCHNApps_ROOT_DIR}/include/view.h
 	${SCHNApps_ROOT_DIR}/include/mapHandler.h
+	${SCHNApps_ROOT_DIR}/include/plugin.h
 	${SCHNApps_ROOT_DIR}/include/window.h
 	${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
 	${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h

SCHNApps/bin/init.py

+importPlugin = schnapps.loadPlugin("ImportSurfacePlugin");
+differentialPropertiesPlugin = schnapps.loadPlugin("DifferentialPropertiesPlugin");
+renderPlugin = schnapps.loadPlugin("RenderPlugin");
+
+hand = importPlugin.importFromFile("/home/kraemer/Media/Data/surface/midRes/handman_12k.off");
+
+v = schnapps.getView("view_0");
+
+schnapps.linkViewAndPlugin(v.getName(), renderPlugin.getName());
+schnapps.linkViewAndMap(v.getName(), hand.getName());

SCHNApps/include/mapHandler.h

@@ -29,6 +29,9 @@ public:
 	virtual ~MapHandlerGen();
 
 	const QString& getName() const { return m_name; }
+
+public slots:
+	QString getName() { return m_name; }
 	void setName(const QString& name) { m_name = name; }
 
 	Window* getWindow() const { return m_window; }
@@ -42,6 +45,7 @@ public:
 
 	bool isUsed() const { return !l_views.empty(); }
 
+public:
 	void draw(Utils::GLSLShader* shader, int primitive) { m_render->draw(shader, primitive); }
 
 	/*********************************************************

SCHNApps/include/plugin.h

@@ -16,12 +16,16 @@ class Window;
 
 class Plugin : public QObject
 {
+	Q_OBJECT
+
 public:
 	Plugin();
 	virtual ~Plugin();
 
+	const QString& getName() const { return m_name; }
+
 public slots:
-	const QString& getName() { return m_name; }
+	QString getName() { return m_name; }
 	void setName(const QString& name) { m_name = name; }
 
 	const QString& getFilePath() { return m_filePath; }

SCHNApps/include/view.h

@@ -32,6 +32,9 @@ public:
 	~View();
 
 	const QString& getName() const { return m_name; }
+
+public slots:
+	QString getName() { return m_name; }
 	void setName(const QString& name) { m_name = name; }
 
 	Window* getWindow() const { return m_window; }
@@ -39,6 +42,7 @@ public:
 
 	bool isCurrentView() const { return m_window->getCurrentView() == this; }
 
+public:
 	virtual void init();
 	virtual void preDraw();
 	virtual void draw();

SCHNApps/src/main.cpp

 #include <QSplashScreen>
+#include <QFileInfo>
 #include "PythonQt/PythonQt.h"
 #include "PythonQt/gui/PythonQtScriptingConsole.h"
 #include "window.h"
@@ -29,7 +30,9 @@ int main(int argc, char* argv[])
 	schnapps.show();
 
 	pythonContext.addObject("schnapps", &schnapps);
-	pythonContext.evalFile(app.applicationDirPath() + QString("/init.py"));
+	QFileInfo fi(app.applicationDirPath() + QString("/init.py"));
+	if(fi.exists())
+		pythonContext.evalFile(fi.filePath());
 
 	splash->finish(&schnapps);
 	delete splash;