Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java @ 9436:9f57d2396360
function auto select fix
author | gernotbelger |
---|---|
date | Mon, 20 Aug 2018 13:30:41 +0200 |
parents | d194c5b24bf8 |
children | 751a3eff6244 |
comparison
equal
deleted
inserted
replaced
9435:af872dab1a0a | 9436:9f57d2396360 |
---|---|
68 final BezugswstCalculationResults results = new BezugswstCalculationResults(calcModeLabel, user, riverInfo, access.getRange()); | 68 final BezugswstCalculationResults results = new BezugswstCalculationResults(calcModeLabel, user, riverInfo, access.getRange()); |
69 | 69 |
70 final Calculation problems = new Calculation(); | 70 final Calculation problems = new Calculation(); |
71 | 71 |
72 // Calculate the wspl for the selected river range as in fixa awspl | 72 // Calculate the wspl for the selected river range as in fixa awspl |
73 bunduartifact.addStringData("wq_isq", "true"); | 73 // bunduartifact.addStringData("wq_isq", "true"); //ist schon gesetzt, Zeile löschen. |
74 final WinfoArtifactWrapper winfo = new WinfoArtifactWrapper(bunduartifact); | 74 final WinfoArtifactWrapper winfo = new WinfoArtifactWrapper(bunduartifact); |
75 final RiverInfoProvider riverInfoProvider = RiverInfoProvider.forRange(this.context, river, access.getRange(), true); | 75 final RiverInfoProvider riverInfoProvider = RiverInfoProvider.forRange(this.context, river, access.getRange(), true); |
76 final WQKms wqkms = calculateWspl(bunduartifact, problems); | 76 final WQKms wqkms = calculateWspl(bunduartifact, problems); |
77 if (wqkms == null) | 77 if (wqkms == null) |
78 return new CalculationResult(results, problems); | 78 return new CalculationResult(results, problems); |
96 } | 96 } |
97 | 97 |
98 // Add the result to the results collection | 98 // Add the result to the results collection |
99 final WaterlevelDescriptionBuilder descBuilder = new WaterlevelDescriptionBuilder(winfo, this.context); | 99 final WaterlevelDescriptionBuilder descBuilder = new WaterlevelDescriptionBuilder(winfo, this.context); |
100 final String qtext = descBuilder.getMetadataQ(); | 100 final String qtext = descBuilder.getMetadataQ(); |
101 final BezugswstMainCalculationResult result = new BezugswstMainCalculationResult("bundu-bzws", rows, bedHeightsFinder.getInfo(), | 101 final BezugswstMainCalculationResult result = new BezugswstMainCalculationResult("bundu-bzws", rows, bedHeightsFinder.getInfo(), wstInfo, |
102 wstInfo, access.getFunction(), preprocessing, startYear, endYear, ud, qtext, missingVolFrom, missingVolTo); | 102 access.getFunction(), preprocessing, startYear, endYear, ud, qtext, missingVolFrom, missingVolTo); |
103 results.addResult(result, problems); | 103 results.addResult(result, problems); |
104 | 104 |
105 // // missing volume calculation | 105 // // missing volume calculation |
106 // if (access.getMissingVolFrom() != null) { | 106 // if (access.getMissingVolFrom() != null) { |
107 // /// FIRST RESULT | 107 // /// FIRST RESULT |