X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=55b199a3380bfee054f1152000c7c87c380b55c9;hb=459db2c5cd2ab084dcf46f9e44c43916cb3ae9cf;hp=1a27e5654dd9e8e66ec96fb0d773a96ad83536f0;hpb=da30ecb7e72bd2547e524258efa5ec642988b70b;p=pulseview.git
diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 1a27e56..55b199a 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -14,20 +14,29 @@
* 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
+#ifdef _WIN32
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
+#include
+#include
+
#include "storesession.hpp"
#include
#include
+#include
+#include
#include
#include
+#include
#include
-#include
#include
@@ -52,9 +61,11 @@ using std::vector;
using Glib::VariantBase;
+using sigrok::ChannelType;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
+using sigrok::OutputFlag;
namespace pv {
@@ -62,10 +73,13 @@ const size_t StoreSession::BlockSize = 1024 * 1024;
StoreSession::StoreSession(const std::string &file_name,
const shared_ptr &output_format,
- const map &options, const Session &session) :
+ const map &options,
+ const std::pair sample_range,
+ const Session &session) :
file_name_(file_name),
output_format_(output_format),
options_(options),
+ sample_range_(sample_range),
session_(session),
interrupt_(false),
units_stored_(0),
@@ -91,44 +105,74 @@ const QString& StoreSession::error() const
bool StoreSession::start()
{
- set< shared_ptr > data_set =
- session_.get_data();
+ const unordered_set< shared_ptr > sigs(session_.signalbases());
- shared_lock lock(session_.signals_mutex());
- const unordered_set< shared_ptr > &sigs(
- session_.signals());
+ shared_ptr any_segment;
+ shared_ptr lsegment;
+ vector< shared_ptr > achannel_list;
+ vector< shared_ptr > asegment_list;
- // Check we have logic data
- if (data_set.empty() || sigs.empty()) {
- error_ = tr("No data to save.");
- return false;
- }
+ for (shared_ptr signal : sigs) {
+ if (!signal->enabled())
+ continue;
- if (data_set.size() > 1) {
- error_ = tr("PulseView currently only has support for "
- "storing a single data stream.");
- return false;
- }
+ if (signal->type() == ChannelType::LOGIC) {
+ // All logic channels share the same data segments
+ shared_ptr ldata = signal->logic_data();
- // Get the logic data
- shared_ptr data;
- if (!(data = dynamic_pointer_cast(*data_set.begin()))) {
- error_ = tr("PulseView currently only has support for "
- "storing a logic data.");
- return false;
- }
+ const deque< shared_ptr > &lsegments =
+ ldata->logic_segments();
- // Get the segment
- const deque< shared_ptr > &segments =
- data->logic_segments();
+ if (lsegments.empty()) {
+ error_ = tr("Can't save logic channel without data.");
+ return false;
+ }
+
+ lsegment = lsegments.front();
+ any_segment = lsegment;
+ }
- if (segments.empty()) {
- error_ = tr("No segments to save.");
+ if (signal->type() == ChannelType::ANALOG) {
+ // Each analog channel has its own segments
+ shared_ptr adata = signal->analog_data();
+
+ const deque< shared_ptr > &asegments =
+ adata->analog_segments();
+
+ if (asegments.empty()) {
+ error_ = tr("Can't save analog channel without data.");
+ return false;
+ }
+
+ asegment_list.push_back(asegments.front());
+ any_segment = asegments.front();
+
+ achannel_list.push_back(signal);
+ }
+ }
+
+ if (!any_segment) {
+ error_ = tr("No channels enabled.");
return false;
}
- const shared_ptr segment(segments.front());
- assert(segment);
+ // Check whether the user wants to export a certain sample range
+ uint64_t end_sample;
+
+ if (sample_range_.first == sample_range_.second) {
+ start_sample_ = 0;
+ sample_count_ = any_segment->get_sample_count();
+ } else {
+ if (sample_range_.first > sample_range_.second) {
+ start_sample_ = sample_range_.second;
+ end_sample = min(sample_range_.first, any_segment->get_sample_count());
+ sample_count_ = end_sample - start_sample_;
+ } else {
+ start_sample_ = sample_range_.first;
+ end_sample = min(sample_range_.second, any_segment->get_sample_count());
+ sample_count_ = end_sample - start_sample_;
+ }
+ }
// Begin storing
try {
@@ -137,27 +181,22 @@ bool StoreSession::start()
map options = options_;
- // If the output has the capability to write files, use it.
- // Otherwise, open the output stream.
- const auto opt_list = output_format_->options();
- if (opt_list.find("filename") != opt_list.end())
- options["filename"] =
- Glib::Variant::create(file_name_);
- else
+ if (!output_format_->test_flag(OutputFlag::INTERNAL_IO_HANDLING))
output_stream_.open(file_name_, ios_base::binary |
- ios_base::trunc | ios_base::out);
+ ios_base::trunc | ios_base::out);
- output_ = output_format_->create_output(device, options);
+ output_ = output_format_->create_output(file_name_, device, options);
auto meta = context->create_meta_packet(
{{ConfigKey::SAMPLERATE, Glib::Variant::create(
- segment->samplerate())}});
+ any_segment->samplerate())}});
output_->receive(meta);
} catch (Error error) {
- error_ = tr("Error while saving.");
+ error_ = tr("Error while saving: ") + error.what();
return false;
}
- thread_ = std::thread(&StoreSession::store_proc, this, segment);
+ thread_ = std::thread(&StoreSession::store_proc, this,
+ achannel_list, asegment_list, lsegment);
return true;
}
@@ -172,65 +211,99 @@ void StoreSession::cancel()
interrupt_ = true;
}
-void StoreSession::store_proc(shared_ptr segment)
+void StoreSession::store_proc(vector< shared_ptr > achannel_list,
+ vector< shared_ptr > asegment_list,
+ shared_ptr lsegment)
{
- assert(segment);
-
- uint64_t start_sample = 0, sample_count;
unsigned progress_scale = 0;
- /// TODO: Wrap this in a std::unique_ptr when we transition to C++11
- uint8_t *const data = new uint8_t[BlockSize];
- assert(data);
+ int aunit_size = 0;
+ int lunit_size = 0;
+ unsigned int lsamples_per_block = INT_MAX;
+ unsigned int asamples_per_block = INT_MAX;
- const int unit_size = segment->unit_size();
- assert(unit_size != 0);
-
- sample_count = segment->get_sample_count();
+ if (!asegment_list.empty()) {
+ // We assume all analog channels use the sample unit size
+ aunit_size = asegment_list.front()->unit_size();
+ asamples_per_block = BlockSize / aunit_size;
+ }
+ if (lsegment) {
+ lunit_size = lsegment->unit_size();
+ lsamples_per_block = BlockSize / lunit_size;
+ }
- // Qt needs the progress values to fit inside an int. If they would
+ // Qt needs the progress values to fit inside an int. If they would
// not, scale the current and max values down until they do.
- while ((sample_count >> progress_scale) > INT_MAX)
+ while ((sample_count_ >> progress_scale) > INT_MAX)
progress_scale ++;
- unit_count_ = sample_count >> progress_scale;
+ unit_count_ = sample_count_ >> progress_scale;
- const unsigned int samples_per_block = BlockSize / unit_size;
+ const unsigned int samples_per_block =
+ std::min(asamples_per_block, lsamples_per_block);
- while (!interrupt_ && start_sample < sample_count)
- {
+ while (!interrupt_ && sample_count_) {
progress_updated();
- const uint64_t end_sample = min(
- start_sample + samples_per_block, sample_count);
- segment->get_samples(data, start_sample, end_sample);
-
- size_t length = end_sample - start_sample;
+ const uint64_t packet_len =
+ std::min((uint64_t)samples_per_block, sample_count_);
try {
const auto context = session_.device_manager().context();
- auto logic = context->create_logic_packet(data, length, unit_size);
- const string data = output_->receive(logic);
- if (output_stream_.is_open())
- output_stream_ << data;
+
+ for (unsigned int i = 0; i < achannel_list.size(); i++) {
+ shared_ptr achannel = (achannel_list.at(i))->channel();
+ shared_ptr asegment = asegment_list.at(i);
+
+ const float *adata =
+ asegment->get_samples(start_sample_, start_sample_ + packet_len);
+
+ // The srzip format currently only supports packets with one
+ // analog channel. See zip_append_analog() in srzip.c
+ auto analog = context->create_analog_packet(
+ vector >{achannel},
+ (float *)adata, packet_len,
+ sigrok::Quantity::VOLTAGE, sigrok::Unit::VOLT,
+ vector());
+ const string adata_str = output_->receive(analog);
+
+ if (output_stream_.is_open())
+ output_stream_ << adata_str;
+
+ delete[] adata;
+ }
+
+ if (lsegment) {
+ const uint8_t* ldata =
+ lsegment->get_samples(start_sample_, start_sample_ + packet_len);
+
+ const size_t length = packet_len * lunit_size;
+ auto logic = context->create_logic_packet((void*)ldata, length, lunit_size);
+ const string ldata_str = output_->receive(logic);
+
+ if (output_stream_.is_open())
+ output_stream_ << ldata_str;
+
+ delete[] ldata;
+ }
} catch (Error error) {
- error_ = tr("Error while saving.");
+ error_ = tr("Error while saving: ") + error.what();
break;
}
- start_sample = end_sample;
- units_stored_ = start_sample >> progress_scale;
+ sample_count_ -= packet_len;
+ start_sample_ += packet_len;
+ units_stored_ = unit_count_ - (sample_count_ >> progress_scale);
}
// Zeroing the progress variables indicates completion
units_stored_ = unit_count_ = 0;
+ store_successful();
progress_updated();
output_.reset();
output_stream_.close();
-
- delete[] data;
}
} // pv