Added CROSSHAIR_COLOR, refactored parts of the public GLView interface

git-svn-id: http://svn.clifford.at/openscad/trunk@313 b57f626f-c46c-0410-a088-ec61d464b74c

1 files changed, 27 insertions, 12 deletions

diff --git a/GLView.h b/GLView.h
index ca269ce..dd896fc 100644
--- a/GLView.h
+++ b/GLView.h
@@ -12,34 +12,49 @@
 class GLView : public QGLWidget
 {
 	Q_OBJECT
+	Q_PROPERTY(bool showAxes READ showAxes WRITE setShowAxes);
+	Q_PROPERTY(bool showCrosshairs READ showCrosshairs WRITE setShowCrosshairs);
+	Q_PROPERTY(bool orthoMode READ orthoMode WRITE setOrthoMode);
 
 public:
-	void (*renderfunc)(void*);
-	void *renderfunc_vp;
-
-	bool orthomode;
-	bool showaxes;
-	bool showcrosshairs;
+	GLView(QWidget *parent = NULL);
+	void setRenderFunc(void (*func)(void*), void *userdata);
+#ifdef ENABLE_OPENCSG
+	bool hasOpenCSGSupport() { return this->opencsg_support; }
+#endif
+	// Properties
+	bool showAxes() const { return this->showaxes; }
+	void setShowAxes(bool enabled) { this->showaxes = enabled; }
+	bool showCrosshairs() const { return this->showcrosshairs; }
+	void setShowCrosshairs(bool enabled) { this->showcrosshairs = enabled; }
+	bool orthoMode() const { return this->orthomode; }
+	void setOrthoMode(bool enabled) { this->orthomode = enabled; }
 
-	double viewer_distance;
+	QLabel *statusLabel;
 	double object_rot_x;
 	double object_rot_y;
 	double object_rot_z;
 	double object_trans_x;
 	double object_trans_y;
 	double object_trans_z;
+	GLint shaderinfo[11];
+
+private:
+	void (*renderfunc)(void*);
+	void *renderfunc_vp;
+
+	bool showaxes;
+	bool showcrosshairs;
+	bool orthomode;
+
+	double viewer_distance;
 
 	double w_h_ratio;
-	GLint shaderinfo[11];
 
-	QLabel *statusLabel;
 #ifdef ENABLE_OPENCSG
 	bool opencsg_support;
 #endif
 
-	GLView(QWidget *parent = NULL);
-
-protected:
 	bool mouse_drag_active;
 	int last_mouse_x;
 	int last_mouse_y;