X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=aead39e1fb0abb6ba1e696d386d9fb4e073d1178;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=f8143232e57c86e73abc26941d06c32a4c3153bf;hpb=8543e637cbb4ae48998c596241fce567a729eb67;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx index f8143232..aead39e1 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx +++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx @@ -145,6 +145,7 @@ void HYDROGUI_CalculationOp::startOperation() aPolylineName = aPolylineObj->GetName(); aPanel->setBoundary( aPolylineName ); } + aSeq = myEditedObject->GetGeometryObjects(); getNamesAndEntries( aSeq, aList, anEntryList ); aPanel->includeGeomObjects( aList ); @@ -173,8 +174,8 @@ void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjec 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 ) ); @@ -504,7 +505,7 @@ bool HYDROGUI_CalculationOp::processApply( int& theUpdateFlags, 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; } @@ -777,7 +778,11 @@ void HYDROGUI_CalculationOp::closePreview() void HYDROGUI_CalculationOp::setAvailableGroups() { HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); + ::qobject_cast( inputPanel() ); + + HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryGroups(); + QStringList aList, anEntryList; + getNamesAndEntries( aSeq, aList, anEntryList ); QStringList aGroupsNames; @@ -792,8 +797,13 @@ void HYDROGUI_CalculationOp::setAvailableGroups() 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()