//
// 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 "CurveCreator.hxx"
-#include "CurveCreator_Curve.hxx"
-#include "CurveCreator_CurveEditor.hxx"
-#include "HYDROGUI_AISCurve.h"
+#include "HYDROGUI_UpdateFlags.h"
#include <HYDROData_Document.h>
-#include <HYDROData_Polyline.h>
+
#include <CurveCreator_Curve.hxx>
-#include <CurveCreator_CurveEditor.hxx>
+#include <CurveCreator_Displayer.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <Precision.hxx>
-static int ZValueIncrement = 0;
+//static int ZValueIncrement = 0;
HYDROGUI_PolylineOp::HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool theIsEdit )
-: HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit), myCurve(NULL),
- myViewManager(NULL), myAISCurve(NULL)
+: HYDROGUI_Operation( theModule ),
+ myIsEdit( theIsEdit ),
+ myCurve( NULL ),
+ myViewManager( NULL )
{
setName( theIsEdit ? tr( "EDIT_POLYLINE" ) : tr( "CREATE_POLYLINE" ) );
}
erasePreview();
}
+/**
+ * Redirect the delete action to input panel
+ */
+void HYDROGUI_PolylineOp::deleteSelected()
+{
+ HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+ aPanel->deleteSelected();
+}
+
+/**
+ * Checks whether there are some to delete
+ */
+bool HYDROGUI_PolylineOp::deleteEnabled()
+{
+ HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+ return aPanel->deleteEnabled();
+}
+
void HYDROGUI_PolylineOp::startOperation()
{
if( myCurve )
- {
delete myCurve;
- myCurve = 0;
- }
+
+ myCurve = new CurveCreator_Curve( CurveCreator::Dim2d );
HYDROGUI_Operation::startOperation();
HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
aPanel->reset();
- myEditedObject = Handle(HYDROData_Polyline)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+ 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_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<PolylineSection> aPolylineData = myEditedObject->GetPolylineData();
-
- CurveCreator_CurveEditor* anEdit = new CurveCreator_CurveEditor(myCurve);
- for( int i = 0 ; i < aPolylineData.size() ; i++ ){
- std::string aName = HYDROGUI_Tool::ToQString(aPolylineData[i].mySectionName).toStdString();
- bool isClosed = aPolylineData[i].myIsClosed;
- CurveCreator::Type aType = CurveCreator::Polyline;
- if( aPolylineData[i].myType == PolylineSection::SECTION_SPLINE ){
- aType = CurveCreator::BSpline;
- }
- CurveCreator::Coordinates aCoords;
- for( int j = 0 ; j < aPolylineData[i].myCoords.size() ; j++ ){
- aCoords.push_back(aPolylineData[i].myCoords[j]);
+ NCollection_Sequence<TCollection_AsciiString> aSectNames;
+ NCollection_Sequence<HYDROData_PolylineXY::SectionType> aSectTypes;
+ NCollection_Sequence<bool> 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() );
}
- anEdit->addSection( aName, aType, isClosed, aCoords );
+
+ myCurve->addSectionInternal( aSectName.toStdString(), aCurveType, aSectClosure, aCurveCoords );
}
- delete anEdit;
- aPanel->setPolylineName( myEditedObject->GetName() );
+ aPolylineName = myEditedObject->GetName();
}
- else{
- myCurve = new CurveCreator_Curve(CurveCreator::Dim2d);
- aPanel->setCurve(myCurve);
- QString aNewName = HYDROGUI_Tool::GenerateObjectName( module(), "Polyline" );
- aPanel->setPolylineName(aNewName);
+ else
+ {
+ aPolylineName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_POLYLINE_NAME" ) );
}
- aPanel->setCurve(myCurve);
- if( myAISCurve )
- myAISCurve->setCurve(myCurve);
+ aPanel->setPolylineName( aPolylineName );
+ aPanel->setCurve( myCurve );
displayPreview();
}
void HYDROGUI_PolylineOp::abortOperation()
{
+ HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+ if ( aPanel )
+ aPanel->setOCCViewer( 0 );
erasePreview();
HYDROGUI_Operation::abortOperation();
void HYDROGUI_PolylineOp::commitOperation()
{
+ HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+ if ( aPanel )
+ aPanel->setOCCViewer( 0 );
erasePreview();
HYDROGUI_Operation::commitOperation();
if( aDocument.IsNull() )
return false;
- Handle(HYDROData_Polyline) aPolylineObj;
- if( myIsEdit ){
+ Handle(HYDROData_PolylineXY) aPolylineObj;
+ if( myIsEdit )
+ {
aPolylineObj = myEditedObject;
+ aPolylineObj->RemoveSections();
}
else{
- aPolylineObj = Handle(HYDROData_Polyline)::DownCast( aDocument->CreateObject( KIND_POLYLINE ) );
+ aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( aDocument->CreateObject( KIND_POLYLINEXY ) );
- double aZValue = double( ++ZValueIncrement ) * 1e-2; // empiric value, to be revised
- aPolylineObj->SetZValue( aZValue );
+ //double aZValue = double( ++ZValueIncrement ) * 1e-2; // empiric value, to be revised
+ //aPolylineObj->SetZValue( aZValue );
}
if( aPolylineObj.IsNull() )
QString aPolylineName = aPanel->getPolylineName();
aPolylineObj->SetName(aPolylineName);
- int aDimInt = 3;
- if( myCurve->getDimension() == CurveCreator::Dim2d )
- aDimInt = 2;
- aPolylineObj->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->getType(i) == CurveCreator::BSpline ){
- aSect.myType = PolylineSection::SECTION_SPLINE;
- }
- CurveCreator::Coordinates aCoords = myCurve->getPoints(i);
- for( int j = 0 ; j < aCoords.size() ; j++ ){
- aSect.myCoords << aCoords.at(j);
+
+ 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 );
+ 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);
+
+ // 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 );
theUpdateFlags = UF_Model;
- module()->setObjectVisible( HYDROGUI_Tool::GetActiveGraphicsViewId( module() ), aPolylineObj, true );
+
+ // 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() );
+ }
+
+ if( !myIsEdit )
+ {
+ module()->setObjectVisible( anActiveViewId, aPolylineObj, true );
+ }
+
return true;
}
return;
if( !myCurve )
return;
- if( !myAISCurve )
+ 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) ){
- myAISCurve->highlightSection(i, aIsHl);
+ aDisplayer->highlight( myCurve->constructSection(i), aIsHl );
}
}
}
void HYDROGUI_PolylineOp::displayPreview()
{
- LightApp_Application* anApp = module()->getApp();
-
- myViewManager =
- dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
if( myViewManager )
{
if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
if( !aCtx.IsNull() )
{
- myAISCurve = new HYDROGUI_AISCurve( myCurve, aCtx );
- myAISCurve->Display();
+ CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
+ myCurve->setDisplayer( aDisplayer );
+ aDisplayer->display( myCurve->constructWire(), true );
}
}
}
void HYDROGUI_PolylineOp::erasePreview()
{
- if( myViewManager )
+ CurveCreator_Displayer* aDisplayer = myCurve ? myCurve->getDisplayer() : 0;
+ if( myViewManager && aDisplayer )
{
if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
{
Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
- if( !aCtx.IsNull() && myAISCurve )
+ if( !aCtx.IsNull() )
{
- myAISCurve->Erase();
- delete myAISCurve;
- myAISCurve = 0;
+ aDisplayer->erase( true );
}
}
}
