projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Settings: Activate first item upon dialog creation
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 60d64b2f401f2483aad1226dc00e66d62ca54191..8849ee3fed2beb4b7fe8e9ba1fcfd445412c41df 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "header.hpp"
*/
#include "header.hpp"
@@
-49,7
+48,8
@@
using std::stable_sort;
using std::vector;
namespace pv {
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int Header::Padding = 12;
const int Header::BaselineOffset = 5;
const int Header::Padding = 12;
const int Header::BaselineOffset = 5;
@@
-67,7
+67,9
@@
Header::Header(View &parent) :
QSize Header::sizeHint() const
{
QRectF max_rect(-Padding, 0, Padding, 0);
QSize Header::sizeHint() const
{
QRectF max_rect(-Padding, 0, Padding, 0);
- for (auto &i : view_)
+ const vector<shared_ptr<TraceTreeItem>> items(
+ view_.list_by_type<TraceTreeItem>());
+ for (auto &i : items)
if (i->enabled())
max_rect = max_rect.united(i->label_rect(QRect()));
return QSize(max_rect.width() + Padding + BaselineOffset, 0);
if (i->enabled())
max_rect = max_rect.united(i->label_rect(QRect()));
return QSize(max_rect.width() + Padding + BaselineOffset, 0);
@@
-80,15
+82,19
@@
QSize Header::extended_size_hint() const
vector< shared_ptr<ViewItem> > Header::items()
{
vector< shared_ptr<ViewItem> > Header::items()
{
- return vector< shared_ptr<ViewItem> >(view_.begin(), view_.end());
+ const vector<shared_ptr<TraceTreeItem>> items(
+ view_.list_by_type<TraceTreeItem>());
+ return vector< shared_ptr<ViewItem> >(items.begin(), items.end());
}
shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
{
const QRect r(0, 0, width() - BaselineOffset, height());
}
shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
{
const QRect r(0, 0, width() - BaselineOffset, height());
- for (auto &i : view_)
- if (i->enabled() && i->label_rect(r).contains(pt))
- return i;
+ const vector<shared_ptr<TraceTreeItem>> items(
+ view_.list_by_type<TraceTreeItem>());
+ for (auto i = items.rbegin(); i != items.rend(); i++)
+ if ((*i)->enabled() && (*i)->label_rect(r).contains(pt))
+ return *i;
return shared_ptr<TraceTreeItem>();
}
return shared_ptr<TraceTreeItem>();
}
@@
-99,18
+105,17
@@
void Header::paintEvent(QPaintEvent*)
// would be clipped away.
const QRect rect(0, 0, width() - BaselineOffset, height());
// would be clipped away.
const QRect rect(0, 0, width() - BaselineOffset, height());
- vector< shared_ptr<
TraceTree
Item> > items(
- view_.
begin(), view_.end
());
+ vector< shared_ptr<
Row
Item> > items(
+ view_.
list_by_type<RowItem>
());
stable_sort(items.begin(), items.end(),
stable_sort(items.begin(), items.end(),
- [](const shared_ptr<
TraceTreeItem> &a, const shared_ptr<TraceTree
Item> &b) {
- return a->
visual_v_offset() < b->visual_v_offset
(); });
+ [](const shared_ptr<
RowItem> &a, const shared_ptr<Row
Item> &b) {
+ return a->
point(QRect()).y() < b->point(QRect()).y
(); });
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
- for (const shared_ptr<TraceTreeItem> r : items)
- {
+ for (const shared_ptr<RowItem> r : items) {
assert(r);
const bool highlight = !item_dragging_ &&
assert(r);
const bool highlight = !item_dragging_ &&
@@
-131,7
+136,9
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
if (!menu)
menu = new QMenu(this);
if (!menu)
menu = new QMenu(this);
- if (std::count_if(view_.begin(), view_.end(), item_selected) > 1)
+ const vector< shared_ptr<TraceTreeItem> > items(
+ view_.list_by_type<TraceTreeItem>());
+ if (std::count_if(items.begin(), items.end(), item_selected) > 1)
{
menu->addSeparator();
{
menu->addSeparator();
@@
-146,23
+153,25
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
menu->exec(event->globalPos());
}
menu->exec(event->globalPos());
}
-void Header::keyPressEvent(QKeyEvent *e)
+void Header::keyPressEvent(QKeyEvent *e
vent
)
{
{
- assert(e);
+ assert(e
vent
);
- MarginWidget::keyPressEvent(e);
+ MarginWidget::keyPressEvent(e
vent
);
- if (e
->key() == Qt::Key_G && e
->modifiers() == Qt::ControlModifier)
+ if (e
vent->key() == Qt::Key_G && event
->modifiers() == Qt::ControlModifier)
on_group();
on_group();
- else if (e
->key() == Qt::Key_U && e
->modifiers() == Qt::ControlModifier)
+ else if (e
vent->key() == Qt::Key_U && event
->modifiers() == Qt::ControlModifier)
on_ungroup();
}
void Header::on_group()
{
on_ungroup();
}
void Header::on_group()
{
+ const vector< shared_ptr<TraceTreeItem> > items(
+ view_.list_by_type<TraceTreeItem>());
vector< shared_ptr<TraceTreeItem> > selected_items(
vector< shared_ptr<TraceTreeItem> > selected_items(
- make_filter_iterator(item_selected,
view_.begin(), view_
.end()),
- make_filter_iterator(item_selected,
view_.end(), view_
.end()));
+ make_filter_iterator(item_selected,
items.begin(), items
.end()),
+ make_filter_iterator(item_selected,
items.end(), items
.end()));
stable_sort(selected_items.begin(), selected_items.end(),
[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
return a->visual_v_offset() < b->visual_v_offset(); });
stable_sort(selected_items.begin(), selected_items.end(),
[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
return a->visual_v_offset() < b->visual_v_offset(); });
@@
-198,17
+207,17
@@
void Header::on_ungroup()
bool restart;
do {
restart = false;
bool restart;
do {
restart = false;
- for (const shared_ptr<TraceTreeItem> r : view_) {
- const shared_ptr<TraceGroup> tg =
- dynamic_pointer_cast<TraceGroup>(r);
- if (tg
&& tg
->selected()) {
+ const vector< shared_ptr<TraceGroup> > groups(
+ view_.list_by_type<TraceGroup>());
+ for (const shared_ptr<TraceGroup> tg : groups)
+ if (tg->selected()) {
tg->ungroup();
restart = true;
break;
}
tg->ungroup();
restart = true;
break;
}
- }
} while (restart);
}
} while (restart);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv