Changeset 3795 for trunk/sources

Timestamp:

05/12/10 14:05:05 (14 years ago)

Author:

mkommend

Message:

fixed enabled state of play button in AntTrailView (ticket #893)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (3 diffs)
• HeuristicLab.Problems.ArtificialAnt.Views/3.3/AntTrailView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -66 +66 @@
           }
           ActiveViewChanged();
-          OnViewTypeChanged();
         }
       }
@@ -109 +108 @@
 
         Type defaultViewType = MainFormManager.GetDefaultViewType(Content.GetType());
-        if (!ViewCanShowContent(viewType, Content) || defaultViewType != this.ViewType) {
+        if (!ViewCanShowContent(viewType, Content)) {
           cachedViews.Clear();
-          ViewType = defaultViewType;
-          if ((viewType == null) && (viewContextMenuStrip.Items.Count > 0))  // create first available view if default view is not available
-            ViewType = (Type)viewContextMenuStrip.Items[0].Tag;
+          if (defaultViewType == null) {
+            if (viewContextMenuStrip.Items.Count > 0)  // create first available view if default view is not available
+              ViewType = (Type)viewContextMenuStrip.Items[0].Tag;
+          } else if (defaultViewType != this.ViewType)
+            ViewType = defaultViewType;
         }
         UpdateActiveMenuItem();
@@ -242 +243 @@
 
     private void viewsLabel_DoubleClick(object sender, EventArgs e) {
-      IContentView view = MainFormManager.GetMainForm<MainForm>().ShowContent(this.Content,this.ViewType);
+      IContentView view = MainFormManager.GetMainForm<MainForm>().ShowContent(this.Content, this.ViewType);
       if (view != null) {
         view.ReadOnly = this.ReadOnly;

trunk/sources/HeuristicLab.Problems.ArtificialAnt.Views/3.3/AntTrailView.cs

@@ -53 +53 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content == null) {
-        pictureBox.Image = null;
-      } else {
-        GenerateImage();
-      }
+      this.playButton.Enabled = Content != null && !Locked;
+      GenerateImage();
     }
 
     protected override void OnLockedChanged() {
-      this.playButton.Enabled = !Locked;
+      this.playButton.Enabled = Content != null && !Locked;
       base.OnLockedChanged();
     }
@@ -67 +64 @@
     private void GenerateImage() {
       animationTimer.Stop();
+      pictureBox.Image = null;
       if ((pictureBox.Width > 0) && (pictureBox.Height > 0)) {
-        if (Content == null) {
-          pictureBox.Image = null;
-          playButton.Enabled = false;
-        } else {
+        if (Content != null) {
           var nodeStack = new Stack<SymbolicExpressionTreeNode>();
           int rows = Content.World.Rows;