From f5b69ee44c7918a89e5fd9d21d3bd2a10a724b5d Mon Sep 17 00:00:00 2001 From: akl Date: Mon, 8 Sep 2014 16:36:41 +0400 Subject: [PATCH] 0022420: [CEA 1004] Take the "incremental limit check" into account at the first mesh display. --- .../images/display_entity_choose_item.png | Bin 0 -> 2186 bytes .../gui/SMESH/images/display_entity_dlg.png | Bin 0 -> 6216 bytes doc/salome/gui/SMESH/input/display_entity.doc | 9 + .../SMESH/input/viewing_meshes_overview.doc | 2 +- resources/CMakeLists.txt | 2 + resources/mesh_choose.png | Bin 0 -> 469 bytes resources/mesh_choose_all.png | Bin 0 -> 472 bytes src/SMESHGUI/CMakeLists.txt | 2 + src/SMESHGUI/SMESHGUI.cxx | 16 +- src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx | 247 ++++++++++++++++++ src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.h | 61 +++++ src/SMESHGUI/SMESHGUI_Operations.h | 3 +- src/SMESHGUI/SMESH_images.ts | 8 + src/SMESHGUI/SMESH_msg_en.ts | 11 + src/SMESHGUI/SMESH_msg_fr.ts | 11 + src/SMESHGUI/SMESH_msg_ja.ts | 11 + 16 files changed, 380 insertions(+), 3 deletions(-) create mode 100644 doc/salome/gui/SMESH/images/display_entity_choose_item.png create mode 100644 doc/salome/gui/SMESH/images/display_entity_dlg.png create mode 100644 resources/mesh_choose.png create mode 100644 resources/mesh_choose_all.png create mode 100644 src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.h diff --git a/doc/salome/gui/SMESH/images/display_entity_choose_item.png b/doc/salome/gui/SMESH/images/display_entity_choose_item.png new file mode 100644 index 0000000000000000000000000000000000000000..d09961822626937c7d20a29742f171541440b2df GIT binary patch literal 2186 zcmb7`c{~(a8^_Netr#i9O$@o+xS@<2X^^pu8n-Lk$QBJU23Zq^N*TK$Bs*y=HOMkF z*Tju%;kC;&rX))l+cYyVSKjIV*ZY3nKi)sibI$Yoob$)?`<&-{PQpcN3yD1ndjJ3u zC`+Ub01%RJeQlSxFbZ;%a)c8k*v8@ zClD<&)I5?&y6B_mOFFNJsFX)@U17c*@~WteV-~;Ws3lC2?fvQnoGuPm;G4)eLFrm! zyM;-H`rZm1HTsl9v?Mc0ckYOmE1=hs>}&VX6@9a@BlN$$X*J#SKjz^)0@gXrlW(W* zTHpkH5|5caTAK4^byV}Nv9VQ!Y2yxLS@2MKOz8Bg3KD?!UDCi<`{%dhJjf3xLrV5UPT1# zGAI6*B>T75OEXR@=K4XFS)p2wm69Crki!#+Pt>&m7&AKzLr_R2({l>#&A!oF^bfNP zF~zoppN!x^=ni@h?Zkp+-(!3j9uq?^;LpQ5iy&Xg`E{65r3BkUcFhNH&Si-PTYzvJ z;o$UCR&{^JVHj4+EfwVYC>)Gu_@w%2b4~U5#LCOjL%{g}p6K&g1&g0bA!K`s0)kWDq9$kyf_^U+ zCkMN57Sgu<#6?(acKrWoo+oO=Hd)8RMzs<(*mOztl{{h+3iJT(2OI4p(X(>_+dfBu zb|aPF)x!3tey&7bFepg1hru91qeGcE=7<%PWKDC5C2AM!01qIl(%^hBhnnYv!ZQ6G zTw6EoG)yJ7x!c25CzO#$wZ1}BhT%jncx|#>QIl0{QYt~xj0`L3rw?^Sal#8;ba%4a zySTK243BS2h+nFYDH17_G8s_HLA;1KA_ct0D(-UCA_&U|>07==eTC@luTw5tdTvi~ zMr=pK1_7IPY22Sb$axEx6#G~SX|ClX$;kUN50`(j-qErdE!gn&{&;5IP%}EMk}KL* zr@@iT)N-SDPt>>-L<>WX;&1+^1)pX%P8s23V0vz`vql2f@*EdOUjJnp)FrL1VzK%8 zym;K3f^Va~jgKZ6SrOtrLqnvu0n8i?2TDF}``Z>RY9YGfFsyT4c`&}yF%MdI=Suco zFV_*{`g~C+nYkDf*;@Gelra*io|)iGkHV;D_OygKsRrWempPfG58RhRNM{_bc%2Vi`A1wO#p)2iV?uDy3-1(-aCM0rpxcvOdLlcS# zKE3A0H#qcW7pl>hNwiETaTN9WZ@U|qr{hIbnz<4dj-Wg=kV}lNvs2JJm37)<) z1_6~Oy$?LL!g`T|o1ma^7G)%kd`ZK6DeuqW&FDs6Q&YfFsf08;rncIAZ*EoeRM^2O z1ce~@tBN6|n}U;=WizPj3qz{Fd{QB0c6Iflq|~6uhs6={_jH*_8-C8RNqv`{Cf4get1w|;K1N{I zHNZ2UamG_y{S>8PoXx#O6W3)`=7L3|%*#m0U7m|!wDs8@nTWNS&JeceI2?+%s=Pq2 z3D~aMQW5C&o5$^nJuMM$s;{q4s&=U9?aR?3vpG(pYs`EXc357RXHoeJ>!PMsU*W#2 z7Ovpeh>~!Mtw;1qK!` z-F@tCu=hW)T-zuqJzXsVk`CgDUqy;1tt~;DubCpu?keVS767spLn|_xamqm34Og!YE8XU}(Naje!D}zPIc!5AUQ6D2EBOL&*BiP=ToDh@N)>E6HxPjF zSsYvlAjcE`<0<*^b*X)I&+?KHzp8Rx0-P8kEG1a}$wGF|2SD0#eM~#PeY)(%c-BJC z2p^jl1J%P7i<+z)+YLl3b<%;Svo;l0$K;lzQ9N@B9O|rbqOlLm&g`!&^|MW9r6)1^ z6yVxUklJ5L4<{UWvHg;t=t|QOAoS>`Z*~W)@_3q6ODhWPwr`|>$GQ=@UCBMX39}*m PCjgY0HIj19{r0~B+UWMZ literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/images/display_entity_dlg.png b/doc/salome/gui/SMESH/images/display_entity_dlg.png new file mode 100644 index 0000000000000000000000000000000000000000..d0f4fa0ca38a63dbc445773aabddb3aa0a8623d7 GIT binary patch literal 6216 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 B-p&93 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/input/display_entity.doc b/doc/salome/gui/SMESH/input/display_entity.doc index 570674017..ccd0043ef 100644 --- a/doc/salome/gui/SMESH/input/display_entity.doc +++ b/doc/salome/gui/SMESH/input/display_entity.doc @@ -9,4 +9,13 @@ edges or combine them. \image html image58.gif Only Edges +If the mesh contains a lot of elements, select Choose... item, + +\image html display_entity_choose_item.png Item to call 'Display Entity' dialog box + +and Display Entity dialog box will provide a way to display only some entities at first display instead of displaying all entities long time. + +\image html display_entity_dlg.png 'Display Entity' dialog allows to select entities before displaying + +\note This menu item is available from popup menu in both Object browser and 3D viewer. */ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/viewing_meshes_overview.doc b/doc/salome/gui/SMESH/input/viewing_meshes_overview.doc index 376da99b0..248685579 100644 --- a/doc/salome/gui/SMESH/input/viewing_meshes_overview.doc +++ b/doc/salome/gui/SMESH/input/viewing_meshes_overview.doc @@ -33,7 +33,7 @@ viewer.
  • \subpage display_mode_page "Display Mode" - allows to select between Wireframe, Shading and Nodes presentation.
  • \subpage display_entity_page "Display Entity" - allows to display -Faces, Edges or both.
    • +entities by types (Faces, Edges, Volumes etc.).
  • 2D Quadratic - allows to select between the representation of quadratic edges as broken lines or as arcs
  • Orientation of faces - shows vectors of orientation of diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 4ffa049b7..46ca05a36 100755 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -34,6 +34,8 @@ SET(SMESH_RESOURCES_FILES mesh_aspect_3d.png mesh_biquad_quadrangle.png mesh_biquad_triangle.png + mesh_choose.png + mesh_choose_all.png mesh_clear.png mesh_compute.png mesh_diagonal.png diff --git a/resources/mesh_choose.png b/resources/mesh_choose.png new file mode 100644 index 0000000000000000000000000000000000000000..b5a40bacb8b4d12313d8f335b4f44a95811eced0 GIT binary patch literal 469 zcmV;`0V@89P)}Exmj9RXkY)MLgsv^eKc;@&Y~C_F@XjJ9slzlK2^oomp5htUY%$Q&|8jLZMKAIF7lVrfJ6EaL83B-*&rIBm^;3RfSTi1oQcvQS$M4l;Z34 znn?o4)xZyDrY_3m^0Vi8Kq97Tauc!DY9)8D-|w$7W4kb!OrTn=o_$G@FzFbHOE3#_ zU6)rR4BB9_<#PEGMUmVAaZ%EEJcd@Q1&-suY&L^tvk9Zo=q(6>FR>Oyr;-41AqM!q z&y7Z>(;+l44C7tb_1DE>!Tq$!5(06hX$tLj8^SQ;UrHt)#VpH$N~QAmRVFUtBTn14 zC1y0J*XwjTIRPdfQ>|8e!fKD#t}ZfvqJ3QK7vG6P)MA zI0%7m9dz^s+&cIU4&5R`hb~3P)_g+@R`kKhlN6+%BRqGSe8Yw!ykqr z4F&@>2m%72BUjxPP>{fFWhdLVO{39B7J?tT<2b&iX}9p_aydUMz^w@cnx;whdY!u6 zE)9o6;<01__{-%o@%$$CGEr42E083KU>>N~>q$VG%_c1t3j)dT=ks~0)oMRTexec(); + break; + } + case SMESHOp::OpOrientationOnFaces: { LightApp_SelectionMgr* mgr = selectionMgr(); @@ -3903,7 +3911,8 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( SMESHOp::OpDEFaces, "FACES", "ICON_DLG_TRIANGLE", 0, true ); createSMESHAction( SMESHOp::OpDEVolumes, "VOLUMES", "ICON_DLG_TETRAS", 0, true ); createSMESHAction( SMESHOp::OpDEBalls, "BALLS", "ICON_DLG_BALL", 0, true ); - createSMESHAction( SMESHOp::OpDEAllEntity, "ALL" ); + createSMESHAction( SMESHOp::OpDEChoose, "CHOOSE", "ICON_DLG_CHOOSE", 0, false ); + createSMESHAction( SMESHOp::OpDEAllEntity, "ALL", "ICON_DLG_CHOOSE_ALL", 0, false ); createSMESHAction( SMESHOp::OpOrientationOnFaces, "FACE_ORIENTATION", "", 0, true ); createSMESHAction( SMESHOp::OpRepresentationLines, "LINE_REPRESENTATION", "", 0, true ); @@ -4436,6 +4445,11 @@ void SMESHGUI::initialize( CAM_Application* app ) popupMgr()->insert( separator(), anId, -1 ); + popupMgr()->insert( action( SMESHOp::OpDEChoose ), anId, -1 ); + popupMgr()->setRule( action( SMESHOp::OpDEChoose ), aClient + "&&" + aType + "&&" + isNotEmpty, QtxPopupMgr::VisibleRule ); + + popupMgr()->insert( separator(), anId, -1 ); + popupMgr()->insert( action( SMESHOp::OpDEAllEntity ), anId, -1 ); popupMgr()->setRule( action( SMESHOp::OpDEAllEntity ), aDiffElemsInVTK + "&& isVisible && not( elemTypes in entityMode )", QtxPopupMgr::VisibleRule ); diff --git a/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx b/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx new file mode 100644 index 000000000..741c0dbde --- /dev/null +++ b/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx @@ -0,0 +1,247 @@ +// Copyright (C) 2014 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESHGUI_DisplayEntitiesDlg.cxx +// Author : Alexander KOVALEV, Open CASCADE S.A.S. (alexander.kovalev@opencascade.com) + +#include "SMESHGUI_DisplayEntitiesDlg.h" + +#include "SMESHGUI.h" +#include "SMESHGUI_Utils.h" +#include "SMESHGUI_VTKUtils.h" +#include "SMESHGUI_MeshUtils.h" + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +const int MARGIN = 9; +const int SPACING = 6; + +/*! + \class SMESHGUI_DisplayEntitiesDlg + \brief Dialog box to select entities to be displayed in viewer +*/ + +/* + \brief Constructor + \param parent parent widget +*/ +SMESHGUI_DisplayEntitiesDlg::SMESHGUI_DisplayEntitiesDlg( QWidget* parent ) + : SMESHGUI_Dialog( parent, true, false, Standard ) +{ + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + + LightApp_SelectionMgr* mgr = SMESHGUI::selectionMgr(); + SALOME_ListIO selected; + mgr->selectedObjects( selected ); + SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_nil(); + myActor = 0; + myNbCheckedButtons = 0; + + SALOME_ListIteratorOfListIO it( selected ); + myIObject = selected.First(); + if ( myIObject->hasEntry() ) { + myActor = SMESH::FindActorByEntry( myIObject->getEntry() ); + } + myEntityMode = myActor ? myActor->GetEntityMode() : 0; + + aMesh = SMESH::GetMeshByIO( myIObject ); + + // set title + setWindowTitle( tr( "MEN_DISP_ENT" ) ); + + // create widgets + QGroupBox* anEntitiesGrp = new QGroupBox( tr( "SMESH_MESHINFO_ENTITIES" ), mainFrame() ); + QGridLayout* hl = new QGridLayout( anEntitiesGrp ); + hl->setMargin( MARGIN ); + hl->setSpacing( SPACING ); + int nbElements; + + // 0DElements + nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_0DElement ) : aMesh->Nb0DElements(); + my0DElemsTB = new QCheckBox( tr("SMESH_ELEMS0D"), anEntitiesGrp ); + my0DElemsTB->setIcon( QIcon( aResMgr->loadPixmap( "SMESH", tr( "ICON_DLG_ELEM0D" ) ) ) ); + bool has0DElems = myEntityMode & SMESH_Actor::e0DElements; + my0DElemsTB->setChecked( has0DElems ); + if ( has0DElems ) + myNbCheckedButtons++; + connect( my0DElemsTB, SIGNAL(toggled(bool)), this, SLOT(onChangeEntityMode(bool)) ); + QLabel* nb0DElemsLab = new QLabel( QString("%1").arg(nbElements).toLatin1().data(), anEntitiesGrp ); + hl->addWidget( my0DElemsTB, 0, 0 ); + hl->addWidget( nb0DElemsLab, 0, 1 ); + my0DElemsTB->setEnabled( nbElements ); + nb0DElemsLab->setEnabled( nbElements ); + + // Edges + nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_Edge ) : aMesh->NbEdges(); + myEdgesTB = new QCheckBox( tr("SMESH_EDGES"), anEntitiesGrp ); + myEdgesTB->setIcon( QIcon( aResMgr->loadPixmap( "SMESH", tr( "ICON_DLG_EDGE" ) ) ) ); + bool hasEdges = myEntityMode & SMESH_Actor::eEdges; + myEdgesTB->setChecked( hasEdges ); + if ( hasEdges ) + myNbCheckedButtons++; + connect( myEdgesTB, SIGNAL(toggled(bool)), this, SLOT(onChangeEntityMode(bool)) ); + QLabel* nbEdgesLab = new QLabel( QString("%1").arg(nbElements).toLatin1().data(), anEntitiesGrp ); + hl->addWidget( myEdgesTB, 1, 0 ); + hl->addWidget( nbEdgesLab, 1, 1 ); + myEdgesTB->setEnabled( nbElements ); + nbEdgesLab->setEnabled( nbElements ); + + // Faces + nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_Face ) : aMesh->NbFaces(); + myFacesTB = new QCheckBox( tr("SMESH_FACES"), anEntitiesGrp ); + myFacesTB->setIcon( QIcon( aResMgr->loadPixmap( "SMESH", tr( "ICON_DLG_TRIANGLE" ) ) ) ); + bool hasFaces = myEntityMode & SMESH_Actor::eFaces; + myFacesTB->setChecked( hasFaces ); + if ( hasFaces ) + myNbCheckedButtons++; + connect( myFacesTB, SIGNAL(toggled(bool)), this, SLOT(onChangeEntityMode(bool)) ); + QLabel* nbFacesLab = new QLabel( QString("%1").arg(nbElements).toLatin1().data(), anEntitiesGrp ); + hl->addWidget( myFacesTB, 2, 0 ); + hl->addWidget( nbFacesLab, 2, 1 ); + myFacesTB->setEnabled( nbElements ); + nbFacesLab->setEnabled( nbElements ); + + // Volumes + nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_Volume ) : aMesh->NbVolumes(); + myVolumesTB = new QCheckBox( tr("SMESH_VOLUMES"), anEntitiesGrp ); + myVolumesTB->setIcon( QIcon( aResMgr->loadPixmap( "SMESH", tr( "ICON_DLG_TETRAS" ) ) ) ); + bool hasVolumes = myEntityMode & SMESH_Actor::eVolumes; + myVolumesTB->setChecked( hasVolumes ); + if ( hasVolumes ) + myNbCheckedButtons++; + connect( myVolumesTB, SIGNAL(toggled(bool)), this, SLOT(onChangeEntityMode(bool) ) ); + QLabel* nbVolumesLab = new QLabel( QString("%1").arg(nbElements).toLatin1().data(), anEntitiesGrp ); + hl->addWidget( myVolumesTB, 3, 0 ); + hl->addWidget( nbVolumesLab, 3, 1 ); + myVolumesTB->setEnabled( nbElements ); + nbVolumesLab->setEnabled( nbElements ); + + // Balls + nbElements = myActor ? myActor->GetObject()->GetNbEntities( SMDSAbs_Ball ) : aMesh->NbBalls(); + myBallsTB = new QCheckBox( tr("SMESH_BALLS"), anEntitiesGrp ); + myBallsTB->setIcon( QIcon( aResMgr->loadPixmap( "SMESH", tr( "ICON_DLG_BALL" ) ) ) ); + bool hasBalls = myEntityMode & SMESH_Actor::eBallElem; + myBallsTB->setChecked( hasBalls ); + if ( hasBalls ) + myNbCheckedButtons++; + connect( myBallsTB, SIGNAL(toggled(bool)), this, SLOT(onChangeEntityMode(bool)) ); + QLabel* nbBallsLab = new QLabel( QString("%1").arg(nbElements).toLatin1().data(), anEntitiesGrp ); + hl->addWidget( myBallsTB, 4, 0 ); + hl->addWidget( nbBallsLab, 4, 1 ); + myBallsTB->setEnabled( nbElements ); + nbBallsLab->setEnabled( nbElements ); + + QVBoxLayout* aDlgLay = new QVBoxLayout( mainFrame() ); + aDlgLay->setMargin( 0 ); + aDlgLay->setSpacing( SPACING ); + aDlgLay->addWidget( anEntitiesGrp ); + + button( OK )->setText( tr( "SMESH_BUT_OK" ) ); + + connect( this, SIGNAL( dlgHelp() ), this, SLOT( onHelp() ) ); + connect( this, SIGNAL( dlgOk() ), this, SLOT( onOk() ) ); +} + +/* + \brief Destructor: clean-up resources if necessary +*/ +SMESHGUI_DisplayEntitiesDlg::~SMESHGUI_DisplayEntitiesDlg() +{ +} + +void SMESHGUI_DisplayEntitiesDlg::InverseEntityMode(unsigned int& theOutputMode, + unsigned int theMode) +{ + bool anIsNotPresent = ~theOutputMode & theMode; + if(anIsNotPresent) + theOutputMode |= theMode; + else + theOutputMode &= ~theMode; +} + +/*! + \brief Slot for changing entities state +*/ +void SMESHGUI_DisplayEntitiesDlg::onChangeEntityMode( bool isChecked ) +{ + QCheckBox* aSender = (QCheckBox*)sender(); + if ( myNbCheckedButtons == 1 && !isChecked ) { + SUIT_MessageBox::warning(this, tr("SMESH_WRN_WARNING"), + tr("WRN_AT_LEAST_ONE")); + disconnect( aSender, SIGNAL(toggled(bool)), this, SLOT(onChangeEntityMode(bool)) ); + aSender->setChecked( true ); + connect( aSender, SIGNAL(toggled(bool)), this, SLOT(onChangeEntityMode(bool)) ); + return; + } + if ( my0DElemsTB == aSender ) + InverseEntityMode( myEntityMode, SMESH_Actor::e0DElements ); + else if ( myEdgesTB == aSender ) + InverseEntityMode( myEntityMode, SMESH_Actor::eEdges ); + else if ( myFacesTB == aSender ) + InverseEntityMode( myEntityMode, SMESH_Actor::eFaces ); + else if ( myVolumesTB == aSender ) + InverseEntityMode( myEntityMode, SMESH_Actor::eVolumes ); + else if ( myBallsTB == aSender ) + InverseEntityMode( myEntityMode, SMESH_Actor::eBallElem ); + + isChecked ? myNbCheckedButtons++ : myNbCheckedButtons--; + +} + +/*! + \brief Show online help on dialog box +*/ +void SMESHGUI_DisplayEntitiesDlg::onHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + app->onHelpContextModule( "SMESH", "display_entity_page.html" ); +} + +/*! + \brief Display or update the mesh in the 3D view with selected entity mode +*/ +void SMESHGUI_DisplayEntitiesDlg::onOk() +{ + const char* entry = myIObject->getEntry(); + + if ( !myActor ) { + myActor = SMESH::CreateActor(SMESH::GetActiveStudyDocument(), + entry, true); + } + + if( myEntityMode != myActor->GetEntityMode() ) { + myActor->SetEntityMode(myEntityMode); + SUIT_ViewWindow* wnd = SMESH::GetActiveWindow(); + SMESH::DisplayActor( wnd, myActor ); + SUIT_DataOwnerPtrList aList; + aList.append( new LightApp_DataOwner( entry ) ); + SMESHGUI::selectionMgr()->setSelected( aList, false ); + SMESH::UpdateView( wnd, SMESH::eDisplay, entry ); + } +} diff --git a/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.h b/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.h new file mode 100644 index 000000000..4b36a6b25 --- /dev/null +++ b/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.h @@ -0,0 +1,61 @@ +// Copyright (C) 2014 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESHGUI_DisplayEntitiesDlg.h +// Author : Alexander KOVALEV, Open CASCADE S.A.S. (alexander.kovalev@opencascade.com) + +#ifndef SMESHGUI_DISPLAYENTITIES_H +#define SMESHGUI_DISPLAYENTITIES_H + +#include "SMESHGUI_Dialog.h" +#include "SMESH_SMESHGUI.hxx" + +#include + +class QCheckBox; + +class SMESHGUI_EXPORT SMESHGUI_DisplayEntitiesDlg : public SMESHGUI_Dialog +{ + Q_OBJECT + +public: + SMESHGUI_DisplayEntitiesDlg( QWidget* parent ); + ~SMESHGUI_DisplayEntitiesDlg(); + +private: + void InverseEntityMode( unsigned int& theOutputMode, + unsigned int theMode ); + +private slots: + void onOk(); + void onHelp(); + void onChangeEntityMode( bool isChecked ); + +private: + Handle(SALOME_InteractiveObject) myIObject; + unsigned int myEntityMode; + SMESH_Actor *myActor; + int myNbCheckedButtons; + QCheckBox* my0DElemsTB; + QCheckBox* myEdgesTB; + QCheckBox* myFacesTB; + QCheckBox* myVolumesTB; + QCheckBox* myBallsTB; +}; + +#endif // SMESHGUI_DISPLAYENTITIES_H diff --git a/src/SMESHGUI/SMESHGUI_Operations.h b/src/SMESHGUI/SMESHGUI_Operations.h index 0d1cfe56a..18c28a441 100644 --- a/src/SMESHGUI/SMESHGUI_Operations.h +++ b/src/SMESHGUI/SMESHGUI_Operations.h @@ -200,7 +200,8 @@ namespace SMESHOp { OpDEFaces = 6042, // POPUP MENU - DISPLAY ENTITY - FACES OpDEVolumes = 6043, // POPUP MENU - DISPLAY ENTITY - VOLUMES OpDEBalls = 6044, // POPUP MENU - DISPLAY ENTITY - BALLS - OpDEAllEntity = 6045, // POPUP MENU - DISPLAY ENTITY - ALL ENTITY + OpDEAllEntity = 6045, // POPUP MENU - DISPLAY ENTITY - ALL ENTITIES + OpDEChoose = 6046, // POPUP MENU - DISPLAY ENTITY - CHOOSE ENTITIES // Representation -----------------//-------------------------------- OpRepresentationLines = 6050, // POPUP MENU - 2D QUADRATIC - LINES OpRepresentationArcs = 6051, // POPUP MENU - 2D QUADRATIC - ARCS diff --git a/src/SMESHGUI/SMESH_images.ts b/src/SMESHGUI/SMESH_images.ts index 80c04e7d6..7da6cad1a 100644 --- a/src/SMESHGUI/SMESH_images.ts +++ b/src/SMESHGUI/SMESH_images.ts @@ -255,6 +255,14 @@ ICON_DLG_TRIANGLE mesh_triangle.png + + ICON_DLG_CHOOSE + mesh_choose.png + + + ICON_DLG_CHOOSE_ALL + mesh_choose_all.png + ICON_EDIT_GROUP mesh_edit_group.png diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index fcb37740a..3f8a01c03 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -396,6 +396,10 @@ MEN_EDGES Edges + + MEN_CHOOSE + Choose... + MEN_EDIT Edit @@ -7805,4 +7809,11 @@ as they are of improper type: Shrink coef: + + SMESHGUI_DisplayEntitiesDlg + + WRN_AT_LEAST_ONE + At least one entity type should be chosen! + + diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts index f20d819eb..91596f776 100755 --- a/src/SMESHGUI/SMESH_msg_fr.ts +++ b/src/SMESHGUI/SMESH_msg_fr.ts @@ -396,6 +396,10 @@ MEN_EDGES Arêtes + + MEN_CHOOSE + Choose... + MEN_EDIT Edition @@ -7753,4 +7757,11 @@ en raison de leurs types incompatibles: Coef de réduction: + + SMESHGUI_DisplayEntitiesDlg + + WRN_AT_LEAST_ONE + At least one entity type should be chosen! + + diff --git a/src/SMESHGUI/SMESH_msg_ja.ts b/src/SMESHGUI/SMESH_msg_ja.ts index 5d6e78d20..0332875cf 100644 --- a/src/SMESHGUI/SMESH_msg_ja.ts +++ b/src/SMESHGUI/SMESH_msg_ja.ts @@ -395,6 +395,10 @@ MEN_EDGES エッジ + + MEN_CHOOSE + Choose... + MEN_EDIT 編集(&E) @@ -7687,4 +7691,11 @@ 減少係数: + + SMESHGUI_DisplayEntitiesDlg + + WRN_AT_LEAST_ONE + At least one entity type should be chosen! + +