#include "HYDROData_Document.h"
#include "HYDROData_Profile.h"
-#include "CurveCreator_Curve.hxx"
+#include "CurveCreator_Profile.hxx"
#include "CurveCreator_Displayer.h"
#include <LightApp_Application.h>
//static int ZValueIncrement = 0;
HYDROGUI_ProfileOp::HYDROGUI_ProfileOp( HYDROGUI_Module* theModule, bool theIsEdit )
-: HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit), myCurve(NULL)//,
- //myViewManager(NULL)
+: HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit), myProfile(NULL)
{
setName( theIsEdit ? tr( "EDIT_PROFILE" ) : tr( "CREATE_PROFILE" ) );
}
HYDROGUI_ProfileOp::~HYDROGUI_ProfileOp()
{
- //erasePreview();
+ erasePreview();
}
/**
void HYDROGUI_ProfileOp::startOperation()
{
- if( myCurve )
- {
- delete myCurve;
- myCurve = 0;
- }
+ if( myProfile )
+ delete myProfile;
+
+ myProfile = new CurveCreator_Profile();
HYDROGUI_Operation::startOperation();
HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
aPanel->reset();
- //LightApp_Application* anApp = module()->getApp();
- //myViewManager =
- // dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
- //aPanel->setOCCViewer( myViewManager ? myViewManager->getOCCViewer() : 0 );
-
if( myIsEdit )
myEditedObject = Handle(HYDROData_Profile)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+
+ QString aProfileName;
if( !myEditedObject.IsNull() )
{
- /*int anIntDim = myEditedObject->GetDimension();
- CurveCreator::Dimension aDim = CurveCreator::Dim3d;
- if( anIntDim == 2 )
- aDim = CurveCreator::Dim2d;
- myCurve = new CurveCreator_Curve(aDim);
- QList<PolylineSection> aPolylineData = myEditedObject->GetPolylineData();
-
- for( int i = 0 ; i < aPolylineData.size() ; i++ ){
- std::string aName = HYDROGUI_Tool::ToQString(aPolylineData[i].mySectionName).toStdString();
- bool isClosed = aPolylineData[i].myIsClosed;
- CurveCreator::SectionType aType = CurveCreator::Polyline;
- if( aPolylineData[i].myType == PolylineSection::SECTION_SPLINE ){
- aType = CurveCreator::Spline;
- }
- CurveCreator::Coordinates aCoords;
- for( int j = 0 ; j < aPolylineData[i].myCoords.size() ; j++ ){
- aCoords.push_back(aPolylineData[i].myCoords[j]);
- }
- myCurve->addSectionInternal( aName, aType, isClosed, aCoords );
+ CurveCreator::Coordinates aCurveCoords;
+ CurveCreator::SectionsMap aSectionsMap;
+
+ HYDROData_Profile::ProfilePoints aSectPointsList = myEditedObject->GetProfilePoints();
+ CurveCreator::PosPointsList aPoints;
+ for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k )
+ {
+ const HYDROData_Profile::ProfilePoint& aSectPoint = aSectPointsList.Value( k );
+ aCurveCoords.clear();
+ aCurveCoords.push_back( aSectPoint.X() );
+ aCurveCoords.push_back( aSectPoint.Z() );
+
+ CurveCreator_PosPoint* aPosPoint = new CurveCreator_PosPoint( k, aCurveCoords );
+ aPoints.push_back( aPosPoint );
}
- aPanel->setProfileName( myEditedObject->GetName() );
- */
+ aSectionsMap[0] = aPoints;
+ myProfile->addPointsInternal( aSectionsMap );
+
+ aProfileName = myEditedObject->GetName();
}
- else{
- /*myCurve = new CurveCreator_Curve(CurveCreator::Dim2d);*/
- //aPanel->setCurve(myCurve);
- QString aNewName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_PROFILE_NAME" ) );
- aPanel->setProfileName(aNewName);
+ else
+ {
+ aProfileName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_PROFILE_NAME" ) );
}
- /*aPanel->setCurve(myCurve);*/
- //displayPreview();
+
+ aPanel->setProfileName( aProfileName );
+ aPanel->setProfile( myProfile );
+ displayPreview();
}
void HYDROGUI_ProfileOp::abortOperation()
{
- //HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
- //if ( aPanel )
- // aPanel->setOCCViewer( 0 );
- //erasePreview();
+ erasePreview();
HYDROGUI_Operation::abortOperation();
}
void HYDROGUI_ProfileOp::commitOperation()
{
- //HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
- //if ( aPanel )
- // aPanel->setOCCViewer( 0 );
- //erasePreview();
+ erasePreview();
HYDROGUI_Operation::commitOperation();
}
HYDROGUI_InputPanel* HYDROGUI_ProfileOp::createInputPanel() const
{
HYDROGUI_ProfileDlg* aDlg = new HYDROGUI_ProfileDlg( module(), getName() );
- //connect( aDlg, SIGNAL( selectionChanged() ), this, SLOT( onEditorSelectionChanged() ) );
return aDlg;
}
QString aProfileName = aPanel->getProfileName();
aProfileObj->SetName(aProfileName);
- /*
- int aDimInt = 3;
- if( myCurve->getDimension() == CurveCreator::Dim2d )
- aDimInt = 2;
- aProfileObj->SetDimension(aDimInt);
- QList<PolylineSection> aPolylineData;
- for( int i=0 ; i < myCurve->getNbSections() ; i++ ){
- PolylineSection aSect;
- aSect.mySectionName = HYDROGUI_Tool::ToExtString( QString::fromLocal8Bit(myCurve->getSectionName(i).c_str()));
- aSect.myIsClosed = myCurve->isClosed(i);
- aSect.myType = PolylineSection::SECTION_POLYLINE;
- if( myCurve->getSectionType(i) == CurveCreator::Spline ){
- aSect.myType = PolylineSection::SECTION_SPLINE;
- }
- CurveCreator::Coordinates aCoords = myCurve->getPoints(i);
- for( int j = 0 ; j < aCoords.size() ; j++ ){
- aSect.myCoords << aCoords.at(j);
- }
- aPolylineData << aSect;
- }
- aProfileObj->SetPolylineData(aPolylineData);
- // the viewer should be release from the widget before the module update it
- // because it has an opened local context and updated presentation should not be displayed in it
- //if ( aPanel )
- // aPanel->setOCCViewer( 0 );
+ HYDROData_Profile::ProfilePoints aProfilePoints;
+
+ CurveCreator::Coordinates aCurveCoords = myProfile->getPoints( 0 );
+ for ( int k = 0 ; k + 1 < aCurveCoords.size() ; k++ )
+ {
+ HYDROData_Profile::ProfilePoint aProfilePoint;
+
+ aProfilePoint.SetX( aCurveCoords.at( k ) );
+ k++;
+ aProfilePoint.SetY( 0 );
+ aProfilePoint.SetZ( aCurveCoords.at( k ) );
+
+ aProfilePoints.Append( aProfilePoint );
+ }
+ aProfileObj->SetProfilePoints( aProfilePoints );
if( !myIsEdit )
module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aProfileObj, true );
-*/
+
theUpdateFlags = UF_Model;
return true;
}
-/*void HYDROGUI_ProfileOp::onEditorSelectionChanged()
+void HYDROGUI_ProfileOp::displayPreview()
{
- HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
- if( !aPanel )
- return;
- if( !myCurve )
- return;
- CurveCreator_Displayer* aDisplayer = myCurve->getDisplayer();
- if( !aDisplayer )
- return;
- QList<int> aSelSections = aPanel->getSelectedSections();
- for( int i = 0 ; i < myCurve->getNbSections() ; i++ ){
- bool aIsHl = false;
- if( aSelSections.contains(i) ){
- aDisplayer->highlight( myCurve->constructSection(i), aIsHl );
- }
- }
-}*/
-
-/*void HYDROGUI_ProfileOp::displayPreview()
-{
- if( myViewManager )
+ HYDROGUI_ProfileDlg* aPanel = dynamic_cast<HYDROGUI_ProfileDlg*>( inputPanel() );
+ if( aPanel )
{
- if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
+ Handle(AIS_InteractiveContext) aCtx = aPanel->getAISContext();
+ if( !aCtx.IsNull() )
{
- Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
- if( !aCtx.IsNull() )
- {
- CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
- myCurve->setDisplayer( aDisplayer );
- aDisplayer->display( myCurve->constructWire() );
- }
+ CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
+ myProfile->setDisplayer( aDisplayer );
+ aDisplayer->display( myProfile->constructWire(), true );
}
}
-}*/
+}
-/*void HYDROGUI_ProfileOp::erasePreview()
+void HYDROGUI_ProfileOp::erasePreview()
{
- CurveCreator_Displayer* aDisplayer = myCurve ? myCurve->getDisplayer() : 0;
- if( myViewManager && aDisplayer )
+ HYDROGUI_ProfileDlg* aPanel = dynamic_cast<HYDROGUI_ProfileDlg*>( inputPanel() );
+ CurveCreator_Displayer* aDisplayer = myProfile ? myProfile->getDisplayer() : 0;
+ if( aPanel && aDisplayer )
{
- if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
+ Handle(AIS_InteractiveContext) aCtx = aPanel->getAISContext();
+ if( !aCtx.IsNull() )
{
- Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
- if( !aCtx.IsNull() )
- {
- aDisplayer->erase();
- }
+ aDisplayer->erase( true );
}
}
-}*/
+}
