* 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 "signal.hpp"
#include "tracegroup.hpp"
-#include <cassert>
#include <algorithm>
+#include <cassert>
#include <boost/iterator/filter_iterator.hpp>
#include <pv/widgets/popup.hpp>
using boost::make_filter_iterator;
+
+using std::count_if;
using std::dynamic_pointer_cast;
-using std::max;
-using std::make_pair;
-using std::min;
-using std::pair;
using std::shared_ptr;
using std::stable_sort;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int Header::Padding = 12;
-const int Header::BaselineOffset = 5;
-static bool item_selected(shared_ptr<RowItem> r)
+static bool item_selected(shared_ptr<TraceTreeItem> r)
{
return r->selected();
}
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);
+ return QSize(max_rect.width() + Padding, 0);
}
QSize Header::extended_size_hint() const
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());
- for (auto &i : view_)
- if (i->enabled() && i->label_rect(r).contains(pt))
- return i;
- return shared_ptr<RowItem>();
+ const QRect r(0, 0, width(), height());
+ 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>();
}
void Header::paintEvent(QPaintEvent*)
{
- // The trace labels are not drawn with the arrows exactly on the
- // left edge of the widget, because then the selection shadow
- // would be clipped away.
- const QRect rect(0, 0, width() - BaselineOffset, height());
+ const QRect rect(0, 0, width(), height());
- vector< shared_ptr<RowItem> > row_items(
- view_.begin(), view_.end());
+ vector< shared_ptr<RowItem> > items(view_.list_by_type<RowItem>());
- stable_sort(row_items.begin(), row_items.end(),
+ stable_sort(items.begin(), items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
- return a->visual_v_offset() < b->visual_v_offset(); });
+ return a->point(QRect()).y() < b->point(QRect()).y(); });
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
- for (const shared_ptr<RowItem> r : row_items)
- {
+ for (const shared_ptr<RowItem> r : items) {
assert(r);
const bool highlight = !item_dragging_ &&
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 (count_if(items.begin(), items.end(), item_selected) > 1) {
menu->addSeparator();
QAction *const group = new QAction(tr("Group"), this);
menu->exec(event->globalPos());
}
-void Header::keyPressEvent(QKeyEvent *e)
+void Header::keyPressEvent(QKeyEvent *event)
{
- assert(e);
+ assert(event);
- MarginWidget::keyPressEvent(e);
+ MarginWidget::keyPressEvent(event);
- if (e->key() == Qt::Key_G && e->modifiers() == Qt::ControlModifier)
+ if (event->key() == Qt::Key_G && event->modifiers() == Qt::ControlModifier)
on_group();
- else if (e->key() == Qt::Key_U && e->modifiers() == Qt::ControlModifier)
+ else if (event->key() == Qt::Key_U && event->modifiers() == Qt::ControlModifier)
on_ungroup();
}
void Header::on_group()
{
- vector< shared_ptr<RowItem> > selected_items(
- make_filter_iterator(item_selected, view_.begin(), view_.end()),
- make_filter_iterator(item_selected, view_.end(), view_.end()));
+ const vector< shared_ptr<TraceTreeItem> > items(
+ view_.list_by_type<TraceTreeItem>());
+ vector< shared_ptr<TraceTreeItem> > selected_items(
+ 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<RowItem> &a, const shared_ptr<RowItem> &b) {
+ [](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
return a->visual_v_offset() < b->visual_v_offset(); });
shared_ptr<TraceGroup> group(new TraceGroup());
- shared_ptr<RowItem> mouse_down_item(
- std::dynamic_pointer_cast<RowItem>(mouse_down_item_));
- shared_ptr<RowItem> focus_item(
+ shared_ptr<TraceTreeItem> mouse_down_item(
+ dynamic_pointer_cast<TraceTreeItem>(mouse_down_item_));
+ shared_ptr<TraceTreeItem> focus_item(
mouse_down_item ? mouse_down_item : selected_items.front());
assert(focus_item);
focus_item->v_extents().first);
for (size_t i = 0; i < selected_items.size(); i++) {
- const shared_ptr<RowItem> &r = selected_items[i];
+ const shared_ptr<TraceTreeItem> &r = selected_items[i];
assert(r->owner());
r->owner()->remove_child_item(r);
group->add_child_item(r);
bool restart;
do {
restart = false;
- for (const shared_ptr<RowItem> 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;
}
- }
- } while(restart);
+ } while (restart);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
projects / pulseview.git / blobdiff