projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Implement A2D conversions
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index bfb75532aa58ad7508db13b1243ce051613e131c..ad91cd12f8c5df760058f121e0c2c30302efd43e 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"
@@
-39,6
+38,8
@@
#include <pv/widgets/popup.hpp>
using boost::make_filter_iterator;
#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::dynamic_pointer_cast;
using std::max;
using std::make_pair;
@@
-49,7
+50,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;
@@
-105,18
+107,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_.list_by_type<
TraceTree
Item>());
+ vector< shared_ptr<
Row
Item> > items(
+ view_.list_by_type<
Row
Item>());
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_ &&
@@
-139,8
+140,7
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
const vector< shared_ptr<TraceTreeItem> > items(
view_.list_by_type<TraceTreeItem>());
const vector< shared_ptr<TraceTreeItem> > items(
view_.list_by_type<TraceTreeItem>());
- if (std::count_if(items.begin(), items.end(), item_selected) > 1)
- {
+ if (count_if(items.begin(), items.end(), item_selected) > 1) {
menu->addSeparator();
QAction *const group = new QAction(tr("Group"), this);
menu->addSeparator();
QAction *const group = new QAction(tr("Group"), this);
@@
-154,15
+154,15
@@
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();
}
on_ungroup();
}
@@
-179,7
+179,7
@@
void Header::on_group()
shared_ptr<TraceGroup> group(new TraceGroup());
shared_ptr<TraceTreeItem> mouse_down_item(
shared_ptr<TraceGroup> group(new TraceGroup());
shared_ptr<TraceTreeItem> mouse_down_item(
-
std::
dynamic_pointer_cast<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());
shared_ptr<TraceTreeItem> focus_item(
mouse_down_item ? mouse_down_item : selected_items.front());
@@
-219,5
+219,6
@@
void Header::on_ungroup()
} while (restart);
}
} while (restart);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv