Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -rcd23d6049521a39924d08fcaf816e85f0a51c017 -rbfb4d9a9b1992d55a06627289b169c9188ab12ff --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision cd23d6049521a39924d08fcaf816e85f0a51c017) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision bfb4d9a9b1992d55a06627289b169c9188ab12ff) @@ -320,27 +320,32 @@ var yCoord; if (_activity.parentUIID != null) { - xCoord = (parentAct.activityTypeID == Activity.SEQUENCE_ACTIVITY_TYPE) ? _activity.xCoord : parentAct.xCoord; + var actX = _activity.xCoord; + var parentX = (mm.activeView instanceof CanvasComplexView) ? mm.activeView.openActivity._x : parentAct.xCoord; + + xCoord = (parentAct.activityTypeID == Activity.SEQUENCE_ACTIVITY_TYPE) ? actX : parentX; if(parentAct.activityTypeID != Activity.PARALLEL_ACTIVITY_TYPE && parentAct.activityTypeID != Activity.SEQUENCE_ACTIVITY_TYPE) { - xCoord = parentAct.xCoord + _activity.xCoord; - if(learner_X != null) - learner_X = (mm instanceof CanvasComplexView) ? learner_X + parentAct.xCoord : null; - - learner_Y = learner_Y + parentAct.yCoord; + xCoord = parentX + actX; + + learner_X = (learner_X != null) ? learner_X + parentX : null; + learner_Y = (mm.activeView instanceof CanvasComplexView) ? learner_Y + mm.activeView.openActivity._y : learner_Y + parentAct.yCoord; + + } else { - xCoord = parentAct.xCoord; - yCoord = parentAct.yCoord; + xCoord = parentX; + yCoord = (mm.activeView instanceof CanvasComplexView) ? mm.activeView.openActivity._y : parentAct.yCoord; - parentAct = mm.getMonitor().ddm.getActivityByUIID(parentAct.parentUIID); + var gparentAct:Activity = mm.getMonitor().ddm.getActivityByUIID(parentAct.parentUIID); - if(parentAct.isOptionsWithSequencesActivity()) { - xCoord = parentAct.xCoord + xCoord; + if(gparentAct.isOptionsWithSequencesActivity()) { + xCoord = (mm.activeView instanceof CanvasComplexView) ? xCoord + parentAct.xCoord : gparentAct.xCoord + xCoord; learner_X = (learner_X != null) ? learner_X + xCoord : null; - learner_Y = learner_Y + parentAct.yCoord + yCoord; + learner_Y = (mm.activeView instanceof CanvasComplexView) ? learner_Y + parentAct.yCoord + yCoord : learner_Y + gparentAct.yCoord + yCoord; + } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as =================================================================== diff -u -rd065d513d8d620f940a0adb75935ebc5553cc276 -rbfb4d9a9b1992d55a06627289b169c9188ab12ff --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as (.../CanvasComplexView.as) (revision d065d513d8d620f940a0adb75935ebc5553cc276) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as (.../CanvasComplexView.as) (revision bfb4d9a9b1992d55a06627289b169c9188ab12ff) @@ -163,7 +163,7 @@ activityComplexLayer = content.createEmptyMovieClip("_activityComplexLayer_mc", content.getNextHighestDepth()); activityLayer = content.createEmptyMovieClip("_activityLayer_mc", content.getNextHighestDepth()); - _learnerContainer_mc = content.createEmptyMovieClip("_learnerContainer_mc", content.getNextHighestDepth()); + _learnerContainer_mc = content.createEmptyMovieClip("_learnerContainer_mc", content.getNextHighestDepth(), {_x: 0, _y: 0}); complexViewer = content.createEmptyMovieClip("_complex_viewer_mc", content.getNextHighestDepth()); branchContent = content.createEmptyMovieClip("_branch_content_mc", DepthManager.kTopmost); Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r513ab798375077f65f9b7aff57e47548763ed4ac -rbfb4d9a9b1992d55a06627289b169c9188ab12ff Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r513ab798375077f65f9b7aff57e47548763ed4ac -rbfb4d9a9b1992d55a06627289b169c9188ab12ff Binary files differ