projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Standardize on 'event' as name for all Qt events.
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index eeb8afd236529e442bac91d6f4eeae6b5a065f05..9a46bab8c4c4d41ea9f91e36b05d84c96c05b9c7 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-43,7
+43,6
@@
#include <libsigrokcxx/libsigrokcxx.hpp>
#include "analogsignal.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
#include "analogsignal.hpp"
-#include "decodetrace.hpp"
#include "header.hpp"
#include "logicsignal.hpp"
#include "ruler.hpp"
#include "header.hpp"
#include "logicsignal.hpp"
#include "ruler.hpp"
@@
-59,6
+58,10
@@
#include "pv/data/logicsegment.hpp"
#include "pv/util.hpp"
#include "pv/data/logicsegment.hpp"
#include "pv/util.hpp"
+#ifdef ENABLE_DECODE
+#include "decodetrace.hpp"
+#endif
+
using boost::shared_lock;
using boost::shared_mutex;
using boost::shared_lock;
using boost::shared_mutex;
@@
-455,9
+458,11
@@
void View::enable_coloured_bg(bool state)
if (l)
l->set_coloured_bg(state);
if (l)
l->set_coloured_bg(state);
+#ifdef ENABLE_DECODE
shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
if (d)
d->set_coloured_bg(state);
shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
if (d)
d->set_coloured_bg(state);
+#endif
}
viewport_->update();
}
viewport_->update();
@@
-546,6
+551,12
@@
void View::restack_all_trace_tree_items()
for (auto &o : sorted_owners)
o->restack_items();
for (auto &o : sorted_owners)
o->restack_items();
+ // Re-assign background colors
+ bool next_bgcolour_state = 0;
+
+ for (auto &o : sorted_owners)
+ next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
+
// Animate the items to their destination
for (const auto &i : items)
i->animate_to_layout_v_offset();
// Animate the items to their destination
for (const auto &i : items)
i->animate_to_layout_v_offset();
@@
-815,9
+826,9
@@
bool View::eventFilter(QObject *object, QEvent *event)
return QObject::eventFilter(object, event);
}
return QObject::eventFilter(object, event);
}
-bool View::viewportEvent(QEvent *e)
+bool View::viewportEvent(QEvent *e
vent
)
{
{
- switch (e->type()) {
+ switch (e
vent
->type()) {
case QEvent::Paint:
case QEvent::MouseButtonPress:
case QEvent::MouseButtonRelease:
case QEvent::Paint:
case QEvent::MouseButtonPress:
case QEvent::MouseButtonRelease:
@@
-829,7
+840,7
@@
bool View::viewportEvent(QEvent *e)
case QEvent::TouchEnd:
return false;
default:
case QEvent::TouchEnd:
return false;
default:
- return QAbstractScrollArea::viewportEvent(e);
+ return QAbstractScrollArea::viewportEvent(e
vent
);
}
}
}
}