Update sr_period_string usage

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

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 224bc23a11079ea4593230a4637a2ff947e6886c..2253e70dc4fe97261267dee8411a5bb43e95f18b 100644 (file)
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -14,8 +14,7 @@
  * 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>
@@ -56,21 +55,17 @@ namespace binding {
 Device::Device(shared_ptr<sigrok::Configurable> configurable) :
        configurable_(configurable)
 {
-       assert(configurable);
 
-       for (auto entry : configurable->config_keys(ConfigKey::DEVICE_OPTIONS)) {
-               auto key = entry.first;
-               auto capabilities = entry.second;
+       auto keys = configurable->config_keys();
 
-               Glib::VariantContainerBase gvar_list;
+       for (auto key : keys) {
+
+               auto capabilities = configurable->config_capabilities(key);
 
                if (!capabilities.count(Capability::GET) ||
                        !capabilities.count(Capability::SET))
                        continue;
 
-               if (capabilities.count(Capability::LIST))
-                       gvar_list = configurable->config_list(key);
-
                string name_str;
                try {
                        name_str = key->description();
@@ -87,8 +82,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
@@ -103,27 +97,35 @@ 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, gvar_list, get, set);
+                       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:
                        bind_bool(name, get, set);
                        break;
 
                case SR_CONF_TIMEBASE:
-                       bind_enum(name, gvar_list, get, set, print_timebase);
+                       bind_enum(name, key, capabilities, get, set, print_timebase);
                        break;
 
                case SR_CONF_VDIV:
-                       bind_enum(name, gvar_list, get, set, print_vdiv);
+                       bind_enum(name, key, capabilities, get, set, print_vdiv);
                        break;
 
                case SR_CONF_VOLTAGE_THRESHOLD:
-                       bind_enum(name, gvar_list, get, set, print_voltage_threshold);
+                       bind_enum(name, key, capabilities, get, set, print_voltage_threshold);
+                       break;
+
+               case SR_CONF_PROBE_FACTOR:
+                       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:
@@ -141,7 +143,8 @@ void Device::bind_bool(const QString &name,
 }
 
 void Device::bind_enum(const QString &name,
-       Glib::VariantContainerBase gvar_list, Property::Getter getter,
+       const ConfigKey *key, std::set<const Capability *> capabilities,
+       Property::Getter getter,
        Property::Setter setter, function<QString (Glib::VariantBase)> printer)
 {
        Glib::VariantBase gvar;
@@ -149,7 +152,10 @@ void Device::bind_enum(const QString &name,
 
        assert(configurable_);
 
-       Glib::VariantIter iter(gvar_list);
+       if (!capabilities.count(Capability::LIST))
+               return;
+
+       Glib::VariantIter iter(configurable_->config_list(key));
        while ((iter.next_value(gvar)))
                values.push_back(make_pair(gvar, printer(gvar)));
 
@@ -171,7 +177,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)
@@ -188,5 +194,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