Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
porting on linux
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Region.cxx
diff --git
a/src/HYDROData/HYDROData_Region.cxx
b/src/HYDROData/HYDROData_Region.cxx
index c82d17e9d4ea42aa3e38597b1f5400a63bcbf669..698cfc944925502b5744e9ae3adc281bc39b5523 100644
(file)
--- a/
src/HYDROData/HYDROData_Region.cxx
+++ b/
src/HYDROData/HYDROData_Region.cxx
@@
-44,6
+44,7
@@
#include <ShapeUpgrade_UnifySameDomain.hxx>
#include <QStringList>
#include <ShapeUpgrade_UnifySameDomain.hxx>
#include <QStringList>
+#include <QColor>
//#define DEB_GET_REGION_SHAPE
//#define DEB_GET_REGION_SHAPE
@@
-52,7
+53,7
@@
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Region, HYDROData_Entity)
HYDROData_Region::HYDROData_Region()
HYDROData_Region::HYDROData_Region()
- : HYDROData_Entity()
+ : HYDROData_Entity(
Geom_2d
)
{
}
{
}
@@
-388,12
+389,14
@@
TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs*
return aResShape;
}
return aResShape;
}
-QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Region::DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects,
+ QString defRegName ) const
{
QStringList aResList;
// Find region
{
QStringList aResList;
// Find region
- findPythonReferenceObject(
theTreatedObjects, aResList
);
+ findPythonReferenceObject(
aResList, defRegName
);
// Add zones
HYDROData_SequenceOfObjects aZones = GetZones();
// Add zones
HYDROData_SequenceOfObjects aZones = GetZones();
@@
-406,7
+409,7
@@
QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjec
}
// find zone
}
// find zone
- aZone->findPythonReferenceObject(
theTreatedObjects,
aResList );
+ aZone->findPythonReferenceObject( aResList );
theTreatedObjects.insert( aZone->GetName(), aZone );
// set zone merge type
theTreatedObjects.insert( aZone->GetName(), aZone );
// set zone merge type
@@
-426,14
+429,18
@@
QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjec
if ( aMergeType == HYDROData_Zone::Merge_Object ) {
Handle(HYDROData_Entity) aMergeObject = aZone->GetMergeObject();
if ( !aMergeObject.IsNull() ) {
if ( aMergeType == HYDROData_Zone::Merge_Object ) {
Handle(HYDROData_Entity) aMergeObject = aZone->GetMergeObject();
if ( !aMergeObject.IsNull() ) {
- aMergeObject->findPythonReferenceObject(
theTreatedObjects,
aResList );
+ aMergeObject->findPythonReferenceObject( aResList );
aResList << QString( "%1.SetMergeObject( %2 )" ).arg( aZone->GetObjPyName() )
.arg( aMergeObject->GetObjPyName() );
}
}
aResList << QString( "%1.SetMergeObject( %2 )" ).arg( aZone->GetObjPyName() )
.arg( aMergeObject->GetObjPyName() );
}
}
-
+ // set color
+ QColor zoneColor = aZone->GetColor(Qt::darkBlue);
+ aResList << QString( "%1.SetColor( QColor( %2, %3, %4 ))" )
+ .arg( aZone->GetObjPyName() ).arg( zoneColor.red() ).arg( zoneColor.green() ).arg( zoneColor.blue() );
// add zone
// add zone
- setPythonReferenceObject( theTreatedObjects, aResList, aZone, "AddZone" );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aZone, "AddZone" );
+
}
return aResList;
}
return aResList;