Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for the bug #255: VTK viewer is not updated after modification of objects.
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_CalculationOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index f8143232e57c86e73abc26941d06c32a4c3153bf..aead39e1fb0abb6ba1e696d386d9fb4e073d1178 100644
(file)
--- 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 );
}
aPolylineName = aPolylineObj->GetName();
aPanel->setBoundary( aPolylineName );
}
+
aSeq = myEditedObject->GetGeometryObjects();
getNamesAndEntries( aSeq, aList, anEntryList );
aPanel->includeGeomObjects( aList );
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();
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 ) );
theNames.append( anEntity->GetName() );
theEntries.append( HYDROGUI_DataObject::dataObjectEntry( anEntity ) );
@@
-504,7
+505,7
@@
bool HYDROGUI_CalculationOp::processApply( int& theUpdateFlags,
if ( !aPanel )
return false;
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;
}
return true;
}
@@
-777,7
+778,11
@@
void HYDROGUI_CalculationOp::closePreview()
void HYDROGUI_CalculationOp::setAvailableGroups()
{
HYDROGUI_CalculationDlg* aPanel =
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;
QStringList aGroupsNames;
@@
-792,8
+797,13
@@
void HYDROGUI_CalculationOp::setAvailableGroups()
aGroupsNames.append( aGroup->GetName() );
}
}
aGroupsNames.append( aGroup->GetName() );
}
}
- myEditedObject->RemoveGeometryGroups();
+ if( myEditedObject->IsMustBeUpdated() )
+ myEditedObject->RemoveGeometryGroups();
+
aPanel->setAvailableGroups( aGroupsNames );
aPanel->setAvailableGroups( aGroupsNames );
+ aPanel->includeGroups( aList );
+
+ bool isUpdated = myEditedObject->IsMustBeUpdated();
}
void HYDROGUI_CalculationOp::onAddGroups()
}
void HYDROGUI_CalculationOp::onAddGroups()