Revision 26448

View differences:

trunk/extensions/extSymbology/src/org/gvsig/symbology/fmap/symbols/PictureMarkerSymbol.java
110 110
import java.awt.Graphics2D;
111 111
import java.awt.Rectangle;
112 112
import java.awt.geom.AffineTransform;
113
import java.io.File;
113 114
import java.io.IOException;
114 115
import java.net.MalformedURLException;
115 116
import java.net.URL;
......
214 215
			Rectangle rect = new Rectangle(	size, size );
215 216
			g.translate(x+xOffset, y+yOffset);
216 217
			g.rotate(getRotation(), halfSize, halfSize);
217
			try {
218
				bg.drawInsideRectangle(g, rect);
219
			} catch (SymbolDrawingException e) {
220
				Logger.getLogger(getClass()).warn(Messages.getString("label_style_could_not_be_painted"), e);
218
			if(bg!=null){
219
				try {
220
					bg.drawInsideRectangle(g, rect);
221
				} catch (SymbolDrawingException e) {
222
					Logger.getLogger(getClass()).warn(Messages.getString("label_style_could_not_be_painted")+": "+imagePath, e);
223
				}
224
			} else {
225
				Logger.getLogger(getClass()).warn(Messages.getString("label_style_could_not_be_painted")+": "+imagePath);
221 226
			}
222 227
			g.rotate(-getRotation(), halfSize, halfSize);
223 228
			g.translate(-(x+xOffset), -(y+yOffset));
......
259 264
		setUnit(xml.getIntProperty("unit"));
260 265
		if (xml.contains("rotation"))
261 266
			setRotation(xml.getDoubleProperty("rotation"));
267
		File rootDir = new File(SymbologyFactory.SymbolLibraryPath);
262 268
		try {
263
			setImage(new URL(imagePath));
264
			setSelImage(new URL(selImagePath));
269
			try{
270
				setImage(new URL(imagePath));
271
			} catch (MalformedURLException e) {
272
				setImage(new URL("file://"+ rootDir.getAbsolutePath() + File.separator +imagePath));
273
			}
265 274
		} catch (MalformedURLException e) {
266
			Logger.getLogger(getClass()).error(Messages.getString("invalid_url"));
275
			Logger.getLogger(getClass()).error(Messages.getString("invalid_url")+": "+imagePath);
267 276
		} catch (IOException e) {
268
			Logger.getLogger(getClass()).error(Messages.getString("invalid_url"));
269

  
277
			Logger.getLogger(getClass()).error(Messages.getString("invalid_url")+": "+imagePath);
270 278
		}
279
		try {
280
			try{
281
				setImage(new URL(selImagePath));
282
			} catch (MalformedURLException e) {
283
				setSelImage(new URL("file://"+ rootDir.getAbsolutePath() + File.separator +selImagePath));
284
			}
285
		} catch (MalformedURLException e) {
286
			Logger.getLogger(getClass()).error(Messages.getString("invalid_url")+": "+selImagePath);
287
		} catch (IOException e) {
288
			Logger.getLogger(getClass()).error(Messages.getString("invalid_url")+": "+selImagePath);
289
		}
271 290

  
272 291

  
273 292
	}
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_35.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="35"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo35.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo35sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_35.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_35sel.svg"/>
8 8
    <property key="size" value="39.04761904761903"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_37.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="37"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo37.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo37sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_37.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_37sel.svg"/>
8 8
    <property key="size" value="28.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_41.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="41"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo41.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo41sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_41.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_41sel.svg"/>
8 8
    <property key="size" value="38.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_43.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="43"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo43.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo43sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_43.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_43sel.svg"/>
8 8
    <property key="size" value="38.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_47.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="47"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo47.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo47sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_47.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_47sel.svg"/>
8 8
    <property key="size" value="39.5"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_48.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="48"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo48.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo48sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_48.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_48sel.svg"/>
8 8
    <property key="size" value="39.5"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_52.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="52"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo52.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo52sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_52.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_52sel.svg"/>
8 8
    <property key="size" value="40.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_53.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="53"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo53.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo53sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_53.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_53sel.svg"/>
8 8
    <property key="size" value="30.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_54.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="54"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo54.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo54sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_54.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_54sel.svg"/>
8 8
    <property key="size" value="32.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_55.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="55"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo55.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo55sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_55.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_55sel.svg"/>
8 8
    <property key="size" value="36.875"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_56.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="56"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo56.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo56sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_56.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_56sel.svg"/>
8 8
    <property key="size" value="39.5"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_57.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="57"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo57.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo57sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_57.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_57sel.svg"/>
8 8
    <property key="size" value="47.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_58.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="58"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo58.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo58sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_58.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_58sel.svg"/>
8 8
    <property key="size" value="38.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_60.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="60"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo60.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo60sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_60.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_60sel.svg"/>
8 8
    <property key="size" value="50.5"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_61.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="61"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo61.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo61sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_61.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_61sel.svg"/>
8 8
    <property key="size" value="46.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_62.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="62"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo62.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo62sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_62.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_62sel.svg"/>
8 8
    <property key="size" value="44.5"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_63.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="63"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo63.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo63sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_63.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_63sel.svg"/>
8 8
    <property key="size" value="38.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_64.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="64"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo64.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo64sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_64.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_64sel.svg"/>
8 8
    <property key="size" value="38.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_65.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="65"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo65.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo65sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_65.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_65sel.svg"/>
8 8
    <property key="size" value="37.5"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_66.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="66"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo66.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo66sel.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_66.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_66sel.svg"/>
8 8
    <property key="size" value="36.5"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>
trunk/extensions/extSymbology/defaultSymbology/Symbols/basic/symbol/symbol_67.sym
3 3
    <property key="className" value="org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol"/>
4 4
    <property key="isShapeVisible" value="true"/>
5 5
    <property key="desc" value="67"/>
6
    <property key="imagePath" value="mapInfo/symbol/mapinfo67.svg"/>
7
    <property key="selImagePath" value="mapInfo/symbol/mapinfo67.svg"/>
6
    <property key="imagePath" value="basic/symbol/basic_67.svg"/>
7
    <property key="selImagePath" value="basic/symbol/basic_67.svg"/>
8 8
    <property key="size" value="39.0"/>
9 9
    <property key="unit" value="-1"/>
10 10
    <property key="referenceSystem" value="0"/>

Also available in: Unified diff