projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trace: Removed coloured_bg state
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 8595594803b58f21b3c33f439e51b69358d149ae..ab458f26bf36e981d49a1992826dbddb41e3d6e1 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-29,18
+29,16
@@
#include <cmath>
#include <iostream>
#include <iterator>
#include <cmath>
#include <iostream>
#include <iterator>
-#include <mutex>
#include <unordered_set>
#include <boost/archive/text_iarchive.hpp>
#include <boost/archive/text_oarchive.hpp>
#include <boost/serialization/serialization.hpp>
#include <unordered_set>
#include <boost/archive/text_iarchive.hpp>
#include <boost/archive/text_oarchive.hpp>
#include <boost/serialization/serialization.hpp>
-#include <boost/thread/locks.hpp>
#include <QApplication>
#include <QApplication>
-#include <QHBoxLayout>
#include <QEvent>
#include <QFontMetrics>
#include <QEvent>
#include <QFontMetrics>
+#include <QHBoxLayout>
#include <QMouseEvent>
#include <QScrollBar>
#include <QMouseEvent>
#include <QScrollBar>
@@
-56,20
+54,17
@@
#include "view.hpp"
#include "viewport.hpp"
#include "view.hpp"
#include "viewport.hpp"
-#include "pv/session.hpp"
-#include "pv/globalsettings.hpp"
-#include "pv/devices/device.hpp"
#include "pv/data/logic.hpp"
#include "pv/data/logicsegment.hpp"
#include "pv/data/logic.hpp"
#include "pv/data/logicsegment.hpp"
+#include "pv/devices/device.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/session.hpp"
#include "pv/util.hpp"
#ifdef ENABLE_DECODE
#include "decodetrace.hpp"
#endif
#include "pv/util.hpp"
#ifdef ENABLE_DECODE
#include "decodetrace.hpp"
#endif
-using boost::shared_lock;
-using boost::shared_mutex;
-
using pv::data::SignalData;
using pv::data::Segment;
using pv::util::TimeUnit;
using pv::data::SignalData;
using pv::data::Segment;
using pv::util::TimeUnit;
@@
-77,11
+72,9
@@
using pv::util::Timestamp;
using std::back_inserter;
using std::copy_if;
using std::back_inserter;
using std::copy_if;
-using std::
deque
;
+using std::
count_if
;
using std::dynamic_pointer_cast;
using std::inserter;
using std::dynamic_pointer_cast;
using std::inserter;
-using std::list;
-using std::lock_guard;
using std::max;
using std::make_pair;
using std::make_shared;
using std::max;
using std::make_pair;
using std::make_shared;
@@
-90,10
+83,10
@@
using std::pair;
using std::set;
using std::set_difference;
using std::shared_ptr;
using std::set;
using std::set_difference;
using std::shared_ptr;
+using std::stringstream;
using std::unordered_map;
using std::unordered_set;
using std::vector;
using std::unordered_map;
using std::unordered_set;
using std::vector;
-using std::weak_ptr;
namespace pv {
namespace views {
namespace pv {
namespace views {
@@
-224,7
+217,7
@@
const Session& View::session() const
return session_;
}
return session_;
}
-
std::unordered_set< std::
shared_ptr<Signal> > View::signals() const
+
unordered_set<
shared_ptr<Signal> > View::signals() const
{
return signals_;
}
{
return signals_;
}
@@
-289,7
+282,7
@@
void View::save_settings(QSettings &settings) const
settings.setValue("v_offset",
scrollarea_.verticalScrollBar()->sliderPosition());
settings.setValue("v_offset",
scrollarea_.verticalScrollBar()->sliderPosition());
- st
d::st
ringstream ss;
+ stringstream ss;
boost::archive::text_oarchive oa(ss);
oa << boost::serialization::make_nvp("offset", offset_);
settings.setValue("offset", QString::fromStdString(ss.str()));
boost::archive::text_oarchive oa(ss);
oa << boost::serialization::make_nvp("offset", offset_);
settings.setValue("offset", QString::fromStdString(ss.str()));
@@
-311,7
+304,7
@@
void View::restore_settings(QSettings &settings)
if (settings.contains("offset")) {
util::Timestamp offset;
if (settings.contains("offset")) {
util::Timestamp offset;
- st
d::st
ringstream ss;
+ stringstream ss;
ss << settings.value("offset").toString().toStdString();
boost::archive::text_iarchive ia(ss);
ss << settings.value("offset").toString().toStdString();
boost::archive::text_iarchive ia(ss);
@@
-450,7
+443,7
@@
void View::zoom(double steps)
void View::zoom(double steps, int offset)
{
void View::zoom(double steps, int offset)
{
- set_zoom(scale_ * pow(3.0
/
2.0, -steps), offset);
+ set_zoom(scale_ * pow(3.0
/
2.0, -steps), offset);
}
void View::zoom_fit(bool gui_state)
}
void View::zoom_fit(bool gui_state)
@@
-539,8
+532,7
@@
pair<Timestamp, Timestamp> View::get_time_extents() const
boost::optional<Timestamp> left_time, right_time;
const set< shared_ptr<SignalData> > visible_data = get_visible_data();
for (const shared_ptr<SignalData> d : visible_data) {
boost::optional<Timestamp> left_time, right_time;
const set< shared_ptr<SignalData> > visible_data = get_visible_data();
for (const shared_ptr<SignalData> d : visible_data) {
- const vector< shared_ptr<Segment> > segments =
- d->segments();
+ const vector< shared_ptr<Segment> > segments = d->segments();
for (const shared_ptr<Segment> &s : segments) {
double samplerate = s->samplerate();
samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
for (const shared_ptr<Segment> &s : segments) {
double samplerate = s->samplerate();
samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
@@
-562,33
+554,31
@@
pair<Timestamp, Timestamp> View::get_time_extents() const
return make_pair(*left_time, *right_time);
}
return make_pair(*left_time, *right_time);
}
-void View::enable_
coloured_bg
(bool state)
+void View::enable_
show_sampling_points
(bool state)
{
{
- const vector<shared_ptr<TraceTreeItem>> items(
- list_by_type<TraceTreeItem>());
-
- for (shared_ptr<TraceTreeItem> i : items) {
- // Can't cast to Trace because it's abstract, so we need to
- // check for any derived classes individually
+ (void)state;
- shared_ptr<AnalogSignal> a = dynamic_pointer_cast<AnalogSignal>(i);
- if (a)
- a->set_coloured_bg(state);
+ viewport_->update();
+}
- shared_ptr<LogicSignal> l = dynamic_pointer_cast<LogicSignal>(i);
- if (l)
-
l->set_coloured_bg(state)
;
+void View::enable_show_analog_minor_grid(bool state)
+{
+
(void)state
;
-#ifdef ENABLE_DECODE
- shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
- if (d)
- d->set_coloured_bg(state);
-#endif
- }
+ viewport_->update();
+}
+void View::enable_coloured_bg(bool state)
+{
+ coloured_bg_ = state;
viewport_->update();
}
viewport_->update();
}
+bool View::coloured_bg() const
+{
+ return coloured_bg_;
+}
+
bool View::cursors_shown() const
{
return show_cursors_;
bool View::cursors_shown() const
{
return show_cursors_;
@@
-610,7
+600,7
@@
void View::centre_cursors()
viewport_->update();
}
viewport_->update();
}
-s
td::s
hared_ptr<CursorPair> View::cursors() const
+shared_ptr<CursorPair> View::cursors() const
{
return cursors_;
}
{
return cursors_;
}
@@
-626,15
+616,15
@@
void View::add_flag(const Timestamp& time)
time_item_appearance_changed(true, true);
}
time_item_appearance_changed(true, true);
}
-void View::remove_flag(s
td::s
hared_ptr<Flag> flag)
+void View::remove_flag(shared_ptr<Flag> flag)
{
flags_.remove(flag);
time_item_appearance_changed(true, true);
}
{
flags_.remove(flag);
time_item_appearance_changed(true, true);
}
-vector< s
td::s
hared_ptr<Flag> > View::flags() const
+vector< shared_ptr<Flag> > View::flags() const
{
{
- vector< s
td::s
hared_ptr<Flag> > flags(flags_.begin(), flags_.end());
+ vector< shared_ptr<Flag> > flags(flags_.begin(), flags_.end());
stable_sort(flags.begin(), flags.end(),
[](const shared_ptr<Flag> &a, const shared_ptr<Flag> &b) {
return a->time() < b->time();
stable_sort(flags.begin(), flags.end(),
[](const shared_ptr<Flag> &a, const shared_ptr<Flag> &b) {
return a->time() < b->time();
@@
-748,7
+738,7
@@
void View::calculate_tick_spacing()
// Precision is the number of fractional digits required, not
// taking the prefix into account (and it must never be negative)
// Precision is the number of fractional digits required, not
// taking the prefix into account (and it must never be negative)
- tick_precision =
std::
max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
+ tick_precision = max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
tick_period_width = (tick_period / scale_).convert_to<double>();
tick_period_width = (tick_period / scale_).convert_to<double>();
@@
-880,7
+870,7
@@
TraceTreeItemOwner* View::find_prevalent_trace_group(
size_t max_prevalence = 0;
TraceTreeItemOwner *prevalent_owner = nullptr;
for (TraceTreeItemOwner *owner : owners) {
size_t max_prevalence = 0;
TraceTreeItemOwner *prevalent_owner = nullptr;
for (TraceTreeItemOwner *owner : owners) {
- const size_t prevalence =
std::
count_if(
+ const size_t prevalence = count_if(
owner_list.begin(), owner_list.end(),
[&](TraceTreeItemOwner *o) { return o == owner; });
if (prevalence > max_prevalence) {
owner_list.begin(), owner_list.end(),
[&](TraceTreeItemOwner *o) { return o == owner; });
if (prevalence > max_prevalence) {