#include "HYDROGUI_Zone.h"
#include "HYDROGUI_Region.h"
-#include <HYDROData_Polyline.h>
+#include <HYDROData_PolylineXY.h>
#include <HYDROData_Iterator.h>
-#include <HYDROData_ImmersibleZone.h>
#include <HYDROData_Object.h>
+#include <HYDROData_Tool.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewModel.h>
// Get all polylines
aList.clear();
anEntryList.clear();
- HYDROData_Iterator anIter( doc(), KIND_POLYLINE );
- Handle(HYDROData_Polyline) aPolylineObj;
+ HYDROData_Iterator anIter( doc(), KIND_POLYLINEXY );
+ Handle(HYDROData_PolylineXY) aPolylineObj;
QString aPolylineName;
for ( ; anIter.More(); anIter.Next() )
{
- aPolylineObj = Handle(HYDROData_Polyline)::DownCast( anIter.Current() );
+ aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() );
if ( !aPolylineObj.IsNull() && aPolylineObj->IsClosed() )
{
// Check the polyline shape
- TopoDS_Shape aPolylineShape = aPolylineObj->GetTopShape();
+ TopoDS_Shape aPolylineShape = aPolylineObj->GetShape();
if ( !aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE ) {
aPolylineName = aPolylineObj->GetName();
if ( !aPolylineName.isEmpty() )
void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq,
QStringList& theNames, QStringList& theEntries ) const
{
- Handle(HYDROData_Object) anObject;
- Handle(HYDROData_Entity) anEntity;
+
theNames.clear();
theEntries.clear();
HYDROData_SequenceOfObjects::Iterator anIter( theSeq );
for ( ; anIter.More(); anIter.Next() )
{
- anEntity = anIter.Value();
- if ( !anEntity.IsNull() )
- {
- // Temporary solution will be revised later
- //anObject = Handle(HYDROData_Object)::DownCast( anEntity );
- anObject = Handle(HYDROData_ImmersibleZone)::DownCast( anEntity );
- if ( !anObject.IsNull() )
- {
- theNames.append( anObject->GetName() );
- theEntries.append( HYDROGUI_DataObject::dataObjectEntry( anObject ) );
- }
- }
+ Handle(HYDROData_Entity) anEntity = anIter.Value();
+ if ( !HYDROData_Tool::IsGeometryObject( anEntity ) )
+ continue;
+
+ theNames.append( anEntity->GetName() );
+ theEntries.append( HYDROGUI_DataObject::dataObjectEntry( anEntity ) );
}
}
// Connect signals and slots
connect( aPanel, SIGNAL( addObjects() ), SLOT( onAddObjects() ) );
connect( aPanel, SIGNAL( removeObjects() ), SLOT( onRemoveObjects() ) );
- connect( aPanel, SIGNAL( splitZones() ), SLOT( onSplitZones() ) );
- connect( aPanel, SIGNAL( hideZones() ), SLOT( onHideZones() ) );
+ connect( aPanel, SIGNAL( Next( const int ) ), SLOT( onSplitZones() ) );
+ connect( aPanel, SIGNAL( Back( const int ) ), SLOT( onHideZones() ) );
connect( aPanel, SIGNAL( clicked( SUIT_DataObject* ) ), SLOT( onSelected( SUIT_DataObject* ) ) );
connect( aPanel, SIGNAL( setMergeType( int, QString& ) ), SLOT( onSetMergeType( int, QString& ) ) );
connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>& ) ),
void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName )
{
- // Set the selected boundary polyline to the calculation case
- Handle(HYDROData_Polyline) anObject;
- Handle(AIS_InteractiveContext) aCtx;
- if ( myPreviewViewManager )
- {
- if ( OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer() )
- {
- aCtx = aViewer->getAISContext();
- }
- }
+ bool anIsToUpdateViewer = false;
+
// Remove the old boundary from the operation viewer
- anObject = myEditedObject->GetBoundaryPolyline();
- if ( !anObject.IsNull() )
+ Handle(HYDROData_PolylineXY) aPrevPolyline =
+ myEditedObject->GetBoundaryPolyline();
+ if ( !aPrevPolyline.IsNull() )
{
- module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anObject );
+ module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aPrevPolyline );
+ anIsToUpdateViewer = true;
}
- if ( theObjName.trimmed().isEmpty() )
- {
- // No polyline is selected
- myEditedObject->RemoveBoundaryPolyline();
- }
- else
+ // Set the selected boundary polyline to the calculation case
+ Handle(HYDROData_PolylineXY) aNewPolyline = Handle(HYDROData_PolylineXY)::DownCast(
+ HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_POLYLINEXY ) );
+ myEditedObject->SetBoundaryPolyline( aNewPolyline );
+
+ if ( myPreviewViewManager )
{
- Handle(HYDROData_Entity) anEntity =
- HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_POLYLINE );
- if ( !anEntity.IsNull() )
+ OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+ if ( aViewer )
{
- anObject = Handle(HYDROData_Polyline)::DownCast( anEntity );
- if ( !anObject.IsNull() )
+ if ( !aNewPolyline.IsNull() )
{
- myEditedObject->SetBoundaryPolyline( anObject );
+ Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
if ( !aCtx.IsNull() )
{
- showObject( anEntity, aCtx );
+ showObject( aNewPolyline, aCtx );
+ anIsToUpdateViewer = true;
}
}
+
+ if ( anIsToUpdateViewer )
+ aViewer->update();
}
}
}
{
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( aPanel )
+ if ( !aPanel )
+ return;
+
+ // Add geometry objects selected in the module browser to the calculation case
+ QStringList aSelectedList = aPanel->getSelectedAvailableGeomObjects();
+ if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+ return;
+
+ QStringList anAddedList;
+ for (int i = 0; i < aSelectedList.length(); i++)
{
- // Add geometry objects selected in the module browser to the calculation case
- QStringList aSelectedList = aPanel->getSelectedAvailableGeomObjects();
- if ( ( !aSelectedList.isEmpty() ) && ( confirmRegionsChange() ) )
- {
- Handle(HYDROData_Object) anObject;
- Handle(HYDROData_Entity) anEntity;
- QStringList aList;
- for (int i = 0; i < aSelectedList.length(); i++)
- {
- anEntity = HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) );
- if ( !anEntity.IsNull() )
- {
- anObject = Handle(HYDROData_Object)::DownCast( anEntity );
- if ( !anObject.IsNull() )
- {
- if (myEditedObject->AddGeometryObject( anObject ))
- {
- aList.append( anObject->GetName() );
- }
- }
- }
- }
- if ( !aList.isEmpty() )
- {
- aPanel->includeGeomObjects( aList );
- createPreview();
- }
- }
+ Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast(
+ HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) );
+ if ( anObject.IsNull() )
+ continue;
+
+ if ( myEditedObject->AddGeometryObject( anObject ) )
+ anAddedList.append( anObject->GetName() );
+ }
+
+ if ( !anAddedList.isEmpty() )
+ {
+ aPanel->includeGeomObjects( anAddedList );
+ createPreview();
}
}
// Remove selected objects from the calculation case
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( aPanel )
+ if ( !aPanel )
+ return;
+
+ QStringList aSelectedList = aPanel->getSelectedGeomObjects();
+ if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+ return;
+
+ for (int i = 0; i < aSelectedList.length(); i++)
{
- QStringList aList = aPanel->getSelectedGeomObjects();
- if ( ( !aList.isEmpty() ) && ( confirmRegionsChange() ) )
- {
- Handle(HYDROData_Object) anObject;
- Handle(HYDROData_Entity) anEntity;
- for (int i = 0; i < aList.length(); i++)
- {
- anEntity = HYDROGUI_Tool::FindObjectByName( module(), aList.at(i) );
- if ( !anEntity.IsNull() )
- {
- anObject = Handle(HYDROData_Object)::DownCast( anEntity );
- if ( !anObject.IsNull() )
- {
- module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anObject );
- myEditedObject->RemoveGeometryObject( anObject );
- }
- }
- }
- if ( !aList.isEmpty() )
- {
- aPanel->excludeGeomObjects( aList );
- }
- }
+ Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast(
+ HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) );
+ if ( anObject.IsNull() )
+ continue;
+
+ module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anObject );
+ myEditedObject->RemoveGeometryObject( anObject );
}
+
+ aPanel->excludeGeomObjects( aSelectedList );
}
bool HYDROGUI_CalculationOp::confirmRegionsChange() const
if ( myEditedObject->IsMustBeUpdated() )
{
myShowZones = true;
- myEditedObject->SplitGeometryObjects();
+ myEditedObject->Update();
aPanel->setEditedObject( myEditedObject );
}
}
}
+
+ aViewer->update();
}
}
}
if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() )
vw->onTopView();
}
+
+ aViewer->update();
}
}
aShape = new HYDROGUI_Shape( theCtx, theEntity );
module()->setObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, theEntity, aShape );
}
- aShape->update();
+ aShape->update( false );
}
}
