# HG changeset patch # User Raimund Renkert # Date 1306492328 -7200 # Node ID 3087c89a5bb895419f506c8f9d0051a0cc214cdf # Parent 9ea64427ac7ea1dace8e022e4283d0ceb35efdb9 Added line fill symbol reader. diff -r 9ea64427ac7e -r 3087c89a5bb8 ChangeLog --- a/ChangeLog Fri May 27 12:04:19 2011 +0200 +++ b/ChangeLog Fri May 27 12:32:08 2011 +0200 @@ -1,3 +1,13 @@ +2011-05-27 Raimund Renkert + + Added line fill symbol reader. + + * src/java/de/intevation/mxd/reader/FillSymbolReader.java: + Use the new reader to get line fill symbol attributes. + + * src/java/de/intevation/mxd/reader/LineFillSymbolReader.java: + New. + 2011-05-27 Raimund Renkert Added marker fill symbol reader. diff -r 9ea64427ac7e -r 3087c89a5bb8 src/java/de/intevation/mxd/reader/FillSymbolReader.java --- a/src/java/de/intevation/mxd/reader/FillSymbolReader.java Fri May 27 12:04:19 2011 +0200 +++ b/src/java/de/intevation/mxd/reader/FillSymbolReader.java Fri May 27 12:32:08 2011 +0200 @@ -11,6 +11,7 @@ import com.esri.arcgis.display.MultiLayerFillSymbol; import com.esri.arcgis.display.SimpleFillSymbol; import com.esri.arcgis.display.MarkerFillSymbol; +import com.esri.arcgis.display.LineFillSymbol; /** * Wrapper for fill symbol reader. @@ -59,6 +60,9 @@ else if(symbol instanceof MarkerFillSymbol) { sreader = new MarkerFillSymbolReader(symbol); } + else if(symbol instanceof LineFillSymbol) { + sreader = new LineFillSymbolReader(symbol); + } else { logger.debug("The reader for type " + symbol.getClass().toString() + " is not implemented!"); @@ -75,6 +79,9 @@ else if(fillSymbol instanceof MarkerFillSymbol) { sreader = new MarkerFillSymbolReader(fillSymbol); } + else if(fillSymbol instanceof LineFillSymbol) { + sreader = new LineFillSymbolReader(fillSymbol); + } else { logger.debug("The reader for type " + fillSymbol.getClass().toString() + @@ -106,7 +113,8 @@ public boolean canRead(ISymbol sym) { if(sym instanceof SimpleFillSymbol || sym instanceof MarkerFillSymbol || - sym instanceof MultiLayerFillSymbol) { + sym instanceof MultiLayerFillSymbol || + sym instanceof LineFillSymbol) { return true; } else { @@ -117,7 +125,8 @@ public boolean canRead(IFillSymbol sym) { if(sym instanceof SimpleFillSymbol || sym instanceof MarkerFillSymbol || - sym instanceof MultiLayerFillSymbol) { + sym instanceof MultiLayerFillSymbol || + sym instanceof LineFillSymbol) { return true; } else { diff -r 9ea64427ac7e -r 3087c89a5bb8 src/java/de/intevation/mxd/reader/LineFillSymbolReader.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java/de/intevation/mxd/reader/LineFillSymbolReader.java Fri May 27 12:32:08 2011 +0200 @@ -0,0 +1,133 @@ +package de.intevation.mxd.reader; + +import java.io.IOException; + +import java.awt.Color; + +import org.apache.log4j.Logger; + +import com.esri.arcgis.display.ISymbol; +import com.esri.arcgis.display.IFillSymbol; +import com.esri.arcgis.display.ILineSymbol; +import com.esri.arcgis.display.LineFillSymbol; +import com.esri.arcgis.display.esriSimpleFillStyle; +import com.esri.arcgis.display.MultiLayerMarkerSymbol; +import com.esri.arcgis.display.IRgbColor; +import com.esri.arcgis.display.RgbColor; + +import org.w3c.dom.Element; +import de.intevation.mxd.utils.MapToXMLUtils; + +/** + * Reads marker line symbol information. + * + * @author Raimund Renkert + */ +public class LineFillSymbolReader +extends AbstractSymbolReader{ + + /** + * The logger. + */ + private static final Logger logger = + Logger.getLogger(LineFillSymbolReader.class); + + /** + * Private member. + */ + private LineFillSymbol symbol; + + + public LineFillSymbolReader(ISymbol symbol) + throws Exception { + logger.debug("contructor()"); + if(symbol instanceof LineFillSymbol) { + this.symbol = (LineFillSymbol)symbol; + } + else { + throw new Exception("Not a LineFillSymbol!"); + } + } + + + public LineFillSymbolReader(IFillSymbol symbol) + throws Exception { + logger.debug("contructor()"); + if(symbol instanceof LineFillSymbol) { + this.symbol = (LineFillSymbol)symbol; + } + else { + throw new Exception("Not a LineFillSymbol!"); + } + } + + /** + * Reads the symbol attributes. + * + * @return The XML node. + */ + public Element read() + throws Exception { + logger.debug("read()"); + + Element symbolElement = util.addSymbol(parent); + + symbolElement.setAttribute("name", symbol.getNameString()); + symbolElement.setAttribute("style", "fill"); + symbolElement.setAttribute( + "offset", + String.valueOf(symbol.getOffset())); + symbolElement.setAttribute( + "separation", + String.valueOf(symbol.getSeparation())); + + if(symbol.getColor() instanceof IRgbColor) { + IRgbColor color = (IRgbColor)symbol.getColor(); + Color c = new Color ( + color.getRed(), + color.getGreen(), + color.getBlue()); + symbolElement.setAttribute("color", String.valueOf(c.getRGB())); + symbolElement.setAttribute("transparency", + String.valueOf(color.getTransparency())); + } + else { + RgbColor col = new RgbColor(); + col.setRGB(symbol.getColor().getRGB()); + Color c = new Color ( + col.getRed(), + col.getGreen(), + col.getBlue()); + symbolElement.setAttribute("color", String.valueOf(c.getRGB())); + symbolElement.setAttribute("transparency", + String.valueOf(col.getTransparency())); + } + + ILineSymbol ols = symbol.getOutline(); + LineSymbolReader olsr = new LineSymbolReader(); + if(olsr.canRead(ols)) { + olsr.setSymbol(ols); + olsr.setUtil(util); + olsr.setParent(symbolElement); + olsr.read(); + } + else { + logger.debug("The type of " + ols.getClass().toString() + + " is not implemented!"); + } + ILineSymbol ls = symbol.getLineSymbol(); + LineSymbolReader lsr = new LineSymbolReader(); + if(lsr.canRead(ls)) { + lsr.setSymbol(ls); + lsr.setUtil(util); + lsr.setParent(symbolElement); + lsr.read(); + } + else { + logger.debug("The type of " + ls.getClass().toString() + + " is not implemented!"); + } + return parent; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :