X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ProfileOp.cxx;h=c4c822df57515a5a9fdb4461e27b74928da49049;hb=6dd1807886655d96b021fbfb6ba736d79d49a492;hp=8f9519006ede54a7c9ceaf398bd9369b4a63e14f;hpb=3dcf1e98a13cb0bdcfc9d0800983a42ed7fb2e45;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx index 8f951900..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_Profile.hxx" -#include "CurveCreator_Displayer.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -78,36 +75,52 @@ void HYDROGUI_ProfileOp::startOperation() if( myProfile ) delete myProfile; - myProfile = new CurveCreator_Profile(); + myProfile = new HYDROGUI_CurveCreatorProfile(); HYDROGUI_Operation::startOperation(); HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel(); aPanel->reset(); + 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() ) { - 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 ) + Handle(HYDROData_ProfileUZ) aProfileUZ = myEditedObject->GetProfileUZ( false ); + if ( !aProfileUZ.IsNull() ) { - const HYDROData_Profile::ProfilePoint& aSectPoint = aSectPointsList.Value( k ); - aCurveCoords.clear(); - aCurveCoords.push_back( aSectPoint.X() ); - aCurveCoords.push_back( aSectPoint.Z() ); + 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 ); + } - CurveCreator_PosPoint* aPosPoint = new CurveCreator_PosPoint( k, aCurveCoords ); - aPoints.push_back( aPosPoint ); + 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 ); } - aSectionsMap[0] = aPoints; - myProfile->addPointsInternal( aSectionsMap ); aProfileName = myEditedObject->GetName(); } @@ -124,6 +137,7 @@ void HYDROGUI_ProfileOp::startOperation() void HYDROGUI_ProfileOp::abortOperation() { erasePreview(); + restoreCursor(); HYDROGUI_Operation::abortOperation(); } @@ -131,6 +145,7 @@ void HYDROGUI_ProfileOp::abortOperation() void HYDROGUI_ProfileOp::commitOperation() { erasePreview(); + restoreCursor(); HYDROGUI_Operation::commitOperation(); } @@ -142,36 +157,57 @@ HYDROGUI_InputPanel* HYDROGUI_ProfileOp::createInputPanel() const } 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); 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; @@ -184,10 +220,34 @@ bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags, } aProfileObj->SetParametricPoints( aProfileParamPoints ); - if( !myIsEdit ) - module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aProfileObj, true ); + 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() ); + } + + // 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 ); 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; } @@ -201,7 +261,7 @@ void HYDROGUI_ProfileOp::displayPreview() { CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx ); myProfile->setDisplayer( aDisplayer ); - aDisplayer->display( myProfile->constructWire(), true ); + aDisplayer->display( myProfile->getAISObject( true ), true ); } } } @@ -215,7 +275,7 @@ void HYDROGUI_ProfileOp::erasePreview() Handle(AIS_InteractiveContext) aCtx = aPanel->getAISContext(); if( !aCtx.IsNull() ) { - aDisplayer->erase( true ); + aDisplayer->eraseAll( true ); } } }