From b3f602685879a370e7ea196d0ecc45779db21e25 Mon Sep 17 00:00:00 2001 From: untereiner Date: Mon, 18 Feb 2013 17:48:38 +0100 Subject: [PATCH] yet another modification on renderExplod plugin --- .../Plugins/renderExplod/src/renderExplod.cpp | 48 +++++++++++++++---- SCHNApps/bin/init.py | 28 +++++------ 2 files changed, 53 insertions(+), 23 deletions(-) diff --git a/SCHNApps/Plugins/renderExplod/src/renderExplod.cpp b/SCHNApps/Plugins/renderExplod/src/renderExplod.cpp index b3dc224c8..c24d7ccd5 100644 --- a/SCHNApps/Plugins/renderExplod/src/renderExplod.cpp +++ b/SCHNApps/Plugins/renderExplod/src/renderExplod.cpp @@ -297,13 +297,37 @@ void RenderExplodPlugin::changeVolumesScaleFactor(View* view, MapHandlerGen* map void RenderExplodPlugin::attributeModified(unsigned int orbit, QString nameAttr) { + MapHandler* mh = static_cast*>(QObject::sender()); + + //On cherche la carte et on la met a jour puis updateGL(); + + //pour toutes les vues + //on va mettre a jour la carte QObject::senter() si elle est enregistree dans le parameterSet de cette vue + + + // if(orbit == VERTEX) // { -// // MapHandler* mh = static_cast*>(QObject::sender()); // if(mh == NULL) // return; // +// foreach(ParameterSet* params, h_viewParams) +// { +// QHash::const_iterator i = params->perMap.constBegin(); +// while (i != params->perMap.constEnd()) +// { +// PerMapParameterSet* p = params->perMap[mh->getName()]; +// +// p->updateRender(); +// +// ++i; +// } +// +// } + + + // VertexAttribute position = mh->getAttribute(nameAttr); // if(!position.isValid()) // return; @@ -311,18 +335,24 @@ void RenderExplodPlugin::attributeModified(unsigned int orbit, QString nameAttr) // PFP3::MAP* map = mh->getMap(); // // m_renderExplod->updateData(*map,position); -// -//// if(computeNormalLastParameters.contains(map->getName())) -//// { -//// ComputeNormalParameters& params = computeNormalLastParameters[map->getName()]; -//// if(params.positionName == nameAttr && params.autoUpdate) -//// computeNormal(map->getName(), params.positionName, params.normalName); -//// } -// } + +// if(computeNormalLastParameters.contains(map->getName())) +// { +// ComputeNormalParameters& params = computeNormalLastParameters[map->getName()]; +// if(params.positionName == nameAttr && params.autoUpdate) +// computeNormal(map->getName(), params.positionName, params.normalName); +// } + } } void RenderExplodPlugin::connectivityModified() { + //On cherche la carte et on la met a jour puis updateGL(); + + //pour toutes les vues + //on va mettre a jour la carte QObject::senter() si elle est enregistree dans le parameterSet de cette vue + + // MapHandler* mh = static_cast*>(QObject::sender()); // if(mh == NULL) // return; diff --git a/SCHNApps/bin/init.py b/SCHNApps/bin/init.py index 704992921..f0a9dc7ad 100644 --- a/SCHNApps/bin/init.py +++ b/SCHNApps/bin/init.py @@ -1,19 +1,19 @@ -#importPlugin = schnapps.loadPlugin("ImportSurface"); -#renderPlugin = schnapps.loadPlugin("RenderD"); -#renderVectorPlugin = schnapps.loadPlugin("RenderVectorD"); -#differentialPropertiesPlugin = schnapps.loadPlugin("DifferentialProperties"); -#subdivisionPlugin = schnapps.loadPlugin("SubdivideSurface"); -#surfaceDeformationPlugin = schnapps.loadPlugin("SurfaceDeformation"); +importPlugin = schnapps.loadPlugin("ImportSurface"); +renderPlugin = schnapps.loadPlugin("RenderD"); +renderVectorPlugin = schnapps.loadPlugin("RenderVectorD"); +differentialPropertiesPlugin = schnapps.loadPlugin("DifferentialProperties"); +subdivisionPlugin = schnapps.loadPlugin("SubdivideSurface"); +surfaceDeformationPlugin = schnapps.loadPlugin("SurfaceDeformation"); -#obj = importPlugin.importFromFile("/home/kraemer/Media/Data/surface/lowRes/iphi_good_9k.off"); +obj = importPlugin.importFromFile("/home/kraemer/Media/Data/surface/lowRes/iphi_good_9k.off"); -#v = schnapps.getView("view_0"); +v = schnapps.getView("view_0"); -#schnapps.linkViewAndPlugin(v.getName(), renderPlugin.getName()); -#schnapps.linkViewAndPlugin(v.getName(), renderVectorPlugin.getName()); -#schnapps.linkViewAndPlugin(v.getName(), surfaceDeformationPlugin.getName()); +schnapps.linkViewAndPlugin(v.getName(), renderPlugin.getName()); +schnapps.linkViewAndPlugin(v.getName(), renderVectorPlugin.getName()); +schnapps.linkViewAndPlugin(v.getName(), surfaceDeformationPlugin.getName()); -#schnapps.linkViewAndMap(v.getName(), obj.getName()); +schnapps.linkViewAndMap(v.getName(), obj.getName()); -#differentialPropertiesPlugin.computeNormal(obj.getName()); -#differentialPropertiesPlugin.computeCurvature(obj.getName()); +differentialPropertiesPlugin.computeNormal(obj.getName()); +differentialPropertiesPlugin.computeCurvature(obj.getName()); -- GitLab