From: nds Date: Mon, 26 Jun 2017 13:19:55 +0000 (+0300) Subject: Porting to the current version of TInspector. X-Git-Tag: V_2.9.0~23^2~35 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e675b9eb8df755fff9763560ddf36d5bfeb6fe35;p=modules%2Fshaper.git Porting to the current version of TInspector. --- diff --git a/CMakeCommon/FindTInspector.cmake b/CMakeCommon/FindTInspector.cmake index 7ba0468a2..0b2ba217b 100644 --- a/CMakeCommon/FindTInspector.cmake +++ b/CMakeCommon/FindTInspector.cmake @@ -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) diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt index f5b9729a7..1bc373d68 100644 --- a/src/XGUI/CMakeLists.txt +++ b/src/XGUI/CMakeLists.txt @@ -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) diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index b08c24cd7..462359e09 100755 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -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