Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java @ 9360:ddcd52d239cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Outliers in fixation calculation are now shown within the other 'B' event themes and get a separate symbol (triangle). Removed old outliers theme. Also consider showpoints property. Also consider pointsize property.
author gernotbelger
date Wed, 01 Aug 2018 17:13:52 +0200
parents 0c621beceb2f
children 9744ce3c3853
comparison
equal deleted inserted replaced
9359:df6f1b5806f6 9360:ddcd52d239cd
24 import org.dive4elements.river.artifacts.model.DataFacet; 24 import org.dive4elements.river.artifacts.model.DataFacet;
25 import org.dive4elements.river.artifacts.model.FacetTypes; 25 import org.dive4elements.river.artifacts.model.FacetTypes;
26 import org.dive4elements.river.artifacts.model.ReportFacet; 26 import org.dive4elements.river.artifacts.model.ReportFacet;
27 import org.dive4elements.river.artifacts.model.WQCKms; 27 import org.dive4elements.river.artifacts.model.WQCKms;
28 import org.dive4elements.river.artifacts.model.WQKms; 28 import org.dive4elements.river.artifacts.model.WQKms;
29 import org.dive4elements.river.artifacts.model.fixings.FixOutlierFacet;
30 import org.dive4elements.river.artifacts.model.fixings.FixRealizingCalculation; 29 import org.dive4elements.river.artifacts.model.fixings.FixRealizingCalculation;
31 import org.dive4elements.river.artifacts.model.fixings.FixRealizingResult; 30 import org.dive4elements.river.artifacts.model.fixings.FixRealizingResult;
32 import org.dive4elements.river.artifacts.model.fixings.FixReferenceEventsFacet; 31 import org.dive4elements.river.artifacts.model.fixings.FixReferenceEventsFacet;
33 import org.dive4elements.river.artifacts.model.fixings.FixWQCurveFacet; 32 import org.dive4elements.river.artifacts.model.fixings.FixWQCurveFacet;
34 import org.dive4elements.river.artifacts.model.fixings.FixWaterlevelFacet; 33 import org.dive4elements.river.artifacts.model.fixings.FixWaterlevelFacet;
46 45
47 /** The log used in this class. */ 46 /** The log used in this class. */
48 private static Logger log = Logger.getLogger(FixRealizingCompute.class); 47 private static Logger log = Logger.getLogger(FixRealizingCompute.class);
49 48
50 public static final String I18N_WQ_CURVE = "fix.vollmer.wq.curve"; 49 public static final String I18N_WQ_CURVE = "fix.vollmer.wq.curve";
51
52 public static final String I18N_WQ_OUTLIER = "fix.vollmer.wq.outliers";
53 50
54 /** 51 /**
55 * The default constructor that initializes an empty State object. 52 * The default constructor that initializes an empty State object.
56 */ 53 */
57 public FixRealizingCompute() { 54 public FixRealizingCompute() {
96 } else { 93 } else {
97 nameW = wqkms[i].getName(); 94 nameW = wqkms[i].getName();
98 nameQ = "Q(" + nameW + ")"; 95 nameQ = "Q(" + nameW + ")";
99 } 96 }
100 97
101 final Facet wq = new FixWaterlevelFacet(i, FIX_WQ_LS, nameW, ComputeType.ADVANCE, hash, id); 98 facets.add(new FixWaterlevelFacet(i, FIX_WQ_LS, nameW, ComputeType.ADVANCE, hash, id));
102 99 facets.add(new FixWaterlevelFacet(i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, hash, id));
103 final Facet w = new FixWaterlevelFacet(i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, hash, id); 100 facets.add(new FixWaterlevelFacet(i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, hash, id));
104 101 facets.add(new CrossSectionWaterLineFacet(i, nameW));
105 final Facet q = new FixWaterlevelFacet(i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, hash, id);
106 final Facet csFacet = new CrossSectionWaterLineFacet(i, nameW);
107
108 facets.add(wq);
109 facets.add(w);
110 facets.add(q);
111 facets.add(csFacet);
112 102
113 // XXX: THIS CAN NOT HAPPEN! REMOVE IT! 103 // XXX: THIS CAN NOT HAPPEN! REMOVE IT!
114 if (wqkms[i] instanceof WQCKms) { 104 if (wqkms[i] instanceof WQCKms) {
115 final String nameC = nameW.replace("benutzerdefiniert", "benutzerdefiniert [korrigiert]"); 105 final String nameC = nameW.replace("benutzerdefiniert", "benutzerdefiniert [korrigiert]");
116 106 facets.add(new FixWaterlevelFacet(i, DISCHARGE_LONGITUDINAL_C, nameC));
117 final Facet c = new FixWaterlevelFacet(i, DISCHARGE_LONGITUDINAL_C, nameC);
118
119 facets.add(c);
120 } 107 }
121 } 108 }
122 109
123 if (wqkms.length > 0) { 110 if (fixRes != null && wqkms.length > 0) {
124 final DateFormat df = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy"); 111 final DateFormat df = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy");
125 final DateFormat lf = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy'T'HH:mm"); 112 final DateFormat lf = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy'T'HH:mm");
126 113
127 final Collection<Date> reds = fixRes.getReferenceEventsDates(); 114 final Collection<Date> reds = fixRes.getReferenceEventsDates();
128 final UniqueDateFormatter cf = new UniqueDateFormatter(df, lf, reds); 115 final UniqueDateFormatter cf = new UniqueDateFormatter(df, lf, reds);
143 facets.add(new DataFacet(AT, "AT data", ComputeType.ADVANCE, hash, id)); 130 facets.add(new DataFacet(AT, "AT data", ComputeType.ADVANCE, hash, id));
144 131
145 if (fixRes != null) 132 if (fixRes != null)
146 facets.add(new FixWQCurveFacet(0, Resources.getMsg(meta, I18N_WQ_CURVE, I18N_WQ_CURVE) + " (" + access.getFunction() + ")")); 133 facets.add(new FixWQCurveFacet(0, Resources.getMsg(meta, I18N_WQ_CURVE, I18N_WQ_CURVE) + " (" + access.getFunction() + ")"));
147 134
148 if (access.getPreprocessing() && fixRes != null) {
149 facets.add(new FixOutlierFacet(0, FIX_OUTLIER, Resources.getMsg(meta, I18N_WQ_OUTLIER, I18N_WQ_OUTLIER)));
150 }
151
152 return res; 135 return res;
153 } 136 }
154 } 137 }
http://dive4elements.wald.intevation.org