xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2335 - Implement adhoc point queries" into dd_pre_release_2.1

Browse source 
Former-commit-id: a6652b28f5 [formerly b21e918baf426f02947dcc98e33478018dcfe789]
Former-commit-id: fa09f2a97f
This commit is contained in:
Richard Peter 2013-09-05 16:39:53 -05:00 • committed by Gerrit Code Review
commit ab8e1d868e
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
View file

@ -60,6 +60,7 @@ import com.raytheon.uf.viz.datadelivery.subscription.subset.xml.SubsetXML;
* Jun 11, 2013 2064 mpduff Fix editing of subscriptions. * Jun 11, 2013 2064 mpduff Fix editing of subscriptions.
* Jun 14, 2013 2108 mpduff Refactored DataSizeUtils and * Jun 14, 2013 2108 mpduff Refactored DataSizeUtils and
* implement subset size. * implement subset size.
* Sep 05, 2013 2335 mpduff Fix times for adhoc point queries.
* *
* </pre> * </pre>
* *
@ -174,8 +175,18 @@ public class PointSubsetManagerDlg extends
*/ */
@Override @Override
protected Time setupDataSpecificTime(Time newTime, Subscription sub) { protected Time setupDataSpecificTime(Time newTime, Subscription sub) {
// TODO Auto-generated method stub PointTime newTimePoint = (PointTime) newTime;
return null;
// Format must be set before setting the dates.
newTimePoint.setFormat(dataSet.getTime().getFormat());
int interval = timingTabControls.getSaveInfo()
.getDataRetrievalInterval();
newTimePoint.setInterval(interval);
newTimePoint.setStartDate(new Date());
newTimePoint.setEndDate(new Date());
newTimePoint.setInterval(timingTabControls.getDataRetrievalInterval());
return newTimePoint;
} }
/** /**
@ -194,12 +205,8 @@ public class PointSubsetManagerDlg extends
protected <T extends Subscription> T populateSubscription(T sub, protected <T extends Subscription> T populateSubscription(T sub,
boolean create) { boolean create) {
PointTime newTime = new PointTime(); Time newTime = new PointTime();
int interval = timingTabControls.getSaveInfo() newTime = setupDataSpecificTime(newTime, sub);
.getDataRetrievalInterval();
newTime.setInterval(interval);
newTime.setStartDate(new Date());
newTime.setEndDate(new Date());
sub.setTime(newTime); sub.setTime(newTime);
Coverage cov = new Coverage(); Coverage cov = new Coverage();