projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: display type-related improvements
[pulseview.git]
/
pv
/
storesession.cpp
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index 16665369be2b9a2bf7b6d53d5ef66a6ef5c617c0..3c5d899f2ce71a410a5e8845dbecbb703d2389e1 100644
(file)
--- a/
pv/storesession.cpp
+++ b/
pv/storesession.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* 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 <http://www.gnu.org/licenses/>.
*/
#include <cassert>
*/
#include <cassert>
@@
-56,13
+55,11
@@
using std::pair;
using std::set;
using std::shared_ptr;
using std::string;
using std::set;
using std::shared_ptr;
using std::string;
-using std::thread;
using std::unordered_set;
using std::vector;
using Glib::VariantBase;
using std::unordered_set;
using std::vector;
using Glib::VariantBase;
-using sigrok::ChannelType;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
@@
-70,12
+67,12
@@
using sigrok::OutputFlag;
namespace pv {
namespace pv {
-const size_t StoreSession::BlockSize = 1024 * 1024;
+const size_t StoreSession::BlockSize = 10
* 10
24 * 1024;
-StoreSession::StoreSession(const st
d::st
ring &file_name,
+StoreSession::StoreSession(const string &file_name,
const shared_ptr<OutputFormat> &output_format,
const map<string, VariantBase> &options,
const shared_ptr<OutputFormat> &output_format,
const map<string, VariantBase> &options,
- const
std::
pair<uint64_t, uint64_t> sample_range,
+ const pair<uint64_t, uint64_t> sample_range,
const Session &session) :
file_name_(file_name),
output_format_(output_format),
const Session &session) :
file_name_(file_name),
output_format_(output_format),
@@
-117,7
+114,7
@@
bool StoreSession::start()
if (!signal->enabled())
continue;
if (!signal->enabled())
continue;
- if (signal->type() ==
ChannelType::LOGIC
) {
+ if (signal->type() ==
data::SignalBase::LogicChannel
) {
// All logic channels share the same data segments
shared_ptr<data::Logic> ldata = signal->logic_data();
// All logic channels share the same data segments
shared_ptr<data::Logic> ldata = signal->logic_data();
@@
-133,7
+130,7
@@
bool StoreSession::start()
any_segment = lsegment;
}
any_segment = lsegment;
}
- if (signal->type() ==
ChannelType::ANALOG
) {
+ if (signal->type() ==
data::SignalBase::AnalogChannel
) {
// Each analog channel has its own segments
shared_ptr<data::Analog> adata = signal->analog_data();
// Each analog channel has its own segments
shared_ptr<data::Analog> adata = signal->analog_data();
@@
-218,10
+215,6
@@
void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
{
unsigned progress_scale = 0;
{
unsigned progress_scale = 0;
- /// TODO: Wrap this in a std::unique_ptr when we transition to C++11
- uint8_t *const ldata = new uint8_t[BlockSize];
- assert(ldata);
-
int aunit_size = 0;
int lunit_size = 0;
unsigned int lsamples_per_block = INT_MAX;
int aunit_size = 0;
int lunit_size = 0;
unsigned int lsamples_per_block = INT_MAX;
@@
-245,13
+238,13
@@
void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
unit_count_ = sample_count_ >> progress_scale;
const unsigned int samples_per_block =
unit_count_ = sample_count_ >> progress_scale;
const unsigned int samples_per_block =
-
std::
min(asamples_per_block, lsamples_per_block);
+ min(asamples_per_block, lsamples_per_block);
while (!interrupt_ && sample_count_) {
progress_updated();
const uint64_t packet_len =
while (!interrupt_ && sample_count_) {
progress_updated();
const uint64_t packet_len =
-
std::
min((uint64_t)samples_per_block, sample_count_);
+ min((uint64_t)samples_per_block, sample_count_);
try {
const auto context = session_.device_manager().context();
try {
const auto context = session_.device_manager().context();
@@
-263,8
+256,6
@@
void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
const float *adata =
asegment->get_samples(start_sample_, start_sample_ + packet_len);
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<shared_ptr<sigrok::Channel> >{achannel},
(float *)adata, packet_len,
auto analog = context->create_analog_packet(
vector<shared_ptr<sigrok::Channel> >{achannel},
(float *)adata, packet_len,
@@
-279,14
+270,17
@@
void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
}
if (lsegment) {
}
if (lsegment) {
- lsegment->get_samples(ldata, start_sample_, start_sample_ + packet_len);
+ const uint8_t* ldata =
+ lsegment->get_samples(start_sample_, start_sample_ + packet_len);
const size_t length = packet_len * lunit_size;
const size_t length = packet_len * lunit_size;
- auto logic = context->create_logic_packet(ldata, length, 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;
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.what();
}
} catch (Error error) {
error_ = tr("Error while saving: ") + error.what();
@@
-301,12
+295,11
@@
void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
// Zeroing the progress variables indicates completion
units_stored_ = unit_count_ = 0;
// Zeroing the progress variables indicates completion
units_stored_ = unit_count_ = 0;
+ store_successful();
progress_updated();
output_.reset();
output_stream_.close();
progress_updated();
output_.reset();
output_stream_.close();
-
- delete[] ldata;
}
} // pv
}
} // pv