Commit bfc19774 authored by Luna Riegel's avatar Luna Riegel
Browse files

Fix: Add topology checks table to config assembly

parent 5c91d943
...@@ -91,12 +91,10 @@ public class ValidationConfiguration implements Serializable { ...@@ -91,12 +91,10 @@ public class ValidationConfiguration implements Serializable {
ValidationConfiguration config = new ValidationConfiguration(); ValidationConfiguration config = new ValidationConfiguration();
config.requirements = new HashMap<>(); config.requirements = new HashMap<>();
for (CheckPrototype c : Checks.getCheckPrototypes()) { for (CheckPrototype c : Checks.getCheckPrototypes()) {
if (c.getType() == RequirementType.TOPOLOGY){
continue;
}
for (Requirement req : c.checksRequirements()) { for (Requirement req : c.checksRequirements()) {
RequirementConfiguration reqConfig = new RequirementConfiguration(); RequirementConfiguration reqConfig = new RequirementConfiguration();
reqConfig.setEnabled(true); //Topology checks are disabled in standard config
reqConfig.setEnabled(c.getType() != RequirementType.TOPOLOGY);
for (DefaultParameter param : req.getDefaultParameters()) { for (DefaultParameter param : req.getDefaultParameters()) {
reqConfig.getParameters().put(param.getName(), param.getValue()); reqConfig.getParameters().put(param.getName(), param.getValue());
} }
......
...@@ -532,6 +532,7 @@ public class CheckDialog { ...@@ -532,6 +532,7 @@ public class CheckDialog {
private boolean collectCheckConfiguration(ValidationConfiguration config) { private boolean collectCheckConfiguration(ValidationConfiguration config) {
collectCheckInformationFromTree(config, geometricTable); collectCheckInformationFromTree(config, geometricTable);
collectCheckInformationFromTree(config, semanticTable); collectCheckInformationFromTree(config, semanticTable);
collectCheckInformationFromTree(config, topologyTable);
config.setSchematronFilePathInGlobalParameters(schematronField.getText()); config.setSchematronFilePathInGlobalParameters(schematronField.getText());
config.setMinVertexDistanceInGlobalParameters( config.setMinVertexDistanceInGlobalParameters(
Double.parseDouble(globalParametersTable.getItems().get(1).getValue())); Double.parseDouble(globalParametersTable.getItems().get(1).getValue()));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment