Working on streamline processing

Author: dcwhite

src/ExampleNets/regression/osprayStreamlines.srn5

@@ -3508,7 +3508,7 @@
 									<name>ScaleBarFontSize</name>
 									<value>
 										<which>0</which>
-										<value>1</value>
+										<value>99</value>
 									</value>
 								</second>
 							</item>
@@ -3520,7 +3520,7 @@
 									<name>ScaleBarHeight</name>
 									<value>
 										<which>1</which>
-										<value>0.00000000000000000e+00</value>
+										<value>9.99899999999999949e+01</value>
 									</value>
 								</second>
 							</item>
@@ -3710,7 +3710,7 @@
 			</item>
 		</modules>
 		<connections class_id="13" tracking_level="0" version="0">
-			<count>24</count>
+			<count>25</count>
 			<item_version>0</item_version>
 			<item class_id="14" tracking_level="0" version="0">
 				<moduleId1_>CalculateGradients:0</moduleId1_>
@@ -3856,6 +3856,18 @@
 					<id>0</id>
 				</port2_>
 			</item>
+			<item>
+				<moduleId1_>GenerateStreamLines:0</moduleId1_>
+				<port1_>
+					<name>Streamlines</name>
+					<id>0</id>
+				</port1_>
+				<moduleId2_>InterfaceWithOspray:0</moduleId2_>
+				<port2_>
+					<name>Streamlines</name>
+					<id>0</id>
+				</port2_>
+			</item>
 			<item>
 				<moduleId1_>GenerateStreamLines:0</moduleId1_>
 				<port1_>

src/Interface/Modules/Visualization/InterfaceWithOspray.ui

@@ -29,7 +29,7 @@
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -635,6 +635,9 @@
          <layout class="QGridLayout" name="gridLayout_11">
           <item row="0" column="0">
            <widget class="QComboBox" name="lightTypeComboBox_">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -646,11 +649,6 @@
               <string>ambient</string>
              </property>
             </item>
-            <item>
-             <property name="text">
-              <string>none</string>
-             </property>
-            </item>
             <item>
              <property name="text">
               <string>spot</string>

src/Modules/Visualization/InterfaceWithOspray.cc

@@ -183,7 +183,7 @@ namespace detail
       ospCommit(world_);
     }
 
-    void addField(FieldHandle field, boost::optional<ColorMapHandle> colorMap)
+    void adjustCameraPosition(FieldHandle field)
     {
       if (state_->getValue(Parameters::AutoCameraView).toBool())
       {
@@ -207,10 +207,12 @@ namespace detail
         ospSet3fv(camera_, "up", newUp);
         ospCommit(camera_);
       }
+    }
 
+    void fillDataBuffers(FieldHandle field, ColorMapHandle colorMap)
+    {
       auto facade(field->mesh()->getFacade());
 
-      auto map = colorMap.value_or(nullptr);
       fieldData_.push_back({});
       auto& fieldData = fieldData_.back();
       auto& vertex = fieldData.vertex;
@@ -232,9 +234,9 @@ namespace detail
           vertex.push_back(0);
 
           vfield->get_value(value, node.index());
-          if (map)
+          if (colorMap)
           {
-            nodeColor = map->valueToColor(value);
+            nodeColor = colorMap->valueToColor(value);
           }
           color.push_back(static_cast<float>(nodeColor.r()));
           color.push_back(static_cast<float>(nodeColor.g()));
@@ -254,6 +256,19 @@ namespace detail
         }
       }
 
+    }
+
+    void addField(FieldHandle field, ColorMapHandle colorMap)
+    {
+      adjustCameraPosition(field);
+
+      fillDataBuffers(field, colorMap);
+
+      const auto& fieldData = fieldData_.back();
+      const auto& vertex = fieldData.vertex;
+      const auto& color = fieldData.color;
+      const auto& index = fieldData.index;
+
       // create and setup model and mesh
       OSPGeometry mesh = ospNewGeometry("triangles");
       OSPData data = ospNewData(vertex.size() / 4, OSP_FLOAT3A, &vertex[0]); // OSP_FLOAT3 format is also supported for vertex positions
@@ -272,9 +287,55 @@ namespace detail
       ospCommit(world_);
     }
 
+    void addStreamline(FieldHandle field)
+    {
+      auto vfield = field->vfield();
+      auto vmesh  = field->vmesh();
+      auto td = field->get_type_description();
+      if (td)
+      {
+        const auto& tname = td->get_name();
+        std::cout << __FUNCTION__ << " " << tname << std::endl;
+      }
+
+      adjustCameraPosition(field);
+
+      fillDataBuffers(field, nullptr);
+
+      const auto& fieldData = fieldData_.back();
+      const auto& vertex = fieldData.vertex;
+      const auto& color = fieldData.color;
+
+      auto& index = fieldData.index;
+      {
+        for (const auto& edge : facade->edges())
+        {
+          auto nodesFromEdge = edge.nodeIndices();
+          //auto nodePoints = edge.nodePoints();
+          std::cout << "Edge " << edge.index() << " nodes=[" << nodesFromEdge[0] << ", " << nodesFromEdge[1] << "]" << std::endl;
+        }
+      }
+
+      // create and setup model and mesh
+      OSPGeometry streamlines = ospNewGeometry("streamlines");
+      OSPData data = ospNewData(vertex.size() / 4, OSP_FLOAT3A, &vertex[0]);
+      ospCommit(data);
+      ospSetData(streamlines, "vertex", data);
+      data = ospNewData(vertex.size() / 4, OSP_FLOAT4, &color[0]);
+      ospCommit(data);
+      ospSetData(streamlines, "vertex.color", data);
+      // data = ospNewData(index.size() / 3, OSP_INT3, &index[0]);
+      // ospCommit(data);
+      // ospSetData(streamlines, "index", data);
+      ospCommit(mesh);
+
+      meshes_.push_back(mesh);
+      ospAddGeometry(world_, mesh);
+      ospCommit(world_);
+    }
+
     void render()
     {
-      // create renderer
       renderer_ = ospNewRenderer("scivis"); // choose Scientific Visualization renderer
 
       // create and setup light for Ambient Occlusion
@@ -373,6 +434,7 @@ void InterfaceWithOspray::execute()
   #ifdef WITH_OSPRAY
   auto fields = getRequiredDynamicInputs(Field);
   auto colorMaps = getOptionalDynamicInputs(ColorMapObject);
+  auto streamlines = getOptionalDynamicInputs(Streamlines);
 
   if (needToExecute())
   {
@@ -385,7 +447,7 @@ void InterfaceWithOspray::execute()
     for (auto&& fieldColor : zip(fields, colorMaps))
     {
       FieldHandle field;
-      boost::optional<ColorMapHandle> color;
+      ColorMapHandle color;
       boost::tie(field, color) = fieldColor;
 
       FieldInformation info(field);
@@ -395,6 +457,17 @@ void InterfaceWithOspray::execute()
 
       ospray.addField(field, color);
     }
+
+    for (auto& streamline : streamlines)
+    {
+      FieldInformation info(streamline);
+
+      if (!info.is_curvemesh())
+        THROW_INVALID_ARGUMENT("Module currently only works with curvemesh streamlines.");
+
+      ospray.addStreamline(streamline);
+    }
+
     ospray.render();
 
     auto isoString = boost::posix_time::to_iso_string(boost::posix_time::microsec_clock::universal_time());