Don't use std:: in the code directly (where possible).

[pulseview.git] / pv / binding / device.cpp

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 6f9788932c8dd0d4377d98771cee69ad6b6760e3..fe08d2b4ab48a8c91e1543ee971ea398ae6eda4e 100644 (file)
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -14,11 +14,10 @@
  * 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 <stdint.h>
+#include <cstdint>
 
 #include <QDebug>
 
@@ -32,9 +31,11 @@
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::optional;
+
 using std::function;
 using std::make_pair;
 using std::pair;
+using std::set;
 using std::shared_ptr;
 using std::string;
 using std::vector;
@@ -56,17 +57,12 @@ namespace binding {
 Device::Device(shared_ptr<sigrok::Configurable> configurable) :
        configurable_(configurable)
 {
-       std::map< const ConfigKey*, std::set<Capability> > keys;
 
-       try {
-               keys = configurable->config_keys(ConfigKey::DEVICE_OPTIONS);
-       } catch (const Error) {
-               return;
-       }
+       auto keys = configurable->config_keys();
 
-       for (auto entry : keys) {
-               auto key = entry.first;
-               auto capabilities = entry.second;
+       for (auto key : keys) {
+
+               auto capabilities = configurable->config_capabilities(key);
 
                if (!capabilities.count(Capability::GET) ||
                        !capabilities.count(Capability::SET))
@@ -88,8 +84,7 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
                        config_changed();
                };
 
-               switch (key->id())
-               {
+               switch (key->id()) {
                case SR_CONF_SAMPLERATE:
                        // Sample rate values are not bound because they are shown
                        // in the MainBar
@@ -104,12 +99,12 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
                case SR_CONF_BUFFERSIZE:
                case SR_CONF_TRIGGER_SOURCE:
                case SR_CONF_TRIGGER_SLOPE:
-               case SR_CONF_FILTER:
                case SR_CONF_COUPLING:
                case SR_CONF_CLOCK_EDGE:
                        bind_enum(name, key, capabilities, get, set);
                        break;
 
+               case SR_CONF_FILTER:
                case SR_CONF_EXTERNAL_CLOCK:
                case SR_CONF_RLE:
                case SR_CONF_POWER_OFF:
@@ -129,7 +124,10 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
                        break;
 
                case SR_CONF_PROBE_FACTOR:
-                       bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
+                       if (capabilities.count(Capability::LIST))
+                               bind_enum(name, key, capabilities, get, set, print_probe_factor);
+                       else
+                               bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
                        break;
 
                default:
@@ -147,7 +145,7 @@ void Device::bind_bool(const QString &name,
 }
 
 void Device::bind_enum(const QString &name,
-       const ConfigKey *key, std::set<Capability> capabilities,
+       const ConfigKey *key, set<const Capability *> capabilities,
        Property::Getter getter,
        Property::Setter setter, function<QString (Glib::VariantBase)> printer)
 {
@@ -168,7 +166,7 @@ void Device::bind_enum(const QString &name,
 }
 
 void Device::bind_int(const QString &name, QString suffix,
-       optional< std::pair<int64_t, int64_t> > range,
+       optional< pair<int64_t, int64_t> > range,
        Property::Getter getter, Property::Setter setter)
 {
        assert(configurable_);
@@ -181,7 +179,7 @@ QString Device::print_timebase(Glib::VariantBase gvar)
 {
        uint64_t p, q;
        g_variant_get(gvar.gobj(), "(tt)", &p, &q);
-       return QString::fromUtf8(sr_period_string(p * q));
+       return QString::fromUtf8(sr_period_string(p, q));
 }
 
 QString Device::print_vdiv(Glib::VariantBase gvar)
@@ -198,5 +196,12 @@ QString Device::print_voltage_threshold(Glib::VariantBase gvar)
        return QString("L<%1V H>%2V").arg(lo, 0, 'f', 1).arg(hi, 0, 'f', 1);
 }
 
+QString Device::print_probe_factor(Glib::VariantBase gvar)
+{
+       uint64_t factor;
+       factor = g_variant_get_uint64(gvar.gobj());
+       return QString("%1x").arg(factor);
+}
+
 } // binding
 } // pv