Author: scooter
Date: 2012-05-31 16:41:01 -0700 (Thu, 31 May 2012)
New Revision: 29416
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/api/Annotation.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/PreviewPanel.java
Log:
Paint the preview background to look the same as the network background
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-05-31 23:26:41 UTC (rev 29415)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AbstractAnnotation.java
2012-05-31 23:41:01 UTC (rev 29416)
@@ -37,7 +37,7 @@
//A BasicAnnotation Class
//
-public class AbstractAnnotation extends Component implements Annotation {
+public class AbstractAnnotation extends JComponent implements Annotation {
private static int nextAnnotationNumber = 0;
private boolean selected=false;
@@ -164,8 +164,8 @@
return (JComponent)canvas;
}
- public Component getComponent() {
- return (Component)this;
+ public JComponent getComponent() {
+ return (JComponent)this;
}
@Override
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/api/Annotation.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/api/Annotation.java
2012-05-31 23:26:41 UTC (rev 29415)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/api/Annotation.java
2012-05-31 23:41:01 UTC (rev 29416)
@@ -25,7 +25,7 @@
public void changeCanvas(String canvas);
public JComponent getCanvas();
- public Component getComponent();
+ public JComponent getComponent();
public CyAnnotator getCyAnnotator();
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/PreviewPanel.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/PreviewPanel.java
2012-05-31 23:26:41 UTC (rev 29415)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/PreviewPanel.java
2012-05-31 23:41:01 UTC (rev 29416)
@@ -1,8 +1,11 @@
package org.cytoscape.ding.impl.cyannotator.dialogs;
+import java.awt.Color;
import java.awt.Graphics;
+import java.awt.Paint;
import javax.swing.BorderFactory;
+import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.border.TitledBorder;
@@ -15,13 +18,18 @@
public PreviewPanel(Annotation annotation, int width, int height) {
this.mAnnotation=annotation;
- Component c = mAnnotation.getComponent();
+ JComponent c = mAnnotation.getComponent();
mAnnotation.setUsedForPreviews(true);
// System.out.println("Panel size = "+width+"x"+height);
// System.out.println("Annotation size =
"+c.getWidth()+"x"+c.getHeight());
c.setLocation((width-c.getWidth())/2+5,(height-c.getHeight())/2+5);
+ c.setOpaque(false);
+ // Get the background paint for this view
+ Paint backgroundPaint =
mAnnotation.getCyAnnotator().getView().getBackgroundPaint();
+ setBackground((Color)backgroundPaint); // Set our background to
match
+
// Border it
TitledBorder title =
BorderFactory.createTitledBorder("Preview");
setBorder(title);
--
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.
