Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as,v diff -u -r1.31 -r1.32 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as 9 Nov 2007 04:10:48 -0000 1.31 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as 12 Nov 2007 08:29:24 -0000 1.32 @@ -320,7 +320,7 @@ if (!_pi.isPIExpanded()){ _canvasModel.setPIHeight(_pi.piFullHeight()); } - } else if (ca.activity.parentUIID != null && parentAct.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE && (ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE)){ + } else if (ca.activity.parentUIID != null && parentAct.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE && (ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SEQUENCE_ACTIVITY_TYPE)){ if (!_pi.isPIExpanded()){ _canvasModel.setPIHeight(_pi.piFullHeight()); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as,v diff -u -r1.35 -r1.36 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as 7 Nov 2007 07:54:54 -0000 1.35 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as 12 Nov 2007 08:29:24 -0000 1.36 @@ -218,15 +218,15 @@ setSelectedItem(_activitiesDisplayed.get(branchingActivity.activityUIID)); } - public function createNewSequenceActivity(parent){ + public function createNewSequenceActivity(parent, orderID){ Debugger.log('Running...',Debugger.GEN,'createNewSequenceActivity','CanvasModel'); var seqAct = new SequenceActivity(_cv.ddm.newUIID()); seqAct.title = Dictionary.getValue('sequence_act_title'); seqAct.learningDesignID = _cv.ddm.learningDesignID; seqAct.groupingSupportType = Activity.GROUPING_SUPPORT_OPTIONAL; seqAct.activityCategoryID = Activity.CATEGORY_SYSTEM; - seqAct.orderID = 1; + seqAct.orderID = (orderID != null || orderID != undefined) ? orderID : 1; seqAct.stopAfterActivity = true; if(parent != null) { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as,v diff -u -r1.7 -r1.8 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as 9 Nov 2007 04:10:48 -0000 1.7 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as 12 Nov 2007 08:29:24 -0000 1.8 @@ -41,9 +41,9 @@ public static var ACT_TYPE:Number = 0; public static var SEQ_TYPE:Number = 1; - private var CHILD_OFFSET_X : Number = 8; - private var CHILD_OFFSET_Y : Number = 57; - private var CHILD_INCRE : Number = 60; + private var CHILD_OFFSET_X:Number = 8; + private var CHILD_OFFSET_Y:Number = 57; + private var CHILD_INCRE:Number = 60; private var newContainerXCoord:Number; private var newContainerYCoord:Number; @@ -174,9 +174,9 @@ showStatus(false); - CHILD_OFFSET_X = 8; - CHILD_OFFSET_Y = 57; - + CHILD_OFFSET_X = 4; + CHILD_OFFSET_Y = 48; + CHILD_INCRE = 50; removeAllChildren(); children_mc = new Array(); @@ -300,7 +300,10 @@ container_pnl._height = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE); } else { container_pnl._height = CHILD_OFFSET_Y + CHILD_INCRE; - } + } + + if(_type == SEQ_TYPE) + container_pnl._height += 10; _x = _activity.xCoord; _y = _activity.yCoord; @@ -406,7 +409,6 @@ } private function getAssociatedStyle():Object{ - trace("Category ID for Activity "+_activity.title +": "+_activity.activityCategoryID) var styleObj:Object = new Object(); switch (String(_activity.activityCategoryID)){ case '0' : Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as,v diff -u -r1.1 -r1.2 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as 9 Nov 2007 04:10:48 -0000 1.1 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as 12 Nov 2007 08:29:24 -0000 1.2 @@ -42,13 +42,13 @@ */ class org.lamsfoundation.lams.authoring.cv.CanvasSequenceActivity extends MovieClip implements ICanvasActivity{ - public static var TOOL_ACTIVITY_WIDTH:Number = 123.1; - public static var TOOL_ACTIVITY_HEIGHT:Number = 50.5; + public static var TOOL_ACTIVITY_WIDTH:Number = 136; + public static var TOOL_ACTIVITY_HEIGHT:Number = 55.5; public static var ICON_WIDTH:Number = 25; public static var ICON_HEIGHT:Number = 25; - private var CHILD_OFFSET_X : Number = 8; - private var CHILD_OFFSET_Y : Number = 57; + private var CHILD_OFFSET_X : Number = 2; + private var CHILD_OFFSET_Y : Number = 50.5; private var CHILD_INCRE : Number = 60; //this is set by the init object @@ -91,7 +91,6 @@ private var clickTarget_mc:MovieClip; private var canvasActivity_mc:MovieClip; - private var canvasActivityGrouped_mc:MovieClip; private var _dcStartTime:Number = 0; private var _doubleClicking:Boolean; @@ -120,8 +119,8 @@ //let it wait one frame to set up the components. //this has to be set b4 the do later :) - _visibleHeight = CanvasActivity.TOOL_ACTIVITY_HEIGHT; - _visibleWidth = CanvasActivity.TOOL_ACTIVITY_WIDTH; + _visibleHeight = CanvasSequenceActivity.TOOL_ACTIVITY_HEIGHT; + _visibleWidth = CanvasSequenceActivity.TOOL_ACTIVITY_WIDTH; _base_mc = this; @@ -198,7 +197,6 @@ icon_mc._visible = isVisible; canvasActivity_mc._visible = isVisible; clickTarget_mc._visible = isVisible; - canvasActivityGrouped_mc._visible = isVisible; fade_mc._visible = isVisible; } @@ -218,16 +216,12 @@ public function setSelected(isSelected){ Debugger.log(_activity.title+" isSelected:"+isSelected,4,'setSelected','CanvasActivity'); - var MARGIN = 5; + //var MARGIN = 5; if(isSelected){ //draw a selected border - var tgt_mc; - if(_activity.groupingUIID > 0){ - tgt_mc = canvasActivityGrouped_mc; - }else{ - tgt_mc = canvasActivity_mc; - } + /** var tgt_mc; + tgt_mc = canvasActivity_mc; Debugger.log("tgt_mc:"+tgt_mc,4,'setSelected','CanvasActivity'); @@ -254,19 +248,19 @@ Draw.dashTo(_selected_mc,tr_x,tr_y,br_x,br_y,2,3,2,color); Draw.dashTo(_selected_mc,br_x,br_y,bl_x,bl_y,2,3,2,color); Draw.dashTo(_selected_mc,bl_x,bl_y,tl_x,tl_y,2,3,2,color); - + */ _isSelected = isSelected; } else { //hide the selected border - _selected_mc.removeMovieClip(); + //_selected_mc.removeMovieClip(); } } private function setUpActIcon(icon_mc):Void{ - icon_mc._x = (CanvasActivity.TOOL_ACTIVITY_WIDTH / 2) - (icon_mc._width / 2); - icon_mc._y = (CanvasActivity.TOOL_ACTIVITY_HEIGHT / 2) - (icon_mc._height / 2) - 6; + icon_mc._x = (_visibleWidth / 2) - (icon_mc._width / 2); + icon_mc._y = (_visibleHeight / 2) - (icon_mc._height / 2) - 6; } /** @@ -311,18 +305,18 @@ theIcon_mc._visible = true; } + //canvasActivity_mc._width = _visibleWidth; + //canvasActivity_mc._height = _visibleHeight; + //chose the background mc - if(_activity.groupingUIID > 0){ - canvasActivityGrouped_mc._visible = true; - canvasActivity_mc._visible = false; - }else{ - canvasActivity_mc._visible = true; - canvasActivityGrouped_mc._visible = false; - } - - clickTarget_mc._width = TOOL_ACTIVITY_WIDTH; - clickTarget_mc._height = TOOL_ACTIVITY_HEIGHT; + canvasActivity_mc._visible = false; + act_pnl._width = _visibleWidth - 3.5; + act_pnl._height = _visibleHeight - 3.5; + + clickTarget_mc._width = _visibleWidth; + clickTarget_mc._height = _visibleHeight; + _visible = true; _x = _activity.xCoord; @@ -438,8 +432,9 @@ private function getAssociatedStyle():Object{ var styleObj:Object = new Object(); - styleObj = _tm.getStyleObject('ACTPanel'); - + + styleObj = _tm.getStyleObject('ACTPanel' + String(_activity.orderID%6)); + return styleObj; } @@ -451,33 +446,10 @@ * @return */ private function setStyles() { - /**var my_color:Color = new Color(this); - var transNegative = {ra:-100, ga:-100, ba:-100, rb:255, gb:255, bb:255}; - var transPositive = {ra:100, ga:100, ba:100, rb:0, gb:0, bb:0}; + + var styleObj = getAssociatedStyle(); + act_pnl.setStyle('styleName', styleObj); - if (bgNegative == "true"){ - my_color.setTransform(transNegative); - }else if(bgNegative == "false"){ - my_color.setTransform(transPositive); - }else if(bgNegative == "original"){ - - if (this.activity.parentUIID != null || this.activity.parentUIID != undefined){ - if (_module != "monitoring"){ - var parentAct = _canvasModel.getCanvas().ddm.getActivityByUIID(this.activity.parentUIID) - }else { - var parentAct = mm.getMonitor().ddm.getActivityByUIID(this.activity.parentUIID) - } - */ - var styleObj = getAssociatedStyle(); - act_pnl.setStyle('styleName',styleObj); - - //} else { - // styleObj = getAssociatedStyle(); - // act_pnl.setStyle('styleName',styleObj); - // } - // - //} - } private function getDDM():DesignDataModel { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as,v diff -u -r1.20 -r1.21 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as 9 Nov 2007 04:10:48 -0000 1.20 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as 12 Nov 2007 08:29:24 -0000 1.21 @@ -489,7 +489,7 @@ if(o.noSequences < noSeqAct_cmb.value) { for(var i=0; i<(noSeqAct_cmb.value - o.noSequences); i++) - _canvasModel.createNewSequenceActivity(oa); + _canvasModel.createNewSequenceActivity(oa, o.noSequences+(i-1)); } else { var itemsToRemove:Array = CanvasOptionalActivity(_canvasModel.selectedItem).getLastItems((o.noSequences - noSeqAct_cmb.value)); Debugger.log("itemsToRemove len: " + itemsToRemove.length,Debugger.CRITICAL, "updateOptionalSequenceData", "PropertyInspector"); Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as,v diff -u -r1.1 -r1.2 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as 5 Jun 2007 02:58:14 -0000 1.1 +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as 12 Nov 2007 08:29:24 -0000 1.2 @@ -347,7 +347,7 @@ ACTPanelSO.setStyle('backgroundColor', 0xC2D5FE); //Visual Element - var ACTPanelVisualElement = new VisualElement('ACTPanel',ACTPanelSO); + var ACTPanelVisualElement = new VisualElement('ACTPanel',ACTPanelSO); //add visual element to the default ACTPanelVisualElement _theme.addVisualElement(ACTPanelVisualElement); //------------------------------------------------------ @@ -644,12 +644,11 @@ if (typeof(dataObj[prop])=='number' && String(prop)!='fontSize'){ var dataVal = DecToHex(dataObj[prop]); so.setStyle(String(prop), 0+"\x"+dataVal); - trace("style parsed for "+String(prop)+ " is: "+0+"\x"+dataVal); } else { so.setStyle(String(prop), dataObj[prop]); - trace("style parsed for "+String(prop)+ " is: "+dataObj[prop]); } } + return so; }