projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow for a context menu in the view area
[pulseview.git]
/
pv
/
storesession.cpp
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index db766179e61f0c5b2d267221c809db8c2bb724c5..3d7b058a87034b6c02cc4109347e798b94702b40 100644
(file)
--- a/
pv/storesession.cpp
+++ b/
pv/storesession.cpp
@@
-19,12
+19,6
@@
#include <cassert>
#include <cassert>
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
#include "storesession.hpp"
#include <pv/data/analog.hpp>
#include "storesession.hpp"
#include <pv/data/analog.hpp>
@@
-151,6
+145,7
@@
bool StoreSession::start()
uint64_t end_sample;
if (sample_range_.first == sample_range_.second) {
uint64_t end_sample;
if (sample_range_.first == sample_range_.second) {
+ // No sample range specified, save everything we have
start_sample_ = 0;
sample_count_ = any_segment->get_sample_count();
} else {
start_sample_ = 0;
sample_count_ = any_segment->get_sample_count();
} else {
@@
-165,6
+160,12
@@
bool StoreSession::start()
}
}
}
}
+ // Make sure the sample range is valid
+ if (start_sample_ > any_segment->get_sample_count()) {
+ error_ = tr("Can't save range without sample data.");
+ return false;
+ }
+
// Begin storing
try {
const auto context = session_.device_manager().context();
// Begin storing
try {
const auto context = session_.device_manager().context();
@@
-181,7
+182,7
@@
bool StoreSession::start()
{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
any_segment->samplerate())}});
output_->receive(meta);
{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
any_segment->samplerate())}});
output_->receive(meta);
- } catch (Error error) {
+ } catch (Error
&
error) {
error_ = tr("Error while saving: ") + error.what();
return false;
}
error_ = tr("Error while saving: ") + error.what();
return false;
}
@@
-246,8
+247,8
@@
void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
shared_ptr<sigrok::Channel> achannel = (achannel_list.at(i))->channel();
shared_ptr<data::AnalogSegment> asegment = asegment_list.at(i);
shared_ptr<sigrok::Channel> achannel = (achannel_list.at(i))->channel();
shared_ptr<data::AnalogSegment> asegment = asegment_list.at(i);
- const float *adata =
-
asegment->get_samples(start_sample_, start_sample_ + packet_len
);
+ float *adata = new float[packet_len];
+
asegment->get_samples(start_sample_, start_sample_ + packet_len, adata
);
auto analog = context->create_analog_packet(
vector<shared_ptr<sigrok::Channel> >{achannel},
auto analog = context->create_analog_packet(
vector<shared_ptr<sigrok::Channel> >{achannel},
@@
-263,11
+264,11
@@
void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
}
if (lsegment) {
}
if (lsegment) {
- const uint8_t* ldata =
- lsegment->get_samples(start_sample_, start_sample_ + packet_len);
+ const size_t data_size = packet_len * lunit_size;
+ uint8_t* ldata = new uint8_t[data_size];
+ lsegment->get_samples(start_sample_, start_sample_ + packet_len, ldata);
- const size_t length = packet_len * lunit_size;
- auto logic = context->create_logic_packet((void*)ldata, length, lunit_size);
+ auto logic = context->create_logic_packet((void*)ldata, data_size, lunit_size);
const string ldata_str = output_->receive(logic);
if (output_stream_.is_open())
const string ldata_str = output_->receive(logic);
if (output_stream_.is_open())
@@
-275,7
+276,7
@@
void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
delete[] ldata;
}
delete[] ldata;
}
- } catch (Error error) {
+ } catch (Error
&
error) {
error_ = tr("Error while saving: ") + error.what();
break;
}
error_ = tr("Error while saving: ") + error.what();
break;
}