Backport S-Rep support updates

src/CMakeLists.txt

@@ -21,6 +21,7 @@ set(CXX_FILES
   backgroundDialogQT.cxx
   cameraDialogQT.cxx
   CSVloaderQT.cxx
+  timeSeriesLoaderQT.cxx
   customizeColorMapByDirectionDialogQT.cxx
   gradientArrow.cxx
   gradientWidgetQT.cxx
@@ -38,6 +39,7 @@ set(UI_FILES
   backgroundDialogQT.ui
   cameraDialogQT.ui
   CSVloaderQT.ui
+  timeSeriesLoaderQT.ui
   customizeColorMapByDirectionDialogQT.ui
   ShapePopulationMainWindowQT.ui
   ShapePopulationQT.ui
@@ -47,6 +49,7 @@ set(QT_WRAP
   backgroundDialogQT.h
   cameraDialogQT.h
   CSVloaderQT.h
+  timeSeriesLoaderQT.h
   customizeColorMapByDirectionDialogQT.h
   gradientWidgetQT.h
   ShapePopulationGradientWidgetQT.h
@@ -90,6 +93,8 @@ if(ShapePopulationViewer_BUILD_SLICER_EXTENSION)
 
   # Current_{source,binary} and Slicer_{Libs,Base} already included
   set(MODULE_INCLUDE_DIRECTORIES
+    ${vtkSlicerSRepModuleMRML_INCLUDE_DIRS}
+    ${vtkSlicerSRepModuleLogic_INCLUDE_DIRS}
     )
   set(MODULE_SRCS
     qSlicer${MODULE_NAME}LayoutViewFactory.cxx
@@ -109,6 +114,8 @@ if(ShapePopulationViewer_BUILD_SLICER_EXTENSION)
     )
   set(MODULE_TARGET_LIBRARIES
     ${LOCAL_PROJECT_NAME}Widget
+    vtkSlicerSRepModuleMRML
+    vtkSlicerSRepModuleLogic
     )
   set(MODULE_RESOURCES
     )

src/CSVloaderQT.cxx

@@ -55,13 +55,13 @@ void CSVloaderQT::on_buttonBox_accepted()
     for (int i = 0; i < fileList.size(); i++)
     {
         QString QFilePath = fileList[i].absoluteFilePath();
-        if (!QFilePath.endsWith(".vtk") && !QFilePath.endsWith(".vtp"))
+        if (!QFilePath.endsWith(".vtk") && !QFilePath.endsWith(".vtp") && !QFilePath.endsWith(".xml") && !QFilePath.endsWith(".srep.json"))
         {
             fileList.removeAt(i);
             i--;
             std::ostringstream strs;
             strs << QFilePath.toStdString() << std::endl
-                 << "This is not a vtk/vtp file."<< std::endl;
+                 << "This is not a vtk/vtp/xml/srep.json file."<< std::endl;
             QMessageBox::critical(this,"Wrong file format",QString(strs.str().c_str()), QMessageBox::Ok);
         }
         else if(!fileList[i].exists())

src/ShapePopulationBase.cxx

@@ -257,6 +257,95 @@ vtkRenderWindow* ShapePopulationBase::CreateNewWindow(ShapePopulationData* a_mes
     return renderWindow;
 }
 
+void ShapePopulationBase::UpdateWindows()
+{
+    unsigned int i;
+    for (i = 0; i < m_meshList.size(); i++)
+    {
+        //MAPPER
+        vtkNew<vtkPolyDataMapper> mapper;
+        mapper->SetInputData(m_meshList[i]->GetPolyData());
+
+        //ACTOR
+        vtkSmartPointer<vtkActor> actor = vtkSmartPointer<vtkActor>::New();
+        actor->SetMapper(mapper);
+
+        /* VECTORS */
+        //Arrow
+        vtkNew<vtkArrowSource> arrow;
+        m_glyphList[i]->SetSourceConnection(arrow->GetOutputPort());
+        m_glyphList[i]->SetInputData(m_meshList[i]->GetPolyData());
+        m_glyphList[i]->ScalingOn();
+        m_glyphList[i]->OrientOn();
+        m_glyphList[i]->ClampingOff();
+        m_glyphList[i]->SetColorModeToColorByVector();
+        m_glyphList[i]->SetScaleModeToScaleByVector();
+        m_glyphList[i]->SetVectorModeToUseVector();
+        m_glyphList[i]->Update();
+
+        //Mapper & Actor
+        vtkNew<vtkPolyDataMapper> glyphMapper;
+        glyphMapper->SetInputData(m_glyphList[i]->GetOutput());
+        vtkNew<vtkActor> glyphActor;
+        glyphActor->SetMapper(glyphMapper);
+
+        /* END VECTORS */
+
+        //RENDERER
+        auto renderer = m_windowsList[i]->GetRenderers()->GetFirstRenderer();
+        renderer->RemoveAllViewProps();
+
+        renderer->AddActor(actor);
+        renderer->AddActor(glyphActor);
+        renderer->SetActiveCamera(m_headcam); //set the active camera for this renderer to main camera
+        renderer->ResetCamera();
+        //renderer->SetUseDepthPeeling(true);/*test opacity*/
+
+//        //INTERACTOR
+//        vtkSmartPointer<vtkRenderWindowInteractor> interactor = vtkSmartPointer<vtkRenderWindowInteractor>::New();
+//        renderWindow->SetInteractor(interactor);
+
+        //ANNOTATIONS (file name)
+        vtkSmartPointer<vtkCornerAnnotation> fileName = vtkSmartPointer<vtkCornerAnnotation>::New();
+        fileName->SetLinearFontScaleFactor( 2 );
+        fileName->SetNonlinearFontScaleFactor( 1 );
+        fileName->SetMaximumFontSize( 15 );
+        fileName->SetText(2,m_meshList[i]->GetFileName().c_str());
+        fileName->GetTextProperty()->SetColor(m_labelColor);
+        renderer->AddViewProp(fileName);
+
+        //ANNOTATIONS (attribute name)
+        vtkNew<vtkCornerAnnotation> attributeName;
+        attributeName->SetLinearFontScaleFactor(2);
+        attributeName->SetNonlinearFontScaleFactor(1);
+        attributeName->SetMaximumFontSize(15);
+        attributeName->SetText(0," ");
+        attributeName->GetTextProperty()->SetColor(m_labelColor);
+        renderer->AddViewProp(attributeName);
+
+        // SCALAR BAR
+        vtkNew<vtkScalarBarActor> scalarBar;
+        scalarBar->SetLookupTable(mapper->GetLookupTable());
+    //    scalarBar->SetTitle("Title");
+        scalarBar->SetNumberOfLabels(5);
+        scalarBar->SetMaximumWidthInPixels(60);
+
+        vtkNew<vtkTextProperty> LabelProperty;
+        LabelProperty->SetFontSize(12);
+        LabelProperty->SetColor(m_labelColor);
+
+        scalarBar->SetLabelTextProperty(LabelProperty);
+        scalarBar->SetTitleTextProperty(LabelProperty);
+        renderer->AddActor2D(scalarBar);
+
+        //DISPLAY
+        if (m_displayMeshName == false) fileName->SetVisibility(0);
+        if (m_displayAttribute == false) attributeName->SetVisibility(0);
+        if (m_displayColorbar == false) scalarBar->SetVisibility(0);
+    }
+    RenderAll();
+}
+
 // * ///////////////////////////////////////////////////////////////////////////////////////////// * //
 // *                                          SELECTION                                            * //
 // * ///////////////////////////////////////////////////////////////////////////////////////////// * //

src/ShapePopulationBase.h

@@ -89,6 +89,7 @@ class ShapePopulationBase
     vtkRenderWindow* CreateNewWindow(std::string a_filePath, bool testing = false);
     vtkRenderWindow* CreateNewWindow(vtkPolyData* a_popyData, std::string a_filePath, bool testing = false);
     vtkRenderWindow* CreateNewWindow(ShapePopulationData* a_mesh, bool testing = false);
+    void UpdateWindows();
 
     //SELECTION
     unsigned int getSelectedIndex(vtkSmartPointer<vtkRenderWindow> a_selectedWindow);