Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as =================================================================== diff -u -rf5a57ac858ce03e2894f539832d05d9e44f8133a -r43fff4250a8f7d70205c6c9f0f7b967d7462d2ad --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision f5a57ac858ce03e2894f539832d05d9e44f8133a) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision 43fff4250a8f7d70205c6c9f0f7b967d7462d2ad) @@ -55,10 +55,10 @@ private static var LESSONS_X:Number = 0; private static var LESSONS_Y:Number = 55; - private static var CANVAS_X:Number = 180; - private static var CANVAS_Y:Number = 55; - private static var CANVAS_W:Number = 1000; - private static var CANVAS_H:Number = 200; + private static var MONITOR_X:Number = 240; + private static var MONITOR_Y:Number = 55; + private static var MONITOR_W:Number = 550; + private static var MONITOR_H:Number = 550; private static var WORKSPACE_X:Number = 200; private static var WORKSPACE_Y:Number = 200; @@ -93,7 +93,7 @@ //private var _ddm:DesignDataModel; private var _toolbar:Toolbar; private var _lessons:Lesson; - //private var _canvas:Canvas; + private var _monitor:Monitor; private var _workspace:Workspace; private var _comms:Communication; private var _themeManager:ThemeManager; @@ -121,7 +121,7 @@ //UI Elements private var _toolbarLoaded:Boolean; //These are flags set to true when respective element is 'loaded' - private var _canvasLoaded:Boolean; + private var _monitorLoaded:Boolean; private var _lessonsLoaded:Boolean; private var _menuLoaded:Boolean; private var _showCMItem:Boolean; @@ -138,7 +138,7 @@ * Application - Constructor */ private function Application(){ - super(); + super(this); _menuLoaded = false; _lessonsLoaded = false; _toolbarLoaded = false; @@ -340,8 +340,8 @@ case 'Lesson' : _lessonsLoaded = true; break; - case 'Canvas' : - _canvasLoaded = true; + case 'Monitor' : + _monitorLoaded = true; break; case 'LFMenuBar' : _menuLoaded = true; @@ -353,7 +353,7 @@ } //If all of them are loaded set UILoad accordingly - if(_menuLoaded && _toolbarLoaded && _lessonsLoaded){ + if(_menuLoaded && _toolbarLoaded && _lessonsLoaded && _monitorLoaded){ _UILoaded=true; } //if(_toolkitLoaded && _canvasLoaded && _menuLoaded && _toolbarLoaded){ @@ -432,11 +432,12 @@ var depth:Number = _appRoot_mc.getNextHighestDepth(); _toolbar = new Toolbar(_appRoot_mc,TOOLBAR_X,TOOLBAR_Y); _toolbar.addEventListener('load',Proxy.create(this,UIElementLoaded)); - /* - //CANVAS - _canvas = new Canvas(_appRoot_mc,depth++,CANVAS_X,CANVAS_Y,CANVAS_W,CANVAS_H); - _canvas.addEventListener('load',Proxy.create(this,UIElementLoaded)); + + //MONITOR + _monitor = new Monitor(_appRoot_mc,depth++,MONITOR_X,MONITOR_Y,MONITOR_W,MONITOR_H); + _monitor.addEventListener('load',Proxy.create(this,UIElementLoaded)); + /* //WORKSPACE _workspace = new Workspace(); //_workspace.addEventListener('load',Proxy.create(this,UIElementLoaded)); @@ -485,8 +486,8 @@ //Menu - only need to worry about width _menu_mc.setSize(w,_menu_mc._height); - //Canvas - // _canvas.setSize(w-_toolkit.width,h-CANVAS_Y); + //MONITOR + _monitor.setSize(w-_lessons.width,h-MONITOR_Y); //_toolkit.setSize(_toolkit.width,h-TOOLKIT_Y); //Toolbar @@ -573,7 +574,7 @@ /** - * get the ddm form the canvas.. this method is here as the ddm used to be stored inthe application. + * get the ddm from the canvas.. this method is here as the ddm used to be stored inthe application. * returns the the Design Data Model public function getDesignDataModel():DesignDataModel{ @@ -597,9 +598,9 @@ /** * returns the the canvas instance */ - //public function getCanvas():Canvas{ - // return _canvas; - // } + public function getMonitor():Monitor{ + return _monitor; + } public function get controlKeyPressed():String{ return _controlKeyPressed; }