Mercurial > dive4elements > river
changeset 9526:51212d40ff56
Set default fitting function to log-inear („W(Q)=a*ln(m*Q+b)“)
| author | gernotbelger |
|---|---|
| date | Mon, 01 Oct 2018 18:08:31 +0200 |
| parents | 967ca59cc11a |
| children | 7c8d62867876 |
| files | gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/BunduWstCalcSelectRadioPanel.java gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java |
| diffstat | 2 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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();