changeset 9436:9f57d2396360

function auto select fix
author gernotbelger
date Mon, 20 Aug 2018 13:30:41 +0200 (2018-08-20)
parents af872dab1a0a
children 751a3eff6244
files artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java	Mon Aug 20 12:11:54 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java	Mon Aug 20 13:30:41 2018 +0200
@@ -70,7 +70,7 @@
         final Calculation problems = new Calculation();
 
         // Calculate the wspl for the selected river range as in fixa awspl
-        bunduartifact.addStringData("wq_isq", "true");
+        // bunduartifact.addStringData("wq_isq", "true"); //ist schon gesetzt, Zeile löschen.
         final WinfoArtifactWrapper winfo = new WinfoArtifactWrapper(bunduartifact);
         final RiverInfoProvider riverInfoProvider = RiverInfoProvider.forRange(this.context, river, access.getRange(), true);
         final WQKms wqkms = calculateWspl(bunduartifact, problems);
@@ -98,8 +98,8 @@
         // Add the result to the results collection
         final WaterlevelDescriptionBuilder descBuilder = new WaterlevelDescriptionBuilder(winfo, this.context);
         final String qtext = descBuilder.getMetadataQ();
-        final BezugswstMainCalculationResult result = new BezugswstMainCalculationResult("bundu-bzws", rows, bedHeightsFinder.getInfo(),
-                wstInfo, access.getFunction(), preprocessing, startYear, endYear, ud, qtext, missingVolFrom, missingVolTo);
+        final BezugswstMainCalculationResult result = new BezugswstMainCalculationResult("bundu-bzws", rows, bedHeightsFinder.getInfo(), wstInfo,
+                access.getFunction(), preprocessing, startYear, endYear, ud, qtext, missingVolFrom, missingVolTo);
         results.addResult(result, problems);
 
         // // missing volume calculation
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java	Mon Aug 20 12:11:54 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java	Mon Aug 20 13:30:41 2018 +0200
@@ -32,8 +32,7 @@
         if (value.equals("state.bundu.wst.calc.auto")) {
             final Data[] data = new Data[3];
             data[0] = selection;
-            data[1] = new DefaultData("function", "", "",
-                    new DataItem[] { new DefaultDataItem("", "", org.dive4elements.river.client.client.ui.fixation.FixFunctionSelect.funcDesc.get("log")) });
+            data[1] = new DefaultData("function", "", "", new DataItem[] { new DefaultDataItem("", "", "log") });
             data[2] = new DefaultData("preprocessing", "", "", //
                     new DataItem[] { new DefaultDataItem("", "", "true") });
 

http://dive4elements.wald.intevation.org