Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V5_1_main 10/06/2010
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_WhatIsDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
b/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
index 1af954d482cb6f515c4735cb66ebbbc4cb112c08..02791962750009867698b4c7ff95c7bd4b7971dc 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
@@
-1,7
+1,4
@@
-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-19,6
+16,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_WhatIsDlg.cxx
// Author : Vladimir TURIN, Open CASCADE S.A.S.
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_WhatIsDlg.cxx
// Author : Vladimir TURIN, Open CASCADE S.A.S.
@@
-132,6
+130,7
@@
SMESHGUI_WhatIsDlg::SMESHGUI_WhatIsDlg( SMESHGUI* theModule )
LineEditElements = new QLineEdit(GroupArguments);
LineEditElements->setValidator(new SMESHGUI_IdValidator(this));
LineEditElements = new QLineEdit(GroupArguments);
LineEditElements->setValidator(new SMESHGUI_IdValidator(this));
+ LineEditElements->setMaxLength(-1);
GroupArgumentsLayout->addWidget(LineEditElements, 0, 1);
// information text browser
GroupArgumentsLayout->addWidget(LineEditElements, 0, 1);
// information text browser
@@
-242,14
+241,14
@@
void SMESHGUI_WhatIsDlg::SelectionsClicked (int selectionId)
{
SMESH::SetPointRepresentation(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
{
SMESH::SetPointRepresentation(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode( NodeSelection );
+
aViewWindow->SetSelectionMode( NodeSelection );
break;
}
case 1:
{
SMESH::SetPointRepresentation(false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
break;
}
case 1:
{
SMESH::SetPointRepresentation(false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode( CellSelection );
+
aViewWindow->SetSelectionMode( CellSelection );
break;
}
}
break;
}
}
@@
-299,10
+298,10
@@
void SMESHGUI_WhatIsDlg::ClickOnHelp()
app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName);
else {
SUIT_MessageBox::warning(this, tr("WRN_WARNING"),
app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName);
else {
SUIT_MessageBox::warning(this, tr("WRN_WARNING"),
- tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
- arg(app->resourceMgr()->stringValue("ExternalBrowser",
- "application")).
- arg(myHelpFileName));
+
tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+
arg(app->resourceMgr()->stringValue("ExternalBrowser",
+
"application")).
+
arg(myHelpFileName));
}
}
}
}
@@
-329,10
+328,10
@@
void SMESHGUI_WhatIsDlg::onTextChange (const QString& theNewText)
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = RadioButtonNodes->isChecked()?
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = RadioButtonNodes->isChecked()?
- aMesh->FindNode(aListId[ i ].toInt()):
- aMesh->FindElement(aListId[ i ].toInt());
+
aMesh->FindNode(aListId[ i ].toInt()):
+
aMesh->FindElement(aListId[ i ].toInt());
if (e)
if (e)
- newIndices.Add(e->GetID());
+
newIndices.Add(e->GetID());
}
mySelector->AddOrRemoveIndex( anIO, newIndices, false );
}
mySelector->AddOrRemoveIndex( anIO, newIndices, false );
@@
-443,6
+442,8
@@
void SMESHGUI_WhatIsDlg::SelectionIntoArgument()
if(e->GetType() == SMDSAbs_Node) {
anInfo+=tr("MESH_NODE")+"<br>";
//const SMDS_MeshNode *en = (SMDS_MeshNode*) e; // VSR: not used!
if(e->GetType() == SMDSAbs_Node) {
anInfo+=tr("MESH_NODE")+"<br>";
//const SMDS_MeshNode *en = (SMDS_MeshNode*) e; // VSR: not used!
+ } else if (e->GetType() == SMDSAbs_0DElement) {
+ anInfo+=tr("SMESH_ELEM0D")+"<br>";
} else if(e->GetType() == SMDSAbs_Edge) {
anInfo+=tr("SMESH_EDGE")+"<br>";
anInfo+="<b>" + tr("SMESH_MESHINFO_TYPE")+":</b> ";
} else if(e->GetType() == SMDSAbs_Edge) {
anInfo+=tr("SMESH_EDGE")+"<br>";
anInfo+="<b>" + tr("SMESH_MESHINFO_TYPE")+":</b> ";
@@
-453,22
+454,22
@@
void SMESHGUI_WhatIsDlg::SelectionIntoArgument()
anInfo+=tr("SMESH_FACE")+"<br>";
anInfo+="<b>" + tr("SMESH_MESHINFO_TYPE")+":</b> ";
if(!ef->IsPoly())
anInfo+=tr("SMESH_FACE")+"<br>";
anInfo+="<b>" + tr("SMESH_MESHINFO_TYPE")+":</b> ";
if(!ef->IsPoly())
- anInfo+=(ef->IsQuadratic()?tr("SMESH_MESHINFO_ORDER2"):tr("SMESH_MESHINFO_ORDER1"))+" ";
+
anInfo+=(ef->IsQuadratic()?tr("SMESH_MESHINFO_ORDER2"):tr("SMESH_MESHINFO_ORDER1"))+" ";
switch(ef->NbNodes()) {
case 3:
case 6:
switch(ef->NbNodes()) {
case 3:
case 6:
- {
- anInfo+=tr("SMESH_TRIANGLE");
- break;
- }
+
{
+
anInfo+=tr("SMESH_TRIANGLE");
+
break;
+
}
case 4:
case 8:
case 4:
case 8:
- {
- anInfo+=tr("SMESH_QUADRANGLE");
- break;
- }
+
{
+
anInfo+=tr("SMESH_QUADRANGLE");
+
break;
+
}
default:
default:
- break;
+
break;
}
anInfo+="<br>";
} else if(e->GetType() == SMDSAbs_Volume) {
}
anInfo+="<br>";
} else if(e->GetType() == SMDSAbs_Volume) {
@@
-477,39
+478,39
@@
void SMESHGUI_WhatIsDlg::SelectionIntoArgument()
const SMDS_MeshVolume *ev = (SMDS_MeshVolume*) e;
SMDS_VolumeTool vt(ev);
if(vt.GetVolumeType() != SMDS_VolumeTool::POLYHEDA)
const SMDS_MeshVolume *ev = (SMDS_MeshVolume*) e;
SMDS_VolumeTool vt(ev);
if(vt.GetVolumeType() != SMDS_VolumeTool::POLYHEDA)
- anInfo+=(ev->IsQuadratic()?tr("SMESH_MESHINFO_ORDER2"):tr("SMESH_MESHINFO_ORDER1"))+" ";
+
anInfo+=(ev->IsQuadratic()?tr("SMESH_MESHINFO_ORDER2"):tr("SMESH_MESHINFO_ORDER1"))+" ";
switch(vt.GetVolumeType()) {
case SMDS_VolumeTool::TETRA:
case SMDS_VolumeTool::QUAD_TETRA:
switch(vt.GetVolumeType()) {
case SMDS_VolumeTool::TETRA:
case SMDS_VolumeTool::QUAD_TETRA:
- {
- anInfo+=tr("SMESH_TETRAS");
- break;
- }
+
{
+
anInfo+=tr("SMESH_TETRAS");
+
break;
+
}
case SMDS_VolumeTool::PYRAM:
case SMDS_VolumeTool::QUAD_PYRAM:
case SMDS_VolumeTool::PYRAM:
case SMDS_VolumeTool::QUAD_PYRAM:
- {
- anInfo+=tr("SMESH_PYRAMID");
- break;
- }
+
{
+
anInfo+=tr("SMESH_PYRAMID");
+
break;
+
}
case SMDS_VolumeTool::PENTA:
case SMDS_VolumeTool::QUAD_PENTA:
case SMDS_VolumeTool::PENTA:
case SMDS_VolumeTool::QUAD_PENTA:
- {
- anInfo+=tr("SMESH_PRISM");
- break;
- }
+
{
+
anInfo+=tr("SMESH_PRISM");
+
break;
+
}
case SMDS_VolumeTool::HEXA:
case SMDS_VolumeTool::QUAD_HEXA:
case SMDS_VolumeTool::HEXA:
case SMDS_VolumeTool::QUAD_HEXA:
- {
- anInfo+=tr("SMESH_HEXAS");
- break;
- }
+
{
+
anInfo+=tr("SMESH_HEXAS");
+
break;
+
}
case SMDS_VolumeTool::POLYHEDA:
case SMDS_VolumeTool::POLYHEDA:
- {
- anInfo+=tr("SMESH_POLYEDRON");
- break;
- }
+
{
+
anInfo+=tr("SMESH_POLYEDRON");
+
break;
+
}
default:
default:
- break;
+
break;
}
anInfo+="<br>";
}
}
anInfo+="<br>";
}
@@
-521,17
+522,17
@@
void SMESHGUI_WhatIsDlg::SelectionIntoArgument()
const SMDS_MeshNode* node = static_cast<const SMDS_MeshNode*>( nodeIt->next() );
anXYZ.Add( gp_XYZ( node->X(), node->Y(), node->Z() ) );
if(e->GetType() != SMDSAbs_Node)
const SMDS_MeshNode* node = static_cast<const SMDS_MeshNode*>( nodeIt->next() );
anXYZ.Add( gp_XYZ( node->X(), node->Y(), node->Z() ) );
if(e->GetType() != SMDSAbs_Node)
- aNodesInfo+=QString("<b>Node %1:</b><br>Id=%2, X=%3, Y=%4, Z=%5<br>").arg(nbNodes+1).arg(node->GetID()).arg(node->X()).arg(node->Y()).arg(node->Z());
+
aNodesInfo+=QString("<b>Node %1:</b><br>Id=%2, X=%3, Y=%4, Z=%5<br>").arg(nbNodes+1).arg(node->GetID()).arg(node->X()).arg(node->Y()).arg(node->Z());
// Calculate Connectivity
SMDS_ElemIteratorPtr it = node->GetInverseElementIterator();
if (it) {
// Calculate Connectivity
SMDS_ElemIteratorPtr it = node->GetInverseElementIterator();
if (it) {
- aNodesInfo+="<b>" + tr("CONNECTED_ELEMENTS") + ":</b>";
- while (it->more()) {
- const SMDS_MeshElement* elem = it->next();
- aNodesInfo+=QString(" %1").arg(elem->GetID());
- }
- if ( (nbNodes+1) != e->NbNodes())
- aNodesInfo+=QString("<br><br>");
+
aNodesInfo+="<b>" + tr("CONNECTED_ELEMENTS") + ":</b>";
+
while (it->more()) {
+
const SMDS_MeshElement* elem = it->next();
+
aNodesInfo+=QString(" %1").arg(elem->GetID());
+
}
+
if ( (nbNodes+1) != e->NbNodes())
+
aNodesInfo+=QString("<br><br>");
}
}
if(e->GetType() != SMDSAbs_Node)
}
}
if(e->GetType() != SMDSAbs_Node)