Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
3ea58610
Commit
3ea58610
authored
May 28, 2019
by
Piotr Gawron
Browse files
point on line is computed properly
parent
ff8452e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
converter-sbml/src/main/java/lcsb/mapviewer/converter/model/sbml/reaction/SbmlReactionParser.java
View file @
3ea58610
...
...
@@ -514,9 +514,9 @@ public class SbmlReactionParser extends SbmlBioEntityParser {
return
getPointOnSegment
(
segment
,
0.5
);
}
private
Point
getPointOnSegment
(
CurveSegment
segment
,
double
coef
)
{
double
centerX
=
(
segment
.
getStart
().
getX
()
+
segment
.
getEnd
().
getX
())
*
coef
;
double
centerY
=
(
segment
.
getStart
().
getY
()
+
segment
.
getEnd
().
getY
())
*
coef
;
Point
getPointOnSegment
(
CurveSegment
segment
,
double
coef
)
{
double
centerX
=
segment
.
getStart
().
getX
()
+
(
segment
.
getEnd
().
getX
()
-
segment
.
getStart
().
getX
()
)
*
coef
;
double
centerY
=
segment
.
getStart
().
getY
()
+
(
segment
.
getEnd
().
getY
()
-
segment
.
getStart
().
getY
()
)
*
coef
;
Point
centerPoint
=
new
Point
(
getSbmlModel
().
getLevel
(),
getSbmlModel
().
getVersion
());
centerPoint
.
setX
(
centerX
);
centerPoint
.
setY
(
centerY
);
...
...
converter-sbml/src/test/java/lcsb/mapviewer/converter/model/sbml/reaction/SbmlReactionParserTest.java
View file @
3ea58610
...
...
@@ -6,9 +6,14 @@ import static org.junit.Assert.assertTrue;
import
java.io.FileNotFoundException
;
import
org.apache.logging.log4j.*
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.junit.Test
;
import
org.sbml.jsbml.ext.layout.CurveSegment
;
import
org.sbml.jsbml.ext.layout.LineSegment
;
import
org.sbml.jsbml.ext.layout.Point
;
import
lcsb.mapviewer.common.Configuration
;
import
lcsb.mapviewer.converter.ConverterParams
;
import
lcsb.mapviewer.converter.InvalidInputDataExecption
;
import
lcsb.mapviewer.converter.model.sbml.SbmlParser
;
...
...
@@ -299,4 +304,22 @@ public class SbmlReactionParserTest extends SbmlTestFunctions {
}
}
@Test
public
void
testGetPointOnSegment
()
throws
Exception
{
try
{
SbmlReactionParser
parser
=
new
SbmlReactionParser
(
new
org
.
sbml
.
jsbml
.
Model
(),
null
,
null
,
null
);
CurveSegment
segment
=
new
LineSegment
(
3
,
2
);
segment
.
setStart
(
new
Point
(
12
,
2
,
0
,
3
,
2
));
segment
.
setEnd
(
new
Point
(
2
,
8
,
0
,
3
,
2
));
Point
p
=
parser
.
getPointOnSegment
(
segment
,
0.4
);
assertEquals
(
8
,
p
.
getX
(),
Configuration
.
EPSILON
);
assertEquals
(
4.4
,
p
.
getY
(),
Configuration
.
EPSILON
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
throw
e
;
}
}
}
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