From d3a1e350c73e8d7ba1bbd83e5126dc131df9cfce Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Tue, 2 Apr 2013 06:04:07 +0000 Subject: [PATCH] inprogress --- forester/java/src/org/forester/archaeopteryx/TreePanel.java | 6 ++++++ .../phylogeny/data/RenderableDomainArchitecture.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/forester/java/src/org/forester/archaeopteryx/TreePanel.java b/forester/java/src/org/forester/archaeopteryx/TreePanel.java index fce060b..559d120 100644 --- a/forester/java/src/org/forester/archaeopteryx/TreePanel.java +++ b/forester/java/src/org/forester/archaeopteryx/TreePanel.java @@ -4539,6 +4539,8 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee final float y = getVisibleRect().y + getOvYPosition() + ( getOvMaxHeight() / y_ratio ); g.setColor( getTreeColorSet().getFoundColor() ); getOvRectangle().setRect( x, y, width, height ); + final Stroke s = g.getStroke(); + g.setStroke( STROKE_1 ); if ( ( width < 6 ) && ( height < 6 ) ) { drawRectFilled( x, y, 6, 6, g ); getOvVirtualRectangle().setRect( x, y, 6, 6 ); @@ -4558,6 +4560,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee } getOvVirtualRectangle().setRect( x, y, width, height ); } + g.setStroke( s ); } final private void paintPhylogenyLite( final Graphics2D g ) { @@ -4623,12 +4626,15 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee else { g.setColor( getTreeColorSet().getBranchLengthColor() ); } + final Stroke s = g.getStroke(); + g.setStroke( STROKE_1 ); drawLine( x1, y1, x1, y2, g ); drawLine( x2, y1, x2, y2, g ); drawLine( x1, y3, x2, y3, g ); if ( getScaleLabel() != null ) { g.drawString( getScaleLabel(), ( x1 + 2 ), y3 - 2 ); } + g.setStroke( s ); } final private int paintTaxonomy( final Graphics2D g, diff --git a/forester/java/src/org/forester/archaeopteryx/phylogeny/data/RenderableDomainArchitecture.java b/forester/java/src/org/forester/archaeopteryx/phylogeny/data/RenderableDomainArchitecture.java index 066aebf..3b2d563 100644 --- a/forester/java/src/org/forester/archaeopteryx/phylogeny/data/RenderableDomainArchitecture.java +++ b/forester/java/src/org/forester/archaeopteryx/phylogeny/data/RenderableDomainArchitecture.java @@ -26,9 +26,11 @@ package org.forester.archaeopteryx.phylogeny.data; +import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; +import java.awt.Stroke; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.Writer; @@ -58,6 +60,7 @@ public final class RenderableDomainArchitecture extends DomainArchitecture imple private final DomainArchitecture _domain_structure; private final Rectangle2D _rectangle = new Rectangle2D.Float(); private final Configuration _configuration; + private static final BasicStroke STROKE_1 = new BasicStroke( 1f ); public RenderableDomainArchitecture( final DomainArchitecture domain_structure, final Configuration configuration ) { _domain_structure = domain_structure; @@ -184,6 +187,8 @@ public final class RenderableDomainArchitecture extends DomainArchitecture imple final double f = getRenderingFactorWidth(); final double y = y1 + ( _rendering_height / 2 ); final double start = x1 + 20.0; + final Stroke s = g.getStroke(); + g.setStroke( STROKE_1 ); g.setColor( getConfiguration().getDomainStructureFontColor() ); _rectangle.setFrame( start, y - 0.5, _domain_structure.getTotalLength() * f, 1 ); g.fill( _rectangle ); @@ -201,6 +206,7 @@ public final class RenderableDomainArchitecture extends DomainArchitecture imple drawDomain( xa, y1, xb - xa, _rendering_height, d.getName(), g, to_pdf ); } } + g.setStroke( s ); } @Override -- 1.7.10.2