Browse Source

Tooltip in TreeMap show the numeric value the map is made from

pull/18/head
PeterForstmeier 14 years ago
parent
commit
9739235d19
  1. 2
      SharpDevelop.Tests.sln
  2. 1
      src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj
  3. 2
      src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml
  4. 36
      src/AddIns/Analysis/CodeQuality/Src/MainWindowModel.cs
  5. 7
      src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/BaseQuery.cs
  6. 26
      src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/ItemWithFunction.cs
  7. 7
      src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/QueryAssembly.cs
  8. 15
      src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/QueryMethod.cs
  9. 16
      src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/QueryNameSpace.cs
  10. 17
      src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/QueryType.cs

2
SharpDevelop.Tests.sln

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.2.0.8314-alpha
# SharpDevelop 4.2.0.8354-alpha
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection

1
src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj

@ -152,6 +152,7 @@ @@ -152,6 +152,7 @@
<Compile Include="Src\Utility\Localizeable\LocalizableDescriptionAttribute.cs" />
<Compile Include="Src\Utility\Matrix.cs" />
<Compile Include="Src\Utility\Queries\BaseQuery.cs" />
<Compile Include="Src\Utility\Queries\ItemWithFunction.cs" />
<Compile Include="Src\Utility\Queries\QueryAssembly.cs" />
<Compile Include="Src\Utility\Queries\QueryMethod.cs" />
<Compile Include="Src\Utility\Queries\QueryNameSpace.cs" />

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

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

36
src/AddIns/Analysis/CodeQuality/Src/MainWindowModel.cs

@ -33,20 +33,6 @@ namespace ICSharpCode.CodeQualityAnalysis @@ -33,20 +33,6 @@ namespace ICSharpCode.CodeQualityAnalysis
Method
}
public enum Metrics
{
[LocalizableDescription("IL Instructions")]
ILInstructions,
[LocalizableDescription("Cyclomatic Complexity")]
CyclomaticComplexity,
[LocalizableDescription("Variables")]
Variables
}
public class MainWindowViewModel :ViewModelBase
{
@ -214,7 +200,6 @@ namespace ICSharpCode.CodeQualityAnalysis @@ -214,7 +200,6 @@ namespace ICSharpCode.CodeQualityAnalysis
void ActivateMetricsExecute ()
{
// BaseQuery query = null;
itemsWithCommand.Clear();
switch (SelectedMetricsLevel) {
@ -240,12 +225,12 @@ namespace ICSharpCode.CodeQualityAnalysis @@ -240,12 +225,12 @@ namespace ICSharpCode.CodeQualityAnalysis
#region Metrics Combo > Right Combobox
List<ItemWithAction> itemsWithCommand;
List<ItemWithFunc> itemsWithCommand;
public List<ItemWithAction> ItemsWithCommand {
public List<ItemWithFunc> ItemsWithCommand {
get {
if (itemsWithCommand == null) {
itemsWithCommand = new List<ItemWithAction>();
itemsWithCommand = new List<ItemWithFunc>();
}
return itemsWithCommand;
}
@ -254,9 +239,9 @@ namespace ICSharpCode.CodeQualityAnalysis @@ -254,9 +239,9 @@ namespace ICSharpCode.CodeQualityAnalysis
base.RaisePropertyChanged(() => ItemsWithCommand);}
}
ItemWithAction selectedItemWithCommand;
ItemWithFunc selectedItemWithCommand;
public ItemWithAction SelectedItemWithCommand {
public ItemWithFunc SelectedItemWithCommand {
get { return selectedItemWithCommand; }
set { selectedItemWithCommand = value;
base.RaisePropertyChanged(() => SelectedItemWithCommand);}
@ -332,15 +317,4 @@ namespace ICSharpCode.CodeQualityAnalysis @@ -332,15 +317,4 @@ namespace ICSharpCode.CodeQualityAnalysis
#endregion
}
public class ItemWithAction
{
public ItemWithAction()
{
}
public string Description {get; set;}
public Func<List<TreeMapViewModel>> Action {get; set;}
public string Metrics {get;set;}
}
}

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

@ -27,7 +27,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries @@ -27,7 +27,7 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
public int TotalElements {get; private set;}
public int RemovedElements {get; private set;}
public virtual List<ItemWithAction> GetQueryList ()
public virtual List<ItemWithFunc> GetQueryList ()
{
return null;
}
@ -35,6 +35,11 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries @@ -35,6 +35,11 @@ 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;

26
src/AddIns/Analysis/CodeQuality/Src/Utility/Queries/ItemWithFunction.cs

@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
/*
* Created by SharpDevelop.
* User: Peter Forstmeier
* Date: 14.01.2012
* Time: 18:54
*
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Collections.Generic;
namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
{
/// <summary>
/// Description of ItemWithFunction.
/// </summary>
public class ItemWithFunc
{
public ItemWithFunc()
{
}
public string Description {get; set;}
public Func<List<TreeMapViewModel>> Action {get; set;}
public string Metrics {get;set;}
}
}

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

@ -21,13 +21,12 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries @@ -21,13 +21,12 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
{
}
public override System.Collections.Generic.List<ItemWithAction> GetQueryList()
public override System.Collections.Generic.List<ItemWithFunc> GetQueryList()
{
List<ItemWithAction> items = new List<ItemWithAction>();
items.Add(new ItemWithAction()
List<ItemWithFunc> items = new List<ItemWithFunc>();
items.Add(new ItemWithFunc()
{
Description = "# of NameSpaces",
Metrics = "Instructions.Count",
Action = ExecuteNotImplemented
});
return items;

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

@ -35,27 +35,24 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries @@ -35,27 +35,24 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
}
public override List<ItemWithAction> GetQueryList()
public override List<ItemWithFunc> GetQueryList()
{
List<ItemWithAction> items = new List<ItemWithAction>();
items.Add(new ItemWithAction()
List<ItemWithFunc> items = new List<ItemWithFunc>();
items.Add(new ItemWithFunc()
{
Description = "# of IL Instructions",
Metrics = "Instructions.Count",
Description = "# of IL Instructions",
Action = ExecuteMethodILInstructions
});
items.Add(new ItemWithAction()
items.Add(new ItemWithFunc()
{
Description = "IL Cyclomatic Complexity",
Metrics = Metrics.CyclomaticComplexity.ToString(),
Action = ExecuteMethodComplexity
});
items.Add(new ItemWithAction()
items.Add(new ItemWithFunc()
{
Description = "# of Variables",
Metrics = Metrics.Variables.ToString(),
Action = ExecuteMethodVariables
});

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

@ -30,32 +30,28 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries @@ -30,32 +30,28 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
return query.ToList();
}
public override List<ItemWithAction> GetQueryList()
public override List<ItemWithFunc> GetQueryList()
{
List<ItemWithAction> items = new List<ItemWithAction>();
items.Add(new ItemWithAction()
List<ItemWithFunc> items = new List<ItemWithFunc>();
items.Add(new ItemWithFunc()
{
Description = "# of IL Instructions",
Metrics = "Instructions.Count",
Action = ExecuteILInstructions
});
items.Add(new ItemWithAction()
items.Add(new ItemWithFunc()
{
Description = "# of Methods",
Metrics = Metrics.CyclomaticComplexity.ToString(),
Action = MethodsCount
});
items.Add(new ItemWithAction()
items.Add(new ItemWithFunc()
{
Description = "# of Fields",
Metrics = Metrics.Variables.ToString(),
Action = FieldsCount
});
items.Add(new ItemWithAction()
items.Add(new ItemWithFunc()
{
Description = "# of Types",
Metrics = Metrics.Variables.ToString(),
Action = TypesCount
});
return items;

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

@ -27,39 +27,34 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries @@ -27,39 +27,34 @@ namespace ICSharpCode.CodeQualityAnalysis.Utility.Queries
IEnumerable<Type> query = new List<Type>();
query = from ns in MainModule.Namespaces
from type in ns.Types
//from method in type.Methods
select type;
return query.ToList();
}
public override System.Collections.Generic.List<ItemWithAction> GetQueryList()
public override System.Collections.Generic.List<ItemWithFunc> GetQueryList()
{
List<ItemWithAction> items = new List<ItemWithAction>();
items.Add(new ItemWithAction()
List<ItemWithFunc> items = new List<ItemWithFunc>();
items.Add(new ItemWithFunc()
{
Description = "# of IL Instructions",
Metrics = "Instructions.Count",
Action = ExecuteILInstructions
});
items.Add(new ItemWithAction()
items.Add(new ItemWithFunc()
{
Description = "IL Cyclomatic Complexity",
Metrics = Metrics.CyclomaticComplexity.ToString(),
Action = ExecuteMethodComplexity
});
items.Add(new ItemWithAction()
items.Add(new ItemWithFunc()
{
Description = "# of Methods",
Metrics = Metrics.CyclomaticComplexity.ToString(),
Action = ExecuteNumberOfMethods
});
items.Add(new ItemWithAction()
items.Add(new ItemWithFunc()
{
Description = "# of Fields",
Metrics = Metrics.Variables.ToString(),
Action = ExecuteNumberOfFields
});

Loading…
Cancel
Save