Changeset 7270 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization

Timestamp:

01/04/12 16:45:02 (13 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/BidirectionalLookup.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ConnectionInfo.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IConnectionInfo.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IGraphVisualizationInfo.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IShapeInfo.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ShapeInfo.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/IOperatorShapeInfo.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShape.cs (modified) (1 diff)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs (modified) (4 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfoFactory.cs (modified) (3 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/Properties/AssemblyInfo.cs.frame (modified) (2 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/BidirectionalLookup.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ConnectionInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IConnectionInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IGraphVisualizationInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IShapeInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ShapeInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/IOperatorShapeInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
     bool Collapsed { get; set; }
     string Title { get; set; }
+    string TypeName { get; set; }
     Color Color { get; set; }
     Color LineColor { get; set; }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -121 +121 @@
         }
       }
+
+      foreach (IOperatorShapeInfo shapeInfo2 in this.operatorShapeInfoMapping.SecondValues)
+        if (string.IsNullOrEmpty(shapeInfo2.TypeName)) shapeInfo2.TypeName = this.operatorShapeInfoMapping.GetBySecond(shapeInfo2).GetType().GetPrettyName();
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShape.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -38 +38 @@
     [StorableConstructor]
     protected OperatorShapeInfo(bool deserializing) : base(deserializing) { }
+
     protected OperatorShapeInfo(OperatorShapeInfo original, Cloner cloner)
       : base(original, cloner) {
@@ -45 +46 @@
       lineWidth = original.lineWidth;
       title = original.title;
+      typeName = original.typeName;
 
       //mkommend: necessary because cloning a Bitmap is not threadsafe
@@ -129 +131 @@
 
     [Storable]
+    private string typeName;
+    public string TypeName {
+      get { return this.typeName; }
+      set {
+        if (this.typeName != value) {
+          this.typeName = value;
+          this.OnChanged();
+        }
+      }
+    }
+
+    [Storable]
     private Color color;
     public Color Color {

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfoFactory.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -37 +38 @@
       operatorShapeInfo.Collapsed = true;
       operatorShapeInfo.Title = op.Name;
+      operatorShapeInfo.TypeName = op.GetType().GetPrettyName();
       operatorShapeInfo.Color = Color.LightBlue;
       operatorShapeInfo.LineWidth = 1;

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
   /// Plugin class for HeuristicLab.Operators.Views plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Operators.Views.GraphVisualization", "3.3.5.$WCREV$")]
+  [Plugin("HeuristicLab.Operators.Views.GraphVisualization", "3.3.6.$WCREV$")]
   [PluginFile("HeuristicLab.Operators.Views.GraphVisualization-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/HeuristicLab.Hive.Azure/HeuristicLab.Operators.Views.GraphVisualization/3.3/Properties/AssemblyInfo.cs.frame

@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]