From: ageay <ageay>
Date: Mon, 16 Jan 2012 12:14:51 +0000 (+0000)
Subject: Multi axe X implementation (from CS)
X-Git-Tag: pxsxl1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3a8e927ca5bcdb66ab563f2236a2d67ee4032951;p=modules%2Fgui.git

Multi axe X implementation (from CS)
---

diff --git a/src/Plot2d/Plot2d_Curve.cxx b/src/Plot2d/Plot2d_Curve.cxx
index ad4b544c9..8c96f8e4a 100755
--- a/src/Plot2d/Plot2d_Curve.cxx
+++ b/src/Plot2d/Plot2d_Curve.cxx
@@ -185,6 +185,13 @@ void Plot2d_Curve::setMarker( Plot2d::MarkerType marker )
   setAutoAssign( false );
 }
 
+/* Sets Qwt marker type
+ */
+void Plot2d_Curve::setMarkerStyle( QwtSymbol::Style style)
+{
+  myMarkerStyle = style;
+}
+
 /*!
   Gets marker type
 */
@@ -193,6 +200,16 @@ Plot2d::MarkerType Plot2d_Curve::getMarker() const
   return myMarker;
 }
 
+
+/* Gets Qwt marker type
+ */
+QwtSymbol::Style Plot2d_Curve::getMarkerStyle() const
+{
+  return myMarkerStyle;
+}
+
+
+
 /*!
   Sets new marker size ( and resets AutoAssign flag )
 */
diff --git a/src/Plot2d/Plot2d_Curve.h b/src/Plot2d/Plot2d_Curve.h
index 9517dddc7..81640e936 100755
--- a/src/Plot2d/Plot2d_Curve.h
+++ b/src/Plot2d/Plot2d_Curve.h
@@ -28,11 +28,12 @@
 #include "Plot2d.h"
 #include "Plot2d_Object.h"
 
-//#include <qwt_plot_curve.h>
+#include <qwt_symbol.h>
 
 class PLOT2D_EXPORT Plot2d_Curve : public Plot2d_Object
 {
 public:
+
   Plot2d_Curve();
   Plot2d_Curve( const Plot2d_Curve& );
 
@@ -49,7 +50,9 @@ public:
 
   void                 setMarker( Plot2d::MarkerType, const int );
   void                 setMarker( Plot2d::MarkerType );
+  void		       setMarkerStyle( QwtSymbol::Style style);
   Plot2d::MarkerType   getMarker() const;
+  QwtSymbol::Style     getMarkerStyle() const;
   void                 setMarkerSize( const int );
   int                  getMarkerSize() const;
 
@@ -60,8 +63,10 @@ public:
   int                  getLineWidth() const;
 
 protected:
+
   QColor               myColor;
   Plot2d::MarkerType   myMarker;
+  QwtSymbol::Style     myMarkerStyle;
   int                  myMarkerSize;
   Plot2d::LineType     myLine;
   int                  myLineWidth;