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
13843641
Commit
13843641
authored
Feb 08, 2021
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
0 tiles error message added
parent
0dd18040
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
10 deletions
+14
-10
nemo_dummy_temp.py
nemo_dummy_temp.py
+0
-0
MeasurementArea.cc
src/MeasurementComplexItem/geometry/MeasurementArea.cc
+10
-2
AreaDataEditor.qml
src/MeasurementComplexItem/qml/AreaDataEditor.qml
+2
-2
MeasurementItemEditor.qml
src/MeasurementComplexItem/qml/MeasurementItemEditor.qml
+1
-5
NemoEditor.qml
src/MeasurementComplexItem/qml/NemoEditor.qml
+1
-1
No files found.
nemo_dummy_temp.py
0 → 100644
View file @
13843641
src/MeasurementComplexItem/geometry/MeasurementArea.cc
View file @
13843641
...
...
@@ -326,7 +326,13 @@ bool MeasurementArea::loadFromJson(const QJsonObject &json,
bool
MeasurementArea
::
isCorrect
()
{
if
(
GeoArea
::
isCorrect
())
{
if
(
ready
())
{
return
true
;
if
(
_tiles
->
count
()
>
0
)
{
return
true
;
}
else
{
setErrorString
(
tr
(
"Not able to create tiles. This indicates that the "
"tile parameters must be adjusted. Reducing the Min. "
"Area parameter might deliver the desired result."
));
}
}
else
if
(
_toManyTiles
)
{
setErrorString
(
tr
(
"Calculation would yield to many tiles, please adjust the tile "
...
...
@@ -627,8 +633,10 @@ bool getTiles(const FPolygon &area, Length tileHeight, Length tileWidth,
minimalBoundingBox
(
area
,
bbox
);
}
if
(
bbox
.
corners
.
outer
().
size
()
<
5
)
if
(
bbox
.
corners
.
outer
().
size
()
<
5
)
{
return
false
;
}
double
bboxWidth
=
bbox
.
width
;
double
bboxHeight
=
bbox
.
height
;
FPoint
origin
=
bbox
.
corners
.
outer
()[
0
];
...
...
src/MeasurementComplexItem/qml/AreaDataEditor.qml
View file @
13843641
...
...
@@ -218,8 +218,8 @@ Rectangle {
wrapMode
:
Text
.
WordWrap
horizontalAlignment
:
Text
.
AlignLeft
text
:
qsTr
(
"
Use the Intersection button to clip the Measurement Area(s).
Use the Reset button to restore the areas to the state before entering this tab.
Use the Abort button to reset the areas and leave the tab.
"
)
Use the Reset button to restore the areas to the state before entering this tab.
"
)
Layout.fillWidth
:
true
Layout.columnSpan
:
parent
.
columns
}
...
...
src/MeasurementComplexItem/qml/MeasurementItemEditor.qml
View file @
13843641
...
...
@@ -43,6 +43,7 @@ Rectangle {
anchors.top
:
parent
.
top
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
spacing
:
_margin
QGCTabBar
{
id
:
tabBar
...
...
@@ -78,11 +79,6 @@ Rectangle {
visible
:
tabBar
.
currentIndex
===
tabBar
.
areaEditorIndex
missionItem
:
_root
.
_missionItem
availableWidth
:
mainColumn
.
width
onVisibleChanged
:{
if
(
visible
){
_missionItem
.
startEditing
()
}
}
}
MCI.ParameterEditor
{
...
...
src/MeasurementComplexItem/qml/NemoEditor.qml
View file @
13843641
...
...
@@ -179,7 +179,7 @@ Rectangle {
id
:
hintLabel
wrapMode
:
Text
.
WordWrap
horizontalAlignment
:
Text
.
AlignLeft
text
:
qsTr
(
"
Use this tab to connect to a device implementing the Nemo
I
nterface.
text
:
qsTr
(
"
Use this tab to connect to a device implementing the Nemo
i
nterface.
Use the Random button to simulate measurement progress.
"
)
Layout.fillWidth
:
true
Layout.columnSpan
:
parent
.
columns
...
...
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