Browse Source

fixed CallCount when selecting only a small amount of datasets.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3947 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 17 years ago
parent
commit
b8d901686e
  1. 4
      src/AddIns/Misc/Profiler/Controller/Data/SQLiteCallTreeNode.cs
  2. 2
      src/AddIns/Misc/Profiler/Controller/Data/UnmanagedCallTreeNode.cs
  3. 4
      src/AddIns/Misc/Profiler/Controller/Queries/NodePath.cs
  4. 2
      src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
  5. 2
      src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfileExecutableForm.xaml

4
src/AddIns/Misc/Profiler/Controller/Data/SQLiteCallTreeNode.cs

@ -50,8 +50,8 @@ namespace ICSharpCode.Profiler.Controller.Data
/// Gets the number of calls to the method represented by the CallTreeNode. /// Gets the number of calls to the method represented by the CallTreeNode.
/// </summary> /// </summary>
public override int CallCount { public override int CallCount {
get{ get {
return this.callCount; return this.callCount + (isActiveAtStart ? 1 : 0);
} }
} }

2
src/AddIns/Misc/Profiler/Controller/Data/UnmanagedCallTreeNode.cs

@ -58,7 +58,7 @@ namespace ICSharpCode.Profiler.Controller.Data
public override int CallCount { public override int CallCount {
get { get {
dataSet.VerifyAccess(); // need to verify before deferencing data dataSet.VerifyAccess(); // need to verify before deferencing data
return this.data->CallCount; return this.data->CallCount + (IsActiveAtStart ? 1 : 0);
} }
} }

4
src/AddIns/Misc/Profiler/Controller/Queries/NodePath.cs

@ -12,7 +12,7 @@ using System.Collections.Generic;
namespace ICSharpCode.Profiler.Controller.Queries namespace ICSharpCode.Profiler.Controller.Queries
{ {
/// <summary> /// <summary>
/// Description of NodePath. /// Describes an absolute path to an CallTreeNode.
/// </summary> /// </summary>
public class NodePath : IEquatable<NodePath>, IEnumerable<int> public class NodePath : IEquatable<NodePath>, IEnumerable<int>
{ {
@ -21,7 +21,7 @@ namespace ICSharpCode.Profiler.Controller.Queries
/// </summary> /// </summary>
public static readonly NodePath Empty = new NodePath(0, null); public static readonly NodePath Empty = new NodePath(0, null);
int lastId; int lastId;
NodePath previous; NodePath previous;
/// <summary> /// <summary>

2
src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin

@ -16,7 +16,7 @@
<MenuItem <MenuItem
id="ProfileProject" id="ProfileProject"
class="ICSharpCode.Profiler.AddIn.Commands.ProfileProject" class="ICSharpCode.Profiler.AddIn.Commands.ProfileProject"
label="Profile current project ..." label="Profile current project"
/> />
</ComplexCondition> </ComplexCondition>
<MenuItem <MenuItem

2
src/AddIns/Misc/Profiler/Frontend/AddIn/Src/Dialogs/ProfileExecutableForm.xaml

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="Profile executable" WindowStartupLocation="CenterScreen" Title="Profile executable" WindowStartupLocation="CenterScreen"
WindowStyle="ToolWindow" ShowInTaskbar="False" ResizeMode="NoResize" SizeToContent="WidthAndHeight"> WindowStyle="ToolWindow" ShowInTaskbar="False" ResizeMode="NoResize" SizeToContent="WidthAndHeight">
<Grid Background="#FFD4D0C8"> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />

Loading…
Cancel
Save