From: Leonardo Florez-Valencia <florez-l@javeriana.edu.co>
Date: Fri, 20 May 2016 22:59:49 +0000 (-0500)
Subject: ...
X-Git-Tag: v0.1~160
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b2bb173d0feca93ca889a80280a1f5d2a87de402;p=cpPlugins.git

...
---

diff --git a/appli/PipelineEditor/PipelineEditor.cxx b/appli/PipelineEditor/PipelineEditor.cxx
index 0f2d3fd..b61cd14 100644
--- a/appli/PipelineEditor/PipelineEditor.cxx
+++ b/appli/PipelineEditor/PipelineEditor.cxx
@@ -123,20 +123,20 @@ _HideFilterOutput(
   const std::string& filter_name, const std::string& output_name
   )
 {
-  /*
   // Get output
-  auto filter = this->m_Workspace.GetFilter( filter_name );
-  if( filter != NULL )
-  {
-    auto output = filter->GetOutputData( output_name );
-    if( output != NULL )
-    {
-      std::string data_name = output_name + "@" + filter_name;
-      this->m_UI->Viewer->HideData( data_name );
+  /* TODO
+     auto filter = this->m_Workspace.GetFilter( filter_name );
+     if( filter != NULL )
+     {
+     auto output = filter->GetOutputData( output_name );
+     if( output != NULL )
+     {
+     std::string data_name = output_name + "@" + filter_name;
+     this->m_UI->Viewer->HideData( data_name );
 
-    } // fi
+     } // fi
 
-  } // fi
+     } // fi
   */
 }
 
@@ -146,22 +146,25 @@ _PropertiesFilterOutput(
   const std::string& filter_name, const std::string& output_name
   )
 {
-  /*
   // Get output
   auto filter = this->m_Workspace.GetFilter( filter_name );
   if( filter != NULL )
   {
-    auto output = filter->GetOutputData( output_name );
+    auto output = filter->GetOutputData< vtkPolyData >( output_name );
     if( output != NULL )
     {
-      std::string data_name = output_name + "@" + filter_name;
-      auto prop = this->m_UI->Viewer->GetProp( data_name );
+      auto actor = this->m_UI->Viewer->GetActor( output );
+      if( actor != NULL )
+      {
+        cpExtensions::QT::PropertyWidget* wdg =
+          new cpExtensions::QT::PropertyWidget( NULL );
+        wdg->SetProp( actor );
+        wdg->SetRenderWindow(
+          this->m_UI->Viewer->GetInteractor( 3 )->GetRenderWindow( )
+          );
+        wdg->show( );
 
-      cpExtensions::QT::PropertyWidget* wdg =
-        new cpExtensions::QT::PropertyWidget( NULL );
-      wdg->SetProp( prop );
-      wdg->SetRenderWindow( this->m_UI->Viewer->GetInteractor( 3 )->GetRenderWindow( ) );
-      wdg->show( );
+      } // fi
     }
     else
       QMessageBox::critical(
@@ -171,7 +174,6 @@ _PropertiesFilterOutput(
         );
 
   } // fi
-  */
 }
 
 // eof - $RCSfile$
diff --git a/appli/PipelineEditor/PipelineEditor.ui b/appli/PipelineEditor/PipelineEditor.ui
index 4a3e330..3b92d74 100644
--- a/appli/PipelineEditor/PipelineEditor.ui
+++ b/appli/PipelineEditor/PipelineEditor.ui
@@ -162,7 +162,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>27</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="MenuFile">
@@ -180,7 +180,21 @@
     <addaction name="separator"/>
     <addaction name="ActionExit"/>
    </widget>
+   <widget class="QMenu" name="menu_View">
+    <property name="title">
+     <string>&amp;View</string>
+    </property>
+    <widget class="QMenu" name="menuBackgrounds">
+     <property name="title">
+      <string>Backgrounds</string>
+     </property>
+     <addaction name="ActionBackground3D"/>
+     <addaction name="ActionBackgroundMPR"/>
+    </widget>
+    <addaction name="menuBackgrounds"/>
+   </widget>
    <addaction name="MenuFile"/>
+   <addaction name="menu_View"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <action name="ActionOpenWorkspace">
@@ -198,6 +212,16 @@
     <string>E&amp;xit</string>
    </property>
   </action>
+  <action name="ActionBackgroundMPR">
+   <property name="text">
+    <string>MPR</string>
+   </property>
+  </action>
+  <action name="ActionBackground3D">
+   <property name="text">
+    <string>3D</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/lib/cpExtensions/QT/SimpleMPRWidget.cxx b/lib/cpExtensions/QT/SimpleMPRWidget.cxx
index 73f3b76..0cede9d 100644
--- a/lib/cpExtensions/QT/SimpleMPRWidget.cxx
+++ b/lib/cpExtensions/QT/SimpleMPRWidget.cxx
@@ -149,6 +149,17 @@ GetInteractor( unsigned int i )
     return( NULL );
 }
 
+// -------------------------------------------------------------------------
+vtkActor* cpExtensions::QT::SimpleMPRWidget::
+GetActor( vtkPolyData* mesh )
+{
+  auto i = this->m_PolyDatas.find( mesh );
+  if( i != this->m_PolyDatas.end( ) )
+    return( i->second.Actor.GetPointer( ) );
+  else
+    return( NULL );
+}
+
 // -------------------------------------------------------------------------
 void cpExtensions::QT::SimpleMPRWidget::
 _SyncBottom( int a, int b )
diff --git a/lib/cpExtensions/QT/SimpleMPRWidget.h b/lib/cpExtensions/QT/SimpleMPRWidget.h
index 149abb8..f6d90f0 100644
--- a/lib/cpExtensions/QT/SimpleMPRWidget.h
+++ b/lib/cpExtensions/QT/SimpleMPRWidget.h
@@ -101,6 +101,8 @@ namespace cpExtensions
       // Visual objects
       vtkRenderWindowInteractor* GetInteractor( unsigned int i );
 
+      vtkActor* GetActor( vtkPolyData* mesh );
+
     private slots:
       void _SyncBottom( int a, int b );
       void _SyncTop( int a, int b );