Mercurial > dive4elements > river
changeset 9248:9e6b70cce337
pseudo epoch for salix.historical
author | gernotbelger |
---|---|
date | Thu, 12 Jul 2018 13:27:34 +0200 (2018-07-12) |
parents | 1ec3b891ab02 |
children | 600e1ac42049 |
files | artifacts/doc/conf/artifacts/uinfo.xml artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadSingleEpochSelectState.java gwt-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleEpochSelect.java gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleYearPseudoEpochPanel.java |
diffstat | 5 files changed, 32 insertions(+), 64 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/uinfo.xml Thu Jul 12 12:12:01 2018 +0200 +++ b/artifacts/doc/conf/artifacts/uinfo.xml Thu Jul 12 13:27:34 2018 +0200 @@ -118,7 +118,7 @@ </state> <state id="state.uinfo.load.epoch" description="state.uinfo.load.epoch" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleEpochSelectState" helpText="help.state.uinfo.load.epoch"> - <data name="singleepoch" type="String" /> + <data name="singleepoch" type="Integer" /> </state> <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> @@ -132,9 +132,10 @@ <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" /> </transition> - <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.states.DistanceOnlyPartSelect" helpText="help.state.uinfo.distance_only"> + <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.uinfo.salix.DistanceOnlyPartHistoricalSelect" helpText="help.state.uinfo.distance_only"> <data name="ld_from_part" type="Double" /> <data name="ld_to_part" type="Double" /> + <data name="bedheights_for_part" type="Double" /> </state> <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadSingleEpochSelectState.java Thu Jul 12 12:12:01 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/LoadSingleEpochSelectState.java Thu Jul 12 13:27:34 2018 +0200 @@ -37,7 +37,7 @@ @Override protected String getUIProvider() { - return "common.load_single_epoch_select"; + return "uinfo.salix.load_single_year_pseudo_epoch_select"; } @Override
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java Thu Jul 12 12:12:01 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java Thu Jul 12 13:27:34 2018 +0200 @@ -30,8 +30,8 @@ import org.dive4elements.river.client.client.ui.sinfo.FlowDepthTwinPanel; import org.dive4elements.river.client.client.ui.sq.SQPeriodPanel; import org.dive4elements.river.client.client.ui.uinfo.LoadSedimentHeightPanel; -import org.dive4elements.river.client.client.ui.uinfo.LoadSingleEpochSelect; import org.dive4elements.river.client.client.ui.uinfo.LoadSingleYearPanel; +import org.dive4elements.river.client.client.ui.uinfo.LoadSingleYearPseudoEpochPanel; import org.dive4elements.river.client.client.ui.uinfo.SupraRegionalTablePanel; import org.dive4elements.river.client.client.ui.uinfo.VegetationzonesTableEditPanel; import org.dive4elements.river.client.client.ui.uinfo.VegetationzonesTablePanel; @@ -168,8 +168,8 @@ return new CollisionLoadEpochPanel(); } else if (uiProvider.equals("common.state.load_single_year_select")) { return new LoadSingleYearPanel(); - } else if (uiProvider.equals("common.load_single_epoch_select")) { - return new LoadSingleEpochSelect(); + } else if (uiProvider.equals("uinfo.salix.load_single_year_pseudo_epoch_select")) { + return new LoadSingleYearPseudoEpochPanel(); } else if (uiProvider.equals("minfo.sedimentload_sqti_select")) { return new SedLoadSQTiPanel(); } else if (uiProvider.equals("uinfo.sedimentheight_select")) {
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleEpochSelect.java Thu Jul 12 12:12:01 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde - * Software engineering by Intevation GmbH - * - * This file is Free Software under the GNU AGPL (>=v3) - * and comes with ABSOLUTELY NO WARRANTY! Check out the - * documentation coming with Dive4Elements River for details. - */ - -package org.dive4elements.river.client.client.ui.uinfo; - -import org.dive4elements.river.client.client.ui.AbstractEpochPanel; -import org.dive4elements.river.client.client.ui.PanelHelper; -import org.dive4elements.river.client.shared.model.DataList; - -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.Label; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.TextItem; -import com.smartgwt.client.widgets.layout.VLayout; - -public class LoadSingleEpochSelect extends AbstractEpochPanel { - - private static final long serialVersionUID = 1L; - - public LoadSingleEpochSelect() { - super(Type.single); - } - - @Override - protected String getDatakey() { - return "singleepoch"; - } - - @Override - protected Canvas createWidget(final DataList data) { - final VLayout root = new VLayout(); - - final Label title = new Label(data.get(0).getDescription()); - title.setHeight("25px"); - - final DynamicForm form = new DynamicForm(); - form.setNumCols(4); - final TextItem start = createStartInputItem(this.MSG.from()); - start.setCanEdit(false); - - final TextItem end = createEndInputItem(this.MSG.to()); - end.setCanEdit(false); - - form.setFields(start, end); - - root.addMember(title); - root.addMember(PanelHelper.getSpacer(10)); - root.addMember(form); - - return root; - } - -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/uinfo/LoadSingleYearPseudoEpochPanel.java Thu Jul 12 13:27:34 2018 +0200 @@ -0,0 +1,25 @@ +/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde + * Software engineering by Intevation GmbH + * + * This file is Free Software under the GNU AGPL (>=v3) + * and comes with ABSOLUTELY NO WARRANTY! Check out the + * documentation coming with Dive4Elements River for details. + */ + +package org.dive4elements.river.client.client.ui.uinfo; + +public class LoadSingleYearPseudoEpochPanel extends LoadSingleYearPanel { + + private static final long serialVersionUID = 1L; + + @Override + protected String getDatakey() { + return "singleepoch"; + } + + @Override + protected String errorForItemMsg() { + return this.MSG.no_data_for_year();// NO DATA FOR EPOCH TODO möglicherweise, wenn der ablauf klar ist + } + +} \ No newline at end of file