BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Issue 123

Browse Source 
Fixed issue with whiteboard flooding the server with large calls when the user holds down the mouse for too long in order to draw a really long shape

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4295 af16638f-c34d-0410-8cfa-b39d5352b314
This commit is contained in:
Denis Zgonjanin 2010-05-11 16:08:47 +00:00
parent cb2a90b700
commit 242d339bc6
2 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
bigbluebutton-client/src/org/bigbluebutton/modules/highlighter/views/HighlighterCanvas.mxml
View File

@ -4,21 +4,21 @@
mouseOver="setCursor()" mouseOut="removeCursor()" implements="org.bigbluebutton.common.IBbbCanvas">
<mx:Script>
<![CDATA[
import mx.controls.Alert;
import org.bigbluebutton.common.IBbbCanvas;
import mx.managers.CursorManager;
import org.bigbluebutton.common.Images;
import mx.collections.ArrayCollection;
import org.bigbluebutton.modules.highlighter.events.PageEvent;
import org.bigbluebutton.modules.present.events.WindowResizedEvent;
import org.bigbluebutton.modules.highlighter.events.HighlighterUpdate;
import org.bigbluebutton.common.mate.SharedObjectEvent;
import org.bigbluebutton.modules.highlighter.maps.HighlighterEventMap;
import org.bigbluebutton.modules.highlighter.events.HighlighterDrawEvent;
import mx.core.Application;
import org.bigbluebutton.modules.highlighter.business.shapes.ShapeFactory;
import org.bigbluebutton.modules.highlighter.business.shapes.DrawObjectFactory;
import mx.managers.CursorManager;
import org.bigbluebutton.common.IBbbCanvas;
import org.bigbluebutton.common.Images;
import org.bigbluebutton.common.mate.SharedObjectEvent;
import org.bigbluebutton.modules.highlighter.business.shapes.DrawObject;
import org.bigbluebutton.modules.highlighter.business.shapes.DrawObjectFactory;
import org.bigbluebutton.modules.highlighter.business.shapes.ShapeFactory;
import org.bigbluebutton.modules.highlighter.events.HighlighterDrawEvent;
import org.bigbluebutton.modules.highlighter.events.HighlighterUpdate;
import org.bigbluebutton.modules.highlighter.events.PageEvent;
import org.bigbluebutton.modules.highlighter.maps.HighlighterEventMap;
import org.bigbluebutton.modules.present.events.WindowResizedEvent;
private var x1:int;
private var y1:int;
@ -49,6 +49,8 @@
private var whiteboardEnabled:Boolean = false;
private var showWhiteboard:Boolean = true;
private var drawTimer:Timer;
private function init():void{
drawFactory = new DrawObjectFactory();
shapeFactory = new ShapeFactory();
@ -65,6 +67,18 @@
*/
private function doMouseUp():void{
isDrawing = false;
sendShapeToServer();
drawTimer.stop();
}
private function onDrawTimer(e:TimerEvent):void{
var startX:Number = segment[segment.length - 2] as Number;
var startY:Number = segment[segment.length - 1] as Number;
sendShapeToServer();
startShape(startX,startY);
}
private function sendShapeToServer():void{
this.d = drawFactory.makeDrawObject(this.shapeStyle, segment, this.drawColor, this.thickness);
this.d.parentHeight = this.height;
this.d.parentWidth = this.width;
@ -75,6 +89,7 @@
rawChildren.removeChild(feedback);
}
feedback = new Shape();
segment = new Array();
}
/**
@ -84,11 +99,18 @@
*the starting point in a shape
*/
private function doMouseDown():void{
isDrawing = true;
x1 = this.mouseX;
y1 = this.mouseY;
segment.push(x1);
segment.push(y1);
startShape(x1, y1);
drawTimer = new Timer(1000, 0);
drawTimer.addEventListener(TimerEvent.TIMER, onDrawTimer);
drawTimer.start();
}
private function startShape(startX:Number, startY:Number):void{
isDrawing = true;
segment.push(startX);
segment.push(startY);
rawChildren.addChild(feedback);
}
@ -134,7 +156,6 @@
shapeList.push(newShape);
//rawChildren.addChild(shapeList[shapeList.length-1]);
bbbCanvas.addRawChild(shapeList[shapeList.length-1]);
segment = new Array();
newShape = new Shape();
}

29
bigbluebutton-client/src/org/bigbluebutton/modules/highlighter/views/HighlighterToolbar.mxml
View File

@ -30,17 +30,18 @@
<mx:Script>
<![CDATA[
import mx.events.ResizeEvent;
import mx.events.MoveEvent;
import org.bigbluebutton.modules.present.views.PresentationWindow;
import org.bigbluebutton.modules.highlighter.events.WhiteboardButtonEvent;
import org.bigbluebutton.modules.present.events.PresentationEvent;
import org.bigbluebutton.modules.highlighter.events.HighlighterPresenterEvent;
import mx.controls.Alert;
import mx.events.MoveEvent;
import mx.events.ResizeEvent;
import org.bigbluebutton.common.Images;
import org.bigbluebutton.main.events.MadePresenterEvent;
import org.bigbluebutton.modules.highlighter.business.shapes.DrawObject;
import org.bigbluebutton.modules.highlighter.events.HighlighterDrawEvent;
import org.bigbluebutton.common.Images;
import org.bigbluebutton.modules.highlighter.events.HighlighterPresenterEvent;
import org.bigbluebutton.modules.highlighter.events.WhiteboardButtonEvent;
import org.bigbluebutton.modules.present.events.PresentationEvent;
import org.bigbluebutton.modules.present.views.PresentationWindow;
private var images:Images = new Images();
[Bindable] private var pencil_icon:Class = images.pencil_icon;
@ -84,7 +85,7 @@
}
private function presenterMode(e:MadePresenterEvent):void{
this.visible = true;
//this.visible = true;
}
private function viewerMode(e:MadePresenterEvent):void{
@ -115,20 +116,14 @@
public function positionToolbar(window:PresentationWindow):void{
presentationWindow = window;
presentationWindow.addEventListener(MoveEvent.MOVE, onMove);
presentationWindow.addEventListener(ResizeEvent.RESIZE, onResize);
presentationWindow.addEventListener(MoveEvent.MOVE, setPositionAndDepth);
presentationWindow.addEventListener(ResizeEvent.RESIZE, setPositionAndDepth);
this.x = presentationWindow.x + presentationWindow.width + 3;
this.y = presentationWindow.y + 30;
parent.setChildIndex(this, parent.numChildren-1);
}
private function onMove(e:MoveEvent):void{
this.x = presentationWindow.x + presentationWindow.width + 3;
this.y = presentationWindow.y + 30;
parent.setChildIndex(this, parent.numChildren-1);
}
private function onResize(e:ResizeEvent):void{
private function setPositionAndDepth(e:Event = null):void{
this.x = presentationWindow.x + presentationWindow.width + 3;
this.y = presentationWindow.y + 30;
parent.setChildIndex(this, parent.numChildren-1);