Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as =================================================================== diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as (.../BranchConnector.as) (revision 60db93c549c96bad95e890f34add10c4ef9d3d2e) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as (.../BranchConnector.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -26,7 +26,8 @@ import org.lamsfoundation.lams.common.*; import org.lamsfoundation.lams.authoring.*; import org.lamsfoundation.lams.authoring.cv.*; -import org.lamsfoundation.lams.authoring.br.*; +import org.lamsfoundation.lams.authoring.br.*; +import org.lamsfoundation.lams.monitoring.mv.*; class org.lamsfoundation.lams.authoring.br.BranchConnector extends CanvasConnection { @@ -56,18 +57,15 @@ * @return */ private function draw():Void{ - - var cv:Canvas = Application.getInstance().getCanvas(); - var fromAct_mc = (branch.direction == DIR_FROM_START) ? cv.model.activeView.startHub : cv.model.getActivityMCByUIID(_branch.targetUIID); - var toAct_mc = (branch.direction == DIR_TO_END) ? cv.model.activeView.endHub : cv.model.getActivityMCByUIID(_branch.targetUIID); + var fromAct_mc = (branch.direction == DIR_FROM_START) ? model.activeView.startHub : model.getActivityMCByUIID(_branch.targetUIID); + var toAct_mc = (branch.direction == DIR_TO_END) ? model.activeView.endHub : model.getActivityMCByUIID(_branch.targetUIID); var fromOTC:Object = getFromOTC(fromAct_mc); var toOTC:Object = getToOTC(toAct_mc); + + Debugger.log("fromAct: " + fromAct_mc); - Debugger.log('fromAct_mc.getActivity().xCoord:' + fromAct_mc.getActivity().xCoord , 4, 'draw', 'BranchConnector'); - Debugger.log('offsetToCentre_x: ' + fromOTC.x, 4, 'draw', 'BranchConnector'); - _startPoint = (branch.direction == DIR_FROM_START) ? new Point(fromAct_mc._x + fromOTC.x,fromAct_mc._y + fromOTC.y) : new Point(fromAct_mc.getActivity().xCoord + fromOTC.x,fromAct_mc.getActivity().yCoord + fromOTC.y); _endPoint = (branch.direction == DIR_TO_END) ? new Point(toAct_mc._x + toOTC.x, toAct_mc._y + toOTC.y) Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r52c43a34d2db89ffb51e5f19119b700cdb23a6dc -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 52c43a34d2db89ffb51e5f19119b700cdb23a6dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -266,10 +266,10 @@ Debugger.log('adding hubs for branch activity:' + _canvasBranchingActivity,Debugger.CRITICAL,'setupConenctorHubs','org.lamsfoundation.lams.CanvasBranchView'); // start-point connector hub - cHubStart_mc = activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity,_canvasController:getController(),_canvasBranchView:_canvasBranchView, _x: activity.startXCoord , _y: activity.startYCoord, branchConnector:true}); + cHubStart_mc = activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, controller:getController(), _canvasBranchView:_canvasBranchView, _x: activity.startXCoord , _y: activity.startYCoord, branchConnector:true}); // end-point connector hub - cHubEnd_mc = activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity,_canvasController:getController(),_canvasBranchView:_canvasBranchView, _x: activity.endXCoord , _y: activity.endYCoord, branchConnector:true}); + cHubEnd_mc = activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, controller:getController(), _canvasBranchView:_canvasBranchView, _x: activity.endXCoord , _y: activity.endYCoord, branchConnector:true}); } @@ -324,7 +324,10 @@ {type:mx.transitions.Zoom, direction:1, duration:0.5, easing:mx.transitions.easing.Strong.easeIn}); - model.getCanvas().closeBranchView(); + if(model instanceof CanvasModel) + model.getCanvas().closeBranchView(); + else + model.getMonitor().closeBranchView(); if(model instanceof CanvasModel) model.getCanvas().addBin(model.activeView); @@ -333,7 +336,6 @@ } public function localOnReleaseOutside():Void{ - } private function addSequence(a:SequenceActivity, cm:CanvasModel):Boolean{ @@ -349,44 +351,47 @@ * @param cm - Refernce to the model * @return Boolean - successfullit */ - private function drawActivity(a:Activity, cm):Boolean{ + private function drawActivity(a:Activity, cm):Boolean { - Debugger.log("pnt1", Debugger.CRITICAL, "drawActivity", "CanvasBranchView"); - if(!cm.isActiveView(this)) return false; - Debugger.log("pnt2", Debugger.CRITICAL, "drawActivity", "CanvasBranchView"); - var cbv = CanvasBranchView(this); var cbc = getController(); + var fromModuleTab:String = null; + var _module = null; + if(cbc instanceof MonitorController) { + fromModuleTab = "monitorMonitorTab"; + _module = "monitoring"; + } + Debugger.log('I am in drawActivity and Activity typeID :'+a.activityTypeID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView'); //take action depending on act type if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity()){ - var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a,_canvasController:cbc,_canvasBranchView:cbv}); + var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, controller:cbc, _canvasBranchView:cbv, _module:_module}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Tool or gate activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable:'+newActivity_mc,4,'drawActivity','CanvasBranchView'); } else if (a.isGateActivity()){ - var newActivity_mc = activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kTop,{_activity:a,_canvasController:cbc,_canvasBranchView:cbv}); + var newActivity_mc = activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kTop,{_activity:a, controller:cbc, _canvasBranchView:cbv, _module:_module}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Gate activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable:'+newActivity_mc,4,'drawActivity','CanvasBranchView'); } else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE){ //get the children var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID); - var newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cbc,_canvasBranchView:cbv, _locked:a.isReadOnly()}); + var newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children, controller:cbc,_canvasBranchView:cbv, _locked:a.isReadOnly(), fromModuleTab:fromModuleTab}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Parallel activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView'); } else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){ var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID); - var newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly()}); + var newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, controller:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly(), fromModuleTab:fromModuleTab}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView'); } else if(a.isBranchingActivity()) { - var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a,_canvasController:cbc,_canvasBranchView:cbv}); + var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a, controller:cbc,_canvasBranchView:cbv, _module:_module}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Branching activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView'); @@ -453,7 +458,7 @@ var cbv = CanvasBranchView(this); var cbc = getController(); - var newTransition_mc:MovieClip = transitionLayer.createChildAtDepth("CanvasTransition",DepthManager.kTop,{_transition:t,_canvasController:cbc,_canvasBranchView:cbv}); + var newTransition_mc:MovieClip = transitionLayer.createChildAtDepth("CanvasTransition",DepthManager.kTop,{_transition:t, controller:cbc, _canvasBranchView:cbv}); cm.transitionsDisplayed.put(t.transitionUIID,newTransition_mc); Debugger.log('drawn a transition:'+t.transitionUIID+','+newTransition_mc,Debugger.GEN,'drawTransition','CanvasView'); @@ -483,8 +488,9 @@ } if(b.direction == BranchConnector.DIR_FROM_START) b.sequenceActivity.firstActivityUIID = b.targetUIID; - var newBranch_mc:MovieClip = branchLayer.createChildAtDepth("BranchConnector",DepthManager.kTop,{_branch:b,_canvasController:cbc,_canvasBranchView:cbv}); + var newBranch_mc:MovieClip = branchLayer.createChildAtDepth("BranchConnector",DepthManager.kTop,{_branch:b, controller:cbc, _canvasBranchView:cbv}); cm.branchesDisplayed.put(b.branchUIID,newBranch_mc); + Debugger.log('drawn a branch:'+b.branchUIID+','+newBranch_mc,Debugger.GEN,'drawBranch','CanvasView'); if(b.direction != BranchConnector.DIR_TO_END) { @@ -511,7 +517,7 @@ var cbv = CanvasBranchView(this); var cbc = getController(); - var newTransition_mc:MovieClip = transitionLayer.createChildAtDepth("CanvasTransition",DepthManager.kTop,{_transition:t,_canvasController:cbc,_canvasBranchView:cbv, _visible:false}); + var newTransition_mc:MovieClip = transitionLayer.createChildAtDepth("CanvasTransition",DepthManager.kTop,{_transition:t, controller:cbc, _canvasBranchView:cbv, _visible:false}); cm.transitionsDisplayed.put(t.transitionUIID,newTransition_mc); Debugger.log('drawn (hidden) a transition:'+t.transitionUIID+','+newTransition_mc,Debugger.GEN,'hideTransition','CanvasView'); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -rc5ce2369b6232db2c25a966f7873f695ebf6e485 -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision c5ce2369b6232db2c25a966f7873f695ebf6e485) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -674,5 +674,12 @@ return _canvasView.ddm; } } + + public function set controller(a):Void { + if(a instanceof CanvasController) + _canvasController = a; + else + _monitorController = a; + } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasConnection.as =================================================================== diff -u -rfac001f56e1427654498b0888139e2dcfff7f6a6 -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasConnection.as (.../CanvasConnection.as) (revision fac001f56e1427654498b0888139e2dcfff7f6a6) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasConnection.as (.../CanvasConnection.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -23,15 +23,23 @@ import org.lamsfoundation.lams.common.util.*; import org.lamsfoundation.lams.common.ui.*; -import org.lamsfoundation.lams.common.*; +import org.lamsfoundation.lams.common.*; + import org.lamsfoundation.lams.authoring.*; import org.lamsfoundation.lams.authoring.cv.*; -import org.lamsfoundation.lams.authoring.br.*; +import org.lamsfoundation.lams.authoring.br.*; + +import org.lamsfoundation.lams.monitoring.mv.*; +import org.lamsfoundation.lams.monitoring.mv.tabviews.MonitorTabView; class org.lamsfoundation.lams.authoring.cv.CanvasConnection extends MovieClip{ private var _canvasController:CanvasController; + private var _monitorController:MonitorController; + private var _canvasView:CanvasView; + private var _monitorTabView:MonitorTabView; + private var _canvasBranchView:CanvasBranchView; private var _drawnLineStyle:Number; @@ -73,9 +81,6 @@ } public function createConnection(fromAct_mc, toAct_mc, _startPoint:Point, _endPoint:Point, fromOTC:Object, toOTC:Object) { - Debugger.log('fromAct_mc:'+fromAct_mc,4,'draw','CanvasConnection'); - Debugger.log('toAct_mc:'+toAct_mc,4,'draw','CanvasConnection'); - this.lineStyle(2, _drawnLineStyle); this.moveTo(_startPoint.x, _startPoint.y); this.lineTo(_endPoint.x, _endPoint.y); @@ -192,5 +197,19 @@ _fromOTC.x = fromAct_mc.getVisibleWidth()/2; _fromOTC.y = fromAct_mc.getVisibleHeight()/2; return _fromOTC; + } + + public function set controller(a):Void { + if(a instanceof CanvasController) + _canvasController = a; + else + _monitorController = a; + } + + public function get model() { + if(_canvasController != null || _canvasController != undefined) + return org.lamsfoundation.lams.authoring.Application.getInstance().getCanvas().model; + else + return org.lamsfoundation.lams.monitoring.Application.getInstance().getMonitor().getMM(); } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== diff -u -r245728d04c9feab340685e9d94b5623e0f9a1d74 -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision 245728d04c9feab340685e9d94b5623e0f9a1d74) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -370,5 +370,12 @@ styleObj = getAssociatedStyle(); container_pnl.setStyle ('styleName', styleObj); + } + + public function set controller(a):Void { + if(a instanceof CanvasController) + _canvasController = a; + else + _monitorController = a; } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as =================================================================== diff -u -rc99ac4e72ae3c8db8627c38f7e31afd0f6e469d8 -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision c99ac4e72ae3c8db8627c38f7e31afd0f6e469d8) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -368,7 +368,13 @@ public function get children():Array { return new Array(child1_mc, child2_mc); - } - - + } + + public function set controller(a):Void { + if(a instanceof CanvasController) + _canvasController = a; + else + _monitorController = a; + } + } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as =================================================================== diff -u -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6 -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as (.../CanvasTransition.as) (revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as (.../CanvasTransition.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -63,24 +63,19 @@ * @return */ private function draw():Void{ - - var cv:Canvas = Application.getInstance().getCanvas(); var fromAct_mc; var toAct_mc; - if(_transition.mod_fromUIID != null) fromAct_mc = cv.model.getActivityMCByUIID(_transition.mod_fromUIID); - else fromAct_mc = cv.model.getActivityMCByUIID(_transition.fromUIID); + if(_transition.mod_fromUIID != null) fromAct_mc = model.getActivityMCByUIID(_transition.mod_fromUIID); + else fromAct_mc = model.getActivityMCByUIID(_transition.fromUIID); - if(_transition.mod_toUIID != null) toAct_mc = cv.model.getActivityMCByUIID(_transition.mod_toUIID); - else toAct_mc = cv.model.getActivityMCByUIID(_transition.toUIID); + if(_transition.mod_toUIID != null) toAct_mc = model.getActivityMCByUIID(_transition.mod_toUIID); + else toAct_mc = model.getActivityMCByUIID(_transition.toUIID); var fromOTC:Object = getFromOTC(fromAct_mc); var toOTC:Object = getToOTC(toAct_mc); - - Debugger.log('fromAct_mc.getActivity().xCoord:' + fromAct_mc.getActivity().xCoord , 4, 'draw', 'CanvasTransition'); - Debugger.log('offsetToCentre_x: ' + fromOTC.x, 4, 'draw', 'CanvasTransition'); - + _startPoint = new Point(fromAct_mc.getActivity().xCoord + fromOTC.x, fromAct_mc.getActivity().yCoord + fromOTC.y); _endPoint = new Point(toAct_mc.getActivity().xCoord + toOTC.x, toAct_mc.getActivity().yCoord + toOTC.y); @@ -89,21 +84,20 @@ } private function onPress():Void{ - // check double-click - var now:Number = new Date().getTime(); - Debugger.log('now - _dcStartTime:'+(now - _dcStartTime)+' Config.DOUBLE_CLICK_DELAY:'+Config.DOUBLE_CLICK_DELAY,Debugger.GEN,'onPress','CanvasTransition'); - if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){ - _doubleClicking = true; - _canvasController.transitionDoubleClick(this); - + // check double-click + var now:Number = new Date().getTime(); + Debugger.log('now - _dcStartTime:'+(now - _dcStartTime)+' Config.DOUBLE_CLICK_DELAY:'+Config.DOUBLE_CLICK_DELAY,Debugger.GEN,'onPress','CanvasTransition'); + + if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){ + _doubleClicking = true; + _canvasController.transitionDoubleClick(this); + } else { + Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasTransition'); + _doubleClicking = false; + _canvasController.transitionClick(this); + } - }else{ - Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasTransition'); - _doubleClicking = false; - _canvasController.transitionClick(this); - } - - _dcStartTime = now; + _dcStartTime = now; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -r11be58369c919ae40d1329129fdb6c2dabe27c45 -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 11be58369c919ae40d1329129fdb6c2dabe27c45) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -463,6 +463,10 @@ } + public function closeBranchView() { + monitorModel.activeView = monitorView.getMonitorTabView(); + monitorModel.currentBranchingActivity = null; + } /** * Open the Help page for the selected Tool (Canvas) Activity @@ -595,14 +599,17 @@ return monitorModel; } public function getMV():MonitorView{ - trace("Called getMV") return monitorView; } public function get ddm():DesignDataModel{ return _ddm; } + public function get model():MonitorModel { + return monitorModel; + } + public function get root():MovieClip{ return _root_mc; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -r11be58369c919ae40d1329129fdb6c2dabe27c45 -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 11be58369c919ae40d1329129fdb6c2dabe27c45) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -465,6 +465,10 @@ setDirty(); } + public function moveActivitiesToBranchSequence(activityUIID:Number, sequence:SequenceActivity):Boolean { + return true; + } + private function getLastActivityUIID(activityUIID:Number):Number { // get next activity from transition @@ -1008,7 +1012,6 @@ public function getActivityMCByUIID(UIID:Number):MovieClip{ var a_mc:MovieClip = _activitiesDisplayed.get(UIID); - //Debugger.log('UIID:'+UIID+'='+a_mc,Debugger.GEN,'getActivityMCByUIID','CanvasModel'); return a_mc; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -r11be58369c919ae40d1329129fdb6c2dabe27c45 -ra51a3578f817472254bb2e84b301122a6d8268cd --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 11be58369c919ae40d1329129fdb6c2dabe27c45) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision a51a3578f817472254bb2e84b301122a6d8268cd) @@ -347,7 +347,7 @@ newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kBottom,{_activity:a,_children:children, _monitorController:mc,_monitorTabView:mtv,fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc}); } else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){ var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID); - newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kBottom,{_activity:a,_children:children,_monitorController:mc,_monitorTabView:mtv,fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc}); + newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kBottom,{_activity:a,_children:children,_monitorController:mc,_monitorTabView:mtv, fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc}); } else if(a.isBranchingActivity()){ var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false}); } else { @@ -428,7 +428,7 @@ if(!isActivityOnLayer(mm.activitiesDisplayed.get(t.fromUIID), this.activityLayer) && !isActivityOnLayer(mm.activitiesDisplayed.get(t.toUIID), this.activityLayer)) return false; - var newTransition_mc:MovieClip = transitionLayer.createChildAtDepth("MonitorTransition",DepthManager.kTop,{_transition:t,_monitorController:mc,_monitorTabView:mtv}); + var newTransition_mc:MovieClip = transitionLayer.createChildAtDepth("CanvasTransition",DepthManager.kTop,{_transition:t,_monitorController:mc,_monitorTabView:mtv}); var trnsItems:Number = mm.transitionsDisplayed.size() if (trnsItems < mm.getTransitionKeys().length){ @@ -492,9 +492,11 @@ var cvWidth:Number = Math.max(Math.max(orig_width, span.x + hSpacing), s.w); var cvHeight:Number = Math.max(Math.max(orig_height, span.y + vSpacing), s.h); - bkg_pnl.setSize(cvWidth,cvHeight); + bkg_pnl.setSize(cvWidth, cvHeight); bkg_pnl.redraw(true); + transparentCover.setSize(cvWidth, cvHeight); + //Create the grid. The grid is re-drawn each time the canvas is resized. var grid_mc = Grid.drawGrid(gridLayer,Math.round(cvWidth),Math.round(cvHeight), V_GAP, H_GAP); gridLayer.redraw(true); Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r3f1fc7bcf2f21a867db18a2ef7db179cfa8ac212 -ra51a3578f817472254bb2e84b301122a6d8268cd Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r3f1fc7bcf2f21a867db18a2ef7db179cfa8ac212 -ra51a3578f817472254bb2e84b301122a6d8268cd Binary files differ