Changeset 89 for gssim_ui/branches/vine/gssimstudio/src/web/ui

Timestamp:

09/16/11 12:08:50 (14 years ago)

Author:

mcichenski

Message:

fixed bug with losing visible rectangle from image area

Location:

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor

Files:

• gssim/components/MultiImageNavigator.mxml (modified) (2 diffs)
• views/ExperimentEditor.mxml (modified) (3 diffs)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/gssim/components/MultiImageNavigator.mxml

@@ -118 +118 @@
                                 visibleRectangleGroup.x = tmp.horizontalScrollPosition * (this.width - visibleRectangleGroup.width) / (matrix.a * _container.width - _container.parent.width);
                                 visibleRectangleGroup.y = tmp.verticalScrollPosition * (this.height - visibleRectangleGroup.height) / (matrix.d * _container.height - _container.parent.height);
+                                validateRectanglePosition();
                         }
                         
@@ -132 +133 @@
                                 rectangle.width = this.width/numberOfScreensHorizontal;
                                 rectangle.height = this.height/numberOfScreensVertical;
+                                validateRectanglePosition();
+                        }
+                        
+                        public function validateRectanglePosition() : void
+                        {
+                                if (visibleRectangleGroup.x < 0) visibleRectangleGroup.x = 0;
+                                if (visibleRectangleGroup.y < 0) visibleRectangleGroup.y = 0;
+                                if (visibleRectangleGroup.x > this.width - rectangle.width) visibleRectangleGroup.x = this.width - rectangle.width;
+                                if (visibleRectangleGroup.y > this.height - rectangle.height) visibleRectangleGroup.y = this.height - rectangle.height;
                         }
                         

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/views/ExperimentEditor.mxml

@@ -260 +260 @@
                                                                                         <mx:Component>
                                                                                                 <mx:HBox paddingLeft="4">
-                                                                                                        <!--
-                                                                                                        -<mx:Button label="{resourceManager.getString('ExperimentEditor', 'View')}" toolTip="{resourceManager.getString('ExperimentEditor', 'ViewTooltip')}" click="outerDocument.viewWorkload()" height="30" paddingLeft="8"/>
-                                                                                                        -->
                                                                                                         <mx:Button label="{resourceManager.getString('ExperimentEditor', 'Remove')}" toolTip="{resourceManager.getString('ExperimentEditor', 'RemoveTooltip')}" click="outerDocument.removeItem(outerDocument.workloadFilesDG)" height="30"/>
                                                                                                 </mx:HBox>
@@ -285 +282 @@
                                                                                         <mx:Component>
                                                                                                 <mx:HBox paddingLeft="4">
-                                                                                                        <!--
-                                                                                                        <mx:Button label="{resourceManager.getString('ExperimentEditor', 'Load')}" toolTip="{resourceManager.getString('ExperimentEditor', 'LoadTooltip')}" click="outerDocument.loadResources()" height="30" paddingLeft="8"/>
-                                                                                                        -->
                                                                                                         <mx:Button label="{resourceManager.getString('ExperimentEditor', 'Remove')}" toolTip="{resourceManager.getString('ExperimentEditor', 'RemoveTooltip')}" click="outerDocument.removeItem(outerDocument.resourceFilesDG)" height="30"/>
                                                                                                 </mx:HBox>
@@ -309 +303 @@
                                                                                         <mx:Component>
                                                                                                 <mx:HBox paddingLeft="4">
-                                                                                                        <!--
-                                                                                                        <mx:Button label="{resourceManager.getString('ExperimentEditor', 'Load')}" toolTip="{resourceManager.getString('ExperimentEditor', 'LoadTooltip')}" click="outerDocument.loadTopology()" height="30" paddingLeft="8"/>
-                                                                                                        -->
                                                                                                         <mx:Button label="{resourceManager.getString('ExperimentEditor', 'Remove')}" toolTip="{resourceManager.getString('ExperimentEditor', 'RemoveTooltip')}" click="outerDocument.removeItem(outerDocument.topologyFilesDG)" height="30"/>
                                                                                                 </mx:HBox>