From 48969dd674edb33bed2602c3a58329a4430bc293 Mon Sep 17 00:00:00 2001 From: Pierre Kraemer Date: Fri, 30 Aug 2013 14:08:55 +0200 Subject: [PATCH] SCHNApps launching: Python script can be passed as argument --- SCHNApps/bin/schnappsInit.py | 15 --------------- SCHNApps/src/main.cpp | 11 ++++++++--- 2 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 SCHNApps/bin/schnappsInit.py diff --git a/SCHNApps/bin/schnappsInit.py b/SCHNApps/bin/schnappsInit.py deleted file mode 100644 index 6df5bfb3e..000000000 --- a/SCHNApps/bin/schnappsInit.py +++ /dev/null @@ -1,15 +0,0 @@ -v0 = schnapps.getView("view_0"); - -importPlugin = schnapps.enablePlugin("Surface_Import"); -surfaceRender = schnapps.enablePlugin("Surface_Render"); - -v0.linkPlugin(surfaceRender.getName()); - -handman = importPlugin.importFromFile("/home/kraemer/Media/Data/surface/midRes/handman_34k.off"); - -v0.linkMap(handman.getName()); - -handman.createVBO("position"); - -surfaceRender.changePositionVBO(v0.getName(), handman.getName(), "position"); -surfaceRender.changeRenderEdges(v0.getName(), handman.getName(), True); diff --git a/SCHNApps/src/main.cpp b/SCHNApps/src/main.cpp index 53640d51e..e4c2be66b 100644 --- a/SCHNApps/src/main.cpp +++ b/SCHNApps/src/main.cpp @@ -30,9 +30,14 @@ int main(int argc, char* argv[]) schnapps.show(); pythonContext.addObject("schnapps", &schnapps); - QFileInfo fi(app.applicationDirPath() + QString("/schnappsInit.py")); - if(fi.exists()) - pythonContext.evalFile(fi.filePath()); + + if(argc > 1) + { + QString filename(argv[1]); + QFileInfo fi(filename); + if(fi.exists()) + pythonContext.evalFile(fi.filePath()); + } splash->finish(&schnapps); delete splash; -- GitLab