Add ignore foreign includes option.

Author: awulkiew

CxxDependencyVisualizer/Graph.cs

@@ -38,6 +38,7 @@ public void AddChild(string childId)
         public List<string> parents = new List<string>();
         public int minLevel = int.MaxValue;
         public int maxLevel = int.MinValue;
+        public bool isForeign = false;
         public bool duplicatedChildren = false;
 
         public List<Node> childNodes = new List<Node>();
@@ -58,8 +59,9 @@ public LibData()
 
         public LibData(string dir, string file, bool fromLibOnly, bool ignoreComments)
         {
+            string dirPath = Util.PathFromDirFile(dir, "");
             rootPath = Util.PathFromDirFile(dir, file);
-            Analyze(dir, rootPath, null, fromLibOnly, ignoreComments);
+            Analyze(dirPath, rootPath, null, fromLibOnly, ignoreComments);
 
             foreach (var d in dict)
             {
@@ -80,17 +82,35 @@ private void Analyze(string dir, string path, string parentPath,
             }
             else
             {
+                if (!File.Exists(path))
+                {
+                    if (fromLibOnly)
+                        return;
+
+                    Node foreignNode = new Node(parentPath, level);
+                    foreignNode.isForeign = true;
+                    dict.Add(path, foreignNode);
+                    return;
+                }
+
                 if (fromLibOnly && !File.Exists(path))
                     return;
 
                 List<string> children = Util.GetIncludePaths(dir, path, ignoreComments);
                 Node data = new Node(parentPath, level);
                 foreach (string c in children)
                 {
-                    if (fromLibOnly && !File.Exists(c))
-                        continue;
+                    if (File.Exists(c))
+                    {
+                        data.AddChild(c);
+                    }
+                    else
+                    {
+                        if (fromLibOnly)
+                            continue;
 
-                    data.AddChild(c);
+                        data.AddChild(c.Substring(dir.Length));
+                    }
                 }
 
                 dict.Add(path, data);

CxxDependencyVisualizer/GraphLayout.cs

@@ -148,6 +148,10 @@ public static GraphData RadialHierarchicalLayout(string dir, Dictionary<string,
                     string path = d.Key.Substring(dirPath.Length);
                     inputNodes.Add(new DirNode.PathNodePair(path, d.Value));
                 }
+                else
+                {
+                    inputNodes.Add(new DirNode.PathNodePair(d.Key, d.Value));
+                }
             }
 
             DirNode hierarchy = DirNode.Create(inputNodes);

CxxDependencyVisualizer/MainWindow.xaml

@@ -52,8 +52,9 @@
                             <RadioButton x:Name="menu_Layout2" Content="Layout 2 (Max Level)" Margin="10,0" />
                             <RadioButton x:Name="menu_Layout3" Content="Layout 3 (Radial-Hierarchy)" Margin="10,0" />
                             <RadioButton x:Name="menu_Layout4" Content="Layout 4 (Force-Directed)" Margin="10,0" />
-                            <CheckBox x:Name="menu_IgnoreComments" Content="Ignore Comments" IsChecked="True" Margin="10,10,10,10" />
-                            <Button x:Name="buttonAnalyze" Content="Analyze" Margin="10,10,10,20"
+                            <CheckBox x:Name="menu_IgnoreForeign" Content="Ignore Foreign" IsChecked="True" Margin="10,10,10,0" />
+                            <CheckBox x:Name="menu_IgnoreComments" Content="Ignore Comments" IsChecked="True" Margin="10,10,10,0" />
+                            <Button x:Name="buttonAnalyze" Content="Analyze" Margin="10,20,10,20"
                                     Click="buttonAnalyze_Click" />
                             <CheckBox x:Name="menu_ShowLines" Content="Show Lines" Margin="10,20,10,5" Checked="menu_ShowLines_Checked" Unchecked="menu_ShowLines_Unchecked"/>
                             <Label Content="Lines Width" Margin="5,10,5,0"/>

CxxDependencyVisualizer/MainWindow.xaml.cs

@@ -85,7 +85,9 @@ private void buttonAnalyze_Click(object sender, RoutedEventArgs e)
             canvas.Children.Clear();
 
             // Analyze includes and create dictionary
-            data = new LibData(textBoxDir.Text, textBoxFile.Text, true, (bool)menu_IgnoreComments.IsChecked);
+            data = new LibData(textBoxDir.Text, textBoxFile.Text,
+                               (bool)menu_IgnoreForeign.IsChecked,
+                               (bool)menu_IgnoreComments.IsChecked);
 
             if ((bool)menu_Layout4.IsChecked)
             {
@@ -129,7 +131,9 @@ private void buttonAnalyze_Click(object sender, RoutedEventArgs e)
 
                 Border border = new Border();
                 border.BorderThickness = new Thickness(1);
-                border.BorderBrush = Brushes.Blue;
+                border.BorderBrush = d.Value.isForeign
+                                   ? Brushes.Black
+                                   : Brushes.Blue;
                 border.Child = textBlock;
                 double l = d.Value.center.X - d.Value.textBlock.Width / 2;
                 double t = d.Value.center.Y - d.Value.textBlock.Height / 2;
@@ -229,7 +233,9 @@ public void Reset(LibData data)
 
                     Border borderActive = tb.Parent as Border;
                     borderActive.BorderThickness = new Thickness(1);
-                    borderActive.BorderBrush = Brushes.Blue;
+                    borderActive.BorderBrush = d.isForeign
+                                             ? Brushes.Black
+                                             : Brushes.Blue;
                 }
                 textBlocks.Clear();