GridPlot improvements and fixes

Fixed multithreadings issues
More glDrawArrays usage

Author: sintegrial

.gitignore

@@ -26,3 +26,5 @@
 *.exe
 *.out
 *.app
+*.idb
+*.user

examples/dynamicplot/dynamicplot.cpp

@@ -5,16 +5,20 @@
 //-----------------------------------------------------------------
 
 #include <math.h>
+#include <limits>
+
 #include <QApplication>
 #include <QElapsedTimer>
 
 #include "dynamicplot.h"
 
-
 Plot::Plot()
 {
 	//setTitle("Dynamic Plotter Demonstration");
 
+    setRenderThreadsCount(2);
+    enableFastNormals(true);
+
 	// fill initial data
 	for (int i = 0; i < Width1; i++)
 	{
@@ -27,12 +31,21 @@ Plot::Plot()
 			data[i][j] = xval;
 
 			xval += rand() % 3 - 1;
+
+			if (rand() % 5 == 1)
+				data[i][j] = std::numeric_limits<double>::quiet_NaN();
 		}
 	}
 
 	setRotation(50, 0, -15);
 	setZoom(1);
 
+	setPlotStyle(Qwt3D::FILLED);
+	//setPlotStyle(Qwt3D::FILLEDMESH);
+	//setPlotStyle(Qwt3D::WIREFRAME);
+	//setPlotStyle(Qwt3D::HIDDENLINE);
+
+
 	for (unsigned i=0; i!=coordinates()->axes.size(); ++i)
 	{
 		coordinates()->axes[i].setMajors(10);
@@ -43,7 +56,6 @@ Plot::Plot()
 	coordinates()->axes[Y1].setLabelString("y-axis");
 	//coordinates()->axes[Z1].setLabelString(QChar(0x38f)); // Omega - see http://www.unicode.org/charts/
 
-
 	setCoordinateStyle(BOX);
 
 	connect(&timer, SIGNAL(timeout()), this, SLOT(UpdateData()));
@@ -69,6 +81,9 @@ void Plot::UpdateData()
 		data[i][Width2-1] = xval;
 
 		xval += rand() % 3 - 1;
+
+        if (rand() % 5 == 1)
+            data[i][Width2-1] = std::numeric_limits<double>::quiet_NaN();
 	}
 
 	QElapsedTimer tim;
@@ -77,12 +92,11 @@ void Plot::UpdateData()
 	// update dataset
 	createDataset(data, Width1, Width2, 0, Width1, 0, Width2);
 
+    updateGL();
+
 	qint64 rate = tim.elapsed();
 
     setTitle(QString("Dynamic Plotter Demonstration - Frame Time %1 ms").arg(rate));
-
-    //updateData();
-	updateGL();
 }
 
 int main(int argc, char **argv)

examples/dynamicplot/dynamicplot.vcproj

@@ -60,12 +60,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm200 -MP -w34100 -w34189"
-				Optimization="4"
+				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include&quot;;..\..\include;&quot;$(IntDir)\..&quot;"
-				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_THREAD_SUPPORT,QT_DLL,QT_OPENGL_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_HAVE_MMX,QT_HAVE_3DNOW,QT_HAVE_SSE,QT_HAVE_MMXEXT,QT_HAVE_SSE2"
+				PreprocessorDefinitions="_WINDOWS;UNICODE;WIN32;QT_THREAD_SUPPORT;QT_OPENGL_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;DEBUG"
 				GeneratePreprocessedFile="0"
 				ExceptionHandling="1"
 				RuntimeLibrary="3"
+				FloatingPointModel="2"
 				TreatWChar_tAsBuiltInType="false"
 				RuntimeTypeInfo="true"
 				AssemblerListingLocation=""
@@ -90,7 +91,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
-				AdditionalDependencies="glu32.lib opengl32.lib gdi32.lib user32.lib c:\Qt\4.8.5_VC2008\lib\qtmaind.lib qwtplot3d.lib opengl32.lib glu32.lib gdi32.lib c:\Qt\4.8.5_VC2008\lib\QtOpenGLd4.lib c:\Qt\4.8.5_VC2008\lib\QtGuid4.lib c:\Qt\4.8.5_VC2008\lib\QtCored4.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib gdi32.lib user32.lib c:\Qt\4.8.5_VC2008\lib\qtmaind.lib qwtplot3d-debug.lib c:\Qt\4.8.5_VC2008\lib\QtOpenGLd4.lib c:\Qt\4.8.5_VC2008\lib\QtGuid4.lib c:\Qt\4.8.5_VC2008\lib\QtCored4.lib"
 				OutputFile="$(OutDir)\dynamicplot.exe"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(QTDIR)\lib,../../lib"
@@ -128,6 +129,7 @@
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -163,12 +165,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm200 -MP -w34100 -w34189"
 				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include&quot;;..\..\include;&quot;$(IntDir)\..&quot;"
 				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_THREAD_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_OPENGL_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_HAVE_MMX,QT_HAVE_3DNOW,QT_HAVE_SSE,QT_HAVE_MMXEXT,QT_HAVE_SSE2,NDEBUG"
 				GeneratePreprocessedFile="0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
 				TreatWChar_tAsBuiltInType="false"
 				RuntimeTypeInfo="true"
 				AssemblerListingLocation=""

examples/freemesh/freemesh.vcproj

@@ -128,6 +128,7 @@
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -163,11 +164,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm200 -MP -w34100 -w34189"
 				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include&quot;;..\..\include;&quot;$(IntDir)\..&quot;"
 				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_THREAD_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_OPENGL_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_HAVE_MMX,QT_HAVE_3DNOW,QT_HAVE_SSE,QT_HAVE_MMXEXT,QT_HAVE_SSE2,NDEBUG"
 				GeneratePreprocessedFile="0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
 				TreatWChar_tAsBuiltInType="false"
 				RuntimeTypeInfo="true"
 				AssemblerListingLocation=""

examples/mesh/mesh.vcproj

@@ -90,7 +90,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalOptions=""/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'""
-				AdditionalDependencies="glu32.lib opengl32.lib gdi32.lib user32.lib c:\Qt\4.8.5_VC2008\lib\qtmaind.lib qwtplot3d.lib opengl32.lib glu32.lib gdi32.lib c:\Qt\4.8.5_VC2008\lib\QtOpenGLd4.lib c:\Qt\4.8.5_VC2008\lib\QtGuid4.lib c:\Qt\4.8.5_VC2008\lib\QtCored4.lib"
+				AdditionalDependencies="glu32.lib opengl32.lib gdi32.lib user32.lib c:\Qt\4.8.5_VC2008\lib\qtmaind.lib qwtplot3d-debug.lib c:\Qt\4.8.5_VC2008\lib\QtOpenGLd4.lib c:\Qt\4.8.5_VC2008\lib\QtGuid4.lib c:\Qt\4.8.5_VC2008\lib\QtCored4.lib"
 				OutputFile="$(OutDir)\mesh.exe"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(QTDIR)\lib,../../lib"
@@ -128,6 +128,7 @@
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -163,11 +164,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm200 -MP -w34100 -w34189"
 				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include&quot;;..\..\include;&quot;$(IntDir)\..&quot;"
 				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_THREAD_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_OPENGL_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_HAVE_MMX,QT_HAVE_3DNOW,QT_HAVE_SSE,QT_HAVE_MMXEXT,QT_HAVE_SSE2,NDEBUG"
 				GeneratePreprocessedFile="0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
 				TreatWChar_tAsBuiltInType="false"
 				RuntimeTypeInfo="true"
 				AssemblerListingLocation=""

examples/mesh/src/meshmainwindow.cpp

@@ -110,6 +110,7 @@ MeshMainWindow::MeshMainWindow( QWidget* parent )
   dataWidget = new GridPlot(frame);
   grid->addWidget( dataWidget, 0, 0 );
 
+  dataWidget->setRenderThreadsCount(2);
 
 	connect( coord, SIGNAL( triggered( QAction* ) ), this, SLOT( pickCoordSystem( QAction* ) ) );
 	connect( plotstyle, SIGNAL( triggered( QAction* ) ), this, SLOT( pickPlotStyle( QAction* ) ) );

examples/plotlets/plotlets.vcproj

@@ -128,6 +128,7 @@
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -163,11 +164,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm200 -MP -w34100 -w34189"
 				Optimization="2"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;;&quot;$(QTDIR)\include&quot;;..\..\include;&quot;$(IntDir)\..&quot;;."
 				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_THREAD_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_OPENGL_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_HAVE_MMX,QT_HAVE_3DNOW,QT_HAVE_SSE,QT_HAVE_MMXEXT,QT_HAVE_SSE2,NDEBUG"
 				GeneratePreprocessedFile="0"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
 				TreatWChar_tAsBuiltInType="false"
 				RuntimeTypeInfo="true"
 				AssemblerListingLocation=""

include/qwt3d_colorlegend.h

@@ -19,27 +19,27 @@ class QWT3D_EXPORT ColorLegend : public Drawable
 {
 
 public:
-	
+
 	//! Possible anchor points for caption and axis
 	enum SCALEPOSITION
 	{
 		Top,      //!< scale on top
-    Bottom,   //!< scale on bottom
+		Bottom,   //!< scale on bottom
 		Left,     //!< scale left
 		Right     //!< scale right
 	};
-	
+
 	//! Orientation of the legend
 	enum ORIENTATION
 	{
-    BottomTop, //!< Positionate the legend vertically, the lowest color index is on the bottom
+		BottomTop, //!< Positionate the legend vertically, the lowest color index is on the bottom
 		LeftRight  //!< Positionate the legend horizontally, the lowest color index is on left side
 	};
 
 	ColorLegend(); //!< Standard constructor
 
-	void draw(); //!< Draws the object. You should not use this explicitely - the function is called by updateGL().
-	
+	void draw(); //!< Draws the object. You should not use this explicitly - the function is called by updateGL().
+
 	void setRelPosition(Qwt3D::Tuple relMin, Qwt3D::Tuple relMax); //!< Sets the relative position of the legend inside widget
 	void setOrientation(ORIENTATION, SCALEPOSITION); //!< Sets legend orientation and scale position
 	void setLimits(double start, double stop); //!< Sets the limit of the scale.
@@ -48,18 +48,18 @@ class QWT3D_EXPORT ColorLegend : public Drawable
 	void drawScale(bool val) { showaxis_ = val; } //!< Sets whether a scale will be drawn.
 	void drawNumbers(bool val) { axis_.setNumbers(val); } //!< Sets whether the scale will have scale numbers.
 	void setAutoScale(bool val); //!< Sets, whether the axis is autoscaled or not.
-  void setScale(Qwt3D::Scale *scale); //!< Sets another scale
-  void setScale(Qwt3D::SCALETYPE); //!< Sets one of the predefined scale types
+	void setScale(Qwt3D::Scale *scale); //!< Sets another scale
+	void setScale(Qwt3D::SCALETYPE); //!< Sets one of the predefined scale types
 
 	void setTitleString(QString const& s); //!< Sets the legends caption string.
-	
+
 	//! Sets the legends caption font.
 	void setTitleFont(QString const& family, int pointSize, int weight = QFont::Normal, bool italic = false); 
 
 	Qwt3D::ColorVector colors; //!< The color vector
 
 private:
-	
+
 	Qwt3D::Label caption_;
 	Qwt3D::ParallelEpiped geometry() const { return pe_;}
 	void setGeometryInternal();

include/qwt3d_gridplot.h

@@ -92,8 +92,9 @@ public slots:
 	public:
 		CVertexProcessor();
 
-		void setup(int dataWidth, int dataLength, const GridData& data, int row, int step = 1, 
-			bool m_colorize = true, const Color* colorData = NULL);
+		void setup(int dataWidth, int dataLength, const GridData& data, int row, int step, 
+			bool useColorMap, const Qwt3D::RGBA& fixedColor, const Color* colorData = NULL,
+			bool showMesh = false, const Qwt3D::RGBA& meshColor = Qwt3D::RGBA(0,0,0,0));
 
 		virtual void run();
 
@@ -103,17 +104,28 @@ public slots:
 		void processVertex(bool& stripStarted, int i, int j, int& index, int& size);
 		void endVertex(int& index, int& size);
 
+		void processLineStripVertex(bool& stripStarted, int i, int j, int& index, int& size);
+		void endLineVertex(int& index, int& size);
+
 		int m_dataWidth, m_dataLength, m_row, m_step;
 		TripleVector m_draw_normals, m_draw_vertices;
 		ColorVector m_draw_colors;
 		std::vector< QPair<int,int> > m_drawList;
 		const GridData* m_data;
+		bool m_drawFill, m_useColorMap;
+		Qwt3D::RGBA m_fixedColor;
 		const Color* m_colorData;
-		bool m_colorize;
+
+		bool m_drawMesh;
+		Qwt3D::RGBA m_meshColor;
+		TripleVector m_mesh_vertices;
+		ColorVector m_mesh_colors;
+		std::vector< QPair<int,int> > m_drawMeshList;
 	};
 
 	int m_threadsCount;
 	CVertexProcessor m_workers[10];
+    bool m_useThreads;
 
     void createNormals(const Plotlet& pl);
     void data2Floor(const Plotlet& pl);

qwtplot3d-vc2008.sln

@@ -3,6 +3,26 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qwtplot3d-vs2008", "qwtplot3d-vc2008.vcproj", "{25E04C55-C6D9-3425-B9FF-0F2F5CE680E8}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamicplot", "examples\dynamicplot\dynamicplot.vcproj", "{83D7D95A-3053-4945-9351-5CB40347CF65}"
+	ProjectSection(ProjectDependencies) = postProject
+		{25E04C55-C6D9-3425-B9FF-0F2F5CE680E8} = {25E04C55-C6D9-3425-B9FF-0F2F5CE680E8}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plotlets", "examples\plotlets\plotlets.vcproj", "{CF1ACDB7-B2C5-3DB4-A764-A121F43B6BC6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{25E04C55-C6D9-3425-B9FF-0F2F5CE680E8} = {25E04C55-C6D9-3425-B9FF-0F2F5CE680E8}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freemesh", "examples\freemesh\freemesh.vcproj", "{9D5DB26E-6468-3301-BA12-40E12D002C56}"
+	ProjectSection(ProjectDependencies) = postProject
+		{25E04C55-C6D9-3425-B9FF-0F2F5CE680E8} = {25E04C55-C6D9-3425-B9FF-0F2F5CE680E8}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesh", "examples\mesh\mesh.vcproj", "{8D335988-DF3F-3E28-9289-5772249B420F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{25E04C55-C6D9-3425-B9FF-0F2F5CE680E8} = {25E04C55-C6D9-3425-B9FF-0F2F5CE680E8}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -13,6 +33,22 @@ Global
 		{25E04C55-C6D9-3425-B9FF-0F2F5CE680E8}.Debug|Win32.Build.0 = Debug|Win32
 		{25E04C55-C6D9-3425-B9FF-0F2F5CE680E8}.Release|Win32.ActiveCfg = Release|Win32
 		{25E04C55-C6D9-3425-B9FF-0F2F5CE680E8}.Release|Win32.Build.0 = Release|Win32
+		{83D7D95A-3053-4945-9351-5CB40347CF65}.Debug|Win32.ActiveCfg = Debug|Win32
+		{83D7D95A-3053-4945-9351-5CB40347CF65}.Debug|Win32.Build.0 = Debug|Win32
+		{83D7D95A-3053-4945-9351-5CB40347CF65}.Release|Win32.ActiveCfg = Release|Win32
+		{83D7D95A-3053-4945-9351-5CB40347CF65}.Release|Win32.Build.0 = Release|Win32
+		{CF1ACDB7-B2C5-3DB4-A764-A121F43B6BC6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CF1ACDB7-B2C5-3DB4-A764-A121F43B6BC6}.Debug|Win32.Build.0 = Debug|Win32
+		{CF1ACDB7-B2C5-3DB4-A764-A121F43B6BC6}.Release|Win32.ActiveCfg = Release|Win32
+		{CF1ACDB7-B2C5-3DB4-A764-A121F43B6BC6}.Release|Win32.Build.0 = Release|Win32
+		{9D5DB26E-6468-3301-BA12-40E12D002C56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9D5DB26E-6468-3301-BA12-40E12D002C56}.Debug|Win32.Build.0 = Debug|Win32
+		{9D5DB26E-6468-3301-BA12-40E12D002C56}.Release|Win32.ActiveCfg = Release|Win32
+		{9D5DB26E-6468-3301-BA12-40E12D002C56}.Release|Win32.Build.0 = Release|Win32
+		{8D335988-DF3F-3E28-9289-5772249B420F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8D335988-DF3F-3E28-9289-5772249B420F}.Debug|Win32.Build.0 = Debug|Win32
+		{8D335988-DF3F-3E28-9289-5772249B420F}.Release|Win32.ActiveCfg = Release|Win32
+		{8D335988-DF3F-3E28-9289-5772249B420F}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE