Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit 2046135e authored by untereiner's avatar untereiner
Browse files

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,38 +132,44 @@ void RenderPlugin::redraw(View* view)
}
}
void RenderPlugin::viewLinked(View* view)
void RenderPlugin::viewLinked(View* view, Plugin* plugin)
{
ParameterSet* params = new ParameterSet();
h_viewParams.insert(view, params);
const QList<MapHandlerGen*>& maps = view->getLinkedMaps();
foreach(MapHandlerGen* map, maps)
if(plugin == this)
{
PerMapParameterSet p(map);
params->perMap.insert(map->getName(), p);
}
if (!maps.empty())
changeSelectedMap(view, maps[0]);
ParameterSet* params = new ParameterSet();
h_viewParams.insert(view, params);
const QList<MapHandlerGen*>& maps = view->getLinkedMaps();
foreach(MapHandlerGen* map, maps)
{
PerMapParameterSet p(map);
params->perMap.insert(map->getName(), p);
}
if (!maps.empty())
changeSelectedMap(view, maps[0]);
connect(view, SIGNAL(mapLinked(MapHandlerGen*)), this, SLOT(mapLinked(MapHandlerGen*)));
connect(view, SIGNAL(mapUnlinked(MapHandlerGen*)), this, SLOT(mapUnlinked(MapHandlerGen*)));
connect(view, SIGNAL(mapLinked(MapHandlerGen*)), this, SLOT(mapLinked(MapHandlerGen*)));
connect(view, SIGNAL(mapUnlinked(MapHandlerGen*)), this, SLOT(mapUnlinked(MapHandlerGen*)));
if(view->isCurrentView())
m_dockTab->refreshUI(params);
if(view->isCurrentView())
m_dockTab->refreshUI(params);
}
}
void RenderPlugin::viewUnlinked(View* view)
void RenderPlugin::viewUnlinked(View* view, Plugin* plugin)
{
h_viewParams.remove(view);
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*)));
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));
m_dockTab->refreshUI(h_viewParams[view]);
if(isLinkedToView(view))
m_dockTab->refreshUI(h_viewParams[view]);
}
void RenderPlugin::mapLinked(MapHandlerGen* m)
......@@ -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,38 +70,44 @@ void RenderVectorPlugin::redraw(View* view)
}
}
void RenderVectorPlugin::viewLinked(View* view)
void RenderVectorPlugin::viewLinked(View* view, Plugin* plugin)
{
ParameterSet* params = new ParameterSet();
h_viewParams.insert(view, params);
const QList<MapHandlerGen*>& maps = view->getLinkedMaps();
foreach(MapHandlerGen* map, maps)
if(plugin == this)
{
PerMapParameterSet p(map);
params->perMap.insert(map->getName(), p);
}
if (!maps.empty())
changeSelectedMap(view, maps[0]);
ParameterSet* params = new ParameterSet();
h_viewParams.insert(view, params);
const QList<MapHandlerGen*>& maps = view->getLinkedMaps();
foreach(MapHandlerGen* map, maps)
{
PerMapParameterSet p(map);
params->perMap.insert(map->getName(), p);
}
if (!maps.empty())
changeSelectedMap(view, maps[0]);
connect(view, SIGNAL(mapLinked(MapHandlerGen*)), this, SLOT(mapLinked(MapHandlerGen*)));
connect(view, SIGNAL(mapUnlinked(MapHandlerGen*)), this, SLOT(mapUnlinked(MapHandlerGen*)));
connect(view, SIGNAL(mapLinked(MapHandlerGen*)), this, SLOT(mapLinked(MapHandlerGen*)));
connect(view, SIGNAL(mapUnlinked(MapHandlerGen*)), this, SLOT(mapUnlinked(MapHandlerGen*)));
if(view->isCurrentView())
m_dockTab->refreshUI(params);
if(view->isCurrentView())
m_dockTab->refreshUI(params);
}
}
void RenderVectorPlugin::viewUnlinked(View* view)
void RenderVectorPlugin::viewUnlinked(View* view, Plugin* plugin)
{
h_viewParams.remove(view);
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*)));
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));
m_dockTab->refreshUI(h_viewParams[view]);
if(isLinkedToView(view))
m_dockTab->refreshUI(h_viewParams[view]);
}
void RenderVectorPlugin::mapLinked(MapHandlerGen* m)
......
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment