Extend ToolTip Text in TreeMapViewModel.cs

src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml

@@ -169,7 +169,7 @@
 							Background="AliceBlue"
 							BorderBrush="Black"
 							BorderThickness="1">
-							<StackPanel ToolTip="{Binding NumericValue}">
+							<StackPanel ToolTip="{Binding ToolTipString}">
 								<TextBlock
 									Text="{Binding DeclaringType.Name}" />
 								<TextBlock

src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/BaseQuery.cs

@@ -21,6 +21,13 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 		{
 			MainModule = mainModule;
 		}
+		protected string NameSpaceCount = "No of Namespaces";
+		protected string InstructionsCount = "No of Instructions";
+		protected string Complexity = "Complexity";
+		protected string MethodsCount = "No of Methods";
+		protected string FieldsCount = "No of Fields";
+		protected string VariablesCount = "No of Variables";
+		protected string TypesCount = "No of Types";
 		
 		protected Module MainModule {get; private set;}
 	
@@ -35,11 +42,6 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 		
 		protected List<TreeMapViewModel> EliminateZeroValues(IEnumerable<TreeMapViewModel> list)
 		{
-			
-//			var zeros =  from v in list
-//				where v.NumericValue == 0
-//				select v;
-			
 			var filtered =  from viewModel in list
 				where viewModel.NumericValue > 0
 				select viewModel;
@@ -48,5 +50,13 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			RemovedElements = TotalElements - result.Count();
 			return result;
 		}
+		
+		
+		protected void SetToolstripText (IEnumerable<TreeMapViewModel> list,string tooltipText)
+		{
+			foreach (var element in list) {
+				element.ToolTipString = string.Format("{0} <{1}>",tooltipText , element.NumericValue);
+			}
+		}
 	}
 }

src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/QueryAssembly.cs

@@ -29,9 +29,11 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                     	Description = "# of NameSpaces",
 			                     	Action = ExecuteNotImplemented
 			                     });
+			
 			return items;
 		}
 		
+		
 		private List<TreeMapViewModel> ExecuteNotImplemented()
 		{
 			MessageService.ShowMessage("Not Implemented yet","CodeQualityAnalysis");

src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/QueryMethod.cs

@@ -71,7 +71,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               });
 
 			var filtered = base.EliminateZeroValues(list);
-			Console.WriteLine("{0} - {1} - {2}",intermediate.Count,list.Count(),filtered.Count());
+			base.SetToolstripText(filtered,base.InstructionsCount);
 			return filtered.ToList();
 		}
 		
@@ -86,7 +86,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               	NumericValue = m.CyclomaticComplexity
 			                               });
 			var filtered = base.EliminateZeroValues(list);
-			Console.WriteLine("{0} - {1} - {2}",intermediate.Count,list.Count(),filtered.Count());
+			base.SetToolstripText(filtered,base.Complexity);
 			return filtered.ToList();
 		}
 	
@@ -101,7 +101,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               	NumericValue =  m.Variables
 			                               });
 			var filtered = base.EliminateZeroValues(list);
-			Console.WriteLine("{0} - {1} - {2}",intermediate.Count,list.Count(),filtered.Count());
+			base.SetToolstripText(filtered,base.VariablesCount);
 			return filtered.ToList();
 		}
 	}

src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/QueryNameSpace.cs

@@ -41,18 +41,18 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			items.Add(new ItemWithFunc()
 			                     {
 			                     	Description = "# of Methods",
-			                     	Action = MethodsCount
+			                     	Action = ExecuteMethodsCount
 			                     });
 			items.Add(new ItemWithFunc()
 			                     {
 			                     	Description = "# of Fields",
-			                     	Action = FieldsCount
+			                     	Action = ExecuteFieldsCount
 			                     });
 			
 			items.Add(new ItemWithFunc()
 			                     {
 			                     	Description = "# of Types",
-			                     	Action = TypesCount
+			                     	Action = ExecuteTypesCount
 			                     });
 			return items;
 		}
@@ -68,11 +68,12 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               	NumericValue = m.GetAllMethods().Aggregate(i, (current, x) => current + x.Instructions.Count)
 			                               });
 			var filtered = base.EliminateZeroValues(list);
+			base.SetToolstripText (filtered,base.InstructionsCount);
 			return filtered.ToList();
 		}
 		
 		
-		private List<TreeMapViewModel> MethodsCount()
+		private List<TreeMapViewModel> ExecuteMethodsCount()
 		{
 			var intermediate = this.NameSpaceQuery();
 			
@@ -82,11 +83,12 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               	NumericValue = m.GetAllMethods().ToList().Count
 			                               });
 			var filtered = base.EliminateZeroValues(list);
+			base.SetToolstripText (filtered,base.MethodsCount);
 			return filtered.ToList();
 		}
 		
 		
-		private List<TreeMapViewModel> FieldsCount()
+		private List<TreeMapViewModel> ExecuteFieldsCount()
 		{
 			var intermediate = this.NameSpaceQuery();
 			var list = intermediate.Select(m =>  new TreeMapViewModel()
@@ -95,11 +97,12 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               	NumericValue = m.GetAllFields().ToList().Count
 			                               });
 			var filtered = base.EliminateZeroValues(list);
+			base.SetToolstripText (filtered,base.FieldsCount);
 			return filtered.ToList();
 		}
 		
 		
-		private List<TreeMapViewModel> TypesCount()
+		private List<TreeMapViewModel> ExecuteTypesCount()
 		{
 			var intermediate = this.NameSpaceQuery();
 			
@@ -109,6 +112,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               	NumericValue = m.GetAllTypes().ToList().Count
 			                               });
 			var filtered = base.EliminateZeroValues(list);
+			base.SetToolstripText (filtered,base.TypesCount);
 			return filtered.ToList();
 		}
 	}

src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/QueryType.cs

@@ -69,9 +69,10 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			var list = intermediate.Select(m =>  new TreeMapViewModel()
 			                               {
 			                               	Name = m.Name,
-			                               	NumericValue = m.GetAllMethods().Aggregate(i, (current, x) => current + x.Instructions.Count)
+			                               	NumericValue = m.GetAllMethods().Aggregate(i, (current, x) => current + x.Instructions.Count),
 			                               });
 			var filtered = base.EliminateZeroValues(list);
+			base.SetToolstripText (filtered,base.InstructionsCount);
 			return filtered.ToList();
 		}
 		
@@ -86,7 +87,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               	NumericValue = m.GetAllMethods().Aggregate(i, (current, x) => current + x.CyclomaticComplexity)
 			                               });
 			var filtered = base.EliminateZeroValues(list);
-			Console.WriteLine("{0} - {1} - {2}",intermediate.Count,list.Count(),filtered.Count());
+			base.SetToolstripText (filtered,base.Complexity);
 			return filtered.ToList();
 		}
 		
@@ -101,7 +102,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               });
 		
 			var filtered = base.EliminateZeroValues(list);
-			Console.WriteLine("{0} - {1} - {2}",intermediate.Count,list.Count(),filtered.Count());
+			base.SetToolstripText (filtered,base.MethodsCount);
 			return filtered.ToList();
 		}
 		
@@ -115,7 +116,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 			                               	NumericValue = m.GetAllFields().ToList().Count
 			                               });
 			var filtered = base.EliminateZeroValues(list);
-			Console.WriteLine("{0} - {1} - {2}",intermediate.Count,list.Count(),filtered.Count());
+			base.SetToolstripText (filtered,base.FieldsCount);
 			return filtered.ToList();
 		}
 	}

src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/TreeMapViewModel.cs

@@ -17,5 +17,6 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
 	{
 		public string Name {get;set;}
 		public int  NumericValue {get;set;}
+		public string ToolTipString {get;set;}
 	}
 }