View Issue Details [ Jump to Notes ]

[ Print ]

Project

Tags

No tags attached.

Project

Type

Attached Files

vtk_create_sources_cylinder_along_with_superquadric.py [^] (1,306 bytes) 2010-09-14 06:55

octave_superquadric.source.m [^] (2,905 bytes) 2010-09-14 06:56

0001-BUG-Axis-of-symmetry-claimed-to-be-the-global-z-axis.patch [^] (3,188 bytes) 2010-09-14 06:56 [Show Content] [Hide Content]

From 933f216f1101506f159cc4cb3fb484ed2892a18e Mon Sep 17 00:00:00 2001
From: Sven Buijssen <sven.buijssen@tu-dortmund.de>
Date: Mon, 13 Sep 2010 14:48:08 +0200
Subject: [PATCH 1/3] BUG: Axis of symmetry claimed to be the global z axis, but was the y-axis.

     Additionally, the code to change the axis of symmetry to be aligned with
     the global x-axis had the correct rotation formula z->x, but used the
     faulty y-axis based input and consequently did not yield a superquadric
     with an axis aligned to the global x-axis.
---
 Graphics/vtkSuperquadricSource.cxx |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Graphics/vtkSuperquadricSource.cxx b/Graphics/vtkSuperquadricSource.cxx
index 366a04e..a437150 100644
--- a/Graphics/vtkSuperquadricSource.cxx
+++ b/Graphics/vtkSuperquadricSource.cxx
@@ -274,7 +274,7 @@ int vtkSuperquadricSource::RequestData(
             thetaOffset =  0.0;
             }
 
-          //This give you superquadric with axis of symmetry: z
+          // This gives a superquadric with axis of symmetry: z
           evalSuperquadric(theta, phi,
                            thetaOffset, phiOffset,
                            this->ThetaRoundness, this->PhiRoundness,
@@ -282,16 +282,16 @@ int vtkSuperquadricSource::RequestData(
           switch (this->AxisOfSymmetry)
             {
             case 0:
-              //x-axis
-              tmp = pt[0];
+              // x-axis
+              tmp   = pt[0];
               pt[0] = pt[2];
               pt[2] = tmp;
               pt[1] = -pt[1];
 
-              tmp = nv[0];
-              nv[0]=nv[2];
-              nv[2]=tmp;
-              nv[1]=-nv[1];
+              tmp   = nv[0];
+              nv[0] = nv[2];
+              nv[2] = tmp;
+              nv[1] = -nv[1];
               break;
             case 1:
               //y-axis
@@ -315,7 +315,7 @@ int vtkSuperquadricSource::RequestData(
             // (the superquadric evaluation is numerically unstable
             // at the poles)
 
-            pt[0] = pt[2] = 0.0;
+            pt[0] = pt[1] = 0.0;
           }
 
           pt[0] += this->Center[0];
@@ -416,16 +416,18 @@ static void evalSuperquadric(double theta, double phi,  // parametric coords
                              double xyz[3],      // output coords
                              double nrm[3])      // output normals
 {
+  // axis of symmetry: z
+
   double cf1, cf2;
 
   cf1 = cf(phi, rphi, alpha);
-  xyz[0] = dims[0] * cf1 * sf(theta, rtheta);
-  xyz[1] = dims[1]       * sf(phi, rphi);
-  xyz[2] = dims[2] * cf1 * cf(theta, rtheta);
+  xyz[0] =  dims[0] * cf1 * cf(theta, rtheta);
+  xyz[1] =  dims[1] * cf1 * sf(theta, rtheta);
+  xyz[2] =  dims[2]       * sf(phi, rphi);
 
   cf2 = cf(phi+dphi, 2.0-rphi);
-  nrm[0] = 1.0/dims[0] * cf2 * sf(theta+dtheta, 2.0-rtheta);
-  nrm[1] = 1.0/dims[1]       * sf(phi+dphi, 2.0-rphi);
-  nrm[2] = 1.0/dims[2] * cf2 * cf(theta+dtheta, 2.0-rtheta);
+  nrm[0] = 1.0/dims[0] * cf2 * cf(theta+dtheta, 2.0-rtheta);
+  nrm[1] = 1.0/dims[1] * cf2 * sf(theta+dtheta, 2.0-rtheta);
+  nrm[2] = 1.0/dims[2]       * sf(phi+dphi, 2.0-rphi);
 }
 
-- 
1.7.2.2

0002-ENH-Provide-code-for-aligned-of-axis-along-the-globa.patch [^] (1,051 bytes) 2010-09-14 06:56 [Show Content] [Hide Content]

From 4c6fcc0b2f4c1aede882e97d05331c36b931ddd1 Mon Sep 17 00:00:00 2001
From: Sven Buijssen <sven.buijssen@tu-dortmund.de>
Date: Tue, 14 Sep 2010 12:27:57 +0200
Subject: [PATCH 2/3] ENH: Provide code for aligned of axis along the global y-axis.

---
 Graphics/vtkSuperquadricSource.cxx |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Graphics/vtkSuperquadricSource.cxx b/Graphics/vtkSuperquadricSource.cxx
index a437150..4c27fa0 100644
--- a/Graphics/vtkSuperquadricSource.cxx
+++ b/Graphics/vtkSuperquadricSource.cxx
@@ -294,9 +294,16 @@ int vtkSuperquadricSource::RequestData(
               nv[1] = -nv[1];
               break;
             case 1:
-              //y-axis
-              //PENDING
+              // y-axis
+              tmp   = pt[1];
+              pt[1] = pt[2];
+              pt[2] = tmp;
+              pt[0] = -pt[0];
 
+              tmp   = nv[1];
+              nv[1] = nv[2];
+              nv[2] = tmp;
+              nv[0] = -nv[0];
               break;
           }
 
-- 
1.7.2.2

0003-ENH-Provide-a-method-to-set-axis-of-symmetry.patch [^] (1,750 bytes) 2010-09-14 06:56 [Show Content] [Hide Content]

From 613029631fa89c50998b9374161d79efdfbee6b3 Mon Sep 17 00:00:00 2001
From: Sven Buijssen <sven.buijssen@tu-dortmund.de>
Date: Tue, 14 Sep 2010 12:28:48 +0200
Subject: [PATCH 3/3] ENH: Provide a method to set axis of symmetry.

---
 Graphics/vtkSuperquadricSource.h |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Graphics/vtkSuperquadricSource.h b/Graphics/vtkSuperquadricSource.h
index 19bc964..7ee8317 100644
--- a/Graphics/vtkSuperquadricSource.h
+++ b/Graphics/vtkSuperquadricSource.h
@@ -15,9 +15,10 @@
 // .NAME vtkSuperquadricSource - create a polygonal superquadric centered 
 // at the origin
 // .SECTION Description
-// vtkSuperquadricSource creates a superquadric (represented by polygons) 
-// of specified
-// size centered at the origin. The resolution (polygonal discretization)
+// vtkSuperquadricSource creates a superquadric (represented by polygons) of
+// specified size centered at the origin. The alignment of the axis of the
+// superquadric along one of the global axes can be specified. The resolution
+// (polygonal discretization)
 // in both the latitude (phi) and longitude (theta) directions can be
 // specified. Roundness parameters (PhiRoundness and ThetaRoundness) control
 // the shape of the superquadric.  The Toroidal boolean controls whether
@@ -110,6 +111,11 @@ public:
   vtkGetMacro(Size,double);
 
   // Description:
+  // Set/Get axis of symmetry for superquadric (x axis: 0, y axis: 1, z axis: 2). Initial value is 2.
+  vtkSetMacro(AxisOfSymmetry,int);
+  vtkGetMacro(AxisOfSymmetry,int);
+
+  // Description:
   // Set/Get whether or not the superquadric is toroidal (1) or ellipsoidal (0).
   // Initial value is 0.
   vtkBooleanMacro(Toroidal,int);
-- 
1.7.2.2

0001-BUG-Axis-of-symmetry-claimed-to-be-the-global-z-axis.updated.patch [^] (3,974 bytes) 2010-09-23 17:04 [Show Content] [Hide Content]

From e20d3ff88fa25ca190e3dd1fbb0d4ce52954afe7 Mon Sep 17 00:00:00 2001
From: Sven Buijssen <sven.buijssen@tu-dortmund.de>
Date: Mon, 13 Sep 2010 14:48:08 +0200
Subject: [PATCH 1/3] BUG: Axis of symmetry claimed to be the global z axis, but was the y-axis.

     Additionally, the code to change the axis of symmetry to be aligned with
     the global x-axis had the correct rotation formula z->x, but used the
     faulty y-axis based input and consequently did not yield a superquadric
     with an axis aligned to the global x-axis.
     Thirdly, location of poles of a superquadric was assumed to be independent
     of the axis of symmetry. The problem merely became evident for the parameter 
     subspace with toroidal = 0, theta = 1, phi < 1 and a superquadric 
     symmetric to the x-axis: the poles got positioned at the center of 
     gravity of the superquadric. A planar capping is intended, though.
     
---
 Graphics/vtkSuperquadricSource.cxx |   44 ++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/Graphics/vtkSuperquadricSource.cxx b/Graphics/vtkSuperquadricSource.cxx
index 366a04e..43388b2 100644
--- a/Graphics/vtkSuperquadricSource.cxx
+++ b/Graphics/vtkSuperquadricSource.cxx
@@ -274,7 +274,7 @@ int vtkSuperquadricSource::RequestData(
             thetaOffset =  0.0;
             }
 
-          //This give you superquadric with axis of symmetry: z
+          // This gives a superquadric with axis of symmetry: z
           evalSuperquadric(theta, phi,
                            thetaOffset, phiOffset,
                            this->ThetaRoundness, this->PhiRoundness,
@@ -282,16 +282,16 @@ int vtkSuperquadricSource::RequestData(
           switch (this->AxisOfSymmetry)
             {
             case 0:
-              //x-axis
-              tmp = pt[0];
+              // x-axis
+              tmp   = pt[0];
               pt[0] = pt[2];
               pt[2] = tmp;
               pt[1] = -pt[1];
 
-              tmp = nv[0];
-              nv[0]=nv[2];
-              nv[2]=tmp;
-              nv[1]=-nv[1];
+              tmp   = nv[0];
+              nv[0] = nv[2];
+              nv[2] = tmp;
+              nv[1] = -nv[1];
               break;
             case 1:
               //y-axis
@@ -314,9 +314,19 @@ int vtkSuperquadricSource::RequestData(
             // make sure the pole is at the same location for all evals
             // (the superquadric evaluation is numerically unstable
             // at the poles)
-
-            pt[0] = pt[2] = 0.0;
-          }
+            switch (this->AxisOfSymmetry)
+              {
+              case 0:
+                // x-axis
+                pt[1] = pt[2] = 0.0;
+                break;
+
+              case 2:
+                // z-axis
+                pt[0] = pt[1] = 0.0;
+                break;
+              }
+            }
 
           pt[0] += this->Center[0];
           pt[1] += this->Center[1];
@@ -416,16 +426,18 @@ static void evalSuperquadric(double theta, double phi,  // parametric coords
                              double xyz[3],      // output coords
                              double nrm[3])      // output normals
 {
+  // axis of symmetry: z
+
   double cf1, cf2;
 
   cf1 = cf(phi, rphi, alpha);
-  xyz[0] = dims[0] * cf1 * sf(theta, rtheta);
-  xyz[1] = dims[1]       * sf(phi, rphi);
-  xyz[2] = dims[2] * cf1 * cf(theta, rtheta);
+  xyz[0] =  dims[0] * cf1 * cf(theta, rtheta);
+  xyz[1] =  dims[1] * cf1 * sf(theta, rtheta);
+  xyz[2] =  dims[2]       * sf(phi, rphi);
 
   cf2 = cf(phi+dphi, 2.0-rphi);
-  nrm[0] = 1.0/dims[0] * cf2 * sf(theta+dtheta, 2.0-rtheta);
-  nrm[1] = 1.0/dims[1]       * sf(phi+dphi, 2.0-rphi);
-  nrm[2] = 1.0/dims[2] * cf2 * cf(theta+dtheta, 2.0-rtheta);
+  nrm[0] = 1.0/dims[0] * cf2 * cf(theta+dtheta, 2.0-rtheta);
+  nrm[1] = 1.0/dims[1] * cf2 * sf(theta+dtheta, 2.0-rtheta);
+  nrm[2] = 1.0/dims[2]       * sf(phi+dphi, 2.0-rphi);
 }
 
-- 
1.7.2.2

0002-ENH-Provide-code-for-aligned-of-axis-along-the-globa.updated.patch [^] (1,384 bytes) 2010-09-23 17:04 [Show Content] [Hide Content]

From d04e8f0c72f23631f586a0b8bf4158adfc86536b Mon Sep 17 00:00:00 2001
From: Sven Buijssen <sven.buijssen@tu-dortmund.de>
Date: Tue, 14 Sep 2010 12:27:57 +0200
Subject: [PATCH 2/3] ENH: Provide code for aligned of axis along the global y-axis.

---
 Graphics/vtkSuperquadricSource.cxx |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Graphics/vtkSuperquadricSource.cxx b/Graphics/vtkSuperquadricSource.cxx
index 43388b2..c834cba 100644
--- a/Graphics/vtkSuperquadricSource.cxx
+++ b/Graphics/vtkSuperquadricSource.cxx
@@ -294,9 +294,16 @@ int vtkSuperquadricSource::RequestData(
               nv[1] = -nv[1];
               break;
             case 1:
-              //y-axis
-              //PENDING
+              // y-axis
+              tmp   = pt[1];
+              pt[1] = pt[2];
+              pt[2] = tmp;
+              pt[0] = -pt[0];
 
+              tmp   = nv[1];
+              nv[1] = nv[2];
+              nv[2] = tmp;
+              nv[0] = -nv[0];
               break;
           }
 
@@ -321,6 +328,11 @@ int vtkSuperquadricSource::RequestData(
                 pt[1] = pt[2] = 0.0;
                 break;
 
+              case 1:
+                // y-axis
+                pt[0] = pt[2] = 0.0;
+                break;
+
               case 2:
                 // z-axis
                 pt[0] = pt[1] = 0.0;
-- 
1.7.2.2

newSource.png [^] (21,692 bytes) 2012-11-16 17:04

oldSource.png [^] (21,084 bytes) 2012-11-16 17:04

Relationships

Notes
(0022338) Sven Buijssen (reporter) 2010-09-23 17:04	I've identified an additional problem with the original implementation: the location of poles of a superquadric was assumed to be independent of the axis of symmetry. The problem merely became evident for the parameter subspace with toroidal = 0, theta = 1, phi < 1 and a superquadric symmetric to the x-axis: the poles got positioned at the center of gravity of the superquadric. A planar capping is intended, though. I'll upload again the first two patch files that have been updated accordingly.

(0029744) Sebastien Jourdain (developer) 2012-11-16 17:10	I've reverted to patch as they were backward incompatible regarding the angle management. Therefore, to move forward, either the generated source should remain identical as before or discuss the reason of the changes on the mailing list and managed to be approved by the ARB. I've created a gerrit topic that could be apply if we want to move forward. http://review.source.kitware.com/#/t/1745/ [^] I've attached some image of a ParaView test that illustrate the change in the Source generation. (pv.ColorEditor2) I'll let you take over Sven... Once the community and the ARB approve I'll be able to integrate it, but for now, I can not do it as it might brake some existing code.

(0029745) Sebastien Jourdain (developer) 2012-11-18 18:09	Merged into master

(0029746) Sebastien Jourdain (developer) 2012-11-18 18:11	commit 2e6bb23adac980e866fd248bdecd1974e68a97ad Merge: c550908 8d0ada1 Author: Sebastien Jourdain <sebastien.jourdain@kitware.com> Date: Sun Nov 18 17:59:53 2012 -0500 Merge topic 'proposition_of_improvement_of_super_quadric_source' into master 8d0ada17 Bring back the old behavior 56140286 Revert "Revert "Add code to support 'invalid' symmetric axis value"" 1c5e87c2 Revert "Revert "ENH: Provide a method to set axis of symmetry."" d96193b5 Revert "Revert "ENH: Provide code for aligned of axis along the global y-axis."" 3afab72c Revert "Revert "BUG: Axis of symmetry claimed to be the global z axis, but was the y-axis.""

Issue History
Date Modified	Username	Field	Change
2010-09-14 06:55	Sven Buijssen	New Issue
2010-09-14 06:55	Sven Buijssen	File Added: vtk_create_sources_cylinder_along_with_superquadric.py
2010-09-14 06:56	Sven Buijssen	File Added: octave_superquadric.source.m
2010-09-14 06:56	Sven Buijssen	File Added: 0001-BUG-Axis-of-symmetry-claimed-to-be-the-global-z-axis.patch
2010-09-14 06:56	Sven Buijssen	File Added: 0002-ENH-Provide-code-for-aligned-of-axis-along-the-globa.patch
2010-09-14 06:56	Sven Buijssen	File Added: 0003-ENH-Provide-a-method-to-set-axis-of-symmetry.patch
2010-09-23 17:04	Sven Buijssen	Note Added: 0022338
2010-09-23 17:04	Sven Buijssen	File Added: 0001-BUG-Axis-of-symmetry-claimed-to-be-the-global-z-axis.updated.patch
2010-09-23 17:04	Sven Buijssen	File Added: 0002-ENH-Provide-code-for-aligned-of-axis-along-the-globa.updated.patch
2011-06-16 13:11	Zack Galbreath	Category	=> (No Category)
2012-11-12 11:13	guest	Status	expired => tabled
2012-11-12 11:18	guest	Status	tabled => todo
2012-11-12 11:19	guest	Status	todo => active development
2012-11-16 17:04	Sebastien Jourdain	File Added: newSource.png
2012-11-16 17:04	Sebastien Jourdain	File Added: oldSource.png
2012-11-16 17:10	Sebastien Jourdain	Note Added: 0029744
2012-11-16 17:13	Sebastien Jourdain	Assigned To	=> Sebastien Jourdain
2012-11-16 17:13	Sebastien Jourdain	Status	active development => todo
2012-11-16 17:13	Sebastien Jourdain	Resolution	open => fixed
2012-11-16 17:14	Sebastien Jourdain	Status	todo => backlog
2012-11-16 17:14	Sebastien Jourdain	Resolution	fixed => reopened
2012-11-18 18:08	Sebastien Jourdain	Status	backlog => todo
2012-11-18 18:08	Sebastien Jourdain	Resolution	reopened => fixed
2012-11-18 18:08	Sebastien Jourdain	Status	todo => active development
2012-11-18 18:09	Sebastien Jourdain	Status	active development => gatekeeper review
2012-11-18 18:09	Sebastien Jourdain	Note Added: 0029745
2012-11-18 18:09	Sebastien Jourdain	Status	gatekeeper review => customer review
2012-11-18 18:11	Sebastien Jourdain	Note Added: 0029746
2013-04-05 20:35	Berk Geveci	Status	customer review => closed