mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-18 03:52:11 +01:00
OP-9 GCS/uavobjectbrowser: Refactoring.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@599 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
23ed286883
commit
ea108813ab
@ -122,10 +122,47 @@ class IntFieldTreeItem : public FieldTreeItem
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
IntFieldTreeItem(int index, const QList<QVariant> &data, int min, int max, TreeItem *parent = 0) :
|
||||
FieldTreeItem(index, data, parent), m_minValue(min), m_maxValue(max) { }
|
||||
IntFieldTreeItem(int index, const QVariant &data, int min, int max, TreeItem *parent = 0) :
|
||||
FieldTreeItem(index, data, parent), m_minValue(min), m_maxValue(max) { }
|
||||
IntFieldTreeItem(UAVObjectField *field, int index, const QList<QVariant> &data, TreeItem *parent = 0) :
|
||||
FieldTreeItem(index, data, parent), m_field(field) {
|
||||
setMinMaxValues();
|
||||
}
|
||||
IntFieldTreeItem(UAVObjectField *field, int index, const QVariant &data, TreeItem *parent = 0) :
|
||||
FieldTreeItem(index, data, parent), m_field(field) {
|
||||
setMinMaxValues();
|
||||
}
|
||||
|
||||
void setMinMaxValues() {
|
||||
switch (m_field->getType()) {
|
||||
case UAVObjectField::INT8:
|
||||
m_minValue = QINT8MIN;
|
||||
m_maxValue = QINT8MAX;
|
||||
break;
|
||||
case UAVObjectField::INT16:
|
||||
m_minValue = QINT16MIN;
|
||||
m_maxValue = QINT16MAX;
|
||||
break;
|
||||
case UAVObjectField::INT32:
|
||||
m_minValue = QINT32MIN;
|
||||
m_maxValue = QINT32MAX;
|
||||
break;
|
||||
case UAVObjectField::UINT8:
|
||||
m_minValue = QUINTMIN;
|
||||
m_maxValue = QUINT8MAX;
|
||||
break;
|
||||
case UAVObjectField::UINT16:
|
||||
m_minValue = QUINTMIN;
|
||||
m_maxValue = QUINT16MAX;
|
||||
break;
|
||||
case UAVObjectField::UINT32:
|
||||
m_minValue = QUINTMIN;
|
||||
m_maxValue = QUINT32MAX;
|
||||
break;
|
||||
default:
|
||||
Q_ASSERT(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
QWidget *createEditor(QWidget *parent) {
|
||||
QSpinBox *editor = new QSpinBox(parent);
|
||||
editor->setMinimum(m_minValue);
|
||||
@ -143,174 +180,28 @@ public:
|
||||
QSpinBox *spinBox = static_cast<QSpinBox*>(editor);
|
||||
spinBox->setValue(value.toInt());
|
||||
}
|
||||
void setData(QVariant value, int column) {
|
||||
setChanged(m_field->getValue(m_index) != value);
|
||||
TreeItem::setData(value, column);
|
||||
}
|
||||
void apply() {
|
||||
m_field->setValue(data(dataColumn).toInt(), m_index);
|
||||
setChanged(false);
|
||||
}
|
||||
void update() {
|
||||
int value = m_field->getValue(m_index).toInt();
|
||||
if (data() != value || changed()) {
|
||||
TreeItem::setData(value);
|
||||
setHighlight(true);
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
UAVObjectField *m_field;
|
||||
int m_minValue;
|
||||
int m_maxValue;
|
||||
};
|
||||
|
||||
class Int8FieldTreeItem : public IntFieldTreeItem
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Int8FieldTreeItem(UAVObjectField *field, int index, const QList<QVariant> &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QINT8MIN, QINT8MAX, parent), m_field(field) { }
|
||||
Int8FieldTreeItem(UAVObjectField *field, int index, const QVariant &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QINT8MIN, QINT8MAX, parent), m_field(field) { }
|
||||
void setData(QVariant value, int column) {
|
||||
setChanged(m_field->getValue(m_index) != value);
|
||||
TreeItem::setData(value, column);
|
||||
}
|
||||
void apply() {
|
||||
m_field->setValue(data(dataColumn).toInt(), m_index);
|
||||
setChanged(false);
|
||||
}
|
||||
void update() {
|
||||
int value = m_field->getValue(m_index).toInt();
|
||||
if (data() != value || changed()) {
|
||||
TreeItem::setData(value);
|
||||
setHighlight(true);
|
||||
}
|
||||
}
|
||||
private:
|
||||
UAVObjectField *m_field;
|
||||
};
|
||||
|
||||
class Int16FieldTreeItem : public IntFieldTreeItem
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Int16FieldTreeItem(UAVObjectField *field, int index, const QList<QVariant> &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QINT16MIN, QINT16MAX, parent), m_field(field) { }
|
||||
Int16FieldTreeItem(UAVObjectField *field, int index, const QVariant &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QINT16MIN, QINT16MAX, parent), m_field(field) { }
|
||||
void setData(QVariant value, int column) {
|
||||
setChanged(m_field->getValue(m_index) != value);
|
||||
TreeItem::setData(value, column);
|
||||
}
|
||||
void apply() {
|
||||
m_field->setValue(data(dataColumn).toInt(), m_index);
|
||||
setChanged(false);
|
||||
}
|
||||
void update() {
|
||||
int value = m_field->getValue(m_index).toInt();
|
||||
if (data() != value || changed()) {
|
||||
TreeItem::setData(value);
|
||||
setHighlight(true);
|
||||
}
|
||||
}
|
||||
private:
|
||||
UAVObjectField *m_field;
|
||||
};
|
||||
|
||||
class Int32FieldTreeItem : public IntFieldTreeItem
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Int32FieldTreeItem(UAVObjectField *field, int index, const QList<QVariant> &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QINT32MIN, QINT32MAX, parent), m_field(field) { }
|
||||
Int32FieldTreeItem(UAVObjectField *field, int index, const QVariant &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QINT32MIN, QINT32MAX, parent), m_field(field) { }
|
||||
void setData(QVariant value, int column) {
|
||||
setChanged(m_field->getValue(m_index) != value);
|
||||
TreeItem::setData(value, column);
|
||||
}
|
||||
void apply() {
|
||||
m_field->setValue(data(dataColumn).toInt(), m_index);
|
||||
setChanged(false);
|
||||
}
|
||||
void update() {
|
||||
int value = m_field->getValue(m_index).toInt();
|
||||
if (data() != value || changed()) {
|
||||
TreeItem::setData(value);
|
||||
setHighlight(true);
|
||||
}
|
||||
}
|
||||
private:
|
||||
UAVObjectField *m_field;
|
||||
};
|
||||
|
||||
class UInt8FieldTreeItem : public IntFieldTreeItem
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
UInt8FieldTreeItem(UAVObjectField *field, int index, const QList<QVariant> &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QUINTMIN, QUINT8MAX, parent), m_field(field) { }
|
||||
UInt8FieldTreeItem(UAVObjectField *field, int index, const QVariant &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QUINTMIN, QUINT8MAX, parent), m_field(field) { }
|
||||
void setData(QVariant value, int column) {
|
||||
setChanged(m_field->getValue(m_index) != value);
|
||||
TreeItem::setData(value, column);
|
||||
}
|
||||
void apply() {
|
||||
m_field->setValue(data(dataColumn).toInt(), m_index);
|
||||
setChanged(false);
|
||||
}
|
||||
void update() {
|
||||
int value = m_field->getValue(m_index).toInt();
|
||||
if (data() != value || changed()) {
|
||||
TreeItem::setData(value);
|
||||
setHighlight(true);
|
||||
}
|
||||
}
|
||||
private:
|
||||
UAVObjectField *m_field;
|
||||
};
|
||||
|
||||
class UInt16FieldTreeItem : public IntFieldTreeItem
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
UInt16FieldTreeItem(UAVObjectField *field, int index, const QList<QVariant> &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QUINTMIN, QUINT16MAX, parent), m_field(field) { }
|
||||
UInt16FieldTreeItem(UAVObjectField *field, int index, const QVariant &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QUINTMIN, QUINT16MAX, parent), m_field(field) { }
|
||||
void setData(QVariant value, int column) {
|
||||
setChanged(m_field->getValue(m_index) != value);
|
||||
TreeItem::setData(value, column);
|
||||
}
|
||||
void apply() {
|
||||
m_field->setValue(data(dataColumn).toInt(), m_index);
|
||||
setChanged(false);
|
||||
}
|
||||
void update() {
|
||||
int value = m_field->getValue(m_index).toInt();
|
||||
if (data() != value || changed()) {
|
||||
TreeItem::setData(value);
|
||||
setHighlight(true);
|
||||
}
|
||||
}
|
||||
private:
|
||||
UAVObjectField *m_field;
|
||||
};
|
||||
|
||||
class UInt32FieldTreeItem : public IntFieldTreeItem
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
UInt32FieldTreeItem(UAVObjectField *field, int index, const QList<QVariant> &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QUINTMIN, QUINT32MAX, parent), m_field(field) { }
|
||||
UInt32FieldTreeItem(UAVObjectField *field, int index, const QVariant &data, TreeItem *parent = 0) :
|
||||
IntFieldTreeItem(index, data, QUINTMIN, QUINT32MAX, parent), m_field(field) { }
|
||||
void setData(QVariant value, int column) {
|
||||
setChanged(m_field->getValue(m_index) != value);
|
||||
TreeItem::setData(value, column);
|
||||
}
|
||||
void apply() {
|
||||
m_field->setValue(data(dataColumn).toInt(), m_index);
|
||||
setChanged(false);
|
||||
}
|
||||
void update() {
|
||||
int value = m_field->getValue(m_index).toInt();
|
||||
if (data() != value || changed()) {
|
||||
TreeItem::setData(value);
|
||||
setHighlight(true);
|
||||
}
|
||||
}
|
||||
private:
|
||||
UAVObjectField *m_field;
|
||||
};
|
||||
|
||||
|
||||
class FloatFieldTreeItem : public FieldTreeItem
|
||||
{
|
||||
Q_OBJECT
|
||||
|
@ -165,41 +165,31 @@ void UAVObjectTreeModel::addSingleField(int index, UAVObjectField *field, TreeIt
|
||||
|
||||
FieldTreeItem *item;
|
||||
UAVObjectField::FieldType type = field->getType();
|
||||
if (type == UAVObjectField::ENUM) {
|
||||
switch (type) {
|
||||
case UAVObjectField::ENUM: {
|
||||
QStringList options = field->getOptions();
|
||||
QVariant value = field->getValue();
|
||||
data.append( options.indexOf(value.toString()) );
|
||||
data.append(field->getUnits());
|
||||
item = new EnumFieldTreeItem(field, index, data);
|
||||
} else if (type == UAVObjectField::INT8) {
|
||||
break;
|
||||
}
|
||||
case UAVObjectField::INT8:
|
||||
case UAVObjectField::INT16:
|
||||
case UAVObjectField::INT32:
|
||||
case UAVObjectField::UINT8:
|
||||
case UAVObjectField::UINT16:
|
||||
case UAVObjectField::UINT32:
|
||||
data.append(field->getValue(index));
|
||||
data.append(field->getUnits());
|
||||
item = new Int8FieldTreeItem(field, index, data);
|
||||
} else if (type == UAVObjectField::INT16) {
|
||||
data.append(field->getValue(index));
|
||||
data.append(field->getUnits());
|
||||
item = new Int16FieldTreeItem(field, index, data);
|
||||
} else if (type == UAVObjectField::INT32) {
|
||||
data.append(field->getValue(index));
|
||||
data.append(field->getUnits());
|
||||
item = new Int32FieldTreeItem(field, index, data);
|
||||
} else if (type == UAVObjectField::UINT8) {
|
||||
data.append(field->getValue(index));
|
||||
data.append(field->getUnits());
|
||||
item = new UInt8FieldTreeItem(field, index, data);
|
||||
} else if (type == UAVObjectField::UINT16) {
|
||||
data.append(field->getValue(index));
|
||||
data.append(field->getUnits());
|
||||
item = new UInt16FieldTreeItem(field, index, data);
|
||||
} else if (type == UAVObjectField::UINT32) {
|
||||
data.append(field->getValue(index));
|
||||
data.append(field->getUnits());
|
||||
item = new UInt32FieldTreeItem(field, index, data);
|
||||
} else if (type == UAVObjectField::FLOAT32) {
|
||||
item = new IntFieldTreeItem(field, index, data);
|
||||
break;
|
||||
case UAVObjectField::FLOAT32:
|
||||
data.append(field->getValue(index));
|
||||
data.append(field->getUnits());
|
||||
item = new FloatFieldTreeItem(field, index, data);
|
||||
} else {
|
||||
break;
|
||||
default:
|
||||
Q_ASSERT(false);
|
||||
}
|
||||
connect(item, SIGNAL(updateHighlight(TreeItem*)), this, SLOT(updateHighlight(TreeItem*)));
|
||||
|
Loading…
x
Reference in New Issue
Block a user