Revision 37201
| branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/impl/AbstractPrimitive.java | ||
|---|---|---|
| 695 | 695 |
if (affineTransform == null){
|
| 696 | 696 |
return this; |
| 697 | 697 |
} |
| 698 |
return affineTransform.createTransformedShape(this);
|
|
| 698 |
return new GeneralPathAdapter(affineTransform, getGeneralPath());
|
|
| 699 | 699 |
} |
| 700 | 700 |
} |
| branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/impl/GeneralPathAdapter.java | ||
|---|---|---|
| 83 | 83 |
} |
| 84 | 84 |
|
| 85 | 85 |
public PathIterator getPathIterator(AffineTransform at) {
|
| 86 |
AffineTransform applicableTransform = (AffineTransform) affineTransform.clone();
|
|
| 86 |
AffineTransform applicableTransform = null;
|
|
| 87 | 87 |
|
| 88 |
if (applicableTransform != null){
|
|
| 88 |
if (affineTransform != null){
|
|
| 89 | 89 |
if (at != null){
|
| 90 |
applicableTransform.concatenate(at); |
|
| 90 |
applicableTransform = (AffineTransform)at.clone(); |
|
| 91 |
applicableTransform.concatenate(affineTransform); |
|
| 92 |
}else{
|
|
| 93 |
applicableTransform = affineTransform; |
|
| 91 | 94 |
} |
| 92 | 95 |
}else{
|
| 93 | 96 |
applicableTransform = at; |
| branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.lib/org.gvsig.symbology.lib.impl/src/main/java/org/gvsig/symbology/fmap/mapcontext/rendering/symbol/fill/impl/SimpleFillSymbol.java | ||
|---|---|---|
| 82 | 82 |
public void draw(Graphics2D g, AffineTransform affineTransform, |
| 83 | 83 |
Geometry geom, Feature feature, Cancellable cancel) {
|
| 84 | 84 |
Color c = getFillColor(); |
| 85 |
Geometry geomToDraw = geom.cloneGeometry(); |
|
| 85 |
|
|
| 86 | 86 |
if (c!=null && hasFill()) {
|
| 87 | 87 |
g.setColor(c); |
| 88 |
g.fill(geomToDraw.getShape(affineTransform));
|
|
| 88 |
g.fill(geom.getShape(affineTransform)); |
|
| 89 | 89 |
} |
| 90 | 90 |
if (getOutline() != null && hasOutline()) {
|
| 91 | 91 |
getOutline().draw(g, affineTransform, geom, feature, cancel); |
| branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.lib/org.gvsig.symbology.lib.impl/src/main/java/org/gvsig/symbology/fmap/mapcontext/rendering/symbol/line/impl/SimpleLineSymbol.java | ||
|---|---|---|
| 83 | 83 |
public void draw(Graphics2D g, AffineTransform affineTransform, |
| 84 | 84 |
Geometry geom, Feature feature, Cancellable cancel) {
|
| 85 | 85 |
|
| 86 |
Geometry geomToDraw = geom.cloneGeometry();
|
|
| 86 |
Geometry geomToDraw = geom; |
|
| 87 | 87 |
g.setStroke(getLineStyle().getStroke()); |
| 88 | 88 |
|
| 89 | 89 |
if (getLineStyle().getOffset() != 0) {
|
| branches/v2_0_0_prep/libraries/libFMap_controls/src/org/gvsig/fmap/mapcontrol/impl/MapControlDrawer2D.java | ||
|---|---|---|
| 74 | 74 |
*/ |
| 75 | 75 |
public void draw(Geometry geometry, ISymbol symbol) {
|
| 76 | 76 |
if (geometry != null) {
|
| 77 |
DrawOperationContext doc = new DrawOperationContext(); |
|
| 78 |
doc.setGraphics(graphics); |
|
| 79 |
doc.setViewPort(viewPort); |
|
| 80 |
doc.setSymbol(symbol); |
|
| 81 |
try {
|
|
| 82 |
geometry.cloneGeometry().invokeOperation(Draw.CODE, doc); |
|
| 83 |
} catch (GeometryOperationNotSupportedException e) {
|
|
| 84 |
e.printStackTrace(); |
|
| 85 |
} catch (GeometryOperationException e) {
|
|
| 86 |
e.printStackTrace(); |
|
| 87 |
} |
|
| 77 |
symbol.draw(graphics, viewPort.getAffineTransform(), geometry, null, null); |
|
| 88 | 78 |
} |
| 89 | 79 |
} |
| 90 | 80 |
|
| branches/v2_0_0_prep/extensions/org.gvsig.app.document.layout.app/org.gvsig.app.document.layout.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/geometryadapters/GeometryAdapter.java | ||
|---|---|---|
| 148 | 148 |
* FSymbol |
| 149 | 149 |
*/ |
| 150 | 150 |
public void draw(Graphics2D g, AffineTransform at, ISymbol symbol){
|
| 151 |
symbol.draw(g, null, getGeometry(at), null, null);
|
|
| 151 |
symbol.draw(g, at, geometry, null, null);
|
|
| 152 | 152 |
} |
| 153 | 153 |
|
| 154 | 154 |
/** |
Also available in: Unified diff