Pipeline and rendering with pipeline implementation

CMakeLists.txt

@@ -43,7 +43,6 @@ common_find_package(BBPTestData)
 common_find_package(Boost REQUIRED COMPONENTS filesystem program_options thread
                                          system regex unit_test_framework)
 common_find_package(Collage REQUIRED)
-common_find_package(dash REQUIRED)
 common_find_package(Equalizer REQUIRED)
 common_find_package(Lexis REQUIRED)
 common_find_package(LibJpegTurbo)
@@ -62,7 +61,7 @@ common_find_package(ZeroBuf REQUIRED)
 common_find_package_post()
 
 include(EqGLLibraries)
-set(LIVRE_DEPENDENT_LIBRARIES vmmlib Lunchbox dash Equalizer ZeroBuf)
+set(LIVRE_DEPENDENT_LIBRARIES vmmlib Lunchbox Equalizer ZeroBuf)
 
 add_definitions(-DBOOST_PROGRAM_OPTIONS_DYN_LINK) # Fix for windows and shared boost.
 add_subdirectory(livre)

apps/livreGUI/tfEditor/TransferFunctionEditor.ui

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TransferFunctionEditor</class>
+ <widget class="QWidget" name="TransferFunctionEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>518</width>
+    <height>444</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="6" column="0">
+    <layout class="QVBoxLayout" name="blueLayout"/>
+   </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QPushButton" name="clearButton">
+       <property name="text">
+        <string>Clear</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="resetButton">
+       <property name="text">
+        <string>Default</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="loadButton">
+       <property name="text">
+        <string>Load...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="saveButton">
+       <property name="text">
+        <string>Save...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="4" column="0">
+    <layout class="QVBoxLayout" name="redLayout"/>
+   </item>
+   <item row="3" column="0">
+    <layout class="QVBoxLayout" name="rgbaLayout"/>
+   </item>
+   <item row="5" column="0">
+    <layout class="QVBoxLayout" name="greenLayout"/>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Color Map</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

livre/core/CMakeLists.txt

@@ -20,41 +20,43 @@ set(LIVRECORE_PUBLIC_HEADERS
 )
 
 set(LIVRECORE_HEADERS
-  dashTypes.h
   cache/Cache.h
   cache/CacheObject.h
   cache/CacheStatistics.h
   configuration/Configuration.h
   configuration/Parameters.h
-  dash/DashContextTrait.h
-  dash/DashRenderNode.h
-  dash/DashRenderStatus.h
-  dash/DashTree.h
   data/DataSource.h
-  dashpipeline/DashConnection.h
-  dashpipeline/DashProcessor.h
-  dashpipeline/DashProcessorInput.h
-  dashpipeline/DashProcessorOutput.h
   events/EventHandler.h
   events/EventHandlerFactory.h
   events/EventInfo.h
   events/EventMapper.h
   maths/maths.h
   maths/Quantizer.h
-  pipeline/Connection.h
-  pipeline/Processor.h
-  pipeline/ProcessorInput.h
-  pipeline/ProcessorOutput.h
+  pipeline/Executable.h
+  pipeline/Filter.h
+  pipeline/FutureMap.h
+  pipeline/InputPort.h
+  pipeline/OutputPort.h
+  pipeline/PipeFilter.h
+  pipeline/Pipeline.h
+  pipeline/PortData.h
+  pipeline/FuturePromise.h
+  pipeline/PromiseMap.h
+  pipeline/SimpleExecutor.h
+  pipeline/Workers.h
   render/FrameInfo.h
   render/Frustum.h
   render/Renderer.h
+  render/SelectVisibles.h
   render/TexturePool.h
   render/TextureState.h
   render/TransferFunction1D.h
   util/FrameUtils.h
   util/ThreadClock.h
+  visitor/DFSTraversal.h
   visitor/NodeVisitor.h
-  visitor/RenderNodeVisitor.h
+  visitor/DataSourceVisitor.h
+  visitor/DFSTraversal.h
   visitor/VisitState.h)
 
 set(LIVRECORE_SOURCES
@@ -63,24 +65,23 @@ set(LIVRECORE_SOURCES
   cache/CacheStatistics.cpp
   configuration/Configuration.cpp
   configuration/Parameters.cpp
-  dash/DashContextTrait.cpp
-  dash/DashRenderNode.cpp
-  dash/DashRenderStatus.cpp
-  dash/DashTree.cpp
   data/LODNode.cpp
   data/MemoryUnit.cpp
   data/NodeId.cpp
   data/DataSource.cpp
   data/DataSourcePlugin.cpp
   data/VolumeInformation.cpp
-  dashpipeline/DashConnection.cpp
-  dashpipeline/DashProcessor.cpp
-  dashpipeline/DashProcessorInput.cpp
-  dashpipeline/DashProcessorOutput.cpp
   events/EventMapper.cpp
-  pipeline/Processor.cpp
-  pipeline/ProcessorInput.cpp
-  pipeline/ProcessorOutput.cpp
+  pipeline/Executable.cpp
+  pipeline/FutureMap.cpp
+  pipeline/InputPort.cpp
+  pipeline/OutputPort.cpp
+  pipeline/PipeFilter.cpp
+  pipeline/Pipeline.cpp
+  pipeline/FuturePromise.cpp
+  pipeline/PromiseMap.cpp
+  pipeline/SimpleExecutor.cpp
+  pipeline/Workers.cpp
   render/FrameInfo.cpp
   render/Frustum.cpp
   render/GLContext.cpp
@@ -92,11 +93,12 @@ set(LIVRECORE_SOURCES
   util/FrameUtils.cpp
   util/ThreadClock.cpp
   util/Utilities.cpp
-  visitor/RenderNodeVisitor.cpp
+  visitor/DataSourceVisitor.cpp
+  visitor/DFSTraversal.cpp
   visitor/VisitState.cpp)
 
 set(LIVRECORE_LINK_LIBRARIES
-  PUBLIC ${Boost_LIBRARIES} dash Collage Lexis Lunchbox vmmlib
+  PUBLIC ${Boost_LIBRARIES} Collage Lexis Lunchbox vmmlib ZeroBufRender
   PRIVATE Equalizer ${GLEW_MX_LIBRARIES})
 
 set(LIVRECORE_INCLUDE_NAME livre/core)

livre/core/cache/Cache.cpp

@@ -85,6 +85,7 @@ struct Cache::Impl
         : _policy( maxMemBytes )
         , _cache( cache )
         , _statistics( name, maxMemBytes )
+        , _cacheMap( 128 )
     {}
 
     ~Impl()