aPolylineName = aPolylineObj->GetName();
aPanel->setBoundary( aPolylineName );
}
+
aSeq = myEditedObject->GetGeometryObjects();
getNamesAndEntries( aSeq, aList, anEntryList );
aPanel->includeGeomObjects( aList );
for ( ; anIter.More(); anIter.Next() )
{
Handle(HYDROData_Entity) anEntity = anIter.Value();
- if ( !HYDROData_Tool::IsGeometryObject( anEntity ) )
- continue;
+ //if ( !HYDROData_Tool::IsGeometryObject( anEntity ) )
+ // continue;
theNames.append( anEntity->GetName() );
theEntries.append( HYDROGUI_DataObject::dataObjectEntry( anEntity ) );
}
}
-void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theBathymetryName )
+void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltitudeName )
{
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
HYDROGUI_Zone* aZone = aPanel->getCurrentZone();
if ( aZone )
{
- aZone->setMergeType( theMergeType, theBathymetryName );
+ aZone->setMergeType( theMergeType, theAltitudeName );
HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() );
if ( aShape )
{
if ( !aPanel )
return false;
- theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+ theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
return true;
}
}
//Process the draw events for viewer
- QApplication::processEvents();
+ QApplication::processEvents( QEventLoop::ExcludeUserInputEvents );
if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() )
vw->onTopView();
}
void HYDROGUI_CalculationOp::setAvailableGroups()
{
HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+ ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryGroups();
+ QStringList aList, anEntryList;
+ getNamesAndEntries( aSeq, aList, anEntryList );
QStringList aGroupsNames;
aGroupsNames.append( aGroup->GetName() );
}
}
- myEditedObject->RemoveGeometryGroups();
+ if( myEditedObject->IsMustBeUpdated() )
+ myEditedObject->RemoveGeometryGroups();
+
aPanel->setAvailableGroups( aGroupsNames );
+ aPanel->includeGroups( aList );
+
+ bool isUpdated = myEditedObject->IsMustBeUpdated();
}
void HYDROGUI_CalculationOp::onAddGroups()