Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
5fe301ae
Commit
5fe301ae
authored
3 years ago
by
Matthias Puchner
Browse files
Options
Downloads
Patches
Plain Diff
rm obsolete code (obsolete after removing net oriented sample designer)
parent
aa2c017b
No related branches found
No related tags found
1 merge request
!466
Minor enhancement & cleanup & fix
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/View/PropertyEditor/ComponentTreeView.cpp
+3
-11
3 additions, 11 deletions
GUI/View/PropertyEditor/ComponentTreeView.cpp
GUI/View/PropertyEditor/ComponentTreeView.h
+1
-3
1 addition, 3 deletions
GUI/View/PropertyEditor/ComponentTreeView.h
with
4 additions
and
14 deletions
GUI/View/PropertyEditor/ComponentTreeView.cpp
+
3
−
11
View file @
5fe301ae
...
@@ -31,7 +31,6 @@ ComponentTreeView::ComponentTreeView(QWidget* parent)
...
@@ -31,7 +31,6 @@ ComponentTreeView::ComponentTreeView(QWidget* parent)
,
m_proxyModel
(
new
ComponentProxyModel
(
this
))
,
m_proxyModel
(
new
ComponentProxyModel
(
this
))
,
m_placeHolderModel
(
new
QStandardItemModel
(
this
))
,
m_placeHolderModel
(
new
QStandardItemModel
(
this
))
,
m_eventFilter
(
new
RightMouseButtonEater
)
,
m_eventFilter
(
new
RightMouseButtonEater
)
,
m_show_root_item
(
false
)
{
{
auto
*
layout
=
new
QVBoxLayout
;
auto
*
layout
=
new
QVBoxLayout
;
...
@@ -59,7 +58,6 @@ ComponentTreeView::ComponentTreeView(QWidget* parent)
...
@@ -59,7 +58,6 @@ ComponentTreeView::ComponentTreeView(QWidget* parent)
&
ComponentTreeView
::
onCustomContextMenuRequested
);
&
ComponentTreeView
::
onCustomContextMenuRequested
);
setShowHeader
(
true
);
setShowHeader
(
true
);
setShowRootItem
(
false
);
}
}
void
ComponentTreeView
::
setItem
(
SessionItem
*
item
)
void
ComponentTreeView
::
setItem
(
SessionItem
*
item
)
...
@@ -69,7 +67,7 @@ void ComponentTreeView::setItem(SessionItem* item)
...
@@ -69,7 +67,7 @@ void ComponentTreeView::setItem(SessionItem* item)
return
;
return
;
}
}
setModel
(
item
->
model
());
setModel
(
item
->
model
());
setRootIndex
(
item
->
index
()
,
m_show_root_item
);
setRootIndex
(
item
->
index
());
m_tree
->
expandAll
();
m_tree
->
expandAll
();
}
}
...
@@ -87,14 +85,13 @@ void ComponentTreeView::setModel(SessionModel* model)
...
@@ -87,14 +85,13 @@ void ComponentTreeView::setModel(SessionModel* model)
m_tree
->
setModel
(
m_placeHolderModel
);
m_tree
->
setModel
(
m_placeHolderModel
);
}
}
void
ComponentTreeView
::
setRootIndex
(
const
QModelIndex
&
index
,
bool
show_root_item
)
void
ComponentTreeView
::
setRootIndex
(
const
QModelIndex
&
index
)
{
{
if
(
QWidget
*
editor
=
m_tree
->
indexWidget
(
m_tree
->
currentIndex
()))
if
(
QWidget
*
editor
=
m_tree
->
indexWidget
(
m_tree
->
currentIndex
()))
m_delegate
->
closeEditor
(
editor
,
QAbstractItemDelegate
::
NoHint
);
m_delegate
->
closeEditor
(
editor
,
QAbstractItemDelegate
::
NoHint
);
ASSERT
(
m_proxyModel
);
ASSERT
(
m_proxyModel
);
m_proxyModel
->
setRootIndex
(
index
);
m_proxyModel
->
setRootIndex
(
index
);
if
(
!
show_root_item
)
m_tree
->
setRootIndex
(
m_proxyModel
->
mapFromSource
(
index
));
m_tree
->
setRootIndex
(
m_proxyModel
->
mapFromSource
(
index
));
}
}
void
ComponentTreeView
::
setShowHeader
(
bool
show
)
void
ComponentTreeView
::
setShowHeader
(
bool
show
)
...
@@ -102,11 +99,6 @@ void ComponentTreeView::setShowHeader(bool show)
...
@@ -102,11 +99,6 @@ void ComponentTreeView::setShowHeader(bool show)
m_tree
->
setHeaderHidden
(
!
show
);
m_tree
->
setHeaderHidden
(
!
show
);
}
}
void
ComponentTreeView
::
setShowRootItem
(
bool
show
)
{
m_show_root_item
=
show
;
}
void
ComponentTreeView
::
onCustomContextMenuRequested
(
const
QPoint
&
pos
)
void
ComponentTreeView
::
onCustomContextMenuRequested
(
const
QPoint
&
pos
)
{
{
auto
point
=
m_tree
->
mapToGlobal
(
pos
);
auto
point
=
m_tree
->
mapToGlobal
(
pos
);
...
...
This diff is collapsed.
Click to expand it.
GUI/View/PropertyEditor/ComponentTreeView.h
+
1
−
3
View file @
5fe301ae
...
@@ -39,21 +39,19 @@ public:
...
@@ -39,21 +39,19 @@ public:
void
clearEditor
();
void
clearEditor
();
void
setShowHeader
(
bool
show
);
void
setShowHeader
(
bool
show
);
void
setShowRootItem
(
bool
show
);
private
slots
:
private
slots
:
void
onCustomContextMenuRequested
(
const
QPoint
&
pos
);
void
onCustomContextMenuRequested
(
const
QPoint
&
pos
);
private:
private:
void
setModel
(
SessionModel
*
model
);
void
setModel
(
SessionModel
*
model
);
void
setRootIndex
(
const
QModelIndex
&
index
,
bool
show_root_item
=
true
);
void
setRootIndex
(
const
QModelIndex
&
index
);
QTreeView
*
m_tree
;
QTreeView
*
m_tree
;
SessionModelDelegate
*
m_delegate
;
SessionModelDelegate
*
m_delegate
;
ComponentProxyModel
*
m_proxyModel
;
ComponentProxyModel
*
m_proxyModel
;
QStandardItemModel
*
m_placeHolderModel
;
QStandardItemModel
*
m_placeHolderModel
;
std
::
unique_ptr
<
RightMouseButtonEater
>
m_eventFilter
;
std
::
unique_ptr
<
RightMouseButtonEater
>
m_eventFilter
;
bool
m_show_root_item
;
//!< Tree will starts from item itself, if true.
};
};
#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTTREEVIEW_H
#endif // BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_COMPONENTTREEVIEW_H
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment