Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
512922c9
Commit
512922c9
authored
Apr 29, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New ListModel for Fact meta data base increment/decrement
parent
d067e6f9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
177 additions
and
2 deletions
+177
-2
qgroundcontrol.pro
qgroundcontrol.pro
+2
-2
FactValueSliderListModel.cc
src/FactSystem/FactValueSliderListModel.cc
+125
-0
FactValueSliderListModel.h
src/FactSystem/FactValueSliderListModel.h
+48
-0
QGCApplication.cc
src/QGCApplication.cc
+2
-0
No files found.
qgroundcontrol.pro
View file @
512922c9
...
...
@@ -1057,7 +1057,7 @@ HEADERS += \
src
/
FactSystem
/
FactGroup
.
h
\
src
/
FactSystem
/
FactMetaData
.
h
\
src
/
FactSystem
/
FactSystem
.
h
\
src
/
FactSystem
/
FactVal
idator
.
h
\
src
/
FactSystem
/
FactVal
ueSliderListModel
.
h
\
src
/
FactSystem
/
ParameterManager
.
h
\
src
/
FactSystem
/
SettingsFact
.
h
\
...
...
@@ -1067,7 +1067,7 @@ SOURCES += \
src
/
FactSystem
/
FactGroup
.
cc
\
src
/
FactSystem
/
FactMetaData
.
cc
\
src
/
FactSystem
/
FactSystem
.
cc
\
src
/
FactSystem
/
FactVal
idator
.
cc
\
src
/
FactSystem
/
FactVal
ueSliderListModel
.
cc
\
src
/
FactSystem
/
ParameterManager
.
cc
\
src
/
FactSystem
/
SettingsFact
.
cc
\
...
...
src/FactSystem/FactValueSliderListModel.cc
0 → 100644
View file @
512922c9
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#include "FactValueSliderListModel.h"
#include <QDebug>
#include <QQmlEngine>
#include <QtMath>
#include <math.h>
const
int
FactValueSliderListModel
::
_valueRole
=
Qt
::
UserRole
;
const
int
FactValueSliderListModel
::
_valueIndexRole
=
Qt
::
UserRole
+
1
;
FactValueSliderListModel
::
FactValueSliderListModel
(
Fact
&
fact
,
QObject
*
parent
)
:
QAbstractListModel
(
parent
)
,
_fact
(
fact
)
,
_cValues
(
0
)
,
_firstValueIndexInWindow
(
0
)
,
_initialValueIndex
(
0
)
,
_cPrevValues
(
0
)
,
_cNextValues
(
0
)
,
_initialValue
(
0
)
,
_initialValueRounded
(
0
)
,
_increment
(
0
)
{
}
FactValueSliderListModel
::~
FactValueSliderListModel
()
{
}
int
FactValueSliderListModel
::
resetInitialValue
(
void
)
{
// Remove any old rows
beginRemoveRows
(
QModelIndex
(),
0
,
_cValues
-
1
);
_cValues
=
0
;
endRemoveRows
();
_initialValue
=
_fact
.
cookedValue
().
toDouble
();
_initialValueRounded
=
qRound
(
_initialValue
);
if
(
qRound
(
_fact
.
rawIncrement
())
==
_fact
.
rawIncrement
())
{
_increment
=
qRound
(
_fact
.
cookedIncrement
());
}
else
{
_increment
=
_fact
.
cookedIncrement
();
}
_cPrevValues
=
qMin
((
_initialValue
-
_fact
.
cookedMin
().
toDouble
()),
1000.0
)
/
_increment
;
_cNextValues
=
qMin
((
_fact
.
cookedMax
().
toDouble
()
-
_initialValue
),
1000.0
)
/
_increment
;
_initialValueIndex
=
_cPrevValues
;
int
totalValueCount
=
_cPrevValues
+
1
+
_cNextValues
;
beginInsertRows
(
QModelIndex
(),
0
,
totalValueCount
-
1
);
_cValues
=
totalValueCount
;
endInsertRows
();
return
_initialValueIndex
;
}
int
FactValueSliderListModel
::
rowCount
(
const
QModelIndex
&
parent
)
const
{
Q_UNUSED
(
parent
);
return
_cValues
;
}
QVariant
FactValueSliderListModel
::
data
(
const
QModelIndex
&
index
,
int
role
)
const
{
Q_UNUSED
(
role
);
if
(
!
index
.
isValid
())
{
return
QVariant
();
}
int
valueIndex
=
index
.
row
();
if
(
valueIndex
>=
_cValues
)
{
return
QVariant
();
}
if
(
role
==
_valueRole
)
{
double
value
;
int
cIncrementCount
=
valueIndex
-
_initialValueIndex
;
if
(
cIncrementCount
==
0
)
{
value
=
_initialValue
;
}
else
{
value
=
_initialValueRounded
+
(
cIncrementCount
*
_increment
);
}
double
precision
=
qPow
(
10
,
_fact
.
decimalPlaces
());
double
atPrecision
=
qRound
(
value
*
precision
)
/
precision
;
//qDebug() << value << precision << atPrecision << _fact.decimalPlaces() << _fact.name();
return
QVariant
(
atPrecision
);
}
else
if
(
role
==
_valueIndexRole
)
{
return
QVariant
::
fromValue
(
valueIndex
);
}
else
{
return
QVariant
();
}
}
QHash
<
int
,
QByteArray
>
FactValueSliderListModel
::
roleNames
(
void
)
const
{
QHash
<
int
,
QByteArray
>
hash
;
hash
[
_valueRole
]
=
"value"
;
hash
[
_valueIndexRole
]
=
"valueIndex"
;
return
hash
;
}
double
FactValueSliderListModel
::
valueAtModelIndex
(
int
index
)
{
return
data
(
createIndex
(
index
,
0
),
_valueRole
).
toDouble
();
}
int
FactValueSliderListModel
::
valueIndexAtModelIndex
(
int
index
)
{
return
data
(
createIndex
(
index
,
0
),
_valueIndexRole
).
toInt
();
}
src/FactSystem/FactValueSliderListModel.h
0 → 100644
View file @
512922c9
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#pragma once
#include <QAbstractListModel>
#include "Fact.h"
/// Provides a list model of values for incrementing/decrementing the value of a Fact
class
FactValueSliderListModel
:
public
QAbstractListModel
{
Q_OBJECT
public:
FactValueSliderListModel
(
Fact
&
fact
,
QObject
*
parent
=
NULL
);
~
FactValueSliderListModel
();
Q_INVOKABLE
int
resetInitialValue
(
void
);
Q_INVOKABLE
double
valueAtModelIndex
(
int
index
);
Q_INVOKABLE
int
valueIndexAtModelIndex
(
int
index
);
private:
// Overrides from QAbstractListModel
int
rowCount
(
const
QModelIndex
&
parent
=
QModelIndex
())
const
override
;
QVariant
data
(
const
QModelIndex
&
index
,
int
role
=
Qt
::
DisplayRole
)
const
override
;
QHash
<
int
,
QByteArray
>
roleNames
(
void
)
const
override
;
Fact
&
_fact
;
int
_cValues
;
int
_firstValueIndexInWindow
;
int
_initialValueIndex
;
int
_cPrevValues
;
int
_cNextValues
;
int
_windowSize
;
double
_initialValue
;
double
_initialValueRounded
;
double
_increment
;
static
const
int
_valueRole
;
static
const
int
_valueIndexRole
;
};
src/QGCApplication.cc
View file @
512922c9
...
...
@@ -83,6 +83,7 @@
#include "CameraCalc.h"
#include "VisualMissionItem.h"
#include "EditPositionDialogController.h"
#include "FactValueSliderListModel.h"
#ifndef NO_SERIAL_LINK
#include "SerialLink.h"
...
...
@@ -368,6 +369,7 @@ void QGCApplication::_initCommon(void)
qmlRegisterUncreatableType
<
GeoFenceController
>
(
"QGroundControl.Controllers"
,
1
,
0
,
"GeoFenceController"
,
"Reference only"
);
qmlRegisterUncreatableType
<
RallyPointController
>
(
"QGroundControl.Controllers"
,
1
,
0
,
"RallyPointController"
,
"Reference only"
);
qmlRegisterUncreatableType
<
VisualMissionItem
>
(
"QGroundControl.Controllers"
,
1
,
0
,
"VisualMissionItem"
,
"Reference only"
);
qmlRegisterUncreatableType
<
FactValueSliderListModel
>
(
"QGroundControl.FactControls"
,
1
,
0
,
"FactValueSliderListModel"
,
"Reference only"
);
qmlRegisterType
<
ParameterEditorController
>
(
"QGroundControl.Controllers"
,
1
,
0
,
"ParameterEditorController"
);
qmlRegisterType
<
ESP8266ComponentController
>
(
"QGroundControl.Controllers"
,
1
,
0
,
"ESP8266ComponentController"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment