From: rnv Date: Wed, 1 Feb 2012 07:45:21 +0000 (+0000) Subject: Additional fix for the 0021407: [CEA 515] Plot2d Display error labels around the... X-Git-Tag: V6_main_20120202~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e2010faf12659b0d33230353aa7cd132f7ce1130;p=modules%2Fvisu.git Additional fix for the 0021407: [CEA 515] Plot2d Display error labels around the point issue. --- diff --git a/src/VISUGUI/VISU_msg_en.ts b/src/VISUGUI/VISU_msg_en.ts index 8037777d..ca4b84c3 100644 --- a/src/VISUGUI/VISU_msg_en.ts +++ b/src/VISUGUI/VISU_msg_en.ts @@ -1085,7 +1085,7 @@ Input value precision can be adjusted using MEN_VISU_SHOW_DEVIATION - Show Deviation + Show errors TOOL_IMPORT diff --git a/src/VISU_I/VISU_Table_i.cc b/src/VISU_I/VISU_Table_i.cc index 160cbc13..bf18fa05 100644 --- a/src/VISU_I/VISU_Table_i.cc +++ b/src/VISU_I/VISU_Table_i.cc @@ -1238,7 +1238,7 @@ int VISU::Curve_i::GetDeviationData( double*& theMin, double*& theMax, QListHasValue( minRow, j ) && anInt->HasValue( maxRow, j )) { value = anInt->GetValue(myVRow,j); theMin[k] = Table_i::calculateDeviation(info->minDeviation(),value, anInt->GetValue(minRow,j), true); - theMax[k] = Table_i::calculateDeviation(info->maxDeviation(),value, anInt->GetValue(minRow,j), false); + theMax[k] = Table_i::calculateDeviation(info->maxDeviation(),value, anInt->GetValue(maxRow,j), false); k++; theIndexes.push_back(j-1); } diff --git a/src/VISU_I/VISU_Table_i.hh b/src/VISU_I/VISU_Table_i.hh index 85b9c209..2f679afa 100644 --- a/src/VISU_I/VISU_Table_i.hh +++ b/src/VISU_I/VISU_Table_i.hh @@ -38,12 +38,13 @@ class SPlot2d_Curve; namespace VISU { typedef enum {NoneDvtn = 0, - AbsoluteDvtn, - PercentageDvtn, - ErrorDvtn, - ErrorPercentageDvtn, - SimpleErrorDvtn, - SimpleErrorPercentageDvtn } DeviationType; + AbsoluteDvtn, // min, max + PercentageDvtn, // min%, max% + ErrorDvtn, // errmin, errmax + ErrorPercentageDvtn, // errmin%, errmax% + SimpleErrorDvtn, // error + SimpleErrorPercentageDvtn // error% + } DeviationType; class VISU_I_EXPORT DeviationData { public: