Changeset 140

Timestamp:

03/08/07 22:07:04 (2 years ago)

Author:

dmoy2

Message:

Added start buttons

Files:

• TeachingSoftware/GUI/BodyOfCode_Canvas.xaml.cs (modified) (4 diffs)
• TeachingSoftware/GUI/ButtonControl.xaml (modified) (1 diff)
• TeachingSoftware/GUI/ButtonControl.xaml.cs (modified) (5 diffs)
• TeachingSoftware/GUI/Scene1.xaml.cs (modified) (5 diffs)
• TeachingSoftware/TeachingSoftware.csproj (modified) (1 diff)

TeachingSoftware/GUI/BodyOfCode_Canvas.xaml.cs

@@ -25 +25 @@
-
-        // Form Controls
+        public List<ButtonControl> myStartButtons    = new List<ButtonControl>();
-        public List<ButtonControl> myCanvasButtons   = new List<ButtonControl>();
-        public List<Arrow>         myCanvasArrows    = new List<Arrow>();
@@ -37 +38 @@
-        private List<Line>      selectionBox          = new List<Line>();
-        private List<ButtonControl> mySelectedButtons = new List<ButtonControl>();
+        
-
-        // -------------------------------------------------------------------------
@@ -82 +84 @@
-            this.Children.Add(element);
-            this.myCanvasButtons.Add(element);
+        }
+
+        public void AddStartButton(ButtonControl start)
+        {
+            this.myStartButtons.Add(start);
+            this.Children.Add(start);
-        }
-
@@ -161 +169 @@
-                }
-            }
+            foreach(ButtonControl button in this.myStartButtons) {
+                if((button.Visibility == Visibility.Visible) && (!button.HasOutgoing() && ((button.GetIncoming() != arrow) || (arrow == null))) || ((button.GetOutgoing() == arrow) && (arrow != null))) {
+                    this.CreateEllipsesForArrows(button, this.myLineSources);
+                }
+            }
-        }
-

TeachingSoftware/GUI/ButtonControl.xaml

@@ -41 +41 @@
-                        </EventTrigger>
-                </Canvas.Triggers>
+                <Image x:Name="startImage" Source="../Art/start.png" Visibility="Hidden" Width="84.09" Height="83.446"/>
+                <Image x:Name="startImageGlow" Source="../Art/start_glow.png" Visibility="Hidden" Width="84.09" Height="83.446"/>
-                <Image x:Name="ifImage" Source="../Art/triangle.png" Visibility="Hidden" Width="84.09" Height="83.446"/>
-                <Image x:Name="otherImage" Source="../Art/square.png" Visibility="Hidden" Width="84.09" Height="83.446"/>

TeachingSoftware/GUI/ButtonControl.xaml.cs

@@ -15 +15 @@
-    public enum AnchorSide { Top = 0, Bottom = 1, Left = 2, Right = 3 };
-    public enum ButtonLocation { Sidebar, Normal };
-
+, Start
-
-        public partial class ButtonControl
@@ -74 +74 @@
-                }
-
+        // ------------------------------------------
+        // ButtonControl()
+        // Copy Constructor
+        // Params:
+        //    sourceButton - Button to Copy data from
+        // ------------------------------------------
+        public ButtonControl(ButtonControl sourceButton, ButtonControl newParent)
+        {
+            // Initialize Stuff
+                        this.InitializeComponent();
+
+            SetLocation(sourceButton.myLocation);
+            this.myParentWindow  = sourceButton.myParentWindow;
+            this.myParent        = newParent;
+            this.Background      = Brushes.White;
+            this.Foreground      = Brushes.Black;
+            this.myType          = sourceButton.myType;
+            this.myShape.Content = sourceButton.myShape.Content;
+            this.myBackendComponent = sourceButton.myBackendComponent;
+            this.RenderTransform = sourceButton.RenderTransform;
+            this.myOutgoingArrow = null;
+            this.myIncomingArrow = null;
+
+            // Event
+            this.MouseDoubleClick += new MouseButtonEventHandler(ButtonControl_MouseDoubleClick);
+            this.MouseLeftButtonDown += new MouseButtonEventHandler(this.myParentWindow.ButtonControl_MouseLeftButtonDown);
+            SetupType();
+        }
+
-        public ButtonControl GetParentView()
-        {
@@ -104 +133 @@
-        public void ButtonControl_MouseDoubleClick(object sender, MouseButtonEventArgs e)
-        {
-
+
+
+
+
+
-                this.myParentWindow.ChangeViewLevel(this);
-                DoubleAnimation expandAnimation = new DoubleAnimation(50, new Duration( new TimeSpan(0, 0, 0, 0, 500)));
@@ -131 +164 @@
-        }
-
-        // ------------------------------------------
-        // ButtonControl()
-        // Copy Constructor
-        // Params:
-        //    sourceButton - Button to Copy data from
-        // ------------------------------------------
-        public ButtonControl(ButtonControl sourceButton)
-        {
-            this.InitializeComponent();
-            this.myParentWindow        = sourceButton.myParentWindow;
-            this.Background      = sourceButton.Background;
-            this.Foreground      = sourceButton.Foreground;
-            this.myChildren      = sourceButton.myChildren;
-            this.myType          = sourceButton.myType;
-            this.myIncomingArrow = sourceButton.myIncomingArrow;
-            this.myOutgoingArrow = sourceButton.myOutgoingArrow;
-
-            SetLocation(sourceButton.myLocation);
-
-            // Event
-            this.MouseLeftButtonDown += new MouseButtonEventHandler(this.myParentWindow.ButtonControl_MouseLeftButtonDown);
-
-            SetupType();
-        }
-
-        public void Delete()
@@ -426 +435 @@
-                    break;
-
+                case ButtonType.Start:
+                    this.myImage = this.startImage;
+                    this.startImage.Visibility = Visibility.Visible;
+                    this.myOutputAnchors.Insert((int)AnchorSide.Top, new Point(GetWidth() / 2 - 5, 0));
+                    this.myOutputAnchors.Insert((int)AnchorSide.Bottom, new Point(GetWidth() / 2 - 5, GetHeight()));
+                    this.myOutputAnchors.Insert((int)AnchorSide.Left, new Point(0, GetHeight() / 2 - 5));
+                    this.myOutputAnchors.Insert((int)AnchorSide.Right, new Point(GetWidth(), GetHeight() / 2 - 5));
+                    this.myInputAnchors.Insert((int)AnchorSide.Top, new Point(GetWidth() / 2 + 5, 0));
+                    this.myInputAnchors.Insert((int)AnchorSide.Bottom, new Point(GetWidth() / 2 + 5, GetHeight()));
+                    this.myInputAnchors.Insert((int)AnchorSide.Left, new Point(0, GetHeight() / 2 + 5));
+                    this.myInputAnchors.Insert((int)AnchorSide.Right, new Point(GetWidth(), GetHeight() / 2 + 5));
+                    break;
+
-                case ButtonType.Method:
-                    this.myImage = this.methodImage;

TeachingSoftware/GUI/Scene1.xaml.cs

@@ -38 +38 @@
-                        this.InitializeComponent();
-                
+            ButtonControl myStartButton = new ButtonControl(this, ButtonType.Start, ButtonLocation.Normal, null, null);
+            myStartButton.RenderTransform = new TranslateTransform(70, 30);
+            this.Canvas_Main.AddStartButton(myStartButton);
+
-            this.ListBox_Variable.DataContext = Project.getInScopeVariables();
-            this.ListBox_Class.DataContext = Project.getProgramClasses();
@@ -54 +58 @@
-            this.ListBox_Variable.MouseLeftButtonDown += new MouseButtonEventHandler(ListBox_Variable_MouseDown);
-            this.ListBox_Variable.SelectionChanged += new SelectionChangedEventHandler(ListBox_Variable_SelectionChanged);
+        }
+
+        public bool HasStartButtonFor(ButtonControl button)
+        {
+            foreach(ButtonControl startButton in this.Canvas_Main.myStartButtons) {
+                if(startButton.GetParentView() == button) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public void AddStartButton(ButtonControl parentView)
+        {
+            ButtonControl newStart = new ButtonControl(this.Canvas_Main.myStartButtons[0], parentView);
+            this.Canvas_Main.AddStartButton(newStart);
+        }
+
+        public ButtonControl GetStartButtonForParent(ButtonControl button)
+        {
+            foreach(ButtonControl startButton in this.Canvas_Main.myStartButtons) {
+                if(startButton.GetParentView() == button) {
+                    return startButton;
+                }
+            }
+            return null;
-        }
-
@@ -67 +97 @@
-                }
-            }
+            foreach(ButtonControl button in this.Canvas_Main.myStartButtons) {
+                if(button.GetParentView() == this.myCurrentViewRoot) {
+                    button.Show();
+                }
+                else if(button != newViewRoot) {
+                    button.Hide();
+                }
+            }
-
-            if(this.myCurrentViewRoot == null) {
@@ -74 +112 @@
-                this.UpLevelButton.IsEnabled = true;
-            }
-        }
-
-        void showAnim_Completed(object sender, EventArgs e)
-        {
-            
-        }
-
@@ -194 +227 @@
-            }
-            else {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            // Set to handled

TeachingSoftware/TeachingSoftware.csproj

@@ -144 +144 @@
-    <None Include="ClassDiagram1.cd" />
-  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Art\start.png" />
+    <Resource Include="Art\start_glow.png" />
+  </ItemGroup>
-</Project>