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

author nds <nds@opencascade.com>

Thu, 24 Aug 2017 05:25:47 +0000 (08:25 +0300)

committer bugmaster <bugmaster@opencascade.com>

Fri, 25 Aug 2017 07:37:52 +0000 (10:37 +0300)
author nds <nds@opencascade.com>
Thu, 24 Aug 2017 05:25:47 +0000 (08:25 +0300)
committer bugmaster <bugmaster@opencascade.com>
Fri, 25 Aug 2017 07:37:52 +0000 (10:37 +0300)
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 006cafa..43621df 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 d0a3d99..3d40a7c 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 5d3e051..7523a95 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 5aa234b..4607755 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 2792359..0c636d3 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 6e29d00..3d4fb13 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 1dd3d27..541f7a1 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 ad1b461..e54c39b 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 550c676..1081658 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 34bffde..548e955 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 8ef0f0d..405aacb 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 d06d1d8..fd5a1a1 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 fc4e101..b5b6fc8 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 2a226c9..5c10ac1 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 89ed532..f6555fc 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 d817553..dbc675f 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 ae4d0d6..9cbd596 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 d16eb93..c1ef3b6 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 dcefc48..37029ca 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 4338369..52b516a 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 404c6f4..0a04c64 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 b151276..d3e2748 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 39b919d..65785a7 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 4ec0e9c..52545a3 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 baa10ad..8bfba4b 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 0b89cf9..101eb37 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 9ce3744..ac84386 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 052acc7..362b258 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 dde4894..cfc8e9b 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 6da5a5f..c0416aa 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 5126b5d..44fc177 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 2fb7f3a..2f644c5 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 757ff8a..a6ed154 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 fd973dc..b734ba1 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 6640089..b1112d1 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 4b5eb78..5a80636 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 d363589..21ecd20 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 71a57d0..950ff0e 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 3753c50..65658a3 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 c1be576..8714f4f 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 bcd4b07..d24bd27 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 1395845..9eb9cc5 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 c1c0a4e..acdb763 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 b486e36..e79467e 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 9663e6f..60e8998 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 00a9a7c..6b9118a 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 1b85271..e618568 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 af77057..ce91e80 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 ebcd34b..1bc3b4b 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 9ac42fc..3365816 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 8c5c260..640dfd1 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 9c1ace1..20dd55b 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 9d35014..bdcc8a3 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 f5298ab..972ad80 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 bcb80c7..9869790 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 23f4539..5e4fdb8 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 3ec1c97..ff6aac7 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 951807a..870a2f6 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 c5dc6c2..7848c10 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 39155d4..9cdf77f 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 0cd6e32..2760592 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 1784239..fff0ba1 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 a93f539..4c86520 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 427b089..12197a9 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 3220802..2c71d42 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 6e5d242..b9ccdc7 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 642ced4..ec23701 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 d82cf2f..d4a357a 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 5881db8..f254fb5 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 6c90ec2..e6f8749 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 dff3588..12b3915 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 4c33194..f16c641 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 5cb2a9d..976660f 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 cd0424c..94d5ad9 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 907c5b8..ff2c995 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 27e7f6c..482aab2 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 ca2b861..94bce61 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 9e89559..eade6ea 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 7016260..e545148 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 18dfa0e..6437bad 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 c9e0855..d91fe71 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 74394bd..bea934f 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 6f9a908..dc0afb8 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 dad9a52..23a2aa5 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 5bd1eec..ad18e5b 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 141f9db..179dfc4 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 ebe1c84..64f81f2 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 7256cc1..7af9521 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 e423a19..03fad8c 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 81e3957..b2ca9af 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 77f961e..96a2aca 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 01bd09a..bf03586 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 2777b9c..1e28774 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 5eea2e3..969960f 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 3146716..b916b12 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 2551bff..cc386a2 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 cc22701..a1aa102 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 a31e6e9..0ceaa43 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 480379b..e8bf511 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 4b22a72..8f90490 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 dfb1d81..501d0e3 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 d593b41..a85e2e0 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 a083ae0..7019b0d 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 ed76ecd..5523478 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 e95511c..02d9b5c 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 b419e8a..debc605 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 c211372..cce96e2 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 58973da..efcbf82 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 a544d17..6f32974 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 54643b0..49ece11 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 8e84b6a..a2b2276 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 bb8076a..05529ab 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 9035a81..4d81123 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 5e9d27b..d956d4e 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 a31056b..4b07cc6 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 b1f20f3..b1cd494 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 79d1366..9057060 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 c048965..99f1ec9 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 f1a98c7..43dea90 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 44f570e..78f1f94 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 4d08445..22bc9da 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 cb9638c..d8a1529 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 12ea902..a98fb4a 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 cf70e27..e23d3b8 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 2f30e16..5bb6efa 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 c5f1152..f2fdcff 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 0b223f5..2f52c31 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 9fc7efe..7c1b217 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 d961a63..142b890 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 e9081b6..13b802b 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 4e6c34c..da9deef 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 4462f43..c9cb50c 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 e0b6c04..60e6ce7 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 f5ce3cd..9622a86 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 a45e355..46745c4 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 fdfa94d..1b659fc 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 e3caef7..11f44e8 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 64de46c..6a75451 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 e65d814..67ecf80 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 7488fe1..8257fe8 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 84020e2..4efe150 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 f3001ba..a4d52e8 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 2aae1ec..73e5d87 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 ea25583..9f4d68d 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 ffbe642..9ed95c9 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 73f14d7..42b1e0a 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 e806c8c..d925f81 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 c9b60b6..c005550 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 f115975..f1e7e8d 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 a65336f..97706d1 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 22bd3db..b95d968 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 e7b7c3d..5508708 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 73c8840..26465b2 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 846cd97..64adc76 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 3a6bf04..8c0641f 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 097de00..2520a02 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 24c9f30..46b7cbd 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 4499960..dd0017e 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 0d2f20a..5098d7b 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 8ca9361..e5e17c0 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 b143d96..9068329 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 d517b6b..d0f2596 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 5698ae5..de4fb78 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 558b2d6..1e6202e 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 178b77d..f445f02 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 f3ee134..d7bbc92 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 c17a091..7aedc1d 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 b011452..6024a3d 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 1719bb4..cf8171e 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 a6ca6f1..21c9af9 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 7231abf..c69e0b1 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 9bb7146..67b4227 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 aa5accf..bb75c87 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 ebc44ab..0366a0b 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 88203b9..1221721 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 499ee95..bacf238 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 5c1520b..7afad77 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 4f06db4..aa3fc5b 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 7084797..798b4dd 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 50ce324..d3f0b0b 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 5c06c1e..95e8d5b 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 692b28a..790cb24 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 be53fb3..d1f4a10 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 7f43023..ace15f9 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 0fb82f4..c457e18 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 12088e8..00bc421 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 d5b1f54..085aa00 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 343570d..b4a98f2 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 2893382..1090cce 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 731d376..7a7aa80 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 4c599a3..703bbda 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 75d663e..1728015 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 5ecff2e..c1d89ec 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 535b9d2..a32657a 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 535c871..3e0559c 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 6d784bb..64d1dbe 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 63b95ef..370ab5b 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 631e116..88bf5f0 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 3ab29ce..eaac833 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 8c02741..06cad9d 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 01dc6af..12db813 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 4968689..72a5d66 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 2f5f49b..a44b112 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 77a34b7..210e8bb 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 739cfe2..11fe070 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);
 }
@@ -325,6 +355,20 @@ void ShapeView_Window::onBREPDirectory()
 }
 
 // =======================================================================
+// 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 11c57fd..31cd1d3 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 9bfd58b..b0a139e 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 2c39e56..f673397 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 e69723a..41790a1 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 0b961f0..ff59ecf 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 8fea026..08813a7 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;
 }
 
 // =======================================================================
@@ -147,6 +192,44 @@ void TInspector_Window::ActivateTool (const TCollection_AsciiString& thePluginNa
 }
 
 // =======================================================================
+// 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;
@@ -222,23 +313,13 @@ bool TInspector_Window::LoadPlugin (const TCollection_AsciiString& thePluginName
 }
 
 // =======================================================================
-// function : onLastApplicationWindowClosed
-// purpose :
-// =======================================================================
-void TInspector_Window::OnLastApplicationWindowClosed()
-{
-  for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++)
-    delete myToolNames[aToolId].myCommunicator;
-}
-
-// =======================================================================
 // function : onButtonClicked
 // purpose :
 // =======================================================================
 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 1887707..ecac17c 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 459e468..877f6ee 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 18991cc..ee26363 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 3db7210..1bf0725 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 c59c9cf..ea5c1ec 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 480a311..0cd3a7b 100644 (file)
--- a/tools/ToolsDraw/ToolsDraw.cxx
+++ b/tools/ToolsDraw/ToolsDraw.cxx
@@ -13,20 +13,74 @@
 // 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++;
+
author	nds <nds@opencascade.com>
	Thu, 24 Aug 2017 05:25:47 +0000 (08:25 +0300)
committer	bugmaster <bugmaster@opencascade.com>
	Fri, 25 Aug 2017 07:37:52 +0000 (10:37 +0300)