dive4elements/river: flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java comparison

comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java @ 2473:9fa513b7955b

Issue 499. Completed the 'W free' input and validation. flys-client/trunk@4202 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Raimund Renkert <raimund.renkert@intevation.de>
date	Thu, 05 Apr 2012 09:01:09 +0000
parents	5659b5e8c9a8
children	6f7e188fac1a

comparison

equal deleted inserted replaced

-:75d19d46c3cd
+:9fa513b7955b
 protected double minQ;
 /** The min value for the 'from' property in the free Q-Range input mode.*/
 protected double minQFree;
+/** The min value for the 'from' property in the free W-Range input mode.*/
+protected double minWFree;
 /** The max values for the 'from' property in the W-Range input mode.*/
 protected double maxW;
 /** The max values for the 'from' property in the Q-Range input mode.*/
 protected double maxQ;
 /** The max value for the 'from' property in the free Q-Range input mode.*/
 protected double maxQFree;
+/** The max value for the 'from' property in the free W-Range input mode.*/
+protected double maxWFree;
 /** The 'from' value entered in the range W mode.*/
 protected double fromW;
 /** The 'to' value entered in the range W mode.*/
 protected double toW;
 protected double stepW;
 /** The values entered in the single W mode.*/
 protected double[] valuesW;
+/** The values entered in the single W mode.*/
+protected double[] valuesWFree;
 /** The 'from' value entered in the range Q mode.*/
 protected double fromQ;
 /** The 'from' value entered in the range free Q mode.*/
 protected double fromQFree;
+/** The 'from' value entered in the range free W mode.*/
+protected double fromWFree;
 /** The 'to' value entered in the range Q mode.*/
 protected double toQ;
 /** The 'to' value entered in the range free Q mode.*/
 protected double toQFree;
+/** The 'to' value entered in the range free W mode.*/
+protected double toWFree;
 /** The 'step' value entered in the range Q mode.*/
 protected double stepQ;
 /** The 'step' value entered in the range free Q mode.*/
 protected double stepQFree;
+/** The 'step' value entered in the range free W mode.*/
+protected double stepWFree;
 /** The values entered in the single Q mode.*/
 protected double[] valuesQ;
 /** The values entered in the single free Q mode.*/
 protected double[] valuesQFree;
 protected DoubleArrayPanel qArrayPanel;
 /** The input panel for free q values*/
 protected DoubleArrayPanel qFreeArrayPanel;
+/** The input panel for free w values*/
+protected DoubleArrayPanel wFreeArrayPanel;
 /** The input panel for w range*/
 protected DoubleRangePanel wRangePanel;
 /** The input panel for q range*/
 protected DoubleRangePanel qRangePanel;
 /** The input panel for free q range*/
 protected DoubleRangePanel qFreeRangePanel;
+/** The input panel for free w range*/
+protected DoubleRangePanel wFreeRangePanel;
 protected QDTable qdTable;
 protected WTable wTable;
 VLayout selectedLayout = new VLayout();
 String  wqMode         = null;
 if (!isQMode) {
-wqMode = MESSAGE.wqW();
+wqMode = isFree ? MESSAGE.wqWFree() : MESSAGE.wqW();
 }
 else {
 wqMode = isFree ? MESSAGE.wqQ() : MESSAGE.wqQGauge();
 }
 DataItem sQItem  = getDataItem(s.getItems(), "stepQ");
 DataItem sWItem  = getDataItem(s.getItems(), "stepW");
 DataItem fQFItem = getDataItem(f.getItems(), "minQFree");
 DataItem tQFItem = getDataItem(t.getItems(), "maxQFree");
 DataItem sQFItem = getDataItem(s.getItems(), "stepQFree");
+DataItem fWFItem = getDataItem(f.getItems(), "minWFree");
+DataItem tWFItem = getDataItem(t.getItems(), "maxWFree");
+DataItem sWFItem = getDataItem(s.getItems(), "stepWFree");
 minW  = Double.valueOf(fWItem.getStringValue());
 maxW  = Double.valueOf(tWItem.getStringValue());
 stepW = Double.valueOf(sWItem.getStringValue());
 minQFree  = Double.valueOf(fQFItem.getStringValue());
 maxQFree  = Double.valueOf(tQFItem.getStringValue());
 stepQFree = Double.valueOf(sQFItem.getStringValue());
+minWFree  = Double.valueOf(fWFItem.getStringValue());
+maxWFree  = Double.valueOf(tWFItem.getStringValue());
+stepWFree = Double.valueOf(sWFItem.getStringValue());
 this.fromW = minW;
 this.toW   = maxW;
 this.stepW = stepW;
 this.fromQ = minQ;
 this.stepQ = stepQ;
 this.fromQFree = minQFree;
 this.toQFree   = maxQFree;
 this.stepQFree = stepQFree;
+this.fromWFree = minWFree;
+this.toWFree   = maxWFree;
+this.stepWFree = stepWFree;
 }
 /**
 * Initializes the form items with former inserted user data.
 }
 }
 protected List<String> validateRangeValues() {
-if (isWMode()) {
+if (isWFree()) {
-return validateRange(wRangePanel, minW, maxW);
+return validateRange(wFreeRangePanel, minWFree, maxWFree);
 }
 else if (isQFree()) {
 return validateRange(qFreeRangePanel, minQFree, maxQFree);
 }
-else if (isWFree()) {
+else if (isWMode()) {
 return validateRange(wRangePanel, minW, maxW);
 }
 else {
 return validateRange(qRangePanel, minQ, maxQ);
 }
 }
 protected List<String> validateSingleValues() {
 if (isWFree()) {
-// FIXME: We need min W and max W of the start km of the range.
+return validateSingle(wFreeArrayPanel, minWFree, maxWFree);
-return validateSingle(wArrayPanel, 0, 100000);
 }
 else if (isWMode()) {
-//return validateSingle(wArrayPanel, minW, maxW);
+return validateSingle(wArrayPanel, minW, maxW);
-return validateSingle(wArrayPanel, 0, 100000);
+//return validateSingle(wArrayPanel, 0, 100000);
 }
 else if (isQFree()) {
 return validateSingle(qFreeArrayPanel, minQFree, maxQFree);
 }
 else {
 // saved. So, we gonna save those values explicitly.
 if (!isRangeMode()) {
 Canvas member = container.getMember(0);
 if (member instanceof DoubleArrayPanel) {
 DoubleArrayPanel form = (DoubleArrayPanel) member;
-if (isWMode()) {
+if (isWFree()) {
+saveSingleWFreeValues(form);
+}
+else if (isWMode()) {
 saveSingleWValues(form);
 }
 else if (isQFree()) {
 saveSingleQFreeValues(form);
 }
 else {
 Canvas member = container.getMember(0);
 if (member instanceof DoubleRangePanel) {
 DoubleRangePanel form = (DoubleRangePanel) member;
-if (isWMode()) {
+if (isWFree()) {
+saveRangeWFreeValues(form);
+}
+else if (isWMode()) {
 saveRangeWValues(form);
 }
 else if (isQFree()) {
 saveRangeQFreeValues(form);
 }
 if (wqMode.equals(FIELD_WQ_Q_FREE) || wqMode.equals(FIELD_WQ_Q)) {
 GWT.log("getData: FIELD_WQ_Q || FIELD_WQ_Q_FREE");
 value = "true";
 }
 else {
-GWT.log("getData: FIELD_WQ_W");
+GWT.log("getData: FIELD_WQ_W || FIELD_WQ_W_FREE");
 value = "false";
 }
 DataItem item = new DefaultDataItem("wq_isq", "wq_isq", value);
 return new DefaultData(
 "wq_step", null, null, new DataItem[] { item });
 }
 protected double[] getFinalSingle() {
-boolean wMode = isWMode();
+if (isWFree()) {
+return getSingleWFree();
-if (isWMode()) {
+}
+else if (isWMode()) {
 return getSingleW();
 }
 else if (isQFree()) {
 return getSingleQFree();
 }
 * Returns the value of 'from' depending on the selected input mode.
 *
 * @return the value of 'from' depending on the selected input mode.
 */
 protected double getFinalFrom() {
-boolean wMode     = isWMode();
+if (isRangeMode()) {
-boolean rangeMode = isRangeMode();
+if (isWFree()) {
+return getFromWFree();
-if (rangeMode) {
+}
-if (wMode) {
+else if (isWMode()) {
 return getFromW();
 }
 else if (isQFree()) {
 return getFromQFree();
 }
 }
 }
 else {
 double[] values = null;
-if (wMode) {
+if (isWFree()) {
+values = getSingleWFree();
+}
+else if (isWMode()) {
 values = getSingleW();
 }
 else if (isQFree()) {
 values = getSingleQFree();
 }
 * Returns the value of 'to' depending on the selected input mode.
 *
 * @return the value of 'to' depending on the selected input mode.
 */
 protected double getFinalTo() {
-boolean wMode     = isWMode();
+if (isRangeMode()) {
-boolean rangeMode = isRangeMode();
+if (isWFree()) {
+return getToWFree();
-if (rangeMode) {
+}
-if (wMode) {
+else if (isWMode()) {
 return getToW();
 }
 else if (isQFree()) {
 return getToQFree();
 }
 }
 }
 else {
 double[] values = null;
-if (wMode) {
+if (isWFree()) {
+values = getSingleWFree();
+}
+else if (isWMode()) {
 values = getSingleW();
 }
 else if (isQFree()) {
 values = getSingleQFree();
 }
 * Returns the value of 'step' depending on the selected input mode.
 *
 * @return the value of 'step' depending on the selected input mode.
 */
 protected double getFinalStep() {
-boolean wMode     = isWMode();
+if (isRangeMode()) {
-boolean rangeMode = isRangeMode();
+if (isWFree()) {
+return getStepWFree();
-if (rangeMode) {
+}
-if (wMode) {
+else if (isWMode()) {
 return getStepW();
 }
 else if (isQFree()) {
 return getStepQFree();
 }
 protected void updatePanels(boolean isQ, boolean isFree, boolean isRange) {
 container.removeMembers(container.getMembers());
-if (!isQ) {
+if (!isQ && isFree) {
+if (!isRange) {
+// Single W mode
+double[] values = getSingleWFree();
+wFreeArrayPanel = new DoubleArrayPanel(
+MESSAGE.unitWSingle(), values, this);
+container.addMember(wFreeArrayPanel);
+}
+else {
+// Range W mode
+double from = getFromWFree();
+double to   = getToWFree();
+double step = getStepWFree();
+wFreeRangePanel = new DoubleRangePanel(
+MESSAGE.unitWFrom(), MESSAGE.unitWTo(), MESSAGE.unitWStep(),
+from, to, step,
+250,
+this);
+container.addMember(wFreeRangePanel);
+}
+tabs.selectTab(0);
+}
+else if (!isQ) {
 if (!isRange) {
 // Single W mode
 double[] values = getSingleW();
 wArrayPanel = new DoubleArrayPanel(
 else {
 DoubleRangePanel p = (DoubleRangePanel) form;
 saveRangeWValue(p, item);
 }
 }
-else if (wqMode.equals(FIELD_WQ_Q)) {
+else if (wqMode.equals(FIELD_WQ_W_FREE)) {
+if (inputMode.equals(FIELD_MODE_SINGLE)) {
+DoubleArrayPanel p = (DoubleArrayPanel) form;
+saveSingleWFreeValue(p, item);
+}
+else {
+DoubleRangePanel p = (DoubleRangePanel) form;
+saveRangeWFreeValue(p, item);
+}
+}
+else if (wqMode.equals(FIELD_WQ_Q_FREE)) {
 if (inputMode.equals(FIELD_MODE_SINGLE)) {
 DoubleArrayPanel p = (DoubleArrayPanel) form;
 saveSingleQFreeValue(p, item);
 }
 else {
 }
 }
 }
+protected void saveSingleWFreeValues(DoubleArrayPanel p) {
+FormItem[] formItems = p.getFields();
+for (FormItem item: formItems) {
+if (item.getFieldName().equals(DoubleArrayPanel.FIELD_NAME)) {
+saveSingleWFreeValue(p, item);
+}
+}
+}
 protected void saveSingleQValues(DoubleArrayPanel p) {
 FormItem[] formItems = p.getFields();
 for (FormItem item: formItems) {
 if (item.getFieldName().equals(DoubleArrayPanel.FIELD_NAME)) {
 setSingleW(p.getInputValues(item));
 }
 }
+protected void saveSingleWFreeValue(DoubleArrayPanel p, FormItem item) {
+if (p.validateForm(item)) {
+setSingleWFree(p.getInputValues(item));
+}
+}
 protected void saveSingleQValue(DoubleArrayPanel p, FormItem item) {
 if (p.validateForm(item)) {
 setSingleQ(p.getInputValues(item));
 }
 }
 protected void saveRangeWValues(DoubleRangePanel p) {
 FormItem[] formItems = p.getFields();
 for (FormItem item: formItems) {
 saveRangeWValue(p, item);
+}
+}
+protected void saveRangeWFreeValues(DoubleRangePanel p) {
+FormItem[] formItems = p.getFields();
+for (FormItem item: formItems) {
+saveRangeWFreeValue(p, item);
 }
 }
 protected void saveRangeQValues(DoubleRangePanel p) {
 setStepW(p.getStep());
 }
 }
+protected void saveRangeWFreeValue(DoubleRangePanel p, FormItem item) {
+if (p.validateForm()) {
+setFromW(p.getFrom());
+setToW(p.getTo());
+setStepW(p.getStep());
+}
+}
 protected void saveRangeQValue(DoubleRangePanel p, FormItem item) {
 if (p.validateForm()) {
 setFromQ(p.getFrom());
 setToQ(p.getTo());
 setStepQ(p.getStep());
 protected void setStepQFree(double stepQ) {
 this.stepQFree = stepQ;
 }
 protected double[] getSingleW() {
 return valuesW;
 }
+protected double[] getSingleWFree() {
+return valuesWFree;
+}
 protected void setSingleW(double[] values) {
 valuesW = values;
 }
+protected void setSingleWFree(double[] values) {
+valuesWFree = values;
+}
 protected double getFromW() {
 return fromW;
 }
+protected double getFromWFree() {
+return fromWFree;
+}
 protected void setFromW(double fromW) {
 this.fromW = fromW;
 }
+protected void setFromWFree(double fromW) {
+this.fromW = fromW;
+}
 protected double getToW() {
 return toW;
 }
+protected double getToWFree() {
+return toWFree;
+}
 protected void setToW(double toW) {
 this.toW = toW;
 }
+protected void setToWFree(double toW) {
+this.toWFree = toW;
+}
 protected double getStepW() {
 return stepW;
 }
+protected double getStepWFree() {
+return stepWFree;
+}
 protected void setStepW(double stepW) {
 this.stepW = stepW;
 }
+protected void setStepWFree(double stepW) {
+this.stepWFree = stepW;
+}
 /**
 * Determines the min and max kilometer value selected in a former state. A
 * bit silly, but we need to run over each value of the "old data" to find
 * such values because it is not available here.

Mercurial > dive4elements > river

comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java @ 2473:9fa513b7955b