Changeset 2782 for trunk

Timestamp:

02/11/10 17:44:21 (15 years ago)

Author:

mkommend

Message:

added test application for netron (ticket #867)

Location:

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446

Files:

• HeuristicLab.Netron-3.0.2672.12446/Controller.cs (modified) (1 diff)
• HeuristicLab.Netron-3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446.csproj (modified) (1 diff)
• HeuristicLab.Netron-3.0.2672.12446/NetronForm.Designer.cs (added)
• HeuristicLab.Netron-3.0.2672.12446/NetronForm.cs (added)
• HeuristicLab.Netron-3.0.2672.12446/NetronTestApplication.cs (added)
• HeuristicLab.Netron-3.0.2672.12446/NetronVisualization.cs (modified) (3 diffs)
• Netron.Diagramming.Core-3.0.2672.12446/Core/Scene graph/Page.cs (modified) (1 diff)
• Netron.Diagramming.Core-3.0.2672.12446/Layout/StandardTreeLayout.cs (modified) (1 diff)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Controller.cs

@@ -19 +19 @@
       TextEditor.Show();
       return true;
-    }  
+    }
+
+    public ILayout StandardTreeLayout {
+      get {
+        return (ILayout)this.FindActivity("Standard TreeLayout");
+      }
+    }
   }
 }

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446.csproj

@@ -50 +50 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="NetronForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="NetronForm.Designer.cs">
+      <DependentUpon>NetronForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="NetronTestApplication.cs" />
     <Compile Include="NetronVisualization.cs">
       <SubType>Component</SubType>

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/NetronVisualization.cs

@@ -13 +13 @@
   [ToolboxItem(true)]
   public partial class NetronVisualization : DiagramControlBase {
+    private static Size INVALID_SIZE = new Size(-1,-1);
+    private Size oldSize;
     public NetronVisualization()
       : base() {
       InitializeComponent();
+      this.oldSize = INVALID_SIZE;
 
       SetStyle(ControlStyles.AllPaintingInWmPaint, true);
@@ -34 +37 @@
         View.OnBackColorChange += new EventHandler<ColorEventArgs>(View_OnBackColorChange);
 
-        this.SizeChanged += new EventHandler(AlgorithmVisualization_SizeChanged);
+        this.SizeChanged += new EventHandler(NetronVisualization_SizeChanged);
         this.AllowDrop = true;
       }
     }
 
-    void AlgorithmVisualization_SizeChanged(object sender, EventArgs e) {
-      Size newSize = new Size((int) (this.Size.Width * this.View.Magnification.Width),
-        (int) (this.Size.Height * this.View.Magnification.Height));
-      this.View.PageSize = newSize;
+    private void NetronVisualization_SizeChanged(object sender, EventArgs e) {
+      if (this.oldSize == INVALID_SIZE) {
+        this.View.PageSize = new Size((int)(this.Size.Width * this.Magnification.Width), (int)(this.Size.Height * this.Magnification.Height));
+        oldSize = this.Size;
+        return;
+      }
+
+      SizeF magnificationChanges = new SizeF();
+      magnificationChanges.Width = ((float)this.Size.Width) / oldSize.Width;
+      magnificationChanges.Height = ((float)this.Size.Height) / oldSize.Height;
+
+      SizeF newMagnification = new SizeF();
+      newMagnification.Width = this.View.Magnification.Width * magnificationChanges.Width;
+      newMagnification.Height = this.View.Magnification.Height * magnificationChanges.Height;
+
+      this.Magnification = newMagnification;
+      this.oldSize = this.Size;
     }
 
@@ -53 +69 @@
         Origin = new Point(Origin.X, se.NewValue);
         //System.Diagnostics.Trace.WriteLine(se.NewValue);
-      } 
+      }
     }
 

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Core/Scene graph/Page.cs

@@ -169 +169 @@
 
                 // Offset the upper-left corner by 1 inch.
-                float x = 1F * Display.DpiX;
-                float y = 1F * Display.DpiY;
+                //float x = 1F * Display.DpiX;
+                //float y = 1F * Display.DpiY;
+
+              //inserted to remove margin around the drawi-ng aera
+                float x = 0;
+                float y = 0;
 
                 RectangleF bounds = new RectangleF(x, y, width, height);

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Layout/StandardTreeLayout.cs

@@ -186 +186 @@
             get
             {
-                if (m_anchor != null)
-                {
-                    return m_anchor;
-                }
+                //if (m_anchor != null)
+                //{
+                //    return m_anchor;
+                //}
 
                 m_tmpa = PointF.Empty;