ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-05-14 22:40:48 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL13708: Complex geometry => Vertex creation very slow. Optimize sub-shapes publishing in a Study.

Browse Source
This commit is contained in:
jfa 2007-01-12 14:00:32 +00:00
parent c80d068c9c
commit a4ae3a7a34
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -46,7 +46,6 @@
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <SalomeApp_Tools.h> #include <SalomeApp_Tools.h>
#include <SalomeApp_DataModel.h> #include <SalomeApp_DataModel.h>
#include <SalomeApp_Module.h>
#include <OCCViewer_ViewModel.h> #include <OCCViewer_ViewModel.h>
#include <SVTK_ViewModel.h> #include <SVTK_ViewModel.h>
@ -758,7 +757,6 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
} }
else { else {
const int nbObjs = objects.size(); const int nbObjs = objects.size();
bool withChildren = false;
int aNumber = 1; int aNumber = 1;
for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it ) { for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it ) {
if ( publish ) { if ( publish ) {
@ -779,14 +777,15 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
aName = GEOMBase::GetDefaultName( getPrefix( *it ) ); aName = GEOMBase::GetDefaultName( getPrefix( *it ) );
} }
addInStudy( *it, aName.latin1() ); addInStudy( *it, aName.latin1() );
withChildren = false; // updateView=false
display( *it, false ); display( *it, false );
} }
else { // asv : fix of PAL6454. If publish==false, then the original shape was modified, and need to be re-cached in GEOM_Client else {
// before redisplay // asv : fix of PAL6454. If publish==false, then the original shape
// was modified, and need to be re-cached in GEOM_Client before redisplay
clearShapeBuffer( *it ); clearShapeBuffer( *it );
withChildren = true; // withChildren=true, updateView=false
redisplay( *it, withChildren, false ); redisplay( *it, true, false );
} }
} }
@ -905,22 +904,23 @@ QString GEOMBase_Helper::getPrefix( GEOM::GEOM_Object_ptr theObj ) const
if ( !myPrefix.isEmpty() || theObj->_is_nil() ) if ( !myPrefix.isEmpty() || theObj->_is_nil() )
return myPrefix; return myPrefix;
TopoDS_Shape aShape; //TopoDS_Shape aShape;
if ( !GEOMBase::GetShape( theObj, aShape ) ) //if ( !GEOMBase::GetShape( theObj, aShape ) )
return ""; // return "";
//
long aType = aShape.ShapeType(); //long aType = aShape.ShapeType();
GEOM::shape_type aType = theObj->GetShapeType();
switch ( aType ) switch ( aType )
{ {
case TopAbs_VERTEX : return QObject::tr( "GEOM_VERTEX" ); case GEOM::VERTEX : return QObject::tr( "GEOM_VERTEX" );
case TopAbs_EDGE : return QObject::tr( "GEOM_EDGE" ); case GEOM::EDGE : return QObject::tr( "GEOM_EDGE" );
case TopAbs_WIRE : return QObject::tr( "GEOM_WIRE" ); case GEOM::WIRE : return QObject::tr( "GEOM_WIRE" );
case TopAbs_FACE : return QObject::tr( "GEOM_FACE" ); case GEOM::FACE : return QObject::tr( "GEOM_FACE" );
case TopAbs_SHELL : return QObject::tr( "GEOM_SHELL" ); case GEOM::SHELL : return QObject::tr( "GEOM_SHELL" );
case TopAbs_SOLID : return QObject::tr( "GEOM_SOLID" ); case GEOM::SOLID : return QObject::tr( "GEOM_SOLID" );
case TopAbs_COMPSOLID: return QObject::tr( "GEOM_COMPOUNDSOLID" ); case GEOM::COMPSOLID: return QObject::tr( "GEOM_COMPOUNDSOLID" );
case TopAbs_COMPOUND : return QObject::tr( "GEOM_COMPOUND" ); case GEOM::COMPOUND : return QObject::tr( "GEOM_COMPOUND" );
default : return ""; default : return "";
} }
} }