Skip to content

GitLab

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 b1faeed4 authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files

SCHNApps: more signal/slot connection for plugins

parent 4f88ae92
Hide whitespace changes
Inline Side-by-side
SCHNApps/Plugins/differentialProperties/include/differentialProperties.h
View file @ b1faeed4
......@@ -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();
......
SCHNApps/Plugins/importSurface/importSurface.h
View file @ b1faeed4
......@@ -34,10 +34,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 importFromFile(const QString& fileName);
void importFromFileDialog();
......
SCHNApps/Plugins/importVolume/importVolume.h
View file @ b1faeed4
......@@ -34,10 +34,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 importFromFile(const QString& fileName);
void importFromFileDialog();
......
SCHNApps/Plugins/render/render.cpp
View file @ b1faeed4
......@@ -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)
......
SCHNApps/Plugins/render/render.h
View file @ b1faeed4
......@@ -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);
......
SCHNApps/Plugins/renderVector/renderVector.cpp
View file @ b1faeed4
......@@ -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)
......
SCHNApps/Plugins/renderVector/renderVector.h
View file @ b1faeed4
......@@ -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);
......
SCHNApps/Plugins/subdivideSurface/include/subdivideSurface.h
View file @ b1faeed4
......@@ -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();
......
SCHNApps/include/plugin.h
View file @ b1faeed4
......@@ -46,9 +46,9 @@ 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;
// virtual void viewLinked(View* view) = 0;
// virtual void viewUnlinked(View* view) = 0;
// virtual void currentViewChanged(View* view) = 0;
/*********************************************************
* MANAGE LINKED VIEWS
......
SCHNApps/src/window.cpp
View file @ b1faeed4
......@@ -382,10 +382,7 @@ void Window::setCurrentView(View* view)
const QList<Plugin*>& newPlugins = m_currentView->getLinkedPlugins();
foreach(Plugin* p, newPlugins)
{
enablePluginTabWidgets(p);
p->currentViewChanged(m_currentView);
}
connect(m_currentView, SIGNAL(pluginLinked(Plugin*)), this, SLOT(enablePluginTabWidgets(Plugin*)));
......@@ -592,8 +589,6 @@ void Window::linkViewAndPlugin(View* v, Plugin* p)
p->linkView(v);
emit(viewAndPluginLinked(v, p));
p->viewLinked(v);
}
void Window::unlinkViewAndPlugin(View* v, Plugin* p)
......@@ -602,8 +597,6 @@ void Window::unlinkViewAndPlugin(View* v, Plugin* p)
p->unlinkView(v);
emit(viewAndPluginUnlinked(v, p));
p->viewUnlinked(v);
}
void Window::linkViewAndMap(View* v, MapHandlerGen* m)
......@@ -629,6 +622,7 @@ void Window::linkViewAndCamera(View* v, Camera* c)
emit(viewAndCameraUnlinked(v, current));
v->setCurrentCamera(c);
c->linkView(v);
emit(viewAndCameraLinked(v, c));
}
......
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