From: nkv <nkv@opencascade.com>
Date: Thu, 21 Apr 2005 05:08:09 +0000 (+0000)
Subject: Merge with previous revision (sorry)
X-Git-Tag: V2_2_0_VISU_improvement_2005-05-27~51
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=808c3e6d01a3d78fbc12725454f0539dccf6122f;p=modules%2Fvisu.git

Merge with previous revision (sorry)
---

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 851dd70c..2b75d6d7 100644
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -60,6 +60,7 @@
 #include "VisuGUI_StreamLinesDlg.h"
 #include "VisuGUI_EditContainerDlg.h"
 #include "VisuGUI_TimeAnimation.h"
+#include "VisuGUI_ClippingDlg.h"
 
 #include "VisuGUI_Selection.h"
 #include "VisuGUI_NonIsometricDlg.h"
@@ -438,11 +439,11 @@ bool VisuGUI::OnGUIEvent(int theCommandID,  QAD_Desktop* parent)
       /* Import Mesh from MED, DAT file             		                                          */
       /* ======================================================================================== */
 
-    case 111:
-      {
-	visuGUI->CopyAndImportFile();
-	break;
-      }
+      //    case 111:
+      //      {
+      //	visuGUI->CopyAndImportFile();
+      //	break;
+      //      }
     case 112:
       {
 	visuGUI->ImportFile();
@@ -552,11 +553,12 @@ bool VisuGUI::OnGUIEvent(int theCommandID,  QAD_Desktop* parent)
       /*  POP-UP OBJECTS BROWSER      */
       /* ============================ */
 
-    case 900 : // Rename object
-      visuGUI->Rename();
-      break;
+       //    case 900 : // Rename object
+       //      visuGUI->Rename();
+       //      break;
 
                 // ---------------- For Popup in Viewer
+       /*
     case 802  : // Erase
     case 902  : // Erase
       visuGUI->ErasePrs();
@@ -610,6 +612,7 @@ bool VisuGUI::OnGUIEvent(int theCommandID,  QAD_Desktop* parent)
     case 908  : // Sweep IsoSurfaces or Cutplanes
       visuGUI->Sweep();
       break;
+       */
 
 /* ======================================================================================== */
 /* Preferences for Scalar Bar                                                               */
@@ -691,13 +694,14 @@ bool VisuGUI::OnGUIEvent(int theCommandID,  QAD_Desktop* parent)
 			  tr("ERR_NO_MEMORY") + " " + tr(e.what()),
 			  tr("VISU_BUT_OK") );
     return false;
-    }
+  }
   catch (std::exception& e){
     INFOS(e.what());
     QAD_MessageBox::warn1(QAD_Application::getDesktop(), tr ("VISU_WARNING"),
 			  tr(e.what()),
 			  tr("VISU_BUT_OK") );
-  }catch (const SALOME::SALOME_Exception& S_ex) {
+  }
+  catch (const SALOME::SALOME_Exception& S_ex) {
     INFOS("const SALOME::SALOME_Exception& S_ex");
     QtCatchCorbaException(S_ex);
     return false;
@@ -2343,6 +2347,15 @@ void VisuGUI::DeleteViewParams() {
 }
 
 
+//=====================================================================================
+// function : ClippingPlanes()
+// purpose  :
+//=====================================================================================
+void VisuGUI::ClippingPlanes() {
+  //SMESHGUI::GetSMESHGUI()->EmitSignalDeactivateDialog();
+  new VisuGUI_ClippingDlg (QAD_Application::getDesktop(),"",false);
+}
+
 //=====================================================================================
 // function : Sweep()
 // purpose  :
@@ -3042,6 +3055,9 @@ bool VisuGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* thePopup, const QStri
 	      thePopup->insertItem("Sweep", visuGUI, SLOT(Sweep()));
 	      
 	    }
+
+            thePopup->insertItem("Clipping planes", visuGUI, SLOT(ClippingPlanes()));
+
 	    if (isVTKViewer) {
 	      if ( theParent == "Viewer" && 
 		   ( aType == VISU::TMESH      || 
diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h
index 017ab39c..0cbf43a0 100644
--- a/src/VISUGUI/VisuGUI.h
+++ b/src/VISUGUI/VisuGUI.h
@@ -263,6 +263,7 @@ public slots:
   void Rename();
   void RenameTable();
   void RenameContainer();
+  void ClippingPlanes();
   void Sweep();
   void TimeAnimation();