From 404aadadd829a23b2c3b6a2527ca27faa5d3d5ed Mon Sep 17 00:00:00 2001 From: Bernhard Froehler Date: Fri, 24 Feb 2023 13:07:24 +0100 Subject: [PATCH] Modules: unify volume settings apply --- modules/DynamicVolumeLines/dlg_DynamicVolumeLines.cpp | 1 - modules/FuzzyFeatureTracking/dlg_dataView4DCT.cpp | 1 - modules/ImNDT/iAImNDTModuleInterface.cpp | 1 - modules/InSpectr/dlg_InSpectr.cpp | 1 - modules/InSpectr/dlg_elementRenderer.cpp | 5 ----- modules/InSpectr/dlg_elementRenderer.h | 1 - 6 files changed, 10 deletions(-) diff --git a/modules/DynamicVolumeLines/dlg_DynamicVolumeLines.cpp b/modules/DynamicVolumeLines/dlg_DynamicVolumeLines.cpp index f0ab28809..aa1a4132c 100644 --- a/modules/DynamicVolumeLines/dlg_DynamicVolumeLines.cpp +++ b/modules/DynamicVolumeLines/dlg_DynamicVolumeLines.cpp @@ -1671,7 +1671,6 @@ void dlg_DynamicVolumeLines::setSelectionForRenderer(QList visSelGra ren->AddViewProp(cornerAnnotation); ren->ResetCamera(); m_volRen = QSharedPointer::create(ren, m_imgDataList[datasetIdx], tf); - //m_volRen->applySettings(m_mdiChild->volumeSettings()); m_volRen->setVisible(true); m_volRen->setBoundsVisible(true); m_wgtContainer->renderWindow()->AddRenderer(ren); diff --git a/modules/FuzzyFeatureTracking/dlg_dataView4DCT.cpp b/modules/FuzzyFeatureTracking/dlg_dataView4DCT.cpp index fa7291903..76d7c2095 100644 --- a/modules/FuzzyFeatureTracking/dlg_dataView4DCT.cpp +++ b/modules/FuzzyFeatureTracking/dlg_dataView4DCT.cpp @@ -47,7 +47,6 @@ dlg_dataView4DCT::dlg_dataView4DCT(QWidget* parent, std::vector m_volumeRenderer[i]->setVisible(true); bool slicerVisibility[3] = { false, false, false }; m_renderers[i]->applySettings(m_mdiChild->renderSettings(), slicerVisibility ); - //m_volumeRenderer[i]->applySettings(m_mdiChild->volumeSettings()); // setup renderers m_renderers[i]->showHelpers(SHOW_HELPERS); diff --git a/modules/ImNDT/iAImNDTModuleInterface.cpp b/modules/ImNDT/iAImNDTModuleInterface.cpp index 5cb37cf35..5b2f6f4e0 100644 --- a/modules/ImNDT/iAImNDTModuleInterface.cpp +++ b/modules/ImNDT/iAImNDTModuleInterface.cpp @@ -280,7 +280,6 @@ void iAImNDTModuleInterface::renderVolume() auto child = m_mainWnd->activeMdiChild(); m_volumeRenderer = std::make_shared(m_vrEnv->renderer(), child->firstImageData().Get(), dynamic_cast(child->dataSetViewer(child->firstImageDataSetIdx()))->transfer()); - //m_volumeRenderer->applySettings(child->volumeSettings()); m_volumeRenderer->setVisible(true); m_volumeRenderer->setBoundsVisible(true); m_vrEnv->start(); diff --git a/modules/InSpectr/dlg_InSpectr.cpp b/modules/InSpectr/dlg_InSpectr.cpp index dc5e1d405..bc995ecb0 100644 --- a/modules/InSpectr/dlg_InSpectr.cpp +++ b/modules/InSpectr/dlg_InSpectr.cpp @@ -950,7 +950,6 @@ void dlg_InSpectr::showLinkedElementMaps( int show ) InitElementRenderer( elemRend, i ); bool slicerVisibility[3] = { false, false, false }; elemRend->GetRenderer()->applySettings(mdiChild->renderSettings(), slicerVisibility); - elemRend->ApplyVolumeSettings(mdiChild->volumeSettings()); m_rendererManager.addToBundle(elemRend->GetRenderer()->renderer()); m_elementRenderers.push_back( elemRend ); if(isFirst) diff --git a/modules/InSpectr/dlg_elementRenderer.cpp b/modules/InSpectr/dlg_elementRenderer.cpp index aae03e24e..be814c305 100644 --- a/modules/InSpectr/dlg_elementRenderer.cpp +++ b/modules/InSpectr/dlg_elementRenderer.cpp @@ -48,8 +48,3 @@ size_t dlg_elementRenderer::GetRefLibIndex() { return m_indexInReferenceLib; } - -void dlg_elementRenderer::ApplyVolumeSettings(iAVolumeSettings const & vs) -{ - m_volumeRenderer->applyAttributes(vs.toMap()); -} diff --git a/modules/InSpectr/dlg_elementRenderer.h b/modules/InSpectr/dlg_elementRenderer.h index 9e8842f8c..b450553a3 100644 --- a/modules/InSpectr/dlg_elementRenderer.h +++ b/modules/InSpectr/dlg_elementRenderer.h @@ -34,7 +34,6 @@ class dlg_elementRenderer : public dlg_elemRendererContainer iARenderer * GetRenderer(); void SetRefLibIndex(size_t index); size_t GetRefLibIndex(); - void ApplyVolumeSettings(iAVolumeSettings const & vs); private: iARendererImpl * m_renderer;