Revision: 4804
http://sourceforge.net/p/jump-pilot/code/4804
Author: bertazza
Date: 2016-01-30 18:13:42 +0000 (Sat, 30 Jan 2016)
Log Message:
-----------
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/workbench/model/LayerTreeModel.java
core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
core/trunk/src/org/openjump/core/ui/plugin/file/open/OpenProjectWizard.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2016-01-27 15:06:17 UTC (rev 4803)
+++ core/trunk/ChangeLog 2016-01-30 18:13:42 UTC (rev 4804)
@@ -3,6 +3,9 @@
# 2. make sure that lines break at 80 chars for constricted display situations
#<-------------------------------- 80 chars
---------------------------------->#
+2016-01-30
+ * Fix for missing layers problem when loading projects that include rasters.
+
2016-01-21 berta...@gmail.com
* Quick fix for NullPointerException when loading a project containing
raster(s) when no other projects (tasks) are open.
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/model/LayerTreeModel.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/model/LayerTreeModel.java
2016-01-27 15:06:17 UTC (rev 4803)
+++ core/trunk/src/com/vividsolutions/jump/workbench/model/LayerTreeModel.java
2016-01-30 18:13:42 UTC (rev 4804)
@@ -280,11 +280,11 @@
if (parent instanceof RasterImageLayer) {
RasterImageLayer rasterImageLayer = (RasterImageLayer)parent;
- if(rasterImageLayer.getSymbology() != null) {
+ if(rasterImageLayer.getSymbology() != null &&
rasterImageLayer.getMetadata() != null) {
RasterSymbology rasterSymbology =
rasterImageLayer.getSymbology();
- if(rasterImageLayer.getSymbology().getColorMapType() !=
RasterSymbology.TYPE_RAMP) {
+
if(!rasterImageLayer.getSymbology().getColorMapType().equals(RasterSymbology.TYPE_RAMP))
{
List<RasterStyleValueIntv> styleValues_l = new
ArrayList<RasterStyleValueIntv>();
@@ -321,7 +321,7 @@
} else {
List<RasterStyleValueRamp> styleValues_l = new
ArrayList<RasterStyleValueRamp>();
-
+
double topValue =
rasterImageLayer.getMetadata().getStats().getMax(0);
double bottomValue =
rasterImageLayer.getMetadata().getStats().getMin(0);
Modified:
core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
2016-01-27 15:06:17 UTC (rev 4803)
+++ core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
2016-01-30 18:13:42 UTC (rev 4804)
@@ -161,6 +161,10 @@
private void addImage(WorkbenchContext context, Envelope envelope,
Point imageDimensions) throws NoninvertibleTransformException {
+ if(context.getTask() == null) {
+ context.getWorkbench().getFrame().addTaskFrame();
+ }
+
String newLayerName = context.getLayerManager().uniqueLayerName(
cachedLayer);
Modified:
core/trunk/src/org/openjump/core/ui/plugin/file/open/OpenProjectWizard.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/file/open/OpenProjectWizard.java
2016-01-27 15:06:17 UTC (rev 4803)
+++ core/trunk/src/org/openjump/core/ui/plugin/file/open/OpenProjectWizard.java
2016-01-30 18:13:42 UTC (rev 4804)
@@ -314,7 +314,7 @@
RasterImageLayer rasterImageLayer = (RasterImageLayer)
layerable;
loadRasterImageLayer(workbenchContext,
rasterImageLayer, rasterImageLayer.getSymbology(), sourceLayerCategory);
- break;
+ continue;
}
newLayerManager.addLayerable(sourceLayerCategory.getName(), layerable);
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
