Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
6240302b
Commit
6240302b
authored
Jun 16, 2016
by
Nate Weibley
Browse files
Updating CoordinateVector to be less noisy and easier to bind to VisualMissionItems
parent
b669753d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/QmlControls/CoordinateVector.cc
View file @
6240302b
...
...
@@ -27,15 +27,24 @@ CoordinateVector::CoordinateVector(const QGeoCoordinate& coordinate1, const QGeo
}
CoordinateVector
::
~
Coordinate
Vector
(
)
void
CoordinateVector
::
set
Coordinate
s
(
const
QGeoCoordinate
&
coordinate1
,
const
QGeoCoordinate
&
coordinate2
)
{
setCoordinate1
(
coordinate1
);
setCoordinate2
(
coordinate2
);
}
void
CoordinateVector
::
setCoordinates
(
const
QGeoCoordinate
&
coordinate1
,
const
QGeoCoordinate
&
coordinate2
)
void
CoordinateVector
::
setCoordinate1
(
const
QGeoCoordinate
&
coordinate
)
{
if
(
_coordinate1
!=
coordinate
)
{
_coordinate1
=
coordinate
;
emit
coordinate1Changed
(
_coordinate1
);
}
}
void
CoordinateVector
::
setCoordinate2
(
const
QGeoCoordinate
&
coordinate
)
{
_coordinate
1
=
coordinate
1
;
_coordinate2
=
coordinate
2
;
emit
coordinate
1
Changed
(
_coordinate
1
);
emit
coordinate2Changed
(
_coordinate2
);
if
(
_coordinate
2
!
=
coordinate
)
{
_coordinate2
=
coordinate
;
emit
coordinate
2
Changed
(
_coordinate
2
);
}
}
src/QmlControls/CoordinateVector.h
View file @
6240302b
...
...
@@ -21,12 +21,15 @@ class CoordinateVector : public QObject
public:
CoordinateVector
(
QObject
*
parent
=
NULL
);
CoordinateVector
(
const
QGeoCoordinate
&
coordinate1
,
const
QGeoCoordinate
&
coordinate2
,
QObject
*
parent
=
NULL
);
~
CoordinateVector
();
Q_PROPERTY
(
QGeoCoordinate
coordinate1
MEMBER
_coordinate1
NOTIFY
coordinate1Changed
)
Q_PROPERTY
(
QGeoCoordinate
coordinate2
MEMBER
_coordinate2
NOTIFY
coordinate2Changed
)
void
setCoordinates
(
const
QGeoCoordinate
&
coordinate1
,
const
QGeoCoordinate
&
coordinate2
);
public
slots
:
void
setCoordinate1
(
const
QGeoCoordinate
&
coordinate
);
void
setCoordinate2
(
const
QGeoCoordinate
&
coordinate
);
signals:
void
coordinate1Changed
(
QGeoCoordinate
coordinate
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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