Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -rc6f80aa1171b205d2d3c52c61713b10c31cffcc4 -rb9746b5f35ddd1650881f2bc67be8c5f2dcbdc5d --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision c6f80aa1171b205d2d3c52c61713b10c31cffcc4) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision b9746b5f35ddd1650881f2bc67be8c5f2dcbdc5d) @@ -43,9 +43,7 @@ private var monitorModel:MonitorModel; // View private var monitorView:MonitorView; - private var lessonTabView:LessonTabView; private var monitorView_mc:MovieClip; - private var lessonTabView_mc:MovieClip; private var app:Application; private var _dictionary:Dictionary; @@ -82,13 +80,12 @@ monitorView.addEventListener('load',Proxy.create(this,viewLoaded)); //lessonTabView_mc = monitorView_mc. - lessonTabView = LessonTabView(lessonTabView_mc); - lessonTabView.init(monitorModel,undefined); + //dictionary.addEventListener('init',Proxy.create(this,setupPI)); //Register view with model to receive update events monitorModel.addObserver(monitorView); - monitorModel.addObserver(lessonTabView); + //monitorModel.addObserver(monitorView); //monitorModel.addObserver(monitorView); //monitorModel.addObserver(monitorView); Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as =================================================================== diff -u -r3a58c1e57842a9dbef3e8446b90710c767b4888f -rb9746b5f35ddd1650881f2bc67be8c5f2dcbdc5d --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision 3a58c1e57842a9dbef3e8446b90710c767b4888f) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision b9746b5f35ddd1650881f2bc67be8c5f2dcbdc5d) @@ -25,6 +25,7 @@ import org.lamsfoundation.lams.common.ui.* import org.lamsfoundation.lams.common.style.* import org.lamsfoundation.lams.monitoring.mv.* +import org.lamsfoundation.lams.monitoring.mv.tabviews.*; import org.lamsfoundation.lams.monitoring.*; import org.lamsfoundation.lams.common.dict.* import org.lamsfoundation.lams.common.mvc.* @@ -51,6 +52,8 @@ private var _tm:ThemeManager; + private var _monitorView_mc:MovieClip; + //Canvas clip private var _monitor_mc:MovieClip; private var monitor_scp:MovieClip; @@ -65,6 +68,11 @@ //private var _transitionPropertiesOK:Function; private var _monitorView:MonitorView; + + + private var lessonTabView:LessonTabView; + private var lessonTabView_mc:MovieClip; + //Defined so compiler can 'see' events added at runtime by EventDispatcher private var dispatchEvent:Function; public var addEventListener:Function; @@ -90,17 +98,42 @@ //if(c==undefined){ // c==defaultController(); //} + _monitorView_mc = this; + super (m, c); //Set up parameters for the grid H_GAP = 10; V_GAP = 10; + + lessonTabView_mc = _monitorView_mc.monitor_scp.attachMovie("LessonTabView", "lessonTabView_mc",DepthManager.kTop) + lessonTabView = LessonTabView(lessonTabView_mc); + + lessonTabView.init(m, c); + lessonTabView.addEventListener('load',Proxy.create(this,tabLoaded)); + + trace('lesson tab view: ' + lessonTabView_mc); + + var mm:MonitorModel = MonitorModel(m); + m.addObserver(lessonTabView); + + //setupCM(); //register to recive updates form the model //MonitorModel(m).addEventListener('update',this); MovieClipUtils.doLater(Proxy.create(this,draw)); } + private function tabLoaded(evt:Object){ + Debugger.log('viewLoaded called',Debugger.GEN,'tabLoaded','MonitorView'); + + if(evt.type=='load') { + //dispatchEvent({type:'load',target:this}); + }else { + //Raise error for unrecognized event + } + } + /** * Recieved update events from the CanvasModel. Dispatches to relevent handler depending on update.Type * @usage @@ -135,6 +168,7 @@ //for (var i in s){ trace("Item Description is : "+s._seqDescription); //} + //monitor_scp.contentPath = lessonTabView; }