projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use bool literals for boolean values.
[pulseview.git]
/
pv
/
storesession.cpp
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index 00f6af63ed0a9e1374e673bbc5adfb22e9db3b54..b0f33f4a7a2ae674f2253ca16bedf11362475dfb 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>
@@
-38,7
+37,6
@@
#include <pv/data/logicsegment.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/devices/device.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/devices/device.hpp>
-#include <pv/view/signal.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
@@
-63,6
+61,7
@@
using std::vector;
using Glib::VariantBase;
using Glib::VariantBase;
+using sigrok::ChannelType;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
@@
-106,22
+105,20
@@
const QString& StoreSession::error() const
bool StoreSession::start()
{
bool StoreSession::start()
{
- const unordered_set< shared_ptr<
view::Signal> > sigs(session_.signal
s());
+ const unordered_set< shared_ptr<
data::SignalBase> > sigs(session_.signalbase
s());
shared_ptr<data::Segment> any_segment;
shared_ptr<data::LogicSegment> lsegment;
vector< shared_ptr<data::SignalBase> > achannel_list;
vector< shared_ptr<data::AnalogSegment> > asegment_list;
shared_ptr<data::Segment> any_segment;
shared_ptr<data::LogicSegment> lsegment;
vector< shared_ptr<data::SignalBase> > achannel_list;
vector< shared_ptr<data::AnalogSegment> > asegment_list;
- for (shared_ptr<
view::Signal
> signal : sigs) {
+ for (shared_ptr<
data::SignalBase
> signal : sigs) {
if (!signal->enabled())
continue;
if (!signal->enabled())
continue;
- shared_ptr<data::SignalData> data = signal->data();
-
- if (dynamic_pointer_cast<data::Logic>(data)) {
+ if (signal->type() == ChannelType::LOGIC) {
// All logic channels share the same data segments
// All logic channels share the same data segments
- shared_ptr<data::Logic> ldata =
dynamic_pointer_cast<data::Logic>(data
);
+ shared_ptr<data::Logic> ldata =
signal->logic_data(
);
const deque< shared_ptr<data::LogicSegment> > &lsegments =
ldata->logic_segments();
const deque< shared_ptr<data::LogicSegment> > &lsegments =
ldata->logic_segments();
@@
-135,10
+132,9
@@
bool StoreSession::start()
any_segment = lsegment;
}
any_segment = lsegment;
}
- if (
dynamic_pointer_cast<data::Analog>(data)
) {
+ if (
signal->type() == ChannelType::ANALOG
) {
// Each analog channel has its own segments
// Each analog channel has its own segments
- shared_ptr<data::Analog> adata =
- dynamic_pointer_cast<data::Analog>(data);
+ shared_ptr<data::Analog> adata = signal->analog_data();
const deque< shared_ptr<data::AnalogSegment> > &asegments =
adata->analog_segments();
const deque< shared_ptr<data::AnalogSegment> > &asegments =
adata->analog_segments();
@@
-151,7
+147,7
@@
bool StoreSession::start()
asegment_list.push_back(asegments.front());
any_segment = asegments.front();
asegment_list.push_back(asegments.front());
any_segment = asegments.front();
- achannel_list.push_back(signal
->base()
);
+ achannel_list.push_back(signal);
}
}
}
}
@@
-221,10
+217,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;
@@
-266,8
+258,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,
@@
-282,14
+272,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();
@@
-304,12
+297,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