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
27bb39a8
Commit
27bb39a8
authored
7 months ago
by
Riegel
Browse files
Options
Download
Email Patches
Plain Diff
Marked fields as final. Ref
#69
parent
618ff639
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
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java
+1
-1
...de/hft/stuttgart/citydoctor2/datastructure/TinObject.java
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/Vector3d.java
+1
-1
...main/java/de/hft/stuttgart/citydoctor2/math/Vector3d.java
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/ParserConfiguration.java
+2
-2
...hft/stuttgart/citydoctor2/parser/ParserConfiguration.java
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/tesselation/Primitive.java
+1
-1
...a/de/hft/stuttgart/citydoctor2/tesselation/Primitive.java
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/Checks.java
+3
-3
...main/java/de/hft/stuttgart/citydoctor2/checks/Checks.java
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/util/SelfIntersectionUtil.java
+1
-1
...uttgart/citydoctor2/checks/util/SelfIntersectionUtil.java
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/ErrorStatisticsCollector.java
+1
-1
...tgart/citydoctor2/reporting/ErrorStatisticsCollector.java
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlStreamErrorHandler.java
+2
-2
...tuttgart/citydoctor2/reporting/XmlStreamErrorHandler.java
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlStreamReporter.java
+4
-4
...ft/stuttgart/citydoctor2/reporting/XmlStreamReporter.java
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/CodeBlock.java
+2
-2
...de/hft/stuttgart/citydoctor2/reporting/pdf/CodeBlock.java
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/PdfErrorHandler.java
+2
-2
.../stuttgart/citydoctor2/reporting/pdf/PdfErrorHandler.java
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/PdfStreamReporter.java
+7
-7
...tuttgart/citydoctor2/reporting/pdf/PdfStreamReporter.java
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/Section.java
+4
-4
...a/de/hft/stuttgart/citydoctor2/reporting/pdf/Section.java
with
31 additions
and
31 deletions
+31
-31
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java
+
1
-
1
View file @
27bb39a8
...
...
@@ -40,7 +40,7 @@ public class TinObject extends CityObject {
private
static
final
long
serialVersionUID
=
1910744427384724422L
;
private
TINRelief
gmlRelief
;
private
final
TINRelief
gmlRelief
;
public
TinObject
(
TINRelief
gmlRelief
)
{
this
.
gmlRelief
=
gmlRelief
;
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/Vector3d.java
+
1
-
1
View file @
27bb39a8
...
...
@@ -39,7 +39,7 @@ public class Vector3d implements Serializable {
public
static
final
int
Y
=
1
;
public
static
final
int
Z
=
2
;
private
double
[]
coords
;
private
final
double
[]
coords
;
public
Vector3d
()
{
this
(
0
d
,
0
d
,
0
d
);
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/ParserConfiguration.java
+
2
-
2
View file @
27bb39a8
...
...
@@ -39,9 +39,9 @@ public class ParserConfiguration implements Serializable {
private
static
final
CRSFactory
CRS_FACTORY
=
new
CRSFactory
();
private
int
roundingPlaces
=
8
;
private
final
int
roundingPlaces
;
private
boolean
validate
=
false
;
private
final
boolean
validate
;
private
transient
BasicCoordinateTransform
targetTransform
=
null
;
private
transient
BasicCoordinateTransform
originalTransform
=
null
;
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/tesselation/Primitive.java
+
1
-
1
View file @
27bb39a8
...
...
@@ -36,7 +36,7 @@ import de.hft.stuttgart.citydoctor2.math.Vector3d;
*/
public
class
Primitive
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
Primitive
.
class
);
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
Primitive
.
class
);
private
static
final
double
AREA_EPSILON
=
0.00001
;
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/Checks.java
+
3
-
3
View file @
27bb39a8
...
...
@@ -69,12 +69,12 @@ public class Checks {
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
Checks
.
class
);
private
static
List
<
CheckPrototype
>
checkPrototypes
;
private
static
Map
<
CheckId
,
CheckPrototype
>
prototypeMap
;
private
static
final
List
<
CheckPrototype
>
checkPrototypes
;
private
static
final
Map
<
CheckId
,
CheckPrototype
>
prototypeMap
;
private
static
Map
<
String
,
Requirement
>
availableRequirements
;
private
Map
<
CheckId
,
Check
>
checkMap
;
private
final
Map
<
CheckId
,
Check
>
checkMap
;
static
{
checkPrototypes
=
new
ArrayList
<>();
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/util/SelfIntersectionUtil.java
+
1
-
1
View file @
27bb39a8
...
...
@@ -78,7 +78,7 @@ public class SelfIntersectionUtil {
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
SelfIntersectionUtil
.
class
);
private
static
GeometryFactory
factory
=
new
GeometryFactory
(
new
PrecisionModel
(
PrecisionModel
.
FLOATING
));
private
static
final
GeometryFactory
factory
=
new
GeometryFactory
(
new
PrecisionModel
(
PrecisionModel
.
FLOATING
));
private
SelfIntersectionUtil
()
{
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/ErrorStatisticsCollector.java
+
1
-
1
View file @
27bb39a8
...
...
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public
class
ErrorStatisticsCollector
{
private
Map
<
String
,
AtomicInteger
>
errorCounts
=
new
HashMap
<>();
private
final
Map
<
String
,
AtomicInteger
>
errorCounts
=
new
HashMap
<>();
public
void
addError
(
String
errorName
)
{
AtomicInteger
numErrors
=
errorCounts
.
get
(
errorName
);
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlStreamErrorHandler.java
+
2
-
2
View file @
27bb39a8
...
...
@@ -56,8 +56,8 @@ import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
*/
public
class
XmlStreamErrorHandler
implements
ErrorReport
{
private
ErrorDetails
details
;
private
BasicCoordinateTransform
originalTransform
;
private
final
ErrorDetails
details
;
private
final
BasicCoordinateTransform
originalTransform
;
public
XmlStreamErrorHandler
(
ParserConfiguration
config
)
{
originalTransform
=
config
.
getOriginalTransform
();
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlStreamReporter.java
+
4
-
4
View file @
27bb39a8
...
...
@@ -74,11 +74,11 @@ public class XmlStreamReporter implements StreamReporter {
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
XmlStreamReporter
.
class
);
private
OutputStream
output
;
private
final
OutputStream
output
;
private
CheckReport
report
;
private
Map
<
String
,
FeatureReport
>
reportMap
;
private
ValidationConfiguration
config
;
private
final
CheckReport
report
;
private
final
Map
<
String
,
FeatureReport
>
reportMap
;
private
final
ValidationConfiguration
config
;
public
XmlStreamReporter
(
OutputStream
output
,
String
fileName
,
ValidationConfiguration
config
)
{
this
.
output
=
output
;
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/CodeBlock.java
+
2
-
2
View file @
27bb39a8
...
...
@@ -31,8 +31,8 @@ public class CodeBlock {
private
static
final
String
BLOCK
=
"block"
;
private
Element
codeBlockContainer
;
private
Element
codeBlockElement
;
private
final
Element
codeBlockContainer
;
private
final
Element
codeBlockElement
;
private
Element
currentLine
;
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/PdfErrorHandler.java
+
2
-
2
View file @
27bb39a8
...
...
@@ -48,8 +48,8 @@ public class PdfErrorHandler implements ErrorReport {
private
static
final
String
ATTRIBUTE_KEY_COLOR
=
"#7F007F"
;
private
static
final
String
ATTRIBUTE_VALUE_COLOR
=
"#2A00FF"
;
private
Section
section
;
private
ParserConfiguration
config
;
private
final
Section
section
;
private
final
ParserConfiguration
config
;
public
PdfErrorHandler
(
Section
section
,
ParserConfiguration
config
)
{
this
.
config
=
config
;
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/PdfStreamReporter.java
+
7
-
7
View file @
27bb39a8
...
...
@@ -72,14 +72,14 @@ public class PdfStreamReporter implements StreamReporter {
private
static
final
String
WARNING_COLOR
=
"yellow"
;
private
static
final
String
OK_COLOR
=
"green"
;
private
PdfReport
report
;
private
OutputStream
outFile
;
private
final
PdfReport
report
;
private
final
OutputStream
outFile
;
private
Map
<
ErrorId
,
AtomicInteger
>
errorStatistics
;
private
ValidationConfiguration
config
;
private
final
Map
<
ErrorId
,
AtomicInteger
>
errorStatistics
;
private
final
ValidationConfiguration
config
;
private
Section
statistics
;
private
Section
vr
;
private
final
Section
statistics
;
private
final
Section
vr
;
private
Section
buildings
;
private
int
numErrorBuildings
;
...
...
@@ -107,7 +107,7 @@ public class PdfStreamReporter implements StreamReporter {
private
Section
globalErrors
;
private
Map
<
String
,
Section
>
sectionMap
=
new
HashMap
<>();
private
final
Map
<
String
,
Section
>
sectionMap
=
new
HashMap
<>();
public
PdfStreamReporter
(
OutputStream
pdfOutputFile
,
String
fileName
,
ValidationConfiguration
config
)
{
this
.
config
=
config
;
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/Section.java
+
4
-
4
View file @
27bb39a8
...
...
@@ -50,15 +50,15 @@ public class Section {
private
static
final
AtomicInteger
S_COUNTER
=
new
AtomicInteger
(
0
);
private
Element
tocBlock
;
private
Element
contentBlock
;
private
final
Element
tocBlock
;
private
final
Element
contentBlock
;
private
Element
headlineBlock
;
private
final
Element
headlineBlock
;
private
String
linkId
;
private
List
<
Section
>
subSections
;
private
int
depth
;
private
final
int
depth
;
// attributes for error reporting
private
ErrorStatisticsCollector
stats
;
...
...
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