BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bindings: Add Session::filename() and corresponding SWIG attribute.

This commit is contained in:
Martin Ling 2014-10-12 17:53:10 +01:00 committed by Bert Vermeulen
parent 73a1eb017b
commit 1411f7d8e9
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bindings/cxx/classes.cpp
View File

@ -1071,6 +1071,11 @@ void Session::set_trigger(shared_ptr<Trigger> trigger)
_trigger = trigger; _trigger = trigger;
} }
string Session::filename()
{
return _filename;
}
Packet::Packet(shared_ptr<Device> device, Packet::Packet(shared_ptr<Device> device,
const struct sr_datafeed_packet *structure) : const struct sr_datafeed_packet *structure) :
UserOwned(structure), UserOwned(structure),

2
bindings/cxx/include/libsigrok/libsigrok.hpp
View File

@ -672,6 +672,8 @@ public:
/** Set trigger setting. /** Set trigger setting.
* @param trigger Trigger object to use. */ * @param trigger Trigger object to use. */
void set_trigger(shared_ptr<Trigger> trigger); void set_trigger(shared_ptr<Trigger> trigger);
/** Get filename this session was loaded from. */
string filename();
protected: protected:
Session(shared_ptr<Context> context); Session(shared_ptr<Context> context);
Session(shared_ptr<Context> context, string filename); Session(shared_ptr<Context> context, string filename);

2
bindings/swig/classes.i
View File

@ -257,6 +257,8 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
%attributestring(sigrok::Session, %attributestring(sigrok::Session,
std::shared_ptr<sigrok::Trigger>, trigger, trigger, set_trigger); std::shared_ptr<sigrok::Trigger>, trigger, trigger, set_trigger);
%attributestring(sigrok::Session, std::string, filename, filename);
%attribute(sigrok::Packet, %attribute(sigrok::Packet,
const sigrok::PacketType *, type, type); const sigrok::PacketType *, type, type);
%attributestring(sigrok::Packet, %attributestring(sigrok::Packet,