From: eap Date: Thu, 14 May 2015 11:58:45 +0000 (+0300) Subject: 52747: Wrong doc page opened from Scalar Bar Properties dialog X-Git-Tag: V7_6_0rc1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bb10a2d7a23f18c97afc646a35031908c98bd82e;p=modules%2Fsmesh.git 52747: Wrong doc page opened from Scalar Bar Properties dialog --- diff --git a/doc/salome/gui/SMESH/images/image90.jpg b/doc/salome/gui/SMESH/images/image90.jpg old mode 100755 new mode 100644 index 4f4c301d4..a78c4394b Binary files a/doc/salome/gui/SMESH/images/image90.jpg and b/doc/salome/gui/SMESH/images/image90.jpg differ diff --git a/src/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx index 714f48e97..0b53dd266 100644 --- a/src/Controls/SMESH_Controls.cxx +++ b/src/Controls/SMESH_Controls.cxx @@ -1357,10 +1357,10 @@ double Taper::GetValue( const TSequenceOfXYZ& P ) return 0.; // Compute taper - double J1 = getArea( P( 4 ), P( 1 ), P( 2 ) ) / 2.; - double J2 = getArea( P( 3 ), P( 1 ), P( 2 ) ) / 2.; - double J3 = getArea( P( 2 ), P( 3 ), P( 4 ) ) / 2.; - double J4 = getArea( P( 3 ), P( 4 ), P( 1 ) ) / 2.; + double J1 = getArea( P( 4 ), P( 1 ), P( 2 ) ); + double J2 = getArea( P( 3 ), P( 1 ), P( 2 ) ); + double J3 = getArea( P( 2 ), P( 3 ), P( 4 ) ); + double J4 = getArea( P( 3 ), P( 4 ), P( 1 ) ); double JA = 0.25 * ( J1 + J2 + J3 + J4 ); if ( JA <= theEps ) @@ -1381,7 +1381,7 @@ double Taper::GetValue( const TSequenceOfXYZ& P ) double Taper::GetBadRate( double Value, int /*nbNodes*/ ) const { // the taper is in the range [0.0,1.0] - // 0.0 = good (no taper) + // 0.0 = good (no taper) // 1.0 = bad (les cotes opposes sont allignes) return Value; } diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx index 7e64eb06c..68deaf5a5 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx @@ -448,7 +448,7 @@ SMESHGUI_Preferences_ScalarBarDlg::SMESHGUI_Preferences_ScalarBarDlg( SMESHGUI* connect( mySelectionMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionChanged() ) ); connect( mySMESHGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( reject() ) ); - myHelpFileName = "quality_page.html"; + myHelpFileName = "scalar_bar_dlg.html"; } //=================================================================================================