Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -r22d22a0b35bb7e6e8d438e880260b39cab5f501b -rb8ff0113333e7280b4221b21f90613cb7eacd1ac --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 22d22a0b35bb7e6e8d438e880260b39cab5f501b) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision b8ff0113333e7280b4221b21f90613cb7eacd1ac) @@ -210,9 +210,7 @@ public function openLearningDesign(seq:Sequence){ trace('opening learning design...'+ seq.getLearningDesignID()); var designID:Number = seq.getLearningDesignID(); - //var designId:Number = seq._learningDesignID; - - var callback:Function = Proxy.create(this,saveDataDesignModel); + var callback:Function = Proxy.create(this,saveDataDesignModel); Application.getInstance().getComms().getRequest('authoring/author.do?method=getLearningDesignDetails&learningDesignID='+designID,callback, false); @@ -222,15 +220,44 @@ trace('returning learning design...'); trace('saving model data...'); var seq:Sequence = Sequence(monitorModel.getSequence()); - + + // clear canvas + clearCanvas(true); + _ddm.setDesign(learningDesignDTO); seq.setLearningDesignModel(_ddm); - // activite Progress movie - monitorModel.drawDesign(); + monitorModel.broadcastViewUpdate('REDRAW_CANVAS', null, monitorModel.getSelectedTab()); } /** + * Clears the design in the canvas.but leaves other state variables (undo etc..) + * @usage + * @param noWarn + * @return + */ + public function clearCanvas(noWarn:Boolean):Boolean{ + //_global.breakpoint(); + var s = false; + var ref = this; + Debugger.log('noWarn:'+noWarn,4,'clearCanvas','Monitor'); + if(noWarn){ + + _ddm = new DesignDataModel(); + //as its a new instance of the ddm,need to add the listener again + //_ddm.addEventListener('ddmUpdate',Proxy.create(this,onDDMUpdated)); + Debugger.log('noWarn2:'+noWarn,4,'clearCanvas','Monitor');//_ddm.addEventListener('ddmBeforeUpdate',Proxy.create(this,onDDMBeforeUpdate)); + //checkValidDesign(); + monitorModel.setDirty(); + return true; + }else{ + //var fn:Function = Proxy.create(ref,confirmedClearDesign, ref); + //LFMessage.showMessageConfirm(Dictionary.getValue('new_confirm_msg'), fn,null); + Debugger.log('Set design failed as old design could not be cleared',Debugger.CRITICAL,"setDesign",'Canvas'); + } + } + + /** * * @usage * @param newonOKCallback @@ -293,8 +320,4 @@ public function get ddm():DesignDataModel{ return _ddm; } - - public function get root():MovieClip{ - return _root_mc; - } } \ No newline at end of file