0029025: TInspector include files are not installed to inc directory by CMake

TInspector headers are collected in 'inc/tools' directory.

Extending DRAW Commands;

Eliminating warnings;

Improve Export to ShapeView dialog;

Avoid crash with QML using;

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 006cafa41c5b959066caa80a49ca5d06df49f3a1..43621df7b6eaafd688685f906a3c0ccfb8607a70 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -789,8 +789,7 @@ else()
   # collect all the headers to <binary dir>/inc folder
   string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
   message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT tool header files into ${CMAKE_BINARY_DIR}/tools/inc ...")
-  COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}" "${BUILD_TOOL_TOOLKITS}" "${CMAKE_SOURCE_DIR}/tools" "tools")
-  include_directories (${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/tools)
+  COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOL_TOOLKITS}" "${CMAKE_SOURCE_DIR}/tools" "${INSTALL_DIR_INCLUDE}/inspector")
 
 
   # check qt 3rdparty path

diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
index d0a3d99201e9d9caa32cdd301a0b2328dfe5fc40..3d40a7cc494bda0e3ad966b0922b88c9802c9f6a 100644 (file)
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -340,7 +340,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
   string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
   message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
     
-  file (GLOB OCCT_HEADER_FILES_OLD "${ROOT_TARGET_OCCT_DIR}/inc/*")
+  file (GLOB OCCT_HEADER_FILES_OLD "${ROOT_TARGET_OCCT_DIR}/${OCCT_INSTALL_DIR_PREFIX}/*")
   foreach (OCCT_HEADER_FILE_OLD ${OCCT_HEADER_FILES_OLD})
     get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE_OLD} NAME)
     string (REGEX MATCH "^[a-zA-Z0-9]+" PACKAGE_NAME "${HEADER_FILE_NAME}")

diff --git a/samples/tools/TInspectorEXE/TInspectorEXE.cxx b/samples/tools/TInspectorEXE/TInspectorEXE.cxx
index 5d3e0515ecb6908a28074a230aaca5117db73737..7523a95f9e95e0c46683c5901136282848d85c8d 100644 (file)
--- a/samples/tools/TInspectorEXE/TInspectorEXE.cxx
+++ b/samples/tools/TInspectorEXE/TInspectorEXE.cxx
@@ -14,9 +14,11 @@
 // commercial license or contractual agreement. 
 
 
-#include <OSD_Environment.hxx>
 #include <TInspectorEXE_OpenFileDialog.hxx>
-#include <TInspector_Communicator.hxx>
+
+#include <inspector/TInspector_Communicator.hxx>
+
+#include <OSD_Environment.hxx>
 
 #include <QAction>
 #include <QApplication>

diff --git a/samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.cxx b/samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.cxx
index 5aa234b77c9aa37436470c82f893d8d051b97d0c..4607755c2b69dd11f19467f51c8765edc71c3ed5 100644 (file)
--- a/samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.cxx
+++ b/samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.cxx
@@ -14,10 +14,10 @@
 // commercial license or contractual agreement. 
 
 #include <TInspectorEXE_OpenFileDialog.hxx>
-
-#include <TInspector_Communicator.hxx>
 #include <TInspectorEXE_OpenFileViewModel.hxx>
 
+#include <inspector/TInspector_Communicator.hxx>
+
 #include <QApplication>
 #include <QCompleter>
 #include <QDir>

diff --git a/tests/tools/dfbrowser/A1 b/tests/tools/dfbrowser/A1
index 2792359f0d1bd0d70a5cdfe365b7ce6abecf29dc..0c636d3e339c0e2f773ca168941542bd9cb28d2b 100644 (file)
--- a/tests/tools/dfbrowser/A1
+++ b/tests/tools/dfbrowser/A1
@@ -7,6 +7,6 @@ set aSetAttr1 100
 set aLabel 0:2
 SetInteger Doc ${aLabel} ${aSetAttr1}
 
-tinspector -dfbrowser
+tinspector -plugins dfbrowser
 tinspector -update
 

diff --git a/tests/tools/dfbrowser/A2 b/tests/tools/dfbrowser/A2
index 6e29d0025a9b5844e10df88c4db8eb5c219284c2..3d4fb130b55c4fb5ca313e81eb3241823b17600b 100644 (file)
--- a/tests/tools/dfbrowser/A2
+++ b/tests/tools/dfbrowser/A2
@@ -5,7 +5,7 @@ pload INSPECTOR
 chrono qat start
 # Create a new document and set UndoLimit
 NewDocument D BinOcaf
-tinspector -dfbrowser
+tinspector -plugins dfbrowser
 
 #NewDocument D
 cpulimit 300

diff --git a/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx b/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx
index 1dd3d27cc38d61af320a25234886fd4944d1d702..541f7a1116b117c8fdf4eec12c8c1433d3a06240 100644 (file)
--- a/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx
+++ b/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx
@@ -13,17 +13,17 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_AttributePaneStack.hxx>
-
-#include <DFBrowserPane_AttributePaneAPI.hxx>
-#include <DFBrowserPane_AttributePaneSelector.hxx>
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
-#include <DFBrowser_TreeModel.hxx>
-#include <DFBrowser_SearchView.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_AttributePaneStack.hxx>
+
+#include <inspector/DFBrowserPane_AttributePaneAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneSelector.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_SearchView.hxx>
+#include <inspector/DFBrowser_Window.hxx>
 
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx b/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx
index ad1b461e4d3a573f7f3159db16875bca6e1ee4be..e54c39b67009f664a063bbb4f45a3a643799acb5 100644 (file)
--- a/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx
+++ b/tools/DFBrowser/DFBrowser_AttributePaneStack.hxx
@@ -16,9 +16,10 @@
 #ifndef DFBrowser_AttributePaneStack_H
 #define DFBrowser_AttributePaneStack_H
 
-#include <DFBrowser_AttributePaneType.hxx>
+#include <inspector/DFBrowser_AttributePaneType.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
 
 #include <QMap>
 #include <QItemSelection>

diff --git a/tools/DFBrowser/DFBrowser_Communicator.cxx b/tools/DFBrowser/DFBrowser_Communicator.cxx
index 550c67626c37764492cd229d92469339395591e2..10816585d6ee6f25562afccf0cd2bf61bdb22158 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Communicator.cxx
+++ b/tools/DFBrowser/DFBrowser_Communicator.cxx
@@ -14,11 +14,11 @@
 // commercial license or contractual agreement. 
 
 
-#include <DFBrowser_Communicator.hxx>
+#include <inspector/DFBrowser_Communicator.hxx>
 
 #include <CDF_Session.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Window.hxx>
 
 // =======================================================================
 // function : CreateCommunicator

diff --git a/tools/DFBrowser/DFBrowser_Communicator.hxx b/tools/DFBrowser/DFBrowser_Communicator.hxx
index 34bffdec8e04260f516444a44ae2df4524063a35..548e9553314fe70d26fb62ccc0465187e978e320 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Communicator.hxx
+++ b/tools/DFBrowser/DFBrowser_Communicator.hxx
@@ -16,10 +16,11 @@
 #ifndef DFBrowser_Communicator_H
 #define DFBrowser_Communicator_H
 
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/TInspectorAPI_Communicator.hxx>
+
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <TInspectorAPI_Communicator.hxx>
 
 #include <QObject>
 

diff --git a/tools/DFBrowser/DFBrowser_DumpView.cxx b/tools/DFBrowser/DFBrowser_DumpView.cxx
index 8ef0f0de00d99d2b4f860aa276ff29e97c33c482..405aacbf079f11783a8cc8db9b6a1722ed98af8b 100644 (file)
--- a/tools/DFBrowser/DFBrowser_DumpView.cxx
+++ b/tools/DFBrowser/DFBrowser_DumpView.cxx
@@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_DumpView.hxx>
+#include <inspector/DFBrowser_DumpView.hxx>
 
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>
 #include <OSD_OpenFile.hxx>
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
 
 #include <QAbstractItemModel>
 #include <QDir>
@@ -52,7 +52,6 @@ void DFBrowser_DumpView::OnTreeViewSelectionChanged (const QItemSelection& theSe
   QString aDumpInfo;
   const QModelIndex& anIndex = aFirstColumnSelectedIndices.first();
   TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex);
-//#define REQUIRE_OCAF_REVIEW:18 : start
   DFBrowser_ItemPtr anItem;
   if (anItemBase)
     anItem = itemDynamicCast<DFBrowser_Item> (anItemBase);
@@ -87,7 +86,6 @@ void DFBrowser_DumpView::OnTreeViewSelectionChanged (const QItemSelection& theSe
   aFile.close();
   QDir aDir;
   aDir.remove (aFileName.ToCString());
-//#define REQUIRE_OCAF_REVIEW:18 : end
   if (!aDumpInfo.isEmpty())
   {
     myTextEdit->setVisible (true);

diff --git a/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx b/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx
index d06d1d8e602dd2992f12ae74d1d713db3ddec82c..fd5a1a132a6cb47435f14fe5ba76de322ed1220f 100644 (file)
--- a/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx
+++ b/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx
@@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_HighlightDelegate.hxx>
+#include <inspector/DFBrowser_HighlightDelegate.hxx>
 
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Window.hxx>
 #include <QPainter>
 
 // =======================================================================

diff --git a/tools/DFBrowser/DFBrowser_Item.cxx b/tools/DFBrowser/DFBrowser_Item.cxx
index fc4e10168bbb975d7a4652df2718937ee5439e0c..b5b6fc8e49aac1a46709dbe15b3884aca4d8712f 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Item.cxx
+++ b/tools/DFBrowser/DFBrowser_Item.cxx
@@ -13,15 +13,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_Item.hxx>
 
-#include <DFBrowser_ItemRole.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_ItemRole.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDF_AttributeIterator.hxx>
 #include <TDF_ChildIterator.hxx>
@@ -31,7 +31,6 @@
 
 const int INFO_LENGHT = 60;
 
-//#define REQUIRE_OCAF_REVIEW:23
 // =======================================================================
 // function : hasAttribute
 // purpose :

diff --git a/tools/DFBrowser/DFBrowser_Item.hxx b/tools/DFBrowser/DFBrowser_Item.hxx
index 2a226c9cf4708e0450ae5f0729edc4d6fe9711fb..5c10ac1c05ac912c1835af0603bc35841302faab 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Item.hxx
+++ b/tools/DFBrowser/DFBrowser_Item.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowser_Item_H
 #define DFBrowser_Item_H
 
-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
 
 #include <TDF_Attribute.hxx>
 #include <Standard.hxx>

diff --git a/tools/DFBrowser/DFBrowser_ItemApplication.cxx b/tools/DFBrowser/DFBrowser_ItemApplication.cxx
index 89ed532e2d837896af2ae55a7de3968b26ba5300..f6555fc13bff02f8163ba1034be29b840a68c636 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ItemApplication.cxx
+++ b/tools/DFBrowser/DFBrowser_ItemApplication.cxx
@@ -13,20 +13,18 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>
 
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemDocument.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemDocument.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
 
 #include <QObject>
 
-//#define REQUIRE_OCAF_REVIEW:21
-
 // =======================================================================
 // function : createChild
 // purpose :

diff --git a/tools/DFBrowser/DFBrowser_ItemApplication.hxx b/tools/DFBrowser/DFBrowser_ItemApplication.hxx
index d817553f730ad16efd218badf00933892e84327a..dbc675f385046f3d7be618206d45250aacd4aaf6 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ItemApplication.hxx
+++ b/tools/DFBrowser/DFBrowser_ItemApplication.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowser_ItemApplication_H
 #define DFBrowser_ItemApplication_H
 
-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+
 #include <TDocStd_Application.hxx>
 
 class DFBrowser_ItemApplication;

diff --git a/tools/DFBrowser/DFBrowser_ItemBase.cxx b/tools/DFBrowser/DFBrowser_ItemBase.cxx
index ae4d0d66d4431dc563bdf98e7e74529b9adadd67..9cbd59639d127e315954d1d3461ffd4150c5357e 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ItemBase.cxx
+++ b/tools/DFBrowser/DFBrowser_ItemBase.cxx
@@ -13,15 +13,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
 
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_Name.hxx>
 #include <TDF_ChildIterator.hxx>
@@ -30,7 +30,6 @@
 #include <QIcon>
 #include <QVariant>
 
-//#define REQUIRE_OCAF_REVIEW:20
 // =======================================================================
 // function : Constructor
 // purpose :

diff --git a/tools/DFBrowser/DFBrowser_ItemBase.hxx b/tools/DFBrowser/DFBrowser_ItemBase.hxx
index d16eb93850e09c7788feeb28ad20b36af09278c6..c1ef3b6e949f95e92b9fad4d8724f47bdc3a509b 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ItemBase.hxx
+++ b/tools/DFBrowser/DFBrowser_ItemBase.hxx
@@ -17,9 +17,10 @@
 #define DFBrowser_ItemBase_H
 
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
 #include <TDF_Label.hxx>
 
+#include <inspector/TreeModel_ItemBase.hxx>
+
 class DFBrowser_ItemBase;
 class DFBrowser_Module;
 typedef QExplicitlySharedDataPointer<DFBrowser_ItemBase> DFBrowser_ItemBasePtr;

diff --git a/tools/DFBrowser/DFBrowser_ItemDocument.cxx b/tools/DFBrowser/DFBrowser_ItemDocument.cxx
index dcefc48f51eb0033af3533e9787363c30f5e251d..37029caa97c9318b49a30052cfe4f8307cd44834 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ItemDocument.cxx
+++ b/tools/DFBrowser/DFBrowser_ItemDocument.cxx
@@ -13,22 +13,20 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_ItemDocument.hxx>
+#include <inspector/DFBrowser_ItemDocument.hxx>
 
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemApplication.hxx>
-#include <DFBrowser_ItemDocument.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_ItemDocument.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
 
 #include <QIcon>
 #include <QLabel>
 #include <QObject>
 
-//#define REQUIRE_OCAF_REVIEW:22
-
 // =======================================================================
 // function : GetLabel
 // purpose :

diff --git a/tools/DFBrowser/DFBrowser_ItemDocument.hxx b/tools/DFBrowser/DFBrowser_ItemDocument.hxx
index 4338369ea6fcf9c5e12a08369a484bf2b4f9ef34..52b516ae85820e6dbc06b54d1d03c0501368dc32 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ItemDocument.hxx
+++ b/tools/DFBrowser/DFBrowser_ItemDocument.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowser_ItemDocument_H
 #define DFBrowser_ItemDocument_H
 
-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+
 #include <Standard.hxx>
 #include <TDocStd_Document.hxx>
 

diff --git a/tools/DFBrowser/DFBrowser_Module.cxx b/tools/DFBrowser/DFBrowser_Module.cxx
index 404c6f4f5f9628dcbc122bef11364f58c5a5c955..0a04c64621dccc4d7084e05cae8199f08e4ca42b 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Module.cxx
+++ b/tools/DFBrowser/DFBrowser_Module.cxx
@@ -13,22 +13,22 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_Module.hxx>
-
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemApplication.hxx>
-#include <DFBrowser_ItemBase.hxx>
-#include <DFBrowser_ItemRole.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeModel.hxx>
-
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_AttributePaneCreator.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_Tools.hxx>
-
-#include <DFBrowserPaneXDE_AttributePaneCreator.hxx>
-#include <DFBrowserPaneXDE_Tools.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemRole.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>
+
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePaneCreator.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
+
+#include <inspector/DFBrowserPaneXDE_AttributePaneCreator.hxx>
+#include <inspector/DFBrowserPaneXDE_Tools.hxx>
 
 #include <XCAFApp_Application.hxx>
 

diff --git a/tools/DFBrowser/DFBrowser_Module.hxx b/tools/DFBrowser/DFBrowser_Module.hxx
index b15127656162f09bdd568d712819bfcaf36bba39..d3e2748555812c0cd13ed37f6deb111a37d6616b 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Module.hxx
+++ b/tools/DFBrowser/DFBrowser_Module.hxx
@@ -16,15 +16,16 @@
 #ifndef DFBrowser_Module_H
 #define DFBrowser_Module_H
 
+#include <inspector/DFBrowser_TreeModel.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <AIS_InteractiveContext.hxx>
-#include <DFBrowser_TreeModel.hxx>
 #include <NCollection_Map.hxx>
 #include <Standard.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDocStd_Application.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TreeModel_ItemBase.hxx>
 
 #include <QObject>
 

diff --git a/tools/DFBrowser/DFBrowser_OpenApplication.cxx b/tools/DFBrowser/DFBrowser_OpenApplication.cxx
index 39b919dc4f751f723ab8dc186b706c1b91e13499..65785a7518f48bc9e30d3a6ff2e7ffea01dc8f9b 100644 (file)
--- a/tools/DFBrowser/DFBrowser_OpenApplication.cxx
+++ b/tools/DFBrowser/DFBrowser_OpenApplication.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_OpenApplication.hxx>
+#include <inspector/DFBrowser_OpenApplication.hxx>
 
 #include <BinDrivers.hxx>
 #include <BinLDrivers.hxx>
@@ -32,7 +32,6 @@
 #include <XmlXCAFDrivers.hxx>
 #include <UTL.hxx>
 
-//#define REQUIRE_OCAF_REVIEW:24
 namespace DFBrowser_OpenApplication
 {
 

diff --git a/tools/DFBrowser/DFBrowser_PropertyPanel.cxx b/tools/DFBrowser/DFBrowser_PropertyPanel.cxx
index 4ec0e9c036b1de3359af4b8a396019d1eb183be8..52545a384509ff64aa9c6e2179edfba15d956521 100644 (file)
--- a/tools/DFBrowser/DFBrowser_PropertyPanel.cxx
+++ b/tools/DFBrowser/DFBrowser_PropertyPanel.cxx
@@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_PropertyPanel.hxx>
+#include <inspector/DFBrowser_PropertyPanel.hxx>
 
-#include <DFBrowser_AttributePaneStack.hxx>
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_SearchView.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_AttributePaneStack.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_SearchView.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>
 
 #include <QAbstractItemModel>
 #include <QGridLayout>

diff --git a/tools/DFBrowser/DFBrowser_PropertyPanel.hxx b/tools/DFBrowser/DFBrowser_PropertyPanel.hxx
index baa10ad17c4850c9bd67c55d36b64bff64548e65..8bfba4b18cf8fe9e45b40890fc8598ab394295a6 100644 (file)
--- a/tools/DFBrowser/DFBrowser_PropertyPanel.hxx
+++ b/tools/DFBrowser/DFBrowser_PropertyPanel.hxx
@@ -16,8 +16,9 @@
 #ifndef DFBrowser_PropertyPanel_H
 #define DFBrowser_PropertyPanel_H
 
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
 
 #include <QItemSelection>
 #include <QObject>

diff --git a/tools/DFBrowser/DFBrowser_SearchLine.cxx b/tools/DFBrowser/DFBrowser_SearchLine.cxx
index 0b89cf9876b904352a50713766b434137481d489..101eb370550344ddcf416c5237a3d68a29e8e440 100644 (file)
--- a/tools/DFBrowser/DFBrowser_SearchLine.cxx
+++ b/tools/DFBrowser/DFBrowser_SearchLine.cxx
@@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowser_SearchLineModel.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_SearchLineModel.hxx>
+#include <inspector/DFBrowser_Window.hxx>
 
-#include <DFBrowserPane_Tools.hxx>
-#include <DFBrowser_Module.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowser_Module.hxx>
 
 #include <TDocStd_Application.hxx>
 #include <TDocStd_Document.hxx>

diff --git a/tools/DFBrowser/DFBrowser_SearchLine.hxx b/tools/DFBrowser/DFBrowser_SearchLine.hxx
index 9ce3744080a510fc5ee04ccff60205e2f409af3a..ac8438613ce6131626c5b72fd9dcef7168367a2a 100644 (file)
--- a/tools/DFBrowser/DFBrowser_SearchLine.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchLine.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowser_SearchLine_H
 #define DFBrowser_SearchLine_H
 
-#include <DFBrowser_SearchLineModel.hxx> // to include DFBrowser_SearchItemInfo
+#include <inspector/DFBrowser_SearchLineModel.hxx> // to include DFBrowser_SearchItemInfo
+
 #include <Standard.hxx>
 #include <TDocStd_Application.hxx>
 #include <TDF_Label.hxx>

diff --git a/tools/DFBrowser/DFBrowser_SearchLineModel.cxx b/tools/DFBrowser/DFBrowser_SearchLineModel.cxx
index 052acc7f120acc16c5c16d72d53c488ca38b7367..362b258ac9fa6482acab2b6bdcd02a305c6bed91 100644 (file)
--- a/tools/DFBrowser/DFBrowser_SearchLineModel.cxx
+++ b/tools/DFBrowser/DFBrowser_SearchLineModel.cxx
@@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_SearchLineModel.hxx>
+#include <inspector/DFBrowser_SearchLineModel.hxx>
 
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <QDir>
 #include <QIcon>
@@ -139,6 +139,8 @@ QVariant DFBrowser_SearchLineModel::data (const QModelIndex& theIndex, int theRo
           anIcon = DFBrowser_Module::GetAttributeInfo (anAttributeName.toUtf8().data(),
                                                        myModule, DFBrowserPane_ItemRole_Decoration_40x40, 0);
         }
+        else
+          anIcon = DFBrowser_Tools::GetLabelIcon (TDF_Label(), false);
         return anIcon;
       }
       if (theRole == Qt::SizeHintRole) return QSize (80, 80);

diff --git a/tools/DFBrowser/DFBrowser_SearchLineModel.hxx b/tools/DFBrowser/DFBrowser_SearchLineModel.hxx
index dde48946098fc1d6205600f547d930631ad16475..cfc8e9b6991b229329ada36f7e71f0b2cb17929f 100644 (file)
--- a/tools/DFBrowser/DFBrowser_SearchLineModel.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchLineModel.hxx
@@ -16,11 +16,12 @@
 #ifndef DFBrowser_SearchLineModel_H
 #define DFBrowser_SearchLineModel_H
 
-#include <DFBrowser_SearchItemInfo.hxx>
+#include <inspector/DFBrowser_SearchItemInfo.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDF_Label.hxx>
-#include <TreeModel_ItemBase.hxx>
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4127) // conditional expression is constant

diff --git a/tools/DFBrowser/DFBrowser_SearchView.cxx b/tools/DFBrowser/DFBrowser_SearchView.cxx
index 6da5a5f16065ee214cc8d2b2eff051dd8f387342..c0416aa30c878b79278b745ba9f03225292f8d08 100644 (file)
--- a/tools/DFBrowser/DFBrowser_SearchView.cxx
+++ b/tools/DFBrowser/DFBrowser_SearchView.cxx
@@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_SearchView.hxx>
+#include <inspector/DFBrowser_SearchView.hxx>
 
-#include <DFBrowser_HighlightDelegate.hxx>
-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowser_SearchLineModel.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_HighlightDelegate.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_SearchLineModel.hxx>
+#include <inspector/DFBrowser_Window.hxx>
 
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <QAbstractProxyModel>
 #include <QGridLayout>

diff --git a/tools/DFBrowser/DFBrowser_SearchView.hxx b/tools/DFBrowser/DFBrowser_SearchView.hxx
index 5126b5d1dec9dd8b0d56609b97b9f0ab68613d71..44fc17728abf000836a4994d0fd0ffe13ccc1a2e 100644 (file)
--- a/tools/DFBrowser/DFBrowser_SearchView.hxx
+++ b/tools/DFBrowser/DFBrowser_SearchView.hxx
@@ -16,9 +16,10 @@
 #ifndef DFBrowser_SearchView_H
 #define DFBrowser_SearchView_H
 
-#include <DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
 
 #include <QItemSelection>
 #include <QObject>

diff --git a/tools/DFBrowser/DFBrowser_Shortcut.cxx b/tools/DFBrowser/DFBrowser_Shortcut.cxx
index 2fb7f3aa9660e425addbca9bd309be40b1c2edf5..2f644c5aa1380fa31fa46d342c0e27c3e36245a8 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Shortcut.cxx
+++ b/tools/DFBrowser/DFBrowser_Shortcut.cxx
@@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_Shortcut.hxx>
+#include <inspector/DFBrowser_Shortcut.hxx>
 
-#include <DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Module.hxx>
 
 #include <QApplication>
 #include <QKeyEvent>

diff --git a/tools/DFBrowser/DFBrowser_Thread.cxx b/tools/DFBrowser/DFBrowser_Thread.cxx
index 757ff8a7b4f6fdd1d66e668d45c2e2e3e409e106..a6ed15493e17f5dfe6e60c6a7557ef8432e53d33 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Thread.cxx
+++ b/tools/DFBrowser/DFBrowser_Thread.cxx
@@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_Thread.hxx>
-#include <DFBrowser_ThreadItemSearch.hxx>
-#include <DFBrowser_ThreadItemUsedShapesMap.hxx>
-#include <DFBrowser_TreeLevelLine.hxx>
-#include <DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_Thread.hxx>
+#include <inspector/DFBrowser_ThreadItemSearch.hxx>
+#include <inspector/DFBrowser_ThreadItemUsedShapesMap.hxx>
+#include <inspector/DFBrowser_TreeLevelLine.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
 
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Window.hxx>
 
 #include <QThread>
 

diff --git a/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx b/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx
index fd973dc0365f572406bf8e99fab7e21280f7ea54..b734ba1589fa48f3030cd59268998bac655c0ba8 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemSearch.cxx
@@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_ThreadItemSearch.hxx>
+#include <inspector/DFBrowser_ThreadItemSearch.hxx>
 
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeModel.hxx>
-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_Comment.hxx>
 #include <TDataStd_Name.hxx>
@@ -43,7 +43,6 @@ void DFBrowser_ThreadItemSearch::Run()
   myDocumentValues.clear();
   myDocumentInfoValues.clear();
 
-  //#define REQUIRE_OCAF_REVIEW:25 : start
   QMap<QString, DFBrowser_SearchItemInfo> anAdditionalValues;
   QStringList anInfoValues;
   QStringList aCurrentPath;
@@ -62,7 +61,6 @@ void DFBrowser_ThreadItemSearch::Run()
     myDocumentValues[aDocId] = anAdditionalValues;
     myDocumentInfoValues[aDocId] = anInfoValues;
   }
-  //#define REQUIRE_OCAF_REVIEW:25 : end
 }
 
 // =======================================================================
@@ -116,8 +114,7 @@ void DFBrowser_ThreadItemSearch::addLabel (const TDF_Label& theLabel, const QStr
   if (!theValues.contains (anEntry))
   {
     theInfoValues.append (anEntry);
-    theValues[anEntry] = DFBrowser_SearchItemInfo (DFBrowser_Tools::GetLabelIcon (theLabel, false),
-                                                   anEntry, theCurrentPath, QDir::separator());
+    theValues[anEntry] = DFBrowser_SearchItemInfo ("40x40_label_icon", anEntry, theCurrentPath, QDir::separator());
   }
 }
 

diff --git a/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx b/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx
index 6640089b2d8015a07b1b2a9feaad8d8040ab7978..b1112d1a0045e70bd47d8a66115a5171093ba492 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemSearch.hxx
@@ -16,8 +16,9 @@
 #ifndef DFBrowser_ThreadItemSearch_H
 #define DFBrowser_ThreadItemSearch_H
 
-#include <DFBrowser_ThreadItem.hxx>
-#include <DFBrowser_SearchLineModel.hxx> // to include DFBrowser_SearchItemInfo
+#include <inspector/DFBrowser_ThreadItem.hxx>
+#include <inspector/DFBrowser_SearchLineModel.hxx> // to include DFBrowser_SearchItemInfo
+
 #include <Standard.hxx>
 #include <TDF_Label.hxx>
 

diff --git a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx
index 4b5eb787f25610160ae7e011a1059af445185cf3..5a80636808d71f6fe946939523e0a83ca61bce43 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx
@@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_ThreadItemUsedShapesMap.hxx>
+#include <inspector/DFBrowser_ThreadItemUsedShapesMap.hxx>
 
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>
 
-#include <DFBrowserPane_TNamingUsedShapes.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TNamingUsedShapes.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TNaming_DataMapIteratorOfDataMapOfShapePtrRefShape.hxx>
 #include <TNaming_PtrRefShape.hxx>
@@ -89,7 +89,10 @@ void DFBrowser_ThreadItemUsedShapesMap::ApplyValues()
     TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex
                                                    (aDFBrowserModel->FindIndexByAttribute (aRefIt.Key()));
     if (anItemBase)
+    {
+      anItemBase->Reset();
       anItemBase->Init();
+    }
   }
   // clear cache
   myAttributeRefs.Clear();
@@ -205,7 +208,6 @@ void DFBrowser_ThreadItemUsedShapesMap::addValue (const TCollection_AsciiString&
 // function : findReferences
 // purpose :
 // =======================================================================
-//#define REQUIRE_OCAF_REVIEW:26 : start
 void DFBrowser_ThreadItemUsedShapesMap::findReferences (Handle(TDF_Attribute) theAttribute,
                                                         std::list<TCollection_AsciiString>& theReferences)
 {
@@ -219,4 +221,3 @@ void DFBrowser_ThreadItemUsedShapesMap::findReferences (Handle(TDF_Attribute) th
        anEntryIt != anEntries.end(); anEntryIt++)
     theReferences.push_back (anEntryIt->first);
 }
-//#define REQUIRE_OCAF_REVIEW:26 : end

diff --git a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx
index d3635891b754429919ea09945971b9ab1a137fb0..21ecd201387b42faa911f66f7801593bf2b61065 100644 (file)
--- a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx
+++ b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBROWSER_ThreadItemUsedShapesMap_H
 #define DFBROWSER_ThreadItemUsedShapesMap_H
 
-#include <DFBrowser_ThreadItem.hxx>
+#include <inspector/DFBrowser_ThreadItem.hxx>
+
 #include <NCollection_DataMap.hxx>
 #include <Standard.hxx>
 #include <TCollection_AsciiString.hxx>

diff --git a/tools/DFBrowser/DFBrowser_Tools.cxx b/tools/DFBrowser/DFBrowser_Tools.cxx
index 71a57d0697b1aa4fb5e801cfe8855bc8b9957f02..950ff0e05565e51bda773416509089805b977ee7 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Tools.cxx
+++ b/tools/DFBrowser/DFBrowser_Tools.cxx
@@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
 
-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
 
-#include <DFBrowserPane_AttributePaneCreator.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneCreator.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Tool.hxx>
@@ -33,8 +33,6 @@
 #include <QPalette>
 #include <QWidget>
 
-//#define REQUIRE_OCAF_REVIEW:27
-
 namespace DFBrowser_Tools
 {
   // =======================================================================

diff --git a/tools/DFBrowser/DFBrowser_Tools.hxx b/tools/DFBrowser/DFBrowser_Tools.hxx
index 3753c502ccc1f883ad3acbea96ef804f1ddff9a8..65658a3b7c2361e346bef58e6da32e2b4d0cd622 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Tools.hxx
+++ b/tools/DFBrowser/DFBrowser_Tools.hxx
@@ -16,9 +16,10 @@
 #ifndef DFBrowser_Tools_H
 #define DFBrowser_Tools_H
 
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
 #include <Standard_GUID.hxx>
-#include <TreeModel_ItemBase.hxx>
 #include <TDocStd_Document.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_Attribute.hxx>

diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx
index c1be576f31c35bebc90486d20ba053f9b48139bc..8714f4f35784bb46928f0f833916ea06a8a01bb2 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx
@@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_TreeLevelLine.hxx>
+#include <inspector/DFBrowser_TreeLevelLine.hxx>
 
-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowser_TreeLevelLineDelegate.hxx>
-#include <DFBrowser_TreeLevelLineModel.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_TreeLevelLineDelegate.hxx>
+#include <inspector/DFBrowser_TreeLevelLineModel.hxx>
 
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <QAbstractItemModel>
 #include <QFrame>

diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx b/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx
index bcd4b077e1357d626bd4fae07dcb5119db5a6767..d24bd27464c5dad2a1bc812c969a9e80410f4221 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.hxx
@@ -16,8 +16,9 @@
 #ifndef DFBrowser_TreeLevelLine_H
 #define DFBrowser_TreeLevelLine_H
 
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
 
 #include <QItemSelection>
 #include <QObject>

diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx
index 139584554faf297227c9eeefb2014cc4731cacfb..9eb9cc564642b8cc45c69be71b1c394628684faf 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_TreeLevelLineDelegate.hxx>
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_TreeLevelLineDelegate.hxx>
+#include <inspector/DFBrowser_Window.hxx>
 
 #include <QPainter>
 

diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx
index c1c0a4e152a74f2f7362320f264bd30cbdf5333f..acdb76368fd996460175f2a839857589bef369d7 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.cxx
@@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_TreeLevelLineModel.hxx>
+#include <inspector/DFBrowser_TreeLevelLineModel.hxx>
 
-#include <DFBrowser_ItemBase.hxx>
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
 
 #include <QIcon>
 #include <QWidget>

diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx
index b486e363d23e3a427be51d18a686bcf9f480886d..e79467ee603ea87efca8413909b333e5e8f596e2 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelLineModel.hxx
@@ -16,8 +16,9 @@
 #ifndef DFBrowser_TreeLevelLineModel_H
 #define DFBrowser_TreeLevelLineModel_H
 
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
 
 #include <QAbstractTableModel>
 #include <QObject>

diff --git a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx
index 9663e6f32d3a31727b0e49432d84135d1f90f15d..60e899812c6c356773dd13865fef0994694aa63d 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx
@@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>
 
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_TreeLevelViewModel.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowserPane_Tools.hxx>
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_TreeLevelViewModel.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
 
 #include <QItemSelectionModel>
 

diff --git a/tools/DFBrowser/DFBrowser_TreeLevelView.hxx b/tools/DFBrowser/DFBrowser_TreeLevelView.hxx
index 00a9a7c2adc6dab6ef87f36a58fca83fa6e65753..6b9118accb1167463b7a5b6e55ce30d98eff8ede 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeLevelView.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelView.hxx
@@ -16,8 +16,9 @@
 #ifndef DFBrowser_TreeLevelView_H
 #define DFBrowser_TreeLevelView_H
 
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
 
 #include <QObject>
 #include <QItemSelection>

diff --git a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx
index 1b85271c0ddb30ab83c142d36280485b65e7735f..e618568d5162437cf1715fb82c048d5593082ea3 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx
@@ -13,18 +13,18 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_TreeLevelViewModel.hxx>
+#include <inspector/DFBrowser_TreeLevelViewModel.hxx>
 
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemRole.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemRole.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>
 
 #include <TDF_AttributeIterator.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <TDF_Label.hxx>
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
 
 #include <QIcon>
 

diff --git a/tools/DFBrowser/DFBrowser_TreeModel.cxx b/tools/DFBrowser/DFBrowser_TreeModel.cxx
index af77057fdfa7e96eee696c5fb23a789808b9b292..ce91e805669fb06d8d3a2dee6bfde929fed89c49 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeModel.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeModel.cxx
@@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>
 
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_ItemApplication.hxx>
-#include <DFBrowser_ItemDocument.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Window.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_ItemDocument.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Window.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 #include <NCollection_List.hxx>
 
 #include <TDocStd_Application.hxx>
@@ -30,7 +30,6 @@
 
 #include <QAbstractItemModel>
 
-//#define REQUIRE_OCAF_REVIEW:19
 // =======================================================================
 // function : Constructor
 // purpose :
@@ -71,7 +70,6 @@ Handle(TDocStd_Application) DFBrowser_TreeModel::GetTDocStdApplication() const
 // =======================================================================
 QModelIndex DFBrowser_TreeModel::FindIndex (const TDF_Label& theLabel) const
 {
-//#define REQUIRE_OCAF_REVIEW:10 : start (GetReferences)
   TDF_Label aRoot = theLabel.Root();
 
   NCollection_List<TDF_Label> aLabels;
@@ -124,7 +122,6 @@ QModelIndex DFBrowser_TreeModel::FindIndex (const TDF_Label& theLabel) const
       }
     }
   }
-  //#define REQUIRE_OCAF_REVIEW:10 : end
   return aParentIndex;
 }
 
@@ -233,10 +230,8 @@ QModelIndex DFBrowser_TreeModel::FindIndexByAttribute (Handle(TDF_Attribute) the
 void DFBrowser_TreeModel::ConvertToIndices (const NCollection_List<TDF_Label>& theReferences,
                                             QModelIndexList& theIndices)
 {
-//#define REQUIRE_OCAF_REVIEW:10 : start (GetReferences)
   for (NCollection_List<TDF_Label>::Iterator aLabelItr (theReferences); aLabelItr.More(); aLabelItr.Next())
     theIndices.append (FindIndex (aLabelItr.Value()));
-//#define REQUIRE_OCAF_REVIEW:10 : end
 }
 
 // =======================================================================

diff --git a/tools/DFBrowser/DFBrowser_TreeModel.hxx b/tools/DFBrowser/DFBrowser_TreeModel.hxx
index ebcd34b54c65f063a4959c37ff7a11148cdad588..1bc3b4b654052a7d659d258792f606eea81ec84e 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeModel.hxx
+++ b/tools/DFBrowser/DFBrowser_TreeModel.hxx
@@ -16,12 +16,13 @@
 #ifndef DFBrowser_TreeModel_H
 #define DFBrowser_TreeModel_H
 
-#include <DFBrowser_ItemBase.hxx>
+#include <inspector/DFBrowser_ItemBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
+
 #include <NCollection_List.hxx>
 #include <Standard.hxx>
 #include <TDF_Label.hxx>
 #include <TDocStd_Application.hxx>
-#include <TreeModel_ModelBase.hxx>
 
 #include <QByteArray>
 #include <QHash>

diff --git a/tools/DFBrowser/DFBrowser_TreeView.cxx b/tools/DFBrowser/DFBrowser_TreeView.cxx
index 9ac42fc1cbf303e681eb912b79bd8ae2d902221b..33658169d16592e48bdc9587cb81a270dc7c0e58 100644 (file)
--- a/tools/DFBrowser/DFBrowser_TreeView.cxx
+++ b/tools/DFBrowser/DFBrowser_TreeView.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_TreeView.hxx>
+#include <inspector/DFBrowser_TreeView.hxx>
 
 // =======================================================================
 // function : SetPredefinedSize

diff --git a/tools/DFBrowser/DFBrowser_Window.cxx b/tools/DFBrowser/DFBrowser_Window.cxx
index 8c5c2602f171cb10779c15162f8ec55f5958d35b..640dfd1f2c0f0e4aac2bd729cc7c149d44e1d46d 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Window.cxx
+++ b/tools/DFBrowser/DFBrowser_Window.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowser_Window.hxx>
+#include <inspector/DFBrowser_Window.hxx>
 
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_InteractiveObject.hxx>
@@ -21,40 +21,44 @@
 
 #include <CDF_Session.hxx>
 
-#include <DFBrowserPane_AttributePaneAPI.hxx>
-
-#include <DFBrowser_AttributePaneStack.hxx>
-#include <DFBrowser_AttributePaneType.hxx>
-#include <DFBrowser_DumpView.hxx>
-#include <DFBrowser_Item.hxx>
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_OpenApplication.hxx>
-#include <DFBrowser_PropertyPanel.hxx>
-#include <DFBrowser_SearchLine.hxx>
-#include <DFBrowser_SearchView.hxx>
-#include <DFBrowser_Shortcut.hxx>
-#include <DFBrowser_Thread.hxx>
-#include <DFBrowser_ThreadItemSearch.hxx>
-#include <DFBrowser_ThreadItemUsedShapesMap.hxx>
-#include <DFBrowser_Tools.hxx>
-#include <DFBrowser_TreeLevelLine.hxx>
-#include <DFBrowser_TreeLevelView.hxx>
-#include <DFBrowser_TreeModel.hxx>
-#include <DFBrowser_TreeView.hxx>
-
-#include <DFBrowserPane_AttributePaneSelector.hxx>
-#include <DFBrowserPane_SelectionKind.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneAPI.hxx>
+
+#include <inspector/DFBrowser_AttributePaneStack.hxx>
+#include <inspector/DFBrowser_AttributePaneType.hxx>
+#include <inspector/DFBrowser_DumpView.hxx>
+#include <inspector/DFBrowser_Item.hxx>
+#include <inspector/DFBrowser_ItemApplication.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_OpenApplication.hxx>
+#include <inspector/DFBrowser_PropertyPanel.hxx>
+#include <inspector/DFBrowser_SearchLine.hxx>
+#include <inspector/DFBrowser_SearchView.hxx>
+#include <inspector/DFBrowser_Shortcut.hxx>
+#include <inspector/DFBrowser_Thread.hxx>
+#include <inspector/DFBrowser_ThreadItemSearch.hxx>
+#include <inspector/DFBrowser_ThreadItemUsedShapesMap.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_TreeLevelLine.hxx>
+#include <inspector/DFBrowser_TreeLevelView.hxx>
+#include <inspector/DFBrowser_TreeModel.hxx>
+#include <inspector/DFBrowser_TreeView.hxx>
+
+#include <inspector/DFBrowserPane_AttributePaneSelector.hxx>
+#include <inspector/DFBrowserPane_SelectionKind.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <OSD_Directory.hxx>
 #include <OSD_Environment.hxx>
 #include <OSD_Protection.hxx>
 
-#include <View_Displayer.hxx>
-#include <View_ToolBar.hxx>
-#include <View_Viewer.hxx>
-#include <View_Widget.hxx>
-#include <View_Window.hxx>
+#include <inspector/View_Displayer.hxx>
+#include <inspector/View_ToolBar.hxx>
+#include <inspector/View_Viewer.hxx>
+#include <inspector/View_Widget.hxx>
+#include <inspector/View_Window.hxx>
+
+#include <TDF_Tool.hxx>
+#include <inspector/TreeModel_MessageDialog.hxx>
 
 #include <QAction>
 #include <QApplication>
@@ -100,7 +104,7 @@ const int DEFAULT_BROWSER_HEIGHT = 800;
 // purpose :
 // =======================================================================
 DFBrowser_Window::DFBrowser_Window()
-: myModule (0), myParent (0), myPropertyPanel (0)
+: myModule (0), myParent (0), myPropertyPanel (0), myExportToShapeViewDialog (0)
 {
   myMainWindow = new QMainWindow (0);
 
@@ -237,6 +241,72 @@ void DFBrowser_Window::UpdateContent()
     myParameters->SetFileNames(aName, NCollection_List<TCollection_AsciiString>());
   }
   onUpdateClicked();
+
+  // make parameter items selected if defined
+  if (myParameters->FindSelectedNames(aName))
+  {
+    const NCollection_List<TCollection_AsciiString>& aSelected = myParameters->GetSelectedNames (aName);
+
+    DFBrowser_TreeModel* aTreeModel = dynamic_cast<DFBrowser_TreeModel*> (myTreeView->model());
+    Handle(TDocStd_Application) anApplication = aTreeModel->GetTDocStdApplication();
+
+    QItemSelectionModel* aSelectionModel = myTreeView->selectionModel();
+    aSelectionModel->clear();
+
+    NCollection_List<TCollection_AsciiString>::Iterator aSelectedIt (aSelected);
+    if (aSelectedIt.More())
+    {
+      TCollection_AsciiString aLabelEntry = aSelectedIt.Value();
+
+      TDF_Label aLabel;
+      for (Standard_Integer aDocId = 1, aNbDoc = anApplication->NbDocuments(); aDocId <= aNbDoc; aDocId++)
+      {
+        Handle(TDocStd_Document) aDocument;
+        anApplication->GetDocument (aDocId, aDocument);
+
+        TDF_Tool::Label(aDocument->GetData(), aLabelEntry.ToCString(), aLabel, Standard_False);
+        if (!aLabel.IsNull())
+          break;
+      }
+      if (!aLabel.IsNull())
+      {
+        QModelIndex anIndexToBeSelected = aTreeModel->FindIndex (aLabel);
+
+        TCollection_AsciiString anAttributeType;
+        aSelectedIt.Next();
+        // find attribute by attribute type on the given label
+        if  (aSelectedIt.More())
+        {
+          anAttributeType = aSelectedIt.Value();
+
+          TreeModel_ItemBasePtr aLabelItem = TreeModel_ModelBase::GetItemByIndex (anIndexToBeSelected);
+          //DFBrowser_ItemPtr anItem = itemDynamicCast<DFBrowser_Item> (anItemBase);
+          for (int aChildId = 0, aNbChildren = aLabelItem->rowCount(); aChildId < aNbChildren; aChildId++)
+          {
+            QModelIndex anIndex = aTreeModel->index (aChildId, 0, anIndexToBeSelected);
+            TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex);
+            DFBrowser_ItemPtr anItem = itemDynamicCast<DFBrowser_Item> (anItemBase);
+            if (anItem->HasAttribute())
+            {
+              // processing attribute in theValue
+              DFBrowser_ItemApplicationPtr aRootAppItem = itemDynamicCast<DFBrowser_ItemApplication>(aTreeModel->RootItem (0));
+              QString anAttributeInfo = DFBrowser_Module::GetAttributeInfo (anItem->GetAttribute(), aRootAppItem->GetModule(),
+                                                      Qt::DisplayRole, 0).toString();
+              if (anAttributeInfo == anAttributeType.ToCString())
+              {
+                anIndexToBeSelected = anIndex;
+                break;
+              }
+            }
+          }
+        }
+        aSelectionModel->select (anIndexToBeSelected, QItemSelectionModel::Select);
+        myTreeView->scrollTo (anIndexToBeSelected);
+      }
+    }
+
+    myParameters->SetSelectedNames(aName, NCollection_List<TCollection_AsciiString>());
+  }
 }
 
 // =======================================================================
@@ -326,8 +396,6 @@ void DFBrowser_Window::Init (const NCollection_List<Handle(Standard_Transient)>&
 // =======================================================================
 void DFBrowser_Window::OpenFile (const TCollection_AsciiString& theFileName)
 {
-  //#define REQUIRE_OCAF_REVIEW:28 (check that previous application is correctly closed) : start
-
   QApplication::setOverrideCursor (Qt::WaitCursor);
   myThread->TerminateThread();
 
@@ -389,7 +457,6 @@ void DFBrowser_Window::OpenFile (const TCollection_AsciiString& theFileName)
     myModule->SetInitialTreeViewSelection();
     QApplication::restoreOverrideCursor();
   }
-  //#define REQUIRE_OCAF_REVIEW:28 (check that previous application is correctly closed) : end
 }
 
 // =======================================================================
@@ -665,18 +732,27 @@ void DFBrowser_Window::onPaneSelectionChanged (const QItemSelection&,
         return;
 
       TCollection_AsciiString aPluginName ("TKShapeView");
-      if (!myParameters->FindParameters (aPluginName))
-        return;
+      NCollection_List<Handle(Standard_Transient)> aParameters;
+      if (myParameters->FindParameters (aPluginName))
+        aParameters = myParameters->Parameters (aPluginName);
 
-      NCollection_List<Handle(Standard_Transient)> aParameters = myParameters->Parameters (aPluginName);
       int aParametersCount = aParameters.Extent();
       anAttributePane->GetSelectionParameters (aSelectionModel, aParameters);
       if (aParametersCount != aParameters.Extent()) // some TShapes are added
       {
-        myParameters->SetParameters (aPluginName, aParameters);
-        QMessageBox::information (0, "Information", QString ("TShape %1 is sent to %2 tool.")
-                                 .arg (DFBrowserPane_Tools::GetPointerInfo (aParameters.Last()).ToCString())
-                                 .arg (aPluginName.ToCString()));
+        TCollection_AsciiString aPluginShortName = aPluginName.SubString (3, aPluginName.Length());
+        QString aMessage = QString ("TShape %1 is sent to %2.")
+          .arg (DFBrowserPane_Tools::GetPointerInfo (aParameters.Last()).ToCString())
+          .arg (aPluginShortName.ToCString());
+        QString aQuestion = QString ("Would you like to activate %1 immediately?\n")
+          .arg (aPluginShortName.ToCString()).toStdString().c_str();
+        if (!myExportToShapeViewDialog)
+          myExportToShapeViewDialog = new TreeModel_MessageDialog (myParent, aMessage, aQuestion);
+        else
+          myExportToShapeViewDialog->SetInformation (aMessage);
+        myExportToShapeViewDialog->Start();
+
+        myParameters->SetParameters (aPluginName, aParameters, myExportToShapeViewDialog->IsAccepted());
       }
       return;
     }
@@ -700,9 +776,7 @@ void DFBrowser_Window::onPaneSelectionChanged (const QItemSelection&,
   Handle(TDF_Attribute) anAttribute = myModule->FindAttribute (aSelectedIndex);
   NCollection_List<TDF_Label> aReferences;
   Handle(Standard_Transient) aPresentation;
-//#define REQUIRE_OCAF_REVIEW:10 : start (GetReferences)
   anAttributePane->GetReferences (anAttribute, aReferences, aPresentation);
-//#define REQUIRE_OCAF_REVIEW:10 : end
   QModelIndexList anIndices;
   DFBrowser_TreeModel* aTreeModel = dynamic_cast<DFBrowser_TreeModel*> (myTreeView->model());
   if (!aReferences.IsEmpty())

diff --git a/tools/DFBrowser/DFBrowser_Window.hxx b/tools/DFBrowser/DFBrowser_Window.hxx
index 9c1ace1609d936219c035d7ccd6aa46eca31d253..20dd55b6f612a4f3fa4a04131927ce1fefe6dec8 100644 (file)
--- a/tools/DFBrowser/DFBrowser_Window.hxx
+++ b/tools/DFBrowser/DFBrowser_Window.hxx
@@ -16,13 +16,14 @@
 #ifndef DFBrowser_Window_H
 #define DFBrowser_Window_H
 
+#include <inspector/TInspectorAPI_PluginParameters.hxx>
+
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_ListOfInteractive.hxx>
 #include <NCollection_List.hxx>
 #include <Standard.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Label.hxx>
-#include <TInspectorAPI_PluginParameters.hxx>
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4127) // conditional expression is constant
@@ -39,6 +40,8 @@ class DFBrowser_Shortcut;
 class DFBrowser_Thread;
 class DFBrowser_TreeLevelLine;
 
+class TreeModel_MessageDialog;
+
 class View_ToolBar;
 class View_Window;
 
@@ -234,6 +237,7 @@ private:
   DFBrowser_DumpView* myDumpView; //!< Text editor where "Dump" method output is shown
   DFBrowser_Thread* myThread; //!< Threads manipulator, starting thread items, listens finalizing
   DFBrowser_Shortcut* myShortcut; //!< Short cut processor, F5 - updates OCAF view model content
+  TreeModel_MessageDialog* myExportToShapeViewDialog; //!< dialog about exporting TopoDS_Shape to ShapeView plugin
   Handle(TInspectorAPI_PluginParameters) myParameters; //!< contains application, context, files that should be opened
 };
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx
index 9d350142ca89174f2274e7fa23750b404933c77e..bdcc8a3d9e0293770e0a8fc9f37163845e231039 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx
@@ -13,11 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
 
 #include <AIS_InteractiveObject.hxx>
 
@@ -27,8 +27,6 @@
 #include <QTableView>
 #include <QWidget>
 
-//#define REQUIRE_OCAF_REVIEW:3 : start
-
 // =======================================================================
 // function : Constructor
 // purpose :
@@ -154,4 +152,3 @@ QMap<int, int> DFBrowserPane_AttributePane::getTableColumnWidths() const
     aValues.insert (aColumnId, DFBrowserPane_Tools::DefaultPanelColumnWidth (aColumnId));
   return aValues;
 }
-//#define REQUIRE_OCAF_REVIEW:2 : end

diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx
index f5298ab6245abdc78dd38401426cce4c3300753a..972ad80ca76a9453e3550289ddd96c52cc25b804 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPane_AttributePane_H
 #define DFBrowserPane_AttributePane_H
 
-#include <DFBrowserPane_AttributePaneAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneAPI.hxx>
 
 #include <TDF_Attribute.hxx>
 #include <TDF_Label.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.cxx
index bcb80c70cc7a0852400b8d431ecdd90a08ca8000..9869790ed48bf886af6a5bef2a91ce3805c59a61 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.cxx
@@ -13,15 +13,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_AttributePaneCreator.hxx>
+#include <inspector/DFBrowserPane_AttributePaneCreator.hxx>
 
 #include <TDF_Attribute.hxx>
 
 #include <TDF_Reference.hxx>
 
 // the types are defined in TDF library
-#include <DFBrowserPane_TDFReference.hxx>
-#include <DFBrowserPane_TDFTagSource.hxx>
+#include <inspector/DFBrowserPane_TDFReference.hxx>
+#include <inspector/DFBrowserPane_TDFTagSource.hxx>
 
 #include <TDataStd_Current.hxx>
 #include <TDataStd_Name.hxx>
@@ -68,61 +68,60 @@
 
 // the types are defined in TDataStd.cdl
 // Basic  attributes
-#include <DFBrowserPane_TDataStdCurrent.hxx>
-#include <DFBrowserPane_TDataStdName.hxx>
-#include <DFBrowserPane_TDataStdComment.hxx>
-#include <DFBrowserPane_TDataStdInteger.hxx>
-#include <DFBrowserPane_TDataStdIntegerArray.hxx>
-#include <DFBrowserPane_TDataStdReal.hxx>
-#include <DFBrowserPane_TDataStdRealArray.hxx>
-#include <DFBrowserPane_TDataStdExtStringArray.hxx>
-#include <DFBrowserPane_TDataStdUAttribute.hxx>
-
-#include <DFBrowserPane_TDataStdTreeNode.hxx>
-#include <DFBrowserPane_TDataStdDirectory.hxx>
-#include <DFBrowserPane_TDataStdNoteBook.hxx>
-#include <DFBrowserPane_TDataStdExpression.hxx>
-#include <DFBrowserPane_TDataStdRelation.hxx>
-#include <DFBrowserPane_TDataStdVariable.hxx>
+#include <inspector/DFBrowserPane_TDataStdCurrent.hxx>
+#include <inspector/DFBrowserPane_TDataStdName.hxx>
+#include <inspector/DFBrowserPane_TDataStdComment.hxx>
+#include <inspector/DFBrowserPane_TDataStdInteger.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntegerArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdReal.hxx>
+#include <inspector/DFBrowserPane_TDataStdRealArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdExtStringArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdUAttribute.hxx>
+
+#include <inspector/DFBrowserPane_TDataStdTreeNode.hxx>
+#include <inspector/DFBrowserPane_TDataStdDirectory.hxx>
+#include <inspector/DFBrowserPane_TDataStdNoteBook.hxx>
+#include <inspector/DFBrowserPane_TDataStdExpression.hxx>
+#include <inspector/DFBrowserPane_TDataStdRelation.hxx>
+#include <inspector/DFBrowserPane_TDataStdVariable.hxx>
 
 //Extension
-#include <DFBrowserPane_TDataStdTick.hxx>
-#include <DFBrowserPane_TDataStdAsciiString.hxx>
-#include <DFBrowserPane_TDataStdIntPackedMap.hxx>
+#include <inspector/DFBrowserPane_TDataStdTick.hxx>
+#include <inspector/DFBrowserPane_TDataStdAsciiString.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntPackedMap.hxx>
 // Lists:
-#include <DFBrowserPane_TDataStdIntegerList.hxx>
-#include <DFBrowserPane_TDataStdRealList.hxx>
-#include <DFBrowserPane_TDataStdExtStringList.hxx>
-#include <DFBrowserPane_TDataStdBooleanList.hxx>
-#include <DFBrowserPane_TDataStdReferenceList.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntegerList.hxx>
+#include <inspector/DFBrowserPane_TDataStdRealList.hxx>
+#include <inspector/DFBrowserPane_TDataStdExtStringList.hxx>
+#include <inspector/DFBrowserPane_TDataStdBooleanList.hxx>
+#include <inspector/DFBrowserPane_TDataStdReferenceList.hxx>
 
 // Arrays:
-#include <DFBrowserPane_TDataStdBooleanArray.hxx>
-#include <DFBrowserPane_TDataStdReferenceArray.hxx>
-#include <DFBrowserPane_TDataStdByteArray.hxx>
-#include <DFBrowserPane_TDataStdNamedData.hxx>
+#include <inspector/DFBrowserPane_TDataStdBooleanArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdReferenceArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdByteArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdNamedData.hxx>
 
 // TDocStd attributes
-#include <DFBrowserPane_TDocStdModified.hxx>
-#include <DFBrowserPane_TDocStdOwner.hxx>
-#include <DFBrowserPane_TDocStdXLink.hxx>
-#include <DFBrowserPane_TDocStdXLinkRoot.hxx>
+#include <inspector/DFBrowserPane_TDocStdModified.hxx>
+#include <inspector/DFBrowserPane_TDocStdOwner.hxx>
+#include <inspector/DFBrowserPane_TDocStdXLink.hxx>
+#include <inspector/DFBrowserPane_TDocStdXLinkRoot.hxx>
 
 // TPrsStd attributes
-#include <DFBrowserPane_TPrsStdAISViewer.hxx>
-#include <DFBrowserPane_TPrsStdAISPresentation.hxx>
+#include <inspector/DFBrowserPane_TPrsStdAISViewer.hxx>
+#include <inspector/DFBrowserPane_TPrsStdAISPresentation.hxx>
 
 // TNaming attributes
-#include <DFBrowserPane_TNamingNamedShape.hxx>
-#include <DFBrowserPane_TNamingNaming.hxx>
-#include <DFBrowserPane_TNamingUsedShapes.hxx>
+#include <inspector/DFBrowserPane_TNamingNamedShape.hxx>
+#include <inspector/DFBrowserPane_TNamingNaming.hxx>
+#include <inspector/DFBrowserPane_TNamingUsedShapes.hxx>
 
 // TFunction attributes
-#include <DFBrowserPane_TFunctionFunction.hxx>
-#include <DFBrowserPane_TFunctionGraphNode.hxx>
-#include <DFBrowserPane_TFunctionScope.hxx>
+#include <inspector/DFBrowserPane_TFunctionFunction.hxx>
+#include <inspector/DFBrowserPane_TFunctionGraphNode.hxx>
+#include <inspector/DFBrowserPane_TFunctionScope.hxx>
 
-//#define REQUIRE_OCAF_REVIEW:1 : start
 // =======================================================================
 // function : Constructor
 // purpose :
@@ -216,5 +215,3 @@ DFBrowserPane_AttributePaneAPI* DFBrowserPane_AttributePaneCreator::CreateAttrib
 
   return aPane;
 }
-
-//#define REQUIRE_OCAF_REVIEW : end

diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.hxx
index 23f45391492b0eb9272ee811820907df8a96fda6..5e4fdb89bdacfe2c373b3041396874c3c6ebb1e6 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneCreator.hxx
@@ -16,8 +16,9 @@
 #ifndef DFBrowserPane_AttributePaneCreator_H
 #define DFBrowserPane_AttributePaneCreator_H
 
-#include <DFBrowserPane_AttributePaneAPI.hxx>
-#include <DFBrowserPane_AttributePaneCreatorAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneCreatorAPI.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_AttributePaneCreator

diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx
index 3ec1c978d07adb992b54b4c92c731ede8a50092e..ff6aac7f018a15ab9b07fba20fad259e7bfa0fd6 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
 
 // =======================================================================
 // function : Constructor

diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.cxx
index 951807a14317e86ca62a70debf975edc6bdb25d8..870a2f68d45e7a499282a68c17c7f189a47a5265 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneSelector.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_AttributePaneSelector.hxx>
+#include <inspector/DFBrowserPane_AttributePaneSelector.hxx>
 
 #include <QItemSelectionModel>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx
index c5dc6c26ed65751c72f94318df56064ec30981cf..7848c10ecee2936a2d16c9c38619fd390dd0430e 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx
@@ -13,17 +13,16 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_HelperArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
 
 #include <QList>
 #include <QVariant>
 #include <QGridLayout>
 #include <QWidget>
 
-//#define REQUIRE_OCAF_REVIEW:6 : start
 // =======================================================================
 // function : Constructor
 // purpose :
@@ -86,4 +85,3 @@ void DFBrowserPane_HelperArray::GetShortAttributeInfo (const Handle(TDF_Attribut
   for (int aRowId = 0, aRows = myValuesModel->rowCount(); aRowId < aRows; aRowId++)
     theValues.append (myValuesModel->data (myValuesModel->index (aRowId, 0)));
 }
-//#define REQUIRE_OCAF_REVIEW:6 : end

diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx
index 39155d41aa30a38ef563c246526ec8a5dde9adff..9cdf77fae48a38e5ba8493c6d85fae63655f8203 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_HelperExport.hxx>
+#include <inspector/DFBrowserPane_HelperExport.hxx>
 
 #include <BRepTools.hxx>
 #include <TCollection_AsciiString.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx b/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx
index 0cd6e3214e864c0d322aee71fc37da17cc2f7ce7..2760592458a08dc90f8f835d475d6f8ec65ec5c5 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperExport.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPane_HelperExport_H
 #define DFBrowserPane_HelperExport_H
 
-#include <DFBrowserPane.hxx>
+#include <inspector/DFBrowserPane.hxx>
 #include <TopoDS_Shape.hxx>
 
 #ifdef _MSC_VER

diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.cxx
index 1784239fb26ec22f85016279b3c2abeff776b186..fff0ba17f87ad10a4132136607a13487852f7af5 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_HelperGroupContent.hxx>
+#include <inspector/DFBrowserPane_HelperGroupContent.hxx>
 
 #include <QHBoxLayout>
 #include <QWidget>

diff --git a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx
index a93f539d5a59aeef757ef844d968ef1a5f9f9579..4c8652017da68eef53764679470914b29425a7e9 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_ItemDelegateButton.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_ItemDelegateButton.hxx>
+#include <inspector/DFBrowserPane_ItemDelegateButton.hxx>
 
 #include <QAbstractItemModel>
 #include <QEvent>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx b/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx
index 427b089e3f583cd9b7610598cfb9249bcb6694f7..12197a9597526144e6b7eac05dca3a7e22c2e60d 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx
@@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDFReference.hxx>
+#include <inspector/DFBrowserPane_TDFReference.hxx>
 
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDF_Reference.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFReference.hxx b/tools/DFBrowserPane/DFBrowserPane_TDFReference.hxx
index 322080253a0e5fcead3dd41b79a79765dd7b0dd6..2c71d423170ed1cb9167aebcd704bbce6dc623c8 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDFReference.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFReference.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDFReference_H
 #define DFBrowserPane_TDFReference_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDFReference

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx
index 6e5d242ef25ef9cacd69a9f9d1191ec2d07df02f..b9ccdc755692339a38793d1a1eec8833930a54a2 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDFTagSource.hxx>
+#include <inspector/DFBrowserPane_TDFTagSource.hxx>
 
 #include <TDF_TagSource.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.hxx b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.hxx
index 642ced41924c0f506d14a6122b5eb68dc995b14d..ec23701f546210be3ccbf7aba12096c7c2b88040 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDFTagSource_H
 #define DFBrowserPane_TDFTagSource_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDFTagSource

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx
index d82cf2f0da55444ef888414c802a1a23dc8b7837..d4a357adf6857b9a549e099f49b22f9d7f56c5b6 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx
@@ -13,14 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdAsciiString.hxx>
+#include <inspector/DFBrowserPane_TDataStdAsciiString.hxx>
 
 #include <TDataStd_AsciiString.hxx>
 
 #include <QVariant>
 #include <QIcon>
 
-//#define REQUIRE_OCAF_REVIEW:4 : start
 // =======================================================================
 // function : GetValues
 // purpose :
@@ -32,4 +31,3 @@ void DFBrowserPane_TDataStdAsciiString::GetValues (const Handle(TDF_Attribute)&
   if (!anAttribute.IsNull())
     theValues.append (anAttribute->Get().ToCString());
 }
-//#define REQUIRE_OCAF_REVIEW:4 : end

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.hxx
index 5881db86b198ea803d07ca5b2a91bf8203c8cf2e..f254fb5abe5cede2a4c9f8c335c9b14398dd2aa2 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdAsciiString_H
 #define DFBrowserPane_TDataStdAsciiString_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdAsciiString

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx
index 6c90ec2eb6cb4b774d7cbe997bdeb1dc7cde9ded..e6f8749bef0ed0c7d245e67e4ebb6e2172cea89e 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx
@@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdBooleanArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdBooleanArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
 #include <TDataStd_BooleanArray.hxx>
 
@@ -28,7 +28,6 @@
 #include <QWidget>
 #include <QGridLayout>
 
-//#define REQUIRE_OCAF_REVIEW:5 : start
 // =======================================================================
 // function : CreateWidget
 // purpose :
@@ -84,4 +83,3 @@ void DFBrowserPane_TDataStdBooleanArray::GetShortAttributeInfo (const Handle(TDF
   myArrayTableHelper.Init (aValues);
   return myArrayTableHelper.GetShortAttributeInfo (theAttribute, theValues);
 }
-//#define REQUIRE_OCAF_REVIEW:5 : end

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.hxx
index dff3588032538e9c9fb3b66652b079e1940c35b9..12b391577a0981345f57e59f155ebf18a7ba8edc 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.hxx
@@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdBooleanArray_H
 #define DFBrowserPane_TDataStdBooleanArray_H
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdBooleanArray
 //! \brief The class to manipulate of TDataStd_BooleanArray attribute

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx
index 4c33194ee13c995300571fc357064050dcb428e1..f16c641e6dbebd63fe3360131a1b416a5a23dbf7 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdBooleanList.hxx>
+#include <inspector/DFBrowserPane_TDataStdBooleanList.hxx>
 
 #include <TDataStd_BooleanList.hxx>
 #include <TDataStd_ListIteratorOfListOfByte.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.hxx
index 5cb2a9d43550cc75149c98d878c076a5476c3918..976660f9ebf6ff0229d7ca9385ac4a66de263ac2 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdBooleanList_H
 #define DFBrowserPane_TDataStdBooleanList_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdBooleanList

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx
index cd0424c12478edac58d528bc602430087569e9e6..94d5ad9c164bb8f5d3788361d6e51550816d1a91 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.cxx
@@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdByteArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdByteArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
 #include <TDataStd_ByteArray.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.hxx
index 907c5b8fc35414fc693223fb1aee6b28e3023994..ff2c9952510cb8b0da76cf07a3be6ea0ad30ac02 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdByteArray.hxx
@@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdByteArray_H
 #define DFBrowserPane_TDataStdByteArray_H
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdByteArray
 //! \brief The class to manipulate of TDataStd_ByteArra attribute

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx
index 27e7f6c05b1cc16c53c22dcce539157a7b21e1e4..482aab26c462c6e4d2b5b8ae887d91cb8dd7f510 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdComment.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdComment.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_Comment.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.hxx
index ca2b8614529c392dc4dcc0e878ede630f4eb173c..94bce618dccb3c7298ca1e3f40d1f902a23af37d 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdComment_H
 #define DFBrowserPane_TDataStdComment_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdComment

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx
index 9e89559cb14cd3a6004d002575da461000152268..eade6ead4e12e1915468967fcbbd8d1637d079e7 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdCurrent.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdCurrent.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_Current.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.hxx
index 70162601a97eae2ebbc7852a7b06d693d69dc956..e5451486633cab73fb70c20a4f6fbd173f0bc58d 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdCurrent_H
 #define DFBrowserPane_TDataStdCurrent_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdCurrent

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx
index 18dfa0e01ed1737178f2cfc824cc908945b9c929..6437bad91a59c91e14c02ed66d9ff86cf1943e65 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdDirectory.hxx>
+#include <inspector/DFBrowserPane_TDataStdDirectory.hxx>
 
 #include <TDataStd_Directory.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.hxx
index c9e0855f9bdbadfe89a61a48d058878b62d4b0d4..d91fe71eb169bab1e779a8c18752e8dde666936f 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdDirectory.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdDirectory_H
 #define DFBrowserPane_TDataStdDirectory_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdDirectory

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx
index 74394bd370969f9519f69a0a24f56933d4dd998b..bea934fa48f4ec2d0012c5293701f23a408c53fd 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdExpression.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdExpression.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_Expression.hxx>
 #include <QVariant>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.hxx
index 6f9a908f80a4048100b60b6760f403017817f250..dc0afb86aa7313089ed30307b2ec2f52debfcc86 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdExpression_H
 #define DFBrowserPane_TDataStdExpression_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdExpression

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx
index dad9a52a702a2e64f5d402d701b3d97d666fc728..23a2aa5da8f140fab643934a106ee9c4c8251fb1 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.cxx
@@ -13,11 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdExtStringArray.hxx>
-#include <DFBrowserPane_Tools.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdExtStringArray.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
 #include <TDataStd_ExtStringArray.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.hxx
index 5bd1eecc40e37166883910a8ce270829ca8f3ec2..ad18e5b99f56c6da09cf4ce08baf03e8a07082a8 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringArray.hxx
@@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdExtStringArray_H
 #define DFBrowserPane_TDataStdExtStringArray_H
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdExtStringArray
 //! \brief The class to manipulate of TDataStd_ExtStringArray attribute

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx
index 141f9db5df692927e5b8959b8884235d5b7c8e83..179dfc473c51e1b3012679f0816b6fd1b1deff0b 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdExtStringList.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdExtStringList.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_ExtStringList.hxx>
 #include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
@@ -22,7 +22,6 @@
 #include <QVariant>
 #include <QWidget>
 
-//#define REQUIRE_OCAF_REVIEW:7 : start (DFBrowserPane_Tools)
 // =======================================================================
 // function : GetValues
 // purpose :
@@ -36,4 +35,3 @@ void DFBrowserPane_TDataStdExtStringList::GetValues (const Handle(TDF_Attribute)
   for (TDataStd_ListIteratorOfListOfExtendedString aValuesIt(anAttribute->List()); aValuesIt.More(); aValuesIt.Next())
     theValues.append (DFBrowserPane_Tools::ToString (aValuesIt.Value()));
 }
-//#define REQUIRE_OCAF_REVIEW:7 : end

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.hxx
index ebe1c840647116ea792f381d2e1bd668ef82b6a8..64f81f25aee04ede3cde6b9b01440e6d0ee30f52 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdExtStringList_H
 #define DFBrowserPane_TDataStdExtStringList_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdExtStringList

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx
index 7256cc1e481d515ba6a1c5fe4e7f83f8d2ad65f7..7af9521ef24590d7c07f705c43b42bf9663d91d1 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdIntPackedMap.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntPackedMap.hxx>
 
 #include <TDataStd_IntPackedMap.hxx>
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.hxx
index e423a19b7c2edab4cacb058054ea14d530f942f4..03fad8c712271d18447812699783b7beec30d0d3 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdIntPackedMap_H
 #define DFBrowserPane_TDataStdIntPackedMap_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdIntPackedMap

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx
index 81e395753fc4a72b75fd5132acc8e31c20e06ab9..b2ca9afbce842b1e2803a35b1325ba996d7187d6 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdInteger.hxx>
+#include <inspector/DFBrowserPane_TDataStdInteger.hxx>
 
 #include <TDataStd_Integer.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.hxx
index 77f961e4ddecfb66c799dd148072ac59904c4e83..96a2acaaa77baf1f2bec4c24f701bfe5ad1fc84a 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdInteger_H
 #define DFBrowserPane_TDataStdInteger_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdInteger

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx
index 01bd09a210498df75c100034edd0242fe4399614..bf03586c9f6e6d08dcd7cb51601198d74007040a 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.cxx
@@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdIntegerArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntegerArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
 #include <TDataStd_IntegerArray.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.hxx
index 2777b9cba691de644f4bd3c29bfd82c6652d5712..1e28774cc175569d2ccd28b459e15878dd716e62 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerArray.hxx
@@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdIntegerArray_H
 #define DFBrowserPane_TDataStdIntegerArray_H
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdIntegerArray
 //! \brief The class to manipulate of TDataStd_IntegerArray attribute

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx
index 5eea2e37335ea0046d8b062cfb14a02e7d402b9c..969960f3348b24263adf57bf5ab4e6e8684f98b2 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdIntegerList.hxx>
+#include <inspector/DFBrowserPane_TDataStdIntegerList.hxx>
 
 #include <TDataStd_IntegerList.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.hxx
index 314671618a77f5333b5ba8fec02070228e37461d..b916b1215b13f6d1cda51ef71d12d61a180759b2 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdIntegerList_H
 #define DFBrowserPane_TDataStdIntegerList_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdIntegerList

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx
index 2551bff1b44bb215184d3949fe79b2678aaa721d..cc386a22800790b32e2e6cf3f449fd44fa96d463 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdName.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdName.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_Name.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.hxx
index cc227019cd80e53b214eddf4558003497679dc4d..a1aa102773634441fe04663a115a39eb3053a1c6 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdName_H
 #define DFBrowserPane_TDataStdName_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdName

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx
index a31e6e99c4794e32b7e04ff5e112efc4109dc2df..0ceaa4309d26d063541125b1577f151d97d13750 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx
@@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdNamedData.hxx>
+#include <inspector/DFBrowserPane_TDataStdNamedData.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperGroupContent.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperGroupContent.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TColStd_DataMapOfStringInteger.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfStringInteger.hxx>
@@ -48,7 +48,6 @@ static const QString VALUES_BYTE =       "values_byte";
 static const QString VALUES_INT_ARRAY =  "values_int_array";
 static const QString VALUES_REAL_ARRAY = "values_real_array";
 
-//#define REQUIRE_OCAF_REVIEW:9 : start
 // =======================================================================
 // function : Constructor
 // purpose :
@@ -236,4 +235,3 @@ QList<QVariant> DFBrowserPane_TDataStdNamedData::getPartOfValues (const QString&
   }
   return aValues;
 }
-//#define REQUIRE_OCAF_REVIEW:9 : end

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx
index 480379bea39f923a3c22b4db65e0299482e6fa67..e8bf511d44e0dd9b7c0ddae1679758e635043ae8 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdNamedData_H
 #define DFBrowserPane_TDataStdNamedData_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 class DFBrowserPane_AttributePaneModel;

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx
index 4b22a722799b941fe7ec8eb02116aa2f18523623..8f904902e14441f197fc716b4699dd5cbc161cbb 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdNoteBook.hxx>
+#include <inspector/DFBrowserPane_TDataStdNoteBook.hxx>
 
 #include <TDataStd_NoteBook.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.hxx
index dfb1d81104a8febe5ce2e94f922fa7b497e38426..501d0e35ebb9449b61b93b8fe2ce18dec7234186 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNoteBook.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdNoteBook_H
 #define DFBrowserPane_TDataStdNoteBook_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdNoteBook

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx
index d593b41b3719909376403182af407667dfb39328..a85e2e0f500f4e64eabc4285cc8fefa225eeb89a 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdReal.hxx>
+#include <inspector/DFBrowserPane_TDataStdReal.hxx>
 
 #include <TDataStd_Real.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.hxx
index a083ae008e5a893941212be90f15200d66d4d5e3..7019b0d1dda2ba7bdaa3143413d81f3ebb5d5725 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdReal_H
 #define DFBrowserPane_TDataStdReal_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdReal

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx
index ed76ecd59adf248b9ecb302e7c12c05945eaca07..5523478e59f021203929a9cecf9192efbf18b05a 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.cxx
@@ -13,11 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdRealArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdRealArray.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
 
 #include <TDataStd_RealArray.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.hxx
index e95511cfb23e6f872f9203fd5258e2ea7dd3ec51..02d9b5cc35d2b6a6e3968d1983ca517641b295c5 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealArray.hxx
@@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdRealArray_H
 #define DFBrowserPane_TDataStdRealArray_H
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdRealArray
 //! \brief The class to manipulate of TDataStd_RealArray attribute

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx
index b419e8a6cf652d0b1954002b2acbb6a2e196dac1..debc605cfa378c9a1782ba66d8a55cc79eda677e 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdRealList.hxx>
+#include <inspector/DFBrowserPane_TDataStdRealList.hxx>
 
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 #include <TDataStd_RealList.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.hxx
index c211372bac262607f0e0fb7c76a72ca8b0fd23aa..cce96e2f1f44f535067a9d90c2584689b5dde31e 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdRealList_H
 #define DFBrowserPane_TDataStdRealList_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdRealList

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx
index 58973da213d42ae95a84e128f983a1477783d33b..efcbf82388ff1c768b2d64177e097c9ecf54800a 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx
@@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdReferenceArray.hxx>
+#include <inspector/DFBrowserPane_TDataStdReferenceArray.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperArray.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_ReferenceArray.hxx>
 
@@ -28,7 +28,6 @@
 #include <QVariant>
 #include <QWidget>
 
-//#define REQUIRE_OCAF_REVIEW:10 : start (GetReferences)
 // =======================================================================
 // function : CreateWidget
 // purpose :
@@ -108,4 +107,3 @@ void DFBrowserPane_TDataStdReferenceArray::GetReferences (const Handle(TDF_Attri
       theRefLabels.Append (aLabel);
   }
 }
-//#define REQUIRE_OCAF_REVIEW:10 : end

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.hxx
index a544d1786925db19910f5dd75d9531aa88c2c407..6f32974fd9ad1b1174c701d5f855ece0513a71e7 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.hxx
@@ -16,10 +16,10 @@
 #ifndef DFBrowserPane_TDataStdReferenceArray_H
 #define DFBrowserPane_TDataStdReferenceArray_H
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <Standard.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperArray.hxx>
 
-#include <DFBrowserPane_HelperArray.hxx>
+#include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdReferenceArray
 //! \brief The class to manipulate of TDataStd_ReferenceArray attribute

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx
index 54643b0a3e2a5e906e9c46257b6b249d0d0aaed6..49ece11480f67383c106d1ce3922982a2a30cc28 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx
@@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdReferenceList.hxx>
+#include <inspector/DFBrowserPane_TDataStdReferenceList.hxx>
 
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_ReferenceList.hxx>
 #include <TDF_ListIteratorOfLabelList.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.hxx
index 8e84b6a56c912a553cede4310b4aedf7951f4276..a2b227691e81ad651a6bac4d49db903e31e205f8 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdReferenceList_H
 #define DFBrowserPane_TDataStdReferenceList_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdReferenceList

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx
index bb8076ae8c323bc58f3eb7608c782a33648a053b..05529ab19ba8e1786ba3e8711b86ff57247f7169 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdRelation.hxx>
+#include <inspector/DFBrowserPane_TDataStdRelation.hxx>
 
 #include <TDataStd_Relation.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.hxx
index 9035a81ff7d258c10b7cead4b8f0edcf22faa78e..4d8112394095e26285f62fe58e296df863ee7b4d 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRelation.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdRelation_H
 #define DFBrowserPane_TDataStdRelation_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdRelation

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx
index 5e9d27b191ddfbc02e21d842c9a49253b196bbcb..d956d4e4dd42afdb4a74ccf025070b4625eb061f 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdTick.hxx>
+#include <inspector/DFBrowserPane_TDataStdTick.hxx>
 
 #include <TDataStd_Tick.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.hxx
index a31056bf0322d847d0d2331532e33702ffe344d2..4b07cc621a893e6fece5158476165c7c042612d3 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTick.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdTick_H
 #define DFBrowserPane_TDataStdTick_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdTick

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx
index b1f20f369e381947267f8fb7728e49e85e5c4ce2..b1cd494a89d2e07364f46f0b64501284c8989677 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx
@@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdTreeNode.hxx>
+#include <inspector/DFBrowserPane_TDataStdTreeNode.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_TDataStdTreeNodeItem.hxx>
-#include <DFBrowserPane_TDataStdTreeNodeModel.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_TDataStdTreeNodeItem.hxx>
+#include <inspector/DFBrowserPane_TDataStdTreeNodeModel.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_TreeNode.hxx>
 
@@ -30,7 +30,6 @@
 #include <QWidget>
 #include <QItemSelectionModel>
 
-//#define REQUIRE_OCAF_REVIEW:11
 // =======================================================================
 // function : Constructor
 // purpose :
@@ -55,9 +54,6 @@ QWidget* DFBrowserPane_TDataStdTreeNode::CreateWidget (QWidget* theParent)
   myTableView = new DFBrowserPane_TableView (aMainWidget, getTableColumnWidths());
   DFBrowserPane_TableView::SetFixedRowCount (1, myTableView->GetTableView());
   myTableView->SetModel (myPaneModel);
-  QTableView* aTableView = myTableView->GetTableView();
-  aTableView->setSelectionModel (mySelectionModels.front());
-  aTableView->setSelectionBehavior (QAbstractItemView::SelectRows);
 
   QVBoxLayout* aLay = new QVBoxLayout (aMainWidget);
   aLay->setContentsMargins (0, 0, 0, 0);

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.hxx
index 79d1366ae28071f5bc2e0c3ede40106ccefd844d..9057060869ad983f03da70b2649045aad75cec39 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdTreeNode_H
 #define DFBrowserPane_TDataStdTreeNode_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 class QAbstractItemModel;

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx
index c04896544a70c0464411f8dd15b75ed03a88b01d..99f1ec9c7ef3d10eb8927e62eb69d1fac8db4eb8 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx
@@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdTreeNodeItem.hxx>
+#include <inspector/DFBrowserPane_TDataStdTreeNodeItem.hxx>
 
-#include <DFBrowser_Module.hxx>
-#include <DFBrowser_Tools.hxx>
+#include <inspector/DFBrowser_Module.hxx>
+#include <inspector/DFBrowser_Tools.hxx>
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_TreeNode.hxx>
 #include <TDataStd_ChildNodeIterator.hxx>
@@ -29,8 +29,6 @@
 #include <QIcon>
 #include <QObject>
 
-//#define REQUIRE_OCAF_REVIEW:11
-
 // =======================================================================
 // function : Init
 // purpose :

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx
index f1a98c728f23a914192e3c30778534255542a2cb..43dea904783be0e6949c2f8176b16e1f7fcce7ae 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx
@@ -16,9 +16,10 @@
 #ifndef DFBrowserPane_TDataStdTreeNodeItem_H
 #define DFBrowserPane_TDataStdTreeNodeItem_H
 
+#include <inspector/TreeModel_ItemBase.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
-#include <TreeModel_ItemBase.hxx>
 
 #include <QList>
 #include <QMap>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx
index 44f570eaf35acdf0c04b06a04638a7a2b7e2f4f2..78f1f9489c8f3e3823b1302dc2fa7670eadd0281 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdTreeNodeModel.hxx>
-#include <DFBrowserPane_TDataStdTreeNodeItem.hxx>
+#include <inspector/DFBrowserPane_TDataStdTreeNodeModel.hxx>
+#include <inspector/DFBrowserPane_TDataStdTreeNodeItem.hxx>
 
 #include <TDataStd_TreeNode.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx
index 4d08445becd96e2821fb4f3f382a87a5898d1c4f..22bc9dad816ebd045d33f8448afca717492a2c22 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx
@@ -16,9 +16,10 @@
 #ifndef DFBrowserPane_TDataStdTreeNodeMode_H
 #define DFBrowserPane_TDataStdTreeNodeMode_H
 
+#include <inspector/TreeModel_ModelBase.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
-#include <TreeModel_ModelBase.hxx>
 
 #include <QObject>
 #include <QHash>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx
index cb9638cedc39929ea8e87c1a40dcfd38b63996ae..d8a152939dfc7e6482f33335da495d548ec2ba80 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdUAttribute.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TDataStdUAttribute.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDataStd_UAttribute.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.hxx
index 12ea9020a50154697752a56fff2236ac5d955536..a98fb4a498c2aa62c777dbc81b2eeb0123cf4631 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdUAttribute_H
 #define DFBrowserPane_TDataStdUAttribute_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdUAttribute

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx
index cf70e27daa72ad0387c5c68e9de81df0888fa1b1..e23d3b88f1d4ac8f64cfb596a6cf93e09cdba83f 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDataStdVariable.hxx>
+#include <inspector/DFBrowserPane_TDataStdVariable.hxx>
 
 #include <TDataStd_Variable.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.hxx
index 2f30e16240d8c7d13ab5b71c833e1d10cbbaa8a2..5bb6efa8e6afa9cb9f50dbb8494ad0292e26ce41 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdVariable.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDataStdVariable_H
 #define DFBrowserPane_TDataStdVariable_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDataStdVariable

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx
index c5f1152013a9cbfc08ea18d31ba84c1ff6f3e74b..f2fdcff8ce091b33c2eac02fc97d779648c1a8d1 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDocStdModified.hxx>
+#include <inspector/DFBrowserPane_TDocStdModified.hxx>
 
 #include <TDocStd_Modified.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.hxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.hxx
index 0b223f5489a5ef54164573d89d3d3fbf6ab94204..2f52c31d605b740ab05396468935ea42000c6889 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdModified.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDocStdModified_H
 #define DFBrowserPane_TDocStdModified_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDocStdModified

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx
index 9fc7efe300e0b7ab1875d0b8e91e1423fa7dc3e2..7c1b217264335c59c77ba45c993cee3b769cbcc1 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx
@@ -13,11 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDocStdOwner.hxx>
+#include <inspector/DFBrowserPane_TDocStdOwner.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDocStd_Document.hxx>
 #include <TDocStd_Owner.hxx>
@@ -31,7 +31,6 @@
 #include <QGroupBox>
 #include <QTableView>
 
-//#define REQUIRE_OCAF_REVIEW:12
 // =======================================================================
 // function : Constructor
 // purpose :

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.hxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.hxx
index d961a63e0b1d3fd7dac97225a83254b13577c975..142b8900fdc9e4c9bc2668cadad1b85aed92802d 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDocStdOwner_H
 #define DFBrowserPane_TDocStdOwner_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 #include <TColStd_SequenceOfExtendedString.hxx>
 #include <TDF_DeltaList.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx
index e9081b6b866255c110886f9eec04b89eec6f4503..13b802b8774e5749c7afa6e427ebef0deca8f234 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDocStdXLink.hxx>
+#include <inspector/DFBrowserPane_TDocStdXLink.hxx>
 
 #include <TDocStd_XLink.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.hxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.hxx
index 4e6c34c6ad490962d7ce2112ac69022464a13b80..da9deefdf5d8b156352acbe026262aecb41c5752 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDocStdXLink_H
 #define DFBrowserPane_TDocStdXLink_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDocStdXLink

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx
index 4462f434807edec88fdf06140b032e64bce32f3e..c9cb50c0628c88ae3003b68d23f52773880f56cf 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TDocStdXLinkRoot.hxx>
+#include <inspector/DFBrowserPane_TDocStdXLinkRoot.hxx>
 
 #include <TDocStd_XLinkRoot.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.hxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.hxx
index e0b6c04a9f43ac74a330f14ecde88dfe48c57b17..60e6ce7f3f2e966d7df9ca41859fc3e74e9cecd3 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLinkRoot.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TDocStdXLinkRoot_H
 #define DFBrowserPane_TDocStdXLinkRoot_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TDocStdXLinkRoot

diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx
index f5ce3cd5489b7ac1ae615948c64fd2abd9e5eb0c..9622a86b4809b210dfb0cbcff679ff0710a1ba7e 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TFunctionFunction.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TFunctionFunction.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TFunction_Function.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.hxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.hxx
index a45e355593227c24ee79507bbe739e627a23eefa..46745c4fe37690d627cd4a9aa7bb4bcaf6c4eeb5 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TFunctionFunction_H
 #define DFBrowserPane_TFunctionFunction_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TFunctionFunction

diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx
index fdfa94dc5dd0d5087ea0544ef428f2411a50ea9c..1b659fc127cf0db5124268b5d9763884af18234f 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TFunctionGraphNode.hxx>
+#include <inspector/DFBrowserPane_TFunctionGraphNode.hxx>
 
 #include <TFunction_GraphNode.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.hxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.hxx
index e3caef702060ee006d6041a4c7b1755b3423a815..11f44e87231fb37b8920fc6b95e5b140f662e7a7 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionGraphNode.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TFunctionGraphNode_H
 #define DFBrowserPane_TFunctionGraphNode_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TFunctionGraphNode

diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx
index 64de46cc6655a864b292668fad569560645379cb..6a754518c89115d129d287a187033b6d4369daed 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TFunctionScope.hxx>
+#include <inspector/DFBrowserPane_TFunctionScope.hxx>
 
 #include <TFunction_Scope.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.hxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.hxx
index e65d814d4853f73b20930eec31c416c2043b8652..67ecf8035f6abd9b9b4457c9c12f2e94d60ee70d 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionScope.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TFunctionScope_H
 #define DFBrowserPane_TFunctionScope_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TFunctionScope

diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx
index 7488fe15881530056ab6644272cd2370b1898295..8257fe8bca184ade6fb7fba7c6bf59185a9ee03d 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx
@@ -13,15 +13,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TNamingNamedShape.hxx>
+#include <inspector/DFBrowserPane_TNamingNamedShape.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_ItemDelegateButton.hxx>
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPane_HelperExport.hxx>
-#include <DFBrowserPane_SelectionKind.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_ItemDelegateButton.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPane_HelperExport.hxx>
+#include <inspector/DFBrowserPane_SelectionKind.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_Shape.hxx>
@@ -52,7 +52,6 @@ const int COLUMN_POINTER_WIDTH = 110;
 const int COLUMN_REFERENCE_WIDTH = 90;
 const int COLUMN_EVOLUTION_WIDTH = 90;
 
-//#define REQUIRE_OCAF_REVIEW:13
 // =======================================================================
 // function : Constructor
 // purpose :

diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx
index 84020e2f3774f261a708ffa31c71501f99e291c5..4efe150296d6e6a0c78f6074dccd51c98942d879 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx
@@ -16,8 +16,9 @@
 #ifndef DFBrowserPane_TNamingNamedShape_H
 #define DFBrowserPane_TNamingNamedShape_H
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_HelperExport.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperExport.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 #include <TNaming_NamedShape.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx
index f3001ba9b6a4f8b7aac29730230d48992cdbcc6e..a4d52e86b14c86aff0aed8a946a8ac08bde44e7b 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx
@@ -13,14 +13,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TNamingNaming.hxx>
+#include <inspector/DFBrowserPane_TNamingNaming.hxx>
 
 #include <AIS_Shape.hxx>
 #include <BRep_Builder.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDF_Label.hxx>
 #include <TNaming_ListIteratorOfListOfNamedShape.hxx>
@@ -36,7 +36,6 @@
 #include <QVariant>
 #include <QWidget>
 
-//#define REQUIRE_OCAF_REVIEW:14
 // =======================================================================
 // function : Constructor
 // purpose :

diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.hxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.hxx
index 2aae1ec089cc0a257544b7b2ac82eecbcb7dde5e..73e5d87b18a84c8de4896fc5834f43b093829b2c 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TNamingNaming_H
 #define DFBrowserPane_TNamingNaming_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 class DFBrowserPane_AttributePaneModel;

diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx
index ea25583bf0f09e3a60cddc6ae77f17e05de7274a..9f4d68dce2d175ec40ffe72b8e3ada2a14860bf5 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx
@@ -13,15 +13,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TNamingUsedShapes.hxx>
+#include <inspector/DFBrowserPane_TNamingUsedShapes.hxx>
 
 #include <AIS_Shape.hxx>
 #include <BRep_Builder.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_AttributePaneSelector.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_AttributePaneSelector.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TDF_Label.hxx>
 
@@ -39,7 +39,6 @@
 #include <QVariant>
 #include <QWidget>
 
-//#define REQUIRE_OCAF_REVIEW:15
 // =======================================================================
 // function : Constructor
 // purpose :
@@ -138,7 +137,7 @@ void DFBrowserPane_TNamingUsedShapes::GetShortAttributeInfo (const Handle(TDF_At
   if (anAttribute.IsNull())
     return;
 
-  theValues.append (QString ("[%1]").arg (anAttribute->Map().Extent()));
+  theValues.append (QString ("%1").arg (anAttribute->Map().Extent()));
 }
 
 // =======================================================================

diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx
index ffbe64266eee1c3a34e3b4ce5ec229b550d36036..9ed95c950cafb0e13b4eba39252891afe3e5b1cf 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TNamingUsedShapes_H
 #define DFBrowserPane_TNamingUsedShapes_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <NCollection_DataMap.hxx>
 #include <Standard.hxx>
 #include <TCollection_AsciiString.hxx>

diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx
index 73f14d7b9c8bbd84af015fa94691b0e8021301d3..42b1e0a3560643830ff672587ec958269041b96f 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx
@@ -13,17 +13,16 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TPrsStdAISPresentation.hxx>
+#include <inspector/DFBrowserPane_TPrsStdAISPresentation.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <TPrsStd_AISPresentation.hxx>
 
 #include <QVariant>
 #include <QWidget>
 
-//#define REQUIRE_OCAF_REVIEW:16
 // =======================================================================
 // function : Constructor
 // purpose :

diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.hxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.hxx
index e806c8c918b080bfe5c6d3400bece1c88ead5240..d925f816dabf982ed09bba3e9ca2c2ef42b4543f 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TPrsStdAISPresentation_H
 #define DFBrowserPane_TPrsStdAISPresentation_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TPrsStdAISPresentation

diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx
index c9b60b63fc861f78173f372bfcd1f5e55a51526e..c00555029f5188b3e2afbf4a4dc1c0973dc6f3ca 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TPrsStdAISViewer.hxx>
+#include <inspector/DFBrowserPane_TPrsStdAISViewer.hxx>
 
 #include <TPrsStd_AISViewer.hxx>
 

diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.hxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.hxx
index f115975b4a51e77397bdb7dceb4b1edb82c90d81..f1e7e8d48bb1924efd9fec9d93ee3feb44c6c79b 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_TPrsStdAISViewer_H
 #define DFBrowserPane_TPrsStdAISViewer_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 
 //! \class DFBrowserPane_TPrsStdAISViewer

diff --git a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx
index a65336f81d5ee689fff3b63a47cb6d1169de70e0..97706d1b631cca6b49c049818dac3c5732ebf75b 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <QWidget>
 #include <QTableView>

diff --git a/tools/DFBrowserPane/DFBrowserPane_Tools.cxx b/tools/DFBrowserPane/DFBrowserPane_Tools.cxx
index 22bd3dbd59e41d9798a78516bedcaefc10ff1653..b95d968e0b28f2b3602f21d6a4f467672aad69af 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_Tools.cxx
+++ b/tools/DFBrowserPane/DFBrowserPane_Tools.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <AIS_DisplayMode.hxx>
 #include <Graphic3d_MaterialAspect.hxx>
@@ -39,7 +39,6 @@
 
 #include <sstream>
 
-//#define REQUIRE_OCAF_REVIEW:8 : start
 const int TABLE_COLUMN_0_WIDTH = 200;
 const int TABLE_COLUMN_OTHER_WIDTH = 120;
 
@@ -132,4 +131,3 @@ TCollection_AsciiString DFBrowserPane_Tools::ToName (const DFBrowserPane_OcctEnu
   }
   return aSStream.str().c_str();
 }
-//#define REQUIRE_OCAF_REVIEW:8 : end

diff --git a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx
index e7b7c3d8e3d8ced368c734528533ecb57e2142db..5508708f33322f5cf28d2a8fbcf950989f2d10e0 100644 (file)
--- a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx
+++ b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPane_Tools_H
 #define DFBrowserPane_Tools_H
 
-#include <DFBrowserPane_OcctEnumType.hxx>
+#include <inspector/DFBrowserPane_OcctEnumType.hxx>
+
 #include <Standard.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <TDF_Label.hxx>

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx
index 73c88402024361c3d451b97276b2f23b00d547ad..26465b23b860c44b0d3f6a7ca603e834d58c19ff 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx
@@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_AttributeCommonPane.hxx>
+#include <inspector/DFBrowserPaneXDE_AttributeCommonPane.hxx>
 
-#include <DFBrowserPane_ItemRole.hxx>
-#include <DFBrowserPaneXDE_XDEDRAW.hxx>
+#include <inspector/DFBrowserPane_ItemRole.hxx>
+#include <inspector/DFBrowserPaneXDE_XDEDRAW.hxx>
 
 #include <TDataStd_TreeNode.hxx>
 #include <TDF_Reference.hxx>

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx
index 846cd9713d30c3f5ec595eac28d48ec2ae84dd5a..64adc76aa1a1d3eb24f8d0bbccc86095e06f4f5e 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPaneXDE_AttributeCommonPane_H
 #define DFBrowserPaneXDE_AttributeCommonPane_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 #include <TopoDS_Shape.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributePaneCreator.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributePaneCreator.cxx
index 3a6bf041a8fb5266c1fce8947c3d19e2fc4637df..8c0641fe11dc21715b971e6cae7033bbcddb0f4b 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributePaneCreator.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributePaneCreator.cxx
@@ -13,26 +13,26 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_AttributePaneCreator.hxx>
+#include <inspector/DFBrowserPaneXDE_AttributePaneCreator.hxx>
 
-#include <DFBrowserPaneXDE_AttributeCommonPane.hxx>
-#include <DFBrowserPaneXDE_XCAFDocArea.hxx>
-#include <DFBrowserPaneXDE_XCAFDocCentroid.hxx>
-#include <DFBrowserPaneXDE_XCAFDocColor.hxx>
-#include <DFBrowserPaneXDE_XCAFDocColorTool.hxx>
-#include <DFBrowserPaneXDE_XCAFDocDatum.hxx>
-#include <DFBrowserPaneXDE_XCAFDocDimension.hxx>
-#include <DFBrowserPaneXDE_XCAFDocDimTol.hxx>
-#include <DFBrowserPaneXDE_XCAFDocDimTolTool.hxx>
-#include <DFBrowserPaneXDE_XCAFDocDocumentTool.hxx>
-#include <DFBrowserPaneXDE_XCAFDocGeomTolerance.hxx>
-#include <DFBrowserPaneXDE_XCAFDocGraphNode.hxx>
-#include <DFBrowserPaneXDE_XCAFDocLayerTool.hxx>
-#include <DFBrowserPaneXDE_XCAFDocLocation.hxx>
-#include <DFBrowserPaneXDE_XCAFDocMaterial.hxx>
-#include <DFBrowserPaneXDE_XCAFDocMaterialTool.hxx>
-#include <DFBrowserPaneXDE_XCAFDocShapeMapTool.hxx>
-#include <DFBrowserPaneXDE_XCAFDocShapeTool.hxx>
+#include <inspector/DFBrowserPaneXDE_AttributeCommonPane.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocArea.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocCentroid.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocColor.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocColorTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDatum.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDimension.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDimTol.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDimTolTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDocumentTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocGeomTolerance.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocGraphNode.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocLayerTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocLocation.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocMaterial.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocMaterialTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocShapeMapTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocShapeTool.hxx>
 
 #include <Standard_Version.hxx>
 
@@ -57,7 +57,6 @@
 #include <XCAFDoc_ShapeTool.hxx>
 #include <XCAFDoc_ShapeMapTool.hxx>
 
-//#define REQUIRE_OCAF_REVIEW:2 : start
 // =======================================================================
 // function : Constructor
 // purpose :
@@ -137,4 +136,3 @@ DFBrowserPane_AttributePaneAPI* DFBrowserPaneXDE_AttributePaneCreator::createXDE
     aPane = new DFBrowserPaneXDE_XCAFDocShapeTool();
   return aPane;
 }
-//#define REQUIRE_OCAF_REVIEW:2 : end

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributePaneCreator.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributePaneCreator.hxx
index 097de00ab2138613a4ced8ca5a35a3f4f417971b..2520a026510b4101876047ea30021b67000a2031 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributePaneCreator.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributePaneCreator.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPaneXDE_ATTRIBUTEPANECREATOR_H
 #define DFBrowserPaneXDE_ATTRIBUTEPANECREATOR_H
 
-#include <DFBrowserPane_AttributePaneCreatorAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneCreatorAPI.hxx>
+
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.cxx
index 24c9f3092d66c8b36ebc2b632ad2b27b6707b3b8..46b7cbdbb018b01055c99659658407d5e64b2dec 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_Tools.cxx
@@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_Tools.hxx>
+#include <inspector/DFBrowserPaneXDE_Tools.hxx>
 
-#include <DFBrowserPane_AttributePaneAPI.hxx>
+#include <inspector/DFBrowserPane_AttributePaneAPI.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <TDataStd_Name.hxx>

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.cxx
index 4499960227e54ac888fceb8e65fee4a637a44d23..dd0017eeeb5f44d60e2543cb00e62b4a5d73d8ea 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocArea.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocArea.hxx>
 
 #include <XCAFDoc_Area.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.hxx
index 0d2f20aaf521cc94c67c9f8f81105a8d175e0d15..5098d7b7c9484996118ef0d274424e0c5ba1971f 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPaneXDE_XCAFDocArea_H
 #define DFBrowserPaneXDE_XCAFDocArea_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.cxx
index 8ca936128fd535cf44e0fec77738f90ef74454d3..e5e17c01c0620d7786f377dd17cc2be24964da3b 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocCentroid.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocCentroid.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
 
 #include <XCAFDoc_Centroid.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.hxx
index b143d964cd61ec1545a3018ce2b2506c565d1fb4..90683296a6a1e006b4c886145439649c148bdf89 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPaneXDE_XCAFDocCentroid_H
 #define DFBrowserPaneXDE_XCAFDocCentroid_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx
index d517b6b94604b8c471770aea5896dee7eca13465..d0f2596d2f596e8caa0eea8740b0e0edd7ea9a19 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocColor.hxx>
-#include <DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocColor.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
 
 #include <XCAFDoc_Color.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.hxx
index 5698ae50c9e01268648da099d720df30b0127836..de4fb781fb5921604639bb8c5b329f46c3e4586e 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPaneXDE_XCAFDocColor_H
 #define DFBrowserPaneXDE_XCAFDocColor_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColorTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColorTool.cxx
index 558b2d69620c67bfcf4790aeaa27669c38b5076c..1e6202e84cac888baff35762fceb83f7e2227045 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColorTool.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColorTool.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocColorTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocColorTool.hxx>
 
 #include <XCAFDoc_Area.hxx>
 // =======================================================================

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColorTool.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColorTool.hxx
index 178b77d0ebd76a135dd85f91e84cd7069cee6d69..f445f022afe6a73646c7b6ac51a2035cd6ca48d1 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColorTool.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColorTool.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPaneXDE_XCAFDocColorTool_H
 #define DFBrowserPaneXDE_XCAFDocColorTool_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx
index f3ee134508ab6d2a60d57751d519bca1243f8ef4..d7bbc92223dfc99a1e71bc4a3bf1f578b282401b 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx
@@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocDatum.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDatum.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
 
 #include <Standard_Version.hxx>
 #include <TCollection_HAsciiString.hxx>

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.hxx
index c17a09187cb600ff4482be2df2e4678d1afce796..7aedc1d27195b6c27b109f70451326be89899295 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPaneXDE_XCAFDocDatum_H
 #define DFBrowserPaneXDE_XCAFDocDatum_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTol.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTol.cxx
index b0114528734241fcbbc083274ce46f852575de7c..6024a3dccf0a33545a16e9e0b8260d90ebab80be 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTol.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTol.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocDimTol.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDimTol.hxx>
 
 #include <XCAFDoc_DimTol.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTol.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTol.hxx
index 1719bb4b1edc04c669fe667df6a7ba0b6a0fec13..cf8171e2d3cb21ee004a1412f72e8d27f76c9ddb 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTol.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTol.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocDimTol_H
 #define DFBrowserPaneXDE_XCAFDocDimTol_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTolTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTolTool.cxx
index a6ca6f16b393a217ce71ca0f45542a325969d7b9..21c9af9595f1cb95503cfe6de8cc4bb7bb4ad9f2 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTolTool.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTolTool.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocDimTolTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDimTolTool.hxx>
 
 #include <XCAFDoc_DimTolTool.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTolTool.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTolTool.hxx
index 7231abf586c20f29d19d4c854aa238c32870ecc7..c69e0b1385d9a9d0168e9909b550b0e3628ef584 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTolTool.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimTolTool.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocDimTolTool_H
 #define DFBrowserPaneXDE_XCAFDocDimTolTool_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimension.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimension.cxx
index 9bb71467f11f4f647393a2e6d05b5e0bef9b6e6e..67b42270c1b64a32a7da83aa45f33b8aefa3cdb8 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimension.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimension.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocDimension.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDimension.hxx>
 
 #include <XCAFDoc_Dimension.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimension.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimension.hxx
index aa5accf1a9c5c50be2bf8ed386d2efbed0015b45..bb75c8722cd29408d6496d922b502a60bafda09e 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimension.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDimension.hxx
@@ -16,7 +16,8 @@
 #ifndef DFBrowserPaneXDE_XCAFDocDimension_H
 #define DFBrowserPaneXDE_XCAFDocDimension_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDocumentTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDocumentTool.cxx
index ebc44ab7a12f4564fcb0b5f8ef6bcaaac8fe912a..0366a0b41baac0c2506466a580c55ed42fe1ddef 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDocumentTool.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDocumentTool.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocDocumentTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocDocumentTool.hxx>
 
 #include <XCAFDoc_DocumentTool.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDocumentTool.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDocumentTool.hxx
index 88203b95e9ab891d62160159f8a30a1ab6e39199..12217219d67c4b4d747ee093fd6883a04fab8d03 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDocumentTool.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDocumentTool.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocDocumentTool_H
 #define DFBrowserPaneXDE_XCAFDocDocumentTool_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGeomTolerance.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGeomTolerance.cxx
index 499ee956f8dcb84e69a28f63840f82bc1c335a72..bacf238c5c25fb24d16f98e569ac4e3454ec1db1 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGeomTolerance.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGeomTolerance.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocGeomTolerance.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocGeomTolerance.hxx>
 
 #include <XCAFDoc_GeomTolerance.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGeomTolerance.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGeomTolerance.hxx
index 5c1520b53a2c565571f6eb02ca4ac5da08692852..7afad776cf56165c83db92a88487ff578d1dec09 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGeomTolerance.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGeomTolerance.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocGeomTolerance_H
 #define DFBrowserPaneXDE_XCAFDocGeomTolerance_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGraphNode.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGraphNode.cxx
index 4f06db431f0f603808338017cb6f065be91366a4..aa3fc5b4c62661a007472e8d419a72e33be6e220 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGraphNode.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGraphNode.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocGraphNode.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocGraphNode.hxx>
 
 #include <XCAFDoc_GraphNode.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGraphNode.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGraphNode.hxx
index 70847970ad03790ed81753c2934a2799ae8f4b94..798b4dd658897f3b49d92e7ee154a7a68b2cf1e2 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGraphNode.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocGraphNode.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocGraphNode_H
 #define DFBrowserPaneXDE_XCAFDocGraphNode_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLayerTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLayerTool.cxx
index 50ce3248888be2f500964b106ff360093d692c7b..d3f0b0b70f2e0ad1f255a75711885a6319e28a5f 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLayerTool.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLayerTool.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocLayerTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocLayerTool.hxx>
 
 #include <XCAFDoc_Area.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLayerTool.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLayerTool.hxx
index 5c06c1e3e97e6610a858753d7be8c8875a63ed13..95e8d5b3ac08cc5d66326f1cf1436e9581c2407e 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLayerTool.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLayerTool.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocLayerTool_H
 #define DFBrowserPaneXDE_XCAFDocLayerTool_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLocation.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLocation.cxx
index 692b28ade48142105298787c77702af100ee7986..790cb24ec66f7087bb9a220967784ad3a950e302 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLocation.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLocation.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocLocation.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocLocation.hxx>
 
 #include <XCAFDoc_Location.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLocation.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLocation.hxx
index be53fb3e95b3926f8403b0e24d2df5d498797c30..d1f4a100f4fca72ce7981f45b90fae5f4069eb8e 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLocation.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocLocation.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocLocation_H
 #define DFBrowserPaneXDE_XCAFDocLocation_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterial.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterial.cxx
index 7f430234e1f16f78b6c278e8e0bfb6b5cb432137..ace15f9fffb7ac78ab127947d3522197a793cae1 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterial.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterial.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocMaterial.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocMaterial.hxx>
 
 #include <XCAFDoc_Material.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterial.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterial.hxx
index 0fb82f4cfc0a7360eb150cd43065242ffd62a7f5..c457e18e5bcf0e0d5f8ea6671369631a4db2dc0d 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterial.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterial.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocMaterial_H
 #define DFBrowserPaneXDE_XCAFDocMaterial_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterialTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterialTool.cxx
index 12088e8efe5bc2fa634e36ecd6ce4041ceb0a9b2..00bc4217adfd5006ba095d92a91863172d7f5198 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterialTool.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterialTool.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocMaterialTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocMaterialTool.hxx>
 
 #include <XCAFDoc_MaterialTool.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterialTool.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterialTool.hxx
index d5b1f543db70d1b691f88d82d2bb2321219978d3..085aa00b8bd7e133b6a1d1ed0e3be29ac00d61c9 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterialTool.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocMaterialTool.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocMaterialTool_H
 #define DFBrowserPaneXDE_XCAFDocMaterialTool_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx
index 343570d8170625adf93048f0a0796e655c7ff8fb..b4a98f201fab5ef792f9dd01e7c0e912b518f034 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx
@@ -13,13 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocShapeMapTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocShapeMapTool.hxx>
 
-#include <DFBrowserPane_AttributePaneModel.hxx>
-#include <DFBrowserPane_HelperExport.hxx>
-#include <DFBrowserPane_ItemDelegateButton.hxx>
-#include <DFBrowserPane_TableView.hxx>
-#include <DFBrowserPane_Tools.hxx>
+#include <inspector/DFBrowserPane_AttributePaneModel.hxx>
+#include <inspector/DFBrowserPane_HelperExport.hxx>
+#include <inspector/DFBrowserPane_ItemDelegateButton.hxx>
+#include <inspector/DFBrowserPane_TableView.hxx>
+#include <inspector/DFBrowserPane_Tools.hxx>
 
 #include <AIS_Shape.hxx>
 #include <BRepTools.hxx>

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.hxx
index 28933820d7d4632f9c5aa8a715e2c7e4af5a696b..1090ccef4a3cce24ffcebe6e7bd258e733770c1d 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.hxx
@@ -16,8 +16,8 @@
 #ifndef DFBrowserPaneXDE_XCAFDocShapeMapTool_H
 #define DFBrowserPaneXDE_XCAFDocShapeMapTool_H
 
-#include <DFBrowserPane_AttributePane.hxx>
-#include <DFBrowserPane_HelperExport.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_HelperExport.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeTool.cxx
index 731d376ccd437c31623cd7788d2dee4bce082d57..7a7aa80dda145a4636a0dad03b40c6c38bc78b4c 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeTool.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeTool.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XCAFDocShapeTool.hxx>
+#include <inspector/DFBrowserPaneXDE_XCAFDocShapeTool.hxx>
 
 #include <XCAFDoc_ShapeTool.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeTool.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeTool.hxx
index 4c599a3f699459ebbe1a9bd243d1829d89a5ecee..703bbda988309875e233814083d49d22a0bb9918 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeTool.hxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeTool.hxx
@@ -16,7 +16,7 @@
 #ifndef DFBrowserPaneXDE_XCAFDocShapeTool_H
 #define DFBrowserPaneXDE_XCAFDocShapeTool_H
 
-#include <DFBrowserPane_AttributePane.hxx>
+#include <inspector/DFBrowserPane_AttributePane.hxx>
 #include <Standard.hxx>
 #include <TDF_Attribute.hxx>
 

diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XDEDRAW.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XDEDRAW.cxx
index 75d663ecddde2d8cde5c2c95f8d1bffbc4cf465a..17280152c450697ce2723ff6c95ca58dda7605a0 100644 (file)
--- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XDEDRAW.cxx
+++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XDEDRAW.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <DFBrowserPaneXDE_XDEDRAW.hxx>
+#include <inspector/DFBrowserPaneXDE_XDEDRAW.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>

diff --git a/tools/ShapeView/ShapeView_Communicator.cxx b/tools/ShapeView/ShapeView_Communicator.cxx
index 5ecff2ef8d59c96bdc1e26135aa41d5e7b5bf243..c1d89ecd41278a8c832f210ac72251062e9976f2 100644 (file)
--- a/tools/ShapeView/ShapeView_Communicator.cxx
+++ b/tools/ShapeView/ShapeView_Communicator.cxx
@@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <ShapeView_Communicator.hxx>
+#include <inspector/ShapeView_Communicator.hxx>
 
-#include <ShapeView_Window.hxx>
+#include <inspector/ShapeView_Window.hxx>
 #include <OSD_Directory.hxx>
 #include <OSD_Environment.hxx>
 #include <OSD_Path.hxx>

diff --git a/tools/ShapeView/ShapeView_Communicator.hxx b/tools/ShapeView/ShapeView_Communicator.hxx
index 535b9d28fc92f6c977eb162108d051613f82b8da..a32657a03ef2b44b231a65461b6a22e0c93cf730 100644 (file)
--- a/tools/ShapeView/ShapeView_Communicator.hxx
+++ b/tools/ShapeView/ShapeView_Communicator.hxx
@@ -16,8 +16,8 @@
 #ifndef ShapeView_Communicator_H
 #define ShapeView_Communicator_H
 
-#include <ShapeView_Window.hxx>
-#include <TInspectorAPI_Communicator.hxx>
+#include <inspector/ShapeView_Window.hxx>
+#include <inspector/TInspectorAPI_Communicator.hxx>
 
 //! \class ShapeView_Communicator.
 //! \brief This is a connector from TInspector application to ShapeView window

diff --git a/tools/ShapeView/ShapeView_ItemBase.hxx b/tools/ShapeView/ShapeView_ItemBase.hxx
index 535c87175cb076da750a06192b3c2573d238802e..3e0559c50192ccc24960ec0d3a7efa2c32acdefc 100644 (file)
--- a/tools/ShapeView/ShapeView_ItemBase.hxx
+++ b/tools/ShapeView/ShapeView_ItemBase.hxx
@@ -18,7 +18,7 @@
 
 #include <Standard.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TreeModel_ItemBase.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
 
 class ShapeView_ItemBase;
 typedef QExplicitlySharedDataPointer<ShapeView_ItemBase> ShapeView_ItemBasePtr;

diff --git a/tools/ShapeView/ShapeView_ItemRoot.cxx b/tools/ShapeView/ShapeView_ItemRoot.cxx
index 6d784bb88c65bec5d632439f8201580a48a59a3e..64d1dbec32b1d4aae1bb5aed1e75658c5a15c576 100644 (file)
--- a/tools/ShapeView/ShapeView_ItemRoot.cxx
+++ b/tools/ShapeView/ShapeView_ItemRoot.cxx
@@ -14,8 +14,8 @@
 // commercial license or contractual agreement. 
 
 
-#include <ShapeView_ItemRoot.hxx>
-#include <ShapeView_ItemShape.hxx>
+#include <inspector/ShapeView_ItemRoot.hxx>
+#include <inspector/ShapeView_ItemShape.hxx>
 
 // =======================================================================
 // function : GetShape

diff --git a/tools/ShapeView/ShapeView_ItemRoot.hxx b/tools/ShapeView/ShapeView_ItemRoot.hxx
index 63b95efd422c91b96bfbe1ec09e33d5ae170a9bb..370ab5b272aad7c1212622864ec97ef0ac5d96b2 100644 (file)
--- a/tools/ShapeView/ShapeView_ItemRoot.hxx
+++ b/tools/ShapeView/ShapeView_ItemRoot.hxx
@@ -17,7 +17,7 @@
 #define ShapeView_ItemRoot_H
 
 #include <NCollection_List.hxx>
-#include <ShapeView_ItemBase.hxx>
+#include <inspector/ShapeView_ItemBase.hxx>
 #include <Standard.hxx>
 #include <TopoDS_Shape.hxx>
 

diff --git a/tools/ShapeView/ShapeView_ItemShape.cxx b/tools/ShapeView/ShapeView_ItemShape.cxx
index 631e116261e99871cb93381174f9f982dcbf27fb..88bf5f098515898e86c45feb9518fc21f284ffe0 100644 (file)
--- a/tools/ShapeView/ShapeView_ItemShape.cxx
+++ b/tools/ShapeView/ShapeView_ItemShape.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <ShapeView_ItemShape.hxx>
+#include <inspector/ShapeView_ItemShape.hxx>
 
 #include <Adaptor3d_Curve.hxx>
 #include <BRep_Tool.hxx>
@@ -23,8 +23,8 @@
 #include <Geom_Curve.hxx>
 #include <GeomAdaptor_Curve.hxx>
 
-#include <ShapeView_ItemRoot.hxx>
-#include <ShapeView_ItemShape.hxx>
+#include <inspector/ShapeView_ItemRoot.hxx>
+#include <inspector/ShapeView_ItemShape.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>

diff --git a/tools/ShapeView/ShapeView_ItemShape.hxx b/tools/ShapeView/ShapeView_ItemShape.hxx
index 3ab29ceb47022dfaa1de54658d53aa8426a3b28a..eaac8337725cad712b77969670b075a28b202633 100644 (file)
--- a/tools/ShapeView/ShapeView_ItemShape.hxx
+++ b/tools/ShapeView/ShapeView_ItemShape.hxx
@@ -16,7 +16,7 @@
 #ifndef ShapeView_ItemShape_H
 #define ShapeView_ItemShape_H
 
-#include <ShapeView_ItemBase.hxx>
+#include <inspector/ShapeView_ItemBase.hxx>
 #include <Standard.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
@@ -45,7 +45,7 @@ public:
   virtual ~ShapeView_ItemShape() Standard_OVERRIDE {};
 
   //! Returns the current shape
-  const TopoDS_Shape& GetItemShape() const { return myShape; }
+  const TopoDS_Shape& GetItemShape() const { initItem(); return myShape; }
 
   //! Returns child(extracted) shape for the current shape by the index
   //! \param theRowId an index of child shape

diff --git a/tools/ShapeView/ShapeView_OpenFileDialog.cxx b/tools/ShapeView/ShapeView_OpenFileDialog.cxx
index 8c027418f6358652be225488ccf56e172c00ea30..06cad9da18eb45aac338184022e8e0b70385f8dd 100644 (file)
--- a/tools/ShapeView/ShapeView_OpenFileDialog.cxx
+++ b/tools/ShapeView/ShapeView_OpenFileDialog.cxx
@@ -13,8 +13,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <ShapeView_OpenFileDialog.hxx>
-#include <ShapeView_OpenFileViewModel.hxx>
+#include <inspector/ShapeView_OpenFileDialog.hxx>
+#include <inspector/ShapeView_OpenFileViewModel.hxx>
 
 #include <QGroupBox>
 #include <QHBoxLayout>
@@ -208,7 +208,8 @@ void ShapeView_OpenFileDialog::onSelectClicked()
       anEnteredPath = aDirName;
   }
 
-  QString aFileName = QFileDialog::getOpenFileName (0, "Open document", anEnteredPath);
+  QString aFilter (tr ("BREP file (*.brep*)"));
+  QString aFileName = QFileDialog::getOpenFileName (0, "Open document", anEnteredPath, aFilter);
 
   if (aFileName.isEmpty())
     return; // do nothing, left the previous value

diff --git a/tools/ShapeView/ShapeView_OpenFileViewModel.cxx b/tools/ShapeView/ShapeView_OpenFileViewModel.cxx
index 01dc6af59c95ba5b14498154360c22a6d146317f..12db8132b839be7fba7968f666d7b1b8dee7a696 100644 (file)
--- a/tools/ShapeView/ShapeView_OpenFileViewModel.cxx
+++ b/tools/ShapeView/ShapeView_OpenFileViewModel.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <ShapeView_OpenFileViewModel.hxx>
+#include <inspector/ShapeView_OpenFileViewModel.hxx>
 
 #include <QApplication>
 #include <QFileInfo>

diff --git a/tools/ShapeView/ShapeView_Tools.cxx b/tools/ShapeView/ShapeView_Tools.cxx
index 4968689054fbf8e6183d06feea6f698428d10c06..72a5d6649caa8b2a15b7a0fe951567523a55da40 100644 (file)
--- a/tools/ShapeView/ShapeView_Tools.cxx
+++ b/tools/ShapeView/ShapeView_Tools.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <ShapeView_Tools.hxx>
+#include <inspector/ShapeView_Tools.hxx>
 
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>

diff --git a/tools/ShapeView/ShapeView_TreeModel.cxx b/tools/ShapeView/ShapeView_TreeModel.cxx
index 2f5f49bc1c814f0d6f06e40b1ebfd504fc75bcbb..a44b11254470af8a7212b3b9ae55a5a613f45709 100644 (file)
--- a/tools/ShapeView/ShapeView_TreeModel.cxx
+++ b/tools/ShapeView/ShapeView_TreeModel.cxx
@@ -13,8 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <ShapeView_TreeModel.hxx>
-#include <ShapeView_ItemRoot.hxx>
+#include <inspector/ShapeView_TreeModel.hxx>
+#include <inspector/ShapeView_ItemRoot.hxx>
+#include <inspector/ShapeView_TreeModel.hxx>
+#include <inspector/ShapeView_ItemRoot.hxx>
+#include <inspector/ShapeView_ItemShape.hxx>
 
 // =======================================================================
 // function : Constructor
@@ -84,3 +87,39 @@ QVariant ShapeView_TreeModel::headerData (int theSection, Qt::Orientation theOri
   }
   return QVariant();
 }
+
+// =======================================================================
+// function : FindIndex
+// purpose :
+// =======================================================================
+QModelIndex ShapeView_TreeModel::FindIndex (const TopoDS_Shape& theShape) const
+{
+  QModelIndex aParentIndex = index (0, 0);
+  TreeModel_ItemBasePtr aParentItem = TreeModel_ModelBase::GetItemByIndex (aParentIndex); // application item
+  for (int aChildId = 0, aCount = aParentItem->rowCount(); aChildId < aCount; aChildId++)
+  {
+    QModelIndex anIndex = index (aChildId, 0, aParentIndex);
+    ShapeView_ItemShapePtr anItem = itemDynamicCast<ShapeView_ItemShape> (TreeModel_ModelBase::GetItemByIndex (anIndex));
+    if (anItem && anItem->GetItemShape() == theShape)
+      return anIndex;
+  }
+  return QModelIndex();
+}
+
+// =======================================================================
+// function : SingleSelected
+// purpose :
+// =======================================================================
+QModelIndex ShapeView_TreeModel::SingleSelected (const QModelIndexList& theIndices, const int theCellId,
+                                                 const Qt::Orientation theOrientation)
+{
+  QModelIndexList aFirstColumnSelectedIndices;
+  for (QModelIndexList::const_iterator anIndicesIt = theIndices.begin(); anIndicesIt != theIndices.end(); anIndicesIt++)
+  {
+    QModelIndex anIndex = *anIndicesIt;
+    if ((theOrientation == Qt::Horizontal && anIndex.column() == theCellId) ||
+        (theOrientation == Qt::Vertical && anIndex.row() == theCellId))
+      aFirstColumnSelectedIndices.append (anIndex);
+  }
+  return aFirstColumnSelectedIndices.size() == 1 ? aFirstColumnSelectedIndices.first() : QModelIndex();
+}

diff --git a/tools/ShapeView/ShapeView_TreeModel.hxx b/tools/ShapeView/ShapeView_TreeModel.hxx
index 77a34b78a018d3b74f5504145f1ef1d32eaf6f0d..210e8bb882391b1b42d8aec006506d7727cf3b2f 100644 (file)
--- a/tools/ShapeView/ShapeView_TreeModel.hxx
+++ b/tools/ShapeView/ShapeView_TreeModel.hxx
@@ -16,10 +16,10 @@
 #ifndef ShapeView_TreeModel_H
 #define ShapeView_TreeModel_H
 
-#include <ShapeView_ItemBase.hxx>
+#include <inspector/ShapeView_ItemBase.hxx>
 #include <Standard.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
 
 #include <QMap>
 #include <QObject>
@@ -64,6 +64,19 @@ public:
   //! \return the header data
   Standard_EXPORT virtual QVariant headerData (int theSection, Qt::Orientation theOrientation,
                                                int theRole = Qt::DisplayRole ) const Standard_OVERRIDE;
+  //! Returns model index of the shape.
+  //! \param theShape a shape object
+  //! \return the model index
+  QModelIndex FindIndex (const TopoDS_Shape& theShape) const;
+
+    //! Returns single selected item in the cell of given orientation. If the orientation is Horizontal,
+  //! in the cell id colum, one row should be selected.
+  //! \param theIndices a container of selected indices
+  //! \param theCellId column index if orientation is horizontal, row index otherwise
+  //! \param theOrientation an orientation to apply the cell index
+  //! \return model index from the list
+  Standard_EXPORT static QModelIndex SingleSelected (const QModelIndexList& theIndices, const int theCellId,
+                                                     const Qt::Orientation theOrientation = Qt::Horizontal);
 
 private:
   QMap<int, TreeModel_ItemBasePtr> myRootItems; //!< container of root items, for each column own root item

diff --git a/tools/ShapeView/ShapeView_Window.cxx b/tools/ShapeView/ShapeView_Window.cxx
index 739cfe22a51ce47181d1afc1b3572c3d7a3320ac..11fe0703b9df32d0816e1dfacdf4bddaad09fd83 100644 (file)
--- a/tools/ShapeView/ShapeView_Window.cxx
+++ b/tools/ShapeView/ShapeView_Window.cxx
@@ -13,18 +13,22 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <ShapeView_Window.hxx>
-#include <ShapeView_ItemShape.hxx>
-#include <ShapeView_TreeModel.hxx>
-
-#include <View_Displayer.hxx>
-#include <View_ToolBar.hxx>
-#include <View_Widget.hxx>
-#include <View_Window.hxx>
-#include <View_Viewer.hxx>
-
-#include <ShapeView_OpenFileDialog.hxx>
-#include <ShapeView_Tools.hxx>
+#include <inspector/ShapeView_Window.hxx>
+#include <inspector/ShapeView_ItemRoot.hxx>
+#include <inspector/ShapeView_ItemShape.hxx>
+#include <inspector/ShapeView_TreeModel.hxx>
+#include <inspector/View_Displayer.hxx>
+#include <inspector/View_ToolBar.hxx>
+#include <inspector/View_Widget.hxx>
+#include <inspector/View_Window.hxx>
+#include <inspector/View_Viewer.hxx>
+
+#include <inspector/ShapeView_Window.hxx>
+#include <inspector/ShapeView_ItemRoot.hxx>
+#include <inspector/ShapeView_ItemShape.hxx>
+#include <inspector/ShapeView_TreeModel.hxx>
+#include <inspector/ShapeView_OpenFileDialog.hxx>
+#include <inspector/ShapeView_Tools.hxx>
 
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
@@ -127,19 +131,9 @@ ShapeView_Window::ShapeView_Window (QWidget* theParent, const TCollection_AsciiS
 {
   myMainWindow = new QMainWindow (theParent);
 
-  QWidget* aCentralWidget = new QWidget (myMainWindow);
-  QGridLayout* aParentLay = new QGridLayout (aCentralWidget);
-  aParentLay->setContentsMargins (0, 0, 0, 0);
-  myMainWindow->setCentralWidget (aCentralWidget);
-
-  ShapeView_OpenButton* aButton = new ShapeView_OpenButton (0);
-  connect (aButton, SIGNAL (OpenFile (const QString&)), this, SLOT (onOpenFile (const QString&)));
-  aButton->setObjectName ("TKShapeView");
-  aParentLay->addWidget (aButton->StartButton(), 0, 2);
-
   myTreeView = new ShapeView_TreeView (myMainWindow);
   ((ShapeView_TreeView*)myTreeView)->SetPredefinedSize (SHAPEVIEW_DEFAULT_TREE_VIEW_WIDTH,
-                                                          SHAPEVIEW_DEFAULT_TREE_VIEW_HEIGHT);
+                                                        SHAPEVIEW_DEFAULT_TREE_VIEW_HEIGHT);
   myTreeView->setContextMenuPolicy (Qt::CustomContextMenu);
   connect (myTreeView, SIGNAL (customContextMenuRequested (const QPoint&)),
           this, SLOT (onTreeViewContextMenuRequested (const QPoint&)));
@@ -161,11 +155,7 @@ ShapeView_Window::ShapeView_Window (QWidget* theParent, const TCollection_AsciiS
   myTreeView->setColumnWidth (4, LOCATION_COLUMN_WIDTH);
   myTreeView->setColumnWidth (5, FLAGS_COLUMN_WIDTH);
 
-  QDockWidget* aTreeViewWidget = new QDockWidget (tr ("ShapeView"), myMainWindow);
-  aTreeViewWidget->setFeatures (QDockWidget::NoDockWidgetFeatures);
-  aTreeViewWidget->setWidget (myTreeView);
-  myMainWindow->addDockWidget (Qt::LeftDockWidgetArea, aTreeViewWidget);
-  myMainWindow->setCorner (Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
+  myMainWindow->setCentralWidget (myTreeView);
 
   // view
   myViewWindow = new View_Window (myMainWindow);
@@ -173,7 +163,7 @@ ShapeView_Window::ShapeView_Window (QWidget* theParent, const TCollection_AsciiS
 
   QDockWidget* aViewDockWidget = new QDockWidget (tr ("View"), myMainWindow);
   aViewDockWidget->setWidget (myViewWindow);
-  myMainWindow->addDockWidget (Qt::BottomDockWidgetArea, aViewDockWidget);
+  myMainWindow->addDockWidget (Qt::RightDockWidgetArea, aViewDockWidget);
 
   myMainWindow->resize (DEFAULT_SHAPE_VIEW_WIDTH, DEFAULT_SHAPE_VIEW_HEIGHT);
   myMainWindow->move (DEFAULT_SHAPE_VIEW_POSITION_X, DEFAULT_SHAPE_VIEW_POSITION_Y);
@@ -226,6 +216,32 @@ void ShapeView_Window::UpdateContent()
     NCollection_List<TCollection_AsciiString> aNames;
     myParameters->SetFileNames (aName, aNames);
   }
+  // make TopoDS_TShape selected if exist in select parameters
+  NCollection_List<Handle(Standard_Transient)> anObjects;
+  if (myParameters->GetSelectedObjects(aName, anObjects))
+  {
+    ShapeView_TreeModel* aModel = dynamic_cast<ShapeView_TreeModel*> (myTreeView->model());
+    QItemSelectionModel* aSelectionModel = myTreeView->selectionModel();
+    aSelectionModel->clear();
+    for (NCollection_List<Handle(Standard_Transient)>::Iterator aParamsIt (anObjects);
+         aParamsIt.More(); aParamsIt.Next())
+    {
+      Handle(Standard_Transient) anObject = aParamsIt.Value();
+      Handle(TopoDS_TShape) aShapePointer = Handle(TopoDS_TShape)::DownCast (anObject);
+      if (aShapePointer.IsNull())
+        continue;
+
+      TopoDS_Shape aShape;
+      aShape.TShape (aShapePointer);
+
+      QModelIndex aShapeIndex = aModel->FindIndex (aShape);
+      if (!aShapeIndex.isValid())
+        continue;
+       aSelectionModel->select (aShapeIndex, QItemSelectionModel::Select);
+       myTreeView->scrollTo (aShapeIndex);
+    }
+    myParameters->SetSelected (aName, NCollection_List<Handle(Standard_Transient)>());
+  }
 }
 
 // =======================================================================
@@ -299,13 +315,27 @@ void ShapeView_Window::addShape (const TopoDS_Shape& theShape)
 // =======================================================================
 void ShapeView_Window::onTreeViewContextMenuRequested (const QPoint& thePosition)
 {
-  QMenu* aMenu = new QMenu(myMainWindow);
-  aMenu->addAction (createAction ("Clear view", SLOT (onClearView())));
-  if (!myTemporaryDirectory.IsEmpty())
-    aMenu->addAction (createAction ("BREP view", SLOT (onBREPView())));
-  aMenu->addAction (createAction ("Close All BREP views", SLOT (onCloseAllBREPViews())));
-  aMenu->addAction (createAction ("BREP directory", SLOT (onBREPDirectory())));
+  QItemSelectionModel* aModel = myTreeView->selectionModel();
+  if (!aModel)
+    return;
+
+  QModelIndex anIndex = ShapeView_TreeModel::SingleSelected (aModel->selectedIndexes(), 0);
+  TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex);
+  if (!anItemBase)
+    return;
 
+  QMenu* aMenu = new QMenu(myMainWindow);
+  ShapeView_ItemRootPtr aRootItem = itemDynamicCast<ShapeView_ItemRoot> (anItemBase);
+  if (aRootItem) {
+    aMenu->addAction (createAction("Load BREP file", SLOT (onLoadFile())));
+    aMenu->addAction (createAction ("Remove all shape items", SLOT (onClearView())));
+  }
+  else {
+    if (!myTemporaryDirectory.IsEmpty())
+      aMenu->addAction (createAction ("BREP view", SLOT (onBREPView())));
+    aMenu->addAction (createAction ("Close All BREP views", SLOT (onCloseAllBREPViews())));
+    aMenu->addAction (createAction ("BREP directory", SLOT (onBREPDirectory())));
+  }
   QPoint aPoint = myTreeView->mapToGlobal (thePosition);
   aMenu->exec (aPoint);
 }
@@ -324,6 +354,20 @@ void ShapeView_Window::onBREPDirectory()
     viewFile (aFileName);
 }
 
+// =======================================================================
+// function : onLoadFile
+// purpose :
+// =======================================================================
+void ShapeView_Window::onLoadFile()
+{
+  QString aDataDirName = QDir::currentPath();
+
+  QString aFileName = ShapeView_OpenFileDialog::OpenFile(0, aDataDirName);
+  aFileName = QDir().toNativeSeparators (aFileName);
+  if (!aFileName.isEmpty())
+    onOpenFile(aFileName);
+}
+
 // =======================================================================
 // function : onBREPView
 // purpose :

diff --git a/tools/ShapeView/ShapeView_Window.hxx b/tools/ShapeView/ShapeView_Window.hxx
index 11c57fd72909af3b97ad3dc30c224d7624c1dc2f..31cd1d38ce03b506f487149ed91655eb7a5cda04 100644 (file)
--- a/tools/ShapeView/ShapeView_Window.hxx
+++ b/tools/ShapeView/ShapeView_Window.hxx
@@ -18,7 +18,7 @@
 
 #include <Standard.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TInspectorAPI_PluginParameters.hxx>
+#include <inspector/TInspectorAPI_PluginParameters.hxx>
 #include <TopoDS_Shape.hxx>
 
 #ifdef _MSC_VER
@@ -110,6 +110,9 @@ protected slots:
   //! Removes all shapes in tree view
   void onClearView() { RemoveAllShapes(); }
 
+  //! Load BREP file and updates tree model to have shape of the file
+  void onLoadFile();
+
   //! View BREP files of selected items if exist
   void onBREPView();
 

diff --git a/tools/ShapeView/icons/folder_open.png b/tools/ShapeView/icons/folder_open.png
index 9bfd58b38acd312759d4e37b400bce6919b47384..b0a139ebc65294d49ed5be9612931ffbba86b339 100644 (file)
Binary files a/tools/ShapeView/icons/folder_open.png and b/tools/ShapeView/icons/folder_open.png differ

diff --git a/tools/TInspector/FILES b/tools/TInspector/FILES
index 2c39e567fe04142a281f496df92fe71a7be8b14f..f6733979ac4728e20a0e7bdedae154c8cc3da0d5 100644 (file)
--- a/tools/TInspector/FILES
+++ b/tools/TInspector/FILES
@@ -1,5 +1,7 @@
 TInspector.qrc
 TInspector_Communicator.cxx
 TInspector_Communicator.hxx
+TInspector_PluginParameters.cxx
+TInspector_PluginParameters.hxx
 TInspector_Window.cxx
 TInspector_Window.hxx

diff --git a/tools/TInspector/TInspector_Communicator.cxx b/tools/TInspector/TInspector_Communicator.cxx
index e69723a6148bd30cf39f265e8c55c1bd5c59b060..41790a1c66d2c136f385cb5f7bd36eae67f78de6 100644 (file)
--- a/tools/TInspector/TInspector_Communicator.cxx
+++ b/tools/TInspector/TInspector_Communicator.cxx
@@ -13,11 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <TInspector_Communicator.hxx>
+#include <inspector/TInspector_Communicator.hxx>
 
 #include <OSD_Environment.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TInspector_Window.hxx>
+#include <inspector/TInspector_Window.hxx>
 
 #include <QApplication>
 #include <QDir>
@@ -43,7 +43,6 @@ TInspector_Communicator::TInspector_Communicator()
     new QApplication (argc, argv);
   }
   myWindow = new TInspector_Window();
-  QObject::connect (qApp, SIGNAL (lastWindowClosed()), myWindow, SLOT (OnLastApplicationWindowClosed()));
 }
 
 // =======================================================================

diff --git a/tools/TInspector/TInspector_Communicator.hxx b/tools/TInspector/TInspector_Communicator.hxx
index 0b961f0202530960851984fa35efb7746596e41b..ff59ecfcaf4dcf2c83ba998deee70392744a9f03 100644 (file)
--- a/tools/TInspector/TInspector_Communicator.hxx
+++ b/tools/TInspector/TInspector_Communicator.hxx
@@ -16,7 +16,7 @@
 #ifndef TInspector_Communicator_H
 #define TInspector_Communicator_H
 
-#include <TInspector_Window.hxx>
+#include <inspector/TInspector_Window.hxx>
 
 #include <NCollection_List.hxx>
 #include <Standard.hxx>
@@ -43,16 +43,25 @@ public:
   //! \param thePluginName a name of the plugin
   void RegisterPlugin (const TCollection_AsciiString& thePluginName) { myWindow->RegisterPlugin (thePluginName); }
 
+  //! Returns list of registered plugins
+  //! \return container of plugin names
+  NCollection_List<TCollection_AsciiString> RegisteredPlugins() const { return myWindow->RegisteredPlugins(); }
+
   //! Stores parameters for the plugin
   //! \param theParameters container of parameters(e.g. AIS_InteractiveContext, TDocStd_Application)
-  void Init (const NCollection_List<Handle(Standard_Transient)>& theParameters) { myWindow->Init ("", theParameters); }
+  //! \param theAppend boolean state whethe the parameters should be added to existing
+  void Init (const NCollection_List<Handle(Standard_Transient)>& theParameters,
+             const Standard_Boolean theAppend = Standard_False)
+    { myWindow->Init ("", theParameters, theAppend); }
 
   //! Stores parameters for the plugin
   //! \param thePluginName a name of the plugin
   //! \param theParameters container of parameters(e.g. AIS_InteractiveContext, TDocStd_Application)
+  //! \param theAppend boolean state whethe the parameters should be added to existing
   void Init (const TCollection_AsciiString& thePluginName,
-             const NCollection_List<Handle(Standard_Transient)>& theParameters)
-  { myWindow->Init (thePluginName, theParameters); }
+             const NCollection_List<Handle(Standard_Transient)>& theParameters,
+             const Standard_Boolean theAppend = Standard_False)
+  { myWindow->Init (thePluginName, theParameters, theAppend); }
 
   //! UpdateContent for the TInspector window
   void UpdateContent() { myWindow->UpdateContent(); }
@@ -68,6 +77,15 @@ public:
   //! \param thePluginName a name of the plugin
   void Activate (const TCollection_AsciiString& thePluginName) { myWindow->ActivateTool (thePluginName); }
 
+  //! Set item selected in the active plugin
+  //! \param theItemName a containerr of name of items in plugin that should become selected
+  void SetSelected (const NCollection_List<TCollection_AsciiString>& theItemNames) { myWindow->SetSelected (theItemNames); }
+
+  //! Sets objects to be selected in the plugin
+  //! \param theObjects an objects
+  Standard_EXPORT void SetSelected (const NCollection_List<Handle(Standard_Transient)>& theObjects)
+    { myWindow->SetSelected (theObjects); }
+
   //! Change window visibility
   //! \param theVisible boolean state
   Standard_EXPORT virtual void SetVisible (const bool theVisible);

diff --git a/tools/TInspector/TInspector_PluginParameters.cxx b/tools/TInspector/TInspector_PluginParameters.cxx
new file mode 100644 (file)
index 0000000..50ffd7d
--- /dev/null
+++ b/tools/TInspector/TInspector_PluginParameters.cxx
@@ -0,0 +1,34 @@
+// Created on: 2017-06-16
+// Created by: Natalia ERMOLAEVA
+// Copyright (c) 2017 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement. 
+
+
+#include <inspector/TInspector_PluginParameters.hxx>
+
+// =======================================================================
+// function : SetParameters
+// purpose :
+// =======================================================================
+void TInspector_PluginParameters::SetParameters (const TCollection_AsciiString& thePluginName,
+                                                 const NCollection_List<Handle(Standard_Transient)>& theParameters,
+                                                 const Standard_Boolean& theToActivatePlugin)
+{
+  TInspectorAPI_PluginParameters::SetParameters (thePluginName, theParameters, Standard_False);
+
+  if (!theToActivatePlugin)
+    return;
+
+  SetSelected (thePluginName, theParameters);
+  myWindow->ActivateTool (thePluginName);
+}

diff --git a/tools/TInspector/TInspector_PluginParameters.hxx b/tools/TInspector/TInspector_PluginParameters.hxx
new file mode 100644 (file)
index 0000000..ea88aae
--- /dev/null
+++ b/tools/TInspector/TInspector_PluginParameters.hxx
@@ -0,0 +1,50 @@
+// Created on: 2017-06-16
+// Created by: Natalia ERMOLAEVA
+// Copyright (c) 2017 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement. 
+
+#ifndef DFBrowser_Communicator_H
+#define DFBrowser_Communicator_H
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+
+#include <inspector/TInspectorAPI_PluginParameters.hxx>
+#include <inspector/TInspector_Window.hxx>
+
+//! \class TInspector_PluginParameters.
+//! \brief This is plugin parameters extended by a possibility to activate module during setting new parameters
+class TInspector_PluginParameters : public TInspectorAPI_PluginParameters
+{
+public:
+
+  //! Constructor
+  Standard_EXPORT TInspector_PluginParameters (TInspector_Window* theWindow) : myWindow (theWindow) {}
+
+  //! Destructor
+  virtual ~TInspector_PluginParameters() Standard_OVERRIDE {}
+
+  //! Stores the parameters for plugin
+  //! \param thePluginName a plugin name
+  //! \param theParameters a list of parameters
+  //! \param theToActivatePlugin a state whether the plugin should be immediately activated
+  Standard_EXPORT virtual void SetParameters (const TCollection_AsciiString& thePluginName,
+                                      const NCollection_List<Handle(Standard_Transient)>& theParameters,
+                                      const Standard_Boolean& theToActivatePlugin = Standard_False) Standard_OVERRIDE;
+
+private:
+
+  TInspector_Window* myWindow; //!< the current window
+};
+
+#endif

diff --git a/tools/TInspector/TInspector_Window.cxx b/tools/TInspector/TInspector_Window.cxx
index 8fea026a4bb8380f61e10d2704652fe676d25f4d..08813a719205504da8bccc7ab6920c98ba1474fd 100644 (file)
--- a/tools/TInspector/TInspector_Window.cxx
+++ b/tools/TInspector/TInspector_Window.cxx
@@ -13,9 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <TInspector_Window.hxx>
+#include <inspector/TInspector_Window.hxx>
+#include <inspector/TInspector_Window.hxx>
 
-#include <TInspectorAPI_Communicator.hxx>
+#include <inspector/TInspectorAPI_Communicator.hxx>
+#include <inspector/TInspector_PluginParameters.hxx>
 
 #include <QApplication>
 #include <QDockWidget>
@@ -65,7 +67,35 @@ TInspector_Window::TInspector_Window()
   myMainWindow->move (TINSPECTOR_DEFAULT_POSITION_X, TINSPECTOR_DEFAULT_POSITION_Y);
   myMainWindow->setDockOptions (QMainWindow::VerticalTabs);
 
-  myParameters = new TInspectorAPI_PluginParameters();
+  myParameters = new TInspector_PluginParameters (this);
+}
+
+// =======================================================================
+// function : RegisterPlugin
+// purpose :
+// =======================================================================
+void TInspector_Window::RegisterPlugin (const TCollection_AsciiString& thePluginName)
+{
+  TInspector_ToolInfo anInfo;
+  int aToolId;
+  if (FindPlugin (thePluginName, anInfo, aToolId))
+    return;
+
+  myToolNames.append (TInspector_ToolInfo (thePluginName));
+}
+
+// =======================================================================
+// function : RegisteredPlugins
+// purpose :
+// =======================================================================
+NCollection_List<TCollection_AsciiString> TInspector_Window::RegisteredPlugins() const
+{
+  NCollection_List<TCollection_AsciiString> aPlugins;
+
+  for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++)
+    aPlugins.Append (myToolNames[aToolId].myName);
+
+  return aPlugins;
 }
 
 // =======================================================================
@@ -73,13 +103,14 @@ TInspector_Window::TInspector_Window()
 // purpose :
 // =======================================================================
 void TInspector_Window::Init (const TCollection_AsciiString& thePluginName,
-                              const NCollection_List<Handle(Standard_Transient)>& theParameters)
+                              const NCollection_List<Handle(Standard_Transient)>& theParameters,
+                              const Standard_Boolean theAppend)
 {
   if (thePluginName.IsEmpty())
   {
     // Init all plugins by the given parameters
     for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++)
-      Init (myToolNames[aToolId].myName, theParameters);
+      Init (myToolNames[aToolId].myName, theParameters, theAppend);
 
     // temporary activation of the first tool
     if (!myToolNames.isEmpty())
@@ -87,24 +118,38 @@ void TInspector_Window::Init (const TCollection_AsciiString& thePluginName,
     return;
   }
 
-  myParameters->SetParameters (thePluginName, theParameters);
-
-  for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++)
+  if (theAppend)
   {
-    TInspector_ToolInfo anInfo = myToolNames[aToolId];
-    if (anInfo.myName != thePluginName)
-      continue;
+    NCollection_List<Handle(Standard_Transient)> aParameters;
+    if (myParameters->FindParameters (thePluginName))
+      aParameters = myParameters->Parameters (thePluginName);
 
-    if (anInfo.myCommunicator)
-      break;
+    for (NCollection_List<Handle(Standard_Transient)>::Iterator anIterator (theParameters);
+      anIterator.More(); anIterator.Next())
+      aParameters.Append (anIterator.Value());
 
-    QPushButton* aButton = new QPushButton(anInfo.myName.ToCString(), myButtonWidget);
-    connect (aButton, SIGNAL (clicked (bool)), this, SLOT (onButtonClicked()));
-    myButtonLay->insertWidget (myButtonLay->count()-1, aButton);
-    anInfo.myButton = aButton;
-    myToolNames[aToolId] = anInfo;
-    break;
+    myParameters->SetParameters (thePluginName, aParameters, Standard_False);
   }
+  else
+    myParameters->SetParameters (thePluginName, theParameters, Standard_False);
+
+  TInspector_ToolInfo anInfo;
+  int aToolId;
+  if (!FindPlugin (thePluginName, anInfo, aToolId))
+    return;
+
+  if (anInfo.myButton)
+    return;
+
+  QString aButtonName = anInfo.myName.ToCString();
+  if (aButtonName.indexOf("TK") == 0)
+    aButtonName = aButtonName.mid(2);
+
+  QPushButton* aButton = new QPushButton(aButtonName, myButtonWidget);
+  connect (aButton, SIGNAL (clicked (bool)), this, SLOT (onButtonClicked()));
+  myButtonLay->insertWidget (myButtonLay->count()-1, aButton);
+  anInfo.myButton = aButton;
+  myToolNames[aToolId] = anInfo;
 }
 
 // =======================================================================
@@ -146,6 +191,44 @@ void TInspector_Window::ActivateTool (const TCollection_AsciiString& thePluginNa
   onCommuncatorNameChanged();
 }
 
+// =======================================================================
+// function : SetSelected
+// purpose :
+// =======================================================================
+void TInspector_Window::SetSelected (const NCollection_List<TCollection_AsciiString>& theItemNames)
+{
+  TInspector_ToolInfo anInfo;
+  if (!ActiveToolInfo (anInfo))
+    return;
+
+  myParameters->SetSelectedNames (anInfo.myName, theItemNames);
+
+  TInspectorAPI_Communicator* aCommunicator = anInfo.myCommunicator;
+  if (aCommunicator)
+  {
+    aCommunicator->UpdateContent();
+  }
+}
+
+// =======================================================================
+// function : SetSelected
+// purpose :
+// =======================================================================
+void TInspector_Window::SetSelected (const NCollection_List<Handle(Standard_Transient)>& theObjects)
+{
+  TInspector_ToolInfo anInfo;
+  if (!ActiveToolInfo (anInfo))
+    return;
+
+  myParameters->SetSelected (anInfo.myName, theObjects);
+
+  TInspectorAPI_Communicator* aCommunicator = anInfo.myCommunicator;
+  if (aCommunicator)
+  {
+    aCommunicator->UpdateContent();
+  }
+}
+
 // =======================================================================
 // function : SetOpenButton
 // purpose :
@@ -166,6 +249,14 @@ void TInspector_Window::SetOpenButton (QPushButton* theButton)
 void TInspector_Window::OpenFile (const TCollection_AsciiString& thePluginName,
                                   const TCollection_AsciiString& theFileName)
 {
+  if (thePluginName.IsEmpty())
+  {
+    // Apply file name to all plugins
+    for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++)
+      OpenFile (myToolNames[aToolId].myName, theFileName);
+    return;
+  }
+
   myParameters->AddFileName (thePluginName, theFileName);
 
   TInspector_ToolInfo anInfo;
@@ -221,16 +312,6 @@ bool TInspector_Window::LoadPlugin (const TCollection_AsciiString& thePluginName
   return aLoaded;
 }
 
-// =======================================================================
-// function : onLastApplicationWindowClosed
-// purpose :
-// =======================================================================
-void TInspector_Window::OnLastApplicationWindowClosed()
-{
-  for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++)
-    delete myToolNames[aToolId].myCommunicator;
-}
-
 // =======================================================================
 // function : onButtonClicked
 // purpose :
@@ -238,7 +319,7 @@ void TInspector_Window::OnLastApplicationWindowClosed()
 void TInspector_Window::onButtonClicked()
 {
   QPushButton* aButton = (QPushButton*)sender();
-  ActivateTool (TCollection_AsciiString (aButton->text().toStdString().c_str()));
+  ActivateTool (TCollection_AsciiString ("TK") + aButton->text().toStdString().c_str());
 }
 
 // =======================================================================
@@ -275,3 +356,24 @@ bool TInspector_Window::ActiveToolInfo (TInspector_Window::TInspector_ToolInfo&
   }
   return false;
 }
+
+// =======================================================================
+// function : FindPlugin
+// purpose :
+// =======================================================================
+bool TInspector_Window::FindPlugin (const TCollection_AsciiString& thePluginName, TInspector_ToolInfo& theToolInfo,
+                                    int& theToolId)
+{
+  for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++)
+  {
+    TInspector_ToolInfo anInfo = myToolNames[aToolId];
+    if (anInfo.myName != thePluginName)
+      continue;
+    theToolInfo = anInfo;
+    theToolId = aToolId;
+    return true;
+  }
+
+  return false;
+}
+  
\ No newline at end of file

diff --git a/tools/TInspector/TInspector_Window.hxx b/tools/TInspector/TInspector_Window.hxx
index 1887707f1965e25379fee6c65f7ac3966c827be0..ecac17cd166a6168fba1da2c9632920bba50d7c7 100644 (file)
--- a/tools/TInspector/TInspector_Window.hxx
+++ b/tools/TInspector/TInspector_Window.hxx
@@ -20,7 +20,7 @@
 #include <Standard.hxx>
 #include <Standard_Transient.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TInspectorAPI_PluginParameters.hxx>
+#include <inspector/TInspectorAPI_PluginParameters.hxx>
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4127) // conditional expression is constant
@@ -70,14 +70,19 @@ public:
 
   //! Appends the plugin names into internal conainer
   //! \param thePluginName a name of the plugin
-  void RegisterPlugin (const TCollection_AsciiString& thePluginName)
-  { myToolNames.append (TInspector_ToolInfo(thePluginName)); }
+  Standard_EXPORT void RegisterPlugin (const TCollection_AsciiString& thePluginName);
+
+  //! Returns list of registered plugins
+  //! \return container of plugin names
+  Standard_EXPORT NCollection_List<TCollection_AsciiString> RegisteredPlugins() const;
 
   //! Stores parameters for the plugin. If the plugin name is empty, it inits all plugins with the parameters
   //! \param thePluginName a name of the plugin
   //! \param theParameters container of parameters(e.g. AIS_InteractiveContext, TDocStd_Application)
+  //! \param theAppend boolean state whethe the parameters should be added to existing
   Standard_EXPORT void Init (const TCollection_AsciiString& thePluginName,
-                             const NCollection_List<Handle(Standard_Transient)>& theParameters);
+                             const NCollection_List<Handle(Standard_Transient)>& theParameters,
+                             const Standard_Boolean theAppend = Standard_False);
 
   //! Appends to container of parameters the given name, if the given parameter is active, cal UpdateContent
   //! \param thePluginName a name of the plugin
@@ -95,6 +100,14 @@ public:
   //! \param thePluginName a name of the plugin
   Standard_EXPORT void ActivateTool (const TCollection_AsciiString& thePluginName);
 
+  //! Set item selected in the active plugin
+  //! \param theItemNames a container of name of items in plugin that should become selected
+  Standard_EXPORT void SetSelected (const NCollection_List<TCollection_AsciiString>& theItemNames);
+
+  //! Sets objects to be selected in the plugin
+  //! \param theObjects an objects
+  Standard_EXPORT void SetSelected (const NCollection_List<Handle(Standard_Transient)>& theObjects);
+
   //! Sets open button. Stores into objectName for the button the name of the current plugin to know where
   //! the file should be applied
   //! \param theButton a button
@@ -105,11 +118,6 @@ public:
   //! \param theInfo an output parameter for plugin info
   Standard_EXPORT bool LoadPlugin (const TCollection_AsciiString& thePluginName, TInspector_ToolInfo& theInfo);
 
-public slots:
-
-  //! Destroys loaded communicators
-  Standard_EXPORT void OnLastApplicationWindowClosed();
-
 protected slots:
 
   //! Activates plugin correspnded to the clicked button
@@ -124,6 +132,14 @@ protected:
   //! \param theToolInfo an information about plugin
   bool ActiveToolInfo (TInspector_ToolInfo& theToolInfo) const;
 
+  //! Returns true if there is plugin registered by the given name
+  //! \param thePluginName a name of the plugin
+  //! \param theToolInfo an output parameter for plugin information
+  //! \param theToolId an index in internal map
+  //! \return true if the plugin is found
+  bool FindPlugin (const TCollection_AsciiString& thePluginName, TInspector_ToolInfo& theToolInfo,
+                   int& theToolId);
+
 private:
 
   QWidget* myEmptyWidget; //!< widget that is active in tools stack while no one plugin is loaded

diff --git a/tools/TInspectorAPI/TInspectorAPI_Communicator.cxx b/tools/TInspectorAPI/TInspectorAPI_Communicator.cxx
index 459e4680ba1d1c3742a1d3fcf38eb45eaf56cfd8..877f6ee86f4a003493e678e462fe758cc5904f02 100644 (file)
--- a/tools/TInspectorAPI/TInspectorAPI_Communicator.cxx
+++ b/tools/TInspectorAPI/TInspectorAPI_Communicator.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <TInspectorAPI_Communicator.hxx>
+#include <inspector/TInspectorAPI_Communicator.hxx>
 
 #include <cstdio>
 #include <map>

diff --git a/tools/TInspectorAPI/TInspectorAPI_Communicator.hxx b/tools/TInspectorAPI/TInspectorAPI_Communicator.hxx
index 18991cc822d1403aba7d255ad77acd4449411af0..ee26363c318a31f530c40cf97826bb54887f9e17 100644 (file)
--- a/tools/TInspectorAPI/TInspectorAPI_Communicator.hxx
+++ b/tools/TInspectorAPI/TInspectorAPI_Communicator.hxx
@@ -22,7 +22,7 @@
 #if OCC_VERSION_HEX > 0x060901
   #include <Standard_Handle.hxx>
 #endif
-#include <TInspectorAPI_PluginParameters.hxx>
+#include <inspector/TInspectorAPI_PluginParameters.hxx>
 
 //! The Communicator is an interface that should be implemented for a separate plugin
 //! It will be placed in layout of the given parent. After the plugin is created, it is possible to

diff --git a/tools/TInspectorAPI/TInspectorAPI_PluginParameters.cxx b/tools/TInspectorAPI/TInspectorAPI_PluginParameters.cxx
index 3db7210768b9616d93112cdf58c04d4eee574d97..1bf0725f14d215469d4e73380473f354e06ae561 100644 (file)
--- a/tools/TInspectorAPI/TInspectorAPI_PluginParameters.cxx
+++ b/tools/TInspectorAPI/TInspectorAPI_PluginParameters.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <TInspectorAPI_PluginParameters.hxx>
+#include <inspector/TInspectorAPI_PluginParameters.hxx>
 
 #if OCC_VERSION_HEX <= 0x060901
 IMPLEMENT_STANDARD_HANDLE (TInspectorAPI_PluginParameters, Standard_Transient)
@@ -31,11 +31,12 @@ TInspectorAPI_PluginParameters::TInspectorAPI_PluginParameters()
 }
 
 // =======================================================================
-// function :  SetParameters
+// function : SetParameters
 // purpose :
 // =======================================================================
 void TInspectorAPI_PluginParameters::SetParameters (const TCollection_AsciiString& thePluginName,
-                               const NCollection_List<Handle(Standard_Transient)>& theParameters)
+                                                    const NCollection_List<Handle(Standard_Transient)>& theParameters,
+                                                    const Standard_Boolean&)
 {
   if (theParameters.Size() > 0)
     myParameters.Bind (thePluginName, theParameters);
@@ -44,7 +45,7 @@ void TInspectorAPI_PluginParameters::SetParameters (const TCollection_AsciiStrin
 }
 
 // =======================================================================
-// function :  AddFileName
+// function : AddFileName
 // purpose :
 // =======================================================================
 void TInspectorAPI_PluginParameters::AddFileName (const TCollection_AsciiString& thePluginName,
@@ -61,7 +62,7 @@ void TInspectorAPI_PluginParameters::AddFileName (const TCollection_AsciiString&
 }
 
 // =======================================================================
-// function :  SetFileNames
+// function : SetFileNames
 // purpose :
 // =======================================================================
 void TInspectorAPI_PluginParameters::SetFileNames (const TCollection_AsciiString& thePluginName,
@@ -70,12 +71,34 @@ void TInspectorAPI_PluginParameters::SetFileNames (const TCollection_AsciiString
   if (theFileNames.Size() > 0)
     myFileNames.Bind (thePluginName, theFileNames);
   else
-    myFileNames.UnBind(thePluginName);
+    myFileNames.UnBind (thePluginName);
+}
+
+// =======================================================================
+// function : SetSelectedNames
+// purpose :
+// =======================================================================
+void TInspectorAPI_PluginParameters::SetSelectedNames (const TCollection_AsciiString& thePluginName,
+                                                       const NCollection_List<TCollection_AsciiString>& theItemNames)
+{
+  mySelectedItemNames.Bind (thePluginName, theItemNames);
+}
 
+// =======================================================================
+// function : SetSelected
+// purpose :
+// =======================================================================
+void TInspectorAPI_PluginParameters::SetSelected (const TCollection_AsciiString& thePluginName,
+                                                  const NCollection_List<Handle(Standard_Transient)>& theObjects)
+{
+  if (theObjects.Size() > 0)
+    mySelectedObjects.Bind (thePluginName, theObjects);
+  else
+    mySelectedObjects.UnBind (thePluginName);
 }
 
 // =======================================================================
-// function :  FindParameters
+// function : FindParameters
 // purpose :
 // =======================================================================
 bool TInspectorAPI_PluginParameters::FindParameters (const TCollection_AsciiString& thePluginName)
@@ -84,7 +107,7 @@ bool TInspectorAPI_PluginParameters::FindParameters (const TCollection_AsciiStri
 }
 
 // =======================================================================
-// function :  Parameters
+// function : Parameters
 // purpose :
 // =======================================================================
 const NCollection_List<Handle(Standard_Transient)>& TInspectorAPI_PluginParameters::Parameters
@@ -94,7 +117,7 @@ const NCollection_List<Handle(Standard_Transient)>& TInspectorAPI_PluginParamete
 }
 
 // =======================================================================
-// function :  FindFileNames
+// function : FindFileNames
 // purpose :
 // =======================================================================
 bool TInspectorAPI_PluginParameters::FindFileNames (const TCollection_AsciiString& thePluginName)
@@ -103,7 +126,7 @@ bool TInspectorAPI_PluginParameters::FindFileNames (const TCollection_AsciiStrin
 }
 
 // =======================================================================
-// function :  FileNames
+// function : FileNames
 // purpose :
 // =======================================================================
 const NCollection_List<TCollection_AsciiString>& TInspectorAPI_PluginParameters::FileNames
@@ -111,3 +134,32 @@ const NCollection_List<TCollection_AsciiString>& TInspectorAPI_PluginParameters:
 {
   return myFileNames.Find (thePluginName);
 }
+
+// =======================================================================
+// function : FindSelectedNames
+// purpose :
+// =======================================================================
+bool TInspectorAPI_PluginParameters::FindSelectedNames (const TCollection_AsciiString& thePluginName)
+{
+  return mySelectedItemNames.IsBound(thePluginName);
+}
+
+// =======================================================================
+// function : GetSelectedNames
+// purpose :
+// =======================================================================
+const NCollection_List<TCollection_AsciiString>& TInspectorAPI_PluginParameters::GetSelectedNames
+                                                       (const TCollection_AsciiString& thePluginName)
+{
+  return mySelectedItemNames.Find (thePluginName);
+}
+
+// =======================================================================
+// function : GetSelectedObjects
+// purpose :
+// =======================================================================
+Standard_Boolean TInspectorAPI_PluginParameters::GetSelectedObjects (const TCollection_AsciiString& thePluginName,
+                                                       NCollection_List<Handle(Standard_Transient)>& theObjects)
+{
+  return mySelectedObjects.Find (thePluginName, theObjects);
+}

diff --git a/tools/TInspectorAPI/TInspectorAPI_PluginParameters.hxx b/tools/TInspectorAPI/TInspectorAPI_PluginParameters.hxx
index c59c9cf9378baca0d0dd120b452802f9265b72fc..ea5c1ec4db5a3dc04a95a7e8344ec4f3b8553215 100644 (file)
--- a/tools/TInspectorAPI/TInspectorAPI_PluginParameters.hxx
+++ b/tools/TInspectorAPI/TInspectorAPI_PluginParameters.hxx
@@ -44,21 +44,35 @@ public:
   //! Stores the parameters for plugin
   //! \param thePluginName a plugin name
   //! \param theParameters a list of parameters
-  Standard_EXPORT void SetParameters (const TCollection_AsciiString& thePluginName,
-                                      const NCollection_List<Handle(Standard_Transient)>& theParameters);
+  //! \param theToActivatePlugin a state whether the plugin should be immediately activated, to be used in a heir
+  Standard_EXPORT virtual void SetParameters (const TCollection_AsciiString& thePluginName,
+                                              const NCollection_List<Handle(Standard_Transient)>& theParameters,
+                                              const Standard_Boolean& theToActivatePlugin = Standard_False);
 
-  //! Add a file name for the plugin
+  //! Adds a file name for the plugin
   //! \param thePluginName a plugin name
   //! \param theFileName a name
   Standard_EXPORT void AddFileName (const TCollection_AsciiString& thePluginName,
                                     const TCollection_AsciiString& theFileName);
 
-  //! Set file names for the plugin
+  //! Sets file names for the plugin
   //! \param thePluginName a plugin name
   //! \param theFileNames container of names
   Standard_EXPORT void SetFileNames (const TCollection_AsciiString& thePluginName,
                                      const NCollection_List<TCollection_AsciiString>& theFileNames);
 
+  //! Sets a name of item to be selected in the plugin
+  //! \param thePluginName a plugin name
+  //! \param theItemNames a container of names to be selected
+  Standard_EXPORT void SetSelectedNames (const TCollection_AsciiString& thePluginName,
+                                         const NCollection_List<TCollection_AsciiString>& theItemNames);
+
+  //! Sets objects to be selected in the plugin
+  //! \param thePluginName a plugin name
+  //! \param theObjects an objects
+  Standard_EXPORT void SetSelected (const TCollection_AsciiString& thePluginName,
+                                    const NCollection_List<Handle(Standard_Transient)>& theObjects);
+
   //! Returns true if there are parameters set for the given plugin
   //! \param thePluginName a plugin name
   //! \return boolean result
@@ -81,6 +95,23 @@ public:
   Standard_EXPORT const NCollection_List<TCollection_AsciiString>& FileNames(
                                                       const TCollection_AsciiString& thePluginName);
 
+  //! Returns true if there are file names set for the given plugin
+  //! \param thePluginName a plugin name
+  //! \return boolean result
+  Standard_EXPORT bool FindSelectedNames (const TCollection_AsciiString& thePluginName);
+
+  //! Returns name to be selected in the plugin
+  //! \param thePluginName a plugin name
+  //! \return container of names
+  Standard_EXPORT const NCollection_List<TCollection_AsciiString>& GetSelectedNames (
+                                                      const TCollection_AsciiString& thePluginName);
+
+  //! Returns objects set for the given plugin
+  //! \param thePluginName a plugin name
+  //! \return container of objects
+  Standard_EXPORT Standard_Boolean GetSelectedObjects (const TCollection_AsciiString& thePluginName,
+                                                       NCollection_List<Handle(Standard_Transient)>& theObjects);
+
 #if OCC_VERSION_HEX <= 0x060901
   DEFINE_STANDARD_RTTI (TInspectorAPI_PluginParameters)
 #else
@@ -91,6 +122,10 @@ private:
   NCollection_DataMap<TCollection_AsciiString, NCollection_List<Handle(Standard_Transient)> > myParameters;
   //! container of names
   NCollection_DataMap<TCollection_AsciiString, NCollection_List<TCollection_AsciiString> > myFileNames;
+  //! container of select item names
+  NCollection_DataMap<TCollection_AsciiString, NCollection_List<TCollection_AsciiString> > mySelectedItemNames;
+  //! container of select objects
+  NCollection_DataMap<TCollection_AsciiString, NCollection_List<Handle(Standard_Transient)> > mySelectedObjects;
 };
 
 #endif

diff --git a/tools/ToolsDraw/ToolsDraw.cxx b/tools/ToolsDraw/ToolsDraw.cxx
index 480a311c9e4937a7f3c66d15236b0aa1644db570..0cd3a7b069bb83df291d1bddb202f8d4a37954c1 100644 (file)
--- a/tools/ToolsDraw/ToolsDraw.cxx
+++ b/tools/ToolsDraw/ToolsDraw.cxx
@@ -13,19 +13,73 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <ToolsDraw.hxx>
+#include <inspector/ToolsDraw.hxx>
+#include <inspector/ToolsDraw.hxx>
 
 #include <AIS_InteractiveContext.hxx>
+#include <BRep_Builder.hxx>
+#include <BRepTools.hxx>
+#include <DBRep.hxx>
 #include <DDocStd.hxx>
+#include <Draw.hxx>
 #include <Draw_PluginMacro.hxx>
+#include <NCollection_DataMap.hxx>
 #include <Standard_Stream.hxx>
 #include <TDocStd_Application.hxx>
-#include <TInspector_Communicator.hxx>
+#include <inspector/TInspector_Communicator.hxx>
+#include <TopoDS_Shape.hxx>
 #include <ViewerTest.hxx>
-#include <DDocStd.hxx>
+#include <ViewerTest_DoubleMapOfInteractiveAndName.hxx>
+
+#if ! defined(_WIN32)
+extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
+#else
+Standard_EXPORT ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
+#endif
 
 static TInspector_Communicator* MyCommunicator;
 
+// =======================================================================
+// function : convertToPluginName
+// purpose  : defines plugin library name by the command argument
+// =======================================================================
+Standard_Boolean convertToPluginName (const TCollection_AsciiString& theArgument,
+                                      TCollection_AsciiString& thePluginName)
+{
+  TCollection_AsciiString anArgument = theArgument;
+  anArgument.LowerCase();
+
+  if (anArgument == "dfbrowser")       { thePluginName = "TKDFBrowser"; return Standard_True; }
+  else if (anArgument == "shapeview")  { thePluginName = "TKShapeView"; return Standard_True; }
+  else if (anArgument == "vinspector") { thePluginName = "TKVInspector"; return Standard_True; }
+
+  return Standard_False;
+}
+
+// =======================================================================
+// function : getArgumentPlugins
+// purpose  : fills container of plugin names by the next following plugin names
+// =======================================================================
+void getArgumentPlugins (Standard_Integer theArgsNb, const char** theArgs, Standard_Integer& theIt,
+                         NCollection_List<TCollection_AsciiString>& thePlugins)
+{
+  while (theIt != theArgsNb)
+  {
+    TCollection_AsciiString aPluginName;
+    if (convertToPluginName (theArgs[theIt], aPluginName))
+    {
+      if (!thePlugins.Contains (aPluginName))
+        thePlugins.Append (aPluginName);
+    }
+    else
+    {
+      break;
+    }
+    theIt++;
+  }
+  theIt--; // the last not processed parameter is the next argument
+}
+
 // =======================================================================
 // function : tinspector
 // purpose  : 
@@ -34,76 +88,240 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con
 {
   if (theArgsNb < 1)
   {
-    std::cerr << "Error: wrong number of arguments.\n";
+    std::cout << "Error: wrong number of arguments.\n";
     return 1;
   }
 
-  if (!MyCommunicator)
-    MyCommunicator = new TInspector_Communicator();
-  NCollection_List<Handle(Standard_Transient)> aParameters;
-
+  // parse command arguments
   NCollection_List<TCollection_AsciiString> aPlugins;
-  bool aNeedToUpdateContent = false, aNeedToActivateAllPlugins = false;
+  NCollection_DataMap<TCollection_AsciiString, NCollection_List<Handle(Standard_Transient)> > aParameters;
+  NCollection_DataMap<TCollection_AsciiString, TCollection_AsciiString > anOpenFileParameters;
+  TCollection_AsciiString aPluginNameToActivate;
+  Standard_Boolean aNeedToUpdateContent = Standard_False,
+                   aNeedToHideInspector = Standard_False,
+                   aNeedToShowInspector = Standard_False;
+
+  NCollection_List<Handle(Standard_Transient)> aDefaultParameters;
+  TCollection_AsciiString aDefaultOpenFileParameter;
+
+  NCollection_List<Handle(Standard_Transient)> anObjectsToSelect;
+  NCollection_List<TCollection_AsciiString> anItemNamesToSelect;
+
   for (Standard_Integer anIt = 1; anIt < theArgsNb; ++anIt)
   {
     TCollection_AsciiString aParam (theArgs[anIt]);
     aParam.LowerCase();
 
-    TCollection_AsciiString aPluginName;
-    if (aParam == "-dfbrowser")
-      aPluginName = "TKDFBrowser";
-    else if (aParam == "-shapeview")
-      aPluginName = "TKShapeView";
-    else if (aParam == "-vinspector")
-      aPluginName = "TKVInspector";
-    else if (aParam == "-all")
-      aNeedToActivateAllPlugins = true;
-    else if (aParam == "-update")
-      aNeedToUpdateContent = true;
-
-    if (!aPluginName.IsEmpty() && !aPlugins.Contains (aPluginName))
-      aPlugins.Append (aPluginName);
+    if (aParam.IsEqual ("-plugins")) // [-plugins {name1 [name2] ... [name3] | all}]
+    {
+      anIt++;
+      getArgumentPlugins(theArgsNb, theArgs, anIt, aPlugins);
+    }
+    else if (aParam.IsEqual ("-activate")) // [-activate name]
+    {
+      anIt++;
+      if (anIt == theArgsNb)
+      {
+        cout << "Empty argument of '" << aParam << "'.\n";
+        return 1;
+      }
+      TCollection_AsciiString aPluginName;
+      if (convertToPluginName (theArgs[anIt], aPluginName))
+        aPluginNameToActivate = aPluginName;
+    }
+    else if (aParam.IsEqual ("-shape")) // [-shape object [name1] ... [nameN]]
+    {
+      anIt++;
+      if (anIt == theArgsNb)
+      {
+        cout << "Empty argument of '" << aParam << "'.\n";
+        return 1;
+      }
+      TopoDS_Shape aShape = DBRep::Get (theArgs[anIt]);
+      anIt++;
+      if (aShape.IsNull())
+      {
+        cout << "Wrong shape name: " << aParam << ".\n";
+        return 1;
+      }
+      NCollection_List<TCollection_AsciiString> anArgPlugins;
+      getArgumentPlugins(theArgsNb, theArgs, anIt, anArgPlugins);
+      if (anArgPlugins.IsEmpty())
+        aDefaultParameters.Append(aShape.TShape());
+      else
+      {
+        for (NCollection_List<TCollection_AsciiString>::Iterator anArgIt (anArgPlugins);
+          anArgIt.More(); anArgIt.Next())
+        {
+          NCollection_List<Handle(Standard_Transient)> aPluginParameters;
+          aParameters.Find(anArgIt.Value(), aPluginParameters);
+          aPluginParameters.Append(aShape.TShape());
+          aParameters.Bind (anArgIt.Value(), aPluginParameters);
+        }
+      }
+    }
+    else if (aParam.IsEqual ("-open")) // [-open file_name [name1] ... [nameN]]
+    {
+      anIt++;
+      if (anIt == theArgsNb)
+      {
+        cout << "Empty argument of '" << aParam << "'.\n";
+        return 1;
+      }
+      TCollection_AsciiString aFileName (theArgs[anIt]);
+      anIt++;
+
+      NCollection_List<TCollection_AsciiString> anArgPlugins;
+      getArgumentPlugins(theArgsNb, theArgs, anIt, anArgPlugins);
+      if (anArgPlugins.IsEmpty())
+        aDefaultOpenFileParameter = aFileName;
+      else
+      {
+        for (NCollection_List<TCollection_AsciiString>::Iterator anArgIt (anArgPlugins);
+          anArgIt.More(); anArgIt.Next())
+        {
+          NCollection_List<Handle(Standard_Transient)> aPluginParameters;
+          aParameters.Find(anArgIt.Value(), aPluginParameters);
+          anOpenFileParameters.Bind(anArgIt.Value(), aFileName);
+        }
+      }
+    }
+    else if (aParam.IsEqual ("-update")) // [-update]
+    {
+      aNeedToUpdateContent = Standard_True;
+    }
+    else if (aParam.IsEqual ("-select")) // [-select {name|object}]
+    {
+      anIt++;
+      if (anIt == theArgsNb)
+      {
+        cout << "Empty argument of '" << aParam << "'.\n";
+        return 1;
+      }
+      // search shape with given name
+      TopoDS_Shape aShape = DBRep::Get (theArgs[anIt]);
+      if (!aShape.IsNull())
+      {
+        anObjectsToSelect.Append(aShape.TShape());
+      }
+      // search prsentations with given name
+      if (GetMapOfAIS().IsBound2(theArgs[anIt]))
+      {
+        Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast
+          (GetMapOfAIS().Find2 (theArgs[anIt]));
+        if (!anIO.IsNull())
+        anObjectsToSelect.Append(anIO);
+      }
+      // give parameters as a container of names
+      TCollection_AsciiString aParam (theArgs[anIt]);
+      while (!aParam.StartsWith ("-"))
+      {
+        anItemNamesToSelect.Append (aParam);
+        anIt++;
+        if (anIt >= theArgsNb)
+          break;
+        aParam = theArgs[anIt];
+      }
+      anIt--;
+    }
+    else if (aParam.IsEqual ("-show")) // [-show {0|1} = 1]
+    {
+      anIt++;
+      if (anIt == theArgsNb)
+      {
+        cout << "Empty argument of '" << aParam << "'.\n";
+        return 1;
+      }
+      aNeedToHideInspector = Draw::Atoi (theArgs[anIt]) == 0;
+      aNeedToShowInspector = Draw::Atoi (theArgs[anIt]) > 0;
+    }
+    else
+    {
+      cout << "Wrong argument of command: " << aParam.ToCString() << "\n";
+      return 1;
+    }
   }
 
-  // DFBrowser only parameter
+  // start inspector
+  Standard_Boolean isTInspectorCreation = !MyCommunicator;
+  if (!MyCommunicator)
+    MyCommunicator = new TInspector_Communicator();
+
+  Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
+  if (!aContext.IsNull())
+    aDefaultParameters.Append (aContext);
+
+  // Sets OCAF application into DFBrowser
   const Handle(TDocStd_Application)& anApplication = DDocStd::GetApplication();
   // Initialize standard document formats at creation - they should
   // be available even if this DRAW plugin is not loaded by pload command
   if (!anApplication.IsNull())
-    aParameters.Append (anApplication);
+  {
+    NCollection_List<Handle(Standard_Transient)> aDFBrowserParameters;
+    aParameters.Find("TKDFBrowser", aDFBrowserParameters);
+    aDFBrowserParameters.Append(anApplication);
+    aParameters.Bind ("TKDFBrowser", aDFBrowserParameters);
+  }
 
-  const Handle(AIS_InteractiveContext)& aContext = ViewerTest::GetAISContext();
-  if (!aContext.IsNull())
-    aParameters.Append (aContext);
+  // by starting, if the plugns were not defined, register all
+  if (isTInspectorCreation)
+  {
+    if (aPlugins.IsEmpty())
+    {
+      aPlugins.Append("TKDFBrowser");
+      aPlugins.Append("TKShapeView");
+      aPlugins.Append("TKVInspector");
+    }
+    aPluginNameToActivate = !aPluginNameToActivate.IsEmpty() ? aPluginNameToActivate : aPlugins.First();
+  }
 
-  if (aNeedToActivateAllPlugins)
+  // register plugin from parameters
+  for (NCollection_List<TCollection_AsciiString>::Iterator aPluginNameIt (aPlugins);
+       aPluginNameIt.More(); aPluginNameIt.Next())
+    MyCommunicator->RegisterPlugin (aPluginNameIt.Value());
+
+  // init all registered plugins with the default and parameters values
+  NCollection_List<TCollection_AsciiString> aRegisteredPlugins = MyCommunicator->RegisteredPlugins();
+  for (NCollection_List<TCollection_AsciiString>::Iterator anIterator (aRegisteredPlugins);
+    anIterator.More(); anIterator.Next())
   {
-    MyCommunicator->RegisterPlugin ("TKDFBrowser");
-    MyCommunicator->RegisterPlugin ("TKShapeView");
-    MyCommunicator->RegisterPlugin ("TKVInspector");
+    TCollection_AsciiString aPluginName = anIterator.Value();
+    NCollection_List<Handle(Standard_Transient)> aParameterValues;
+    aParameters.Find (aPluginName, aParameterValues);
 
-    TCollection_AsciiString aLastPluginName = "TKDFBrowser";
-    MyCommunicator->Init (aParameters);
-    MyCommunicator->Activate (aLastPluginName);
+    for (NCollection_List<Handle(Standard_Transient)>::Iterator aDefIt(aDefaultParameters);
+         aDefIt.More(); aDefIt.Next())
+      aParameterValues.Append (aDefIt.Value());
+    MyCommunicator->Init (aPluginName, aParameterValues, Standard_True);
   }
 
-  if (!aNeedToActivateAllPlugins)
+  if (!aPluginNameToActivate.IsEmpty())
+    MyCommunicator->Activate (!aPluginNameToActivate.IsEmpty() ? aPluginNameToActivate : aPlugins.First());
+
+  if (!anOpenFileParameters.IsEmpty())
   {
-    TCollection_AsciiString aLastPluginName;
-    for (NCollection_List<TCollection_AsciiString>::Iterator aPluginNameIt (aPlugins);
-         aPluginNameIt.More(); aPluginNameIt.Next())
-    {
-      aLastPluginName = aPluginNameIt.Value();
-      MyCommunicator->RegisterPlugin (aLastPluginName);
-      MyCommunicator->Init (aLastPluginName, aParameters);
-    }
-    MyCommunicator->Activate (aLastPluginName);
+    for (NCollection_DataMap<TCollection_AsciiString, TCollection_AsciiString >::Iterator anOpenIt
+      (anOpenFileParameters); anOpenIt.More(); anOpenIt.Next())
+      MyCommunicator->OpenFile(anOpenIt.Key(), anOpenIt.Value());
   }
+  else if (!aDefaultOpenFileParameter.IsEmpty()) // open file in active plugin
+    MyCommunicator->OpenFile("", aDefaultOpenFileParameter);
+
+  if (!anObjectsToSelect.IsEmpty())
+    MyCommunicator->SetSelected(anObjectsToSelect);
+
+  if (!anItemNamesToSelect.IsEmpty())
+    MyCommunicator->SetSelected(anItemNamesToSelect);
 
   if (aNeedToUpdateContent)
     MyCommunicator->UpdateContent();
 
-  MyCommunicator->SetVisible (true);
+  if (isTInspectorCreation || aNeedToShowInspector)
+    MyCommunicator->SetVisible (true);
+
+  if (aNeedToHideInspector)
+    MyCommunicator->SetVisible (false);
+
   return 0;
 }
 
@@ -117,14 +335,32 @@ void ToolsDraw::Commands(Draw_Interpretor& theCommands)
 
   // display
   theCommands.Add ("tinspector",
-    "tinspector\n"
-    "[-all]\n"
-    "[-tinspector]\n"
-    "[-dfbrowser]\n"
-    "[-shaperview]\n"
-    "[-vinspector]\n"
-    "[-update]\n"
-    "\tStarts tool of inspection.\n",
+    "tinspector [-plugins {name1 ... [nameN] | all}]"
+    "\n\t\t:            [-activate name]"
+    "\n\t\t:            [-shape object [name1] ... [nameN]]"
+    "\n\t\t:            [-open file_name [name1] ... [nameN]]"
+    "\n\t\t:            [-update]"
+    "\n\t\t:            [-select {object | name1 ... [nameN]}]"
+    "\n\t\t:            [-show {0|1} = 1]"
+    "\n\t\t: Starts tool of inspection."
+    "\n\t\t: Options:"
+    "\n\t\t:  -plugins enters plugins that should be added in the inspector."
+    "\n\t\t:           Available names are: dfbrowser, vinspector and shapeview."
+    "\n\t\t:           Plugins order will be the same as defined in arguments."
+    "\n\t\t:           'all' adds all available plugins in the order:"
+    "\n\t\t:                 DFBrowser, VInspector and ShapeView."
+    "\n\t\t:           If at the first call this option is not used, 'all' option is applyed;"
+    "\n\t\t:  -activate active the plugin in the tool view."
+    "\n\t\t:           If at the first call this option is not used, the first plugin is activated;"
+    "\n\t\t:  -shape initialize plugin/s by the shape object. If 'name' is empty, initializes all plugins;"
+    "\n\t\t:  -open gives the file to the plugin/s. If the plugin is active, after open, update content will be done;"
+    "\n\t\t:  -update updates content of the active plugin;"
+    "\n\t\t:  -select set the parameter that should be selected in an active tool view."
+    "\n\t\t:          Depending on active tool the parameter is:"
+    "\n\t\t:          ShapeView: 'object' is an instance of TopoDS_Shape TShape,"
+    "\n\t\t:          DFBrowser: 'name' is an entry of TDF_Label and name2(optionaly) for TDF_Attribute type name,"
+    "\n\t\t:          VInspector: 'object' is an instance of AIS_InteractiveObject;"
+    "\n\t\t:  -show set tool view visible or hidden. The first call of this command will show it.",
       __FILE__, tinspector, group);
 }
 

diff --git a/tools/TreeModel/FILES b/tools/TreeModel/FILES
index 2ef4a694c110a66881135e7e8ef9f5fd847c9ac6..6bb591504c70cdb96c909f8bd8627317115c0abe 100644 (file)
--- a/tools/TreeModel/FILES
+++ b/tools/TreeModel/FILES
@@ -1,5 +1,7 @@
 TreeModel_ItemBase.cxx
 TreeModel_ItemBase.hxx
 TreeModel_ItemRole.hxx
+TreeModel_MessageDialog.cxx
+TreeModel_MessageDialog.hxx
 TreeModel_ModelBase.cxx
 TreeModel_ModelBase.hxx

diff --git a/tools/TreeModel/TreeModel_ItemBase.cxx b/tools/TreeModel/TreeModel_ItemBase.cxx
index b7bd152dfec3e1735be058b17961654dc91c92a2..75a3957284fc9a5b400b8d0d79a5f7d8ba4d0357 100644 (file)
--- a/tools/TreeModel/TreeModel_ItemBase.cxx
+++ b/tools/TreeModel/TreeModel_ItemBase.cxx
@@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <TreeModel_ItemBase.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
 
-#include <TreeModel_ItemRole.hxx>
+#include <inspector/TreeModel_ItemRole.hxx>
 
 #include <QStringList>
 

diff --git a/tools/TreeModel/TreeModel_ItemBase.hxx b/tools/TreeModel/TreeModel_ItemBase.hxx
index 85315a3fee17b79e2b4d951cad9380e7ca72bdb3..57f4000a3c33da33c0fcba79eb3b7f51705bf29a 100644 (file)
--- a/tools/TreeModel/TreeModel_ItemBase.hxx
+++ b/tools/TreeModel/TreeModel_ItemBase.hxx
@@ -18,7 +18,7 @@
 
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <TreeModel_ItemRole.hxx>
+#include <inspector/TreeModel_ItemRole.hxx>
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4127) // conditional expression is constant

diff --git a/tools/TreeModel/TreeModel_MessageDialog.cxx b/tools/TreeModel/TreeModel_MessageDialog.cxx
new file mode 100644 (file)
index 0000000..be2fbd9
--- /dev/null
+++ b/tools/TreeModel/TreeModel_MessageDialog.cxx
@@ -0,0 +1,123 @@
+// Created on: 2017-06-16
+// Created by: Natalia ERMOLAEVA
+// Copyright (c) 2017 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement. 
+
+#include <inspector/TreeModel_MessageDialog.hxx>
+
+#include <QCheckBox>
+#include <QCursor>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QWidget>
+
+// =======================================================================
+// function : Constructor
+// purpose :
+// =======================================================================
+TreeModel_MessageDialog::TreeModel_MessageDialog (QWidget* theParent, const QString& theInformation,
+                                                  const QString& theQuestion)
+: QDialog (theParent), myDoNotShowItAgain (false), myPreviousAnswer (false), myInformation (theInformation),
+ myQuestion (theQuestion)
+{
+  setWindowTitle ("Information");
+
+  QGridLayout* aLayout = new QGridLayout (this);
+  QString anInformation = theInformation;
+  if (!theQuestion.isEmpty())
+    anInformation += QString("\n\n%2").arg (myQuestion);
+  myInformationLabel = new QLabel (anInformation, this);
+  myInformationLabel->setWordWrap (true);
+  aLayout->addWidget (myInformationLabel, 0, 0, 1, 3);
+
+  myDoNotShowCheckBox = new QCheckBox ("Don't show this dialog again. Do the same next time.", this);
+  connect (myDoNotShowCheckBox, SIGNAL (toggled (bool)), this, SLOT (onDonNotShowToggled (bool) ));
+  aLayout->addWidget (myDoNotShowCheckBox, 1, 0, 1, 3);
+
+  myOkButton = new QPushButton ("Ok", this);
+  myCancelButton = new QPushButton ("Cancel", this);
+  connect (myOkButton, SIGNAL (clicked()), this, SLOT (onOkClicked() ));
+  connect (myCancelButton, SIGNAL (clicked()), this, SLOT (onCancelClicked() ));
+  aLayout->addWidget (myOkButton, 2, 1);
+  aLayout->addWidget (myCancelButton, 2, 2);
+
+  aLayout->setColumnStretch (0, 1);
+
+  SetInformation (theInformation);
+}
+
+// =======================================================================
+// function : Start
+// purpose :
+// =======================================================================
+void TreeModel_MessageDialog::Start()
+{
+  if (!myDoNotShowItAgain)
+  {
+    QString anInformation = myInformation;
+    if (!myQuestion.isEmpty())
+      anInformation += QString("\n\n%2").arg (myQuestion);
+    myInformationLabel->setText (anInformation);
+    exec();
+    return;
+  }
+
+  if (IsAccepted())
+    return;
+
+  // tool tip information window
+  QWidget* aWidget = new QWidget (this, Qt::Popup);
+  QVBoxLayout* aLayout = new QVBoxLayout (aWidget);
+  aLayout->addWidget (new QLabel(myInformation, aWidget));
+  aWidget->move(QCursor::pos());
+  aWidget->show();
+}
+
+// =======================================================================
+// function : onOkClicked
+// purpose :
+// =======================================================================
+void TreeModel_MessageDialog::onOkClicked()
+{
+  myPreviousAnswer = true;
+  if (myDoNotShowItAgain)
+    setToolTipInfoMode();
+
+  accept();
+}
+
+// =======================================================================
+// function : onCancelClicked
+// purpose :
+// =======================================================================
+void TreeModel_MessageDialog::onCancelClicked()
+{
+  myPreviousAnswer = false;
+  if (myDoNotShowItAgain)
+    setToolTipInfoMode();
+
+  reject();
+}
+
+// =======================================================================
+// function : setToolTipInfoMode
+// purpose :
+// =======================================================================
+void TreeModel_MessageDialog::setToolTipInfoMode()
+{
+  //setWindowFlags (Qt::FramelessWindowHint);
+  //myDoNotShowCheckBox->setVisible (false);
+  //myOkButton->setVisible (false);
+  //myCancelButton->setVisible (false);
+}

diff --git a/tools/TreeModel/TreeModel_MessageDialog.hxx b/tools/TreeModel/TreeModel_MessageDialog.hxx
new file mode 100644 (file)
index 0000000..433acc1
--- /dev/null
+++ b/tools/TreeModel/TreeModel_MessageDialog.hxx
@@ -0,0 +1,88 @@
+// Created on: 2017-06-16
+// Created by: Natalia ERMOLAEVA
+// Copyright (c) 2017 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement. 
+
+#ifndef TreeModel_MessageDialog_H
+#define TreeModel_MessageDialog_H
+
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4127) // conditional expression is constant
+#endif
+#include <QCheckBox>
+#include <QDialog>
+#include <QLabel>
+#include <QPushButton>
+#include <QString>
+
+class DFBrowser_Module;
+class QWidget;
+
+//! \class TreeModel_MessageDialog
+//! Dialog providing information and a question.
+//! It has a check box to do not the dialog again. In this case the previous value will be used as a result
+class TreeModel_MessageDialog : public QDialog
+{
+  Q_OBJECT
+public:
+
+  //! Constructor
+  Standard_EXPORT TreeModel_MessageDialog (QWidget* theParent, const QString& theInformation, const QString& theQuestion);
+
+  //! Destructor
+  virtual ~TreeModel_MessageDialog() {}
+
+  //! Fills message dialog with the information
+  //! \param theInformation text
+  void SetInformation (const QString& theInformation) { myInformation = theInformation; }
+
+  //! Returns result of the dialog
+  //! \bool true if the dialog was accepted
+  bool IsAccepted() { return myPreviousAnswer; }
+
+  //! Either perform exec() for the dialog or show tool tip information depending do not be shown again state
+  Standard_EXPORT void Start();
+
+private slots:
+  //! Processing this checkbox, store result in the dialog field to use by the next dialog start
+  //! \param theState current changed state of the check box
+  void onDonNotShowToggled (bool theState) { myDoNotShowItAgain = theState; }
+
+  //! Processing action button. Stores accept choice, change dialog state if do not show it again is on
+  void onOkClicked();
+
+  //! Processing action button. Stores reject choice, change dialog state if do not show it again is on
+  void onCancelClicked();
+
+private:
+  //! Change state of the dialog to message tool tip. Only information control will be shown in the dialog
+  void setToolTipInfoMode();
+
+private:
+  bool myDoNotShowItAgain; //! state if the dialog should not be shown again, the latest result is used as answer
+  bool myPreviousAnswer; //! the previous cached result of the dialog
+
+  QString myInformation; //! the information text
+  QString myQuestion; //! the question text
+
+  QLabel* myInformationLabel; //! message control
+  QCheckBox* myDoNotShowCheckBox; //! choice whether the dialog will be shown again
+  QPushButton* myOkButton; //! accept button
+  QPushButton* myCancelButton; //! reject button
+};
+
+
+#endif

diff --git a/tools/TreeModel/TreeModel_ModelBase.cxx b/tools/TreeModel/TreeModel_ModelBase.cxx
index cb738f3c3bb77ea65b0385daa43720d0c136af07..58eef1039c6dc3edfa1372100cd5ec6973eeaf45 100644 (file)
--- a/tools/TreeModel/TreeModel_ModelBase.cxx
+++ b/tools/TreeModel/TreeModel_ModelBase.cxx
@@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
 
-#include <TreeModel_ItemBase.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
 
 // =======================================================================
 // function : Constructor

diff --git a/tools/TreeModel/TreeModel_ModelBase.hxx b/tools/TreeModel/TreeModel_ModelBase.hxx
index f1d186d76818d0a2ee4f1e5e179160acca857eef..38b98d5a300f2f0dc66765f526f193ac1554358f 100644 (file)
--- a/tools/TreeModel/TreeModel_ModelBase.hxx
+++ b/tools/TreeModel/TreeModel_ModelBase.hxx
@@ -17,7 +17,7 @@
 #define TreeModel_ModelBase_H
 
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
 
 #include <QAbstractItemModel>
 #include <QExplicitlySharedDataPointer>

diff --git a/tools/VInspector/FILES b/tools/VInspector/FILES
index 94d3c0664c8ecced0aa6ad493c3fbf77515b313c..b52b057fb5023bf4b60e1952e79a432613c3502c 100644 (file)
--- a/tools/VInspector/FILES
+++ b/tools/VInspector/FILES
@@ -1,3 +1,4 @@
+VInspector.qrc
 VInspector_CallBack.cxx
 VInspector_CallBack.hxx
 VInspector_CallBackMode.hxx

diff --git a/tools/VInspector/VInspector.qrc b/tools/VInspector/VInspector.qrc
new file mode 100644 (file)
index 0000000..ed3792b
--- /dev/null
+++ b/tools/VInspector/VInspector.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+    <qresource>
+        <file>icons/treeview_update.png</file>
+    </qresource>
+</RCC>

diff --git a/tools/VInspector/VInspectorAPI_CallBack.cxx b/tools/VInspector/VInspectorAPI_CallBack.cxx
index 042ae2cb8a12c2f3764bf8b7c6797315e236f169..bdb5fb3cfeefb3c7eeb7c397466c7a3748f8649b 100644 (file)
--- a/tools/VInspector/VInspectorAPI_CallBack.cxx
+++ b/tools/VInspector/VInspectorAPI_CallBack.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspectorAPI_CallBack.hxx>
+#include <inspector/VInspectorAPI_CallBack.hxx>
 
 #if OCC_VERSION_HEX <= 0x060901
 IMPLEMENT_STANDARD_HANDLE(VInspectorAPI_CallBack, Standard_Transient)

diff --git a/tools/VInspector/VInspector_CallBack.cxx b/tools/VInspector/VInspector_CallBack.cxx
index df8e020199681263dcce4e7f0fcc2c0ed49f10a1..ffbf64013ad00edd6728971aa1e693ecc985afbc 100644 (file)
--- a/tools/VInspector/VInspector_CallBack.cxx
+++ b/tools/VInspector/VInspector_CallBack.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_CallBack.hxx>
+#include <inspector/VInspector_CallBack.hxx>
 
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_InteractiveObject.hxx>
@@ -21,9 +21,9 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Version.hxx>
 
-#include <VInspector_CallBackMode.hxx>
-#include <VInspector_Tools.hxx>
-#include <VInspector_ViewModelHistory.hxx>
+#include <inspector/VInspector_CallBackMode.hxx>
+#include <inspector/VInspector_Tools.hxx>
+#include <inspector/VInspector_ViewModelHistory.hxx>
 
 #include <QStringList>
 

diff --git a/tools/VInspector/VInspector_CallBack.hxx b/tools/VInspector/VInspector_CallBack.hxx
index 53e33608b4107c62fc51dec0243ec73dbda6dc54..57bdeae4ffd92dee5094497943e9df02ba3784d2 100644 (file)
--- a/tools/VInspector/VInspector_CallBack.hxx
+++ b/tools/VInspector/VInspector_CallBack.hxx
@@ -18,10 +18,10 @@
 
 #include <AIS_InteractiveContext.hxx>
 #include <Standard.hxx>
-#include <VInspectorAPI_CallBack.hxx>
-#include <VInspector_CallBackMode.hxx>
-#include <VInspector_ViewModelHistory.hxx>
-#include <VInspector_Tools.hxx>
+#include <inspector/VInspectorAPI_CallBack.hxx>
+#include <inspector/VInspector_CallBackMode.hxx>
+#include <inspector/VInspector_ViewModelHistory.hxx>
+#include <inspector/VInspector_Tools.hxx>
 
 class AIS_InteractiveObject;
 class SelectMgr_EntityOwner;

diff --git a/tools/VInspector/VInspector_Communicator.cxx b/tools/VInspector/VInspector_Communicator.cxx
index 4495fe6eda009bb3da60be70b9f7f4d85d3a04a1..654dc939c239d4708cac727270ef6b77bd043dba 100644 (file)
--- a/tools/VInspector/VInspector_Communicator.cxx
+++ b/tools/VInspector/VInspector_Communicator.cxx
@@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_Communicator.hxx>
+#include <inspector/VInspector_Communicator.hxx>
 
-#include <VInspector_CallBack.hxx>
-#include <VInspector_Window.hxx>
+#include <inspector/VInspector_CallBack.hxx>
+#include <inspector/VInspector_Window.hxx>
 
 #include <AIS_InteractiveContext.hxx>
 

diff --git a/tools/VInspector/VInspector_Communicator.hxx b/tools/VInspector/VInspector_Communicator.hxx
index 4d271944fc26bd640d130811b43c57be92091a15..fdffb12b489af867c8df12daf4ad76211900611b 100644 (file)
--- a/tools/VInspector/VInspector_Communicator.hxx
+++ b/tools/VInspector/VInspector_Communicator.hxx
@@ -18,9 +18,9 @@
 
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <VInspector_Window.hxx>
+#include <inspector/VInspector_Window.hxx>
 
-#include <TInspectorAPI_Communicator.hxx>
+#include <inspector/TInspectorAPI_Communicator.hxx>
 
 //! \class VInspector_Communicator.
 //! \brief This is a connector from TInspector application to VInspector view

diff --git a/tools/VInspector/VInspector_ItemBase.cxx b/tools/VInspector/VInspector_ItemBase.cxx
index bde1fb1d84615d9d0653038b3fd3ad8173c1c58b..323db67bff4f0e4103884431da197802c7134622 100644 (file)
--- a/tools/VInspector/VInspector_ItemBase.cxx
+++ b/tools/VInspector/VInspector_ItemBase.cxx
@@ -14,8 +14,8 @@
 // commercial license or contractual agreement. 
 
 
-#include <VInspector_ItemBase.hxx>
-#include <VInspector_ItemContext.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
+#include <inspector/VInspector_ItemContext.hxx>
 
 // =======================================================================
 // function : GetContext

diff --git a/tools/VInspector/VInspector_ItemBase.hxx b/tools/VInspector/VInspector_ItemBase.hxx
index db7245caccfbeb6f2f7545d73df42478dbbbf0f1..ca065ffd378dba410d6a5af49c44f1deca6c3725 100644 (file)
--- a/tools/VInspector/VInspector_ItemBase.hxx
+++ b/tools/VInspector/VInspector_ItemBase.hxx
@@ -18,7 +18,7 @@
 
 #include <AIS_InteractiveContext.hxx>
 #include <Standard.hxx>
-#include <TreeModel_ItemBase.hxx>
+#include <inspector/TreeModel_ItemBase.hxx>
 
 class VInspector_ItemBase;
 typedef QExplicitlySharedDataPointer<VInspector_ItemBase> VInspector_ItemBasePtr;

diff --git a/tools/VInspector/VInspector_ItemContext.cxx b/tools/VInspector/VInspector_ItemContext.cxx
index de4e1f1283363681c8f7ae937c1ebac1c1d744d2..9a8a91cc77ecb740c872e7ca75e1baf2686c243b 100644 (file)
--- a/tools/VInspector/VInspector_ItemContext.cxx
+++ b/tools/VInspector/VInspector_ItemContext.cxx
@@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ItemContext.hxx>
+#include <inspector/VInspector_ItemContext.hxx>
 
 #include <AIS_ListOfInteractive.hxx>
 #include <SelectMgr_EntityOwner.hxx>
-#include <VInspector_ItemPresentableObject.hxx>
-#include <VInspector_Tools.hxx>
+#include <inspector/VInspector_ItemPresentableObject.hxx>
+#include <inspector/VInspector_Tools.hxx>
 
 #include <QStringList>
 

diff --git a/tools/VInspector/VInspector_ItemContext.hxx b/tools/VInspector/VInspector_ItemContext.hxx
index 3073dcae594487835e7e3b4e571414fc499d5fdd..76a2a990c3b4f7e828dc2ccc0dbc7abf14256229 100644 (file)
--- a/tools/VInspector/VInspector_ItemContext.hxx
+++ b/tools/VInspector/VInspector_ItemContext.hxx
@@ -17,7 +17,7 @@
 #define VInspector_ItemContext_H
 
 #include <Standard.hxx>
-#include <VInspector_ItemBase.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
 
 class VInspector_ItemContext;
 typedef QExplicitlySharedDataPointer<VInspector_ItemContext> VInspector_ItemContextPtr;

diff --git a/tools/VInspector/VInspector_ItemEntityOwner.cxx b/tools/VInspector/VInspector_ItemEntityOwner.cxx
index 380c73eab7cdcf9b86f80011770c7ffb48fdac85..2201a72705e4b6e75443a0af12e2d4d607d71d99 100644 (file)
--- a/tools/VInspector/VInspector_ItemEntityOwner.cxx
+++ b/tools/VInspector/VInspector_ItemEntityOwner.cxx
@@ -13,10 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ItemEntityOwner.hxx>
-#include <VInspector_ItemSensitiveEntity.hxx>
-#include <VInspector_ItemPresentableObject.hxx>
-#include <VInspector_Tools.hxx>
+#include <inspector/VInspector_ItemEntityOwner.hxx>
+#include <inspector/VInspector_ItemSensitiveEntity.hxx>
+#include <inspector/VInspector_ItemPresentableObject.hxx>
+#include <inspector/VInspector_Tools.hxx>
 
 #include <SelectMgr_SensitiveEntity.hxx>
 #include <SelectBasics_SensitiveEntity.hxx>

diff --git a/tools/VInspector/VInspector_ItemEntityOwner.hxx b/tools/VInspector/VInspector_ItemEntityOwner.hxx
index 36303e4521784160a25df2bc864ae78056ba70db..598ca26d818266339f89b91809634542ba2bc5ed 100644 (file)
--- a/tools/VInspector/VInspector_ItemEntityOwner.hxx
+++ b/tools/VInspector/VInspector_ItemEntityOwner.hxx
@@ -18,7 +18,7 @@
 
 #include <AIS_InteractiveObject.hxx>
 #include <Standard.hxx>
-#include <VInspector_ItemBase.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
 
 class QItemSelectionModel;
 

diff --git a/tools/VInspector/VInspector_ItemHistoryElement.cxx b/tools/VInspector/VInspector_ItemHistoryElement.cxx
index d67e3d71c4ae2a79ed79ccf521c7105aa2650a74..f6a6b1df6544200ddf562a498965ea0bcda26f6a 100644 (file)
--- a/tools/VInspector/VInspector_ItemHistoryElement.cxx
+++ b/tools/VInspector/VInspector_ItemHistoryElement.cxx
@@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ItemHistoryElement.hxx>
+#include <inspector/VInspector_ItemHistoryElement.hxx>
 
-#include <VInspector_ItemHistoryRoot.hxx>
-#include <VInspector_ItemHistoryType.hxx>
-#include <VInspector_ItemHistoryElement.hxx>
-#include <VInspector_Tools.hxx>
+#include <inspector/VInspector_ItemHistoryRoot.hxx>
+#include <inspector/VInspector_ItemHistoryType.hxx>
+#include <inspector/VInspector_ItemHistoryElement.hxx>
+#include <inspector/VInspector_Tools.hxx>
 
 // =======================================================================
 // function : data

diff --git a/tools/VInspector/VInspector_ItemHistoryElement.hxx b/tools/VInspector/VInspector_ItemHistoryElement.hxx
index 56ac3ac1f15a797ab6046f8d09547bbc82d9d99a..07bdc0ade135d464d69449297da3156148cf4216 100644 (file)
--- a/tools/VInspector/VInspector_ItemHistoryElement.hxx
+++ b/tools/VInspector/VInspector_ItemHistoryElement.hxx
@@ -17,7 +17,7 @@
 #define VInspector_ItemHistoryElement_H
 
 #include <Standard.hxx>
-#include <VInspector_ItemBase.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
 
 class VInspector_ItemHistoryElement;
 typedef QExplicitlySharedDataPointer<VInspector_ItemHistoryElement> VInspector_ItemHistoryElementPtr;

diff --git a/tools/VInspector/VInspector_ItemHistoryRoot.cxx b/tools/VInspector/VInspector_ItemHistoryRoot.cxx
index 848b09cd795d953d511e56c091b8a1892e4a2385..7a5c2bd50127783d2710cc4933b253101db876f7 100644 (file)
--- a/tools/VInspector/VInspector_ItemHistoryRoot.cxx
+++ b/tools/VInspector/VInspector_ItemHistoryRoot.cxx
@@ -13,9 +13,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ItemHistoryRoot.hxx>
+#include <inspector/VInspector_ItemHistoryRoot.hxx>
 
-#include <VInspector_ItemHistoryType.hxx>
+#include <inspector/VInspector_ItemHistoryType.hxx>
 
 // =======================================================================
 // function : Constructor

diff --git a/tools/VInspector/VInspector_ItemHistoryRoot.hxx b/tools/VInspector/VInspector_ItemHistoryRoot.hxx
index ad1ac7591d24135147b8e368dfda6834aad166c6..42630670d497d77cd68c8e986c9b6dcb1c302adf 100644 (file)
--- a/tools/VInspector/VInspector_ItemHistoryRoot.hxx
+++ b/tools/VInspector/VInspector_ItemHistoryRoot.hxx
@@ -17,9 +17,9 @@
 #define VInspector_ItemHistoryRoot_H
 
 #include <Standard.hxx>
-#include <VInspector_ItemBase.hxx>
-#include <VInspector_ItemHistoryTypeInfo.hxx>
-#include <VInspector_CallBackMode.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
+#include <inspector/VInspector_ItemHistoryTypeInfo.hxx>
+#include <inspector/VInspector_CallBackMode.hxx>
 
 class VInspector_ItemHistoryRoot;
 typedef QExplicitlySharedDataPointer<VInspector_ItemHistoryRoot> VInspector_ItemHistoryRootPtr;

diff --git a/tools/VInspector/VInspector_ItemHistoryType.cxx b/tools/VInspector/VInspector_ItemHistoryType.cxx
index 5fcfd0aa2024541a881df98ab565f8c08b2fe9af..bd8f90a9a98e96aceebcfc1a6c787b32b23c58ff 100644 (file)
--- a/tools/VInspector/VInspector_ItemHistoryType.cxx
+++ b/tools/VInspector/VInspector_ItemHistoryType.cxx
@@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ItemHistoryType.hxx>
+#include <inspector/VInspector_ItemHistoryType.hxx>
 
-#include <VInspector_CallBack.hxx>
-#include <VInspector_ItemHistoryRoot.hxx>
-#include <VInspector_ItemHistoryElement.hxx>
-#include <VInspector_Tools.hxx>
+#include <inspector/VInspector_CallBack.hxx>
+#include <inspector/VInspector_ItemHistoryRoot.hxx>
+#include <inspector/VInspector_ItemHistoryElement.hxx>
+#include <inspector/VInspector_Tools.hxx>
 
 // =======================================================================
 // function : PointerInfo

diff --git a/tools/VInspector/VInspector_ItemHistoryType.hxx b/tools/VInspector/VInspector_ItemHistoryType.hxx
index d2384db1baa0e1308adacc8e75abdd2e209f3a6d..875a9b6418124dd5972b8901e3cef8715baf7235 100644 (file)
--- a/tools/VInspector/VInspector_ItemHistoryType.hxx
+++ b/tools/VInspector/VInspector_ItemHistoryType.hxx
@@ -17,7 +17,7 @@
 #define VInspector_ItemHistoryType_H
 
 #include <Standard.hxx>
-#include <VInspector_ItemBase.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
 
 class VInspector_ItemHistoryType;
 typedef QExplicitlySharedDataPointer<VInspector_ItemHistoryType> VInspector_ItemHistoryTypePtr;

diff --git a/tools/VInspector/VInspector_ItemHistoryTypeInfo.hxx b/tools/VInspector/VInspector_ItemHistoryTypeInfo.hxx
index 1763d922294314849bedcc56b6b4ea40764404c4..e01b36b2b64d2d145369807a648704e1b5d42100 100644 (file)
--- a/tools/VInspector/VInspector_ItemHistoryTypeInfo.hxx
+++ b/tools/VInspector/VInspector_ItemHistoryTypeInfo.hxx
@@ -16,7 +16,7 @@
 #ifndef VInspector_ItemHistoryTypeInfo_H
 #define VInspector_ItemHistoryTypeInfo_H
 
-#include <VInspector_CallBackMode.hxx>
+#include <inspector/VInspector_CallBackMode.hxx>
 
 //! \class VInspector_ItemHistoryTypeInfo
 //! History info for a type item. It contains container of information for the element

diff --git a/tools/VInspector/VInspector_ItemPresentableObject.cxx b/tools/VInspector/VInspector_ItemPresentableObject.cxx
index aa9ef134b3190625d602b1061995879ef17882d3..47664b1ad7a1141cc65a36a1d2ddeeb247efcc6c 100644 (file)
--- a/tools/VInspector/VInspector_ItemPresentableObject.cxx
+++ b/tools/VInspector/VInspector_ItemPresentableObject.cxx
@@ -13,16 +13,16 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ItemPresentableObject.hxx>
+#include <inspector/VInspector_ItemPresentableObject.hxx>
 
 #include <AIS_Shape.hxx>
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
-#include <VInspector_ItemContext.hxx>
-#include <VInspector_ItemEntityOwner.hxx>
-#include <VInspector_ItemSelection.hxx>
-#include <VInspector_Tools.hxx>
-#include <VInspector_ViewModel.hxx>
+#include <inspector/VInspector_ItemContext.hxx>
+#include <inspector/VInspector_ItemEntityOwner.hxx>
+#include <inspector/VInspector_ItemSelection.hxx>
+#include <inspector/VInspector_Tools.hxx>
+#include <inspector/VInspector_ViewModel.hxx>
 
 #include <NCollection_List.hxx>
 #include <Prs3d.hxx>

diff --git a/tools/VInspector/VInspector_ItemPresentableObject.hxx b/tools/VInspector/VInspector_ItemPresentableObject.hxx
index 9ca4a7ee707fffab8ecea29548611ae60b3833a8..ed5765200f2757368a6afc18a669c314187e05c8 100644 (file)
--- a/tools/VInspector/VInspector_ItemPresentableObject.hxx
+++ b/tools/VInspector/VInspector_ItemPresentableObject.hxx
@@ -17,7 +17,7 @@
 #define VInspector_ItemPresentableObject_H
 
 #include <Standard.hxx>
-#include <VInspector_ItemBase.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
 
 #include <AIS_InteractiveObject.hxx>
 #include <NCollection_List.hxx>

diff --git a/tools/VInspector/VInspector_ItemSelection.cxx b/tools/VInspector/VInspector_ItemSelection.cxx
index 94383e0ca45e19130893805c76612e7c59f689e0..faaa5b14f6e77e258bca399ca8c4cce7de1ed6e9 100644 (file)
--- a/tools/VInspector/VInspector_ItemSelection.cxx
+++ b/tools/VInspector/VInspector_ItemSelection.cxx
@@ -13,16 +13,16 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ItemSelection.hxx>
+#include <inspector/VInspector_ItemSelection.hxx>
 
 #include <AIS_ListOfInteractive.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
 #include <SelectMgr_SensitiveEntity.hxx>
-#include <VInspector_ItemContext.hxx>
-#include <VInspector_ItemPresentableObject.hxx>
-#include <VInspector_ItemSensitiveEntity.hxx>
-#include <VInspector_Tools.hxx>
+#include <inspector/VInspector_ItemContext.hxx>
+#include <inspector/VInspector_ItemPresentableObject.hxx>
+#include <inspector/VInspector_ItemSensitiveEntity.hxx>
+#include <inspector/VInspector_Tools.hxx>
 
 #include <QStringList>
 

diff --git a/tools/VInspector/VInspector_ItemSelection.hxx b/tools/VInspector/VInspector_ItemSelection.hxx
index 1f9cc7a93de0a249378a3e4c4236aeb654a9b465..f1565a6c0397a1bd02c5dd40bf2182770df72b03 100644 (file)
--- a/tools/VInspector/VInspector_ItemSelection.hxx
+++ b/tools/VInspector/VInspector_ItemSelection.hxx
@@ -17,7 +17,7 @@
 #define VInspector_ItemSelection_H
 
 #include <Standard.hxx>
-#include <VInspector_ItemBase.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
 
 #include <SelectMgr_Selection.hxx>
 

diff --git a/tools/VInspector/VInspector_ItemSensitiveEntity.cxx b/tools/VInspector/VInspector_ItemSensitiveEntity.cxx
index 2fb7135e79e1c0b22f6bc38d64b6fb5358c1ed89..49044062e898f7adf95d30b239e8d1280ca3d92b 100644 (file)
--- a/tools/VInspector/VInspector_ItemSensitiveEntity.cxx
+++ b/tools/VInspector/VInspector_ItemSensitiveEntity.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement. 
 
 
-#include <VInspector_ItemSensitiveEntity.hxx>
+#include <inspector/VInspector_ItemSensitiveEntity.hxx>
 
 #include <AIS_ListOfInteractive.hxx>
 #include <SelectBasics_SensitiveEntity.hxx>
@@ -24,10 +24,10 @@
 #include <Standard_Version.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <TopoDS_Shape.hxx>
-#include <VInspector_ItemContext.hxx>
-#include <VInspector_ItemEntityOwner.hxx>
-#include <VInspector_ItemSelection.hxx>
-#include <VInspector_Tools.hxx>
+#include <inspector/VInspector_ItemContext.hxx>
+#include <inspector/VInspector_ItemEntityOwner.hxx>
+#include <inspector/VInspector_ItemSelection.hxx>
+#include <inspector/VInspector_Tools.hxx>
 
 #include <QStringList>
 #include <QColor>

diff --git a/tools/VInspector/VInspector_ItemSensitiveEntity.hxx b/tools/VInspector/VInspector_ItemSensitiveEntity.hxx
index b62aad6cd4219f8976ab16971ec7810987a1f6d1..ecda9976e723b0cf205d7fbb6277363a741f5927 100644 (file)
--- a/tools/VInspector/VInspector_ItemSensitiveEntity.hxx
+++ b/tools/VInspector/VInspector_ItemSensitiveEntity.hxx
@@ -19,7 +19,7 @@
 #include <SelectMgr_SensitiveEntity.hxx>
 #include <SelectBasics_SensitiveEntity.hxx>
 #include <Standard.hxx>
-#include <VInspector_ItemBase.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
 
 class SelectBasics_EntityOwner;
 class VInspector_ItemSensitiveEntity;

diff --git a/tools/VInspector/VInspector_ToolBar.cxx b/tools/VInspector/VInspector_ToolBar.cxx
index 9c5aff0209759148694cc2ddf9edb08e9d82a574..e84d7199f46cd48c9eebc50f319839ec9dd35ec2 100644 (file)
--- a/tools/VInspector/VInspector_ToolBar.cxx
+++ b/tools/VInspector/VInspector_ToolBar.cxx
@@ -13,12 +13,13 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ToolBar.hxx>
+#include <inspector/VInspector_ToolBar.hxx>
 
 #include <QHBoxLayout>
-#include <QToolButton>
+#include <QPushButton>
 #include <QWidget>
 
+
 // =======================================================================
 // function : Constructor
 // purpose :
@@ -26,34 +27,42 @@
 VInspector_ToolBar::VInspector_ToolBar (QWidget* theParent)
 : QObject (theParent)
 {
-  myActionsMap[VInspector_ToolActionType_UpdateId] = new QToolButton (theParent);
+  myActionsMap[VInspector_ToolActionType_UpdateId] = new QPushButton (theParent);
+  myActionsMap[VInspector_ToolActionType_UpdateId]->setIcon (QIcon (":/icons/treeview_update.png"));
+  myActionsMap[VInspector_ToolActionType_UpdateId]->setText (tr ("Update Tree Model"));
+  myActionsMap[VInspector_ToolActionType_UpdateId]->setToolTip (tr ("Update Tree Model"));
+
   myActionsMap[VInspector_ToolActionType_UpdateId]->setText ("Update");
 
-  myActionsMap[VInspector_ToolActionType_SelectPresentationsId] = new QToolButton (theParent);
+  myActionsMap[VInspector_ToolActionType_SelectPresentationsId] = new QPushButton (theParent);
   myActionsMap[VInspector_ToolActionType_SelectPresentationsId]->setText ("Select Presentations");
   myActionsMap[VInspector_ToolActionType_SelectPresentationsId]->setCheckable (true);
+  myActionsMap[VInspector_ToolActionType_SelectPresentationsId]->setFixedHeight(20);
 
-  myActionsMap[VInspector_ToolActionType_SelectOwnersId] = new QToolButton (theParent);
+  myActionsMap[VInspector_ToolActionType_SelectOwnersId] = new QPushButton (theParent);
   myActionsMap[VInspector_ToolActionType_SelectOwnersId]->setText ("Select Owners");
   myActionsMap[VInspector_ToolActionType_SelectOwnersId]->setCheckable (true);
+  myActionsMap[VInspector_ToolActionType_SelectPresentationsId]->setFixedHeight(25);
 
   myMainWindow = new QWidget (theParent);
 
   QHBoxLayout* aLay = new QHBoxLayout (myMainWindow);
-  for (QMap<VInspector_ToolActionType, QToolButton*>::ConstIterator anActionsIt = myActionsMap.begin();
+  aLay->setMargin(0);
+  for (QMap<VInspector_ToolActionType, QPushButton*>::ConstIterator anActionsIt = myActionsMap.begin();
        anActionsIt != myActionsMap.end(); anActionsIt++)
   {
-    QToolButton* aBtn = anActionsIt.value();
+    QPushButton* aBtn = anActionsIt.value();
     connect (aBtn, SIGNAL (clicked()), this, SLOT (onActionClicked()));
     aLay->addWidget (aBtn);
   }
+  aLay->addStretch(1);
 }
 
 // =======================================================================
 // function : GetToolButton
 // purpose :
 // =======================================================================
-QToolButton* VInspector_ToolBar::GetToolButton (const VInspector_ToolActionType& theActionId ) const
+QPushButton* VInspector_ToolBar::GetToolButton (const VInspector_ToolActionType& theActionId ) const
 {
   return myActionsMap.contains (theActionId) ? myActionsMap[theActionId] : 0;
 }
@@ -65,9 +74,9 @@ QToolButton* VInspector_ToolBar::GetToolButton (const VInspector_ToolActionType&
 void VInspector_ToolBar::onActionClicked()
 {
   int anId = -1;
-  QToolButton* aSenderBtn = (QToolButton*)sender();
+  QPushButton* aSenderBtn = (QPushButton*)sender();
 
-  for (QMap<VInspector_ToolActionType, QToolButton*>::ConstIterator anActionsIt = myActionsMap.begin();
+  for (QMap<VInspector_ToolActionType, QPushButton*>::ConstIterator anActionsIt = myActionsMap.begin();
        anActionsIt != myActionsMap.end(); anActionsIt++)
   {
     if (anActionsIt.value() != aSenderBtn)

diff --git a/tools/VInspector/VInspector_ToolBar.hxx b/tools/VInspector/VInspector_ToolBar.hxx
index dae4819b58a23dffb627b8d7a417f98a1eba4b18..5e8257eaf1fd3091cd2ba433afa161f15f45bb6f 100644 (file)
--- a/tools/VInspector/VInspector_ToolBar.hxx
+++ b/tools/VInspector/VInspector_ToolBar.hxx
@@ -18,7 +18,7 @@
 
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>
-#include <VInspector_ToolActionType.hxx>
+#include <inspector/VInspector_ToolActionType.hxx>
 
 #ifdef _MSC_VER
   #pragma warning(disable : 4127 4718) // conditional expression is constant, recursive call has no side effects
@@ -27,7 +27,7 @@
 #include <QObject>
 
 class QWidget;
-class QToolButton;
+class QPushButton;
 
 //! \class VInspector_ToolBar
 //! Container of View tool bar actions
@@ -48,7 +48,7 @@ public:
 
   //! Returns tool button by action index
   //! \param theActionId index of action
-  Standard_EXPORT QToolButton* GetToolButton (const VInspector_ToolActionType& theActionId) const;
+  Standard_EXPORT QPushButton* GetToolButton (const VInspector_ToolActionType& theActionId) const;
 
 signals:
 
@@ -64,7 +64,7 @@ private slots:
 private:
 
   QWidget* myMainWindow; //!< the main control
-  QMap<VInspector_ToolActionType, QToolButton*> myActionsMap; //!< container of type into button
+  QMap<VInspector_ToolActionType, QPushButton*> myActionsMap; //!< container of type into button
 };
 
 #endif

diff --git a/tools/VInspector/VInspector_Tools.cxx b/tools/VInspector/VInspector_Tools.cxx
index c63bdb92000ef23a501c4108d23f335ac3d084a0..414f349eb38a0bd94d465fabcdfe0c4a3f8c3f63 100644 (file)
--- a/tools/VInspector/VInspector_Tools.cxx
+++ b/tools/VInspector/VInspector_Tools.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_Tools.hxx>
+#include <inspector/VInspector_Tools.hxx>
 
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <AIS_ListOfInteractive.hxx>

diff --git a/tools/VInspector/VInspector_Tools.hxx b/tools/VInspector/VInspector_Tools.hxx
index 6a82baa679401babcf2e5ccfa95b214b64fba2e2..a3bd96a6e4ba1b2867d09cc8167f7e95c4cfbae7 100644 (file)
--- a/tools/VInspector/VInspector_Tools.hxx
+++ b/tools/VInspector/VInspector_Tools.hxx
@@ -25,8 +25,8 @@
 #include <TopLoc_Location.hxx>
 #include <TopoDS_Shape.hxx>
 
-#include <VInspector_CallBackMode.hxx>
-#include <VInspector_SelectionType.hxx>
+#include <inspector/VInspector_CallBackMode.hxx>
+#include <inspector/VInspector_SelectionType.hxx>
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4127) // conditional expression is constant

diff --git a/tools/VInspector/VInspector_ViewModel.cxx b/tools/VInspector/VInspector_ViewModel.cxx
index f5dc9372ddb335b5ea3e9ef5b22ccbfd847d79f8..86a406031714e1686b773d1a06b770ea8e4367af 100644 (file)
--- a/tools/VInspector/VInspector_ViewModel.cxx
+++ b/tools/VInspector/VInspector_ViewModel.cxx
@@ -13,12 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ViewModel.hxx>
+#include <inspector/VInspector_ViewModel.hxx>
 
-#include <VInspector_ItemContext.hxx>
-#include <VInspector_ItemEntityOwner.hxx>
-#include <VInspector_ItemPresentableObject.hxx>
-#include <VInspector_ItemSensitiveEntity.hxx>
+#include <inspector/VInspector_ItemContext.hxx>
+#include <inspector/VInspector_ItemEntityOwner.hxx>
+#include <inspector/VInspector_ItemPresentableObject.hxx>
+#include <inspector/VInspector_ItemSensitiveEntity.hxx>
 #include <SelectBasics_EntityOwner.hxx>
 
 #include <QItemSelectionModel>
@@ -80,6 +80,27 @@ QModelIndexList VInspector_ViewModel::FindPointers (const QStringList& thePointe
   return anIndices;
 }
 
+// =======================================================================
+// function : FindIndex
+// purpose :
+// =======================================================================
+QModelIndex VInspector_ViewModel::FindIndex (const Handle(AIS_InteractiveObject)& thePresentation) const
+{
+  QModelIndex aParentIndex = index (0, 0);
+  TreeModel_ItemBasePtr aParentItem = TreeModel_ModelBase::GetItemByIndex (aParentIndex); // context item
+  for (int aRowId = 0, aCount = aParentItem->rowCount(); aRowId < aCount; aRowId++)
+  {
+    QModelIndex anIndex = index (aRowId, 0, aParentIndex);
+    TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex);
+    VInspector_ItemPresentableObjectPtr anItemPrs = itemDynamicCast<VInspector_ItemPresentableObject>(anItemBase);
+    if (!anItemPrs)
+      continue;
+    if (anItemPrs->GetInteractiveObject() == thePresentation)
+      return anIndex;
+  }
+  return QModelIndex();
+}
+
 // =======================================================================
 // function : headerData
 // purpose :

diff --git a/tools/VInspector/VInspector_ViewModel.hxx b/tools/VInspector/VInspector_ViewModel.hxx
index c1d6c18e9fe8292b25ff0d3d99e1d3898f84a1a1..f73f063d30a3fb49b6c9d2608487a884e7300148 100644 (file)
--- a/tools/VInspector/VInspector_ViewModel.hxx
+++ b/tools/VInspector/VInspector_ViewModel.hxx
@@ -20,8 +20,8 @@
 #include <NCollection_List.hxx>
 #include <SelectBasics_EntityOwner.hxx>
 #include <Standard.hxx>
-#include <TreeModel_ModelBase.hxx>
-#include <VInspector_ItemBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
 
 #include <QByteArray>
 #include <QHash>
@@ -60,6 +60,11 @@ public:
   //! \return container of indices
   Standard_EXPORT QModelIndexList FindPointers (const QStringList& thePointers);
 
+  //! Returns tree model index of the presentation item in the tree view.
+  //! \param thePresentation a presentation
+  //! \return model index if the value is found or Null model index
+  Standard_EXPORT QModelIndex FindIndex (const Handle(AIS_InteractiveObject)& thePresentation) const;
+
   //! Returns root item by column
   //! \param theColumn an index of the column
   //! \return root item instance

diff --git a/tools/VInspector/VInspector_ViewModelHistory.cxx b/tools/VInspector/VInspector_ViewModelHistory.cxx
index 7b158be0645a65f0a9e918b8fbf72b281e3e09ea..77839f2b67c5722809727f354bc40cb72a070ebc 100644 (file)
--- a/tools/VInspector/VInspector_ViewModelHistory.cxx
+++ b/tools/VInspector/VInspector_ViewModelHistory.cxx
@@ -13,11 +13,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_ViewModelHistory.hxx>
+#include <inspector/VInspector_ViewModelHistory.hxx>
 
-#include <VInspector_ItemHistoryElement.hxx>
-#include <VInspector_ItemHistoryRoot.hxx>
-#include <VInspector_ItemHistoryType.hxx>
+#include <inspector/VInspector_ItemHistoryElement.hxx>
+#include <inspector/VInspector_ItemHistoryRoot.hxx>
+#include <inspector/VInspector_ItemHistoryType.hxx>
 
 #include <QStringList>
 

diff --git a/tools/VInspector/VInspector_ViewModelHistory.hxx b/tools/VInspector/VInspector_ViewModelHistory.hxx
index dc23eacc1aba063f1ea8e7c225f9f9cd0dfde1ef..76b6f2f634c5f8b0bdab46c1e5cbc82266e0a95a 100644 (file)
--- a/tools/VInspector/VInspector_ViewModelHistory.hxx
+++ b/tools/VInspector/VInspector_ViewModelHistory.hxx
@@ -17,15 +17,15 @@
 #define VInspector_ViewModelHistory_H
 
 #include <Standard.hxx>
-#include <VInspector_ItemBase.hxx>
-#include <VInspector_CallBackMode.hxx>
+#include <inspector/VInspector_ItemBase.hxx>
+#include <inspector/VInspector_CallBackMode.hxx>
 
 #include <QByteArray>
 #include <QHash>
 #include <QMap>
 #include <QObject>
 
-#include <TreeModel_ModelBase.hxx>
+#include <inspector/TreeModel_ModelBase.hxx>
 
 //! \class VInspector_ViewModelHistory
 //! The class that visualizes methods called in AIS interactive context.

diff --git a/tools/VInspector/VInspector_Window.cxx b/tools/VInspector/VInspector_Window.cxx
index e0b3ef3a58cb0abe9dd8ceab5f24b5fde1630ab8..0d2d970e14bfa3c6509e14a89bcbe6f0c8d1133b 100644 (file)
--- a/tools/VInspector/VInspector_Window.cxx
+++ b/tools/VInspector/VInspector_Window.cxx
@@ -13,17 +13,28 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <VInspector_Window.hxx>
+#include <inspector/VInspector_Window.hxx>
 
 #include <AIS_Shape.hxx>
-#include <VInspector_CallBack.hxx>
-#include <VInspector_Communicator.hxx>
-#include <VInspector_ItemEntityOwner.hxx>
-#include <VInspector_ItemPresentableObject.hxx>
-#include <VInspector_ToolBar.hxx>
-#include <VInspector_Tools.hxx>
-#include <VInspector_ViewModel.hxx>
-#include <VInspector_ViewModelHistory.hxx>
+
+#include <inspector/TreeModel_MessageDialog.hxx>
+
+#include <inspector/VInspector_ItemPresentableObject.hxx>
+#include <inspector/VInspector_ToolBar.hxx>
+#include <inspector/VInspector_Tools.hxx>
+#include <inspector/VInspector_ViewModel.hxx>
+#include <inspector/VInspector_ViewModelHistory.hxx>
+#include <inspector/VInspector_CallBack.hxx>
+#include <inspector/VInspector_Communicator.hxx>
+#include <inspector/VInspector_ItemEntityOwner.hxx>
+#include <inspector/VInspector_ItemPresentableObject.hxx>
+#include <inspector/VInspector_ToolBar.hxx>
+#include <inspector/VInspector_Tools.hxx>
+#include <inspector/VInspector_ViewModel.hxx>
+#include <inspector/VInspector_ViewModelHistory.hxx>
+
+#include <inspector/View_Widget.hxx>
+#include <inspector/View_Window.hxx>
 
 #include <QApplication>
 #include <QDockWidget>
@@ -55,11 +66,18 @@ const int VINSPECTOR_DEFAULT_HEIGHT = 800;
 const int VINSPECTOR_DEFAULT_POSITION_X = 200;
 const int VINSPECTOR_DEFAULT_POSITION_Y = 60;
 
+const int VINSPECTOR_DEFAULT_VIEW_WIDTH = 400;
+const int VINSPECTOR_DEFAULT_VIEW_HEIGHT = 1000;
+
+const int VINSPECTOR_DEFAULT_VIEW_POSITION_X = 200 + 900 + 100; // TINSPECTOR_DEFAULT_POSITION_X + TINSPECTOR_DEFAULT_WIDTH + 100
+const int VINSPECTOR_DEFAULT_VIEW_POSITION_Y = 60; // TINSPECTOR_DEFAULT_POSITION_Y + 50
+
 // =======================================================================
 // function : Constructor
 // purpose :
 // =======================================================================
 VInspector_Window::VInspector_Window()
+: myParent (0), myExportToShapeViewDialog (0), myViewWindow (0)
 {
   myMainWindow = new QMainWindow (0);
 
@@ -91,7 +109,7 @@ VInspector_Window::VInspector_Window()
   VInspector_ViewModelHistory* aHistoryModel = new VInspector_ViewModelHistory (myHistoryView);
   myHistoryView->setModel (aHistoryModel);
 
-  QItemSelectionModel* aSelectionModel = new QItemSelectionModel (myTreeView->model());
+  QItemSelectionModel* aSelectionModel = new QItemSelectionModel (myHistoryView->model());
   myHistoryView->setSelectionModel (aSelectionModel);
   connect (aSelectionModel, SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)),
            this, SLOT (onHistoryViewSelectionChanged (const QItemSelection&, const QItemSelection&)));
@@ -102,7 +120,7 @@ VInspector_Window::VInspector_Window()
   myHistoryView->setColumnWidth (3, COLUMN_3_WIDTH);
   myHistoryView->setColumnWidth (4, HISTORY_AIS_NAME_COLUMN_WIDTH);
 
-  QDockWidget* aHistoryDockWidget = new QDockWidget (tr ("Tree Level Line"), myMainWindow);
+  QDockWidget* aHistoryDockWidget = new QDockWidget (tr ("HistoryView"), myMainWindow);
   aHistoryDockWidget->setWidget (myHistoryView);
   myMainWindow->addDockWidget (Qt::BottomDockWidgetArea, aHistoryDockWidget);
 
@@ -119,11 +137,11 @@ VInspector_Window::VInspector_Window()
 // =======================================================================
 void VInspector_Window::SetParent (void* theParent)
 {
-  QWidget* aParent = (QWidget*)theParent;
-  if (!aParent)
+  myParent = (QWidget*)theParent;
+  if (!myParent)
     return;
 
-  QLayout* aLayout = aParent->layout();
+  QLayout* aLayout = myParent->layout();
   if (aLayout)
     aLayout->addWidget (GetMainWindow());
 }
@@ -147,6 +165,29 @@ void VInspector_Window::UpdateContent()
     NCollection_List<TCollection_AsciiString> aNames;
     myParameters->SetFileNames(aName, aNames);
   }
+
+  // make AIS_InteractiveObject selected selected if exist in select parameters
+  NCollection_List<Handle(Standard_Transient)> anObjects;
+  if (myParameters->GetSelectedObjects(aName, anObjects))
+  {
+    VInspector_ViewModel* aViewModel = dynamic_cast<VInspector_ViewModel*>(myTreeView->model());
+    QItemSelectionModel* aSelectionModel = myTreeView->selectionModel();
+    aSelectionModel->clear();
+    for (NCollection_List<Handle(Standard_Transient)>::Iterator aParamsIt (anObjects);
+         aParamsIt.More(); aParamsIt.Next())
+    {
+      Handle(Standard_Transient) anObject = aParamsIt.Value();
+      Handle(AIS_InteractiveObject) aPresentation = Handle(AIS_InteractiveObject)::DownCast (anObject);
+      if (aPresentation.IsNull())
+        continue;
+
+      QModelIndex aPresentationIndex = aViewModel->FindIndex (aPresentation);
+      if (!aPresentationIndex.isValid())
+        continue;
+       aSelectionModel->select (aPresentationIndex, QItemSelectionModel::Select);
+       myTreeView->scrollTo (aPresentationIndex);
+    }
+  }
 }
 
 // =======================================================================
@@ -218,11 +259,17 @@ void VInspector_Window::SetContext (const Handle(AIS_InteractiveContext)& theCon
 void VInspector_Window::OpenFile(const TCollection_AsciiString& theFileName)
 {
   VInspector_ViewModel* aViewModel = dynamic_cast<VInspector_ViewModel*> (myTreeView->model());
+  if (!aViewModel)
+  {
+    Handle(AIS_InteractiveContext) aContext = createView();
+    SetContext (aContext);
+    aViewModel = dynamic_cast<VInspector_ViewModel*> (myTreeView->model());
+  }
   if (!aViewModel)
     return;
-    
+
   Handle(AIS_InteractiveContext) aContext = aViewModel->GetContext();
-  if (aContext.IsNull())
+  if (!aContext)
     return;
 
   TopoDS_Shape aShape = VInspector_Tools::ReadShape (theFileName);
@@ -351,29 +398,39 @@ void VInspector_Window::onExportToShapeView()
     return;
 
   TCollection_AsciiString aPluginName ("TKShapeView");
-  if (myParameters->FindParameters(aPluginName))
-  {
-    NCollection_List<Handle(Standard_Transient)> aPluginParameters = myParameters->Parameters(aPluginName);
+  NCollection_List<Handle(Standard_Transient)> aParameters;
+  if (myParameters->FindParameters (aPluginName))
+    aParameters = myParameters->Parameters (aPluginName);
 
-    QStringList anExportedPointers;
-    for (NCollection_List<Handle(AIS_InteractiveObject)>::Iterator anIOIt (aSelectedPresentations); anIOIt.More(); anIOIt.Next())
-    {
-      Handle(AIS_Shape) aShapePresentation = Handle(AIS_Shape)::DownCast (anIOIt.Value());
-      if (aShapePresentation.IsNull())
-        continue;
+  QStringList anExportedPointers;
+  for (NCollection_List<Handle(AIS_InteractiveObject)>::Iterator anIOIt (aSelectedPresentations); anIOIt.More(); anIOIt.Next())
+  {
+    Handle(AIS_Shape) aShapePresentation = Handle(AIS_Shape)::DownCast (anIOIt.Value());
+    if (aShapePresentation.IsNull())
+      continue;
 
-      const TopoDS_Shape& aShape = aShapePresentation->Shape();
-      if (aShape.IsNull())
-        continue;
-      aPluginParameters.Append (aShape.TShape());
-      anExportedPointers.append (VInspector_Tools::GetPointerInfo (aShape.TShape(), true).ToCString());
-    }
-    if (anExportedPointers.empty())
-      return;
-    myParameters->SetParameters (aPluginName, aPluginParameters);
-    QMessageBox::information (0, "Information", QString("TShapes '%1' are sent to %2 tool.")
-                             .arg (anExportedPointers.join(", ").arg (QString (aPluginName.ToCString()))));
+    const TopoDS_Shape& aShape = aShapePresentation->Shape();
+    if (aShape.IsNull())
+      continue;
+    aParameters.Append (aShape.TShape());
+    anExportedPointers.append (VInspector_Tools::GetPointerInfo (aShape.TShape(), true).ToCString());
   }
+  if (anExportedPointers.empty())
+    return;
+
+  TCollection_AsciiString aPluginShortName = aPluginName.SubString (3, aPluginName.Length());
+  QString aMessage = QString ("TShape %1 is sent to %2.")
+    .arg (anExportedPointers.join(", "))
+    .arg (aPluginShortName.ToCString());
+  QString aQuestion = QString ("Would you like to activate %1 immediately?\n")
+    .arg (aPluginShortName.ToCString()).toStdString().c_str();
+  if (!myExportToShapeViewDialog)
+    myExportToShapeViewDialog = new TreeModel_MessageDialog (myParent, aMessage, aQuestion);
+  else
+    myExportToShapeViewDialog->SetInformation (aMessage);
+  myExportToShapeViewDialog->Start();
+
+  myParameters->SetParameters (aPluginName, aParameters);
 }
 
 // =======================================================================
@@ -451,3 +508,17 @@ void VInspector_Window::displaySelectedPresentations(const bool theToDisplay)
   }
   aContext->UpdateCurrentViewer();
 }
+
+// =======================================================================
+// function : createView
+// purpose :
+// =======================================================================
+Handle(AIS_InteractiveContext) VInspector_Window::createView()
+{
+  myViewWindow = new View_Window (0);
+  myViewWindow->GetView()->SetPredefinedSize (VINSPECTOR_DEFAULT_VIEW_WIDTH, VINSPECTOR_DEFAULT_VIEW_HEIGHT);
+  myViewWindow->move (VINSPECTOR_DEFAULT_VIEW_POSITION_X, VINSPECTOR_DEFAULT_VIEW_POSITION_Y);
+  myViewWindow->show();
+
+  return myViewWindow->GetView()->GetViewer()->GetContext();
+}

diff --git a/tools/VInspector/VInspector_Window.hxx b/tools/VInspector/VInspector_Window.hxx
index 3515ef3ebc60061a0cfc49c09c38505d10afb982..7fa4664abac380c367f9cc0fb61b0e39b3a002a1 100644 (file)
--- a/tools/VInspector/VInspector_Window.hxx
+++ b/tools/VInspector/VInspector_Window.hxx
@@ -20,14 +20,17 @@
 #include <NCollection_List.hxx>
 #include <SelectBasics_EntityOwner.hxx>
 #include <Standard.hxx>
-#include <TInspectorAPI_PluginParameters.hxx>
-#include <VInspector_CallBack.hxx>
+#include <inspector/TInspectorAPI_PluginParameters.hxx>
+#include <inspector/VInspector_CallBack.hxx>
 
 #include <QObject>
 #include <QItemSelection>
 #include <QMainWindow>
 
+class TreeModel_MessageDialog;
+
 class VInspector_ToolBar;
+class View_Window;
 
 class QAbstractItemModel;
 class QAction;
@@ -126,14 +129,23 @@ private:
   //! \param theToDisplay if true, presentation is displayed otherwise erased
   void displaySelectedPresentations (const bool theToDisplay);
 
+  //! Creates an istance of 3D view to initialize context.
+  //! \return a context of created view.
+  Handle(AIS_InteractiveContext) createView();
+
 private:
 
+  QWidget* myParent; //!< widget, comes when Init window, the window control lays in the layout, updates window title
+
   QMainWindow* myMainWindow; //!< main control
   VInspector_ToolBar* myToolBar; //!< tool bar actions
   QTreeView* myTreeView; //!< tree view of AIS content
   QTreeView* myHistoryView; //!< history of AIS context calls
   Handle(VInspector_CallBack) myCallBack; //!< AIS context call back, if set
 
+  TreeModel_MessageDialog* myExportToShapeViewDialog; //!< dialog about exporting TopoDS_Shape to ShapeView plugin
+  View_Window* myViewWindow; //!< temporary view window, it is created if Open is called but context is still NULL
+
   Handle(TInspectorAPI_PluginParameters) myParameters; //!< plugins parameters container
 };
 

diff --git a/tools/VInspector/icons/treeview_update.png b/tools/VInspector/icons/treeview_update.png
new file mode 100644 (file)
index 0000000..134d316
Binary files /dev/null and b/tools/VInspector/icons/treeview_update.png differ

diff --git a/tools/View/View_Displayer.cxx b/tools/View/View_Displayer.cxx
index cb90118dc5dadc1ccc1617b5269b7a5aa00c8a92..97d9ce01ae1b33e24eb8334ea182a0fb14a65c2f 100644 (file)
--- a/tools/View/View_Displayer.cxx
+++ b/tools/View/View_Displayer.cxx
@@ -13,15 +13,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <View_Displayer.hxx>
+#include <inspector/View_Displayer.hxx>
 
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
-#include <View_Viewer.hxx>
-#include <View_Widget.hxx>
+#include <inspector/View_Viewer.hxx>
+#include <inspector/View_Widget.hxx>
 
 // =======================================================================
 // function : Constructor

diff --git a/tools/View/View_Displayer.hxx b/tools/View/View_Displayer.hxx
index a67ec44ad6c5f02e1f4b9ed883d5cb344478c4f8..7b788031bd8cdedffdaa5b6729c0d53c03de447b 100644 (file)
--- a/tools/View/View_Displayer.hxx
+++ b/tools/View/View_Displayer.hxx
@@ -22,7 +22,7 @@
 #include <NCollection_DataMap.hxx>
 #include <NCollection_Shared.hxx>
 #include <Quantity_Color.hxx>
-#include <View_PresentationType.hxx>
+#include <inspector/View_PresentationType.hxx>
 
 class V3d_View;
 

diff --git a/tools/View/View_ToolBar.cxx b/tools/View/View_ToolBar.cxx
index 3887e18279fd9662add482f7a16e0f0e44e2ba03..2373a35813eb93c782f8dc542100a165f9f7952c 100644 (file)
--- a/tools/View/View_ToolBar.cxx
+++ b/tools/View/View_ToolBar.cxx
@@ -14,7 +14,7 @@
 // commercial license or contractual agreement. 
 
                                                           
-#include <View_ToolBar.hxx>
+#include <inspector/View_ToolBar.hxx>
 
 #include <QComboBox>
 #include <QHBoxLayout>
@@ -42,7 +42,7 @@ View_ToolBar::View_ToolBar (QWidget* theParent)
   QHBoxLayout* aViewSelectorLay = new QHBoxLayout (aViewSelectorWidget);
   aViewSelectorLay->setContentsMargins (0, 0, 0, 0);
   aViewSelectorLay->setContentsMargins (0, 0, 0, 0);
-  aViewSelectorLay->addWidget (new QLabel (tr ("View: "), aViewSelectorWidget));
+  aViewSelectorLay->addWidget (new QLabel (tr ("Context: "), aViewSelectorWidget));
   myViewSelector = new QComboBox (aViewSelectorWidget);
   myViewSelector->setMinimumWidth (DEFAULT_COMBO_WIDTH_MINIMUM);
   aViewSelectorLay->addWidget (myViewSelector);
@@ -63,14 +63,16 @@ View_ToolBar::View_ToolBar (QWidget* theParent)
 
   myActionsMap[View_ToolActionType_KeepViewId] = new QToolButton (theParent);
   myActionsMap[View_ToolActionType_KeepViewId]->setIcon (QIcon (":/icons/keep_view_on.png"));
-  myActionsMap[View_ToolActionType_KeepViewId]->setText (tr ("Keep View On"));
+  myActionsMap[View_ToolActionType_KeepViewId]->setText (tr ("Multi"));
   myActionsMap[View_ToolActionType_KeepViewId]->setToolTip (tr ("Keep View On: does not clear previously shown presentation"));
+  myActionsMap[View_ToolActionType_KeepViewId]->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
   myActionsMap[View_ToolActionType_KeepViewId]->setCheckable (true);
   myActionsMap[View_ToolActionType_KeepViewId]->setChecked (false);
 
   myActionsMap[View_ToolActionType_KeepViewOffId] = new QToolButton (theParent);
   myActionsMap[View_ToolActionType_KeepViewOffId]->setIcon (QIcon (":/icons/keep_view_off.png"));
-  myActionsMap[View_ToolActionType_KeepViewOffId]->setText (QObject::tr ("Keep View Off"));
+  myActionsMap[View_ToolActionType_KeepViewOffId]->setText (QObject::tr ("Single"));
+  myActionsMap[View_ToolActionType_KeepViewOffId]->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
   myActionsMap[View_ToolActionType_KeepViewOffId]->setToolTip (tr ("Keep View Off: clear previously shown presentation"));
   myActionsMap[View_ToolActionType_KeepViewOffId]->setCheckable (true);
   myActionsMap[View_ToolActionType_KeepViewOffId]->setChecked (true);

diff --git a/tools/View/View_ToolBar.hxx b/tools/View/View_ToolBar.hxx
index c81d2c0ff166127aa6e67533f0a0e92c7e442f38..a4fcd5db49a9212c304402550141396e4fccaba7 100644 (file)
--- a/tools/View/View_ToolBar.hxx
+++ b/tools/View/View_ToolBar.hxx
@@ -18,8 +18,8 @@
 
 #include <AIS_InteractiveContext.hxx>
 #include <Standard.hxx>
-#include <View_ContextType.hxx>
-#include <View_ToolActionType.hxx>
+#include <inspector/View_ContextType.hxx>
+#include <inspector/View_ToolActionType.hxx>
 
 #ifdef _MSC_VER
   #pragma warning(disable : 4127 4718) // conditional expression is constant, recursive call has no side effects

diff --git a/tools/View/View_Viewer.cxx b/tools/View/View_Viewer.cxx
index 73550fbd68496b471da982bb79ab48d5c0de73b1..1b2ed6c1054ddc1a93c1588bd46ed75e3b0e80ae 100644 (file)
--- a/tools/View/View_Viewer.cxx
+++ b/tools/View/View_Viewer.cxx
@@ -13,7 +13,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement. 
 
-#include <View_Viewer.hxx>
+#include <inspector/View_Viewer.hxx>
 
 #include <OpenGl_GraphicDriver.hxx>
 #include <Standard_ExtString.hxx>

diff --git a/tools/View/View_Widget.cxx b/tools/View/View_Widget.cxx
index aaaac6049599d2bb4773c1a7a549befe5e031845..a72d90834243814e9158090455a55dcc2d33482f 100644 (file)
--- a/tools/View/View_Widget.cxx
+++ b/tools/View/View_Widget.cxx
@@ -17,12 +17,12 @@
 #define QT_CLEAN_NAMESPACE         /* avoid definition of INT32 and INT8 */
 #endif
 
-#include <View_Widget.hxx>
+#include <inspector/View_Widget.hxx>
 
 #include <Graphic3d_GraphicDriver.hxx>
 #include <Standard_Version.hxx>
-#include <View_ViewActionType.hxx>
-#include <View_Viewer.hxx>
+#include <inspector/View_ViewActionType.hxx>
+#include <inspector/View_Viewer.hxx>
 
 #include <QColorDialog>
 #include <QCursor>

diff --git a/tools/View/View_Widget.hxx b/tools/View/View_Widget.hxx
index cd83e451b35efcc4e6d38877c156e543c87b3a49..06d6ccbba99862657ec6544c097e334721d86ed9 100644 (file)
--- a/tools/View/View_Widget.hxx
+++ b/tools/View/View_Widget.hxx
@@ -18,8 +18,8 @@
 
 #include <AIS_InteractiveContext.hxx>
 #include <V3d_View.hxx>
-#include <View_ViewActionType.hxx>
-#include <View_Viewer.hxx>
+#include <inspector/View_ViewActionType.hxx>
+#include <inspector/View_Viewer.hxx>
 
 #ifdef _MSC_VER
   #pragma warning(disable : 4127 4718) // conditional expression is constant, recursive call has no side effects

diff --git a/tools/View/View_Window.cxx b/tools/View/View_Window.cxx
index 0a7684c12ab7cede7b6bf6b614e2419fba416986..e6939689c4cde6c23f1f6736a5b2a656c381f728 100644 (file)
--- a/tools/View/View_Window.cxx
+++ b/tools/View/View_Window.cxx
@@ -17,12 +17,12 @@
 #define QT_CLEAN_NAMESPACE         /* avoid definition of INT32 and INT8 */
 #endif
 
-#include <View_Window.hxx>
+#include <inspector/View_Window.hxx>
 
-#include <View_Displayer.hxx>
-#include <View_ToolBar.hxx>
-#include <View_Viewer.hxx>
-#include <View_Widget.hxx>
+#include <inspector/View_Displayer.hxx>
+#include <inspector/View_ToolBar.hxx>
+#include <inspector/View_Viewer.hxx>
+#include <inspector/View_Widget.hxx>
 
 #include <QComboBox>
 #include <QDockWidget>

diff --git a/tools/View/View_Window.hxx b/tools/View/View_Window.hxx
index 8150238885fe649701824404aaa0fbbe1cc26eb7..61556f4d4222b0b2eb93c0d0081f84afee81f480 100644 (file)
--- a/tools/View/View_Window.hxx
+++ b/tools/View/View_Window.hxx
@@ -17,7 +17,7 @@
 #define View_Window_H
 
 #include <AIS_InteractiveContext.hxx>
-#include <View_ContextType.hxx>
+#include <inspector/View_ContextType.hxx>
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4127) // conditional expression is constant