From f7d235b116fdeed91a93fb97c4047aaa5e109865 Mon Sep 17 00:00:00 2001
From: juliandescottes <julian.descottes@gmail.com>
Date: Fri, 14 Sep 2012 22:20:34 +0200
Subject: [PATCH] Adding Circle tool - reusing Rectangle implementation for now

---
 img/tools/cursors/circle.png | Bin 0 -> 628 bytes
 js/drawingtools/Circle.js    |  62 +++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 img/tools/cursors/circle.png
 create mode 100644 js/drawingtools/Circle.js

diff --git a/img/tools/cursors/circle.png b/img/tools/cursors/circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36e9eb051dbfc468c468efd2eb84c91eb99576c
GIT binary patch
literal 628
zcmV-)0*n2LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0005wNkl<ZI8UXMO-ox*5QY^IQ&0o`jV|1D
zoy7PRHM!R$CI(G{_)%Ic72ARqsUHg$BHH#hNPmW#(w#1Jt9DUAH!6xBBqrQ<eCOy@
z(`prR;f1;9%sgl2%$y1lsVGM#*!}#rRQfE`P+n??S~0RQOnE7f`ndik)&=-&RMX)l
z17@im+BvRW+$higU22hguY6tbDC8DEY84&Z=<w4YMXoi2LgyPChez>8)%6xf?E@$T
z;>Z)QNo9Q@c<ulZG%|QS*b7)=$fxF!%X|g0-$hiJZz6pQ$lD)r(VT)~vat}l1^6QP
z(G-W+AAt1Ib<jgfFN?$`;RF)^A!`O;E{nCcW`X|2$Aev<LONfIuw+ML6|my(hOkzX
z>SL$hUyn_Q1fn7udjk-Oj41%m0>nR;0*07QAvDPPmr;Bw11%x^4x(9`67(Wy{0b(4
zo-c6zSBCEOO!E>`yhICo_q!10MILDX<5RdyFTwdc6FoUGgF@Q?E_wPXJNNz$(18~u
zjuW!aStxdl;FLZ8ot(y2a?aWA{)8<K)=5hriY)igOluh4l2K-GEoD)w)OjF^bN2g8
z6^P-CYdVD+)FAB!eG?@Boo&*qxLHRfXivG1$=EiM{I92~|9MR1Jm)KAh<v1r<#jj!
O0000<MNUMnLSTX_+X<-v

literal 0
HcmV?d00001

diff --git a/js/drawingtools/Circle.js b/js/drawingtools/Circle.js
new file mode 100644
index 00000000..0c40da3a
--- /dev/null
+++ b/js/drawingtools/Circle.js
@@ -0,0 +1,62 @@
+/*
+ * @provide pskl.drawingtools.Circle
+ *
+ * @require pskl.utils
+ */
+(function() {
+	var ns = $.namespace("pskl.drawingtools");
+
+	ns.Circle = function() {
+		this.toolId = "tool-circle"
+		
+		// Circle's first point coordinates (set in applyToolAt)
+		this.startCol = null;
+		this.startRow = null;
+	};
+
+	pskl.utils.inherit(ns.Circle, ns.BaseTool);
+	
+	/**
+	 * @override
+	 */
+	ns.Circle.prototype.applyToolAt = function(col, row, color, frame, overlay) {
+		this.startCol = col;
+		this.startRow = row;
+		
+		// Drawing the first point of the rectangle in the fake overlay canvas:
+		overlay.setPixel(col, row, color);
+	};
+
+	ns.Circle.prototype.moveToolAt = function(col, row, color, frame, overlay) {
+		overlay.clear();
+
+		// When the user moussemove (before releasing), we dynamically compute the 
+		// pixel to draw the line and draw this line in the overlay :
+		var strokePoints = pskl.PixelUtils.getBoundRectanglePixels(this.startCol, this.startRow, col, row);
+		if(color == Constants.TRANSPARENT_COLOR) {
+			color = Constants.SELECTION_TRANSPARENT_COLOR;
+		}
+
+		// Drawing current stroke:
+		for(var i = 0; i< strokePoints.length; i++) {
+			overlay.setPixel(strokePoints[i].col, strokePoints[i].row, color);
+		}
+	};
+
+	/**
+	 * @override
+	 */
+	ns.Circle.prototype.releaseToolAt = function(col, row, color, frame, overlay) {		
+		overlay.clear();
+		// If the stroke tool is released outside of the canvas, we cancel the stroke: 
+		if(frame.containsPixel(col, row)) {
+			var strokePoints = pskl.PixelUtils.getBoundRectanglePixels(this.startCol, this.startRow, col, row);
+			for(var i = 0; i< strokePoints.length; i++) {
+				// Change model:
+				frame.setPixel(strokePoints[i].col, strokePoints[i].row, color);
+			}
+			// The user released the tool to draw a line. We will compute the pixel coordinate, impact
+			// the model and draw them in the drawing canvas (not the fake overlay anymore)		
+		}
+	};
+})();