GridPlot speedup

General extensions, bugfixes and speedups of the GridPlot up to 40%

Author: sintegrial

include/qwt3d_coordsys.h

@@ -11,33 +11,33 @@ namespace Qwt3D
 //! A coordinate system with different styles (BOX, FRAME)
 class QWT3D_EXPORT CoordinateSystem : public Drawable
 {
-
 public:
 	explicit CoordinateSystem(Qwt3D::Triple blb = Qwt3D::Triple(0,0,0), Qwt3D::Triple ftr = Qwt3D::Triple(0,0,0), Qwt3D::COORDSTYLE = Qwt3D::BOX);
-  ~CoordinateSystem();	
+	~CoordinateSystem();	
 
 	void init(Qwt3D::Triple beg = Qwt3D::Triple(0,0,0), Qwt3D::Triple end = Qwt3D::Triple(0,0,0));
 	//! Set style for the coordinate system (NOCOORD, FRAME or BOX)
-  void setStyle(Qwt3D::COORDSTYLE s,	Qwt3D::AXIS frame_1 = Qwt3D::X1, 
-																			Qwt3D::AXIS frame_2 = Qwt3D::Y1, 
-																			Qwt3D::AXIS frame_3 = Qwt3D::Z1);
-  Qwt3D::COORDSTYLE style() const { return style_;} 	//!< Return style oft the coordinate system 
+	void setStyle(Qwt3D::COORDSTYLE s,	
+					Qwt3D::AXIS frame_1 = Qwt3D::X1, 
+					Qwt3D::AXIS frame_2 = Qwt3D::Y1, 
+					Qwt3D::AXIS frame_3 = Qwt3D::Z1);
+	Qwt3D::COORDSTYLE style() const { return style_;} 	//!< Return style oft the coordinate system 
 	void setPosition(Qwt3D::Triple first, Qwt3D::Triple second); //!< first == front_left_bottom, second == back_right_top
 
 	void setAxesColor(Qwt3D::RGBA val); //!< Set common color for all axes
 	//! Set common font for all axis numberings
-  void setNumberFont(QString const& family, int pointSize, int weight = QFont::Normal, bool italic = false);
+	void setNumberFont(QString const& family, int pointSize, int weight = QFont::Normal, bool italic = false);
 	//! Set common font for all axis numberings
 	void setNumberFont(QFont const& font);
 	//! Set common color for all axis numberings
 	void setNumberColor(Qwt3D::RGBA val);
-  void setStandardScale(); //!< Sets an linear axis with real number items
+	void setStandardScale(); //!< Sets an linear axis with real number items
 
  	void adjustNumbers(int val); //!< Fine tunes distance between axis numbering and axis body
 	void adjustLabels(int val); //!< Fine tunes distance between axis label and axis body
 
 	//! Sets color for the grid lines
-  void setGridLinesColor(Qwt3D::RGBA val) {gridlinecolor_ = val;}
+	void setGridLinesColor(Qwt3D::RGBA val) {gridlinecolor_ = val;}
 
 	//! Set common font for all axis labels
 	void setLabelFont(QString const& family, int pointSize, int weight = QFont::Normal, bool italic = false);
@@ -52,7 +52,7 @@ class QWT3D_EXPORT CoordinateSystem : public Drawable
 	void setTicLength(double major, double minor);
 
 	//! Switch autoscaling of axes
-  void setAutoScale(bool val = true);
+	void setAutoScale(bool val = true);
 
 	Qwt3D::Triple first() const { return first_;}
 	Qwt3D::Triple second() const { return second_;}
@@ -66,12 +66,11 @@ class QWT3D_EXPORT CoordinateSystem : public Drawable
 	void draw();
 
 	//! Defines whether a grid between the major and/or minor tics should be drawn
-  void setGridLines(bool majors, bool minors, int sides = Qwt3D::NOSIDEGRID); 
-  int grids() const {return sides_;} //!< Returns grids switched on
+	void setGridLines(bool majors, bool minors, int sides = Qwt3D::NOSIDEGRID); 
+	int grids() const {return sides_;} //!< Returns grids switched on
 
 	//! The vector of all12 axes - use them to set axis properties individually.
-  std::vector<Axis> axes;
-
+	std::vector<Axis> axes;
 
 private:
 	void destroy();
@@ -85,15 +84,15 @@ class QWT3D_EXPORT CoordinateSystem : public Drawable
 
 	void chooseAxes();
 	void autoDecorateExposedAxis(Axis& ax, bool left);
-  void drawMajorGridLines(); //!< Draws a grid between the major tics on the site
+	void drawMajorGridLines(); //!< Draws a grid between the major tics on the site
 	void drawMinorGridLines(); //!< Draws a grid between the minor tics on the site
-  void drawMajorGridLines(Qwt3D::Axis&, Qwt3D::Axis&); //! Helper
-  void drawMinorGridLines(Qwt3D::Axis&, Qwt3D::Axis&); //! Helper
-  void recalculateAxesTics();
+	void drawMajorGridLines(Qwt3D::Axis&, Qwt3D::Axis&); //! Helper
+	void drawMinorGridLines(Qwt3D::Axis&, Qwt3D::Axis&); //! Helper
+	void recalculateAxesTics();
 
 	bool autodecoration_;
 	bool majorgridlines_, minorgridlines_;
-  int  sides_;
+	int  sides_;
 };
 
 } // ns

include/qwt3d_drawable.h

@@ -12,11 +12,9 @@ namespace Qwt3D
 //! ABC for Drawables
 class QWT3D_EXPORT Drawable 
 {
-
 public:
-
 	virtual ~Drawable() = 0;
-	
+
 	virtual void draw();
 
 	virtual void saveGLState();
@@ -25,25 +23,22 @@ class QWT3D_EXPORT Drawable
 	void attach(Drawable*);
 	void detach(Drawable*);
 	void detachAll();
-	
+
 	virtual void setColor(double r, double g, double b, double a = 1);	
 	virtual void setColor(Qwt3D::RGBA rgba);	
 	Qwt3D::Triple relativePosition(Qwt3D::Triple rel); 
 
 protected:
-	
 	Qwt3D::RGBA color;
 	void Enable(GLenum what, GLboolean val);
 	Qwt3D::Triple ViewPort2World(Qwt3D::Triple win, bool* err = 0);
 	Qwt3D::Triple World2ViewPort(Qwt3D::Triple obj, bool* err = 0);
 
 	GLdouble modelMatrix[16];
-  GLdouble projMatrix[16];
-  GLint viewport[4];
-	
+	GLdouble projMatrix[16];
+	GLint viewport[4];
 
 private:
-
 	GLboolean ls;
 	GLboolean pols;
 	GLint polmode[2];

include/qwt3d_gridplot.h

@@ -33,18 +33,21 @@ public slots:
 
 protected:  
     void createOpenGlData(const Plotlet& pl);
-	void processVertex(const Triple& vert1, const Triple& norm1, const Plotlet& pl, bool hl, bool& stripStarted);
+	void processVertex(const Triple& vert1, const Triple& norm1, const Plotlet& pl, bool hl, bool& stripStarted, RGBA& lastColor) const;
+	void processLineLoopVertex(const Triple& vert1, bool& stripStarted) const;
+	void processLineStripVertex(const Triple& vert1, bool& stripStarted) const;
 
 	void drawEnrichment(const Plotlet& pl, Enrichment& p);
 
     int resolution_p;
 
-private:
+protected:
+	//! class made protected to access grid data from inherited classes
     class GridData : public Data
     {
     public:
         GridData();
-        GridData(unsigned int columns, unsigned int rows);//!< see setSize()
+        GridData(unsigned int columns, unsigned int rows); //!< see setSize()
 
         GridData* clone() const {return new GridData(*this);}
 
@@ -68,7 +71,7 @@ public slots:
     void createNormals(const Plotlet& pl);
     void data2Floor(const Plotlet& pl);
     void isolines2Floor(const Plotlet& pl);
-    void setColorFromVertex(const Plotlet& pl, const Triple& vertex, bool skip = false);
+    void setColorFromVertex(const Plotlet& pl, const Triple& vertex, RGBA& lastColor, bool skip = false) const;
     void calcNormals(GridData& gdata);
     void sewPeriodic(GridData& gdata);
     void readIn(GridData& gdata, Triple** data, unsigned int columns, unsigned int rows);

include/qwt3d_plot3d.h

@@ -31,8 +31,10 @@ class QWT3D_EXPORT Plot3D : public ExtGLWidget
 
     void updateData(); //!< Recalculate data
 
+	Qwt3D::CoordinateSystem* coordinates() { return &coordinates_p; } //!< Returns pointer to CoordinateSystem object
+	//! \since 0.3.2
+	const Qwt3D::CoordinateSystem* coordinates() const { return &coordinates_p; } //!< Returns const pointer to CoordinateSystem object
     void createCoordinateSystem(Qwt3D::Triple beg, Qwt3D::Triple end);
-    Qwt3D::CoordinateSystem* coordinates() { return &coordinates_p; } //!< Returns pointer to CoordinateSystem object
     void setCoordinateStyle(Qwt3D::COORDSTYLE st); //!< Sets style of coordinate system.
 
     Qwt3D::ColorLegend* legend() { return &legend_;} //!< Returns pointer to ColorLegend object
@@ -58,7 +60,7 @@ class QWT3D_EXPORT Plot3D : public ExtGLWidget
 
     //! Returns number of Plotlets
     unsigned plotlets() const {return plotlets_p.size();}
-    //! Returns false, if at leat one valid datset exists.
+    //! Returns false, if at least one valid dataset exists.
     inline bool hasData() const;
     //! Returns appearance for Plotlet at position idx
     inline Appearance& appearance(unsigned idx);
@@ -146,11 +148,11 @@ public slots:
     quint64 m_createTime;
 
     /**
-  Utilized from createDataset members in inherited plot types.
-  Following different strategies (depending on append) in modifying the
-  Plotlet vector, the function assigns data of type DATA to
-  a Plotlets data member. It returns a reference to the new content and the
-  position in the Plotlet vector
+	  Utilized from createDataset members in inherited plot types.
+	  Following different strategies (depending on append) in modifying the
+	  Plotlet vector, the function assigns data of type DATA to
+	  a Plotlets data member. It returns a reference to the new content and the
+	  position in the Plotlet vector
   */
     template<typename DATA>
     int prepareDatasetCreation(bool append)

include/qwt3d_types.h

@@ -30,8 +30,8 @@ enum PLOTSTYLE
 	HIDDENLINE , //!< Hidden Line style
 	FILLED     , //!< Color filled polygons w/o edges 
 	FILLEDMESH , //!< Color filled polygons w/ separately colored edges
-  POINTS     , //!< User defined style (used by Enrichments)
-  USER         //!< User defined style (used by Enrichments)
+	POINTS     , //!< User defined style (used by Enrichments)
+	USER         //!< User defined style (used by Enrichments)
 };
 
 //! Shading style
@@ -54,7 +54,7 @@ enum SCALETYPE
 {
 	LINEARSCALE,//!< Linear scaling 
 	LOG10SCALE,	//!< Logarithmic scaling (base 10)
-  USERSCALE   //!< User-defined (for extensions)
+	USERSCALE   //!< User-defined (for extensions)
 };
 
 //! Plotting style for floor data (projections)
@@ -158,7 +158,7 @@ struct QWT3D_EXPORT Triple
 	//! Triple coordinates
 	double x,y,z; 
 
-	Triple& operator+=(Triple t)
+	Triple& operator+=(const Triple& t)
 	{
 		x += t.x;
 		y += t.y;
@@ -167,14 +167,15 @@ struct QWT3D_EXPORT Triple
 		return *this;
 	}
 
-	Triple& operator-=(Triple t)
+	Triple& operator-=(const Triple& t)
 	{
 		x -= t.x;
 		y -= t.y;
 		z -= t.z;
 
 		return *this;
 	}
+
 	Triple& operator*=(double d)
 	{
 		x *= d;
@@ -183,6 +184,7 @@ struct QWT3D_EXPORT Triple
 
 		return *this;
 	}
+
 	Triple& operator/=(double d)
 	{
 		x /= d;
@@ -191,7 +193,8 @@ struct QWT3D_EXPORT Triple
 
 		return *this;
 	}
-	Triple& operator*=(Triple t) // scale
+
+	Triple& operator*=(const Triple& t) // scale
 	{
 		x *= t.x;
 		y *= t.y;
@@ -200,12 +203,12 @@ struct QWT3D_EXPORT Triple
 		return *this;
 	}
 
-	bool operator!=(Triple t) const
+	bool operator!=(const Triple& t) const
 	{
 		return !isPracticallyZero(x,t.x) || !isPracticallyZero(y,t.y) || !isPracticallyZero(z,t.z);
 	}
 
-	bool operator==(Triple t) const
+	bool operator==(const Triple& t) const
 	{
 		return !operator!=(t);
 	}
@@ -221,33 +224,62 @@ struct QWT3D_EXPORT Triple
 		double l = length();
 		if (l)
 			*this /= l;
+		else
+			reset();
+	}
+
+	//! \since 0.3.2
+	void crossProduct(Triple const& u, Triple const& v)
+	{
+		/* compute the cross product (u x v for right-handed [ccw]) */
+		x = u.y * v.z - u.z * v.y;
+		y = u.z * v.x - u.x * v.z;
+		z = u.x * v.y - u.y * v.x;
+	}
+
+	//! \since 0.3.2
+	bool isValid() const
+	{
+		return !_isnan(x) && !_isnan(y) && !_isnan(z);
+	}
+
+	//! \since 0.3.2
+	void reset()
+	{
+		x = y = z = 0.0;
 	}
 };
 
 inline const Triple operator+(const Triple& t, const Triple& t2)
 {
 	return Triple(t) += t2;
 }
+
 inline const Triple operator-(const Triple& t, const Triple& t2)
 {
 	return Triple(t) -= t2;
 }
+
 inline const Triple operator*(double d, const Triple& t)
 {
 	return Triple(t) *= d;
 }
+
 inline const Triple operator*(const Triple& t, double d)
 {
 	return Triple(t) *= d;
 }
+
 inline const Triple operator/(double d, const Triple& t)
 {
 	return Triple(t) /= d;
 }
+
 inline const Triple operator/(const Triple& t, double d)
 {
 	return Triple(t) /= d;
 }
+
 inline const Triple operator*(const Triple& t, const Triple& t2)
 {
 	return Triple(t) *= t2;
@@ -344,9 +376,23 @@ struct QWT3D_EXPORT RGBA
 	RGBA()
 		: r(0), g(0), b(0), a(1)
 		{}
+	
 	RGBA(double rr, double gg, double bb, double aa = 1)
 		: r(rr), g(gg), b(bb), a(aa)
 		{}
+
+	//! \since 0.3.2
+	bool operator==(const RGBA& c)
+	{
+		return r == c.r && g == c.g && b == c.b && a == c.a;
+	}
+
+	//! \since 0.3.2
+	bool operator!=(const RGBA& c)
+	{
+		return !(*this == c);
+	}
+
 	double r,g,b,a;
 };
 
@@ -368,11 +414,7 @@ inline Triple normalizedcross(Triple const& u, Triple const& v)
 	n.z = u.x * v.y - u.y * v.x;
 
 	/* normalize */
-	double l = n.length();
-	if (l > 0)
-	{
-		n /= l;
-	}
+	n.normalize();
 
 	return n;
 }

include/qwt3d_volumeplot.h

@@ -29,6 +29,11 @@ struct Voxel
     {
     }
 
+	bool isValid() const
+	{
+		return !_isnan(x) && !_isnan(y) && !_isnan(z);
+	}
+
     float x,y,z;
     quint8 r,g,b,a;