//Refer to KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx
#define WITHGENERICOBJ
+// Below macro, when uncommented, switches on simplified (more performant) algorithm
+// of auto-color picking up
+#define SIMPLE_AUTOCOLOR
+
//namespace{
// Declarations
//=============================================================
if ( resMgr )
toCreateGroups = resMgr->booleanValue( "SMESH", "auto_groups", false );
bool toOverwrite = true;
+ bool toFindOutDim = true;
QString aFilter, aTitle = QObject::tr("SMESH_EXPORT_MESH");
QString anInitialPath = "";
anInitialPath + QString("/") + aMeshName,
aFilter, aTitle, false);
}
- // else if ( isGMF )// Export to GMF
- // {
- // SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg
- // ( SMESHGUI::desktop(), false, QObject::tr("SMESH_REQUIRED_GROUPS"), true, true );
- // QStringList filters;
- // filters << QObject::tr( "GMF_ASCII_FILES_FILTER" ) + " (*.mesh)"
- // << QObject::tr( "GMF_BINARY_FILES_FILTER" ) + " (*.meshb)";
- // fd->setWindowTitle( aTitle );
- // fd->setNameFilters( filters );
-
- // if ( !aMeshOrGroup->_is_equivalent( aMesh ))
- // toCreateGroups = false;
- // else
- // toCreateGroups = ( aMesh->NbGroups() > 0 );
-
- // fd->SetChecked( true );
- // if ( !anInitialPath.isEmpty() )
- // fd->setDirectory( anInitialPath );
- // fd->selectFile(aMeshName);
-
- // if ( fd->exec() )
- // aFilename = fd->selectedFile();
- // toCreateGroups = fd->IsChecked();
-
- // delete fd;
- // }
else if ( isCGNS )// Export to CGNS
{
SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
if (it.value() == SMESH::MED_V2_2)
aDefaultFilter = it.key();
}
+ QStringList checkBoxes;
+ checkBoxes << QObject::tr("SMESH_AUTO_GROUPS") << QObject::tr("SMESH_AUTO_DIM");
- SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg
- ( SMESHGUI::desktop(), false, QObject::tr("SMESH_AUTO_GROUPS"), true, true );
+ SalomeApp_CheckFileDlg* fd =
+ new SalomeApp_CheckFileDlg ( SMESHGUI::desktop(), false, checkBoxes, true, true );
fd->setWindowTitle( aTitle );
fd->setNameFilters( filters );
fd->selectNameFilter(aDefaultFilter);
- fd->SetChecked(toCreateGroups);
+ fd->SetChecked(0,toCreateGroups);
+ fd->SetChecked(1,toFindOutDim);
if ( !anInitialPath.isEmpty() )
fd->setDirectory( anInitialPath );
fd->selectFile(aMeshName);
}
}
}
- toCreateGroups = fd->IsChecked();
+ toCreateGroups = fd->IsChecked(0);
+ toFindOutDim = fd->IsChecked(1);
delete fd;
}
else
SMESH::SMESH_Mesh_var aMeshItem = aMeshOrGroup->GetMesh();
if ( aMeshOrGroup->_is_equivalent( aMeshItem ))
aMeshItem->ExportToMEDX( aFilename.toLatin1().data(), toCreateGroups,
- aFormat, toOverwrite && aMeshIndex == 0 );
+ aFormat, toOverwrite && aMeshIndex == 0, toFindOutDim );
else
aMeshItem->ExportPartToMED( aMeshOrGroup, aFilename.toLatin1().data(), toCreateGroups,
- aFormat, toOverwrite && aMeshIndex == 0 );
+ aFormat, toOverwrite && aMeshIndex == 0, toFindOutDim );
}
}
else if ( isSAUV )
aMainObject->SetAutoColor( true ); // mesh groups are re-colored here
+ QList<SALOMEDS::Color> aReservedColors;
+
SMESH::ListOfGroups aListOfGroups = *aMainObject->GetGroups();
for( int i = 0, n = aListOfGroups.length(); i < n; i++ )
{
SMESH::SMESH_GroupBase_var aGroupObject = aListOfGroups[i];
- SALOMEDS::Color aColor = aGroupObject->GetColor();
+ //SALOMEDS::Color aColor = aGroupObject->GetColor();
+
+#ifdef SIMPLE_AUTOCOLOR // simplified algorithm for auto-colors
+ SALOMEDS::Color aColor = SMESHGUI::getPredefinedUniqueColor();
+#else // old algorithm for auto-colors
+ SALOMEDS::Color aColor = SMESHGUI::getUniqueColor( aReservedColors );
+ aReservedColors.append( aColor );
+#endif // SIMPLE_AUTOCOLOR
+
_PTR(SObject) aGroupSObject = SMESH::FindSObject(aGroupObject);
if (aGroupSObject) {
QColor c;
SMESH::RepaintCurrentView();
}
+ void OverallMeshQuality() {
+ SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ SALOME_ListIO selected;
+ if( aSel )
+ aSel->selectedObjects( selected );
+
+ if ( selected.IsEmpty() ) return;
+ SALOME_ListIteratorOfListIO It( selected );
+ for ( ; It.More(); It.Next() ) {
+ SMESHGUI_CtrlInfoDlg* ctrlDlg = new SMESHGUI_CtrlInfoDlg( SMESHGUI::desktop() );
+ ctrlDlg->showInfo( It.Value() );
+ ctrlDlg->show();
+ }
+ }
+
QString functorToString( SMESH::Controls::FunctorPtr f )
{
QString type = QObject::tr( "UNKNOWN_CONTROL" );
return autoUpdate && !exceeded;
}
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+bool SMESHGUI::automaticUpdate( SMESH::SMESH_Mesh_ptr theMesh,
+ int* entities, bool* limitExceeded )
+{
+ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+ if ( !resMgr )
+ return false;
+
+ bool autoUpdate = resMgr->booleanValue( "SMESH", "auto_update", false );
+ long updateLimit = resMgr->integerValue( "SMESH", "update_limit", 500000 );
+ bool incrementalLimit = resMgr->booleanValue( "SMESH", "incremental_limit", false );
+
+ long requestedSize = theMesh->NbElements();
+
+ *entities = SMESH_Actor::eAllEntity;
+
+ bool exceeded = updateLimit > 0 && requestedSize > updateLimit;
+
+ if ( limitExceeded ) *limitExceeded = autoUpdate && exceeded;
+
+ if ( incrementalLimit ) {
+ long nbOdElems = theMesh->Nb0DElements();
+ long nbEdges = theMesh->NbEdges();
+ long nbFaces = theMesh->NbFaces();
+ long nbVolumes = theMesh->NbVolumes();
+ long nbBalls = theMesh->NbBalls();
+ long total = 0;
+
+ if ( nbOdElems > 0 ) {
+ if ( total + nbOdElems > updateLimit )
+ *entities = *entities & ~SMESH_Actor::e0DElements;
+ else
+ exceeded = false;
+ }
+ total += nbOdElems;
+
+ if ( nbEdges > 0 ) {
+ if ( total + nbEdges > updateLimit )
+ *entities = *entities & ~SMESH_Actor::eEdges;
+ else
+ exceeded = false;
+ }
+ total += nbEdges;
+
+ if ( nbFaces > 0 ) {
+ if ( total + nbFaces > updateLimit )
+ *entities = *entities & ~SMESH_Actor::eFaces;
+ else
+ exceeded = false;
+ }
+ total += nbFaces;
+
+ if ( nbVolumes > 0 ) {
+ if ( total + nbVolumes > updateLimit )
+ *entities = *entities & ~SMESH_Actor::eVolumes;
+ else
+ exceeded = false;
+ }
+ total += nbVolumes;
+
+ if ( nbBalls > 0 ) {
+ if ( total + nbBalls > updateLimit )
+ *entities = *entities & ~SMESH_Actor::eBallElem;
+ else
+ exceeded = false;
+ }
+ total += nbBalls;
+ }
+
+ return autoUpdate && !exceeded;
+}
+
//=============================================================================
/*!
*
case 214: // UPDATE
{
if(checkLock(aStudy)) break;
+ SUIT_OverrideCursor wc;
try {
#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
OCC_CATCH_SIGNALS;
SMDSAbs_EntityType type = SMDSEntity_Last;
switch (theCommandID) {
- case 4034:
- type = SMDSEntity_Quad_Edge; break;
- case 4035:
- type = SMDSEntity_Quad_Triangle; break;
- case 4036:
- type = SMDSEntity_Quad_Quadrangle; break;
- case 4136:
- type = SMDSEntity_BiQuad_Quadrangle; break;
- case 4137:
- type = SMDSEntity_BiQuad_Triangle; break;
- case 4037:
- type = SMDSEntity_Quad_Tetra; break;
- case 4038:
- type = SMDSEntity_Quad_Pyramid; break;
- case 4039:
- type = SMDSEntity_Quad_Penta; break;
- case 4040:
- type = SMDSEntity_Quad_Hexa; break;
- case 4140:
- type = SMDSEntity_TriQuad_Hexa; break;
+ case 4034: type = SMDSEntity_Quad_Edge; break;
+ case 4035: type = SMDSEntity_Quad_Triangle; break;
+ case 4036: type = SMDSEntity_Quad_Quadrangle; break;
+ case 4136: type = SMDSEntity_BiQuad_Quadrangle; break;
+ case 4137: type = SMDSEntity_BiQuad_Triangle; break;
+ case 4037: type = SMDSEntity_Quad_Tetra; break;
+ case 4038: type = SMDSEntity_Quad_Pyramid; break;
+ case 4039: type = SMDSEntity_Quad_Penta; break;
+ case 4040: type = SMDSEntity_Quad_Hexa; break;
+ case 4140: type = SMDSEntity_TriQuad_Hexa; break;
default: break;
}
if ( type != SMDSEntity_Last )
SUIT_MessageBox::No ) == SUIT_MessageBox::Yes;
if( confirm ) {
try {
+ SUIT_OverrideCursor wc;
SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
int removed = aMeshEditor->RemoveOrphanNodes();
SUIT_MessageBox::information(SMESHGUI::desktop(),
SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( aObject );
SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( aObject );
if ( !aMesh->_is_nil() || !aSubMesh->_is_nil() || !aGroup->_is_nil() ) {
+ SUIT_OverrideCursor wc;
::Control( theCommandID );
break;
}
tr( "NOT_A_VTK_VIEWER" ) );
}
break;
+ case 6032:
+ OverallMeshQuality();
+ break;
case 9010:
{
+ SUIT_OverrideCursor wc;
LightApp_SelectionMgr* mgr = selectionMgr();
SALOME_ListIO selected; mgr->selectedObjects( selected );
}
case 9011:
{
+ SUIT_OverrideCursor wc;
LightApp_SelectionMgr* mgr = selectionMgr();
SALOME_ListIO selected; mgr->selectedObjects( selected );
createSMESHAction( 6029, "EQUAL_EDGE", "ICON_EQUAL_EDGE", 0, true );
createSMESHAction( 6030, "EQUAL_FACE", "ICON_EQUAL_FACE", 0, true );
createSMESHAction( 6031, "EQUAL_VOLUME", "ICON_EQUAL_VOLUME", 0, true );
+ createSMESHAction( 6032, "OVERALL_MESH_QUALITY" );
createSMESHAction( 6003, "FREE_BORDER", "ICON_FREE_EDGE_2D", 0, true );
createSMESHAction( 6004, "CONNECTION", "ICON_CONNECTION", 0, true );
createSMESHAction( 6005, "FREE_NODE", "ICON_FREE_NODE", 0, true );
createMenu( 6024, volumeId, -1 );
createMenu( 6026, volumeId, -1 );
createMenu( 6031, volumeId, -1 );
+ createMenu( separator(), ctrlId, -1 );
+ createMenu( 6032, ctrlId, -1 );
createMenu( 4000, addId, -1 );
createMenu( 4009, addId, -1 );
createPopupItem( 214, OB, mesh_part ); // UPDATE
createPopupItem( 900, OB, mesh_part ); // ADV_INFO
createPopupItem( 904, OB, mesh_group ); // FIND_ELEM
+ createPopupItem( 6032, OB, mesh_part ); // CTRL_INFO
popupMgr()->insert( separator(), -1, 0 );
createPopupItem( 801, OB, mesh ); // CREATE_GROUP
createPopupItem( 806, OB, mesh ); // CREATE_GEO_GROUP
popupMgr()->insert( separator(), -1, 0 );
createPopupItem( 214, View, mesh_part ); // UPDATE
createPopupItem( 900, View, mesh_part ); // ADV_INFO
+ createPopupItem( 6032,View, mesh_part ); // CTRL_INFO
createPopupItem( 904, View, mesh ); // FIND_ELEM
popupMgr()->insert( separator(), -1, 0 );
popupMgr()->insert ( action( 6031 ), aSubId, -1 ); // EQUAL_VOLUME
popupMgr()->setRule( action( 6031 ), aMeshInVtkHasVolumes, QtxPopupMgr::VisibleRule );
popupMgr()->setRule( action( 6031 ), "controlMode = 'eCoincidentElems3D'", QtxPopupMgr::ToggleRule );
-
+
popupMgr()->insert( separator(), anId, -1 );
popupMgr()->insert( action( 201 ), anId, -1 ); // SCALAR_BAR_PROP
int genTab = addPreference( tr( "PREF_TAB_GENERAL" ) );
int autoUpdate = addPreference( tr( "PREF_AUTO_UPDATE" ), genTab, LightApp_Preferences::Auto, "SMESH", "auto_update" );
+ setPreferenceProperty( autoUpdate, "columns", 2 );
int lim = addPreference( tr( "PREF_UPDATE_LIMIT" ), autoUpdate, LightApp_Preferences::IntSpin, "SMESH", "update_limit" );
setPreferenceProperty( lim, "min", 0 );
setPreferenceProperty( lim, "max", 100000000 );
setPreferenceProperty( lim, "step", 1000 );
setPreferenceProperty( lim, "special", tr( "PREF_UPDATE_LIMIT_NOLIMIT" ) );
+ addPreference( tr( "PREF_INCREMENTAL_LIMIT" ), autoUpdate, LightApp_Preferences::Bool, "SMESH", "incremental_limit" );
int qaGroup = addPreference( tr( "PREF_GROUP_QUALITY" ), genTab );
setPreferenceProperty( qaGroup, "columns", 2 );
setPreferenceProperty( nodesLim, "max", 10000000 );
setPreferenceProperty( nodesLim, "step", 10000 );
setPreferenceProperty( nodesLim, "special", tr( "PREF_UPDATE_LIMIT_NOLIMIT" ) );
+ int ctrlLim = addPreference( tr( "PREF_CTRL_LIMIT" ), infoGroup, LightApp_Preferences::IntSpin, "SMESH", "info_controls_limit" );
+ setPreferenceProperty( ctrlLim, "special", tr( "PREF_UPDATE_LIMIT_NOLIMIT" ) );
+ setPreferenceProperty( ctrlLim, "min", 0 );
+ setPreferenceProperty( ctrlLim, "max", 10000000 );
+ setPreferenceProperty( ctrlLim, "step", 1000 );
addPreference( tr( "PREF_ELEM_INFO_GRP_DETAILS" ), infoGroup, LightApp_Preferences::Bool, "SMESH", "elem_info_grp_details" );
addPreference( tr( "PREF_DUMP_BASE_INFO" ), infoGroup, LightApp_Preferences::Bool, "SMESH", "info_dump_base" );
addPreference( tr( "PREF_DUMP_ELEM_INFO" ), infoGroup, LightApp_Preferences::Bool, "SMESH", "info_dump_elem" );
addPreference( tr( "PREF_DUMP_ADD_INFO" ), infoGroup, LightApp_Preferences::Bool, "SMESH", "info_dump_add" );
+ addPreference( tr( "PREF_DUMP_CTRL_INFO" ), infoGroup, LightApp_Preferences::Bool, "SMESH", "info_dump_ctrl" );
int segGroup = addPreference( tr( "PREF_GROUP_SEGMENT_LENGTH" ), genTab );
setPreferenceProperty( segGroup, "columns", 2 );
}
return false;
}
+
+
+SALOMEDS::Color SMESHGUI::getPredefinedUniqueColor()
+{
+ static QList<QColor> colors;
+
+ if ( colors.isEmpty() ) {
+
+ for (int s = 0; s < 2 ; s++)
+ {
+ for (int v = 100; v >= 40; v = v - 20)
+ {
+ for (int h = 0; h < 359 ; h = h + 60)
+ {
+ colors.append(QColor::fromHsv(h, 255 - s * 127, v * 255 / 100));
+ }
+ }
+ }
+ }
+ static int currentColor = 0;
+
+ SALOMEDS::Color color;
+ color.R = (double)colors[currentColor].red() / 255.0;
+ color.G = (double)colors[currentColor].green() / 255.0;
+ color.B = (double)colors[currentColor].blue() / 255.0;
+
+ currentColor = (currentColor+1) % colors.count();
+
+ return color;
+}
