projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #709 by deriving row/ann colors from the channel color
[pulseview.git]
/
pv
/
prop
/
int.cpp
diff --git
a/pv/prop/int.cpp
b/pv/prop/int.cpp
index 45113ac73e6e8954aeb6b05f5b4a2ffce5ca6f23..2930a3ea1e8c96b5d0091e6c2b640050ecb5d09f 100644
(file)
--- a/
pv/prop/int.cpp
+++ b/
pv/prop/int.cpp
@@
-14,16
+14,15
@@
* 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 <
assert.h
>
+#include <
cassert
>
+#include <
cstdint
>
#include <QSpinBox>
#include <QSpinBox>
-#include "int.h"
+#include "int.h
pp
"
using boost::optional;
using std::max;
using boost::optional;
using std::max;
@@
-34,142
+33,124
@@
namespace pv {
namespace prop {
Int::Int(QString name,
namespace prop {
Int::Int(QString name,
+ QString desc,
QString suffix,
optional< pair<int64_t, int64_t> > range,
Getter getter,
Setter setter) :
QString suffix,
optional< pair<int64_t, int64_t> > range,
Getter getter,
Setter setter) :
- Property(name, getter, setter),
- _suffix(suffix),
- _range(range),
- _spin_box(NULL)
-{
-}
-
-Int::~Int()
+ Property(name, desc, getter, setter),
+ suffix_(suffix),
+ range_(range),
+ spin_box_(nullptr)
{
}
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
{
{
}
QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
{
- int64_t int_val = 0, range_min = 0, range_max = 0;
+ int64_t int_val = 0, range_min = 0;
+ uint64_t range_max = 0;
- if (
_spin_box
)
- return
_spin_box
;
+ if (
spin_box_
)
+ return
spin_box_
;
- if (!
_getter
)
- return
NULL
;
+ if (!
getter_
)
+ return
nullptr
;
-
_value = _getter
();
+
value_ = getter_
();
- GVariant *value =
_value
.gobj();
+ GVariant *value =
value_
.gobj();
if (!value)
if (!value)
- return
NULL
;
+ return
nullptr
;
-
_spin_box
= new QSpinBox(parent);
-
_spin_box->setSuffix(_suffix
);
+
spin_box_
= new QSpinBox(parent);
+
spin_box_->setSuffix(suffix_
);
const GVariantType *const type = g_variant_get_type(value);
assert(type);
const GVariantType *const type = g_variant_get_type(value);
assert(type);
- if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
- {
+ if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE)) {
int_val = g_variant_get_byte(value);
range_min = 0, range_max = UINT8_MAX;
int_val = g_variant_get_byte(value);
range_min = 0, range_max = UINT8_MAX;
- }
- else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
- {
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16)) {
int_val = g_variant_get_int16(value);
range_min = INT16_MIN, range_max = INT16_MAX;
int_val = g_variant_get_int16(value);
range_min = INT16_MIN, range_max = INT16_MAX;
- }
- else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
- {
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16)) {
int_val = g_variant_get_uint16(value);
range_min = 0, range_max = UINT16_MAX;
int_val = g_variant_get_uint16(value);
range_min = 0, range_max = UINT16_MAX;
- }
- else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
- {
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32)) {
int_val = g_variant_get_int32(value);
range_min = INT32_MIN, range_max = INT32_MAX;
int_val = g_variant_get_int32(value);
range_min = INT32_MIN, range_max = INT32_MAX;
- }
- else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
- {
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32)) {
int_val = g_variant_get_uint32(value);
range_min = 0, range_max = UINT32_MAX;
int_val = g_variant_get_uint32(value);
range_min = 0, range_max = UINT32_MAX;
- }
- else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
- {
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64)) {
int_val = g_variant_get_int64(value);
range_min = INT64_MIN, range_max = INT64_MAX;
int_val = g_variant_get_int64(value);
range_min = INT64_MIN, range_max = INT64_MAX;
- }
- else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
- {
+ } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64)) {
int_val = g_variant_get_uint64(value);
range_min = 0, range_max = UINT64_MAX;
int_val = g_variant_get_uint64(value);
range_min = 0, range_max = UINT64_MAX;
- }
- else
- {
+ } else {
// Unexpected value type.
// Unexpected value type.
- assert(
0
);
+ assert(
false
);
}
}
- // @todo
S
igrok supports 64-bit quantities, but Qt does not have a
+ // @todo
s
igrok supports 64-bit quantities, but Qt does not have a
// standard widget to allow the values to be modified over the full
// 64-bit range on 32-bit machines. To solve the issue we need a
// custom widget.
range_min = max(range_min, (int64_t)INT_MIN);
// standard widget to allow the values to be modified over the full
// 64-bit range on 32-bit machines. To solve the issue we need a
// custom widget.
range_min = max(range_min, (int64_t)INT_MIN);
- range_max = min(range_max, (int64_t)INT_MAX);
+ range_max = min(range_max, (
u
int64_t)INT_MAX);
- if (
_range
)
-
_spin_box->setRange((int)_range->first, (int)_range
->second);
+ if (
range_
)
+
spin_box_->setRange((int)range_->first, (int)range_
->second);
else
else
-
_spin_box
->setRange((int)range_min, (int)range_max);
+
spin_box_
->setRange((int)range_min, (int)range_max);
-
_spin_box
->setValue((int)int_val);
+
spin_box_
->setValue((int)int_val);
if (auto_commit)
if (auto_commit)
- connect(
_spin_box
, SIGNAL(valueChanged(int)),
+ connect(
spin_box_
, SIGNAL(valueChanged(int)),
this, SLOT(on_value_changed(int)));
this, SLOT(on_value_changed(int)));
- return
_spin_box
;
+ return
spin_box_
;
}
void Int::commit()
{
}
void Int::commit()
{
- assert(
_setter
);
+ assert(
setter_
);
- if (!
_spin_box
)
+ if (!
spin_box_
)
return;
return;
- GVariant *new_value =
NULL
;
- const GVariantType *const type = g_variant_get_type(
_value
.gobj());
+ GVariant *new_value =
nullptr
;
+ const GVariantType *const type = g_variant_get_type(
value_
.gobj());
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
assert(type);
if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE))
- new_value = g_variant_new_byte(
_spin_box
->value());
+ new_value = g_variant_new_byte(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16))
- new_value = g_variant_new_int16(
_spin_box
->value());
+ new_value = g_variant_new_int16(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16))
- new_value = g_variant_new_uint16(
_spin_box
->value());
+ new_value = g_variant_new_uint16(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32))
- new_value = g_variant_new_int32(
_spin_box
->value());
+ new_value = g_variant_new_int32(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32))
- new_value = g_variant_new_
int32(_spin_box
->value());
+ new_value = g_variant_new_
uint32(spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64))
- new_value = g_variant_new_int64(
_spin_box
->value());
+ new_value = g_variant_new_int64(
spin_box_
->value());
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64))
- new_value = g_variant_new_uint64(_spin_box->value());
- else
- {
+ new_value = g_variant_new_uint64(spin_box_->value());
+ else {
// Unexpected value type.
// Unexpected value type.
- assert(
0
);
+ assert(
false
);
}
assert(new_value);
}
assert(new_value);
-
_value
= Glib::VariantBase(new_value);
+
value_
= Glib::VariantBase(new_value);
-
_setter(_value
);
+
setter_(value_
);
}
void Int::on_value_changed(int)
}
void Int::on_value_changed(int)
@@
-177,5
+158,5
@@
void Int::on_value_changed(int)
commit();
}
commit();
}
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv