Changeset 3549

Timestamp:

Mar 22, 2013, 11:16:51 AM (11 years ago)

Author:

ldelgass

Message:

Fix for oversized axis labels. AutoScale? computation in CubeAxesActor? happens
before label positions may be rebuilt (when rendering each AxisActor?), so
recompute AutoScale? in AxisActor? when rebuilding the axis.

Location:

trunk/packages/vizservers/vtkvis

Files:

• vtkRpAxisActor.cpp (modified) (3 diffs)
• vtkRpAxisActor.h (modified) (3 diffs)
• vtkRpCubeAxesActor.cpp (modified) (6 diffs)

trunk/packages/vizservers/vtkvis/vtkRpAxisActor.cpp

@@ -176 +176 @@
   this->CalculateTitleOffset = 1;
   this->CalculateLabelOffset = 1;
+
+  this->ScreenSize = 10.;
 
   // Instance variables specific to 2D mode
@@ -658 +660 @@
     }
 
+  // If label positions changed, need to rescale
+  this->AutoScale(viewport);
+
   this->LastAxisPosition = this->AxisPosition;
 
@@ -778 +783 @@
     this->LabelActors[i]->SetPosition(pos[0], pos[1], pos[2]);
     }
+}
+
+void
+vtkRpAxisActor::AutoScale(vtkViewport *viewport)
+{
+    double newTitleScale
+        = this->AutoScale(viewport,
+                          this->ScreenSize,
+                          this->GetTitleActor()->GetPosition());
+
+    this->SetTitleScale(newTitleScale);
+
+    // Now labels.
+    vtkRpAxisFollower** labelActors = this->GetLabelActors();
+
+    for(int j = 0; j < this->GetNumberOfLabelsBuilt(); ++j)
+      {
+      double newLabelScale
+        = this->AutoScale(viewport,
+                          this->ScreenSize,
+                          labelActors[j]->GetPosition());
+
+      labelActors[j]->SetScale(newLabelScale);
+      }
+}
+
+double
+vtkRpAxisActor::AutoScale(vtkViewport *viewport, double screenSize,
+                          double position[3])
+{
+  double factor = 1;
+  if (viewport->GetSize()[1] > 0)
+    {
+    factor = 2.0 * screenSize
+      * tan(vtkMath::RadiansFromDegrees(this->Camera->GetViewAngle()/2.0))
+      / viewport->GetSize()[1];
+    }
+
+    double dist = sqrt(
+          vtkMath::Distance2BetweenPoints(position,
+                                          this->Camera->GetPosition()));
+    double newScale = factor * dist;
+
+    return newScale;
 }
 

trunk/packages/vizservers/vtkvis/vtkRpAxisActor.h

@@ -123 +123 @@
   void   GetBounds(double bounds[6]);
 
+  vtkSetMacro(ScreenSize, double);
+  vtkGetMacro(ScreenSize, double);
+
   // Description:
   // Set/Get the format with which to print the labels on the axis.
@@ -466 +469 @@
   void TransformBounds(vtkViewport *, double bnds[6]);
 
+  void AutoScale(vtkViewport *viewport);
+  double AutoScale(vtkViewport *viewport, double screenSize,
+                   double position[3]);
+
   void BuildLabels(vtkViewport *, bool);
   void BuildLabels2D(vtkViewport *, bool);
@@ -552 +559 @@
   int                 CalculateLabelOffset;
 
+  double              ScreenSize;
+
   // Description:
   // Use xy-axis only when Use2DMode=1:

trunk/packages/vizservers/vtkvis/vtkRpCubeAxesActor.cpp

@@ -29 +29 @@
 #include "vtkViewport.h"
 
-
 vtkStandardNewMacro(vtkRpCubeAxesActor);
 vtkCxxSetObjectMacro(vtkRpCubeAxesActor, Camera,vtkCamera);
@@ -117 +116 @@
   //this->YAxesGridpolysProperty->LightingOff();       // To be able to see the polys from high camera angles
   //this->ZAxesGridpolysProperty->LightingOff();       // To be able to see the polys from high camera angles
+
+  this->ScreenSize = 10.0;
+
+  this->LabelScreenOffset = 20.0 + this->ScreenSize * 0.5;
+  this->TitleScreenOffset =
+    this->LabelScreenOffset * 2.0 + this->ScreenSize * 0.5;
 
   for (int i = 0; i < NUMBER_OF_ALIGNED_AXIS; i++)
@@ -133 +138 @@
     this->XAxes[i]->SetCalculateTitleOffset(0);
     this->XAxes[i]->SetCalculateLabelOffset(0);
+    this->XAxes[i]->SetScreenSize(this->ScreenSize);
 
     this->YAxes[i] = vtkRpAxisActor::New();
@@ -147 +153 @@
     this->YAxes[i]->SetCalculateTitleOffset(0);
     this->YAxes[i]->SetCalculateLabelOffset(0);
+    this->YAxes[i]->SetScreenSize(this->ScreenSize);
 
     this->ZAxes[i] = vtkRpAxisActor::New();
@@ -161 +168 @@
     this->ZAxes[i]->SetCalculateTitleOffset(0);
     this->ZAxes[i]->SetCalculateLabelOffset(0);
-
-    this->ScreenSize = 10.0;
-
-    this->LabelScreenOffset = 20.0 + this->ScreenSize * 0.5;
-    this->TitleScreenOffset =
-      this->LabelScreenOffset * 2.0 + this->ScreenSize * 0.5;
+    this->ZAxes[i]->SetScreenSize(this->ScreenSize);
 
     // Pass information to axes followers.
@@ -680 +682 @@
   for (int i = 0; i < NUMBER_OF_ALIGNED_AXIS; i++)
     {
+    this->XAxes[i]->SetScreenSize(this->ScreenSize);
+    this->YAxes[i]->SetScreenSize(this->ScreenSize);
+    this->ZAxes[i]->SetScreenSize(this->ScreenSize);
+
     this->XAxes[i]->GetTitleActor()->SetScreenOffset(this->TitleScreenOffset);
     this->YAxes[i]->GetTitleActor()->SetScreenOffset(this->TitleScreenOffset);