ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-31 08:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

CCAR: optimisation of publishinstudy

Browse Source
This commit is contained in:
caremoli 2011-01-03 18:18:07 +00:00
parent 942dc6b74b
commit f6f891919b
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -202,7 +202,8 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
TCollection_AsciiString aShapeName("Shape_"); TCollection_AsciiString aShapeName("Shape_");
if ( aShape->GetType() == GEOM_GROUP ) { CORBA::Long mytype=aShape->GetType();
if ( mytype == GEOM_GROUP ) {
GEOM::GEOM_IGroupOperations_var anOp = GetIGroupOperations( theStudy->StudyId() ); GEOM::GEOM_IGroupOperations_var anOp = GetIGroupOperations( theStudy->StudyId() );
switch ( (TopAbs_ShapeEnum)anOp->GetType( aShape ) ) { switch ( (TopAbs_ShapeEnum)anOp->GetType( aShape ) ) {
case TopAbs_VERTEX: case TopAbs_VERTEX:
@ -222,40 +223,43 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
aShapeName = "Group_Of_Solids_"; aShapeName = "Group_Of_Solids_";
break; break;
} }
} else if ( aShape->GetType() == GEOM_MARKER ) { } else if ( mytype == GEOM_MARKER ) {
aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_LCS"); aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_LCS");
aShapeName = "LocalCS_"; aShapeName = "LocalCS_";
} else if ( aShape->GetType() > ADVANCED_BASE ) { } else if ( mytype > ADVANCED_BASE ) {
char buf[20]; char buf[20];
sprintf( buf, "%d", aShape->GetType() ); sprintf( buf, "%d", aShape->GetType() );
std::string advId = "ICON_OBJBROWSER_ADVANCED_"; advId += buf; std::string advId = "ICON_OBJBROWSER_ADVANCED_"; advId += buf;
aResultSO->SetAttrString("AttributePixMap",advId.c_str()); aResultSO->SetAttrString("AttributePixMap",advId.c_str());
aShapeName = "Advanced_"; aShapeName = "Advanced_";
} else if ( aShape->GetShapeType() == GEOM::COMPOUND ) { } else {
GEOM::shape_type myshapetype=aShape->GetShapeType();
if ( myshapetype == GEOM::COMPOUND ) {
aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_COMPOUND" ); aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_COMPOUND" );
aShapeName = "Compound_"; aShapeName = "Compound_";
} else if ( aShape->GetShapeType() == GEOM::COMPSOLID ) { } else if ( myshapetype == GEOM::COMPSOLID ) {
aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_COMPSOLID"); aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_COMPSOLID");
aShapeName = "Compsolid_"; aShapeName = "Compsolid_";
} else if ( aShape->GetShapeType() == GEOM::SOLID ) { } else if ( myshapetype == GEOM::SOLID ) {
aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_SOLID"); aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_SOLID");
aShapeName = "Solid_"; aShapeName = "Solid_";
} else if ( aShape->GetShapeType() == GEOM::SHELL ) { } else if ( myshapetype == GEOM::SHELL ) {
aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_SHELL"); aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_SHELL");
aShapeName = "Shell_"; aShapeName = "Shell_";
} else if ( aShape->GetShapeType() == GEOM::FACE ) { } else if ( myshapetype == GEOM::FACE ) {
aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_FACE"); aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_FACE");
aShapeName = "Face_"; aShapeName = "Face_";
} else if ( aShape->GetShapeType() == GEOM::WIRE ) { } else if ( myshapetype == GEOM::WIRE ) {
aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_WIRE"); aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_WIRE");
aShapeName = "Wire_"; aShapeName = "Wire_";
} else if ( aShape->GetShapeType() == GEOM::EDGE ) { } else if ( myshapetype == GEOM::EDGE ) {
aResultSO->SetAttrString("AttributePixMap", "ICON_OBJBROWSER_EDGE"); aResultSO->SetAttrString("AttributePixMap", "ICON_OBJBROWSER_EDGE");
aShapeName = "Edge_"; aShapeName = "Edge_";
} else if ( aShape->GetShapeType() == GEOM::VERTEX ) { } else if ( myshapetype == GEOM::VERTEX ) {
aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_VERTEX" ); aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_VERTEX" );
aShapeName = "Vertex_"; aShapeName = "Vertex_";
} }
}
//if (strlen(theName) == 0) aShapeName += TCollection_AsciiString(aResultSO->Tag()); //if (strlen(theName) == 0) aShapeName += TCollection_AsciiString(aResultSO->Tag());
//else aShapeName = TCollection_AsciiString(CORBA::string_dup(theName)); //else aShapeName = TCollection_AsciiString(CORBA::string_dup(theName));