Fix bugs and refactoring some of the info keys.

Ricardo Ortiz · Ricardo Ortiz · commit bcd4c3b9fc85 · 2013-01-28T08:30:30.000-05:00
Issue #8
diff --git a/Applications/ButtonClusters/msvQButtonClustersMainWindow.cxx b/Applications/ButtonClusters/msvQButtonClustersMainWindow.cxx
@@ -255,6 +255,7 @@ void msvQButtonClustersMainWindowPrivate::enableClustering(bool value)
     {
     this->ButtonsManager->ClusteringEnabledOff();
     this->ButtonsManager->ShowButtons();
+    this->ButtonsManager->HideClusterButtons(1);
     }
   this->update();
 }
diff --git a/Libs/VTK/Widgets/msvVTKWidgetClusters.cxx b/Libs/VTK/Widgets/msvVTKWidgetClusters.cxx
@@ -486,12 +486,9 @@ void msvVTKWidgetClusters::vtkInternal::GetDisplayCoordinates(vtkPoints* from,
 //------------------------------------------------------------------------------
 vtkStandardNewMacro(msvVTKWidgetClusters);
 vtkInformationKeyMacro(msvVTKWidgetClusters, CLUSTER_IDX, IdType);
-vtkInformationKeyRestrictedMacro(msvVTKWidgetClusters, CLUSTER_BUTTONS_RANGE,
+vtkInformationKeyMacro(msvVTKWidgetClusters, DATASET_BUTTONS_OFFSET, IdType);
+vtkInformationKeyRestrictedMacro(msvVTKWidgetClusters, CLUSTER_BUTTONS_OFFSET,
   IntegerVector, 2);
-vtkInformationKeyRestrictedMacro(msvVTKWidgetClusters, DATASET_BUTTONS_RANGE,
-  IntegerVector, 2);
-vtkInformationKeyRestrictedMacro(msvVTKWidgetClusters, DATA_DIMENSIONALITY,
-  DoubleVector, 6);
 
 //------------------------------------------------------------------------------
 vtkCxxSetObjectMacro(msvVTKWidgetClusters,ColorLookUpTable,vtkLookupTable);
@@ -517,19 +514,9 @@ void msvVTKWidgetClusters::SetDataSet(size_t level, size_t idx,
     vtkInformation* info = levelDS->GetMetaData(idx);
     if (info)
       {
-      double *bounds = points->GetBounds();
-      info->Set(DATA_DIMENSIONALITY(),
-        bounds[0], bounds[1], bounds[2],
-        bounds[3], bounds[4], bounds[5]);
       info->Set(CLUSTER_IDX(),clusterIdx);
-
-      int range[2] = {0};
-      range[0] = this->Internal->ButtonList.size();
-      range[1] = this->Internal->ButtonList.size() +
-                 points->GetNumberOfPoints();
-
-      info->Set(DATASET_BUTTONS_RANGE(), range, 2);
-
+      vtkIdType offset = this->Internal->ButtonList.size();
+      info->Set(DATASET_BUTTONS_OFFSET(), offset);
       }
     this->Internal->SetButtons(points,this->Internal->ButtonList);
     }
@@ -616,11 +603,11 @@ void msvVTKWidgetClusters::SetRenderer(vtkRenderer* renderer)
 //------------------------------------------------------------------------------
 void msvVTKWidgetClusters::UpdateWidgets()
 {
+  this->Clear();
   if(!this->ClusteringEnabled)
     {
     return;
     }
-  this->Clear();
 
   size_t numLevels = this->GetNumberOfLevels();
   for(size_t levelIdx = 0; levelIdx < numLevels; ++levelIdx)
@@ -636,24 +623,22 @@ void msvVTKWidgetClusters::UpdateWidgets()
           = vtkUnstructuredGrid::SafeDownCast(levelDS->GetPiece(dataSetIdx));
         // Recompute clusters for each dataset
         vtkPoints *points     = ds->GetPoints();
-        vtkIdType  clusterIdx = this->Internal->ComputeClusters(points);
+        size_t clusterIdx = this->Internal->ComputeClusters(points);
 
         // Get the cluster structure and assign a button to each cluster
-        vtkInternal::IndexMapType& indexMap = this->Internal->IndexMaps.back();
+        vtkInternal::IndexMapType& indexMap = this->Internal->IndexMaps[clusterIdx];
 
         vtkNew<vtkPoints> clusterPositions;
         this->Internal->GetClustersPositions(points,indexMap,
           clusterPositions.GetPointer());
         vtkInformation* info = levelDS->GetMetaData(dataSetIdx);
         if(info)
           {
-
           int range[2] = {0};
           range[0] = this->Internal->ClusterButtons.size();
-          range[1] = this->Internal->ClusterButtons.size() +
-                     clusterPositions->GetNumberOfPoints();
+          range[1] = clusterPositions->GetNumberOfPoints();
           info->Set(CLUSTER_IDX(),clusterIdx);
-          info->Set(CLUSTER_BUTTONS_RANGE(),range,2);
+          info->Set(CLUSTER_BUTTONS_OFFSET(),range,2);
           }
         this->Internal->SetButtons(
           clusterPositions.GetPointer(), this->Internal->ClusterButtons);
@@ -765,11 +750,11 @@ void msvVTKWidgetClusters::ShowClusterButtons(size_t level)
       vtkInformation* info = levelDS->GetMetaData(dataSetIdx);
       if(info)
         {
-        int buttonRange[2];
-        info->Get(CLUSTER_BUTTONS_RANGE(),buttonRange);
-        for(int i = buttonRange[0]; i < buttonRange[1]; ++i)
+        int offset[2];
+        info->Get(CLUSTER_BUTTONS_OFFSET(),offset);
+        for(int i = 0; i < offset[1]; ++i)
           {
-          this->Internal->ClusterButtons[i]->Show();
+          this->Internal->ClusterButtons[offset[0]+i]->Show();
           }
         }
       }
@@ -794,11 +779,11 @@ void msvVTKWidgetClusters::HideClusterButtons(size_t level)
       vtkInformation* info = levelDS->GetMetaData(dataSetIdx);
       if(info)
         {
-        int buttonRange[2];
-        info->Get(CLUSTER_BUTTONS_RANGE(),buttonRange);
-        for(int i = buttonRange[0]; i < buttonRange[1]; ++i)
+        int offset[2];
+        info->Get(CLUSTER_BUTTONS_OFFSET(),offset);
+        for(int i = 0; i < offset[1]; ++i)
           {
-          this->Internal->ClusterButtons[i]->Hide();
+          this->Internal->ClusterButtons[offset[0]+i]->Hide();
           }
         }
       }
@@ -820,12 +805,12 @@ void msvVTKWidgetClusters::ShowButtons(size_t level)
     size_t numDataSets = this->GetNumberOfDataSets(level);
     for(size_t dataSetIdx = 0; dataSetIdx < numDataSets; ++dataSetIdx)
       {
+      size_t numButtons = vtkUnstructuredGrid::SafeDownCast(levelDS->GetPiece(dataSetIdx))->GetPoints()->GetNumberOfPoints();
       vtkInformation* info = levelDS->GetMetaData(dataSetIdx);
       if(info)
         {
-        int buttonRange[2];
-        info->Get(DATASET_BUTTONS_RANGE(),buttonRange);
-        for(int i = buttonRange[0]; i < buttonRange[1]; ++i)
+        vtkIdType offset = info->Get(DATASET_BUTTONS_OFFSET());
+        for(size_t i = offset, end = offset+numButtons; i < end; ++i)
           {
           this->Internal->ButtonList[i]->Show();
           }
@@ -845,12 +830,12 @@ void msvVTKWidgetClusters::HideButtons(size_t level)
     size_t numDataSets = this->GetNumberOfDataSets(level);
     for(size_t dataSetIdx = 0; dataSetIdx < numDataSets; ++dataSetIdx)
       {
+      size_t numButtons = vtkUnstructuredGrid::SafeDownCast(levelDS->GetPiece(dataSetIdx))->GetPoints()->GetNumberOfPoints();
       vtkInformation* info = levelDS->GetMetaData(dataSetIdx);
       if(info)
         {
-        int buttonRange[2];
-        info->Get(DATASET_BUTTONS_RANGE(),buttonRange);
-        for(int i = buttonRange[0]; i < buttonRange[1]; ++i)
+        vtkIdType offset = info->Get(DATASET_BUTTONS_OFFSET());
+        for(size_t i = offset, end = offset+numButtons; i < end; ++i)
           {
           this->Internal->ButtonList[i]->Hide();
           }
diff --git a/Libs/VTK/Widgets/msvVTKWidgetClusters.h b/Libs/VTK/Widgets/msvVTKWidgetClusters.h
@@ -100,10 +100,9 @@ class msvVTKWidgetClusters : public vtkObject
   // Returns the number of levels.
   size_t GetNumberOfLevels();
   
-  static vtkInformationDoubleVectorKey* DATA_DIMENSIONALITY();
   static vtkInformationIdTypeKey* CLUSTER_IDX();
-  static vtkInformationIntegerVectorKey* CLUSTER_BUTTONS_RANGE();
-  static vtkInformationIntegerVectorKey* DATASET_BUTTONS_RANGE();
+  static vtkInformationIdTypeKey* DATASET_BUTTONS_OFFSET();
+  static vtkInformationIntegerVectorKey* CLUSTER_BUTTONS_OFFSET();
 
   virtual void UpdateWidgets();
   virtual void Clear();

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ void msvQButtonClustersMainWindowPrivate::enableClustering(bool value)`
`255`	`255`	`{`
`256`	`256`	`this->ButtonsManager->ClusteringEnabledOff();`
`257`	`257`	`this->ButtonsManager->ShowButtons();`
	`258`	`+ this->ButtonsManager->HideClusterButtons(1);`
`258`	`259`	`}`
`259`	`260`	`this->update();`
`260`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -486,12 +486,9 @@ void msvVTKWidgetClusters::vtkInternal::GetDisplayCoordinates(vtkPoints* from,`
`486`	`486`	`//------------------------------------------------------------------------------`
`487`	`487`	`vtkStandardNewMacro(msvVTKWidgetClusters);`
`488`	`488`	`vtkInformationKeyMacro(msvVTKWidgetClusters, CLUSTER_IDX, IdType);`
`489`		`-vtkInformationKeyRestrictedMacro(msvVTKWidgetClusters, CLUSTER_BUTTONS_RANGE,`
	`489`	`+vtkInformationKeyMacro(msvVTKWidgetClusters, DATASET_BUTTONS_OFFSET, IdType);`
	`490`	`+vtkInformationKeyRestrictedMacro(msvVTKWidgetClusters, CLUSTER_BUTTONS_OFFSET,`
`490`	`491`	`IntegerVector, 2);`
`491`		`-vtkInformationKeyRestrictedMacro(msvVTKWidgetClusters, DATASET_BUTTONS_RANGE,`
`492`		`- IntegerVector, 2);`
`493`		`-vtkInformationKeyRestrictedMacro(msvVTKWidgetClusters, DATA_DIMENSIONALITY,`
`494`		`- DoubleVector, 6);`
`495`	`492`
`496`	`493`	`//------------------------------------------------------------------------------`
`497`	`494`	`vtkCxxSetObjectMacro(msvVTKWidgetClusters,ColorLookUpTable,vtkLookupTable);`
`@@ -517,19 +514,9 @@ void msvVTKWidgetClusters::SetDataSet(size_t level, size_t idx,`
`517`	`514`	`vtkInformation* info = levelDS->GetMetaData(idx);`
`518`	`515`	`if (info)`
`519`	`516`	`{`
`520`		`- double *bounds = points->GetBounds();`
`521`		`- info->Set(DATA_DIMENSIONALITY(),`
`522`		`- bounds[0], bounds[1], bounds[2],`
`523`		`- bounds[3], bounds[4], bounds[5]);`
`524`	`517`	`info->Set(CLUSTER_IDX(),clusterIdx);`
`525`		`-`
`526`		`- int range[2] = {0};`
`527`		`- range[0] = this->Internal->ButtonList.size();`
`528`		`- range[1] = this->Internal->ButtonList.size() +`
`529`		`- points->GetNumberOfPoints();`
`530`		`-`
`531`		`- info->Set(DATASET_BUTTONS_RANGE(), range, 2);`
`532`		`-`
	`518`	`+ vtkIdType offset = this->Internal->ButtonList.size();`
	`519`	`+ info->Set(DATASET_BUTTONS_OFFSET(), offset);`
`533`	`520`	`}`
`534`	`521`	`this->Internal->SetButtons(points,this->Internal->ButtonList);`
`535`	`522`	`}`
`@@ -616,11 +603,11 @@ void msvVTKWidgetClusters::SetRenderer(vtkRenderer* renderer)`
`616`	`603`	`//------------------------------------------------------------------------------`
`617`	`604`	`void msvVTKWidgetClusters::UpdateWidgets()`
`618`	`605`	`{`
	`606`	`+ this->Clear();`
`619`	`607`	`if(!this->ClusteringEnabled)`
`620`	`608`	`{`
`621`	`609`	`return;`
`622`	`610`	`}`
`623`		`- this->Clear();`
`624`	`611`
`625`	`612`	`size_t numLevels = this->GetNumberOfLevels();`
`626`	`613`	`for(size_t levelIdx = 0; levelIdx < numLevels; ++levelIdx)`
`@@ -636,24 +623,22 @@ void msvVTKWidgetClusters::UpdateWidgets()`
`636`	`623`	`= vtkUnstructuredGrid::SafeDownCast(levelDS->GetPiece(dataSetIdx));`
`637`	`624`	`// Recompute clusters for each dataset`
`638`	`625`	`vtkPoints *points = ds->GetPoints();`
`639`		`- vtkIdType clusterIdx = this->Internal->ComputeClusters(points);`
	`626`	`+ size_t clusterIdx = this->Internal->ComputeClusters(points);`
`640`	`627`
`641`	`628`	`// Get the cluster structure and assign a button to each cluster`
`642`		`- vtkInternal::IndexMapType& indexMap = this->Internal->IndexMaps.back();`
	`629`	`+ vtkInternal::IndexMapType& indexMap = this->Internal->IndexMaps[clusterIdx];`
`643`	`630`
`644`	`631`	`vtkNew<vtkPoints> clusterPositions;`
`645`	`632`	`this->Internal->GetClustersPositions(points,indexMap,`
`646`	`633`	`clusterPositions.GetPointer());`
`647`	`634`	`vtkInformation* info = levelDS->GetMetaData(dataSetIdx);`
`648`	`635`	`if(info)`
`649`	`636`	`{`
`650`		`-`
`651`	`637`	`int range[2] = {0};`
`652`	`638`	`range[0] = this->Internal->ClusterButtons.size();`
`653`		`- range[1] = this->Internal->ClusterButtons.size() +`
`654`		`- clusterPositions->GetNumberOfPoints();`
	`639`	`+ range[1] = clusterPositions->GetNumberOfPoints();`
`655`	`640`	`info->Set(CLUSTER_IDX(),clusterIdx);`
`656`		`- info->Set(CLUSTER_BUTTONS_RANGE(),range,2);`
	`641`	`+ info->Set(CLUSTER_BUTTONS_OFFSET(),range,2);`
`657`	`642`	`}`
`658`	`643`	`this->Internal->SetButtons(`
`659`	`644`	`clusterPositions.GetPointer(), this->Internal->ClusterButtons);`
`@@ -765,11 +750,11 @@ void msvVTKWidgetClusters::ShowClusterButtons(size_t level)`
`765`	`750`	`vtkInformation* info = levelDS->GetMetaData(dataSetIdx);`
`766`	`751`	`if(info)`
`767`	`752`	`{`
`768`		`- int buttonRange[2];`
`769`		`- info->Get(CLUSTER_BUTTONS_RANGE(),buttonRange);`
`770`		`- for(int i = buttonRange[0]; i < buttonRange[1]; ++i)`
	`753`	`+ int offset[2];`
	`754`	`+ info->Get(CLUSTER_BUTTONS_OFFSET(),offset);`
	`755`	`+ for(int i = 0; i < offset[1]; ++i)`
`771`	`756`	`{`
`772`		`- this->Internal->ClusterButtons[i]->Show();`
	`757`	`+ this->Internal->ClusterButtons[offset[0]+i]->Show();`
`773`	`758`	`}`
`774`	`759`	`}`
`775`	`760`	`}`
`@@ -794,11 +779,11 @@ void msvVTKWidgetClusters::HideClusterButtons(size_t level)`
`794`	`779`	`vtkInformation* info = levelDS->GetMetaData(dataSetIdx);`
`795`	`780`	`if(info)`
`796`	`781`	`{`
`797`		`- int buttonRange[2];`
`798`		`- info->Get(CLUSTER_BUTTONS_RANGE(),buttonRange);`
`799`		`- for(int i = buttonRange[0]; i < buttonRange[1]; ++i)`
	`782`	`+ int offset[2];`
	`783`	`+ info->Get(CLUSTER_BUTTONS_OFFSET(),offset);`
	`784`	`+ for(int i = 0; i < offset[1]; ++i)`
`800`	`785`	`{`
`801`		`- this->Internal->ClusterButtons[i]->Hide();`
	`786`	`+ this->Internal->ClusterButtons[offset[0]+i]->Hide();`
`802`	`787`	`}`
`803`	`788`	`}`
`804`	`789`	`}`
`@@ -820,12 +805,12 @@ void msvVTKWidgetClusters::ShowButtons(size_t level)`
`820`	`805`	`size_t numDataSets = this->GetNumberOfDataSets(level);`
`821`	`806`	`for(size_t dataSetIdx = 0; dataSetIdx < numDataSets; ++dataSetIdx)`
`822`	`807`	`{`
	`808`	`+ size_t numButtons = vtkUnstructuredGrid::SafeDownCast(levelDS->GetPiece(dataSetIdx))->GetPoints()->GetNumberOfPoints();`
`823`	`809`	`vtkInformation* info = levelDS->GetMetaData(dataSetIdx);`
`824`	`810`	`if(info)`
`825`	`811`	`{`
`826`		`- int buttonRange[2];`
`827`		`- info->Get(DATASET_BUTTONS_RANGE(),buttonRange);`
`828`		`- for(int i = buttonRange[0]; i < buttonRange[1]; ++i)`
	`812`	`+ vtkIdType offset = info->Get(DATASET_BUTTONS_OFFSET());`
	`813`	`+ for(size_t i = offset, end = offset+numButtons; i < end; ++i)`
`829`	`814`	`{`
`830`	`815`	`this->Internal->ButtonList[i]->Show();`
`831`	`816`	`}`
`@@ -845,12 +830,12 @@ void msvVTKWidgetClusters::HideButtons(size_t level)`
`845`	`830`	`size_t numDataSets = this->GetNumberOfDataSets(level);`
`846`	`831`	`for(size_t dataSetIdx = 0; dataSetIdx < numDataSets; ++dataSetIdx)`
`847`	`832`	`{`
	`833`	`+ size_t numButtons = vtkUnstructuredGrid::SafeDownCast(levelDS->GetPiece(dataSetIdx))->GetPoints()->GetNumberOfPoints();`
`848`	`834`	`vtkInformation* info = levelDS->GetMetaData(dataSetIdx);`
`849`	`835`	`if(info)`
`850`	`836`	`{`
`851`		`- int buttonRange[2];`
`852`		`- info->Get(DATASET_BUTTONS_RANGE(),buttonRange);`
`853`		`- for(int i = buttonRange[0]; i < buttonRange[1]; ++i)`
	`837`	`+ vtkIdType offset = info->Get(DATASET_BUTTONS_OFFSET());`
	`838`	`+ for(size_t i = offset, end = offset+numButtons; i < end; ++i)`
`854`	`839`	`{`
`855`	`840`	`this->Internal->ButtonList[i]->Hide();`
`856`	`841`	`}`