]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Porting to the current version of TInspector.
authornds <nds@opencascade.com>
Mon, 26 Jun 2017 13:19:55 +0000 (16:19 +0300)
committernds <nds@opencascade.com>
Mon, 26 Jun 2017 13:19:55 +0000 (16:19 +0300)
CMakeCommon/FindTInspector.cmake
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_Workshop.cpp

index 7ba0468a23f8fd2e9a003ed6220a155b887e5001..0b2ba217bf48e57fa63c955d6c294dc6f5d5aa3c 100644 (file)
@@ -24,11 +24,11 @@ IF(EXISTS ${TINSPECTOR_ROOT_DIR})
     FIND_LIBRARY(TKVInspector TKVInspector "${TINSPECTOR_LIB_DIR}")
     SET(TKVInspector ${TKVInspector})
 
-    FIND_LIBRARY(DFBrowserAPI DFBrowserAPI "${TINSPECTOR_LIB_DIR}")
-    SET(DFBrowserAPI ${DFBrowserAPI})
+    FIND_LIBRARY(TKTInspectorAPI TKTInspectorAPI "${TINSPECTOR_LIB_DIR}")
+    SET(TKTInspectorAPI ${TKTInspectorAPI})
 
-    FIND_LIBRARY(TKDFTreeModel TKDFTreeModel "${TINSPECTOR_LIB_DIR}")
-    SET(TKDFTreeModel ${TKDFTreeModel})
+    FIND_LIBRARY(TKTreeModel TKTreeModel "${TINSPECTOR_LIB_DIR}")
+    SET(TKTreeModel ${TKTreeModel})
 
   ENDIF(TKTInspector)
 
index f5b9729a72fb10b8d797d3fc5b1fb5b8914b7003..1bc373d68798e5fb488e122c1bef4ce13db68f87 100644 (file)
@@ -180,7 +180,7 @@ ENDIF(NOT ${HAVE_SALOME})
 
 IF(TKTInspector)
     message("TINSPECTOR is defined")
-    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${TKTInspector} ${TKVInspector})
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${TKTInspectorAPI} ${TKTInspector} ${TKTreeModel} ${TKVInspector})
     SET(PROJECT_INCLUDES ${PROJECT_INCLUDES} ${TINSPECTOR_INCLUDE_DIR})
 
     ADD_DEFINITIONS(-DTINSPECTOR)
index b08c24cd73015b39db537c8596c3b772a710f8cc..462359e0976930a15071f07b66ef740c351b3a27 100755 (executable)
@@ -1418,14 +1418,14 @@ void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked)
         #endif
         aParameters.Append(MyVCallBack);
 
-        MyTCommunicator->registerPlugin("SMBrowser"); // custom plugin to view ModelAPI
+        MyTCommunicator->RegisterPlugin("SMBrowser"); // custom plugin to view ModelAPI
 
-        MyTCommunicator->init(aParameters);
+        MyTCommunicator->Init(aParameters);
         MyTCommunicator->Activate("SMBrowser"); // to have button in TInspector
         MyTCommunicator->Activate("TKVInspector"); // to have filled callback by model
         MyTCommunicator->Activate("TKDFBrowser");
       }
-      MyTCommunicator->setVisible(true);
+      MyTCommunicator->SetVisible(true);
     }
   }
 #endif