[PATCH 2 of 2] Set default fitting function to log-inear („W(Q)=a*ln(m*Q+b)“)

Wald Commits scm-commit at wald.intevation.org
Mon Oct 1 18:08:28 CEST 2018


# HG changeset patch
# User gernotbelger
# Date 1538410111 -7200
# Node ID 51212d40ff56788e61a4b36847da20adc079fb46
# Parent  967ca59cc11afca035ca82d3efd564437d4ef7a0
Set default fitting function to log-inear („W(Q)=a*ln(m*Q+b)“)

diff -r 967ca59cc11a -r 51212d40ff56 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java	Mon Oct 01 18:07:49 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java	Mon Oct 01 18:08:31 2018 +0200
@@ -16,12 +16,12 @@
 
 public class BunduWstCalcSelectRadioPanel extends RadioPanel {
 
+    private static final long serialVersionUID = 3357071563224461043L;
+
     public BunduWstCalcSelectRadioPanel(final String datakey) {
         super(datakey);
     }
 
-    private static final long serialVersionUID = 3357071563224461043L;
-
     @Override
     protected Data[] getData() {
         // if auto selected, additional custom data (function) has to be set. the rest is standard radioPanel behaviour
@@ -32,14 +32,12 @@
         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("", "", "log") });
-            data[2] = new DefaultData("preprocessing", "", "", //
-                    new DataItem[] { new DefaultDataItem("", "", "true") });
+            data[1] = new DefaultData("function", "", "", new DataItem[] { new DefaultDataItem("", "", "log-linear") });
+            data[2] = new DefaultData("preprocessing", "", "", new DataItem[] { new DefaultDataItem("", "", "true") });
 
             return data;
-        } else {
-            return new Data[] { selection };
         }
+
+        return new Data[] { selection };
     }
-
-}
+}
\ No newline at end of file
diff -r 967ca59cc11a -r 51212d40ff56 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java	Mon Oct 01 18:07:49 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java	Mon Oct 01 18:08:31 2018 +0200
@@ -52,7 +52,7 @@
 
         this.form = new DynamicForm();
 
-        final int selectIndex = 0;
+        final int selectIndex = 2;
 
         final int size = data.size();
 


More information about the Dive4Elements-commits mailing list