Author: scooter
Date: 2012-06-19 10:58:05 -0700 (Tue, 19 Jun 2012)
New Revision: 29618
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AbstractAnnotation.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ArrowAnnotationImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/BoundedTextAnnotationImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GraphicsUtilities.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ShapeAnnotationImpl.java
Log:
Fix printing to use specific weights
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
2012-06-19 17:48:09 UTC (rev 29617)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
2012-06-19 17:58:05 UTC (rev 29618)
@@ -86,6 +86,11 @@
*/
private Map<Component, Point> m_componentToPointMap;
+ /*
+ * Flag to record that we're printing since we don't use the
PrinterGraphics interface
+ */
+ private boolean isPrinting = false;
+
/**
* Constructor.
*
@@ -303,9 +308,19 @@
* @param graphics Graphics
*/
public void print(Graphics graphics) {
- this.paintChildren(graphics);
+ isPrinting = true;
+ this.printChildren(graphics);
+ isPrinting = false;
}
+ /**
+ * Return true if this view is curerntly being printed (as opposed to
painted on the screen)
+ * @return true if we're currently being printed, false otherwise
+ */
+ public boolean isPrinting() {
+ return isPrinting;
+ }
+
private boolean setBoundsChildren() {
// get list of child components
Component[] components = getComponents();
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AbstractAnnotation.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AbstractAnnotation.java
2012-06-19 17:48:09 UTC (rev 29617)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AbstractAnnotation.java
2012-06-19 17:58:05 UTC (rev 29618)
@@ -46,7 +46,6 @@
private double globalZoom = 1.0;
private double myZoom = 1.0;
- private ArbitraryGraphicsCanvas canvas;
private DGraphView.Canvas canvasName;
private CyAnnotator cyAnnotator;
private UUID uuid = UUID.randomUUID();
@@ -55,6 +54,7 @@
protected boolean usedForPreviews=false;
protected DGraphView view;
+ protected ArbitraryGraphicsCanvas canvas;
protected static final String ID="id";
protected static final String ZOOM="zoom";
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ArrowAnnotationImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ArrowAnnotationImpl.java
2012-06-19 17:48:09 UTC (rev 29617)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ArrowAnnotationImpl.java
2012-06-19 17:58:05 UTC (rev 29618)
@@ -337,14 +337,12 @@
public void paint(Graphics g) {
super.paint(g);
- drawArrow(g, false);
+ if (canvas.isPrinting())
+ drawArrow(g, true);
+ else
+ drawArrow(g, false);
}
- public void print(Graphics g) {
- super.paint(g);
- drawArrow(g, true);
- }
-
public void drawArrow(Graphics g, boolean isPrinting) {
if ( (source == null || target == null) && !usedForPreviews )
return;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/BoundedTextAnnotationImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/BoundedTextAnnotationImpl.java
2012-06-19 17:48:09 UTC (rev 29617)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/BoundedTextAnnotationImpl.java
2012-06-19 17:58:05 UTC (rev 29618)
@@ -110,7 +110,7 @@
double height = getTextHeight((Graphics2D)this.getGraphics())+8;
shapeIsFit = true;
- System.out.println("Fitting shape to text: "+width+"x"+height);
+ // System.out.println("Fitting shape to text:
"+width+"x"+height);
// Different depending on the type...
switch (getShapeType()) {
@@ -185,13 +185,6 @@
g2.drawString(text, halfWidth, halfHeight);
}
- public void print(Graphics g) {
- boolean selected = isSelected();
- setSelected(false);
- paint(g);
- setSelected(selected);
- }
-
@Override
public void setSpecificZoom(double zoom) {
font=font.deriveFont(((float)(zoom/getSpecificZoom()))*font.getSize2D());
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GraphicsUtilities.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GraphicsUtilities.java
2012-06-19 17:48:09 UTC (rev 29617)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GraphicsUtilities.java
2012-06-19 17:58:05 UTC (rev 29618)
@@ -92,6 +92,7 @@
// Get the stroke
float border = (float)annotation.getBorderWidth();
if (!isPrinting && border < 1.0f) border = 1.0f;
+ // System.out.println("Border width = "+border+", isPrinting =
"+isPrinting);
// Get the shape
Shape shape = getShape(annotation.getShapeType(), x+border,
y+border, width-border, height-border);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ShapeAnnotationImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ShapeAnnotationImpl.java
2012-06-19 17:48:09 UTC (rev 29617)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/ShapeAnnotationImpl.java
2012-06-19 17:58:05 UTC (rev 29618)
@@ -190,14 +190,13 @@
public void paint(Graphics g) {
super.paint(g);
- GraphicsUtilities.drawShape(g, 0, 0, getWidth()-1,
getHeight()-1, this, false);
+ if (canvas.isPrinting()) {
+ GraphicsUtilities.drawShape(g, 0, 0, getWidth()-1,
getHeight()-1, this, true);
+ } else {
+ GraphicsUtilities.drawShape(g, 0, 0, getWidth()-1,
getHeight()-1, this, false);
+ }
}
- public void print(Graphics g) {
- super.paint(g);
- GraphicsUtilities.drawShape(g, 0, 0, getWidth()-1,
getHeight()-1, this, true);
- }
-
public void setSize(double width, double height) {
shapeWidth = width;
shapeHeight = height;
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
