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

Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development

Browse source 
Former-commit-id: adb51300d8 [formerly 4563e38db2] [formerly 3078b69273] [formerly adb51300d8 [formerly 4563e38db2] [formerly 3078b69273] [formerly 5856957c57 [formerly 3078b69273 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]]
Former-commit-id: 5856957c57
Former-commit-id: 08ede8e9f3 [formerly c936a659a5] [formerly 1a60933c3ce5c3f2514129d9f7ef73e507bb6d7c [formerly 5412b72c57]]
Former-commit-id: 3423ea500fae2ba7c5b5f5039edab1f4d969c5e3 [formerly 9e261c9c22]
Former-commit-id: 4628b0c67c
This commit is contained in:
Nate Jensen 2014-02-19 17:22:00 -06:00 • committed by Gerrit Code Review
commit 714a282a4f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
View file

@ -102,7 +102,8 @@ import com.raytheon.viz.ui.editor.IMultiPaneEditor;
* Mar 14, 2013 1457 mpduff Reset the gages on the resource.
* Apr 18, 2013 1920 mpduff Added updateGages method to reload the gage data,
* fix formatting of legend for Base field Height.
* Jul 02, 2013 2160 mpduff Initialize newly displayed resources.
* Jul 02, 2013 2160 mpduff Initialize newly displayed resources.
* Feb 19, 2014 2628 mpduff Change cast from short to int when creating color bar.
*
* </pre>
*
@ -750,7 +751,7 @@ public class MPEDisplayManager {
listener.displayFieldChanged(oldField, fieldToDisplay);
}
}
}
}
displayedFieldResource.issueRefresh();
}
@ -1020,13 +1021,12 @@ public class MPEDisplayManager {
entry.setOperator("<");
entry.setLabel("");
} else {
// Convert display to data, cast to short, convert back to
// display
entry.setDisplayValue(dataToDisplay
.convert((short) displayToData.convert(threshold)));
// Convert display to data, cast to int, convert back to display
entry.setDisplayValue(dataToDisplay.convert((int) displayToData
.convert(threshold)));
if (displayField != DisplayFieldData.Index) {
entry.setLabel(format.format(threshold));
}
}
}
entry.setPixelValue((double) i);