Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== diff -u -r21fa6367cce27ccc69e51a10c4d627a4eb6ba872 -r0d73174a35f80e9797001ae3562d56b240afcdb8 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision 21fa6367cce27ccc69e51a10c4d627a4eb6ba872) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision 0d73174a35f80e9797001ae3562d56b240afcdb8) @@ -40,6 +40,8 @@ //class org.lamsfoundation.lams.authoring.cv.CanvasParallelActivity extends MovieClip { private var CHILD_OFFSET_X : Number = 8; private var CHILD_OFFSET_Y : Number = 57; + private var newContainerXCoord:Number; + private var newContainerYCoord:Number; private var CHILD_INCRE : Number = 60; private var learnerOffset_X:Number = 4 private var learnerOffset_Y:Number = 3 @@ -108,7 +110,7 @@ CHILD_OFFSET_X = 8; CHILD_OFFSET_Y = 57; - childActivities_mc = this; + //childActivities_mc = this; for (var j=0; j 1) { + if(numOfChildren > 1){ container_pnl._height = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE); } + _x = _activity.xCoord; _y = _activity.yCoord; + + + //dimentions of container (this) - if (_locked){ - padlockClosed_mc._visible = true; - padlockOpen_mc._visible = false; - clickTarget_mc._height = container_pnl._height; - }else{ - padlockOpen_mc._visible = true; - padlockClosed_mc._visible = false; - clickTarget_mc._height = 45; - } + setLocking(); if(fromModuleTab == "monitorMonitorTab"){ @@ -222,7 +218,28 @@ //child1_mc._visible = true; } + private function setLocking():Void{ + if (_locked){ + padlockClosed_mc._visible = true; + padlockOpen_mc._visible = false; + clickTarget_mc._height = container_pnl._height; + }else{ + padlockOpen_mc._visible = true; + padlockClosed_mc._visible = false; + clickTarget_mc._height = 45; + } + } + public function set locked(setLock:Boolean):Void { + _locked = setLock; + setLocking(); + + } + + public function get locked():Boolean { + return _locked; + } + private function localOnPress ():Void{ // check double-click @@ -274,9 +291,6 @@ public function getVisibleHeight():Number { return _visibleHeight; } - public function get locked():Boolean { - return _locked; - } public function get actChildren():Array { return _children; Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as =================================================================== diff -u -r9109ba8d5d48ca1680e99383e9eb2eea042c18e9 -r0d73174a35f80e9797001ae3562d56b240afcdb8 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 9109ba8d5d48ca1680e99383e9eb2eea042c18e9) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 0d73174a35f80e9797001ae3562d56b240afcdb8) @@ -42,8 +42,10 @@ //class org.lamsfoundation.lams.authoring.cv.CanvasParallelActivity extends MovieClip { private var CHILD_OFFSET_X:Number = 8; - private var CHILD1_OFFSET_Y:Number = 45; - private var CHILD2_OFFSET_Y:Number = 108; + private var CHILD1_OFFSET_Y:Number = 45 //67.5; + private var CHILD2_OFFSET_Y:Number = 108 //130.5; + private var newContainerXCoord:Number; + private var newContainerYCoord:Number; //this is set by the init object private var _canvasController:CanvasController; private var _canvasView:CanvasView; @@ -119,10 +121,12 @@ } //set the positioning co-ords - child1.xCoord = CHILD_OFFSET_X; + newContainerXCoord = container_pnl._width/2 + newContainerYCoord = container_pnl._height/2 + child1.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X); child1.yCoord = CHILD1_OFFSET_Y; - child2.xCoord = CHILD_OFFSET_X; - child2.yCoord = CHILD2_OFFSET_Y; + child2.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X); + child2.yCoord = CHILD2_OFFSET_Y //+ newContainerYCoord; //so now it is placed on in the IDE and we just call init if (fromModuleTab == "monitorMonitorTab"){ child1_mc.init({activity:child1,_monitorController:_monitorController,_monitorView:_monitorTabView, _module:"monitoring"}); @@ -204,9 +208,16 @@ } } //position the container (this) - _x = _activity.xCoord; - _y = _activity.yCoord; + _x = _activity.xCoord //- newContainerXCoord; + _y = _activity.yCoord + setLocking() + _visible = true; + //child1_mc._visible = true; + + } + + private function setLocking():Void{ if(_locked){ padlockClosed_mc._visible = true; padlockOpen_mc._visible = false; @@ -216,14 +227,18 @@ padlockClosed_mc._visible = false; clickTarget_mc._height = 30; } + } + + public function set locked(setLock:Boolean):Void { + _locked = setLock; + setLocking(); + } - _visible = true; - //child1_mc._visible = true; - + public function get locked():Boolean { + return _locked; } - private function localOnPress():Void{ // check double-click