Commit ceb4a9f3 authored by Sylvain Thery's avatar Sylvain Thery

Merge branch 'master' of cgogn:~kraemer/CGoGN

Conflicts:
	SCHNApps/src/main.cpp
parents 58e2022f 54603ff0
...@@ -38,6 +38,7 @@ SET(SCHNApps_H_OBJECT_FILES ...@@ -38,6 +38,7 @@ SET(SCHNApps_H_OBJECT_FILES
${SCHNApps_ROOT_DIR}/include/view.h ${SCHNApps_ROOT_DIR}/include/view.h
${SCHNApps_ROOT_DIR}/include/window.h ${SCHNApps_ROOT_DIR}/include/window.h
${SCHNApps_ROOT_DIR}/include/mapHandler.h ${SCHNApps_ROOT_DIR}/include/mapHandler.h
${SCHNApps_ROOT_DIR}/include/plugin.h
${SCHNApps_ROOT_DIR}/include/viewButtonArea.h ${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h ${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/pluginsDialog.h ${SCHNApps_ROOT_DIR}/include/dialogs/pluginsDialog.h
......
...@@ -15,7 +15,7 @@ bool ImportSurfacePlugin::enable() ...@@ -15,7 +15,7 @@ bool ImportSurfacePlugin::enable()
return true; return true;
} }
void ImportSurfacePlugin::importFromFile(const QString& fileName) MapHandlerGen* ImportSurfacePlugin::importFromFile(const QString& fileName)
{ {
QFileInfo fi(fileName); QFileInfo fi(fileName);
if(fi.exists()) if(fi.exists())
...@@ -43,6 +43,7 @@ void ImportSurfacePlugin::importFromFile(const QString& fileName) ...@@ -43,6 +43,7 @@ void ImportSurfacePlugin::importFromFile(const QString& fileName)
mh->updatePrimitives(Algo::Render::GL2::LINES); mh->updatePrimitives(Algo::Render::GL2::LINES);
mh->updatePrimitives(Algo::Render::GL2::TRIANGLES); mh->updatePrimitives(Algo::Render::GL2::TRIANGLES);
} }
return mhg;
} }
} }
......
...@@ -35,7 +35,7 @@ public: ...@@ -35,7 +35,7 @@ public:
virtual void wheelEvent(View* view, int delta, int x, int y) {} virtual void wheelEvent(View* view, int delta, int x, int y) {}
public slots: public slots:
void importFromFile(const QString& fileName); MapHandlerGen* importFromFile(const QString& fileName);
void importFromFileDialog(); void importFromFileDialog();
private: private:
......
...@@ -15,7 +15,7 @@ bool ImportVolumePlugin::enable() ...@@ -15,7 +15,7 @@ bool ImportVolumePlugin::enable()
return true; return true;
} }
void ImportVolumePlugin::importFromFile(const QString& fileName) MapHandlerGen* ImportVolumePlugin::importFromFile(const QString& fileName)
{ {
QFileInfo fi(fileName); QFileInfo fi(fileName);
if(fi.exists()) if(fi.exists())
...@@ -43,6 +43,7 @@ void ImportVolumePlugin::importFromFile(const QString& fileName) ...@@ -43,6 +43,7 @@ void ImportVolumePlugin::importFromFile(const QString& fileName)
mh->updatePrimitives(Algo::Render::GL2::LINES); mh->updatePrimitives(Algo::Render::GL2::LINES);
mh->updatePrimitives(Algo::Render::GL2::TRIANGLES); mh->updatePrimitives(Algo::Render::GL2::TRIANGLES);
} }
return mhg;
} }
} }
......
...@@ -35,7 +35,7 @@ public: ...@@ -35,7 +35,7 @@ public:
virtual void wheelEvent(View* view, int delta, int x, int y) {} virtual void wheelEvent(View* view, int delta, int x, int y) {}
public slots: public slots:
void importFromFile(const QString& fileName); MapHandlerGen* importFromFile(const QString& fileName);
void importFromFileDialog(); void importFromFileDialog();
private: private:
......
...@@ -37,6 +37,7 @@ file( ...@@ -37,6 +37,7 @@ file(
SET(SCHNApps_H_OBJECT_FILES SET(SCHNApps_H_OBJECT_FILES
${SCHNApps_ROOT_DIR}/include/view.h ${SCHNApps_ROOT_DIR}/include/view.h
${SCHNApps_ROOT_DIR}/include/mapHandler.h ${SCHNApps_ROOT_DIR}/include/mapHandler.h
${SCHNApps_ROOT_DIR}/include/plugin.h
${SCHNApps_ROOT_DIR}/include/window.h ${SCHNApps_ROOT_DIR}/include/window.h
${SCHNApps_ROOT_DIR}/include/viewButtonArea.h ${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h ${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h
......
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());
...@@ -24,11 +24,14 @@ public: ...@@ -24,11 +24,14 @@ public:
private: private:
Window* m_window; Window* m_window;
View* m_view; View* m_view;
bool b_refreshingUI;
void selectCurrentCamera(); void selectCurrentCamera();
public slots: public slots:
void selectedCameraChanged(); void selectedCameraChanged();
void selectCamera(View* view, Camera* camera);
void deselectCamera(View* view, Camera* camera);
void addCameraToList(Camera* c); void addCameraToList(Camera* c);
void removeCameraFromList(Camera* c); void removeCameraFromList(Camera* c);
}; };
......
...@@ -24,9 +24,12 @@ public: ...@@ -24,9 +24,12 @@ public:
private: private:
Window* m_window; Window* m_window;
View* m_view; View* m_view;
bool b_refreshingUI;
public slots: public slots:
void selectedMapsChanged(); void selectedMapsChanged();
void selectMap(View* view, MapHandlerGen* map);
void deselectMap(View* view, MapHandlerGen* map);
void addMapToList(MapHandlerGen* m); void addMapToList(MapHandlerGen* m);
void removeMapFromList(MapHandlerGen* m); void removeMapFromList(MapHandlerGen* m);
}; };
......
...@@ -24,9 +24,12 @@ public: ...@@ -24,9 +24,12 @@ public:
private: private:
Window* m_window; Window* m_window;
View* m_view; View* m_view;
bool b_refreshingUI;
public slots: public slots:
void selectedPluginsChanged(); void selectedPluginsChanged();
void selectPlugin(View* view, Plugin* plugin);
void deselectPlugin(View* view, Plugin* plugin);
void addPluginToList(Plugin* p); void addPluginToList(Plugin* p);
void removePluginFromList(Plugin* p); void removePluginFromList(Plugin* p);
}; };
......
...@@ -29,6 +29,9 @@ public: ...@@ -29,6 +29,9 @@ public:
virtual ~MapHandlerGen(); virtual ~MapHandlerGen();
const QString& getName() const { return m_name; } const QString& getName() const { return m_name; }
public slots:
QString getName() { return m_name; }
void setName(const QString& name) { m_name = name; } void setName(const QString& name) { m_name = name; }
Window* getWindow() const { return m_window; } Window* getWindow() const { return m_window; }
...@@ -42,6 +45,7 @@ public: ...@@ -42,6 +45,7 @@ public:
bool isUsed() const { return !l_views.empty(); } bool isUsed() const { return !l_views.empty(); }
public:
void draw(Utils::GLSLShader* shader, int primitive) { m_render->draw(shader, primitive); } void draw(Utils::GLSLShader* shader, int primitive) { m_render->draw(shader, primitive); }
/********************************************************* /*********************************************************
......
...@@ -16,11 +16,16 @@ class Window; ...@@ -16,11 +16,16 @@ class Window;
class Plugin : public QObject class Plugin : public QObject
{ {
Q_OBJECT
public: public:
Plugin(); Plugin();
virtual ~Plugin(); virtual ~Plugin();
const QString& getName() { return m_name; } const QString& getName() const { return m_name; }
public slots:
QString getName() { return m_name; }
void setName(const QString& name) { m_name = name; } void setName(const QString& name) { m_name = name; }
const QString& getFilePath() { return m_filePath; } const QString& getFilePath() { return m_filePath; }
...@@ -34,6 +39,7 @@ public: ...@@ -34,6 +39,7 @@ public:
bool getProvidesRendering() { return b_providesRendering; } bool getProvidesRendering() { return b_providesRendering; }
void setProvidesRendering(bool b) { b_providesRendering = b; } void setProvidesRendering(bool b) { b_providesRendering = b; }
public:
virtual bool enable() = 0; virtual bool enable() = 0;
virtual void disable() = 0; virtual void disable() = 0;
...@@ -46,10 +52,6 @@ public: ...@@ -46,10 +52,6 @@ public:
virtual void mouseMove(View* view, int buttons, int x, int y) = 0; virtual void mouseMove(View* view, int buttons, int x, int y) = 0;
virtual void wheelEvent(View* view, int delta, int x, int y) = 0; virtual void wheelEvent(View* view, int delta, int x, int y) = 0;
// virtual void viewLinked(View* view) = 0;
// virtual void viewUnlinked(View* view) = 0;
// virtual void currentViewChanged(View* view) = 0;
/********************************************************* /*********************************************************
* MANAGE LINKED VIEWS * MANAGE LINKED VIEWS
*********************************************************/ *********************************************************/
......
...@@ -32,6 +32,9 @@ public: ...@@ -32,6 +32,9 @@ public:
~View(); ~View();
const QString& getName() const { return m_name; } const QString& getName() const { return m_name; }
public slots:
QString getName() { return m_name; }
void setName(const QString& name) { m_name = name; } void setName(const QString& name) { m_name = name; }
Window* getWindow() const { return m_window; } Window* getWindow() const { return m_window; }
...@@ -39,6 +42,7 @@ public: ...@@ -39,6 +42,7 @@ public:
bool isCurrentView() const { return m_window->getCurrentView() == this; } bool isCurrentView() const { return m_window->getCurrentView() == this; }
public:
virtual void init(); virtual void init();
virtual void preDraw(); virtual void preDraw();
virtual void draw(); virtual void draw();
......
...@@ -231,12 +231,17 @@ public: ...@@ -231,12 +231,17 @@ public:
public slots: public slots:
void linkViewAndCamera(View* v, Camera* c); void linkViewAndCamera(View* v, Camera* c);
void linkViewAndCamera(const QString& viewName, const QString& cameraName);
void linkViewAndMap(View* v, MapHandlerGen* m); void linkViewAndMap(View* v, MapHandlerGen* m);
void linkViewAndMap(const QString& viewName, const QString& mapName);
void unlinkViewAndMap(View* v, MapHandlerGen* m); void unlinkViewAndMap(View* v, MapHandlerGen* m);
void unlinkViewAndMap(const QString& viewName, const QString& mapName);
void linkViewAndPlugin(View* v, Plugin* p); void linkViewAndPlugin(View* v, Plugin* p);
void linkViewAndPlugin(const QString& viewName, const QString& pluginName);
void unlinkViewAndPlugin(View* v, Plugin* p); void unlinkViewAndPlugin(View* v, Plugin* p);
void unlinkViewAndPlugin(const QString& viewName, const QString& pluginName);
/********************************************************* /*********************************************************
* MANAGE TEXTURES * MANAGE TEXTURES
......
...@@ -16,7 +16,8 @@ namespace SCHNApps ...@@ -16,7 +16,8 @@ namespace SCHNApps
CameraViewDialog::CameraViewDialog(Window* window, View* view) : CameraViewDialog::CameraViewDialog(Window* window, View* view) :
QDialog(view), QDialog(view),
m_window(window), m_window(window),
m_view(view) m_view(view),
b_refreshingUI(false)
{ {
this->setupUi(this); this->setupUi(this);
this->setWindowTitle(m_view->getName() + QString(" : camera")); this->setWindowTitle(m_view->getName() + QString(" : camera"));
...@@ -26,6 +27,9 @@ CameraViewDialog::CameraViewDialog(Window* window, View* view) : ...@@ -26,6 +27,9 @@ CameraViewDialog::CameraViewDialog(Window* window, View* view) :
connect(m_window, SIGNAL(cameraAdded(Camera*)), this, SLOT(addCameraToList(Camera*))); connect(m_window, SIGNAL(cameraAdded(Camera*)), this, SLOT(addCameraToList(Camera*)));
connect(m_window, SIGNAL(cameraRemoved(Camera*)), this, SLOT(removeCameraFromList(Camera*))); connect(m_window, SIGNAL(cameraRemoved(Camera*)), this, SLOT(removeCameraFromList(Camera*)));
connect(m_window, SIGNAL(viewAndCameraLinked(View*, Camera*)), this, SLOT(selectCamera(View*, Camera*)));
connect(m_window, SIGNAL(viewAndCameraUnlinked(View*, Camera*)), this, SLOT(deselectCamera(View*, Camera*)));
QList<Camera*> cameras = m_window->getCamerasList(); QList<Camera*> cameras = m_window->getCamerasList();
foreach(Camera* c, cameras) foreach(Camera* c, cameras)
cameraList->addItem(c->getName()); cameraList->addItem(c->getName());
...@@ -50,14 +54,47 @@ void CameraViewDialog::selectCurrentCamera() ...@@ -50,14 +54,47 @@ void CameraViewDialog::selectCurrentCamera()
void CameraViewDialog::selectedCameraChanged() void CameraViewDialog::selectedCameraChanged()
{ {
QList<QListWidgetItem*> currentItems = cameraList->selectedItems(); if(b_refreshingUI)
if(currentItems.empty()) {
selectCurrentCamera(); QList<QListWidgetItem*> currentItems = cameraList->selectedItems();
else if(currentItems.empty())
selectCurrentCamera();
else
{
const QString& cname = currentItems[0]->text();
Camera* c = m_window->getCamera(cname);
m_window->linkViewAndCamera(m_view, c);
}
}
}
void CameraViewDialog::selectCamera(View* view, Camera* camera)
{
if(view == m_view)
{ {
const QString& cname = currentItems[0]->text(); QList<QListWidgetItem*> items = cameraList->findItems(camera->getName(), Qt::MatchExactly);
Camera* c = m_window->getCamera(cname); if(!items.empty())
m_window->linkViewAndCamera(m_view, c); {
b_refreshingUI = true;
items[0]->setSelected(true);
m_view->updateGL();
b_refreshingUI = false;
}
}
}
void CameraViewDialog::deselectCamera(View* view, Camera* camera)
{
if(view == m_view)
{
QList<QListWidgetItem*> items = cameraList->findItems(camera->getName(), Qt::MatchExactly);
if(!items.empty())
{
b_refreshingUI = true;
items[0]->setSelected(false);
m_view->updateGL();
b_refreshingUI = false;
}
} }
} }
......
...@@ -17,7 +17,8 @@ namespace SCHNApps ...@@ -17,7 +17,8 @@ namespace SCHNApps
MapsViewDialog::MapsViewDialog(Window* window, View* view) : MapsViewDialog::MapsViewDialog(Window* window, View* view) :
QDialog(view), QDialog(view),
m_window(window), m_window(window),
m_view(view) m_view(view),
b_refreshingUI(false)
{ {
this->setupUi(this); this->setupUi(this);
this->setWindowTitle(m_view->getName() + QString(" : maps")); this->setWindowTitle(m_view->getName() + QString(" : maps"));
...@@ -27,6 +28,9 @@ MapsViewDialog::MapsViewDialog(Window* window, View* view) : ...@@ -27,6 +28,9 @@ MapsViewDialog::MapsViewDialog(Window* window, View* view) :
connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*))); connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*)));
connect(m_window, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*))); connect(m_window, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*)));
connect(m_window, SIGNAL(viewAndMapLinked(View*, MapHandlerGen*)), this, SLOT(selectMap(View*, MapHandlerGen*)));
connect(m_window, SIGNAL(viewAndMapUnlinked(View*, MapHandlerGen*)), this, SLOT(deselectMap(View*, MapHandlerGen*)));
QList<MapHandlerGen*> maps = m_window->getMapsList(); QList<MapHandlerGen*> maps = m_window->getMapsList();
foreach(MapHandlerGen* m, maps) foreach(MapHandlerGen* m, maps)
mapList->addItem(m->getName()); mapList->addItem(m->getName());
...@@ -37,18 +41,51 @@ MapsViewDialog::~MapsViewDialog() ...@@ -37,18 +41,51 @@ MapsViewDialog::~MapsViewDialog()
void MapsViewDialog::selectedMapsChanged() void MapsViewDialog::selectedMapsChanged()
{ {
for(int i = 0; i < mapList->count(); ++i) if(!b_refreshingUI)
{ {
QString mapName = mapList->item(i)->text(); for(int i = 0; i < mapList->count(); ++i)
MapHandlerGen* map = m_window->getMap(mapName); {
QString mapName = mapList->item(i)->text();
MapHandlerGen* map = m_window->getMap(mapName);
if(mapList->item(i)->isSelected() && !m_view->isLinkedToMap(map)) if(mapList->item(i)->isSelected() && !m_view->isLinkedToMap(map))
m_window->linkViewAndMap(m_view, map); m_window->linkViewAndMap(m_view, map);
else if(!mapList->item(i)->isSelected() && m_view->isLinkedToMap(map))
m_window->unlinkViewAndMap(m_view, map);
}
m_view->updateGL();
}
}
void MapsViewDialog::selectMap(View* view, MapHandlerGen* plugin)
{
if(view == m_view)
{
QList<QListWidgetItem*> items = mapList->findItems(plugin->getName(), Qt::MatchExactly);
if(!items.empty())
{
b_refreshingUI = true;
items[0]->setSelected(true);
m_view->updateGL();
b_refreshingUI = false;
}
}
}
else if(!mapList->item(i)->isSelected() && m_view->isLinkedToMap(map)) void MapsViewDialog::deselectMap(View* view, MapHandlerGen* plugin)
m_window->unlinkViewAndMap(m_view, map); {
if(view == m_view)
{
QList<QListWidgetItem*> items = mapList->findItems(plugin->getName(), Qt::MatchExactly);
if(!items.empty())
{
b_refreshingUI = true;
items[0]->setSelected(false);
m_view->updateGL();
b_refreshingUI = false;
}
} }
m_view->updateGL();
} }
void MapsViewDialog::addMapToList(MapHandlerGen* m) void MapsViewDialog::addMapToList(MapHandlerGen* m)
......
...@@ -16,7 +16,8 @@ namespace SCHNApps ...@@ -16,7 +16,8 @@ namespace SCHNApps
PluginsViewDialog::PluginsViewDialog(Window* window, View* view) : PluginsViewDialog::PluginsViewDialog(Window* window, View* view) :
QDialog(view), QDialog(view),
m_window(window), m_window(window),
m_view(view) m_view(view),
b_refreshingUI(false)
{ {
this->setupUi(this); this->setupUi(this);
this->setWindowTitle(m_view->getName() + QString(" : plugins")); this->setWindowTitle(m_view->getName() + QString(" : plugins"));
...@@ -26,6 +27,9 @@ PluginsViewDialog::PluginsViewDialog(Window* window, View* view) : ...@@ -26,6 +27,9 @@ PluginsViewDialog::PluginsViewDialog(Window* window, View* view) :
connect(m_window, SIGNAL(pluginLoaded(Plugin*)), this, SLOT(addPluginToList(Plugin*))); connect(m_window, SIGNAL(pluginLoaded(Plugin*)), this, SLOT(addPluginToList(Plugin*)));
connect(m_window, SIGNAL(pluginUnloaded(Plugin*)), this, SLOT(removePluginFromList(Plugin*))); connect(m_window, SIGNAL(pluginUnloaded(Plugin*)), this, SLOT(removePluginFromList(Plugin*)));
connect(m_window, SIGNAL(viewAndPluginLinked(View*, Plugin*)), this, SLOT(selectPlugin(View*, Plugin*)));
connect(m_window, SIGNAL(viewAndPluginUnlinked(View*, Plugin*)), this, SLOT(deselectPlugin(View*, Plugin*)));
QList<Plugin*> plugins = m_window->getPluginsList(); QList<Plugin*> plugins = m_window->getPluginsList();
foreach(Plugin* p, plugins) foreach(Plugin* p, plugins)
{ {
...@@ -39,17 +43,50 @@ PluginsViewDialog::~PluginsViewDialog() ...@@ -39,17 +43,50 @@ PluginsViewDialog::~PluginsViewDialog()
void PluginsViewDialog::selectedPluginsChanged() void PluginsViewDialog::selectedPluginsChanged()
{ {
for(int i = 0; i < pluginList->count(); ++i) if(!b_refreshingUI)
{
for(int i = 0; i < pluginList->count(); ++i)
{
QString pluginName = pluginList->item(i)->text();
Plugin* plugin = m_window->getPlugin(pluginName);
if(pluginList->item(i)->isSelected() && !m_view->isLinkedToPlugin(plugin))
m_window->linkViewAndPlugin(m_view, plugin);
else if(!pluginList->item(i)->isSelected() && m_view->isLinkedToPlugin(plugin))
m_window->unlinkViewAndPlugin(m_view, plugin);
}
m_view->updateGL();
}
}
void PluginsViewDialog::selectPlugin(View* view, Plugin* plugin)
{
if(view == m_view)
{ {
QString pluginName = pluginList->item(i)->text(); QList<QListWidgetItem*> items = pluginList->findItems(plugin->getName(), Qt::MatchExactly);
Plugin* plugin = m_window->getPlugin(pluginName); if(!items.empty())
if(pluginList->item(i)->isSelected() && !m_view->isLinkedToPlugin(plugin)) {
m_window->linkViewAndPlugin(m_view, plugin); b_refreshingUI = true;
items[0]->setSelected(true);
m_view->updateGL();
b_refreshingUI = false;
}
}
}
else if(!pluginList->item(i)->isSelected() && m_view->isLinkedToPlugin(plugin)) void PluginsViewDialog::deselectPlugin(View* view, Plugin* plugin)
m_window->unlinkViewAndPlugin(m_view, plugin); {
if(view == m_view)
{
QList<QListWidgetItem*> items = pluginList->findItems(plugin->getName(), Qt::MatchExactly);
if(!items.empty())
{
b_refreshingUI = true;
items[0]->setSelected(false);
m_view->updateGL();
b_refreshingUI = false;
}
} }
m_view->updateGL();
} }
void PluginsViewDialog::addPluginToList(Plugin* p) void PluginsViewDialog::addPluginToList(Plugin* p)
......
#include <QSplashScreen> #include <QSplashScreen>
#include "window.h" #include "window.h"
#include <QFileInfo>
#include "PythonQt/PythonQt.h" #include "PythonQt/PythonQt.h"
#include "PythonQt/gui/PythonQtScriptingConsole.h" #include "PythonQt/gui/PythonQtScriptingConsole.h"
...@@ -19,10 +18,10 @@ int main(int argc, char* argv[]) ...@@ -19,10 +18,10 @@ int main(int argc, char* argv[])
PythonQt::init(); PythonQt::init();
QStringList classNames; QStringList classNames;
classNames.append("Plugin");
classNames.append("View"); classNames.append("View");
classNames.append("MapHandlerGen");
classNames.append("Camera"); classNames.append("Camera");
classNames.append("Plugin");
classNames.append("MapHandlerGen");
PythonQt::self()->registerQObjectClassNames(classNames); PythonQt::self()->registerQObjectClassNames(classNames);
// get a smart pointer to the __main__ module of the Python interpreter // get a smart pointer to the __main__ module of the Python interpreter
...@@ -33,7 +32,9 @@ int main(int argc, char* argv[]) ...@@ -33,7 +32,9 @@ int main(int argc, char* argv[])
schnapps.show(); schnapps.show();
pythonContext.addObject("schnapps", &schnapps); 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); splash->finish(&schnapps);
delete splash; delete splash;
......
...@@ -476,8 +476,6 @@ Plugin* Window::loadPlugin(const QString& pluginName) ...@@ -476,8 +476,6 @@ Plugin* Window::loadPlugin(const QString& pluginName)
statusbar->showMessage(pluginName + QString(" successfully loaded."), 2000); statusbar->showMessage(pluginName + QString(" successfully loaded."), 2000);
emit(pluginLoaded(plugin)); emit(pluginLoaded(plugin));
m_pythonContext.addObject(pluginName, plugin);
// method success // method success
return plugin;