Merge topic 'multiblock-colormap'

123a822 ENH: Add vtkBlockColors

Author: utkarshayachit

ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.cxx

@@ -198,6 +198,31 @@ void vtkGeometryRepresentation::SetupDefaults()
   keys->Delete();
 }
 
+//----------------------------------------------------------------------------
+int vtkGeometryRepresentation::GetBlockColorsDistinctValues()
+{
+  vtkPVGeometryFilter *geomFilter = 
+    vtkPVGeometryFilter::SafeDownCast(this->GeometryFilter);
+  if (geomFilter)
+    {
+    return geomFilter->GetBlockColorsDistinctValues();
+    }
+  return 2;
+}
+
+//----------------------------------------------------------------------------
+void vtkGeometryRepresentation::SetBlockColorsDistinctValues(
+  int distinctValues)
+{
+  vtkPVGeometryFilter *geomFilter = 
+    vtkPVGeometryFilter::SafeDownCast(this->GeometryFilter);
+  if (geomFilter)
+    {
+    geomFilter->SetBlockColorsDistinctValues(distinctValues);
+    this->MarkModified();
+    }
+}
+
 //----------------------------------------------------------------------------
 int vtkGeometryRepresentation::FillInputPortInformation(
   int vtkNotUsed(port), vtkInformation* info)

ParaViewCore/ClientServerCore/Rendering/vtkGeometryRepresentation.h

@@ -65,6 +65,12 @@ class VTKPVCLIENTSERVERCORERENDERING_EXPORT vtkGeometryRepresentation : public v
   // representation of false, all view passes are ignored.
   virtual void SetVisibility(bool val);
 
+  // Description:
+  // Determines the number of distinct values in vtkBlockColors
+  // See also vtkPVGeometryFilter
+  void SetBlockColorsDistinctValues(int distinctValues);
+  int GetBlockColorsDistinctValues();
+
   // Description:
   // Enable/Disable LOD;
   virtual void SetSuppressLOD(bool suppress)

ParaViewCore/ServerManager/Default/settings.xml

@@ -107,6 +107,22 @@
         <BooleanDomain name="bool"/>
       </IntVectorProperty>
 
+      <IntVectorProperty name="BlockColorsDistinctValues"
+                         number_of_elements="1"
+                         default_values="7"
+                         command="SetBlockColorsDistinctValues"
+                         panel_visibility="advanced">
+        <Documentation>
+          Determines the number of distinct values in
+          vtkBlockColors. This array is added to each block if
+          the dataset is a composite dataset. The array has one value
+          set to the reminder of blockIndex divided by
+          BlockColorsDistinctValues (blockIndex mod
+          BlockColorsDistinctValues).
+        </Documentation>
+        <IntRangeDomain min="2" name="range" />
+      </IntVectorProperty>
+
       <IntVectorProperty name="TransferFunctionResetMode"
         number_of_elements="1"
         default_values="0"
@@ -290,6 +306,7 @@
 
       <PropertyGroup label="Data Processing Options">
         <Property name="AutoConvertProperties" />
+        <Property name="BlockColorsDistinctValues" />
       </PropertyGroup>
 
       <PropertyGroup label="Multicore Support">

ParaViewCore/ServerManager/Default/vtkPVGeneralSettings.cxx

@@ -40,7 +40,8 @@ vtkPVGeneralSettings* vtkPVGeneralSettings::New()
 
 //----------------------------------------------------------------------------
 vtkPVGeneralSettings::vtkPVGeneralSettings()
-  : AutoApply(false),
+  : BlockColorsDistinctValues(7),
+  AutoApply(false),
   AutoApplyActiveOnly(false),
   DefaultViewType(NULL),
   TransferFunctionResetMode(vtkPVGeneralSettings::GROW_ON_APPLY),

ParaViewCore/ServerManager/Default/vtkPVGeneralSettings.h

@@ -45,6 +45,14 @@ class VTKPVSERVERMANAGERDEFAULT_EXPORT vtkPVGeneralSettings : public vtkObject
   void SetAutoConvertProperties(bool val);
   bool GetAutoConvertProperties();
 
+  // Description:
+  // Determines the number of distinct values in
+  // vtkBlockColors. This array is added to each block if
+  // the dataset is a composite dataset. The array has one value
+  // set to (blockIndex % BlockColorsDistinctValues)
+  vtkGetMacro(BlockColorsDistinctValues, int);
+  vtkSetMacro(BlockColorsDistinctValues, int);
+
   // Description:
   // Automatically apply changes in the 'Properties' panel.
   vtkGetMacro(AutoApply, bool);
@@ -144,7 +152,8 @@ class VTKPVSERVERMANAGERDEFAULT_EXPORT vtkPVGeneralSettings : public vtkObject
 protected:
   vtkPVGeneralSettings();
   ~vtkPVGeneralSettings();
-
+  
+  int BlockColorsDistinctValues;
   bool AutoApply;
   bool AutoApplyActiveOnly;
   char* DefaultViewType;

ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml

@@ -3254,6 +3254,8 @@
                       panel_visibility="never" />
             <Property name="BlockOpacity"
                       panel_visibility="never" />
+            <Property name="BlockColorsDistinctValues"
+                      panel_visibility="advanced" />
           </PropertyGroup>
         </ExposedProperties>
       </SubProxy>
@@ -8357,6 +8359,24 @@
           Set the opacity for a block. Value is (index, alpha).
         </Documentation>
       </DoubleMapProperty>
+      <IntVectorProperty command="SetBlockColorsDistinctValues"
+                         default_values="7"
+                         name="BlockColorsDistinctValues"
+                         number_of_elements="1"
+                         panel_visibility="never">
+        <Documentation>
+          Determines the number of distinct values in
+          vtkBlockColors. This array is added to each block if
+          the dataset is a composite dataset. The array has one value
+          set to (blockIndex % BlockColorsDistinctValues)
+        </Documentation>
+        <IntRangeDomain min="2" name="range" />
+        <Hints>
+          <PropertyLink group="settings"
+                        proxy="GeneralSettings"
+                        property="BlockColorsDistinctValues"/>
+        </Hints>
+      </IntVectorProperty>
       <!-- End of SurfaceRepresentationBase -->
     </RepresentationProxy>
 

ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.cxx

@@ -146,6 +146,7 @@ vtkPVGeometryFilter::vtkPVGeometryFilter ()
 {
   this->OutlineFlag = 0;
   this->UseOutline = 1;
+  this->BlockColorsDistinctValues = 7;
   this->UseStrips = 0;
 #ifdef VTKGL2
   // generating cell normals by default really slows down paraview
@@ -681,6 +682,20 @@ void vtkPVGeometryFilter::AddCompositeIndex(vtkPolyData* pd, unsigned int index)
   cindex->FastDelete();
 }
 
+//----------------------------------------------------------------------------
+void vtkPVGeometryFilter::AddBlockColors(
+  vtkPolyData* pd, unsigned int index)
+{
+  vtkUnsignedIntArray* cindex = vtkUnsignedIntArray::New();
+  cindex->SetNumberOfComponents(1);
+  cindex->SetNumberOfTuples(1);
+  cindex->FillComponent(0, index % this->BlockColorsDistinctValues);
+  cindex->SetName("vtkBlockColors");
+  pd->GetFieldData()->AddArray(cindex);
+  cindex->FastDelete();
+}
+
+
 //----------------------------------------------------------------------------
 void vtkPVGeometryFilter::AddHierarchicalIndex(vtkPolyData* pd,
   unsigned int level, unsigned int index)
@@ -840,6 +855,8 @@ int vtkPVGeometryFilter::RequestAMRData(
 
         this->CleanupOutputData(outputBlock.GetPointer(), /*doCommunicate=*/0);
         this->AddCompositeIndex(outputBlock.GetPointer(), amr->GetCompositeIndex(level,dataIdx));
+        this->AddBlockColors(outputBlock.GetPointer(), 
+                                    amr->GetCompositeIndex(level,dataIdx));
         this->AddHierarchicalIndex(outputBlock.GetPointer(), level, dataIdx);
         }
       amrDatasets->SetPiece(block_id, outputBlock.GetPointer());
@@ -920,6 +937,7 @@ int vtkPVGeometryFilter::RequestCompositeData(vtkInformation*,
       tmpOut->FastDelete();
 
       this->AddCompositeIndex(tmpOut, current_flat_index);
+      this->AddBlockColors(tmpOut, current_flat_index);
       }
     else
       {

ParaViewCore/VTKExtensions/Rendering/vtkPVGeometryFilter.h

@@ -61,6 +61,11 @@ class VTKPVVTKEXTENSIONSRENDERING_EXPORT vtkPVGeometryFilter : public vtkDataObj
   vtkSetMacro(UseOutline, int);
   vtkGetMacro(UseOutline, int);
 
+  // Description:
+  // Determines the number of distinct values in vtkBlockColors
+  vtkSetMacro(BlockColorsDistinctValues, int);
+  vtkGetMacro(BlockColorsDistinctValues, int);
+
   // Description:
   // When input is structured data, this flag will generate faces with
   // triangle strips.  This should render faster and use less memory, but no
@@ -252,6 +257,7 @@ class VTKPVVTKEXTENSIONSRENDERING_EXPORT vtkPVGeometryFilter : public vtkDataObj
 
   int OutlineFlag;
   int UseOutline;
+  int BlockColorsDistinctValues;
   int UseStrips;
   int GenerateCellNormals;
   int Triangulate;
@@ -306,6 +312,12 @@ class VTKPVVTKEXTENSIONSRENDERING_EXPORT vtkPVGeometryFilter : public vtkDataObj
   void operator=(const vtkPVGeometryFilter&); // Not implemented
 
   void AddCompositeIndex(vtkPolyData* pd, unsigned int index);
+  // Description:
+  // Adds a field array called "vtkBlockColors". The array is
+  // added to each block only if the dataset is a composite
+  // dataset. The array has one value set to 
+  // (blockIndex % BlockColorsDistinctValues)
+  void AddBlockColors(vtkPolyData* pd, unsigned int index);
   void AddHierarchicalIndex(vtkPolyData* pd, unsigned int level, unsigned int index);
   class BoundsReductionOperation;
 //ETX