From: asl <asl@opencascade.com>
Date: Tue, 19 May 2015 12:56:59 +0000 (+0300)
Subject: refs #534: creation of a new region via popup
X-Git-Tag: v1.4.1~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=457ce361f17154c25755624bd0aacda1c6cffb62;p=modules%2Fhydro.git

refs #534: creation of a new region via popup
---

diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
index 8bd9bfa8..49d61888 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
@@ -334,6 +334,7 @@ QWizardPage* HYDROGUI_CalculationDlg::createZonesPage() {
   connect( myBrowser, 
       SIGNAL( dropped( const QList<SUIT_DataObject*>&, SUIT_DataObject*, int, Qt::DropAction ) ),
       SLOT( onZonesDropped( const QList<SUIT_DataObject*>&, SUIT_DataObject*, int, Qt::DropAction ) ) );
+  connect( myBrowser, SIGNAL( newRegion() ), this, SLOT( OnNewRegion() ) );
 
   return aPage;
 }
@@ -408,6 +409,11 @@ void HYDROGUI_CalculationDlg::onZonesDropped( const QList<SUIT_DataObject*>& the
   }
 }
 
+void HYDROGUI_CalculationDlg::OnNewRegion()
+{
+  emit createRegion( myBrowser->getSelected() );
+}
+
 void HYDROGUI_CalculationDlg::onMergeTypeSelected( int theIndex )
 {
   int aType = myBathymetryChoice->itemData( theIndex ).toInt();
@@ -733,4 +739,4 @@ void  HYDROGUI_CalculationDlg::setRules( const HYDROData_ListOfRules& theRules )
 void HYDROGUI_CalculationDlg::onOrderChanged()
 {
   myPriorityWidget->setObjects( getGeometryObjects() );
-}
\ No newline at end of file
+}
diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.h b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
index ba2fb2cb..3578ec12 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationDlg.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.h
@@ -123,6 +123,9 @@ protected:
 
   virtual bool               acceptCurrent() const;
 
+protected slots:
+  void OnNewRegion();
+
 private:
   QList<Handle(HYDROData_Object)> getGeometryObjects();
 
diff --git a/src/HYDROGUI/HYDROGUI_DataBrowser.cxx b/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
index e213ea2e..4a553e04 100644
--- a/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataBrowser.cxx
@@ -39,6 +39,7 @@
 
 #include <QObject>
 #include <QShortcut>
+#include <QMenu>
 
 class SUIT_DataBrowser;
 class LightApp_DataObject;
@@ -274,7 +275,7 @@ HYDROGUI_DataBrowser::HYDROGUI_DataBrowser( HYDROGUI_Module* theModule, SUIT_Dat
   treeView()->setColumnWidth(SUIT_DataObject::VisibilityId, VISIBILITY_COLUMN_WIDTH);
   treeView()->hideColumn( SUIT_DataObject::VisibilityId );
   treeView()->hideColumn( LightApp_DataObject::EntryId );
-  //RKV: connectPopupRequest( theModule->getApp(), SLOT( onConnectPopupRequest( SUIT_PopupClient*, QContextMenuEvent* ) ) );
+  connectPopupRequest( theModule->getApp(), SLOT( onConnectPopupRequest( SUIT_PopupClient*, QContextMenuEvent* ) ) );
 }
 
 HYDROGUI_DataBrowser::~HYDROGUI_DataBrowser()
@@ -316,4 +317,10 @@ void HYDROGUI_DataBrowser::setReadOnly( const bool theIsReadOnly )
       aShortcut->setEnabled( !theIsReadOnly );
     }
   }
-}
\ No newline at end of file
+}
+
+void HYDROGUI_DataBrowser::createPopupMenu( QMenu* theMenu )
+{
+  theMenu->clear();
+  theMenu->addAction( tr( "ZONE_TO_NEW_REGION" ), this, SIGNAL( newRegion() ) );
+}
diff --git a/src/HYDROGUI/HYDROGUI_DataBrowser.h b/src/HYDROGUI/HYDROGUI_DataBrowser.h
index adbf77d7..decdcbed 100644
--- a/src/HYDROGUI/HYDROGUI_DataBrowser.h
+++ b/src/HYDROGUI/HYDROGUI_DataBrowser.h
@@ -49,8 +49,13 @@ public:
 
 signals:
   void             dropped( const QList<SUIT_DataObject*>& theList, 
-    SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction );
+                            SUIT_DataObject* theTargetParent,
+                            int theTargetRow, Qt::DropAction theDropAction );
   void             dataChanged();
+  void             newRegion();
+
+protected:
+  virtual void createPopupMenu( QMenu* );
 
 private:
   HYDROGUI_Module* myModule;
diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index 996a948d..180ef842 100644
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -349,6 +349,10 @@ All supported formats (*.brep *.iges *.igs *.step *.stp)</translation>
       <source>ALTITUDE_COLUMN</source>
       <translation>Altitude.Object</translation>
     </message>
+    <message>
+      <source>ZONE_TO_NEW_REGION</source>
+      <translation>Create a new region</translation>
+    </message>
   </context>
 
   <context>