ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-07 01:04:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Bug IPAL11555:

Browse Source 
The "Origin & Size" values from "Preferences" aren't taken into account for Scalar Bar.
This commit is contained in:
enk 2006-02-14 09:02:15 +00:00
parent 5a37347fb2
commit 135b5c7bcf
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
View File

@ -64,15 +64,6 @@
#define MARGIN_SIZE 11 #define MARGIN_SIZE 11
#define SPACING_SIZE 6 #define SPACING_SIZE 6
#define DEF_VER_X 0.01
#define DEF_VER_Y 0.10
#define DEF_VER_H 0.80
#define DEF_VER_W 0.10
#define DEF_HOR_X 0.20
#define DEF_HOR_Y 0.01
#define DEF_HOR_H 0.12
#define DEF_HOR_W 0.60
using namespace std; using namespace std;
// Only one instance is allowed // Only one instance is allowed
@ -125,6 +116,14 @@ SMESHGUI_Preferences_ScalarBarDlg::SMESHGUI_Preferences_ScalarBarDlg( SMESHGUI*
mySMESHGUI( theModule ), mySMESHGUI( theModule ),
mySelectionMgr( property ? SMESH::GetSelectionMgr( theModule ) : 0 ) mySelectionMgr( property ? SMESH::GetSelectionMgr( theModule ) : 0 )
{ {
DEF_VER_X = 0.01;
DEF_VER_Y = 0.10;
DEF_VER_H = 0.80;
DEF_VER_W = 0.10;
DEF_HOR_X = 0.20;
DEF_HOR_Y = 0.01;
DEF_HOR_H = 0.12;
DEF_HOR_W = 0.60;
setName("SMESHGUI_Preferences_ScalarBarDlg"); setName("SMESHGUI_Preferences_ScalarBarDlg");
setCaption( property ? tr("SMESH_PROPERTIES_SCALARBAR") : tr("SMESH_PREFERENCES_SCALARBAR")); setCaption( property ? tr("SMESH_PROPERTIES_SCALARBAR") : tr("SMESH_PREFERENCES_SCALARBAR"));
setSizeGripEnabled(TRUE); setSizeGripEnabled(TRUE);
@ -756,6 +755,8 @@ void SMESHGUI_Preferences_ScalarBarDlg::setOriginAndSize( const double x,
//================================================================================================= //=================================================================================================
void SMESHGUI_Preferences_ScalarBarDlg::onOrientationChanged() void SMESHGUI_Preferences_ScalarBarDlg::onOrientationChanged()
{ {
this->initScalarBarFromResources();
int aOrientation = myVertRadioBtn->isChecked(); int aOrientation = myVertRadioBtn->isChecked();
if ( aOrientation == myIniOrientation ) if ( aOrientation == myIniOrientation )
setOriginAndSize( myIniX, myIniY, myIniW, myIniH ); setOriginAndSize( myIniX, myIniY, myIniW, myIniH );
@ -765,3 +766,41 @@ void SMESHGUI_Preferences_ScalarBarDlg::onOrientationChanged()
aOrientation ? DEF_VER_W : DEF_HOR_W, aOrientation ? DEF_VER_W : DEF_HOR_W,
aOrientation ? DEF_VER_H : DEF_HOR_H ); aOrientation ? DEF_VER_H : DEF_HOR_H );
} }
//=================================================================================================
/*!
* SMESHGUI_Preferences_ScalarBarDlg::initScalarBarFromResources()
*
* Rereading vertical and horizontal default positions from resources.
*/
//=================================================================================================
void SMESHGUI_Preferences_ScalarBarDlg::initScalarBarFromResources()
{
SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI );
QString name;
if (mgr){
// initialize from resoources
// horizontal
name = QString("scalar_bar_horizontal_%1");
if (mgr->hasValue("SMESH", name.arg( "x" )))
DEF_HOR_X = mgr->doubleValue("SMESH", name.arg( "x" ));
if (mgr->hasValue("SMESH", name.arg( "y" )))
DEF_HOR_Y = mgr->doubleValue("SMESH", name.arg( "y" ));
if (mgr->hasValue("SMESH", name.arg( "width" )))
DEF_HOR_W = mgr->doubleValue("SMESH", name.arg( "width" ));
if (mgr->hasValue("SMESH", name.arg( "height" )))
DEF_HOR_H = mgr->doubleValue("SMESH", name.arg( "height" ));
// vertical
name = QString("scalar_bar_vertical_%1");
if (mgr->hasValue("SMESH", name.arg( "x" )))
DEF_VER_X = mgr->doubleValue("SMESH", name.arg( "x" ));
if (mgr->hasValue("SMESH", name.arg( "y" )))
DEF_VER_Y = mgr->doubleValue("SMESH", name.arg( "y" ));
if (mgr->hasValue("SMESH", name.arg( "width" )))
DEF_VER_W = mgr->doubleValue("SMESH", name.arg( "width" ));
if (mgr->hasValue("SMESH", name.arg( "height" )))
DEF_VER_H = mgr->doubleValue("SMESH", name.arg( "height" ));
}
}

3
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
View File

@ -63,6 +63,7 @@ protected:
static SMESHGUI_Preferences_ScalarBarDlg* myDlg; static SMESHGUI_Preferences_ScalarBarDlg* myDlg;
void closeEvent( QCloseEvent* e ); void closeEvent( QCloseEvent* e );
void setOriginAndSize( const double x, const double y, const double w, const double h ); void setOriginAndSize( const double x, const double y, const double w, const double h );
void initScalarBarFromResources();
protected slots: protected slots:
void onOk(); void onOk();
@ -80,6 +81,8 @@ private:
SMESH_Actor* myActor; SMESH_Actor* myActor;
double myIniX, myIniY, myIniW, myIniH; double myIniX, myIniY, myIniW, myIniH;
int myIniOrientation; int myIniOrientation;
double DEF_VER_X,DEF_VER_Y,DEF_VER_H,DEF_VER_W;
double DEF_HOR_X,DEF_HOR_Y,DEF_HOR_H,DEF_HOR_W;
QGroupBox* myRangeGrp; QGroupBox* myRangeGrp;
QLineEdit* myMinEdit; QLineEdit* myMinEdit;