Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d9cc1f5
)
The properties of scalar bar actor now are read from resource manager under correct...
author
asl
<asl@opencascade.com>
Thu, 21 Jul 2005 12:26:13 +0000
(12:26 +0000)
committer
asl
<asl@opencascade.com>
Thu, 21 Jul 2005 12:26:13 +0000
(12:26 +0000)
src/OBJECT/SMESH_Actor.cxx
patch
|
blob
|
history
diff --git
a/src/OBJECT/SMESH_Actor.cxx
b/src/OBJECT/SMESH_Actor.cxx
index 667a80b6ef86c709448e1f785d67f6434c8f510b..a9877109f7895952d34e856bb6a4aec1ad606aa0 100644
(file)
--- a/
src/OBJECT/SMESH_Actor.cxx
+++ b/
src/OBJECT/SMESH_Actor.cxx
@@
-282,106
+282,110
@@
SMESH_ActorDef::SMESH_ActorDef()
if( !mgr )
return;
if( !mgr )
return;
- QColor aTColor = mgr->colorValue( "SMESH", "
ScalarBarTitleC
olor", QColor( 255, 255, 255 ) );
+ QColor aTColor = mgr->colorValue( "SMESH", "
scalar_bar_title_c
olor", QColor( 255, 255, 255 ) );
aScalarBarTitleProp->SetColor( aTColor.red()/255., aTColor.green()/255., aTColor.blue()/255. );
aScalarBarTitleProp->SetFontFamilyToArial();
aScalarBarTitleProp->SetColor( aTColor.red()/255., aTColor.green()/255., aTColor.blue()/255. );
aScalarBarTitleProp->SetFontFamilyToArial();
- if ( mgr->hasValue( "SMESH", "
ScalarBarTitleF
ont" ) )
+ if ( mgr->hasValue( "SMESH", "
scalar_bar_title_f
ont" ) )
{
{
- Q
String str = mgr->stringValue( "SMESH", "ScalarBarTitleF
ont" );
- if (
str
== "Arial" )
+ Q
Font f = mgr->fontValue( "SMESH", "scalar_bar_title_f
ont" );
+ if (
f.family()
== "Arial" )
aScalarBarTitleProp->SetFontFamilyToArial();
aScalarBarTitleProp->SetFontFamilyToArial();
- else if (
str
== "Courier" )
+ else if (
f.family()
== "Courier" )
aScalarBarTitleProp->SetFontFamilyToCourier();
aScalarBarTitleProp->SetFontFamilyToCourier();
- else if (
str
== "Times" )
+ else if (
f.family()
== "Times" )
aScalarBarTitleProp->SetFontFamilyToTimes();
aScalarBarTitleProp->SetFontFamilyToTimes();
- }
-
if ( mgr->booleanValue( "SMESH", "ScalarBarTitleBold"
) )
- aScalarBarTitleProp->BoldOn();
- else
- aScalarBarTitleProp->BoldOff();
+
if ( f.bold(
) )
+
aScalarBarTitleProp->BoldOn();
+
else
+
aScalarBarTitleProp->BoldOff();
-
if ( mgr->booleanValue( "SMESH", "ScalarBarTitleItalic"
) )
- aScalarBarTitleProp->ItalicOn();
- else
- aScalarBarTitleProp->ItalicOff();
+
if ( f.italic(
) )
+
aScalarBarTitleProp->ItalicOn();
+
else
+
aScalarBarTitleProp->ItalicOff();
- if ( mgr->booleanValue( "SMESH", "ScalarBarTitleShadow" ) )
- aScalarBarTitleProp->ShadowOn();
- else
- aScalarBarTitleProp->ShadowOff();
+ if ( f.underline() )
+ aScalarBarTitleProp->ShadowOn();
+ else
+ aScalarBarTitleProp->ShadowOff();
+ }
myScalarBarActor->SetTitleTextProperty( aScalarBarTitleProp );
aScalarBarTitleProp->Delete();
vtkTextProperty* aScalarBarLabelProp = vtkTextProperty::New();
myScalarBarActor->SetTitleTextProperty( aScalarBarTitleProp );
aScalarBarTitleProp->Delete();
vtkTextProperty* aScalarBarLabelProp = vtkTextProperty::New();
- aTColor = mgr->colorValue( "SMESH", "
ScalarBarLabelC
olor", QColor( 255, 255, 255 ) );
+ aTColor = mgr->colorValue( "SMESH", "
scalar_bar_label_c
olor", QColor( 255, 255, 255 ) );
aScalarBarLabelProp->SetColor( aTColor.red()/255., aTColor.green()/255., aTColor.blue()/255. );
aScalarBarLabelProp->SetFontFamilyToArial();
aScalarBarLabelProp->SetColor( aTColor.red()/255., aTColor.green()/255., aTColor.blue()/255. );
aScalarBarLabelProp->SetFontFamilyToArial();
- if( mgr->hasValue( "SMESH", "
ScalarBarLabelF
ont" ) )
+ if( mgr->hasValue( "SMESH", "
scalar_bar_label_f
ont" ) )
{
{
- Q
String str = mgr->stringValue( "SMESH", "ScalarBarLabelF
ont" );
- if(
str
== "Arial" )
+ Q
Font f = mgr->stringValue( "SMESH", "scalar_bar_label_f
ont" );
+ if(
f.family()
== "Arial" )
aScalarBarLabelProp->SetFontFamilyToArial();
aScalarBarLabelProp->SetFontFamilyToArial();
- else if(
str
== "Courier" )
+ else if(
f.family()
== "Courier" )
aScalarBarLabelProp->SetFontFamilyToCourier();
aScalarBarLabelProp->SetFontFamilyToCourier();
- else if(
str
== "Times" )
+ else if(
f.family()
== "Times" )
aScalarBarLabelProp->SetFontFamilyToTimes();
aScalarBarLabelProp->SetFontFamilyToTimes();
+
+ if ( f.bold() )
+ aScalarBarLabelProp->BoldOn();
+ else
+ aScalarBarLabelProp->BoldOff();
+
+ if ( f.italic() )
+ aScalarBarLabelProp->ItalicOn();
+ else
+ aScalarBarLabelProp->ItalicOff();
+
+ if( f.underline() )
+ aScalarBarLabelProp->ShadowOn();
+ else
+ aScalarBarLabelProp->ShadowOff();
}
}
- if ( mgr->booleanValue( "SMESH", "ScalarBarLabelBold" ) )
- aScalarBarLabelProp->BoldOn();
- else
- aScalarBarLabelProp->BoldOff();
-
- if ( mgr->booleanValue( "SMESH", "ScalarBarLabelItalic" ) )
- aScalarBarLabelProp->ItalicOn();
- else
- aScalarBarLabelProp->ItalicOff();
-
- if( mgr->booleanValue( "SMESH", "ScalarBarLabelShadow" ) )
- aScalarBarLabelProp->ShadowOn();
- else
- aScalarBarLabelProp->ShadowOff();
-
myScalarBarActor->SetLabelTextProperty( aScalarBarLabelProp );
aScalarBarLabelProp->Delete();
myScalarBarActor->SetLabelTextProperty( aScalarBarLabelProp );
aScalarBarLabelProp->Delete();
- if( mgr->stringValue( "SMESH", "ScalarBarOrientation" ) == "Horizontal" )
+ bool horiz = ( mgr->integerValue( "SMESH", "scalar_bar_orientation" ) == 1 );
+ QString name = QString( "scalar_bar_%1_" ).arg( horiz ? "horizontal" : "vertical" );
+ if( horiz )
myScalarBarActor->SetOrientationToHorizontal();
else
myScalarBarActor->SetOrientationToVertical();
myScalarBarActor->SetOrientationToHorizontal();
else
myScalarBarActor->SetOrientationToVertical();
+
- float aXVal = mgr->stringValue( "SMESH", "ScalarBarOrientation" ) == "Horizontal" ? 0.20 : 0.01;
- if( mgr->hasValue( "SMESH", "ScalarBarXPosition" ) )
- aXVal = mgr->doubleValue( "SMESH", "ScalarBarXPosition", aXVal );
- float aYVal = mgr->stringValue( "SMESH", "ScalarBarOrientation" ) == "Horizontal" ? 0.01 : 0.1;
- if( mgr->hasValue( "SMESH", "ScalarBarYPosition" ) )
- aYVal = mgr->doubleValue( "SMESH", "ScalarBarYPosition", aYVal );
+ float aXVal = horiz ? 0.20 : 0.01;
+ if( mgr->hasValue( "SMESH", name + "x" ) )
+ aXVal = mgr->doubleValue( "SMESH", name + "x", aXVal );
+
+ float aYVal = horiz ? 0.01 : 0.1;
+ if( mgr->hasValue( "SMESH", name + "y" ) )
+ aYVal = mgr->doubleValue( "SMESH", name + "y", aYVal );
myScalarBarActor->SetPosition( aXVal, aYVal );
myScalarBarActor->SetPosition( aXVal, aYVal );
- float aWVal =
mgr->stringValue( "SMESH", "ScalarBarOrientation" ) == "Horizontal"
? 0.60 : 0.10;
- if( mgr->hasValue( "SMESH",
"ScalarBarW
idth" ) )
- aWVal = mgr->doubleValue( "SMESH",
"ScalarBarW
idth", aWVal );
+ float aWVal =
horiz
? 0.60 : 0.10;
+ if( mgr->hasValue( "SMESH",
name + "w
idth" ) )
+ aWVal = mgr->doubleValue( "SMESH",
name + "w
idth", aWVal );
myScalarBarActor->SetWidth( aWVal );
myScalarBarActor->SetWidth( aWVal );
- float aHVal =
mgr->stringValue( "SMESH", "ScalarBarOrientation" ) == "Horizontal"
? 0.12 : 0.80;
- if( mgr->hasValue( "SMESH",
"ScalarBarH
eight" ) )
- aHVal = mgr->doubleValue( "SMESH",
"ScalarBarH
eight", aHVal );
+ float aHVal =
horiz
? 0.12 : 0.80;
+ if( mgr->hasValue( "SMESH",
name + "h
eight" ) )
+ aHVal = mgr->doubleValue( "SMESH",
name + "h
eight", aHVal );
myScalarBarActor->SetHeight( aHVal );
int anIntVal = 5;
myScalarBarActor->SetHeight( aHVal );
int anIntVal = 5;
- if( mgr->hasValue( "SMESH", "
ScalarBarNbOfL
abels" ) )
- anIntVal = mgr->integerValue( "SMESH", "
ScalarBarNbOfL
abels", anIntVal );
+ if( mgr->hasValue( "SMESH", "
scalar_bar_num_l
abels" ) )
+ anIntVal = mgr->integerValue( "SMESH", "
scalar_bar_num_l
abels", anIntVal );
myScalarBarActor->SetNumberOfLabels( anIntVal == 0 ? 5: anIntVal );
anIntVal = 64;
myScalarBarActor->SetNumberOfLabels( anIntVal == 0 ? 5: anIntVal );
anIntVal = 64;
- if( mgr->hasValue( "SMESH", "
ScalarBarNbOfC
olors" ) )
- anIntVal = mgr->integerValue( "SMESH", "
ScalarBarNbOfC
olors", anIntVal );
+ if( mgr->hasValue( "SMESH", "
scalar_bar_num_c
olors" ) )
+ anIntVal = mgr->integerValue( "SMESH", "
scalar_bar_num_c
olors", anIntVal );
myScalarBarActor->SetMaximumNumberOfColors( anIntVal == 0 ? 64 : anIntVal );
myScalarBarActor->SetMaximumNumberOfColors( anIntVal == 0 ? 64 : anIntVal );