From 074ff1b94c1178a29574cca12cf2c9182a3d2fd0 Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Wed, 1 Feb 2012 12:51:33 +0000
Subject: [PATCH] Issue "0021407: [CEA 515] Plot2d Display error labels around
 the point" ignore error (deviation) rows in the "Plot 2d Setup" dialog.

---
 src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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()) );
     }
   }
 }
-- 
2.39.2