|
From: Logs S. c. messages. <gvs...@li...> - 2013-11-23 15:54:38
|
Revision: 1077
http://sourceforge.net/p/gvsigce/code/1077
Author: vicgonco
Date: 2013-11-23 15:54:35 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Applying https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/revisions/38223
Modified Paths:
--------------
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/ui/launcher/FileSelectionPanel.java
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/ui/zoom/ViewMapRequestManager.java
Modified: trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/ui/launcher/FileSelectionPanel.java
===================================================================
--- trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/ui/launcher/FileSelectionPanel.java 2013-11-23 15:53:12 UTC (rev 1076)
+++ trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/ui/launcher/FileSelectionPanel.java 2013-11-23 15:54:35 UTC (rev 1077)
@@ -144,7 +144,7 @@
layer.getDataSource().close();
layer = FLyrRasterSE.createLayer(RasterUtilities.getLastPart(path, File.separator), path, null);
if (layer != null) {
- layer.init();
+// layer.init();
getFileName().setText(path);
}
return layer;
Modified: trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/ui/zoom/ViewMapRequestManager.java
===================================================================
--- trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/ui/zoom/ViewMapRequestManager.java 2013-11-23 15:53:12 UTC (rev 1076)
+++ trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/ui/zoom/ViewMapRequestManager.java 2013-11-23 15:54:35 UTC (rev 1077)
@@ -34,6 +34,7 @@
import com.iver.cit.gvsig.fmap.MapControl;
import com.iver.cit.gvsig.fmap.ViewPort;
import com.iver.cit.gvsig.fmap.layers.FLayers;
+import com.iver.cit.gvsig.fmap.operations.Cancel;
import com.iver.utiles.swing.threads.Cancellable;
/**
@@ -158,7 +159,8 @@
DefaultMapContextDrawer mapContextDrawer = new DefaultMapContextDrawer();
mapContextDrawer.setMapContext(lyrs.getMapContext());
mapContextDrawer.setViewPort(vp);
- mapContextDrawer.draw(lyrs, initImg, img, new CancellableClass(), mapControl.getMapContext().getScaleView());
+ Cancel myCancel = new Cancel();
+ mapContextDrawer.draw(lyrs, initImg, img, myCancel, mapControl.getMapContext().getScaleView());
//lyrs.draw(initImg, img, vp, new CancellableClass(), mapControl.getMapContext().getScaleView());
setDrawParams(initImg, extent);
@@ -210,14 +212,4 @@
this.backGroundColor = backGroundColor;
}
- class CancellableClass implements Cancellable{
- private boolean cancel = false;
- public void setCanceled(boolean canceled) {
- this.cancel = canceled;
- }
-
- public boolean isCanceled() {
- return this.cancel;
- }
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|