1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

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

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

Extending DRAW Commands;

Eliminating warnings;

Improve Export to ShapeView dialog;

Avoid crash with QML using;
This commit is contained in:
nds
2017-08-24 08:25:47 +03:00
committed by bugmaster
parent 340054e17a
commit 0cb512c013
272 changed files with 1980 additions and 903 deletions

View File

@@ -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());
}
}