Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ISIS3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
aflab
astrogeology
ISIS3
Commits
3793da6f
Unverified
Commit
3793da6f
authored
6 months ago
by
Austin Sanders
Committed by
GitHub
6 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix autoseed SeedDomain = SampleLine (#5674)
* Fix SeedDomain SampleLine * Updated changelog * Removed ugmap
parent
038cc5f8
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
isis/src/control/apps/autoseed/autoseed.cpp
+4
-14
4 additions, 14 deletions
isis/src/control/apps/autoseed/autoseed.cpp
with
5 additions
and
14 deletions
CHANGELOG.md
+
1
−
0
View file @
3793da6f
...
...
@@ -61,6 +61,7 @@ file. Slightly modified the FunctionalTestJigsawBundleXYZ ctest accordingly. Iss
-
Fixed XmlToJson namespaced key conversion
[
#5652
](
https://github.com/DOI-USGS/ISIS3/pull/5652
)
-
Fixed PHOTOMET not accepting backplanes
[
#5281
](
https://github.com/DOI-USGS/ISIS3/issues/5281
)
-
Fixed dstripe parallel test failing by converting tests to gtests
[
#5613
](
https://github.com/DOI-USGS/ISIS3/issues/5613
)
-
Fixed autoseed SeedDomain = SampleLine only working for first overlap
[
#5673
](
https://github.com/DOI-USGS/ISIS3/issues/5673
)
## [8.3.0] - 2024-09-30
...
...
This diff is collapsed.
Click to expand it.
isis/src/control/apps/autoseed/autoseed.cpp
+
4
−
14
View file @
3793da6f
...
...
@@ -174,16 +174,10 @@ namespace Isis {
//PolygonSeeder *seeder = PolygonSeederFactory::Create(seedDef);
TProjection
*
proj
=
NULL
;
UniversalGroundMap
*
ugmap
=
NULL
;
mapGroup
=
Target
::
radiiGroup
(
cubeLab
,
mapGroup
);
if
(
seedDomain
==
XY
)
{
proj
=
(
TProjection
*
)
ProjectionFactory
::
Create
(
maplab
);
}
else
if
(
seedDomain
==
SampleLine
)
{
Cube
cube
;
cube
.
open
(
serialNumbers
.
fileName
(
0
));
ugmap
=
new
UniversalGroundMap
(
cube
);
}
// Create the control net to store the points in.
ControlNet
cnet
;
...
...
@@ -289,7 +283,7 @@ namespace Isis {
mp
=
PolygonTools
::
LatLonToXY
(
*
polygonOverlaps
,
proj
);
}
else
if
(
seedDomain
==
SampleLine
)
{
mp
=
PolygonTools
::
LatLonToSampleLine
(
*
polygonOverlaps
,
ugmap
);
mp
=
PolygonTools
::
LatLonToSampleLine
(
*
polygonOverlaps
,
gMaps
[(
*
overlaps
[
ov
])[
0
]]
);
}
points
=
seeder
->
Seed
(
mp
);
}
...
...
@@ -340,10 +334,10 @@ namespace Isis {
else
if
(
seedDomain
==
SampleLine
)
{
// Convert the Sample/Line points back to Lat/Lon points
for
(
unsigned
int
pt
=
0
;
pt
<
points
.
size
();
pt
++
)
{
if
(
ugmap
->
SetImage
(
points
[
pt
]
->
getX
(),
points
[
pt
]
->
getY
()))
{
if
(
gMaps
[(
*
overlaps
[
ov
])[
0
]]
->
SetImage
(
points
[
pt
]
->
getX
(),
points
[
pt
]
->
getY
()))
{
seed
.
push_back
(
Isis
::
globalFactory
->
createPoint
(
geos
::
geom
::
Coordinate
(
ugmap
->
UniversalLongitude
(),
ugmap
->
UniversalLatitude
())).
release
());
geos
::
geom
::
Coordinate
(
gMaps
[(
*
overlaps
[
ov
])[
0
]]
->
UniversalLongitude
(),
gMaps
[(
*
overlaps
[
ov
])[
0
]]
->
UniversalLatitude
())).
release
());
}
else
{
IString
msg
=
"Unable to convert from Sample/Line to a (lon,lat)"
;
...
...
@@ -515,10 +509,6 @@ namespace Isis {
delete
proj
;
proj
=
NULL
;
}
else
if
(
seedDomain
==
SampleLine
)
{
delete
ugmap
;
ugmap
=
NULL
;
}
delete
seeder
;
seeder
=
NULL
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment