X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.cpp;h=490f39c5457187a0c808cc32684abb25f8fcb3d9;hp=3058cec5158ba90e1979a82ba3dd9d790b43ef56;hb=00f6bae935837b38b0d03a5928ba8175d460413f;hpb=3e769a374963f37f7d52b65ef6c56bcdf1ef11fe
diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 3058cec5..490f39c5 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -14,26 +14,26 @@
* 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.h"
+#include "tracegroup.hpp"
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;
@@ -42,48 +42,48 @@ const QColor TraceGroup::LineColour(QColor(0x55, 0x57, 0x53));
TraceGroup::~TraceGroup()
{
- _owner = nullptr;
+ owner_ = nullptr;
clear_child_items();
}
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::SigSession& TraceGroup::session()
+pv::Session& TraceGroup::session()
{
- assert(_owner);
- return _owner->session();
+ assert(owner_);
+ return owner_->session();
}
-const pv::SigSession& TraceGroup::session() const
+const pv::Session& TraceGroup::session() const
{
- assert(_owner);
- return _owner->session();
+ assert(owner_);
+ return owner_->session();
}
-pv::view::View* TraceGroup::view()
+View* TraceGroup::view()
{
- assert(_owner);
- return _owner->view();
+ assert(owner_);
+ return owner_->view();
}
-const pv::view::View* TraceGroup::view() const
+const View* TraceGroup::view() const
{
- assert(_owner);
- return _owner->view();
+ assert(owner_);
+ return owner_->view();
}
pair TraceGroup::v_extents() const
{
- return RowItemOwner::v_extents();
+ return TraceTreeItemOwner::v_extents();
}
-void TraceGroup::paint_label(QPainter &p, int right, bool hover)
+void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
{
- const QRectF r = label_rect(right).adjusted(
+ const QRectF r = label_rect(rect).adjusted(
LineThickness / 2, LineThickness / 2,
-LineThickness / 2, -LineThickness / 2);
@@ -112,15 +112,15 @@ void TraceGroup::paint_label(QPainter &p, int right, bool hover)
p.drawPolyline(points, countof(points));
}
-QRectF TraceGroup::label_rect(int right) const
+QRectF TraceGroup::label_rect(const QRectF &rect) const
{
- QRectF rect;
- for (const shared_ptr r : child_items())
- if (r)
- rect = rect.united(r->label_rect(right));
+ QRectF child_rect;
+ for (const shared_ptr r : child_items())
+ if (r && r->enabled())
+ child_rect = child_rect.united(r->label_rect(rect));
- return QRectF(rect.x() - Width - Padding, rect.y(),
- Width, rect.height());
+ return QRectF(child_rect.x() - Width - Padding, child_rect.y(),
+ Width, child_rect.height());
}
bool TraceGroup::pt_in_label_rect(int left, int right, const QPoint &point)
@@ -147,42 +147,81 @@ QMenu* TraceGroup::create_context_menu(QWidget *parent)
pv::widgets::Popup* TraceGroup::create_popup(QWidget *parent)
{
(void)parent;
- return NULL;
+ return nullptr;
}
-int TraceGroup::owner_v_offset() const
+int TraceGroup::owner_visual_v_offset() const
{
- return _owner ? layout_v_offset() + _owner->owner_v_offset() : 0;
+ return owner_ ? visual_v_offset() + owner_->owner_visual_v_offset() : 0;
+}
+
+void TraceGroup::restack_items()
+{
+ 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() +
+ (aext.first + aext.second) / 2 <
+ b->layout_v_offset() +
+ (bext.first + bext.second) / 2;
+ });
+
+ int total_offset = 0;
+ for (shared_ptr r : items) {
+ const pair extents = r->v_extents();
+ if (extents.first == 0 && extents.second == 0)
+ continue;
+
+ // We position disabled traces, so that they are close to the
+ // animation target positon should they be re-enabled
+ if (r->enabled())
+ total_offset += -extents.first;
+
+ if (!r->dragging())
+ r->set_layout_v_offset(total_offset);
+
+ if (r->enabled())
+ total_offset += extents.second;
+ }
}
unsigned int TraceGroup::depth() const
{
- return _owner ? _owner->depth() + 1 : 0;
+ return owner_ ? owner_->depth() + 1 : 0;
}
-void TraceGroup::on_ungroup()
+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)
- _owner->add_child_item(r);
+ for (shared_ptr r : items)
+ owner_->add_child_item(r);
- _owner->remove_child_item(shared_from_this());
+ owner_->remove_child_item(shared_from_this());
+}
+
+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);
+ if (owner_)
+ owner_->row_item_appearance_changed(label, content);
}
void TraceGroup::extents_changed(bool horz, bool vert)
{
- if (_owner)
- _owner->extents_changed(horz, vert);
+ if (owner_)
+ owner_->extents_changed(horz, vert);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv