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
Dump to python corrected.
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Channel.cxx
diff --git
a/src/HYDROData/HYDROData_Channel.cxx
b/src/HYDROData/HYDROData_Channel.cxx
index 2c76702a014bce72c82f20a710dc047d5ed97b96..2159ce7f9d5fbf17a67657ee9045538536b851b7 100644
(file)
--- a/
src/HYDROData/HYDROData_Channel.cxx
+++ b/
src/HYDROData/HYDROData_Channel.cxx
@@
-30,8
+30,6
@@
#include <QColor>
#include <QStringList>
#include <QColor>
#include <QStringList>
-#define PYTHON_CHANNEL_ID "KIND_CHANNEL"
-
IMPLEMENT_STANDARD_HANDLE(HYDROData_Channel,HYDROData_ArtificialObject)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Channel,HYDROData_ArtificialObject)
IMPLEMENT_STANDARD_HANDLE(HYDROData_Channel,HYDROData_ArtificialObject)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Channel,HYDROData_ArtificialObject)
@@
-47,22
+45,18
@@
HYDROData_Channel::~HYDROData_Channel()
QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
{
QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
{
- QStringList aResList;
+ QStringList aResList = dumpObjectCreation( theTreatedObjects );
+ QString aName = GetObjPyName();
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
- if ( aDocument.IsNull() )
- return aResList;
+ Handle(HYDROData_Polyline3D) aRefGideLine = GetGuideLine();
+ setPythonReferenceObject( theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" );
-
QString aDocName = aDocument->GetDocPyNam
e();
-
QString aChannelName = GetName(
);
+
Handle(HYDROData_Profile) aRefProfile = GetProfil
e();
+
setPythonReferenceObject( theTreatedObjects, aResList, aRefProfile, "SetProfile"
);
- aResList << QString( "%1 = %2.CreateObject( %3 );" )
- .arg( aChannelName ).arg( aDocName ).arg( PYTHON_CHANNEL_ID );
- aResList << QString( "%1.SetName( \"%2\" );" )
- .arg( aChannelName ).arg( aChannelName );
aResList << QString( "" );
aResList << QString( "" );
-
- // TODO
+ aResList << QString( "%1.Update();" ).arg( aName );
+ aResList << QString( "" );
return aResList;
}
return aResList;
}
@@
-109,6
+103,8
@@
void HYDROData_Channel::Update()
if(aProfileWire.IsNull())
return;
if(aProfileWire.IsNull())
return;
+ BRepTools::Write( aPathWire, "guideline.brep" );
+ BRepTools::Write( aProfileWire, "profile.brep" );
HYDROData_Canal3dAnd2d aChannelConstructor( aProfileWire, aPathWire );
aChannelConstructor.Create3dPresentation();
HYDROData_Canal3dAnd2d aChannelConstructor( aProfileWire, aPathWire );
aChannelConstructor.Create3dPresentation();
@@
-116,8
+112,6
@@
void HYDROData_Channel::Update()
SetShape3D( aChannelConstructor.Get3dPresentation() );
SetTopShape( aChannelConstructor.Get2dPresentation() );
SetShape3D( aChannelConstructor.Get3dPresentation() );
SetTopShape( aChannelConstructor.Get2dPresentation() );
- BRepTools::Write( aPathWire, "guideline.brep" );
- BRepTools::Write( aProfileWire, "profile.brep" );
BRepTools::Write( aChannelConstructor.Get2dPresentation(), "channel2d.brep" );
BRepTools::Write( aChannelConstructor.Get3dPresentation(), "channel3d.brep" );
BRepTools::Write( aChannelConstructor.Get2dPresentation(), "channel2d.brep" );
BRepTools::Write( aChannelConstructor.Get3dPresentation(), "channel3d.brep" );