Adding dataprovider

starting to add a class to get the models and transfer functions.

Author: lquatrin

cppvolrend/renderingmanager.cpp

@@ -1046,8 +1046,9 @@ void RenderingManager::SetImGuiInterface ()
         if (m_data_mgr.GetNumberOfStructuredDatasets() > 0)
         {
           int volume_index = m_data_mgr.GetCurrentVolumeIndex();
+          std::vector<std::string>& ui_strgrid_names = m_data_mgr.GetUINameDatasetList();
           if (ImGui::Combo("###CurrentVolumeDataID", &volume_index, vector_getter,
-            static_cast<void*>(m_data_mgr.GetUINameDatasetListPtr()), m_data_mgr.GetUINameDatasetListPtr()->size()))
+            static_cast<void*>(&ui_strgrid_names), ui_strgrid_names.size()))
           {
             if (volume_index != m_data_mgr.GetCurrentVolumeIndex())
             {
@@ -1102,8 +1103,9 @@ void RenderingManager::SetImGuiInterface ()
     if (ImGui::CollapsingHeader("Transfer Function###DataMdanagerTransferFunction"))
     {
       int transfer_function_index = m_data_mgr.GetCurrentTransferFunctionIndex();
+      std::vector<std::string>& ui_tf_names = m_data_mgr.GetUINameTransferFunctionList();
       if (ImGui::Combo("###CurrentTransferFunction1DID", &transfer_function_index, vector_getter,
-        static_cast<void*>(m_data_mgr.GetUINameTransferFunctionListPtr()), m_data_mgr.GetUINameTransferFunctionListPtr()->size()))
+        static_cast<void*>(&ui_tf_names), ui_tf_names.size()))
       {
         if (transfer_function_index != m_data_mgr.GetCurrentTransferFunctionIndex())
         {

data/volume_list.csv

@@ -0,0 +1,3 @@
+sep=;
+Name;Source;File;Size;Spacing;Type
+Bonsai;raw;Bonsai.1.256x256x256.raw;256x256x256;1x1x1;uchar

libs/volvis_utils/CMakeLists.txt

@@ -17,7 +17,8 @@ add_library(volvis_utils STATIC camerastatelist.cpp        camerastatelist.h
                                 transferfunction1d.cpp     transferfunction1d.h
                                 unstructuredgridvolume.cpp unstructuredgridvolume.h
                                 utils.cpp                  utils.h
-                                tetrahedron.cpp            tetrahedron.h)
+                                tetrahedron.cpp            tetrahedron.h
+                                dataprovider.cpp           dataprovider.h)
 
 include_directories(${CMAKE_SOURCE_DIR}/include)
 add_definitions(-DEXPMODULE)

libs/volvis_utils/datamanager.cpp

@@ -28,15 +28,17 @@ namespace vis
     , curr_gl_tex_structured_volume(nullptr)
     , curr_gl_tex_structured_gradient(nullptr)
   {
+    m_path_to_data = "";
+#ifdef USE_DATA_PROVIDER
+    m_data_provider = std::make_unique<DataProvider>();
+#else
     // structured, unstructured and transfer function list...
     stored_structured_datasets.clear();
     stored_transfer_functions.clear();
-    
-    m_path_to_data = "";
-
 
     ui_dataset_names.clear();
     ui_transferf_names.clear();
+#endif
   }
 
   DataManager::~DataManager ()
@@ -66,6 +68,16 @@ namespace vis
 
   void DataManager::ReadData ()
   {
+#ifdef USE_DATA_PROVIDER
+    m_data_provider->ClearStructuredGridFileList();
+    m_data_provider->ClearTransferFunctionFileList();
+
+    if (curr_vol_data_type == vis::GRID_VOLUME_DATA_TYPE::STRUCTURED) {
+      //m_data_provider->SetStructuredGridFileList(m_path_to_data, "#list_structured_datasets");
+      m_data_provider->SetStructuredGridFileList(m_path_to_data, "volume_list.csv");
+      curr_volume_index = 0;
+    }
+#else
     stored_structured_datasets.clear();
     stored_transfer_functions.clear();
 
@@ -74,22 +86,27 @@ namespace vis
 
     if (curr_vol_data_type == vis::GRID_VOLUME_DATA_TYPE::STRUCTURED)
       ReadStructuredDatasetsFromRes();
+#endif
 
     ReadTransferFunctionsFromRes();
 
     if (curr_vol_data_type == vis::GRID_VOLUME_DATA_TYPE::STRUCTURED)
     {
       GenerateStructuredVolumeTexture();
     }
-    
+
     vis::TransferFunctionReader tfr;
     curr_vr_transferfunction = tfr.ReadTransferFunction(stored_transfer_functions[GetCurrentTransferFunctionIndex()].path);
     curr_vr_transferfunction->SetName(stored_transfer_functions[GetCurrentTransferFunctionIndex()].name);
   }
 
   int DataManager::GetNumberOfStructuredDatasets ()
   {
+#ifdef USE_DATA_PROVIDER
+    return m_data_provider->GetNumberOfStructuredGrids();
+#else
     return stored_structured_datasets.size();
+#endif
   }
 
   int DataManager::GetCurrentVolumeIndex ()
@@ -99,9 +116,13 @@ namespace vis
 
   std::string DataManager::GetCurrentVolumeName ()
   {
-    if (GetInputVolumeDataType() == vis::GRID_VOLUME_DATA_TYPE::STRUCTURED)
+    if (GetInputVolumeDataType() == vis::GRID_VOLUME_DATA_TYPE::STRUCTURED) 
     {
+#ifdef USE_DATA_PROVIDER
+      return m_data_provider->GetStructuredGridNameList()[GetCurrentVolumeIndex()];
+#else
       return stored_structured_datasets[GetCurrentVolumeIndex()].name;
+#endif
     }
     return "";
   }
@@ -171,15 +192,14 @@ namespace vis
   {
     return curr_gl_tex_structured_gradient;
   }
-  
-  std::vector<std::string>* DataManager::GetUINameDatasetListPtr ()
-  {
-    return &ui_dataset_names;
-  }
 
-  std::vector<std::string>* DataManager::GetUINameTransferFunctionListPtr ()
+  std::vector<std::string>& DataManager::GetUINameTransferFunctionList ()
   {
-    return &ui_transferf_names;
+#ifdef USE_DATA_PROVIDER
+    return m_data_provider->GetTransferFunctionNameList();
+#else
+    return ui_transferf_names;
+#endif
   }
 
   ////////////////////////////////////////////////////////////////////////
@@ -208,45 +228,46 @@ namespace vis
     curr_vr_transferfunction = nullptr;
   }
 
+#ifndef USE_DATA_PROVIDER
   void DataManager::ReadStructuredDatasetsFromRes ()
   {
     std::string line;
     std::string model_read_filename = m_path_to_data;
     model_read_filename.append("/#list_structured_datasets");
     std::ifstream f_openmodels(model_read_filename);
-    
+
     if (!f_openmodels.is_open())
     {
       std::cout << "Error: Unable to read vol rendering datasets." << std::endl;
       exit(EXIT_FAILURE);
     }
-    
+
     std::cout << "Reading structured datasets..." << std::endl;
     while (!f_openmodels.eof())
     {
       line.clear();
       std::getline(f_openmodels, line);
-    
+
       int start_path = line.find_first_of("<") + 1;
       int end_path = line.find_first_of(">");
-    
+
       int start_name = line.find_last_of("<") + 1;
       int end_name = line.find_last_of(">");
-    
+
       stored_structured_datasets.push_back(DataReference(
         line.substr(start_path, end_path - start_path),
         line.substr(start_name, end_name - start_name),
         m_path_to_data
       ));
     }
     f_openmodels.close();
-    
+
     for (int i = 0; i < stored_structured_datasets.size(); i++)
     {
       std::cout << i << ": " << stored_structured_datasets[i].name << std::endl;
       ui_dataset_names.push_back(stored_structured_datasets[i].name);
     }
-   
+
     curr_volume_index = 0;
   }
 
@@ -256,43 +277,48 @@ namespace vis
     std::string tfunc_read_filename = m_path_to_data;
     tfunc_read_filename.append("/#list_transfer_functions");
     std::ifstream f_opentransferfunctions(tfunc_read_filename);
-    
+
     if (!f_opentransferfunctions.is_open())
     {
       std::cout << "Error: Unable to read vol rendering transfer functions." << std::endl;
       exit(EXIT_FAILURE);
     }
-    
+
     std::cout << "Reading Transfer Functions...";
     while (!f_opentransferfunctions.eof())
     {
       line.clear();
       std::getline(f_opentransferfunctions, line);
-    
+
       int start_path = line.find_first_of("<") + 1;
       int end_path = line.find_first_of(">");
-    
+
       int start_name = line.find_last_of("<") + 1;
       int end_name = line.find_last_of(">");
-    
+
       stored_transfer_functions.push_back(DataReference(
         line.substr(start_path, end_path - start_path),
         line.substr(start_name, end_name - start_name),
         m_path_to_data
       ));
     }
     f_opentransferfunctions.close();
-    
+
     for (int i = 0; i < stored_transfer_functions.size(); i++)
       ui_transferf_names.push_back(stored_transfer_functions[i].name);
   }
+#endif
 
   bool DataManager::GenerateStructuredVolumeTexture ()
   {
     // Read Volume
+#ifdef USE_DATA_PROVIDER
+    curr_vr_volume = m_data_provider->LoadStructuredGrid(GetCurrentVolumeIndex());
+#else
     vis::VolumeReader vr;
     curr_vr_volume = vr.ReadStructuredVolume(stored_structured_datasets[GetCurrentVolumeIndex()].path);
-    curr_vr_volume->SetName(stored_structured_datasets[GetCurrentVolumeIndex()].name);
+    curr_vr_volume->SetName(stored_structured_datasets[GetCurrentVolumeIndex()].name); 
+#endif
 
     // Generate Volume Texture
     curr_gl_tex_structured_volume = vis::GenerateRTexture(curr_vr_volume, 0, 0, 0, curr_vr_volume->GetWidth(),
@@ -347,7 +373,7 @@ namespace vis
   {
     if (curr_vol_data_type == vis::GRID_VOLUME_DATA_TYPE::STRUCTURED)
     {
-      if (curr_volume_index + 1 < stored_structured_datasets.size())
+      if (curr_volume_index + 1 < GetNumberOfStructuredDatasets())
       {
         curr_volume_index += 1;
         DeleteVolumeData();
@@ -364,18 +390,27 @@ namespace vis
   {
     if (curr_vol_data_type == vis::GRID_VOLUME_DATA_TYPE::STRUCTURED)
     {
-      for(int i = 0; i < stored_structured_datasets.size(); i++)
+#ifdef USE_DATA_PROVIDER
+      int new_volume_id = m_data_provider->FindStructuredGridName(name);
+      if (new_volume_id != -1) {
+        curr_volume_index = new_volume_id;
+        DeleteVolumeData();
+        GenerateStructuredVolumeTexture();
+        return true;
+      }
+#else
+      for (int i = 0; i < stored_structured_datasets.size(); i++) 
       {
         if (stored_structured_datasets[i].name.compare(name) == 0)
         {
           curr_volume_index = i;
           DeleteVolumeData();
 
           GenerateStructuredVolumeTexture();
-
           return true;
         }
       }
+#endif
     }
     return false;
   }
@@ -384,7 +419,7 @@ namespace vis
   {
     if (curr_vol_data_type == vis::GRID_VOLUME_DATA_TYPE::STRUCTURED)
     {
-      if (id < stored_structured_datasets.size())
+      if (id < GetNumberOfStructuredDatasets())
       {
         curr_volume_index = id;
         DeleteVolumeData();
@@ -577,6 +612,15 @@ namespace vis
     return vlist;
   }
 
+  std::vector<std::string>& DataManager::GetUINameDatasetList ()
+  {
+#ifdef USE_DATA_PROVIDER
+    return m_data_provider->GetStructuredGridNameList();
+#else
+    return ui_dataset_names;
+#endif
+  }
+
   gl::Texture3D* DataManager::GenerateGradientWithComputeShader ()
   {
     // Get Current Volume

libs/volvis_utils/datamanager.h

@@ -25,6 +25,7 @@
 
 #include <iostream>
 
+#include <volvis_utils/dataprovider.h>
 #include <volvis_utils/gridvolume.h>
 #include <volvis_utils/structuredgridvolume.h>
 #include <volvis_utils/unstructuredgridvolume.h>
@@ -36,6 +37,8 @@
 #include <gl_utils/computeshader.h>
 #include <gl_utils/pipelineshader.h>
 
+//#define USE_DATA_PROVIDER
+
 namespace vis
 {
   class DataReference
@@ -113,16 +116,17 @@ namespace vis
     std::string CurrentGradientName ();
     std::vector<std::string> GetGradientGenerationTypeStrList ();
 
-    std::vector<std::string>* GetUINameDatasetListPtr ();
-    std::vector<std::string>* GetUINameTransferFunctionListPtr ();
+    std::vector<std::string>& GetUINameDatasetList ();
+    std::vector<std::string>& GetUINameTransferFunctionList ();
 
     void DeleteVolumeData ();
     void DeleteTransferFunctionData ();
     void DeleteGradientData ();
   protected:
-
+#ifndef USE_DATA_PROVIDER
     void ReadStructuredDatasetsFromRes ();
     void ReadTransferFunctionsFromRes ();
+#endif
 
     bool GenerateStructuredVolumeTexture ();
     bool GenerateStructuredGradientTexture ();
@@ -136,10 +140,6 @@ namespace vis
     vis::GRID_VOLUME_DATA_TYPE curr_vol_data_type;
     bool use_specific_lookup_data_shader;
 
-    // structured, unstructured and transfer function list...
-    std::vector<DataReference> stored_structured_datasets;
-    std::vector<DataReference> stored_transfer_functions;
-
     // structured datasets
     vis::StructuredGridVolume* curr_vr_volume;
     gl::Texture3D* curr_gl_tex_structured_volume;
@@ -157,27 +157,17 @@ namespace vis
     gl::Texture3D* curr_gl_tex_structured_gradient;
 
     std::string m_path_to_data;
-
-    //// data and transfer function list...
-    //int m_curr_volume_index;
-    //std::vector<DataReference> m_stored_datasets;
-    //int m_curr_transferfunction_index;
-    //std::vector<DataReference> m_stored_transfer_functions;
-    //
-    //VOL_DATA_TYPE m_curr_data_type;
-    //
-    //// structured datasets
-    //vis::StructuredGridVolume* m_curr_structured_volume;
-    //gl::Texture3D* m_curr_tex_structured_volume;
-    //
-    //// transfer function
-    //vis::TransferFunction* m_curr_transferfunction;
-    //
-    //STRUCTURED_GRADIENT_TYPE m_curr_gradient_type;
-    //gl::Texture3D* m_curr_tex_structured_gradient;
+    
+#ifdef USE_DATA_PROVIDER
+    std::unique_ptr<DataProvider> m_data_provider;
+#else
+    // structured, unstructured and transfer function list...
+    std::vector<DataReference> stored_structured_datasets;
+    std::vector<DataReference> stored_transfer_functions;
 
     std::vector<std::string> ui_dataset_names;
     std::vector<std::string> ui_transferf_names;
+#endif
   private:
 
   };