/ - Diff - | gvSIG desktop 1 - gvSIG

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/tools/listener/LayoutAddRectangleListener.java
64	64	(FFrameGraphics) layoutManager
65	65	.createFrame(FFrameGraphics.PERSISTENCE_DEFINITION_NAME);
66	66
67		// fframe.setLayout(layout);
68	67	fframe.setGeometryAdapter(layoutPanel.getLayoutControl()
69	68	.getGeometryAdapter());
70	69	fframe.update(Geometry.TYPES.SURFACE, layoutPanel.getLayoutControl()

      * @author Vicente Caballero Navarro
      */
     public class LayoutPointSelectionListener implements LayoutPointListener {
         // private final Image img = new ImageIcon(MapControl.class.getResource(
         // "images/PointSelectCursor.gif")).getImage();
         private final Image img = PluginServices.getIconTheme()
             .get("point-select-cursor").getImage();
         protected LayoutPanel layout;

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/fframes/FFrameGraphics.java
367	367	af.transform(point, point);
368	368	}
369	369
370		// points[j] = new Point2D.Double(point.getX(), point.getY());
371	370	geometryEdit.changePoint(j, point);
372	371	}
373		// geometryEdit.setPoints(points);
374	372	geometryEdit.end();
375	373	}
376	374
...	...
407	405	}
408	406
409	407	public void initialize() {
410		// TODO Auto-generated method stub
411	408
412	409	}
413	410

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/fframes/FFrameGrid.java
458	458	doc.setViewPort(viewPortI);
459	459	doc.setSymbol(symbolLine);
460	460	ViewPort vp = fframeViewDependence.getMapContext().getViewPort();
461		// vp.setAffineTransform(at);
462	461	FontRenderContext frc = g.getFontRenderContext();
463	462	int pq = properties.getPrintQuality();
464	463	double factor = 1;

                         (FFrameBasic) layoutManager
                             .createFrame(FFrameBasic.PERSISTENCE_DEFINITION_NAME);
                     basic.setRectangle(rBasic);
                     // basic.setLayout(getLayout());
                     addFFrame(basic);
+                }
+            }
-...
+                    }
                     this.removeFFrame(i);
+                }
                 // removeFFrame(fframes[i]);
+            }
             if (r != null) {
                 // Layout
                 // layout=(Layout)PluginServices.getMDIManager().getActiveView();
                 FFrameBasic basic =
                     (FFrameBasic) layoutManager
                         .createFrame(FFrameBasic.PERSISTENCE_DEFINITION_NAME);
                 basic.setRectangle(r);
                 // basic.setLayout(getLayout());
                 this.addFFrame(basic);
                 return this;
+            }
-...
             return null;
+        }
         /*
          * public int getSelected() {
          * // if (!selectFFrameBasic)
          * return super.getSelected();
          * // IFFrame[] fframes=getFFrames();
          * // for (int i = 0;i<fframes.length;i++){
          * // int selection=fframes[i].getSelected();
          * // if (selection>0){
          * // return selection;
          * // }
          * // }
          * // return 0;
+         *
          * }
          */
         public void setSelected(Point2D p, MouseEvent e) {
             if (!selectFFrameBasic) {
                 super.setSelected(p, e);
-...
+        }
         /*
          * public void drawHandlersGroup(Graphics2D g) {
          * g.setColor(Color.gray);
          * IFFrame[] fframes=getFFrames();
          * for (int i = 0; i < fframes.length; i++) {
          * IFFrame fframe = fframes[i];
          * if (fframe.getSelected()!=IFFrame.NOSELECT){
          * fframe.drawHandlers(g);
          * }
          * }
          * }
          */
         public boolean containsGroup(Point2D p) {
             IFFrame[] fframes = getFFrames();
             for (int i = 0; i < fframes.length; i++) {
-...
+                }
                 for (int i = 0; i < fframes.length; i++) {
                     IFFrame fframe = fframes[i];
                     // if ((fframe.getSelected() == IFFrame.NOSELECT)) {
                     fframe.setSelected(p, e);
                     // }
+                }
             } else {
                 for (int i = 0; i < fframes.length; i++) {

          * Crea un nuevo FFrameGroup.
          */
         public FFrameGroup() {
             // do nothing
+        }
         /**
-...
                 + (r.height / 2));
             IFFrame[] fframes = m_fframes.toArray(new IFFrame[0]);
             for (int i = 0; i < fframes.length; i++) {
                 // fframes[i].setPrintingProperties(printingProperties);
                 fframes[i].print(g, at, geom, printingProperties);
                 // fframes[i].setPrintingProperties(null);
+            }
             g.rotate(Math.toRadians(-getRotation()), r.x + (r.width / 2), r.y
-...
+        }
         public void initialize() {
             // TODO Auto-generated method stub
+        }

                                         (FFramePicture) layoutManager
                                             .createFrame(FFramePicture.PERSISTENCE_DEFINITION_NAME);
                                     // picture.setLayout(getLayout());
                                     BufferedImage bi =
                                         new BufferedImage(image.getWidth(null),
                                             image.getHeight(null),
-...
                 (FFrameText) layoutManager
                     .createFrame(FFrameText.PERSISTENCE_DEFINITION_NAME);
             // text.setLayout(getLayout());
             text.setFixedFontSize(true);
             // text.setFontSize((int) (sizefont*1.4));
             double myScale = layout.getAT().getScaleX() * 0.0234;
             text.setFontSize((int) (sizefont / myScale));
             text.setBoundBox(FLayoutUtilities.toSheetRect(rAux, layout.getAT()));
-...
          */
         public void toFFrames(LayoutContext layout) {
             Rectangle2D rectangle = getBoundingBox(null);
             // Rectangle2D r = getBoundBox();
             double h = rectangle.getHeight() / m_numLayers;
             FLayers lays = layers;
-...
         public Font getFont() {
             if (m_font != null) {
                 return new Font(m_font.getName(), m_font.getStyle(), 9);
                 // return new Font(m_f.getFontName(), m_f.getStyle(), 9);
+            }
             return new Font("SansSerif", Font.PLAIN, 9);
+        }
         /*
          * @see
          * com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame#getNameFFrame
          * ()
          */
         public String getNameFFrame() {
             return PluginServices.getText(this, "leyenda") + num;
+        }
-...
             return PERSISTENCE_DEFINITION_NAME;
+        }
         /*
          * @see
          * com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame#print(java
          * .awt.Graphics2D,
          * java.awt.geom.AffineTransform)
          */
         public void print(Graphics2D g, AffineTransform at, Geometry geom,
             PrintAttributes properties) {
             this.properties = properties;
-...
+        }
         public void initialize() {
             // TODO Auto-generated method stub
+        }

             graphics.setGeometryAdapter(pa);
             graphics.setBoundBox(r);
             /*
              * jaume; moved to ISymbol
              * FSymbol symbol=new FSymbol(FShape.POLYGON,Color.black);
              * symbol.setColor(new Color(255,255,255,0));
              * symbol.setOutlineColor(Color.black);
              */
             IFillSymbol symbol =
                 (IFillSymbol) mapContextManager.getSymbolManager().createSymbol(
                     IFillSymbol.SYMBOL_NAME);
-...
          */
         public void print(Graphics2D g, AffineTransform at, Geometry geom,
             PrintAttributes printingProperties) {
             // fframeGraphics.setPrintingProperties(printingProperties);
             fframeGraphics.print(g, at, geom, printingProperties);
             // fframeGraphics.setPrintingProperties(null);
             if (fframe != null) {
                 fframe.print(g, at, geom, printingProperties);
+            }
-...
+            }
             if (getFframe() != null) {
                 getFframe().setBoundBox(r);
                 // super.setBoundBox(r);
+            }
+        }

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/gui/DefaultLayoutPanel.java
302	302	}
303	303	}
304	304	}
305
306		/*
307		* try { print = job.printDialog(att); } catch (Exception e) {
308		* logger.error("Abriendo el Di?logo de imprimir");
309		* //System.out.println("Excepci?n "+e); } if (print) {
310		* job.setPrintable((Printable)
311		* App.instance.getPc().getExtension(com.iver.cit.gvsig.Print.class));
312		* try { job.print(att); } catch (Exception ex) { ex.printStackTrace();
313		* } }
314		*/
315	305	}
316	306
317	307	public IFFrameDialog createFFrameDialog(IFFrame fframe) {

| gvSIG desktop 1

Revision 37196