Revision: 4523
Author: seba.wagner
Date: Mon Nov 7 10:31:59 2011
Log: Merge whiteboard fix to Tag 1.8
http://code.google.com/p/openmeetings/source/detail?r=4523
Modified:
/tags/1_8/WebContent/openmeetings/base/mainAttributes.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawEllipse.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawLine.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawSelect.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawTriangle.lzx
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawULine.lzx
=======================================
--- /tags/1_8/WebContent/openmeetings/base/mainAttributes.lzx Thu Sep 22
10:00:43 2011
+++ /tags/1_8/WebContent/openmeetings/base/mainAttributes.lzx Mon Nov 7
10:31:59 2011
@@ -386,4 +386,7 @@
<!-- userdata -->
<attribute name="sharedObject" value="null" />
+<attribute name="currentMicName" value="" type="string"/>
+<attribute name="currentCamName" value="" type="string"/>
+
</library>
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx
Mon Sep 12 11:03:36 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx
Mon Nov 7 10:31:59 2011
@@ -87,6 +87,9 @@
} else {
parent.myvideocontainer.publicSID =
canvas.publicSID;
}
+
+ canvas.setAttribute("currentMicName",
Microphone.names[parent.chosenMic]);
+ canvas.setAttribute("currentCamName",
Camera.names[parent.chosenCam]);
if ($debug) Debug.write("parent.setUserAVSettings
-1- ",parent.chosenSetting);
if ($debug) Debug.write("parent.setUserAVSettings
-2- ",parent.remoteMessage);
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
Tue Apr 26 02:23:02 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawArrow.lzx
Mon Nov 7 10:31:59 2011
@@ -150,7 +150,7 @@
<![CDATA[
//Debug.write("## lineactionHistory",parentView," 2 ## NEW
x,y ",lastActionObject[lastActionObject.length-5],lastActionObject[lastActionObject.length-4],"
width,height: ",lastActionObject[lastActionObject.length-3],lastActionObject[lastActionObject.length-2]);
- this.currentlayer = new lz.drawViewNew(parentView,{
+ var tmpCurrentlayer = new lz.drawViewNew(parentView,{
name:lastActionObject[lastActionObject.length-1],
x:lastActionObject[lastActionObject.length-5],
y:lastActionObject[lastActionObject.length-4],
@@ -162,14 +162,14 @@
var pArrowEnd = new
flash.geom.Point(lastActionObject[9],lastActionObject[10]);
//if ($debug)
Debug.write("start,end,line",pArrowStart,pArrowEnd,this.currentdrawarrowlinelineWidth);
-
this.drawArrow(this.currentlayer,pArrowStart,pArrowEnd,lastActionObject[2],
+
this.drawArrow(tmpCurrentlayer,pArrowStart,pArrowEnd,lastActionObject[2],
lastActionObject[4],lastActionObject[1],
lastActionObject[3],lastActionObject[5]);
//Add Layer to global Layer
- this.layers.push(this.currentlayer);
-
-
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-7]);
+ this.layers.push(tmpCurrentlayer);
+
+
this.doSWFDocumentStatus(tmpCurrentlayer,lastActionObject[lastActionObject.length-7]);
]]>
</method>
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
Tue Apr 26 02:23:02 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
Mon Nov 7 10:31:59 2011
@@ -391,7 +391,7 @@
<method name="drawClipArtToHistory" args="lastActionObject,parentView">
<![CDATA[
- this.currentlayer = new lz.drawViewNew(parentView,{
+ var tmpCurrentlayer = new lz.drawViewNew(parentView,{
name:lastActionObject[lastActionObject.length-1],
x:lastActionObject[lastActionObject.length-5],
y:lastActionObject[lastActionObject.length-4],
@@ -400,7 +400,7 @@
opacity:lastActionObject[4]
});
- new lz.drawClipArtWhiteBoard(this.currentlayer,{
+ new lz.drawClipArtWhiteBoard(tmpCurrentlayer,{
width:lastActionObject[7],
height:lastActionObject[8],
stretches:'both',
@@ -413,12 +413,12 @@
name:'clipart'
});
- if ($debug)
Debug.write("x,y ",this.currentlayer.x,this.currentlayer.y,this.currentlayer.width,this.currentlayer.height);
+ if ($debug)
Debug.write("x,y ",tmpCurrentlayer.x,tmpCurrentlayer.y,tmpCurrentlayer.width,tmpCurrentlayer.height);
//Add Layer to global Layer
- this.layers.push(this.currentlayer);
-
-
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-7]);
+ this.layers.push(tmpCurrentlayer);
+
+
this.doSWFDocumentStatus(tmpCurrentlayer,lastActionObject[lastActionObject.length-7]);
]]>
</method>
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawEllipse.lzx
Tue Apr 26 02:23:02 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawEllipse.lzx
Mon Nov 7 10:31:59 2011
@@ -84,7 +84,7 @@
<method name="drawellipseToHistory"
args="lastActionObject,parentView">
- this.currentlayer = new lz.drawViewNew(parentView,{
+ var tmpCurrentlayer = new lz.drawViewNew(parentView,{
name:lastActionObject[lastActionObject.length-1],
x:lastActionObject[lastActionObject.length-5],
y:lastActionObject[lastActionObject.length-4],
@@ -92,19 +92,19 @@
height:lastActionObject[lastActionObject.length-2],
opacity:lastActionObject[6]});
- new lz.drawViewInner(this.currentlayer,{
+ new lz.drawViewInner(tmpCurrentlayer,{
name:'_innerEllipse',x:0,y:0,
width:lastActionObject[lastActionObject.length-3],
height:lastActionObject[lastActionObject.length-2]});
//Debug.write("lastActionObject[1],lastActionObject[2]: ",lastActionObject[1],lastActionObject[2]);
- this.drawellipseHistory(this.currentlayer,
+ this.drawellipseHistory(tmpCurrentlayer,
0,0,lastActionObject[lastActionObject.length-3],lastActionObject[lastActionObject.length-2],
lastActionObject[1],lastActionObject[2],
lastActionObject[3],lastActionObject[4],
lastActionObject[5]);
-
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-7]);
+
this.doSWFDocumentStatus(tmpCurrentlayer,lastActionObject[lastActionObject.length-7]);
</method>
<method name="redrawEllipseItemByScaling" args="objRef">
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawLine.lzx
Fri Jul 1 05:21:36 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawLine.lzx
Mon Nov 7 10:31:59 2011
@@ -1,160 +1,187 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
-<class name="baseDrawLine" extends="baseDrawPaint" >
-
- <!-- for drawing line -->
- <attribute name="currentlinestroke" value="0xFF6600" />
- <attribute name="currentlinelineWidth" value="2" type="number" />
- <attribute name="currentlineOpacity" value="1" type="number" />
-
- <!-- ###########################
- Line
- -->
-
- <method name="startLine" args="oid_name">
- //Debug.write("startLine ",this.startx,this.starty);
- if (oid_name==null) {
- oid_name = 'line'+this.getCounter()
- }
- this.currentlayer = new lz.drawViewNew(this,{
- name:oid_name,width:this.width+2,height:this.height+2,
- x:-1,y:-1,
- opacity:this.currentlineOpacity});
- this.drawlineOnObject(this.currentlayer,-1,-1,0,0);
-
this.drawlineOnObject(this.currentlayer,this.width,this.height,this.width+1,this.height+1);
-
- //Set previous to null
- this.prevx = null;
- this.prevy = null;
-
- currentlayer.strokeStyle = this.currentlinestroke;
- currentlayer.lineWidth = this.currentlinelineWidth;
- //currentlayer.fillstyle = '0x000000';
-
- </method>
-
- <method name="endLine">
+ <class name="baseDrawLine" extends="baseDrawPaint" >
+
+ <!-- for drawing line -->
+ <attribute name="currentlinestroke" value="0xFF6600" />
+ <attribute name="currentlinelineWidth" value="2" type="number"
/>
+ <attribute name="currentlineOpacity" value="1" type="number" />
+
+ <!-- ###########################
+ Line
+ -->
+
+ <method name="startLine" args="oid_name">
+
+ //Debug.write("startLine ",this.startx,this.starty);
+ if (oid_name == null) {
+ oid_name = 'line' + this.getCounter()
+ }
+ this.currentlayer = new lz.drawViewNew(this, {
+ name : oid_name,
+ width : this.width + 2,
+ height : this.height + 2,
+ x : -1,
+ y : -1,
+ opacity :
this.currentlineOpacity
+ });
+ this.drawlineOnObject(this.currentlayer, -1, -1, 0, 0);
+ this.drawlineOnObject(this.currentlayer, this.width,
this.height,
+ this.width + 1, this.height + 1);
+
+ //Set previous to null
+ this.prevx = null;
+ this.prevy = null;
+
+ currentlayer.strokeStyle = this.currentlinestroke;
+ currentlayer.lineWidth = this.currentlinelineWidth;
+ //currentlayer.fillstyle = '0x000000';
+
+ </method>
+
+ <method name="endLine">
////Debug.write("endLine",this.startx,this.starty,this.endx,this.endy);
- <![CDATA[
- var tempName = this.currentlayer.name;
- this.currentlayer.destroy();
-
- //GetBounds of that Object
- var minx = this.width+2;
- var miny = this.height+2;
- var maxx = -2;
- var maxy = -2;
-
- if (this.startx<minx) minx=this.startx;
- if (this.endx<minx) minx=this.endx;
-
- if (this.startx>maxx) maxx=this.startx;
- if (this.endx>maxx) maxx=this.endx;
-
- if (this.starty<miny) miny=this.starty;
- if (this.endy<miny) miny=this.endy;
-
- if (this.starty>maxy) maxy=this.starty;
- if (this.endy>maxy) maxy=this.endy;
-
- var width = maxx-minx;
- var height = maxy-miny;
-
- var x1 = this.startx-minx+(this.currentlinelineWidth/2);
- var y1 = this.starty-miny+(this.currentlinelineWidth/2);
- var x2 = this.endx-minx+(this.currentlinelineWidth/2);
- var y2 = this.endy-miny+(this.currentlinelineWidth/2);
-
- if(this.isSnapToGrid){
-
- xgrid =
Math.round((minx-1-(this.currentlinelineWidth/2))/this.gridWidth)*this.gridWidth;
- ygrid =
Math.round((miny-1-(this.currentlinelineWidth/2))/this.gridWidth)*this.gridWidth;
-
- this.currentlayer = new lz.drawViewNew(this,{
- name:tempName,
- x:xgrid,
- y:ygrid,
- width:(width+this.currentlinelineWidth),
- height:(height+this.currentlinelineWidth),
- opacity:this.currentlineOpacity});
-
- }else{
-
- this.currentlayer = new lz.drawViewNew(this,{
-
name:tempName,x:(minx-1-(this.currentlinelineWidth/2)),
- y:(miny-1-(this.currentlinelineWidth/2)),
- width:(width+this.currentlinelineWidth),
- height:(height+this.currentlinelineWidth),
- opacity:this.currentlineOpacity});
- }
- //this.currentlayer.fillstyle = '0x000000';
- this.currentlayer.lineWidth = this.currentlinelineWidth;
- this.currentlayer.strokeStyle = this.currentlinestroke;
-
- this.drawline((x1),(y1),(x2),(y2));
-
- //Add Layer to global Layer
- this.layers.push(this.currentlayer);
-
-
this.lineregisterFinal(this.currentlayer.name,this.currentlinestroke,
- this.currentlinelineWidth,this.currentlineOpacity,
- this.currentlayer.x,this.currentlayer.y,
- this.currentlayer.width,this.currentlayer.height,
- x1,y1,x2,y2,true,this.getSWFDocumentStatus(),
- this.getZIndex());
- ]]>
- </method>
+ <![CDATA[
+ var tempName = this.currentlayer.name;
+ this.currentlayer.destroy();
+
+ //GetBounds of that Object
+ var minx = this.width + 2;
+ var miny = this.height + 2;
+ var maxx = -2;
+ var maxy = -2;
+
+ if (this.startx < minx)
+ minx = this.startx;
+ if (this.endx < minx)
+ minx = this.endx;
+
+ if (this.startx > maxx)
+ maxx = this.startx;
+ if (this.endx > maxx)
+ maxx = this.endx;
+
+ if (this.starty < miny)
+ miny = this.starty;
+ if (this.endy < miny)
+ miny = this.endy;
+
+ if (this.starty > maxy)
+ maxy = this.starty;
+ if (this.endy > maxy)
+ maxy = this.endy;
+
+ var width = maxx - minx;
+ var height = maxy - miny;
+
+ var x1 = this.startx - minx +
(this.currentlinelineWidth / 2);
+ var y1 = this.starty - miny +
(this.currentlinelineWidth / 2);
+ var x2 = this.endx - minx + (this.currentlinelineWidth
/ 2);
+ var y2 = this.endy - miny + (this.currentlinelineWidth
/ 2);
+
+ if (this.isSnapToGrid) {
+
+ xgrid = Math.round((minx - 1 -
(this.currentlinelineWidth / 2))
+ / this.gridWidth)
+ * this.gridWidth;
+ ygrid = Math.round((miny - 1 -
(this.currentlinelineWidth / 2))
+ / this.gridWidth)
+ * this.gridWidth;
+
+ this.currentlayer = new lz.drawViewNew(this, {
+ name : tempName,
+ x : xgrid,
+ y : ygrid,
+ width : (width +
this.currentlinelineWidth),
+ height : (height +
this.currentlinelineWidth),
+ opacity :
this.currentlineOpacity
+ });
+
+ } else {
+
+ this.currentlayer = new lz.drawViewNew(this, {
+ name : tempName,
+ x : (minx - 1 -
(this.currentlinelineWidth / 2)),
+ y : (miny - 1 -
(this.currentlinelineWidth / 2)),
+ width : (width +
this.currentlinelineWidth),
+ height : (height +
this.currentlinelineWidth),
+ opacity :
this.currentlineOpacity
+ });
+ }
+ //this.currentlayer.fillstyle = '0x000000';
+ this.currentlayer.lineWidth = this.currentlinelineWidth;
+ this.currentlayer.strokeStyle = this.currentlinestroke;
+
+ this.drawline((x1), (y1), (x2), (y2));
+
+ //Add Layer to global Layer
+ this.layers.push(this.currentlayer);
+
+ this.lineregisterFinal(this.currentlayer.name,
+ this.currentlinestroke,
this.currentlinelineWidth,
+ this.currentlineOpacity,
this.currentlayer.x,
+ this.currentlayer.y,
this.currentlayer.width,
+ this.currentlayer.height, x1, y1, x2,
y2, true, this
+
.getSWFDocumentStatus(), this.getZIndex());
+ ]]>
+ </method>
- <method name="lineregisterFinal"
args="newName,stroke,line,opacity,x,y,width,height,x1,y1,x2,y2,doCall,swfObj,zIndex">
- var actionObject = new Array();
- actionObject[0] = 'line';
- actionObject[1] = stroke;
- actionObject[2] = line;
- actionObject[3] = opacity;
- actionObject[4] = x1
- actionObject[5] = y1;
- actionObject[6] = x2;
- actionObject[7] = y2;
- actionObject[8] = zIndex;//-8
- actionObject[9] = swfObj;//-7
- actionObject[10] = this.counter;//-6
- actionObject[11] = x;//-5
- actionObject[12] = y;//-4
- actionObject[13] = width;//-3
- actionObject[14] = height;//-2
- actionObject[15] = newName;//-1
- this.baseactionobjectList.push(actionObject);
- if (doCall) this.onsharedMessage('draw',actionObject);
- </method>
+ <method name="lineregisterFinal"
args="newName,stroke,line,opacity,x,y,width,height,x1,y1,x2,y2,doCall,swfObj,zIndex">
+ var actionObject = new Array();
+ actionObject[0] = 'line';
+ actionObject[1] = stroke;
+ actionObject[2] = line;
+ actionObject[3] = opacity;
+ actionObject[4] = x1
+ actionObject[5] = y1;
+ actionObject[6] = x2;
+ actionObject[7] = y2;
+ actionObject[8] = zIndex;//-8
+ actionObject[9] = swfObj;//-7
+ actionObject[10] = this.counter;//-6
+ actionObject[11] = x;//-5
+ actionObject[12] = y;//-4
+ actionObject[13] = width;//-3
+ actionObject[14] = height;//-2
+ actionObject[15] = newName;//-1
+ this.baseactionobjectList.push(actionObject);
+ if (doCall)
+ this.onsharedMessage('draw', actionObject);
+ </method>
- <method name="lineactionHistory" args="lastActionObject,parentView">
- <![CDATA[
- //Debug.write("## lineactionHistory",parentView," 2 ## NEW
x,y ",lastActionObject[lastActionObject.length-5],lastActionObject[lastActionObject.length-4],"
width,height: ",lastActionObject[lastActionObject.length-3],lastActionObject[lastActionObject.length-2]);
-
- this.currentlayer = new lz.drawViewNew(parentView,{
- name:lastActionObject[lastActionObject.length-1],
- x:lastActionObject[lastActionObject.length-5],
- y:lastActionObject[lastActionObject.length-4],
- width:lastActionObject[lastActionObject.length-3],
- height:lastActionObject[lastActionObject.length-2],
- opacity:lastActionObject[3]});
-
- //this.currentlayer.fillstyle = lastActionObject[1];
- this.currentlayer.lineWidth = lastActionObject[2];
- this.currentlayer.strokeStyle = lastActionObject[1];
-
-
this.drawline(lastActionObject[4],lastActionObject[5],lastActionObject[6],lastActionObject[7]);
-
- //Add Layer to global Layer
- this.layers.push(this.currentlayer);
-
-
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-7]);
- ]]>
- </method>
-
-</class>
+ <method name="lineactionHistory"
args="lastActionObject,parentView">
+ <![CDATA[
+
+ //Debug.write("## lineactionHistory",parentView," 2 ## NEW
x,y ",lastActionObject[lastActionObject.length-5],lastActionObject[lastActionObject.length-4],"
width,height: ",lastActionObject[lastActionObject.length-3],lastActionObject[lastActionObject.length-2]);
+
+ var tmpCurrentlayer = new lz.drawViewNew(parentView, {
+ name :
lastActionObject[lastActionObject.length - 1],
+ x :
lastActionObject[lastActionObject.length - 5],
+ y :
lastActionObject[lastActionObject.length - 4],
+ width :
lastActionObject[lastActionObject.length - 3],
+ height :
lastActionObject[lastActionObject.length - 2],
+ opacity : lastActionObject[3]
+ });
+
+ //this.currentlayer.fillstyle = lastActionObject[1];
+ tmpCurrentlayer.lineWidth = lastActionObject[2];
+ tmpCurrentlayer.strokeStyle = lastActionObject[1];
+
+ this.drawlineOnObject(tmpCurrentlayer,
lastActionObject[4],
+ lastActionObject[5],
lastActionObject[6],
+ lastActionObject[7]);
+
+ //Add Layer to global Layer
+ this.layers.push(tmpCurrentlayer);
+
+ this.doSWFDocumentStatus(tmpCurrentlayer,
+
lastActionObject[lastActionObject.length - 7]);
+ ]]>
+ </method>
+
+ </class>
</library>
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Fri Jul 1 05:21:36 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Mon Nov 7 10:31:59 2011
@@ -1,230 +1,265 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
-<class name="baseDrawPaint" extends="baseDraw" >
-
- <!-- paint -->
- <attribute name="currentlayerstroke" value="0xFF6600" />
- <attribute name="currentlayerlineWidth" value="2" type="number" />
- <attribute name="currentlayerOpacity" value="1" type="number" />
-
- <!-- TODO: Check if needed, seems to have no reference -->
- <attribute name="painttrans" value="false" type="boolean" />
-
- <!-- #####################
- Paint
- -->
-
- <method name="drawline" args="x1,y1,x2,y2">
- <![CDATA[
- currentlayer.beginPath();
- currentlayer.moveTo(x1,y1);
- currentlayer.lineTo(x2,y2);
- currentlayer.stroke();
- ]]>
- </method>
-
- <method name="drawlineOnObject" args="obj,x1,y1,x2,y2">
- <![CDATA[
- obj.beginPath();
- obj.moveTo(x1,y1);
- obj.lineTo(x2,y2);
- obj.stroke();
- ]]>
- </method>
+ <class name="baseDrawPaint" extends="baseDraw" >
+
+ <!-- paint -->
+ <attribute name="currentlayerstroke" value="0xFF6600" />
+ <attribute name="currentlayerlineWidth" value="2" type="number"
/>
+ <attribute name="currentlayerOpacity" value="1" type="number" />
+
+ <!-- TODO: Check if needed, seems to have no reference -->
+ <attribute name="painttrans" value="false" type="boolean" />
+
+ <!-- #####################
+ Paint
+ -->
+
+ <method name="drawline" args="x1,y1,x2,y2">
+ <![CDATA[
+ currentlayer.beginPath();
+ currentlayer.moveTo(x1, y1);
+ currentlayer.lineTo(x2, y2);
+ currentlayer.stroke();
+ ]]>
+ </method>
+
+ <method name="drawlineOnObject" args="obj,x1,y1,x2,y2">
+ <![CDATA[
+ obj.beginPath();
+ obj.moveTo(x1, y1);
+ obj.lineTo(x2, y2);
+ obj.stroke();
+ ]]>
+ </method>
- <method name="drawlineRegisterPaint" args="x1,y1,x2,y2">
- var actionObject = new Array();
- actionObject[0] = 'point';
- actionObject[1] = x1;
- actionObject[2] = y1;
- actionObject[3] = x2;
- actionObject[4] = y2;
- this.basetempactionobjectList.push(actionObject);
- </method>
-
- <method name="startPaint">
- //Debug.write("startPaint ",this.startx,this.starty);
- this.currentlayer = new lz.drawViewNew(this,{
-
name:'paint'+this.getCounter(),width:this.width+2,height:this.height+2,
- x:-1,y:-1,
- opacity:this.currentlayerOpacity});
- this.drawlineOnObject(this.currentlayer,-1,-1,0,0);
-
this.drawlineOnObject(this.currentlayer,this.width,this.height,this.width+1,this.height+1);
-
- this.startx = this.currentlayer.getMouse('x');
- this.starty = this.currentlayer.getMouse('y');
-
- //Set previous to null
- this.prevx = null;
- this.prevy = null;
-
- currentlayer.strokeStyle = this.currentlayerstroke;
- currentlayer.lineWidth = this.currentlayerlineWidth;
- currentlayer.fillstyle = '0x000000';
-
- this.basetempactionobjectList = new Array();
-
- //beginFill( the_colorpicker.selectedColor );
- </method>
-
- <method name="endPaint">
+ <method name="drawlineRegisterPaint" args="x1,y1,x2,y2">
+ var actionObject = new Array();
+ actionObject[0] = 'point';
+ actionObject[1] = x1;
+ actionObject[2] = y1;
+ actionObject[3] = x2;
+ actionObject[4] = y2;
+ this.basetempactionobjectList.push(actionObject);
+ </method>
+
+ <method name="startPaint">
+
+ //Debug.write("startPaint ",this.startx,this.starty);
+ this.currentlayer = new lz.drawViewNew(this, {
+ name : 'paint' +
this.getCounter(),
+ width : this.width + 2,
+ height : this.height + 2,
+ x : -1,
+ y : -1,
+ opacity :
this.currentlayerOpacity
+ });
+ this.drawlineOnObject(this.currentlayer, -1, -1, 0, 0);
+ this.drawlineOnObject(this.currentlayer, this.width,
this.height,
+ this.width + 1, this.height + 1);
+
+ this.startx = this.currentlayer.getMouse('x');
+ this.starty = this.currentlayer.getMouse('y');
+
+ //Set previous to null
+ this.prevx = null;
+ this.prevy = null;
+
+ currentlayer.strokeStyle = this.currentlayerstroke;
+ currentlayer.lineWidth = this.currentlayerlineWidth;
+ currentlayer.fillstyle = '0x000000';
+
+ this.basetempactionobjectList = new Array();
+
+ //beginFill( the_colorpicker.selectedColor );
+ </method>
+
+ <method name="endPaint">
////Debug.write("endPaint");
- <![CDATA[
- var tempName = this.currentlayer.name;
- this.currentlayer.destroy();
-
- //GetBounds of that Object
- var minx = this.width+2;
- var miny = this.height+2;
- var maxx = -2;
- var maxy = -2;
-
- for (var eg=0;eg<this.basetempactionobjectList.length;eg++){
-
////Debug.write(this.basetempactionobjectList[eg][1],this.basetempactionobjectList[eg][3]);
- if (this.basetempactionobjectList[eg][1]<minx)
minx=this.basetempactionobjectList[eg][1];
- if (this.basetempactionobjectList[eg][3]<minx)
minx=this.basetempactionobjectList[eg][3];
-
- if (this.basetempactionobjectList[eg][1]>maxx)
maxx=this.basetempactionobjectList[eg][1];
- if (this.basetempactionobjectList[eg][3]>maxx)
maxx=this.basetempactionobjectList[eg][3];
-
- if (this.basetempactionobjectList[eg][2]<miny)
miny=this.basetempactionobjectList[eg][2];
- if (this.basetempactionobjectList[eg][4]<miny)
miny=this.basetempactionobjectList[eg][4];
-
- if (this.basetempactionobjectList[eg][2]>maxy)
maxy=this.basetempactionobjectList[eg][2];
- if (this.basetempactionobjectList[eg][4]>maxy)
maxy=this.basetempactionobjectList[eg][4];
- }
-
- for (var eg=0;eg<this.basetempactionobjectList.length;eg++){
-
- this.basetempactionobjectList[eg][1]-=minx;
- this.basetempactionobjectList[eg][2]-=miny;
- this.basetempactionobjectList[eg][3]-=minx;
- this.basetempactionobjectList[eg][4]-=miny
-
- }
-
- var width = maxx-minx;
- var height = maxy-miny;
- //if ($debug) Debug.info("## 1 ## NEW x,y ",minx,miny,"
width,height: ",width,height);
-
- if (width < 2 && height < 2) {
-
- //if ($debug) Debug.info("Add minimum size of Painting Line");
-
- if (this.basetempactionobjectList.length > 0) {
-
- var lastPoint =
this.basetempactionobjectList[this.basetempactionobjectList.length-1];
-
- var actionObject = new Array();
- actionObject[0] = 'point';
- actionObject[1] = lastPoint[3];
- actionObject[2] = lastPoint[4];
- actionObject[3] = lastPoint[3]+2;
- actionObject[4] = lastPoint[4]+2;
- this.basetempactionobjectList.push(actionObject);
-
- } else {
-
- //if ($debug) Debug.info("## 2 ## CURRENT
width,height ",this.width,this.height);
-
- minx = this.startx;
- miny = this.starty;
-
- var actionObject = new Array();
- actionObject[0] = 'point';
- actionObject[1] = 0;
- actionObject[2] = 0;
- actionObject[3] = 2;
- actionObject[4] = 2;
- this.basetempactionobjectList.push(actionObject);
-
- width = 2;
- height = 2;
-
- }
-
- }
-
- if(this.isSnapToGrid){
-
- xgrid = Math.round((minx-1)/this.gridWidth)*this.gridWidth;
- ygrid = Math.round((miny-1)/this.gridWidth)*this.gridWidth;
-
- this.currentlayer = new lz.drawViewNew(this,{
-
name:tempName,x:xgrid,y:ygrid,width:width,height:height,
- opacity:this.currentlayerOpacity});
- }else{
- this.currentlayer = new lz.drawViewNew(this,{
-
name:tempName,x:minx-1,y:miny-1,width:width,height:height,
- opacity:this.currentlayerOpacity});
- }
-
-
- this.currentlayer.fillstyle = '0x000000';
- this.currentlayer.lineWidth = this.currentlayerlineWidth;
- this.currentlayer.strokeStyle = this.currentlayerstroke;
-
- for (var eg=0;eg<this.basetempactionobjectList.length;eg++)
-
this.drawline(this.basetempactionobjectList[eg][1],this.basetempactionobjectList[eg][2],this.basetempactionobjectList[eg][3],this.basetempactionobjectList[eg][4]);
-
- //this.currentlayer.setAttribute('stretches','both');
-
- //Add Layer to global Layer
- this.layers.push(this.currentlayer);
-
- this.registerFinal(this.getSWFDocumentStatus(),
- this.getZIndex());
- ]]>
- </method>
-
- <method name="registerFinal" args="swfObj,zIndex">
- var actionObject = new Array();
- actionObject[0] = 'paint';
- actionObject[1] = this.basetempactionobjectList;
- actionObject[2] = currentlayer.fillstyle;
- actionObject[3] = currentlayer.lineWidth;
- actionObject[4] = currentlayer.strokeStyle;
- actionObject[5] = this.currentlayerOpacity;
- actionObject[6] = zIndex;//-8
- actionObject[7] = swfObj;//-7
- actionObject[8] = this.counter;//-6
- actionObject[9] = currentlayer.x;//-5
- actionObject[10] = currentlayer.y;//-4
- actionObject[11] = currentlayer.width;//-3
- actionObject[12] = currentlayer.height;//-2
- actionObject[13] = this.currentlayer.name;//-1
- if ($debug) Debug.write("registerFinal :: ",actionObject);
- this.baseactionobjectList.push(actionObject);
- this.onsharedMessage('draw',actionObject);
- </method>
+ <![CDATA[
+ var tempName = this.currentlayer.name;
+ this.currentlayer.destroy();
+
+ //GetBounds of that Object
+ var minx = this.width + 2;
+ var miny = this.height + 2;
+ var maxx = -2;
+ var maxy = -2;
+
+ for (var eg = 0; eg <
this.basetempactionobjectList.length; eg++) {
+
////Debug.write(this.basetempactionobjectList[eg][1],this.basetempactionobjectList[eg][3]);
+ if (this.basetempactionobjectList[eg][1] < minx)
+ minx =
this.basetempactionobjectList[eg][1];
+ if (this.basetempactionobjectList[eg][3] < minx)
+ minx =
this.basetempactionobjectList[eg][3];
+
+ if (this.basetempactionobjectList[eg][1] > maxx)
+ maxx =
this.basetempactionobjectList[eg][1];
+ if (this.basetempactionobjectList[eg][3] > maxx)
+ maxx =
this.basetempactionobjectList[eg][3];
+
+ if (this.basetempactionobjectList[eg][2] < miny)
+ miny =
this.basetempactionobjectList[eg][2];
+ if (this.basetempactionobjectList[eg][4] < miny)
+ miny =
this.basetempactionobjectList[eg][4];
+
+ if (this.basetempactionobjectList[eg][2] > maxy)
+ maxy =
this.basetempactionobjectList[eg][2];
+ if (this.basetempactionobjectList[eg][4] > maxy)
+ maxy =
this.basetempactionobjectList[eg][4];
+ }
+
+ for (var eg = 0; eg <
this.basetempactionobjectList.length; eg++) {
+
+ this.basetempactionobjectList[eg][1] -= minx;
+ this.basetempactionobjectList[eg][2] -= miny;
+ this.basetempactionobjectList[eg][3] -= minx;
+ this.basetempactionobjectList[eg][4] -= miny
+
+ }
+
+ var width = maxx - minx;
+ var height = maxy - miny;
+ //if ($debug) Debug.info("## 1 ## NEW x,y ",minx,miny,"
width,height: ",width,height);
+
+ if (width < 2 && height < 2) {
+
+ //if ($debug) Debug.info("Add minimum size of
Painting Line");
+
+ if (this.basetempactionobjectList.length > 0) {
+
+ var lastPoint =
this.basetempactionobjectList[this.basetempactionobjectList.length
+ - 1];
+
+ var actionObject = new Array();
+ actionObject[0] = 'point';
+ actionObject[1] = lastPoint[3];
+ actionObject[2] = lastPoint[4];
+ actionObject[3] = lastPoint[3] + 2;
+ actionObject[4] = lastPoint[4] + 2;
+
this.basetempactionobjectList.push(actionObject);
+
+ } else {
+
+ //if ($debug) Debug.info("## 2 ## CURRENT
width,height ",this.width,this.height);
+
+ minx = this.startx;
+ miny = this.starty;
+
+ var actionObject = new Array();
+ actionObject[0] = 'point';
+ actionObject[1] = 0;
+ actionObject[2] = 0;
+ actionObject[3] = 2;
+ actionObject[4] = 2;
+
this.basetempactionobjectList.push(actionObject);
+
+ width = 2;
+ height = 2;
+
+ }
+
+ }
+
+ if (this.isSnapToGrid) {
+
+ xgrid = Math.round((minx - 1) / this.gridWidth)
+ * this.gridWidth;
+ ygrid = Math.round((miny - 1) / this.gridWidth)
+ * this.gridWidth;
+
+ this.currentlayer = new lz.drawViewNew(this, {
+ name : tempName,
+ x : xgrid,
+ y : ygrid,
+ width : width,
+ height : height,
+ opacity :
this.currentlayerOpacity
+ });
+ } else {
+ this.currentlayer = new lz.drawViewNew(this, {
+ name : tempName,
+ x : minx - 1,
+ y : miny - 1,
+ width : width,
+ height : height,
+ opacity :
this.currentlayerOpacity
+ });
+ }
+
+ this.currentlayer.fillstyle = '0x000000';
+ this.currentlayer.lineWidth =
this.currentlayerlineWidth;
+ this.currentlayer.strokeStyle = this.currentlayerstroke;
+
+ for (var eg = 0; eg <
this.basetempactionobjectList.length; eg++)
+
this.drawline(this.basetempactionobjectList[eg][1],
+
this.basetempactionobjectList[eg][2],
+
this.basetempactionobjectList[eg][3],
+
this.basetempactionobjectList[eg][4]);
+
+ //this.currentlayer.setAttribute('stretches','both');
+
+ //Add Layer to global Layer
+ this.layers.push(this.currentlayer);
+
+ this.registerFinal(this.getSWFDocumentStatus(),
this.getZIndex());
+ ]]>
+ </method>
+
+ <method name="registerFinal" args="swfObj,zIndex">
+ var actionObject = new Array();
+ actionObject[0] = 'paint';
+ actionObject[1] = this.basetempactionobjectList;
+ actionObject[2] = currentlayer.fillstyle;
+ actionObject[3] = currentlayer.lineWidth;
+ actionObject[4] = currentlayer.strokeStyle;
+ actionObject[5] = this.currentlayerOpacity;
+ actionObject[6] = zIndex;//-8
+ actionObject[7] = swfObj;//-7
+ actionObject[8] = this.counter;//-6
+ actionObject[9] = currentlayer.x;//-5
+ actionObject[10] = currentlayer.y;//-4
+ actionObject[11] = currentlayer.width;//-3
+ actionObject[12] = currentlayer.height;//-2
+ actionObject[13] = this.currentlayer.name;//-1
+ if ($debug)
+ Debug.write("registerFinal :: ", actionObject);
+ this.baseactionobjectList.push(actionObject);
+ this.onsharedMessage('draw', actionObject);
+ </method>
- <method name="paintactionHistory" args="lastActionObject,parentView">
- <![CDATA[
- if ($debug) Debug.write("## paintactionHistory",parentView,"
opacity:",lastActionObject[5]);
-
- this.currentlayer = new lz.drawViewNew(parentView,{
- name:lastActionObject[lastActionObject.length-1],
- x:lastActionObject[lastActionObject.length-5],
- y:lastActionObject[lastActionObject.length-4],
- width:lastActionObject[lastActionObject.length-3],
- height:lastActionObject[lastActionObject.length-2],
- opacity:lastActionObject[5]});
-
- this.currentlayer.fillstyle = lastActionObject[2];
- this.currentlayer.lineWidth = lastActionObject[3];
- this.currentlayer.strokeStyle = lastActionObject[4];
-
- for (var eg=0;eg<lastActionObject[1].length;eg++)
-
this.drawline(lastActionObject[1][eg][1],lastActionObject[1][eg][2],lastActionObject[1][eg][3],lastActionObject[1][eg][4]);
-
- //this.currentlayer.setAttribute('stretches','both');
-
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-7]);
- ]]>
- </method>
-
-</class>
+ <method name="paintactionHistory"
args="lastActionObject,parentView">
+ <![CDATA[
+ if ($debug)
+ Debug.write("## paintactionHistory", parentView, "
opacity:",
+ lastActionObject[5]);
+
+ var tmpCurrentlayer = new lz.drawViewNew(parentView, {
+ name :
lastActionObject[lastActionObject.length - 1],
+ x :
lastActionObject[lastActionObject.length - 5],
+ y :
lastActionObject[lastActionObject.length - 4],
+ width :
lastActionObject[lastActionObject.length - 3],
+ height :
lastActionObject[lastActionObject.length - 2],
+ opacity : lastActionObject[5]
+ });
+
+ tmpCurrentlayer.fillstyle = lastActionObject[2];
+ tmpCurrentlayer.lineWidth = lastActionObject[3];
+ tmpCurrentlayer.strokeStyle = lastActionObject[4];
+
+ for (var eg = 0; eg < lastActionObject[1].length; eg++)
+ this.drawlineOnObject(tmpCurrentlayer,
+ lastActionObject[1][eg][1],
lastActionObject[1][eg][2],
+ lastActionObject[1][eg][3],
lastActionObject[1][eg][4]);
+
+ //tmpCurrentlayer.setAttribute('stretches','both');
+ this.doSWFDocumentStatus(tmpCurrentlayer,
+
lastActionObject[lastActionObject.length - 7]);
+ ]]>
+ </method>
+
+ </class>
</library>
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
Fri Sep 9 12:26:53 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
Mon Nov 7 10:31:59 2011
@@ -121,22 +121,22 @@
</method>
<method name="drawrectangleToHistory"
args="lastActionObject,parentView">
- this.currentlayer = new lz.drawViewNew(parentView,{
+ var tmpCurrentlayer = new lz.drawViewNew(parentView,{
name:lastActionObject[lastActionObject.length-1],
x:lastActionObject[lastActionObject.length-5],
y:lastActionObject[lastActionObject.length-4],
width:lastActionObject[lastActionObject.length-3],
height:lastActionObject[lastActionObject.length-2],
opacity:lastActionObject[6]});
- new lz.drawViewInner(this.currentlayer,{
+ new lz.drawViewInner(tmpCurrentlayer,{
name:'_innerRect',x:0,y:0,
width:lastActionObject[lastActionObject.length-3],
height:lastActionObject[lastActionObject.length-2]});
- this.drawrectangleHistory(this.currentlayer,0,0,
+ this.drawrectangleHistory(tmpCurrentlayer,0,0,
lastActionObject[lastActionObject.length-3],lastActionObject[lastActionObject.length-2],
lastActionObject[1],lastActionObject[2],lastActionObject[3],lastActionObject[4],lastActionObject[5]);
-
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-7]);
+
this.doSWFDocumentStatus(tmpCurrentlayer,lastActionObject[lastActionObject.length-7]);
</method>
<method name="drawrectangleHistory"
args="parentObj,x1,y1,x2,y2,stroke,line,fill,strokeDis,fillDis">
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawSelect.lzx
Tue Apr 26 02:23:02 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawSelect.lzx
Mon Nov 7 10:31:59 2011
@@ -377,22 +377,22 @@
</method>
<method name="drawSelectangleToHistory"
args="lastActionObject,parentView">
- this.currentlayer = new lz.drawViewNew(parentView,{
+ var tmpCurrentlayer = new lz.drawViewNew(parentView,{
name:lastActionObject[lastActionObject.length-1],
x:lastActionObject[lastActionObject.length-5],
y:lastActionObject[lastActionObject.length-4],
width:lastActionObject[lastActionObject.length-3],
height:lastActionObject[lastActionObject.length-2],
opacity:lastActionObject[6]});
- new lz.drawViewInner(this.currentlayer,{
+ new lz.drawViewInner(tmpCurrentlayer,{
name:'_innerSelect',x:0,y:0,
width:lastActionObject[lastActionObject.length-3],
height:lastActionObject[lastActionObject.length-2]});
- this.drawSelectangleHistory(this.currentlayer,0,0,
+ this.drawSelectangleHistory(tmpCurrentlayer,0,0,
lastActionObject[lastActionObject.length-3],lastActionObject[lastActionObject.length-2],
lastActionObject[1],lastActionObject[2],lastActionObject[3],lastActionObject[4],lastActionObject[5]);
-
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-7]);
+
this.doSWFDocumentStatus(tmpCurrentlayer,lastActionObject[lastActionObject.length-7]);
</method>
<method name="drawSelectangleHistory"
args="parentObj,x1,y1,x2,y2,stroke,line,fill,strokeDis,fillDis">
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawTriangle.lzx
Tue Apr 26 02:23:02 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawTriangle.lzx
Mon Nov 7 10:31:59 2011
@@ -180,25 +180,25 @@
</method>
<method name="drawtriangleToHistory"
args="lastActionObject,parentView">
- this.currentlayer = new lz.drawViewNew(parentView,{
+ var tmpCurrentlayer = new lz.drawViewNew(parentView,{
name:lastActionObject[lastActionObject.length-1],
x:lastActionObject[lastActionObject.length-5],
y:lastActionObject[lastActionObject.length-4],
width:lastActionObject[lastActionObject.length-3],
height:lastActionObject[lastActionObject.length-2],
opacity:lastActionObject[6]});
- new lz.drawViewInner(this.currentlayer,{
+ new lz.drawViewInner(tmpCurrentlayer,{
name:'_innerTriangle',x:0,y:0,
width:lastActionObject[lastActionObject.length-3],
height:lastActionObject[lastActionObject.length-2]});
- this.drawtriangleHistory(this.currentlayer,0,0,
+ this.drawtriangleHistory(tmpCurrentlayer,0,0,
lastActionObject[lastActionObject.length-3],lastActionObject[lastActionObject.length-2],
lastActionObject[7],lastActionObject[8], //tx1,ty1
lastActionObject[9],lastActionObject[10], //tx2,ty2
lastActionObject[11],lastActionObject[12], //tx3,ty3
lastActionObject[1],lastActionObject[2],lastActionObject[3],lastActionObject[4],lastActionObject[5]);
-
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-7]);
+
this.doSWFDocumentStatus(tmpCurrentlayer,lastActionObject[lastActionObject.length-7]);
</method>
<method name="drawtriangleHistory"
args="parentObj,x1,y1,x2,y2,tx1,ty1,tx2,ty2,tx3,ty3,stroke,line,fill,strokeDis,fillDis">
=======================================
---
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawULine.lzx
Fri Jul 1 05:21:36 2011
+++
/tags/1_8/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawULine.lzx
Mon Nov 7 10:31:59 2011
@@ -120,7 +120,7 @@
<![CDATA[
//Debug.write("## lineactionHistory",parentView," 2 ## NEW
x,y ",lastActionObject[lastActionObject.length-5],lastActionObject[lastActionObject.length-4],"
width,height: ",lastActionObject[lastActionObject.length-3],lastActionObject[lastActionObject.length-2]);
- this.currentlayer = new lz.drawViewNew(parentView,{
+ var tmpCurrentlayer = new lz.drawViewNew(parentView,{
name:lastActionObject[lastActionObject.length-1],
x:lastActionObject[lastActionObject.length-5],
y:lastActionObject[lastActionObject.length-4],
@@ -129,15 +129,15 @@
opacity:lastActionObject[3]});
//this.currentlayer.fillstyle = lastActionObject[1];
- this.currentlayer.lineWidth = lastActionObject[2];
- this.currentlayer.strokeStyle = lastActionObject[1];
-
-
this.drawline(lastActionObject[4],lastActionObject[5],lastActionObject[6],lastActionObject[7]);
+ tmpCurrentlayer.lineWidth = lastActionObject[2];
+ tmpCurrentlayer.strokeStyle = lastActionObject[1];
+
+ this.drawlineOnObject(tmpCurrentlayer,
lastActionObject[4],lastActionObject[5],lastActionObject[6],lastActionObject[7]);
//Add Layer to global Layer
- this.layers.push(this.currentlayer);
-
-
this.doSWFDocumentStatus(this.currentlayer,lastActionObject[lastActionObject.length-7]);
+ this.layers.push(tmpCurrentlayer);
+
+
this.doSWFDocumentStatus(tmpCurrentlayer,lastActionObject[lastActionObject.length-7]);
]]>
</method>
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" 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/openmeetings-dev?hl=en.
