Merge from V6_main 15/03/2013

[modules/gui.git] / src / Plot2d / Plot2d_Object.cxx

diff --git a/src/Plot2d/Plot2d_Object.cxx b/src/Plot2d/Plot2d_Object.cxx
index 376a697b19d92fcb1b6c4d061e5b4f569073f6d4..94d7e869a01f434195d99e672a7bd139198edc10 100755 (executable)
--- a/src/Plot2d/Plot2d_Object.cxx
+++ b/src/Plot2d/Plot2d_Object.cxx
@@ -25,9 +25,10 @@
 
 #include "Plot2d_Object.h"
 
-
+#ifndef NO_SUIT
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
+#endif
 
 // Static members
 QColor Plot2d_Object::mySelectionColor;
@@ -37,6 +38,7 @@ QColor Plot2d_Object::myHighlightedLegendTextColor;
  * Read colors from the resource manager.
 */
 void Plot2d_Object::initColors() {
+#ifndef NO_SUIT
   SUIT_Session* session = SUIT_Session::session();
   if(!session)
     return;
@@ -46,6 +48,10 @@ void Plot2d_Object::initColors() {
     mySelectionColor = resMgr->colorValue( "Plot2d", "SelectionColor", QColor(80,80,80) );
     myHighlightedLegendTextColor = resMgr->colorValue( "Plot2d", "SelectedLegendFontColor", QColor(255,255,255) );
   }
+#else
+  mySelectionColor = QColor(80,80,80);
+  myHighlightedLegendTextColor = QColor(255,255,255);
+#endif
 }
 
 /*!
@@ -315,12 +321,12 @@ void Plot2d_Object::setPointList( const pointList& points )
 }
 
 /*!
-  Sets object's data. 
+  Sets object's data.
 */
 void Plot2d_Object::setData( const double* hData, const double* vData, long size, const QStringList& lst )
 {
   clearAllPoints();
-  QStringList::const_iterator anIt = lst.begin(), aLast = lst.end(); 
+  QStringList::const_iterator anIt = lst.begin(), aLast = lst.end();
   for ( long i = 0; i < size; i++, anIt++ )
     addPoint( hData[i], vData[i], anIt==aLast ? QString() : *anIt );
 }