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 branch 'occ/26452_face_ori'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_DisplayEntitiesDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
b/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
index 14088fe1a169614ce010ba1a9fd6c30ca7aa91ac..06a44303aa540602b354fa74a682a8876a57de76 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2014-20
21
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
@@
-33,6
+33,7
@@
#include <SUIT_OverrideCursor.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_OverrideCursor.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
+#include <smIdType.hxx>
#include <QCheckBox>
#include <QGridLayout>
#include <QCheckBox>
#include <QGridLayout>
@@
-81,7
+82,7
@@
SMESHGUI_DisplayEntitiesDlg::SMESHGUI_DisplayEntitiesDlg( QWidget* parent )
QGridLayout* hl = new QGridLayout( anEntitiesGrp );
hl->setMargin( MARGIN );
hl->setSpacing( SPACING );
QGridLayout* hl = new QGridLayout( anEntitiesGrp );
hl->setMargin( MARGIN );
hl->setSpacing( SPACING );
-
int
nbElements;
+
smIdType
nbElements;
// 0DElements
nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_0DElement ) : aMesh->Nb0DElements();
// 0DElements
nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_0DElement ) : aMesh->Nb0DElements();
@@
-220,7
+221,7
@@
void SMESHGUI_DisplayEntitiesDlg::onChangeEntityMode( bool isChecked )
void SMESHGUI_DisplayEntitiesDlg::onHelp()
{
LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
void SMESHGUI_DisplayEntitiesDlg::onHelp()
{
LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
- app->onHelpContextModule( "SMESH", "display_entity
_page
.html" );
+ app->onHelpContextModule( "SMESH", "display_entity.html" );
}
/*!
}
/*!
@@
-233,8
+234,7
@@
void SMESHGUI_DisplayEntitiesDlg::onOk()
const char* entry = myIObject->getEntry();
if ( !myActor ) {
const char* entry = myIObject->getEntry();
if ( !myActor ) {
- myActor = SMESH::CreateActor(SMESH::GetActiveStudyDocument(),
- entry, true);
+ myActor = SMESH::CreateActor(entry, true);
}
if( myEntityMode != myActor->GetEntityMode() ) {
}
if( myEntityMode != myActor->GetEntityMode() ) {