Implementation of the 0021407: [CEA 515] Plot2d Display error labels around the point...

diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml
index 340517cbcec9c86f710fd1d14d732a5540fa4d0e..86f24153908f912361bf4e606c3eb208b4be74b7 100644 (file)
--- a/src/LightApp/resources/LightApp.xml
+++ b/src/LightApp/resources/LightApp.xml
@@ -170,7 +170,7 @@
     <!-- Plot2d viewer preferences -->
     <parameter name="Background"   value="255, 255, 255" />
     <parameter name="SelectionColor"   value="80, 80, 80" />
-    <parameter name="DeviationMarkerColor"   value="0, 0, 255" />
+    <parameter name="DeviationMarkerColor"   value="255, 0, 0" />
     <parameter name="DeviationMarkerLineWidth" value="1" />
     <parameter name="DeviationMarkerTickSize" value="2" />
     <parameter name="CurveType"    value="1" />

diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index fb196d7dba96288d68412354ea712c2402a4e33e..ba256d53638eb864a6739542d657e2f89f544908 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -416,7 +416,7 @@ void Plot2d_ViewFrame::readPreferences()
   setNormLMaxMode( resMgr->booleanValue( "Plot2d", "VerNormLMaxMode", myNormLMax ) );
   setNormRMinMode( resMgr->booleanValue( "Plot2d", "VerNormRMinMode", myNormRMin ) );
   setNormRMaxMode( resMgr->booleanValue( "Plot2d", "VerNormRMaxMode", myNormRMax ) );
-  QColor c = resMgr->colorValue( "Plot2d", "DeviationMarkerColor", QColor(0,0,255));
+  QColor c = resMgr->colorValue( "Plot2d", "DeviationMarkerColor", QColor(255,0,0));
   myPlot->setProperty(PLOT2D_DEVIATION_COLOR, c);
   myPlot->setProperty(PLOT2D_DEVIATION_LW, 
                       resMgr->integerValue( "Plot2d", "DeviationMarkerLineWidth", 1));
@@ -1539,7 +1539,7 @@ void Plot2d_ViewFrame::onSettings()
   int ts = v.isValid() ? v.toInt() : 2;
 
   v = myPlot->property(PLOT2D_DEVIATION_COLOR);
-  QColor cl =  v.isValid() ? v.value<QColor>() : QColor(0,0,255);
+  QColor cl =  v.isValid() ? v.value<QColor>() : QColor(255,0,0);
 
   dlg->setDeviationMarkerLw(lw);
   dlg->setDeviationMarkerTs(ts);