X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.cpp;h=265bc27547c6c525607860a79707509ae12d490f;hb=4bbd53c93847f579a2a0415704c91ef8adaa400c;hp=87f1ff3dcab20fac2c065a5daadb0525534e56f8;hpb=af503b104d890a357c736c678bb00296d889c090;p=pulseview.git
diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 87f1ff3..265bc27 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -14,26 +14,27 @@
* 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
-#include
#include
+#include
#include
#include
#include "tracegroup.hpp"
+using std::any_of;
using std::pair;
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;
@@ -48,8 +49,8 @@ TraceGroup::~TraceGroup()
bool TraceGroup::enabled() const
{
- return std::any_of(child_items().begin(), child_items().end(),
- [](const shared_ptr &r) { return r->enabled(); });
+ return any_of(child_items().begin(), child_items().end(),
+ [](const shared_ptr &r) { return r->enabled(); });
}
pv::Session& TraceGroup::session()
@@ -64,13 +65,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();
@@ -115,7 +116,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));
@@ -157,15 +158,14 @@ 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 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;
@@ -197,8 +197,7 @@ 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)
@@ -224,5 +223,6 @@ void TraceGroup::extents_changed(bool horz, bool vert)
owner_->extents_changed(horz, vert);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv