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
055a51a4
Commit
055a51a4
authored
Aug 20, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add camera info calculator
parent
905af395
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
115 additions
and
5 deletions
+115
-5
SurveyItemEditor.qml
src/MissionEditor/SurveyItemEditor.qml
+110
-0
SurveyMissionItem.cc
src/MissionManager/SurveyMissionItem.cc
+5
-5
No files found.
src/MissionEditor/SurveyItemEditor.qml
View file @
055a51a4
...
...
@@ -22,8 +22,45 @@ Rectangle {
property
real
_margin
:
ScreenTools
.
defaultFontPixelWidth
/
2
property
var
_cameraInfoCanonSX260
:
{
"
focalLength
"
:
4.5
,
"
sensorHeight
"
:
4.55
,
"
sensorWidth
"
:
6.17
}
function
recalcFromCameraValues
()
{
var
focalLength
=
Number
(
focalLengthField
.
text
)
var
sensorWidth
=
Number
(
sensorWidthField
.
text
)
var
sensorHeight
=
Number
(
sensorHeightField
.
text
)
var
overlap
=
Number
(
imageOverlapField
.
text
)
if
(
focalLength
<=
0.0
||
sensorWidth
<=
0.0
||
sensorHeight
<=
0.0
)
{
return
}
var
scaledFocalLengthMM
=
(
1000.0
*
missionItem
.
gridAltitude
.
rawValue
)
/
focalLength
var
imageWidthM
=
(
sensorWidth
*
scaledFocalLengthMM
)
/
1000.0
;
var
imageHeightM
=
(
sensorHeight
*
scaledFocalLengthMM
)
/
1000.0
;
var
gridSpacing
var
cameraTriggerDistance
if
(
cameraOrientationLandscape
.
checked
)
{
gridSpacing
=
imageWidthM
cameraTriggerDistance
=
imageHeightM
}
else
{
gridSpacing
=
imageHeightM
cameraTriggerDistance
=
imageWidthM
}
gridSpacing
=
(
1.0
-
(
overlap
/
100.0
))
*
gridSpacing
cameraTriggerDistance
=
(
1.0
-
(
overlap
/
100.0
))
*
cameraTriggerDistance
missionItem
.
gridSpacing
.
rawValue
=
gridSpacing
missionItem
.
cameraTriggerDistance
.
rawValue
=
cameraTriggerDistance
}
QGCPalette
{
id
:
qgcPal
;
colorGroupEnabled
:
true
}
ExclusiveGroup
{
id
:
cameraOrientationGroup
onCurrentChanged
:
recalcFromCameraValues
()
}
Column
{
id
:
editorColumn
anchors.margins
:
_margin
...
...
@@ -115,6 +152,79 @@ Rectangle {
onPolygonAdjustVertex
:
missionItem
.
adjustPolygonCoordinate
(
vertexIndex
,
vertexCoordinate
)
}
QGCLabel
{
text
:
qsTr
(
"
Camera:
"
)
}
Rectangle
{
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
height
:
1
color
:
qgcPal
.
text
}
Row
{
spacing
:
ScreenTools
.
defaultFontPixelWidth
QGCRadioButton
{
id
:
cameraOrientationLandscape
text
:
"
Landscape
"
checked
:
true
exclusiveGroup
:
cameraOrientationGroup
}
QGCRadioButton
{
id
:
cameraOrientationPortrait
text
:
"
Portrait
"
exclusiveGroup
:
cameraOrientationGroup
}
}
Grid
{
columns
:
2
spacing
:
ScreenTools
.
defaultFontPixelWidth
verticalItemAlignment
:
Grid
.
AlignVCenter
QGCLabel
{
text
:
qsTr
(
"
Focal length:
"
)
}
QGCTextField
{
id
:
focalLengthField
unitsLabel
:
"
mm
"
showUnits
:
true
text
:
_cameraInfoCanonSX260
.
focalLength
.
toString
()
onEditingFinished
:
recalcFromCameraValues
()
}
QGCLabel
{
text
:
qsTr
(
"
Sensor Width:
"
)
}
QGCTextField
{
id
:
sensorWidthField
unitsLabel
:
"
mm
"
showUnits
:
true
text
:
_cameraInfoCanonSX260
.
sensorWidth
.
toString
()
onEditingFinished
:
recalcFromCameraValues
()
}
QGCLabel
{
text
:
qsTr
(
"
Sensor height:
"
)
}
QGCTextField
{
id
:
sensorHeightField
unitsLabel
:
"
mm
"
showUnits
:
true
text
:
_cameraInfoCanonSX260
.
sensorHeight
.
toString
()
onEditingFinished
:
recalcFromCameraValues
()
}
QGCLabel
{
text
:
qsTr
(
"
Image overlap:
"
)
}
QGCTextField
{
id
:
imageOverlapField
unitsLabel
:
"
%
"
showUnits
:
true
text
:
"
0
"
onEditingFinished
:
recalcFromCameraValues
()
}
}
QGCLabel
{
text
:
qsTr
(
"
Polygon:
"
)
}
Rectangle
{
...
...
src/MissionManager/SurveyMissionItem.cc
View file @
055a51a4
...
...
@@ -34,16 +34,16 @@ SurveyMissionItem::SurveyMissionItem(Vehicle* vehicle, QObject* parent)
:
ComplexMissionItem
(
vehicle
,
parent
)
,
_sequenceNumber
(
0
)
,
_dirty
(
false
)
,
_cameraTrigger
(
fals
e
)
,
_cameraTrigger
(
tru
e
)
,
_gridAltitudeRelative
(
true
)
,
_surveyDistance
(
0.0
)
,
_cameraShots
(
0
)
,
_coveredArea
(
0.0
)
,
_gridAltitudeFact
(
0
,
"Altitude:"
,
FactMetaData
::
valueTypeDouble
)
,
_gridAngleFact
(
0
,
"Grid angle:"
,
FactMetaData
::
valueTypeDouble
)
,
_gridSpacingFact
(
0
,
"Grid spacing:"
,
FactMetaData
::
valueTypeDouble
)
,
_cameraTriggerDistanceFact
(
0
,
"Camera trigger distance"
,
FactMetaData
::
valueTypeDouble
)
,
_gridAltitudeFact
(
0
,
"Altitude:"
,
FactMetaData
::
valueTypeDouble
)
,
_gridAngleFact
(
0
,
"Grid angle:"
,
FactMetaData
::
valueTypeDouble
)
,
_gridSpacingFact
(
0
,
"Grid spacing:"
,
FactMetaData
::
valueTypeDouble
)
,
_cameraTriggerDistanceFact
(
0
,
"Camera trigger distance"
,
FactMetaData
::
valueTypeDouble
)
,
_gridAltitudeMetaData
(
FactMetaData
::
valueTypeDouble
)
,
_gridAngleMetaData
(
FactMetaData
::
valueTypeDouble
)
...
...
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