Commit 2046135e authored by untereiner's avatar untereiner

Merge cgogn:~cgogn/CGoGN

parents 8b368628 42e522b2
......@@ -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
......
......@@ -37,10 +37,6 @@ public:
virtual void mouseMove(View* view, int buttons, int x, int y) {}
virtual void wheelEvent(View* view, int delta, int x, int y) {}
virtual void viewLinked(View* view) {}
virtual void viewUnlinked(View* view) {}
virtual void currentViewChanged(View* view) {}
public slots:
void openComputeNormalDialog();
void openComputeCurvatureDialog();
......
......@@ -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;
}
}
......
......@@ -34,12 +34,8 @@ public:
virtual void mouseMove(View* view, int buttons, int x, int y) {}
virtual void wheelEvent(View* view, int delta, int x, int y) {}
virtual void viewLinked(View* view) {}
virtual void viewUnlinked(View* view) {}
virtual void currentViewChanged(View* view) {}
public slots:
void importFromFile(const QString& fileName);
MapHandlerGen* importFromFile(const QString& fileName);
void importFromFileDialog();
private:
......
......@@ -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;
}
}
......
......@@ -34,12 +34,8 @@ public:
virtual void mouseMove(View* view, int buttons, int x, int y) {}
virtual void wheelEvent(View* view, int delta, int x, int y) {}
virtual void viewLinked(View* view) {}
virtual void viewUnlinked(View* view) {}
virtual void currentViewChanged(View* view) {}
public slots:
void importFromFile(const QString& fileName);
MapHandlerGen* importFromFile(const QString& fileName);
void importFromFileDialog();
private:
......
......@@ -66,6 +66,10 @@ bool RenderPlugin::enable()
connect(m_dockTab->check_renderFaces, SIGNAL(toggled(bool)), this, SLOT(cb_renderFacesChanged(bool)));
connect(m_dockTab->group_faceShading, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(cb_faceStyleChanged(QAbstractButton*)));
connect(m_window, SIGNAL(viewAndPluginLinked(View*, Plugin*)), this, SLOT(viewLinked(View*, Plugin*)));
connect(m_window, SIGNAL(viewAndPluginUnlinked(View*, Plugin*)), this, SLOT(viewUnlinked(View*, Plugin*)));
connect(m_window, SIGNAL(currentViewChanged(View*)), this, SLOT(currentViewChanged(View*)));
return true;
}
......@@ -128,8 +132,10 @@ void RenderPlugin::redraw(View* view)
}
}
void RenderPlugin::viewLinked(View* view)
void RenderPlugin::viewLinked(View* view, Plugin* plugin)
{
if(plugin == this)
{
ParameterSet* params = new ParameterSet();
h_viewParams.insert(view, params);
const QList<MapHandlerGen*>& maps = view->getLinkedMaps();
......@@ -146,19 +152,23 @@ void RenderPlugin::viewLinked(View* view)
if(view->isCurrentView())
m_dockTab->refreshUI(params);
}
}
void RenderPlugin::viewUnlinked(View* view)
void RenderPlugin::viewUnlinked(View* view, Plugin* plugin)
{
if(plugin == this)
{
h_viewParams.remove(view);
disconnect(view, SIGNAL(mapLinked(MapHandlerGen*)), this, SLOT(mapLinked(MapHandlerGen*)));
disconnect(view, SIGNAL(mapUnlinked(MapHandlerGen*)), this, SLOT(mapUnlinked(MapHandlerGen*)));
}
}
void RenderPlugin::currentViewChanged(View* view)
{
assert(isLinkedToView(view));
if(isLinkedToView(view))
m_dockTab->refreshUI(h_viewParams[view]);
}
......@@ -210,6 +220,8 @@ void RenderPlugin::vboRemoved(Utils::VBO* vbo)
changePositionVBO(view, map, NULL);
if(params->perMap[map->getName()].normalVBO == vbo)
changeNormalVBO(view, map, NULL);
m_dockTab->refreshUI(h_viewParams[view]);
}
void RenderPlugin::changeSelectedMap(View* view, MapHandlerGen* map)
......
......@@ -96,10 +96,6 @@ public:
virtual void mouseMove(View* view, int buttons, int x, int y) {}
virtual void wheelEvent(View* view, int delta, int x, int y) {}
virtual void viewLinked(View* view);
virtual void viewUnlinked(View* view);
virtual void currentViewChanged(View* view);
void setRefreshingUI(bool b) { b_refreshingUI = b; }
protected:
......@@ -114,8 +110,13 @@ protected:
bool b_refreshingUI;
public slots:
void viewLinked(View* view, Plugin* plugin);
void viewUnlinked(View* view, Plugin* plugin);
void currentViewChanged(View* view);
void mapLinked(MapHandlerGen* m);
void mapUnlinked(MapHandlerGen* m);
void vboAdded(Utils::VBO* vbo);
void vboRemoved(Utils::VBO* vbo);
......
......@@ -39,7 +39,7 @@
</property>
</widget>
</item>
<item row="2" column="2" alignment="Qt::AlignRight">
<item row="2" column="2">
<widget class="QPushButton" name="button_refreshVBOs">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
......
......@@ -36,6 +36,10 @@ bool RenderVectorPlugin::enable()
connect(m_dockTab->list_vectorVBO, SIGNAL(itemSelectionChanged()), this, SLOT(cb_selectedVectorsVBOChanged()));
connect(m_dockTab->slider_vectorsScaleFactor, SIGNAL(valueChanged(int)), this, SLOT(cb_vectorsScaleFactorChanged(int)));
connect(m_window, SIGNAL(viewAndPluginLinked(View*, Plugin*)), this, SLOT(viewLinked(View*, Plugin*)));
connect(m_window, SIGNAL(viewAndPluginUnlinked(View*, Plugin*)), this, SLOT(viewUnlinked(View*, Plugin*)));
connect(m_window, SIGNAL(currentViewChanged(View*)), this, SLOT(currentViewChanged(View*)));
return true;
}
......@@ -66,8 +70,10 @@ void RenderVectorPlugin::redraw(View* view)
}
}
void RenderVectorPlugin::viewLinked(View* view)
void RenderVectorPlugin::viewLinked(View* view, Plugin* plugin)
{
if(plugin == this)
{
ParameterSet* params = new ParameterSet();
h_viewParams.insert(view, params);
const QList<MapHandlerGen*>& maps = view->getLinkedMaps();
......@@ -84,19 +90,23 @@ void RenderVectorPlugin::viewLinked(View* view)
if(view->isCurrentView())
m_dockTab->refreshUI(params);
}
}
void RenderVectorPlugin::viewUnlinked(View* view)
void RenderVectorPlugin::viewUnlinked(View* view, Plugin* plugin)
{
if(plugin == this)
{
h_viewParams.remove(view);
disconnect(view, SIGNAL(mapLinked(MapHandlerGen*)), this, SLOT(mapLinked(MapHandlerGen*)));
disconnect(view, SIGNAL(mapUnlinked(MapHandlerGen*)), this, SLOT(mapUnlinked(MapHandlerGen*)));
}
}
void RenderVectorPlugin::currentViewChanged(View* view)
{
assert(isLinkedToView(view));
if(isLinkedToView(view))
m_dockTab->refreshUI(h_viewParams[view]);
}
......
......@@ -78,10 +78,6 @@ public:
virtual void mouseMove(View* view, int buttons, int x, int y) {}
virtual void wheelEvent(View* view, int delta, int x, int y) {}
virtual void viewLinked(View* view);
virtual void viewUnlinked(View* view);
virtual void currentViewChanged(View* view);
void setRefreshingUI(bool b) { b_refreshingUI = b; }
protected:
......@@ -93,8 +89,13 @@ protected:
bool b_refreshingUI;
public slots:
void viewLinked(View* view, Plugin* plugin);
void viewUnlinked(View* view, Plugin* plugin);
void currentViewChanged(View* view);
void mapLinked(MapHandlerGen* m);
void mapUnlinked(MapHandlerGen* m);
void vboAdded(Utils::VBO* vbo);
void vboRemoved(Utils::VBO* vbo);
......
......@@ -36,10 +36,6 @@ public:
virtual void mouseMove(View* view, int buttons, int x, int y) {}
virtual void wheelEvent(View* view, int delta, int x, int y) {}
virtual void viewLinked(View* view) {}
virtual void viewUnlinked(View* view) {}
virtual void currentViewChanged(View* view) {}
public slots:
void openSubdivideSurfaceDialog();
void subdivideSurface();
......
......@@ -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
......
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:
private:
Window* m_window;
View* m_view;
bool b_refreshingUI;
void selectCurrentCamera();
public slots:
void selectedCameraChanged();
void selectCamera(View* view, Camera* camera);
void deselectCamera(View* view, Camera* camera);
void addCameraToList(Camera* c);
void removeCameraFromList(Camera* c);
};
......
......@@ -24,9 +24,12 @@ public:
private:
Window* m_window;
View* m_view;
bool b_refreshingUI;
public slots:
void selectedMapsChanged();
void selectMap(View* view, MapHandlerGen* map);
void deselectMap(View* view, MapHandlerGen* map);
void addMapToList(MapHandlerGen* m);
void removeMapFromList(MapHandlerGen* m);
};
......
......@@ -24,9 +24,12 @@ public:
private:
Window* m_window;
View* m_view;
bool b_refreshingUI;
public slots:
void selectedPluginsChanged();
void selectPlugin(View* view, Plugin* plugin);
void deselectPlugin(View* view, Plugin* plugin);
void addPluginToList(Plugin* p);
void removePluginFromList(Plugin* p);
};
......
......@@ -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); }
/*********************************************************
......
......@@ -16,11 +16,16 @@ class Window;
class Plugin : public QObject
{
Q_OBJECT
public:
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; }
const QString& getFilePath() { return m_filePath; }
......@@ -34,6 +39,7 @@ public:
bool getProvidesRendering() { return b_providesRendering; }
void setProvidesRendering(bool b) { b_providesRendering = b; }
public:
virtual bool enable() = 0;
virtual void disable() = 0;
......@@ -46,10 +52,6 @@ public:
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 viewLinked(View* view) = 0;
virtual void viewUnlinked(View* view) = 0;
virtual void currentViewChanged(View* view) = 0;
/*********************************************************
* MANAGE LINKED VIEWS
*********************************************************/
......
......@@ -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();
......
......@@ -231,12 +231,17 @@ public:
public slots:
void linkViewAndCamera(View* v, Camera* c);
void linkViewAndCamera(const QString& viewName, const QString& cameraName);
void linkViewAndMap(View* v, MapHandlerGen* m);
void linkViewAndMap(const QString& viewName, const QString& mapName);
void unlinkViewAndMap(View* v, MapHandlerGen* m);
void unlinkViewAndMap(const QString& viewName, const QString& mapName);
void linkViewAndPlugin(View* v, Plugin* p);
void linkViewAndPlugin(const QString& viewName, const QString& pluginName);
void unlinkViewAndPlugin(View* v, Plugin* p);
void unlinkViewAndPlugin(const QString& viewName, const QString& pluginName);
/*********************************************************
* MANAGE TEXTURES
......
......@@ -16,7 +16,8 @@ namespace SCHNApps
CameraViewDialog::CameraViewDialog(Window* window, View* view) :
QDialog(view),
m_window(window),
m_view(view)
m_view(view),
b_refreshingUI(false)
{
this->setupUi(this);
this->setWindowTitle(m_view->getName() + QString(" : camera"));
......@@ -26,6 +27,9 @@ CameraViewDialog::CameraViewDialog(Window* window, View* view) :
connect(m_window, SIGNAL(cameraAdded(Camera*)), this, SLOT(addCameraToList(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();
foreach(Camera* c, cameras)
cameraList->addItem(c->getName());
......@@ -50,6 +54,8 @@ void CameraViewDialog::selectCurrentCamera()
void CameraViewDialog::selectedCameraChanged()
{
if(b_refreshingUI)
{
QList<QListWidgetItem*> currentItems = cameraList->selectedItems();
if(currentItems.empty())
selectCurrentCamera();
......@@ -59,6 +65,37 @@ void CameraViewDialog::selectedCameraChanged()
Camera* c = m_window->getCamera(cname);
m_window->linkViewAndCamera(m_view, c);
}
}
}
void CameraViewDialog::selectCamera(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(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;
}
}
}
void CameraViewDialog::addCameraToList(Camera* c)
......
......@@ -17,7 +17,8 @@ namespace SCHNApps
MapsViewDialog::MapsViewDialog(Window* window, View* view) :
QDialog(view),
m_window(window),
m_view(view)
m_view(view),
b_refreshingUI(false)
{
this->setupUi(this);
this->setWindowTitle(m_view->getName() + QString(" : maps"));
......@@ -27,6 +28,9 @@ MapsViewDialog::MapsViewDialog(Window* window, View* view) :
connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(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();
foreach(MapHandlerGen* m, maps)
mapList->addItem(m->getName());
......@@ -37,6 +41,8 @@ MapsViewDialog::~MapsViewDialog()
void MapsViewDialog::selectedMapsChanged()
{
if(!b_refreshingUI)
{
for(int i = 0; i < mapList->count(); ++i)
{
QString mapName = mapList->item(i)->text();
......@@ -49,6 +55,37 @@ void MapsViewDialog::selectedMapsChanged()
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;
}
}
}
void MapsViewDialog::deselectMap(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(false);
m_view->updateGL();
b_refreshingUI = false;
}
}
}
void MapsViewDialog::addMapToList(MapHandlerGen* m)
......
......@@ -16,7 +16,8 @@ namespace SCHNApps
PluginsViewDialog::PluginsViewDialog(Window* window, View* view) :
QDialog(view),
m_window(window),
m_view(view)
m_view(view),
b_refreshingUI(false)
{
this->setupUi(this);
this->setWindowTitle(m_view->getName() + QString(" : plugins"));
......@@ -26,6 +27,9 @@ PluginsViewDialog::PluginsViewDialog(Window* window, View* view) :
connect(m_window, SIGNAL(pluginLoaded(Plugin*)), this, SLOT(addPluginToList(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();
foreach(Plugin* p, plugins)
{
......@@ -39,6 +43,8 @@ PluginsViewDialog::~PluginsViewDialog()
void PluginsViewDialog::selectedPluginsChanged()
{
if(!b_refreshingUI)
{
for(int i = 0; i < pluginList->count(); ++i)
{
QString pluginName = pluginList->item(i)->text();
......@@ -50,6 +56,37 @@ void PluginsViewDialog::selectedPluginsChanged()
m_window->unlinkViewAndPlugin(m_view, plugin);
}
m_view->updateGL();
}
}
void PluginsViewDialog::selectPlugin(View* view, Plugin* plugin)
{
if(view == m_view)
{
QList<QListWidgetItem*> items = pluginList->findItems(plugin->getName(), Qt::MatchExactly);
if(!items.empty())
{
b_refreshingUI = true;
items[0]->setSelected(true);
m_view->updateGL();
b_refreshingUI = false;
}
}
}
void PluginsViewDialog::deselectPlugin(View* view, Plugin* 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;
}
}
}
void PluginsViewDialog::addPluginToList(Plugin* p)
......
#include <QSplashScreen>
#include "window.h"
#include <QFileInfo>
#include "PythonQt/PythonQt.h"
#include "PythonQt/gui/PythonQtScriptingConsole.h"
#include "window.h"
int main(int argc, char* argv[])