From 6822a3bef196dcdf185d5af9103f74cf79ca897c Mon Sep 17 00:00:00 2001 From: nds Date: Fri, 23 Mar 2018 16:08:11 +0300 Subject: [PATCH] 0029674: Improvements in Inspector tool - preferences for dock windows geometry, tree view columns and current view projection; - ViewControl package for common functionality between plugins; - processing Location and Orientation for external TopoDS_Shape object - 'F5' key to update content of each plugin - visibility column in tree view (used now only in ShapeView) - properties child item for context (presents tree of current Filters of context) --- CMakeLists.txt | 4 +- adm/cmake/qt.cmake | 2 +- adm/cmake/qt_macro.cmake | 14 +- .../tools/TInspectorEXE/src/TInspectorEXE.cxx | 2 + .../src/TInspectorEXE_OpenFileDialog.cxx | 7 +- .../src/TInspectorEXE_OpenFileDialog.hxx | 5 +- .../src/TInspectorEXE_OpenFileViewModel.cxx | 8 +- .../src/TInspectorEXE_OpenFileViewModel.hxx | 5 +- src/TopAbs/TopAbs.cxx | 21 ++ src/TopAbs/TopAbs.hxx | 16 + src/V3d/V3d.cxx | 41 +++ src/V3d/V3d.hxx | 22 ++ .../DFBrowser_AttributePaneStack.cxx | 8 +- tools/DFBrowser/DFBrowser_Communicator.hxx | 14 + tools/DFBrowser/DFBrowser_Item.cxx | 6 +- tools/DFBrowser/DFBrowser_PropertyPanel.cxx | 8 +- tools/DFBrowser/DFBrowser_SearchLine.cxx | 4 +- tools/DFBrowser/DFBrowser_SearchView.cxx | 13 +- tools/DFBrowser/DFBrowser_Thread.cxx | 16 - tools/DFBrowser/DFBrowser_Thread.hxx | 4 - .../DFBrowser_ThreadItemUsedShapesMap.cxx | 223 -------------- .../DFBrowser_ThreadItemUsedShapesMap.hxx | 81 ----- tools/DFBrowser/DFBrowser_TreeLevelLine.cxx | 9 +- tools/DFBrowser/DFBrowser_TreeLevelView.cxx | 5 +- tools/DFBrowser/DFBrowser_TreeModel.cxx | 14 +- tools/DFBrowser/DFBrowser_TreeModel.hxx | 9 +- tools/DFBrowser/DFBrowser_Window.cxx | 188 ++++++------ tools/DFBrowser/DFBrowser_Window.hxx | 36 +-- tools/DFBrowser/FILES | 6 - .../DFBrowserPane_AttributePaneAPI.hxx | 6 +- .../DFBrowserPane_TDataStdTreeNodeModel.cxx | 11 +- .../DFBrowserPane_TDataStdTreeNodeModel.hxx | 5 + .../DFBrowserPane_TDocStdOwner.cxx | 2 +- .../DFBrowserPane_TNamingNamedShape.cxx | 5 +- .../DFBrowserPane_TNamingNamedShape.hxx | 4 +- .../DFBrowserPane/DFBrowserPane_TableView.cxx | 4 +- tools/DFBrowserPane/DFBrowserPane_Tools.hxx | 8 +- .../DFBrowserPaneXDE_AttributeCommonPane.cxx | 7 +- .../DFBrowserPaneXDE_AttributeCommonPane.hxx | 4 +- tools/ShapeView/FILES | 2 + tools/ShapeView/ShapeView_Communicator.cxx | 61 ---- tools/ShapeView/ShapeView_Communicator.hxx | 18 +- tools/ShapeView/ShapeView_ItemShape.cxx | 89 +++--- tools/ShapeView/ShapeView_Tools.cxx | 9 - tools/ShapeView/ShapeView_Tools.hxx | 5 - tools/ShapeView/ShapeView_TreeModel.cxx | 87 +++--- tools/ShapeView/ShapeView_TreeModel.hxx | 25 +- tools/ShapeView/ShapeView_VisibilityState.cxx | 52 ++++ tools/ShapeView/ShapeView_VisibilityState.hxx | 76 +++++ tools/ShapeView/ShapeView_Window.cxx | 250 ++++++++-------- tools/ShapeView/ShapeView_Window.hxx | 32 +- tools/TInspector/FILES | 4 + tools/TInspector/TInspector.qrc | 1 + tools/TInspector/TInspector_Communicator.cxx | 16 +- tools/TInspector/TInspector_Communicator.hxx | 17 ++ .../TInspector_PluginParameters.cxx | 23 ++ .../TInspector_PluginParameters.hxx | 30 +- tools/TInspector/TInspector_Preferences.cxx | 159 ++++++++++ tools/TInspector/TInspector_Preferences.hxx | 100 +++++++ .../TInspector_Shortcut.cxx} | 14 +- .../TInspector_Shortcut.hxx} | 22 +- tools/TInspector/TInspector_Window.cxx | 248 ++++++++++++++-- tools/TInspector/TInspector_Window.hxx | 49 +++- tools/TInspector/icons/plugin_actions.png | Bin 0 -> 204 bytes tools/TInspectorAPI/FILES | 1 + .../TInspectorAPI_Communicator.hxx | 10 + .../TInspectorAPI_PluginParameters.cxx | 146 ++++++++- .../TInspectorAPI_PluginParameters.hxx | 44 ++- .../TInspectorAPI_PreferencesDataMap.hxx | 25 ++ tools/TKTInspector/EXTERNLIB | 3 +- tools/TKTInspectorAPI/EXTERNLIB | 4 +- tools/TKTreeModel/PACKAGES | 1 + tools/ToolsDraw/ToolsDraw.cxx | 93 ++++-- tools/TreeModel/FILES | 12 +- tools/TreeModel/TreeModel.hxx | 33 +++ tools/TreeModel/TreeModel.qrc | 6 + tools/TreeModel/TreeModel_ColumnType.hxx | 30 ++ tools/TreeModel/TreeModel_ContextMenu.cxx | 82 ++++++ tools/TreeModel/TreeModel_ContextMenu.hxx | 53 ++++ tools/TreeModel/TreeModel_HeaderSection.hxx | 78 +++++ tools/TreeModel/TreeModel_ItemBase.cxx | 22 +- tools/TreeModel/TreeModel_ItemBase.hxx | 11 +- tools/TreeModel/TreeModel_ModelBase.cxx | 91 +++++- tools/TreeModel/TreeModel_ModelBase.hxx | 67 ++++- tools/TreeModel/TreeModel_Tools.cxx | 213 ++++++++++++++ tools/TreeModel/TreeModel_Tools.hxx | 95 ++++++ .../TreeModel_VisibilityState.cxx} | 25 +- tools/TreeModel/TreeModel_VisibilityState.hxx | 81 +++++ tools/TreeModel/icons/item_invisible.png | Bin 0 -> 446 bytes tools/TreeModel/icons/item_visible.png | Bin 0 -> 478 bytes tools/VInspector/FILES | 4 + tools/VInspector/VInspector.qrc | 2 + tools/VInspector/VInspector_Communicator.hxx | 14 + tools/VInspector/VInspector_ItemBase.cxx | 6 +- tools/VInspector/VInspector_ItemBase.hxx | 4 +- tools/VInspector/VInspector_ItemContext.cxx | 105 +++---- tools/VInspector/VInspector_ItemContext.hxx | 3 + .../VInspector/VInspector_ItemEntityOwner.cxx | 81 +++-- .../VInspector_ItemFolderObject.cxx | 93 ++++++ .../VInspector_ItemFolderObject.hxx | 86 ++++++ .../VInspector_ItemHistoryTypeInfo.hxx | 2 +- .../VInspector_ItemPresentableObject.cxx | 117 +++++--- .../VInspector_ItemSelectMgrFilter.cxx | 138 +++++++++ .../VInspector_ItemSelectMgrFilter.hxx | 91 ++++++ tools/VInspector/VInspector_ItemSelection.cxx | 47 ++- .../VInspector_ItemSensitiveEntity.cxx | 68 ++--- tools/VInspector/VInspector_Tools.cxx | 26 ++ tools/VInspector/VInspector_ViewModel.cxx | 84 ++++-- tools/VInspector/VInspector_ViewModel.hxx | 29 +- .../VInspector_ViewModelHistory.cxx | 61 ++-- .../VInspector_ViewModelHistory.hxx | 16 +- tools/VInspector/VInspector_Window.cxx | 277 +++++++++--------- tools/VInspector/VInspector_Window.hxx | 27 +- tools/VInspector/icons/treeview_and.png | Bin 0 -> 604 bytes tools/VInspector/icons/treeview_or.png | Bin 0 -> 231 bytes tools/View/FILES | 3 + tools/View/View_Displayer.cxx | 157 +++++++++- tools/View/View_Displayer.hxx | 48 ++- tools/View/View_ToolBar.cxx | 35 ++- tools/View/View_ToolBar.hxx | 2 +- tools/View/View_ToolButton.hxx | 64 ++++ tools/View/View_Tools.cxx | 76 +++++ tools/View/View_Tools.hxx | 65 ++++ tools/View/View_Widget.cxx | 59 +++- tools/View/View_Widget.hxx | 46 ++- tools/View/View_Window.cxx | 80 ++++- tools/View/View_Window.hxx | 18 +- tools/View/icons/keep_view_off.svg | 64 ---- tools/View/icons/keep_view_on.svg | 78 ----- tools/ViewControl/FILES | 5 + .../ViewControl_MessageDialog.cxx} | 12 +- .../ViewControl_MessageDialog.hxx} | 13 +- tools/ViewControl/ViewControl_Tools.cxx | 45 +++ tools/ViewControl/ViewControl_Tools.hxx | 51 ++++ .../ViewControl_TreeView.hxx} | 26 +- 135 files changed, 4187 insertions(+), 1603 deletions(-) delete mode 100644 tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx delete mode 100644 tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx create mode 100644 tools/ShapeView/ShapeView_VisibilityState.cxx create mode 100644 tools/ShapeView/ShapeView_VisibilityState.hxx create mode 100644 tools/TInspector/TInspector_Preferences.cxx create mode 100644 tools/TInspector/TInspector_Preferences.hxx rename tools/{DFBrowser/DFBrowser_Shortcut.cxx => TInspector/TInspector_Shortcut.cxx} (79%) rename tools/{DFBrowser/DFBrowser_Shortcut.hxx => TInspector/TInspector_Shortcut.hxx} (71%) create mode 100644 tools/TInspector/icons/plugin_actions.png create mode 100644 tools/TInspectorAPI/TInspectorAPI_PreferencesDataMap.hxx create mode 100644 tools/TreeModel/TreeModel.hxx create mode 100644 tools/TreeModel/TreeModel.qrc create mode 100644 tools/TreeModel/TreeModel_ColumnType.hxx create mode 100644 tools/TreeModel/TreeModel_ContextMenu.cxx create mode 100644 tools/TreeModel/TreeModel_ContextMenu.hxx create mode 100644 tools/TreeModel/TreeModel_HeaderSection.hxx create mode 100644 tools/TreeModel/TreeModel_Tools.cxx create mode 100644 tools/TreeModel/TreeModel_Tools.hxx rename tools/{DFBrowser/DFBrowser_TreeView.cxx => TreeModel/TreeModel_VisibilityState.cxx} (58%) create mode 100644 tools/TreeModel/TreeModel_VisibilityState.hxx create mode 100644 tools/TreeModel/icons/item_invisible.png create mode 100644 tools/TreeModel/icons/item_visible.png create mode 100644 tools/VInspector/VInspector_ItemFolderObject.cxx create mode 100644 tools/VInspector/VInspector_ItemFolderObject.hxx create mode 100644 tools/VInspector/VInspector_ItemSelectMgrFilter.cxx create mode 100644 tools/VInspector/VInspector_ItemSelectMgrFilter.hxx create mode 100644 tools/VInspector/icons/treeview_and.png create mode 100644 tools/VInspector/icons/treeview_or.png create mode 100644 tools/View/View_ToolButton.hxx create mode 100644 tools/View/View_Tools.cxx create mode 100644 tools/View/View_Tools.hxx delete mode 100644 tools/View/icons/keep_view_off.svg delete mode 100644 tools/View/icons/keep_view_on.svg create mode 100644 tools/ViewControl/FILES rename tools/{TreeModel/TreeModel_MessageDialog.cxx => ViewControl/ViewControl_MessageDialog.cxx} (92%) rename tools/{TreeModel/TreeModel_MessageDialog.hxx => ViewControl/ViewControl_MessageDialog.hxx} (89%) create mode 100644 tools/ViewControl/ViewControl_Tools.cxx create mode 100644 tools/ViewControl/ViewControl_Tools.hxx rename tools/{DFBrowser/DFBrowser_TreeView.hxx => ViewControl/ViewControl_TreeView.hxx} (66%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b98eaf34d6..491fa03146 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1019,9 +1019,9 @@ OCCT_MODULES_AND_TOOLKITS (SAMPLES "SAMPLES_TOOLKITS" OCCT_SAMPLES) if (BUILD_Inspector OR BUILD_MODULE_QtSamples) if (BUILD_MODULE_QtSamples) - if (NOT Qt5_FOUND OR NOT WIN32) + if (NOT Qt5_FOUND OR "${Qt5Gui_EGL_INCLUDE_DIRS}" STREQUAL "" OR NOT WIN32) list (REMOVE_ITEM qt_SAMPLES_TOOLKITS AndroidQt) - message (STATUS "Info: AndroidQt sample excluded due to Qt5 usage is disabled or OS is not Windows") + message (STATUS "Info: AndroidQt sample excluded due to OS is not Windows or Qt is configured without ANGLE") endif() else() list (REMOVE_ITEM OCCT_SAMPLES qt) diff --git a/adm/cmake/qt.cmake b/adm/cmake/qt.cmake index 2eacf8f093..01546ce106 100644 --- a/adm/cmake/qt.cmake +++ b/adm/cmake/qt.cmake @@ -25,7 +25,7 @@ set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR}) # Now we can apply standard CMake finder for Qt5. We do this mostly # to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled -find_package(Qt5 QUIET COMPONENTS Widgets Quick PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH) +find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH) if (NOT ${Qt5_FOUND}) # Now we can apply standard CMake finder for Qt. We do this mostly # to have qt4_wrap_cpp() function available diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake index 7870d60e7c..82305649e2 100644 --- a/adm/cmake/qt_macro.cmake +++ b/adm/cmake/qt_macro.cmake @@ -9,9 +9,9 @@ macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT if (${Qt5_FOUND}) #message (STATUS "Qt5 cmake configuration") - set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}" "${Qt5Quick_INCLUDE_DIRS}") - set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}") - set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}") + set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}" "${Qt5Quick_INCLUDE_DIRS}" "${Qt5Xml_INCLUDE_DIRS}") + set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}") + set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}") # processing *.ts files to generate *.qm find_package(Qt5LinguistTools) @@ -24,11 +24,11 @@ macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT #message (STATUS "Qt4 cmake configuration") set(PROJECT_INCLUDES ${QT_INCLUDES}) if (WIN32) - set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib") - set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib") + set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib;${3RDPARTY_QT_DIR}/lib/QtXmld4.lib") + set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib;${3RDPARTY_QT_DIR}/lib/QtXml4.lib") else() - set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so") - set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so") + set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so") + set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so") endif(WIN32) find_program(QT_LRELEASE_EXECUTABLE lrelease) endif() diff --git a/samples/tools/TInspectorEXE/src/TInspectorEXE.cxx b/samples/tools/TInspectorEXE/src/TInspectorEXE.cxx index 012e95f3fe..01963ec2d4 100644 --- a/samples/tools/TInspectorEXE/src/TInspectorEXE.cxx +++ b/samples/tools/TInspectorEXE/src/TInspectorEXE.cxx @@ -20,11 +20,13 @@ #include +#include #include #include #include #include #include +#include #include diff --git a/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.cxx b/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.cxx index 1b4dd51f12..48edf4155e 100644 --- a/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.cxx +++ b/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.cxx @@ -18,6 +18,7 @@ #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include const int FONT_POINT_SIZE = 18; const int ICON_SIZE = 40; @@ -232,8 +234,9 @@ void TInspectorEXE_OpenFileDialog::onSelectClicked() if (aFileName.isEmpty()) return; // do nothing, left the previous value - mySelectedName->setText (aFileName); - onNameChanged (aFileName); + + myFileName = aFileName; + accept(); } // ======================================================================= diff --git a/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.hxx b/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.hxx index 2c492d7322..4afa4491cf 100644 --- a/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.hxx +++ b/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.hxx @@ -19,12 +19,11 @@ #include #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include +#include #include diff --git a/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.cxx b/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.cxx index 104c492455..73a80c9c58 100644 --- a/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.cxx +++ b/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.cxx @@ -15,10 +15,12 @@ #include +#include #include #include #include #include +#include const int ICON_SIZE = 40; @@ -36,11 +38,9 @@ void TInspectorEXE_OpenFileItemDelegate::paint (QPainter* thePainter, const QSty // action icon for all indices before the last one QIcon anIcon (":/icons/folder_import.png"); QSize anIconSize (ICON_SIZE, ICON_SIZE); - int aWidth = theOption.rect.width(); - int aCenter = aWidth / 2.; - int aHalf = anIconSize.width() / 2.; + int aDX = (theOption.rect.width() - anIconSize.width()) / 2; int aMargin = qApp->style()->pixelMetric (QStyle::PM_HeaderMargin); - thePainter->drawPixmap (QRect (theOption.rect.left() + (aCenter - aHalf), + thePainter->drawPixmap (QRect (theOption.rect.left() + aDX, theOption.rect.top() + aMargin, anIconSize.width(), anIconSize.height()), diff --git a/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.hxx b/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.hxx index f71019e20f..42b6604e07 100644 --- a/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.hxx +++ b/samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.hxx @@ -18,12 +18,11 @@ #include -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif +#include #include #include #include +#include class QObject; class QPainter; diff --git a/src/TopAbs/TopAbs.cxx b/src/TopAbs/TopAbs.cxx index d9a43d0378..e0dd4b9d31 100644 --- a/src/TopAbs/TopAbs.cxx +++ b/src/TopAbs/TopAbs.cxx @@ -70,6 +70,27 @@ Standard_CString TopAbs::ShapeOrientationToString (TopAbs_Orientation theOrienta return TopAbs_Table_PrintOrientation[theOrientation]; } +//======================================================================= +//function : ShapeOrientationFromString +//purpose : +//======================================================================= +Standard_Boolean TopAbs::ShapeOrientationFromString (const Standard_CString theOrientationString, + TopAbs_Orientation& theOrientation) +{ + TCollection_AsciiString aName (theOrientationString); + aName.UpperCase(); + for (Standard_Integer anOrientationIter = 0; anOrientationIter <= TopAbs_EXTERNAL; ++anOrientationIter) + { + Standard_CString anOrientationName = TopAbs_Table_PrintOrientation[anOrientationIter]; + if (aName == anOrientationName) + { + theOrientation = TopAbs_Orientation(anOrientationIter); + return Standard_True; + } + } + return Standard_False; +} + //======================================================================= //function : TopAbs_Compose //purpose : Compose two orientations diff --git a/src/TopAbs/TopAbs.hxx b/src/TopAbs/TopAbs.hxx index 1efbf00d17..cc8bbd5bdc 100644 --- a/src/TopAbs/TopAbs.hxx +++ b/src/TopAbs/TopAbs.hxx @@ -141,6 +141,22 @@ public: //! @return string identifier from the list FORWARD, REVERSED, INTERNAL, EXTERNAL Standard_EXPORT static Standard_CString ShapeOrientationToString (TopAbs_Orientation theOrientation); + //! Returns the shape orientation from the given string identifier (using case-insensitive comparison). + //! @param theOrientationString string identifier + //! @return shape orientation or TopAbs_FORWARD if string identifier is invalid + static TopAbs_Orientation ShapeOrientationFromString (const Standard_CString theOrientationString) + { + TopAbs_Orientation aType = TopAbs_FORWARD; + ShapeOrientationFromString (theOrientationString, aType); + return aType; + } + + //! Determines the shape orientation from the given string identifier (using case-insensitive comparison). + //! @param theOrientationString string identifier + //! @param theOrientation detected shape orientation + //! @return TRUE if string identifier is known + Standard_EXPORT static Standard_Boolean ShapeOrientationFromString (const Standard_CString theOrientationString, + TopAbs_Orientation& theOrientation); }; #endif // _TopAbs_HeaderFile diff --git a/src/V3d/V3d.cxx b/src/V3d/V3d.cxx index 2e92a00caa..9b7736070f 100644 --- a/src/V3d/V3d.cxx +++ b/src/V3d/V3d.cxx @@ -26,6 +26,17 @@ #include #include +namespace +{ + static Standard_CString V3d_Table_PrintTypeOfOrientation[26] = + { + "XPOS", "YPOS", "ZPOS", "XNEG", "YNEG", "ZNEG", "XPOSYPOS", "XPOSZPOS", "XPOSZPOS", "XNEGYNEG", + "XNEGYPOS", "XNEGZNEG", "XNEGZPOS", "YNEGZNEG", "YNEGZPOS", "XPOSYNEG", "XPOSZNEG", "YPOSZNEG", + "XPOSYPOSZPOS", "XPOSYNEGZPOS", "XPOSYPOSZNEG", "XNEGYPOSZPOS", "XPOSYNEGZNEG", "XNEGYPOSZNEG", + "XNEGYNEGZPOS", "XNEGYNEGZNEG" + }; +} + void V3d::ArrowOfRadius(const Handle(Graphic3d_Group)& garrow,const Standard_Real X0,const Standard_Real Y0,const Standard_Real Z0,const Standard_Real Dx,const Standard_Real Dy,const Standard_Real Dz,const Standard_Real Alpha,const Standard_Real Lng) { Standard_Real Xc, Yc, Zc, Xi, Yi, Zi, Xj, Yj, Zj; @@ -134,3 +145,33 @@ void V3d::SwitchViewsinWindow(const Handle(V3d_View)& aPreviousView, aNextView->Viewer()->SetViewOn(aNextView); } + +//======================================================================= +//function : TypeOfOrientationToString +//purpose : +//======================================================================= +Standard_CString V3d::TypeOfOrientationToString (V3d_TypeOfOrientation theType) +{ + return V3d_Table_PrintTypeOfOrientation[theType]; +} + +//======================================================================= +//function : TypeOfOrientationFromString +//purpose : +//======================================================================= +Standard_Boolean V3d::TypeOfOrientationFromString (Standard_CString theTypeString, + V3d_TypeOfOrientation& theType) +{ + TCollection_AsciiString aName (theTypeString); + aName.UpperCase(); + for (Standard_Integer aTypeIter = 0; aTypeIter <= V3d_XnegYnegZneg; ++aTypeIter) + { + Standard_CString aTypeName = V3d_Table_PrintTypeOfOrientation[aTypeIter]; + if (aName == aTypeName) + { + theType = V3d_TypeOfOrientation (aTypeIter); + return Standard_True; + } + } + return Standard_False; +} diff --git a/src/V3d/V3d.hxx b/src/V3d/V3d.hxx index 07672ea59b..fe0f9fc30b 100644 --- a/src/V3d/V3d.hxx +++ b/src/V3d/V3d.hxx @@ -93,6 +93,28 @@ public: Standard_EXPORT static void SwitchViewsinWindow (const Handle(V3d_View)& aPreviousView, const Handle(V3d_View)& aNextView); + //! Returns the string name for a given orientation type. + //! @param theType orientation type + //! @return string identifier from the list Xpos, Ypos, Zpos and others + Standard_EXPORT static Standard_CString TypeOfOrientationToString (V3d_TypeOfOrientation theType); + + //! Returns the orientation type from the given string identifier (using case-insensitive comparison). + //! @param theTypeString string identifier + //! @return orientation type or V3d_TypeOfOrientation if string identifier is invalid + static V3d_TypeOfOrientation TypeOfOrientationFromString (Standard_CString theTypeString) + { + V3d_TypeOfOrientation aType = V3d_Xpos; + TypeOfOrientationFromString (theTypeString, aType); + return aType; + } + + //! Determines the shape type from the given string identifier (using case-insensitive comparison). + //! @param theTypeString string identifier + //! @param theType detected shape type + //! @return TRUE if string identifier is known + Standard_EXPORT static Standard_Boolean TypeOfOrientationFromString (const Standard_CString theTypeString, + V3d_TypeOfOrientation& theType); + }; #endif // _V3d_HeaderFile diff --git a/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx b/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx index ebc2d1b367..e602209316 100644 --- a/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx +++ b/tools/DFBrowser/DFBrowser_AttributePaneStack.cxx @@ -25,6 +25,8 @@ #include #include +#include + #include #include @@ -51,9 +53,9 @@ DFBrowser_AttributePaneStack::DFBrowser_AttributePaneStack (QObject* theParent) void DFBrowser_AttributePaneStack::CreateWidget (QWidget* theParent) { myAttributesStack = new QStackedWidget (theParent); - DFBrowser_Window::SetWhiteBackground (myAttributesStack); + ViewControl_Tools::SetWhiteBackground (myAttributesStack); myEmptyWidget = new QWidget (theParent); - DFBrowser_Window::SetWhiteBackground (myEmptyWidget); + ViewControl_Tools::SetWhiteBackground (myEmptyWidget); myAttributesStack->addWidget (myEmptyWidget); @@ -87,7 +89,7 @@ void DFBrowser_AttributePaneStack::SetPaneMode (const DFBrowser_AttributePaneTyp else { QItemSelectionModel* aSelectionModel = myModule->GetOCAFViewSelectionModel(); - QModelIndex anIndex = DFBrowser_Window::SingleSelected (aSelectionModel->selectedIndexes(), 0); + QModelIndex anIndex = TreeModel_ModelBase::SingleSelected (aSelectionModel->selectedIndexes(), 0); SetCurrentItem (anIndex); } } diff --git a/tools/DFBrowser/DFBrowser_Communicator.hxx b/tools/DFBrowser/DFBrowser_Communicator.hxx index 3f27eb7a2e..a1c0b6c37e 100644 --- a/tools/DFBrowser/DFBrowser_Communicator.hxx +++ b/tools/DFBrowser/DFBrowser_Communicator.hxx @@ -49,6 +49,20 @@ public: //! \param theParameters a parameters container Standard_EXPORT virtual void SetParameters (const Handle(TInspectorAPI_PluginParameters)& theParameters) Standard_OVERRIDE; + //! Provide container for actions available in inspector on general level + //! \param theMenu if Qt implementation, it is QMenu object + Standard_EXPORT virtual void FillActionsMenu (void* theMenu) Standard_OVERRIDE { myWindow->FillActionsMenu (theMenu); } + + //! Returns plugin preferences, empty implementation by default + //! \param theItem container of preference elements + virtual void GetPreferences (TInspectorAPI_PreferencesDataMap& theItem) Standard_OVERRIDE + { myWindow->GetPreferences (theItem); } + + //! Stores plugin preferences, empty implementation by default + //! \param theItem container of preference elements + virtual void SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem) Standard_OVERRIDE + { myWindow->SetPreferences (theItem); } + //! Updates content of the current window virtual void UpdateContent() Standard_OVERRIDE { myWindow->UpdateContent(); } diff --git a/tools/DFBrowser/DFBrowser_Item.cxx b/tools/DFBrowser/DFBrowser_Item.cxx index 82b63b3033..1f0ea229ef 100644 --- a/tools/DFBrowser/DFBrowser_Item.cxx +++ b/tools/DFBrowser/DFBrowser_Item.cxx @@ -31,8 +31,6 @@ #include #include -const int INFO_LENGHT = 60; - // ======================================================================= // function : hasAttribute // purpose : @@ -136,8 +134,8 @@ QVariant DFBrowser_Item::initValue (const int theItemRole) const DFBrowser_ItemRole_AdditionalInfo, Column()).toString(); if (!anAdditionalInfo.isEmpty()) { - if (theItemRole == DFBrowserPane_ItemRole_DisplayExtended && anAdditionalInfo.length() > INFO_LENGHT) - anAdditionalInfo = anAdditionalInfo.mid (0, INFO_LENGHT - 3) + "..."; + if (theItemRole == DFBrowserPane_ItemRole_DisplayExtended) + anAdditionalInfo = TreeModel_Tools::CutString (anAdditionalInfo); if (!anAdditionalInfo.isEmpty()) aValue = QVariant (aValue.toString() + QString (" [%1]").arg (anAdditionalInfo)); //if (aRole == Qt::ToolTipRole) diff --git a/tools/DFBrowser/DFBrowser_PropertyPanel.cxx b/tools/DFBrowser/DFBrowser_PropertyPanel.cxx index 66cdcdf5c0..7f2961a45c 100644 --- a/tools/DFBrowser/DFBrowser_PropertyPanel.cxx +++ b/tools/DFBrowser/DFBrowser_PropertyPanel.cxx @@ -21,6 +21,10 @@ #include #include +#include + +#include + #include #include #include @@ -36,7 +40,7 @@ DFBrowser_PropertyPanel::DFBrowser_PropertyPanel (QWidget* theParent) : QObject (theParent), myAttributesStack (0) { myMainWindow = new QWidget (theParent); - DFBrowser_Window::SetWhiteBackground (myMainWindow); + ViewControl_Tools::SetWhiteBackground (myMainWindow); QGridLayout* aLayout = new QGridLayout (myMainWindow); aLayout->setContentsMargins (0, 0, 0, 0); @@ -55,6 +59,6 @@ void DFBrowser_PropertyPanel::UpdateBySelectionChanged (const QItemSelection& th { GetAttributesStack()->GetSearchView()->Reset(); - QModelIndex anIndex = DFBrowser_Window::SingleSelected (theSelected.indexes(), 0); + QModelIndex anIndex = TreeModel_ModelBase::SingleSelected (theSelected.indexes(), 0); myAttributesStack->SetCurrentItem (anIndex); } diff --git a/tools/DFBrowser/DFBrowser_SearchLine.cxx b/tools/DFBrowser/DFBrowser_SearchLine.cxx index 740caf544b..3eb23cea7a 100644 --- a/tools/DFBrowser/DFBrowser_SearchLine.cxx +++ b/tools/DFBrowser/DFBrowser_SearchLine.cxx @@ -20,6 +20,8 @@ #include #include +#include + #include #include #include @@ -108,7 +110,7 @@ DFBrowser_SearchLine::DFBrowser_SearchLine (QWidget* theParent) connect (myLineControl, SIGNAL (returnPressed()), this, SLOT (onReturnPressed())); connect (mySearchButton, SIGNAL (clicked()), this, SLOT (onSearchButtonClicked())); - DFBrowser_Window::SetWhiteBackground (this); + ViewControl_Tools::SetWhiteBackground (this); } // ======================================================================= diff --git a/tools/DFBrowser/DFBrowser_SearchView.cxx b/tools/DFBrowser/DFBrowser_SearchView.cxx index 437eac2228..08ae8f658d 100644 --- a/tools/DFBrowser/DFBrowser_SearchView.cxx +++ b/tools/DFBrowser/DFBrowser_SearchView.cxx @@ -22,6 +22,11 @@ #include +#include +#include + +#include + #include #include #include @@ -46,7 +51,7 @@ DFBrowser_SearchView::DFBrowser_SearchView (QWidget* theParent) myTableView = new QTableView (myMainWindow); myTableView->verticalHeader()->setVisible (false); - myTableView->verticalHeader()->setDefaultSectionSize (DEFAULT_ICON_SIZE + DFBrowserPane_Tools::HeaderSectionMargin()); + myTableView->verticalHeader()->setDefaultSectionSize (DEFAULT_ICON_SIZE + TreeModel_Tools::HeaderSectionMargin()); myTableView->setIconSize (QSize (DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE)); myTableView->horizontalHeader()->setVisible (false); myTableView->horizontalHeader()->setStretchLastSection (true); @@ -56,7 +61,7 @@ DFBrowser_SearchView::DFBrowser_SearchView (QWidget* theParent) aLayout->addWidget (myTableView); - DFBrowser_Window::SetWhiteBackground (myTableView); + ViewControl_Tools::SetWhiteBackground (myTableView); myTableView->setGridStyle (Qt::NoPen); } @@ -69,7 +74,7 @@ void DFBrowser_SearchView::InitModels() QAbstractItemModel* aModel = mySearchLine->GetCompletionModel(); myTableView->setModel (aModel); myTableView->setColumnWidth (0, 0); // to hide column - myTableView->setColumnWidth (1, DEFAULT_ICON_SIZE + DFBrowserPane_Tools::HeaderSectionMargin()); + myTableView->setColumnWidth (1, DEFAULT_ICON_SIZE + TreeModel_Tools::HeaderSectionMargin()); QItemSelectionModel* aSelectionModel = new QItemSelectionModel (aModel); myTableView->setSelectionMode (QAbstractItemView::SingleSelection); @@ -89,7 +94,7 @@ void DFBrowser_SearchView::onTableSelectionChanged (const QItemSelection&, { QItemSelectionModel* aSelectionModel = myTableView->selectionModel(); QModelIndexList aSelectedIndices = aSelectionModel->selectedIndexes(); - QModelIndex aSelectedIndex = DFBrowser_Window::SingleSelected (aSelectedIndices, 2); + QModelIndex aSelectedIndex = TreeModel_ModelBase::SingleSelected (aSelectedIndices, 2); if (!aSelectedIndex.isValid()) return; QAbstractProxyModel* aTableModel = dynamic_cast (myTableView->model()); diff --git a/tools/DFBrowser/DFBrowser_Thread.cxx b/tools/DFBrowser/DFBrowser_Thread.cxx index 2e33bdccfc..c20ee510a1 100644 --- a/tools/DFBrowser/DFBrowser_Thread.cxx +++ b/tools/DFBrowser/DFBrowser_Thread.cxx @@ -15,7 +15,6 @@ #include #include -#include #include #include @@ -67,21 +66,6 @@ DFBrowser_Thread::DFBrowser_Thread (DFBrowser_Window* theWindow) { DFBrowser_SearchLine* aSearchLine = theWindow->GetTreeLevelLine()->GetSearchLine(); myItems.append (new DFBrowser_ThreadItemSearch(aSearchLine)); - myItems.append (new DFBrowser_ThreadItemUsedShapesMap()); -} - -// ======================================================================= -// function : SetModule -// purpose : -// ======================================================================= -void DFBrowser_Thread::SetModule (DFBrowser_Module* theModule) -{ - for (int anItemId = 0, aSize = myItems.size(); anItemId < aSize; anItemId++) - { - DFBrowser_ThreadItemUsedShapesMap* aShapesItem = dynamic_cast (myItems[anItemId]); - if (aShapesItem) - aShapesItem->SetModule (theModule); - } } // ======================================================================= diff --git a/tools/DFBrowser/DFBrowser_Thread.hxx b/tools/DFBrowser/DFBrowser_Thread.hxx index 361c808f1c..b6a11d9632 100644 --- a/tools/DFBrowser/DFBrowser_Thread.hxx +++ b/tools/DFBrowser/DFBrowser_Thread.hxx @@ -42,10 +42,6 @@ public: //! Destructor virtual ~DFBrowser_Thread() {} - //! Sets module to the started thread items - //! \param theModule a current module - Standard_EXPORT void SetModule (DFBrowser_Module* theModule); - //! Starts all candidate thread items Standard_EXPORT void ProcessApplication(); diff --git a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx deleted file mode 100644 index 5a80636808..0000000000 --- a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.cxx +++ /dev/null @@ -1,223 +0,0 @@ -// 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 - -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - -#include -#include - -// ======================================================================= -// function : Run -// purpose : -// ======================================================================= -void DFBrowser_ThreadItemUsedShapesMap::Run() -{ - if (!myModule) - return; - DFBrowser_TreeModel* aDFBrowserModel = dynamic_cast (myModule->GetOCAFViewModel()); - if (!aDFBrowserModel) - return; - - Handle(TDocStd_Application) anApplication = aDFBrowserModel->GetTDocStdApplication(); - if (anApplication.IsNull()) - return; - - for (Standard_Integer aDocId = 1, aNbDocuments = anApplication->NbDocuments(); aDocId <= aNbDocuments; aDocId++) - { - Handle(TDocStd_Document) aDocument; - anApplication->GetDocument (aDocId, aDocument); - if (aDocument.IsNull()) - continue; - - TDF_Label aLabel = aDocument->Main().Root(); - - Handle(TNaming_UsedShapes) anAttribute; - if (!aLabel.FindAttribute (TNaming_UsedShapes::GetID(), anAttribute)) - continue; - - std::list aReferences; - findReferences (anAttribute, aReferences); - if (!aReferences.empty()) - myAttributeRefs.Bind (anAttribute, aReferences); - } -} - -// ======================================================================= -// function : ApplyValues -// purpose : -// ======================================================================= -void DFBrowser_ThreadItemUsedShapesMap::ApplyValues() -{ - if (myAttributeRefs.IsEmpty()) - return; - - DFBrowserPane_AttributePaneAPI* aPane = myModule->GetAttributePane (STANDARD_TYPE (TNaming_UsedShapes)->Name()); - if (aPane) - { - DFBrowserPane_TNamingUsedShapes* aUsedShapesPane = dynamic_cast (aPane); - aUsedShapesPane->SetSortedReferences (myAttributeRefs); - } - // update - DFBrowser_TreeModel* aDFBrowserModel = dynamic_cast (myModule->GetOCAFViewModel()); - for (NCollection_DataMap >::Iterator aRefIt (myAttributeRefs); - aRefIt.More(); aRefIt.Next()) - { - TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex - (aDFBrowserModel->FindIndexByAttribute (aRefIt.Key())); - if (anItemBase) - { - anItemBase->Reset(); - anItemBase->Init(); - } - } - // clear cache - myAttributeRefs.Clear(); -} - -// ======================================================================= -// function : ClearSortedReferences -// purpose : -// ======================================================================= -void DFBrowser_ThreadItemUsedShapesMap::ClearSortedReferences (DFBrowser_Module* theModule) -{ - DFBrowserPane_AttributePaneAPI* aPane = theModule->GetAttributePane (STANDARD_TYPE (TNaming_UsedShapes)->Name()); - if (!aPane) - return; - - DFBrowserPane_TNamingUsedShapes* aUsedShapesPane = dynamic_cast (aPane); - aUsedShapesPane->ClearSortedReferences(); - - // update tree item state - DFBrowser_TreeModel* aDFBrowserModel = dynamic_cast (theModule->GetOCAFViewModel()); - if (!aDFBrowserModel) - return; - Handle(TDocStd_Application) anApplication = aDFBrowserModel->GetTDocStdApplication(); - if (anApplication.IsNull()) - return; - - for (Standard_Integer aDocId = 1, aNbDocuments = anApplication->NbDocuments(); aDocId <= aNbDocuments; aDocId++) - { - Handle(TDocStd_Document) aDocument; - anApplication->GetDocument (aDocId, aDocument); - if (aDocument.IsNull()) - continue; - TDF_Label aLabel = aDocument->Main().Root(); - Handle(TNaming_UsedShapes) anAttribute; - if (aLabel.FindAttribute (TNaming_UsedShapes::GetID(), anAttribute)) - { - TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex( - aDFBrowserModel->FindIndexByAttribute (anAttribute)); - if (anItemBase) - anItemBase->Init(); - } - } -} - -// ======================================================================= -// function : isLessThan -// purpose : -// ======================================================================= -bool DFBrowser_ThreadItemUsedShapesMap::isLessThan (const QStringList& theLeft, const QStringList& theRight) -{ - int aState = 1; //! where 0 - less, 1 - equal, 2 - larger - int aLeftSize = theLeft.size(); - int aRightSize = theRight.size(); - - for (int anItemId = 0; anItemId < aRightSize && anItemId < aLeftSize && aState == 1; anItemId++) - { - int aRightId = theRight[anItemId].toInt(); - int aLeftId = theLeft[anItemId].toInt(); - if (aLeftId == aRightId) - continue; - else if (aLeftId < aRightId) - aState = 0; // less - else if (aLeftId > aRightId) - aState = 2; // less - } - if (aState == 1) - { // equal in similar parts - if (aLeftSize < aRightSize) - aState = 0; - else if (aLeftSize > aRightSize) - aState = 2; - } - return aState == 0; -} - -// ======================================================================= -// function : addValue -// purpose : -// ======================================================================= -void DFBrowser_ThreadItemUsedShapesMap::addValue (const TCollection_AsciiString& theEntry, - QList >& theEntries) -{ - QStringList aSplit = QString (theEntry.ToCString()).split (":"); - - int aLessIndex = -1; - bool isInserted = false; - // looking for nearest smaller value from the end of the list - for (int anEntryId = theEntries.size() - 1; anEntryId >= 0 && !isInserted; anEntryId--) - { - if (isLessThan(aSplit, theEntries[anEntryId].second)) - aLessIndex = anEntryId; - else - { - // if less than was found and now, the entry is greater than current entry - if (aLessIndex != -1) - { - theEntries.insert (aLessIndex, qMakePair (theEntry, aSplit)); - isInserted = true; - } - break; - } - } - if (!isInserted) - { - if (aLessIndex != -1) // less than all, insert at this position - theEntries.insert (aLessIndex, qMakePair (theEntry, aSplit)); - else - theEntries.append (qMakePair (theEntry, aSplit)); - } -} - -// ======================================================================= -// function : findReferences -// purpose : -// ======================================================================= -void DFBrowser_ThreadItemUsedShapesMap::findReferences (Handle(TDF_Attribute) theAttribute, - std::list& theReferences) -{ - Handle(TNaming_UsedShapes) anAttribute = Handle(TNaming_UsedShapes)::DownCast (theAttribute); - - QList > anEntries; - for (TNaming_DataMapIteratorOfDataMapOfShapePtrRefShape aDataIt(anAttribute->Map()); aDataIt.More(); aDataIt.Next()) - addValue(DFBrowserPane_Tools::GetEntry (aDataIt.Value()->Label()), anEntries); - - for (QList >::const_iterator anEntryIt = anEntries.begin(); - anEntryIt != anEntries.end(); anEntryIt++) - theReferences.push_back (anEntryIt->first); -} diff --git a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx b/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx deleted file mode 100644 index 8418d954b5..0000000000 --- a/tools/DFBrowser/DFBrowser_ThreadItemUsedShapesMap.hxx +++ /dev/null @@ -1,81 +0,0 @@ -// 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_ThreadItemUsedShapesMap_H -#define DFBROWSER_ThreadItemUsedShapesMap_H - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -class DFBrowser_Module; - -//! \class DFBrowser_ThreadItemUsedShapesMap -//! Collects and sorts map values of TNaming_UsedShape attributes. Applies values to the OCAF tree view model -class DFBrowser_ThreadItemUsedShapesMap : public DFBrowser_ThreadItem -{ -public: - - //! Constructor - DFBrowser_ThreadItemUsedShapesMap() : myModule (0) {} - - //! Destructor - virtual ~DFBrowser_ThreadItemUsedShapesMap() {} - - //! Sets the current module - void SetModule (DFBrowser_Module* theModule) { myModule = theModule; } - - //! Iterates by application documents and for TNaming_UsedShape attribute collects container of sorted values. - Standard_EXPORT virtual void Run() Standard_OVERRIDE; - - //! Initialize tree view model of OCAF by internal container of sorted values. - Standard_EXPORT virtual void ApplyValues() Standard_OVERRIDE; - - //! Set empty cache into tree view model of OCAF. Calls Init of these item by usual values (not sorted) - Standard_EXPORT static void ClearSortedReferences (DFBrowser_Module* theModule); - -private: - - //! Collects sorted values of the attribute if the attribute has TNaming_UsedShape type - //! \param theAttribute a processed attribute - //! \param theReferences a output container of sorted references - void findReferences (Handle(TDF_Attribute) theAttribute, std::list& theReferences); - - //! Checks whether the left path is less than the right path - //! \param theLeft path to label - //! \param theRight path to label - //! \returns true if the left path is less(not equal) than right path - static bool isLessThan (const QStringList& theLeft, const QStringList& theRight); - - //! Insert entry into container of entries using sorting. It is split by ":" separator to perform soring - //! \param theEntry a label entry - //! \param theEntries a result container - void addValue (const TCollection_AsciiString& theEntry, QList >& theEntries); - -private: - - DFBrowser_Module* myModule; //!< the current module - NCollection_DataMap > myAttributeRefs; //!< sorted references -}; - -#endif diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx index 288f831de6..b5ccff4252 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx @@ -22,6 +22,9 @@ #include +#include +#include + #include #include #include @@ -65,7 +68,7 @@ DFBrowser_TreeLevelLine::DFBrowser_TreeLevelLine (QWidget* theParent) myTableView->horizontalHeader()->setVisible (false); QHeaderView* aVHeader = myTableView->verticalHeader(); aVHeader->setVisible (false); - int aDefCellSize = aVHeader->minimumSectionSize() + DFBrowserPane_Tools::HeaderSectionMargin(); + int aDefCellSize = aVHeader->minimumSectionSize() + TreeModel_Tools::HeaderSectionMargin(); aVHeader->setDefaultSectionSize (aDefCellSize); aLayout->addWidget (myTableView, 0, 2); @@ -120,7 +123,7 @@ void DFBrowser_TreeLevelLine::OnTreeViewSelectionChanged (const QItemSelection& const QItemSelection&) { QModelIndexList aSelectedIndices = theSelected.indexes(); - QModelIndex aSelectedIndex = DFBrowser_Window::SingleSelected (aSelectedIndices, 0); + QModelIndex aSelectedIndex = TreeModel_ModelBase::SingleSelected (aSelectedIndices, 0); if (!mySelectionProcessingBlocked) // we're processing action click setForwardIndex (aSelectedIndex); @@ -152,7 +155,7 @@ void DFBrowser_TreeLevelLine::onTableSelectionChanged (const QItemSelection& the if (!aTableModel) return; - QModelIndex aSelectedIndex = DFBrowser_Window::SingleSelected (theSelected.indexes(), 0, Qt::Vertical); + QModelIndex aSelectedIndex = TreeModel_ModelBase::SingleSelected (theSelected.indexes(), 0, Qt::Vertical); emit indexSelected (aTableModel->GetTreeViewIndex (aSelectedIndex)); } diff --git a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx index 0d1f6b8bcb..18a913111d 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -62,7 +63,7 @@ DFBrowser_TreeLevelView::DFBrowser_TreeLevelView (QWidget* theParent) connect (myTableView, SIGNAL (doubleClicked (const QModelIndex&)), this, SLOT (onTableDoubleClicked (const QModelIndex&))); - DFBrowser_Window::SetWhiteBackground (myTableView); + ViewControl_Tools::SetWhiteBackground (myTableView); myTableView->setGridStyle (Qt::NoPen); } @@ -129,7 +130,7 @@ void DFBrowser_TreeLevelView::onTableSelectionChanged (const QItemSelection& the const QItemSelection&) { QModelIndexList aSelectedIndices = theSelected.indexes(); - QModelIndex aSelectedIndex = DFBrowser_Window::SingleSelected (aSelectedIndices, 0); + QModelIndex aSelectedIndex = TreeModel_ModelBase::SingleSelected (aSelectedIndices, 0); DFBrowser_TreeLevelViewModel* aTableModel = dynamic_cast (myTableView->model()); if (aTableModel && aTableModel->IsInitialized()) diff --git a/tools/DFBrowser/DFBrowser_TreeModel.cxx b/tools/DFBrowser/DFBrowser_TreeModel.cxx index e4c4255e78..16fe10485e 100644 --- a/tools/DFBrowser/DFBrowser_TreeModel.cxx +++ b/tools/DFBrowser/DFBrowser_TreeModel.cxx @@ -32,6 +32,8 @@ #include #include +const int COLUMN_NAME_WIDTH = 300; + // ======================================================================= // function : Constructor // purpose : @@ -39,11 +41,21 @@ DFBrowser_TreeModel::DFBrowser_TreeModel (QObject* theParent, DFBrowser_Module* theModule) : TreeModel_ModelBase (theParent) { - m_pRootItem = DFBrowser_ItemApplication::CreateItem (TreeModel_ItemBasePtr()); + SetHeaderItem (0, TreeModel_HeaderSection ("Name", COLUMN_NAME_WIDTH)); + DFBrowser_ItemApplicationPtr aRootItem = itemDynamicCast (m_pRootItem); aRootItem->SetModule (theModule); } +// ======================================================================= +// function : createRootItem +// purpose : +// ======================================================================= +void DFBrowser_TreeModel::createRootItem (const int) +{ + m_pRootItem = DFBrowser_ItemApplication::CreateItem (TreeModel_ItemBasePtr()); +} + // ======================================================================= // function : Init // purpose : diff --git a/tools/DFBrowser/DFBrowser_TreeModel.hxx b/tools/DFBrowser/DFBrowser_TreeModel.hxx index 91afa8161d..6182c25b56 100644 --- a/tools/DFBrowser/DFBrowser_TreeModel.hxx +++ b/tools/DFBrowser/DFBrowser_TreeModel.hxx @@ -95,11 +95,10 @@ public: Standard_EXPORT virtual QVariant data (const QModelIndex& theIndex, int theRole = Qt::DisplayRole) const Standard_OVERRIDE; - //! Returns count of columns in the model - //! \param theParent an index of the parent item - //! \return integer value - virtual int columnCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE - { (void)theParent; return 1; } +protected: + //! Creates root item + //! \param theColumnId index of a column + virtual void createRootItem (const int theColumnId); private: diff --git a/tools/DFBrowser/DFBrowser_Window.cxx b/tools/DFBrowser/DFBrowser_Window.cxx index 2336f74fcf..3ef9e4f279 100644 --- a/tools/DFBrowser/DFBrowser_Window.cxx +++ b/tools/DFBrowser/DFBrowser_Window.cxx @@ -33,20 +33,24 @@ #include #include #include -#include #include #include -#include #include #include #include #include -#include #include #include #include +#include +#include + +#include + +#include + #include #include #include @@ -58,7 +62,8 @@ #include #include -#include +#include +#include #include #include @@ -94,7 +99,6 @@ const int DFBROWSER_DEFAULT_VIEW_HEIGHT = 300; const int DFBROWSER_DEFAULT_POSITION_X = 200; const int DFBROWSER_DEFAULT_POSITION_Y = 60; -const int OCAF_BROWSER_COLUMN_WIDTH_0 = 300; const int DEFAULT_PROPERTY_PANEL_HEIGHT = 200; const int DEFAULT_BROWSER_HEIGHT = 800; @@ -108,21 +112,16 @@ DFBrowser_Window::DFBrowser_Window() myMainWindow = new QMainWindow (0); // tree view - myTreeView = new DFBrowser_TreeView (myMainWindow); + myTreeView = new ViewControl_TreeView (myMainWindow); myTreeView->setContextMenuPolicy (Qt::CustomContextMenu); connect (myTreeView, SIGNAL (customContextMenuRequested (const QPoint&)), this, SLOT (onTreeViewContextMenuRequested (const QPoint&))); - ((DFBrowser_TreeView*)myTreeView)->SetPredefinedSize (DFBROWSER_DEFAULT_TREE_VIEW_WIDTH, - DFBROWSER_DEFAULT_TREE_VIEW_HEIGHT); + new TreeModel_ContextMenu (myTreeView); + ((ViewControl_TreeView*)myTreeView)->SetPredefinedSize (QSize (DFBROWSER_DEFAULT_TREE_VIEW_WIDTH, + DFBROWSER_DEFAULT_TREE_VIEW_HEIGHT)); myTreeView->setHeaderHidden (true); myTreeView->setSortingEnabled (Standard_False); - - QDockWidget* aTreeViewWidget = new QDockWidget (tr ("TreeView"), myMainWindow); - aTreeViewWidget->setTitleBarWidget (new QWidget(myMainWindow)); - aTreeViewWidget->setFeatures (QDockWidget::NoDockWidgetFeatures); - aTreeViewWidget->setWidget (myTreeView); - myMainWindow->addDockWidget (Qt::LeftDockWidgetArea, aTreeViewWidget); - myMainWindow->setCorner (Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); + myMainWindow->setCentralWidget (myTreeView); #if QT_VERSION < 0x050000 myTreeView->setStyle (new QWindowsStyle); @@ -137,22 +136,11 @@ DFBrowser_Window::DFBrowser_Window() connect (myTreeLevelLine, SIGNAL (updateClicked()), this, SLOT (onUpdateClicked())); QDockWidget* aTreeLineDockWidget = new QDockWidget (tr ("Tree Level Line"), myMainWindow); + aTreeLineDockWidget->setObjectName (aTreeLineDockWidget->windowTitle()); aTreeLineDockWidget->setTitleBarWidget (new QWidget(myMainWindow)); - aTreeLineDockWidget->setFeatures (QDockWidget::NoDockWidgetFeatures); aTreeLineDockWidget->setWidget (myTreeLevelLine->GetControl()); myMainWindow->addDockWidget (Qt::TopDockWidgetArea, aTreeLineDockWidget); - // dump view window - QWidget* aDumpWidget = new QWidget (myMainWindow); - QVBoxLayout* aDumpLay = new QVBoxLayout (aDumpWidget); - aDumpLay->setMargin (0); - myDumpView = new DFBrowser_DumpView (aDumpWidget); - aDumpLay->addWidget (myDumpView->GetControl()); - QDockWidget* aDumpDockWidget = new QDockWidget (tr ("Dump"), myMainWindow); - - aDumpDockWidget->setWidget (aDumpWidget); - myMainWindow->addDockWidget (Qt::BottomDockWidgetArea, aDumpDockWidget); - // property panel myPropertyPanel = new DFBrowser_PropertyPanel (myMainWindow); DFBrowser_AttributePaneStack* anAttributePaneStack = myPropertyPanel->GetAttributesStack(); @@ -173,27 +161,44 @@ DFBrowser_Window::DFBrowser_Window() connect (aLevelView, SIGNAL (indexDoubleClicked (const QModelIndex&)), this, SLOT (onLevelDoubleClicked (const QModelIndex&))); - myMainWindow->setCentralWidget (myPropertyPanel->GetControl()); + QDockWidget* aPropertyPanelWidget = new QDockWidget (tr ("PropertyPanel"), myMainWindow); + aPropertyPanelWidget->setObjectName (aPropertyPanelWidget->windowTitle()); + aPropertyPanelWidget->setTitleBarWidget (new QWidget(myMainWindow)); + aPropertyPanelWidget->setWidget (myPropertyPanel->GetControl()); + myMainWindow->addDockWidget (Qt::RightDockWidgetArea, aPropertyPanelWidget); + + // dump view window + QWidget* aDumpWidget = new QWidget(myMainWindow); + QVBoxLayout* aDumpLay = new QVBoxLayout(aDumpWidget); + aDumpLay->setMargin(0); + myDumpView = new DFBrowser_DumpView(aDumpWidget); + aDumpLay->addWidget(myDumpView->GetControl()); + QDockWidget* aDumpDockWidget = new QDockWidget(tr("Dump"), myMainWindow); + aDumpDockWidget->setObjectName(aDumpDockWidget->windowTitle()); + + aDumpDockWidget->setWidget(aDumpWidget); + myMainWindow->addDockWidget(Qt::RightDockWidgetArea, aDumpDockWidget); // view myViewWindow = new View_Window (myMainWindow); myViewWindow->GetView()->SetPredefinedSize (DFBROWSER_DEFAULT_VIEW_WIDTH, DFBROWSER_DEFAULT_VIEW_HEIGHT); QDockWidget* aViewDockWidget = new QDockWidget (tr ("View"), myMainWindow); + aViewDockWidget->setObjectName (aViewDockWidget->windowTitle()); aViewDockWidget->setTitleBarWidget (myViewWindow->GetViewToolBar()->GetControl()); aViewDockWidget->setWidget (myViewWindow); - myMainWindow->addDockWidget (Qt::BottomDockWidgetArea, aViewDockWidget); + myMainWindow->addDockWidget (Qt::RightDockWidgetArea, aViewDockWidget); QColor aHColor (229, 243, 255); myViewWindow->GetDisplayer()->SetAttributeColor (Quantity_Color(aHColor.red() / 255., aHColor.green() / 255., aHColor.blue() / 255., Quantity_TOC_RGB), View_PresentationType_Additional); + + myMainWindow->splitDockWidget(aPropertyPanelWidget, aViewDockWidget, Qt::Vertical); myMainWindow->tabifyDockWidget (aDumpDockWidget, aViewDockWidget); - aTreeViewWidget->resize (DFBROWSER_DEFAULT_TREE_VIEW_WIDTH, DFBROWSER_DEFAULT_TREE_VIEW_HEIGHT); + myTreeView->resize (DFBROWSER_DEFAULT_TREE_VIEW_WIDTH, DFBROWSER_DEFAULT_TREE_VIEW_HEIGHT); myThread = new DFBrowser_Thread (this); - - myShortcut = new DFBrowser_Shortcut (myMainWindow); } // ======================================================================= @@ -220,6 +225,62 @@ void DFBrowser_Window::SetParent (void* theParent) } } +// ======================================================================= +// function : FillActionsMenu +// purpose : +// ======================================================================= +void DFBrowser_Window::FillActionsMenu (void* theMenu) +{ + QMenu* aMenu = (QMenu*)theMenu; + QList aDockwidgets = myMainWindow->findChildren(); + for (QList::iterator it = aDockwidgets.begin(); it != aDockwidgets.end(); ++it) + { + QDockWidget* aDockWidget = *it; + if (aDockWidget->parentWidget() == myMainWindow) + aMenu->addAction (aDockWidget->toggleViewAction()); + } +} + +// ======================================================================= +// function : GetPreferences +// purpose : +// ======================================================================= +void DFBrowser_Window::GetPreferences (TInspectorAPI_PreferencesDataMap& theItem) +{ + theItem.Clear(); + theItem.Bind ("geometry", TreeModel_Tools::ToString (myMainWindow->saveState()).toStdString().c_str()); + + QMap anItems; + TreeModel_Tools::SaveState (myTreeView, anItems); + View_Tools::SaveState(myViewWindow, anItems); + + for (QMap::const_iterator anItemsIt = anItems.begin(); anItemsIt != anItems.end(); anItemsIt++) + theItem.Bind (anItemsIt.key().toStdString().c_str(), anItemsIt.value().toStdString().c_str()); +} + +// ======================================================================= +// function : SetPreferences +// purpose : +// ======================================================================= +void DFBrowser_Window::SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem) +{ + if (theItem.IsEmpty()) + { + TreeModel_Tools::SetDefaultHeaderSections (myTreeView); + return; + } + + for (TInspectorAPI_IteratorOfPreferencesDataMap anItemIt (theItem); anItemIt.More(); anItemIt.Next()) + { + if (anItemIt.Key().IsEqual ("geometry")) + myMainWindow->restoreState (TreeModel_Tools::ToByteArray (anItemIt.Value().ToCString())); + else if (TreeModel_Tools::RestoreState (myTreeView, anItemIt.Key().ToCString(), anItemIt.Value().ToCString())) + continue; + else if (View_Tools::RestoreState(myViewWindow, anItemIt.Key().ToCString(), anItemIt.Value().ToCString())) + continue; + } +} + // ======================================================================= // function : UpdateContent // purpose : @@ -370,9 +431,6 @@ void DFBrowser_Window::Init (const NCollection_List& myTreeLevelLine->GetSearchLine()->SetModule (myModule); myPropertyPanel->GetAttributesStack()->GetSearchView()->InitModels(); - myShortcut->SetModule (myModule); - myThread->SetModule (myModule); - connect (myModule, SIGNAL (beforeUpdateTreeModel()), this, SLOT (onBeforeUpdateTreeModel())); if (!aContext.IsNull()) @@ -506,7 +564,6 @@ void DFBrowser_Window::setExpandedLevels (QTreeView* theTreeView, const QModelIn void DFBrowser_Window::setOCAFModel (QAbstractItemModel* theModel) { myTreeView->setModel (theModel); - myTreeView->setColumnWidth (0, OCAF_BROWSER_COLUMN_WIDTH_0); QItemSelectionModel* aSelectionModel = new QItemSelectionModel (theModel); myTreeView->setSelectionModel (aSelectionModel); @@ -536,21 +593,9 @@ void DFBrowser_Window::onBeforeUpdateTreeModel() // ======================================================================= void DFBrowser_Window::ClearThreadCache() { - DFBrowser_ThreadItemUsedShapesMap::ClearSortedReferences (myModule); DFBrowser_ThreadItemSearch::ClearValues (GetTreeLevelLine()->GetSearchLine()); } -// ======================================================================= -// function : SetWhiteBackground -// purpose : -// ======================================================================= -void DFBrowser_Window::SetWhiteBackground (QWidget* theControl) -{ - QPalette aPalette = theControl->palette(); - aPalette.setColor (QPalette::All, QPalette::Foreground, Qt::white); - theControl->setPalette (aPalette); -} - // ======================================================================= // function : TmpDirectory // purpose : @@ -582,25 +627,6 @@ TCollection_AsciiString DFBrowser_Window::TmpDirectory() return aTmpDir; } -// ======================================================================= -// function : SingleSelected -// purpose : -// ======================================================================= -QModelIndex DFBrowser_Window::SingleSelected (const QModelIndexList& theIndices, const int theCellId, - const Qt::Orientation theOrientation) -{ - QModelIndexList aFirstColumnSelectedIndices; - for (QModelIndexList::const_iterator anIndicesIt = theIndices.begin(), aLast = theIndices.end(); - anIndicesIt != aLast; 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(); -} - // ======================================================================= // function : onTreeViewContextMenuRequested // purpose : @@ -608,25 +634,14 @@ QModelIndex DFBrowser_Window::SingleSelected (const QModelIndexList& theIndices, void DFBrowser_Window::onTreeViewContextMenuRequested (const QPoint& thePosition) { QMenu* aMenu = new QMenu(GetMainWindow()); - aMenu->addAction (createAction (tr ("Expand"), SLOT (onExpand()))); - aMenu->addAction (createAction (tr ("Expand All"), SLOT (onExpandAll()))); - aMenu->addAction (createAction (tr ("Collapse All"), SLOT (onCollapseAll()))); + aMenu->addAction (ViewControl_Tools::CreateAction (tr ("Expand"), SLOT (onExpand()), GetMainWindow(), this)); + aMenu->addAction (ViewControl_Tools::CreateAction (tr ("Expand All"), SLOT (onExpandAll()), GetMainWindow(), this)); + aMenu->addAction (ViewControl_Tools::CreateAction (tr ("Collapse All"), SLOT (onCollapseAll()), GetMainWindow(), this)); QPoint aPoint = myTreeView->mapToGlobal (thePosition); aMenu->exec (aPoint); } -// ======================================================================= -// function : createAction -// purpose : -// ======================================================================= -QAction* DFBrowser_Window::createAction (const QString& theText, const char* theSlot) -{ - QAction* anAction = new QAction (theText, GetMainWindow()); - connect (anAction, SIGNAL (triggered(bool)), this, theSlot); - return anAction; -} - // ======================================================================= // function : onExpand // purpose : @@ -694,7 +709,7 @@ void DFBrowser_Window::onTreeViewSelectionChanged (const QItemSelection& theSele anAttributePaneStack->GetTreeLevelView()->UpdateByTreeSelectionChanged (theSelected, theDeselected); QModelIndexList aSelectedIndices = theSelected.indexes(); - QModelIndex aSelectedIndex = DFBrowser_Window::SingleSelected (aSelectedIndices, 0); + QModelIndex aSelectedIndex = TreeModel_ModelBase::SingleSelected (aSelectedIndices, 0); myTreeView->scrollTo (aSelectedIndex); View_Displayer* aDisplayer = myViewWindow->GetDisplayer(); @@ -736,8 +751,12 @@ void DFBrowser_Window::onPaneSelectionChanged (const QItemSelection&, if (myParameters->FindParameters (aPluginName)) aParameters = myParameters->Parameters (aPluginName); + NCollection_List anItemNames; + if (myParameters->FindSelectedNames (aPluginName)) + anItemNames = myParameters->GetSelectedNames (aPluginName); + int aParametersCount = aParameters.Extent(); - anAttributePane->GetSelectionParameters (aSelectionModel, aParameters); + anAttributePane->GetSelectionParameters (aSelectionModel, aParameters, anItemNames); if (aParametersCount != aParameters.Extent()) // some TShapes are added { TCollection_AsciiString aPluginShortName = aPluginName.SubString (3, aPluginName.Length()); @@ -747,11 +766,12 @@ void DFBrowser_Window::onPaneSelectionChanged (const QItemSelection&, 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); + myExportToShapeViewDialog = new ViewControl_MessageDialog (myParent, aMessage, aQuestion); else myExportToShapeViewDialog->SetInformation (aMessage); myExportToShapeViewDialog->Start(); + myParameters->SetSelectedNames (aPluginName, anItemNames); myParameters->SetParameters (aPluginName, aParameters, myExportToShapeViewDialog->IsAccepted()); } return; diff --git a/tools/DFBrowser/DFBrowser_Window.hxx b/tools/DFBrowser/DFBrowser_Window.hxx index d22484d6b5..9e66ad6cf6 100644 --- a/tools/DFBrowser/DFBrowser_Window.hxx +++ b/tools/DFBrowser/DFBrowser_Window.hxx @@ -35,11 +35,10 @@ class DFBrowser_DumpView; class DFBrowser_Module; class DFBrowser_PropertyPanel; -class DFBrowser_Shortcut; class DFBrowser_Thread; class DFBrowser_TreeLevelLine; -class TreeModel_MessageDialog; +class ViewControl_MessageDialog; class View_ToolBar; class View_Window; @@ -73,6 +72,18 @@ public: //! \param theParameters a parameters container void SetParameters (const Handle(TInspectorAPI_PluginParameters)& theParameters) { myParameters = theParameters; } + //! Provide container for actions available in inspector on general level + //! \param theMenu if Qt implementation, it is QMenu object + Standard_EXPORT virtual void FillActionsMenu (void* theMenu); + + //! Returns plugin preferences: dock widgets state, tree view columns. + //! \param theItem container of preference elements + Standard_EXPORT void GetPreferences (TInspectorAPI_PreferencesDataMap& theItem); + + //! Applies plugin preferences + //! \param theItem container of preference elements + Standard_EXPORT void SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem); + //! Applyes parameters to Init controls, opens files if there are in parameters, updates OCAF tree view model Standard_EXPORT void UpdateContent(); @@ -101,22 +112,10 @@ public: //! Returns tree level line control DFBrowser_TreeLevelLine* GetTreeLevelLine() const { return myTreeLevelLine; } - //! Change palette of the widget to have white foreground - //! \param theControl a widget to be modified - Standard_EXPORT static void SetWhiteBackground (QWidget* theControl); - //! Returns temporary directory defined by environment variables TEMP or TMP //! \return string value Standard_EXPORT static TCollection_AsciiString TmpDirectory(); - //! 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 slots: //! Cleans history in tree level line, clears cache of thread processing, starts threads for application @@ -191,12 +190,6 @@ private: //! \param theIndices a container of OCAF tree view model indices void highlightIndices (const QModelIndexList& theIndices); - //! Creates an action with the given text connected to the slot - //! \param theText an action text value - //! \param theSlot a listener of triggered signal of the new action - //! \return a new action - QAction* createAction (const QString& theText, const char* theSlot); - //! Returns candidate to be the window title. It is either name of opened STEP file or the application path //! \return string value QString getWindowTitle() const; @@ -231,8 +224,7 @@ private: View_Window* myViewWindow; //!< V3d view to visualize presentations/references if it can be build for a selected item 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 + ViewControl_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/DFBrowser/FILES b/tools/DFBrowser/FILES index 86666645ae..349918d9c3 100644 --- a/tools/DFBrowser/FILES +++ b/tools/DFBrowser/FILES @@ -30,15 +30,11 @@ DFBrowser_SearchLineModel.cxx DFBrowser_SearchLineModel.hxx DFBrowser_SearchView.cxx DFBrowser_SearchView.hxx -DFBrowser_Shortcut.cxx -DFBrowser_Shortcut.hxx DFBrowser_Thread.cxx DFBrowser_Thread.hxx DFBrowser_ThreadItem.hxx DFBrowser_ThreadItemSearch.cxx DFBrowser_ThreadItemSearch.hxx -DFBrowser_ThreadItemUsedShapesMap.cxx -DFBrowser_ThreadItemUsedShapesMap.hxx DFBrowser_Tools.cxx DFBrowser_Tools.hxx DFBrowser_TreeLevelLine.cxx @@ -53,7 +49,5 @@ DFBrowser_TreeLevelViewModel.cxx DFBrowser_TreeLevelViewModel.hxx DFBrowser_TreeModel.cxx DFBrowser_TreeModel.hxx -DFBrowser_TreeView.cxx -DFBrowser_TreeView.hxx DFBrowser_Window.cxx DFBrowser_Window.hxx diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneAPI.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneAPI.hxx index aa859bf488..909828182e 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneAPI.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneAPI.hxx @@ -66,9 +66,11 @@ public: //! Returns selection parameters, that may be useful for communicate between tools //! \param theModel one of selection models provided by this pane //! \theParameters a container of parameters, might be extended depending on the pane state(e.g. selection) + //! \theItemNames names to be selected for each selection parameter virtual void GetSelectionParameters (QItemSelectionModel* theModel, - NCollection_List& theParameters) - { (void)theModel; (void)theParameters; } + NCollection_List& theParameters, + NCollection_List& theItemNames) + { (void)theModel; (void)theParameters; (void)theItemNames; } //! Returns presentation of the attribute to be visualized in the view //! \param theAttribute a current attribute diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx index 310544cbed..aaa62b23b5 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx @@ -29,7 +29,16 @@ DFBrowserPane_TDataStdTreeNodeModel::DFBrowserPane_TDataStdTreeNodeModel (QObject* theParent) : TreeModel_ModelBase (theParent) { - m_pRootItem = DFBrowserPane_TDataStdTreeNodeItem::CreateItem (TreeModel_ItemBasePtr(), 0, 0); + createRootItem(0); +} + +// ======================================================================= +// function : createRootItem +// purpose : +// ======================================================================= +void DFBrowserPane_TDataStdTreeNodeModel::createRootItem (const int theColumnId) +{ + m_pRootItem = DFBrowserPane_TDataStdTreeNodeItem::CreateItem (TreeModel_ItemBasePtr(), 0, theColumnId); } // ======================================================================= diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx index 835a79f7ad..9223cfa19b 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx @@ -56,6 +56,11 @@ public: virtual int columnCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE { (void)theParent; return 1; } +protected: + //! Creates root item + //! \param theColumnId index of a column + virtual void createRootItem (const int theColumnId) Standard_OVERRIDE; + private: Handle(TDF_Attribute) myAttribute; //! the parent attribute diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx index e392c44187..590af0b64b 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx @@ -106,7 +106,7 @@ void DFBrowserPane_TDocStdOwner::GetValues (const Handle(TDF_Attribute)& theAttr << aSeparationStr.ToCString() << aSeparationStr.ToCString() << "IsSaved" << DFBrowserPane_Tools::BoolToStr (aDocument->IsSaved()) << "IsChanged" << DFBrowserPane_Tools::BoolToStr (aDocument->IsChanged()) - << "GetSavedTime" << aDocument->GetSavedTime() + << "GetSavedTime" << QString::number (aDocument->GetSavedTime()) << "GetName" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetName()) : "") << "GetPath" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetPath()) : "") << "GetData" << aDocumentDataInfo.ToCString() diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx index ee6ab872ad..3bbecddcf6 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -367,7 +368,8 @@ int DFBrowserPane_TNamingNamedShape::GetSelectionKind (QItemSelectionModel* theM // purpose : // ======================================================================= void DFBrowserPane_TNamingNamedShape::GetSelectionParameters (QItemSelectionModel* theModel, - NCollection_List& theParameters) + NCollection_List& theParameters, + NCollection_List& theItemNames) { QTableView* aTableView = myTableView->GetTableView(); if (aTableView->selectionModel() != theModel) @@ -385,6 +387,7 @@ void DFBrowserPane_TNamingNamedShape::GetSelectionParameters (QItemSelectionMode if (aShape.IsNull()) return; theParameters.Append (aShape.TShape()); + theItemNames.Append (TInspectorAPI_PluginParameters::ParametersToString (aShape)); } // ======================================================================= diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx index aabbc0174d..ccffd18335 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.hxx @@ -75,8 +75,10 @@ public: //! Returns selection parameters, that may be useful for communicate between tools //! \param theModel one of selection models provided by this pane //! \theParameters a container of parameters, might be extended depending on the pane state(e.g. selection) + //! \theItemNames names to be selected for each selection parameter Standard_EXPORT virtual void GetSelectionParameters (QItemSelectionModel* theModel, - NCollection_List& theParameters) Standard_OVERRIDE; + NCollection_List& theParameters, + NCollection_List& theItemNames) Standard_OVERRIDE; //! Returns container of Label references to the attribute //! \param theAttribute a current attribute diff --git a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx index 6edaa104f3..5bbf2281b6 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx @@ -16,6 +16,8 @@ #include #include +#include + #include #include #include @@ -70,7 +72,7 @@ void DFBrowserPane_TableView::SetModel (QAbstractTableModel* theModel) // ======================================================================= void DFBrowserPane_TableView::SetFixedRowCount (const int theCount, QTableView* theView, const bool theScroll) { - int aHeight = theView->verticalHeader()->defaultSectionSize() * theCount + DFBrowserPane_Tools::HeaderSectionMargin(); + int aHeight = theView->verticalHeader()->defaultSectionSize()*theCount + TreeModel_Tools::HeaderSectionMargin(); if (theScroll) aHeight += theView->horizontalScrollBar()->sizeHint().height(); diff --git a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx index bf19319bcb..cb194777a9 100644 --- a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx @@ -25,9 +25,7 @@ #include #include -#include #include -#include #include #include #include @@ -45,10 +43,6 @@ public: //! \returns value Standard_EXPORT static int DefaultPanelColumnWidth (const int theColumnId); - //! Returns header margin, defined in style settings of application - //! \return integer value - Standard_EXPORT static int HeaderSectionMargin() { return qApp->style()->pixelMetric (QStyle::PM_HeaderMargin); } - //! Returns a string presentation of the label //! \param theLabel a label object //! \return the string value @@ -69,7 +63,7 @@ public: //! Returns "true" or "false" text for the given boolean state //! \param theValue a boolean value //! \return string value - Standard_EXPORT static QString BoolToStr (const Standard_Boolean theValue) { return theValue ? "true" : "false"; } + Standard_EXPORT static QString BoolToStr (const bool theValue) { return theValue ? "true" : "false"; } //! Converts a Qt string to OCCT extended string //! \param theValue a converted string diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx index 4959b408db..b531305725 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.cxx @@ -164,12 +164,13 @@ int DFBrowserPaneXDE_AttributeCommonPane::GetSelectionKind (QItemSelectionModel* // purpose : // ======================================================================= void DFBrowserPaneXDE_AttributeCommonPane::GetSelectionParameters (QItemSelectionModel* theModel, - NCollection_List& theParameters) + NCollection_List& theParameters, + NCollection_List& theItemNames) { if (myStandardPane) - myStandardPane->GetSelectionParameters (theModel, theParameters); + myStandardPane->GetSelectionParameters (theModel, theParameters, theItemNames); - DFBrowserPane_AttributePane::GetSelectionParameters (theModel, theParameters); + DFBrowserPane_AttributePane::GetSelectionParameters (theModel, theParameters, theItemNames); } // ======================================================================= diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx index adb7689750..dd34d91db3 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_AttributeCommonPane.hxx @@ -83,8 +83,10 @@ public: //! Returns selection parameters, that may be useful for communicate between tools //! \param theModel one of selection models provided by this pane //! \theParameters a container of parameters, might be extended depending on the pane state(e.g. selection) + //! \theItemNames names to be selected for each selection parameter Standard_EXPORT virtual void GetSelectionParameters (QItemSelectionModel* theModel, - NCollection_List& theParameters) Standard_OVERRIDE; + NCollection_List& theParameters, + NCollection_List& theItemNames) Standard_OVERRIDE; //! Returns presentation of the attribute to be visualized in the view //! \param theAttribute a current attribute diff --git a/tools/ShapeView/FILES b/tools/ShapeView/FILES index 39fe9b9acd..895416efc1 100644 --- a/tools/ShapeView/FILES +++ b/tools/ShapeView/FILES @@ -14,5 +14,7 @@ ShapeView_Tools.cxx ShapeView_Tools.hxx ShapeView_TreeModel.cxx ShapeView_TreeModel.hxx +ShapeView_VisibilityState.cxx +ShapeView_VisibilityState.hxx ShapeView_Window.cxx ShapeView_Window.hxx diff --git a/tools/ShapeView/ShapeView_Communicator.cxx b/tools/ShapeView/ShapeView_Communicator.cxx index 6ba86e5c7b..8d7bf0f6e8 100644 --- a/tools/ShapeView/ShapeView_Communicator.cxx +++ b/tools/ShapeView/ShapeView_Communicator.cxx @@ -15,18 +15,6 @@ #include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - // ======================================================================= // function : CreateCommunicator // purpose : Creates a communicator by the library loading @@ -35,52 +23,3 @@ Standard_EXPORTEXTERNC TInspectorAPI_Communicator* CreateCommunicator() { return new ShapeView_Communicator(); } - -// ======================================================================= -// function : Constructor -// purpose : -// ======================================================================= -ShapeView_Communicator::ShapeView_Communicator() -: TInspectorAPI_Communicator(), myWindow (0) -{ - // main window creation - TCollection_AsciiString aTmpDir; -#ifdef _WIN32 - OSD_Environment anEnvironment ("TEMP"); - aTmpDir = anEnvironment.Value(); - if (aTmpDir.IsEmpty() ) - { - anEnvironment.SetName("TMP"); - aTmpDir = anEnvironment.Value(); - if (aTmpDir.IsEmpty()) - aTmpDir = "C:\\"; - } - if (!aTmpDir.EndsWith ("\\")) - aTmpDir += "\\"; - OSD_Path aTmpPath (aTmpDir); - OSD_Directory aTmpDirectory; -#else - OSD_Directory aTmpDirectory = OSD_Directory::BuildTemporary(); - OSD_Path aTmpPath; - aTmpDirectory.Path (aTmpPath); -#endif - aTmpPath.DownTrek ("ShapeView"); - aTmpDirectory.SetPath (aTmpPath); - if (!aTmpDirectory.Exists()) - aTmpDirectory.Build (OSD_Protection()); - - aTmpDirectory.Path (aTmpPath); - TCollection_AsciiString aTmpDirectoryName; - aTmpPath.SystemName(aTmpDirectoryName); - myWindow = new ShapeView_Window (0, aTmpDirectoryName); -} - -ShapeView_Communicator::~ShapeView_Communicator() -{ - myWindow->RemoveAllShapes(); // removes all cached shapes and files in temporary directory - OSD_Path aPath (myWindow->GetTemporaryDirectory()); - OSD_Directory aTmpDirectory (aPath); - // temporary directory can be removed only if is empty - aTmpDirectory.Remove(); -} - diff --git a/tools/ShapeView/ShapeView_Communicator.hxx b/tools/ShapeView/ShapeView_Communicator.hxx index a32657a03e..babb61b0fe 100644 --- a/tools/ShapeView/ShapeView_Communicator.hxx +++ b/tools/ShapeView/ShapeView_Communicator.hxx @@ -26,10 +26,10 @@ class ShapeView_Communicator : public TInspectorAPI_Communicator public: //! Constructor - Standard_EXPORT ShapeView_Communicator(); + ShapeView_Communicator() : TInspectorAPI_Communicator(), myWindow (new ShapeView_Window (0)) {} //! Destructor - Standard_EXPORT virtual ~ShapeView_Communicator() Standard_OVERRIDE; + virtual ~ShapeView_Communicator() Standard_OVERRIDE { myWindow->RemoveAllShapes(); } //! Provides the container with a parent where this container should be inserted. //! If Qt implementation, it should be QWidget with QLayout set inside @@ -41,6 +41,20 @@ public: virtual void SetParameters (const Handle(TInspectorAPI_PluginParameters)& theParameters) Standard_OVERRIDE { myWindow->SetParameters (theParameters); } + //! Provide container for actions available in inspector on general level + //! \param theMenu if Qt implementation, it is QMenu object + Standard_EXPORT virtual void FillActionsMenu(void* theMenu) Standard_OVERRIDE { myWindow->FillActionsMenu (theMenu); } + + //! Returns plugin preferences, empty implementation by default + //! \param theItem container of preference elements + virtual void GetPreferences (TInspectorAPI_PreferencesDataMap& theItem) Standard_OVERRIDE + { myWindow->GetPreferences (theItem); } + + //! Stores plugin preferences, empty implementation by default + //! \param theItem container of preference elements + virtual void SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem) Standard_OVERRIDE + { myWindow->SetPreferences (theItem); } + //! Calls update of the plugin's content virtual void UpdateContent() Standard_OVERRIDE { myWindow->UpdateContent(); } diff --git a/tools/ShapeView/ShapeView_ItemShape.cxx b/tools/ShapeView/ShapeView_ItemShape.cxx index be3a623b3f..952534ba4a 100644 --- a/tools/ShapeView/ShapeView_ItemShape.cxx +++ b/tools/ShapeView/ShapeView_ItemShape.cxx @@ -96,21 +96,6 @@ QString ToName (const GeomAbs_Shape& theType) return QString(); } -// ======================================================================= -// function : ToFlags -// purpose : -// ======================================================================= -void ToFlags (const TopoDS_Shape& theShape, QVariant& theValue, QVariant& theInfo) -{ - QStringList aValues; - aValues << ToString (theShape.Checked()) << ToString (theShape.Closed()) - << ToString (theShape.Infinite()) << ToString (theShape.Locked()) - << ToString (theShape.Modified()) << ToString (theShape.Orientable()); - - theValue = aValues.join ("/"); - theInfo = "Checked/Closed/Infinite/Locked/Modified/Orientable"; -} - // ======================================================================= // function : ToOtherInfo // purpose : @@ -171,14 +156,6 @@ void ToOtherInfo (const TopoDS_Shape& theShape, QVariant& theValue, QVariant& th theInfo = QString ("%1:\n%2").arg (anInfo.join (" / ")).arg (aValues.join ("\n")); break; } - case TopAbs_VERTEX: - { - TopoDS_Vertex aVertex = TopoDS::Vertex (theShape); - gp_Pnt aPoint = BRep_Tool::Pnt (aVertex); - theValue = ToString (aPoint); - theInfo = "(X, Y, Z) of gp_Pnt"; - break; - } case TopAbs_SHAPE: default: break; @@ -235,25 +212,59 @@ QVariant ShapeView_ItemShape::initValue(const int theRole) const if (theRole != Qt::DisplayRole && theRole != Qt::ToolTipRole) return QVariant(); - bool isDisplayRole = theRole == Qt::DisplayRole; switch (Column()) { - case 0: return isDisplayRole ? ToName (aShape.ShapeType()) : "ShapeType"; - case 1: return isDisplayRole ? (rowCount() > 0 ? QVariant (rowCount()) : QVariant()) - : QVariant ("Number of sub shapes"); - case 2: return isDisplayRole ? TShapePointer().ToCString() : "TShape pointer"; - case 3: return isDisplayRole ? ToName(aShape.Orientation()) : "Orientation"; - case 4: return isDisplayRole ? locationInfo(aShape.Location()) : "Location"; - case 5: - case 6: - case 7: + case 0: return ToName (aShape.ShapeType()); + case 2: return rowCount() > 0 ? QVariant (rowCount()) : QVariant(); + case 3: return TShapePointer().ToCString(); + case 4: return ToName(aShape.Orientation()); + case 5: return locationInfo(aShape.Location()); + case 6: return ToString (aShape.Checked()); + case 7: return ToString (aShape.Closed()); + case 8: return ToString (aShape.Infinite()); + case 9: return ToString (aShape.Locked()); + case 10: return ToString (aShape.Modified()); + case 11: return ToString (aShape.Orientable()); + case 12: { - QVariant aDataInfo, aTooTipInfo; - if (Column() == 5) - ToFlags(aShape, aDataInfo, aTooTipInfo); - else if (Column() == 6) - ToOtherInfo(aShape, aDataInfo, aTooTipInfo); - return isDisplayRole ? aDataInfo : aTooTipInfo; + if (aShape.ShapeType() != TopAbs_VERTEX) + return QVariant(); + TopoDS_Vertex aVertex = TopoDS::Vertex (aShape); + gp_Pnt aPoint = BRep_Tool::Pnt (aVertex); + return ToString (aPoint); + } + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + case 19: + { + if (aShape.ShapeType() != TopAbs_EDGE) + return QVariant(); + + TopoDS_Edge anEdge = TopoDS::Edge(aShape); + double aFirst, aLast; + Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, aFirst, aLast); + + GeomAdaptor_Curve aAdaptor(aCurve, aFirst, aLast); + gp_Pnt aFirstPnt = aAdaptor.Value(aFirst); + gp_Pnt aLastPnt = aAdaptor.Value(aLast); + + BRepAdaptor_Curve aBRepAdaptor = BRepAdaptor_Curve(anEdge); + Adaptor3d_Curve* anAdaptor3d = &aBRepAdaptor; + + switch (Column()) + { + case 13: return QString::number (GCPnts_AbscissaPoint::Length(*anAdaptor3d)); + case 14: return aCurve->DynamicType()->Name(); + case 15: return ToString (aFirstPnt); + case 16: return ToString (aLastPnt); + case 17: return ToName (aCurve->Continuity()); + case 18: return ToString (aCurve->IsClosed()); + case 19: return aCurve->IsPeriodic() ? QString::number (aCurve->Period()) : ToString (aCurve->IsPeriodic()); + } } default: break; } diff --git a/tools/ShapeView/ShapeView_Tools.cxx b/tools/ShapeView/ShapeView_Tools.cxx index 72a5d6649c..afa6de4571 100644 --- a/tools/ShapeView/ShapeView_Tools.cxx +++ b/tools/ShapeView/ShapeView_Tools.cxx @@ -31,12 +31,3 @@ TopoDS_Shape ShapeView_Tools::ReadShape (const TCollection_AsciiString& theFileN BRepTools::Read (aShape, theFileName.ToCString(), aBuilder); return aShape; } - -// ======================================================================= -// function : CreatePresentation -// purpose : -// ======================================================================= -Handle(Standard_Transient) ShapeView_Tools::CreatePresentation (const TopoDS_Shape& theShape) -{ - return new AIS_Shape (theShape); -} diff --git a/tools/ShapeView/ShapeView_Tools.hxx b/tools/ShapeView/ShapeView_Tools.hxx index 23c48aec5e..a922e42b36 100644 --- a/tools/ShapeView/ShapeView_Tools.hxx +++ b/tools/ShapeView/ShapeView_Tools.hxx @@ -32,11 +32,6 @@ public: //! \param theFileName a file name //! \return shape or NULL Standard_EXPORT static TopoDS_Shape ReadShape (const TCollection_AsciiString& theFileName); - - //! Creates AIS_Shape for the shape - //! \param theShape a shape - //! \return presentation - Standard_EXPORT static Handle(Standard_Transient) CreatePresentation (const TopoDS_Shape& theShape); }; #endif diff --git a/tools/ShapeView/ShapeView_TreeModel.cxx b/tools/ShapeView/ShapeView_TreeModel.cxx index a44b112544..bc29c119ae 100644 --- a/tools/ShapeView/ShapeView_TreeModel.cxx +++ b/tools/ShapeView/ShapeView_TreeModel.cxx @@ -19,6 +19,14 @@ #include #include +const int COLUMN_NAME_WIDTH = 190; +const int COLUMN_SIZE_WIDTH = 30; +const int COLUMN_POINTER_WIDTH = 70; +const int COLUMN_SHAPE_TYPE_WIDTH = 75; + +const int COLUMN_ORIENTATION_WIDTH = 70; +const int COLUMN_LOCATION_WIDTH = 120; + // ======================================================================= // function : Constructor // purpose : @@ -26,10 +34,40 @@ ShapeView_TreeModel::ShapeView_TreeModel (QObject* theParent) : TreeModel_ModelBase (theParent) { - for (int aColumnId = 0, aNbColumns = columnCount(); aColumnId < aNbColumns; aColumnId++) - myRootItems.insert(aColumnId, ShapeView_ItemRoot::CreateItem(TreeModel_ItemBasePtr(), 0, aColumnId)); + SetHeaderItem (0, TreeModel_HeaderSection ("Name", COLUMN_NAME_WIDTH)); + // column 1 is reserved for visiblity state + SetHeaderItem (2, TreeModel_HeaderSection ("Size", COLUMN_SIZE_WIDTH)); + SetHeaderItem (3, TreeModel_HeaderSection ("Pointer", COLUMN_POINTER_WIDTH)); + SetHeaderItem (4, TreeModel_HeaderSection ("Orientation", COLUMN_ORIENTATION_WIDTH)); + SetHeaderItem (5, TreeModel_HeaderSection ("Location", COLUMN_LOCATION_WIDTH)); - m_pRootItem = myRootItems[0]; + SetHeaderItem (6, TreeModel_HeaderSection ("Checked", -1, true)); + SetHeaderItem (7, TreeModel_HeaderSection ("Closed", -1, true)); + SetHeaderItem (8, TreeModel_HeaderSection ("Infinite", -1, true)); + SetHeaderItem (9, TreeModel_HeaderSection ("Locked", -1, true)); + SetHeaderItem (10, TreeModel_HeaderSection ("Modified", -1, true)); + SetHeaderItem (11, TreeModel_HeaderSection ("Orientable", -1, true)); + + SetHeaderItem (12, TreeModel_HeaderSection ("VERTEX: (X, Y, Z)", -1, true)); + + SetHeaderItem (13, TreeModel_HeaderSection ("EDGE: Length", -1, true)); + SetHeaderItem (14, TreeModel_HeaderSection ("DynamicType", -1, true)); + SetHeaderItem (15, TreeModel_HeaderSection ("First", -1, true)); + SetHeaderItem (16, TreeModel_HeaderSection ("Last", -1, true)); + SetHeaderItem (17, TreeModel_HeaderSection ("Continuity", -1, true)); + SetHeaderItem (18, TreeModel_HeaderSection ("IsClosed", -1, true)); + SetHeaderItem (19, TreeModel_HeaderSection ("IsPeriodic", -1, true)); +} + +// ======================================================================= +// function : createRootItem +// purpose : +// ======================================================================= +void ShapeView_TreeModel::createRootItem (const int theColumnId) +{ + myRootItems.insert (theColumnId, ShapeView_ItemRoot::CreateItem (TreeModel_ItemBasePtr(), 0, theColumnId)); + if (theColumnId == 0) + m_pRootItem = myRootItems[0]; } // ======================================================================= @@ -63,31 +101,6 @@ void ShapeView_TreeModel::RemoveAllShapes() EmitLayoutChanged(); } -// ======================================================================= -// function : headerData -// purpose : -// ======================================================================= -QVariant ShapeView_TreeModel::headerData (int theSection, Qt::Orientation theOrientation, int theRole) const -{ - if (theOrientation != Qt::Horizontal || theRole != Qt::DisplayRole) - return QVariant(); - { - switch (theSection) - { - case 0: return "Name"; - case 1: return "Size"; - case 2: return "Pointer"; - case 3: return "Orientation"; - case 4: return "Location"; - case 5: return "Flags"; // Checked/Closed/Infinite/Locked/Modified/Orientable - case 7: return "Other"; - //Auto Triangulation - default: break; - } - } - return QVariant(); -} - // ======================================================================= // function : FindIndex // purpose : @@ -105,21 +118,3 @@ QModelIndex ShapeView_TreeModel::FindIndex (const TopoDS_Shape& theShape) const } 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 6983570182..7778ad535d 100644 --- a/tools/ShapeView/ShapeView_TreeModel.hxx +++ b/tools/ShapeView/ShapeView_TreeModel.hxx @@ -53,32 +53,15 @@ public: virtual TreeModel_ItemBasePtr RootItem(const int theColumn) const Standard_OVERRIDE { return myRootItems[theColumn]; } - //! Returns count of columns in the model. - //! \param theParent an index of the parent item - //! \return integer value - virtual int columnCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE - { (void)theParent; return 7; } - - //! Returns the header data for the given role and section in the header with the specified orientation. - //! \param theSection the header section. For horizontal headers - column number, for vertical headers - row number. - //! \param theOrientation a header orientation - //! \param theRole a data role - //! \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); +protected: + //! Creates root item + //! \param theColumnId index of a column + virtual void createRootItem (const int theColumnId) Standard_OVERRIDE; private: QMap myRootItems; //!< container of root items, for each column own root item diff --git a/tools/ShapeView/ShapeView_VisibilityState.cxx b/tools/ShapeView/ShapeView_VisibilityState.cxx new file mode 100644 index 0000000000..7e7e02f600 --- /dev/null +++ b/tools/ShapeView/ShapeView_VisibilityState.cxx @@ -0,0 +1,52 @@ +// 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 + +#include + +// ======================================================================= +// function : SetVisible +// purpose : +// ======================================================================= +bool ShapeView_VisibilityState::SetVisible (const QModelIndex& theIndex, const bool theState, const bool toEmitDataChanged) +{ + TopoDS_Shape aShape = GetShape (theIndex); + if (aShape.IsNull()) + return false; + + myDisplayer->SetVisible (aShape, theState, myPresentationType); + + if (toEmitDataChanged) + getModel()->EmitDataChanged (theIndex, theIndex); + return true; +} + +// ======================================================================= +// function : GetShape +// purpose : +// ======================================================================= +TopoDS_Shape ShapeView_VisibilityState::GetShape (const QModelIndex& theIndex) const +{ + TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (theIndex); + if (!anItemBase) + return TopoDS_Shape(); + + ShapeView_ItemShapePtr aShapeItem = itemDynamicCast(anItemBase); + if (!aShapeItem) + return TopoDS_Shape(); + + return aShapeItem->GetItemShape(); +} diff --git a/tools/ShapeView/ShapeView_VisibilityState.hxx b/tools/ShapeView/ShapeView_VisibilityState.hxx new file mode 100644 index 0000000000..4d384d61c2 --- /dev/null +++ b/tools/ShapeView/ShapeView_VisibilityState.hxx @@ -0,0 +1,76 @@ +// 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 ShapeView_VisibilityState_H +#define ShapeView_VisibilityState_H + +#include + +#include + +#include +#include +#include + +class TreeModel_ModelBase; + +//! \class ShapeView_VisibilityState +//! \brief Class provides connection between model and visualization control +class ShapeView_VisibilityState : public TreeModel_VisibilityState +{ +public: + //! Constructor + ShapeView_VisibilityState (TreeModel_ModelBase* theModel) : TreeModel_VisibilityState (theModel), + myPresentationType (View_PresentationType_Main) {} + + //! Destructor + ~ShapeView_VisibilityState() {} + + //! Sets current displayer + //! \theDisplayer class that provides connection to visualized objects + void SetDisplayer (View_Displayer* theDisplayer) { myDisplayer = theDisplayer; } + + //! Sets presentation type for displayer + //! \param theType type value + void SetPresentationType (const View_PresentationType theType) { myPresentationType = theType; } + + //! Returns true if visibility of the item can be changed + //! \param theIndex tree model index + //! \return boolean value + virtual bool CanBeVisible (const QModelIndex& theIndex) const Standard_OVERRIDE { return !GetShape (theIndex).IsNull(); } + + //! Sets visibility state + //! \theIndex tree model index + //! \param theState visibility state + //! \param toEmitDataChanged boolean flag whether emit of the model should be done immediatelly + //! \return true if state is changed + Standard_EXPORT virtual bool SetVisible (const QModelIndex& theIndex, const bool theState, const bool toEmitDataChanged) Standard_OVERRIDE; + + //! Returns visibility state value + virtual bool IsVisible (const QModelIndex& theIndex) const Standard_OVERRIDE + { return myDisplayer->IsVisible (GetShape (theIndex), myPresentationType); } + +protected: + //! Gets shape of the view model by the parameter index if it has a shape + //! \param theIndex tree model index + //! \return shape instance + TopoDS_Shape GetShape (const QModelIndex& theIndex) const; + +private: + View_Displayer* myDisplayer; //! view displayer + View_PresentationType myPresentationType; //! presentation type +}; + +#endif diff --git a/tools/ShapeView/ShapeView_Window.cxx b/tools/ShapeView/ShapeView_Window.cxx index 8c05fe1d86..7ec1c822a6 100644 --- a/tools/ShapeView/ShapeView_Window.cxx +++ b/tools/ShapeView/ShapeView_Window.cxx @@ -17,16 +17,23 @@ #include #include #include +#include + +#include +#include + +#include +#include + #include +#include +#include #include #include #include #include #include -#include -#include -#include #include #include @@ -54,13 +61,6 @@ #include #include -const int FIRST_COLUMN_WIDTH = 190; -const int SIZE_COLUMN_WIDTH = 30; -const int POINTER_COLUMN_WIDTH = 70; -const int ORIENTATION_COLUMN_WIDTH = 70; -const int LOCATION_COLUMN_WIDTH = 120; -const int FLAGS_COLUMN_WIDTH = 70; - const int DEFAULT_TEXT_VIEW_WIDTH = 800; const int DEFAULT_TEXT_VIEW_HEIGHT = 700; const int DEFAULT_TEXT_VIEW_POSITION_X = 430; @@ -75,95 +75,44 @@ const int DEFAULT_SHAPE_VIEW_POSITION_Y = 60; const int SHAPEVIEW_DEFAULT_TREE_VIEW_WIDTH = 600; const int SHAPEVIEW_DEFAULT_TREE_VIEW_HEIGHT = 500; -const int SHAPEVIEW_DEFAULT_VIEW_WIDTH = 200;//400; +const int SHAPEVIEW_DEFAULT_VIEW_WIDTH = 300; const int SHAPEVIEW_DEFAULT_VIEW_HEIGHT = 1000; -//! \class ShapeView_TreeView -//! Extended tree view control with possibility to set predefined size. -class ShapeView_TreeView : public QTreeView -{ -public: - //! Constructor - ShapeView_TreeView (QWidget* theParent) : QTreeView (theParent), myDefaultWidth (-1), myDefaultHeight (-1) {} - - //! Destructor - virtual ~ShapeView_TreeView() {} - - //! Sets default size of control, that is used by the first control show - //! \param theDefaultWidth the width value - //! \param theDefaultHeight the height value - void SetPredefinedSize (int theDefaultWidth, int theDefaultHeight); - - //! Returns predefined size if both values are positive, otherwise parent size hint - virtual QSize sizeHint() const Standard_OVERRIDE; - -private: - - int myDefaultWidth; //!< default width, -1 if it should not be used - int myDefaultHeight; //!< default height, -1 if it should not be used -}; - -// ======================================================================= -// function : SetPredefinedSize -// purpose : -// ======================================================================= -void ShapeView_TreeView::SetPredefinedSize (int theDefaultWidth, int theDefaultHeight) -{ - myDefaultWidth = theDefaultWidth; - myDefaultHeight = theDefaultHeight; -} - -// ======================================================================= -// function : sizeHint -// purpose : -// ======================================================================= -QSize ShapeView_TreeView::sizeHint() const -{ - if (myDefaultWidth > 0 && myDefaultHeight > 0) - return QSize (myDefaultWidth, myDefaultHeight); - return QTreeView::sizeHint(); -} - // ======================================================================= // function : Constructor // purpose : // ======================================================================= -ShapeView_Window::ShapeView_Window (QWidget* theParent, const TCollection_AsciiString& theTemporaryDirectory) -: QObject (theParent), myTemporaryDirectory (theTemporaryDirectory), myNextPosition (0) +ShapeView_Window::ShapeView_Window (QWidget* theParent) +: QObject (theParent), myNextPosition (0) { myMainWindow = new QMainWindow (theParent); - myTreeView = new ShapeView_TreeView (myMainWindow); - ((ShapeView_TreeView*)myTreeView)->SetPredefinedSize (SHAPEVIEW_DEFAULT_TREE_VIEW_WIDTH, - SHAPEVIEW_DEFAULT_TREE_VIEW_HEIGHT); + myTreeView = new ViewControl_TreeView (myMainWindow); + ((ViewControl_TreeView*)myTreeView)->SetPredefinedSize (QSize (SHAPEVIEW_DEFAULT_TREE_VIEW_WIDTH, + SHAPEVIEW_DEFAULT_TREE_VIEW_HEIGHT)); myTreeView->setContextMenuPolicy (Qt::CustomContextMenu); connect (myTreeView, SIGNAL (customContextMenuRequested (const QPoint&)), this, SLOT (onTreeViewContextMenuRequested (const QPoint&))); + new TreeModel_ContextMenu (myTreeView); ShapeView_TreeModel* aModel = new ShapeView_TreeModel (myTreeView); myTreeView->setModel (aModel); - - QItemSelectionModel* aSelectionModel = new QItemSelectionModel (aModel); - myTreeView->setSelectionMode (QAbstractItemView::ExtendedSelection); - myTreeView->setSelectionModel (aSelectionModel); - connect (aSelectionModel, SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)), - this, SLOT (onTreeViewSelectionChanged (const QItemSelection&, const QItemSelection&))); + ShapeView_VisibilityState* aVisibilityState = new ShapeView_VisibilityState (aModel); + aModel->SetVisibilityState (aVisibilityState); + TreeModel_Tools::UseVisibilityColumn (myTreeView); QModelIndex aParentIndex = myTreeView->model()->index (0, 0); myTreeView->setExpanded (aParentIndex, true); - myTreeView->setColumnWidth (0, FIRST_COLUMN_WIDTH); - myTreeView->setColumnWidth (1, SIZE_COLUMN_WIDTH); - myTreeView->setColumnWidth (2, POINTER_COLUMN_WIDTH); - myTreeView->setColumnWidth (3, ORIENTATION_COLUMN_WIDTH); - myTreeView->setColumnWidth (4, LOCATION_COLUMN_WIDTH); - myTreeView->setColumnWidth (5, FLAGS_COLUMN_WIDTH); - myMainWindow->setCentralWidget (myTreeView); // view - myViewWindow = new View_Window (myMainWindow); + myViewWindow = new View_Window (myMainWindow, false); + connect (myViewWindow, SIGNAL(eraseAllPerformed()), this, SLOT(onEraseAllPerformed())); + aVisibilityState->SetDisplayer (myViewWindow->GetDisplayer()); + aVisibilityState->SetPresentationType (View_PresentationType_Main); myViewWindow->GetView()->SetPredefinedSize (SHAPEVIEW_DEFAULT_VIEW_WIDTH, SHAPEVIEW_DEFAULT_VIEW_HEIGHT); QDockWidget* aViewDockWidget = new QDockWidget (tr ("View"), myMainWindow); + aViewDockWidget->setObjectName (aViewDockWidget->windowTitle()); aViewDockWidget->setWidget (myViewWindow); aViewDockWidget->setTitleBarWidget (myViewWindow->GetViewToolBar()->GetControl()); myMainWindow->addDockWidget (Qt::RightDockWidgetArea, aViewDockWidget); @@ -196,6 +145,61 @@ void ShapeView_Window::SetParent (void* theParent) } } +// ======================================================================= +// function : FillActionsMenu +// purpose : +// ======================================================================= +void ShapeView_Window::FillActionsMenu (void* theMenu) +{ + QMenu* aMenu = (QMenu*)theMenu; + QList aDockwidgets = myMainWindow->findChildren(); + for (QList::iterator it = aDockwidgets.begin(); it != aDockwidgets.end(); ++it) + { + QDockWidget* aDockWidget = *it; + if (aDockWidget->parentWidget() == myMainWindow) + aMenu->addAction (aDockWidget->toggleViewAction()); + } +} + +// ======================================================================= +// function : GetPreferences +// purpose : +// ======================================================================= +void ShapeView_Window::GetPreferences (TInspectorAPI_PreferencesDataMap& theItem) +{ + theItem.Clear(); + theItem.Bind ("geometry", TreeModel_Tools::ToString (myMainWindow->saveState()).toStdString().c_str()); + + QMap anItems; + TreeModel_Tools::SaveState (myTreeView, anItems); + View_Tools::SaveState(myViewWindow, anItems); + for (QMap::const_iterator anItemsIt = anItems.begin(); anItemsIt != anItems.end(); anItemsIt++) + theItem.Bind (anItemsIt.key().toStdString().c_str(), anItemsIt.value().toStdString().c_str()); +} + +// ======================================================================= +// function : SetPreferences +// purpose : +// ======================================================================= +void ShapeView_Window::SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem) +{ + if (theItem.IsEmpty()) + { + TreeModel_Tools::SetDefaultHeaderSections (myTreeView); + return; + } + + for (TInspectorAPI_IteratorOfPreferencesDataMap anItemIt (theItem); anItemIt.More(); anItemIt.Next()) + { + if (anItemIt.Key().IsEqual ("geometry")) + myMainWindow->restoreState (TreeModel_Tools::ToByteArray (anItemIt.Value().ToCString())); + else if (TreeModel_Tools::RestoreState (myTreeView, anItemIt.Key().ToCString(), anItemIt.Value().ToCString())) + continue; + else if (View_Tools::RestoreState(myViewWindow, anItemIt.Key().ToCString(), anItemIt.Value().ToCString())) + continue; + } +} + // ======================================================================= // function : UpdateContent // purpose : @@ -255,15 +259,28 @@ void ShapeView_Window::Init (NCollection_List& thePa { Handle(AIS_InteractiveContext) aContext; NCollection_List aParameters; - for (NCollection_List::Iterator aParamsIt (theParameters); - aParamsIt.More(); aParamsIt.Next()) + + TCollection_AsciiString aPluginName ("TKShapeView"); + NCollection_List aSelectedParameters; + if (myParameters->FindSelectedNames (aPluginName)) // selected names have TShape parameters + aSelectedParameters = myParameters->GetSelectedNames (aPluginName); + + NCollection_List::Iterator aParamsIt (aSelectedParameters); + for (NCollection_List::Iterator anObjectsIt (theParameters); + anObjectsIt.More(); anObjectsIt.Next()) { - Handle(Standard_Transient) anObject = aParamsIt.Value(); + Handle(Standard_Transient) anObject = anObjectsIt.Value(); Handle(TopoDS_TShape) aShapePointer = Handle(TopoDS_TShape)::DownCast (anObject); if (!aShapePointer.IsNull()) { TopoDS_Shape aShape; aShape.TShape (aShapePointer); + if (aParamsIt.More()) + { + // each Transient object has own location/orientation description + TInspectorAPI_PluginParameters::ParametersToShape (aParamsIt.Value(), aShape); + aParamsIt.Next(); + } addShape (aShape); } else @@ -277,6 +294,7 @@ void ShapeView_Window::Init (NCollection_List& thePa myViewWindow->SetContext (View_ContextType_External, aContext); theParameters = aParameters; + myParameters->SetSelectedNames (aPluginName, NCollection_List()); } // ======================================================================= @@ -322,7 +340,7 @@ void ShapeView_Window::onTreeViewContextMenuRequested (const QPoint& thePosition if (!aModel) return; - QModelIndex anIndex = ShapeView_TreeModel::SingleSelected (aModel->selectedIndexes(), 0); + QModelIndex anIndex = TreeModel_ModelBase::SingleSelected (aModel->selectedIndexes(), 0); TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex); if (!anItemBase) return; @@ -330,19 +348,34 @@ void ShapeView_Window::onTreeViewContextMenuRequested (const QPoint& thePosition QMenu* aMenu = new QMenu(myMainWindow); ShapeView_ItemRootPtr aRootItem = itemDynamicCast (anItemBase); if (aRootItem) { - aMenu->addAction (createAction("Load BREP file", SLOT (onLoadFile()))); - aMenu->addAction (createAction ("Remove all shape items", SLOT (onClearView()))); + aMenu->addAction (ViewControl_Tools::CreateAction ("Load BREP file", SLOT (onLoadFile()), myMainWindow, this)); + aMenu->addAction (ViewControl_Tools::CreateAction ("Remove all shape items", SLOT (onClearView()), myMainWindow, this)); } 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()))); + if (!GetTemporaryDirectory().IsEmpty()) + aMenu->addAction (ViewControl_Tools::CreateAction ("BREP view", SLOT (onBREPView()), myMainWindow, this)); + aMenu->addAction (ViewControl_Tools::CreateAction ("Close All BREP views", SLOT (onCloseAllBREPViews()), myMainWindow, this)); + aMenu->addAction (ViewControl_Tools::CreateAction ("BREP directory", SLOT (onBREPDirectory()), myMainWindow, this)); } + QPoint aPoint = myTreeView->mapToGlobal (thePosition); aMenu->exec (aPoint); } +// ======================================================================= +// function : onEraseAllPerformed +// purpose : +// ======================================================================= +void ShapeView_Window::onEraseAllPerformed() +{ + ShapeView_TreeModel* aTreeModel = dynamic_cast (myTreeView->model()); + + // TODO: provide update for only visibility state for better performance TopoDS_Shape myCustomShape; + + aTreeModel->Reset(); + aTreeModel->EmitLayoutChanged(); +} + // ======================================================================= // function : onBREPDirectory // purpose : @@ -352,7 +385,7 @@ void ShapeView_Window::onBREPDirectory() QString aFilter (tr ("BREP file (*.brep*)")); QString aSelectedFilter; QString aFileName = QFileDialog::getOpenFileName (0, tr ("Export shape to BREP file"), - myTemporaryDirectory.ToCString(), aSelectedFilter); + GetTemporaryDirectory().ToCString(), aSelectedFilter); if (!aFileName.isEmpty()) viewFile (aFileName); } @@ -377,7 +410,7 @@ void ShapeView_Window::onLoadFile() // ======================================================================= void ShapeView_Window::onBREPView() { - if (myTemporaryDirectory.IsEmpty()) + if (GetTemporaryDirectory().IsEmpty()) return; QItemSelectionModel* aModel = myTreeView->selectionModel(); @@ -401,7 +434,7 @@ void ShapeView_Window::onBREPView() QDir aDir; if (aFileName.isEmpty() || !aDir.exists (aFileName)) { - TCollection_AsciiString aFileNameIndiced = myTemporaryDirectory + TCollection_AsciiString ("\\") + + TCollection_AsciiString aFileNameIndiced = GetTemporaryDirectory() + TCollection_AsciiString ("\\") + getNextTmpName (anItem->TShapePointer()); const TopoDS_Shape& aShape = anItem->GetItemShape(); BRepTools::Write (aShape, aFileNameIndiced.ToCString()); @@ -440,32 +473,6 @@ void ShapeView_Window::onEditorDestroyed(QObject* theObject) } } -// ======================================================================= -// function : displaySelectedShapes -// purpose : -// ======================================================================= -void ShapeView_Window::displaySelectedShapes (const QModelIndexList& theSelected) -{ - for (QModelIndexList::const_iterator aSelIt = theSelected.begin(); aSelIt != theSelected.end(); aSelIt++) - { - QModelIndex anIndex = *aSelIt; - if (anIndex.column() != 0) - continue; - - TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex); - if (!anItemBase) - continue; - - ShapeView_ItemShapePtr aShapeItem = itemDynamicCast(anItemBase); - if (!aShapeItem) - continue; - TopoDS_Shape aShape = aShapeItem->GetItemShape(); - myViewWindow->GetDisplayer()->DisplayPresentation (ShapeView_Tools::CreatePresentation(aShape), - View_PresentationType_Main, true); - } - myViewWindow->GetDisplayer()->UpdateViewer(); -} - // ======================================================================= // function : viewFile // purpose : @@ -506,7 +513,7 @@ void ShapeView_Window::viewFile (const QString& theFileName) // ======================================================================= void ShapeView_Window::removeBREPFiles() { - QDir aDir (myTemporaryDirectory.ToCString()); + QDir aDir (GetTemporaryDirectory().ToCString()); QStringList anEntries = aDir.entryList(); QString aPrefix(viewBREPPrefix().ToCString()); @@ -517,17 +524,6 @@ void ShapeView_Window::removeBREPFiles() } } -// ======================================================================= -// function : createAction -// purpose : -// ======================================================================= -QAction* ShapeView_Window::createAction (const QString& theText, const char* theSlot) -{ - QAction* anAction = new QAction (theText, myMainWindow); - connect (anAction, SIGNAL (triggered(bool)), this, theSlot); - return anAction; -} - // ======================================================================= // function : getNextTmpName // purpose : diff --git a/tools/ShapeView/ShapeView_Window.hxx b/tools/ShapeView/ShapeView_Window.hxx index a7014bd6e1..39274f8939 100644 --- a/tools/ShapeView/ShapeView_Window.hxx +++ b/tools/ShapeView/ShapeView_Window.hxx @@ -31,7 +31,6 @@ #include #include -class View_Displayer; class View_Window; class QAction; @@ -46,7 +45,7 @@ class ShapeView_Window : public QObject public: //! Constructor - Standard_EXPORT ShapeView_Window (QWidget* theParent, const TCollection_AsciiString& theTemporaryDirectory); + Standard_EXPORT ShapeView_Window (QWidget* theParent); //! Destructor Standard_EXPORT virtual ~ShapeView_Window(); @@ -60,6 +59,18 @@ public: //! \param theParameters a parameters container void SetParameters (const Handle(TInspectorAPI_PluginParameters)& theParameters) { myParameters = theParameters; } + //! Provide container for actions available in inspector on general level + //! \param theMenu if Qt implementation, it is QMenu object + Standard_EXPORT virtual void FillActionsMenu (void* theMenu); + + //! Returns plugin preferences: dock widgets state, tree view columns. + //! \param theItem container of preference elements + Standard_EXPORT void GetPreferences (TInspectorAPI_PreferencesDataMap& theItem); + + //! Applies plugin preferences + //! \param theItem container of preference elements + Standard_EXPORT void SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem); + //! Applyes parameters to Init controls, opens files if there are in parameters, updates OCAF tree view model Standard_EXPORT void UpdateContent(); @@ -70,7 +81,7 @@ public: QTreeView* GetTreeView() const { return myTreeView; } //! Returns path to temporary directory - TCollection_AsciiString GetTemporaryDirectory() const { return myTemporaryDirectory; } + TCollection_AsciiString GetTemporaryDirectory() const { return myParameters->GetTemporaryDirectory(); } //! Removes all shapes in tree view model, remove all stored BREP files Standard_EXPORT void RemoveAllShapes(); @@ -93,16 +104,13 @@ private: protected slots: - //! Displays shapes obtained by selected indices - //! \param theSelected a container of selected indices in tree view - //! \param theDeselected a container of deselected indices in tree view - void onTreeViewSelectionChanged (const QItemSelection& theSelected, const QItemSelection& theDeselected) - { (void)theDeselected; displaySelectedShapes(theSelected.indexes()); } - //! Shows context menu for tree view selected item. It contains expand/collapse actions. //! \param thePosition a clicked point void onTreeViewContextMenuRequested (const QPoint& thePosition); + //! Updates visibility states by erase all in context + void onEraseAllPerformed(); + //! Exports shape to BREP file and view result file void onBREPDirectory(); @@ -148,17 +156,13 @@ protected: //! \return string value TCollection_AsciiString getNextTmpName (const TCollection_AsciiString& thePointerInfo); - //! Finds shapes for selected items in tree view and display presentations for the shapes - //! \param theSelected a list of selected indices in tree view - void displaySelectedShapes (const QModelIndexList& theSelected); - private: QMainWindow* myMainWindow; //!< main control, parent for all ShapeView controls + View_Window* myViewWindow; //!< OCC 3d view to visualize presentations QTreeView* myTreeView; //!< tree view visualized shapes - TCollection_AsciiString myTemporaryDirectory; //!< path to the temporary directory int myNextPosition; //!< delta of moving control of view BREP file QList myBREPViews; //!< list of view BREP file controls diff --git a/tools/TInspector/FILES b/tools/TInspector/FILES index f6733979ac..21dba46d9d 100644 --- a/tools/TInspector/FILES +++ b/tools/TInspector/FILES @@ -3,5 +3,9 @@ TInspector_Communicator.cxx TInspector_Communicator.hxx TInspector_PluginParameters.cxx TInspector_PluginParameters.hxx +TInspector_Preferences.cxx +TInspector_Preferences.hxx +TInspector_Shortcut.cxx +TInspector_Shortcut.hxx TInspector_Window.cxx TInspector_Window.hxx diff --git a/tools/TInspector/TInspector.qrc b/tools/TInspector/TInspector.qrc index 1865368d6e..8fbf4bb7a5 100644 --- a/tools/TInspector/TInspector.qrc +++ b/tools/TInspector/TInspector.qrc @@ -1,5 +1,6 @@ icons/item_algo_folder.png + icons/plugin_actions.png diff --git a/tools/TInspector/TInspector_Communicator.cxx b/tools/TInspector/TInspector_Communicator.cxx index 025163e350..8ec0c8cc2a 100644 --- a/tools/TInspector/TInspector_Communicator.cxx +++ b/tools/TInspector/TInspector_Communicator.cxx @@ -37,9 +37,10 @@ TInspector_Communicator::TInspector_Communicator() static int argc = 1; static char* argv[] = { (char*)"", 0 }; #if QT_VERSION > 0x050000 - TCollection_AsciiString aPlugindsDirName = OSD_Environment ("QTDIR").Value(); - if (!aPlugindsDirName.IsEmpty()) - QApplication::addLibraryPath (QString (aPlugindsDirName.ToCString()) + "/plugins"); + OSD_Environment anEnvironment ("QTDIR"); + TCollection_AsciiString aPlugindsDirName = anEnvironment.Value(); + aPlugindsDirName += "/plugins"; + QApplication::addLibraryPath (aPlugindsDirName.ToCString()); #endif new QApplication (argc, argv); } @@ -58,3 +59,12 @@ void TInspector_Communicator::SetVisible (const bool theVisible) QApplication::processEvents(); #endif } + +// ======================================================================= +// function : Move +// purpose : +// ======================================================================= +void TInspector_Communicator::Move (const int theXPosition, const int theYPosition) +{ + myWindow->GetMainWindow()->move (theXPosition, theYPosition); +} diff --git a/tools/TInspector/TInspector_Communicator.hxx b/tools/TInspector/TInspector_Communicator.hxx index ff59ecfcaf..da88bb6000 100644 --- a/tools/TInspector/TInspector_Communicator.hxx +++ b/tools/TInspector/TInspector_Communicator.hxx @@ -86,10 +86,27 @@ public: Standard_EXPORT void SetSelected (const NCollection_List& theObjects) { myWindow->SetSelected (theObjects); } + //! Sets path to a directory for temporary plugin files + //! \param thePath a path + void SetTemporaryDirectory (const TCollection_AsciiString& thePath) { myWindow->SetTemporaryDirectory (thePath); } + + //! Returns path to a directory for temporary plugin files + //! \return path + TCollection_AsciiString GetTemporaryDirectory() const { return myWindow->GetTemporaryDirectory(); } + //! Change window visibility //! \param theVisible boolean state Standard_EXPORT virtual void SetVisible (const bool theVisible); + //! Change window position + //! \param theX X pixel position of top left corner of the window + //! \param theY Y pixel position + Standard_EXPORT virtual void Move (const int theXPosition, const int theYPosition); + + //! Puts in the stream information about communicator + //! \param theStream stream for output + void Dump (Standard_OStream& theStream) const { return myWindow->Dump (theStream); } + private: TInspector_Window* myWindow; //!< current window diff --git a/tools/TInspector/TInspector_PluginParameters.cxx b/tools/TInspector/TInspector_PluginParameters.cxx index 50ffd7de10..cb2972c7ef 100644 --- a/tools/TInspector/TInspector_PluginParameters.cxx +++ b/tools/TInspector/TInspector_PluginParameters.cxx @@ -15,6 +15,17 @@ #include +#include + +// ======================================================================= +// function : Constructor +// purpose : +// ======================================================================= +TInspector_PluginParameters::TInspector_PluginParameters (TInspector_Window* theWindow) +: myWindow (theWindow), myPreferences (new TInspector_Preferences()) +{ + myPreferences->SetDirectory (GetTemporaryDirectory()); +} // ======================================================================= // function : SetParameters @@ -32,3 +43,15 @@ void TInspector_PluginParameters::SetParameters (const TCollection_AsciiString& SetSelected (thePluginName, theParameters); myWindow->ActivateTool (thePluginName); } + +// ======================================================================= +// function : SetTemporaryDirectory +// purpose : +// ======================================================================= +void TInspector_PluginParameters::SetTemporaryDirectory (const TCollection_AsciiString& thePath) +{ + if (thePath.IsEqual (myPreferences->GetDirectory())) + return; + + myPreferences->SetDirectory (thePath); +} diff --git a/tools/TInspector/TInspector_PluginParameters.hxx b/tools/TInspector/TInspector_PluginParameters.hxx index ea88aae622..fcc29dc5ee 100644 --- a/tools/TInspector/TInspector_PluginParameters.hxx +++ b/tools/TInspector/TInspector_PluginParameters.hxx @@ -20,8 +20,11 @@ #include #include +#include #include +class TInspector_ReportCallBack; + //! \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 @@ -29,7 +32,7 @@ class TInspector_PluginParameters : public TInspectorAPI_PluginParameters public: //! Constructor - Standard_EXPORT TInspector_PluginParameters (TInspector_Window* theWindow) : myWindow (theWindow) {} + Standard_EXPORT TInspector_PluginParameters (TInspector_Window* theWindow); //! Destructor virtual ~TInspector_PluginParameters() Standard_OVERRIDE {} @@ -42,9 +45,34 @@ public: const NCollection_List& theParameters, const Standard_Boolean& theToActivatePlugin = Standard_False) Standard_OVERRIDE; + //! Sets path to a directory for temporary plugin files. Sets the directory into preferences loader + //! \param thePath a path + virtual void SetTemporaryDirectory (const TCollection_AsciiString& thePath) Standard_OVERRIDE; + + //! Returns plugin preferences + //! \param thePluginName a plugin name + virtual void GetPreferences (const TCollection_AsciiString& thePluginName, + TInspectorAPI_PreferencesDataMap& theItem) Standard_OVERRIDE + { myPreferences->GetPreferences (thePluginName, theItem); } + + //! Stores plugin preferences + //! \param thePluginName a plugin name + //! \theItem container of plugin preferences values in form: + virtual void SetPreferences (const TCollection_AsciiString& thePluginName, + const TInspectorAPI_PreferencesDataMap& theItem) Standard_OVERRIDE + { myPreferences->SetPreferences (thePluginName, theItem); } + + //! Store plugin preferences into a preferences file + void StorePreferences() { myPreferences->StorePreferences(); } + + //! Remove plugin preferences file + void RemovePreferences() { myPreferences->RemovePreferences(); } + private: TInspector_Window* myWindow; //!< the current window + Handle(TInspector_ReportCallBack) myReportCallBack; //!< inspector report callback for automatic view update + TInspector_Preferences* myPreferences; //!< the preferences loader }; #endif diff --git a/tools/TInspector/TInspector_Preferences.cxx b/tools/TInspector/TInspector_Preferences.cxx new file mode 100644 index 0000000000..3ccf899447 --- /dev/null +++ b/tools/TInspector/TInspector_Preferences.cxx @@ -0,0 +1,159 @@ +// 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 + +#include +#include +#include +#include +#include +#include +#include +#include + +// ======================================================================= +// function : GetPreferences +// purpose : +// ======================================================================= +void TInspector_Preferences::GetPreferences (const TCollection_AsciiString& thePluginName, + TInspectorAPI_PreferencesDataMap& theItem) +{ + theItem.Clear(); + if (!myIsLoadedPreferences) + { + loadPreferences(); + myIsLoadedPreferences = Standard_True; + } + myLoadedPreferences.Find (thePluginName, theItem); +} + +// ======================================================================= +// function : StorePreferences +// purpose : +// ======================================================================= +void TInspector_Preferences::StorePreferences() +{ + if (myLoadedPreferences.IsEmpty()) + return; + + QString aFileName = QString (GetDirectory().ToCString()) + QDir::separator() + PreferencesFileName(); + QFile aFile(aFileName); + if (!aFile.open (QFile::WriteOnly)) + return; + + QDomDocument aDomDocument (documentKey()); + QDomComment aComment = aDomDocument.createComment("\nThis file is automatically created by TInspector application.\nChanges made in this file can be lost.\n"); + aDomDocument.appendChild (aComment); + QDomElement aRootElement = aDomDocument.createElement (documentKey()); + aDomDocument.appendChild (aRootElement); + + for (NCollection_DataMap::Iterator aPrefsIt (myLoadedPreferences); + aPrefsIt.More(); aPrefsIt.Next()) + { + QDomElement aPluginElement = aDomDocument.createElement (pluginKey()); + aPluginElement.setAttribute (nameKey(), aPrefsIt.Key().ToCString()); + aRootElement.appendChild (aPluginElement); + + const TInspectorAPI_PreferencesDataMap& aPluginMap = aPrefsIt.Value(); + for (TInspectorAPI_IteratorOfPreferencesDataMap aPluginPrefsIt (aPluginMap); aPluginPrefsIt.More(); aPluginPrefsIt.Next()) + { + QDomElement aParameterElement = aDomDocument.createElement (parameterKey()); + aParameterElement.setAttribute (nameKey(), aPluginPrefsIt.Key().ToCString()); + aParameterElement.setAttribute (valueKey(), aPluginPrefsIt.Value().ToCString()); + aPluginElement.appendChild (aParameterElement); + } + } + + QTextStream aTextStream (&aFile); + QStringList aDocumentStr = aDomDocument.toString().split ("\n"); + for (QStringList::ConstIterator aContentIt = aDocumentStr.begin(); aContentIt != aDocumentStr.end(); ++aContentIt) + aTextStream << *aContentIt << endl; + aFile.close(); +} + +// ======================================================================= +// function : RemovePreferences +// purpose : +// ======================================================================= +void TInspector_Preferences::RemovePreferences() +{ + QString aFileName = QString (GetDirectory().ToCString()) + QDir::separator() + PreferencesFileName(); + QDir aDir (GetDirectory().ToCString()); + if (aDir.exists (aFileName)) + aDir.remove (aFileName); + reset(); +} + +// ======================================================================= +// function : loadPreferences +// purpose : +// ======================================================================= +void TInspector_Preferences::loadPreferences() +{ + QString aFileName = QString (GetDirectory().ToCString()) + QDir::separator() + PreferencesFileName(); + QFile aFile (aFileName); + if (!aFile.open (QFile::ReadOnly)) + return; + + QDomDocument aDomDocument; + bool aResult = aDomDocument.setContent (&aFile); + aFile.close(); + if (!aResult) + return; + + QDomElement aRootElement = aDomDocument.documentElement(); + if (aRootElement.isNull() || aRootElement.tagName() != documentKey()) + return; + + QDomNode aPluginNode = aRootElement.firstChild(); + while (!aPluginNode.isNull()) + { + if (aPluginNode.isElement()) + { + QDomElement aPluginElement = aPluginNode.toElement(); + if (aPluginElement.tagName() == pluginKey() && aPluginElement.hasAttribute (nameKey())) + { + TInspectorAPI_PreferencesDataMap anItem; + readPluginItem (aPluginElement, anItem); + myLoadedPreferences.Bind (aPluginElement.attribute (nameKey()).toStdString().c_str(), anItem); + } + } + aPluginNode = aPluginNode.nextSibling(); + } +} + +// ======================================================================= +// function : readPluginItem +// purpose : +// ======================================================================= +void TInspector_Preferences::readPluginItem (const QDomElement thePluginElement, TInspectorAPI_PreferencesDataMap& theItem) +{ + QDomNode aParameterNode = thePluginElement.firstChild(); + while (!aParameterNode.isNull()) + { + if (aParameterNode.isElement()) + { + QDomElement aParameterElement = aParameterNode.toElement(); + if (aParameterElement.tagName() == parameterKey() && + aParameterElement.hasAttribute (nameKey()) && aParameterElement.hasAttribute (valueKey())) + { + theItem.Bind (aParameterElement.attribute (nameKey()).toStdString().c_str(), + aParameterElement.attribute (valueKey()).toStdString().c_str()); + } + } + aParameterNode = aParameterNode.nextSibling(); + } +} diff --git a/tools/TInspector/TInspector_Preferences.hxx b/tools/TInspector/TInspector_Preferences.hxx new file mode 100644 index 0000000000..141cf2d98e --- /dev/null +++ b/tools/TInspector/TInspector_Preferences.hxx @@ -0,0 +1,100 @@ +// 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 TInspector_Preferences_H +#define TInspector_Preferences_H + +#include +#include + +#include +#include +#include + +//! The class to read/write custom plugin preferences in XML format. +//! The preferences file is intended to know about: +//! - dock window placement +//! - tree view columns: visibility, width +class TInspector_Preferences +{ +public: + //! Constructs the communicator. + TInspector_Preferences() {} + + //! Destructor + virtual ~TInspector_Preferences() {} + + static Standard_CString PreferencesFileName() { return ".tinspector.xml"; } + + //! Sets path to a preferences file + //! \param thePath a path + void SetDirectory (const TCollection_AsciiString& thePath) { reset(); myDirectory = thePath; } + + //! Returns path to a preferences file + //! \return path + TCollection_AsciiString GetDirectory() const { return myDirectory; } + + //! Returns plugin preferences + //! \param thePluginName a plugin name + Standard_EXPORT void GetPreferences (const TCollection_AsciiString& thePluginName, + TInspectorAPI_PreferencesDataMap& theItem); + + //! Stores plugin preferences + //! \param thePluginName a plugin name + //! \theItem container of plugin preferences values in form: + void SetPreferences (const TCollection_AsciiString& thePluginName, const TInspectorAPI_PreferencesDataMap& theItem) + { myLoadedPreferences.Bind(thePluginName, theItem); } + + //! Store plugin preferences into a preferences file + Standard_EXPORT void StorePreferences(); + + //! Remove plugin preferences file + Standard_EXPORT void RemovePreferences(); + +private: + //! Loads the directory preference file with filling internal container + void loadPreferences(); + + //! clears all internal containers with information of already loaded file + void reset() { myLoadedPreferences.Clear(); myIsLoadedPreferences = Standard_False; } + + //! Reads plugin preferences and fill container + void readPluginItem(const QDomElement thePluginElement, TInspectorAPI_PreferencesDataMap& theItem); + + //! Returns text of attribute document + static Standard_CString documentKey() { return "document"; } + + //! Returns text of attribute plugin + static Standard_CString pluginKey() { return "plugin"; } + + //! Returns text of attribute parameter + static Standard_CString parameterKey() { return "parameter"; } + + //! Returns text of attribute name + static Standard_CString nameKey() { return "name"; } + + //! Returns text of attribute value + static Standard_CString valueKey() { return "value"; } + +private: + //! directory of preferences file + TCollection_AsciiString myDirectory; + //! container of already loaded preferences : cache + NCollection_DataMap myLoadedPreferences; + //! state whether the preferences of the current directory is loaded + Standard_Boolean myIsLoadedPreferences; +}; + +#endif diff --git a/tools/DFBrowser/DFBrowser_Shortcut.cxx b/tools/TInspector/TInspector_Shortcut.cxx similarity index 79% rename from tools/DFBrowser/DFBrowser_Shortcut.cxx rename to tools/TInspector/TInspector_Shortcut.cxx index 1908eb72bb..106022b86a 100644 --- a/tools/DFBrowser/DFBrowser_Shortcut.cxx +++ b/tools/TInspector/TInspector_Shortcut.cxx @@ -13,9 +13,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#include -#include +#include #include #include @@ -26,8 +26,8 @@ // function : Constructor // purpose : // ======================================================================= -DFBrowser_Shortcut::DFBrowser_Shortcut (QObject* theParent) -: QObject (theParent), myModule (0) +TInspector_Shortcut::TInspector_Shortcut (QObject* theParent, TInspector_Window* theWindow) +: QObject (theParent), myWindow (theWindow) { qApp->installEventFilter (this); } @@ -36,9 +36,9 @@ DFBrowser_Shortcut::DFBrowser_Shortcut (QObject* theParent) // function : eventFilter // purpose : // ======================================================================= -bool DFBrowser_Shortcut::eventFilter (QObject* theObject, QEvent* theEvent) +bool TInspector_Shortcut::eventFilter (QObject* theObject, QEvent* theEvent) { - if (!myModule || theEvent->type() != QEvent::KeyRelease) + if (!myWindow || theEvent->type() != QEvent::KeyRelease) return QObject::eventFilter (theObject, theEvent); QKeyEvent* aKeyEvent = dynamic_cast (theEvent); @@ -46,7 +46,7 @@ bool DFBrowser_Shortcut::eventFilter (QObject* theObject, QEvent* theEvent) { case Qt::Key_F5: { - myModule->UpdateTreeModel(); + myWindow->UpdateContent(); return true; } default: break; diff --git a/tools/DFBrowser/DFBrowser_Shortcut.hxx b/tools/TInspector/TInspector_Shortcut.hxx similarity index 71% rename from tools/DFBrowser/DFBrowser_Shortcut.hxx rename to tools/TInspector/TInspector_Shortcut.hxx index 977b4517db..202b9ea115 100644 --- a/tools/DFBrowser/DFBrowser_Shortcut.hxx +++ b/tools/TInspector/TInspector_Shortcut.hxx @@ -13,8 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef DFBrowser_Shortcut_H -#define DFBrowser_Shortcut_H +#ifndef TInspector_Shortcut_H +#define TInspector_Shortcut_H #include #include @@ -23,31 +23,27 @@ #include #include -class DFBrowser_Module; +class TInspector_Window; class QEvent; -//! \class DFBrowser_Shortcut +//! \class TInspector_Shortcut //! Listens application KeyRelease event. Processes key event: -//! - : updates tree view model -class DFBrowser_Shortcut : public QObject +//! - : updates content (tree view model) of the active plugin +class TInspector_Shortcut : public QObject { public: //! Constructor - Standard_EXPORT DFBrowser_Shortcut (QObject* theParent); + Standard_EXPORT TInspector_Shortcut (QObject* theParent, TInspector_Window* theWindow); //! Destructor - virtual ~DFBrowser_Shortcut() {} - - //! Sets the current module - //! \param theModule a module - void SetModule (DFBrowser_Module* theModule) { myModule = theModule; } + virtual ~TInspector_Shortcut() {} //! Processes key release event to update view model, otherwise do usual QObject functionality Standard_EXPORT virtual bool eventFilter (QObject *theObject, QEvent* theEvent) Standard_OVERRIDE; private: - DFBrowser_Module* myModule; //!< the current module + TInspector_Window* myWindow; //!< the current window }; diff --git a/tools/TInspector/TInspector_Window.cxx b/tools/TInspector/TInspector_Window.cxx index 0c777d1cf5..76eacae75c 100644 --- a/tools/TInspector/TInspector_Window.cxx +++ b/tools/TInspector/TInspector_Window.cxx @@ -13,19 +13,30 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include #include #include #include +#include +#include + +#include + +#include +#include +#include +#include #include #include +#include #include #include #include +#include #include #include +#include #include #include @@ -56,13 +67,32 @@ TInspector_Window::TInspector_Window() myEmptyWidget = new QWidget (aCentralWidget); myToolsStack->addWidget (myEmptyWidget); + QWidget* aTopWidget = new QWidget (aCentralWidget); + QHBoxLayout* aTopWidgetLayout = new QHBoxLayout (aTopWidget); + aTopWidgetLayout->setContentsMargins (0, 0, 0, 0); + aTopWidgetLayout->setSpacing (0); + myButtonWidget = new QWidget (aCentralWidget); myButtonLay = new QHBoxLayout (myButtonWidget); myButtonLay->setContentsMargins (0, 0, 0, 0); myButtonLay->setSpacing (0); myButtonLay->insertStretch (0, 1); - aCentralLayout->addWidget (myButtonWidget); + myButtonGroup = new QButtonGroup (aCentralWidget); + myButtonGroup->setExclusive (true); + + myActionsWidget = new QToolButton(aCentralWidget); + myActionsWidget->setPopupMode(QToolButton::InstantPopup); + myActionsWidget->setIcon (QIcon (":/icons/plugin_actions.png")); + myActionsWidget->setIconSize (QSize (20, 20)); + QMenu* anActionsMenu = new QMenu(myActionsWidget); + myActionsWidget->setMenu(anActionsMenu); + connect (anActionsMenu, SIGNAL (aboutToShow()), this, SLOT (onShowActionsMenu())); + + aTopWidgetLayout->addWidget(myButtonWidget, 1); + aTopWidgetLayout->addWidget(myActionsWidget); + + aCentralLayout->addWidget (aTopWidget); aCentralLayout->addWidget (myToolsStack); myMainWindow->resize (TINSPECTOR_DEFAULT_WIDTH, TINSPECTOR_DEFAULT_HEIGHT); @@ -70,6 +100,13 @@ TInspector_Window::TInspector_Window() myMainWindow->setDockOptions (QMainWindow::VerticalTabs); myParameters = new TInspector_PluginParameters (this); + + myDefaultDirectory = defaultTemporaryDirectory(); + myParameters->SetTemporaryDirectory (myDefaultDirectory); + + applyPreferences(); + + myShortcut = new TInspector_Shortcut (myMainWindow, this); } // ======================================================================= @@ -80,7 +117,7 @@ void TInspector_Window::RegisterPlugin (const TCollection_AsciiString& thePlugin { TInspector_ToolInfo anInfo; int aToolId; - if (FindPlugin (thePluginName, anInfo, aToolId)) + if (findPlugin (thePluginName, anInfo, aToolId)) return; myToolNames.append (TInspector_ToolInfo (thePluginName)); @@ -137,7 +174,7 @@ void TInspector_Window::Init (const TCollection_AsciiString& thePluginName, TInspector_ToolInfo anInfo; int aToolId; - if (!FindPlugin (thePluginName, anInfo, aToolId)) + if (!findPlugin (thePluginName, anInfo, aToolId)) return; if (anInfo.myButton) @@ -148,8 +185,10 @@ void TInspector_Window::Init (const TCollection_AsciiString& thePluginName, aButtonName = aButtonName.mid(2); QPushButton* aButton = new QPushButton(aButtonName, myButtonWidget); + aButton->setCheckable (true); connect (aButton, SIGNAL (clicked (bool)), this, SLOT (onButtonClicked())); myButtonLay->insertWidget (myButtonLay->count()-1, aButton); + myButtonGroup->addButton (aButton); anInfo.myButton = aButton; myToolNames[aToolId] = anInfo; } @@ -173,6 +212,7 @@ void TInspector_Window::ActivateTool (const TCollection_AsciiString& thePluginNa return; TInspector_ToolInfo anInfo = myToolNames[aToolIndex]; + bool isPluginLoaded = false; if (!anInfo.myWidget) { if (!LoadPlugin (thePluginName, anInfo)) @@ -180,6 +220,7 @@ void TInspector_Window::ActivateTool (const TCollection_AsciiString& thePluginNa anInfo.myButton->setEnabled (false); return; } + isPluginLoaded = true; myToolsStack->addWidget (anInfo.myWidget); myToolNames[aToolIndex] = anInfo; } @@ -190,6 +231,13 @@ void TInspector_Window::ActivateTool (const TCollection_AsciiString& thePluginNa myOpenButton->setObjectName (thePluginName.ToCString()); anInfo.myCommunicator->UpdateContent(); + if (isPluginLoaded) + { + // apply preferences + TInspectorAPI_PreferencesDataMap aPreferences; + myParameters->GetPreferences (thePluginName, aPreferences); + anInfo.myCommunicator->SetPreferences (aPreferences); + } onCommuncatorNameChanged(); } @@ -200,7 +248,7 @@ void TInspector_Window::ActivateTool (const TCollection_AsciiString& thePluginNa void TInspector_Window::SetSelected (const NCollection_List& theItemNames) { TInspector_ToolInfo anInfo; - if (!ActiveToolInfo (anInfo)) + if (!activeToolInfo (anInfo)) return; myParameters->SetSelectedNames (anInfo.myName, theItemNames); @@ -219,7 +267,7 @@ void TInspector_Window::SetSelected (const NCollection_List& theObjects) { TInspector_ToolInfo anInfo; - if (!ActiveToolInfo (anInfo)) + if (!activeToolInfo (anInfo)) return; myParameters->SetSelected (anInfo.myName, theObjects); @@ -239,7 +287,7 @@ void TInspector_Window::SetOpenButton (QPushButton* theButton) { myOpenButton = theButton; TInspector_ToolInfo anInfo; - if (ActiveToolInfo (anInfo)) + if (activeToolInfo (anInfo)) myOpenButton->setObjectName (anInfo.myName.ToCString()); myButtonLay->insertWidget (0, theButton); } @@ -262,7 +310,7 @@ void TInspector_Window::OpenFile (const TCollection_AsciiString& thePluginName, myParameters->AddFileName (thePluginName, theFileName); TInspector_ToolInfo anInfo; - if (!ActiveToolInfo (anInfo) || anInfo.myName != thePluginName) + if (!activeToolInfo (anInfo) || anInfo.myName != thePluginName) return; TInspectorAPI_Communicator* aCommunicator = anInfo.myCommunicator; @@ -277,10 +325,8 @@ void TInspector_Window::OpenFile (const TCollection_AsciiString& thePluginName, void TInspector_Window::UpdateContent() { TInspector_ToolInfo anInfo; - if (!ActiveToolInfo (anInfo) || !anInfo.myCommunicator) - return; - - anInfo.myCommunicator->UpdateContent(); + if (activeToolInfo (anInfo) && anInfo.myCommunicator) + anInfo.myCommunicator->UpdateContent(); } // ======================================================================= @@ -314,6 +360,90 @@ bool TInspector_Window::LoadPlugin (const TCollection_AsciiString& thePluginName return aLoaded; } +// ======================================================================= +// function : GetPreferences +// purpose : +// ======================================================================= +void TInspector_Window::GetPreferences (TInspectorAPI_PreferencesDataMap& theItem) +{ + theItem.Clear(); + theItem.Bind ("geometry", TreeModel_Tools::ToString (myMainWindow->saveGeometry()).toStdString().c_str()); +} + +// ======================================================================= +// function : SetPreferences +// purpose : +// ======================================================================= +void TInspector_Window::SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem) +{ + for (TInspectorAPI_IteratorOfPreferencesDataMap anItemIt (theItem); anItemIt.More(); anItemIt.Next()) + { + if (anItemIt.Key().IsEqual ("geometry")) + myMainWindow->restoreGeometry (TreeModel_Tools::ToByteArray (anItemIt.Value().ToCString())); + } +} + +// ======================================================================= +// function : Dump +// purpose : +// ======================================================================= +void TInspector_Window::Dump (Standard_OStream& theStream) const +{ + TInspector_ToolInfo anInfo; + activeToolInfo(anInfo); + + theStream << "Active Plugin: " << anInfo.myName << "\n"; + theStream << "Temporary Directory: " << GetTemporaryDirectory() << "\n"; +} + +// ======================================================================= +// function : OnStorePreferences +// purpose : +// ======================================================================= +void TInspector_Window::OnStorePreferences() +{ + Handle(TInspector_PluginParameters) aParameters = Handle(TInspector_PluginParameters)::DownCast (myParameters); + TInspectorAPI_PreferencesDataMap aPreferences; + GetPreferences (aPreferences); + aParameters->SetPreferences ("Desktop", aPreferences); + + TInspector_ToolInfo anInfo; + for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++) + { + anInfo = myToolNames[aToolId]; + if (!anInfo.myCommunicator) + continue; + + anInfo.myCommunicator->GetPreferences (aPreferences); + myParameters->SetPreferences (anInfo.myName, aPreferences); + } + + // store preferences parameters into a file + aParameters->StorePreferences(); +} + +// ======================================================================= +// function : OnRemovePreferences +// purpose : +// ======================================================================= +void TInspector_Window::OnRemovePreferences() +{ + Handle(TInspector_PluginParameters) aParameters = Handle(TInspector_PluginParameters)::DownCast (myParameters); + + // remove preferences file + aParameters->RemovePreferences(); + + // restore plugins default state + TInspector_ToolInfo anInfo; + for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++) + { + anInfo = myToolNames[aToolId]; + if (!anInfo.myCommunicator) + continue; + anInfo.myCommunicator->SetPreferences (TInspectorAPI_PreferencesDataMap()); + } +} + // ======================================================================= // function : onButtonClicked // purpose : @@ -321,7 +451,38 @@ bool TInspector_Window::LoadPlugin (const TCollection_AsciiString& thePluginName void TInspector_Window::onButtonClicked() { QPushButton* aButton = (QPushButton*)sender(); - ActivateTool (TCollection_AsciiString ("TK") + aButton->text().toStdString().c_str()); + + TCollection_AsciiString aPluginName = aButton->text().toStdString().c_str(); + + TInspector_ToolInfo anInfo; + int aToolId; + if (!findPlugin (aPluginName, anInfo, aToolId)) + aPluginName = TCollection_AsciiString ("TK") + aPluginName; + + ActivateTool (aPluginName); +} + +// ======================================================================= +// function : onShowActionsMenu +// purpose : +// ======================================================================= +void TInspector_Window::onShowActionsMenu() +{ + myActionsWidget->menu()->clear(); + + TInspector_ToolInfo anInfo; + activeToolInfo(anInfo); + + QMenu* aMenu = myActionsWidget->menu(); + anInfo.myCommunicator->FillActionsMenu(aMenu); + + aMenu->addSeparator(); + aMenu->addAction (ViewControl_Tools::CreateAction (tr ("Store Preferences"), + SLOT (OnStorePreferences()), myMainWindow, this)); + QAction* anAction = ViewControl_Tools::CreateAction (tr ("Remove Preferences"), + SLOT (OnRemovePreferences()), myMainWindow, this); + anAction->setToolTip ("Default state will be restored after restarting the application"); + aMenu->addAction (anAction); } // ======================================================================= @@ -332,17 +493,17 @@ void TInspector_Window::onCommuncatorNameChanged() { #if QT_VERSION >= 0x050000 TInspector_ToolInfo anInfo; - if (!ActiveToolInfo (anInfo)) + if (!activeToolInfo (anInfo)) return; myMainWindow->setWindowTitle (anInfo.myWidget->objectName()); #endif } // ======================================================================= -// function : ActiveToolInfo +// function : activeToolInfo // purpose : // ======================================================================= -bool TInspector_Window::ActiveToolInfo (TInspector_Window::TInspector_ToolInfo& theToolInfo) const +bool TInspector_Window::activeToolInfo (TInspector_Window::TInspector_ToolInfo& theToolInfo) const { QWidget* anActiveWidget = myToolsStack->currentWidget(); if (anActiveWidget == myEmptyWidget) @@ -360,10 +521,10 @@ bool TInspector_Window::ActiveToolInfo (TInspector_Window::TInspector_ToolInfo& } // ======================================================================= -// function : FindPlugin +// function : findPlugin // purpose : // ======================================================================= -bool TInspector_Window::FindPlugin (const TCollection_AsciiString& thePluginName, TInspector_ToolInfo& theToolInfo, +bool TInspector_Window::findPlugin (const TCollection_AsciiString& thePluginName, TInspector_ToolInfo& theToolInfo, int& theToolId) { for (int aToolId = 0, aSize = myToolNames.size(); aToolId < aSize; aToolId++) @@ -378,4 +539,53 @@ bool TInspector_Window::FindPlugin (const TCollection_AsciiString& thePluginName return false; } - \ No newline at end of file + +// ======================================================================= +// function : applyPreferences +// purpose : +// ======================================================================= +void TInspector_Window::applyPreferences() +{ + TInspectorAPI_PreferencesDataMap aPreferences; + myParameters->GetPreferences ("Desktop", aPreferences); + SetPreferences (aPreferences); +} + +// ======================================================================= +// function : defaultTemporaryDirectory +// purpose : +// ======================================================================= +TCollection_AsciiString TInspector_Window::defaultTemporaryDirectory() const +{ + // main window creation + TCollection_AsciiString aTmpDir; +#ifdef _WIN32 + OSD_Environment anEnvironment ("TEMP"); + aTmpDir = anEnvironment.Value(); + if (aTmpDir.IsEmpty() ) + { + anEnvironment.SetName ("TMP"); + aTmpDir = anEnvironment.Value(); + if (aTmpDir.IsEmpty()) + aTmpDir = "C:\\"; + } + if (!aTmpDir.EndsWith ("\\")) + aTmpDir += "\\"; + OSD_Path aTmpPath (aTmpDir); + OSD_Directory aTmpDirectory; +#else + OSD_Directory aTmpDirectory = OSD_Directory::BuildTemporary(); + OSD_Path aTmpPath; + aTmpDirectory.Path (aTmpPath); +#endif + aTmpPath.DownTrek ("TInspector"); + aTmpDirectory.SetPath (aTmpPath); + if (!aTmpDirectory.Exists()) + aTmpDirectory.Build (OSD_Protection()); + + aTmpDirectory.Path (aTmpPath); + TCollection_AsciiString aTmpDirectoryName; + aTmpPath.SystemName (aTmpDirectoryName); + + return aTmpDir; +} diff --git a/tools/TInspector/TInspector_Window.hxx b/tools/TInspector/TInspector_Window.hxx index 10048c5d82..3c547303eb 100644 --- a/tools/TInspector/TInspector_Window.hxx +++ b/tools/TInspector/TInspector_Window.hxx @@ -29,11 +29,14 @@ #include class TInspectorAPI_Communicator; +class TInspector_Shortcut; +class QButtonGroup; class QMainWindow; class QHBoxLayout; class QPushButton; class QStackedWidget; +class QToolButton; //! \class Inspector_Window //! Control that contains: @@ -117,11 +120,42 @@ public: //! \param theInfo an output parameter for plugin info Standard_EXPORT bool LoadPlugin (const TCollection_AsciiString& thePluginName, TInspector_ToolInfo& theInfo); + //! Sets path to a directory for temporary plugin files. If parameter is empty, using default directory + //! \param thePath a path + void SetTemporaryDirectory (const TCollection_AsciiString& thePath) + { myParameters->SetTemporaryDirectory (thePath.IsEmpty() ? myDefaultDirectory : thePath); } + + //! Returns path to a directory for temporary plugin files + //! \return path + TCollection_AsciiString GetTemporaryDirectory() const { return myParameters->GetTemporaryDirectory(); } + + //! Returns plugin preferences: dock widgets state, tree view columns. + //! \param theItem container of preference elements + Standard_EXPORT void GetPreferences (TInspectorAPI_PreferencesDataMap& theItem); + + //! Applies plugin preferences + //! \param theItem container of preference elements + Standard_EXPORT void SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem); + + //! Puts in the stream information about communicator + //! \param theStream stream for output + Standard_EXPORT void Dump (Standard_OStream& theStream) const; + +public slots: + //! Stores preferences (current state) of all plugins into a preferences file + Standard_EXPORT void OnStorePreferences(); + + //! Remove preferences file + Standard_EXPORT void OnRemovePreferences(); + protected slots: //! Activates plugin correspnded to the clicked button void onButtonClicked(); + //! Updates available actions by the active plugin + void onShowActionsMenu(); + //! Updates the TInspector window title giving object name of plugin widget (available only in Qt5) void onCommuncatorNameChanged(); @@ -129,16 +163,23 @@ protected: //! Activates plugin by the plugin info //! \param theToolInfo an information about plugin - bool ActiveToolInfo (TInspector_ToolInfo& theToolInfo) const; + 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, + bool findPlugin (const TCollection_AsciiString& thePluginName, TInspector_ToolInfo& theToolInfo, int& theToolId); + //! Applies desktop preferences to window + void applyPreferences(); + + //! Generate default temp directory by 'TEMP' or 'TMP' environment variables + //! \return generated path + TCollection_AsciiString defaultTemporaryDirectory() const; + private: QWidget* myEmptyWidget; //!< widget that is active in tools stack while no one plugin is loaded @@ -147,8 +188,12 @@ private: QWidget* myButtonWidget; //!< container of plugin buttons QPushButton* myOpenButton; //!< button to open file for the active plugin QHBoxLayout* myButtonLay; //!< layout of plugin buttons + QButtonGroup* myButtonGroup; //!< exclusive toggled button + QToolButton* myActionsWidget; //!< tool button for plugin actions QList myToolNames; //!< container of plugin names Handle(TInspectorAPI_PluginParameters) myParameters; //!< plugins parameters container + TInspector_Shortcut* myShortcut; //!< listener of key events + TCollection_AsciiString myDefaultDirectory; //!< default directory }; #endif diff --git a/tools/TInspector/icons/plugin_actions.png b/tools/TInspector/icons/plugin_actions.png new file mode 100644 index 0000000000000000000000000000000000000000..10792a3d8e09f0311c0b559c3530e557585d1014 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1SFYWcSQjy#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V4|msV~BG~rw3hczUg!9oVa8xdqwPq)VG}dCtk1F wvA@jTU~0zm8zFa|sJoopo^qmk&LmfFVdQ&MBb@0PVm^761SM literal 0 HcmV?d00001 diff --git a/tools/TInspectorAPI/FILES b/tools/TInspectorAPI/FILES index 3cd6f3e4d6..63cf600d14 100644 --- a/tools/TInspectorAPI/FILES +++ b/tools/TInspectorAPI/FILES @@ -2,3 +2,4 @@ TInspectorAPI_Communicator.cxx TInspectorAPI_Communicator.hxx TInspectorAPI_PluginParameters.cxx TInspectorAPI_PluginParameters.hxx +TInspectorAPI_PreferencesDataMap.hxx diff --git a/tools/TInspectorAPI/TInspectorAPI_Communicator.hxx b/tools/TInspectorAPI/TInspectorAPI_Communicator.hxx index ee26363c31..b25f4dbf0b 100644 --- a/tools/TInspectorAPI/TInspectorAPI_Communicator.hxx +++ b/tools/TInspectorAPI/TInspectorAPI_Communicator.hxx @@ -50,6 +50,16 @@ public: //! \param theParent a parent class Standard_EXPORT virtual void SetParent (void* theParent) = 0; + //! Provide container for actions available in inspector on general level + //! \param theMenu if Qt implementation, it is QMenu object + Standard_EXPORT virtual void FillActionsMenu (void* theMenu) { (void)theMenu; } + + //! Returns plugin preferences, empty implementation by default + virtual void GetPreferences (TInspectorAPI_PreferencesDataMap&) {} + + //! Applies plugin preferences, empty implementation by default + virtual void SetPreferences (const TInspectorAPI_PreferencesDataMap&) {} + //! Calls update of the plugin's content Standard_EXPORT virtual void UpdateContent() = 0; diff --git a/tools/TInspectorAPI/TInspectorAPI_PluginParameters.cxx b/tools/TInspectorAPI/TInspectorAPI_PluginParameters.cxx index 1bf0725f14..baafa43fe6 100644 --- a/tools/TInspectorAPI/TInspectorAPI_PluginParameters.cxx +++ b/tools/TInspectorAPI/TInspectorAPI_PluginParameters.cxx @@ -22,14 +22,6 @@ IMPLEMENT_STANDARD_RTTIEXT (TInspectorAPI_PluginParameters, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT (TInspectorAPI_PluginParameters, Standard_Transient) #endif -// ======================================================================= -// function : Constructor -// purpose : -// ======================================================================= -TInspectorAPI_PluginParameters::TInspectorAPI_PluginParameters() -{ -} - // ======================================================================= // function : SetParameters // purpose : @@ -51,8 +43,8 @@ void TInspectorAPI_PluginParameters::SetParameters (const TCollection_AsciiStrin void TInspectorAPI_PluginParameters::AddFileName (const TCollection_AsciiString& thePluginName, const TCollection_AsciiString& theFileName) { - if (myFileNames.IsBound(thePluginName)) - myFileNames.ChangeFind(thePluginName).Append (theFileName); + if (myFileNames.IsBound (thePluginName)) + myFileNames.ChangeFind (thePluginName).Append (theFileName); else { NCollection_List aNames; @@ -103,7 +95,7 @@ void TInspectorAPI_PluginParameters::SetSelected (const TCollection_AsciiString& // ======================================================================= bool TInspectorAPI_PluginParameters::FindParameters (const TCollection_AsciiString& thePluginName) { - return myParameters.IsBound(thePluginName); + return myParameters.IsBound (thePluginName); } // ======================================================================= @@ -122,7 +114,7 @@ const NCollection_List& TInspectorAPI_PluginParamete // ======================================================================= bool TInspectorAPI_PluginParameters::FindFileNames (const TCollection_AsciiString& thePluginName) { - return myFileNames.IsBound(thePluginName); + return myFileNames.IsBound (thePluginName); } // ======================================================================= @@ -141,7 +133,7 @@ const NCollection_List& TInspectorAPI_PluginParameters: // ======================================================================= bool TInspectorAPI_PluginParameters::FindSelectedNames (const TCollection_AsciiString& thePluginName) { - return mySelectedItemNames.IsBound(thePluginName); + return mySelectedItemNames.IsBound (thePluginName); } // ======================================================================= @@ -163,3 +155,131 @@ Standard_Boolean TInspectorAPI_PluginParameters::GetSelectedObjects (const TColl { return mySelectedObjects.Find (thePluginName, theObjects); } + +// ======================================================================= +// function : toString +// purpose : +// ======================================================================= +TCollection_AsciiString toString (const TopLoc_Location& theLocation) +{ + TCollection_AsciiString anInfo; + gp_Trsf aTrsf = theLocation.Transformation(); + for (int aRowId = 1; aRowId <= 3; aRowId++) + { + if (!anInfo.IsEmpty()) + anInfo += " "; + for (int aColumnId = 1; aColumnId <= 4; aColumnId++) + { + if (aColumnId > 1) + anInfo += ","; + anInfo += TCollection_AsciiString (aTrsf.Value (aRowId, aColumnId)); + } + } + return anInfo; +} + +// ======================================================================= +// function : ParametersToString +// purpose : +// ======================================================================= +TCollection_AsciiString TInspectorAPI_PluginParameters::ParametersToString (const TopoDS_Shape& theShape) +{ + const TopLoc_Location& aLocation = theShape.Location(); + TCollection_AsciiString aLocationStr = toString (aLocation); + + TopAbs_Orientation anOrientation = theShape.Orientation(); + Standard_SStream aSStream; + TopAbs::Print (anOrientation, aSStream); + return TCollection_AsciiString (aSStream.str().c_str()) + ":" + aLocationStr; +} + +// ======================================================================= +// function : fromString +// purpose : +// ======================================================================= +TopLoc_Location fromString (const TCollection_AsciiString& theValue) +{ + NCollection_Mat4 aValues; + + TCollection_AsciiString aCurrentString = theValue; + Standard_Integer aPosition = aCurrentString.Search (" "); + if (aPosition < 0) + return TopLoc_Location(); + TCollection_AsciiString aTailString = aCurrentString.Split (aPosition); + Standard_Integer aRow = 0; + while (!aCurrentString.IsEmpty()) + { + TCollection_AsciiString aValueString = aCurrentString; + aPosition = aValueString.Search (","); + if (aPosition < 0 ) + break; + aCurrentString = aValueString.Split (aPosition); + Standard_Integer aColumn = 0; + while (!aValueString.IsEmpty()) + { + aPosition = aCurrentString.Search (" "); + if (aPosition > 0) + aValueString.Split (aValueString.Length() - 1); + + aValues.SetValue (aRow, aColumn, aValueString.RealValue()); + aColumn++; + if (aCurrentString.IsEmpty()) + break; + aValueString = aCurrentString; + aPosition = aValueString.Search (","); + if (aPosition < 0 ) + { + aValueString = aCurrentString; + aCurrentString = TCollection_AsciiString(); + } + else + aCurrentString = aValueString.Split (aPosition); + } + if (aTailString.IsEmpty()) + break; + aCurrentString = aTailString; + aPosition = aCurrentString.Search (" "); + if (aPosition < 0 ) + { + aCurrentString = aTailString; + aTailString = TCollection_AsciiString(); + } + else + aTailString = aCurrentString.Split (aPosition); + aRow++; + } + + //if (aValues.Rows() != 3 || aValues.Cols() != 4) + // return TopLoc_Location(); + + gp_Trsf aTrsf; + aTrsf.SetValues (aValues.GetValue (0, 0), aValues.GetValue (0, 1), aValues.GetValue (0, 2), aValues.GetValue (0, 3), + aValues.GetValue (1, 0), aValues.GetValue (1, 1), aValues.GetValue (1, 2), aValues.GetValue (1, 3), + aValues.GetValue (2, 0), aValues.GetValue (2, 1), aValues.GetValue (2, 2), aValues.GetValue (2, 3)); + return TopLoc_Location (aTrsf); +} + +// ======================================================================= +// function : ParametersToShape +// purpose : +// ======================================================================= +void TInspectorAPI_PluginParameters::ParametersToShape (const TCollection_AsciiString& theValue, + TopoDS_Shape& theShape) +{ + int aSeparatorPos = theValue.Search (":"); + TCollection_AsciiString anOrientationStr = theValue; + TCollection_AsciiString aLocationStr = anOrientationStr.Split (aSeparatorPos); + // orientation + if (anOrientationStr.Length() < 2) + return; + anOrientationStr.Split (anOrientationStr.Length() - 1); + + TopAbs_Orientation anOrientation; + if (!TopAbs::ShapeOrientationFromString (anOrientationStr.ToCString(), anOrientation)) + return; + // location + TopLoc_Location aLocation = fromString (aLocationStr); + + theShape.Location (aLocation); + theShape.Orientation (anOrientation); +} diff --git a/tools/TInspectorAPI/TInspectorAPI_PluginParameters.hxx b/tools/TInspectorAPI/TInspectorAPI_PluginParameters.hxx index ea5c1ec4db..5131569555 100644 --- a/tools/TInspectorAPI/TInspectorAPI_PluginParameters.hxx +++ b/tools/TInspectorAPI/TInspectorAPI_PluginParameters.hxx @@ -21,7 +21,9 @@ #include #include #include -#include +#include + +#include class TInspectorAPI_PluginParameters; DEFINE_STANDARD_HANDLE (TInspectorAPI_PluginParameters, Standard_Transient) @@ -36,7 +38,7 @@ class TInspectorAPI_PluginParameters : public Standard_Transient public: //! Constructs the container. - Standard_EXPORT TInspectorAPI_PluginParameters(); + Standard_EXPORT TInspectorAPI_PluginParameters() {} //! Destructor Standard_EXPORT virtual ~TInspectorAPI_PluginParameters() Standard_OVERRIDE {} @@ -81,8 +83,7 @@ public: //! Returns parameters set for the given plugin //! \param thePluginName a plugin name //! \return container of objects - Standard_EXPORT const NCollection_List& Parameters ( - const TCollection_AsciiString& thePluginName); + Standard_EXPORT const NCollection_List& Parameters (const TCollection_AsciiString& thePluginName); //! Returns true if there are file names set for the given plugin //! \param thePluginName a plugin name @@ -92,8 +93,7 @@ public: //! Returns file names set for the given plugin //! \param thePluginName a plugin name //! \return container of names - Standard_EXPORT const NCollection_List& FileNames( - const TCollection_AsciiString& thePluginName); + Standard_EXPORT const NCollection_List& FileNames (const TCollection_AsciiString& thePluginName); //! Returns true if there are file names set for the given plugin //! \param thePluginName a plugin name @@ -112,6 +112,36 @@ public: Standard_EXPORT Standard_Boolean GetSelectedObjects (const TCollection_AsciiString& thePluginName, NCollection_List& theObjects); + //! Sets path to a directory for temporary plugin files + //! \param thePath a path + virtual void SetTemporaryDirectory (const TCollection_AsciiString& thePath) { myTemporaryDirectory = thePath; } + + //! Returns path to a directory for temporary plugin files + //! \return path + TCollection_AsciiString GetTemporaryDirectory() const { return myTemporaryDirectory; } + + //! Returns plugin preferences + //! \param thePluginName a plugin name + Standard_EXPORT virtual void GetPreferences (const TCollection_AsciiString& thePluginName, + TInspectorAPI_PreferencesDataMap& theItem) = 0; + + //! Stores plugin preferences + //! \param thePluginName a plugin name + //! \theItem container of plugin preferences values in form: + Standard_EXPORT virtual void SetPreferences (const TCollection_AsciiString& thePluginName, + const TInspectorAPI_PreferencesDataMap& theItem) = 0; + + //! Converts a Shape parameters excepting TShape into a string value + //! \param theShape processed shape + //! \return string instance + Standard_EXPORT static TCollection_AsciiString ParametersToString (const TopoDS_Shape& theShape); + + //! Converts a Shape parameters exceptin TShape into a string value + //! \param theValue parameters string value (without TShape information) + //! \param theShape processed shape + Standard_EXPORT static void ParametersToShape (const TCollection_AsciiString& theValue, TopoDS_Shape& theShape); + + #if OCC_VERSION_HEX <= 0x060901 DEFINE_STANDARD_RTTI (TInspectorAPI_PluginParameters) #else @@ -126,6 +156,8 @@ private: NCollection_DataMap > mySelectedItemNames; //! container of select objects NCollection_DataMap > mySelectedObjects; + //! temporary directory for saving plugin preferences + TCollection_AsciiString myTemporaryDirectory; }; #endif diff --git a/tools/TInspectorAPI/TInspectorAPI_PreferencesDataMap.hxx b/tools/TInspectorAPI/TInspectorAPI_PreferencesDataMap.hxx new file mode 100644 index 0000000000..1eb3e5d9ac --- /dev/null +++ b/tools/TInspectorAPI/TInspectorAPI_PreferencesDataMap.hxx @@ -0,0 +1,25 @@ +// 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 TInspectorAPI_PreferencesDataMap_H +#define TInspectorAPI_PreferencesDataMap_H + +#include +#include + +typedef NCollection_DataMap TInspectorAPI_PreferencesDataMap; +typedef NCollection_DataMap::Iterator TInspectorAPI_IteratorOfPreferencesDataMap; + +#endif diff --git a/tools/TKTInspector/EXTERNLIB b/tools/TKTInspector/EXTERNLIB index 986e11df0e..4570f90e71 100644 --- a/tools/TKTInspector/EXTERNLIB +++ b/tools/TKTInspector/EXTERNLIB @@ -1,3 +1,4 @@ -TKTInspectorAPI TKernel +TKTInspectorAPI +TKTreeModel CSF_QT \ No newline at end of file diff --git a/tools/TKTInspectorAPI/EXTERNLIB b/tools/TKTInspectorAPI/EXTERNLIB index 599ec4e8c6..df0002f9af 100644 --- a/tools/TKTInspectorAPI/EXTERNLIB +++ b/tools/TKTInspectorAPI/EXTERNLIB @@ -1,2 +1,4 @@ +TKG3d TKernel -TKLCAF \ No newline at end of file +TKLCAF +TKMath \ No newline at end of file diff --git a/tools/TKTreeModel/PACKAGES b/tools/TKTreeModel/PACKAGES index a8e49538ab..b4abb9f985 100644 --- a/tools/TKTreeModel/PACKAGES +++ b/tools/TKTreeModel/PACKAGES @@ -1 +1,2 @@ TreeModel +ViewControl diff --git a/tools/ToolsDraw/ToolsDraw.cxx b/tools/ToolsDraw/ToolsDraw.cxx index 3e267e7ca2..392996998f 100644 --- a/tools/ToolsDraw/ToolsDraw.cxx +++ b/tools/ToolsDraw/ToolsDraw.cxx @@ -13,7 +13,6 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include #include #include @@ -26,11 +25,13 @@ #include #include #include -#include #include #include #include +#include +#include + #if ! defined(_WIN32) extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS(); #else @@ -84,7 +85,7 @@ void getArgumentPlugins (Standard_Integer theArgsNb, const char** theArgs, Stand // function : tinspector // purpose : // ======================================================================= -static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, const char** theArgs) +static int tinspector (Draw_Interpretor& di, Standard_Integer theArgsNb, const char** theArgs) { if (theArgsNb < 1) { @@ -99,7 +100,10 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con TCollection_AsciiString aPluginNameToActivate; Standard_Boolean aNeedToUpdateContent = Standard_False, aNeedToHideInspector = Standard_False, - aNeedToShowInspector = Standard_False; + aNeedToShowInspector = Standard_False, + aNeedToPrintState = Standard_False, + aNeedDirectory = Standard_False; + TCollection_AsciiString aTemporaryDirectory; NCollection_List aDefaultParameters; TCollection_AsciiString aDefaultOpenFileParameter; @@ -115,7 +119,7 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con if (aParam.IsEqual ("-plugins")) // [-plugins {name1 [name2] ... [name3] | all}] { anIt++; - getArgumentPlugins(theArgsNb, theArgs, anIt, aPlugins); + getArgumentPlugins (theArgsNb, theArgs, anIt, aPlugins); } else if (aParam.IsEqual ("-activate")) // [-activate name] { @@ -145,17 +149,22 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con return 1; } NCollection_List anArgPlugins; - getArgumentPlugins(theArgsNb, theArgs, anIt, anArgPlugins); + getArgumentPlugins (theArgsNb, theArgs, anIt, anArgPlugins); + if (anArgPlugins.IsEmpty()) - aDefaultParameters.Append(aShape.TShape()); + { + aDefaultParameters.Append (aShape.TShape()); + anItemNamesToSelect.Append (TInspectorAPI_PluginParameters::ParametersToString (aShape)); + } else { for (NCollection_List::Iterator anArgIt (anArgPlugins); - anArgIt.More(); anArgIt.Next()) + anArgIt.More(); anArgIt.Next()) { NCollection_List aPluginParameters; - aParameters.Find(anArgIt.Value(), aPluginParameters); - aPluginParameters.Append(aShape.TShape()); + aParameters.Find (anArgIt.Value(), aPluginParameters); + aPluginParameters.Append (aShape.TShape()); + anItemNamesToSelect.Append (TInspectorAPI_PluginParameters::ParametersToString (aShape)); aParameters.Bind (anArgIt.Value(), aPluginParameters); } } @@ -181,11 +190,27 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con anArgIt.More(); anArgIt.Next()) { NCollection_List aPluginParameters; - aParameters.Find(anArgIt.Value(), aPluginParameters); - anOpenFileParameters.Bind(anArgIt.Value(), aFileName); + aParameters.Find (anArgIt.Value(), aPluginParameters); + anOpenFileParameters.Bind (anArgIt.Value(), aFileName); } } } + else if (aParam.IsEqual ("-directory")) // [-directory path]" + { + anIt++; + if (anIt == theArgsNb) + { + cout << "Empty argument of '" << aParam << "'.\n"; + return 1; + } + aNeedDirectory = true; + aParam = theArgs[anIt]; + aTemporaryDirectory = aParam.IsEqual ("default") ? "" : aParam; + } + else if (aParam.IsEqual ("-state")) // [-state] + { + aNeedToPrintState = Standard_True; + } else if (aParam.IsEqual ("-update")) // [-update] { aNeedToUpdateContent = Standard_True; @@ -202,15 +227,16 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con TopoDS_Shape aShape = DBRep::Get (theArgs[anIt]); if (!aShape.IsNull()) { - anObjectsToSelect.Append(aShape.TShape()); + anObjectsToSelect.Append (aShape.TShape()); + anItemNamesToSelect.Append (TInspectorAPI_PluginParameters::ParametersToString (aShape)); } // search prsentations with given name - if (GetMapOfAIS().IsBound2(theArgs[anIt])) + if (GetMapOfAIS().IsBound2 (theArgs[anIt])) { Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast (GetMapOfAIS().Find2 (theArgs[anIt])); if (!anIO.IsNull()) - anObjectsToSelect.Append(anIO); + anObjectsToSelect.Append (anIO); } // give parameters as a container of names aParam = TCollection_AsciiString (theArgs[anIt]); @@ -258,8 +284,8 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con if (!anApplication.IsNull()) { NCollection_List aDFBrowserParameters; - aParameters.Find("TKDFBrowser", aDFBrowserParameters); - aDFBrowserParameters.Append(anApplication); + aParameters.Find ("TKDFBrowser", aDFBrowserParameters); + aDFBrowserParameters.Append (anApplication); aParameters.Bind ("TKDFBrowser", aDFBrowserParameters); } @@ -268,9 +294,9 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con { if (aPlugins.IsEmpty()) { - aPlugins.Append("TKDFBrowser"); - aPlugins.Append("TKShapeView"); - aPlugins.Append("TKVInspector"); + aPlugins.Append ("TKDFBrowser"); + aPlugins.Append ("TKShapeView"); + aPlugins.Append ("TKVInspector"); } aPluginNameToActivate = !aPluginNameToActivate.IsEmpty() ? aPluginNameToActivate : aPlugins.First(); } @@ -289,7 +315,7 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con NCollection_List aParameterValues; aParameters.Find (aPluginName, aParameterValues); - for (NCollection_List::Iterator aDefIt(aDefaultParameters); + for (NCollection_List::Iterator aDefIt (aDefaultParameters); aDefIt.More(); aDefIt.Next()) aParameterValues.Append (aDefIt.Value()); MyCommunicator->Init (aPluginName, aParameterValues, Standard_True); @@ -302,16 +328,19 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con { for (NCollection_DataMap::Iterator anOpenIt (anOpenFileParameters); anOpenIt.More(); anOpenIt.Next()) - MyCommunicator->OpenFile(anOpenIt.Key(), anOpenIt.Value()); + MyCommunicator->OpenFile (anOpenIt.Key(), anOpenIt.Value()); } else if (!aDefaultOpenFileParameter.IsEmpty()) // open file in active plugin - MyCommunicator->OpenFile("", aDefaultOpenFileParameter); + MyCommunicator->OpenFile ("", aDefaultOpenFileParameter); if (!anObjectsToSelect.IsEmpty()) - MyCommunicator->SetSelected(anObjectsToSelect); + MyCommunicator->SetSelected (anObjectsToSelect); if (!anItemNamesToSelect.IsEmpty()) - MyCommunicator->SetSelected(anItemNamesToSelect); + MyCommunicator->SetSelected (anItemNamesToSelect); + + if (aNeedDirectory) + MyCommunicator->SetTemporaryDirectory (aTemporaryDirectory); if (aNeedToUpdateContent) MyCommunicator->UpdateContent(); @@ -322,6 +351,13 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con if (aNeedToHideInspector) MyCommunicator->SetVisible (false); + if (aNeedToPrintState) + { + Standard_SStream aSStream; + MyCommunicator->Dump (aSStream); + di << aSStream << "\n"; + } + return 0; } @@ -342,6 +378,8 @@ void ToolsDraw::Commands(Draw_Interpretor& theCommands) "\n\t\t: [-update]" "\n\t\t: [-select {object | name1 ... [nameN]}]" "\n\t\t: [-show {0|1} = 1]" + "\n\t\t: [-directory path|]" + "\n\t\t: [-state]" "\n\t\t: Starts tool of inspection." "\n\t\t: Options:" "\n\t\t: -plugins enters plugins that should be added in the inspector." @@ -360,8 +398,11 @@ void ToolsDraw::Commands(Draw_Interpretor& theCommands) "\n\t\t: ShapeView: 'object' is an instance of TopoDS_Shape TShape," "\n\t\t: DFBrowser: 'name' is an entry of TDF_Label and name2(optionaly) for TDF_Attribute type name," "\n\t\t: VInspector: 'object' is an instance of AIS_InteractiveObject;" - "\n\t\t: -show sets Inspector view visible or hidden. The first call of this command will show it.", + "\n\t\t: -show sets Inspector view visible or hidden. The first call of this command will show it." + "\n\t\t: -directory sets Inspector temporary directory. Preferences file is stored there." + "\n\t\t: -state print some current information about inspector, like name of active plugin, temporary director.", __FILE__, tinspector, group); + } // ======================================================================= diff --git a/tools/TreeModel/FILES b/tools/TreeModel/FILES index 6bb591504c..2eeab8f369 100644 --- a/tools/TreeModel/FILES +++ b/tools/TreeModel/FILES @@ -1,7 +1,15 @@ +TreeModel.hxx +TreeModel.qrc +TreeModel_ColumnType.hxx +TreeModel_ContextMenu.cxx +TreeModel_ContextMenu.hxx +TreeModel_HeaderSection.hxx TreeModel_ItemBase.cxx TreeModel_ItemBase.hxx TreeModel_ItemRole.hxx -TreeModel_MessageDialog.cxx -TreeModel_MessageDialog.hxx TreeModel_ModelBase.cxx TreeModel_ModelBase.hxx +TreeModel_Tools.cxx +TreeModel_Tools.hxx +TreeModel_VisibilityState.cxx +TreeModel_VisibilityState.hxx \ No newline at end of file diff --git a/tools/TreeModel/TreeModel.hxx b/tools/TreeModel/TreeModel.hxx new file mode 100644 index 0000000000..30ba380cd4 --- /dev/null +++ b/tools/TreeModel/TreeModel.hxx @@ -0,0 +1,33 @@ +// Created on: 2017-06-16 +// Created by: Natalia ERMOLAEVA +// Copyright (c) 2017 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef TREEMODEL_H +#define TREEMODEL_H + +#ifdef __TreeModel_DLL + #ifdef _WIN32 + #define TREEMODEL_EXPORT __declspec(dllexport) + #else + #define TREEMODEL_EXPORT + #endif +#else + #ifdef _WIN32 + #define TREEMODEL_EXPORT __declspec(dllimport) + #else + #define TREEMODEL_EXPORT + #endif +#endif + +#endif diff --git a/tools/TreeModel/TreeModel.qrc b/tools/TreeModel/TreeModel.qrc new file mode 100644 index 0000000000..7a6f61c129 --- /dev/null +++ b/tools/TreeModel/TreeModel.qrc @@ -0,0 +1,6 @@ + + + icons/item_invisible.png + icons/item_visible.png + + diff --git a/tools/TreeModel/TreeModel_ColumnType.hxx b/tools/TreeModel/TreeModel_ColumnType.hxx new file mode 100644 index 0000000000..80cb3f97da --- /dev/null +++ b/tools/TreeModel/TreeModel_ColumnType.hxx @@ -0,0 +1,30 @@ +// Created on: 2017-06-16 +// Created by: Natalia ERMOLAEVA +// Copyright (c) 2017 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef TreeModel_ColumnType_H +#define TreeModel_ColumnType_H + +#include +#include +#include + +//! Sets custom item role of Tree view wmodel +enum TreeModel_ColumnType +{ + TreeModel_ColumnType_Name = 0, //! name column + TreeModel_ColumnType_Visibility //! visibility state column +}; + +#endif diff --git a/tools/TreeModel/TreeModel_ContextMenu.cxx b/tools/TreeModel/TreeModel_ContextMenu.cxx new file mode 100644 index 0000000000..9a60792c60 --- /dev/null +++ b/tools/TreeModel/TreeModel_ContextMenu.cxx @@ -0,0 +1,82 @@ +// 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 +#include +#include + +#include + +#include +#include +#include +#include +#include + +// ======================================================================= +// function : Constructor +// purpose : +// ======================================================================= +TreeModel_ContextMenu::TreeModel_ContextMenu (QTreeView* theTreeView) + : QObject (theTreeView), myTreeView (theTreeView) +{ + myTreeView->header()->setContextMenuPolicy (Qt::CustomContextMenu); +#if QT_VERSION >= 0x050000 + myTreeView->header()->setSectionsClickable (true); +#endif + myTreeView->header()->setHighlightSections (true); + connect (myTreeView->header(), SIGNAL (customContextMenuRequested (const QPoint&)), + this, SLOT (onTreeViewHeaderContextMenuRequested (const QPoint&))); +} + +// ======================================================================= +// function : onTreeViewHeaderContextMenuRequested +// purpose : +// ======================================================================= +void TreeModel_ContextMenu::onTreeViewHeaderContextMenuRequested (const QPoint& thePosition) +{ + TreeModel_ModelBase* aModel = dynamic_cast (myTreeView->model()); + if (!aModel) + return; + + QMenu* aMenu = new QMenu (myTreeView); + int aNbSections = aModel->columnCount(); + for (int aColumnId = 0; aColumnId < aNbSections; aColumnId++) + { + QAction* anAction = ViewControl_Tools::CreateAction (aModel->GetHeaderItem (aColumnId).GetName(), + SLOT (onColumnVisibilityChanged()), myTreeView, this); + anAction->setCheckable (true); + anAction->setChecked (!myTreeView->isColumnHidden (aColumnId)); + anAction->setData (aColumnId); + aMenu->addAction (anAction); + } + + if (aMenu->actions().isEmpty()) + return; + + QPoint aPoint = myTreeView->mapToGlobal (thePosition); + aMenu->exec (aPoint); +} + +// ======================================================================= +// function : onColumnVisibilityChanged +// purpose : +// ======================================================================= +void TreeModel_ContextMenu::onColumnVisibilityChanged() +{ + QAction* aClickedAction = (QAction*)sender(); + + myTreeView->setColumnHidden(aClickedAction->data().toInt(), !aClickedAction->isChecked()); +} diff --git a/tools/TreeModel/TreeModel_ContextMenu.hxx b/tools/TreeModel/TreeModel_ContextMenu.hxx new file mode 100644 index 0000000000..925185a679 --- /dev/null +++ b/tools/TreeModel/TreeModel_ContextMenu.hxx @@ -0,0 +1,53 @@ +// Created on: 2017-06-16 +// Created by: Natalia ERMOLAEVA +// Copyright (c) 2017 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef TreeModel_ContextMenu_H +#define TreeModel_ContextMenu_H + +#include +#include + +#include +#include +#include +#include + +class QTreeView; + +//! \class TreeModel_ContextMenu +//! \brief Creates actions to show/hide tree view columns +class TreeModel_ContextMenu : public QObject +{ + Q_OBJECT +public: + //! Constructor + Standard_EXPORT TreeModel_ContextMenu (QTreeView* theTreeView); + + //! Destructor + ~TreeModel_ContextMenu() {} + +protected slots: + //! Shows context menu for tree view header. It contains actions to change columns visibility. + //! \param thePosition a clicked point + void onTreeViewHeaderContextMenuRequested (const QPoint& thePosition); + + //! Changes clicked column visiblity + void onColumnVisibilityChanged(); + +private: + QTreeView* myTreeView; +}; + +#endif diff --git a/tools/TreeModel/TreeModel_HeaderSection.hxx b/tools/TreeModel/TreeModel_HeaderSection.hxx new file mode 100644 index 0000000000..5ea9ca1e4f --- /dev/null +++ b/tools/TreeModel/TreeModel_HeaderSection.hxx @@ -0,0 +1,78 @@ +// Created on: 2017-06-16 +// Created by: Natalia ERMOLAEVA +// Copyright (c) 2017 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef TreeModel_HeaderSection_H +#define TreeModel_HeaderSection_H + +#include +#include + +#include + +#include +#include +#include + +//! \class TreeModel_HeaderSection +//! \brief Container of tree view header sections, like width, visibility, text value +class TreeModel_HeaderSection +{ +public: + //! Constructor + TreeModel_HeaderSection() : myName(), myWidth (-1), myIsHidden (false), myIsItalic (false) {} + + //! Constructor + TreeModel_HeaderSection (const QString& theName, const int theWidth = -1, const bool theIsHidden = false, + const bool theIsItalic = false) + : myName (theName), myWidth (theWidth), myIsHidden (theIsHidden), myIsItalic (theIsItalic) {} + + //! Destructor + ~TreeModel_HeaderSection() {} + + //! Sets text value + //! \theName text value + void SetName (const QString& theName) { myName = theName; } + + //! Returns text value + QString GetName() const { return myName; } + + //! Sets section width + //! \param theValue width value + void SetWidth (const int theWidth) { myWidth = theWidth; } + + //! Returns section width + int GetWidth (const bool isComputeDefault = true) const + { return (myWidth ==-1 && isComputeDefault) ? TreeModel_Tools::GetTextWidth (GetName(), 0) : myWidth; } + + //! Sets section width + void SetIsHidden (bool isHidden) { myIsHidden = isHidden; } + + //! Returns if the section is visiblt + bool IsHidden() const { return myIsHidden; } + + //! Sets section width + void SetIsItalic (bool isItalic) { myIsItalic = isItalic; } + + //! Returns if the section is visiblt + bool IsItalic() const { return myIsItalic; } + +private: + QString myName; //! text value + int myWidth; //! section width + bool myIsHidden; //! visibility + bool myIsItalic; //! italic +}; + +#endif diff --git a/tools/TreeModel/TreeModel_ItemBase.cxx b/tools/TreeModel/TreeModel_ItemBase.cxx index 42acea066e..464a788863 100644 --- a/tools/TreeModel/TreeModel_ItemBase.cxx +++ b/tools/TreeModel/TreeModel_ItemBase.cxx @@ -14,6 +14,7 @@ // commercial license or contractual agreement. #include + #include #include @@ -45,8 +46,19 @@ void TreeModel_ItemBase::Reset() anItem->Reset(); } m_bInitialized = false; - mycachedValues.clear(); + myCachedValues.clear(); +} +// ======================================================================= +// function : Reset +// purpose : +// ======================================================================= +void TreeModel_ItemBase::Reset (int theRole) +{ + if (!myCachedValues.contains (theRole)) + return; + + myCachedValues.remove (theRole); } // ======================================================================= @@ -84,11 +96,11 @@ const TreeModel_ItemBasePtr TreeModel_ItemBase::currentItem() // ======================================================================= QVariant TreeModel_ItemBase::cachedValue (const int theItemRole) const { - if (mycachedValues.contains (theItemRole)) - return mycachedValues[theItemRole]; + if (myCachedValues.contains (theItemRole)) + return myCachedValues[theItemRole]; - const_cast(this)->mycachedValues.insert (theItemRole, + const_cast(this)->myCachedValues.insert (theItemRole, theItemRole == TreeModel_ItemRole_RowCountRole ? QVariant (initRowCount()) : initValue (theItemRole)); - return mycachedValues.contains (theItemRole) ? mycachedValues[theItemRole] : QVariant(); + return myCachedValues.contains (theItemRole) ? myCachedValues[theItemRole] : QVariant(); } diff --git a/tools/TreeModel/TreeModel_ItemBase.hxx b/tools/TreeModel/TreeModel_ItemBase.hxx index 09498b3f62..82ba6dc360 100644 --- a/tools/TreeModel/TreeModel_ItemBase.hxx +++ b/tools/TreeModel/TreeModel_ItemBase.hxx @@ -87,6 +87,10 @@ public: //! If the item has internal values, there should be reseted here. Standard_EXPORT virtual void Reset(); + //! Resets the item cached value for the parameter role. + //! \param theRole an item role + Standard_EXPORT virtual void Reset(int theRole); + //! Gets the parent of the item, or TreeModel_ItemBasePtr() if it has no parent. //! \return pointer to the item TreeModel_ItemBasePtr Parent() const { return m_pParent; }; @@ -108,6 +112,11 @@ public: //! \return the child item or TreeModel_ItemBasePtr() if it does not exist Standard_EXPORT TreeModel_ItemBasePtr Child (int theRow, int theColumn, const bool isToCreate = true); + //! Sets a custom value for the role in an internal cache + //! \param theValue a value + //! \param theRole a value role + void SetCustomData(const QVariant theValue, int theRole) { myCachedValues.insert (theRole, theValue); } + //! Returns the data stored under the given role for the current item //! \param theIndex the item model index //! \param theRole the item model role @@ -154,7 +163,7 @@ private: typedef QHash< QPair, TreeModel_ItemBasePtr > PositionToItemHash; PositionToItemHash m_ChildItems; //!< the hash of item children - QMap mycachedValues; //!< cached values, should be cleared by reset + QMap myCachedValues; //!< cached values, should be cleared by reset TreeModel_ItemBasePtr m_pParent; //!< the parent item int m_iRow; //!< the item row position in the parent item int m_iColumn; //!< the item column position in the parent item diff --git a/tools/TreeModel/TreeModel_ModelBase.cxx b/tools/TreeModel/TreeModel_ModelBase.cxx index 58eef1039c..72acad8d01 100644 --- a/tools/TreeModel/TreeModel_ModelBase.cxx +++ b/tools/TreeModel/TreeModel_ModelBase.cxx @@ -16,13 +16,20 @@ #include #include +#include +#include + +#include +#include +#include // ======================================================================= // function : Constructor // purpose : // ======================================================================= TreeModel_ModelBase::TreeModel_ModelBase (QObject* theParent) -: QAbstractItemModel (theParent), m_pRootItem (0) +: QAbstractItemModel (theParent), m_pRootItem (0), m_pUseVisibilityColumn (false), + myVisibilityState (0) { } @@ -43,7 +50,11 @@ TreeModel_ItemBasePtr TreeModel_ModelBase::GetItemByIndex (const QModelIndex& th void TreeModel_ModelBase::Reset() { for (int aColId = 0, aNbColumns = columnCount(); aColId < aNbColumns; aColId++) - RootItem (aColId)->Reset(); + { + TreeModel_ItemBasePtr aRootItem = RootItem (aColId); + if (aRootItem) + aRootItem->Reset(); + } } // ======================================================================= @@ -78,6 +89,27 @@ QVariant TreeModel_ModelBase::data (const QModelIndex& theIndex, int theRole) co if (!theIndex.isValid()) return QVariant ("undefined"); + if (IsUseVisibilityColumn() && theIndex.column() == TreeModel_ColumnType_Visibility) + { + if (theRole != Qt::DecorationRole) + return QVariant(); + + TreeModel_ItemBasePtr anItem = GetItemByIndex (theIndex); + if (!anItem->data (theIndex, theRole).isNull()) // value is already in cache + return anItem->data (theIndex, theRole); + + if (!anItem->IsInitialized()) + anItem->Init(); + + if (!myVisibilityState || !myVisibilityState->CanBeVisible (theIndex)) + return QVariant(); + + QVariant aValue = QIcon (myVisibilityState->IsVisible (theIndex) ? ":/icons/item_visible.png" + : ":/icons/item_invisible.png"); + anItem->SetCustomData (aValue, theRole); + return aValue; + } + TreeModel_ItemBasePtr anItem = GetItemByIndex (theIndex); return anItem->data (theIndex, theRole); } @@ -111,6 +143,21 @@ Qt::ItemFlags TreeModel_ModelBase::flags (const QModelIndex& theIndex) const return Qt::ItemIsEnabled | Qt::ItemIsSelectable; } +// ======================================================================= +// function : headerData +// purpose : +// ======================================================================= +QVariant TreeModel_ModelBase::headerData (int theSection, Qt::Orientation theOrientation, int theRole) const +{ + if (theOrientation != Qt::Horizontal || theRole != Qt::DisplayRole) + return QVariant(); + + if (IsUseVisibilityColumn() && theSection == TreeModel_ColumnType_Visibility) + return QVariant(); + + return GetHeaderItem (theSection).GetName(); +} + // ======================================================================= // function : rowCount // purpose : @@ -131,7 +178,7 @@ int TreeModel_ModelBase::rowCount (const QModelIndex& theParent) const } // ======================================================================= -// function : emitLayoutChanged +// function : EmitLayoutChanged // purpose : // ======================================================================= void TreeModel_ModelBase::EmitLayoutChanged() @@ -139,6 +186,44 @@ void TreeModel_ModelBase::EmitLayoutChanged() emit layoutChanged(); } +// ======================================================================= +// function : EmitLayoutChanged +// purpose : +// ======================================================================= +void TreeModel_ModelBase::EmitDataChanged (const QModelIndex& theTopLeft, const QModelIndex& theBottomRight, + const QVector& theRoles, + const bool isResetItem) +{ + TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (theTopLeft); + if (anItemBase && isResetItem) + anItemBase->Reset(); + +#if QT_VERSION < 0x050000 + (void)theRoles; + emit dataChanged (theTopLeft, theBottomRight); +#else + emit dataChanged (theTopLeft, theBottomRight, theRoles); +#endif +} + +// ======================================================================= +// function : SingleSelected +// purpose : +// ======================================================================= +QModelIndex TreeModel_ModelBase::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(); +} + // ======================================================================= // function : getIndexValue // purpose : diff --git a/tools/TreeModel/TreeModel_ModelBase.hxx b/tools/TreeModel/TreeModel_ModelBase.hxx index 597cd472cb..d304c164e5 100644 --- a/tools/TreeModel/TreeModel_ModelBase.hxx +++ b/tools/TreeModel/TreeModel_ModelBase.hxx @@ -18,14 +18,19 @@ #include #include +#include #include #include #include +#include #include #include +#include #include +class TreeModel_VisibilityState; + //! \class TreeModel_ModelBase //! \brief Implementation of the tree item based model of QAbstractItemModel. //! The TreeModel_ModelBase class defines the abstract model realization throught the base item architecture. @@ -59,6 +64,26 @@ public: //! Emits the layoutChanged signal from outside of this class Standard_EXPORT void EmitLayoutChanged(); + //! Emits the dataChanged signal from outside of this class + Standard_EXPORT void EmitDataChanged (const QModelIndex& theTopLeft, const QModelIndex& theBottomRight, + const QVector& theRoles = QVector(), const bool isResetItem = true); + + //! Sets state whether visibility column (0) is used in the model + //! \param theState state + void SetUseVisibilityColumn (const bool theState) { m_pUseVisibilityColumn = theState; } + + //! Returns state whether visibility column (0) is used in the model + //! \param theState state + bool IsUseVisibilityColumn() const { return m_pUseVisibilityColumn; } + + //!< Fills visibility state checker + //!< \param theController the checker interface + void SetVisibilityState (TreeModel_VisibilityState* theController) { myVisibilityState = theController; } + + //!< Returns visibility state checker + //!< \return the checker interface + TreeModel_VisibilityState* GetVisibilityState () const { return myVisibilityState; } + //! Returns the index of the item in the model specified by the given row, column and parent index. //! Saves an internal pointer at the createIndex. This pointer is a shared pointer to the class, //! that realizes a base item interface. If the parent is invalid, a root item is used, otherwise a new item @@ -92,8 +117,7 @@ public: //! \param theRole a data role //! \return the header data Standard_EXPORT virtual QVariant headerData (int theSection, Qt::Orientation theOrientation, - int theRole = Qt::DisplayRole) const Standard_OVERRIDE - { (void)theSection, (void)theOrientation; (void)theRole; return QVariant(); } + int theRole = Qt::DisplayRole) const Standard_OVERRIDE; //! Returns the number of rows under the given parent. When the parent is valid it means that rowCount is returning //! the number of children of parent. @@ -101,13 +125,40 @@ public: //! \return the number of rows Standard_EXPORT virtual int rowCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE; - //! Returns the number of columns for the children of the given parent. - //! \param theParent a parent model index - //! \return the number of columns + //! Returns whether the column is hidden by default + //! \param theColumnId a column index + //! \return header section values container + TreeModel_HeaderSection GetHeaderItem (const int theColumnId) const { return myHeaderValues[theColumnId]; } + + //! Set header properties item. + //! \param theColumnId a column index + //! \param theSection a section value + void SetHeaderItem (const int theColumnId, const TreeModel_HeaderSection& theSection) + { myHeaderValues[theColumnId] = theSection; createRootItem (theColumnId); } + + //! Returns count of columns in the model + //! \param theParent an index of the parent item + //! \return integer value virtual int columnCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE - { (void)theParent; return 1; } + { (void)theParent; return myHeaderValues.size(); } + + //! Returns default value of the visibility column + //! \return integer value + static int ColumnVisibilityWidth() { return 20; } + + //! 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); protected: + //! Creates root item + //! \param theColumnId index of a column + virtual void createRootItem (const int theColumnId) = 0; //! Converts the item shared pointer to void* type //! \param theItem @@ -117,7 +168,11 @@ protected: protected: TreeModel_ItemBasePtr m_pRootItem; //!< the model root item. It should be created in the + QMap myHeaderValues; //!< header values //!< model subclass. The model is fulfilled by this item content + + bool m_pUseVisibilityColumn; //!< the state whether column=0 is reserved for Visibility state + TreeModel_VisibilityState* myVisibilityState; //!< the interface of item visibility }; #endif diff --git a/tools/TreeModel/TreeModel_Tools.cxx b/tools/TreeModel/TreeModel_Tools.cxx new file mode 100644 index 0000000000..c1b217b529 --- /dev/null +++ b/tools/TreeModel/TreeModel_Tools.cxx @@ -0,0 +1,213 @@ +// 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 +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +const int INFO_LENGHT = 60; + +// ======================================================================= +// function : ToString +// purpose : +// ======================================================================= +QString TreeModel_Tools::ToString (const QByteArray& theValue) +{ + char aBuffer[8]; + QStringList aBytesList; + for (int aByteId = 0; aByteId < theValue.size(); aByteId++) + { + ::sprintf (aBuffer, "#%02X", (unsigned char)theValue.at (aByteId)); + aBytesList.append (QString (aBuffer)); + } + return QString ("@ByteArray[%1]").arg (aBytesList.join (" ")); +} + +// ======================================================================= +// function : ToByteArray +// purpose : +// ======================================================================= +QByteArray TreeModel_Tools::ToByteArray (const QString& theValue) +{ + QByteArray aStateArray; + if (!theValue.startsWith ("@ByteArray[") || !theValue.endsWith (']')) + return aStateArray; + + QString aValue = theValue.mid (11, theValue.size() - 12); + QStringList lst = aValue.split (QRegExp ("[\\s|,]"), QString::SkipEmptyParts); + for (QStringList::ConstIterator aByteId = lst.begin(); aByteId != lst.end(); ++aByteId) + { + int aBase = 10; + QString aString = *aByteId; + if (aString.startsWith ("#")) + { + aBase = 16; + aString = aString.mid (1); + } + bool isOk = false; + int aNum = aString.toInt (&isOk, aBase); + if (!isOk || aNum < 0 || aNum > 255) + continue; + aStateArray.append ((char)aNum); + } + return aStateArray; +} + +// ======================================================================= +// function : SaveState +// purpose : +// ======================================================================= +void TreeModel_Tools::SaveState (QTreeView* theTreeView, QMap& theItems, + const QString& thePrefix) +{ + QStringList aColumnWidths, aHiddenColumns; + for (int aColumnId = 0; aColumnId < theTreeView->model()->columnCount(); aColumnId++) + { + if (theTreeView->isColumnHidden (aColumnId)) + { + aHiddenColumns.append (QString::number (aColumnId)); + aColumnWidths.append (QString()); + } + else + aColumnWidths.append (QString::number (theTreeView->columnWidth (aColumnId))); + } + theItems[thePrefix + "columns_width"] = aColumnWidths.join (","); + theItems[thePrefix + "columns_hidden"] = aHiddenColumns.join (","); +} + +// ======================================================================= +// function : RestoreState +// purpose : +// ======================================================================= +bool TreeModel_Tools::RestoreState (QTreeView* theTreeView, const QString& theKey, const QString& theValue, + const QString& thePrefix) +{ + if (theKey == thePrefix + "columns_width") + { + QStringList aValues = theValue.split (","); + for (int aColumnId = 0; aColumnId < theTreeView->model()->columnCount() && aColumnId < aValues.size(); aColumnId++) + { + bool isOk; + int aWidth = aValues.at (aColumnId).toInt (&isOk); + if (isOk && !theTreeView->isColumnHidden (aColumnId)) // do not resize hidden columnsa + theTreeView->setColumnWidth (aColumnId, aWidth); + } + } + else if (theKey == thePrefix + "columns_hidden") + { + int aColumnSize = theTreeView->model()->columnCount(); + QStringList aValues = theValue.split (",", QString::SkipEmptyParts); + QList aColumnIds; + for (int aValueId = 0; aValueId < aValues.size(); aValueId++) + { + if (aValueId < aColumnSize) + aColumnIds.append (aValues.at (aValueId).toInt()); + } + for (int aColumnId = 0; aColumnId < aColumnSize; aColumnId++) + { + theTreeView->setColumnHidden (aColumnId, aColumnIds.contains(aColumnId) == true); + } + } + else + return false; + return true; +} + +// ======================================================================= +// function : SetDefaultHeaderSections +// purpose : +// ======================================================================= +void TreeModel_Tools::SetDefaultHeaderSections(QTreeView* theTreeView) +{ + TreeModel_ModelBase* aTreeModel = dynamic_cast (theTreeView->model()); + + for (int aColumnId = 0, aNbColumns = aTreeModel->columnCount(); aColumnId < aNbColumns; aColumnId++) + { + TreeModel_HeaderSection aSection = aTreeModel->GetHeaderItem (aColumnId); + theTreeView->setColumnWidth (aColumnId, aSection.GetWidth()); + theTreeView->setColumnHidden (aColumnId, aSection.IsHidden()); + } +} + +// ======================================================================= +// function : UseVisibilityColumn +// purpose : +// ======================================================================= +void TreeModel_Tools::UseVisibilityColumn (QTreeView* theTreeView, const bool theActive) +{ + QHeaderView* aHeader = theTreeView->header(); +#if QT_VERSION < 0x050000 + aHeader->setResizeMode (TreeModel_ColumnType_Visibility, QHeaderView::Fixed); +#else + aHeader->setSectionResizeMode (TreeModel_ColumnType_Visibility, QHeaderView::Fixed); +#endif + aHeader->moveSection (TreeModel_ColumnType_Name, TreeModel_ColumnType_Visibility); + + TreeModel_ModelBase* aModel = dynamic_cast (theTreeView->model()); + aModel->SetHeaderItem (TreeModel_ColumnType_Visibility, + TreeModel_HeaderSection ("Visibility", TreeModel_ModelBase::ColumnVisibilityWidth())); + + TreeModel_VisibilityState* aVisibilityState = aModel->GetVisibilityState (); + + aModel->SetUseVisibilityColumn (true); + if (theActive && aVisibilityState) + QObject::connect (theTreeView, SIGNAL (clicked (const QModelIndex&)), + aVisibilityState, SLOT (OnClicked(const QModelIndex&))); +} + +// ======================================================================= +// function : GetTextWidth +// purpose : +// ======================================================================= +int TreeModel_Tools::GetTextWidth (const QString& theText, QObject*) +{ + // TODO: find margins like QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, (QWidget*)theParent); + int aTextMargin = 10; + QFontMetrics aFontMetrics (QApplication::font()); + QRect aBoundingRect = aFontMetrics.boundingRect (theText); + return qMax (aBoundingRect.width(), aFontMetrics.width (theText)) + aTextMargin * 2; +} + +// ======================================================================= +// function : CutString +// purpose : +// ======================================================================= +QString TreeModel_Tools::CutString (const QString& theText, const int theWidth, const QString& theTail) +{ + if (theText.isEmpty()) + return theText; + + int aLength = theWidth < 0 ? INFO_LENGHT : theWidth - 3; + + int anIndex = theText.indexOf ('\n'); + if (anIndex > 0 && anIndex < aLength) + aLength = anIndex; + + return aLength < theText.length() ? theText.mid (0, aLength) + theTail : theText; +} diff --git a/tools/TreeModel/TreeModel_Tools.hxx b/tools/TreeModel/TreeModel_Tools.hxx new file mode 100644 index 0000000000..39047a2f03 --- /dev/null +++ b/tools/TreeModel/TreeModel_Tools.hxx @@ -0,0 +1,95 @@ +// Created on: 2017-06-16 +// Created by: Natalia ERMOLAEVA +// Copyright (c) 2017 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef TreeModel_Tools_H +#define TreeModel_Tools_H + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +class QAction; +class QObject; +class QTreeView; + +//! \class TreeModel_Tools +//! \brief The tool that gives auxiliary methods for qt elements manipulation +class TreeModel_Tools +{ +public: + + //! Converts a Qt string to byte array, string has mask: @ByteArray[...] + //! \param theValue a converted string + //! \return the extended filled array + Standard_EXPORT static QString ToString (const QByteArray& theValue); + + //! Converts a Qt byte array to Qt string. It has mask: @ByteArray[...] + //! \param theValue a converted string + //! \return the extended filled array + Standard_EXPORT static QByteArray ToByteArray (const QString& theValue); + + //! Returns header margin, defined in style settings of application + //! \return integer value + Standard_EXPORT static int HeaderSectionMargin() { return qApp->style()->pixelMetric (QStyle::PM_HeaderMargin); } + + //! Save state of three view in a container in form: key, value. It saves: + //! - visibiblity of columns, + //! - columns width + //! \param theTreeView a view instance + //! \param theItems [out] properties + //! \param thePrefix peference item prefix + Standard_EXPORT static void SaveState (QTreeView* theTreeView, QMap& theItems, + const QString& thePrefix = QString()); + //! Restore state of three view by a container + //! \param theTreeView a view instance + //! \param theKey property key + //! \param theValue property value + //! \param thePrefix peference item prefix + //! \return boolean value whether the property is applyed to the tree view + Standard_EXPORT static bool RestoreState (QTreeView* theTreeView, const QString& theKey, const QString& theValue, + const QString& thePrefix = QString()); + + //! Fills tree view by default sections parameters obtained in view's tree model + //! \param theTreeView tree view instance + Standard_EXPORT static void SetDefaultHeaderSections (QTreeView* theTreeView); + + //! Sets using visibility column in the tree view: + //! - sets the state in the TreeModel + //! - set section width, not resizable + //! \param theTreeView a view instance + //! \param theActive boolean value if the column should be connected/visible and other + Standard_EXPORT static void UseVisibilityColumn (QTreeView* theTreeView, const bool theActive = true); + + //! Returns the text width + //! \param theText source text + //! \param theParent parent widget with its own style + //! \return calculated width value + Standard_EXPORT static int GetTextWidth (const QString& theText, QObject* theParent); + + //! Returns string cut by width and '\n' + //! \param theText processing string + //! \param theWidth width value, if -1, default value is used + //! \param theTail symbols added to the end of the cut string + Standard_EXPORT static QString CutString (const QString& theText, const int theWidth = -1, const QString& theTail = "..."); +}; + +#endif diff --git a/tools/DFBrowser/DFBrowser_TreeView.cxx b/tools/TreeModel/TreeModel_VisibilityState.cxx similarity index 58% rename from tools/DFBrowser/DFBrowser_TreeView.cxx rename to tools/TreeModel/TreeModel_VisibilityState.cxx index 33658169d1..599e635fe5 100644 --- a/tools/DFBrowser/DFBrowser_TreeView.cxx +++ b/tools/TreeModel/TreeModel_VisibilityState.cxx @@ -13,25 +13,20 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#include // ======================================================================= -// function : SetPredefinedSize +// function : OnClicked // purpose : // ======================================================================= -void DFBrowser_TreeView::SetPredefinedSize (int theDefaultWidth, int theDefaultHeight) +void TreeModel_VisibilityState::OnClicked (const QModelIndex& theIndex) { - myDefaultWidth = theDefaultWidth; - myDefaultHeight = theDefaultHeight; -} + if (theIndex.column() != TreeModel_ColumnType_Visibility) + return; -// ======================================================================= -// function : sizeHint -// purpose : -// ======================================================================= -QSize DFBrowser_TreeView::sizeHint() const -{ - if (myDefaultWidth > 0 && myDefaultHeight > 0) - return QSize (myDefaultWidth, myDefaultHeight); - return QTreeView::sizeHint(); + if (!CanBeVisible (theIndex)) + return; + + SetVisible (theIndex, !IsVisible (theIndex), true); + emit itemClicked (theIndex); } diff --git a/tools/TreeModel/TreeModel_VisibilityState.hxx b/tools/TreeModel/TreeModel_VisibilityState.hxx new file mode 100644 index 0000000000..9718b5962f --- /dev/null +++ b/tools/TreeModel/TreeModel_VisibilityState.hxx @@ -0,0 +1,81 @@ +// Created on: 2017-06-16 +// Created by: Natalia ERMOLAEVA +// Copyright (c) 2017 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef TreeModel_VisibilityState_H +#define TreeModel_VisibilityState_H + +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +//! \class TreeModel_VisibilityState +//! \brief Interface that provides connection between model and visualization control to: +//! - know whether the model item is visible +//! - change visibility of the model item +class TREEMODEL_EXPORT TreeModel_VisibilityState : public QObject +{ + Q_OBJECT +public: + //! Constructor + TreeModel_VisibilityState (TreeModel_ModelBase* theModel) : myModel (theModel) {} + + //! Destructor + ~TreeModel_VisibilityState() {} + + //! Returns true if visibility of the item can be changed + //! \param theIndex tree model index + //! \return boolean value + virtual bool CanBeVisible (const QModelIndex& theIndex) const = 0; + + //! Sets visibility state + //! \param theIndex tree model index + //! \param theState visibility state + //! \param toEmitDataChanged boolean flag whether emit of the model should be done immediatelly + //! \return true if state is changed + virtual bool SetVisible (const QModelIndex& theIndex, const bool theState, const bool toEmitDataChanged = true) = 0; + + //! Returns visibility state value + //! \param theIndex tree model index + //! \return boolean value + virtual bool IsVisible (const QModelIndex& theIndex) const = 0; + +public slots: + //! Processes the mouse clicked on the index. + //! It changes the item visibility if model allows to change it. + //! \theIndex tree model index + void OnClicked (const QModelIndex& theIndex); + +signals: + //! Signal after OnClicked is performed + //! \theIndex tree model index + void itemClicked (const QModelIndex& theIndex); + +protected: + //! tree view model + TreeModel_ModelBase* getModel() const { return myModel; } + +private: + TreeModel_ModelBase* myModel; //! tree view model +}; + +#endif diff --git a/tools/TreeModel/icons/item_invisible.png b/tools/TreeModel/icons/item_invisible.png new file mode 100644 index 0000000000000000000000000000000000000000..8feb1e7bcaa3718388d778991b9fdb51009df4ae GIT binary patch literal 446 zcmV;v0YUzWP)zlCg^FU=T)6!bOxsECbd?0*XF>jUX0wBEEp7g{}1u zsccmQ?FFB}-d+&V#uVBF1jQzbhQ!3JuHbr`i^cAg!_1kP?;Gjyc<@QcA9eob== zB$G)tn+-t_5QZV=^BGx|DV0i0r&Da(X1CitHF$HO-END;Vu58@NRmVth9nXRB9RD& oVK5$#U#xrs{BQjHD}N050;n^il~|F~asU7T07*qoM6N<$f&nPR(*OVf literal 0 HcmV?d00001 diff --git a/tools/TreeModel/icons/item_visible.png b/tools/TreeModel/icons/item_visible.png new file mode 100644 index 0000000000000000000000000000000000000000..e0bbf75fc83a46998487ec0a32782619b5775550 GIT binary patch literal 478 zcmV<40U`d0P)zlEF)waTv!xzjrxXy-gxWL>MI!1hqmCZykc+cIgm! z*v+f{1s*&IzTjcv#fyjj0Ab#?4tDNPMDeB_f{<+*jhMF0sl}`I>@X(VT10r*p5p`0 z=lMR*_p3yNVM-fn`o92-{H>YG<)mCLQ#)_*<=Yic=VzImu#rqA)tw4Lp^$t$zd)t} z%=p%M>!>i>lFR z5RFFV2Egz4OE?_H>-DP9v2nVcI?b~qoQ@G%pQ~KllLEL zG@2H(OD|ZSo95>-(=;(nQ+YfdrG8CfEEW@&%f + icons/treeview_and.png + icons/treeview_or.png icons/treeview_update.png diff --git a/tools/VInspector/VInspector_Communicator.hxx b/tools/VInspector/VInspector_Communicator.hxx index fdffb12b48..e0fe1f5147 100644 --- a/tools/VInspector/VInspector_Communicator.hxx +++ b/tools/VInspector/VInspector_Communicator.hxx @@ -44,6 +44,20 @@ public: virtual void SetParameters (const Handle(TInspectorAPI_PluginParameters)& theParameters) Standard_OVERRIDE { myWindow->SetParameters (theParameters); } + //! Provide container for actions available in inspector on general level + //! \param theMenu if Qt implementation, it is QMenu object + Standard_EXPORT virtual void FillActionsMenu(void* theMenu) Standard_OVERRIDE { myWindow->FillActionsMenu (theMenu); } + + //! Returns plugin preferences, empty implementation by default + //! \param theItem container of preference elements + virtual void GetPreferences (TInspectorAPI_PreferencesDataMap& theItem) Standard_OVERRIDE + { myWindow->GetPreferences (theItem); } + + //! Stores plugin preferences, empty implementation by default + //! \param theItem container of preference elements + virtual void SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem) Standard_OVERRIDE + { myWindow->SetPreferences (theItem); } + //! Calls update of the plugin's content virtual void UpdateContent() Standard_OVERRIDE { myWindow->UpdateContent(); } diff --git a/tools/VInspector/VInspector_ItemBase.cxx b/tools/VInspector/VInspector_ItemBase.cxx index 323db67bff..8f1cee216e 100644 --- a/tools/VInspector/VInspector_ItemBase.cxx +++ b/tools/VInspector/VInspector_ItemBase.cxx @@ -21,15 +21,15 @@ // function : GetContext // purpose : // ======================================================================= -const Handle(AIS_InteractiveContext)& VInspector_ItemBase::GetContext() const +Handle(AIS_InteractiveContext) VInspector_ItemBase::GetContext() const { if (!myContext.IsNull()) return myContext; Handle(AIS_InteractiveContext) aContext; - if (const VInspector_ItemContext* aThisContextItem = dynamic_cast (this)) + if (dynamic_cast (this)) { - aContext = aThisContextItem->GetContext(); + return Handle(AIS_InteractiveContext)(); // context has not be set yet } else { diff --git a/tools/VInspector/VInspector_ItemBase.hxx b/tools/VInspector/VInspector_ItemBase.hxx index ca065ffd37..c0c268d395 100644 --- a/tools/VInspector/VInspector_ItemBase.hxx +++ b/tools/VInspector/VInspector_ItemBase.hxx @@ -41,12 +41,12 @@ public: //! Returns the current contex. It iterates up by list of parents to found context item and return context //! \return a context - Standard_EXPORT const Handle(AIS_InteractiveContext)& GetContext() const; + Standard_EXPORT Handle(AIS_InteractiveContext) GetContext() const; protected: //! Initialize the current item. It creates a backup of the specific item information - virtual void initItem() const {};// = 0; + virtual void initItem() const {} protected: diff --git a/tools/VInspector/VInspector_ItemContext.cxx b/tools/VInspector/VInspector_ItemContext.cxx index c2d49ee325..8c724d05a7 100644 --- a/tools/VInspector/VInspector_ItemContext.cxx +++ b/tools/VInspector/VInspector_ItemContext.cxx @@ -17,9 +17,14 @@ #include #include +#include #include #include +#include +#include +#include + //#define DEBUG_FREE_OWNERS // ======================================================================= @@ -31,53 +36,48 @@ int VInspector_ItemContext::initRowCount() const if (Column() != 0) return 0; + int aNbProperties = 1; // item to visualize Filters/Drawer information of context + int aNbPresentations = 0; - if (!GetContext().IsNull()) - { - AIS_ListOfInteractive aListOfIO; - GetContext()->DisplayedObjects (aListOfIO); - GetContext()->ErasedObjects(aListOfIO); - aNbPresentations = aListOfIO.Extent(); - } + Handle(AIS_InteractiveContext) aContext = GetContext(); + if (aContext.IsNull()) + return 0; + + AIS_ListOfInteractive aListOfIO; + aContext->DisplayedObjects (aListOfIO); + aContext->ErasedObjects(aListOfIO); + aNbPresentations = aListOfIO.Extent(); + // owners without Presentation #ifdef DEBUG_FREE_OWNERS int aRows = 0; // only local context is processed: TODO for global context - Handle(AIS_InteractiveContext) aContext = GetContext(); - if (!aContext.IsNull()) { - NCollection_List anActiveOwners; - aContext->MainSelector()->ActiveOwners(anActiveOwners); + NCollection_List anActiveOwners; + aContext->MainSelector()->ActiveOwners(anActiveOwners); - Handle(SelectMgr_EntityOwner) anOwner; - for (NCollection_List::Iterator anOwnersIt(anActiveOwners); - anOwnersIt.More(); anOwnersIt.Next()) - { - anOwner = Handle(SelectMgr_EntityOwner)::DownCast(anOwnersIt.Value()); - if (anOwner.IsNull()) - continue; - Handle(AIS_InteractiveObject) anAISObj = Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable()); - if (anAISObj.IsNull()) - aRows++; - } - } - - // owners in Global Context - if (!aContext.IsNull()) + Handle(SelectMgr_EntityOwner) anOwner; + for (NCollection_List::Iterator anOwnersIt(anActiveOwners); + anOwnersIt.More(); anOwnersIt.Next()) { - NCollection_List anActiveOwners; - aContext->MainSelector()->ActiveOwners(anActiveOwners); + anOwner = Handle(SelectMgr_EntityOwner)::DownCast(anOwnersIt.Value()); + if (anOwner.IsNull()) + continue; + Handle(AIS_InteractiveObject) anAISObj = Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable()); + if (anAISObj.IsNull()) + aRows++; } + // owners in Global Context + NCollection_List anActiveOwners; + aContext->MainSelector()->ActiveOwners(anActiveOwners); if (aRows > 0) aNbPresentations += aRows; -#endif -#ifdef DEBUG_FREE_OWNERS NCollection_List anEmptySelectableOwners; NCollection_List anOwners = - VInspector_Tools::ActiveOwners (GetContext(), anEmptySelectableOwners); + VInspector_Tools::ActiveOwners (aContext, anEmptySelectableOwners); if (anEmptySelectableOwners.Size() > 0) aNbPresentations += 1; #endif - return aNbPresentations; + return aNbProperties + aNbPresentations; } // ======================================================================= @@ -89,42 +89,20 @@ QVariant VInspector_ItemContext::initValue (const int theItemRole) const if (theItemRole != Qt::DisplayRole && theItemRole != Qt::EditRole && theItemRole != Qt::ToolTipRole) return QVariant(); + if (GetContext().IsNull()) + return Column() == 0 ? "Empty context" : ""; + switch (Column()) { case 0: return GetContext()->DynamicType()->Name(); case 1: return rowCount(); case 4: { - if (theItemRole == Qt::ToolTipRole) - return "Selected Owners"; - else - { - Handle(AIS_InteractiveObject) anEmptyIO; - int aSelectedCount = VInspector_Tools::SelectedOwners (GetContext(), anEmptyIO, false); - return aSelectedCount > 0 ? QString::number (aSelectedCount) : ""; - } - } - case 7: - { - if (theItemRole == Qt::ToolTipRole) - return QString ("All Owners/Active Owners"); - else - { - NCollection_List anEmptySelectableOwners; - NCollection_List anOwners = - VInspector_Tools::ActiveOwners (GetContext(), anEmptySelectableOwners); - int anActiveOwners = anOwners.Size(); - anOwners = VInspector_Tools::ContextOwners (GetContext()); - return QString ("%1 / %2").arg (anOwners.Size()).arg (anActiveOwners); - } - } - case 8: - { - if (theItemRole == Qt::ToolTipRole) - return QString ("DeviationCoefficient"); - else - return GetContext()->DeviationCoefficient(); + Handle(AIS_InteractiveObject) anEmptyIO; + int aSelectedCount = VInspector_Tools::SelectedOwners (GetContext(), anEmptyIO, false); + return aSelectedCount > 0 ? QString::number (aSelectedCount) : ""; } + case 6: return GetContext()->DeviationCoefficient(); default: break; } @@ -137,5 +115,8 @@ QVariant VInspector_ItemContext::initValue (const int theItemRole) const // ======================================================================= TreeModel_ItemBasePtr VInspector_ItemContext::createChild (int theRow, int theColumn) { - return VInspector_ItemPresentableObject::CreateItem (currentItem(), theRow, theColumn); + if (theRow == 0) + return VInspector_ItemFolderObject::CreateItem (currentItem(), theRow, theColumn); + else + return VInspector_ItemPresentableObject::CreateItem (currentItem(), theRow, theColumn); } diff --git a/tools/VInspector/VInspector_ItemContext.hxx b/tools/VInspector/VInspector_ItemContext.hxx index 76a2a990c3..166b8a6519 100644 --- a/tools/VInspector/VInspector_ItemContext.hxx +++ b/tools/VInspector/VInspector_ItemContext.hxx @@ -24,6 +24,9 @@ typedef QExplicitlySharedDataPointer VInspector_ItemCont //! \class VInspector_ItemContext //! Parent item, that corresponds to AIS_InteractiveContext +//! Children of the item are: +//! - "Property" item to show context attributes such as selection filters and drawer properties +//! - presentation items to show all interactive elements displayed/erased in the context class VInspector_ItemContext : public VInspector_ItemBase { public: diff --git a/tools/VInspector/VInspector_ItemEntityOwner.cxx b/tools/VInspector/VInspector_ItemEntityOwner.cxx index 4542c097e7..80f1f3094b 100644 --- a/tools/VInspector/VInspector_ItemEntityOwner.cxx +++ b/tools/VInspector/VInspector_ItemEntityOwner.cxx @@ -47,58 +47,34 @@ QVariant VInspector_ItemEntityOwner::initValue(int theItemRole) const switch (Column()) { case 0: return anOwner->DynamicType()->Name(); - case 2: return theItemRole == Qt::ToolTipRole ? "Owner pointer" - : VInspector_Tools::GetPointerInfo (anOwner, true).ToCString(); + case 2: return VInspector_Tools::GetPointerInfo (anOwner, true).ToCString(); case 3: { - if (theItemRole == Qt::ToolTipRole) - return "Owner Shape type"; - else - { - Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast (anOwner); - if (!BROwnr.IsNull()) - { - const TopoDS_Shape& aShape = BROwnr->Shape(); - if (!aShape.IsNull()) - return VInspector_Tools::GetShapeTypeInfo (aShape.ShapeType()).ToCString(); - } - } - break; + Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast (anOwner); + if (BROwnr.IsNull()) + return QVariant(); + + const TopoDS_Shape& aShape = BROwnr->Shape(); + if (aShape.IsNull()) + return QVariant(); + + return VInspector_Tools::GetShapeTypeInfo (aShape.ShapeType()).ToCString(); } - case 5: - { - if (theItemRole == Qt::ToolTipRole) - return "TShape pointer"; - else + case 17: + case 18: + case 19: { - Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast (anOwner); - if (!BROwnr.IsNull()) - { - const TopoDS_Shape& aShape = BROwnr->Shape(); - if (!aShape.IsNull()) - return VInspector_Tools::GetPointerInfo (aShape.TShape(), true).ToCString(); - } - } - break; - } - case 8: - { - if (theItemRole == Qt::ToolTipRole) - return "Shape Location : Shape Orientation"; - else - { - Handle(StdSelect_BRepOwner) aBROwnr = Handle(StdSelect_BRepOwner)::DownCast (anOwner); - if (!aBROwnr.IsNull()) - { - const TopoDS_Shape& aShape = aBROwnr->Shape(); - if (!aShape.IsNull()) - return QString ("%1 : %2") - .arg (VInspector_Tools::LocationToName(aShape.Location()).ToCString()) - .arg (VInspector_Tools::OrientationToName(aShape.Orientation()).ToCString()); - return VInspector_Tools::GetShapeTypeInfo (aShape.ShapeType()).ToCString(); - } - } - break; + Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast (anOwner); + if (BROwnr.IsNull()) + return QVariant(); + + const TopoDS_Shape& aShape = BROwnr->Shape(); + if (aShape.IsNull()) + return QVariant(); + + return Column() == 17 ? VInspector_Tools::GetPointerInfo (aShape.TShape(), true).ToCString() + : Column() == 18 ? VInspector_Tools::OrientationToName (aShape.Orientation()).ToCString() + : /*19*/ VInspector_Tools::LocationToName (aShape.Location()).ToCString(); } default: break; } @@ -148,12 +124,21 @@ void VInspector_ItemEntityOwner::Init() int aRowId = Row(); int aCurrentIndex = 0; +#if OCC_VERSION_HEX < 0x070201 + for (anIO->Init(); anIO->More() && anOwner.IsNull(); anIO->Next()) + { + const Handle(SelectMgr_Selection)& aSelection = anIO->CurrentSelection(); + for (aSelection->Init(); aSelection->More() && anOwner.IsNull(); aSelection->Next()) + { + Handle(SelectMgr_SensitiveEntity) anEntity = aSelection->Sensitive(); +#else for (SelectMgr_SequenceOfSelection::Iterator aSelIter (anIO->Selections()); aSelIter.More() && anOwner.IsNull(); aSelIter.Next()) { const Handle(SelectMgr_Selection)& aSelection = aSelIter.Value(); for (NCollection_Vector::Iterator aSelEntIter (aSelection->Entities()); aSelEntIter.More() && anOwner.IsNull(); aSelEntIter.Next()) { Handle(SelectMgr_SensitiveEntity) anEntity = aSelEntIter.Value(); +#endif const Handle(SelectBasics_SensitiveEntity)& aBase = anEntity->BaseSensitive(); if (!aBase.IsNull()) { diff --git a/tools/VInspector/VInspector_ItemFolderObject.cxx b/tools/VInspector/VInspector_ItemFolderObject.cxx new file mode 100644 index 0000000000..cbd413bc5c --- /dev/null +++ b/tools/VInspector/VInspector_ItemFolderObject.cxx @@ -0,0 +1,93 @@ +// 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 + +#include +#include + +// ======================================================================= +// function : initValue +// purpose : +// ======================================================================= +QVariant VInspector_ItemFolderObject::initValue (int theItemRole) const +{ + if (Column() == 0 && (theItemRole == Qt::DisplayRole || theItemRole == Qt::ToolTipRole)) + { + if (parentItemIsContext()) return "Properties"; + else if (Row() == 0) return "Filters"; + else return QVariant(); + } + return QVariant(); +} + +// ======================================================================= +// function : initRowCount +// purpose : +// ======================================================================= +int VInspector_ItemFolderObject::initRowCount() const +{ + return parentItemIsContext() ? 1 : (GetContext().IsNull() ? 0 : GetContext()->Filters().Extent()); +} + +// ======================================================================= +// function : createChild +// purpose : +// ======================================================================= +TreeModel_ItemBasePtr VInspector_ItemFolderObject::createChild (int theRow, int theColumn) +{ + if (parentItemIsContext()) + return VInspector_ItemFolderObject::CreateItem (currentItem(), theRow, theColumn); + else + return VInspector_ItemSelectMgrFilter::CreateItem (currentItem(), theRow, theColumn); +} + +// ======================================================================= +// function : Init +// purpose : +// ======================================================================= +void VInspector_ItemFolderObject::Init() +{ + TreeModel_ItemBase::Init(); // to use getIO() without circling initialization +} + +// ======================================================================= +// function : Reset +// purpose : +// ======================================================================= +void VInspector_ItemFolderObject::Reset() +{ + VInspector_ItemBase::Reset(); +} + +// ======================================================================= +// function : initItem +// purpose : +// ======================================================================= +void VInspector_ItemFolderObject::initItem() const +{ + if (IsInitialized()) + return; + const_cast (this)->Init(); +} + +// ======================================================================= +// function : parentItemIsContext +// purpose : +// ======================================================================= +bool VInspector_ItemFolderObject::parentItemIsContext() const +{ + return itemDynamicCast (Parent()); +} diff --git a/tools/VInspector/VInspector_ItemFolderObject.hxx b/tools/VInspector/VInspector_ItemFolderObject.hxx new file mode 100644 index 0000000000..a0a754f8d8 --- /dev/null +++ b/tools/VInspector/VInspector_ItemFolderObject.hxx @@ -0,0 +1,86 @@ +// 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 VInspector_ItemFolderObject_H +#define VInspector_ItemFolderObject_H + +#include +#include + +#include +#include +#include + +class QItemSelectionModel; + +class VInspector_ItemFolderObject; +typedef QExplicitlySharedDataPointer VInspector_ItemFolderObjectPtr; + +//! \class VInspector_ItemFolderObject +//! Item presents additional level of information in the tree model. +//! Parent is item context, children are either folder item or Selection filter item. +class VInspector_ItemFolderObject : public VInspector_ItemBase +{ + +public: + + //! Creates an item wrapped by a shared pointer + static VInspector_ItemFolderObjectPtr CreateItem (TreeModel_ItemBasePtr theParent, + const int theRow, const int theColumn) + { return VInspector_ItemFolderObjectPtr (new VInspector_ItemFolderObject (theParent, theRow, theColumn)); } + //! Destructor + virtual ~VInspector_ItemFolderObject() Standard_OVERRIDE {}; + + //! Inits the item, fills internal containers + Standard_EXPORT virtual void Init() Standard_OVERRIDE; + + //! Resets cached values + Standard_EXPORT virtual void Reset() Standard_OVERRIDE; + +protected: + + //! Initialize the current item. It is empty because Reset() is also empty. + virtual void initItem() const Standard_OVERRIDE; + + //! Returns number of item selected + //! \return rows count + virtual int initRowCount() const Standard_OVERRIDE; + + //! Returns item information for the given role. Fills internal container if it was not filled yet + //! \param theItemRole a value role + //! \return the value + virtual QVariant initValue (const int theItemRole) const Standard_OVERRIDE; + + //! Creates a child item in the given position. + //! \param theRow the child row position + //! \param theColumn the child column position + //! \return the created item + virtual TreeModel_ItemBasePtr createChild (int theRow, int theColumn) Standard_OVERRIDE; + +private: + //! Returns whether the parent item is context item + //! \returns bolean value + bool parentItemIsContext() const; + +private: + + //! Constructor + //! param theParent a parent item + VInspector_ItemFolderObject (TreeModel_ItemBasePtr theParent, const int theRow, const int theColumn) + : VInspector_ItemBase (theParent, theRow, theColumn) {} + +}; + +#endif diff --git a/tools/VInspector/VInspector_ItemHistoryTypeInfo.hxx b/tools/VInspector/VInspector_ItemHistoryTypeInfo.hxx index e01b36b2b6..933a62bdd6 100644 --- a/tools/VInspector/VInspector_ItemHistoryTypeInfo.hxx +++ b/tools/VInspector/VInspector_ItemHistoryTypeInfo.hxx @@ -32,7 +32,7 @@ struct VInspector_ItemHistoryTypeInfo //! Append new element //! \param theInfo an information element - void AddElement (const QList& theInfo) { myElements.append(theInfo); } + void AddElement (const QList& theInfo) { myElements.append (theInfo); } VInspector_CallBackMode myMode; //!< history element mode QList> myElements; //!< container of elements information diff --git a/tools/VInspector/VInspector_ItemPresentableObject.cxx b/tools/VInspector/VInspector_ItemPresentableObject.cxx index ddb8dcb9e2..45b22ed9eb 100644 --- a/tools/VInspector/VInspector_ItemPresentableObject.cxx +++ b/tools/VInspector/VInspector_ItemPresentableObject.cxx @@ -42,6 +42,16 @@ // ======================================================================= QVariant VInspector_ItemPresentableObject::initValue (int theItemRole) const { + if (Column() == 20 && theItemRole == Qt::BackgroundRole) { + Handle(AIS_InteractiveObject) anIO = GetInteractiveObject(); + if (!anIO.IsNull() && anIO->HasColor()) + { + Quantity_Color aColor; + anIO->Color(aColor); + return QColor ((int)(aColor.Red()*255.), (int)(aColor.Green()*255.), (int)(aColor.Blue()*255.)); + } + } + if (theItemRole == Qt::DisplayRole || theItemRole == Qt::ToolTipRole) { Handle(AIS_InteractiveObject) anIO = GetInteractiveObject(); @@ -78,46 +88,74 @@ QVariant VInspector_ItemPresentableObject::initValue (int theItemRole) const } case 4: { - if (theItemRole == Qt::ToolTipRole) - return "SelectedOwners"; - else + int aNbSelected = VInspector_Tools::SelectedOwners (GetContext(), anIO, false); + return aNbSelected > 0 ? QString::number (aNbSelected) : ""; + } + case 5: + { + TColStd_ListOfInteger aModes; + Handle(AIS_InteractiveContext) aContext = GetContext(); + aContext->ActivatedModes(anIO, aModes); + TCollection_AsciiString aModesInfo; + for (TColStd_ListIteratorOfListOfInteger itr (aModes); itr.More(); itr.Next()) { - Handle(AIS_InteractiveContext) aContext = GetContext(); - int aCount = VInspector_Tools::SelectedOwners (aContext, anIO, false); - if (aCount > 0) - return aCount; + if (!aModesInfo.IsEmpty()) + aModesInfo += ", "; + aModesInfo += VInspector_Tools::GetShapeTypeInfo (AIS_Shape::SelectionType(itr.Value())); } - break; + return aModesInfo.ToCString(); + } + break; + case 6: + { + double aDeviationCoefficient = 0; + Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast (anIO); + if (!anAISShape.IsNull()) + { + Standard_Real aPreviousCoefficient; + anAISShape->OwnDeviationCoefficient(aDeviationCoefficient, aPreviousCoefficient); + } + return QString::number(aDeviationCoefficient); + } + case 7: + { + double aShapeDeflection = 0; + Handle(AIS_Shape) aShapeIO = Handle(AIS_Shape)::DownCast (anIO); + if (!aShapeIO.IsNull()) + { + const TopoDS_Shape& aShape = aShapeIO->Shape(); + if (!aShape.IsNull()) + aShapeDeflection = Prs3d::GetDeflection(aShape, anIO->Attributes()); + } + return QString::number (aShapeDeflection); } case 8: { - if (theItemRole == Qt::ToolTipRole) - return QString ("%1 / %2 / %3").arg ("OwnDeviationCoefficient") - .arg ("ShapeDeflection") - .arg ("IsAutoTriangulation"); - else + double aDeviationCoefficient = 0; + Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast (anIO); + if (!anAISShape.IsNull()) { - double aDeviationCoefficient = 0; - Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast (anIO); - if (!anAISShape.IsNull()) - { - Standard_Real aPreviousCoefficient; - anAISShape->OwnDeviationCoefficient(aDeviationCoefficient, aPreviousCoefficient); - } - double aShapeDeflection = 0; - Handle(AIS_Shape) aShapeIO = Handle(AIS_Shape)::DownCast (anIO); - if (!aShapeIO.IsNull()) - { - const TopoDS_Shape& aShape = aShapeIO->Shape(); - if (!aShape.IsNull()) - aShapeDeflection = Prs3d::GetDeflection(aShape, anIO->Attributes()); - } - bool anIsAutoTriangulation = anIO->Attributes()->IsAutoTriangulation(); - return QString ("%1 / %2 / %3").arg (aDeviationCoefficient) - .arg (aShapeDeflection) - .arg (anIsAutoTriangulation); + Standard_Real aPreviousCoefficient; + anAISShape->OwnDeviationCoefficient(aDeviationCoefficient, aPreviousCoefficient); } - break; + Handle(AIS_Shape) aShapeIO = Handle(AIS_Shape)::DownCast (anIO); + bool anIsAutoTriangulation = aNullIO ? false : anIO->Attributes()->IsAutoTriangulation(); + return anIsAutoTriangulation ? QString ("true") : QString ("false"); + } + case 17: + case 18: + case 19: + { + Handle(AIS_Shape) aShapeIO = Handle(AIS_Shape)::DownCast (anIO); + if (aShapeIO.IsNull()) + return QVariant(); + const TopoDS_Shape& aShape = aShapeIO->Shape(); + if (aShape.IsNull()) + return QVariant(); + + return Column() == 17 ? VInspector_Tools::GetPointerInfo (aShape.TShape(), true).ToCString() + : Column() == 18 ? VInspector_Tools::OrientationToName (aShape.Orientation()).ToCString() + : /*19*/ VInspector_Tools::LocationToName (aShape.Location()).ToCString(); } default: break; } @@ -155,9 +193,19 @@ QVariant VInspector_ItemPresentableObject::initValue (int theItemRole) const int VInspector_ItemPresentableObject::initRowCount() const { Handle(AIS_InteractiveObject) anIO = GetInteractiveObject(); +#if OCC_VERSION_HEX < 0x070201 + int aRows = 0; + if (anIO.IsNull()) + return aRows; + // iteration through sensitive privitives + for (anIO->Init(); anIO->More(); anIO->Next()) + aRows++; + return aRows; +#else return !anIO.IsNull() ? anIO->Selections().Size() : 0; +#endif } // ======================================================================= @@ -186,10 +234,11 @@ void VInspector_ItemPresentableObject::Init() AIS_ListOfInteractive aListOfIO; GetContext()->DisplayedObjects (aListOfIO); // the presentation is in displayed objects of Context GetContext()->ErasedObjects (aListOfIO); // the presentation is in erased objects of Context + int aDeltaIndex = 1; // properties item int aCurrentIndex = 0; for (AIS_ListIteratorOfListOfInteractive anIOIt (aListOfIO); anIOIt.More(); anIOIt.Next(), aCurrentIndex++) { - if (aCurrentIndex != aRowId) + if (aCurrentIndex != aRowId - aDeltaIndex) continue; anIO = anIOIt.Value(); break; diff --git a/tools/VInspector/VInspector_ItemSelectMgrFilter.cxx b/tools/VInspector/VInspector_ItemSelectMgrFilter.cxx new file mode 100644 index 0000000000..a274b05256 --- /dev/null +++ b/tools/VInspector/VInspector_ItemSelectMgrFilter.cxx @@ -0,0 +1,138 @@ +// 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 +#include +#include + +#include +#include + +#include +#include +#include + +// ======================================================================= +// function : initValue +// purpose : +// ======================================================================= +QVariant VInspector_ItemSelectMgrFilter::initValue (int theItemRole) const +{ + if (theItemRole == Qt::DisplayRole || theItemRole == Qt::ToolTipRole) + { + Handle(SelectMgr_Filter) aFilter = GetFilter(); + switch (Column()) + { + case 0: return theItemRole == Qt::ToolTipRole ? QVariant ("") + : QVariant (aFilter->DynamicType()->Name()); + case 1: return rowCount() > 0 ? QVariant (rowCount()) : QVariant(); + case 2: return VInspector_Tools::GetPointerInfo (aFilter, true).ToCString(); + default: break; + } + } + if (Column() == 0 && theItemRole == Qt::DecorationRole) + { + Handle(SelectMgr_Filter) aFilter = GetFilter(); + if (aFilter->IsKind (STANDARD_TYPE (SelectMgr_AndFilter))) return QIcon (":/icons/treeview_and.png"); + if (aFilter->IsKind (STANDARD_TYPE (SelectMgr_OrFilter))) return QIcon (":/icons/treeview_or.png"); + } + return QVariant(); +} + +// ======================================================================= +// function : initRowCount +// purpose : +// ======================================================================= +int VInspector_ItemSelectMgrFilter::initRowCount() const +{ + Handle(SelectMgr_Filter) aFilter = GetFilter(); + if (aFilter->IsKind (STANDARD_TYPE (SelectMgr_CompositionFilter))) + { + Handle(SelectMgr_CompositionFilter) aCompositionFilter = Handle(SelectMgr_CompositionFilter)::DownCast (aFilter); + return aCompositionFilter->StoredFilters().Size(); + } + return 0; +} + +// ======================================================================= +// function : createChild +// purpose : +// ======================================================================= +TreeModel_ItemBasePtr VInspector_ItemSelectMgrFilter::createChild (int theRow, int theColumn) +{ + return VInspector_ItemSelectMgrFilter::CreateItem(currentItem(), theRow, theColumn); +} + +// ======================================================================= +// function : Init +// purpose : +// ======================================================================= +void VInspector_ItemSelectMgrFilter::Init() +{ + Handle(AIS_InteractiveContext) aContext = GetContext(); + + Handle(SelectMgr_Filter) aFilter; + + Handle(SelectMgr_CompositionFilter) aParentCompositeFilter; + VInspector_ItemSelectMgrFilterPtr aParentSelectMgrItem = itemDynamicCast (Parent()); + if (aParentSelectMgrItem) + aParentCompositeFilter = Handle(SelectMgr_CompositionFilter)::DownCast (aParentSelectMgrItem->GetFilter()); + + int aRowId = Row(); + const SelectMgr_ListOfFilter& aFilters = !aParentCompositeFilter.IsNull() ? aParentCompositeFilter->StoredFilters() + : aContext->Filters(); + int aCurrentIndex = 0; + for (SelectMgr_ListOfFilter::Iterator aFiltersIt (aFilters); aFiltersIt.More(); aFiltersIt.Next(), aCurrentIndex++) + { + if (aCurrentIndex != aRowId) + continue; + aFilter = aFiltersIt.Value(); + break; + } + setFilter (aFilter); + TreeModel_ItemBase::Init(); // to use getFilter() without circling initialization +} + +// ======================================================================= +// function : Reset +// purpose : +// ======================================================================= +void VInspector_ItemSelectMgrFilter::Reset() +{ + VInspector_ItemBase::Reset(); + + setFilter (NULL); +} + +// ======================================================================= +// function : initItem +// purpose : +// ======================================================================= +void VInspector_ItemSelectMgrFilter::initItem() const +{ + if (IsInitialized()) + return; + const_cast(this)->Init(); +} + +// ======================================================================= +// function : GetInteractiveObject +// purpose : +// ======================================================================= +Handle(SelectMgr_Filter) VInspector_ItemSelectMgrFilter::GetFilter() const +{ + initItem(); + return myFilter; +} diff --git a/tools/VInspector/VInspector_ItemSelectMgrFilter.hxx b/tools/VInspector/VInspector_ItemSelectMgrFilter.hxx new file mode 100644 index 0000000000..68408359e2 --- /dev/null +++ b/tools/VInspector/VInspector_ItemSelectMgrFilter.hxx @@ -0,0 +1,91 @@ +// 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 VInspector_ItemSelectMgrFilter_H +#define VInspector_ItemSelectMgrFilter_H + +#include +#include + +#include + +class QItemSelectionModel; + +class VInspector_ItemSelectMgrFilter; +typedef QExplicitlySharedDataPointer VInspector_ItemSelectMgrFilterPtr; + +//! \class VInspector_ItemSelectMgrFilter +//! Item presents information about SelectMgr_Filter. +//! Parent is item folder, children are sub filter if the filter is a composition filter. +class VInspector_ItemSelectMgrFilter : public VInspector_ItemBase +{ + +public: + + //! Creates an item wrapped by a shared pointer + static VInspector_ItemSelectMgrFilterPtr CreateItem (TreeModel_ItemBasePtr theParent, const int theRow, const int theColumn) + { return VInspector_ItemSelectMgrFilterPtr (new VInspector_ItemSelectMgrFilter (theParent, theRow, theColumn)); } + //! Destructor + virtual ~VInspector_ItemSelectMgrFilter() Standard_OVERRIDE {}; + + //! Returns the current filter, init item if it was not initialized yet + //! \return filter object + Standard_EXPORT Handle(SelectMgr_Filter) GetFilter() const; + + //! Inits the item, fills internal containers + Standard_EXPORT virtual void Init() Standard_OVERRIDE; + + //! Resets cached values + Standard_EXPORT virtual void Reset() Standard_OVERRIDE; + +protected: + + //! Initialize the current item. It is empty because Reset() is also empty. + virtual void initItem() const Standard_OVERRIDE; + + //! Returns number of item selected + //! \return rows count + virtual int initRowCount() const Standard_OVERRIDE; + + //! Returns item information for the given role. Fills internal container if it was not filled yet + //! \param theItemRole a value role + //! \return the value + virtual QVariant initValue (const int theItemRole) const Standard_OVERRIDE; + + //! Creates a child item in the given position. + //! \param theRow the child row position + //! \param theColumn the child column position + //! \return the created item + virtual TreeModel_ItemBasePtr createChild (int theRow, int theColumn) Standard_OVERRIDE; + +private: + + //! Set filter into the current item + //! \param theFilter a filter + void setFilter (Handle(SelectMgr_Filter) theFilter) { myFilter = theFilter; } + +private: + + //! Constructor + //! param theParent a parent item + VInspector_ItemSelectMgrFilter (TreeModel_ItemBasePtr theParent, const int theRow, const int theColumn) + : VInspector_ItemBase (theParent, theRow, theColumn) {} + +protected: + + Handle(SelectMgr_Filter) myFilter; //!< the current filter +}; + +#endif diff --git a/tools/VInspector/VInspector_ItemSelection.cxx b/tools/VInspector/VInspector_ItemSelection.cxx index 6a42cd5136..bcfb5e9f30 100644 --- a/tools/VInspector/VInspector_ItemSelection.cxx +++ b/tools/VInspector/VInspector_ItemSelection.cxx @@ -19,14 +19,16 @@ #include #include #include +#include #include #include #include #include #include -#include #include + +#include #include // ======================================================================= @@ -46,7 +48,14 @@ Handle(SelectMgr_Selection) VInspector_ItemSelection::getSelection() const int VInspector_ItemSelection::initRowCount() const { Handle(SelectMgr_Selection) aSelection = getSelection(); +#if OCC_VERSION_HEX < 0x070201 + int aRows = 0; + for (aSelection->Init(); aSelection->More(); aSelection->Next()) + aRows++; + return aRows; +#else return aSelection->Entities().Size(); +#endif } // ======================================================================= @@ -85,28 +94,34 @@ QVariant VInspector_ItemSelection::initValue (int theItemRole) const if (aState == SelectMgr_SOS_Activated || aState == SelectMgr_SOS_Any) { Handle(AIS_InteractiveContext) aContext = GetContext(); +#if OCC_VERSION_HEX < 0x070201 + for (mySelection->Init(); mySelection->More(); mySelection->Next()) + { + const Handle(SelectBasics_EntityOwner)& anOwner = mySelection->Sensitive()->BaseSensitive()->OwnerId(); +#else for (NCollection_Vector::Iterator aSelEntIter (mySelection->Entities()); aSelEntIter.More(); aSelEntIter.Next()) { const Handle(SelectBasics_EntityOwner)& anOwner = aSelEntIter.Value()->BaseSensitive()->OwnerId(); +#endif if (VInspector_Tools::IsOwnerSelected(aContext, anOwner)) aNbSelected++; } } - QString aStateValue = VInspector_Tools::ToName (VInspector_SelectionType_StateOfSelection, aState).ToCString(); - return QVariant (aNbSelected > 0 ? QString ("%1 : %2").arg (aStateValue).arg (aNbSelected) : aStateValue); + return aNbSelected > 0 ? QString::number (aNbSelected) : ""; } } - case 6: return theItemRole == Qt::ToolTipRole ? "Sensitivity" : QString::number (getSelection()->Sensitivity()); - case 8: + case 9: { - if (theItemRole == Qt::ToolTipRole) - return QString ("%1 / %2").arg ("SelectMgr_TypeOfUpdate").arg ("SelectMgr_TypeOfBVHUpdate"); - else - return QString ("%1 / %2").arg (VInspector_Tools::ToName (VInspector_SelectionType_TypeOfUpdate, - getSelection()->UpdateStatus()).ToCString()) - .arg (VInspector_Tools::ToName (VInspector_SelectionType_TypeOfBVHUpdate, - getSelection()->BVHUpdateStatus()).ToCString()); + SelectMgr_StateOfSelection aState = getSelection()->GetSelectionState(); + return VInspector_Tools::ToName (VInspector_SelectionType_StateOfSelection, aState).ToCString(); } + case 10: return QString::number (getSelection()->Sensitivity()); + case 11: + return VInspector_Tools::ToName (VInspector_SelectionType_TypeOfUpdate, + getSelection()->UpdateStatus()).ToCString(); + case 12: + return VInspector_Tools::ToName (VInspector_SelectionType_TypeOfBVHUpdate, + getSelection()->BVHUpdateStatus()).ToCString(); default: break; } @@ -142,11 +157,19 @@ void VInspector_ItemSelection::Init() int aRowId = Row(); int aCurrentId = 0; +#if OCC_VERSION_HEX < 0x070201 + for (anIO->Init(); anIO->More(); anIO->Next(), aCurrentId++) +#else for (SelectMgr_SequenceOfSelection::Iterator aSelIter (anIO->Selections()); aSelIter.More(); aSelIter.Next(), aCurrentId++) +#endif { if (aCurrentId != aRowId) continue; +#if OCC_VERSION_HEX < 0x070201 + mySelection = anIO->CurrentSelection(); +#else mySelection = aSelIter.Value(); +#endif break; } TreeModel_ItemBase::Init(); diff --git a/tools/VInspector/VInspector_ItemSensitiveEntity.cxx b/tools/VInspector/VInspector_ItemSensitiveEntity.cxx index 19f6ac95b0..5c244a1cc3 100644 --- a/tools/VInspector/VInspector_ItemSensitiveEntity.cxx +++ b/tools/VInspector/VInspector_ItemSensitiveEntity.cxx @@ -61,52 +61,34 @@ QVariant VInspector_ItemSensitiveEntity::initValue (int theItemRole) const { switch (Column()) { - case 0: - return myEntity->DynamicType()->Name(); - case 2: - { - return theItemRole == Qt::ToolTipRole ? "Owner pointer" : VInspector_Tools::GetPointerInfo ( - GetSensitiveEntity()->BaseSensitive()->OwnerId(), true).ToCString(); - } + case 0: return myEntity->DynamicType()->Name(); + case 2: return VInspector_Tools::GetPointerInfo (GetSensitiveEntity()->BaseSensitive()->OwnerId(), true).ToCString(); case 3: { - if (theItemRole == Qt::ToolTipRole) - return "Owner Shape type"; - else - { - Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast (anOwner); - if (!BROwnr.IsNull()) - { - const TopoDS_Shape& aShape = BROwnr->Shape(); - if (!aShape.IsNull()) - return VInspector_Tools::GetShapeTypeInfo (aShape.ShapeType()).ToCString(); - } - } - break; + Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast (anOwner); + if (BROwnr.IsNull()) + return QVariant(); + + const TopoDS_Shape& aShape = BROwnr->Shape(); + if (aShape.IsNull()) + return QVariant(); + + return VInspector_Tools::GetShapeTypeInfo (aShape.ShapeType()).ToCString(); } - case 4: return theItemRole == Qt::ToolTipRole ? "IsActiveForSelection" + case 13: return #if OCC_VERSION_HEX <= 0x060901 - : ("none"); + ("none"); #else - : myEntity->IsActiveForSelection() ? QString ("true") : QString ("false"); + myEntity->IsActiveForSelection() ? QString ("true") : QString ("false"); #endif - case 5: return theItemRole == Qt::ToolTipRole ? "SelectBasics_SensitiveEntity" - : getEntityOwner()->DynamicType()->Name(); - case 6: return theItemRole == Qt::ToolTipRole ? "SensitivityFactor" - : QString::number (GetSensitiveEntity()->BaseSensitive()->SensitivityFactor()); - case 7: return theItemRole == Qt::ToolTipRole ? "NbSubElements" - : QString::number (GetSensitiveEntity()->BaseSensitive()->NbSubElements()); - case 8: + case 14: return QString::number (GetSensitiveEntity()->BaseSensitive()->SensitivityFactor()); + case 15: return QString::number (GetSensitiveEntity()->BaseSensitive()->NbSubElements()); + case 16: { - if (theItemRole == Qt::ToolTipRole) - return "Owner priority"; - else - { - Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast (anOwner); - if (!BROwnr.IsNull()) - return anOwner->Priority(); - } - break; + Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast (anOwner); + if (BROwnr.IsNull()) + return QVariant(); + return anOwner->Priority(); } default: break; @@ -157,11 +139,19 @@ void VInspector_ItemSensitiveEntity::Init() int aRowId = Row(); int aCurrentId = 0; +#if OCC_VERSION_HEX < 0x070201 + for (aSelection->Init(); aSelection->More(); aSelection->Next(), aCurrentId++) +#else for (NCollection_Vector::Iterator aSelEntIter (aSelection->Entities()); aSelEntIter.More(); aSelEntIter.Next(), aCurrentId++) +#endif { if (aCurrentId != aRowId) continue; +#if OCC_VERSION_HEX < 0x070201 + myEntity = aSelection->Sensitive(); +#else myEntity = aSelEntIter.Value(); +#endif break; } TreeModel_ItemBase::Init(); diff --git a/tools/VInspector/VInspector_Tools.cxx b/tools/VInspector/VInspector_Tools.cxx index 8cf0289a5a..b33860340d 100644 --- a/tools/VInspector/VInspector_Tools.cxx +++ b/tools/VInspector/VInspector_Tools.cxx @@ -17,6 +17,9 @@ #include #include +#if OCC_VERSION_HEX < 0x060901 +#include +#endif #include #include #include @@ -143,6 +146,16 @@ NCollection_List VInspector_Tools::ContextOwne Handle(AIS_InteractiveObject) anIO = aIt.Value(); if (anIO.IsNull()) continue; +#if OCC_VERSION_HEX < 0x070201 + for (anIO->Init(); anIO->More(); anIO->Next()) + { + Handle(SelectMgr_Selection) aSelection = anIO->CurrentSelection(); + if (aSelection.IsNull()) + continue; + for (aSelection->Init(); aSelection->More(); aSelection->Next()) + { + Handle(SelectMgr_SensitiveEntity) anEntity = aSelection->Sensitive(); +#else for (SelectMgr_SequenceOfSelection::Iterator aSelIter (anIO->Selections()); aSelIter.More(); aSelIter.Next()) { Handle(SelectMgr_Selection) aSelection = aSelIter.Value(); @@ -151,6 +164,7 @@ NCollection_List VInspector_Tools::ContextOwne for (NCollection_Vector::Iterator aSelEntIter (aSelection->Entities()); aSelEntIter.More(); aSelEntIter.Next()) { Handle(SelectMgr_SensitiveEntity) anEntity = aSelEntIter.Value(); +#endif if (anEntity.IsNull()) continue; const Handle(SelectBasics_SensitiveEntity)& aBase = anEntity->BaseSensitive(); @@ -223,11 +237,23 @@ void VInspector_Tools::AddOrRemoveSelectedShapes (const Handle(AIS_InteractiveCo theContext->UnhilightSelected(Standard_False); + //TODO: processing in local context only +#if OCC_VERSION_HEX < 0x060901 + Handle(AIS_LocalContext) aLContext = theContext->LocalContext(); + TCollection_AsciiString aSelectionName = aLContext->SelectionName(); + aLContext->UnhilightPicked(Standard_False); +#endif + for (NCollection_List::Iterator anOwnersIt(theOwners); anOwnersIt.More(); anOwnersIt.Next()) { Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast (anOwnersIt.Value()); +#if OCC_VERSION_HEX > 0x060901 theContext->AddOrRemoveSelected (anOwner, Standard_False); +#else + AIS_Selection::Selection(aSelectionName.ToCString())->Select(anOwner); + anOwner->SetSelected(Standard_True); +#endif } theContext->UpdateCurrentViewer(); } diff --git a/tools/VInspector/VInspector_ViewModel.cxx b/tools/VInspector/VInspector_ViewModel.cxx index cb3c281a79..d8f6c026a5 100644 --- a/tools/VInspector/VInspector_ViewModel.cxx +++ b/tools/VInspector/VInspector_ViewModel.cxx @@ -15,6 +15,7 @@ #include +#include #include #include #include @@ -26,6 +27,11 @@ #include #include +const int COLUMN_NAME_WIDTH = 260; +const int COLUMN_SIZE_WIDTH = 30; +const int COLUMN_POINTER_WIDTH = 70; +const int COLUMN_SHAPE_TYPE_WIDTH = 75; + // ======================================================================= // function : Constructor // purpose : @@ -33,19 +39,51 @@ VInspector_ViewModel::VInspector_ViewModel (QObject* theParent) : TreeModel_ModelBase (theParent) { - for (int aColumnId = 0, aNbColumns = columnCount(); aColumnId < aNbColumns; aColumnId++) - myRootItems.insert (aColumnId, VInspector_ItemContext::CreateItem (TreeModel_ItemBasePtr(), 0, aColumnId)); + SetHeaderItem (0, TreeModel_HeaderSection ("Name", COLUMN_NAME_WIDTH)); + SetHeaderItem (1, TreeModel_HeaderSection ("Size", COLUMN_SIZE_WIDTH)); + SetHeaderItem (2, TreeModel_HeaderSection ("Pointer", COLUMN_POINTER_WIDTH)); + SetHeaderItem (3, TreeModel_HeaderSection ("ShapeType", COLUMN_SHAPE_TYPE_WIDTH)); // ItemPresentableObject, ItemSelection + SetHeaderItem (4, TreeModel_HeaderSection ("SelectedOwners", -1)); // ItemContext, ItemPresentableObject, ItemSelection + SetHeaderItem (5, TreeModel_HeaderSection ("ActivatedModes", -1)); // ItemPresentableObject + SetHeaderItem (6, TreeModel_HeaderSection ("DeviationCoefficient", -1, true)); // ItemContext, ItemPresentableObject + SetHeaderItem (7, TreeModel_HeaderSection ("Deflection", -1, true)); // ItemPresentableObject + SetHeaderItem (8, TreeModel_HeaderSection ("IsAutoTriangulation", -1, true)); // ItemPresentableObject - m_pRootItem = myRootItems[0]; + SetHeaderItem (9, TreeModel_HeaderSection ("SelectionState", -1)); // ItemSelection + SetHeaderItem (10, TreeModel_HeaderSection ("Sensitivity", -1, true)); // ItemSelection + SetHeaderItem (11, TreeModel_HeaderSection ("UpdateStatus", -1, true)); // ItemSelection + SetHeaderItem (12, TreeModel_HeaderSection ("BVHUpdateStatus", -1, true)); // ItemSelection + + SetHeaderItem (13, TreeModel_HeaderSection ("IsActiveForSelection", -1, true)); // ItemSensitiveEntity + SetHeaderItem (14, TreeModel_HeaderSection ("SensitivityFactor", -1, true)); // ItemSensitiveEntity + SetHeaderItem (15, TreeModel_HeaderSection ("NbSubElements", -1, true)); // ItemSensitiveEntity + SetHeaderItem (16, TreeModel_HeaderSection ("Priority", -1, true)); // ItemSensitiveEntity + + SetHeaderItem (17, TreeModel_HeaderSection ("TShape", COLUMN_POINTER_WIDTH, true)); // ItemEntityOwner + SetHeaderItem (18, TreeModel_HeaderSection ("Orientation", -1, true)); // ItemEntityOwner + SetHeaderItem (19, TreeModel_HeaderSection ("Location", -1, true)); // ItemEntityOwner + + SetHeaderItem (20, TreeModel_HeaderSection ("Color", -1)); // ItemPresentableObject +} + +// ======================================================================= +// function : createRootItem +// purpose : +// ======================================================================= +void VInspector_ViewModel::createRootItem (const int theColumnId) +{ + myRootItems.insert (theColumnId, VInspector_ItemContext::CreateItem (TreeModel_ItemBasePtr(), 0, theColumnId)); + if (theColumnId == 0) + m_pRootItem = myRootItems[0]; } // ======================================================================= // function : GetContext // purpose : // ======================================================================= -const Handle(AIS_InteractiveContext)& VInspector_ViewModel::GetContext() const +Handle(AIS_InteractiveContext) VInspector_ViewModel::GetContext() const { - return itemDynamicCast(RootItem (0))->GetContext(); + return itemDynamicCast (RootItem (0))->GetContext(); } // ======================================================================= @@ -103,32 +141,6 @@ QModelIndex VInspector_ViewModel::FindIndex (const Handle(AIS_InteractiveObject) return QModelIndex(); } -// ======================================================================= -// function : headerData -// purpose : -// ======================================================================= -QVariant VInspector_ViewModel::headerData (int theSection, Qt::Orientation theOrientation, int theRole) const -{ - if (theOrientation != Qt::Horizontal || theRole != Qt::DisplayRole) - return QVariant(); - - switch (theSection) - { - case 0: return "Name"; - case 1: return "Size"; - case 2: return "Pointer"; - case 3: return "Shape type"; - case 4: return "Selection"; - case 5: return "Base Sensitive"; - case 6: return "Sensitivity"; - case 7: return "SubElements"; - case 8: return "Deviation/Deflectiton/Update/Priority"; - //Auto Triangulation - default: break; - } - return QVariant(); -} - // ======================================================================= // function : GetSelectedOwners // purpose : @@ -171,3 +183,13 @@ void VInspector_ViewModel::GetSelectedOwners (QItemSelectionModel* theSelectionM theOwners.Append (anEntityOwner); } } + +// ======================================================================= +// function : UpdateTreeModel +// purpose : +// ======================================================================= +void VInspector_ViewModel::UpdateTreeModel() +{ + Reset(); + EmitLayoutChanged(); +} diff --git a/tools/VInspector/VInspector_ViewModel.hxx b/tools/VInspector/VInspector_ViewModel.hxx index e5da7d1dba..2f58f57a1c 100644 --- a/tools/VInspector/VInspector_ViewModel.hxx +++ b/tools/VInspector/VInspector_ViewModel.hxx @@ -51,8 +51,8 @@ public: //! Initialize the model by the given context //! \param theContext viewer context - Standard_EXPORT const Handle(AIS_InteractiveContext)& GetContext() const; - + Standard_EXPORT Handle(AIS_InteractiveContext) GetContext() const; + //! Initialize the model by the given context //! \param theContext viewer context Standard_EXPORT void SetContext (const Handle(AIS_InteractiveContext)& theContext); @@ -70,29 +70,24 @@ public: //! Returns root item by column //! \param theColumn an index of the column //! \return root item instance - Standard_EXPORT virtual TreeModel_ItemBasePtr RootItem (const int theColumn) const Standard_OVERRIDE + virtual TreeModel_ItemBasePtr RootItem (const int theColumn) const Standard_OVERRIDE { return myRootItems[theColumn]; } - //! Returns count of columns in the model - //! \param theParent an index of the parent item - //! \return integer value - Standard_EXPORT virtual int columnCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE - { (void)theParent; return 9; } - - //! Returns the header data for the given role and section in the header with the specified orientation. - //! \param theSection the header section. For horizontal headers - column number, for vertical headers - row number. - //! \param theOrientation a header orientation - //! \param theRole a data role - //! \return the header data - Standard_EXPORT virtual QVariant headerData (int theSection, Qt::Orientation theOrientation, - int theRole = Qt::DisplayRole ) const Standard_OVERRIDE; - //! Returns select owners for tree view selected items //! \param theSelectionModel a selection model //! \param theOwners an output list of owners Standard_EXPORT static void GetSelectedOwners (QItemSelectionModel* theSelectionModel, NCollection_List& theOwners); + //! Updates tree model + Standard_EXPORT void UpdateTreeModel(); + +protected: + + //! Creates root item + //! \param theColumnId index of a column + virtual void createRootItem (const int theColumnId) Standard_OVERRIDE; + private: QMap myRootItems; //!< container of root items, for each column own root item diff --git a/tools/VInspector/VInspector_ViewModelHistory.cxx b/tools/VInspector/VInspector_ViewModelHistory.cxx index 244128cfe1..de42b99fd7 100644 --- a/tools/VInspector/VInspector_ViewModelHistory.cxx +++ b/tools/VInspector/VInspector_ViewModelHistory.cxx @@ -23,6 +23,20 @@ #include #include +const int COLUMN_NAME_WIDTH = 230; +const int COLUMN_SIZE_WIDTH = 30; +const int COLUMN_POINTER_WIDTH = 70; +const int COLUMN_SHAPE_TYPE_WIDTH = 75; +const int COLUMN_AIS_NAME_WIDTH = 75; +const int COLUMN_SELECTED_WIDTH = 75; + +const int COLUMN_5_WIDTH = 120; +const int COLUMN_6_WIDTH = 65; +const int COLUMN_7_WIDTH = 70; + +const int HISTORY_AIS_NAME_COLUMN_WIDTH = 140; + + // ======================================================================= // function : Constructor // purpose : @@ -30,13 +44,30 @@ VInspector_ViewModelHistory::VInspector_ViewModelHistory (QObject* theParent, const int theHistoryTypesMaxAmount) : TreeModel_ModelBase (theParent) { + SetHeaderItem (0, TreeModel_HeaderSection ("Name", COLUMN_NAME_WIDTH)); + SetHeaderItem (1, TreeModel_HeaderSection ("Size", COLUMN_SIZE_WIDTH)); + SetHeaderItem (2, TreeModel_HeaderSection ("Pointer", COLUMN_POINTER_WIDTH)); + SetHeaderItem (3, TreeModel_HeaderSection ("Shape type", COLUMN_SHAPE_TYPE_WIDTH)); + SetHeaderItem (4, TreeModel_HeaderSection ("AIS Name", COLUMN_AIS_NAME_WIDTH)); + SetHeaderItem (5, TreeModel_HeaderSection ("Selected/Highlighted", -1)); + for (int aColumnId = 0, aNbColumns = columnCount(); aColumnId < aNbColumns; aColumnId++) { - myRootItems.insert(aColumnId, VInspector_ItemHistoryRoot::CreateItem(TreeModel_ItemBasePtr(), 0, aColumnId)); - VInspector_ItemHistoryRootPtr aRootItem = itemDynamicCast(myRootItems[aColumnId]); - aRootItem->SetHistoryTypesMaxAmount(theHistoryTypesMaxAmount); + VInspector_ItemHistoryRootPtr aRootItem = itemDynamicCast (myRootItems[aColumnId]); + aRootItem->SetHistoryTypesMaxAmount (theHistoryTypesMaxAmount); } - m_pRootItem = myRootItems[0]; +} + + +// ======================================================================= +// function : createRootItem +// purpose : +// ======================================================================= +void VInspector_ViewModelHistory::createRootItem (const int theColumnId) +{ + myRootItems.insert (theColumnId, VInspector_ItemHistoryRoot::CreateItem (TreeModel_ItemBasePtr(), 0, theColumnId)); + if (theColumnId == 0) + m_pRootItem = myRootItems[0]; } // ======================================================================= @@ -89,25 +120,3 @@ QStringList VInspector_ViewModelHistory::GetSelectedPointers (const QModelIndex& } return aPointers; } - -// ======================================================================= -// function : headerData -// purpose : -// ======================================================================= -QVariant VInspector_ViewModelHistory::headerData (int theSection, Qt::Orientation theOrientation, int theRole) const -{ - if (theOrientation != Qt::Horizontal || theRole != Qt::DisplayRole) - return QVariant(); - - switch (theSection) - { - case 0: return "Name"; - case 1: return "Size"; - case 2: return "Pointer"; - case 3: return "Shape type"; - case 4: return "AIS Name"; - case 5: return "Selected/Highlighted"; - default: break; - } - return QVariant(); -} diff --git a/tools/VInspector/VInspector_ViewModelHistory.hxx b/tools/VInspector/VInspector_ViewModelHistory.hxx index 556b5faa8c..d4215c3475 100644 --- a/tools/VInspector/VInspector_ViewModelHistory.hxx +++ b/tools/VInspector/VInspector_ViewModelHistory.hxx @@ -56,19 +56,11 @@ public: //! \return root item instance virtual TreeModel_ItemBasePtr RootItem(const int theColumn) const Standard_OVERRIDE { return myRootItems[theColumn]; } - //! Returns count of columns in the model - //! \param theParent an index of the parent item - //! \return integer value - virtual int columnCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE - { (void)theParent; return 6; } +protected: - //! Returns the header data for the given role and section in the header with the specified orientation. - //! \param theSection the header section. For horizontal headers - column number, for vertical headers - row number. - //! \param theOrientation a header orientation - //! \param theRole a data role - //! \return the header data - Standard_EXPORT virtual QVariant headerData (int theSection, Qt::Orientation theOrientation, - int theRole = Qt::DisplayRole ) const Standard_OVERRIDE; + //! Creates root item + //! \param theColumnId index of a column + virtual void createRootItem (const int theColumnId) Standard_OVERRIDE; private: diff --git a/tools/VInspector/VInspector_Window.cxx b/tools/VInspector/VInspector_Window.cxx index 62a58c47d8..549be243d3 100644 --- a/tools/VInspector/VInspector_Window.cxx +++ b/tools/VInspector/VInspector_Window.cxx @@ -17,13 +17,17 @@ #include -#include +#include +#include +#include + +#include +#include #include #include #include #include -#include #include #include #include @@ -33,6 +37,8 @@ #include #include +#include + #include #include @@ -50,18 +56,6 @@ #include #include -const int FIRST_COLUMN_WIDTH = 230; - -const int COLUMN_1_WIDTH = 30; -const int COLUMN_2_WIDTH = 70; -const int COLUMN_3_WIDTH = 70; -const int COLUMN_4_WIDTH = 75; -const int COLUMN_5_WIDTH = 120; -const int COLUMN_6_WIDTH = 65; -const int COLUMN_7_WIDTH = 70; - -const int HISTORY_AIS_NAME_COLUMN_WIDTH = 140; - const int VINSPECTOR_DEFAULT_WIDTH = 1250; const int VINSPECTOR_DEFAULT_HEIGHT = 800; @@ -77,52 +71,6 @@ const int VINSPECTOR_DEFAULT_HISTORY_VIEW_HEIGHT = 50; const int VINSPECTOR_DEFAULT_VIEW_POSITION_X = 200 + 900 + 100; // TINSPECTOR_DEFAULT_POSITION_X + TINSPECTOR_DEFAULT_WIDTH + 100 const int VINSPECTOR_DEFAULT_VIEW_POSITION_Y = 60; // TINSPECTOR_DEFAULT_POSITION_Y + 50 -//! \class Vinspector_TreeView -//! Extended tree view control with possibility to set predefined size. -class Vinspector_TreeView : public QTreeView -{ -public: - //! Constructor - Vinspector_TreeView (QWidget* theParent) : QTreeView (theParent), myDefaultWidth (-1), myDefaultHeight (-1) {} - - //! Destructor - virtual ~Vinspector_TreeView() {} - - //! Sets default size of control, that is used by the first control show - //! \param theDefaultWidth the width value - //! \param theDefaultHeight the height value - void SetPredefinedSize (int theDefaultWidth, int theDefaultHeight); - - //! Returns predefined size if both values are positive, otherwise parent size hint - virtual QSize sizeHint() const Standard_OVERRIDE; - -private: - - int myDefaultWidth; //!< default width, -1 if it should not be used - int myDefaultHeight; //!< default height, -1 if it should not be used -}; - -// ======================================================================= -// function : SetPredefinedSize -// purpose : -// ======================================================================= -void Vinspector_TreeView::SetPredefinedSize (int theDefaultWidth, int theDefaultHeight) -{ - myDefaultWidth = theDefaultWidth; - myDefaultHeight = theDefaultHeight; -} - -// ======================================================================= -// function : sizeHint -// purpose : -// ======================================================================= -QSize Vinspector_TreeView::sizeHint() const -{ - if (myDefaultWidth > 0 && myDefaultHeight > 0) - return QSize (myDefaultWidth, myDefaultHeight); - return QTreeView::sizeHint(); -} - // ======================================================================= // function : Constructor // purpose : @@ -137,7 +85,7 @@ VInspector_Window::VInspector_Window() aParentLay->setContentsMargins (0, 0, 0, 0); aParentLay->setSpacing(0); - // tool bar: on the bottom of the window + // restore state of tool bar: on the bottom of the window myToolBar = new VInspector_ToolBar(aCentralWidget); connect (myToolBar, SIGNAL (actionClicked (int)), this, SLOT (onToolBarActionClicked (int))); aParentLay->addWidget (myToolBar->GetControl(), 0, 0); @@ -148,34 +96,55 @@ VInspector_Window::VInspector_Window() myTreeView->setSelectionMode (QAbstractItemView::ExtendedSelection); myTreeView->header()->setStretchLastSection (true); myTreeView->setContextMenuPolicy(Qt::CustomContextMenu); + VInspector_ViewModel* aTreeModel = new VInspector_ViewModel (myTreeView); + myTreeView->setModel (aTreeModel); + // hide Visibility column + TreeModel_HeaderSection anItem = aTreeModel->GetHeaderItem ((int)TreeModel_ColumnType_Visibility); + anItem.SetIsHidden (true); + aTreeModel->SetHeaderItem ((int)TreeModel_ColumnType_Visibility, anItem); + connect (myTreeView, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT (onTreeViewContextMenuRequested(const QPoint&))); + new TreeModel_ContextMenu (myTreeView); + + QItemSelectionModel* aSelModel = new QItemSelectionModel (myTreeView->model(), myTreeView); + myTreeView->setSelectionModel (aSelModel); + connect (aSelModel, SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)), + this, SLOT (onSelectionChanged (const QItemSelection&, const QItemSelection&))); + aParentLay->addWidget(myTreeView, 1, 0); aParentLay->setRowStretch (1, 1); myMainWindow->setCentralWidget (aCentralWidget); - // history view in bottom dock widget - myHistoryView = new Vinspector_TreeView (aCentralWidget); + myHistoryView = new ViewControl_TreeView (myMainWindow); myHistoryView->setSelectionBehavior (QAbstractItemView::SelectRows); - ((Vinspector_TreeView*)myHistoryView)->SetPredefinedSize (VINSPECTOR_DEFAULT_HISTORY_VIEW_WIDTH, - VINSPECTOR_DEFAULT_HISTORY_VIEW_HEIGHT); + ((ViewControl_TreeView*)myHistoryView)->SetPredefinedSize (QSize (VINSPECTOR_DEFAULT_HISTORY_VIEW_WIDTH, + VINSPECTOR_DEFAULT_HISTORY_VIEW_HEIGHT)); + myHistoryView->setContextMenuPolicy (Qt::CustomContextMenu); + myHistoryView->header()->setStretchLastSection (true); + new TreeModel_ContextMenu (myHistoryView); myHistoryView->setSelectionMode (QAbstractItemView::ExtendedSelection); VInspector_ViewModelHistory* aHistoryModel = new VInspector_ViewModelHistory (myHistoryView); myHistoryView->setModel (aHistoryModel); - QItemSelectionModel* aSelectionModel = new QItemSelectionModel (myHistoryView->model()); + QItemSelectionModel* aSelectionModel = new QItemSelectionModel (aHistoryModel); myHistoryView->setSelectionModel (aSelectionModel); connect (aSelectionModel, SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)), - this, SLOT (onHistoryViewSelectionChanged (const QItemSelection&, const QItemSelection&))); + this, SLOT (onHistoryViewSelectionChanged (const QItemSelection&, const QItemSelection&))); - myHistoryView->setColumnWidth (0, FIRST_COLUMN_WIDTH); - myHistoryView->setColumnWidth (1, COLUMN_1_WIDTH); - myHistoryView->setColumnWidth (2, COLUMN_2_WIDTH); - myHistoryView->setColumnWidth (3, COLUMN_3_WIDTH); - myHistoryView->setColumnWidth (4, HISTORY_AIS_NAME_COLUMN_WIDTH); + anItem = aHistoryModel->GetHeaderItem (0); + TreeModel_Tools::UseVisibilityColumn (myHistoryView, false); + // hide Visibility column + anItem = aHistoryModel->GetHeaderItem ((int)TreeModel_ColumnType_Visibility); + anItem.SetIsHidden (true); + aHistoryModel->SetHeaderItem ((int)TreeModel_ColumnType_Visibility, anItem); + + QModelIndex aParentIndex = myHistoryView->model()->index (0, 0); + myHistoryView->setExpanded (aParentIndex, true); QDockWidget* aHistoryDockWidget = new QDockWidget (tr ("HistoryView"), myMainWindow); + aHistoryDockWidget->setObjectName (aHistoryDockWidget->windowTitle()); aHistoryDockWidget->setTitleBarWidget (new QWidget(myMainWindow)); aHistoryDockWidget->setWidget (myHistoryView); myMainWindow->addDockWidget (Qt::BottomDockWidgetArea, aHistoryDockWidget); @@ -202,6 +171,69 @@ void VInspector_Window::SetParent (void* theParent) aLayout->addWidget (GetMainWindow()); } +// ======================================================================= +// function : FillActionsMenu +// purpose : +// ======================================================================= +void VInspector_Window::FillActionsMenu (void* theMenu) +{ + QMenu* aMenu = (QMenu*)theMenu; + QList aDockwidgets = myMainWindow->findChildren(); + for (QList::iterator it = aDockwidgets.begin(); it != aDockwidgets.end(); ++it) + { + QDockWidget* aDockWidget = *it; + if (aDockWidget->parentWidget() == myMainWindow) + aMenu->addAction (aDockWidget->toggleViewAction()); + } +} + +// ======================================================================= +// function : GetPreferences +// purpose : +// ======================================================================= +void VInspector_Window::GetPreferences (TInspectorAPI_PreferencesDataMap& theItem) +{ + theItem.Clear(); + theItem.Bind ("geometry", TreeModel_Tools::ToString (myMainWindow->saveState()).toStdString().c_str()); + + QMap anItems; + TreeModel_Tools::SaveState (myTreeView, anItems); + for (QMap::const_iterator anItemsIt = anItems.begin(); anItemsIt != anItems.end(); anItemsIt++) + { + theItem.Bind (anItemsIt.key().toStdString().c_str(), anItemsIt.value().toStdString().c_str()); + } + + anItems.clear(); + TreeModel_Tools::SaveState (myHistoryView, anItems, "history_view_"); + for (QMap::const_iterator anItemsIt = anItems.begin(); anItemsIt != anItems.end(); anItemsIt++) + theItem.Bind (anItemsIt.key().toStdString().c_str(), anItemsIt.value().toStdString().c_str()); +} + +// ======================================================================= +// function : SetPreferences +// purpose : +// ======================================================================= +void VInspector_Window::SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem) +{ + if (theItem.IsEmpty()) + { + TreeModel_Tools::SetDefaultHeaderSections (myTreeView); + TreeModel_Tools::SetDefaultHeaderSections (myHistoryView); + return; + } + + for (TInspectorAPI_IteratorOfPreferencesDataMap anItemIt (theItem); anItemIt.More(); anItemIt.Next()) + { + if (anItemIt.Key().IsEqual ("geometry")) + myMainWindow->restoreState (TreeModel_Tools::ToByteArray (anItemIt.Value().ToCString())); + else if (TreeModel_Tools::RestoreState (myTreeView, anItemIt.Key().ToCString(), anItemIt.Value().ToCString())) + continue; + else if (TreeModel_Tools::RestoreState (myHistoryView, anItemIt.Key().ToCString(), anItemIt.Value().ToCString(), + "history_view_")) + continue; + } +} + // ======================================================================= // function : UpdateContent // purpose : @@ -210,17 +242,20 @@ void VInspector_Window::UpdateContent() { TCollection_AsciiString aName = "TKVInspector"; + bool isModelUpdated = false; if (myParameters->FindParameters (aName)) - Init(myParameters->Parameters (aName)); - if (myParameters->FindFileNames(aName)) + isModelUpdated = Init (myParameters->Parameters (aName)); + if (myParameters->FindFileNames (aName)) { - for (NCollection_List::Iterator aFileNamesIt(myParameters->FileNames(aName)); + for (NCollection_List::Iterator aFileNamesIt (myParameters->FileNames (aName)); aFileNamesIt.More(); aFileNamesIt.Next()) - OpenFile (aFileNamesIt.Value()); + isModelUpdated = OpenFile (aFileNamesIt.Value()) || isModelUpdated; NCollection_List aNames; - myParameters->SetFileNames(aName, aNames); + myParameters->SetFileNames (aName, aNames); } + if (!isModelUpdated) + UpdateTreeModel(); // make AIS_InteractiveObject selected selected if exist in select parameters NCollection_List anObjects; @@ -250,7 +285,7 @@ void VInspector_Window::UpdateContent() // function : Init // purpose : // ======================================================================= -void VInspector_Window::Init (const NCollection_List& theParameters) +bool VInspector_Window::Init (const NCollection_List& theParameters) { Handle(AIS_InteractiveContext) aContext; Handle(VInspector_CallBack) aCallBack; @@ -265,17 +300,18 @@ void VInspector_Window::Init (const NCollection_List aCallBack = Handle(VInspector_CallBack)::DownCast (anObject); } if (aContext.IsNull()) - return; - SetContext (aContext); + return false; + VInspector_ViewModel* aViewModel = dynamic_cast (myTreeView->model()); + if (aViewModel && aViewModel->GetContext() == aContext) + UpdateTreeModel(); + else + SetContext (aContext); - if (!aCallBack.IsNull()) + if (!aCallBack.IsNull() && aCallBack != myCallBack) { myCallBack = aCallBack; - VInspector_ViewModelHistory* aHistoryModel = dynamic_cast - (myHistoryView->model()); - myCallBack->SetContext (aContext); - myCallBack->SetHistoryModel(aHistoryModel); } + return true; } // ======================================================================= @@ -284,53 +320,36 @@ void VInspector_Window::Init (const NCollection_List // ======================================================================= void VInspector_Window::SetContext (const Handle(AIS_InteractiveContext)& theContext) { - VInspector_ViewModel* aViewModel = new VInspector_ViewModel (myTreeView); + VInspector_ViewModel* aViewModel = dynamic_cast (myTreeView->model()); aViewModel->SetContext (theContext); - myTreeView->setModel (aViewModel); - myTreeView->setExpanded (aViewModel->index (0, 0), true); - myTreeView->setColumnWidth (0, FIRST_COLUMN_WIDTH); if (!myCallBack.IsNull()) myCallBack->SetContext (theContext); - - QItemSelectionModel* aSelModel = new QItemSelectionModel (aViewModel, myTreeView); - myTreeView->setSelectionModel (aSelModel); - connect (aSelModel, SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)), - this, SLOT (onSelectionChanged (const QItemSelection&, const QItemSelection&))); - - myTreeView->setColumnWidth (1, COLUMN_1_WIDTH); - myTreeView->setColumnWidth (2, COLUMN_2_WIDTH); - myTreeView->setColumnWidth (3, COLUMN_3_WIDTH); - myTreeView->setColumnWidth (4, COLUMN_4_WIDTH); - myTreeView->setColumnWidth (5, COLUMN_5_WIDTH); - myTreeView->setColumnWidth (6, COLUMN_6_WIDTH); - myTreeView->setColumnWidth (7, COLUMN_7_WIDTH); } // ======================================================================= // function : OpenFile // purpose : // ======================================================================= -void VInspector_Window::OpenFile(const TCollection_AsciiString& theFileName) +bool VInspector_Window::OpenFile(const TCollection_AsciiString& theFileName) { VInspector_ViewModel* aViewModel = dynamic_cast (myTreeView->model()); if (!aViewModel) - { - Handle(AIS_InteractiveContext) aContext = createView(); - SetContext (aContext); - aViewModel = dynamic_cast (myTreeView->model()); - } - if (!aViewModel) - return; + return false; Handle(AIS_InteractiveContext) aContext = aViewModel->GetContext(); - if (!aContext) - return; + bool isModelUpdated = false; + if (aContext.IsNull()) + { + aContext = createView(); + SetContext (aContext); + isModelUpdated = true; + } TopoDS_Shape aShape = VInspector_Tools::ReadShape (theFileName); if (aShape.IsNull()) - return; + return isModelUpdated; Handle(AIS_Shape) aPresentation = new AIS_Shape (aShape); aContext->Display (aPresentation, false); @@ -339,6 +358,7 @@ void VInspector_Window::OpenFile(const TCollection_AsciiString& theFileName) UpdateTreeModel(); myTreeView->setExpanded (aViewModel->index (0, 0), true); + return true; } // ======================================================================= @@ -348,9 +368,9 @@ void VInspector_Window::OpenFile(const TCollection_AsciiString& theFileName) void VInspector_Window::onTreeViewContextMenuRequested(const QPoint& thePosition) { QMenu* aMenu = new QMenu (GetMainWindow()); - aMenu->addAction (createAction (tr ("Export to ShapeView"), SLOT(onExportToShapeView()))); - aMenu->addAction (createAction (tr ("Show"), SLOT(onShow()))); - aMenu->addAction (createAction (tr ("Hide"), SLOT(onHide()))); + aMenu->addAction (ViewControl_Tools::CreateAction (tr ("Export to ShapeView"), SLOT (onExportToShapeView()), GetMainWindow(), this)); + aMenu->addAction (ViewControl_Tools::CreateAction (tr ("Show"), SLOT (onShow()), GetMainWindow(), this)); + aMenu->addAction (ViewControl_Tools::CreateAction (tr ("Hide"), SLOT (onHide()), GetMainWindow(), this)); QPoint aPoint = myTreeView->mapToGlobal (thePosition); aMenu->exec(aPoint); } @@ -462,6 +482,10 @@ void VInspector_Window::onExportToShapeView() if (myParameters->FindParameters (aPluginName)) aParameters = myParameters->Parameters (aPluginName); + NCollection_List anItemNames; + if (myParameters->FindSelectedNames (aPluginName)) + anItemNames = myParameters->GetSelectedNames (aPluginName); + QStringList anExportedPointers; for (NCollection_List::Iterator anIOIt (aSelectedPresentations); anIOIt.More(); anIOIt.Next()) { @@ -473,6 +497,7 @@ void VInspector_Window::onExportToShapeView() if (aShape.IsNull()) continue; aParameters.Append (aShape.TShape()); + anItemNames.Append (TInspectorAPI_PluginParameters::ParametersToString(aShape)); anExportedPointers.append (VInspector_Tools::GetPointerInfo (aShape.TShape(), true).ToCString()); } if (anExportedPointers.empty()) @@ -485,11 +510,12 @@ void VInspector_Window::onExportToShapeView() 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); + myExportToShapeViewDialog = new ViewControl_MessageDialog (myParent, aMessage, aQuestion); else myExportToShapeViewDialog->SetInformation (aMessage); myExportToShapeViewDialog->Start(); + myParameters->SetSelectedNames (aPluginName, anItemNames); myParameters->SetParameters (aPluginName, aParameters, myExportToShapeViewDialog->IsAccepted()); } @@ -518,21 +544,8 @@ void VInspector_Window::onHide() void VInspector_Window::UpdateTreeModel() { VInspector_ViewModel* aViewModel = dynamic_cast (myTreeView->model()); - if (!aViewModel) - return; - aViewModel->Reset(); - aViewModel->EmitLayoutChanged(); -} - -// ======================================================================= -// function : createAction -// purpose : -// ======================================================================= -QAction* VInspector_Window::createAction(const QString& theText, const char* theSlot) -{ - QAction* anAction = new QAction(theText, GetMainWindow()); - connect(anAction, SIGNAL(triggered(bool)), this, theSlot); - return anAction; + if (aViewModel) + aViewModel->UpdateTreeModel(); } // ======================================================================= diff --git a/tools/VInspector/VInspector_Window.hxx b/tools/VInspector/VInspector_Window.hxx index 3732113b83..7d004e59b9 100644 --- a/tools/VInspector/VInspector_Window.hxx +++ b/tools/VInspector/VInspector_Window.hxx @@ -20,6 +20,7 @@ #include #include #include + #include #include @@ -29,7 +30,7 @@ #include #include -class TreeModel_MessageDialog; +class ViewControl_MessageDialog; class VInspector_ToolBar; class View_Window; @@ -63,6 +64,18 @@ public: //! \param theParameters a parameters container void SetParameters (const Handle(TInspectorAPI_PluginParameters)& theParameters) { myParameters = theParameters; } + //! Provide container for actions available in inspector on general level + //! \param theMenu if Qt implementation, it is QMenu object + Standard_EXPORT void FillActionsMenu (void* theMenu); + + //! Returns plugin preferences: dock widgets state, tree view columns. + //! \param theItem container of preference elements + Standard_EXPORT void GetPreferences (TInspectorAPI_PreferencesDataMap& theItem); + + //! Applies plugin preferences + //! \param theItem container of preference elements + Standard_EXPORT void SetPreferences (const TInspectorAPI_PreferencesDataMap& theItem); + //! Applyes parameters to Init controls, opens files if there are in parameters, updates OCAF tree view model Standard_EXPORT void UpdateContent(); @@ -74,11 +87,11 @@ private: //! Fills controls of the plugin by parameters: //! - Fine AIS_InteractiveObject and fills View if it if it differs from the current context //! \param theParameters a parameters container - void Init (const NCollection_List& theParameters); + bool Init (const NCollection_List& theParameters); //! Read BREP file, creates AIS presentation for the shape and visualize it in the current context //! \param theFileName a name of BREP file - void OpenFile (const TCollection_AsciiString& theFileName); + bool OpenFile (const TCollection_AsciiString& theFileName); private slots: @@ -120,12 +133,6 @@ private: //! Updates tree model void UpdateTreeModel(); - //! Creates an action with the given text connected to the slot - //! \param theText an action text value - //! \param theSlot a listener of triggered signal of the new action - //! \return a new action - QAction* createAction(const QString& theText, const char* theSlot); - //! Set selected in tree view presentations displayed or erased in the current context. Note that erased presentations //! still belongs to the current context until Remove is called. //! \param theToDisplay if true, presentation is displayed otherwise erased @@ -145,7 +152,7 @@ private: QTreeView* myHistoryView; //!< history of AIS context calls Handle(VInspector_CallBack) myCallBack; //!< AIS context call back, if set - TreeModel_MessageDialog* myExportToShapeViewDialog; //!< dialog about exporting TopoDS_Shape to ShapeView plugin + ViewControl_MessageDialog* myExportToShapeViewDialog; //!< dialog about exporting TopoDS_Shape to ShapeView plugin View_Window* myViewWindow; //!< temporary view window, it is created if Open is called but context is still NULL Handle(TInspectorAPI_PluginParameters) myParameters; //!< plugins parameters container diff --git a/tools/VInspector/icons/treeview_and.png b/tools/VInspector/icons/treeview_and.png new file mode 100644 index 0000000000000000000000000000000000000000..cd188ad1dc83d303add776ac6d684219ce39fd96 GIT binary patch literal 604 zcmV-i0;BzjP)Dtr!5r9ZHf8X3yZr*JR4Q^`)3nF!=kG8a4$GuS zB*IK4!)P>WsO+}#`TW0uBw4T5sj8|WSqQ;gF30ov%wDf2{hdz702B{H`Gp7Rx(-EA q9^KF66+#@uy@#awPUbV+zW+bO+1C=2Qh`ta0000*DYs6nosN!y~%w=vQhHIB>$7QU$~Y% zU}9qsw4CJq^4QfTp+k=^SiiqNZv|WQh6Sv;83*NA7H6G_^}o8lnR`R(;p|UJ<} #include #include +#include +#include +#include #include #include #include @@ -28,7 +31,7 @@ // purpose : // ======================================================================= View_Displayer::View_Displayer() -: myIsKeepPresentations (false), myDisplayMode (-1) +: myIsKeepPresentations (false), myFitAllActive (false), myDisplayMode (-1) { } @@ -107,21 +110,35 @@ void View_Displayer::DisplayPresentation (const Handle(Standard_Transient)& theP aDisplayed.Append (aPresentation); } - if (!myIsKeepPresentations) - { - Handle(V3d_View) aView = GetView(); - if (!aView.IsNull()) - { - aView->FitAll(); - aView->Redraw(); - } - } + if (!myIsKeepPresentations || myFitAllActive) + fitAllView(); + myDisplayed.Bind (theType, aDisplayed); if (theToUpdateViewer) UpdateViewer(); } +// ======================================================================= +// function : RedisplayPresentation +// purpose : +// ======================================================================= +void View_Displayer::RedisplayPresentation (const Handle(Standard_Transient)& thePresentation, + const bool theToUpdateViewer) +{ + Handle(AIS_InteractiveObject) aPresentation = Handle(AIS_InteractiveObject)::DownCast (thePresentation); + if (aPresentation.IsNull() || aPresentation->GetContext().IsNull()) + return; + + GetContext()->Redisplay (aPresentation, false); + + if (myFitAllActive) + fitAllView(); + + if (theToUpdateViewer) + UpdateViewer(); +} + // ======================================================================= // function : EraseAllPresentations // purpose : @@ -149,12 +166,80 @@ void View_Displayer::ErasePresentations (const View_PresentationType theType, co DisplayedPresentations (aDisplayed, theType); for (AIS_ListIteratorOfListOfInteractive aDisplayedIt (aDisplayed); aDisplayedIt.More(); aDisplayedIt.Next()) + { + if (aDisplayedIt.Value()->IsKind(STANDARD_TYPE (AIS_Trihedron))) + continue; + GetContext()->Remove (aDisplayedIt.Value(), Standard_False); + } + + aDisplayed.Clear(); + myDisplayed.Bind (theType, aDisplayed); if (theToUpdateViewer) UpdateViewer(); } +// ======================================================================= +// function : ErasePresentation +// purpose : +// ======================================================================= +void View_Displayer::ErasePresentation (const Handle(Standard_Transient)& thePresentation, + const View_PresentationType theType, + const bool theToUpdateViewer) +{ + if (GetContext().IsNull()) + return; + + Handle(AIS_InteractiveObject) aPresentation = Handle(AIS_InteractiveObject)::DownCast (thePresentation); + if (aPresentation.IsNull()) + return; + + GetContext()->Remove (aPresentation, Standard_False); + + NCollection_Shared aDisplayed; + DisplayedPresentations (aDisplayed, theType); + aDisplayed.Remove (aPresentation); + myDisplayed.Bind (theType, aDisplayed); + + if (myFitAllActive) + fitAllView(); + + if (theToUpdateViewer) + UpdateViewer(); +} + +// ======================================================================= +// function : SetVisible +// purpose : +// ======================================================================= +void View_Displayer::SetVisible (const TopoDS_Shape& theShape, const bool theState, const View_PresentationType theType) +{ + if (theShape.IsNull()) + return; + + if (theState) + DisplayPresentation (CreatePresentation (theShape), View_PresentationType_Main, Standard_False); + else + { + Handle(AIS_InteractiveObject) aPresentation = FindPresentation (theShape, theType); + if (!aPresentation.IsNull()) + ErasePresentation (aPresentation, theType, Standard_False); + } + + UpdateViewer(); +} + +// ======================================================================= +// function : IsVisible +// purpose : +// ======================================================================= +bool View_Displayer::IsVisible (const TopoDS_Shape& theShape, const View_PresentationType theType) const +{ + Handle(AIS_InteractiveObject) aPresentation = FindPresentation (theShape, theType); + return !aPresentation.IsNull(); +} + // ======================================================================= // function : UpdateViewer // purpose : @@ -181,7 +266,7 @@ void View_Displayer::SetAttributeColor (const Quantity_Color& theColor, const Vi // purpose : // ======================================================================= void View_Displayer::DisplayedPresentations (NCollection_Shared& thePresentations, - const View_PresentationType theType) + const View_PresentationType theType) const { myDisplayed.Find (theType, thePresentations); } @@ -205,3 +290,53 @@ Handle(V3d_View) View_Displayer::GetView() const } return aView; } + +// ======================================================================= +// function : FindPresentation +// purpose : +// ======================================================================= +Handle(AIS_InteractiveObject) View_Displayer::FindPresentation (const TopoDS_Shape& theShape, + const View_PresentationType theType) const +{ + if (theShape.IsNull()) + return Handle(AIS_InteractiveObject)(); + + NCollection_Shared aDisplayed; + DisplayedPresentations (aDisplayed, theType); + + for (AIS_ListIteratorOfListOfInteractive aDisplayedIt (aDisplayed); aDisplayedIt.More(); aDisplayedIt.Next()) + { + Handle(AIS_Shape) aPresentation = Handle(AIS_Shape)::DownCast (aDisplayedIt.Value()); + if (aPresentation->Shape().IsEqual (theShape)) + return aPresentation; + } + + return Handle(AIS_InteractiveObject)(); +} + +// ======================================================================= +// function : CreatePresentation +// purpose : +// ======================================================================= +Handle(Standard_Transient) View_Displayer::CreatePresentation (const TopoDS_Shape& theShape) +{ + Handle(AIS_Shape) aShape = new AIS_Shape (theShape); + + aShape->Attributes()->SetPointAspect (new Prs3d_PointAspect (Aspect_TOM_POINT, Quantity_NOC_WHITE, 1.0)); + + return aShape; +} + +// ======================================================================= +// function : fitAllView +// purpose : +// ======================================================================= +void View_Displayer::fitAllView() +{ + Handle(V3d_View) aView = GetView(); + if (!aView.IsNull()) + { + aView->FitAll(); + aView->Redraw(); + } +} \ No newline at end of file diff --git a/tools/View/View_Displayer.hxx b/tools/View/View_Displayer.hxx index 7b788031bd..8e7bc4ccf7 100644 --- a/tools/View/View_Displayer.hxx +++ b/tools/View/View_Displayer.hxx @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -53,6 +54,10 @@ public: //! \param theToKeepPresentation boolean state void KeepPresentations (const bool theToKeepPresentations) { myIsKeepPresentations = theToKeepPresentations; } + //! Stores flag whether the FitAll shoud be done automatically for each display + //! \param theFitAllActive boolean value + void SetFitAllActive (const bool theFitAllActive) { myFitAllActive = theFitAllActive; } + //! Stores display mode and changes display mode of displayed presentations //! \param theDisplayMode a mode: 0 - AIS_WireFrame, 1 - AIS_Shaded //! \param theType presentation type @@ -73,6 +78,12 @@ public: const View_PresentationType theType = View_PresentationType_Main, const bool theToUpdateViewer = true); + //! Redisplays the parameter presentation in current context + //! \param thePresentation a presentation, it will be casted to AIS_InteractiveObject + //! \param isToUpdateView boolean state if viewer should be updated + Standard_EXPORT void RedisplayPresentation (const Handle(Standard_Transient)& thePresentation, + const bool theToUpdateViewer = true); + //! Erases all presentations from viewer. Iterates by internal map of displayed presentations and //! erase these presentations. //! \param isToUpdateView boolean state if viewer should be updated @@ -84,6 +95,25 @@ public: Standard_EXPORT void ErasePresentations (const View_PresentationType theType = View_PresentationType_Main, const bool theToUpdateViewer = true); + //! Erase presentation from viewer + //! \param thePresentation a presentation, it will be casted to AIS_InteractiveObject + //! \param theType presentation type + //! \param isToUpdateView boolean state if viewer should be updated + Standard_EXPORT void ErasePresentation (const Handle(Standard_Transient)& thePresentation, + const View_PresentationType theType = View_PresentationType_Main, + const bool theToUpdateViewer = true); + + //! Sets shape visible/invisible + //! \theShape shape instance + //! \theState visibility state + Standard_EXPORT void SetVisible (const TopoDS_Shape& theShape, const bool theState, + const View_PresentationType theType = View_PresentationType_Main); + + //! Returns visibility state value + //! \theShape shape instance + Standard_EXPORT bool IsVisible (const TopoDS_Shape& theShape, + const View_PresentationType theType = View_PresentationType_Main) const; + //! Calls UpdateCurrentViewer of context Standard_EXPORT void UpdateViewer(); @@ -97,11 +127,23 @@ public: //! \param thePresentations a container to be filled //! \param theType presentation type Standard_EXPORT void DisplayedPresentations (NCollection_Shared& thePresentations, - const View_PresentationType theType = View_PresentationType_Main); + const View_PresentationType theType = View_PresentationType_Main) const; //! Returns all displayed by the trihedron objects const NCollection_DataMap>& GetDisplayed() const { return myDisplayed; } + //! Returns presentation if there is displayed AIS_Shape presentation for the parameter shape + //! \param theShape a shape instance + //! \param theType presentation type + //! \return presentation instance or NULL + Standard_EXPORT Handle(AIS_InteractiveObject) FindPresentation (const TopoDS_Shape& theShape, + const View_PresentationType theType = View_PresentationType_Main) const; + + //! Creates AIS_Shape for the shape + //! \param theShape a shape + //! \return presentation + Standard_EXPORT static Handle(Standard_Transient) CreatePresentation (const TopoDS_Shape& theShape); + private: //! Returns the current context @@ -110,6 +152,9 @@ private: //! Returns 3d view Handle(V3d_View) GetView() const; + //! Fit all view + void fitAllView(); + private: Handle(AIS_InteractiveContext) myContext; //!< context, where the displayer works @@ -117,6 +162,7 @@ private: NCollection_DataMap myColorAttributes; //!< color properties of presentations bool myIsKeepPresentations; //!< flag if previously shown presentations stays in the context by displaying a new one + bool myFitAllActive; //!< flag if Fit All should be peformed automatically by each Display int myDisplayMode; //!< display mode: 0 - AIS_WireFrame, 1 - AIS_Shaded }; diff --git a/tools/View/View_ToolBar.cxx b/tools/View/View_ToolBar.cxx index 06c7e81246..1ebff8d129 100644 --- a/tools/View/View_ToolBar.cxx +++ b/tools/View/View_ToolBar.cxx @@ -31,7 +31,7 @@ const int DEFAULT_SPACING = 3; // function : Constructor // purpose : // ======================================================================= -View_ToolBar::View_ToolBar (QWidget* theParent) +View_ToolBar::View_ToolBar (QWidget* theParent, const bool isUseKeepView) : QObject (theParent) { myMainWindow = new QWidget (theParent); @@ -63,22 +63,25 @@ View_ToolBar::View_ToolBar (QWidget* theParent) myViewContexts[View_ContextType_Own] = Handle(AIS_InteractiveContext)(); myViewContexts[View_ContextType_External] = Handle(AIS_InteractiveContext)(); - myActionsMap[View_ToolActionType_KeepViewId] = new QToolButton (theParent); - myActionsMap[View_ToolActionType_KeepViewId]->setIcon (QIcon (":/icons/keep_view_on.png")); - myActionsMap[View_ToolActionType_KeepViewId]->setText (tr ("Multi")); - myActionsMap[View_ToolActionType_KeepViewId]->setToolTip (tr ("Keep View On: does not clear previously shown presentation")); - myActionsMap[View_ToolActionType_KeepViewId]->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - myActionsMap[View_ToolActionType_KeepViewId]->setCheckable (true); - myActionsMap[View_ToolActionType_KeepViewId]->setChecked (false); + if (isUseKeepView) + { + myActionsMap[View_ToolActionType_KeepViewId] = new QToolButton (theParent); + myActionsMap[View_ToolActionType_KeepViewId]->setIcon (QIcon (":/icons/keep_view_on.png")); + myActionsMap[View_ToolActionType_KeepViewId]->setText (tr ("Multi")); + myActionsMap[View_ToolActionType_KeepViewId]->setToolTip (tr ("Keep View On: does not clear previously shown presentation")); + myActionsMap[View_ToolActionType_KeepViewId]->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + myActionsMap[View_ToolActionType_KeepViewId]->setCheckable (true); + myActionsMap[View_ToolActionType_KeepViewId]->setChecked (false); + + myActionsMap[View_ToolActionType_KeepViewOffId] = new QToolButton (theParent); + myActionsMap[View_ToolActionType_KeepViewOffId]->setIcon (QIcon (":/icons/keep_view_off.png")); + myActionsMap[View_ToolActionType_KeepViewOffId]->setText (QObject::tr ("Single")); + myActionsMap[View_ToolActionType_KeepViewOffId]->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + myActionsMap[View_ToolActionType_KeepViewOffId]->setToolTip (tr ("Keep View Off: clear previously shown presentation")); + myActionsMap[View_ToolActionType_KeepViewOffId]->setCheckable (true); + myActionsMap[View_ToolActionType_KeepViewOffId]->setChecked (true); + } - myActionsMap[View_ToolActionType_KeepViewOffId] = new QToolButton (theParent); - myActionsMap[View_ToolActionType_KeepViewOffId]->setIcon (QIcon (":/icons/keep_view_off.png")); - myActionsMap[View_ToolActionType_KeepViewOffId]->setText (QObject::tr ("Single")); - myActionsMap[View_ToolActionType_KeepViewOffId]->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - myActionsMap[View_ToolActionType_KeepViewOffId]->setToolTip (tr ("Keep View Off: clear previously shown presentation")); - myActionsMap[View_ToolActionType_KeepViewOffId]->setCheckable (true); - myActionsMap[View_ToolActionType_KeepViewOffId]->setChecked (true); - myActionsMap[View_ToolActionType_ClearViewId] = new QToolButton (theParent); myActionsMap[View_ToolActionType_ClearViewId]->setIcon (QIcon (":/icons/view_clear.png")); myActionsMap[View_ToolActionType_ClearViewId]->setText (tr ( "Clear View")); diff --git a/tools/View/View_ToolBar.hxx b/tools/View/View_ToolBar.hxx index 99d888f083..dca417ba05 100644 --- a/tools/View/View_ToolBar.hxx +++ b/tools/View/View_ToolBar.hxx @@ -44,7 +44,7 @@ class View_ToolBar : public QObject public: //! Constructor - Standard_EXPORT View_ToolBar (QWidget* theParent); + Standard_EXPORT View_ToolBar (QWidget* theParent, const bool isUseKeepView = true); //! Destructor virtual ~View_ToolBar() Standard_OVERRIDE {} diff --git a/tools/View/View_ToolButton.hxx b/tools/View/View_ToolButton.hxx new file mode 100644 index 0000000000..d21b45bb1a --- /dev/null +++ b/tools/View/View_ToolButton.hxx @@ -0,0 +1,64 @@ +// 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 View_ToolButton_H +#define View_ToolButton_H + +#include +#include +#include +#include +#include + +//! \class View_Widget +//! \brief It is a Qt control that implements change checked state for button by double click event +//! Button becomes checked by double click mouse pressed and unchecked by the next press mouse +class View_ToolButton : public QToolButton +{ + Q_OBJECT + +public: + View_ToolButton (QWidget* theParent) : QToolButton (theParent) {} + ~View_ToolButton() {} + + //! Sets the button checkable, set whether the button checkable or not + //! \param theChecked boolean value + void SetButtonChecked (const bool theChecked) {setCheckable (theChecked); setChecked (theChecked); emit checkedStateChanged (theChecked); } + +signals: + //! Sends a signal about checked state is changed + //! \param theState the checked state + void checkedStateChanged (bool theState); + +protected: + //! Sets the button unchecked if it was checked + virtual void mousePressEvent (QMouseEvent* theEvent) + { + if (isChecked()) + SetButtonChecked (false); + else + QToolButton::mousePressEvent (theEvent); + } + + //! Sets the button checked if it was unchecked + virtual void mouseDoubleClickEvent (QMouseEvent* theEvent) + { + QToolButton::mouseDoubleClickEvent (theEvent); + if (!isChecked()) + SetButtonChecked (true); + } +}; + +#endif diff --git a/tools/View/View_Tools.cxx b/tools/View/View_Tools.cxx new file mode 100644 index 0000000000..1699446f00 --- /dev/null +++ b/tools/View/View_Tools.cxx @@ -0,0 +1,76 @@ +// 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 +#include +#include +#include + +#include + +#include +#include +#include +#include + +// ======================================================================= +// function : CreateAction +// purpose : +// ======================================================================= +QAction* View_Tools::CreateAction (const QString& theText, const char* theSlot, QObject* theParent, QObject* theContext) +{ + QAction* anAction = new QAction (theText, theParent); + QObject::connect (anAction, SIGNAL (triggered (bool)), theContext, theSlot); + return anAction; +} + +// ======================================================================= +// function : SaveState +// purpose : +// ======================================================================= +void View_Tools::SaveState (View_Window* theView, QMap& theItems, + const QString& thePrefix) +{ + QStringList aCameraDirection; + Standard_Real aVX, aVY, aVZ; + theView->GetView()->GetViewer()->GetView()->Proj (aVX, aVY, aVZ); + aCameraDirection << QString::number (aVX) << QString::number (aVY) << QString::number (aVZ); + + theItems[thePrefix + "view_camera_direction"] = aCameraDirection.join (","); +} + +// ======================================================================= +// function : RestoreState +// purpose : +// ======================================================================= +bool View_Tools::RestoreState (View_Window* theView, const QString& theKey, const QString& theValue, + const QString& thePrefix) +{ + if (theKey == thePrefix + "view_camera_direction") + { + QStringList aValues = theValue.split (","); + if (aValues.size() == 3) + { + Standard_Real aVX = aValues.at (0).toDouble(); + Standard_Real aVY = aValues.at (1).toDouble(); + Standard_Real aVZ = aValues.at (2).toDouble(); + + theView->GetView()->SetInitProj (aVX, aVY, aVZ); + } + } + else + return false; + return true; +} diff --git a/tools/View/View_Tools.hxx b/tools/View/View_Tools.hxx new file mode 100644 index 0000000000..2c105f7ed6 --- /dev/null +++ b/tools/View/View_Tools.hxx @@ -0,0 +1,65 @@ +// 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 View_Tools_H +#define View_Tools_H + +#include +#include + +#include +#include +#include +#include + +class View_Window; + +class QAction; +class QObject; + +//! \class View_Tools +//! \brief The tool that gives auxiliary methods for qt elements manipulation +class View_Tools +{ +public: + + //! Creates an action with the given text connected to the slot + //! \param theText an action text value + //! \param theSlot a listener of triggered signal of the new action + //! \param theParent a parent object + //! \param theContext listener of the action toggle + //! \return a new action + Standard_EXPORT static QAction* CreateAction (const QString& theText, const char* theSlot, + QObject* theParent, QObject* theContext); + + //! Save state of three view in a container in form: key, value. It saves: + //! - visibiblity of columns, + //! - columns width + //! \param theTreeView a view instance + //! \param theItems [out] properties + //! \param thePrefix peference item prefix + Standard_EXPORT static void SaveState (View_Window* theView, QMap& theItems, + const QString& thePrefix = QString()); + //! Restore state of three view by a container + //! \param theTreeView a view instance + //! \param theKey property key + //! \param theValue property value + //! \param thePrefix peference item prefix + //! \return boolean value whether the property is applyed to the tree view + Standard_EXPORT static bool RestoreState (View_Window* theView, const QString& theKey, const QString& theValue, + const QString& thePrefix = QString()); +}; + +#endif diff --git a/tools/View/View_Widget.cxx b/tools/View/View_Widget.cxx index 295a9c9915..33230ef59d 100644 --- a/tools/View/View_Widget.cxx +++ b/tools/View/View_Widget.cxx @@ -19,8 +19,12 @@ #include +#include +#include #include #include + +#include #include #include @@ -59,14 +63,17 @@ // function : Constructor // purpose : // ======================================================================= -View_Widget::View_Widget (QWidget* theParent) +View_Widget::View_Widget (QWidget* theParent, const bool isFitAllActive) : QWidget (theParent), myCurrentMode (View_CurrentAction3d_Nothing), myFirst (true), myDefaultWidth (-1), myDefaultHeight (-1), myViewIsEnabled (true), myXmin (0), myYmin (0), myXmax (0), myYmax (0), myDragButtonDownX (0), - myDragButtonDownY (0), myDragMultiButtonDownX (0), myDragMultiButtonDownY (0), myIsRectVisible (false), myRectBand (0) + myDragButtonDownY (0), myDragMultiButtonDownX (0), myDragMultiButtonDownY (0), myIsRectVisible (false), myRectBand (0), + myHasInitProj (Standard_False), myInitVx (0), myInitVy (0), myInitVz (0) { myViewer = new View_Viewer (View_Viewer::DefaultColor()); myViewer->InitStandardViewer(); + myViewer->GetContext()->Display(new AIS_Trihedron (new Geom_Axis2Placement (gp::XOY())), Standard_True); + setAttribute (Qt::WA_PaintOnScreen); setAttribute (Qt::WA_NoSystemBackground); @@ -76,6 +83,7 @@ View_Widget::View_Widget (QWidget* theParent) setFocusPolicy (Qt::StrongFocus); initViewActions(); + ((View_ToolButton*)myFitAllAction)->SetButtonChecked (isFitAllActive); initCursors(); } @@ -116,6 +124,9 @@ void View_Widget::Init() myViewer->GetView()->SetBackgroundColor (View_Viewer::DefaultColor()); myViewer->GetView()->MustBeResized(); + + if (myHasInitProj) + myViewer->GetView()->SetProj (myInitVx, myInitVy, myInitVz); } // ======================================================================= @@ -133,13 +144,14 @@ int View_Widget::GetDisplayMode() const // ======================================================================= void View_Widget::paintEvent (QPaintEvent* /*theEvent*/) { -#if QT_VERSION < 0x050000 +#if (QT_VERSION < 0x050000 || QT_VERSION >= 0x050700) if (myFirst) { Init(); myFirst = false; } #endif + if (myViewer->GetView()) myViewer->GetView()->Redraw(); } @@ -150,7 +162,7 @@ void View_Widget::paintEvent (QPaintEvent* /*theEvent*/) // ======================================================================= void View_Widget::resizeEvent (QResizeEvent* /*theEvent*/) { -#if QT_VERSION > 0x050000 +#if (QT_VERSION > 0x050000 && QT_VERSION < 0x050700) if (myFirst) { Init(); @@ -184,21 +196,33 @@ void View_Widget::SetEnabledView (const bool theIsEnabled) if (myViewer->GetView()) myViewer->GetView()->SetBackgroundColor (theIsEnabled ? View_Viewer::DefaultColor() : View_Viewer::DisabledColor()); - for (int anActionId = View_ViewActionType_FitAllId; anActionId <= View_ViewActionType_DisplayModeId; anActionId++) + for (int anActionId = View_ViewActionType_FitAreaId; anActionId <= View_ViewActionType_DisplayModeId; anActionId++) GetViewAction ((View_ViewActionType)anActionId)->setEnabled (theIsEnabled); } +// ======================================================================= +// function : onCheckedStateChanged +// purpose : +// ======================================================================= +void View_Widget::onCheckedStateChanged (bool isOn) +{ + QWidget* aSentByAction = (QWidget*)sender(); + + if (aSentByAction == myFitAllAction) + emit checkedStateChanged(View_ViewActionType_FitAllId, isOn); +} + // ======================================================================= // function : OnUpdateToggled // purpose : // ======================================================================= void View_Widget::OnUpdateToggled (bool isOn) { - QAction* sentBy = (QAction*)sender(); + QAction* aSentByAction = (QAction*)sender(); - if (sentBy == myViewActions[View_ViewActionType_DisplayModeId]) + if (aSentByAction == myViewActions[View_ViewActionType_DisplayModeId]) { - sentBy->setIcon (isOn ? QIcon (":/icons/view_dm_wireframe.png") + aSentByAction->setIcon (isOn ? QIcon (":/icons/view_dm_wireframe.png") : QIcon (":/icons/view_dm_shading.png")); return; } @@ -206,7 +230,7 @@ void View_Widget::OnUpdateToggled (bool isOn) if (!isOn) return; - for (int anActionId = View_ViewActionType_FitAllId; anActionId <= View_ViewActionType_RotationId; anActionId++) + for (int anActionId = View_ViewActionType_FitAreaId; anActionId <= View_ViewActionType_RotationId; anActionId++) { QAction* anAction = myViewActions[(View_ViewActionType)anActionId]; if ((anAction == myViewActions[View_ViewActionType_FitAreaId]) || @@ -214,19 +238,19 @@ void View_Widget::OnUpdateToggled (bool isOn) (anAction == myViewActions[View_ViewActionType_PanId]) || (anAction == myViewActions[View_ViewActionType_RotationId])) { - if (anAction && (anAction != sentBy)) + if (anAction && (anAction != aSentByAction)) { anAction->setChecked (false); } else { - if (sentBy == myViewActions[View_ViewActionType_FitAreaId]) + if (aSentByAction == myViewActions[View_ViewActionType_FitAreaId]) setActiveCursor (View_CursorMode_HandCursor); - else if (sentBy == myViewActions[View_ViewActionType_ZoomId]) + else if (aSentByAction == myViewActions[View_ViewActionType_ZoomId]) setActiveCursor (View_CursorMode_ZoomCursor); - else if (sentBy == myViewActions[View_ViewActionType_PanId]) + else if (aSentByAction == myViewActions[View_ViewActionType_PanId]) setActiveCursor (View_CursorMode_PanCursor); - else if (sentBy == myViewActions[View_ViewActionType_RotationId]) + else if (aSentByAction == myViewActions[View_ViewActionType_RotationId]) setActiveCursor (View_CursorMode_RotationCursor); else setActiveCursor (View_CursorMode_DefaultCursor); @@ -244,7 +268,11 @@ void View_Widget::initViewActions() if (!myViewActions.empty()) return; + myFitAllAction = new View_ToolButton (this); //!< action for automatic fit all + connect (myFitAllAction, SIGNAL (checkedStateChanged(bool)), this, SLOT (onCheckedStateChanged(bool))); createAction (View_ViewActionType_FitAllId, ":/icons/view_fitall.png", tr ("Fit All"), SLOT (OnFitAll())); + myFitAllAction->setDefaultAction (GetViewAction (View_ViewActionType_FitAllId)); + createAction (View_ViewActionType_FitAreaId, ":/icons/view_fitarea.png", tr ("Fit Area"), SLOT (OnFitArea()), true); createAction (View_ViewActionType_ZoomId, ":/icons/view_zoom.png", tr ("Zoom"), SLOT (OnZoom()), true); createAction (View_ViewActionType_PanId, ":/icons/view_pan.png", tr ("Pan"), SLOT (OnPan()), true); @@ -628,7 +656,8 @@ void View_Widget::processInputEvent (const Standard_Integer/* theX*/, const Stan // ======================================================================= void View_Widget::processMoveEvent (const Standard_Integer theX, const Standard_Integer theY) { - myViewer->GetContext()->MoveTo (theX, theY, myViewer->GetView(), Standard_True); + if (myViewer->GetView()) + myViewer->GetContext()->MoveTo (theX, theY, myViewer->GetView(), Standard_True); } // ======================================================================= diff --git a/tools/View/View_Widget.hxx b/tools/View/View_Widget.hxx index a84ff72d7a..5e6ad9bacb 100644 --- a/tools/View/View_Widget.hxx +++ b/tools/View/View_Widget.hxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -73,7 +74,7 @@ protected: public: //! Constructor - Standard_EXPORT View_Widget (QWidget* theParent); + Standard_EXPORT View_Widget (QWidget* theParent, const bool isFitAllActive); //! Destructor virtual ~View_Widget() {} @@ -88,9 +89,13 @@ public: Standard_EXPORT void Init(); //! Returns an action for the given action type - //! \param theActionId an action indes + //! \param theActionId an action index QAction* GetViewAction (const View_ViewActionType theActionId) const { return myViewActions[theActionId]; }; + //! Retuns an action widget if exist. Implemented for fit all widget. + //! \param theActionId an action index + QWidget* GetWidget (const View_ViewActionType theActionId) const { return theActionId == View_ViewActionType_FitAllId ? myFitAllAction : 0; }; + //! \returns 0 - AIS_WireFrame, 1 - AIS_Shaded Standard_EXPORT int GetDisplayMode() const; @@ -98,6 +103,17 @@ public: //! \param theIsEnabled boolean value Standard_EXPORT void SetEnabledView (const bool theIsEnabled); + //!< widget for fit all, processed double click to perform action automatically + //! \param theIsEnabled boolean value + bool IsActionChecked (const View_ViewActionType theActionId) { if (theActionId == View_ViewActionType_FitAllId) return myFitAllAction->isChecked(); } + + //!< Setx initial camera position + //! \param theVx direction on Ox + //! \param theVy direction on Oy + //! \param theVz direction on Oz + void SetInitProj (const Standard_Real theVx, const Standard_Real theVy, const Standard_Real theVz) + { myHasInitProj = Standard_True; myInitVx = theVx; myInitVy = theVy; myInitVz = theVz; } + //! Get paint engine for the OpenGL viewer. Avoid default execution of Qt Widget. virtual QPaintEngine* paintEngine() const Standard_OVERRIDE { return 0; } @@ -112,6 +128,11 @@ signals: //! Sends a signal about display mode change void displayModeClicked(); + //! Sends a signal about checked state is changed + //! \param theActionId an action index + //! \param theState the checked state + void checkedStateChanged (const int theActionId, bool theState); + public slots: //! Fits all the V3d view and redraw view @@ -129,6 +150,11 @@ public slots: //! Stores state about onRotate to use it by the mouse move void OnRotate() { myCurrentMode = View_CurrentAction3d_DynamicRotation; } + //! Updates states of widget actions + //! + //! - if the state is checked, uncheck all other actions + Standard_EXPORT void onCheckedStateChanged (bool isOn); + //! Updates states of tool actions: //! - if the action is display mode, it changes an icon for action(wireframe or shading) //! - if the state is checked, uncheck all other actions @@ -256,7 +282,6 @@ protected: void drawRectangle (const Standard_Integer theMinX, const Standard_Integer theMinY, const Standard_Integer theMaxX, const Standard_Integer theMaxY, const Standard_Boolean theToDraw); private: - //! Creates action and stores it in a map of actions //! \param theActionId an identifier of action in internal map //! \param theIcon an icon name and place according to qrc resource file, e.g. ":/icons/view_fitall.png" @@ -274,14 +299,15 @@ private: private: View_Viewer* myViewer; //!< connector to context, V3d viewer and V3d View + QToolButton* myFitAllAction; //!< widget for fit all, processed double click to perform action automatically QMap myViewActions; //!< tool bar view actions QMap myCursors; //!< possible cursors for view actions View_CurrentAction3d myCurrentMode; //!< an active action mode for viewer - bool myFirst; //!< flag to Init view by the first resize/paint call - int myDefaultWidth; //!< default width for the first sizeHint - int myDefaultHeight; //!< default height for the first sizeHint - bool myViewIsEnabled; //!< flag if the view and tool bar view actions are enabled/disabled + Standard_Boolean myFirst; //!< flag to Init view by the first resize/paint call + Standard_Integer myDefaultWidth; //!< default width for the first sizeHint + Standard_Integer myDefaultHeight; //!< default height for the first sizeHint + Standard_Boolean myViewIsEnabled; //!< flag if the view and tool bar view actions are enabled/disabled Standard_Integer myXmin; //!< cached X minimal position by mouse press event Standard_Integer myYmin; //!< cached Y minimal position by mouse press event Standard_Integer myXmax; //!< cached X maximum position by mouse press event @@ -292,6 +318,12 @@ private: Standard_Integer myDragMultiButtonDownY; //!< cached Y button down by multi drag event Standard_Boolean myIsRectVisible; //!< true if rectangle is visible now QRubberBand* myRectBand; //!< selection rectangle rubber band + + Standard_Boolean myHasInitProj; //!< is initial camera position defined + Standard_Real myInitVx; //!< initial camera position on X + Standard_Real myInitVy; //!< initial camera position on Y + Standard_Real myInitVz; //!< initial camera position on Z + }; #endif diff --git a/tools/View/View_Window.cxx b/tools/View/View_Window.cxx index fa17b55f0f..2976b9cc9d 100644 --- a/tools/View/View_Window.cxx +++ b/tools/View/View_Window.cxx @@ -21,13 +21,17 @@ #include #include +#include #include #include +#include + #include #include #include #include +#include #include #include @@ -37,26 +41,34 @@ const int DEFAULT_SPACING = 3; // function : Constructor // purpose : // ======================================================================= -View_Window::View_Window (QWidget* theParent) +View_Window::View_Window (QWidget* theParent, const bool isUseKeepView, const bool isFitAllActive) : QWidget (theParent) { QGridLayout* aViewLayout = new QGridLayout (this); aViewLayout->setContentsMargins (0, 0, 0, 0); aViewLayout->setSpacing (DEFAULT_SPACING); - myView = new View_Widget (this); - myViewToolBar = new View_ToolBar (this); + myView = new View_Widget (this, isFitAllActive); + myViewToolBar = new View_ToolBar (this, isUseKeepView); aViewLayout->addWidget (myViewToolBar->GetControl(), 0, 0, 1, 2); connect (myViewToolBar, SIGNAL (contextChanged()), this, SLOT (onViewSelectorActivated())); connect (myViewToolBar, SIGNAL (actionClicked (int)), this, SLOT (onToolBarActionClicked (int))); + connect (myView, SIGNAL (checkedStateChanged(int, bool)), this, SLOT (onCheckedStateChanged (int, bool))); + + myView->setContextMenuPolicy (Qt::CustomContextMenu); + connect (myView, SIGNAL (customContextMenuRequested (const QPoint&)), + this, SLOT (onViewContextMenuRequested (const QPoint&))); + myActionsToolBar = new QToolBar (this); myActionsToolBar->layout()->setContentsMargins (0, 0, 0, 0); myActionsToolBar->setOrientation (Qt::Vertical); - for (int anActionId = View_ViewActionType_FitAllId; anActionId <= View_ViewActionType_DisplayModeId; anActionId++) + myActionsToolBar->addWidget (myView-> GetWidget (View_ViewActionType_FitAllId)); + for (int anActionId = View_ViewActionType_FitAreaId; anActionId <= View_ViewActionType_DisplayModeId; anActionId++) myActionsToolBar->addAction (myView->GetViewAction ((View_ViewActionType)anActionId)); + aViewLayout->addWidget (myActionsToolBar, 1, 0); aViewLayout->addWidget (myView, 1, 1); aViewLayout->setRowStretch (1, 1); @@ -65,6 +77,9 @@ View_Window::View_Window (QWidget* theParent) myViewToolBar->SetContext (View_ContextType_Own, aContext); myDisplayer = new View_Displayer(); + if (!isUseKeepView) + myDisplayer->KeepPresentations (true); + myDisplayer->SetFitAllActive (isFitAllActive); connect (myView, SIGNAL (displayModeClicked()), this, SLOT (onDisplayModeChanged())); onViewSelectorActivated(); } @@ -91,6 +106,8 @@ void View_Window::onViewSelectorActivated() Handle(AIS_InteractiveContext) aContext = myViewToolBar->GetCurrentContext(); myDisplayer->EraseAllPresentations (true); + emit eraseAllPerformed(); + myDisplayer->SetContext (aContext); } @@ -115,6 +132,7 @@ void View_Window::onToolBarActionClicked (const int theActionId) case View_ToolActionType_ClearViewId: { myDisplayer->EraseAllPresentations (true); + emit eraseAllPerformed(); break; } default: @@ -122,6 +140,60 @@ void View_Window::onToolBarActionClicked (const int theActionId) } } +// ======================================================================= +// function : onCheckedStateChanged +// purpose : +// ======================================================================= +void View_Window::onCheckedStateChanged (int theActionId, bool theState) +{ + if (theActionId == View_ViewActionType_FitAllId) + myDisplayer->SetFitAllActive (theState); +} + +// ======================================================================= +// function : onViewContextMenuRequested +// purpose : +// ======================================================================= +void View_Window::onViewContextMenuRequested (const QPoint& thePosition) +{ + QMenu* aMenu = new QMenu (this); + QMenu* anOrientationSubMenu = aMenu->addMenu ("Set View Orientation"); + + for (int i = 0; i < (int)V3d_XnegYnegZneg; i++) + { + V3d_TypeOfOrientation anOrientationType = (V3d_TypeOfOrientation)i; + anOrientationSubMenu->addAction (View_Tools::CreateAction (V3d::TypeOfOrientationToString (anOrientationType), + SLOT (onSetOrientation()), this, this)); + } + aMenu->addMenu (anOrientationSubMenu); + + QPoint aPoint = myView->mapToGlobal (thePosition); + aMenu->exec (aPoint); +} + +// ======================================================================= +// function : onSetOrientation +// purpose : +// ======================================================================= +void View_Window::onSetOrientation() +{ + QAction* anAction = (QAction*)(sender()); + + TCollection_AsciiString anOrientationStr (anAction->text().toStdString().c_str()); + + V3d_TypeOfOrientation anOrientationType; + if (!V3d::TypeOfOrientationFromString (anOrientationStr.ToCString(), anOrientationType)) + return; + + Handle(V3d_View) aView = myView->GetViewer()->GetView(); + if (aView.IsNull()) + return; + + aView->SetProj (anOrientationType); + aView->FitAll(); + aView->Redraw(); +} + // ======================================================================= // function : onDisplayModeChanged // purpose : diff --git a/tools/View/View_Window.hxx b/tools/View/View_Window.hxx index 48c487255b..91eb8018c1 100644 --- a/tools/View/View_Window.hxx +++ b/tools/View/View_Window.hxx @@ -40,7 +40,7 @@ class View_Window : public QWidget public: //! Constructor - Standard_EXPORT View_Window (QWidget* theParent); + Standard_EXPORT View_Window (QWidget* theParent, const bool isUseKeepView = true, const bool isFitAllActive = true); //! Destructor virtual ~View_Window() {} @@ -62,6 +62,10 @@ public: //! \param theContext an AIS context Standard_EXPORT void SetContext (View_ContextType theType, const Handle(AIS_InteractiveContext)& theContext); +signals: + //! Signals about calling erasing all presentations in context + void eraseAllPerformed(); + protected slots: //! Processing context change: @@ -70,9 +74,21 @@ protected slots: //! - sets the current view enabled only if a current context type is View_ContextType_Own void onViewSelectorActivated(); + //! Processing widget action checked state changed: for Fit All action, if checked, displayer do FitAll automatically + //! \param theActionId a clicked action + //! \param theState a result checked state + void onCheckedStateChanged (int theActionId, bool theState); + //! Processing window tool bar actions void onToolBarActionClicked (const int theActionId); + //! Shows context menu for view. It contains set view orientation actions. + //! \param thePosition a clicked point + void onViewContextMenuRequested (const QPoint& thePosition); + + //! Sets the view scene orientation by the text of selected action + void onSetOrientation(); + //! Sets selected display mode in the current context void onDisplayModeChanged(); diff --git a/tools/View/icons/keep_view_off.svg b/tools/View/icons/keep_view_off.svg deleted file mode 100644 index 604257b0ec..0000000000 --- a/tools/View/icons/keep_view_off.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/tools/View/icons/keep_view_on.svg b/tools/View/icons/keep_view_on.svg deleted file mode 100644 index 5adbcaa5eb..0000000000 --- a/tools/View/icons/keep_view_on.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/tools/ViewControl/FILES b/tools/ViewControl/FILES new file mode 100644 index 0000000000..432c6f8adf --- /dev/null +++ b/tools/ViewControl/FILES @@ -0,0 +1,5 @@ +ViewControl_MessageDialog.cxx +ViewControl_MessageDialog.hxx +ViewControl_Tools.cxx +ViewControl_Tools.hxx +ViewControl_TreeView.hxx \ No newline at end of file diff --git a/tools/TreeModel/TreeModel_MessageDialog.cxx b/tools/ViewControl/ViewControl_MessageDialog.cxx similarity index 92% rename from tools/TreeModel/TreeModel_MessageDialog.cxx rename to tools/ViewControl/ViewControl_MessageDialog.cxx index c952678e09..5d235e5523 100644 --- a/tools/TreeModel/TreeModel_MessageDialog.cxx +++ b/tools/ViewControl/ViewControl_MessageDialog.cxx @@ -13,7 +13,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#include #include #include @@ -28,7 +28,7 @@ // function : Constructor // purpose : // ======================================================================= -TreeModel_MessageDialog::TreeModel_MessageDialog (QWidget* theParent, const QString& theInformation, +ViewControl_MessageDialog::ViewControl_MessageDialog (QWidget* theParent, const QString& theInformation, const QString& theQuestion) : QDialog (theParent), myDoNotShowItAgain (false), myPreviousAnswer (false), myInformation (theInformation), myQuestion (theQuestion) @@ -65,7 +65,7 @@ TreeModel_MessageDialog::TreeModel_MessageDialog (QWidget* theParent, const QStr // function : Start // purpose : // ======================================================================= -void TreeModel_MessageDialog::Start() +void ViewControl_MessageDialog::Start() { if (!myDoNotShowItAgain) { @@ -92,7 +92,7 @@ void TreeModel_MessageDialog::Start() // function : onOkClicked // purpose : // ======================================================================= -void TreeModel_MessageDialog::onOkClicked() +void ViewControl_MessageDialog::onOkClicked() { myPreviousAnswer = true; if (myDoNotShowItAgain) @@ -105,7 +105,7 @@ void TreeModel_MessageDialog::onOkClicked() // function : onCancelClicked // purpose : // ======================================================================= -void TreeModel_MessageDialog::onCancelClicked() +void ViewControl_MessageDialog::onCancelClicked() { myPreviousAnswer = false; if (myDoNotShowItAgain) @@ -118,7 +118,7 @@ void TreeModel_MessageDialog::onCancelClicked() // function : setToolTipInfoMode // purpose : // ======================================================================= -void TreeModel_MessageDialog::setToolTipInfoMode() +void ViewControl_MessageDialog::setToolTipInfoMode() { //setWindowFlags (Qt::FramelessWindowHint); //myDoNotShowCheckBox->setVisible (false); diff --git a/tools/TreeModel/TreeModel_MessageDialog.hxx b/tools/ViewControl/ViewControl_MessageDialog.hxx similarity index 89% rename from tools/TreeModel/TreeModel_MessageDialog.hxx rename to tools/ViewControl/ViewControl_MessageDialog.hxx index 3669b4a062..8c1e16eca0 100644 --- a/tools/TreeModel/TreeModel_MessageDialog.hxx +++ b/tools/ViewControl/ViewControl_MessageDialog.hxx @@ -13,8 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef TreeModel_MessageDialog_H -#define TreeModel_MessageDialog_H +#ifndef ViewControl_MessageDialog_H +#define ViewControl_MessageDialog_H #include #include @@ -27,22 +27,21 @@ #include #include -class DFBrowser_Module; class QWidget; -//! \class TreeModel_MessageDialog +//! \class ViewControl_MessageDialog //! Dialog providing information and a question. //! It has a check box to do not the dialog again. In this case the previous value will be used as a result -class TreeModel_MessageDialog : public QDialog +class ViewControl_MessageDialog : public QDialog { Q_OBJECT public: //! Constructor - Standard_EXPORT TreeModel_MessageDialog (QWidget* theParent, const QString& theInformation, const QString& theQuestion); + Standard_EXPORT ViewControl_MessageDialog (QWidget* theParent, const QString& theInformation, const QString& theQuestion); //! Destructor - virtual ~TreeModel_MessageDialog() {} + virtual ~ViewControl_MessageDialog() {} //! Fills message dialog with the information //! \param theInformation text diff --git a/tools/ViewControl/ViewControl_Tools.cxx b/tools/ViewControl/ViewControl_Tools.cxx new file mode 100644 index 0000000000..99d3e441ef --- /dev/null +++ b/tools/ViewControl/ViewControl_Tools.cxx @@ -0,0 +1,45 @@ +// 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 + +#include +#include +#include +#include +#include +#include + +// ======================================================================= +// function : CreateAction +// purpose : +// ======================================================================= +QAction* ViewControl_Tools::CreateAction (const QString& theText, const char* theSlot, QObject* theParent, QObject* theContext) +{ + QAction* anAction = new QAction (theText, theParent); + QObject::connect (anAction, SIGNAL (triggered (bool)), theContext, theSlot); + return anAction; +} + +// ======================================================================= +// function : SetWhiteBackground +// purpose : +// ======================================================================= +void ViewControl_Tools::SetWhiteBackground (QWidget* theControl) +{ + QPalette aPalette = theControl->palette(); + aPalette.setColor (QPalette::All, QPalette::Foreground, Qt::white); + theControl->setPalette (aPalette); +} diff --git a/tools/ViewControl/ViewControl_Tools.hxx b/tools/ViewControl/ViewControl_Tools.hxx new file mode 100644 index 0000000000..7dd4bd4b39 --- /dev/null +++ b/tools/ViewControl/ViewControl_Tools.hxx @@ -0,0 +1,51 @@ +// 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 ViewControl_Tools_H +#define ViewControl_Tools_H + +#include +#include + +#include +#include +#include + +class QAction; +class QObject; +class QWidget; + +//! \class ViewControl_Tools +//! \brief The tool that gives auxiliary methods for qt elements manipulation +class ViewControl_Tools +{ +public: + + //! Creates an action with the given text connected to the slot + //! \param theText an action text value + //! \param theSlot a listener of triggered signal of the new action + //! \param theParent a parent object + //! \param theContext listener of the action toggle + //! \return a new action + Standard_EXPORT static QAction* CreateAction (const QString& theText, const char* theSlot, + QObject* theParent, QObject* theContext); + + //! Change palette of the widget to have white foreground + //! \param theControl a widget to be modified + Standard_EXPORT static void SetWhiteBackground (QWidget* theControl); + +}; + +#endif diff --git a/tools/DFBrowser/DFBrowser_TreeView.hxx b/tools/ViewControl/ViewControl_TreeView.hxx similarity index 66% rename from tools/DFBrowser/DFBrowser_TreeView.hxx rename to tools/ViewControl/ViewControl_TreeView.hxx index 8dbc17d7c1..20db18fa5a 100644 --- a/tools/DFBrowser/DFBrowser_TreeView.hxx +++ b/tools/ViewControl/ViewControl_TreeView.hxx @@ -13,41 +13,39 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef DFBrowser_TreeView_H -#define DFBrowser_TreeView_H +#ifndef ViewControl_TreeView_H +#define ViewControl_TreeView_H #include -#include #include +#include #include #include -//! \class DFBrowser_TreeView +class QWidget; + +//! \class ViewControl_TreeView //! Extended tree view control with possibility to set predefined size. -class DFBrowser_TreeView : public QTreeView +class ViewControl_TreeView : public QTreeView { public: - //! Constructor - Standard_EXPORT DFBrowser_TreeView (QWidget* theParent) - : QTreeView (theParent), myDefaultWidth (-1), myDefaultHeight (-1) {} + ViewControl_TreeView (QWidget* theParent) : QTreeView (theParent) {} //! Destructor - virtual ~DFBrowser_TreeView() {} + virtual ~ViewControl_TreeView() {} //! Sets default size of control, that is used by the first control show //! \param theDefaultWidth the width value //! \param theDefaultHeight the height value - Standard_EXPORT void SetPredefinedSize(int theDefaultWidth, int theDefaultHeight); + void SetPredefinedSize (const QSize& theSize) { myDefaultSize = theSize;} //! Returns predefined size if both values are positive, otherwise parent size hint - Standard_EXPORT virtual QSize sizeHint() const Standard_OVERRIDE; + virtual QSize sizeHint() const Standard_OVERRIDE { return myDefaultSize.isValid() ? myDefaultSize : QTreeView::sizeHint(); } private: - - int myDefaultWidth; //!< default width, -1 if it should not be used - int myDefaultHeight; //!< default height, -1 if it should not be used + QSize myDefaultSize; //! default size, empty isze if it should not be used }; #endif