X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ProfileOp.cxx;h=c4c822df57515a5a9fdb4461e27b74928da49049;hb=6dd1807886655d96b021fbfb6ba736d79d49a492;hp=4ff533ed430f0edc59f21bbcb31ef44d02c87622;hpb=47929e267bad89edb95ce8e9b1e545a9f5ec7d58;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx index 4ff533ed..c4c822df 100644 --- a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx +++ b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx @@ -1,12 +1,8 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// Copyright (C) 2014-2015 EDF-R&D // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,16 +15,17 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include "HYDROGUI_Module.h" -#include "HYDROGUI_ProfileOp.h" -#include "HYDROGUI_ProfileDlg.h" -#include "HYDROGUI_Tool.h" -#include "HYDROGUI_UpdateFlags.h" -#include "HYDROData_Document.h" -#include "HYDROData_Profile.h" -#include "CurveCreator_Curve.hxx" -#include "CurveCreator_Displayer.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -45,15 +42,14 @@ //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(); } /** @@ -76,75 +72,80 @@ bool HYDROGUI_ProfileOp::deleteEnabled() void HYDROGUI_ProfileOp::startOperation() { - if( myCurve ) - { - delete myCurve; - myCurve = 0; - } + if( myProfile ) + delete myProfile; + + myProfile = new HYDROGUI_CurveCreatorProfile(); HYDROGUI_Operation::startOperation(); HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel(); aPanel->reset(); - - //LightApp_Application* anApp = module()->getApp(); - //myViewManager = - // dynamic_cast( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) ); - //aPanel->setOCCViewer( myViewManager ? myViewManager->getOCCViewer() : 0 ); + setPreviewManager( aPanel->viewManager() ); + setCursor(); if( myIsEdit ) - myEditedObject = Handle(HYDROData_Profile)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) ); + if ( isApplyAndClose() ) + 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 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]); + Handle(HYDROData_ProfileUZ) aProfileUZ = myEditedObject->GetProfileUZ( false ); + if ( !aProfileUZ.IsNull() ) + { + CurveCreator::Coordinates aCurveCoords; + CurveCreator::SectionsMap aSectionsMap; + + HYDROData_ProfileUZ::PointsList aSectPointsList = aProfileUZ->GetPoints(); + CurveCreator::PosPointsList aPoints; + for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k ) + { + const HYDROData_ProfileUZ::Point& aSectPoint = aSectPointsList.Value( k ); + aCurveCoords.clear(); + aCurveCoords.push_back( aSectPoint.X() ); + aCurveCoords.push_back( aSectPoint.Y() ); + + CurveCreator_PosPoint* aPosPoint = new CurveCreator_PosPoint( k, aCurveCoords ); + aPoints.push_back( aPosPoint ); } - myCurve->addSectionInternal( aName, aType, isClosed, aCoords ); + + aSectionsMap[0] = aPoints; + myProfile->addPointsInternal( aSectionsMap ); + + HYDROData_ProfileUZ::SectionType aSectType = aProfileUZ->GetSectionType( 0 ); + + CurveCreator::SectionType aCurveType = CurveCreator::Polyline; + if( aSectType == HYDROData_ProfileUZ::SECTION_SPLINE ) + aCurveType = CurveCreator::Spline; + + myProfile->setSectionType( 0, aCurveType ); } - aPanel->setProfileName( myEditedObject->GetName() ); - */ + + 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(); + restoreCursor(); HYDROGUI_Operation::abortOperation(); } void HYDROGUI_ProfileOp::commitOperation() { - //HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel(); - //if ( aPanel ) - // aPanel->setOCCViewer( 0 ); - //erasePreview(); + erasePreview(); + restoreCursor(); HYDROGUI_Operation::commitOperation(); } @@ -152,119 +153,129 @@ void HYDROGUI_ProfileOp::commitOperation() HYDROGUI_InputPanel* HYDROGUI_ProfileOp::createInputPanel() const { HYDROGUI_ProfileDlg* aDlg = new HYDROGUI_ProfileDlg( module(), getName() ); - //connect( aDlg, SIGNAL( selectionChanged() ), this, SLOT( onEditorSelectionChanged() ) ); return aDlg; } bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags, - QString& theErrorMsg ) + QString& theErrorMsg, + QStringList& theBrowseObjectsEntries ) { - HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel(); + HYDROGUI_ProfileDlg* 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 aProfileName = aPanel->getProfileName().simplified(); + if ( aProfileName.isEmpty() ) + { + theErrorMsg = tr( "INCORRECT_OBJECT_NAME" ); return false; + } + + if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != aProfileName ) ) + { + // check that there are no other objects with the same name in the document + Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), aProfileName ); + if( !anObject.IsNull() ) + { + theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( aProfileName ); + return false; + } + } Handle(HYDROData_Profile) aProfileObj; if( myIsEdit ){ aProfileObj = myEditedObject; } else{ - aProfileObj = Handle(HYDROData_Profile)::DownCast( aDocument->CreateObject( KIND_PROFILE ) ); - - //double aZValue = double( ++ZValueIncrement ) * 1e-2; // empiric value, to be revised - //aProfileObj->SetZValue( aZValue ); + aProfileObj = Handle(HYDROData_Profile)::DownCast( doc()->CreateObject( KIND_PROFILE ) ); } if( aProfileObj.IsNull() ) return false; - QString aProfileName = aPanel->getProfileName(); + Handle(HYDROData_ProfileUZ) aProfileUZ = aProfileObj->GetProfileUZ(); + if ( aProfileUZ.IsNull() ) + return false; + aProfileObj->SetName(aProfileName); - /* - int aDimInt = 3; - if( myCurve->getDimension() == CurveCreator::Dim2d ) - aDimInt = 2; - aProfileObj->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; - } - CurveCreator::Coordinates aCoords = myCurve->getPoints(i); - for( int j = 0 ; j < aCoords.size() ; j++ ){ - aSect.myCoords << aCoords.at(j); - } - aPolylineData << aSect; + + HYDROData_ProfileUZ::PointsList aProfileParamPoints; + + CurveCreator::Coordinates aCurveCoords = myProfile->getPoints( 0 ); + if ( aCurveCoords.size() <= 2 ) + { + theErrorMsg = tr( "NUMBER_OF_PROFILE_POINTS_INCORRECT" ); + return false; + } + + for ( int k = 0 ; k + 1 < aCurveCoords.size() ; k++ ) + { + HYDROData_ProfileUZ::Point aProfileParamPoint; + + aProfileParamPoint.SetX( aCurveCoords.at( k ) ); + k++; + aProfileParamPoint.SetY( aCurveCoords.at( k ) ); + + aProfileParamPoints.Append( aProfileParamPoint ); + } + aProfileObj->SetParametricPoints( aProfileParamPoints ); + + HYDROData_ProfileUZ::SectionType aSectType = HYDROData_ProfileUZ::SECTION_POLYLINE; + if ( myProfile->getSectionType( 0 ) == CurveCreator::Spline ) + aSectType = HYDROData_ProfileUZ::SECTION_SPLINE; + + aProfileUZ->SetSectionType( 0, aSectType ); + + if ( !myIsEdit ) + { + aProfileObj->SetBorderColor( aProfileObj->DefaultBorderColor() ); } - 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 ); + // At first we update the child u,z profile object + aProfileUZ->Changed( HYDROData_Entity::Geom_2d ); + aProfileUZ->Update(); + + // And now we update our edited object + aProfileObj->Update(); + module()->setIsToUpdate( aProfileObj ); - if( !myIsEdit ) - module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aProfileObj, true ); -*/ theUpdateFlags = UF_Model; + if ( myIsEdit ) + theUpdateFlags |= UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer; + else + { + QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aProfileObj ); + theBrowseObjectsEntries.append( anEntry ); + } + 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 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( 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->getAISObject( true ), true ); } } -}*/ +} -/*void HYDROGUI_ProfileOp::erasePreview() +void HYDROGUI_ProfileOp::erasePreview() { - CurveCreator_Displayer* aDisplayer = myCurve ? myCurve->getDisplayer() : 0; - if( myViewManager && aDisplayer ) + HYDROGUI_ProfileDlg* aPanel = dynamic_cast( 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->eraseAll( true ); } } -}*/ +}