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
8db58b36
Commit
8db58b36
authored
Oct 05, 2019
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugs solved, area stat. added
parent
d656eced
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
2 deletions
+22
-2
QGCMapPolygon.cc
src/MissionManager/QGCMapPolygon.cc
+2
-0
QGCMapPolygon.h
src/MissionManager/QGCMapPolygon.h
+2
-0
WimaPlaner.cc
src/Wima/WimaPlaner.cc
+1
-0
WimaCorridorEditor.qml
src/WimaView/WimaCorridorEditor.qml
+6
-0
WimaMeasurementAreaEditor.qml
src/WimaView/WimaMeasurementAreaEditor.qml
+5
-2
WimaServiceAreaEditor.qml
src/WimaView/WimaServiceAreaEditor.qml
+6
-0
No files found.
src/MissionManager/QGCMapPolygon.cc
View file @
8db58b36
...
@@ -50,6 +50,8 @@ void QGCMapPolygon::_init(void)
...
@@ -50,6 +50,8 @@ void QGCMapPolygon::_init(void)
connect
(
&
_polygonModel
,
&
QmlObjectListModel
::
dirtyChanged
,
this
,
&
QGCMapPolygon
::
_polygonModelDirtyChanged
);
connect
(
&
_polygonModel
,
&
QmlObjectListModel
::
dirtyChanged
,
this
,
&
QGCMapPolygon
::
_polygonModelDirtyChanged
);
connect
(
&
_polygonModel
,
&
QmlObjectListModel
::
countChanged
,
this
,
&
QGCMapPolygon
::
_polygonModelCountChanged
);
connect
(
&
_polygonModel
,
&
QmlObjectListModel
::
countChanged
,
this
,
&
QGCMapPolygon
::
_polygonModelCountChanged
);
connect
(
this
,
&
QGCMapPolygon
::
pathChanged
,
this
,
&
QGCMapPolygon
::
_updateCenter
);
connect
(
this
,
&
QGCMapPolygon
::
pathChanged
,
this
,
&
QGCMapPolygon
::
_updateCenter
);
connect
(
this
,
&
QGCMapPolygon
::
pathChanged
,
this
,
&
QGCMapPolygon
::
areaChanged
);
connect
(
this
,
&
QGCMapPolygon
::
countChanged
,
this
,
&
QGCMapPolygon
::
areaChanged
);
}
}
const
QGCMapPolygon
&
QGCMapPolygon
::
operator
=
(
const
QGCMapPolygon
&
other
)
const
QGCMapPolygon
&
QGCMapPolygon
::
operator
=
(
const
QGCMapPolygon
&
other
)
...
...
src/MissionManager/QGCMapPolygon.h
View file @
8db58b36
...
@@ -36,6 +36,7 @@ public:
...
@@ -36,6 +36,7 @@ public:
Q_PROPERTY
(
QGeoCoordinate
center
READ
center
WRITE
setCenter
NOTIFY
centerChanged
)
Q_PROPERTY
(
QGeoCoordinate
center
READ
center
WRITE
setCenter
NOTIFY
centerChanged
)
Q_PROPERTY
(
bool
centerDrag
READ
centerDrag
WRITE
setCenterDrag
NOTIFY
centerDragChanged
)
Q_PROPERTY
(
bool
centerDrag
READ
centerDrag
WRITE
setCenterDrag
NOTIFY
centerDragChanged
)
Q_PROPERTY
(
bool
interactive
READ
interactive
WRITE
setInteractive
NOTIFY
interactiveChanged
)
Q_PROPERTY
(
bool
interactive
READ
interactive
WRITE
setInteractive
NOTIFY
interactiveChanged
)
Q_PROPERTY
(
double
area
READ
area
NOTIFY
areaChanged
)
Q_INVOKABLE
void
clear
(
void
);
Q_INVOKABLE
void
clear
(
void
);
Q_INVOKABLE
void
appendVertex
(
const
QGeoCoordinate
&
coordinate
);
Q_INVOKABLE
void
appendVertex
(
const
QGeoCoordinate
&
coordinate
);
...
@@ -114,6 +115,7 @@ signals:
...
@@ -114,6 +115,7 @@ signals:
void
centerChanged
(
QGeoCoordinate
center
);
void
centerChanged
(
QGeoCoordinate
center
);
void
centerDragChanged
(
bool
centerDrag
);
void
centerDragChanged
(
bool
centerDrag
);
void
interactiveChanged
(
bool
interactive
);
void
interactiveChanged
(
bool
interactive
);
void
areaChanged
(
void
);
public
slots
:
public
slots
:
void
setPath
(
const
QList
<
QGeoCoordinate
>&
path
);
void
setPath
(
const
QList
<
QGeoCoordinate
>&
path
);
...
...
src/Wima/WimaPlaner.cc
View file @
8db58b36
...
@@ -93,6 +93,7 @@ void WimaPlaner::removeArea(int index)
...
@@ -93,6 +93,7 @@ void WimaPlaner::removeArea(int index)
return
;
return
;
}
}
area
->
clear
();
area
->
clear
();
area
->
borderPolygon
()
->
clear
();
emit
visualItemsChanged
();
emit
visualItemsChanged
();
...
...
src/WimaView/WimaCorridorEditor.qml
View file @
8db58b36
...
@@ -168,6 +168,12 @@ Rectangle {
...
@@ -168,6 +168,12 @@ Rectangle {
/*QGCLabel { text: qsTr("Layers") }
/*QGCLabel { text: qsTr("Layers") }
QGCLabel { text: areaItem.layers.valueString }*/
QGCLabel { text: areaItem.layers.valueString }*/
QGCLabel
{
text
:
qsTr
(
"
Area
"
)
}
QGCLabel
{
text
:
QGroundControl
.
squareMetersToAppSettingsAreaUnits
(
areaItem
.
area
).
toFixed
(
2
)
+
"
"
+
QGroundControl
.
appSettingsAreaUnitsString
}
QGCLabel
{
text
:
qsTr
(
"
Nodes
"
)
}
QGCLabel
{
text
:
areaItem
.
count
}
}
}
}
// Column
}
// Column
}
// Rectangle
}
// Rectangle
src/WimaView/WimaMeasurementAreaEditor.qml
View file @
8db58b36
...
@@ -143,8 +143,11 @@ Rectangle {
...
@@ -143,8 +143,11 @@ Rectangle {
columnSpacing
:
ScreenTools
.
defaultFontPixelWidth
columnSpacing
:
ScreenTools
.
defaultFontPixelWidth
visible
:
statsHeader
.
checked
visible
:
statsHeader
.
checked
/*QGCLabel { text: qsTr("Layers") }
QGCLabel
{
text
:
qsTr
(
"
Area
"
)
}
QGCLabel { text: areaItem.layers.valueString }*/
QGCLabel
{
text
:
QGroundControl
.
squareMetersToAppSettingsAreaUnits
(
areaItem
.
area
).
toFixed
(
2
)
+
"
"
+
QGroundControl
.
appSettingsAreaUnitsString
}
QGCLabel
{
text
:
qsTr
(
"
Nodes
"
)
}
QGCLabel
{
text
:
areaItem
.
count
}
}
}
}
// Column
}
// Column
...
...
src/WimaView/WimaServiceAreaEditor.qml
View file @
8db58b36
...
@@ -164,6 +164,12 @@ Rectangle {
...
@@ -164,6 +164,12 @@ Rectangle {
/*QGCLabel { text: qsTr("Layers") }
/*QGCLabel { text: qsTr("Layers") }
QGCLabel { text: areaItem.layers.valueString }*/
QGCLabel { text: areaItem.layers.valueString }*/
QGCLabel
{
text
:
qsTr
(
"
Area
"
)
}
QGCLabel
{
text
:
QGroundControl
.
squareMetersToAppSettingsAreaUnits
(
areaItem
.
area
).
toFixed
(
2
)
+
"
"
+
QGroundControl
.
appSettingsAreaUnitsString
}
QGCLabel
{
text
:
qsTr
(
"
Nodes
"
)
}
QGCLabel
{
text
:
areaItem
.
count
}
}
}
}
// Column
}
// Column
}
// Rectangle
}
// Rectangle
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