From: rnv <rnv@opencascade.com>
Date: Wed, 1 Feb 2012 12:51:33 +0000 (+0000)
Subject: Issue "0021407: [CEA 515] Plot2d Display error labels around the point" ignore error... 
X-Git-Tag: V6_main_20120202
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=074ff1b94c1178a29574cca12cf2c9182a3d2fd0;p=modules%2Fvisu.git

Issue "0021407: [CEA 515] Plot2d Display error labels around the point" ignore error (deviation) rows in the "Plot 2d Setup" dialog.
---

diff --git a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
index c17c9104..5e877db0 100644
--- a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
@@ -151,8 +151,10 @@ VisuGUI_SetupPlot2dDlg::VisuGUI_SetupPlot2dDlg( _PTR(SObject) object, VISU::Tabl
         std::vector<std::string> rowTitles = tblIntAttr->GetRowTitles();
         std::vector<std::string> rowUnits  = tblIntAttr->GetRowUnits();
         QStringList rows;
-        for ( int i = 0; i < nbRows; i++ )
+        for ( int i = 0; i < nbRows; i++ ) {
+          if(myTable && myTable->isDeviationRow(i)) continue;
           rows.append( rowTitles[i].c_str() );
+        }
         
         int nbItems=0;
         for ( int i = 0; i < nbRows; i++ ) {
@@ -206,8 +208,10 @@ VisuGUI_SetupPlot2dDlg::VisuGUI_SetupPlot2dDlg( _PTR(SObject) object, VISU::Tabl
         std::vector<std::string> rowTitles = tblRealAttr->GetRowTitles();
         std::vector<std::string> rowUnits  = tblRealAttr->GetRowUnits();
         QStringList rows;
-        for ( int i = 0; i < nbRows; i++ )
+        for ( int i = 0; i < nbRows; i++ ) {
+          if(myTable && myTable->isDeviationRow(i)) continue;
           rows.append( rowTitles[i].c_str() );
+        }
         int nbItems = 0;
         for ( int i = 0; i < nbRows; i++ ) {
           if(myTable && myTable->isDeviationRow(i)) continue;
@@ -323,7 +327,7 @@ void VisuGUI_SetupPlot2dDlg::getCurvesSource( int& horIndex, QList<int>& verInde
       else if ( myItems.at( i )->isVertical2On() ) {
         ver2Indexes.append( i );
       }
-      zIndices.append( myItems.at( i )->assigned() );
+      zIndices.append( idx(myItems.at( i )->assigned()) );
     }
   }
 }