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

Merge "Issue #1436 Fixed selection icon reset, Fixed area text box display check." into development

Browse source 
Former-commit-id: e6d99ad02f [formerly 6b2edffd7e] [formerly f25f22c569] [formerly e6d99ad02f [formerly 6b2edffd7e] [formerly f25f22c569] [formerly 6a54b7f4d3 [formerly f25f22c569 [formerly 26e37784cac5ffd690e7280aa394711a3bd86820]]]]
Former-commit-id: 6a54b7f4d3
Former-commit-id: 027405d885 [formerly 7b4c0a6750] [formerly 5a9975d4a70f6406f7472ca9c563808a13efa411 [formerly 34bc572bb9]]
Former-commit-id: 131065445848d56f6141b20ef57f96d9c9cc7029 [formerly e97eead930]
Former-commit-id: 6eed9166d7
This commit is contained in:
Richard Peter 2013-01-08 16:45:58 -06:00 • committed by Gerrit Code Review
commit 968b9fe25b
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
View file

@ -113,6 +113,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Dec 11, 2012 1405 mpduff Move close confirmation dialog after event.doit = false. * Dec 11, 2012 1405 mpduff Move close confirmation dialog after event.doit = false.
* Dec 10, 2012 1259 bsteffen Switch Data Delivery from LatLon to referenced envelopes. * Dec 10, 2012 1259 bsteffen Switch Data Delivery from LatLon to referenced envelopes.
* Dec 12, 2012 1391 bgonzale Added job for dataset retrieval. * Dec 12, 2012 1391 bgonzale Added job for dataset retrieval.
* Jan 08, 2012 1436 bgonzale Fixed area text box display update check.
* *
* </pre> * </pre>
* *
@ -735,27 +736,27 @@ public class DataBrowserDlg extends CaveSWTDialog implements IDataTableUpdate,
if (envelope == null || envelope.isEmpty()) { if (envelope == null || envelope.isEmpty()) {
areaSelectedLbl.setText(""); areaSelectedLbl.setText("");
clearBtn.setEnabled(false); clearBtn.setEnabled(false);
} } else {
NumberFormat formatter = new DecimalFormat(".0000");
NumberFormat formatter = new DecimalFormat(".0000"); Coordinate ul = EnvelopeUtils.getUpperLeftLatLon(envelope);
Coordinate lr = EnvelopeUtils.getLowerRightLatLon(envelope);
Coordinate ul = EnvelopeUtils.getUpperLeftLatLon(envelope); // Check for empty values
Coordinate lr = EnvelopeUtils.getLowerRightLatLon(envelope); if (ul.x == 0 && ul.y == 0 && lr.x == 0 && lr.y == 0) {
return;
}
// Check for empty values StringBuilder sb = new StringBuilder("UL: ");
if (ul.x == 0 && ul.y == 0 && lr.x == 0 && lr.y == 0) { sb.append(formatter.format(ul.x) + "," + formatter.format(ul.y));
return; sb.append(", LR: " + formatter.format(lr.x) + ","
} + formatter.format(lr.y));
StringBuilder sb = new StringBuilder("UL: "); areaSelectedLbl.setText(sb.toString());
sb.append(formatter.format(ul.x) + "," + formatter.format(ul.y));
sb.append(", LR: " + formatter.format(lr.x) + ","
+ formatter.format(lr.y));
areaSelectedLbl.setText(sb.toString()); if (areaSelectedLbl.getText().length() > 0) {
clearBtn.setEnabled(true);
if (areaSelectedLbl.getText().length() > 0) { }
clearBtn.setEnabled(true);
} }
this.areaDirty = true; this.areaDirty = true;

4
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/filter/FilterExpandBar.java
View file

@ -77,7 +77,8 @@ import com.raytheon.viz.ui.widgets.duallist.DualListConfig;
* Dec 12, 2012 1391 bgonzale Added a job for the dataset query. * Dec 12, 2012 1391 bgonzale Added a job for the dataset query.
* Dec 10, 2012 1259 bsteffen Switch Data Delivery from LatLon to referenced envelopes. * Dec 10, 2012 1259 bsteffen Switch Data Delivery from LatLon to referenced envelopes.
* Dec 18, 2012 1436 bgonzale When creating the filter dialogs, use the loaded * Dec 18, 2012 1436 bgonzale When creating the filter dialogs, use the loaded
* configuration when populating the filters. * configuration when populating the filters. Fixed selection
* icon update when loading from a file.
* *
* </pre> * </pre>
* *
@ -326,7 +327,6 @@ public class FilterExpandBar extends Composite implements IFilterUpdate, IExpand
FilterComp filterComp = new FilterComp(expandBar, SWT.NONE, this, filterConfig, idx); FilterComp filterComp = new FilterComp(expandBar, SWT.NONE, this, filterConfig, idx);
expItem.setHeight(filterComp.computeSize(SWT.DEFAULT, SWT.DEFAULT).y); expItem.setHeight(filterComp.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
expItem.setImage(filterImgs.getExpandItemImage(ExpandItemState.NoEntries));
expItem.setControl(filterComp); expItem.setControl(filterComp);
} }