X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Ftracegroup.cpp;h=e33bba4ea7aeb7aaad9d68abf0194ffb3768331c;hb=2cca9ebfdc367aa8e4651cf063f0cdea8fccb798;hp=13ba025f9c1235ed01576fe736812e963c73ad79;hpb=b3f44329f5846bfb800ee53c15c65b2395d3ba0c;p=pulseview.git
diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 13ba025..e33bba4 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -14,8 +14,7 @@
* 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 .
*/
#include
@@ -33,7 +32,8 @@ using std::shared_ptr;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TraceGroup::Padding = 8;
const int TraceGroup::Width = 12;
@@ -49,7 +49,7 @@ TraceGroup::~TraceGroup()
bool TraceGroup::enabled() const
{
return std::any_of(child_items().begin(), child_items().end(),
- [](const shared_ptr &r) { return r->enabled(); });
+ [](const shared_ptr &r) { return r->enabled(); });
}
pv::Session& TraceGroup::session()
@@ -64,13 +64,13 @@ const pv::Session& TraceGroup::session() const
return owner_->session();
}
-pv::view::View* TraceGroup::view()
+View* TraceGroup::view()
{
assert(owner_);
return owner_->view();
}
-const pv::view::View* TraceGroup::view() const
+const View* TraceGroup::view() const
{
assert(owner_);
return owner_->view();
@@ -78,7 +78,7 @@ const pv::view::View* TraceGroup::view() const
pair TraceGroup::v_extents() const
{
- return RowItemOwner::v_extents();
+ return TraceTreeItemOwner::v_extents();
}
void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -115,7 +115,7 @@ void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
QRectF TraceGroup::label_rect(const QRectF &rect) const
{
QRectF child_rect;
- for (const shared_ptr r : child_items())
+ for (const shared_ptr r : child_items())
if (r && r->enabled())
child_rect = child_rect.united(r->label_rect(rect));
@@ -147,7 +147,7 @@ QMenu* TraceGroup::create_context_menu(QWidget *parent)
pv::widgets::Popup* TraceGroup::create_popup(QWidget *parent)
{
(void)parent;
- return NULL;
+ return nullptr;
}
int TraceGroup::owner_visual_v_offset() const
@@ -157,22 +157,21 @@ int TraceGroup::owner_visual_v_offset() const
void TraceGroup::restack_items()
{
- vector< shared_ptr > items(
- child_items().begin(), child_items().end());
+ vector> items(trace_tree_child_items());
// Sort by the centre line of the extents
stable_sort(items.begin(), items.end(),
- [](const shared_ptr &a, const shared_ptr &b) {
+ [](const shared_ptr &a, const shared_ptr &b) {
const auto aext = a->v_extents();
const auto bext = b->v_extents();
- return a->layout_v_offset() +
+ return a->layout_v_offset() +
(aext.first + aext.second) / 2 <
b->layout_v_offset() +
(bext.first + bext.second) / 2;
});
int total_offset = 0;
- for (shared_ptr r : items) {
+ for (shared_ptr r : items) {
const pair extents = r->v_extents();
if (extents.first == 0 && extents.second == 0)
continue;
@@ -197,11 +196,10 @@ unsigned int TraceGroup::depth() const
void TraceGroup::ungroup()
{
- const vector< shared_ptr > items(
- child_items().begin(), child_items().end());
+ const vector> items(trace_tree_child_items());
clear_child_items();
- for (shared_ptr r : items)
+ for (shared_ptr r : items)
owner_->add_child_item(r);
owner_->remove_child_item(shared_from_this());
@@ -212,10 +210,10 @@ void TraceGroup::on_ungroup()
ungroup();
}
-void TraceGroup::appearance_changed(bool label, bool content)
+void TraceGroup::row_item_appearance_changed(bool label, bool content)
{
if (owner_)
- owner_->appearance_changed(label, content);
+ owner_->row_item_appearance_changed(label, content);
}
void TraceGroup::extents_changed(bool horz, bool vert)
@@ -224,5 +222,6 @@ void TraceGroup::extents_changed(bool horz, bool vert)
owner_->extents_changed(horz, vert);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv