use clip to improve performance

diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml

@@ -9,11 +9,11 @@
   </entry>
   <entry>
     <string>lastPath</string>
-    <string>C:\Documents and Settings\Branislav Stojkovic\Desktop\oldFiles</string>
+    <string>C:\Documents and Settings\Branislav Stojkovic\Desktop</string>
   </entry>
   <entry>
     <string>antiAliasing</string>
-    <boolean>false</boolean>
+    <boolean>true</boolean>
   </entry>
   <entry>
     <string>hiQualityRender</string>

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractComponent.java

@@ -2,6 +2,7 @@ package org.diylc.components;
 
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.Shape;
 
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.annotations.EditableProperty;
@@ -56,4 +57,17 @@ public abstract class AbstractComponent<T> implements IDIYComponent<T> {
 	protected int getClosestOdd(double x) {
 		return ((int) x / 2) * 2 + 1;
 	}
+
+	/**
+	 * @param clip
+	 * @return true if none of the control points lie in the clip rectangle.
+	 */
+	protected boolean checkPointsClipped(Shape clip) {
+		for (int i = 0; i < getControlPointCount(); i++) {
+			if (clip.contains(getControlPoint(i))) {
+				return false;
+			}
+		}
+		return true;
+	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractCurvedComponent.java

@@ -63,6 +63,9 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		if (componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING) {
 			// Do not track guidelines.
 			drawingObserver.stopTracking();

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedComponent.java

@@ -65,6 +65,9 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 		Shape shape = getBodyShape();
 		// If there's no body, just draw the line connecting the ending points.
 		if (shape == null) {
+			if (checkPointsClipped(g2d.getClip())) {
+				return;
+			}
 			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(getLeadThickness()));
 			g2d.setColor(shouldShadeLeads() ? getLeadColor(componentState).darker()
 					: getLeadColor(componentState));

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/DrawingManager.java

@@ -147,7 +147,7 @@ public class DrawingManager {
 
 		g2dWrapper.setColor(Constants.CANVAS_COLOR);
 		g2dWrapper.fillRect(0, 0, d.width, d.height);
-		g2d.setClip(new Rectangle(new Point(0, 0), d));
+		g2d.clip(new Rectangle(new Point(0, 0), d));
 
 		GridType gridType = (GridType) ConfigurationManager.getInstance().readObject(
 				ANTIALIASING_KEY, GridType.LINES);

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPanel.java

@@ -107,10 +107,6 @@ class CanvasPanel extends JComponent implements Autoscroll {
 		} else {
 			bufferImage = createImage(getWidth(), getHeight());
 		}
-		Graphics2D g2d = (Graphics2D) bufferImage.getGraphics();
-		plugInPort.draw(g2d, ConfigurationManager.getInstance().readBoolean(
-				IPlugInPort.ANTI_ALIASING_KEY, true) ? DRAW_OPTIONS_ANTI_ALIASING : DRAW_OPTIONS,
-				null);
 	}
 
 	@Override
@@ -120,12 +116,12 @@ class CanvasPanel extends JComponent implements Autoscroll {
 		}
 		if (bufferImage == null) {
 			createBufferImage();
-		} else {
-			Graphics2D g2d = (Graphics2D) bufferImage.getGraphics();
-			plugInPort.draw(g2d, ConfigurationManager.getInstance().readBoolean(
-					IPlugInPort.ANTI_ALIASING_KEY, true) ? DRAW_OPTIONS_ANTI_ALIASING
-					: DRAW_OPTIONS, null);
 		}
+		Graphics2D g2d = (Graphics2D) bufferImage.getGraphics();
+		g2d.setClip(getVisibleRect());
+		plugInPort.draw(g2d, ConfigurationManager.getInstance().readBoolean(
+				IPlugInPort.ANTI_ALIASING_KEY, true) ? DRAW_OPTIONS_ANTI_ALIASING : DRAW_OPTIONS,
+				null);
 		if (USE_HARDWARE_ACCELLERATION) {
 			VolatileImage volatileImage = (VolatileImage) bufferImage;
 			do {

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/AbstractBoard.java

@@ -37,6 +37,9 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
 		if (componentState != ComponentState.DRAGGING) {
 			Composite oldComposite = g2d.getComposite();

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Eyelet.java

@@ -34,6 +34,9 @@ public class Eyelet extends AbstractComponent<String> {
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		int diameter = getClosestOdd((int) size.convertToPixels());
 		int holeDiameter = getClosestOdd((int) holeSize.convertToPixels());
 		g2d.setColor(color);

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java

@@ -33,6 +33,9 @@ public class SolderPad extends AbstractComponent<Void> {
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		int diameter = getClosestOdd((int) size.convertToPixels());
 		int holeDiameter = getClosestOdd((int) HOLE_SIZE.convertToPixels());
 		g2d.setColor(componentState == ComponentState.SELECTED

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/TraceCut.java

@@ -35,6 +35,9 @@ public class TraceCut extends AbstractComponent<Void> {
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		int size = getClosestOdd((int) this.size.convertToPixels());
 		int dotDiameter = size - 6;
 		g2d.setColor(fillColor);

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java

@@ -167,6 +167,9 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		Shape body = getBody();
 		// Draw body if available.
 		if (body != null) {

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java

@@ -42,20 +42,25 @@ public class Image extends AbstractTransparentComponent<Void> {
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		double s = 1d * scale / DEFAULT_SCALE;
+		Point endPoint = new Point((int) (image.getIconWidth() * s),
+				(int) (image.getIconHeight() * s));
+		if (!g2d.getClip().contains(point) && !g2d.getClip().contains(endPoint)) {
+			return;
+		}
 		Composite oldComposite = g2d.getComposite();
 		if (alpha < MAX_ALPHA) {
 			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
 					/ MAX_ALPHA));
 		}
-		double s = 1d * scale / DEFAULT_SCALE;
+
 		g2d.scale(s, s);
 		g2d.drawImage(image.getImage(), (int) (point.x / s), (int) (point.y / s), null);
 		if (componentState == ComponentState.SELECTED) {
 			g2d.setComposite(oldComposite);
 			g2d.scale(1 / s, 1 / s);
 			g2d.setColor(SELECTION_COLOR);
-			g2d.drawRect(point.x, point.y, (int) (image.getIconWidth() * s), (int) (image
+			g2d.drawRect(point.x, point.y, endPoint.x, endPoint.y);
-					.getIconHeight() * s));
 		}
 	}
 

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorValue.java

@@ -23,6 +23,6 @@ public class ResistorValue {
 	
 	@Override
 	public String toString() {
-		return resistance.toString() + " " + power.toString();
+		return resistance.toString() + power.toString();
 	}
 }

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/TrimmerPotentiometer.java

@@ -243,6 +243,9 @@ public class TrimmerPotentiometer extends AbstractPotentiometer {
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
 		Shape mainShape = getBody()[0];
 		Shape shaftShape = getBody()[1];

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/DIL_IC.java

@@ -249,6 +249,9 @@ public class DIL_IC extends AbstractTransparentComponent<String> {
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
 		Area mainArea = getBody()[0];
 		for (Point point : controlPoints) {

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/TransistorTO220.java

@@ -174,6 +174,9 @@ public class TransistorTO220 extends AbstractTransparentComponent<String> {
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
 		Shape mainArea = getBody()[0];
 		Shape tabArea = getBody()[1];

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/TransistorTO92.java

@@ -166,6 +166,9 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
 		Area mainArea = getBody();
 		Composite oldComposite = g2d.getComposite();