Menu
▾
▴
[JPP-Devel] SVN: [4397] core/trunk/src
|
From: <jum...@li...> - 2015-04-12 17:44:46
|
Revision: 4397
http://sourceforge.net/p/jump-pilot/code/4397
Author: ma15569
Date: 2015-04-12 17:44:44 +0000 (Sun, 12 Apr 2015)
Log Message:
-----------
Updated Dialog for image with no worldfile: added option to warp image into the view to save compatibilty with previous version.
Updated language files
Modified Paths:
--------------
core/trunk/src/language/jump.properties
core/trunk/src/language/jump_cz.properties
core/trunk/src/language/jump_de.properties
core/trunk/src/language/jump_es.properties
core/trunk/src/language/jump_fi.properties
core/trunk/src/language/jump_fr.properties
core/trunk/src/language/jump_hu.properties
core/trunk/src/language/jump_it.properties
core/trunk/src/language/jump_ja_JP.properties
core/trunk/src/language/jump_ml.properties
core/trunk/src/language/jump_pt.properties
core/trunk/src/language/jump_pt_BR.properties
core/trunk/src/language/jump_ta_IN.properties
core/trunk/src/language/jump_te.properties
core/trunk/src/language/jump_zh_CN.properties
core/trunk/src/language/jump_zh_HK.properties
core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
core/trunk/src/org/openjump/core/ui/plugin/layer/pirolraster/RasterImageWizardPanel.java
Modified: core/trunk/src/language/jump.properties
===================================================================
--- core/trunk/src/language/jump.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -495,6 +495,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Sextante Raster Image
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = can not determine image dimensions
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = no worldfile found
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message = no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = Select Raster Image
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = supported raster image formats
Modified: core/trunk/src/language/jump_cz.properties
===================================================================
--- core/trunk/src/language/jump_cz.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_cz.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -480,6 +480,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Sextante Raster Image
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = nemohu zjistit rozm\u011Bry obr\u00E1zku
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = nenalezen worldfile
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = Vybrat rastrov\u00FD obr\u00E1zek
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = podporovan\u00E9 rastrov\u00E9 form\u00E1ty
Modified: core/trunk/src/language/jump_de.properties
===================================================================
--- core/trunk/src/language/jump_de.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_de.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -480,6 +480,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Sextante Raster
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = Rasterdimensionen konnten nicht bestimmt werden
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = Kein worldfile gefunden
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = Rasterbild ausw\u00e4hlen
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = unterst\u00fctzte Rasterformate
Modified: core/trunk/src/language/jump_es.properties
===================================================================
--- core/trunk/src/language/jump_es.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_es.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -476,6 +476,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions=No puedo determinar los tama\u00F1o de la imagen
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found=Ningun worldfile encontrado
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image=Imagen Raster (Sextante)
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =Ningun worldfile encontrado por la capa: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=Worldfile creado por el fichero:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image=Seleccionar Imagen Raster
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats=Imagenes Raster
Modified: core/trunk/src/language/jump_fi.properties
===================================================================
--- core/trunk/src/language/jump_fi.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_fi.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -495,6 +495,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions=Kuvan ulottuvuuksia ei voida p\u00E4\u00E4tell\u00E4
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found=Ei l\u00F6ytynyt worldfile\:\u00E4
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image=Sextante-rasterikuva
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image=Valitse rasterikuva
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats=Tuetut rasterikuvien tiedostomuodot
Modified: core/trunk/src/language/jump_fr.properties
===================================================================
--- core/trunk/src/language/jump_fr.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_fr.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -483,6 +483,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Image raster (Sextante)
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = Les dimensions de l'image ne peuvent \u00eatre d\u00e9termin\u00e9es
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = Fichier worldfile non trouv\u00e9
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = S\u00e9lectionner l'image raster
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = Formats d'images reconnus
Modified: core/trunk/src/language/jump_hu.properties
===================================================================
--- core/trunk/src/language/jump_hu.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_hu.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -481,6 +481,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Sextante raszter k\u00E9p
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = a k\u00E9p m\u00E9reteit nem tudom meg\u00E1llap\u00EDtani
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = nem tal\u00E1lom a vil\u00E1gf\u00E1jlt
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = V\u00E1lassz ki egy raszter k\u00E9pet
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = t\u00E1mogatott raszter form\u00E1tumok
Modified: core/trunk/src/language/jump_it.properties
===================================================================
--- core/trunk/src/language/jump_it.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_it.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -475,6 +475,7 @@
model.StandardCategoryNames.working=Progetto
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions=Impossibile determinare le dimensioni della immagine
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found=Nessun worldfile trovato
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =Nessun worldfile trovato per il file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=Worldfile creato per il file:''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image=Immagine Raster (Sextante)
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image=Seleziona Immagine Raster
Modified: core/trunk/src/language/jump_ja_JP.properties
===================================================================
--- core/trunk/src/language/jump_ja_JP.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_ja_JP.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -480,6 +480,8 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Sextante \u30E9\u30B9\u30BF\u30FC\u753B\u50CF
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = \u753B\u50CF\u306E\u5927\u304D\u3055\u3092\u6C7A\u3081\u3089\u308C\u307E\u305B\u3093
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = \u30EF\u30FC\u30EB\u30C9\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = \u30E9\u30B9\u30BF\u30FC\u753B\u50CF\u306E\u9078\u629E
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = \u30B5\u30DD\u30FC\u30C8\u30E9\u30B9\u30BF\u30FC\u753B\u50CF\u5F62\u5F0F
org.openjump.core.ui.io.file.DataSourceFileLayerLoader.charset = \#T\:Charset
Modified: core/trunk/src/language/jump_ml.properties
===================================================================
--- core/trunk/src/language/jump_ml.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_ml.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -649,6 +649,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Sextante \u0d30\u0d3e\u0d38\u0d4d\u0d1f\u0d30\u0d4d\u200d
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = \u0d1a\u0d3f\u0d24\u0d4d\u0d30\u0d24\u0d4d\u0d24\u0d3f\u0d28\u0d4d\u0d31\u0d46 \u0d05\u0d33\u0d35\u0d4d \u0d24\u0d3f\u0d30\u0d3f\u0d1a\u0d4d\u0d1a\u0d31\u0d3f\u0d2f\u0d3e\u0d28\u0d4d\u200d \u0d38\u0d3e\u0d27\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d3f\u0d32\u0d4d\u0d32
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = \u0d35\u0d47\u0d33\u0d4d\u200d\u0d21\u0d4d \u0d2b\u0d2f\u0d32\u0d4d\u200d \u0d15\u0d3e\u0d23\u0d4d\u0d2e\u0d3e\u0d28\u0d3f\u0d32\u0d4d\u0d32
+oorg.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = \u0d30\u0d3e\u0d38\u0d4d\u0d1f\u0d30\u0d4d\u200d \u0d24\u0d3f\u0d30\u0d1e\u0d4d\u0d1e\u0d46\u0d1f\u0d41\u0d15\u0d4d\u0d15\u0d41\u0d15
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = \u0d2a\u0d3f\u0d28\u0d4d\u0d24\u0d41\u0d23\u0d2f\u0d41\u0d33\u0d4d\u0d33 \u0d30\u0d3e\u0d38\u0d4d\u0d1f\u0d30\u0d4d\u200d \u0d30\u0d42\u0d2a\u0d15\u0d32\u0d4d\u0d2a\u0d28\u0d15\u0d33\u0d4d\u200d
Modified: core/trunk/src/language/jump_pt.properties
===================================================================
--- core/trunk/src/language/jump_pt.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_pt.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -480,6 +480,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Imagem rastar do Sextante
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = N\u00e3o foi poss\u00edvel determinar as dimens\u00f5es da imagem
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = Nenhum arquivo world encontrado
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = Selecionar imagem Raster
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = Formato de imagens suportados
Modified: core/trunk/src/language/jump_pt_BR.properties
===================================================================
--- core/trunk/src/language/jump_pt_BR.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_pt_BR.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -480,6 +480,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Imagem rastar do Sextante
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = N\u00e3o foi poss\u00edvel determinar as dimens\u00f5es da imagem
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = Nenhum arquivo world encontrado
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = Selecionar imagem Raster
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = Formato de imagens suportados
Modified: core/trunk/src/language/jump_ta_IN.properties
===================================================================
--- core/trunk/src/language/jump_ta_IN.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_ta_IN.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -478,6 +478,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Sextante Raster Image
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = \u0BAA\u0B9F\u0BA4\u0BCD\u0BA4\u0BC8 \u0BAA\u0BB0\u0BBF\u0BAE\u0BBE\u0BA3\u0B99\u0BCD\u0B95\u0BB3\u0BC8 \u0BA8\u0BBF\u0BB0\u0BCD\u0BA3\u0BAF\u0BBF\u0B95\u0BCD\u0B95 \u0BAE\u0BC1\u0B9F\u0BBF\u0BAF\u0BBE\u0BA4\u0BC1
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = no worldfile found
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = Select Raster Image
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = supported raster image formats
Modified: core/trunk/src/language/jump_te.properties
===================================================================
--- core/trunk/src/language/jump_te.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_te.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -480,6 +480,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = \#T\:Sextante Raster Image
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = \#T\:can not determine image dimensions
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = \#T\:no worldfile found
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = \#T\:Select Raster Image
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = \#T\:supported raster image formats
Modified: core/trunk/src/language/jump_zh_CN.properties
===================================================================
--- core/trunk/src/language/jump_zh_CN.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_zh_CN.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -478,6 +478,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Sextante\u5149\u6805\u56fe\u50cf
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = \u65e0\u6cd5\u786e\u5b9a\u56fe\u7247\u5c3a\u5bf8
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = \u6ca1\u6709\u627e\u5230worldfile
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = \u9009\u62e9\u5149\u6805\u56fe\u50cf
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = \u652f\u6301\u7684\u5149\u6805\u56fe\u50cf\u683c\u5f0f
Modified: core/trunk/src/language/jump_zh_HK.properties
===================================================================
--- core/trunk/src/language/jump_zh_HK.properties 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/language/jump_zh_HK.properties 2015-04-12 17:44:44 UTC (rev 4397)
@@ -478,6 +478,7 @@
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image = Sextante\u5149\u67F5\u5716\u50CF
org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions = \u7121\u6CD5\u78BA\u5B9A\u5716\u7247\u5C3A\u5BF8
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found = \u6C92\u6709\u627E\u5230worldfile
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message =\#T\: no worldfile found for file: ''{0}''
org.openjump.core.rasterimage.AddRasterImageLayerWizard.message=\#T\:Worldfile created for file:''{0}''
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.Select-Raster-Image = \u9078\u64C7\u5149\u67F5\u5716\u50CF
org.openjump.core.rasterimage.SelectRasterImageFilesPanel.supported-raster-image-formats = \u652F\u6301\u7684\u5149\u67F5\u5716\u50CF\u683C\u5F0F
Modified: core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java 2015-04-12 17:44:44 UTC (rev 4397)
@@ -392,20 +392,30 @@
int visibleY1 = visibleRect.y;
int visibleX2 = visibleX1 + width;// visibleRect.width;
int visibleY2 = visibleY1 + height;// visibleRect.height;
+ int visibleX3 = visibleX1 + visibleRect.width;
+ int visibleY3 = visibleY1 + visibleRect.height;
Coordinate upperLeftVisible = viewport
.toModelCoordinate(new Point(0, 0));
- Coordinate lowerRightVisible = viewport
+ Coordinate lowerRightVisible1 = viewport
.toModelCoordinate(new Point(visibleX2, visibleY2));
+ Coordinate lowerRightVisible2 = viewport
+ .toModelCoordinate(new Point(visibleX3, visibleY3));
context.getWorkbench()
.getFrame()
.warnUser(
I18N.get("org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found"));
- WizardDialog d = new WizardDialog(context.getWorkbench()
- .getFrame(), I18N.get("RasterImagePlugIn.34")
- + this.worldFileHandler.getWorldFileName()
- + I18N.get("RasterImagePlugIn.35"),
- context.getErrorHandler());
+ WizardDialog d = new WizardDialog(
+ context.getWorkbench().getFrame(),
+ I18N.getMessage(
+ "org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message",
+ new Object[] { fil.getName() })
+ /*
+ * I18N.get("RasterImagePlugIn.34") +
+ * this.worldFileHandler.getWorldFileName() +
+ * I18N.get("RasterImagePlugIn.35")
+ */
+ , context.getErrorHandler());
d.init(new WizardPanel[] { new RasterImageWizardPanel() });
// 2015-04-10 [Giuseppe Aruta]wizard dialog now shows local
@@ -413,11 +423,11 @@
RasterImageWizardPanel.minxTextField.setText(Double
.toString(upperLeftVisible.x));
RasterImageWizardPanel.maxxTextField.setText(Double
- .toString(lowerRightVisible.x));
+ .toString(lowerRightVisible1.x));
RasterImageWizardPanel.minyTextField.setText(Double
.toString(upperLeftVisible.y));
RasterImageWizardPanel.maxyTextField.setText(Double
- .toString(lowerRightVisible.y));
+ .toString(lowerRightVisible1.y));
// Set size after #init, because #init calls #pack. [Jon Aquino]
d.setSize(700, 350);
@@ -431,36 +441,29 @@
try {
- minx = Double.parseDouble((String) d
- .getData(RasterImageWizardPanel.MINX_KEY));
- maxx = Double.parseDouble((String) d
- .getData(RasterImageWizardPanel.MAXX_KEY));
- miny = Double.parseDouble((String) d
- .getData(RasterImageWizardPanel.MINY_KEY));
- maxy = Double.parseDouble((String) d
- .getData(RasterImageWizardPanel.MAXY_KEY));
+ if (RasterImageWizardPanel.warpCheckBox.isSelected()) {
+ env = new Envelope(upperLeftVisible.x,
+ lowerRightVisible2.x, upperLeftVisible.y,
+ lowerRightVisible2.y);
+ } else {
- env = new Envelope(minx, maxx, miny, maxy);
+ minx = Double.parseDouble((String) d
+ .getData(RasterImageWizardPanel.MINX_KEY));
+ maxx = Double.parseDouble((String) d
+ .getData(RasterImageWizardPanel.MAXX_KEY));
+ miny = Double.parseDouble((String) d
+ .getData(RasterImageWizardPanel.MINY_KEY));
+ maxy = Double.parseDouble((String) d
+ .getData(RasterImageWizardPanel.MAXY_KEY));
+
+ env = new Envelope(minx, maxx, miny, maxy);
+ }
} catch (java.lang.NumberFormatException e) {
- /*
- * Viewport viewport = context.getLayerViewPanel()
- * .getViewport(); Rectangle visibleRect =
- * viewport.getPanel() .getVisibleRect();
- *
- * BufferedImage bimg = ImageIO.read(new File(fileName));
- * int width = bimg.getWidth(); int height =
- * bimg.getHeight();
- *
- * int visibleX1 = visibleRect.x; int visibleY1 =
- * visibleRect.y; int visibleX2 = visibleX1 + width;//
- * visibleRect.width; int visibleY2 = visibleY1 + height;//
- * visibleRect.height; Coordinate upperLeftVisible =
- * viewport .toModelCoordinate(new Point(0, 0)); Coordinate
- * lowerRightVisible = viewport .toModelCoordinate(new
- * Point(visibleX2, visibleY2));
- */
- env = new Envelope(upperLeftVisible.x, lowerRightVisible.x,
- upperLeftVisible.y, lowerRightVisible.y);
+
+ env = new Envelope(upperLeftVisible.x,
+ lowerRightVisible1.x, upperLeftVisible.y,
+ lowerRightVisible1.y);
+
}
}
Modified: core/trunk/src/org/openjump/core/ui/plugin/layer/pirolraster/RasterImageWizardPanel.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/layer/pirolraster/RasterImageWizardPanel.java 2015-04-11 12:06:01 UTC (rev 4396)
+++ core/trunk/src/org/openjump/core/ui/plugin/layer/pirolraster/RasterImageWizardPanel.java 2015-04-12 17:44:44 UTC (rev 4397)
@@ -46,6 +46,7 @@
import java.io.IOException;
import java.util.Map;
+import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
@@ -75,13 +76,21 @@
.get("org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel.miny"); //$NON-NLS-1$
public static final String MAXY_KEY = I18N
.get("org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel.maxy"); //$NON-NLS-1$
+ public static final String TITLE = I18N
+ .get("org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel.worldfile-dialog");
+ public static final String INSTRUCTION = I18N
+ .get("org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel.please-enter-the-image-path");
public static final String WORLD = I18N
.get("org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel.optimizedworldfile");
+ public static final String TOOLTIP = I18N
+ .get("org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel.warp-tooltip");;
+ public static final String WARP = I18N
+ .get("org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel.warp");
+
private InputChangedFirer inputChangedFirer = new InputChangedFirer();
private Map dataMap;
private GridBagLayout gridBagLayout1 = new GridBagLayout();
- private JLabel world = new JLabel();
private JPanel fillerPanel = new JPanel();
private JLabel minxLabel = new JLabel();
public static JTextField minxTextField = new JTextField();
@@ -91,6 +100,7 @@
public static JTextField minyTextField = new JTextField();
private JLabel maxyLabel = new JLabel();
public static JTextField maxyTextField = new JTextField();
+ public static JCheckBox warpCheckBox = new JCheckBox();
public RasterImageWizardPanel() {
try {
@@ -147,7 +157,8 @@
minyTextField.setCaretPosition(minyTextField.getText().length());
maxyTextField.setPreferredSize(new Dimension(270, 21));
maxyTextField.setCaretPosition(maxyTextField.getText().length());
-
+ this.setPreferredSize(new Dimension(450, 100));
+
this.add(minxLabel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(
0, 0, 0, 4), 0, 0));
@@ -172,15 +183,39 @@
this.add(maxyTextField, new GridBagConstraints(1, 5, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
new Insets(0, 0, 0, 4), 0, 0));
+ warpCheckBox.setText(WARP);
+ warpCheckBox.setToolTipText(TOOLTIP);
+ // textPane.setText(WORLD);
+ warpCheckBox.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ updateEnabled();
+ }
+ });
+
+ this.add(warpCheckBox, new GridBagConstraints(1, 6, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
+ new Insets(0, 0, 0, 4), 0, 0));
+
this.add(fillerPanel, new GridBagConstraints(2, 10, 1, 1, 1.0, 1.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(
0, 0, 0, 0), 0, 0));
}
+ private void updateEnabled() {
+
+ minxLabel.setEnabled(warpCheckBox.isSelected() == false);
+ minxTextField.setEnabled(warpCheckBox.isSelected() == false);
+ maxxLabel.setEnabled(warpCheckBox.isSelected() == false);
+ maxxTextField.setEnabled(warpCheckBox.isSelected() == false);
+ minyLabel.setEnabled(warpCheckBox.isSelected() == false);
+ minyTextField.setEnabled(warpCheckBox.isSelected() == false);
+ maxyLabel.setEnabled(warpCheckBox.isSelected() == false);
+ maxyTextField.setEnabled(warpCheckBox.isSelected() == false);
+ }
+
public String getInstructions() {
- return I18N
- .get("org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel.please-enter-the-image-path") + "\n" + WORLD; //$NON-NLS-1$
+ return INSTRUCTION + "\n" + WORLD; //$NON-NLS-1$
}
/**
@@ -199,8 +234,7 @@
}
public String getTitle() {
- return I18N
- .get("org.openjump.core.ui.plugin.layer.pirolraster.RasterImageWizardPanel.worldfile-dialog"); //$NON-NLS-1$
+ return TITLE; //$NON-NLS-1$
}
public String getID() {
|
