diff --git a/dox/FILES_HTML.txt b/dox/FILES_HTML.txt index 9afdceab39..2c1be0ed01 100644 --- a/dox/FILES_HTML.txt +++ b/dox/FILES_HTML.txt @@ -32,6 +32,7 @@ user_guides/xde/xde.md user_guides/ocaf/ocaf.md user_guides/tobj/tobj.md user_guides/draw_test_harness/draw_test_harness.md +user_guides/inspector/inspector.md user_guides/brep_wp/brep_wp.md user_guides/vis/vis.md diff --git a/dox/FILES_PDF.txt b/dox/FILES_PDF.txt index aad07226cc..f7cbb0ef9c 100644 --- a/dox/FILES_PDF.txt +++ b/dox/FILES_PDF.txt @@ -14,6 +14,7 @@ user_guides/shape_healing/shape_healing.md user_guides/ocaf/ocaf.md user_guides/step/step.md user_guides/draw_test_harness/draw_test_harness.md +user_guides/inspector/inspector.md user_guides/tobj/tobj.md user_guides/visualization/visualization.md user_guides/xde/xde.md diff --git a/dox/dev_guides/building/cmake/cmake.md b/dox/dev_guides/building/cmake/cmake.md index bdfa189b01..a1cfdac17f 100644 --- a/dox/dev_guides/building/cmake/cmake.md +++ b/dox/dev_guides/building/cmake/cmake.md @@ -97,6 +97,7 @@ The following table gives the full list of environment variables used at the con | BUILD_ADDITIONAL_TOOLKITS | String | Semicolon-separated individual toolkits to include into build process. If you want to build some particular libraries (toolkits) only, then you may uncheck all modules in the corresponding *BUILD_MODUE_\* options and provide the list of necessary libraries here. Of course, all dependencies will be resolved automatically | | BUILD_YACCLEX | Boolean flag | Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and ExprIntrp functionality are generated automatically with Flex/Bison. Checking this option leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files | | BUILD_MODULE_MfcSamples | Boolean flag | Indicates whether MFC samples should be built together with OCCT. This option is only relevant to Windows platforms | +| BUILD_Inspector | Boolean flag | Indicates whether Inspector should be built together with OCCT. | | BUILD_DOC_Overview | Boolean flag | Indicates whether OCCT overview documentation project should be created together with OCCT. It is not built together with OCCT. Checking this option leads to automatic search of Doxygen binaries. Its building calls Doxygen command to generate the documentation in HTML format | | BUILD_PATCH | Path | Points to the directory recognized as a "patch" for OCCT. If specified, the files from this directory take precedence over the corresponding native OCCT sources. This way you are able to introduce patches to Open CASCADE Technology not affecting the original source distribution | | BUILD_WITH_DEBUG | Boolean flag | Enables extended messages of many OCCT algorithms, usually printed to cout. These include messages on internal errors and special cases encountered, timing, etc. | diff --git a/dox/user_guides/draw_test_harness/draw_test_harness.md b/dox/user_guides/draw_test_harness/draw_test_harness.md index 295afa8ac0..a39b506a02 100644 --- a/dox/user_guides/draw_test_harness/draw_test_harness.md +++ b/dox/user_guides/draw_test_harness/draw_test_harness.md @@ -10687,6 +10687,87 @@ Example: mdist ~~~~~ +@section occt_draw_13 Inspector commands + + +This section describes commands that make possible to use Inspector. + +@subsection occt_draw_13_1 tinspector + +Syntax: +~~~~~ +tinspector [-plugins {name1 ... [nameN] | all}] + [-activate name] + [-shape object [name1] ... [nameN]] + [-open file_name [name1] ... [nameN]] + [-update] + [-select {object | name1 ... [nameN]}] + [-show {0|1} = 1] +~~~~~ +Starts tool of inspection. +Options: +* *plugins* enters plugins that should be added in the inspector. +Available names are: dfbrowser, vinspector and shapeview. +Plugins order will be the same as defined in arguments. +'all' adds all available plugins in the order: +DFBrowser, VInspector and ShapeView. +If at the first call this option is not used, 'all' option is applyed; +* *activate* activates the plugin in the tool view. +If at the first call this option is not used, the first plugin is activated; +* *shape* initializes plugin/s by the shape object. If 'name' is empty, initializes all plugins; +* *open* gives the file to the plugin/s. If the plugin is active, after open, update content will be done; +* *update* updates content of the active plugin; +* *select* sets the parameter that should be selected in an active tool view. +Depending on active tool the parameter is: +ShapeView: 'object' is an instance of TopoDS_Shape TShape, +DFBrowser: 'name' is an entry of TDF_Label and name2(optionaly) for TDF_Attribute type name, +VInspector: 'object' is an instance of AIS_InteractiveObject; +* *show* sets Inspector view visible or hidden. The first call of this command will show it. + +**Example:** +~~~~~ +pload DCAF INSPECTOR + +NewDocument Doc BinOcaf + +set aSetAttr1 100 +set aLabel 0:2 +SetInteger Doc ${aLabel} ${aSetAttr1} + +tinspector -plugins dfbrowser -select 0:2 TDataStd_Integer +~~~~~ + +**Example:** +~~~~~ +pload ALL INSPECTOR + +box b1 200 100 120 +box b2 100 200 220 100 120 100 + +tinspector -plugins shapeview -shape b1 -shape b2 -select b1 +~~~~~ + +**Example:** +~~~~~ +pload ALL INSPECTOR + +tinspector -plugins vinspector + +vinit +box box_1 100 100 100 +vdisplay box_1 + +box box_2 180 120 200 150 150 150 +vdisplay box_2 + +vfit +vselmode box_1 1 1 +vselmode box_1 3 1 + +tinspector -update -select box_1 +~~~~~ + + @section occt_draw_11 Extending Test Harness with custom commands diff --git a/dox/user_guides/inspector/images/3DView.png b/dox/user_guides/inspector/images/3DView.png new file mode 100644 index 0000000000..0caf4efb29 Binary files /dev/null and b/dox/user_guides/inspector/images/3DView.png differ diff --git a/dox/user_guides/inspector/images/3DView_elements.svg b/dox/user_guides/inspector/images/3DView_elements.svg new file mode 100644 index 0000000000..71a18b19d0 --- /dev/null +++ b/dox/user_guides/inspector/images/3DView_elements.svg @@ -0,0 +1,224 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Single + Clean + + + 3D view + + View + + Multi + + diff --git a/dox/user_guides/inspector/images/TStandaloneEXE.png b/dox/user_guides/inspector/images/TStandaloneEXE.png new file mode 100644 index 0000000000..33df1cc038 Binary files /dev/null and b/dox/user_guides/inspector/images/TStandaloneEXE.png differ diff --git a/dox/user_guides/inspector/images/TStandaloneEXE_open.png b/dox/user_guides/inspector/images/TStandaloneEXE_open.png new file mode 100644 index 0000000000..8f08f8f2e5 Binary files /dev/null and b/dox/user_guides/inspector/images/TStandaloneEXE_open.png differ diff --git a/dox/user_guides/inspector/images/VStudio_projects.png b/dox/user_guides/inspector/images/VStudio_projects.png new file mode 100644 index 0000000000..f06963a38f Binary files /dev/null and b/dox/user_guides/inspector/images/VStudio_projects.png differ diff --git a/dox/user_guides/inspector/images/dfbrowser.png b/dox/user_guides/inspector/images/dfbrowser.png new file mode 100644 index 0000000000..0b5a96e1bb Binary files /dev/null and b/dox/user_guides/inspector/images/dfbrowser.png differ diff --git a/dox/user_guides/inspector/images/dfbrowser_elements.svg b/dox/user_guides/inspector/images/dfbrowser_elements.svg new file mode 100644 index 0000000000..ffa7c0a169 --- /dev/null +++ b/dox/user_guides/inspector/images/dfbrowser_elements.svg @@ -0,0 +1,284 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Update + Search + Tree Navigation + + OCAF tree view + + + + Property Panel + 3D View + Dump View + + diff --git a/dox/user_guides/inspector/images/dfbrowser_selection_in_tree_view.svg b/dox/user_guides/inspector/images/dfbrowser_selection_in_tree_view.svg new file mode 100644 index 0000000000..c935963ea8 --- /dev/null +++ b/dox/user_guides/inspector/images/dfbrowser_selection_in_tree_view.svg @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/dox/user_guides/inspector/images/display_additional_presentation.png b/dox/user_guides/inspector/images/display_additional_presentation.png new file mode 100644 index 0000000000..8b4eda8716 Binary files /dev/null and b/dox/user_guides/inspector/images/display_additional_presentation.png differ diff --git a/dox/user_guides/inspector/images/display_main_presentation.png b/dox/user_guides/inspector/images/display_main_presentation.png new file mode 100644 index 0000000000..63d3079b51 Binary files /dev/null and b/dox/user_guides/inspector/images/display_main_presentation.png differ diff --git a/dox/user_guides/inspector/images/drawexe_tinspector.png b/dox/user_guides/inspector/images/drawexe_tinspector.png new file mode 100644 index 0000000000..a7a287c7c2 Binary files /dev/null and b/dox/user_guides/inspector/images/drawexe_tinspector.png differ diff --git a/dox/user_guides/inspector/images/dump_attribute.png b/dox/user_guides/inspector/images/dump_attribute.png new file mode 100644 index 0000000000..e86f09658e Binary files /dev/null and b/dox/user_guides/inspector/images/dump_attribute.png differ diff --git a/dox/user_guides/inspector/images/property_panel_array.png b/dox/user_guides/inspector/images/property_panel_array.png new file mode 100644 index 0000000000..426c5157ed Binary files /dev/null and b/dox/user_guides/inspector/images/property_panel_array.png differ diff --git a/dox/user_guides/inspector/images/property_panel_item_selection.svg b/dox/user_guides/inspector/images/property_panel_item_selection.svg new file mode 100644 index 0000000000..4caaf9782e --- /dev/null +++ b/dox/user_guides/inspector/images/property_panel_item_selection.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/dox/user_guides/inspector/images/property_panel_label.png b/dox/user_guides/inspector/images/property_panel_label.png new file mode 100644 index 0000000000..9b8abedbaf Binary files /dev/null and b/dox/user_guides/inspector/images/property_panel_label.png differ diff --git a/dox/user_guides/inspector/images/property_panel_named_data.png b/dox/user_guides/inspector/images/property_panel_named_data.png new file mode 100644 index 0000000000..ac5ba1b978 Binary files /dev/null and b/dox/user_guides/inspector/images/property_panel_named_data.png differ diff --git a/dox/user_guides/inspector/images/property_panel_simple_type.png b/dox/user_guides/inspector/images/property_panel_simple_type.png new file mode 100644 index 0000000000..f9832d6e79 Binary files /dev/null and b/dox/user_guides/inspector/images/property_panel_simple_type.png differ diff --git a/dox/user_guides/inspector/images/property_panel_tnaming_named_shape.png b/dox/user_guides/inspector/images/property_panel_tnaming_named_shape.png new file mode 100644 index 0000000000..af78a2587d Binary files /dev/null and b/dox/user_guides/inspector/images/property_panel_tnaming_named_shape.png differ diff --git a/dox/user_guides/inspector/images/property_panel_tnaming_naming.png b/dox/user_guides/inspector/images/property_panel_tnaming_naming.png new file mode 100644 index 0000000000..e3c9952dfb Binary files /dev/null and b/dox/user_guides/inspector/images/property_panel_tnaming_naming.png differ diff --git a/dox/user_guides/inspector/images/property_panel_tnaming_used_shapes.png b/dox/user_guides/inspector/images/property_panel_tnaming_used_shapes.png new file mode 100644 index 0000000000..7bad62599d Binary files /dev/null and b/dox/user_guides/inspector/images/property_panel_tnaming_used_shapes.png differ diff --git a/dox/user_guides/inspector/images/property_panel_tree_node.png b/dox/user_guides/inspector/images/property_panel_tree_node.png new file mode 100644 index 0000000000..a0e6f617e4 Binary files /dev/null and b/dox/user_guides/inspector/images/property_panel_tree_node.png differ diff --git a/dox/user_guides/inspector/images/search.png b/dox/user_guides/inspector/images/search.png new file mode 100644 index 0000000000..55dfd3207b Binary files /dev/null and b/dox/user_guides/inspector/images/search.png differ diff --git a/dox/user_guides/inspector/images/shapeview.png b/dox/user_guides/inspector/images/shapeview.png new file mode 100644 index 0000000000..842fd1bc04 Binary files /dev/null and b/dox/user_guides/inspector/images/shapeview.png differ diff --git a/dox/user_guides/inspector/images/shapeview_elements.svg b/dox/user_guides/inspector/images/shapeview_elements.svg new file mode 100644 index 0000000000..4997a05de7 --- /dev/null +++ b/dox/user_guides/inspector/images/shapeview_elements.svg @@ -0,0 +1,142 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + TopoDS_Shape View + 3D View + + diff --git a/dox/user_guides/inspector/images/tinspector_elements.svg b/dox/user_guides/inspector/images/tinspector_elements.svg new file mode 100644 index 0000000000..b8602bb7b5 --- /dev/null +++ b/dox/user_guides/inspector/images/tinspector_elements.svg @@ -0,0 +1,244 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dox/user_guides/inspector/images/vinspector.png b/dox/user_guides/inspector/images/vinspector.png new file mode 100644 index 0000000000..e3b741712f Binary files /dev/null and b/dox/user_guides/inspector/images/vinspector.png differ diff --git a/dox/user_guides/inspector/images/vinspector_elements.svg b/dox/user_guides/inspector/images/vinspector_elements.svg new file mode 100644 index 0000000000..5f644e6054 --- /dev/null +++ b/dox/user_guides/inspector/images/vinspector_elements.svg @@ -0,0 +1,200 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + Update + Selection controls + + Presentations tree view + + + History view + + diff --git a/dox/user_guides/inspector/inspector.md b/dox/user_guides/inspector/inspector.md new file mode 100644 index 0000000000..9b15cee1c6 --- /dev/null +++ b/dox/user_guides/inspector/inspector.md @@ -0,0 +1,578 @@ +Inspector {#occt_user_guides__inspector} +=============================== + +@tableofcontents + +@section occt_inspector_1 Introduction + +This manual explains how to use Inspector. + +@subsection occt_inspector_1_1 Overview +Inspector is a Qt-based library that provides functionality to interactively inspect low-level content of the OCAF data model, OCCT viewer and Modelisation Data. +This component is aimed to assist the developers of OCCT-based applications to debug the problematic situations that occur in their applications. + +Inspector has a plugin-oriented architecture. The current release contains the following plugins: + +| Plugin | OCCT component | Root class of OCCT investigated component | +| :----- | :----- | :----- | +| @ref occt_inspector_2_2 "DFBrowser"| OCAF | TDocStd_Application | +| @ref occt_inspector_2_3 "VInspector"| Visualization | AIS_InteractiveContext | +| @ref occt_inspector_2_4 "ShapeView"| Modelisation Data | TopoDS_Shape | + + +Each plugin implements logic of a corresponding OCCT component. + +Each of the listed plugins is embeded in the common framework. +The user is able to manage which plugins should be loaded by Inspector. +Also he can extend number of plugins by implementing a new plugin. + + +@subsection occt_inspector_1_3 Getting started + +There are two launch modes: +1. Launch **TInspectorEXE** executable sample. For more details see @ref occt_inspector_6 "TInspectorEXE" section; +2. Launch DRAW, load plugin INSPECTOR, and use **tinspector** command. + For more details see @ref occt_inspector_7 "Launch in DRAW Test Harness" section. + + +Note. If you have no Inspector library in your build directory, please make sure that OCCT is compiled with *BUILD_Inspector* +option ON. For more details see @ref occt_inspector_4 "Build procedure". + + +@section occt_inspector_2 Inspector + +@subsection occt_inspector_2_1 Overview + +Inspector consists of the following components: + * buttons to activate the corresponding plugin; + * view area to visualize the plugin content. + +@figure{tinspector_elements.svg,"Plugins placement in Inspector",360} + +@subsection occt_inspector_2_2 DFBrowser Plugin + +@subsubsection occt_inspector_2_2_1 Overview + +@figure{dfbrowser.png, "DFBrowser"} + +This plugin visualizes content of TDocStd_Application in a tree view. It shows documents of the application, +hierarchy of TDF_Labels, content of TDF_Attributes and interconnection between attributes (e.g. references). +Additionally it has 3D view to visualize TopoDS_Shape elements stored in the document. + +@subsubsection occt_inspector_2_2_2 Elements + +@figure{dfbrowser_elements.svg, "DFBrowser Elements",360} + +OCAF tree view + +Each OCAF element has own tree view item: + +| Type | Tree item | Text | Description | +| :----- | :----- | :----- | :----- | +| TDocStd_Application | Application | TDocStd_Application | It is the root of tree view. Children are documents.| +| TDocStd_Document | Document | entry : name | It is a child of Application item. Children are Labels and Attributes items.
Text view is an entry of the root label and the value of TDataStd_Name attribute for the label if it exists. | +| TDF_Label | Label | entry : name | It is a child of a Document or another Label item. Children and text view are the same as for Document item. | +| TDF_Attribute | Attribute | attribute type [additional information] | It is a child of a Label. It has no children.
Text view is the attribute type (DynamicType()->Name() of TDF_Attribute) and additional information (a combination of attribute values) | + + +Additional information of TDF_Attributes: + +| Type | Text | +| :----- | :----- | +| TDocStd_Owner | [storage format] | +| TDataStd_AsciiString,
TDataStd_Name,
TDataStd_Real,
@ref occt_attribute_simple_types "other Simple types" | [value] | +| TDataStd_BooleanList,
TDataStd_ExtStringList,
@ref occt_attribute_list_types "other List types" | [value_1 ... value_n] | +| TDataStd_BooleanArray,
TDataStd_ByteArray,
@ref occt_attribute_array_types "other Array types" | [value_1 ... value_n] | +| TDataStd_TreeNode | [tree node ID ==> Father()->Label()] (if it has father) or
[tree node ID <== First()->Label()] (if it has NO father)| +| TDataStd_TreeNode(XDE) | [@ref occt_attribute_xde_tree_node_id "XDE tree node ID" ==> Father()->Label()] (if it has father),
[@ref occt_attribute_xde_tree_node_id "XDE tree Node ID" <== label_1, ..., label_n] (if it has NO father)| +| TNaming_NamedShape | [shape type : evolution] | +| TNaming_UsedShapes | [map extent] | + + +Custom color of items: + +| OCAF element Type | Color | +| :----- | :----- | +| TDF_Label | dark green, if the label has TDataStd_Name attribute,
light grey if the label is empty (has no attributes on all levels of hierarchy),
black otherwise | +| TNaming_NamedShape | dark gray for TopAbs_FORWARD orientation of TopoDS_Shape,
gray for TopAbs_REVERSED orientation of TopoDS_Shape,
black for other orientation | + + +Context popup menu: +| Action | Functionality | +| :----- | :----- | +| Expand | Expands the next two levels under the selected item | +| Expand All | Expands the whole tree of the selected item | +| Collapse All | Collapses the whole tree of the selected item | + + +Property Panel + +Property panel is used to display content of Label or Attribute tree view items. +This control is used for content of Label or Attribute tree view items or Search result view. +Information is usually shown in one or several tables. + +TDF_Attribute has the following content in Property Panel: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TypeDescriptionContent
TDF_Label a table of [entry or attribute name, value]@figure{property_panel_label.png, "",140}
TDocStd_Owner,
@ref occt_attribute_simple_types "Simple types",
@ref occt_attribute_list_types "List types"		a table of [method name, value]@figure{property_panel_simple_type.png, "",140}
TDataStd_BooleanArray,
TDataStd_ByteArray,
@ref occt_attribute_array_types "other Array types"		2 controls:
* a table of [array bound, value],
* table of [method name, value]		@figure{property_panel_array.png, "",140}
TDataStd_TreeNode2 controls:
* a table of [Tree ID, value] (visible only if Tree ID() != ID()),
* a tree view of tree nodes starting from Root() of the tree node. The current tree node has dark blue text.		@figure{property_panel_tree_node.png, "",140}
TDataStd_NamedDatatab bar of attribute elements, each tab has a table of [name, value]@figure{property_panel_named_data.png, "",140}
TNaming_UsedShapesa table of all the shapes handled by the framework@figure{property_panel_tnaming_used_shapes.png, "",140}
TNaming_NamedShape2 controls:
* a table of [method name, value] including CurrentShape/OriginalShape methods result of TNaming_Tools,
* an evolution table.
Tables contain buttons for @ref occt_shape_export "TopoDS_Shape export".		@figure{property_panel_tnaming_named_shape.png, "",140}
TNaming_Naming2 controls:
* a table of TNaming_Name vlaues,
* a table of [method name, value]		@figure{property_panel_tnaming_naming.png, "",140}
+ + +Dump view + +@figure{dump_attribute.png, "Dump of TDF_Attribute"} + +Dump view shows result of TDF_Attribute::Dump() or TDF_Label::Dump() of selected tree view item. + +3D view + +3D View visualizes TopoDS_Shape elements of OCAF attribute via AIS facilities. + +DFBrowser creates two kinds presentations depending on the selection place: + + + + + + + + + + + +
KindSource objectVisualization propetiesView
Main presentationTree view item:
TPrsStd_AISPresentation,
TNaming_NamedShape,
TNaming_Naming		Color: a default color for shape type of the current TopoDS_Shape@figure{display_main_presentation.png, "",100}
Additional presentationReferences in Property panelColor: white@figure{display_additional_presentation.png, "",100}
+ + + +Tree Navigation + +Tree Navigation shows a path to the item selected in the tree view. +The path is a sequence of label entries and attribute type name. +Each element in the path is selectable - the user can click on it to select the corresponding tree view item. + +Navigation control has buttons to go to the previous and the next selected tree view items. + + +Update Button + +Update button synchronizes content of tree view to the current content of OCAF document that could be modified outside. + +Search + +The user can search OCAF element by typing: + * TDF_Label entry, + * TDF_Attribute name, + * TDataStd_Name and TDataStd_Comment attributes value. + +@figure{search.png,"Search"} + +As soon as the user confirms the typed criteria, the Property panel is filled by all satisfied values. +The user can click a value to hightligt the corresponding tree view item. By double click the item will be selected. + + +@subsubsection occt_inspector_2_2_3 Elements cooperation + +Tree item selection + +Selection of tree view item updates content of the following controls: + * Navigation line + * Property Panel + * 3D View (if it is possible to create an interactive presentation) + * Dump View + +@figure{dfbrowser_selection_in_tree_view.svg,"",360} + +Property Panel item selection + +If property panel shows content of TDF_Label: + * selection of the table row hightlights the corresponding item in tree view, + * double click on the table row selects this item in tree view. + +If property panel shows content of TDF_Attribute that has reference to another attribute, selection of this reference: + * highlights the referenced item in TreeView, + * displays additional presentation in 3D view if it can be created. + +@figure{property_panel_item_selection.svg,"",360} + +Attributes having references: + +| Type | Reference | Additional presentation +| :----- | :----- | :----- | +| TDF_Reference | TDF_Label | | +| TDataStd_ReferenceArray,
TDataStd_ReferenceList,
TNaming_Naming | one or several TDF_Label in a container | | +| TDataStd_TreeNode | TDF_Label | | +| TNaming_NamedShape | TDF_Label in Evolution table | selected TopoDS_Shapes in property panel tables | +| TNaming_UsedShapes | one or several TNaming_NamedShape | TopoDS_Shapes of selected TNaming_NamedShape | + + +@subsubsection occt_shape_export TopoDS_Shape export + +Property panel of TNaming_NamedShape attribute has controls to export TopoDS_Shape to: + * BREP. The save file dialog is started to enter the result file name, + * @ref occt_inspector_2_4 "ShapeView" plugin. Dialog about exporting element to ShapeView is shown with a possibility to activate this plugin immediatelly. + + +@subsection occt_inspector_2_3 VInspector Plugin + +@subsubsection occt_inspector_2_3_1 Overview + +@figure{vinspector.png, "VInspector"} + +It visualizes interactive objects displayed in AIS_InteractiveContext in a tree view with columputed selection +components for each presentation. It shows the selected elements in the context and allows to select these elements. + +@subsubsection occt_inspector_2_3_2 Elements + +@figure{vinspector_elements.svg,"VInspector Elements",360} + +Presentations tree view + +It shows presentations and selection computed of them. Also, the view has columns with information about state of visualization elements. + +VInspector tree items. + +| Type | Description | +| :----- | :----- | +| AIS_InteractiveContext | It is the root of tree view. Children are interactive objects obtained by *DisplayedObjects* and *ErasedObjects* methods.| +| AIS_InteractiveObject | It is a child of AIS_InteractiveContext item. Children are SelectMgr_Selection obtained by iteration on *CurrentSelection* | +| SelectMgr_Selection | It is a child of AIS_InteractiveObject. Children are SelectMgr_SensitiveEntity obtaining by iteration on *Sensitive* | +| SelectMgr_SensitiveEntity | It is a child of SelectMgr_Selection. Children are SelectMgr_SensitiveEntity obtaining by iteration on *OwnerId* | +| SelectBasics_EntityOwner | It is a child SelectMgr_SensitiveEntity. It has no children. | + + +Custom color of tree view items: + +| OCAF element Type | Column | What | Color | +| :----- | :----- | :----- | :----- | +| AIS_InteractiveObject | 0 | Text | dark gray, it is in *ErasedObjects* list of AIS_InteractiveContext,
black otherwise | +| AIS_InteractiveObject,
SelectMgr_SensitiveEntity,
SelectBasics_EntityOwner| 1 | Background | dark blue, if there is a selected owner under the item,
black otherwise | +| SelectMgr_Selection,
SelectMgr_SensitiveEntity,
SelectBasics_EntityOwner| all | Text | dark gray, if *SelectionState* of SelectMgr_Selection is not *SelectMgr_SOS_Activated*,
black otherwise | + + +Context popup menu in tree view: +| Action | Item | Functionality | +| :----- | :----- | :----- | +| Export to ShapeView | AIS_InteractiveObject | Exports TopoDS_Shape of AIS_Interactive presentation to ShapeView plugin.
It should be AIS_Shape presentation and ShapeView plugin should be registered in Inspector
Dialog about exporting element to ShapeView is shown with a possibility to activate this plugin immediatelly. | +| Show | AIS_InteractiveObject | *Display* presentation in AIS_InteractiveContext | +| Hide | AIS_InteractiveObject | *Erase* presentation from AIS_InteractiveContext | + +Update + +It synchronizes content of the plugin to the current state of AIS_InteractiveContext. +It updates the presence of items and the current selection for the items. + +Selection controls + +Selection controls switch on/off the posibility to set selection in the context from VInspector plugin. + +| Action | Tree view item | Functionality | +| :----- | :----- | :----- | +| Select Presentations | AIS_InteractiveObject | Calls *AddOrRemoveSelected* of interactive object for the selected item | +| Select Owners | SelectMgr_EntityOwner or
SelectMgr_SensitiveEntity | Calls *AddOrRemoveSelected* of SelectMgr_EntityOwner for the selected item | + +Please note, that the initial selection in context will be cleared. +If the button is toggled, the button selection is active. Only one button may be toggled at the moment. + + +History view + +At present the History view is under implementation and may be used only in a custom application where Inspector is loaded. + +To fill this view, VInspectorAPI_CallBack should be redefined in the application and send signals about some actions applyed to context. +After, the call back should be given as parameter in the plugin. +If done, new items will be created in the history view for each action. + +@subsubsection occt_inspector_2_3_3 Elements cooperation + +Vinspector markes current selected presentations in AIS_InteractiveContext with blue background in tree items. Use "Update" button to synchronize VInspector selected items state to the context. + +It is also possible to perform selection in context using "Selection controls" VInspector. However, it should be performed carefully as +it clears the current selection in AIS_InteractiveContext. + +Selection change: +| From | To | Action | Result | +| :----- | :----- | :----- | :----- | +| AIS_InteractiveContext | VInspector | perform selection in AIS_InteractiveContext | Click "Update" button in VInspector and check "Selection" column:
AIS_InteractiveContext item has anount of selected objects,
some of AIS_InteractiveObject have filled value if it selection happens for this presentation or entity owner of it | +| VInspector | AIS_InteractiveContext | activate one of Selection controls and select one or several elements in tree view | The objects become selected in AIS_InteractiveContext | + +@subsection occt_inspector_2_4 ShapeView Plugin + +@subsubsection occt_inspector_2_4_1 Overview + +@figure{shapeview.png, "ShapeView"} + +This plugin visualizes content of TopoDS_Shape in a tree view. + +@subsubsection occt_inspector_2_4_2 Elements + +@figure{shapeview_elements.svg,"ShapeView Elements",360} + +TopoDS_Shape View + +Elements of the view are TopoDS_Shape objects. +This shape is exploded into sub-shapes using TopoDS_Iterator of the TopoDS_Shape. +Child sub-shapes are presented in the view as children of the initial shape. +Iterating recursively by all shapes we obtain a tree view of items shown in the ShapeView. + + +Columns of the View show some information about TopoDS_Shape of the item. +The most informative column is the last column of TopoDS_Vertex and TopoDS_Edge shape types. + +For TopoDS_Vertex it contains the point coordinates, + +for TopoDS_Edge it contains the first and the last point coordinates, the edge length and some other parameters. + + +Context popup menu in tree view: +| Action | Functionality | +| :----- | :----- | +| Load BREP file | Opens selected file and appends the result TopoDS_Shape into tree view | +| Remove all shape items | Clears tree view | +| BREP view | Shows text view with BREP content of the selected item. It creates BREP file in temporary directory of the plugin. | +| Close All BREP views | Closes all opened text views | +| BREP directory | Displays folder where temporary BREP files have been stored. | + +@subsubsection occt_inspector_2_4_3 Elements cooperation + +Selection of one or several items in TopoDS_Shape View creates AIS_Shape presentation for it and displays it in the 3D View. + + + +@section occt_inspector_3 Common controls +@subsection occt_inspector_3_1 3D View + +@subsubsection occt_inspector_3_1_1 Overview + +@figure{3DView.png, "3D View"} + +Control for OCCT 3D viewer. It creates visualization view components with possibilities to perform some +user actions for the view. + + +@subsubsection occt_inspector_3_1_2 Elements + +@figure{3DView_elements.svg,"3DView Elements"} + +3D View contains: +| Element | Functionality | +| :----- | :----- | +| 3D view | V3d viewer with mouse events processing | +| Context | choice of another context that should be used in the plugin.
It is possible to use the next contexts:
Own - context of this view,
External - context come in parameters which intializes plugin,
None - do not perform visualization at all | +| Multi/Single | Buttons defined what to do with the previous displayed objects:
Multi displays new presentations in additional to already displayed,
Single removes all previuos displayed presentations | +| Clean | Removes all displayed presentations | +| Fit All,
Fit Area,
Zoom,
Pan,
Rotation | Scene manipulation actions | +| Display Mode | Sets *AIS_Shading* or *AIS_WireFrame* display mode for all presentations | + + +@section occt_inspector_6 TInspectorEXE sample + +Inspector functionality can be tried using this sample. + +Use *inspector.bat* script file placed in binary directory of OCCT to launch it. + +This script accepts the names of plugin's DLL that should be loaded. By default it loads all described above plugins. + + +@figure{TStandaloneEXE.png, "TStandaloneEXE"} + +Click on the Open button shows the dialog to select a file. The user is able to select one of the sample files or load own one. +@figure{TStandaloneEXE_open.png, ""} + +Depending on the active plugin, the following files should be selected in the dialog: +OCAF document or STEP files for DFBRowser and BREP files for VInspector and ShapeView plugins. + +It is possible to click the file name in the proposed directory, enter it manually or using Browser button. +The last Loading icon becomes enabled if file name is correct. + + +By default TInspectorEXE opens the next files for plugins: +| Plugin DLL library name | Files | +| :----- | :----- | +| TKDFBrowser | step/screw.step | +| TKVInspector | occ/hammer.brep | +| TKShapeView | occ/face1.brep,
occ/face2.brep | + +These files are found relatively *CSF_OCCTDataPath*. + + +Source code of TIspectorEXE is a good sample for @ref occt_inspector_8 "Using Inspector in a custom application". + + +@section occt_inspector_7 Launch in DRAW Test Harness + +TKToolsDraw plugin is created to provide DRAW commands for Qt tools. Use INSPECTOR parameter of @ref occt_draw_1_3_3 "pload" +command to download commands of this library. It contains tinspector command to start Inspector under DRAW. +See more detailed description of the @ref occt_draw_13_1 "tinspector" command. + +The simple code to start Inspector with all plugins loaded: + +~~~~~ +pload INSPECTOR +tinspector +~~~~~ + +@figure{drawexe_tinspector.png,"tinspector"} + +Result of this command is the next: +- all available Plugins are presented in the Inspector. These are @ref occt_inspector_2_2 "DFBrowser", @ref occt_inspector_2_3 "VInspector" and @ref occt_inspector_2_4 "ShapeView". +- DFBrowser is an active plugin +- tree of OCAF is empty. + +After, we should create objects in DRAW and update tinspector. + +@section occt_inspector_8 Using in a custom application + +To use Inspector in an application, the next steps should be done: +* Set dependencies to OCCT and Qt in application (Header and Link) +* Create an instance of TInspector_Communicator. +* Register plugins of interest in the communicator by DLL library name +* Initialize communicator with objects that will be investigated +* Set visible true for commumicator + + +C++ code is similar: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} + +#include + +static TInspector_Communicator* MyTCommunicator; + +void CreateInspector() +{ + NCollection_List aParameters; + //... append parameters in the list + + if (!MyTCommunicator) + { + MyTCommunicator = new TInspector_Communicator(); + + MyTCommunicator->RegisterPlugin ("TKDFBrowser"); + MyTCommunicator->RegisterPlugin ("TKVInspector"); + MyTCommunicator->RegisterPlugin ("TKShapeView"); + + MyTCommunicator->Init (aParameters); + MyTCommunicator->Activate ("TKDFBrowser"); + } + MyTCommunicator->SetVisible (true); +} + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +| Plugin | to be initialized by | +| :----- | :----- | +| TKDFBrowser | TDocStd_Application | +| TKVInspector | AIS_InteractiveContext | +| TKShapeView | TopoDS_TShape | + + + +@section occt_inspector_4 Build procedure + +By default the Inspector compilation is off. +To compile it, set the BUILD_Inspector flag to "ON". See @ref build_cmake_conf "Configuration process". + +When this option is switched On, MS Visual Studio project has an additional tree of folders: + +@figure{VStudio_projects.png,"Inspector packages in MS Visual Studio"} + + +@section occt_inspector_5 Sources and packaging + +OCCT sources are extended by the /tools directory. + +Distribution of packages participated in plugins: +| Sources packages| Plugin | +| :----- | :----- | +| DFBrowser,
DFBrowserPane,
DFBrowserPaneXDE,
TKDFBrowser | DFBrowser | +| VInspector,
TKVInspector | VInspector | +| ShapeView,
TKShapeView | ShapeView | + +Other packages: +| Sources packages| Used in | +| :----- | :----- | +| TInspectorAPI,
TKInspectorAPI | Iterface for connection to plugin. | +| TreeModel,
TKTreeView | Items-oriented model to simplify work with GUI tree control. | +| View,
TKView | 3D View component | +| TInspector,
TKTInspector | Inspector window where plugins are placed | +| ToolsDraw,
TKToolsDraw | Plugin for DRAW to start Inspector | + + +In MSVC studio the separate folder contains Inspector projects. + +@section occt_inspector_9 Glossary +* **Component** -- OCCT part, e.g. OCAF, VISUALIZATION, MODELING and others. +* **Plugin** -- library that is loaded in some executable/library. Here, the plugins are: + * DFBrowser, + * ShapeView, + * VInspector. + +@subsection occt_attribute_simple_types TDF_Attribute Simple types +Types where the content is a single value + +| Type | Kind of value | +| :----- | :----- | +| TDataStd_AsciiString | TDataStd_AsciiString | +| TDataStd_Comment | TCollection_ExtendedString | +| TDataStd_Integer | Standard_Integer | +| TDataStd_Name | TCollection_ExtendedString | +| TDataStd_Real | Standard_Real | +| TDF_Reference | TDF_Label | +| TDF_TagSource | Standard_Integer | + + +@subsection occt_attribute_list_types TDF_Attribute List types + +| Type | Kind of value (container of) | +| :----- | :----- | +| TDataStd_BooleanList | Standard_Boolean | +| TDataStd_ExtStringList | TCollection_ExtendedString | +| TDataStd_IntegerList | Standard_Integer | +| TDataStd_RealList | Standard_Real | +| TDataStd_ReferenceList | TDF_Label | + +@subsection occt_attribute_array_types TDF_Attribute Array types + +| Type | Kind of value (container of) | +| :----- | :----- | +| TDataStd_BooleanArray | Standard_Boolean | +| TDataStd_ByteArray | Standard_Byte | +| TDataStd_ExtStringArray | TCollection_ExtendedString | +| TDataStd_IntegerArray | Standard_Integer | +| TDataStd_RealArray | Standard_Real | +| TDataStd_ReferenceArray | TDF_Label | + +@subsection occt_attribute_xde_tree_node_id XDE tree node ID description +| GUID | Text | +| :----- | :----- | +| XCAFDoc::ShapeRefGUID() | Shape Instance Link | +| XCAFDoc::ColorRefGUID (XCAFDoc_ColorGen) | Generic Color Link | +| XCAFDoc::ColorRefGUID (XCAFDoc_ColorSurf) | Surface Color Link | +| XCAFDoc::ColorRefGUID (XCAFDoc_ColorCurv) | Curve Color Link | +| XCAFDoc::DimTolRefGUID() | DGT Link | +| XCAFDoc::DatumRefGUID() | Datum Link | +| XCAFDoc::MaterialRefGUID() | Material Link | + diff --git a/dox/user_guides/user_guides.md b/dox/user_guides/user_guides.md index aa9ff98082..3571044a14 100644 --- a/dox/user_guides/user_guides.md +++ b/dox/user_guides/user_guides.md @@ -17,4 +17,5 @@ OCCT User Guides are organized by OCCT modules: * @subpage occt_user_guides__xde "Extended Data Exchange (XDE)" * @subpage occt_user_guides__ocaf "Open CASCADE Application Framework (OCAF)" * @subpage occt_user_guides__tobj "TObj package" -* @subpage occt_user_guides__test_harness "DRAW Test Harness" \ No newline at end of file +* @subpage occt_user_guides__test_harness "DRAW Test Harness" +* @subpage occt_user_guides__inspector "Inspector" \ No newline at end of file diff --git a/samples/tools/TStandalone/CMakeLists.txt b/samples/tools/TStandalone/CMakeLists.txt index a48dfe8c91..8810073fe7 100644 --- a/samples/tools/TStandalone/CMakeLists.txt +++ b/samples/tools/TStandalone/CMakeLists.txt @@ -101,7 +101,7 @@ set (BUILD_TOOLKITS string(TIMESTAMP CURRENT_TIME "%H:%M:%S") message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all header files into ${CMAKE_BINARY_DIR}/inc ...") # collect all the headers to /inc folder -COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}" "${CASROOT_SOURCE_FILES}/tools" "${INSTALL_DIR_INCLUDE}") +COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}" "${CASROOT_SOURCE_FILES}/tools" "${INSTALL_DIR_INCLUDE}/inspector") OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/standalone_macros") OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt_macro") diff --git a/tests/tools/dfbrowser/A2 b/tests/tools/dfbrowser/A2 index 3d4fb130b5..e138425ac3 100644 --- a/tests/tools/dfbrowser/A2 +++ b/tests/tools/dfbrowser/A2 @@ -1,53 +1,23 @@ -pload DCAF -pload VISUALIZATION -pload INSPECTOR +pload DCAF VISUALIZATION INSPECTOR -chrono qat start -# Create a new document and set UndoLimit NewDocument D BinOcaf tinspector -plugins dfbrowser -#NewDocument D cpulimit 300 UndoLimit D 100 -# Open a transaction NewCommand D -#1 - create box using more flexible set of commands NewCommand D -# add object + set B2 [AddObject D] -# add function set F2 [AddFunction D $B2 Box] -# set argumets of this function BoxDX D $B2 190 BoxDY D $B2 290 BoxDZ D $B2 390 -# initialize (clean) internal maps of labels + InitLogBook D AddDriver D Box Attach Cyl -# compute the function ComputeFun D $F2 -# check result -set IsDone [catch {GetShape D $F2:2 Box2} aResult] -if { ${IsDone} != 0 } { - puts "Error: Get a value of TNaming_NamedShape attribute from restoring document" -} else { - puts "OK: Value of TNaming_NamedShape attribute from restoring document was got" -} -if { [regexp "SOLID FORWARD" [whatis Box2] ] != 1 } { - puts "Error: Box2 is not a solid forward" -} else { - puts "OK: Box2 is a solid forward" -} - -# referes to result NS -GetReference D $B2; - tinspector -update -vinit -vdisplay Box2 -vfit -checkview -screenshot -3d -path ${imagedir}/${test_image}.png \ No newline at end of file diff --git a/tests/tools/dfbrowser/A3 b/tests/tools/dfbrowser/A3 new file mode 100644 index 0000000000..8e83cd5b23 --- /dev/null +++ b/tests/tools/dfbrowser/A3 @@ -0,0 +1,2 @@ +pload INSPECTOR +tinspector -plugins dfbrowser -open $env(CSF_OCCTDataPath)/step/screw.step -select 0:1:1:1 diff --git a/tests/tools/dfbrowser/A4 b/tests/tools/dfbrowser/A4 new file mode 100644 index 0000000000..4733e9440a --- /dev/null +++ b/tests/tools/dfbrowser/A4 @@ -0,0 +1,150 @@ +pload DCAF INSPECTOR TOPTEST + +# Create the first document and set UndoLimit +NewDocument Doc1 BinOcaf +UndoLimit Doc1 100 + +# Add an attribute to a data framework +set aSetAttr1 100 +set aLabel 0:2 +SetInteger Doc1 ${aLabel} ${aSetAttr1} + + +# Create the second document +set test_name "OCC26961" +set test_int 123 +set test_real 123.456e-7 +set test_int_arr {10 20} +set test_real_arr {1.1 3.14 5.4e18} +set test_extstr_arr {"sample string 1" "string 2"} +set test_bool_arr {0 1} +set test_ref_arr {"0:1:2:3:2" "0:1:2:3:1"} +set test_byte_arr {15 25} +set test_map {1 5 2 10} +set test_map_sorted {1 2 5 10} +set test_named_ints {i1 1 i2 2} +set test_named_reals {r1 1.1 r2 2.2} +set test_named_strings {s1 string1 s2 string2 s3 string3_string_extended s4 string4_double_extended s5 string5} +set test_named_bytes {b1 65 b2 66} +set test_ref "0:1:1" +set test_guid "00000000-0000-0000-2222-000000000000" +set test_comment "Sample document containing various attributes" +set test_string "Sample string" +set test_expr "2*pi*r" +set test_var1 "0:1:2:3:2" +set test_var2 "0:1:2:3:1" +set test_point "111 222 333" +set test_axisPos "10 10 30" +set test_axisDir "11 22 33" +set test_plane "15 25 35" +set test_boxXYZ "10 20 30" +set test_boxDX 100 +set test_boxDY 200 +set test_boxDZ 300 +set test_geom_t "cir" +set test_failure 1 +set test_driver "G" +set test_driver_id "2a96b604-ec8b-11d0-bee7-080009dc3333" +set test_transp 0.5 +set test_color 11 +set test_material 22 +set test_positionX 100 +set test_positionY 200 +set test_positionZ 300 + +puts "Creating document" +NewDocument D BinOcaf + +# Simple values +SetInteger D 0:1:1 $test_int +SetReal D 0:1:1 $test_real +SetName D 0:1:1 $test_name +SetComment D 0:1:1 $test_comment +SetAsciiString D 0:1:1 $test_string + +# TagSource +SetTagger D 0:1:2 + +# Reference +SetReference D 0:1:3 $test_ref + +# Directory +#NewDirectory D 0:1:2:1 + +# UAttribute +#SetUAttribute D 0:1:2:2 $test_guid + +# Variable +SetVariable D $test_var2 0 mm +SetVariable D $test_var1 1 "" + +# Relation +SetRelation D 0:1:2:3 "2*pi*r" $test_var1 $test_var2 + +# TreeNode +SetNode D 0:1:2:4 + +# Arrays +eval SetIntArray D 0:1:1 1 1 2 $test_int_arr +eval SetRealArray D 0:1:1 1 1 3 $test_real_arr +eval SetExtStringArray D 0:1:1 1 1 2 $test_extstr_arr +eval SetRefArray D 0:1:1 1 2 $test_ref_arr +eval SetByteArray D 0:1:1 1 1 2 $test_byte_arr + +# Lists +eval SetIntegerList D 0:1:1 $test_int_arr +eval SetRealList D 0:1:1 $test_real_arr +eval SetExtStringList D 0:1:1 $test_extstr_arr +eval SetBooleanList D 0:1:1 $test_bool_arr +eval SetReferenceList D 0:1:1 $test_ref_arr + +# IntPackedMap +eval SetIntPackedMap D 0:1:1 1 $test_map + +# NamedData +eval SetNDataIntegers D 0:1:4 2 $test_named_ints +eval SetNDataReals D 0:1:4 2 $test_named_reals +eval SetNDataStrings D 0:1:4 5 $test_named_strings +eval SetNDataBytes D 0:1:4 2 $test_named_bytes +eval SetNDataIntArrays D 0:1:4 ia 2 $test_int_arr +eval SetNDataRealArrays D 0:1:4 ra 3 $test_real_arr + +# NamedShape +eval box Box $test_boxXYZ $test_boxDX $test_boxDY $test_boxDZ +SetShape D 0:1:6 Box + +# Point +eval point Point $test_point +SetPoint D 0:1:5:1 Point + +# Axis +eval line Axis $test_axisPos $test_axisDir +SetAxis D 0:1:5:2 Axis + +# Plane +eval plane Plane $test_plane +SetPlane D 0:1:5:3 Plane + +# Geometry +SetGeometry D 0:1:6 $test_geom_t + +# Constraint +SetConstraint D 0:1:1 equal 0:1:6 + +# PatternStd +SetPattern D 0:1:1 5 0:1:6 + +# Function +SetFunction D 0:1:1 $test_guid $test_failure + +# AISPresentation +AISInitViewer D +AISSet D 0:1:1 $test_driver +AISTransparency D 0:1:1 $test_transp +AISColor D 0:1:1 $test_color +AISMaterial D 0:1:1 $test_material + +# Position +SetPosition D 0:1:1 $test_positionX $test_positionY $test_positionZ + +tinspector -plugins dfbrowser diff --git a/tests/tools/dfbrowser/A5 b/tests/tools/dfbrowser/A5 new file mode 100644 index 0000000000..6fdadd115b --- /dev/null +++ b/tests/tools/dfbrowser/A5 @@ -0,0 +1,78 @@ +pload TOPTEST +pload VISUALIZATION +pload XDE +pload QAcommands +pload DCAF + +set Test "TNaming_Builder test" +set IsDone 1 +set TestError "" + +puts "Creating document" +NewDocument D MDTV-Standard +set TestLab 0:1 + +#################### PRIMITIVE EVOLUTION #################### +box b 100 200 300 + +explode b E +if {[catch {BuildNamedShape D $TestLab:1 PRIMITIVE b}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build solid as primitive" +} +if {[catch {BuildNamedShape D [set TestLab]:1:1 PRIMITIVE b_1}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build edge as alone primitive" +} +if {[catch {BuildNamedShape D [set TestLab]:1:1 PRIMITIVE b_1 b_2 b_3}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build several edges as primitive over the old one" +} +if {[catch {BuildNamedShape D [set TestLab]:1:2 PRIMITIVE b_4 b_5 b_6}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build several edges as primitive" +} + + +#################### GENERATED EVOLUTION #################### +box b2 200 300 400 +explode b2 F +if {[catch {BuildNamedShape D $TestLab:2 GENERATED b b2}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build solid as generation" +} +if {[catch {BuildNamedShape D [set TestLab]:2:1 GENERATED b_1 b2_1}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build face as alone generation" +} +if {[catch {BuildNamedShape D [set TestLab]:2:2 GENERATED b_2 b2_2 b_2 b2_3 b_3 b2_4}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build face as generation n:m" +} +if {[catch {BuildNamedShape D [set TestLab]:2:1 GENERATED b_3 b2_1 b_3 b2_3 b_4 b2_4}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build face as generation n:m to the exists named shape" +} + +#################### MODIFY EVOLUTION #################### +box b3 300 400 500 +explode b3 F +if {[catch {BuildNamedShape D $TestLab:3 MODIFY b2 b3}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build solid as modification" +} +if {[catch {BuildNamedShape D [set TestLab]:3:1 MODIFY b2_1 b3_1}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build face as alone modification" +} +if {[catch {BuildNamedShape D [set TestLab]:3:2 MODIFY b2_5 b3_2 b2_2 b3_3 b2_3 b3_4}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build face as modification n:m" +} +if {[catch {BuildNamedShape D [set TestLab]:3:1 MODIFY b2_3 b3_1 b_3 b3_3 b2_4 b3_4}] == 1} { + set IsDone 0 + set TestError "$TestError # Can't build face as modification n:m to the exists named shape" +} + +pload INSPECTOR +tinspector -select 0:1:3:2 TNaming_NamedShape diff --git a/tests/tools/dfbrowser/A6 b/tests/tools/dfbrowser/A6 new file mode 100644 index 0000000000..7395f50e98 --- /dev/null +++ b/tests/tools/dfbrowser/A6 @@ -0,0 +1,76 @@ +pload DCAF + +chrono qat start +# Create a new document and set UndoLimit +NewDocument D BinOcaf + +#NewDocument D +cpulimit 300 +UndoLimit D 100 + +# Open a transaction +NewCommand D + +puts "caf005-I3" +set QA_DUP 0 + +# Add an attribute to a data framework +set aLabel_Root 0:2 +set aName_Root Label_1 +Label D ${aLabel_Root} +SetName D ${aLabel_Root} ${aName_Root} + +set aName1 Label_1_1 +###set aChild1 [NewChild D ${aLabel_Root}] +set aChild1 0:2:1 +Label D ${aChild1} +SetName D ${aChild1} ${aName1} + +set aName2 Label_1_2 +###set aChild2 [NewChild D ${aLabel_Root}] +set aChild2 0:2:2 +Label D ${aChild2} +SetName D ${aChild2} ${aName2} + +set aName3 Label_1_1_1 +###set aChild3 [NewChild D ${aLabel_Root}] +set aChild3 0:2:3 +Label D ${aChild3} +SetName D ${aChild3} ${aName3} + +set aName4 Label_1_1_2 +###set aChild4 [NewChild D ${aLabel_Root}] +set aChild4 0:2:4 +Label D ${aChild4} +SetName D ${aChild4} ${aName4} + +set aName5 Label_1_1_3 +###set aChild5 [NewChild D ${aLabel_Root}] +set aChild5 0:2:5 +Label D ${aChild5} +SetName D ${aChild5} ${aName5} + +set aName6 Label_1_2_1 +###set aChild6 [NewChild D ${aLabel_Root}] +set aChild6 0:2:6 +Label D ${aChild6} +SetName D ${aChild6} ${aName6} + +set aName7 Label_1_2_2 +###set aChild7 [NewChild D ${aLabel_Root}] +set aChild7 0:2:7 +Label D ${aChild7} +SetName D ${aChild7} ${aName7} + +SetNode D ${aLabel_Root} +AppendNode D ${aLabel_Root} ${aChild1} +AppendNode D ${aLabel_Root} ${aChild2} +AppendNode D ${aChild1} ${aChild3} +AppendNode D ${aChild1} ${aChild4} +AppendNode D ${aChild1} ${aChild5} +AppendNode D ${aChild2} ${aChild6} +AppendNode D ${aChild2} ${aChild7} + +pload INSPECTOR + +tinspector -plugins dfbrowser -select 0:2:6 TDataStd_TreeNode diff --git a/tests/tools/grids.list b/tests/tools/grids.list index 80a8f9607e..c8ade14958 100644 --- a/tests/tools/grids.list +++ b/tests/tools/grids.list @@ -1 +1,3 @@ 001 dfbrowser +001 shapeview +001 vinspector diff --git a/tests/tools/shapeview/A1 b/tests/tools/shapeview/A1 new file mode 100644 index 0000000000..5093256077 --- /dev/null +++ b/tests/tools/shapeview/A1 @@ -0,0 +1,11 @@ +pload ALL INSPECTOR + +tinspector -plugins shapeview + +box b1 200 100 120 +tinspector -shape b1 + +box b2 100 200 220 100 120 100 +tinspector -shape b2 + +tinspector -activate shapeview -select b1 diff --git a/tests/tools/shapeview/A2 b/tests/tools/shapeview/A2 new file mode 100644 index 0000000000..0e78f445b9 --- /dev/null +++ b/tests/tools/shapeview/A2 @@ -0,0 +1,5 @@ +pload ALL INSPECTOR + +tinspector -plugins shapeview + +tinspector -open $env(CSF_OCCTDataPath)/occ/solid.brep shapeview diff --git a/tests/tools/vinspector/A1 b/tests/tools/vinspector/A1 new file mode 100644 index 0000000000..abc11f94f7 --- /dev/null +++ b/tests/tools/vinspector/A1 @@ -0,0 +1,18 @@ +pload ALL INSPECTOR + +tinspector -plugins vinspector + +vinit + +box box_1 0 0 200 100 100 100 +vdisplay box_1 +vselmode box_1 1 1 +vselmode box_1 3 1 + +box box_2 180 120 200 150 150 150 +vdisplay box_2 + +vfit + +tinspector -update -select box_1 + diff --git a/tests/tools/vinspector/A2 b/tests/tools/vinspector/A2 new file mode 100644 index 0000000000..54c60660ff --- /dev/null +++ b/tests/tools/vinspector/A2 @@ -0,0 +1,9 @@ +pload ALL INSPECTOR + +tinspector -plugins vinspector + +vinit + +tinspector -open $env(CSF_OCCTDataPath)/occ/solid.brep +vfit + diff --git a/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx b/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx index fd5a1a132a..3d7b55e692 100644 --- a/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx +++ b/tools/DFBrowser/DFBrowser_HighlightDelegate.cxx @@ -15,7 +15,7 @@ #include -#include +#include #include // ======================================================================= @@ -28,7 +28,7 @@ void DFBrowser_HighlightDelegate::paint (QPainter* thePainter, const QStyleOptio // highlight cell if (theOption.state & QStyle::State_MouseOver) { - QColor aHighlightColor = DFBrowser_Window::LightHighlightColor(); + QColor aHighlightColor = DFBrowserPane_Tools::LightHighlightColor(); thePainter->fillRect (theOption.rect, aHighlightColor); } // default paint diff --git a/tools/DFBrowser/DFBrowser_ItemRole.hxx b/tools/DFBrowser/DFBrowser_ItemRole.hxx index 96b09a457b..d06f24d792 100644 --- a/tools/DFBrowser/DFBrowser_ItemRole.hxx +++ b/tools/DFBrowser/DFBrowser_ItemRole.hxx @@ -16,12 +16,14 @@ #ifndef DFBrowser_ItemRole_H #define DFBrowser_ItemRole_H +#include + #include //! Additional data item role for DFBrowser tree item enum DFBrowser_ItemRole { - DFBrowser_ItemRole_AdditionalInfo = Qt::UserRole + 1 //!< an attribute additional information + DFBrowser_ItemRole_AdditionalInfo = DFBrowserPane_ItemRole_LastTreeRole + 1 //!< an attribute additional information }; #endif diff --git a/tools/DFBrowser/DFBrowser_SearchLine.cxx b/tools/DFBrowser/DFBrowser_SearchLine.cxx index 101eb37055..d0981894ed 100644 --- a/tools/DFBrowser/DFBrowser_SearchLine.cxx +++ b/tools/DFBrowser/DFBrowser_SearchLine.cxx @@ -65,8 +65,7 @@ public: QRect aLineRect = rect(); Qt::Alignment anAlignment = QStyle::visualAlignment (layoutDirection(), Qt::AlignLeft); - QColor aColor = palette().text().color(); - aColor.setAlpha (128); + QColor aColor = Qt::gray; QPen anOldpen = aPainter.pen(); aPainter.setPen (aColor); aLineRect.adjust (4, 4, 0, 0); diff --git a/tools/DFBrowser/DFBrowser_SearchView.cxx b/tools/DFBrowser/DFBrowser_SearchView.cxx index c0416aa30c..54d694dcaa 100644 --- a/tools/DFBrowser/DFBrowser_SearchView.cxx +++ b/tools/DFBrowser/DFBrowser_SearchView.cxx @@ -82,10 +82,11 @@ void DFBrowser_SearchView::InitModels() // function : onTableSelectionChanged // purpose : // ======================================================================= -void DFBrowser_SearchView::onTableSelectionChanged (const QItemSelection& theSelected, +void DFBrowser_SearchView::onTableSelectionChanged (const QItemSelection&, const QItemSelection&) { - QModelIndexList aSelectedIndices = theSelected.indexes(); + QItemSelectionModel* aSelectionModel = myTableView->selectionModel(); + QModelIndexList aSelectedIndices = aSelectionModel->selectedIndexes(); QModelIndex aSelectedIndex = DFBrowser_Window::SingleSelected (aSelectedIndices, 2); if (!aSelectedIndex.isValid()) return; diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx index 8714f4f357..24ed7d294b 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelLine.cxx @@ -34,6 +34,7 @@ #include const int HISTORY_SIZE = 10; +const int MARGIN_SIZE = 2; // ======================================================================= // function : Constructor @@ -44,7 +45,7 @@ DFBrowser_TreeLevelLine::DFBrowser_TreeLevelLine (QWidget* theParent) { myMainWindow = new QWidget (theParent); QGridLayout* aLayout = new QGridLayout (myMainWindow); - aLayout->setContentsMargins (0, 0, 0, 0); + aLayout->setContentsMargins (MARGIN_SIZE, MARGIN_SIZE, MARGIN_SIZE, MARGIN_SIZE); myBackwardButton = new QToolButton (myMainWindow); myBackwardButton->setIcon (QIcon (":/icons/treeline_backward.png")); @@ -64,13 +65,12 @@ DFBrowser_TreeLevelLine::DFBrowser_TreeLevelLine (QWidget* theParent) aVHeader->setVisible (false); int aDefCellSize = aVHeader->minimumSectionSize() + DFBrowserPane_Tools::HeaderSectionMargin(); aVHeader->setDefaultSectionSize (aDefCellSize); - aLayout->addWidget (myTableView, 0, 2, 2, 1); + aLayout->addWidget (myTableView, 0, 2); - int aScrollHeight = myTableView->horizontalScrollBar()->sizeHint().height(); - myTableView->setFixedHeight (aDefCellSize + aScrollHeight); + myTableView->setFixedHeight (aDefCellSize); myTableView->horizontalHeader()->setMinimumSectionSize (5); // it will be resized by context myTableView->setHorizontalScrollMode (QAbstractItemView::ScrollPerItem); - myTableView->setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOn); //! TEMPORARY + myTableView->setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff); //! TEMPORARY myTableView->setShowGrid (false); DFBrowser_TreeLevelLineModel* aHModel = new DFBrowser_TreeLevelLineModel (myTableView); diff --git a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx index 9eb9cc5646..1b1be9f4ba 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelLineDelegate.cxx @@ -14,7 +14,7 @@ // commercial license or contractual agreement. #include -#include +#include #include @@ -36,7 +36,7 @@ void DFBrowser_TreeLevelLineDelegate::paint (QPainter* thePainter, const QStyleO { // highlight cell if (theOption.state & QStyle::State_MouseOver) - thePainter->fillRect (theOption.rect, DFBrowser_Window::LightHighlightColor()); + thePainter->fillRect (theOption.rect, DFBrowserPane_Tools::LightHighlightColor()); // action icon for all indices before the last one if (theIndex.column() < theIndex.model()->columnCount()-1) diff --git a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx index 60e899812c..855aacdf2b 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelView.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelView.cxx @@ -28,7 +28,7 @@ #include #include -const int DEFAULT_COLUMN_WIDTH = 300; +const int LABEL_OR_ATTRIBUTECOLUMN_WIDTH = 160; // ======================================================================= // function : Constructor @@ -43,11 +43,12 @@ DFBrowser_TreeLevelView::DFBrowser_TreeLevelView (QWidget* theParent) myTableView = new QTableView (myMainWindow); myTableView->setModel (new DFBrowser_TreeLevelViewModel (myTableView)); - myTableView->setColumnWidth (0, DEFAULT_COLUMN_WIDTH); + myTableView->setColumnWidth (0, LABEL_OR_ATTRIBUTECOLUMN_WIDTH); myTableView->setEditTriggers (QAbstractItemView::DoubleClicked); + myTableView->horizontalHeader()->setVisible (false); QHeaderView* aVHeader = myTableView->verticalHeader(); aVHeader->setVisible (false); - aVHeader->setDefaultSectionSize (aVHeader->minimumSectionSize() + DFBrowserPane_Tools::HeaderSectionMargin()); + aVHeader->setDefaultSectionSize (aVHeader->minimumSectionSize()); myTableView->horizontalHeader()->setStretchLastSection (true); aLayout->addWidget (myTableView); diff --git a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx index e618568d51..9f442d061d 100644 --- a/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx +++ b/tools/DFBrowser/DFBrowser_TreeLevelViewModel.cxx @@ -26,6 +26,9 @@ #include #include +#include +#include +#include #include // ======================================================================= @@ -84,7 +87,7 @@ QVariant DFBrowser_TreeLevelViewModel::data (const QModelIndex& theIndex, int th QVariant aValue; TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex); - if (anIndex.column() == 0) + if (theIndex.column() == 0) { DFBrowser_ItemBasePtr aDBrowserItem = itemDynamicCast (anItemBase); bool aPrevValue = aDBrowserItem->SetUseAdditionalInfo (false); @@ -99,6 +102,15 @@ QVariant DFBrowser_TreeLevelViewModel::data (const QModelIndex& theIndex, int th aValue = anItem->GetAttributeInfo (DFBrowser_ItemRole_AdditionalInfo); } } + if (theIndex.column() == 0 && theRole == Qt::FontRole) // method name is in italic + { + QFont aFont = qApp->font(); + aFont.setItalic (true); + return aFont; + } + if (theIndex.column() == 0 && theRole == Qt::ForegroundRole) // method name is light gray + return QColor (Qt::darkGray).darker(150); + return aValue; } diff --git a/tools/DFBrowser/DFBrowser_TreeModel.cxx b/tools/DFBrowser/DFBrowser_TreeModel.cxx index ce91e80566..c23a43f413 100644 --- a/tools/DFBrowser/DFBrowser_TreeModel.cxx +++ b/tools/DFBrowser/DFBrowser_TreeModel.cxx @@ -252,6 +252,6 @@ void DFBrowser_TreeModel::ConvertToIndices (const NCollection_List #include #include -#if QT_VERSION < 0x050000 -#include -#endif #include #include #include @@ -85,9 +82,9 @@ #include #endif -const int DFBROWSER_DEFAULT_WIDTH = 1200; -const int DFBROWSER_DEFAULT_HEIGHT = 850; -const int DFBROWSER_DEFAULT_TREE_VIEW_WIDTH = 300; +const int DFBROWSER_DEFAULT_WIDTH = 650; +const int DFBROWSER_DEFAULT_HEIGHT = 350; +const int DFBROWSER_DEFAULT_TREE_VIEW_WIDTH = 325; const int DFBROWSER_DEFAULT_TREE_VIEW_HEIGHT = 500; const int DFBROWSER_DEFAULT_VIEW_WIDTH = 400; const int DFBROWSER_DEFAULT_VIEW_HEIGHT = 300; @@ -96,7 +93,7 @@ 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 = 100; +const int DEFAULT_PROPERTY_PANEL_HEIGHT = 200; const int DEFAULT_BROWSER_HEIGHT = 800; // ======================================================================= @@ -119,6 +116,7 @@ DFBrowser_Window::DFBrowser_Window() 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); @@ -137,6 +135,7 @@ DFBrowser_Window::DFBrowser_Window() connect (myTreeLevelLine, SIGNAL (updateClicked()), this, SLOT (onUpdateClicked())); QDockWidget* aTreeLineDockWidget = new QDockWidget (tr ("Tree Level Line"), myMainWindow); + aTreeLineDockWidget->setTitleBarWidget (new QWidget(myMainWindow)); aTreeLineDockWidget->setFeatures (QDockWidget::NoDockWidgetFeatures); aTreeLineDockWidget->setWidget (myTreeLevelLine->GetControl()); myMainWindow->addDockWidget (Qt::TopDockWidgetArea, aTreeLineDockWidget); @@ -148,6 +147,7 @@ DFBrowser_Window::DFBrowser_Window() myDumpView = new DFBrowser_DumpView (aDumpWidget); aDumpLay->addWidget (myDumpView->GetControl()); QDockWidget* aDumpDockWidget = new QDockWidget (tr ("Dump"), myMainWindow); + aDumpDockWidget->setWidget (aDumpWidget); myMainWindow->addDockWidget (Qt::BottomDockWidgetArea, aDumpDockWidget); @@ -178,18 +178,16 @@ DFBrowser_Window::DFBrowser_Window() myViewWindow->GetView()->SetPredefinedSize (DFBROWSER_DEFAULT_VIEW_WIDTH, DFBROWSER_DEFAULT_VIEW_HEIGHT); QDockWidget* aViewDockWidget = new QDockWidget (tr ("View"), myMainWindow); + aViewDockWidget->setTitleBarWidget (myViewWindow->GetViewToolBar()->GetControl()); aViewDockWidget->setWidget (myViewWindow); myMainWindow->addDockWidget (Qt::BottomDockWidgetArea, aViewDockWidget); - QColor aHColor = DFBrowser_Window::LightHighlightColor(); + 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->tabifyDockWidget (aDumpDockWidget, aViewDockWidget); - myMainWindow->resize (DFBROWSER_DEFAULT_WIDTH, DFBROWSER_DEFAULT_HEIGHT); - myMainWindow->move (DFBROWSER_DEFAULT_POSITION_X, DFBROWSER_DEFAULT_POSITION_Y); - - aTreeViewWidget->resize (DFBROWSER_DEFAULT_TREE_VIEW_WIDTH, DFBROWSER_DEFAULT_HEIGHT); + aTreeViewWidget->resize (DFBROWSER_DEFAULT_TREE_VIEW_WIDTH, DFBROWSER_DEFAULT_TREE_VIEW_HEIGHT); myThread = new DFBrowser_Thread (this); @@ -792,6 +790,7 @@ void DFBrowser_Window::onPaneSelectionChanged (const QItemSelection&, if (!aPresentation.IsNull()) aDisplayer->DisplayPresentation (aPresentation, View_PresentationType_Additional); else { + aDisplayer->ErasePresentations (View_PresentationType_Additional, false); AIS_ListOfInteractive aDisplayed; findPresentations (anIndices, aDisplayed); for (AIS_ListIteratorOfListOfInteractive aDisplayedIt (aDisplayed); aDisplayedIt.More(); aDisplayedIt.Next()) @@ -904,7 +903,7 @@ void DFBrowser_Window::highlightIndices (const QModelIndexList& theIndices) aTreeModel->SetHighlighted (theIndices); QModelIndex anIndexToScroll; - if (theIndices.size() > 0) + if (!theIndices.isEmpty()) anIndexToScroll = theIndices.last(); // scroll to last selected index else { @@ -917,6 +916,9 @@ void DFBrowser_Window::highlightIndices (const QModelIndexList& theIndices) if (anIndexToScroll.isValid()) myTreeView->scrollTo (anIndexToScroll); + if (theIndices.isEmpty()) + myTreeView->setFocus(); // to see the selected item in active palette color + aTreeModel->EmitLayoutChanged(); } diff --git a/tools/DFBrowser/DFBrowser_Window.hxx b/tools/DFBrowser/DFBrowser_Window.hxx index 20dd55b6f6..8eb8e603d7 100644 --- a/tools/DFBrowser/DFBrowser_Window.hxx +++ b/tools/DFBrowser/DFBrowser_Window.hxx @@ -110,10 +110,6 @@ public: //! \return string value Standard_EXPORT static TCollection_AsciiString TmpDirectory(); - //! Returns light highlight color - //! \returns Qt color - static QColor LightHighlightColor() { return QColor (229, 243, 255); } - //! 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 diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx index bdcc8a3d9e..1b1326efc5 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.cxx @@ -32,13 +32,12 @@ // purpose : // ======================================================================= DFBrowserPane_AttributePane::DFBrowserPane_AttributePane() -: DFBrowserPane_AttributePaneAPI(), myMainWidget (0), myTableView (0), myPaneModel (0) +: DFBrowserPane_AttributePaneAPI(), myMainWidget (0), myTableView (0) { myPaneModel = new DFBrowserPane_AttributePaneModel(); - QList aHeaderValues; - aHeaderValues << "Values"; - getPaneModel()->SetHeaderValues (aHeaderValues, Qt::Horizontal); + getPaneModel()->SetColumnCount (getColumnCount()); + getPaneModel()->SetHeaderValues (getHeaderValues(Qt::Horizontal), Qt::Horizontal); mySelectionModels.push_back (new QItemSelectionModel (myPaneModel)); } @@ -66,6 +65,14 @@ QWidget* DFBrowserPane_AttributePane::CreateWidget (QWidget* theParent) myTableView = new DFBrowserPane_TableView (aMainWidget, getTableColumnWidths()); myTableView->SetModel (myPaneModel); QTableView* aTableView = myTableView->GetTableView(); + DFBrowserPane_AttributePaneModel* aPaneModel = dynamic_cast(myPaneModel); + if (aPaneModel) + { + if (aPaneModel->GetOrientation() == Qt::Vertical) + aTableView->horizontalHeader()->setVisible (!aPaneModel->HeaderValues (Qt::Horizontal).isEmpty()); + else + aTableView->verticalHeader()->setVisible (!aPaneModel->HeaderValues (Qt::Vertical).isEmpty()); + } aTableView->setSelectionModel (mySelectionModels.front()); aTableView->setSelectionBehavior (QAbstractItemView::SelectRows); @@ -85,6 +92,9 @@ void DFBrowserPane_AttributePane::Init (const Handle(TDF_Attribute)& theAttribut QList aValues; GetValues (theAttribute, aValues); getPaneModel()->Init (aValues); + + if (myTableView) + myTableView->GetTableView()->resizeColumnToContents (0); } // ======================================================================= @@ -111,6 +121,19 @@ QVariant DFBrowserPane_AttributePane::GetAttributeInfo (const Handle(TDF_Attribu } } +// ======================================================================= +// function : GetShortAttributeInfo +// purpose : +// ======================================================================= +void DFBrowserPane_AttributePane::GetShortAttributeInfo (const Handle(TDF_Attribute)& theAttribute, QList& theValues) +{ + QList aValues; + GetValues(theAttribute, aValues); + + for (int aValuesEvenId = 1; aValuesEvenId < aValues.size(); aValuesEvenId = aValuesEvenId + 2) + theValues.append (aValues[aValuesEvenId]); +} + // ======================================================================= // function : GetAttributeInfoByType // purpose : diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx index 972ad80ca7..8ad949d290 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePane.hxx @@ -84,11 +84,10 @@ public: //! \return value, interpreted by tree model depending on the role Standard_EXPORT virtual QVariant GetAttributeInfo(const Handle(TDF_Attribute)& theAttribute, int theRole, int theColumnId); - //! Returns brief attribute information. In general case, it returns GetValues() result. + //! Returns brief attribute information. In general case, it returns even values of GetValues() result. //! \param theAttribute a current attribute //! \param theValues a result list of values - virtual void GetShortAttributeInfo (const Handle(TDF_Attribute)& theAttribute, QList& theValues) - { GetValues(theAttribute, theValues); } + Standard_EXPORT virtual void GetShortAttributeInfo (const Handle(TDF_Attribute)& theAttribute, QList& theValues); //! Returns list of selection models. In default implementation it contains a selection model for the table view //! \returns container of models @@ -102,6 +101,16 @@ protected: //! Returns converted table view DFBrowserPane_TableView* getTableView() const { return myTableView; } + //! Returns header text values for 0...n table cells in parameter orientation + //! \param theOrientation defines horizontal or vertical values + //! \param theValues output container of values + virtual QList getHeaderValues (const Qt::Orientation theOrientation) + { (void)theOrientation; return QList(); } + + //! Retuns number of columns in internal table. By default it returns 2 : method name for method value. + //! \return integer value + virtual int getColumnCount() const { return 2; } + //! Defines widths of table columns //! \return container of widths Standard_EXPORT virtual QMap getTableColumnWidths() const; diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx index ff6aac7f01..3b306b4224 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.cxx @@ -15,6 +15,10 @@ #include +#include +#include +#include + // ======================================================================= // function : Constructor // purpose : @@ -22,6 +26,7 @@ DFBrowserPane_AttributePaneModel::DFBrowserPane_AttributePaneModel (QObject* theParent) : QAbstractTableModel (theParent), myOrientation (Qt::Vertical), myColumnCount (1) { + myItalicColumns.append (0); } // ======================================================================= @@ -120,6 +125,15 @@ QVariant DFBrowserPane_AttributePaneModel::data (const QModelIndex& theIndex, in aValue = aColValues.at (theIndex.row()); } } + if (myItalicColumns.contains (theIndex.column()) && theRole == Qt::FontRole) + { + QFont aFont = qApp->font(); + aFont.setItalic (true); + return aFont; + } + if (myItalicColumns.contains (theIndex.column()) && theRole == Qt::ForegroundRole) + return QColor (Qt::darkGray).darker(150); + return aValue; } diff --git a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx index 8177df3fc8..047ea67d21 100644 --- a/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_AttributePaneModel.hxx @@ -46,35 +46,53 @@ public: //! \param theOrientation if horizontal, the values are applyed by rows, otherwise by columns void SetOrientation (const Qt::Orientation& theOrientation) { myOrientation = theOrientation; } + //! Returns table orientation for setting data values + //! \return thye current orientation + Qt::Orientation GetOrientation() const { return myOrientation; } + //! Sets number of columns //! \param theColumnCount a column count void SetColumnCount (const int theColumnCount) { myColumnCount = theColumnCount; } //! Fills the model with the values. Store the values in a cache. //! \param theValues a container of values - Standard_EXPORT void Init(const QList& theValues); + Standard_EXPORT void Init (const QList& theValues); //! Fills the model header values for orientation. //! \param theValues a container of header text values //! \param theOrientation an orientation of header - Standard_EXPORT void SetHeaderValues(const QList& theValues, Qt::Orientation theOrientation); + Standard_EXPORT void SetHeaderValues (const QList& theValues, Qt::Orientation theOrientation); + + //! Returns header values for orientation. + //! \param theValues a container of header text values + //! \param theOrientation an orientation of header + const QList& HeaderValues (Qt::Orientation theOrientation) + { return theOrientation == Qt::Horizontal ? myHorizontalHeaderValues : myVerticalHeaderValues; } + + //! Returns indices of italic columns + //! \return indices of columns + const QList& GetItalicColumns() const { return myItalicColumns; } + + //! Sets indices of italic columns + //! \param theValues indices of columns + void SetItalicColumns (const QList& theValues) { myItalicColumns = theValues; } //! Returns number of columns, depending on orientation: myColumnCount or size of values container //! \param theParent an index of the parent item //! \return an integer value - Standard_EXPORT virtual int columnCount(const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE; + Standard_EXPORT virtual int columnCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE; //! Returns number of rows, depending on orientation: myColumnCount or size of values container //! \param theParent an index of the parent item //! \return an integer value - Standard_EXPORT virtual int rowCount(const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE; + Standard_EXPORT virtual int rowCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE; //! Returns content of the model index for the given role, it is obtained from internal container of values //! It returns value only for DisplayRole. //! \param theIndex a model index //! \param theRole a view role //! \return value intepreted depending on the given role - Standard_EXPORT virtual QVariant data(const QModelIndex& theIndex, int theRole = Qt::DisplayRole) const Standard_OVERRIDE; + Standard_EXPORT virtual QVariant data (const QModelIndex& theIndex, int theRole = Qt::DisplayRole) const Standard_OVERRIDE; //! Returns content of the model index for the given role, it is obtainer from internal container of header values //! It returns value only for DisplayRole. @@ -82,7 +100,7 @@ public: //! \param theIndex a model index //! \param theRole a view role //! \return value intepreted depending on the given role - Standard_EXPORT virtual QVariant headerData(int theSection, Qt::Orientation theOrientation, int theRole = Qt::DisplayRole) const Standard_OVERRIDE; + Standard_EXPORT virtual QVariant headerData (int theSection, Qt::Orientation theOrientation, int theRole = Qt::DisplayRole) const Standard_OVERRIDE; //! Returns flags for the item: ItemIsEnabled | Qt::ItemIsSelectable //! \param theIndex a model index @@ -97,6 +115,8 @@ private: QMap< int, QList > myValuesMap; //!< container of values, filled in Init(), used in data() QList myHorizontalHeaderValues; //!< table horizontal header values QList myVerticalHeaderValues; //!< table vertical header values + QList myItalicColumns; //!< indices of columns that should be visualized in gray and italic + }; #endif diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx index 7848c10ece..f52bbd446b 100644 --- a/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_HelperArray.cxx @@ -18,9 +18,11 @@ #include -#include -#include +#include #include +#include +#include +#include #include // ======================================================================= @@ -28,26 +30,25 @@ // purpose : // ======================================================================= DFBrowserPane_HelperArray::DFBrowserPane_HelperArray (DFBrowserPane_AttributePaneModel* theValuesModel) - : myValuesModel (theValuesModel) + : myValuesModel (theValuesModel), myArrayBounds (0), myValuesView (0) { myBoundsModel = new DFBrowserPane_AttributePaneModel(); - - QList aHeaderValues; - aHeaderValues << "Bounds"; - myBoundsModel->SetHeaderValues (aHeaderValues, Qt::Horizontal); + myBoundsModel->SetColumnCount (2); } // ======================================================================= // function : CreateWidget // purpose : // ======================================================================= -void DFBrowserPane_HelperArray::CreateWidget (QWidget* theParent, QWidget* theValuesView) +void DFBrowserPane_HelperArray::CreateWidget (QWidget* theParent, DFBrowserPane_TableView* theValuesView) { + myValuesView = theValuesView; myArrayBounds = new DFBrowserPane_TableView (theParent); myArrayBounds->SetModel (myBoundsModel); DFBrowserPane_TableView::SetFixedRowCount (2, myArrayBounds->GetTableView()); QGridLayout* aLay = new QGridLayout (theParent); + aLay->setContentsMargins (0, 0, 0, 0); aLay->addWidget (myArrayBounds); aLay->addWidget (theValuesView); aLay->setRowStretch (1, 1); @@ -60,19 +61,19 @@ void DFBrowserPane_HelperArray::CreateWidget (QWidget* theParent, QWidget* theVa void DFBrowserPane_HelperArray::Init (const QList& theValues) { QList aTmpValues; - aTmpValues << theValues[0] << theValues[1]; + aTmpValues << "Lower" << theValues[0] << "Upper" << theValues[1]; myBoundsModel->Init (aTmpValues); aTmpValues.clear(); - QList aHeaderValues; int aLower = theValues[0].toInt(); - for (int aValuesIt = 2, aSize = theValues.size(); aValuesIt < aSize; aValuesIt++) - { - aTmpValues << theValues[aValuesIt]; - aHeaderValues << aLower + (aValuesIt - 2); - } - myValuesModel->SetHeaderValues (aHeaderValues, Qt::Vertical); + for (int aValueIt = 2, aSize = theValues.size(); aValueIt < aSize; aValueIt++) + aTmpValues << QString ("Value (%1)").arg(aValueIt-2 + aLower) << theValues[aValueIt]; myValuesModel->Init (aTmpValues); + + if (myArrayBounds) + myArrayBounds->GetTableView()->resizeColumnToContents (0); + if (myValuesView) + myValuesView->GetTableView()->resizeColumnToContents (0); } // ======================================================================= @@ -83,5 +84,5 @@ void DFBrowserPane_HelperArray::GetShortAttributeInfo (const Handle(TDF_Attribut QList& theValues) { for (int aRowId = 0, aRows = myValuesModel->rowCount(); aRowId < aRows; aRowId++) - theValues.append (myValuesModel->data (myValuesModel->index (aRowId, 0))); + theValues.append (myValuesModel->data (myValuesModel->index (aRowId, 1))); } diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx b/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx index 350d6bcbb9..071a1bd33d 100644 --- a/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_HelperArray.hxx @@ -47,7 +47,7 @@ public: //! Creates bounds table view and grid layout, where the bounds view and the values view are shown //! \param theParent a parent widget //! \param theValuesView a view of values(table view filled by myValuesModel) - Standard_EXPORT void CreateWidget(QWidget* theParent, QWidget* theValuesView); + Standard_EXPORT void CreateWidget(QWidget* theParent, DFBrowserPane_TableView* theValuesView); //! Fills bounds model by firsth and second values, fills values model by left values //! \param theValues values to fill views @@ -63,5 +63,6 @@ private: DFBrowserPane_AttributePaneModel* myValuesModel; //!< model of table view DFBrowserPane_AttributePaneModel* myBoundsModel; //!< model of bounds view DFBrowserPane_TableView* myArrayBounds; //!< bounds view + DFBrowserPane_TableView* myValuesView; //!< values view }; #endif diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx index 9cdf77fae4..aa00516b18 100644 --- a/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_HelperExport.cxx @@ -47,7 +47,11 @@ void DFBrowserPane_HelperExport::OnButtonPressed (const QModelIndex& theIndex) QString aFileExtension = ".brep"; +#if QT_VERSION < 0x050000 QString aFilter (tr ("BREP file (*%1*)").arg (aFileExtension)); +#else + QString aFilter; +#endif QString aSelectedFilter; QString aFileName = QFileDialog::getSaveFileName (0, tr ("Export shape to BREP file"), QString(), aFilter, &aSelectedFilter); diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.cxx b/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.cxx deleted file mode 100644 index fff0ba17f8..0000000000 --- a/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.cxx +++ /dev/null @@ -1,49 +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 - -// ======================================================================= -// function : Constructor -// purpose : -// ======================================================================= -DFBrowserPane_HelperGroupContent::DFBrowserPane_HelperGroupContent (const QString& theTitle, QWidget* theParent, - QWidget* theControl) -: QGroupBox (theTitle, theParent), myControl (0) -{ - setCheckable (true); - - myControl = theControl; - QHBoxLayout* aLayout = new QHBoxLayout (this); - aLayout->addWidget (myControl); - - connect (this, SIGNAL (clicked (bool)), this, SLOT (onChecked(bool))); - - setChecked (false); - onChecked (isChecked()); -} - -// ======================================================================= -// function : onChecked -// purpose : -// ======================================================================= -void DFBrowserPane_HelperGroupContent::onChecked (bool theState) -{ - if (myControl) - myControl->setVisible (theState); -} diff --git a/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.hxx b/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.hxx deleted file mode 100644 index b472833fa5..0000000000 --- a/tools/DFBrowserPane/DFBrowserPane_HelperGroupContent.hxx +++ /dev/null @@ -1,53 +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 DFBrowserPane_HelperGroupContent_H -#define DFBrowserPane_HelperGroupContent_H - -#include -#include - -#ifdef _MSC_VER -#pragma warning(disable : 4127) // conditional expression is constant -#endif -#include - -class QWidget; - -//! \class DFBrowserPane_HelperGroupContent -//! \brief Creates a check group box for the given control. If checked, the control is enabled, -//! otherwise it sets it as disabled -class DFBrowserPane_HelperGroupContent : public QGroupBox -{ -Q_OBJECT -public: - - //! Constructor - Standard_EXPORT DFBrowserPane_HelperGroupContent (const QString& theTitle, QWidget* theParent, QWidget* theControl); - - //! Destructor - virtual ~DFBrowserPane_HelperGroupContent() Standard_OVERRIDE {} - -protected slots: - //! Set enable/disable current control depending on check box state - //! \param theState state of the check box - void onChecked (bool theState); - -private: - - QWidget* myControl; //!< the source control, that will be enabled/disabled -}; - -#endif diff --git a/tools/DFBrowserPane/DFBrowserPane_ItemRole.hxx b/tools/DFBrowserPane/DFBrowserPane_ItemRole.hxx index fc63a30f84..2cdd55b690 100644 --- a/tools/DFBrowserPane/DFBrowserPane_ItemRole.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_ItemRole.hxx @@ -16,13 +16,16 @@ #ifndef DFBrowserPane_ItemRole_H #define DFBrowserPane_ItemRole_H +#include + //! Custom item role for attribute pane enum DFBrowserPane_ItemRole { - DFBrowserPane_ItemRole_ShortInfo = Qt::UserRole + 1, //!< not full information of an attribute + DFBrowserPane_ItemRole_ShortInfo = TreeModel_ItemRole_LastTreeRole + 1, //!< not full information of an attribute DFBrowserPane_ItemRole_Decoration_40x40, //!< icon with greater size DFBrowserPane_ItemRole_DisplayExtended, // extended item information (with additional information) for Qt::DisplayRole - DFBrowserPane_ItemRole_ToolTipExtended // exteneded tool tip information for Qt::ToolTipRole + DFBrowserPane_ItemRole_ToolTipExtended, // exteneded tool tip information for Qt::ToolTipRole + DFBrowserPane_ItemRole_LastTreeRole //! last enumeration value to use outside incremented }; #endif diff --git a/tools/DFBrowserPane/DFBrowserPane_OcctEnumType.hxx b/tools/DFBrowserPane/DFBrowserPane_OcctEnumType.hxx index ff861d0a67..e0b3543ecc 100644 --- a/tools/DFBrowserPane/DFBrowserPane_OcctEnumType.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_OcctEnumType.hxx @@ -27,7 +27,8 @@ enum DFBrowserPane_OcctEnumType DB_DIMENSION_TYPE = 5, //!< TDataStd_RealEnum values DB_MATERIAL_TYPE = 6, //!< Graphic3d_NameOfMaterial values DB_DISPLAY_MODE = 7, //!< AIS_DisplayMode values - DB_ORIENTATION_TYPE = 8 //!< TopAbs_Orientation values + DB_ORIENTATION_TYPE = 8, //!< TopAbs_Orientation values + DB_CDM_CAN_CLOSE_STATUS //!< CDM_CanCloseStatus values }; #endif diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx b/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx index 12197a9597..757b884e51 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDFReference.cxx @@ -29,11 +29,12 @@ void DFBrowserPane_TDFReference::GetValues (const Handle(TDF_Attribute)& theAttribute, QList& theValues) { Handle(TDF_Reference) anAttribute = Handle(TDF_Reference)::DownCast (theAttribute); - if (!anAttribute.IsNull()) - { - TDF_Label aLabel = anAttribute->Get(); - theValues.append (DFBrowserPane_Tools::GetEntry (aLabel).ToCString()); - } + if (anAttribute.IsNull()) + return; + + TDF_Label aLabel = anAttribute->Get(); + theValues.append ("Get"); + theValues.append (DFBrowserPane_Tools::GetEntry (aLabel).ToCString()); } // ======================================================================= diff --git a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx index b9ccdc7556..653c72c9c3 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDFTagSource.cxx @@ -29,6 +29,7 @@ void DFBrowserPane_TDFTagSource::GetValues (const Handle(TDF_Attribute)& theAttr Handle(TDF_TagSource) anAttribute = Handle(TDF_TagSource)::DownCast (theAttribute); if (anAttribute.IsNull()) return; + theValues.append ("Get"); theValues.append (anAttribute->Get()); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx index d4a357adf6..502c6c1480 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdAsciiString.cxx @@ -28,6 +28,9 @@ void DFBrowserPane_TDataStdAsciiString::GetValues (const Handle(TDF_Attribute)& QList& theValues) { Handle(TDataStd_AsciiString) anAttribute = Handle(TDataStd_AsciiString)::DownCast (theAttribute); - if (!anAttribute.IsNull()) - theValues.append (anAttribute->Get().ToCString()); + if (anAttribute.IsNull()) + return; + + theValues.append ("Get"); + theValues.append (anAttribute->Get().ToCString()); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx index e6f8749bef..64b30c60a2 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanArray.cxx @@ -24,9 +24,9 @@ #pragma warning(disable : 4127) // conditional expression is constant #endif +#include #include #include -#include // ======================================================================= // function : CreateWidget @@ -62,13 +62,13 @@ void DFBrowserPane_TDataStdBooleanArray::GetValues (const Handle(TDF_Attribute)& QList& theValues) { Handle(TDataStd_BooleanArray) anAttribute = Handle(TDataStd_BooleanArray)::DownCast (theAttribute); - if (!anAttribute.IsNull()) - { - theValues.append (anAttribute->Lower()); - theValues.append (anAttribute->Upper()); - for (int aValuesId = anAttribute->Lower(); aValuesId <= anAttribute->Upper(); aValuesId++) - theValues.append (anAttribute->Value (aValuesId)); - } + if (anAttribute.IsNull()) + return; + + theValues.append (anAttribute->Lower()); + theValues.append (anAttribute->Upper()); + for (int aValueId = anAttribute->Lower(); aValueId <= anAttribute->Upper(); aValueId++) + theValues.append (anAttribute->Value (aValueId)); } // ======================================================================= diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx index f16c641e6d..261131f007 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdBooleanList.cxx @@ -35,5 +35,8 @@ void DFBrowserPane_TDataStdBooleanList::GetValues (const Handle(TDF_Attribute)& return; for (TDataStd_ListIteratorOfListOfByte aBoolListIt (anAttribute->List()); aBoolListIt.More(); aBoolListIt.Next()) + { + theValues.append ("Value"); theValues.append (aBoolListIt.Value()); + } } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx index 482aab26c4..a60a75cda0 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdComment.cxx @@ -30,5 +30,6 @@ void DFBrowserPane_TDataStdComment::GetValues (const Handle(TDF_Attribute)& theA Handle(TDataStd_Comment) anAttribute = Handle(TDataStd_Comment)::DownCast (theAttribute); if (anAttribute.IsNull()) return; + theValues.append ("Get"); theValues.append (DFBrowserPane_Tools::ToString (anAttribute->Get())); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx index eade6ead4e..23d1ddfccb 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdCurrent.cxx @@ -30,5 +30,6 @@ void DFBrowserPane_TDataStdCurrent::GetValues (const Handle(TDF_Attribute)& theA Handle(TDataStd_Current) anAttribute = Handle(TDataStd_Current)::DownCast (theAttribute); if (anAttribute.IsNull()) return; + theValues.append ("GetLabel"); theValues.append (DFBrowserPane_Tools::GetEntry (anAttribute->GetLabel()).ToCString()); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx index bea934fa48..772742fc4e 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExpression.cxx @@ -29,6 +29,7 @@ void DFBrowserPane_TDataStdExpression::GetValues (const Handle(TDF_Attribute)& t if (anAttribute.IsNull()) return; + theValues.append ("GetExpression"); theValues.append (DFBrowserPane_Tools::ToString (anAttribute->GetExpression())); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx index 179dfc473c..bbd47fadc9 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdExtStringList.cxx @@ -33,5 +33,8 @@ void DFBrowserPane_TDataStdExtStringList::GetValues (const Handle(TDF_Attribute) return; for (TDataStd_ListIteratorOfListOfExtendedString aValuesIt(anAttribute->List()); aValuesIt.More(); aValuesIt.Next()) + { + theValues.append ("Value"); theValues.append (DFBrowserPane_Tools::ToString (aValuesIt.Value())); + } } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx index 7af9521ef2..09fcbcf39e 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntPackedMap.cxx @@ -31,6 +31,10 @@ void DFBrowserPane_TDataStdIntPackedMap::GetValues (const Handle(TDF_Attribute)& if (anAttribute.IsNull()) return; - for (TColStd_MapIteratorOfPackedMapOfInteger aValueIt(anAttribute->GetMap()); aValueIt.More(); aValueIt.Next()) + int anIndexInMap = 0; + for (TColStd_MapIteratorOfPackedMapOfInteger aValueIt(anAttribute->GetMap()); aValueIt.More(); aValueIt.Next(), anIndexInMap++) + { + theValues.append (QString ("GetMap [%1]").arg(anIndexInMap)); theValues.append (aValueIt.Key()); + } } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx index b2ca9afbce..2164e4855d 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdInteger.cxx @@ -29,5 +29,6 @@ void DFBrowserPane_TDataStdInteger::GetValues (const Handle(TDF_Attribute)& theA if (anAttribute.IsNull()) return; + theValues.append ("Get"); theValues.append (anAttribute->Get()); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx index 969960f334..26c1c0cc4c 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdIntegerList.cxx @@ -32,5 +32,8 @@ void DFBrowserPane_TDataStdIntegerList::GetValues (const Handle(TDF_Attribute)& return; for (TColStd_ListIteratorOfListOfInteger aValuesIt (anAttribute->List()); aValuesIt.More(); aValuesIt.Next()) + { + theValues.append ("Value"); theValues.append (aValuesIt.Value()); + } } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx index cc386a2280..43f77f1ad9 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdName.cxx @@ -30,6 +30,7 @@ void DFBrowserPane_TDataStdName::GetValues (const Handle(TDF_Attribute)& theAttr if (anAttribute.IsNull()) return; + theValues.append ("Get"); theValues.append (DFBrowserPane_Tools::ToString (anAttribute->Get())); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx index 0ceaa4309d..958652d0dd 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.cxx @@ -16,7 +16,6 @@ #include #include -#include #include #include @@ -37,6 +36,8 @@ #include #include +#include +#include #include #include #include @@ -53,7 +54,8 @@ static const QString VALUES_REAL_ARRAY = "values_real_array"; // purpose : // ======================================================================= DFBrowserPane_TDataStdNamedData::DFBrowserPane_TDataStdNamedData() - : DFBrowserPane_AttributePane() + : DFBrowserPane_AttributePane(), myRealValues (0), myStringValues(0), myByteValues(0), myIntArrayValues(0), + myRealArrayValues(0) { myPaneModel = createPaneModel(); myRealValuesModel = createPaneModel(); @@ -70,14 +72,8 @@ DFBrowserPane_TDataStdNamedData::DFBrowserPane_TDataStdNamedData() DFBrowserPane_AttributePaneModel* DFBrowserPane_TDataStdNamedData::createPaneModel() { DFBrowserPane_AttributePaneModel* aTableModel = new DFBrowserPane_AttributePaneModel(); - - aTableModel->SetOrientation (Qt::Horizontal); - - QList aHeaderValues; - aHeaderValues << "Name" << "Value"; - aTableModel->SetHeaderValues (aHeaderValues, Qt::Vertical); - aTableModel->SetColumnCount (2); // indeed these are rows as table orientation is Horizontal - + aTableModel->SetColumnCount (2); + aTableModel->SetItalicColumns (QList()); return aTableModel; } @@ -87,40 +83,35 @@ DFBrowserPane_AttributePaneModel* DFBrowserPane_TDataStdNamedData::createPaneMod // ======================================================================= QWidget* DFBrowserPane_TDataStdNamedData::CreateWidget (QWidget* theParent) { - QWidget* aMainWidget = new QWidget (theParent); - QVBoxLayout* aLay = new QVBoxLayout (aMainWidget); + QTabWidget* aMainWidget = new QTabWidget (theParent); + // gray text is visualized by default, better the black one (Qt4) + QPalette aPalette = aMainWidget->palette(); + aPalette.setColor(QPalette::Foreground, Qt::black); + aMainWidget->setPalette (aPalette); myTableView = new DFBrowserPane_TableView (aMainWidget); myTableView->SetModel (getPaneModel()); - myIntValuesContent = new DFBrowserPane_HelperGroupContent ("Named integers", aMainWidget, myTableView); - aLay->addWidget (myIntValuesContent); + aMainWidget->addTab (myTableView, "Integers"); myRealValues = new DFBrowserPane_TableView (aMainWidget); myRealValues->SetModel (myRealValuesModel); - myRealValuesContent = new DFBrowserPane_HelperGroupContent ("Named reals", aMainWidget, myRealValues); - aLay->addWidget (myRealValuesContent); + aMainWidget->addTab (myRealValues, "Reals"); myStringValues = new DFBrowserPane_TableView (aMainWidget); myStringValues->SetModel (myStringValuesModel); - myStringValuesContent = new DFBrowserPane_HelperGroupContent ("Named strings", aMainWidget, myStringValues); - aLay->addWidget (myStringValuesContent); + aMainWidget->addTab (myStringValues, "Strings"); myByteValues = new DFBrowserPane_TableView (aMainWidget); myByteValues->SetModel (myByteValuesModel); - myByteValuesContent = new DFBrowserPane_HelperGroupContent ("Named bytes", aMainWidget, myByteValues); - aLay->addWidget (myByteValuesContent); + aMainWidget->addTab (myByteValues, "Bytes"); myIntArrayValues = new DFBrowserPane_TableView (aMainWidget); myIntArrayValues->SetModel (myIntArrayValuesModel); - myIntArrayValuesContent = new DFBrowserPane_HelperGroupContent ("Named integer arrays", aMainWidget, myIntArrayValues); - aLay->addWidget (myIntArrayValuesContent); + aMainWidget->addTab (myIntArrayValues, "ArraysOfIntegers"); myRealArrayValues = new DFBrowserPane_TableView (aMainWidget); myRealArrayValues->SetModel (myRealArrayModel); - myRealArrayValuesContent = new DFBrowserPane_HelperGroupContent ("Named real arrays", aMainWidget, myRealArrayValues); - aLay->addWidget (myRealArrayValuesContent); - - aLay->addStretch (1); + aMainWidget->addTab (myRealArrayValues, "ArraysOfReals"); return aMainWidget; } @@ -135,11 +126,23 @@ void DFBrowserPane_TDataStdNamedData::Init (const Handle(TDF_Attribute)& theAttr GetValues (theAttribute, aValues); getPaneModel()->Init (getPartOfValues (VALUES_INTEGER, VALUES_REAL, aValues)); + if (myTableView) + myTableView->GetTableView()->resizeColumnToContents (0); myRealValuesModel->Init (getPartOfValues (VALUES_REAL, VALUES_STRING, aValues)); + if (myRealValues) + myRealValues->GetTableView()->resizeColumnToContents (0); myStringValuesModel->Init (getPartOfValues (VALUES_STRING, VALUES_BYTE, aValues)); + if (myStringValues) + myStringValues->GetTableView()->resizeColumnToContents (0); myByteValuesModel->Init (getPartOfValues (VALUES_BYTE, VALUES_INT_ARRAY, aValues)); + if (myByteValues) + myByteValues->GetTableView()->resizeColumnToContents (0); myIntArrayValuesModel->Init (getPartOfValues (VALUES_INT_ARRAY, VALUES_REAL_ARRAY, aValues)); + if (myIntArrayValues) + myIntArrayValues->GetTableView()->resizeColumnToContents (0); myRealArrayModel->Init (getPartOfValues (VALUES_REAL_ARRAY, "", aValues)); + if (myRealArrayValues) + myRealArrayValues->GetTableView()->resizeColumnToContents (0); } // ======================================================================= diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx index e8bf511d44..1e8516abae 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdNamedData.hxx @@ -21,7 +21,6 @@ #include class DFBrowserPane_AttributePaneModel; -class DFBrowserPane_HelperGroupContent; class DFBrowserPane_TableView; //! \class DFBrowserPane_TDataStdNamedData @@ -68,29 +67,22 @@ private: DFBrowserPane_AttributePaneModel* createPaneModel(); private: - //! myPaneMode and myTableView are used for int values - DFBrowserPane_HelperGroupContent* myIntValuesContent; //!< check box of values using DFBrowserPane_AttributePaneModel* myRealValuesModel; //!< real values model DFBrowserPane_TableView* myRealValues; //!< values table view - DFBrowserPane_HelperGroupContent* myRealValuesContent; //!< check box of values using DFBrowserPane_AttributePaneModel* myStringValuesModel; //!< string values model DFBrowserPane_TableView* myStringValues; //!< values table view - DFBrowserPane_HelperGroupContent* myStringValuesContent; //!< check box of values using DFBrowserPane_AttributePaneModel* myByteValuesModel; //!< byte values model DFBrowserPane_TableView* myByteValues; //!< values table view - DFBrowserPane_HelperGroupContent* myByteValuesContent; //!< check box of values using DFBrowserPane_AttributePaneModel* myIntArrayValuesModel; //!< int array values model DFBrowserPane_TableView* myIntArrayValues; //!< values table view - DFBrowserPane_HelperGroupContent* myIntArrayValuesContent; //!< check box of values using DFBrowserPane_AttributePaneModel* myRealArrayModel; //!< real array values model DFBrowserPane_TableView* myRealArrayValues; //!< values table view - DFBrowserPane_HelperGroupContent* myRealArrayValuesContent; //!< check box of values using }; #endif diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx index a85e2e0f50..cfe8da69ac 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReal.cxx @@ -29,6 +29,7 @@ void DFBrowserPane_TDataStdReal::GetValues (const Handle(TDF_Attribute)& theAttr if (anAttribute.IsNull()) return; + theValues.append ("Get"); theValues.append (anAttribute->Get()); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx index debc605cfa..0fb9e84b4b 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdRealList.cxx @@ -32,5 +32,8 @@ void DFBrowserPane_TDataStdRealList::GetValues (const Handle(TDF_Attribute)& the return; for (TColStd_ListIteratorOfListOfReal aRealListIt(anAttribute->List()); aRealListIt.More(); aRealListIt.Next()) + { + theValues.append ("Value"); theValues.append (aRealListIt.Value()); + } } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx index efcbf82388..268e479802 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceArray.cxx @@ -94,7 +94,7 @@ void DFBrowserPane_TDataStdReferenceArray::GetReferences (const Handle(TDF_Attri { if (!getTableView()) return; - QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (getTableView()->GetTableView(), 0); + QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (getTableView()->GetTableView(), 1); Handle(TDataStd_ReferenceArray) anAttribute = Handle(TDataStd_ReferenceArray)::DownCast (theAttribute); if (anAttribute.IsNull()) diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx index 49ece11480..c3ed2af424 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdReferenceList.cxx @@ -35,7 +35,10 @@ void DFBrowserPane_TDataStdReferenceList::GetValues (const Handle(TDF_Attribute) return; for (TDF_ListIteratorOfLabelList aLabelIt(anAttribute->List()); aLabelIt.More(); aLabelIt.Next()) + { + theValues.append ("Value"); theValues.append (DFBrowserPane_Tools::GetEntry (aLabelIt.Value()).ToCString()); + } } // ======================================================================= @@ -46,7 +49,7 @@ void DFBrowserPane_TDataStdReferenceList::GetReferences (const Handle(TDF_Attrib NCollection_List& theRefLabels, Handle(Standard_Transient)& /*theRefPresentation*/) { - QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (getTableView()->GetTableView(), 0); + QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (getTableView()->GetTableView(), 1); Handle(TDataStd_ReferenceList) anAttribute = Handle(TDataStd_ReferenceList)::DownCast (theAttribute); if (anAttribute.IsNull()) return; diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx index b1cd494a89..ba31c011a3 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNode.cxx @@ -23,6 +23,7 @@ #include +#include #include #include #include @@ -35,7 +36,7 @@ // purpose : // ======================================================================= DFBrowserPane_TDataStdTreeNode::DFBrowserPane_TDataStdTreeNode() -: DFBrowserPane_AttributePane() +: DFBrowserPane_AttributePane(), myTreeNodeView (0) { myModel = new DFBrowserPane_TDataStdTreeNodeModel (0); mySelectionModels.clear(); // do not use selection model of parent pane @@ -52,6 +53,7 @@ QWidget* DFBrowserPane_TDataStdTreeNode::CreateWidget (QWidget* theParent) aMainWidget->setVisible (false); myTableView = new DFBrowserPane_TableView (aMainWidget, getTableColumnWidths()); + myTableView->SetVisibleHorizontalHeader (false); DFBrowserPane_TableView::SetFixedRowCount (1, myTableView->GetTableView()); myTableView->SetModel (myPaneModel); @@ -60,11 +62,13 @@ QWidget* DFBrowserPane_TDataStdTreeNode::CreateWidget (QWidget* theParent) aLay->addWidget (myTableView); myTreeNodeView = new QTreeView (theParent); + myTreeNodeView->header()->setVisible (false); myTreeNodeView->setModel (myModel); myTreeNodeView->setSelectionModel (mySelectionModels.front()); myTreeNodeView->setSelectionBehavior (QAbstractItemView::SelectRows); aLay->addWidget (myTreeNodeView); + aLay->setStretch (1, 1); return aMainWidget; } @@ -77,14 +81,19 @@ void DFBrowserPane_TDataStdTreeNode::Init (const Handle(TDF_Attribute)& theAttri Handle(TDataStd_TreeNode) aTreeNode = Handle(TDataStd_TreeNode)::DownCast (theAttribute); bool aDefaultGUID = aTreeNode->ID() != aTreeNode->GetDefaultTreeID(); - myTableView->setVisible (!aDefaultGUID); - if (!aDefaultGUID) { + if (myTableView) + myTableView->setVisible (!aDefaultGUID); + + if (!aDefaultGUID) + { QList aValues; char aStr[256]; aTreeNode->ID().ToCString (aStr); TCollection_AsciiString aString(aStr); - aValues.append (DFBrowserPane_Tools::ToString(aString)); + aValues << "GetDefaultTreeID" << DFBrowserPane_Tools::ToString (aString); getPaneModel()->Init (aValues); + if (myTableView) + myTableView->GetTableView()->resizeColumnToContents (0); } @@ -96,8 +105,8 @@ void DFBrowserPane_TDataStdTreeNode::Init (const Handle(TDF_Attribute)& theAttri Handle(TDataStd_TreeNode) aRootItem = aTreeNode->Root(); aModel->SetAttribute (aRootItem); - QModelIndex anIndex = aModel->FindIndex (theAttribute); - if (anIndex.isValid()) + QModelIndex anIndex = aModel->FindIndex (theAttribute, QModelIndex()); + if (myTreeNodeView && anIndex.isValid()) { myTreeNodeView->setExpanded (anIndex.parent(), true); myTreeNodeView->scrollTo (anIndex); @@ -160,5 +169,19 @@ void DFBrowserPane_TDataStdTreeNode::GetReferences (const Handle(TDF_Attribute)& if (anAttribute.IsNull()) return; - theRefLabels.Append (anAttribute->Label()); + QModelIndexList aSelectedIndices = myTreeNodeView->selectionModel()->selectedIndexes(); + for (int aSelectedId = 0, aSize = aSelectedIndices.size(); aSelectedId < aSize; aSelectedId++) + { + QModelIndex anIndex = aSelectedIndices[aSelectedId]; + + TreeModel_ItemBasePtr anAttributeItem = TreeModel_ModelBase::GetItemByIndex (anIndex); + DFBrowserPane_TDataStdTreeNodeItemPtr anAttributeNodeItem = + itemDynamicCast(anAttributeItem); + + Handle(TDF_Attribute) aNodeAttribute = anAttributeNodeItem->GetAttribute(); + if (aNodeAttribute.IsNull()) + continue; + + theRefLabels.Append (aNodeAttribute->Label()); + } } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx index 99f1ec9c7e..024386dac3 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.cxx @@ -14,6 +14,7 @@ // commercial license or contractual agreement. #include +#include #include #include @@ -82,6 +83,7 @@ QVariant DFBrowserPane_TDataStdTreeNodeItem::initValue (const int theRole) const case Qt::DisplayRole: case Qt::ToolTipRole: return getName(); case Qt::ForegroundRole: return myIsCurrentItem ? QColor (Qt::darkBlue) : QColor (Qt::black); + case Qt::BackgroundRole: return myIsCurrentItem ? DFBrowserPane_Tools::LightHighlightColor() : QVariant(); default: break; } return QVariant(); diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx index 43dea90478..29dcd9c200 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeItem.hxx @@ -51,9 +51,13 @@ public: //! \param theAttribute an attribute void SetAttribute (const Handle(TDF_Attribute)& theAttribute) { myAttribute = theAttribute; } + //! Returns the current attribute + //! \return an attribute + Handle(TDF_Attribute) GetAttribute () const { initItem(); return myAttribute; } + //! Set state if the attribute is current(corresponds to the selected attribute in tree) //! \param theCurrent boolean state - void setCurrentAttribute (const bool theCurrent) { myIsCurrentItem = theCurrent; } + void setCurrentAttribute (const bool theCurrent) { Reset(); myIsCurrentItem = theCurrent; } //! Returns child attribute of the current attribute //! \param theChildRow an index of a child attribute diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx index 78f1f9489c..8dba19d69f 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.cxx @@ -41,3 +41,37 @@ void DFBrowserPane_TDataStdTreeNodeModel::SetAttribute (const Handle(TDF_Attribu aRootItem->SetAttribute (theAttribute); EmitLayoutChanged(); } + +// ======================================================================= +// function : FindIndex +// purpose : +// ======================================================================= +QModelIndex DFBrowserPane_TDataStdTreeNodeModel::FindIndex (const Handle(TDF_Attribute)& theAttribute, + const QModelIndex theParentIndex) +{ + QModelIndex aParentIndex = theParentIndex; + + if (!aParentIndex.isValid()) + aParentIndex = index (0, 0); + + DFBrowserPane_TDataStdTreeNodeItemPtr aParentItem = itemDynamicCast + (TreeModel_ModelBase::GetItemByIndex (aParentIndex)); + + if (aParentItem->GetAttribute() == theAttribute) + return aParentIndex; + + for (int aChildId = 0, aCount = aParentItem->rowCount(); aChildId < aCount; aChildId++) + { + QModelIndex anIndex = index (aChildId, 0, aParentIndex); + TreeModel_ItemBasePtr anItemBase = TreeModel_ModelBase::GetItemByIndex (anIndex); + DFBrowserPane_TDataStdTreeNodeItemPtr anItem = itemDynamicCast(anItemBase); + + if (anItem->GetAttribute() == theAttribute) + return anIndex; + + QModelIndex aSubIndex = FindIndex (theAttribute, anIndex); + if (aSubIndex.isValid()) + return aSubIndex; + } + return QModelIndex(); +} diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx index 22bc9dad81..9f6fdc07b3 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdTreeNodeModel.hxx @@ -42,8 +42,11 @@ public: //! \param theAttribute a current attribute Standard_EXPORT void SetAttribute (const Handle(TDF_Attribute)& theAttribute); - //! Returns model index by the attribute. - QModelIndex FindIndex (const Handle(TDF_Attribute)& theAttribute) { (void)theAttribute; return QModelIndex(); } + //! Returns model index by the attribute. The method is recursive. + //! \param theAttribute an attribute that is searched + //! \param theParentIndex an index of the parent item + //! \return the model index + QModelIndex FindIndex (const Handle(TDF_Attribute)& theAttribute, const QModelIndex theParentIndex); //! Returns count of columns in the model. //! \param theParent an index of the parent item diff --git a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx index d8a152939d..6cd7819eba 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDataStdUAttribute.cxx @@ -33,6 +33,7 @@ void DFBrowserPane_TDataStdUAttribute::GetValues (const Handle(TDF_Attribute)& t theAttribute->ID().ToCString(aStr); TCollection_AsciiString aString(aStr); + theValues.append ("ID"); theValues.append (DFBrowserPane_Tools::ToString (aString)); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx index 7c1b217264..6c78343942 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdOwner.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -38,11 +39,6 @@ DFBrowserPane_TDocStdOwner::DFBrowserPane_TDocStdOwner() : DFBrowserPane_AttributePane() { - getPaneModel()->SetColumnCount (2); - - QList theValues; - theValues << "Method" << "Value"; - getPaneModel()->SetHeaderValues (theValues, Qt::Horizontal); } // ======================================================================= @@ -59,42 +55,29 @@ void DFBrowserPane_TDocStdOwner::GetValues (const Handle(TDF_Attribute)& theAttr if (aDocument.IsNull()) return; - theValues << STANDARD_TYPE (TDocStd_Document)->Name() << "" - << "IsSaved" << DFBrowserPane_Tools::BoolToStr (aDocument->IsSaved()) - << "IsChanged" << DFBrowserPane_Tools::BoolToStr (aDocument->IsChanged()) - << "GetSavedTime" << DFBrowserPane_Tools::BoolToStr (aDocument->GetSavedTime()) - << "GetName" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetName()) : "") - << "GetPath" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetPath()) : "") - << "Main" << DFBrowserPane_Tools::GetEntry (aDocument->Main()).ToCString() - << "IsEmpty" << DFBrowserPane_Tools::BoolToStr (aDocument->IsEmpty()) - << "IsValid" << DFBrowserPane_Tools::BoolToStr (aDocument->IsValid()) - << "HasOpenCommand" << DFBrowserPane_Tools::BoolToStr (aDocument->HasOpenCommand()) - << "GetUndoLimit" << QString::number (aDocument->GetUndoLimit()) - << "GetAvailableUndos" << QString::number (aDocument->GetAvailableUndos()) - << "GetUndos" << convertToString (aDocument->GetUndos()) - << "GetAvailableRedos" << QString::number (aDocument->GetAvailableRedos()) - << "GetRedos" << convertToString (aDocument->GetRedos()) - << "StorageFormat" << DFBrowserPane_Tools::ToString (aDocument->StorageFormat()) - << "IsNestedTransactionMode" << DFBrowserPane_Tools::BoolToStr (aDocument->IsNestedTransactionMode()) - << "ModificationMode" << DFBrowserPane_Tools::BoolToStr (aDocument->ModificationMode()) - << STANDARD_TYPE (CDM_Document)->Name() << ""; - + TCollection_AsciiString aDocumentInfo = DFBrowserPane_Tools::GetPointerInfo (aDocument).ToCString(); TColStd_SequenceOfExtendedString anExtensions; aDocument->Extensions(anExtensions); - theValues << "Extensions" << convertToString (anExtensions) + TCollection_AsciiString aSeparationStr = "---------------------------"; + theValues << aSeparationStr.ToCString() << aSeparationStr.ToCString() + << STANDARD_TYPE (CDM_Document)->Name() << aDocumentInfo.ToCString() + << aSeparationStr.ToCString() << aSeparationStr.ToCString() + << "StorageFormat" << DFBrowserPane_Tools::ToString (aDocument->StorageFormat()) + << "Extensions" << convertToString (anExtensions) << "FromReferencesNumber" << QString::number (aDocument->FromReferencesNumber()) << "ToReferencesNumber" << QString::number (aDocument->ToReferencesNumber()) << "IsReadOnly" << DFBrowserPane_Tools::BoolToStr (aDocument->IsReadOnly()) << "Modifications" << QString::number (aDocument->Modifications()); + TColStd_SequenceOfExtendedString aComments; aDocument->Extensions(aComments); + // if the document application is empty, Application() sents an exception, it is called in LoadResources() of: + // FindFileExtension, FindDescription and others, so we need the check for it + bool isDocumentOpened = aDocument->IsOpened(); - if (!aDocument->IsOpened()) - return; // application is empty, an exception is sent in Application(), - // an exception is sent in FindDescription if the application is not defined - + // CDM_Document methods theValues << "Comments" << convertToString (aComments) - << "Presentation" << "" + << "Presentation" << DFBrowserPane_Tools::ToString (aDocument->Presentation()) << "IsStored" << DFBrowserPane_Tools::BoolToStr (aDocument->IsStored()) << "StorageVersion" << QString::number (aDocument->StorageVersion()) << "Folder" << (aDocument->IsStored() ? DFBrowserPane_Tools::ToString (aDocument->Folder()) : "") @@ -105,25 +88,41 @@ void DFBrowserPane_TDocStdOwner::GetValues (const Handle(TDF_Attribute)& theAttr << "RequestedPreviousVersion" << (aDocument->HasRequestedPreviousVersion() ? DFBrowserPane_Tools::ToString (aDocument->RequestedPreviousVersion()) : "") << "RequestedComment" << DFBrowserPane_Tools::ToString (aDocument->RequestedComment()) - << "FindFileExtension" << DFBrowserPane_Tools::BoolToStr (aDocument->FindFileExtension()) - << "FileExtension" << DFBrowserPane_Tools::ToString (aDocument->FileExtension()) - << "FindDataType" << "" // DFBrowserPane_Tools::BoolToStr (aDocument->FindDataType()) - << "DataType" << ""// DFBrowserPane_Tools::ToString (aDocument->DataType()) - << "FindVersionDataType" << ""// DFBrowserPane_Tools::BoolToStr (aDocument->FindVersionDataType()) - - << "VersionDataType" << ""// DFBrowserPane_Tools::ToString (aDocument->VersionDataType()) - << "FindDescription" << DFBrowserPane_Tools::BoolToStr (aDocument->FindDescription()) - << "Description" << DFBrowserPane_Tools::ToString (aDocument->Description()) - << "FindDomain" << ""// DFBrowserPane_Tools::BoolToStr (aDocument->FindDomain()) - << "Domain" << ""// DFBrowserPane_Tools::ToString (aDocument->Domain()) - << "FindStoragePlugin" << ""// DFBrowserPane_Tools::BoolToStr (aDocument->FindStoragePlugin()) - << "StoragePlugin" << ""// DFBrowserPane_Tools::ToString (aDocument->StoragePlugin()) + << "FindFileExtension" << (isDocumentOpened ? DFBrowserPane_Tools::BoolToStr (aDocument->FindFileExtension()) : "") + << "FileExtension" << (isDocumentOpened ? DFBrowserPane_Tools::ToString (aDocument->FileExtension()) : "") + << "FindDescription" << (isDocumentOpened ? DFBrowserPane_Tools::BoolToStr (aDocument->FindDescription()) : "") + << "Description" << (isDocumentOpened ? DFBrowserPane_Tools::ToString (aDocument->Description()) : "") << "IsModified" << DFBrowserPane_Tools::BoolToStr (aDocument->IsModified()) << "IsOpened" << DFBrowserPane_Tools::BoolToStr (aDocument->IsOpened()) - << "CanClose" << DFBrowserPane_Tools::BoolToStr (aDocument->CanClose()) + << "CanClose" << DFBrowserPane_Tools::ToName(DB_CDM_CAN_CLOSE_STATUS, aDocument->CanClose()).ToCString() << "ReferenceCounter" << QString::number (aDocument->ReferenceCounter()); - // TODO IsInSession, IsStored, Name, IsReadOnly, IsUpToDate, CanCloseReference, IsOpened + // TDocStd_Document methods + TCollection_AsciiString aDocumentDataInfo = !aDocument->GetData().IsNull() + ? DFBrowserPane_Tools::GetPointerInfo (aDocument->GetData()).ToCString() : ""; + theValues << aSeparationStr.ToCString() << aSeparationStr.ToCString() + << STANDARD_TYPE (TDocStd_Document)->Name() << "" + << aSeparationStr.ToCString() << aSeparationStr.ToCString() + << "IsSaved" << DFBrowserPane_Tools::BoolToStr (aDocument->IsSaved()) + << "IsChanged" << DFBrowserPane_Tools::BoolToStr (aDocument->IsChanged()) + << "GetSavedTime" << DFBrowserPane_Tools::BoolToStr (aDocument->GetSavedTime()) + << "GetName" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetName()) : "") + << "GetPath" << (aDocument->IsSaved() ? DFBrowserPane_Tools::ToString (aDocument->GetPath()) : "") + << "GetData" << aDocumentDataInfo.ToCString() + << "Main" << DFBrowserPane_Tools::GetEntry (aDocument->Main()).ToCString() + << "IsEmpty" << DFBrowserPane_Tools::BoolToStr (aDocument->IsEmpty()) + << "IsValid" << DFBrowserPane_Tools::BoolToStr (aDocument->IsValid()) + << "HasOpenCommand" << DFBrowserPane_Tools::BoolToStr (aDocument->HasOpenCommand()) + << "GetUndoLimit" << QString::number (aDocument->GetUndoLimit()) + << "GetAvailableUndos" << QString::number (aDocument->GetAvailableUndos()) + << "GetUndos" << convertToString (aDocument->GetUndos()) + << "GetAvailableRedos" << QString::number (aDocument->GetAvailableRedos()) + << "GetRedos" << convertToString (aDocument->GetRedos()) +#if OCC_VERSION_HEX > 0x070100 + << "EmptyLabelsSavingMode" << DFBrowserPane_Tools::BoolToStr (aDocument->EmptyLabelsSavingMode()) +#endif + << "IsNestedTransactionMode" << DFBrowserPane_Tools::BoolToStr (aDocument->IsNestedTransactionMode()) + << "ModificationMode" << DFBrowserPane_Tools::BoolToStr (aDocument->ModificationMode()); } // ======================================================================= diff --git a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx index 13b802b877..c7fb4fd0cb 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TDocStdXLink.cxx @@ -27,7 +27,9 @@ void DFBrowserPane_TDocStdXLink::GetValues (const Handle(TDF_Attribute)& theAttr Handle(TDocStd_XLink) anAttribute = Handle(TDocStd_XLink)::DownCast (theAttribute); if (anAttribute.IsNull()) return; + theValues.append ("LabelEntry"); theValues.append (anAttribute->LabelEntry().ToCString()); + theValues.append ("DocumentEntry"); theValues.append (anAttribute->DocumentEntry().ToCString()); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx index 9622a86b48..4539e2a1ea 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TFunctionFunction.cxx @@ -32,6 +32,7 @@ void DFBrowserPane_TFunctionFunction::GetValues (const Handle(TDF_Attribute)& th anAttribute->GetDriverGUID().ToCString (aStr); TCollection_AsciiString aString(aStr); + theValues.append ("GetDriverGUID"); theValues.append (DFBrowserPane_Tools::ToString(aString)); } diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx index 8257fe8bca..31e46a222f 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNamedShape.cxx @@ -59,20 +59,13 @@ const int COLUMN_EVOLUTION_WIDTH = 90; DFBrowserPane_TNamingNamedShape::DFBrowserPane_TNamingNamedShape() : DFBrowserPane_AttributePane(), myEvolutionTableView (0), myHelperExport (0) { - QList aHeaderValues; - aHeaderValues << "Value" << "Type" << "BREP" << "SV"; - getPaneModel()->SetHeaderValues (aHeaderValues, Qt::Horizontal); - getPaneModel()->SetColumnCount (aHeaderValues.count()); + getPaneModel()->SetColumnCount (5); - aHeaderValues.clear(); - aHeaderValues << "Version" << "Evolution" << "Shape" << "Current Shape" << "Original Shape"; - getPaneModel()->SetHeaderValues (aHeaderValues, Qt::Vertical); - - aHeaderValues.clear(); - aHeaderValues << "New Shape" << "Type" << "" << "Old Shape" << "Type" << "Label" << "" << "Evolution" << "isModified"; myEvolutionPaneModel = new DFBrowserPane_AttributePaneModel(); - myEvolutionPaneModel->SetHeaderValues (aHeaderValues, Qt::Horizontal); - myEvolutionPaneModel->SetColumnCount (aHeaderValues.count()); + myEvolutionPaneModel->SetColumnCount (11); + QList anItalicColumns; + anItalicColumns << 2 << 6; + myEvolutionPaneModel->SetItalicColumns (anItalicColumns); QItemSelectionModel* aSelectionModel = new QItemSelectionModel (myEvolutionPaneModel); mySelectionModels.push_back (aSelectionModel); } @@ -87,6 +80,7 @@ QWidget* DFBrowserPane_TNamingNamedShape::CreateWidget (QWidget* theParent) aMainWidget->setVisible (false); myTableView = new DFBrowserPane_TableView (aMainWidget); + myTableView->GetTableView()->verticalHeader()->setVisible (false); myTableView->SetModel (myPaneModel); QTableView* aTableView = myTableView->GetTableView(); aTableView->setSelectionBehavior (QAbstractItemView::SelectItems); @@ -95,11 +89,8 @@ QWidget* DFBrowserPane_TNamingNamedShape::CreateWidget (QWidget* theParent) aSelectionModelsIt++; aTableView->horizontalHeader()->setStretchLastSection (false); - aTableView->setColumnWidth (0, COLUMN_POINTER_WIDTH); - aTableView->setColumnWidth (1, COLUMN_TYPE_WIDTH); - aTableView->setColumnWidth (2, COLUMN_EXPORT_WIDTH); aTableView->setColumnWidth (3, COLUMN_EXPORT_WIDTH); - aTableView->verticalHeader()->setVisible (true); + aTableView->setColumnWidth (4, COLUMN_EXPORT_WIDTH); DFBrowserPane_ItemDelegateButton* anItemDelegate = new DFBrowserPane_ItemDelegateButton (aTableView, ":/icons/export_shape.png"); QList aRows; @@ -107,12 +98,12 @@ QWidget* DFBrowserPane_TNamingNamedShape::CreateWidget (QWidget* theParent) anItemDelegate->SetFreeRows (aRows); QObject::connect (anItemDelegate, SIGNAL (buttonPressed (const QModelIndex&)), &myHelperExport, SLOT (OnButtonPressed (const QModelIndex&))); - aTableView->setItemDelegateForColumn (2, anItemDelegate); + aTableView->setItemDelegateForColumn (3, anItemDelegate); DFBrowserPane_ItemDelegateButton* anItemDelegate2 = new DFBrowserPane_ItemDelegateButton (aTableView, ":/icons/folder_export.png"); anItemDelegate2->SetFreeRows (aRows); - aTableView->setItemDelegateForColumn (3, anItemDelegate2); + aTableView->setItemDelegateForColumn (4, anItemDelegate2); myEvolutionTableView = new DFBrowserPane_TableView (aMainWidget); myEvolutionTableView->SetModel (myEvolutionPaneModel); @@ -120,21 +111,19 @@ QWidget* DFBrowserPane_TNamingNamedShape::CreateWidget (QWidget* theParent) aTableView->setSelectionModel (*aSelectionModelsIt); - QList aColumnWidths; - aColumnWidths << COLUMN_POINTER_WIDTH << COLUMN_TYPE_WIDTH << COLUMN_EXPORT_WIDTH << COLUMN_POINTER_WIDTH - << COLUMN_TYPE_WIDTH << COLUMN_REFERENCE_WIDTH << COLUMN_EXPORT_WIDTH << COLUMN_EVOLUTION_WIDTH; - for (int aColumnId = 0, aCount = aColumnWidths.size(); aColumnId < aCount; aColumnId++) - aTableView->setColumnWidth (aColumnId, aColumnWidths[aColumnId]); + aTableView->horizontalHeader()->setStretchLastSection (false); + aTableView->setColumnWidth (5, COLUMN_EXPORT_WIDTH); + aTableView->setColumnWidth (10, COLUMN_EXPORT_WIDTH); anItemDelegate = new DFBrowserPane_ItemDelegateButton (myEvolutionTableView->GetTableView(), ":/icons/export_shape.png"); QObject::connect (anItemDelegate, SIGNAL (buttonPressed (const QModelIndex&)), &myHelperExport, SLOT (OnButtonPressed (const QModelIndex&))); - myEvolutionTableView->GetTableView()->setItemDelegateForColumn (2, anItemDelegate); + myEvolutionTableView->GetTableView()->setItemDelegateForColumn (5, anItemDelegate); anItemDelegate = new DFBrowserPane_ItemDelegateButton (myEvolutionTableView->GetTableView(), ":/icons/export_shape.png"); QObject::connect (anItemDelegate, SIGNAL (buttonPressed (const QModelIndex&)), &myHelperExport, SLOT (OnButtonPressed (const QModelIndex&))); - myEvolutionTableView->GetTableView()->setItemDelegateForColumn (6, anItemDelegate); + myEvolutionTableView->GetTableView()->setItemDelegateForColumn (10, anItemDelegate); QGridLayout* aLay = new QGridLayout (aMainWidget); aLay->setContentsMargins (0, 0, 0, 0); @@ -153,56 +142,81 @@ void DFBrowserPane_TNamingNamedShape::Init (const Handle(TDF_Attribute)& theAttr Handle(TNaming_NamedShape) aShapeAttr = Handle(TNaming_NamedShape)::DownCast (theAttribute); myHelperExport.Clear(); - // table view filling QList aValues; - aValues << QString::number (aShapeAttr->Version()) << "" << "" << ""; - aValues << DFBrowserPane_Tools::ToName (DB_NS_TYPE, aShapeAttr->Evolution()).ToCString() << "" << "" << ""; + aValues << "Version" << QString::number (aShapeAttr->Version()) << "" << "" << ""; + aValues << "Evolution" << DFBrowserPane_Tools::ToName (DB_NS_TYPE, aShapeAttr->Evolution()).ToCString() << "" << "" << ""; NCollection_List aShapes; - { - TopoDS_Shape aShape = aShapeAttr->Get(); - TCollection_AsciiString aShapeInfo = !aShape.IsNull() ? DFBrowserPane_Tools::GetPointerInfo (aShape.TShape()) : ""; - aValues << aShapeInfo.ToCString() << DFBrowserPane_Tools::ShapeTypeInfo (aShape) << "" << ""; - aShapes.Append (aShape); + QList aFreeRows; + aFreeRows << 0 << 1; - TopoDS_Shape aCurrentShape = TNaming_Tool::CurrentShape (aShapeAttr); - TCollection_AsciiString aCurrentShapeInfo = !aCurrentShape.IsNull() ? - DFBrowserPane_Tools::GetPointerInfo (aCurrentShape.TShape()) : ""; - aValues << aCurrentShapeInfo.ToCString() << DFBrowserPane_Tools::ShapeTypeInfo (aCurrentShape) << "" << ""; - aShapes.Append (aCurrentShape); + TopoDS_Shape aShape = aShapeAttr->Get(); + TCollection_AsciiString aShapeInfo = !aShape.IsNull() ? DFBrowserPane_Tools::GetPointerInfo (aShape.TShape()) : ""; + aValues << "Shape" << aShapeInfo.ToCString() << DFBrowserPane_Tools::ShapeTypeInfo (aShape) << "" << ""; + aShapes.Append (aShape); + if (aShape.IsNull()) + aFreeRows << 2; + + TopoDS_Shape aCurrentShape = TNaming_Tool::CurrentShape (aShapeAttr); + TCollection_AsciiString aCurrentShapeInfo = !aCurrentShape.IsNull() ? + DFBrowserPane_Tools::GetPointerInfo (aCurrentShape.TShape()) : ""; + aValues << "CurrentShape" << aCurrentShapeInfo.ToCString() + << DFBrowserPane_Tools::ShapeTypeInfo (aCurrentShape) << "" << ""; + aShapes.Append (aCurrentShape); + if (aCurrentShape.IsNull()) + aFreeRows << 3; + + TopoDS_Shape anOriginalShape = TNaming_Tool::OriginalShape (aShapeAttr); + TCollection_AsciiString anOriginalShapeInfo = !anOriginalShape.IsNull() ? + DFBrowserPane_Tools::GetPointerInfo (anOriginalShape.TShape()) : ""; + aValues << "OriginalShape" << anOriginalShapeInfo.ToCString() + << DFBrowserPane_Tools::ShapeTypeInfo (anOriginalShape) << "" << ""; + aShapes.Append (anOriginalShape); + if (anOriginalShape.IsNull()) + aFreeRows << 4; - TopoDS_Shape anOriginalShape = TNaming_Tool::OriginalShape (aShapeAttr); - TCollection_AsciiString anOriginalShapeInfo = !anOriginalShape.IsNull() ? - DFBrowserPane_Tools::GetPointerInfo (aShape.TShape()) : ""; - aValues << anOriginalShapeInfo.ToCString() << DFBrowserPane_Tools::ShapeTypeInfo (anOriginalShape) << "" << ""; - aShapes.Append (anOriginalShape); - } DFBrowserPane_AttributePaneModel* aModel = getPaneModel(); aModel->Init (aValues); - + if (myTableView) + { + QTableView* aTableView = myTableView->GetTableView(); + for (int i = 0; i < aModel->columnCount(); i++) + { + if (i == 3 || i == 4) + dynamic_cast(aTableView->itemDelegateForColumn(3))->SetFreeRows (aFreeRows); + else + aTableView->resizeColumnToContents (i); + } + } QModelIndexList anIndices; int aRowId = 2; for (NCollection_List::Iterator aShapeIt (aShapes); aShapeIt.More(); aShapeIt.Next(), aRowId++) { - const TopoDS_Shape& aShape = aShapeIt.Value(); - if (aShape.IsNull()) + if (aShapeIt.Value().IsNull()) continue; - anIndices.clear(); - anIndices << aModel->index (aRowId, 2) << aModel->index (aRowId, 3); - myHelperExport.AddShape (aShape, anIndices); + anIndices << aModel->index (aRowId, 1) << aModel->index (aRowId, 2) << + aModel->index (aRowId, 3) << aModel->index (aRowId, 4); + myHelperExport.AddShape (aShapeIt.Value(), anIndices); } // evolution table view filling aValues.clear(); aRowId = 0; + bool aHasModified = false; for (TNaming_Iterator aShapeAttrIt (aShapeAttr); aShapeAttrIt.More(); aShapeAttrIt.Next(), aRowId++) { const TopoDS_Shape& anOldShape = aShapeAttrIt.OldShape(); const TopoDS_Shape& aNewShape = aShapeAttrIt.NewShape(); Handle(TNaming_NamedShape) anOldAttr = TNaming_Tool::NamedShape (anOldShape, aShapeAttr->Label()); + aValues << DFBrowserPane_Tools::ToName (DB_NS_TYPE, aShapeAttrIt.Evolution()).ToCString() + << (aShapeAttrIt.IsModification() ? "modified" : "-"); + aHasModified = aHasModified | aShapeAttrIt.IsModification(); + + aValues << "New:"; + QString aLabelInfo; if (!anOldAttr.IsNull()) { @@ -215,21 +229,21 @@ void DFBrowserPane_TNamingNamedShape::Init (const Handle(TDF_Attribute)& theAttr << DFBrowserPane_Tools::ShapeTypeInfo (aNewShape) << ""; else - aValues << "" << "" << ""; + aValues << "-" << "-" << ""; + aValues << "Old:"; if (!anOldShape.IsNull()) aValues << DFBrowserPane_Tools::GetPointerInfo (anOldShape.TShape()->This()).ToCString() << DFBrowserPane_Tools::ShapeTypeInfo (anOldShape) << aLabelInfo << ""; else - aValues << "" << "" << "" << ""; - aValues << DFBrowserPane_Tools::ToName (DB_NS_TYPE, aShapeAttrIt.Evolution()).ToCString() - << (aShapeAttrIt.IsModification() ? "true" : "false"); + aValues << "-" << "-" << "-" << ""; } if (myEvolutionTableView) { myEvolutionTableView->setVisible (aValues.size() > 0); + myEvolutionTableView->GetTableView()->setColumnHidden (1, !aHasModified); myEvolutionPaneModel->Init (aValues); aRowId = 0; @@ -241,18 +255,23 @@ void DFBrowserPane_TNamingNamedShape::Init (const Handle(TDF_Attribute)& theAttr if (!aNewShape.IsNull()) { anIndices.clear(); - anIndices << myEvolutionPaneModel->index (aRowId, 0) << myEvolutionPaneModel->index (aRowId, 1) - << myEvolutionPaneModel->index (aRowId, 2); + anIndices << myEvolutionPaneModel->index (aRowId, 3) << myEvolutionPaneModel->index (aRowId, 4) + << myEvolutionPaneModel->index (aRowId, 5); myHelperExport.AddShape (aNewShape, anIndices); } if (!anOldShape.IsNull()) { anIndices.clear(); - anIndices << myEvolutionPaneModel->index (aRowId, 3) << myEvolutionPaneModel->index (aRowId, 4) - << myEvolutionPaneModel->index (aRowId, 5) << myEvolutionPaneModel->index (aRowId, 6); + anIndices << myEvolutionPaneModel->index (aRowId, 7) << myEvolutionPaneModel->index (aRowId, 8) + << myEvolutionPaneModel->index (aRowId, 10); myHelperExport.AddShape (anOldShape, anIndices); } } + for (int i = 0; i < myEvolutionPaneModel->columnCount(); i++) + { + if (i == 5 || i == 10) continue; + myEvolutionTableView->GetTableView()->resizeColumnToContents (i); + } } } @@ -335,7 +354,7 @@ int DFBrowserPane_TNamingNamedShape::GetSelectionKind (QItemSelectionModel* theM if (aRow == 0 || aRow == 1) return aKind; - if (aSelectedIndex.column() == 3) + if (aSelectedIndex.column() == 4) aKind = DFBrowserPane_SelectionKind_ExportToShapeViewer; return aKind; @@ -357,7 +376,7 @@ void DFBrowserPane_TNamingNamedShape::GetSelectionParameters (QItemSelectionMode return; QModelIndex aSelectedIndex = aSelectedIndices.first(); - if (aSelectedIndex.column() != 3) + if (aSelectedIndex.column() != 4) return; const TopoDS_Shape& aShape = myHelperExport.GetShape (aSelectedIndex); @@ -377,7 +396,7 @@ void DFBrowserPane_TNamingNamedShape::GetReferences (const Handle(TDF_Attribute) if (!myEvolutionTableView) return; QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues ( - myEvolutionTableView->GetTableView(), 5); + myEvolutionTableView->GetTableView(), 9); Handle(TNaming_NamedShape) aShapeAttr = Handle(TNaming_NamedShape)::DownCast (theAttribute); for (TNaming_Iterator aShapeAttrIt (aShapeAttr); aShapeAttrIt.More(); aShapeAttrIt.Next()) diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx index a4d52e86b1..2a8e64b29a 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingNaming.cxx @@ -44,15 +44,7 @@ DFBrowserPane_TNamingNaming::DFBrowserPane_TNamingNaming() : DFBrowserPane_AttributePane(), myNamingView (0) { myNamingModel = new DFBrowserPane_AttributePaneModel(); - - QList aHeaderValues; - aHeaderValues << "Type" << "Shape Type" << "Stop Named Shape" << "Index"; - aHeaderValues << "Key_TShape" << "Context Label" << "Orientation"; - myNamingModel->SetHeaderValues (aHeaderValues, Qt::Vertical); - - aHeaderValues.clear(); - aHeaderValues << "Arguments"; - getPaneModel()->SetHeaderValues (aHeaderValues, Qt::Horizontal); + myNamingModel->SetColumnCount (2); } // ======================================================================= @@ -64,7 +56,7 @@ QWidget* DFBrowserPane_TNamingNaming::CreateWidget (QWidget* theParent) QWidget* aMainWidget = new QWidget (theParent); myNamingView = new DFBrowserPane_TableView (aMainWidget); - myNamingView->GetTableView()->verticalHeader()->setVisible (true); + myNamingView->GetTableView()->verticalHeader()->setVisible (false); myNamingView->GetTableView()->horizontalHeader()->setVisible (false); myNamingView->SetModel (myNamingModel); @@ -73,6 +65,7 @@ QWidget* DFBrowserPane_TNamingNaming::CreateWidget (QWidget* theParent) myTableView->GetTableView()->setSelectionModel (mySelectionModels.front()); QGridLayout* aLay = new QGridLayout (aMainWidget); + aLay->setContentsMargins (0, 0, 0, 0); aLay->addWidget (myNamingView); aLay->addWidget (myTableView); aLay->setRowStretch (1, 1); @@ -90,15 +83,19 @@ void DFBrowserPane_TNamingNaming::Init (const Handle(TDF_Attribute)& theAttribut GetValues (theAttribute, aValues); QList aNamingValues; - for (int anValueId = 0; anValueId < 7; anValueId++) + for (int anValueId = 0; anValueId < 14; anValueId++) aNamingValues.append (aValues[anValueId]); myNamingModel->Init (aNamingValues); + if (myNamingView) + myNamingView->GetTableView()->resizeColumnToContents (0); QList aNamedShapesValues; - for (int anValueId = 7, aCount = aValues.size(); anValueId < aCount; anValueId++) + for (int anValueId = 14, aCount = aValues.size(); anValueId < aCount; anValueId++) aNamedShapesValues.append (aValues[anValueId]); getPaneModel()->Init (aNamedShapesValues); + if (myTableView) + myTableView->GetTableView()->resizeColumnToContents (0); } // ======================================================================= @@ -113,21 +110,32 @@ void DFBrowserPane_TNamingNaming::GetValues (const Handle(TDF_Attribute)& theAtt TNaming_Name aNamingName = anAttribute->GetName(); - // values from 0-6 + // values from 0-13 + theValues.append ("Type"); theValues.append (DFBrowserPane_Tools::ToName (DB_NAMING_TYPE, aNamingName.Type()).ToCString()); + theValues.append ("ShapeType"); theValues.append (DFBrowserPane_Tools::ToName (DB_SHAPE_TYPE, aNamingName.ShapeType()).ToCString()); Handle(TNaming_NamedShape) aStopShape = aNamingName.StopNamedShape(); + theValues.append ("StopNamedShape"); theValues.append (!aStopShape.IsNull() ? DFBrowserPane_Tools::GetEntry (aStopShape->Label()).ToCString() : ""); + theValues.append ("Index"); theValues.append (QString::number (aNamingName.Index())); TopoDS_Shape aShape = aNamingName.Shape(); + theValues.append ("Shape(TShape)"); theValues.append (!aShape.IsNull() ? DFBrowserPane_Tools::GetPointerInfo (aShape.TShape()->This()).ToCString() : ""); TDF_Label aContextLabel = aNamingName.ContextLabel(); + theValues.append ("ContextLabel"); theValues.append (!aContextLabel.IsNull() ? DFBrowserPane_Tools::GetEntry (aContextLabel).ToCString() : ""); + theValues.append ("Orientation"); theValues.append (DFBrowserPane_Tools::ToName (DB_ORIENTATION_TYPE, aNamingName.Orientation()).ToCString()); - // values from 7 till count of arguments - for (TNaming_ListIteratorOfListOfNamedShape anArgIt(aNamingName.Arguments()); anArgIt.More(); anArgIt.Next()) + // values from 14 till count of arguments + int anArgIndex = 1; + for (TNaming_ListIteratorOfListOfNamedShape anArgIt(aNamingName.Arguments()); anArgIt.More(); anArgIt.Next(), anArgIndex++) + { + theValues << "Argument"; theValues.append (DFBrowserPane_Tools::GetEntry (anArgIt.Value()->Label()).ToCString()); + } } // ======================================================================= @@ -145,7 +153,7 @@ Handle(Standard_Transient) DFBrowserPane_TNamingNaming::GetPresentation (const H if (!aTableView) // the pane is not visualized yet return aPresentation; - QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (aTableView->GetTableView(), 0); + QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (aTableView->GetTableView(), 1); TNaming_Name aNamingName = anAttribute->GetName(); BRep_Builder aBuilder; @@ -182,7 +190,7 @@ void DFBrowserPane_TNamingNaming::GetReferences (const Handle(TDF_Attribute)& th if (anAttribute.IsNull()) return; - QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (getTableView()->GetTableView(), 0); + QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (getTableView()->GetTableView(), 1); for (TNaming_ListIteratorOfListOfNamedShape aNamingIt(anAttribute->GetName().Arguments()); aNamingIt.More(); aNamingIt.Next()) { Handle(TNaming_NamedShape) aShapeAttr = aNamingIt.Value(); diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx index 9f4d68dce2..2cf6d60bb8 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.cxx @@ -39,6 +39,10 @@ #include #include +const int COLUMN_TYPE_WIDTH = 70; +const int COLUMN_POINTER_WIDTH = 90; +const int COLUMN_REFERENCE_WIDTH = 90; + // ======================================================================= // function : Constructor // purpose : @@ -47,10 +51,11 @@ DFBrowserPane_TNamingUsedShapes::DFBrowserPane_TNamingUsedShapes() : DFBrowserPane_AttributePane() { getPaneModel()->SetColumnCount (4); + getPaneModel()->SetItalicColumns (QList()); - QList theValues; - theValues << "ShapeType" << "Label Entry" << "Key_TShape" << "Value_TShape"; - getPaneModel()->SetHeaderValues (theValues, Qt::Horizontal); + QList aValues; + aValues << "ShapeType" << "TShape" << "Label" << "RefShape"; + getPaneModel()->SetHeaderValues (aValues, Qt::Horizontal); } // ======================================================================= @@ -86,7 +91,7 @@ void DFBrowserPane_TNamingUsedShapes::GetValues (const Handle(TDF_Attribute)& th for (std::list::const_iterator aRefIt = aReferences.begin(); aRefIt != aReferences.end(); aRefIt++) { aValues = anEntryValues[*aRefIt]; - theValues << aValues[0] << QString ((*aRefIt).ToCString()) << aValues[1] << aValues[2]; + theValues << aValues[0] << aValues[1] << QString ((*aRefIt).ToCString()) << aValues[2]; } } else @@ -97,8 +102,8 @@ void DFBrowserPane_TNamingUsedShapes::GetValues (const Handle(TDF_Attribute)& th TopoDS_Shape aShape = aRefIt.Key(); theValues.append (!aShape.IsNull() ? DFBrowserPane_Tools::ToName (DB_SHAPE_TYPE, aShape.ShapeType()).ToCString() : "EMPTY SHAPE"); - theValues.append (DFBrowserPane_Tools::GetEntry (aRefIt.Value()->Label()).ToCString()); theValues.append (!aShape.IsNull() ? DFBrowserPane_Tools::GetPointerInfo (aShape.TShape()->This()).ToCString() : ""); + theValues.append (DFBrowserPane_Tools::GetEntry (aRefIt.Value()->Label()).ToCString()); const TopoDS_Shape aValueShape = aRefIt.Value()->Shape(); theValues.append (!aValueShape.IsNull() ? DFBrowserPane_Tools::GetPointerInfo (aValueShape.TShape()->This()).ToCString() : ""); } @@ -152,10 +157,26 @@ void DFBrowserPane_TNamingUsedShapes::GetAttributeReferences (const Handle(TDF_A if (anAttribute.IsNull()) return; - QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (getTableView()->GetTableView(), 1); + QStringList aSelectedEntries = DFBrowserPane_TableView::GetSelectedColumnValues (getTableView()->GetTableView(), 2); + if (aSelectedEntries.isEmpty()) + return; + for (TNaming_DataMapIteratorOfDataMapOfShapePtrRefShape aRefIt (anAttribute->Map()); aRefIt.More(); aRefIt.Next()) { if (aSelectedEntries.contains (DFBrowserPane_Tools::GetEntry (aRefIt.Value()->Label()).ToCString())) theRefAttributes.Append (aRefIt.Value()->NamedShape()); } } + +// ======================================================================= +// function : getTableColumnWidths +// purpose : +// ======================================================================= +QMap DFBrowserPane_TNamingUsedShapes::getTableColumnWidths() const +{ + QMap aValues; + aValues[0] = COLUMN_TYPE_WIDTH; // "ShapeType" + aValues[1] = COLUMN_POINTER_WIDTH; // "Key_TShape" + aValues[2] = COLUMN_REFERENCE_WIDTH; // "Label Entry" + return aValues; +} diff --git a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx index 9ed95c950c..48b0deba68 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TNamingUsedShapes.hxx @@ -72,6 +72,11 @@ public: NCollection_List& theRefAttributes, Handle(Standard_Transient)& theRefPresentation) Standard_OVERRIDE; +protected: + //! Defines widths of table columns + //! \return container of widths + Standard_EXPORT virtual QMap getTableColumnWidths() const; + private: NCollection_DataMap > myAttributeRefs; diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx index 42b1e0a356..abe0b3dbcc 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISPresentation.cxx @@ -30,11 +30,6 @@ DFBrowserPane_TPrsStdAISPresentation::DFBrowserPane_TPrsStdAISPresentation() : DFBrowserPane_AttributePane() { - getPaneModel()->SetColumnCount (2); - - QList theValues; - theValues << "Method" << "Value"; - getPaneModel()->SetHeaderValues (theValues, Qt::Horizontal); } // ======================================================================= @@ -57,10 +52,15 @@ void DFBrowserPane_TPrsStdAISPresentation::GetValues (const Handle(TDF_Attribute if (anAttribute.IsNull()) return; Handle(AIS_InteractiveObject) anIO = anAttribute->GetAIS(); - theValues << "GetDriverGUID" << ""//DFBrowserPane_Tools::ToString (anAttribute->GetDriverGUID()) + + char aStr[256]; + anAttribute->GetDriverGUID().ToCString(aStr); + TCollection_AsciiString aString(aStr); + + theValues << "GetDriverGUID" << DFBrowserPane_Tools::ToString (aString) << "GetAIS" << (anIO.IsNull() ? "Null" : anAttribute->DynamicType()->Name()) << "IsDisplayed" << DFBrowserPane_Tools::BoolToStr (anAttribute->IsDisplayed()) - << "GetContext()" << (!anIO->GetContext().IsNull() ? + << "GetContext()" << ((!anIO.IsNull() && !anIO->GetContext().IsNull()) ? DFBrowserPane_Tools::GetPointerInfo (anIO->GetContext()).ToCString() : "") << "HasOwnMaterial" << DFBrowserPane_Tools::BoolToStr (anAttribute->HasOwnMaterial()) << "Material" << (anAttribute->HasOwnMaterial() ? diff --git a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx index c00555029f..7ebbc7c826 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TPrsStdAISViewer.cxx @@ -14,7 +14,9 @@ // commercial license or contractual agreement. #include +#include +#include #include #include @@ -23,6 +25,16 @@ // function : // purpose : // ======================================================================= -void DFBrowserPane_TPrsStdAISViewer::GetValues (const Handle(TDF_Attribute)&, QList&) +void DFBrowserPane_TPrsStdAISViewer::GetValues (const Handle(TDF_Attribute)& theAttribute, QList& theValues) { + Handle(TPrsStd_AISViewer) aViewerAttribute = Handle(TPrsStd_AISViewer)::DownCast (theAttribute); + if (!aViewerAttribute) + return; + + Handle(AIS_InteractiveContext) aContext = aViewerAttribute->GetInteractiveContext(); + TCollection_AsciiString aPointerInfo = !aContext.IsNull() + ? DFBrowserPane_Tools::GetPointerInfo (aContext).ToCString() : ""; + + theValues << "GetInteractiveContext" << aPointerInfo.ToCString(); + } diff --git a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx index 97706d1b63..346d54648d 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TableView.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_TableView.cxx @@ -16,11 +16,12 @@ #include #include -#include -#include #include #include #include +#include +#include +#include static const int DEFAULT_ROW_HEIGHT = 30; @@ -40,9 +41,10 @@ DFBrowserPane_TableView::DFBrowserPane_TableView (QWidget* theParent, QHeaderView* aVHeader = myTableView->verticalHeader(); aVHeader->setVisible (false); - aVHeader->setDefaultSectionSize (aVHeader->minimumSectionSize() + DFBrowserPane_Tools::HeaderSectionMargin()); + aVHeader->setDefaultSectionSize (aVHeader->minimumSectionSize()); myTableView->horizontalHeader()->setStretchLastSection (true); + myTableView->horizontalHeader()->setVisible (false); aLay->addWidget (myTableView); myDefaultColumnWidths = theDefaultColumnWidths; } @@ -64,9 +66,22 @@ void DFBrowserPane_TableView::SetModel (QAbstractTableModel* theModel) // function : SetFixedRowCount // purpose : // ======================================================================= -void DFBrowserPane_TableView::SetFixedRowCount (const int theCount, QTableView* theView) +void DFBrowserPane_TableView::SetFixedRowCount (const int theCount, QTableView* theView, const bool theScroll) { - theView->setMaximumHeight (DEFAULT_ROW_HEIGHT*(theCount + 1/*header row*/)); + double aHeight = theView->verticalHeader()->defaultSectionSize()*theCount + DFBrowserPane_Tools::HeaderSectionMargin(); + if (theScroll) + aHeight += theView->horizontalScrollBar()->sizeHint().height(); + + theView->setMaximumHeight (aHeight); +} + +// ======================================================================= +// function : SetVisibleHorizontalHeader +// purpose : +// ======================================================================= +void DFBrowserPane_TableView::SetVisibleHorizontalHeader (const bool& theVisible) +{ + myTableView->horizontalHeader()->setVisible (theVisible); } // ======================================================================= @@ -83,7 +98,9 @@ QStringList DFBrowserPane_TableView::GetSelectedColumnValues (QTableView* theTab aSelectedIt != aSelectedIndices.end(); aSelectedIt++) { QModelIndex anIndex = *aSelectedIt; - aSelectedEntries.append (aModel->data (aModel->index (anIndex.row(), theColumnId, anIndex.parent()), Qt::DisplayRole).toString()); + if (theColumnId == anIndex.column()) + aSelectedEntries.append (aModel->data (aModel->index (anIndex.row(), theColumnId, anIndex.parent()), + Qt::DisplayRole).toString()); } return aSelectedEntries; } diff --git a/tools/DFBrowserPane/DFBrowserPane_TableView.hxx b/tools/DFBrowserPane/DFBrowserPane_TableView.hxx index 5d478f44ed..edcd673578 100644 --- a/tools/DFBrowserPane/DFBrowserPane_TableView.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_TableView.hxx @@ -49,10 +49,15 @@ public: //! Returns the current table view QTableView* GetTableView() const { return myTableView; } + //! Set horizontal header shown or hidden + //! \param theVisible visibility flag + Standard_EXPORT void SetVisibleHorizontalHeader (const bool& theVisible); + //! Updates table view height to contain the given number of rows only //! \param theCount a row count //! \param theView a table view, which size will be changed - Standard_EXPORT static void SetFixedRowCount (const int theCount, QTableView* theView); + //! \param theScroll flag whether add scroll height to size + Standard_EXPORT static void SetFixedRowCount (const int theCount, QTableView* theView, const bool theScroll = false); //! Returns names of selected items in the view //! \param theView a table view diff --git a/tools/DFBrowserPane/DFBrowserPane_Tools.cxx b/tools/DFBrowserPane/DFBrowserPane_Tools.cxx index b95d968e0b..4568b46e1c 100644 --- a/tools/DFBrowserPane/DFBrowserPane_Tools.cxx +++ b/tools/DFBrowserPane/DFBrowserPane_Tools.cxx @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -34,8 +35,10 @@ #include #include +#include #include #include +#include #include @@ -99,6 +102,17 @@ QVariant DFBrowserPane_Tools::ShapeTypeInfo (const TopoDS_Shape& theShape) : QString (DFBrowserPane_Tools::ToName (DB_SHAPE_TYPE, theShape.ShapeType()).ToCString()); } +// ======================================================================= +// function : LightHighlightColor +// purpose : +// ======================================================================= +QColor DFBrowserPane_Tools::LightHighlightColor() +{ + QWidget aWidget; + QPalette aPalette = aWidget.palette(); + return aPalette.highlight().color().lighter(); +} + // ======================================================================= // function : ToName // purpose : @@ -127,6 +141,18 @@ TCollection_AsciiString DFBrowserPane_Tools::ToName (const DFBrowserPane_OcctEnu break; } case DB_ORIENTATION_TYPE: { TopAbs::Print((TopAbs_Orientation)theEnumId, aSStream); break; } + case DB_CDM_CAN_CLOSE_STATUS: + { + switch (theEnumId) + { + case CDM_CCS_OK: return "OK"; + case CDM_CCS_NotOpen: return "NotOpen"; + case CDM_CCS_UnstoredReferenced: return "UnstoredReferenced"; + case CDM_CCS_ReferenceRejection: return "ReferenceRejection"; + default: return "UNKNOWN CDM_CanCloseStatus"; + } + break; + } default: return "UNKNOWN PARAMETER"; } return aSStream.str().c_str(); diff --git a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx index 5508708f33..4e108250be 100644 --- a/tools/DFBrowserPane/DFBrowserPane_Tools.hxx +++ b/tools/DFBrowserPane/DFBrowserPane_Tools.hxx @@ -80,6 +80,10 @@ public: return QString::fromUtf16((uint16_t*)theValue.ToExtString()); } + //! Returns light highlight color + //! \returns Qt color + static Standard_EXPORT QColor LightHighlightColor(); + //! Converts enumeration value into string text //! \param theType an enumeration kind //! \param theEnumId an enumeration value diff --git a/tools/DFBrowserPane/FILES b/tools/DFBrowserPane/FILES index b7aed2f2fd..1ea8358f9e 100644 --- a/tools/DFBrowserPane/FILES +++ b/tools/DFBrowserPane/FILES @@ -14,8 +14,6 @@ DFBrowserPane_HelperArray.cxx DFBrowserPane_HelperArray.hxx DFBrowserPane_HelperExport.cxx DFBrowserPane_HelperExport.hxx -DFBrowserPane_HelperGroupContent.cxx -DFBrowserPane_HelperGroupContent.hxx DFBrowserPane_ItemDelegateButton.cxx DFBrowserPane_ItemDelegateButton.hxx DFBrowserPane_ItemRole.hxx diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.cxx index dd0017eeeb..1bcab623e2 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocArea.cxx @@ -24,6 +24,7 @@ void DFBrowserPaneXDE_XCAFDocArea::GetValues (const Handle(TDF_Attribute)& theAttribute, QList& theValues) { Handle(XCAFDoc_Area) anAttr = Handle(XCAFDoc_Area)::DownCast (theAttribute); + theValues.append ("Get"); theValues.append (anAttr->Get()); } diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.cxx index e5e17c01c0..f87e5bec28 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocCentroid.cxx @@ -25,7 +25,6 @@ DFBrowserPaneXDE_XCAFDocCentroid::DFBrowserPaneXDE_XCAFDocCentroid() : DFBrowserPane_AttributePane() { - getPaneModel()->SetColumnCount (2); } // ======================================================================= @@ -36,9 +35,9 @@ void DFBrowserPaneXDE_XCAFDocCentroid::GetValues (const Handle(TDF_Attribute)& t { Handle(XCAFDoc_Centroid) anAttr = Handle(XCAFDoc_Centroid)::DownCast (theAttribute); gp_Pnt aPoint = anAttr->Get(); - theValues << "X" << aPoint.X() - << "Y" << aPoint.Y() - << "Z" << aPoint.Z(); + theValues << "Get: X" << aPoint.X() + << "Get: Y" << aPoint.Y() + << "Get: Z" << aPoint.Z(); } // ======================================================================= diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx index d0f2596d2f..f3fc0b7bdd 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocColor.cxx @@ -28,7 +28,6 @@ DFBrowserPaneXDE_XCAFDocColor::DFBrowserPaneXDE_XCAFDocColor() : DFBrowserPane_AttributePane() { - getPaneModel()->SetColumnCount (2); } // ======================================================================= @@ -40,11 +39,11 @@ void DFBrowserPaneXDE_XCAFDocColor::GetValues (const Handle(TDF_Attribute)& theA Handle(XCAFDoc_Color) anAttr = Handle(XCAFDoc_Color)::DownCast (theAttribute); const Quantity_Color& aColor = anAttr->GetColor(); - theValues << "Red" << aColor.Red(); - theValues << "Green" << aColor.Green(); - theValues << "Blue" << aColor.Blue(); + theValues << "GetColor: Red" << aColor.Red(); + theValues << "GetColor: Green" << aColor.Green(); + theValues << "GetColor: Blue" << aColor.Blue(); - theValues << "Quantity_NameOfColor (nearest)" << aColor.Name(); + theValues << "GetColor: Name" << aColor.Name(); } // ======================================================================= diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx index d7bbc92223..f9e64d7695 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx @@ -32,7 +32,6 @@ DFBrowserPaneXDE_XCAFDocDatum::DFBrowserPaneXDE_XCAFDocDatum() : DFBrowserPane_AttributePane() { - getPaneModel()->SetColumnCount (2); } // ======================================================================= diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx index b4a98f201f..e7fa7ab7c0 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocShapeMapTool.cxx @@ -56,6 +56,7 @@ DFBrowserPaneXDE_XCAFDocShapeMapTool::DFBrowserPaneXDE_XCAFDocShapeMapTool() getPaneModel()->SetHeaderValues (aHeaderValues, Qt::Horizontal); getPaneModel()->SetColumnCount (aHeaderValues.count()); + getPaneModel()->SetItalicColumns (QList()); } // ======================================================================= diff --git a/tools/ShapeView/ShapeView_Window.cxx b/tools/ShapeView/ShapeView_Window.cxx index 11fe0703b9..f4291c57a9 100644 --- a/tools/ShapeView/ShapeView_Window.cxx +++ b/tools/ShapeView/ShapeView_Window.cxx @@ -52,9 +52,9 @@ #include #include -const int FIRST_COLUMN_WIDTH = 200; +const int FIRST_COLUMN_WIDTH = 190; const int SIZE_COLUMN_WIDTH = 30; -const int POINTER_COLUMN_WIDTH = 110; +const int POINTER_COLUMN_WIDTH = 70; const int ORIENTATION_COLUMN_WIDTH = 70; const int LOCATION_COLUMN_WIDTH = 120; const int FLAGS_COLUMN_WIDTH = 70; @@ -73,7 +73,7 @@ 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 = 400; +const int SHAPEVIEW_DEFAULT_VIEW_WIDTH = 200;//400; const int SHAPEVIEW_DEFAULT_VIEW_HEIGHT = 1000; //! \class ShapeView_TreeView @@ -163,6 +163,7 @@ ShapeView_Window::ShapeView_Window (QWidget* theParent, const TCollection_AsciiS QDockWidget* aViewDockWidget = new QDockWidget (tr ("View"), myMainWindow); aViewDockWidget->setWidget (myViewWindow); + aViewDockWidget->setTitleBarWidget (myViewWindow->GetViewToolBar()->GetControl()); myMainWindow->addDockWidget (Qt::RightDockWidgetArea, aViewDockWidget); myMainWindow->resize (DEFAULT_SHAPE_VIEW_WIDTH, DEFAULT_SHAPE_VIEW_HEIGHT); diff --git a/tools/TInspector/TInspector_Window.cxx b/tools/TInspector/TInspector_Window.cxx index 08813a7192..9f49e6d7e1 100644 --- a/tools/TInspector/TInspector_Window.cxx +++ b/tools/TInspector/TInspector_Window.cxx @@ -27,8 +27,8 @@ #include #include -const int TINSPECTOR_DEFAULT_WIDTH = 900; -const int TINSPECTOR_DEFAULT_HEIGHT = 700; +const int TINSPECTOR_DEFAULT_WIDTH = 650; +const int TINSPECTOR_DEFAULT_HEIGHT = 500;//350; const int TINSPECTOR_DEFAULT_POSITION_X = 200; const int TINSPECTOR_DEFAULT_POSITION_Y = 60; diff --git a/tools/ToolsDraw/ToolsDraw.cxx b/tools/ToolsDraw/ToolsDraw.cxx index 0cd3a7b069..3e267e7ca2 100644 --- a/tools/ToolsDraw/ToolsDraw.cxx +++ b/tools/ToolsDraw/ToolsDraw.cxx @@ -213,7 +213,7 @@ static int tinspector (Draw_Interpretor&/* di*/, Standard_Integer theArgsNb, con anObjectsToSelect.Append(anIO); } // give parameters as a container of names - TCollection_AsciiString aParam (theArgs[anIt]); + aParam = TCollection_AsciiString (theArgs[anIt]); while (!aParam.StartsWith ("-")) { anItemNamesToSelect.Append (aParam); @@ -350,17 +350,17 @@ void ToolsDraw::Commands(Draw_Interpretor& theCommands) "\n\t\t: 'all' adds all available plugins in the order:" "\n\t\t: DFBrowser, VInspector and ShapeView." "\n\t\t: If at the first call this option is not used, 'all' option is applyed;" - "\n\t\t: -activate active the plugin in the tool view." + "\n\t\t: -activate activates the plugin in the tool view." "\n\t\t: If at the first call this option is not used, the first plugin is activated;" - "\n\t\t: -shape initialize plugin/s by the shape object. If 'name' is empty, initializes all plugins;" + "\n\t\t: -shape initializes plugin/s by the shape object. If 'name' is empty, initializes all plugins;" "\n\t\t: -open gives the file to the plugin/s. If the plugin is active, after open, update content will be done;" "\n\t\t: -update updates content of the active plugin;" - "\n\t\t: -select set the parameter that should be selected in an active tool view." + "\n\t\t: -select sets the parameter that should be selected in an active tool view." "\n\t\t: Depending on active tool the parameter is:" "\n\t\t: ShapeView: 'object' is an instance of TopoDS_Shape TShape," "\n\t\t: DFBrowser: 'name' is an entry of TDF_Label and name2(optionaly) for TDF_Attribute type name," "\n\t\t: VInspector: 'object' is an instance of AIS_InteractiveObject;" - "\n\t\t: -show set tool view visible or hidden. The first call of this command will show it.", + "\n\t\t: -show sets Inspector view visible or hidden. The first call of this command will show it.", __FILE__, tinspector, group); } diff --git a/tools/TreeModel/TreeModel_ItemRole.hxx b/tools/TreeModel/TreeModel_ItemRole.hxx index 881aeab908..169dff7b10 100644 --- a/tools/TreeModel/TreeModel_ItemRole.hxx +++ b/tools/TreeModel/TreeModel_ItemRole.hxx @@ -21,7 +21,8 @@ //! Sets custom item role of Tree view wmodel enum TreeModel_ItemRole { - TreeModel_ItemRole_RowCountRole = Qt::UserRole + 1 //! additional column with row count for item (cached value) + TreeModel_ItemRole_RowCountRole = Qt::UserRole + 1, //! additional column with row count for item (cached value) + TreeModel_ItemRole_LastTreeRole //! last enumeration value to use outside incremented }; #endif diff --git a/tools/TreeModel/TreeModel_MessageDialog.cxx b/tools/TreeModel/TreeModel_MessageDialog.cxx index be2fbd9dcb..8eda4669cb 100644 --- a/tools/TreeModel/TreeModel_MessageDialog.cxx +++ b/tools/TreeModel/TreeModel_MessageDialog.cxx @@ -54,6 +54,8 @@ TreeModel_MessageDialog::TreeModel_MessageDialog (QWidget* theParent, const QStr aLayout->setColumnStretch (0, 1); + myCancelButton->setDefault (true); + SetInformation (theInformation); } diff --git a/tools/VInspector/VInspector_ToolBar.cxx b/tools/VInspector/VInspector_ToolBar.cxx index e84d7199f4..adcdeb6899 100644 --- a/tools/VInspector/VInspector_ToolBar.cxx +++ b/tools/VInspector/VInspector_ToolBar.cxx @@ -37,12 +37,10 @@ VInspector_ToolBar::VInspector_ToolBar (QWidget* theParent) myActionsMap[VInspector_ToolActionType_SelectPresentationsId] = new QPushButton (theParent); myActionsMap[VInspector_ToolActionType_SelectPresentationsId]->setText ("Select Presentations"); myActionsMap[VInspector_ToolActionType_SelectPresentationsId]->setCheckable (true); - myActionsMap[VInspector_ToolActionType_SelectPresentationsId]->setFixedHeight(20); myActionsMap[VInspector_ToolActionType_SelectOwnersId] = new QPushButton (theParent); myActionsMap[VInspector_ToolActionType_SelectOwnersId]->setText ("Select Owners"); myActionsMap[VInspector_ToolActionType_SelectOwnersId]->setCheckable (true); - myActionsMap[VInspector_ToolActionType_SelectPresentationsId]->setFixedHeight(25); myMainWindow = new QWidget (theParent); diff --git a/tools/VInspector/VInspector_Window.cxx b/tools/VInspector/VInspector_Window.cxx index 0d2d970e14..778748e93a 100644 --- a/tools/VInspector/VInspector_Window.cxx +++ b/tools/VInspector/VInspector_Window.cxx @@ -48,14 +48,14 @@ #include #include -const int FIRST_COLUMN_WIDTH = 250; +const int FIRST_COLUMN_WIDTH = 230; const int COLUMN_1_WIDTH = 30; const int COLUMN_2_WIDTH = 70; -const int COLUMN_3_WIDTH = 130; -const int COLUMN_4_WIDTH = 90; -const int COLUMN_5_WIDTH = 180; -const int COLUMN_6_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; @@ -69,9 +69,58 @@ const int VINSPECTOR_DEFAULT_POSITION_Y = 60; const int VINSPECTOR_DEFAULT_VIEW_WIDTH = 400; const int VINSPECTOR_DEFAULT_VIEW_HEIGHT = 1000; +const int VINSPECTOR_DEFAULT_HISTORY_VIEW_WIDTH = 400; +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 : @@ -84,6 +133,7 @@ VInspector_Window::VInspector_Window() QWidget* aCentralWidget = new QWidget (myMainWindow); QGridLayout* aParentLay = new QGridLayout (aCentralWidget); aParentLay->setContentsMargins (0, 0, 0, 0); + aParentLay->setSpacing(0); // tool bar: on the bottom of the window myToolBar = new VInspector_ToolBar(aCentralWidget); @@ -103,8 +153,11 @@ VInspector_Window::VInspector_Window() myMainWindow->setCentralWidget (aCentralWidget); // history view in bottom dock widget - myHistoryView = new QTreeView (aCentralWidget); + myHistoryView = new Vinspector_TreeView (aCentralWidget); myHistoryView->setSelectionBehavior (QAbstractItemView::SelectRows); + ((Vinspector_TreeView*)myHistoryView)->SetPredefinedSize (VINSPECTOR_DEFAULT_HISTORY_VIEW_WIDTH, + VINSPECTOR_DEFAULT_HISTORY_VIEW_HEIGHT); + myHistoryView->setSelectionMode (QAbstractItemView::ExtendedSelection); VInspector_ViewModelHistory* aHistoryModel = new VInspector_ViewModelHistory (myHistoryView); myHistoryView->setModel (aHistoryModel); @@ -121,6 +174,7 @@ VInspector_Window::VInspector_Window() myHistoryView->setColumnWidth (4, HISTORY_AIS_NAME_COLUMN_WIDTH); QDockWidget* aHistoryDockWidget = new QDockWidget (tr ("HistoryView"), myMainWindow); + aHistoryDockWidget->setTitleBarWidget (new QWidget(myMainWindow)); aHistoryDockWidget->setWidget (myHistoryView); myMainWindow->addDockWidget (Qt::BottomDockWidgetArea, aHistoryDockWidget); @@ -168,9 +222,9 @@ void VInspector_Window::UpdateContent() // make AIS_InteractiveObject selected selected if exist in select parameters NCollection_List anObjects; - if (myParameters->GetSelectedObjects(aName, anObjects)) + VInspector_ViewModel* aViewModel = dynamic_cast(myTreeView->model()); + if (aViewModel && myParameters->GetSelectedObjects(aName, anObjects)) { - VInspector_ViewModel* aViewModel = dynamic_cast(myTreeView->model()); QItemSelectionModel* aSelectionModel = myTreeView->selectionModel(); aSelectionModel->clear(); for (NCollection_List::Iterator aParamsIt (anObjects); @@ -305,33 +359,35 @@ void VInspector_Window::onTreeViewContextMenuRequested(const QPoint& thePosition // ======================================================================= void VInspector_Window::onToolBarActionClicked (const int theActionId) { + VInspector_ViewModel* aViewModel = dynamic_cast (myTreeView->model()); + if (!aViewModel) + return; + switch (theActionId) { case VInspector_ToolActionType_UpdateId: { - VInspector_ViewModel* aViewModel = dynamic_cast (myTreeView->model()); - if (aViewModel) - UpdateTreeModel(); + UpdateTreeModel(); break; } case VInspector_ToolActionType_SelectPresentationsId: { - bool isChecked = myToolBar->GetToolButton((VInspector_ToolActionType)theActionId)->isChecked(); - NCollection_List aPresentationsForViewer; - if (isChecked) - aPresentationsForViewer = VInspector_ItemPresentableObject::GetSelectedPresentations(myTreeView->selectionModel()); - VInspector_ViewModel* aViewModel = dynamic_cast (myTreeView->model()); - Handle(AIS_InteractiveContext) aContext = aViewModel->GetContext(); - VInspector_Tools::AddOrRemovePresentations(aContext, aPresentationsForViewer); + bool isChecked = myToolBar->GetToolButton((VInspector_ToolActionType)theActionId)->isChecked(); + NCollection_List aPresentationsForViewer; + if (isChecked) + aPresentationsForViewer = VInspector_ItemPresentableObject::GetSelectedPresentations(myTreeView->selectionModel()); + Handle(AIS_InteractiveContext) aContext = aViewModel->GetContext(); + VInspector_Tools::AddOrRemovePresentations(aContext, aPresentationsForViewer); + UpdateTreeModel(); break; } case VInspector_ToolActionType_SelectOwnersId: { - NCollection_List anOwnersForViewer; - if (myToolBar->GetToolButton((VInspector_ToolActionType)theActionId)->isChecked()) - VInspector_ViewModel::GetSelectedOwners(myTreeView->selectionModel(), anOwnersForViewer); - VInspector_ViewModel* aViewModel = dynamic_cast (myTreeView->model()); - VInspector_Tools::AddOrRemoveSelectedShapes(aViewModel->GetContext(), anOwnersForViewer); + NCollection_List anOwnersForViewer; + if (myToolBar->GetToolButton((VInspector_ToolActionType)theActionId)->isChecked()) + VInspector_ViewModel::GetSelectedOwners(myTreeView->selectionModel(), anOwnersForViewer); + VInspector_Tools::AddOrRemoveSelectedShapes(aViewModel->GetContext(), anOwnersForViewer); + UpdateTreeModel(); break; } default: @@ -374,6 +430,8 @@ void VInspector_Window::onHistoryViewSelectionChanged (const QItemSelection& the QStringList aPointers = aHistoryModel->GetSelectedPointers(aSelectedIndices.first()); VInspector_ViewModel* aTreeModel = dynamic_cast (myTreeView->model()); + if (!aTreeModel) + return; QModelIndexList anIndices = aTreeModel->FindPointers (aPointers); QItemSelectionModel* aSelectionModel = myTreeView->selectionModel(); @@ -430,7 +488,7 @@ void VInspector_Window::onExportToShapeView() myExportToShapeViewDialog->SetInformation (aMessage); myExportToShapeViewDialog->Start(); - myParameters->SetParameters (aPluginName, aParameters); + myParameters->SetParameters (aPluginName, aParameters, myExportToShapeViewDialog->IsAccepted()); } // ======================================================================= @@ -507,6 +565,13 @@ void VInspector_Window::displaySelectedPresentations(const bool theToDisplay) aContext->Erase(aPresentation, false); } aContext->UpdateCurrentViewer(); + + // the order of objects returned by AIS_InteractiveContext is changed because the processed object is moved from + // Erased to Displayed container or back + QItemSelectionModel* aSelectionModel = myTreeView->selectionModel(); + aSelectionModel->clear(); + + UpdateTreeModel(); } // =======================================================================