0030749: Inspectors - compilation under tcl scripts

- 'Search Qt4' is renamed into 'Search Qt'. Configuration uses Qt5 from now. For Qt4 use CMake configuration.
- 'Build Inspector' check box is added. It causes 'tools' toolkits compilation. Activates automatically 'Search Qt' control.
- Many Tcl procedures are extended with additional parameter to giving a directory of processed toolkits. The default directory is 'src', inspector directory is 'tools'. This way is similar Inspector compilation implemented in Cmake build procedure.
- Dependency libraries in DEBUG are stored in __TKDEP_DEBUG__. Qt requires it as names of debug and release libraries are different.

adm/UDLIST

@@ -444,3 +444,23 @@ t TKRWMesh
 n RWGltf
 n RWMesh
 n RWObj
+n DFBrowser
+n DFBrowserPane
+n DFBrowserPaneXDE
+n ShapeView
+n TInspector
+n TInspectorAPI
+x TInspectorEXE
+t TKDFBrowser
+t TKShapeView
+t TKTInspector
+t TKTInspectorAPI
+t TKToolsDraw
+t TKTreeModel
+t TKView
+t TKVInspector
+n ToolsDraw
+n TreeModel
+n View
+n ViewControl
+n VInspector

adm/genconf.tcl

@@ -223,9 +223,14 @@ proc wokdep:gui:UpdateList {} {
     wokdep:SearchRapidJson anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
   }
 
-  if { "$::CHECK_QT4" == "true" } {
+  if {"$::BUILD_Inspector" == "true" } {
-    wokdep:SearchQt4     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+    set ::CHECK_QT "true"
   }
+
+  if { "$::CHECK_QT" == "true" } {
+    wokdep:SearchQt     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+
   if { "$::CHECK_JDK" == "true" } {
     wokdep:SearchJDK     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
   }
@@ -494,11 +499,16 @@ ttk::label    .myFrame.myChecks.myLzmaLbl       -text "Use liblzma"
 checkbutton   .myFrame.myChecks.myE57Check      -offvalue "false" -onvalue "true" -variable HAVE_E57       -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myE57Lbl        -text "Use E57"
 
-checkbutton   .myFrame.myChecks.myQt4Check      -offvalue "false" -onvalue "true" -variable CHECK_QT4      -command wokdep:gui:UpdateList
+checkbutton   .myFrame.myChecks.myQtCheck       -offvalue "false" -onvalue "true" -variable CHECK_QT       -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myChecks.myQt4Lbl        -text "Search Qt4"
+ttk::label    .myFrame.myChecks.myQtLbl         -text "Search Qt"
 checkbutton   .myFrame.myChecks.myJDKCheck      -offvalue "false" -onvalue "true" -variable CHECK_JDK      -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myJDKLbl        -text "Search JDK"
 
+if { "$::tcl_platform(platform)" == "windows" } {
+  checkbutton   .myFrame.myChecks.myInspectorBuild -offvalue "false" -onvalue "true" -variable BUILD_Inspector      -command wokdep:gui:UpdateList
+  ttk::label    .myFrame.myChecks.myInspectorLbl   -text "Build Inspector"
+}
+
 # Additional headers search paths
 ttk::label    .myFrame.myIncLbl    -text "Additional headers search paths:" -padding {5 5 80 5}
 scrollbar     .myFrame.myIncScrl   -command ".myFrame.myIncList yview"
@@ -602,8 +612,8 @@ if { "$::tcl_platform(os)" != "Darwin" } {
 grid .myFrame.myChecks.myZLibCheck     -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myZLibLbl       -row $aCheckRowIter -column 7 -sticky w
 
-grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 12 -sticky e
+grid .myFrame.myChecks.myQtCheck      -row $aCheckRowIter -column 12 -sticky e
-grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 13 -sticky w
+grid .myFrame.myChecks.myQtLbl        -row $aCheckRowIter -column 13 -sticky w
 
 incr aCheckRowIter
 grid .myFrame.myChecks.myFFmpegCheck   -row $aCheckRowIter -column 0 -sticky e
@@ -628,6 +638,11 @@ grid .myFrame.myChecks.myRapidJsonLbl   -row $aCheckRowIter -column 1 -sticky w
 grid .myFrame.myChecks.myE57Check      -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myE57Lbl        -row $aCheckRowIter -column 7 -sticky w
 
+if { "$::tcl_platform(platform)" == "windows" } {
+  grid .myFrame.myChecks.myInspectorBuild      -row $aCheckRowIter -column 12 -sticky e
+  grid .myFrame.myChecks.myInspectorLbl        -row $aCheckRowIter -column 13 -sticky w
+}
+
 incr aCheckRowIter
 
 # Additional headers search paths

adm/genconfdeps.tcl

@@ -68,7 +68,7 @@ if { [info exists ::env(SHORTCUT_HEADERS)] } {
 }
 
 # fetch environment variables (e.g. set by custom.sh or custom.bat) and set them as tcl variables with the same name
-set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_E57 HAVE_RAPIDJSON HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
+set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_E57 HAVE_RAPIDJSON HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo BUILD_Inspector}
 foreach anEnvIter $THE_ENV_VARIABLES {
   set ${anEnvIter} "false"
   if { [info exists ::env(${anEnvIter})] } {
@@ -1022,8 +1022,8 @@ proc wokdep:SearchVTK {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
   return "$isFound"
 }
 
-# Search Qt4 libraries placement
+# Search Qt libraries placement
-proc wokdep:SearchQt4 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+proc wokdep:SearchQt {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
   upvar $theErrInc   anErrInc
   upvar $theErrLib32 anErrLib32
   upvar $theErrLib64 anErrLib64
@@ -1031,53 +1031,46 @@ proc wokdep:SearchQt4 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
   upvar $theErrBin64 anErrBin64
 
   set isFound "true"
-  set aQMsgBoxHPath [wokdep:SearchHeader "QtGui/qmessagebox.h"]
+  set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt}*] "$::VCVER" "$::ARCH" ] 
+  set aQMsgBoxHPath [wokdep:SearchHeader "QtGui/qguiapplication.h"]
   if { "$aQMsgBoxHPath" == "" } {
-    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/QtGui/qguiapplication.h"] } {
-    if { "$aPath" != "" && [file exists "$aPath/include/QtGui/qmessagebox.h"] } {
       lappend ::CSF_OPT_INC "$aPath/include"
       lappend ::CSF_OPT_INC "$aPath/include/Qt"
       lappend ::CSF_OPT_INC "$aPath/include/QtGui"
       lappend ::CSF_OPT_INC "$aPath/include/QtCore"
+      lappend ::CSF_OPT_INC "$aPath/include/QtWidgets"
+      lappend ::CSF_OPT_INC "$aPath/include/QtXml"
     } else {
-      if { [file exists "/usr/include/qt4/QtGui/qmessagebox.h"] } {
+      lappend anErrInc "Error: 'QtGui/qguiapplication.h' not found"
-        lappend ::CSF_OPT_INC "/usr/include/qt4"
-        lappend ::CSF_OPT_INC "/usr/include/qt4/Qt"
-        lappend ::CSF_OPT_INC "/usr/include/qt4/QtGui"
-        lappend ::CSF_OPT_INC "/usr/include/qt4/QtCore"
-      } else {
-        lappend anErrInc "Error: 'QtGui/qmessagebox.h' not found (Qt4)"
         set isFound "false"
-      }
     }
   }
 
   set aQtGuiLibName "QtGui"
   if { "$::tcl_platform(platform)" == "windows" } {
-    set aQtGuiLibName "QtGui4"
+    set aQtGuiLibName "Qt5Gui"
   }
 
   foreach anArchIter {64 32} {
     set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter"]
     if { "$aQMsgBoxLibPath" == "" } {
-      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ]
       set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter" "$aPath/lib"]
       if { "$aQMsgBoxLibPath" != "" } {
         lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
       } else {
-        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aQtGuiLibName}.${::SYS_LIB_SUFFIX}' not found (Qt4)"
+        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aQtGuiLibName}.${::SYS_LIB_SUFFIX}' not found (Qt)"
         if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
       }
     }
     if { "$::tcl_platform(platform)" == "windows" } {
-      set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter"]
+      set aQMsgBoxDllPath [wokdep:SearchBin "${aQtGuiLibName}.dll" "$anArchIter"]
       if { "$aQMsgBoxDllPath" == "" } {
-        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ]
+        set aQMsgBoxDllPath [wokdep:SearchBin "${aQtGuiLibName}.dll" "$anArchIter" "$aPath/bin"]
-        set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter" "$aPath/bin"]
         if { "$aQMsgBoxDllPath" != "" } {
           lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
         } else {
-          lappend anErrBin$anArchIter "Error: 'QtGui4.dll' not found (Qt4)"
+          lappend anErrBin$anArchIter "Error: '${aQtGuiLibName}.dll' not found (Qt)"
           if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
         }
       }

adm/templates/template.vc10

@@ -159,7 +159,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
       <OutputFile>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -255,7 +255,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
       <OutputFile>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

adm/templates/template.vc10x

@@ -149,7 +149,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -238,7 +238,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>

src/OS/ApplicationFramework.tcl

@@ -58,10 +58,6 @@ proc ApplicationFramework:depends { } {
 
 ;#
 ;# Returns a list of exported features.
-;# source : Source files
-;# runtime: Shareables
-;# wokadm : WOK admin files
-;# api    : Public include files
 ;#
 proc ApplicationFramework:Export { } {
     return [list source runtime wokadm api]

src/OS/DataExchange.tcl

@@ -56,10 +56,6 @@ proc DataExchange:depends { } {
 
 ;#
 ;# Returns a list of exported features.
-;# source : Source files
-;# runtime: Shareables
-;# wokadm : WOK admin files
-;# api    : Public include files
 ;#
 proc DataExchange:Export { } {
     return [list source runtime wokadm api]

src/OS/Draw.tcl

@@ -58,10 +58,6 @@ proc Draw:acdepends { } {
 
 ;#
 ;# Returns a list of exported features.
-;# source : Source files
-;# runtime: Shareables
-;# wokadm : WOK admin files
-;# api    : Public include files
 ;#
 proc Draw:Export { } {
     return [list source runtime wokadm api]

src/OS/FoundationClasses.tcl

@@ -52,10 +52,6 @@ proc FoundationClasses:depends { } {
 
 ;#
 ;# Returns a list of exported features.
-;# source : Source files
-;# runtime: Shareables
-;# wokadm : WOK admin files
-;# api    : Public include files
 ;#
 proc FoundationClasses:Export { } {
     return [list source runtime wokadm api]

src/OS/ModelingAlgorithms.tcl

@@ -50,10 +50,6 @@ proc ModelingAlgorithms:depends { } {
 
 ;#
 ;# Returns a list of exported features.
-;# source : Source files
-;# runtime: Shareables
-;# wokadm : WOK admin files
-;# api    : Public include files
 ;#
 proc ModelingAlgorithms:Export { } {
     return [list source runtime wokadm api]

src/OS/ModelingData.tcl

@@ -42,10 +42,6 @@ proc ModelingData:depends { } {
 
 ;#
 ;# Returns a list of exported features.
-;# source : Source files
-;# runtime: Shareables
-;# wokadm : WOK admin files
-;# api    : Public include files
 ;#
 proc ModelingData:Export { } {
     return [list source runtime wokadm api]

src/OS/TApplicationFramework.tcl

@@ -0,0 +1,41 @@
+# Copyright (c) 2020 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.
+
+# List of toolkits 
+proc TApplicationFramework:toolkits { } {
+  return [list TKTreeModel TKTInspectorAPI TKDFBrowser]
+}
+
+# List of non-toolkits (resource units, executables etc., with associated info)
+proc TApplicationFramework:ressources { } {
+}
+
+# Module name 
+proc TApplicationFramework:name { } {
+  return TApplicationFramework
+}
+
+# And short alias
+proc TApplicationFramework:alias { } {
+  return TApplicationFramework
+}
+
+# Dependency on other products
+proc TApplicationFramework:depends { } {
+  return [list ApplicationFramework FoundationClasses DataExchange TModelingData Visualization]
+}
+
+# Returns a list of exported features.
+proc TApplicationFramework:Export { } {
+  return [list source runtime wokadm api]
+}

src/OS/TModelingData.tcl

@@ -0,0 +1,41 @@
+# Copyright (c) 2020 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.
+
+# List of toolkits 
+proc TModelingData:toolkits { } {
+  return [list TKShapeView]
+}
+
+# List of non-toolkits (resource units, executables etc., with associated info)
+proc TModelingData:ressources { } {
+}
+
+# Module name 
+proc TModelingData:name { } {
+  return TModelingData
+}
+
+# And short alias
+proc TModelingData:alias { } {
+  return TModelingData
+}
+
+# Dependency on other products
+proc TModelingData:depends { } {
+  return [list FoundationClasses ModelingData TVisualization]
+}
+
+# Returns a list of exported features.
+proc TModelingData:Export { } {
+  return [list source runtime wokadm api]
+}

src/OS/TTool.tcl

@@ -0,0 +1,44 @@
+# Copyright (c) 2020 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.
+
+# List of toolkits 
+proc TTool:toolkits { } {
+  return [list TKTInspector TKToolsDraw]
+}
+
+# List of non-toolkits (resource units, executables etc., with associated info)
+proc TTool:ressources { } {
+  return [list \
+          [list both x TInspectorEXE {}] \
+         ]
+}
+
+# Module name 
+proc TTool:name { } {
+    return TTool
+}
+
+# And short alias
+proc TTool:alias { } {
+  return TTool
+}
+
+# Dependency on other products
+proc TTool:depends { } {
+  return [list FoundationClasses Draw TApplicationFramework]
+}
+
+# Returns a list of exported features.
+proc TTool:Export { } {
+  return [list source runtime wokadm api]
+}

src/OS/TVisualization.tcl

@@ -0,0 +1,41 @@
+# Copyright (c) 2020 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.
+
+# List of toolkits 
+proc TVisualization:toolkits { } {
+  return [list TKView TKVInspector]
+}
+
+# List of non-toolkits (resource units, executables etc., with associated info)
+proc TVisualization:ressources { } {
+}
+
+# Module name 
+proc TVisualization:name { } {
+  return TVisualization
+}
+
+# And short alias
+proc TVisualization:alias { } {
+  return TVisualization
+}
+
+# Dependency on other products
+proc TVisualization:depends { } {
+  return [list FoundationClasses]
+}
+
+# Returns a list of exported features.
+proc TVisualization:Export { } {
+  return [list source runtime wokadm api]
+}

src/OS/Tools.tcl

@@ -0,0 +1,24 @@
+# Copyright (c) 2020 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.
+
+;#
+;# Returns an ordered list of module names
+;# 
+proc OS:Modules { {plat ""} } {
+    set ret [list TModelingData \
+	   TVisualization \
+	   TApplicationFramework \
+	   TTool \
+	   ]
+    return $ret
+}

src/OS/Visualization.tcl

@@ -70,10 +70,6 @@ proc Visualization:acdepends { } {
 
 ;#
 ;# Returns a list of exported features.
-;# source : Source files
-;# runtime: Shareables
-;# wokadm : WOK admin files
-;# api    : Public include files
 ;#
 proc Visualization:Export { } {
     return [list source runtime wokadm api]

tools/DFBrowser/DFBrowser.qrc

@@ -1,8 +1,14 @@
 <!DOCTYPE RCC><RCC version="1.0">
     <qresource>
+        <file>icons/attribute.png</file>
+        <file>icons/attribute_40x40.png</file>
+        <file>icons/export_shape.png</file>
+        <file>icons/folder_export.png</file>
         <file>icons/item_type_folder.png</file>
         <file>icons/item_type_folder_40x40.png</file>
         <file>icons/level_change.png</file>
+        <file>icons/named_shape.png</file>
+        <file>icons/named_shape_40x40.png</file>
         <file>icons/search.png</file>
         <file>icons/search_cancel.png</file>
         <file>icons/treeline_backward.png</file>

tools/DFBrowserPane/DFBrowserPane.qrc

@@ -1,13 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-    <qresource>
-        <file>icons/attribute.png</file>
-        <file>icons/attribute_40x40.png</file>
-        <file>icons/export_shape.png</file>
-        <file>icons/folder_export.png</file>
-        <file>icons/label.png</file>
-        <file>icons/label_folder_16x16.png</file>
-        <file>icons/label_folder_40x40.png</file>
-        <file>icons/named_shape.png</file>
-        <file>icons/named_shape_40x40.png</file>
-    </qresource>
-</RCC>

tools/DFBrowserPane/FILES

@@ -1,4 +1,3 @@
-DFBrowserPane.qrc
 DFBrowserPane_AttributePane.cxx
 DFBrowserPane_AttributePane.hxx
 DFBrowserPane_AttributePaneAPI.hxx

tools/TInspector/TInspector_Communicator.cxx

@@ -15,8 +15,10 @@
 
 #include <inspector/TInspector_Communicator.hxx>
 
+#include <OSD_Directory.hxx>
 #include <OSD_Environment.hxx>
 #include <TCollection_AsciiString.hxx>
+
 #include <inspector/TInspector_Window.hxx>
 
 #include <Standard_WarningsDisable.hxx>
@@ -37,16 +39,59 @@ TInspector_Communicator::TInspector_Communicator()
     static int argc = 1;
     static char* argv[] = { (char*)"", 0 };
 #if QT_VERSION > 0x050000
-  OSD_Environment anEnvironment ("QTDIR");
+    TCollection_AsciiString aPlugindsDirName;
-  TCollection_AsciiString aPlugindsDirName = anEnvironment.Value();
+    if (TInspector_Communicator::PluginsDir (aPlugindsDirName))
-  aPlugindsDirName += "/plugins";
+      QApplication::addLibraryPath (aPlugindsDirName.ToCString());
-  QApplication::addLibraryPath (aPlugindsDirName.ToCString());
 #endif
     new QApplication (argc, argv);
   }
   myWindow = new TInspector_Window();
 }
 
+// =======================================================================
+// function : PluginsDir
+// purpose :
+// =======================================================================
+Standard_Boolean TInspector_Communicator::PluginsDir (TCollection_AsciiString& thePlugindsDirName)
+{
+  OSD_Environment anEnvironment ("QTDIR");
+  TCollection_AsciiString aQtDirValue = anEnvironment.Value();
+  if (!aQtDirValue.IsEmpty())
+  {
+    thePlugindsDirName = aQtDirValue + "/plugins";
+    return Standard_True;
+  }
+  anEnvironment = OSD_Environment ("PATH");
+  TCollection_AsciiString aPathValue = anEnvironment.Value();
+  TCollection_AsciiString aPathSep =
+#ifdef _WIN32
+    ';';
+#else
+    ':';
+#endif
+  for (int i = 1; !aPathValue.IsEmpty(); i++)
+  {
+    Standard_Integer aSepIndex = aPathValue.FirstLocationInSet (aPathSep, 1, aPathValue.Length());
+    if (aSepIndex <= 1)
+      break;
+
+    TCollection_AsciiString aCurPath = aPathValue.SubString (1, aSepIndex - 1);
+    aPathValue = aSepIndex < aPathValue.Length() ? aPathValue.SubString (aSepIndex + 1, aPathValue.Length()) : "";
+    if (aCurPath.IsEmpty())
+      continue;
+
+    aCurPath += "/../plugins";
+    OSD_Path aPath (aCurPath);
+    OSD_Directory aCurDir (aPath);
+    if (aCurDir.Exists())
+    {
+      thePlugindsDirName = aCurPath;
+      return Standard_True;
+    }
+  }
+  return Standard_False;
+}
+
 // =======================================================================
 // function : SetVisible
 // purpose :

tools/TInspector/TInspector_Communicator.hxx

@@ -40,6 +40,9 @@ public:
   //! Destructor
   virtual ~TInspector_Communicator() {}
 
+  //! Returns directory of Qt plugins. Firstly it founds it in QTDIR, else if not defined in PATH
+  Standard_EXPORT static Standard_Boolean PluginsDir (TCollection_AsciiString& thePlugindsDirName);
+
   //! Registers plugin into TInspector window
   //! \param thePluginName a name of the plugin
   void RegisterPlugin (const TCollection_AsciiString& thePluginName) { myWindow->RegisterPlugin (thePluginName); }

tools/TInspectorEXE/TInspectorEXE.cxx

@@ -87,9 +87,9 @@ void setPluginSampleDirectory (const TCollection_AsciiString& theName, TInspecto
 int main (int argc, char** argv)
 {
 #if QT_VERSION > 0x050000
-  TCollection_AsciiString aPlugindsDirName = OSD_Environment ("QTDIR").Value();
+  TCollection_AsciiString aPlugindsDirName;
-  if (!aPlugindsDirName.IsEmpty())
+  if (TInspector_Communicator::PluginsDir (aPlugindsDirName))
-    QApplication::addLibraryPath (QString (aPlugindsDirName.ToCString()) + "/plugins");
+    QApplication::addLibraryPath (aPlugindsDirName.ToCString());
 #endif
   QApplication anApp (argc, argv);
 

tools/TKVInspector/EXTERNLIB

@@ -6,6 +6,7 @@ TKMath
 TKV3d
 TKView
 TKService
+TKTopAlgo
 TKTreeModel
 TKBO
 CSF_QT

tools/TKView/EXTERNLIB

@@ -1,3 +1,4 @@
+TKBRep
 TKG3d
 TKernel
 TKMath