Merge branch 'master' of https://github.com/Microsoft/automatic-graph-layout

Author: levnach

.github/workflows/agl.yml

@@ -0,0 +1,59 @@
+on:
+  push:
+     tags:
+        - v* # You will need to provide a tag of the form 'v* ...' with your push command:
+           # For example git tag -a v11 -m "bug fix" && git push origin v11
+name: Create Release
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@master
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false
+          
+  deploy:
+    runs-on: windows-latest
+    steps:
+     - name: Checkout Code
+       uses: actions/checkout@v1
+
+      
+     - name: Add msbuild to PATH
+       uses: microsoft/[email protected]
+       
+     - name: Setup NuGet
+       uses: NuGet/[email protected]
+       env:
+          ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'     
+
+     - name: Restore NuGet Packages
+       run: nuget restore GraphLayout/GraphLayout.sln
+ 
+     - name: Build agl.csproj
+       run: msbuild GraphLayout\tools\agl\agl.csproj /p:Configuration=Release /p:Platform="AnyCPU" /p:DeployOnBuild=true /p:PublishProfile=FolderProfile
+
+     - name: aglzip
+       run: 7z a agl.zip .\GraphLayout\tools\agl\bin\Release -r
+
+     - name: Upload binaries to release
+       uses: svenstaro/upload-release-action@v2
+       with:
+         repo_token: ${{ secrets.GITHUB_TOKEN }}
+         file: agl.zip
+         asset_name: agl.zip
+         tag: ${{ github.ref }}
+         overwrite: true
+         body: "The zip file of agl driver"
+

.github/workflows/build.yml

@@ -0,0 +1,34 @@
+# This workflow will do a clean build of agl, build and test the solution
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+name: Test Status
+
+jobs:
+  build:
+    name: Build    
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@master
+
+      - name: Add msbuild to PATH
+        uses: microsoft/[email protected]
+
+      - name: Restore NuGet Packages
+        run: nuget restore GraphLayout/GraphLayout.sln
+ 
+      - name: Build release agl.csproj
+        run: msbuild GraphLayout\GraphLayout.sln /p:Configuration=Release 
+
+      - name: Build debug agl.csproj
+        run: msbuild GraphLayout\GraphLayout.sln /p:Configuration=Debug
+
+      - name: Setup VSTest.exe
+        uses: Malcolmnixon/Setup-VSTest@v4
+
+      - name : Test
+        run: vstest.console GraphLayout\Test\MSAGLTests\bin\Debug\Microsoft.Msagl.UnitTests.dll

.gitignore

@@ -161,3 +161,5 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 /sh.exe.stackdump
+/node_modules
+/package-lock.json

GraphLayout/MSAGL/Miscellaneous/LayoutHelpers.cs

@@ -232,20 +232,6 @@ public static void RouteAndLabelEdges(GeometryGraph geometryGraph, LayoutAlgorit
 
 
 
-        /// <summary>
-        /// adaptes to the node boundary curve change
-        /// </summary>
-        public static void IncrementalLayout(GeometryGraph geometryGraph, Node node, SugiyamaLayoutSettings settings) {
-            if (settings == null)
-                return;
-            var engine = geometryGraph.AlgorithmData as LayeredLayoutEngine;
-
-            if (engine != null) {
-                engine.IncrementalRun(node);
-                PostRunTransform(geometryGraph, settings);
-            }
-        }
-
         static void PostRunTransform(GeometryGraph geometryGraph, SugiyamaLayoutSettings settings) {
             bool transform = !settings.Transformation.IsIdentity;
             if (transform) {

GraphLayout/Samples/EdgeDirectionTest/Form1.cs

@@ -53,8 +53,8 @@ private void viewer_MouseDown(object sender, MsaglMouseEventArgs e)
                     Node n = new Node(this.FindNewId());
                     IViewerNode iwn = gv.CreateIViewerNode(n, p, true);
                     gv.AddNode(iwn, true);
-                }
-                else if (ob is IViewerNode) {
+                    gv.ResizeNodeToLabel(n);
+                } else if (ob is IViewerNode) {
                     IViewerNode existingNode = ob as IViewerNode;
                     gv.RemoveNode(existingNode, true);
                 }