#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() )
- {
- aPolylineName = aPolylineObj->GetName();
- if ( !aPolylineName.isEmpty() )
- {
- aList.append( aPolylineName );
- anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aPolylineObj ) );
+ {
+ // Check the polyline shape
+ TopoDS_Shape aPolylineShape = aPolylineObj->GetShape();
+ if ( !aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE ) {
+ aPolylineName = aPolylineObj->GetName();
+ if ( !aPolylineName.isEmpty() )
+ {
+ aList.append( aPolylineName );
+ anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aPolylineObj ) );
+ }
}
}
}
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() )
- {
- anObject = Handle(HYDROData_Object)::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 ) );
}
}
void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName )
{
// Set the selected boundary polyline to the calculation case
- Handle(HYDROData_Polyline) anObject;
+ Handle(HYDROData_PolylineXY) anObject;
Handle(AIS_InteractiveContext) aCtx;
if ( myPreviewViewManager )
{
else
{
Handle(HYDROData_Entity) anEntity =
- HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_POLYLINE );
+ HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_POLYLINEXY );
if ( !anEntity.IsNull() )
{
- anObject = Handle(HYDROData_Polyline)::DownCast( anEntity );
+ anObject = Handle(HYDROData_PolylineXY)::DownCast( anEntity );
if ( !anObject.IsNull() )
{
myEditedObject->SetBoundaryPolyline( anObject );
{
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
void HYDROGUI_CalculationOp::onSplitZones()
{
+ HYDROGUI_CalculationDlg* aPanel =
+ ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+ if ( !aPanel )
+ return;
+
QApplication::setOverrideCursor( Qt::WaitCursor );
+ QString aNewCaseName = aPanel->getObjectName();
+ QString anOldCaseName = myEditedObject->GetName();
+
+ bool anIsToUpdateOb = myIsEdit && anOldCaseName != aNewCaseName;
+
+ // At first we must to update the case name because of
+ // automatic names generation for regions and zones
+ myEditedObject->SetName( aNewCaseName );
+
if ( myEditedObject->IsMustBeUpdated() )
{
myShowZones = true;
myEditedObject->SplitGeometryObjects();
- HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( aPanel )
- {
- aPanel->setEditedObject( myEditedObject );
- }
+ aPanel->setEditedObject( myEditedObject );
createPreview();
}
setZonesVisible( true );
}
+ if ( anIsToUpdateOb )
+ module()->getApp()->updateObjectBrowser( false );
+
QApplication::restoreOverrideCursor();
}