* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <assert.h>
+#include <extdef.h>
-#include <boost/foreach.hpp>
+#include <assert.h>
-extern "C" {
#include <libsigrok/libsigrok.h>
-}
#include <QAction>
#include "samplingbar.h"
-#include <pv/dialogs/hwcap.h>
+#include <pv/dialogs/deviceoptions.h>
namespace pv {
-const uint64_t SamplingBar::RecordLengths[11] = {
+const uint64_t SamplingBar::RecordLengths[20] = {
+ 1000,
+ 2500,
+ 5000,
+ 10000,
+ 25000,
+ 50000,
+ 100000,
+ 250000,
+ 500000,
1000000,
2000000,
5000000,
250000000,
500000000,
1000000000,
- 10000000000
+ 10000000000ULL,
};
+const uint64_t SamplingBar::DefaultRecordLength = 1000000;
+
SamplingBar::SamplingBar(QWidget *parent) :
QToolBar("Sampling Bar", parent),
_device_selector(this),
_configure_button(this),
_record_length_selector(this),
_sample_rate_list(this),
+ _icon_green(":/icons/status-green.svg"),
+ _icon_grey(":/icons/status-grey.svg"),
_run_stop_button(this)
{
connect(&_run_stop_button, SIGNAL(clicked()),
_sample_rate_value.setDecimals(0);
_sample_rate_value.setSuffix("Hz");
- BOOST_FOREACH(uint64_t l, RecordLengths)
+ for(size_t i = 0; i < countof(RecordLengths); i++)
{
+ const uint64_t &l = RecordLengths[i];
char *const text = sr_si_string_u64(l, " samples");
_record_length_selector.addItem(QString(text),
qVariantFromValue(l));
g_free(text);
+
+ if(l == DefaultRecordLength)
+ _record_length_selector.setCurrentIndex(i);
}
set_sampling(false);
- _configure_button.setIcon(QIcon::fromTheme("configure"));
+ _configure_button.setIcon(QIcon::fromTheme("configure",
+ QIcon(":/icons/configure.png")));
+
+ _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
addWidget(&_device_selector);
addWidget(&_configure_button);
void SamplingBar::set_sampling(bool sampling)
{
+ _run_stop_button.setIcon(sampling ? _icon_green : _icon_grey);
_run_stop_button.setText(sampling ? "Stop" : "Run");
}
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
- if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+ if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
(const void **)&samplerates, sdi) != SR_OK)
return;
sr_dev_inst *const sdi = get_selected_device();
assert(sdi);
- pv::dialogs::HwCap dlg(this, sdi);
+ pv::dialogs::DeviceOptions dlg(this, sdi);
dlg.exec();
}