[WIP] Path Mapping Barycenters

core/vtk/ttkMergeTreeClustering/ttkMergeTreeClustering.cpp

@@ -574,6 +574,7 @@ int ttkMergeTreeClustering::runOutput(
       visuMaker.setOutputSegmentation(OutputSegmentation);
       visuMaker.setDimensionSpacing(DimensionSpacing);
       visuMaker.setDimensionToShift(DimensionToShift);
+      visuMaker.setDimensionsShift(XShift, YShift, ZShift);
       visuMaker.setImportantPairs(ImportantPairs);
       visuMaker.setMaximumImportantPairs(MaximumImportantPairs);
       visuMaker.setMinimumImportantPairs(MinimumImportantPairs);
@@ -763,6 +764,7 @@ int ttkMergeTreeClustering::runOutput(
           visuMaker.setOutputSegmentation(OutputSegmentation);
           visuMaker.setDimensionSpacing(DimensionSpacing);
           visuMaker.setDimensionToShift(DimensionToShift);
+          visuMaker.setDimensionsShift(XShift, YShift, ZShift);
           visuMaker.setImportantPairs(ImportantPairs);
           visuMaker.setMaximumImportantPairs(MaximumImportantPairs);
           visuMaker.setMinimumImportantPairs(MinimumImportantPairs);
@@ -874,6 +876,7 @@ int ttkMergeTreeClustering::runOutput(
         visuMakerBary.setOutputSegmentation(false);
         visuMakerBary.setDimensionSpacing(DimensionSpacing);
         visuMakerBary.setDimensionToShift(DimensionToShift);
+        visuMakerBary.setDimensionsShift(XShift, YShift, ZShift);
         visuMakerBary.setImportantPairs(ImportantPairs);
         visuMakerBary.setMaximumImportantPairs(MaximumImportantPairs);
         visuMakerBary.setMinimumImportantPairs(MinimumImportantPairs);

core/vtk/ttkMergeTreeClustering/ttkMergeTreeClustering.h

@@ -100,6 +100,9 @@ class TTKMERGETREECLUSTERING_EXPORT ttkMergeTreeClustering
   bool RescaleTreesIndividually = false;
   double DimensionSpacing = 1.;
   int DimensionToShift = 0;
+  double XShift = 1.0;
+  double YShift = 0.0;
+  double ZShift = 0.0;
   double ImportantPairs = 50.;
   int MaximumImportantPairs = 0;
   int MinimumImportantPairs = 0;
@@ -365,6 +368,15 @@ class TTKMERGETREECLUSTERING_EXPORT ttkMergeTreeClustering
   vtkSetMacro(DimensionToShift, int);
   vtkGetMacro(DimensionToShift, int);
 
+  vtkSetMacro(XShift, double);
+  vtkGetMacro(XShift, double);
+
+  vtkSetMacro(YShift, double);
+  vtkGetMacro(YShift, double);
+
+  vtkSetMacro(ZShift, double);
+  vtkGetMacro(ZShift, double);
+
   vtkSetMacro(ImportantPairs, double);
   vtkGetMacro(ImportantPairs, double);
 

core/vtk/ttkPlanarGraphLayout/ttkMergeTreeVisualization.h

@@ -35,6 +35,9 @@ class ttkMergeTreeVisualization : public ttk::MergeTreeVisualization {
   bool PlanarLayout = false;
   double DimensionSpacing = 1.;
   int DimensionToShift = 0;
+  double XShift = 1.0;
+  double YShift = 0.0;
+  double ZShift = 0.0;
   bool OutputSegmentation = false;
   int MaximumImportantPairs = 0;
   int MinimumImportantPairs = 0;
@@ -118,6 +121,20 @@ class ttkMergeTreeVisualization : public ttk::MergeTreeVisualization {
   void setDimensionToShift(int i) {
     DimensionToShift = i;
   }
+  void setXshift(double shift) {
+    XShift = shift;
+  }
+  void setYshift(double shift) {
+    YShift = shift;
+  }
+  void setZshift(double shift) {
+    ZShift = shift;
+  }
+  void setDimensionsShift(double xShift, double yShift, double zShift) {
+    setXshift(xShift);
+    setYshift(yShift);
+    setZshift(zShift);
+  }
   void setOutputSegmentation(bool b) {
     OutputSegmentation = b;
   }
@@ -903,19 +920,6 @@ class ttkMergeTreeVisualization : public ttk::MergeTreeVisualization {
             break;
         }
 
-        // Get dimension shift
-        printMsg("// Get dimension shift", ttk::debug::Priority::VERBOSE);
-        double diff_z = PlanarLayout ? 0 : -std::get<4>(allBounds[i]);
-        // TODO DimensionToShift for Planar Layout
-        if(not PlanarLayout)
-          if(DimensionToShift != 0) { // is not X
-            if(DimensionToShift == 2) // is Z
-              diff_z = diff_x;
-            else if(DimensionToShift == 1) // is Y
-              diff_y = diff_x;
-            diff_x = -std::get<0>(allBounds[i]);
-          }
-
         // Planar layout
         printMsg("// Planar Layout", ttk::debug::Priority::VERBOSE);
         std::vector<float> layout;
@@ -935,6 +939,33 @@ class ttkMergeTreeVisualization : public ttk::MergeTreeVisualization {
           }
         }
 
+        // Get dimension shift
+        printMsg("// Get dimension shift", ttk::debug::Priority::VERBOSE);
+        double diff_z = PlanarLayout ? 0 : -std::get<4>(allBounds[i]);
+        if(DimensionToShift != 0) { // is not X
+          float minX = 0;
+          if(PlanarLayout) {
+            minX = layout[0];
+            for(unsigned int l = 0; l < layout.size(); ++l) {
+              if(l % 2 == 0)
+                minX = std::min(minX, layout[l]);
+            }
+          }
+          double new_diff_x = PlanarLayout ? -minX : -std::get<0>(allBounds[i]);
+          if(DimensionToShift == 2) { // is Z
+            diff_z = -diff_x;
+            diff_x = new_diff_x;
+          } else if(not clusteringOutput and DimensionToShift == 1) { // is Y
+            diff_y = diff_x;
+            diff_x = new_diff_x;
+          } else if(DimensionToShift == 3) { // Custom
+            if(not clusteringOutput)
+              diff_y = YShift * diff_x + (1 - YShift) * diff_y;
+            diff_z = ZShift * -diff_x + (1 - ZShift) * diff_z;
+            diff_x = XShift * diff_x + (1 - XShift) * new_diff_x;
+          }
+        }
+
         // Internal arrays
         printMsg("// Internal arrays", ttk::debug::Priority::VERBOSE);
         int cptNode = 0;

paraview/xmls/MergeTreeClustering.xml

@@ -362,20 +362,74 @@ Online examples:
                                            mode="visibility"
                                            property="OutputTrees"
                                            value="1" />
-                  <PropertyWidgetDecorator type="GenericDecorator"
-                                           mode="visibility"
-                                           property="MergeTreePlanarLayout"
-                                           value="0" />
                   </Hints>
                 <EnumerationDomain name="enum">
                     <Entry value="0" text="X"/>
                     <Entry value="1" text="Y"/>
                     <Entry value="2" text="Z"/>
+                    <Entry value="3" text="Custom"/>
                 </EnumerationDomain>
                   <Documentation>
                   </Documentation>
                 </IntVectorProperty>
 
+                <DoubleVectorProperty
+                name="XShift"
+                command="SetXShift"
+                label="X Shift"
+                number_of_elements="1"
+                default_values="1"
+                panel_visibility="advanced">
+                  <Hints>
+                  <PropertyWidgetDecorator type="GenericDecorator"
+                                           mode="visibility"
+                                           property="DimensionToShift"
+                                           value="3" />
+                  </Hints>
+                  <Documentation>
+
+                  </Documentation>
+                  <DoubleRangeDomain name="range" min="0" max="1" />
+                </DoubleVectorProperty>
+
+                <DoubleVectorProperty
+                name="YShift"
+                command="SetYShift"
+                label="Y Shift"
+                number_of_elements="1"
+                default_values="0"
+                panel_visibility="advanced">
+                  <Hints>
+                  <PropertyWidgetDecorator type="GenericDecorator"
+                                           mode="visibility"
+                                           property="DimensionToShift"
+                                           value="3" />
+                  </Hints>
+                  <Documentation>
+
+                  </Documentation>
+                  <DoubleRangeDomain name="range" min="0" max="1" />
+                </DoubleVectorProperty>
+
+                <DoubleVectorProperty
+                name="ZShift"
+                command="SetZShift"
+                label="Z Shift"
+                number_of_elements="1"
+                default_values="0"
+                panel_visibility="advanced">
+                  <Hints>
+                  <PropertyWidgetDecorator type="GenericDecorator"
+                                           mode="visibility"
+                                           property="DimensionToShift"
+                                           value="3" />
+                  </Hints>
+                  <Documentation>
+
+                  </Documentation>
+                  <DoubleRangeDomain name="range" min="0" max="1" />
+                </DoubleVectorProperty>
+
                 <IntVectorProperty
                 name="BarycenterPositionAlpha"
                 command="SetBarycenterPositionAlpha"
@@ -469,6 +523,9 @@ Online examples:
               <Property name="OutputTrees"/>
               <Property name="DimensionSpacing"/>
               <Property name="DimensionToShift"/>
+              <Property name="XShift"/>
+              <Property name="YShift"/>
+              <Property name="ZShift"/>
               <Property name="BarycenterPositionAlpha"/>
               <Property name="MergeTreePlanarLayout"/>
             </PropertyGroup>