-// 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
//
// 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 <HYDROGUI_Module.h>
+#include <HYDROGUI_ProfileOp.h>
+#include <HYDROGUI_ProfileDlg.h>
+#include <HYDROGUI_Tool2.h>
+#include <HYDROGUI_UpdateFlags.h>
+#include <HYDROGUI_DataObject.h>
+#include <HYDROData_Document.h>
+#include <HYDROData_Profile.h>
+#include <HYDROGUI_CurveCreatorProfile.h>
+#include <CurveCreator_Displayer.hxx>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
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();
}
void HYDROGUI_ProfileOp::abortOperation()
{
erasePreview();
+ restoreCursor();
HYDROGUI_Operation::abortOperation();
}
void HYDROGUI_ProfileOp::commitOperation()
{
erasePreview();
+ restoreCursor();
HYDROGUI_Operation::commitOperation();
}
}
bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
- HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
+ HYDROGUI_ProfileDlg* aPanel = ::qobject_cast<HYDROGUI_ProfileDlg*>( 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_Profile::ProfilePoints aProfilePoints;
+ 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_Profile::ProfilePoint aProfilePoint;
+ HYDROData_ProfileUZ::Point aProfileParamPoint;
- aProfilePoint.SetX( aCurveCoords.at( k ) );
+ aProfileParamPoint.SetX( aCurveCoords.at( k ) );
k++;
- aProfilePoint.SetY( 0 );
- aProfilePoint.SetZ( aCurveCoords.at( k ) );
+ aProfileParamPoint.SetY( aCurveCoords.at( k ) );
- aProfilePoints.Append( aProfilePoint );
+ aProfileParamPoints.Append( aProfileParamPoint );
}
- aProfileObj->SetProfilePoints( aProfilePoints );
+ 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;
}
{
CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
myProfile->setDisplayer( aDisplayer );
- aDisplayer->display( myProfile->constructWire() );
+ aDisplayer->display( myProfile->getAISObject( true ), true );
}
}
}
Handle(AIS_InteractiveContext) aCtx = aPanel->getAISContext();
if( !aCtx.IsNull() )
{
- aDisplayer->erase();
+ aDisplayer->eraseAll( true );
}
}
}
