CASE2TEXT( COMPERR_BAD_INPUT_MESH);
CASE2TEXT( COMPERR_STD_EXCEPTION );
CASE2TEXT( COMPERR_OCC_EXCEPTION );
- CASE2TEXT( COMPERR_SLM_EXCEPTION );
+ case SMESH::COMPERR_SLM_EXCEPTION: break; // avoid double "Salome exception"
CASE2TEXT( COMPERR_EXCEPTION );
CASE2TEXT( COMPERR_MEMORY_PB );
CASE2TEXT( COMPERR_BAD_SHAPE );
}
// -----------------------------------------------------------------------
/*!
- * \brief Return text describing a subshape
+ * \brief Return a list of selected rows
*/
bool getSelectedRows(QTable* table, list< int > & rows)
{
for ( int row = selected.topRow(); row <= selected.bottomRow(); ++row )
rows.push_back( row );
}
+ if (rows.empty() && table->currentRow() > -1 )
+ rows.push_back( table->currentRow() );
+
return !rows.empty();
}
connect(myDlg->myShowBtn, SIGNAL (clicked()), SLOT(onPreviewShape()));
connect(myDlg->myPublishBtn, SIGNAL (clicked()), SLOT(onPublishShape()));
connect(table(),SIGNAL(selectionChanged()), SLOT(currentCellChanged()));
+ connect(table(),SIGNAL(currentChanged(int,int)), SLOT(currentCellChanged()));
}
//=======================================================================
// COMPUTE MESH
bool computeFailed = true, memoryLack = false;
- int nbNodes = 0, nbEdges = 0, nbFaces = 0, nbVolums = 0;
LightApp_SelectionMgr *Sel = selectionMgr();
SALOME_ListIO selected; Sel->selectedObjects( selected );
MemoryReserve aMemoryReserve;
_PTR(SObject) aMeshSObj = SMESH::FindSObject(aMesh);
myMainShape = aMesh->GetShapeToMesh();
- if ( !myMainShape->_is_nil() && aMeshSObj )
+ if ( ((!myMainShape->_is_nil() && aMesh->HasShapeToMesh()) ||
+ (myMainShape->_is_nil() && !aMesh->HasShapeToMesh()))
+ && aMeshSObj )
{
myDlg->myMeshName->setText( aMeshSObj->GetName() );
SMESH::SMESH_Gen_var gen = getSMESHGUI()->GetSMESHGen();
// return;
// }
// check if there are memory problems
- for ( int i = 0; i < anErrors->length() && !memoryLack; ++i )
+ for ( int i = 0; (i < anErrors->length()) && !memoryLack; ++i )
memoryLack = ( anErrors[ i ].code == SMESH::COMPERR_MEMORY_PB );
}
catch(const SALOME::SALOME_Exception & S_ex){
{
SMESH::ModifiedMesh(aMeshSObj, !computeFailed, aMesh->NbNodes() == 0);
update( UF_ObjBrowser | UF_Model );
- Sel->setSelectedObjects( selected );
// SHOW MESH
// NPAL16631: if ( getSMESHGUI()->automaticUpdate() )
{
try {
#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
- OCC_CATCH_SIGNALS;
+ OCC_CATCH_SIGNALS;
#endif
- SMESH::UpdateView(eDisplay, IObject->getEntry());
+ SMESH::Update(IObject, true);
}
catch (...) {
#ifdef _DEBUG_
}
}
}
+ Sel->setSelectedObjects( selected );
}
}
}
myDlg->myBriefInfo->show();
myDlg->myFullInfo->hide();
myDlg->myErrorGroup->show();
-
+
+ bool hasShape = aMesh->HasShapeToMesh();
+ if ( !hasShape )
+ {
+ myDlg->myPublishBtn->hide();
+ myDlg->myShowBtn->hide();
+ }
+ else
+ {
+ myDlg->myPublishBtn->show();
+ myDlg->myShowBtn->show();
+ }
// fill table of errors
tbl->setNumRows( anErrors->length() );
- bool hasShape = aMesh->HasShapeToMesh();
if ( !hasShape ) tbl->hideColumn( COL_SHAPE );
else tbl->showColumn( COL_SHAPE );
tbl->setColumnWidth( COL_ERROR, 200 );