From 35c2971a56838c9c4dac31ae2cfbfeb3750642cf Mon Sep 17 00:00:00 2001 From: Tuareg Date: Tue, 11 Aug 2020 15:59:46 +1200 Subject: [PATCH] Color changing effective --- .../src/cellmlzincmappingviewzincwidget.cpp | 29 ++++++++----------- .../src/cellmlzincmappingviewzincwidget.h | 3 ++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.cpp b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.cpp index b7d7515e07..fb4f2e256c 100644 --- a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.cpp +++ b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.cpp @@ -62,7 +62,8 @@ CellMLZincMappingViewZincWidget::CellMLZincMappingViewZincWidget(QWidget *pParen ZincWidget::ZincWidget(pParent), mMainFileName(pMainFileName), mEditingWidget(pEditingWidget), - mNodeSize(pow(nodeSixeExp,nodeSizeOrigin)) + mNodeSize(pow(nodeSixeExp,nodeSizeOrigin))//, + //mMappedNodeSize() { // Allow for things to be dropped on us @@ -315,27 +316,20 @@ void CellMLZincMappingViewZincWidget::draw() // create "mapped" group - OpenCMISS::Zinc::GraphicsPoints points = scene.createGraphicsPoints(); - points.setFieldDomainType(OpenCMISS::Zinc::Field::DOMAIN_TYPE_NODES); - lines.setCoordinateField(coordinates); - points.setSubgroupField(mMappedSelectionGroup); + mMappedPoints = scene.createGraphicsPoints(); + mMappedPoints.setFieldDomainType(OpenCMISS::Zinc::Field::DOMAIN_TYPE_NODES); + mMappedPoints.setCoordinateField(coordinates); + mMappedPoints.setSubgroupField(mMappedSelectionGroup); - points.setMaterial(materialModule.findMaterialByName("green")); - points.setSelectedMaterial(materialModule.findMaterialByName("orange")); + mMappedPoints.setMaterial(materialModule.findMaterialByName("green")); + mMappedPoints.setSelectedMaterial(materialModule.findMaterialByName("orange")); - pointAttr = points.getGraphicspointattributes(); + pointAttr = mMappedPoints.getGraphicspointattributes(); - double sizeMappedNode = mNodeSize*1.1; - pointAttr.setBaseSize(1, &sizeMappedNode); + pointAttr.setBaseSize(1, &mNodeSize); pointAttr.setGlyphShapeType(OpenCMISS::Zinc::Glyph::SHAPE_TYPE_SPHERE); - pointAttr.setLabelField(mMappedSelectionGroup); - - //mNodePoints.setDataField(mMappedSelectionGroup); - - //TEST - //TODO remove it - OpenCMISS::Zinc::Node node_test = fieldModule.findNodesetByFieldDomainType(OpenCMISS::Zinc::Field::DOMAIN_TYPE_NODES).findNodeByIdentifier(112); + scene.moveGraphicsBefore(mMappedPoints, mNodePoints); scene.endChange(); @@ -415,6 +409,7 @@ void CellMLZincMappingViewZincWidget::setNodeSizes(int pSize) { scene.beginChange(); mNodePoints.getGraphicspointattributes().setBaseSize(1, &mNodeSize); + mNodePoints.getGraphicspointattributes().setBaseSize(1, &mNodeSize); scene.endChange(); } diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.h b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.h index a80f213ddb..653b5ba1c6 100644 --- a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.h +++ b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.h @@ -92,6 +92,8 @@ public slots: QPoint mMousePosClick; double mNodeSize; + double mMappedNodeSize; + //static constexpr double nodeSixeDiff = 1; char *mZincSceneViewerDescription; @@ -105,6 +107,7 @@ public slots: OpenCMISS::Zinc::FieldGroup mMappedSelectionGroup; OpenCMISS::Zinc::GraphicsPoints mNodePoints; + OpenCMISS::Zinc::GraphicsPoints mMappedPoints; void initAuxFile(); void setup();