projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only show sampling points when zoomed in far enough.
[pulseview.git]
/
pv
/
binding
/
device.cpp
diff --git
a/pv/binding/device.cpp
b/pv/binding/device.cpp
index 27a1a38adee15877bb1c0eefe162a4566fa9b7d5..8ef05f05bcfa20baaf608e9975a6beeadaa666cc 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
* 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>
#include <QDebug>
@@
-123,7
+122,10
@@
Device::Device(shared_ptr<sigrok::Configurable> configurable) :
break;
case SR_CONF_PROBE_FACTOR:
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:
break;
default:
@@
-175,7
+177,7
@@
QString Device::print_timebase(Glib::VariantBase gvar)
{
uint64_t p, q;
g_variant_get(gvar.gobj(), "(tt)", &p, &q);
{
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)
}
QString Device::print_vdiv(Glib::VariantBase gvar)
@@
-192,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);
}
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
} // binding
} // pv