ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-25 04:02:03 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems with quadratic elements preview in 'Add Quadriatic element' dialog box.

Browse Source
This commit is contained in:
vsr 2008-06-20 13:24:37 +00:00
parent e48a1779f1
commit 3506ddb84a
2 changed files with 287 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

533
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
View File

@ -316,6 +316,54 @@ static int FirstHexahedronIds[] = {0,1,2,3,4,5,6,7,0,1,2,3};
static int LastHexahedronIds[] = {1,2,3,0,5,6,7,4,4,5,6,7}; static int LastHexahedronIds[] = {1,2,3,0,5,6,7,4,4,5,6,7};
/*!
\class BusyLocker
\brief Simple 'busy state' flag locker.
\internal
*/
class BusyLocker
{
public:
//! Constructor. Sets passed boolean flag to \c true.
BusyLocker( bool& busy ) : myBusy( busy ) { myBusy = true; }
//! Destructor. Clear external boolean flag passed as parameter to the constructor to \c false.
~BusyLocker() { myBusy = false; }
private:
bool& myBusy; //! External 'busy state' boolean flag
};
/*!
\class IdEditItem
\brief Simple editable table item.
\internal
*/
class IdEditItem: public QTableItem
{
public:
IdEditItem(QTable*, EditType, const QString& );
~IdEditItem();
QWidget* createEditor() const;
};
IdEditItem::IdEditItem(QTable* table, EditType et, const QString& text )
: QTableItem( table, et, text )
{
}
IdEditItem::~IdEditItem()
{
}
QWidget* IdEditItem::createEditor() const
{
QLineEdit *aLineEdit = new QLineEdit(text(), table()->viewport());
aLineEdit->setValidator( new SMESHGUI_IdValidator(table()->viewport(), "validator", 1) );
return aLineEdit;
}
//================================================================================= //=================================================================================
// function : SMESHGUI_AddQuadraticElementDlg() // function : SMESHGUI_AddQuadraticElementDlg()
@ -325,11 +373,12 @@ SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theM
const int theType, const int theType,
const char* name, const char* name,
bool modal, WFlags fl) bool modal, WFlags fl)
: QDialog( SMESH::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder | : QDialog( SMESH::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder |
WStyle_Title | WStyle_SysMenu | Qt::WDestructiveClose), WStyle_Title | WStyle_SysMenu | Qt::WDestructiveClose),
mySMESHGUI( theModule ), mySMESHGUI( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ), mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
myType( theType ) myType( theType ),
myBusy( false )
{ {
SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*> SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>
(SUIT_Session::session()->activeApplication()); (SUIT_Session::session()->activeApplication());
@ -487,7 +536,6 @@ void SMESHGUI_AddQuadraticElementDlg::Init()
{ {
GroupArguments->show(); GroupArguments->show();
myRadioButton1->setChecked(TRUE); myRadioButton1->setChecked(TRUE);
myIsEditCorners = true;
mySMESHGUI->SetActiveDialogBox((QDialog*)this); mySMESHGUI->SetActiveDialogBox((QDialog*)this);
myActor = 0; myActor = 0;
@ -553,11 +601,11 @@ void SMESHGUI_AddQuadraticElementDlg::Init()
myTable->setEnabled( false ); myTable->setEnabled( false );
for ( int row = 0; row < myTable->numRows(); row++ ) for ( int row = 0; row < myTable->numRows(); row++ )
{ {
SMESHGUI_IdEditItem* anEditItem = new SMESHGUI_IdEditItem( myTable, QTableItem::OnTyping, "" ); IdEditItem* anEditItem = new IdEditItem( myTable, QTableItem::OnTyping, "" );
anEditItem->setReplaceable(false); anEditItem->setReplaceable(true);
myTable->setItem(row, 1, anEditItem); myTable->setItem(row, 1, anEditItem);
} }
/* signals and slots connections */ /* signals and slots connections */
connect(mySelectButton, SIGNAL(clicked()), SLOT(SetEditCorners())); connect(mySelectButton, SIGNAL(clicked()), SLOT(SetEditCorners()));
@ -583,8 +631,6 @@ void SMESHGUI_AddQuadraticElementDlg::Init()
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode( NodeSelection ); aViewWindow->SetSelectionMode( NodeSelection );
myBusy = false;
SetEditCorners(); SetEditCorners();
} }
@ -594,68 +640,66 @@ void SMESHGUI_AddQuadraticElementDlg::Init()
//================================================================================= //=================================================================================
void SMESHGUI_AddQuadraticElementDlg::ClickOnApply() void SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
{ {
if (IsValid() && !mySMESHGUI->isActiveStudyLocked()) { if ( mySMESHGUI->isActiveStudyLocked() || myBusy || !IsValid() )
myBusy = true; return;
vector<int> anIds; BusyLocker lock( myBusy );
switch (myType) { vector<int> anIds;
case QUAD_EDGE:
anIds.push_back(myTable->text(0, 0).toInt());
anIds.push_back(myTable->text(0, 2).toInt());
anIds.push_back(myTable->text(0, 1).toInt());
break;
case QUAD_TRIANGLE:
case QUAD_QUADRANGLE:
case QUAD_TETRAHEDRON:
case QUAD_PYRAMID:
case QUAD_PENTAHEDRON:
case QUAD_HEXAHEDRON:
for ( int row = 0; row < myNbCorners; row++ )
anIds.push_back(myTable->text(row, 0).toInt());
for ( int row = 0; row < myTable->numRows(); row++ )
anIds.push_back(myTable->text(row, 1).toInt());
break;
}
if ( myReverseCB->isChecked())
SMESH::ReverseConnectivity( anIds, myType );
int aNumberOfIds = anIds.size(); switch (myType) {
SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array; case QUAD_EDGE:
anArrayOfIdeces->length( aNumberOfIds ); anIds.push_back(myTable->text(0, 0).toInt());
anIds.push_back(myTable->text(0, 2).toInt());
for (int i = 0; i < aNumberOfIds; i++) anIds.push_back(myTable->text(0, 1).toInt());
anArrayOfIdeces[i] = anIds[ i ]; break;
case QUAD_TRIANGLE:
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); case QUAD_QUADRANGLE:
switch (myType) { case QUAD_TETRAHEDRON:
case QUAD_EDGE: case QUAD_PYRAMID:
aMeshEditor->AddEdge(anArrayOfIdeces.inout()); break; case QUAD_PENTAHEDRON:
case QUAD_TRIANGLE: case QUAD_HEXAHEDRON:
case QUAD_QUADRANGLE: for ( int row = 0; row < myNbCorners; row++ )
aMeshEditor->AddFace(anArrayOfIdeces.inout()); break; anIds.push_back(myTable->text(row, 0).toInt());
case QUAD_TETRAHEDRON: for ( int row = 0; row < myTable->numRows(); row++ )
case QUAD_PYRAMID: anIds.push_back(myTable->text(row, 1).toInt());
case QUAD_PENTAHEDRON: break;
case QUAD_HEXAHEDRON:
aMeshEditor->AddVolume(anArrayOfIdeces.inout()); break;
}
SALOME_ListIO aList; aList.Append( myActor->getIO() );
mySelector->ClearIndex();
mySelectionMgr->setSelectedObjects( aList, false );
SMESH::UpdateView();
mySimulation->SetVisibility(false);
buttonOk->setEnabled(false);
buttonApply->setEnabled(false);
UpdateTable();
SetEditCorners();
myBusy = false;
} }
if ( myReverseCB->isChecked())
SMESH::ReverseConnectivity( anIds, myType );
int aNumberOfIds = anIds.size();
SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
anArrayOfIdeces->length( aNumberOfIds );
for (int i = 0; i < aNumberOfIds; i++)
anArrayOfIdeces[i] = anIds[ i ];
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
switch (myType) {
case QUAD_EDGE:
aMeshEditor->AddEdge(anArrayOfIdeces.inout()); break;
case QUAD_TRIANGLE:
case QUAD_QUADRANGLE:
aMeshEditor->AddFace(anArrayOfIdeces.inout()); break;
case QUAD_TETRAHEDRON:
case QUAD_PYRAMID:
case QUAD_PENTAHEDRON:
case QUAD_HEXAHEDRON:
aMeshEditor->AddVolume(anArrayOfIdeces.inout()); break;
}
SALOME_ListIO aList; aList.Append( myActor->getIO() );
mySelector->ClearIndex();
mySelectionMgr->setSelectedObjects( aList, false );
mySimulation->SetVisibility(false);
SMESH::UpdateView();
UpdateTable();
SetEditCorners();
updateButtons();
} }
//================================================================================= //=================================================================================
@ -666,7 +710,6 @@ void SMESHGUI_AddQuadraticElementDlg::ClickOnOk()
{ {
ClickOnApply(); ClickOnApply();
ClickOnCancel(); ClickOnCancel();
return;
} }
//================================================================================= //=================================================================================
@ -683,7 +726,6 @@ void SMESHGUI_AddQuadraticElementDlg::ClickOnCancel()
disconnect(mySelectionMgr, 0, this, 0); disconnect(mySelectionMgr, 0, this, 0);
mySMESHGUI->ResetState(); mySMESHGUI->ResetState();
reject(); reject();
return;
} }
//================================================================================= //=================================================================================
@ -696,13 +738,13 @@ void SMESHGUI_AddQuadraticElementDlg::ClickOnHelp()
if (app) if (app)
app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName); app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName);
else { else {
QString platform; QString platform;
#ifdef WIN32 #ifdef WIN32
platform = "winapplication"; platform = "winapplication";
#else #else
platform = "application"; platform = "application";
#endif #endif
SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), SUIT_MessageBox::warn1(this, QObject::tr("WRN_WARNING"),
QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName), arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
QObject::tr("BUT_OK")); QObject::tr("BUT_OK"));
@ -716,10 +758,7 @@ void SMESHGUI_AddQuadraticElementDlg::ClickOnHelp()
void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText) void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
{ {
if (myBusy) return; if (myBusy) return;
myBusy = true; BusyLocker lock( myBusy );
buttonOk->setEnabled(false);
buttonApply->setEnabled(false);
mySimulation->SetVisibility(false); mySimulation->SetVisibility(false);
@ -734,13 +773,15 @@ void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
QStringList aListId = QStringList::split(" ", theNewText, false); QStringList aListId = QStringList::split(" ", theNewText, false);
bool allOk = true; bool allOk = true;
for (int i = 0; i < aListId.count(); i++) { for (int i = 0; i < aListId.count(); i++) {
if( const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() ) ) if ( const SMDS_MeshNode * n = aMesh->FindNode( aListId[ i ].toInt() ) )
{
newIndices.Add( n->GetID() ); newIndices.Add( n->GetID() );
}
else else
{ {
allOk = false; allOk = false;
break; break;
} }
} }
mySelector->AddOrRemoveIndex( myActor->getIO(), newIndices, false ); mySelector->AddOrRemoveIndex( myActor->getIO(), newIndices, false );
@ -751,15 +792,8 @@ void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
UpdateTable( allOk ); UpdateTable( allOk );
} }
if( IsValid() ) { updateButtons();
buttonOk->setEnabled(true); displaySimulation();
buttonApply->setEnabled(true);
}
if ( sender() == myTable )
displaySimulation();
myBusy = false;
} }
//================================================================================= //=================================================================================
@ -769,73 +803,65 @@ void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument() void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument()
{ {
if (myBusy) return; if (myBusy) return;
BusyLocker lock( myBusy );
if ( myIsEditCorners ) if ( myIsEditCorners )
{
// clear
myActor = 0;
myCornerNodes->setText("");
if (!GroupButtons->isEnabled()) // inactive
return;
mySimulation->SetVisibility(false);
// get selected mesh
SALOME_ListIO aList;
mySelectionMgr->selectedObjects(aList,SVTK_Viewer::Type());
if (aList.Extent() != 1)
{ {
// clear UpdateTable();
myActor = 0; updateButtons();
return;
myBusy = true;
myCornerNodes->setText("");
myBusy = false;
if (!GroupButtons->isEnabled()) // inactive
return;
buttonOk->setEnabled(false);
buttonApply->setEnabled(false);
mySimulation->SetVisibility(false);
// get selected mesh
SALOME_ListIO aList;
mySelectionMgr->selectedObjects(aList,SVTK_Viewer::Type());
if (aList.Extent() != 1)
{
UpdateTable();
return;
}
Handle(SALOME_InteractiveObject) anIO = aList.First();
myMesh = SMESH::GetMeshByIO(anIO);
if (myMesh->_is_nil())
return;
myActor = SMESH::FindActorByEntry(anIO->getEntry());
} }
if (!myActor) Handle(SALOME_InteractiveObject) anIO = aList.First();
myMesh = SMESH::GetMeshByIO(anIO);
if (myMesh->_is_nil()) {
updateButtons();
return;
}
myActor = SMESH::FindActorByEntry(anIO->getEntry());
}
if (!myActor) {
updateButtons();
return; return;
}
// get selected nodes // get selected nodes
QString aString = ""; QString aString = "";
int nbNodes = SMESH::GetNameOfSelectedNodes(mySelector,myActor->getIO(),aString); int nbNodes = SMESH::GetNameOfSelectedNodes(mySelector,myActor->getIO(),aString);
if ( myIsEditCorners ) if ( myIsEditCorners )
{ {
myBusy = true; myCornerNodes->setText(aString);
myCornerNodes->setText(aString);
myBusy = false;
UpdateTable(); UpdateTable();
} }
else if ( myTable->isEnabled() && nbNodes == 1 ) else if ( myTable->isEnabled() && nbNodes == 1 )
{ {
myBusy = true; int theRow = myTable->currentRow(), theCol = myTable->currentColumn();
int theRow = myTable->currentRow(), theCol = myTable->currentColumn(); if ( theCol == 1 )
if ( theCol == 1 ) myTable->setText(theRow, 1, aString);
myTable->setText(theRow, 1, aString); }
myBusy = false;
}
if ( IsValid() )
{
buttonOk->setEnabled( true );
buttonApply->setEnabled( true );
}
updateButtons();
displaySimulation(); displaySimulation();
} }
@ -845,7 +871,8 @@ void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument()
//================================================================================= //=================================================================================
void SMESHGUI_AddQuadraticElementDlg::displaySimulation() void SMESHGUI_AddQuadraticElementDlg::displaySimulation()
{ {
if (!myIsEditCorners) { if ( IsValid() )
{
SMESH::TElementSimulation::TVTKIds anIds; SMESH::TElementSimulation::TVTKIds anIds;
// Collect ids from the dialog // Collect ids from the dialog
@ -854,33 +881,37 @@ void SMESHGUI_AddQuadraticElementDlg::displaySimulation()
int aDisplayMode = VTK_SURFACE; int aDisplayMode = VTK_SURFACE;
if ( myType == QUAD_EDGE ) if ( myType == QUAD_EDGE )
{ {
anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->text(0, 0).toInt() ) ); anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->text(0, 0).toInt() ) );
anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->text(0, 2).toInt() ) ); anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->text(0, 2).toInt() ) );
anID = (myTable->text(0, 1)).toInt(&ok); anID = (myTable->text(0, 1)).toInt(&ok);
if (!ok) anID = (myTable->text(0, 0)).toInt(); if (!ok) anID = (myTable->text(0, 0)).toInt();
anIds.push_back( myActor->GetObject()->GetNodeVTKId(anID) ); anIds.push_back( myActor->GetObject()->GetNodeVTKId(anID) );
aDisplayMode = VTK_WIREFRAME; aDisplayMode = VTK_WIREFRAME;
} }
else else
{ {
for ( int row = 0; row < myNbCorners; row++ ) for ( int row = 0; row < myNbCorners; row++ )
anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->text(row, 0).toInt() ) ); anIds.push_back( myActor->GetObject()->GetNodeVTKId( myTable->text(row, 0).toInt() ) );
for ( int row = 0; row < myTable->numRows(); row++ ) for ( int row = 0; row < myTable->numRows(); row++ )
{ {
anID = (myTable->text(row, 1)).toInt(&ok); anID = (myTable->text(row, 1)).toInt(&ok);
if (!ok) { if (!ok) {
anID = (myTable->text(row, 0)).toInt(); anID = (myTable->text(row, 0)).toInt();
aDisplayMode = VTK_WIREFRAME; aDisplayMode = VTK_WIREFRAME;
} }
anIds.push_back( myActor->GetObject()->GetNodeVTKId(anID) ); anIds.push_back( myActor->GetObject()->GetNodeVTKId(anID) );
}
} }
}
mySimulation->SetPosition(myActor,myType,anIds,aDisplayMode,myReverseCB->isChecked()); mySimulation->SetPosition(myActor,myType,anIds,aDisplayMode,myReverseCB->isChecked());
SMESH::UpdateView();
} }
else
{
mySimulation->SetVisibility(false);
}
SMESH::UpdateView();
} }
//================================================================================= //=================================================================================
@ -891,8 +922,8 @@ void SMESHGUI_AddQuadraticElementDlg::SetEditCorners()
{ {
myCornerNodes->setFocus(); myCornerNodes->setFocus();
myIsEditCorners = true; myIsEditCorners = true;
SelectionIntoArgument(); SelectionIntoArgument();
updateButtons();
} }
//================================================================================= //=================================================================================
@ -940,7 +971,6 @@ void SMESHGUI_AddQuadraticElementDlg::enterEvent (QEvent*)
if (GroupConstructors->isEnabled()) if (GroupConstructors->isEnabled())
return; return;
ActivateThisDialog(); ActivateThisDialog();
return;
} }
//================================================================================= //=================================================================================
@ -951,7 +981,6 @@ void SMESHGUI_AddQuadraticElementDlg::closeEvent (QCloseEvent*)
{ {
/* same than click on cancel button */ /* same than click on cancel button */
ClickOnCancel(); ClickOnCancel();
return;
} }
//================================================================================= //=================================================================================
@ -970,13 +999,9 @@ void SMESHGUI_AddQuadraticElementDlg::hideEvent (QHideEvent*)
//================================================================================= //=================================================================================
void SMESHGUI_AddQuadraticElementDlg::onReverse (int state) void SMESHGUI_AddQuadraticElementDlg::onReverse (int state)
{ {
if (!IsValid()) mySimulation->SetVisibility(false);
return; displaySimulation();
updateButtons();
if (state >= 0) {
mySimulation->SetVisibility(false);
displaySimulation();
}
} }
@ -995,15 +1020,15 @@ bool SMESHGUI_AddQuadraticElementDlg::IsValid()
bool ok; bool ok;
for ( int row = 0; row < myTable->numRows(); row++ ) for ( int row = 0; row < myTable->numRows(); row++ )
{ {
int anID = (myTable->text(row, 1)).toInt(&ok); int anID = (myTable->text(row, 1)).toInt(&ok);
if ( !ok ) if ( !ok )
return false; return false;
const SMDS_MeshNode * aNode = aMesh->FindNode(anID); const SMDS_MeshNode * aNode = aMesh->FindNode(anID);
if ( !aNode ) if ( !aNode )
return false; return false;
} }
return true; return true;
} }
@ -1017,63 +1042,63 @@ void SMESHGUI_AddQuadraticElementDlg::UpdateTable( bool theConersValidity )
QStringList aListCorners = QStringList::split(" ", myCornerNodes->text(), false); QStringList aListCorners = QStringList::split(" ", myCornerNodes->text(), false);
if ( aListCorners.count() == myNbCorners && theConersValidity ) if ( aListCorners.count() == myNbCorners && theConersValidity )
{ {
myTable->setEnabled( true ); myTable->setEnabled( true );
// clear the Middle column // clear the Middle column
for ( int row = 0; row < myTable->numRows(); row++ ) for ( int row = 0; row < myTable->numRows(); row++ )
myTable->setText( row, 1, ""); myTable->setText( row, 1, "");
int* aFirstColIds; int* aFirstColIds;
int* aLastColIds; int* aLastColIds;
switch (myType) { switch (myType) {
case QUAD_EDGE: case QUAD_EDGE:
aFirstColIds = FirstEdgeIds; aFirstColIds = FirstEdgeIds;
aLastColIds = LastEdgeIds; aLastColIds = LastEdgeIds;
break; break;
case QUAD_TRIANGLE: case QUAD_TRIANGLE:
aFirstColIds = FirstTriangleIds; aFirstColIds = FirstTriangleIds;
aLastColIds = LastTriangleIds; aLastColIds = LastTriangleIds;
break; break;
case QUAD_QUADRANGLE: case QUAD_QUADRANGLE:
aFirstColIds = FirstQuadrangleIds; aFirstColIds = FirstQuadrangleIds;
aLastColIds = LastQuadrangleIds; aLastColIds = LastQuadrangleIds;
break; break;
case QUAD_TETRAHEDRON: case QUAD_TETRAHEDRON:
aFirstColIds = FirstTetrahedronIds; aFirstColIds = FirstTetrahedronIds;
aLastColIds = LastTetrahedronIds; aLastColIds = LastTetrahedronIds;
break; break;
case QUAD_PYRAMID: case QUAD_PYRAMID:
aFirstColIds = FirstPyramidIds; aFirstColIds = FirstPyramidIds;
aLastColIds = LastPyramidIds; aLastColIds = LastPyramidIds;
break; break;
case QUAD_PENTAHEDRON: case QUAD_PENTAHEDRON:
aFirstColIds = FirstPentahedronIds; aFirstColIds = FirstPentahedronIds;
aLastColIds = LastPentahedronIds; aLastColIds = LastPentahedronIds;
break; break;
case QUAD_HEXAHEDRON: case QUAD_HEXAHEDRON:
aFirstColIds = FirstHexahedronIds; aFirstColIds = FirstHexahedronIds;
aLastColIds = LastHexahedronIds; aLastColIds = LastHexahedronIds;
break; break;
}
// fill the First and the Last columns
for (int i = 0, iEnd = myTable->numRows(); i < iEnd; i++)
myTable->setText( i, 0, aListCorners[ aFirstColIds[i] ] );
for (int i = 0, iEnd = myTable->numRows(); i < iEnd; i++)
myTable->setText( i, 2, aListCorners[ aLastColIds[i] ] );
} }
// fill the First and the Last columns
for (int i = 0, iEnd = myTable->numRows(); i < iEnd; i++)
myTable->setText( i, 0, aListCorners[ aFirstColIds[i] ] );
for (int i = 0, iEnd = myTable->numRows(); i < iEnd; i++)
myTable->setText( i, 2, aListCorners[ aLastColIds[i] ] );
}
else else
{ {
// clear table // clear table
for ( int row = 0; row < myTable->numRows(); row++ ) for ( int row = 0; row < myTable->numRows(); row++ )
for ( int col = 0; col < myTable->numCols(); col++ ) for ( int col = 0; col < myTable->numCols(); col++ )
myTable->setText(row, col, ""); myTable->setText(row, col, "");
myTable->setEnabled( false ); myTable->setEnabled( false );
} }
} }
@ -1083,11 +1108,9 @@ void SMESHGUI_AddQuadraticElementDlg::UpdateTable( bool theConersValidity )
//================================================================================= //=================================================================================
void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCol, int theButton, const QPoint& theMousePos ) void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCol, int theButton, const QPoint& theMousePos )
{ {
if ( theButton == 1 && theCol == 1 ) myIsEditCorners = false;
myIsEditCorners = false;
displaySimulation(); displaySimulation();
return; updateButtons();
} }
@ -1097,17 +1120,12 @@ void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCo
//================================================================================= //=================================================================================
void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int theRow, int theCol) void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int theRow, int theCol)
{ {
onTextChange( myTable->text(theRow, theCol) ); myIsEditCorners = false;
displaySimulation();
updateButtons();
} }
QWidget* SMESHGUI_IdEditItem::createEditor() const
{
QLineEdit *aLineEdit = new QLineEdit(text(), table()->viewport());
aLineEdit->setValidator( new SMESHGUI_IdValidator(table()->viewport(), "validator", 1) );
return aLineEdit;
}
//================================================================================= //=================================================================================
// function : keyPressEvent() // function : keyPressEvent()
// purpose : // purpose :
@ -1119,8 +1137,15 @@ void SMESHGUI_AddQuadraticElementDlg::keyPressEvent( QKeyEvent* e )
return; return;
if ( e->key() == Key_F1 ) if ( e->key() == Key_F1 )
{ {
e->accept(); e->accept();
ClickOnHelp(); ClickOnHelp();
} }
}
void SMESHGUI_AddQuadraticElementDlg::updateButtons()
{
bool valid = IsValid();
buttonOk->setEnabled( valid );
buttonApply->setEnabled( valid );
} }

12
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.h
View File

@ -71,6 +71,7 @@ private:
void displaySimulation(); void displaySimulation();
void UpdateTable( bool theConersValidity = true ); void UpdateTable( bool theConersValidity = true );
bool IsValid(); bool IsValid();
void updateButtons();
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */ SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */ LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
@ -119,15 +120,4 @@ private slots:
void ActivateThisDialog() ; void ActivateThisDialog() ;
}; };
class SMESHGUI_IdEditItem: public QTableItem
{
public:
SMESHGUI_IdEditItem(QTable* table, EditType et, const QString& text ):
QTableItem(table, et, text) {};
~SMESHGUI_IdEditItem() {};
QWidget* createEditor() const;
};
#endif // DIALOGBOX_ADD_QUADRATIC_ELEMENT_H #endif // DIALOGBOX_ADD_QUADRATIC_ELEMENT_H