From: rnv <rnv@opencascade.com>
Date: Thu, 14 Jun 2018 11:42:26 +0000 (+0300)
Subject: Merge V9_dev branch into master
X-Git-Tag: SHAPER_V9_1_0RC1~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8d986a56d8745aba15e2241a252c02bf30b53999;p=modules%2Fgui.git

Merge V9_dev branch into master
---

8d986a56d8745aba15e2241a252c02bf30b53999
diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 2bac58d1a,58634fedd..843e639d8
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@@ -189,17 -189,12 +189,16 @@@ public
    static void              disableSelector();
    static SALOME_Selection* getSelection();
    static void              setSelection( const QStringList& );
-   static int               getStudyId();
 -  static void              putInfo( const QString&, const int = 0 );
    static const QString     getActiveComponent();
    static PyObject*         getActivePythonModule();
    static bool              activateModule( const QString& );
-   static void              updateObjBrowser( const int = 0, bool = true );
+   static void              updateObjBrowser();
  
 +  static void              putInfo( const QString&, const int = 0 );
 +  static int               showNotification( const QString&, const QString&, const int = -1 );
 +  static void              hideNotification( const QString& );
 +  static void              hideNotification( const int );
 +
    static bool              isModified();
    static void              setModified( bool );
  
diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
index e7e726ccb,6630c7a8a..42d7f574b
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
@@@ -299,18 -299,12 +299,17 @@@ public
    static void              enableSelector() /ReleaseGIL/ ;
    static void              disableSelector() /ReleaseGIL/ ;
    static SALOME_Selection* getSelection() /Factory,ReleaseGIL/ ;
 -  static void              putInfo( const QString&, const int = 0 ) /ReleaseGIL/ ;
 +  static void              setSelection( const QStringList& ) /ReleaseGIL/ ;
-   static int               getStudyId() /ReleaseGIL/ ;
    static const QString     getActiveComponent() /ReleaseGIL/ ;
    static SIP_PYOBJECT      getActivePythonModule() /ReleaseGIL/ ;
    static bool              activateModule( const QString& ) /ReleaseGIL/ ;
-   static void              updateObjBrowser( const int = 0, bool =  true ) /ReleaseGIL/ ;
+   static void              updateObjBrowser() /ReleaseGIL/ ;
 -  
 +
 +  static void              putInfo( const QString&, const int = 0 ) /ReleaseGIL/ ;
 +  static int               showNotification( const QString&, const QString&, const int = -1 ) /ReleaseGIL/ ;
 +  static void              hideNotification( const QString& ) /ReleaseGIL/ ;
 +  static void              hideNotification( const int ) /ReleaseGIL/ ;
 +
    static bool              isModified() /ReleaseGIL/ ;
    static void              setModified( bool ) /ReleaseGIL/ ;
  
diff --cc src/SalomeApp/SalomeApp_Application.cxx
index 97b4a077a,462f1a389..895e7c7a2
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@@ -596,14 -599,11 +601,14 @@@ void SalomeApp_Application::onCopy(
    if(it.More())
      {
        _PTR(SObject) so = stdDS->FindObjectID(it.Value()->getEntry());
 -      try {
 -        stdDS->Copy(so);
 -        onSelectionChanged();
 -      }
 -      catch(...) {
 +      if( so )
 +      {
 +        try {
-           studyMgr()->Copy(so);
++          stdDS->Copy(so);
 +          onSelectionChanged();
 +        }
 +        catch(...) {
 +        }
        }
      }
  }
@@@ -634,15 -632,12 +639,15 @@@ void SalomeApp_Application::onPaste(
    if(it.More())
      {
        _PTR(SObject) so = stdDS->FindObjectID(it.Value()->getEntry());
 -      try {
 -        stdDS->Paste(so);
 -        updateObjectBrowser( true );
 -        updateActions(); //SRN: BugID IPAL9377, case 3
 -      }
 -      catch(...) {
 +      if( so )
 +      {
 +        try {
-           studyMgr()->Paste(so);
++          stdDS->Paste(so);
 +          updateObjectBrowser( true );
 +          updateActions(); //SRN: BugID IPAL9377, case 3
 +        }
 +        catch(...) {
 +        }
        }
      }
  }
diff --cc src/TOOLSGUI/CMakeLists.txt
index 8bac12d30,91bef71a8..e60dddabf
--- a/src/TOOLSGUI/CMakeLists.txt
+++ b/src/TOOLSGUI/CMakeLists.txt
@@@ -41,11 -41,13 +41,13 @@@ ADD_DEFINITIONS
  # libraries to link to
  SET(_link_LIBRARIES
    ${QT_LIBRARIES}
 -  ${CAS_KERNEL}
 +  ${OpenCASCADE_FoundationClasses_LIBRARIES}
    ${KERNEL_SalomeIDLKernel}
    ${KERNEL_SALOMELocalTrace}
+   ${KERNEL_SalomeDSClient}
    ${KERNEL_SalomeNS}
    ${KERNEL_OpUtil}
+   ${KERNEL_SalomeKernelHelpers}
    ${OMNIORB_LIBRARIES}
    qtx suit
  )