Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java @ 4146:5589b1fd459d
Merged.
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 16 Oct 2012 11:28:33 +0200 |
| parents | 58864f4f6e3b |
| children | db0b9cff8496 |
comparison
equal
deleted
inserted
replaced
| 4145:d39f229ea990 | 4146:5589b1fd459d |
|---|---|
| 118 doOutlierOut(aaf, doc, visible); | 118 doOutlierOut(aaf, doc, visible); |
| 119 } | 119 } |
| 120 else if(QSECTOR.equals(name)) { | 120 else if(QSECTOR.equals(name)) { |
| 121 doQSectorOut(aaf, doc, visible); | 121 doQSectorOut(aaf, doc, visible); |
| 122 } | 122 } |
| 123 else if(STATIC_WKMS_INTERPOL.equals(name) || | 123 else if(/*STATIC_WKMS_INTERPOL.equals(name) ||*/ |
| 124 STATIC_WKMS_MARKS.equals(name) || | |
| 124 STATIC_WKMS.equals(name) || | 125 STATIC_WKMS.equals(name) || |
| 125 HEIGHTMARKS_POINTS.equals(name) ) { | 126 HEIGHTMARKS_POINTS.equals(name) ) { |
| 126 doWAnnotations( | 127 doWAnnotations( |
| 127 aaf.getData(context), | 128 aaf.getData(context), |
| 128 aaf, | 129 aaf, |
| 129 doc, | 130 doc, |
| 130 visible); | 131 visible); |
| 131 } | 132 } |
| 132 else if (LONGITUDINAL_W.equals(name) || STATIC_WQ.equals(name)) { | 133 else if (LONGITUDINAL_W.equals(name) || STATIC_WQ.equals(name) |
| 134 || STATIC_WKMS_INTERPOL.equals(name)) { | |
| 133 doWQOut(aaf.getData(context), aaf, doc, visible); | 135 doWQOut(aaf.getData(context), aaf, doc, visible); |
| 134 } | 136 } |
| 135 else if (name.equals(DISCHARGE_CURVE)) { | 137 else if (name.equals(DISCHARGE_CURVE)) { |
| 136 doDischargeOut( | 138 doDischargeOut( |
| 137 (WINFOArtifact) aaf.getArtifact(), | 139 (WINFOArtifact) aaf.getArtifact(), |