From 0510c5f9c69917bfd55512772bca6f3517572788 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 28 Feb 2007 09:58:34 +0000 Subject: [PATCH] PAL13460 (force the mesh to go through a point) extract SMESH_MeshEditor.idl from SMESH_Mesh.idl --- src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx | 2 + .../SMESHGUI_AddQuadraticElementDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx | 2 + .../SMESHGUI_CreatePolyhedralVolumeDlg.cxx | 1 + src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx | 2 + .../SMESHGUI_ExtrusionAlongPathDlg.cxx | 1 + src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h | 1 + src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx | 1 + src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx | 1 + src/SMESHGUI/SMESHGUI_MultiEditDlg.h | 1 + src/SMESHGUI/SMESHGUI_NodesDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_RotationDlg.cxx | 1 + src/SMESHGUI/SMESHGUI_SewingDlg.cxx | 3 ++ src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx | 4 -- src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h | 40 ++----------------- src/SMESHGUI/SMESHGUI_SingleEditDlg.h | 1 + src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx | 1 + src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx | 1 + src/SMESHGUI/SMESHGUI_TranslationDlg.cxx | 1 + src/SMESHGUI/SMESHGUI_Utils.cxx | 18 +++++++++ src/SMESHGUI/SMESHGUI_Utils.h | 2 +- 25 files changed, 55 insertions(+), 41 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx index 18dc86e26..70c32a76e 100644 --- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx @@ -55,6 +55,8 @@ #include "utilities.h" +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + // OCCT Includes #include #include diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx index ca7d886e3..37a621a9f 100644 --- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx @@ -46,6 +46,8 @@ #include "utilities.h" +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + // OCCT Includes #include #include diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx index cabea5343..92853de16 100644 --- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx +++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx @@ -42,6 +42,8 @@ #include "LightApp_UpdateFlags.h" +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + //================================================================================ /*! * \brief Constructor diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx index 9d570cde4..5793fe7a5 100644 --- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx @@ -84,6 +84,7 @@ // IDL Headers #include "SALOMEconfig.h" #include CORBA_SERVER_HEADER(SMESH_Group) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) using namespace std; diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx index 19b29d15e..967a2ea51 100644 --- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx @@ -36,6 +36,8 @@ #include "utilities.h" +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + // QT Includes #include #include diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx index 02d6f633f..8a3c0c07b 100644 --- a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx @@ -88,6 +88,7 @@ // IDL Headers #include "SALOMEconfig.h" #include CORBA_SERVER_HEADER(SMESH_Group) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) using namespace std; diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h index f52f8cab5..158c1551c 100644 --- a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h +++ b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h @@ -123,6 +123,7 @@ private: QLabel* StartPointLab; QToolButton* SelectStartPointButton; QLineEdit* StartPointLineEdit; + QCheckBox* LinearAnglesCheck; QCheckBox* AnglesCheck; QGroupBox* AnglesGrp; QListBox* AnglesList; diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx index f2c0c518d..12a09de26 100644 --- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx @@ -79,6 +79,7 @@ // IDL Headers #include "SALOMEconfig.h" #include CORBA_SERVER_HEADER(SMESH_Group) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) using namespace std; diff --git a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx index c16fab197..203d28328 100644 --- a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx @@ -54,6 +54,8 @@ #include "utilities.h" +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + // OCCT Includes #include diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx index b7d41af82..deb0d6c56 100644 --- a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx @@ -82,6 +82,7 @@ // IDL Headers #include #include CORBA_SERVER_HEADER(SMESH_Mesh) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) #define MARGIN 10 #define SPACING 5 diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h index 8bcf3928a..e969d2a6a 100755 --- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h +++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h @@ -36,6 +36,7 @@ #include #include CORBA_SERVER_HEADER(SMESH_Mesh) #include CORBA_SERVER_HEADER(SMESH_Filter) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) class SMESHGUI; class SMESHGUI_FilterDlg; diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx index b91eb086a..f8a2c82ed 100644 --- a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx @@ -89,6 +89,8 @@ #include #include +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + using namespace std; diff --git a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx index 0df620a02..6acb1ff0e 100644 --- a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx @@ -71,6 +71,8 @@ using namespace std; +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + //================================================================================= // class : SMESHGUI_RemoveElementsDlg() // purpose : diff --git a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx index 8625125dd..2e548161c 100644 --- a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx @@ -71,6 +71,8 @@ using namespace std; +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + //================================================================================= // class : SMESHGUI_RemoveNodesDlg() // purpose : diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx index 9992b49fc..db9f4a463 100644 --- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx @@ -59,6 +59,8 @@ using namespace std; +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + //================================================================================= // class : SMESHGUI_RenumberingDlg() // purpose : diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx index 4f4538f9e..e52b6b048 100644 --- a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx @@ -73,6 +73,7 @@ // IDL Headers #include "SALOMEconfig.h" #include CORBA_SERVER_HEADER(SMESH_Group) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) using namespace std; diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx index f4fbe616a..048d93cab 100644 --- a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx @@ -68,8 +68,11 @@ #include #include +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + using namespace std; + //================================================================================= // class : SMESHGUI_SewingDlg() // purpose : diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx index bc0f78779..51881af42 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx @@ -146,10 +146,6 @@ SMESHGUI_ShapeByMeshDlg::~SMESHGUI_ShapeByMeshDlg() //================================================================================ /*! * \brief Constructor - * \param theToCreate - if this parameter is true then operation is used for creation, - * for editing otherwise - * - * Initialize operation */ //================================================================================ SMESHGUI_ShapeByMeshOp::SMESHGUI_ShapeByMeshOp(bool isMultipleAllowed): diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h index c7e2f437c..2645beeed 100644 --- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h +++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h @@ -59,35 +59,22 @@ public: private: -// void closeEvent (QCloseEvent* e); -// void enterEvent (QEvent*); - -private: - - //QFrame* createButtonFrame (QWidget*); QFrame* createMainFrame (QWidget*); - //void displayPreview(); - //void erasePreview(); -private: QButtonGroup* myElemTypeGroup; QLineEdit* myElementId; QLineEdit* myGeomName; -private: bool myIsMultipleAllowed; void setMultipleAllowed(bool isAllowed) {myIsMultipleAllowed = isAllowed;}; -// QPushButton* myOkBtn; -// QPushButton* myCloseBtn; - -// SMESHGUI* mySMESHGUI; -// LightApp_SelectionMgr* mySelectionMgr; -// SVTK_ViewWindow* myViewWindow; - friend class SMESHGUI_ShapeByMeshOp; }; +/*! + * \brief Operation to publish a sub-shape of the mesh main shape + * by selecting mesh elements + */ class SMESHGUI_ShapeByMeshOp: public SMESHGUI_SelectionOp { Q_OBJECT @@ -107,35 +94,16 @@ protected: virtual void commitOperation(); virtual void startOperation(); - //virtual void selectionDone(); - //virtual SUIT_SelectionFilter* createFilter( const int ) const; - //virtual bool isValid( SUIT_Operation* ) const; void activateSelection(); void setElementID(const QString&); -/* signals: */ - -/* void PublishShape(); */ -/* void Close(); */ - protected slots: virtual bool onApply() { return true; } -/* void onCreateHyp( const int theHypType, const int theIndex ); */ -/* void onEditHyp( const int theHypType, const int theIndex ); */ -/* void onHypoSet( const QString& theSetName ); */ -/* void onGeomSelectionByMesh( bool ); */ -/* void onPublishShapeByMeshDlg(); */ -/* void onCloseShapeByMeshDlg(); */ private slots: -// void onOk(); -// void onClose(); - -// void onDeactivate(); - void onSelectionDone(); void onTypeChanged (int); void onElemIdChanged (const QString&); diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.h b/src/SMESHGUI/SMESHGUI_SingleEditDlg.h index 853b138ce..ea9c181cc 100755 --- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.h +++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.h @@ -31,6 +31,7 @@ #include #include CORBA_SERVER_HEADER(SMESH_Mesh) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) class QCloseEvent; class QFrame; diff --git a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx index f3c7e828e..658b58728 100644 --- a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx @@ -80,6 +80,7 @@ // IDL Headers #include "SALOMEconfig.h" #include CORBA_SERVER_HEADER(SMESH_Group) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) using namespace std; diff --git a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx index b6b800ab0..9bfe6af0d 100644 --- a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx @@ -74,6 +74,7 @@ // IDL Headers #include "SALOMEconfig.h" #include CORBA_SERVER_HEADER(SMESH_Group) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) using namespace std; diff --git a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx index 9ec6e4cbd..f5e3819bc 100644 --- a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx @@ -75,6 +75,7 @@ // IDL Headers #include "SALOMEconfig.h" #include CORBA_SERVER_HEADER(SMESH_Group) +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) using namespace std; diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx index 04ae86959..8eff141c8 100644 --- a/src/SMESHGUI/SMESHGUI_Utils.cxx +++ b/src/SMESHGUI/SMESHGUI_Utils.cxx @@ -21,12 +21,14 @@ #include #include "SMESHGUI_Utils.h" +#include "SMESHGUI.h" #include "OB_Browser.h" #include "SUIT_Desktop.h" #include "SUIT_Application.h" #include "SUIT_Session.h" +#include "SUIT_MessageBox.h" #include "LightApp_SelectionMgr.h" #include "SalomeApp_Application.h" @@ -287,6 +289,22 @@ namespace SMESH{ } } + void ShowHelpFile (QString theHelpFileName) + { + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) { + SMESHGUI* gui = SMESHGUI::GetSMESHGUI(); + app->onHelpContextModule(gui ? app->moduleName(gui->moduleName()) : QString(""), + theHelpFileName); + } + else { + SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(theHelpFileName), + QObject::tr("BUT_OK")); + } + } + // void UpdateObjBrowser (bool) // { // //SMESHGUI::activeStudy()->updateObjBrowser(true); diff --git a/src/SMESHGUI/SMESHGUI_Utils.h b/src/SMESHGUI/SMESHGUI_Utils.h index 12704ef19..7f549cb2b 100644 --- a/src/SMESHGUI/SMESHGUI_Utils.h +++ b/src/SMESHGUI/SMESHGUI_Utils.h @@ -126,7 +126,7 @@ namespace SMESH { void ModifiedMesh (_PTR(SObject) theSObject, bool theIsRight); -// void UpdateObjBrowser (bool); + void ShowHelpFile (QString theHelpFileName); } #endif -- 2.39.2