Changeset 3441 for trunk/sources

Timestamp:

04/20/10 15:40:58 (14 years ago)

Author:

mkommend

Message:

corrected selection rectangle in RunCollectionBubbleChartView and removed filtering of datatypes in IStringConvertibleMatrix implementation of RunCollection (ticket #970)

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -81 +81 @@
       set { base.Content = value; }
     }
-    public override bool ReadOnly {
-      get { return base.ReadOnly; }
-      set { /*not needed because results are always readonly */}
-    }
 
     protected override void RegisterContentEvents() {
@@ -291 +287 @@
         HitTestResult h = this.chart.HitTest(e.X, e.Y);
         if (this.draggedRun != null && h.ChartElementType != ChartElementType.DataPoint) {
-          //this.isDragOperationInProgress = true;
+          this.isDragOperationInProgress = true;
           DataObject data = new DataObject();
           data.SetData("Type", draggedRun.GetType());

trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -90 +90 @@
       if (value == null)
         return false;
-      if (!parameterNames.Contains(name) &&
-          viewableDataTypes.Any(x => x.IsAssignableFrom(value.GetType()))) {
+      if (!parameterNames.Contains(name)) {
+        // && viewableDataTypes.Any(x => x.IsAssignableFrom(value.GetType()))) {
         parameterNames.Add(name);
         return true;
@@ -100 +100 @@
       if (value == null)
         return false;
-      if (!resultNames.Contains(name) &&
-          viewableDataTypes.Any(x => x.IsAssignableFrom(value.GetType()))) {
+      if (!resultNames.Contains(name)) {
+        // && viewableDataTypes.Any(x => x.IsAssignableFrom(value.GetType()))) {
         resultNames.Add(name);
         return true;