projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a tooltip for the "Show/hide decoder trace" icon.
[pulseview.git]
/
pv
/
dialogs
/
storeprogress.cpp
diff --git
a/pv/dialogs/storeprogress.cpp
b/pv/dialogs/storeprogress.cpp
index a7f889e07940573c775bfbed361ec5b0823b161a..09b6b0f4ca61236f90815a90b7a1337faba837cf 100644
(file)
--- a/
pv/dialogs/storeprogress.cpp
+++ b/
pv/dialogs/storeprogress.cpp
@@
-14,17
+14,20
@@
* 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 <QMessageBox>
*/
#include <cassert>
#include <QMessageBox>
+#include "pv/session.hpp"
+
#include "storeprogress.hpp"
using std::map;
#include "storeprogress.hpp"
using std::map;
+using std::pair;
+using std::shared_ptr;
using std::string;
using Glib::VariantBase;
using std::string;
using Glib::VariantBase;
@@
-33,14
+36,18
@@
namespace pv {
namespace dialogs {
StoreProgress::StoreProgress(const QString &file_name,
namespace dialogs {
StoreProgress::StoreProgress(const QString &file_name,
- const s
td::s
hared_ptr<sigrok::OutputFormat> output_format,
+ const shared_ptr<sigrok::OutputFormat> output_format,
const map<string, VariantBase> &options,
const map<string, VariantBase> &options,
+ const pair<uint64_t, uint64_t> sample_range,
const Session &session, QWidget *parent) :
QProgressDialog(tr("Saving..."), tr("Cancel"), 0, 0, parent),
const Session &session, QWidget *parent) :
QProgressDialog(tr("Saving..."), tr("Cancel"), 0, 0, parent),
- session_(file_name.toStdString(), output_format, options, session)
+ session_(file_name.toStdString(), output_format, options, sample_range,
+ session)
{
connect(&session_, SIGNAL(progress_updated()),
this, SLOT(on_progress_updated()));
{
connect(&session_, SIGNAL(progress_updated()),
this, SLOT(on_progress_updated()));
+ connect(&session_, SIGNAL(store_successful()),
+ &session, SLOT(on_data_saved()));
}
StoreProgress::~StoreProgress()
}
StoreProgress::~StoreProgress()
@@
-73,7
+80,7
@@
void StoreProgress::closeEvent(QCloseEvent*)
void StoreProgress::on_progress_updated()
{
void StoreProgress::on_progress_updated()
{
- const
std::
pair<int, int> p = session_.progress();
+ const pair<int, int> p = session_.progress();
assert(p.first <= p.second);
if (p.second) {
assert(p.first <= p.second);
if (p.second) {
@@
-87,5
+94,5
@@
void StoreProgress::on_progress_updated()
}
}
}
}
-}
//
dialogs
-}
//
pv
+}
// namespace
dialogs
+}
// namespace
pv