Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
66663802
Commit
66663802
authored
7 months ago
by
Riegel
Browse files
Options
Download
Email Patches
Plain Diff
Converted GmStraight2dIntersectionResult.java to record
parent
1c34a83f
master
107-opengl-view
dev
dev_bht
dev_cpp_code_conversion
dev_gui_features
dev_gui_features_zip_loading
3.16.0
3.15.0
archive/dev_gui_features_zip_loading
archive/dev_citygml3
archive/dev_GUI
2 merge requests
!8
Version 3.15.0
,
!6
Open source release of CityDoctorGUI and other extensions.
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight2dIntersectionResult.java
+2
-37
...gart/citydoctor2/edge/GmStraight2dIntersectionResult.java
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java
+2
-2
...t/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPolygonAndStraight2d.java
+2
-2
...tgart/citydoctor2/edge/IntersectPolygonAndStraight2d.java
with
6 additions
and
41 deletions
+6
-41
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight2dIntersectionResult.java
+
2
-
37
View file @
66663802
...
...
@@ -19,15 +19,8 @@
package
de.hft.stuttgart.citydoctor2.edge
;
public
class
GmStraight2dIntersectionResult
{
private
final
double
paramHE
;
private
final
double
paramInt
;
private
final
GmStraight2d
straightHE
;
private
final
GmStraight2d
straightInt
;
private
final
boolean
areParallel
;
public
record
GmStraight2dIntersectionResult
(
double
paramHE
,
double
paramInt
,
GmStraight2d
straightHE
,
GmStraight2d
straightInt
,
boolean
areParallel
)
{
public
static
GmStraight2dIntersectionResult
parallel
(
GmStraight2d
s1
,
GmStraight2d
s2
)
{
return
new
GmStraight2dIntersectionResult
(
0
,
0
,
s1
,
s2
,
true
);
...
...
@@ -38,33 +31,5 @@ public class GmStraight2dIntersectionResult {
return
new
GmStraight2dIntersectionResult
(
paramHE
,
paramInt
,
straightHE
,
straightInt
,
false
);
}
private
GmStraight2dIntersectionResult
(
double
paramHE
,
double
paramInt
,
GmStraight2d
straightHE
,
GmStraight2d
straightInt
,
boolean
areParallel
)
{
this
.
paramHE
=
paramHE
;
this
.
paramInt
=
paramInt
;
this
.
straightHE
=
straightHE
;
this
.
straightInt
=
straightInt
;
this
.
areParallel
=
areParallel
;
}
public
double
getParamHE
()
{
return
paramHE
;
}
public
double
getParamInt
()
{
return
paramInt
;
}
public
GmStraight2d
getStraightHE
()
{
return
straightHE
;
}
public
GmStraight2d
getStraightInt
()
{
return
straightInt
;
}
public
boolean
areParallel
()
{
return
areParallel
;
}
}
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java
+
2
-
2
View file @
66663802
...
...
@@ -299,8 +299,8 @@ public class IntersectPlanarPolygons {
assignParameterToCorrectList
(
params
[
1
],
intersectionValues
,
intersectedPolygonPoints
);
}
}
else
{
if
(
heStraight2d
.
isWithinBoundaries
(
intersectionResult
.
getP
aramHE
(),
1
e
-
9
))
{
assignParameterToCorrectList
(
intersectionResult
.
getP
aramInt
(),
intersectionValues
,
if
(
heStraight2d
.
isWithinBoundaries
(
intersectionResult
.
p
aramHE
(),
1
e
-
9
))
{
assignParameterToCorrectList
(
intersectionResult
.
p
aramInt
(),
intersectionValues
,
intersectedPolygonPoints
);
}
}
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPolygonAndStraight2d.java
+
2
-
2
View file @
66663802
...
...
@@ -100,11 +100,11 @@ public class IntersectPolygonAndStraight2d {
assignParameterToCorrectList
(
params
[
1
],
intersectionValues
,
intersectedPolygonPoints
);
}
}
else
{
if
(
hEStraight
.
isWithinBoundaries
(
res
.
getP
aramHE
()))
{
if
(
hEStraight
.
isWithinBoundaries
(
res
.
p
aramHE
()))
{
// Point2d pnt = mIntStraight.evaluate( paramInt );
// cout << "got ( " << pnt.getU() << ", " << pnt.getV() << " ) as int point with
// param " << paramInt << endl;
assignParameterToCorrectList
(
res
.
getP
aramInt
(),
intersectionValues
,
intersectedPolygonPoints
);
assignParameterToCorrectList
(
res
.
p
aramInt
(),
intersectionValues
,
intersectedPolygonPoints
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets