X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_PolylineOp.cxx;h=835b9d04d18f341507a19b3c81f089a00abfc57e;hb=5c45a299fb45a108740d6175f7e83c5f63f4c004;hp=5932efc5882f118181575d28d7c7c075aef4d08f;hpb=9940819f697eb46bd7d7fc2945e0dec39db25536;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx index 5932efc5..835b9d04 100755 --- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx +++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx @@ -19,16 +19,18 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include "HYDROGUI_Module.h" + #include "HYDROGUI_PolylineOp.h" + +#include "HYDROGUI_Module.h" #include "HYDROGUI_PolylineDlg.h" #include "HYDROGUI_Tool.h" #include "HYDROGUI_UpdateFlags.h" -#include "HYDROData_Document.h" -#include "HYDROData_Polyline.h" -#include "CurveCreator_Curve.hxx" -#include "CurveCreator_Displayer.h" +#include + +#include +#include #include #include @@ -45,8 +47,10 @@ //static int ZValueIncrement = 0; HYDROGUI_PolylineOp::HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool theIsEdit ) -: HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit), myCurve(NULL), - myViewManager(NULL) +: HYDROGUI_Operation( theModule ), + myIsEdit( theIsEdit ), + myCurve( NULL ), + myViewManager( NULL ) { setName( theIsEdit ? tr( "EDIT_POLYLINE" ) : tr( "CREATE_POLYLINE" ) ); } @@ -77,10 +81,9 @@ bool HYDROGUI_PolylineOp::deleteEnabled() void HYDROGUI_PolylineOp::startOperation() { if( myCurve ) - { delete myCurve; - myCurve = 0; - } + + myCurve = new CurveCreator_Curve( CurveCreator::Dim2d ); HYDROGUI_Operation::startOperation(); @@ -93,39 +96,48 @@ void HYDROGUI_PolylineOp::startOperation() aPanel->setOCCViewer( myViewManager ? myViewManager->getOCCViewer() : 0 ); if( myIsEdit ) - myEditedObject = Handle(HYDROData_Polyline)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); + myEditedObject = Handle(HYDROData_PolylineXY)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); + + QString aPolylineName; if( !myEditedObject.IsNull() ) { - int anIntDim = myEditedObject->GetDimension(); - CurveCreator::Dimension aDim = CurveCreator::Dim3d; - if( anIntDim == 2 ) - aDim = CurveCreator::Dim2d; - myCurve = new CurveCreator_Curve(aDim); - QList 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]); + NCollection_Sequence aSectNames; + NCollection_Sequence aSectTypes; + NCollection_Sequence aSectClosures; + myEditedObject->GetSections( aSectNames, aSectTypes, aSectClosures ); + + for ( int i = 1, n = aSectNames.Size(); i <= n; ++i ) + { + QString aSectName = HYDROGUI_Tool::ToQString( aSectNames.Value( i ) ); + HYDROData_PolylineXY::SectionType aSectType = aSectTypes.Value( i ); + bool aSectClosure = aSectClosures.Value( i ); + + CurveCreator::SectionType aCurveType = CurveCreator::Polyline; + if( aSectType == HYDROData_PolylineXY::SECTION_SPLINE ) + aCurveType = CurveCreator::Spline; + + CurveCreator::Coordinates aCurveCoords; + + HYDROData_PolylineXY::PointsList aSectPointsList = myEditedObject->GetPoints( i - 1 ); + for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k ) + { + const HYDROData_PolylineXY::Point& aSectPoint = aSectPointsList.Value( k ); + aCurveCoords.push_back( aSectPoint.X() ); + aCurveCoords.push_back( aSectPoint.Y() ); } - myCurve->addSectionInternal( aName, aType, isClosed, aCoords ); + + myCurve->addSectionInternal( aSectName.toStdString(), aCurveType, aSectClosure, aCurveCoords ); } - aPanel->setPolylineName( myEditedObject->GetName() ); + aPolylineName = myEditedObject->GetName(); } - else{ - myCurve = new CurveCreator_Curve(CurveCreator::Dim2d); - //aPanel->setCurve(myCurve); - QString aNewName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_POLYLINE_NAME" ) ); - aPanel->setPolylineName(aNewName); + else + { + aPolylineName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_POLYLINE_NAME" ) ); } - aPanel->setCurve(myCurve); + + aPanel->setPolylineName( aPolylineName ); + aPanel->setCurve( myCurve ); displayPreview(); } @@ -160,60 +172,113 @@ HYDROGUI_InputPanel* HYDROGUI_PolylineOp::createInputPanel() const bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags, QString& theErrorMsg ) { - HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel(); + HYDROGUI_PolylineDlg* aPanel = ::qobject_cast( inputPanel() ); + if ( !aPanel ) + return false; - int aStudyId = module()->getStudyId(); - bool aHasDoc = HYDROData_Document::HasDocument(aStudyId); - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( aStudyId ); - if( aDocument.IsNull() ) + QString aPolylineName = aPanel->getPolylineName().simplified(); + if ( aPolylineName.isEmpty() ) + { + theErrorMsg = tr( "INCORRECT_OBJECT_NAME" ); return false; + } - Handle(HYDROData_Polyline) aPolylineObj; - if( myIsEdit ){ - aPolylineObj = myEditedObject; + if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != aPolylineName ) ) + { + // check that there are no other objects with the same name in the document + Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), aPolylineName ); + if( !anObject.IsNull() ) + { + theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( aPolylineName ); + return false; + } } - else{ - aPolylineObj = Handle(HYDROData_Polyline)::DownCast( aDocument->CreateObject( KIND_POLYLINE ) ); - //double aZValue = double( ++ZValueIncrement ) * 1e-2; // empiric value, to be revised - //aPolylineObj->SetZValue( aZValue ); + if ( myCurve->getNbSections() <= 0 ) + { + theErrorMsg = tr( "EMPTY_POLYLINE_DATA" ); + return false; + } + + Handle(HYDROData_PolylineXY) aPolylineObj; + if( myIsEdit ) + { + aPolylineObj = myEditedObject; + aPolylineObj->RemoveSections(); + } + else + { + aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( doc()->CreateObject( KIND_POLYLINEXY ) ); } if( aPolylineObj.IsNull() ) return false; - QString aPolylineName = aPanel->getPolylineName(); - aPolylineObj->SetName(aPolylineName); - int aDimInt = 3; - if( myCurve->getDimension() == CurveCreator::Dim2d ) - aDimInt = 2; - aPolylineObj->SetDimension(aDimInt); - QList 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; + aPolylineObj->SetName( aPolylineName ); + + for ( int i = 0 ; i < myCurve->getNbSections() ; i++ ) + { + TCollection_AsciiString aSectName = HYDROGUI_Tool::ToAsciiString( myCurve->getSectionName( i ).c_str() ); + CurveCreator::SectionType aCurveType = myCurve->getSectionType( i ); + bool aSectClosure = myCurve->isClosed( i ); + + HYDROData_PolylineXY::SectionType aSectType = HYDROData_PolylineXY::SECTION_POLYLINE; + + if ( aCurveType == CurveCreator::Spline ) + aSectType = HYDROData_PolylineXY::SECTION_SPLINE; + + aPolylineObj->AddSection( aSectName, aSectType, aSectClosure ); + + // Add the points fro section + CurveCreator::Coordinates aCurveCoords = myCurve->getPoints( i ); + + if ( aCurveCoords.size() <= 2 ) + { + theErrorMsg = tr( "NUMBER_OF_SECTION_POINTS_INCORRECT" ); + return false; } - CurveCreator::Coordinates aCoords = myCurve->getPoints(i); - for( int j = 0 ; j < aCoords.size() ; j++ ){ - aSect.myCoords << aCoords.at(j); + + for ( int k = 0 ; k + 1 < aCurveCoords.size() ; k++ ) + { + HYDROData_PolylineXY::Point aSectPoint; + + aSectPoint.SetX( aCurveCoords.at( k ) ); + k++; + aSectPoint.SetY( aCurveCoords.at( k ) ); + + aPolylineObj->AddPoint( i, aSectPoint ); } - aPolylineData << aSect; } - aPolylineObj->SetPolylineData(aPolylineData); + + if ( !myIsEdit ) + { + aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() ); + } + + // Update the wire of polyline + aPolylineObj->Update(); // 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 ); - if( !myIsEdit ) - module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aPolylineObj, true ); + theUpdateFlags = UF_Model; + + // the polyline should be rebuild in all viewers, where it is displayed + theUpdateFlags |= UF_Viewer | UF_GV_Forced; + theUpdateFlags |= UF_OCCViewer | UF_OCC_Forced; + + size_t anActiveViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() ); + if ( anActiveViewId == 0 ) + { + anActiveViewId = HYDROGUI_Tool::GetActiveOCCViewId( module() ); + } - theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced; + if( !myIsEdit ) + { + module()->setObjectVisible( anActiveViewId, aPolylineObj, true ); + } return true; } @@ -228,13 +293,12 @@ void HYDROGUI_PolylineOp::onEditorSelectionChanged() CurveCreator_Displayer* aDisplayer = myCurve->getDisplayer(); if( !aDisplayer ) return; - QList aSelSections = aPanel->getSelectedSections(); - for( int i = 0 ; i < myCurve->getNbSections() ; i++ ){ - bool aIsHl = false; - if( aSelSections.contains(i) ){ - aDisplayer->highlight( myCurve->constructSection(i), aIsHl ); - } - } + //QList aSelSections = aPanel->getSelectedSections(); + bool aIsHl = false; + //if( aSelSections.contains(i) ){ + // TODO + //aDisplayer->highlight( myCurve->getAISObject(), aIsHl ); + //} } void HYDROGUI_PolylineOp::displayPreview() @@ -248,7 +312,7 @@ void HYDROGUI_PolylineOp::displayPreview() { CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx ); myCurve->setDisplayer( aDisplayer ); - aDisplayer->display( myCurve->constructWire() ); + aDisplayer->display( myCurve->getAISObject( true ), true ); } } } @@ -264,8 +328,15 @@ void HYDROGUI_PolylineOp::erasePreview() Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); if( !aCtx.IsNull() ) { - aDisplayer->erase(); + aDisplayer->eraseAll( true ); } } } + + myViewManager = NULL; + if ( myCurve ) + { + delete myCurve; + myCurve = NULL; + } }