Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nml parser should parse float coordinates of nodes #4045

Merged
merged 3 commits into from
May 2, 2019
Merged

Nml parser should parse float coordinates of nodes #4045

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c069f59
round float values for node positions
Apr 25, 2019
e2c5d87
Merge branch 'master' of github.com:scalableminds/webknossos into nml…
May 2, 2019
7f6d10c
pr feedback changelog entry #4045
May 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions app/models/annotation/nml/NmlParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,16 @@ object NmlParser extends LazyLogging with ProtoGeometryImplicits {
}
}

private def parsePoint3D(node: XMLNode) =
private def parsePoint3D(node: XMLNode) = {
val xText = (node \ "@x").text
val yText = (node \ "@y").text
val zText = (node \ "@x").text
for {
x <- (node \ "@x").text.toIntOpt
y <- (node \ "@y").text.toIntOpt
z <- (node \ "@z").text.toIntOpt
x <- xText.toIntOpt.orElse(xText.toFloatOpt.map(math.round))
y <- yText.toIntOpt.orElse(yText.toFloatOpt.map(math.round))
z <- zText.toIntOpt.orElse(zText.toFloatOpt.map(math.round))
} yield Point3D(x, y, z)
}

private def parseRotationForParams(node: XMLNode) =
for {
Expand Down