diff --git a/Liver/Liver.py b/Liver/Liver.py index 1987218..60d91f8 100644 --- a/Liver/Liver.py +++ b/Liver/Liver.py @@ -232,9 +232,6 @@ def setup(self): self.resectionsWidget.DistanceMapNodeComboBox.connect('currentNodeChanged(vtkMRMLNode*)', self.onResectionDistanceMapNodeChanged) self.resectionsWidget.DistanceMapNodeComboBox.addAttribute('vtkMRMLScalarVolumeNode', 'DistanceMap', 'True') self.resectionsWidget.DistanceMapNodeComboBox.addAttribute('vtkMRMLScalarVolumeNode', 'Computed', 'True') - self.resectionsWidget.MarkerStyleNodeComboBox.connect('currentNodeChanged(vtkMRMLNode*)', self.onMarkerStyleNodeChanged) - self.resectionsWidget.MarkerStyleNodeComboBox.addAttribute('vtkMRMLScalarVolumeNode', 'DistanceMap', 'True') - self.resectionsWidget.MarkerStyleNodeComboBox.addAttribute('vtkMRMLScalarVolumeNode', 'Computed', 'True') self.resectionsWidget.LiverSegmentSelectorWidget.connect('currentSegmentChanged(QString)', self.onResectionLiverModelNodeChanged) self.resectionsWidget.LiverSegmentSelectorWidget.connect('currentNodeChanged(vtkMRMLNode*)', self.onResectionLiverSegmentationNodeChanged) self.resectionsWidget.ResectionColorPickerButton.connect('colorChanged(QColor)', self.onResectionColorChanged) @@ -366,14 +363,9 @@ def onResectionNodeChanged(self): self.resectionsWidget.LiverSegmentSelectorWidget.blockSignals(False) self.resectionsWidget.DistanceMapNodeComboBox.blockSignals(True) - self.resectionsWidget.DistanceMapNodeComboBox.setCurrentNode( - activeResectionNode.GetDistanceMapVolumeNode()) + self.resectionsWidget.DistanceMapNodeComboBox.setCurrentNode(activeResectionNode.GetDistanceMapVolumeNode()) self.resectionsWidget.DistanceMapNodeComboBox.blockSignals(False) - self.resectionsWidget.MarkerStyleNodeComboBox.blockSignals(True) - self.resectionsWidget.MarkerStyleNodeComboBox.setCurrentNode(activeResectionNode.GetMarkerStyleVolumeNode()) - self.resectionsWidget.MarkerStyleNodeComboBox.blockSignals(False) - self.resectogramWidget.VascularSegmentsNodeComboBox.blockSignals(True) self.resectogramWidget.VascularSegmentsNodeComboBox.setCurrentNode(activeResectionNode.GetVascularSegmentsVolumeNode()) self.resectogramWidget.VascularSegmentsNodeComboBox.blockSignals(False) @@ -487,8 +479,8 @@ def onResectionNodeChanged(self): def onResectionDistanceMapNodeChanged(self): """ -This function is called when the resection distance map selector changes -""" + This function is called when the resection distance map selector changes + """ if self._currentResectionNode is not None: distanceMapNode = self.resectionsWidget.DistanceMapNodeComboBox.currentNode() self._currentResectionNode.SetTextureNumComps(self.numComps) @@ -498,14 +490,6 @@ def onResectionDistanceMapNodeChanged(self): self.resectionsWidget.ResectionPreviewGroupBox.setEnabled(distanceMapNode is not None) self.resectogramWidget.Resection2DCheckBox.setEnabled(distanceMapNode is not None) - def onMarkerStyleNodeChanged(self): - """ - This function is called when the Marker Style selector changes - """ - if self._currentResectionNode is not None: - MarkerStyleNode = self.resectionsWidget.MarkerStyleNodeComboBox.currentNode() - self._currentResectionNode.SetMarkerStyleVolumeNode(MarkerStyleNode) - def onResectionLiverSegmentationNodeChanged(self): self.resectionsWidget.LiverSegmentSelectorWidget.blockSignals(True) self.resectionsWidget.LiverSegmentSelectorWidget.setCurrentSegmentID('') diff --git a/Liver/Resources/UI/ResectionsWidget.ui b/Liver/Resources/UI/ResectionsWidget.ui index 9fe6272..746d41e 100644 --- a/Liver/Resources/UI/ResectionsWidget.ui +++ b/Liver/Resources/UI/ResectionsWidget.ui @@ -285,41 +285,6 @@ - - - - - - Marker Style: - - - - - - - false - - - - vtkMRMLVectorVolumeNode - - - - true - - - false - - - false - - - false - - - - - @@ -892,22 +857,6 @@ - - ResectionWidget - mrmlSceneChanged(vtkMRMLScene*) - MarkerStyleNodeComboBox - setMRMLScene(vtkMRMLScene*) - - - 293 - 365 - - - 376 - 167 - - - ResectionOpacityDoubleSlider valueChanged(double) diff --git a/LiverMarkups/MRML/vtkMRMLMarkupsBezierSurfaceNode.h b/LiverMarkups/MRML/vtkMRMLMarkupsBezierSurfaceNode.h index 552c515..9171471 100644 --- a/LiverMarkups/MRML/vtkMRMLMarkupsBezierSurfaceNode.h +++ b/LiverMarkups/MRML/vtkMRMLMarkupsBezierSurfaceNode.h @@ -97,14 +97,6 @@ class VTK_SLICER_LIVERMARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsBezierSurfaceNode vtkMRMLScalarVolumeNode* GetVascularSegmentsVolumeNode() const {return this->VascularSegments;} - /// Set the Marker Style - void SetMarkerStyleVolumeNode(vtkMRMLScalarVolumeNode* volumeNode) - {this->MarkerStyle = volumeNode; this->Modified();} - - /// Get the Marker Style - vtkMRMLScalarVolumeNode* GetMarkerStyleVolumeNode() const - {return this->MarkerStyle;} - /// Get the distance map margin vtkGetMacro(ResectionMargin, double); @@ -142,7 +134,6 @@ class VTK_SLICER_LIVERMARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsBezierSurfaceNode vtkWeakPointer Target; vtkWeakPointer DistanceMap; vtkWeakPointer VascularSegments; - vtkWeakPointer MarkerStyle; double ResectionMargin; double UncertaintyMargin; double HepaticContourThickness; diff --git a/LiverMarkups/Resources/textureB10W.png b/LiverMarkups/Resources/textureB10W.png new file mode 100644 index 0000000..87e7135 Binary files /dev/null and b/LiverMarkups/Resources/textureB10W.png differ diff --git a/LiverMarkups/VTKWidgets/vtkOpenGLBezierResectionPolyDataMapper.cxx b/LiverMarkups/VTKWidgets/vtkOpenGLBezierResectionPolyDataMapper.cxx index 657c95c..5c7d7c0 100644 --- a/LiverMarkups/VTKWidgets/vtkOpenGLBezierResectionPolyDataMapper.cxx +++ b/LiverMarkups/VTKWidgets/vtkOpenGLBezierResectionPolyDataMapper.cxx @@ -93,7 +93,6 @@ class vtkOpenGLBezierResectionPolyDataMapper::vtkInternal bool ResectionClipOut; unsigned int GridDivisions; float GridThicknessFactor; - unsigned int MarkerStyleAvailable; }; //------------------------------------------------------------------------------ @@ -175,7 +174,6 @@ void vtkOpenGLBezierResectionPolyDataMapper::ReplaceShaderValues( "uniform int uResectionClipOut;\n" "uniform int uInterpolatedMargins;\n" "uniform int uGridDivisions;\n" - "uniform int uMarkerStyleAvailable;\n" "uniform float uGridThickness;\n" "in vec4 vertexWCVSOutput;\n" "in vec2 uvCoordsOutput;\n" @@ -217,17 +215,30 @@ void vtkOpenGLBezierResectionPolyDataMapper::ReplaceShaderValues( " ambientColor = vec3(0.0);\n" " diffuseColor = vec3(0.0);\n" " }\n" - " else if(uMarkerStyleAvailable == 1 && marker.a != 0){\n" - " ambientColor = vec3(marker.r,marker.g,marker.b);\n" - " diffuseColor = vec3(0.0);\n" - " }\n" " else{\n" " ambientColor = uResectionColor;\n" " diffuseColor = vec3(0.6);\n" " }\n" - "}\n" - ); + " vec3 topLeftColor = vec3(0.0, 1.0, 0.067);\n" + " vec3 topRightColor = vec3(1.0, 0.48, 0.0);\n" + " vec3 bottomLeftColor = vec3(0.66666666667, 0.00392156863, 1.0);\n" + " vec3 bottomRightColor = vec3(0.34117647058, 0.78039215686, 0.79607843137);\n" + " float borderSize = 0.025;\n" + " if ( (uvCoordsOutput.y > 0.5 && uvCoordsOutput.x < borderSize) || (uvCoordsOutput.y > 1.0 - borderSize && uvCoordsOutput.x < 0.5) ) {\n" + " ambientColor = bottomLeftColor;\n" + " diffuseColor = vec3(0.0);\n" + " } else if ( (uvCoordsOutput.x < 0.5 && uvCoordsOutput.y < borderSize) || (uvCoordsOutput.x < borderSize && uvCoordsOutput.y < 0.5) ) {\n" + " ambientColor = topLeftColor;\n" + " diffuseColor = vec3(0.0);\n" + " } else if ( (uvCoordsOutput.y > 0.5 && uvCoordsOutput.x > 1.0 - borderSize) || (uvCoordsOutput.y > 1.0 - borderSize && uvCoordsOutput.x > 0.5) ) {\n" + " ambientColor = bottomRightColor;\n" + " diffuseColor = vec3(0.0);\n" + " } else if ((uvCoordsOutput.x > 0.5 && uvCoordsOutput.y < borderSize) || (uvCoordsOutput.x > 1.0 - borderSize && uvCoordsOutput.y < 0.5) ) {\n" + " ambientColor = topRightColor;\n" + " diffuseColor = vec3(0.0);\n" + " }\n" + "}\n"); vtkShaderProgram::Substitute( FSSource, "//VTK::Light::Impl", @@ -346,11 +357,6 @@ void vtkOpenGLBezierResectionPolyDataMapper::SetMapperShaderParameters( cellBO.Program->SetUniformf("uGridThickness", this->Impl->GridThicknessFactor); } - if (cellBO.Program->IsUniformUsed("uMarkerStyleAvailable")) - { - cellBO.Program->SetUniformi("uMarkerStyleAvailable", this->Impl->MarkerStyleAvailable); - } - Superclass::SetMapperShaderParameters(cellBO, ren, actor); } @@ -513,19 +519,6 @@ void vtkOpenGLBezierResectionPolyDataMapper::SetUncertaintyMarginColor(float red this->Modified(); } -//------------------------------------------------------------------------------ -//unsigned int const* vtkOpenGLBezierResectionPolyDataMapper::GetMarkerStyleAvailable() const -//{ -// return this->Impl->MarkerStyleAvailable; -//} - -//------------------------------------------------------------------------------ -void vtkOpenGLBezierResectionPolyDataMapper::SetMarkerStyleAvailable(unsigned int status) -{ - this->Impl->MarkerStyleAvailable = status; - this->Modified(); -} - //------------------------------------------------------------------------------ float const* vtkOpenGLBezierResectionPolyDataMapper::GetResectionColor() const { diff --git a/LiverMarkups/VTKWidgets/vtkOpenGLBezierResectionPolyDataMapper.h b/LiverMarkups/VTKWidgets/vtkOpenGLBezierResectionPolyDataMapper.h index df31178..2f8fd03 100644 --- a/LiverMarkups/VTKWidgets/vtkOpenGLBezierResectionPolyDataMapper.h +++ b/LiverMarkups/VTKWidgets/vtkOpenGLBezierResectionPolyDataMapper.h @@ -143,8 +143,6 @@ class VTK_SLICER_LIVERMARKUPS_MODULE_VTKWIDGETS_EXPORT vtkOpenGLBezierResectionP /// Set the thickness factor for the grid void SetGridThicknessFactor(float thicknessFactor); - /// unsigned int GetMarkerStyleAvailable() const; - void SetMarkerStyleAvailable(unsigned int status); protected: vtkOpenGLBezierResectionPolyDataMapper(); diff --git a/LiverMarkups/VTKWidgets/vtkOpenGLResection2DPolyDataMapper.cpp b/LiverMarkups/VTKWidgets/vtkOpenGLResection2DPolyDataMapper.cpp index 51465cc..5f1c9dd 100644 --- a/LiverMarkups/VTKWidgets/vtkOpenGLResection2DPolyDataMapper.cpp +++ b/LiverMarkups/VTKWidgets/vtkOpenGLResection2DPolyDataMapper.cpp @@ -99,7 +99,6 @@ class vtkOpenGLResection2DPolyDataMapper::vtkInternal float PortalContourColor[3]; float HepaticContourColor[3]; int TextureNumComps; - unsigned int MarkerStyleAvailable; float MatRatio[2]; }; @@ -199,7 +198,8 @@ void vtkOpenGLResection2DPolyDataMapper::ReplaceShaderValues( "uniform vec3 uUncertaintyMarginColor;\n" "uniform vec3 uResectionColor;\n" "uniform int uInterpolatedMargins;\n" - "uniform int uMarkerStyleAvailable;\n" + "uniform vec3 uResectionGridColor;\n" + "uniform int uGridDivisions;\n" "uniform float uGridThickness;\n" "in vec2 uvCoordsOutput;\n" "in vec4 vertexWCVSOutputBS;\n" @@ -258,7 +258,7 @@ void vtkOpenGLResection2DPolyDataMapper::ReplaceShaderValues( "}\n" "else{\n" " ambientColor = uResectionColor;\n" - " diffuseColor = vec3(0.6);\n" + " diffuseColor = vec3(0.0);\n" "}\n" "if(dist[0] < lowMargin){\n" @@ -278,25 +278,43 @@ void vtkOpenGLResection2DPolyDataMapper::ReplaceShaderValues( " }\n" "}\n" - - "if(uTextureNumComps > 2){\n" - " if( abs(dist[1])<0.5 ){\n" - " ambientColor = vec3(0.0,0.0,0.0);\n" - " diffuseColor = vec3(0.0);\n" - " }\n" - " else if( abs(dist[2])10.0-uGridThickness || tan(uvCoordsOutput.y*M_PI*uGridDivisions)>10.0-uGridThickness){\n" + " ambientColor = uResectionGridColor;\n" + " diffuseColor = vec3(0.0);\n" + "}\n" + "else{\n" + " if(uTextureNumComps > 2){\n" + " if( abs(dist[1])<0.5 ){\n" + " ambientColor = vec3(0.0,0.0,0.0);\n" + " diffuseColor = vec3(0.0);\n" + " }\n" + " else if( abs(dist[2]) 0.5 && uvCoordsOutput.x < borderSize) || (uvCoordsOutput.y > 1.0 - borderSize && uvCoordsOutput.x < 0.5) ) {\n" + " ambientColor = bottomLeftColor;\n" + " diffuseColor = vec3(0.0);\n" + "} else if ( (uvCoordsOutput.x < 0.5 && uvCoordsOutput.y < borderSize) || (uvCoordsOutput.x < borderSize && uvCoordsOutput.y < 0.5) ) {\n" + " ambientColor = topLeftColor;\n" + " diffuseColor = vec3(0.0);\n" + "} else if ( (uvCoordsOutput.y > 0.5 && uvCoordsOutput.x > 1.0 - borderSize) || (uvCoordsOutput.y > 1.0 - borderSize && uvCoordsOutput.x > 0.5) ) {\n" + " ambientColor = bottomRightColor;\n" + " diffuseColor = vec3(0.0);\n" + "} else if ((uvCoordsOutput.x > 0.5 && uvCoordsOutput.y < borderSize) || (uvCoordsOutput.x > 1.0 - borderSize && uvCoordsOutput.y < 0.5) ) {\n" + " ambientColor = topRightColor;\n" " diffuseColor = vec3(0.0);\n" "}\n" ); @@ -460,11 +478,6 @@ void vtkOpenGLResection2DPolyDataMapper::SetMapperShaderParameters( cellBO.Program->SetUniformf("uHepaticContourThickness", this->Impl->HepaticContourThickness); } - if (cellBO.Program->IsUniformUsed("uMarkerStyleAvailable")) - { - cellBO.Program->SetUniformi("uMarkerStyleAvailable", this->Impl->MarkerStyleAvailable); - } - if (cellBO.Program->IsUniformUsed("uMatRatio")) { cellBO.Program->SetUniform2f("uMatRatio", this->Impl->MatRatio); @@ -829,19 +842,6 @@ void vtkOpenGLResection2DPolyDataMapper::SetTextureNumComps(int numComps) this->Modified(); } -//------------------------------------------------------------------------------ -//unsigned int const* vtkOpenGLBezierResectionPolyDataMapper::GetMarkerStyleAvailable() const -//{ -// return this->Impl->MarkerStyleAvailable; -//} - -//------------------------------------------------------------------------------ -void vtkOpenGLResection2DPolyDataMapper::SetMarkerStyleAvailable(unsigned int status) -{ - this->Impl->MarkerStyleAvailable = status; - this->Modified(); -} - //------------------------------------------------------------------------------ float const* vtkOpenGLResection2DPolyDataMapper::GetMatRatio() const { diff --git a/LiverMarkups/VTKWidgets/vtkOpenGLResection2DPolyDataMapper.h b/LiverMarkups/VTKWidgets/vtkOpenGLResection2DPolyDataMapper.h index f325bd9..71f220c 100644 --- a/LiverMarkups/VTKWidgets/vtkOpenGLResection2DPolyDataMapper.h +++ b/LiverMarkups/VTKWidgets/vtkOpenGLResection2DPolyDataMapper.h @@ -166,9 +166,6 @@ class VTK_SLICER_LIVERMARKUPS_MODULE_VTKWIDGETS_EXPORT vtkOpenGLResection2DPolyD int GetTextureNumComps() const; void SetTextureNumComps(int numComps); - // unsigned int GetMarkerStyleAvailable() const; - void SetMarkerStyleAvailable(unsigned int status); - // Get and Set Ratio void SetMatRatio(float matR[2]); float const* GetMatRatio() const; diff --git a/LiverMarkups/VTKWidgets/vtkSlicerBezierSurfaceRepresentation3D.cxx b/LiverMarkups/VTKWidgets/vtkSlicerBezierSurfaceRepresentation3D.cxx index d2fa1cc..01d3917 100644 --- a/LiverMarkups/VTKWidgets/vtkSlicerBezierSurfaceRepresentation3D.cxx +++ b/LiverMarkups/VTKWidgets/vtkSlicerBezierSurfaceRepresentation3D.cxx @@ -216,7 +216,6 @@ void vtkSlicerBezierSurfaceRepresentation3D::UpdateFromMRML(vtkMRMLNode* caller, // Update the distance map as 3D texture (if changed) auto distanceMap = liverMarkupsBezierSurfaceNode->GetDistanceMapVolumeNode(); - auto markerStyle = liverMarkupsBezierSurfaceNode->GetMarkerStyleVolumeNode(); auto BezierSurfaceDisplayNode = vtkMRMLMarkupsBezierSurfaceDisplayNode::SafeDownCast(liverMarkupsBezierSurfaceNode->GetDisplayNode()); if (this->DistanceMapVolumeNode != distanceMap) @@ -247,10 +246,7 @@ void vtkSlicerBezierSurfaceRepresentation3D::UpdateFromMRML(vtkMRMLNode* caller, this->DistanceMapVolumeNode = distanceMap; } - if (this->MarkerStyleVolumeNode != markerStyle) { - this->CreateAndTransferMarkerStyleTexture(markerStyle); - this->MarkerStyleVolumeNode = markerStyle; - } + //------------------- add new renderer here ----------------------// if(BezierSurfaceDisplayNode->GetShowResection2D()) { @@ -554,35 +550,6 @@ void vtkSlicerBezierSurfaceRepresentation3D::CreateAndTransferDistanceMapTexture this->DistanceMapTexture->CreateSeq3DFromRaw(dimensions[0], dimensions[1], dimensions[2], numComps, VTK_FLOAT, imageData->GetScalarPointer(), 0); } -//---------------------------------------------------------------------- -void vtkSlicerBezierSurfaceRepresentation3D::CreateAndTransferMarkerStyleTexture(vtkMRMLScalarVolumeNode *node) { - - auto renderWindow = vtkOpenGLRenderWindow::SafeDownCast(this->GetRenderer()->GetRenderWindow()); - this->MarkerStyleTexture = vtkSmartPointer::New(); - this->MarkerStyleTexture->SetContext(renderWindow); - - if (!node) { - vtkWarningMacro("vtkSlicerBezierSurfaceRepresentation::CreateAndTransferDistanceMap:" - "There is no distance map node associated. Texture won't be generated."); - return; - } - - auto imageData = node->GetImageData(); - if (!imageData) { - vtkWarningMacro("vtkSlicerBezierSurfaceRepresentation::CreateAndTransferDistanceMap:" - "There is no image data in the specified scalar volume node."); - return; - } - auto dimensions = imageData->GetDimensions(); - - this->MarkerStyleTexture->SetWrapS(vtkMultiTextureObjectHelper::ClampToBorder); - this->MarkerStyleTexture->SetWrapT(vtkMultiTextureObjectHelper::ClampToBorder); - this->MarkerStyleTexture->SetMinificationFilter(vtkMultiTextureObjectHelper::Linear); - this->MarkerStyleTexture->SetMagnificationFilter(vtkMultiTextureObjectHelper::Linear); - this->MarkerStyleTexture->SetBorderColor(1000.0f, 1000.0f, 0.0f, 0.0f); - this->MarkerStyleTexture->CreateSeq2DFromRaw(dimensions[0], dimensions[1], 4, VTK_UNSIGNED_CHAR, - imageData->GetScalarPointer(),15); -} //---------------------------------------------------------------------- void vtkSlicerBezierSurfaceRepresentation3D::CreateAndTransferVascularSegmentsTexture(vtkMRMLScalarVolumeNode *node) { @@ -636,14 +603,6 @@ void vtkSlicerBezierSurfaceRepresentation3D::UpdateBezierSurfaceDisplay(vtkMRMLM if (displayNode) { - if (!this->MarkerStyleVolumeNode){ - this->BezierSurfaceResectionMapper->SetMarkerStyleAvailable(0); - this->BezierSurfaceResectionMapper2D->SetMarkerStyleAvailable(0); - } - else{ - this->BezierSurfaceResectionMapper->SetMarkerStyleAvailable(1); - this->BezierSurfaceResectionMapper2D->SetMarkerStyleAvailable(1); - } this->BezierSurfaceResectionMapper->SetResectionColor(displayNode->GetResectionColor()); this->BezierSurfaceResectionMapper->SetResectionGridColor(displayNode->GetResectionGridColor()); this->BezierSurfaceResectionMapper->SetResectionMarginColor(displayNode->GetResectionMarginColor()); @@ -659,8 +618,8 @@ void vtkSlicerBezierSurfaceRepresentation3D::UpdateBezierSurfaceDisplay(vtkMRMLM this->BezierSurfaceResectionMapper2D->SetResectionMarginColor(displayNode->GetResectionMarginColor()); this->BezierSurfaceResectionMapper2D->SetUncertaintyMarginColor(displayNode->GetUncertaintyMarginColor()); this->BezierSurfaceResectionMapper2D->SetInterpolatedMargins(displayNode->GetInterpolatedMargins()); -// this->BezierSurfaceResectionMapper2D->SetGridDivisions(displayNode->GetGridDivisions()); -// this->BezierSurfaceResectionMapper2D->SetGridThicknessFactor(displayNode->GetGridThickness()); + this->BezierSurfaceResectionMapper2D->SetGridDivisions(displayNode->GetGridDivisions()); + this->BezierSurfaceResectionMapper2D->SetGridThicknessFactor(displayNode->GetGridThickness()); this->BezierSurfaceResectionMapper2D->SetHepaticContourColor(displayNode->GetHepaticContourColor()); this->BezierSurfaceResectionMapper2D->SetPortalContourColor(displayNode->GetPortalContourColor()); this->BezierSurfaceResectionMapper2D->SetTextureNumComps(displayNode->GetTextureNumComps()); @@ -683,7 +642,7 @@ void vtkSlicerBezierSurfaceRepresentation3D::UpdateControlPolygonDisplay(vtkMRML } } -//---------------------------------------------------------------------- +//---------------------------------------------------------------------------- void vtkSlicerBezierSurfaceRepresentation3D::Ratio(bool flexibleBoundery){ float matR[2]; diff --git a/LiverMarkups/VTKWidgets/vtkSlicerBezierSurfaceRepresentation3D.h b/LiverMarkups/VTKWidgets/vtkSlicerBezierSurfaceRepresentation3D.h index c6c5a1f..e3cd66d 100644 --- a/LiverMarkups/VTKWidgets/vtkSlicerBezierSurfaceRepresentation3D.h +++ b/LiverMarkups/VTKWidgets/vtkSlicerBezierSurfaceRepresentation3D.h @@ -97,7 +97,6 @@ class VTK_SLICER_LIVERMARKUPS_MODULE_VTKWIDGETS_EXPORT vtkSlicerBezierSurfaceRep /// TransferDistanceMap void CreateAndTransferDistanceMapTexture(vtkMRMLScalarVolumeNode* node, int numComps); void CreateAndTransferVascularSegmentsTexture(vtkMRMLScalarVolumeNode *node); - void CreateAndTransferMarkerStyleTexture(vtkMRMLScalarVolumeNode *node); void Ratio(bool flexibleBoundery); void ResectogramPlaneCenter(bool mirror); @@ -133,9 +132,6 @@ class VTK_SLICER_LIVERMARKUPS_MODULE_VTKWIDGETS_EXPORT vtkSlicerBezierSurfaceRep vtkSmartPointer VascularSegmentsTexture; vtkWeakPointer VascularSegmentsVolumeNode; - // Maker style related elements - vtkSmartPointer MarkerStyleTexture; - vtkSmartPointer MarkerStyleVolumeNode; protected: vtkSlicerBezierSurfaceRepresentation3D(); diff --git a/LiverResections/Logic/vtkSlicerLiverResectionsLogic.cxx b/LiverResections/Logic/vtkSlicerLiverResectionsLogic.cxx index 692db87..89def27 100644 --- a/LiverResections/Logic/vtkSlicerLiverResectionsLogic.cxx +++ b/LiverResections/Logic/vtkSlicerLiverResectionsLogic.cxx @@ -174,7 +174,6 @@ void vtkSlicerLiverResectionsLogic::ProcessMRMLNodesEvents(vtkObject *caller, { bezierSurfaceNode->SetDistanceMapVolumeNode(resectionNode->GetDistanceMapVolumeNode()); bezierSurfaceNode->SetVascularSegmentsVolumeNode(resectionNode->GetVascularSegmentsVolumeNode()); - bezierSurfaceNode->SetMarkerStyleVolumeNode(resectionNode->GetMarkerStyleVolumeNode()); bezierSurfaceNode->SetResectionMargin(resectionNode->GetResectionMargin()); bezierSurfaceNode->SetUncertaintyMargin(resectionNode->GetUncertaintyMargin()); bezierSurfaceNode->SetHepaticContourThickness(resectionNode->GetHepaticContourThickness()); diff --git a/LiverResections/MRML/vtkMRMLLiverResectionNode.h b/LiverResections/MRML/vtkMRMLLiverResectionNode.h index 806f900..7e8d348 100644 --- a/LiverResections/MRML/vtkMRMLLiverResectionNode.h +++ b/LiverResections/MRML/vtkMRMLLiverResectionNode.h @@ -156,13 +156,6 @@ class VTK_SLICER_LIVERRESECTIONS_MODULE_MRML_EXPORT vtkMRMLLiverResectionNode void SetVascularSegmentsVolumeNode(vtkMRMLScalarVolumeNode *vascularSegmentsVolumeNode) {this->VascularSegmentsVolumeNode = vascularSegmentsVolumeNode; this->Modified();} - // Get Marker Style Volume - vtkMRMLScalarVolumeNode *GetMarkerStyleVolumeNode() const - { return this->MarkerStyleVolumeNode; } - - // Set Marker Style Volume - void SetMarkerStyleVolumeNode(vtkMRMLScalarVolumeNode *markerStyleVolumeNode) - {this->MarkerStyleVolumeNode = markerStyleVolumeNode; this->Modified();} /// This is a function to set the initialization control points as vtkPoints. /// Since the expected number of points for the initialization is two, the /// function requires at least two points in the vtkPoints provided; if more @@ -341,7 +334,6 @@ class VTK_SLICER_LIVERRESECTIONS_MODULE_MRML_EXPORT vtkMRMLLiverResectionNode vtkWeakPointer TargetOrganModelNode; vtkWeakPointer DistanceMapVolumeNode; vtkWeakPointer VascularSegmentsVolumeNode; - vtkWeakPointer MarkerStyleVolumeNode; vtkWeakPointer BezierSurfaceNode; ResectionState State; InitializationMode InitMode;