Changeset 3556

Timestamp:

04/29/10 12:59:00 (14 years ago)

Author:

mkommend

Message:

corrected drag and drop in operator graph visualization (ticket #867)

Location:

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization

Files:

• OperatorGraphView.Designer.cs (modified) (2 diffs)
• OperatorGraphView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.Designer.cs

@@ -238 +238 @@
       // OperatorGraphView
       // 
+      this.DragOver += new System.Windows.Forms.DragEventHandler(this.OperatorGraphView_DragEnterOver);
+      this.DragDrop += new System.Windows.Forms.DragEventHandler(this.OperatorGraphView_DragDrop);
+      this.DragEnter += new System.Windows.Forms.DragEventHandler(this.OperatorGraphView_DragEnterOver);
       this.AllowDrop = true;
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -244 +247 @@
       this.Name = "OperatorGraphView";
       this.Size = new System.Drawing.Size(665, 444);
-      this.DragDrop += new System.Windows.Forms.DragEventHandler(this.OperatorGraphView_DragDrop);
-      this.DragEnter += new System.Windows.Forms.DragEventHandler(this.OperatorGraphView_DragEnter);
       this.shapeContextMenu.ResumeLayout(false);
       this.splitContainer.Panel1.ResumeLayout(false);

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.cs

@@ -226 +226 @@
 
     #region drag and drop
-    private void OperatorGraphView_DragEnter(object sender, DragEventArgs e) {
+    private void OperatorGraphView_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      if (ReadOnly)
-        return;
       Type type = e.Data.GetData("Type") as Type;
-      if ((type != null) && (typeof(IOperator).IsAssignableFrom(type))) {
-        e.Effect = DragDropEffects.Copy;
+      if (!ReadOnly && (type != null) && (typeof(IOperator).IsAssignableFrom(type))) {
+        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Link;  // CTRL key        
+        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
+        else if ((e.AllowedEffect & DragDropEffects.Copy) == DragDropEffects.Copy) e.Effect = DragDropEffects.Copy;
+        else if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move) e.Effect = DragDropEffects.Move;
+        else if ((e.AllowedEffect & DragDropEffects.Link) == DragDropEffects.Link) e.Effect = DragDropEffects.Link;
       }
     }
@@ -239 +241 @@
       if (e.Effect != DragDropEffects.None) {
         IOperator op = e.Data.GetData("Value") as IOperator;
+        if ((e.Effect & DragDropEffects.Copy) == DragDropEffects.Copy) op = (IOperator)op.Clone();
         IOperatorShapeInfo shapeInfo = OperatorShapeInfoFactory.CreateOperatorShapeInfo(op);
         Point mouse = new Point(MousePosition.X, MousePosition.Y);