projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
devices::Device: Moved in full_name and display_name
[pulseview.git]
/
pv
/
devices
/
sessionfile.cpp
diff --git
a/pv/devices/sessionfile.cpp
b/pv/devices/sessionfile.cpp
index 4ca982ae7cf4f3897dbf83778faecf3ff0a08dfd..687c52bdcd5a225a29d1cdfaeffac104b7c4c9a3 100644
(file)
--- a/
pv/devices/sessionfile.cpp
+++ b/
pv/devices/sessionfile.cpp
@@
-20,6
+20,8
@@
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
+#include <boost/filesystem.hpp>
+
#include "sessionfile.hpp"
namespace pv {
#include "sessionfile.hpp"
namespace pv {
@@
-31,6
+33,14
@@
SessionFile::SessionFile(const std::shared_ptr<sigrok::Context> &context,
file_name_(file_name) {
}
file_name_(file_name) {
}
+std::string SessionFile::full_name() const {
+ return boost::filesystem::path(file_name_).filename().string();
+}
+
+std::string SessionFile::display_name(const DeviceManager&) const {
+ return SessionFile::full_name();
+}
+
void SessionFile::create() {
session_ = context_->load_session(file_name_);
device_ = session_->devices()[0];
void SessionFile::create() {
session_ = context_->load_session(file_name_);
device_ = session_->devices()[0];