PAL13460 (force the mesh to go through a point)

extract SMESH_MeshEditor.idl from SMESH_Mesh.idl

src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx

@@ -55,6 +55,8 @@
 
 #include "utilities.h"
 
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 // OCCT Includes
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>

src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx

@@ -46,6 +46,8 @@
 
 #include "utilities.h"
 
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 // OCCT Includes
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>

src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx

@@ -42,6 +42,8 @@
 
 #include "LightApp_UpdateFlags.h"
        
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 //================================================================================
 /*!
  * \brief Constructor

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;
 

src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx

@@ -36,6 +36,8 @@
 
 #include "utilities.h"
 
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 // QT Includes
 #include <qapplication.h>
 #include <qbuttongroup.h>

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;
 

src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h

@@ -123,6 +123,7 @@ private:
   QLabel*           StartPointLab;
   QToolButton*      SelectStartPointButton;
   QLineEdit*        StartPointLineEdit;
+  QCheckBox*        LinearAnglesCheck;
   QCheckBox*        AnglesCheck;
   QGroupBox*        AnglesGrp;
   QListBox*         AnglesList;

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;
 

src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx

@@ -54,6 +54,8 @@
 
 #include "utilities.h"
 
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 // OCCT Includes
 #include <TColStd_MapOfInteger.hxx>
 

src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx

@@ -82,6 +82,7 @@
 // IDL Headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
 
 #define MARGIN  10
 #define SPACING 5

src/SMESHGUI/SMESHGUI_MultiEditDlg.h

@@ -36,6 +36,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 #include CORBA_SERVER_HEADER(SMESH_Filter)
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
 
 class SMESHGUI;
 class SMESHGUI_FilterDlg;

src/SMESHGUI/SMESHGUI_NodesDlg.cxx

@@ -89,6 +89,8 @@
 #include <qvalidator.h>
 #include <qevent.h>
 
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 using namespace std;
 
 

src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx

@@ -71,6 +71,8 @@
 
 using namespace std;
 
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 //=================================================================================
 // class    : SMESHGUI_RemoveElementsDlg()
 // purpose  :

src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx

@@ -71,6 +71,8 @@
 
 using namespace std;
 
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 //=================================================================================
 // class    : SMESHGUI_RemoveNodesDlg()
 // purpose  :

src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx

@@ -59,6 +59,8 @@
 
 using namespace std;
 
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 //=================================================================================
 // class    : SMESHGUI_RenumberingDlg()
 // purpose  :

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;
 

src/SMESHGUI/SMESHGUI_SewingDlg.cxx

@@ -68,8 +68,11 @@
 #include <qlayout.h>
 #include <qpixmap.h>
 
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+
 using namespace std;
 
+
 //=================================================================================
 // class    : SMESHGUI_SewingDlg()
 // purpose  :

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):

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&);

src/SMESHGUI/SMESHGUI_SingleEditDlg.h

@@ -31,6 +31,7 @@
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
 
 class QCloseEvent;
 class QFrame;

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;
 

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;
 

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;
 

src/SMESHGUI/SMESHGUI_Utils.cxx

@@ -21,12 +21,14 @@
 #include <qstring.h>
 
 #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);

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