Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java @ 6780:b8f94e865875
S/Q relation: Part I of 'faking' fitting linear data. S/Qs can now be subclassed and processed through views. TODO: Add knob to setup a linear data path.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Thu, 08 Aug 2013 12:17:03 +0200 |
parents | af13ceeba52a |
children | 94cb1845c667 |
comparison
equal
deleted
inserted
replaced
6779:8e5adc56385c | 6780:b8f94e865875 |
---|---|
188 | 188 |
189 private MeasurementFactory() { | 189 private MeasurementFactory() { |
190 } | 190 } |
191 | 191 |
192 public static Measurements getMeasurements( | 192 public static Measurements getMeasurements( |
193 String river, | 193 String river, |
194 double location, | 194 double location, |
195 DateRange dateRange | 195 DateRange dateRange, |
196 SQ.Factory sqFactory | |
196 ) { | 197 ) { |
197 Session session = SedDBSessionHolder.HOLDER.get(); | 198 Session session = SedDBSessionHolder.HOLDER.get(); |
198 try { | 199 try { |
199 List<Measurement> totals = loadTotals( | 200 List<Measurement> totals = loadTotals( |
200 session, river, location, dateRange); | 201 session, river, location, dateRange); |
201 | 202 |
202 List<Measurement> accumulated = loadFractions( | 203 List<Measurement> accumulated = loadFractions( |
203 session, river, location, dateRange); | 204 session, river, location, dateRange); |
204 | 205 |
205 return new Measurements(totals, accumulated); | 206 return new Measurements(totals, accumulated, sqFactory); |
206 } | 207 } |
207 finally { | 208 finally { |
208 session.close(); | 209 session.close(); |
209 } | 210 } |
210 } | 211 } |