Merge pull request #3 from AlexandrShcherbakov/main

AntonYudintsev · web-flow · commit a61142c50ae0 · 2024-11-15T22:22:06.000+02:00
Fix crash related to clipboard text set
diff --git a/gui/Profiler.Controls/ThreadView/EventThreadView.xaml.cs b/gui/Profiler.Controls/ThreadView/EventThreadView.xaml.cs
@@ -613,7 +613,7 @@ public void CopyCallstackClipboard(object sender, RoutedEventArgs e)
 					if (sample.Path != FileLine.Empty)
 						stringCallstack += $"\t{sample.Path.File}({sample.Path.Line})\n";
 				}
-				Clipboard.SetText(stringCallstack);
+				Clipboard.SetDataObject(stringCallstack);
 			}
 		}
 
diff --git a/gui/daProfiler/Controls/FrameCapture.xaml.cs b/gui/daProfiler/Controls/FrameCapture.xaml.cs
@@ -419,7 +419,7 @@ public void CopyFunctionInfo(object sender, RoutedEventArgs e)
 					info += $"Per frame :\t|\t{Data.Utils.ConvertMsToString(stats.AvgTotalPerCall)}\t|\t{Data.Utils.ConvertMsToString(stats.P90PerCall)}\t|\t{Data.Utils.ConvertMsToString(stats.MinPerCall)}\t|\t{Data.Utils.ConvertMsToString(stats.MaxPerCall)}\t|\t{Data.Utils.ConvertMsToString(stats.StdDevPerCall)}\n";
 					stats = FunctionThreadSummaryVM.Stats;
 					info += $"Per thread:\t|\t{Data.Utils.ConvertMsToString(stats.AvgTotalPerCall)}\t|\t{Data.Utils.ConvertMsToString(stats.P90PerCall)}\t|\t{Data.Utils.ConvertMsToString(stats.MinPerCall)}\t|\t{Data.Utils.ConvertMsToString(stats.MaxPerCall)}\t|\t{Data.Utils.ConvertMsToString(stats.StdDevPerCall)}\n";
-					Clipboard.SetText(info);
+					Clipboard.SetDataObject(info);
 				}
 			}
 		}
diff --git a/gui/daProfiler/Frames/FrameInfo.xaml.cs b/gui/daProfiler/Frames/FrameInfo.xaml.cs
@@ -317,7 +317,7 @@ private void MenuSampleFunctions(object sender, RoutedEventArgs e)
 		private void TreeViewCopy_Executed(object sender, ExecutedRoutedEventArgs e)
 		{
 			TreeView tree = (TreeView)sender;
-			Clipboard.SetText(tree.SelectedItem.ToString());
+			Clipboard.SetDataObject(tree.SelectedItem.ToString());
 		}
 	}
 
diff --git a/gui/daProfiler/Properties/AssemblyInfo.cs b/gui/daProfiler/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.12.0")]
-[assembly: AssemblyFileVersion("1.0.12.0")]
+[assembly: AssemblyVersion("1.0.13.0")]
+[assembly: AssemblyFileVersion("1.0.13.0")]
diff --git a/gui/daProfiler/Views/UniqueEventsView.xaml.cs b/gui/daProfiler/Views/UniqueEventsView.xaml.cs
@@ -55,7 +55,7 @@ public void CopyUniqueInfo(object sender, RoutedEventArgs e)
 						info += $"{ue.Description}\t|\t{ue.Calls:00000}\t|\t{ue.Frames:0000}\t|\t{Data.Utils.ConvertMsToString(ue.MinTime)}\t|\t{Data.Utils.ConvertMsToString(ue.MaxTime)}\t|\t{Data.Utils.ConvertMsToString(ue.AvgCall)}\t|\t{Data.Utils.ConvertMsToString(ue.AvgFrame)}\t|\t{Data.Utils.ConvertMsToString(ue.TotalTime)}\n";
 					}
 					if (stats.Count != 0)
-						Clipboard.SetText(info);
+						Clipboard.SetDataObject(info);
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ public void CopyCallstackClipboard(object sender, RoutedEventArgs e)`
`613`	`613`	`if (sample.Path != FileLine.Empty)`
`614`	`614`	`stringCallstack += $"\t{sample.Path.File}({sample.Path.Line})\n";`
`615`	`615`	`}`
`616`		`- Clipboard.SetText(stringCallstack);`
	`616`	`+ Clipboard.SetDataObject(stringCallstack);`
`617`	`617`	`}`
`618`	`618`	`}`
`619`	`619`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ public void CopyFunctionInfo(object sender, RoutedEventArgs e)`
`419`	`419`	`info += $"Per frame :\t\|\t{Data.Utils.ConvertMsToString(stats.AvgTotalPerCall)}\t\|\t{Data.Utils.ConvertMsToString(stats.P90PerCall)}\t\|\t{Data.Utils.ConvertMsToString(stats.MinPerCall)}\t\|\t{Data.Utils.ConvertMsToString(stats.MaxPerCall)}\t\|\t{Data.Utils.ConvertMsToString(stats.StdDevPerCall)}\n";`
`420`	`420`	`stats = FunctionThreadSummaryVM.Stats;`
`421`	`421`	`info += $"Per thread:\t\|\t{Data.Utils.ConvertMsToString(stats.AvgTotalPerCall)}\t\|\t{Data.Utils.ConvertMsToString(stats.P90PerCall)}\t\|\t{Data.Utils.ConvertMsToString(stats.MinPerCall)}\t\|\t{Data.Utils.ConvertMsToString(stats.MaxPerCall)}\t\|\t{Data.Utils.ConvertMsToString(stats.StdDevPerCall)}\n";`
`422`		`- Clipboard.SetText(info);`
	`422`	`+ Clipboard.SetDataObject(info);`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`	`}`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ private void MenuSampleFunctions(object sender, RoutedEventArgs e)`
`317`	`317`	`private void TreeViewCopy_Executed(object sender, ExecutedRoutedEventArgs e)`
`318`	`318`	`{`
`319`	`319`	`TreeView tree = (TreeView)sender;`
`320`		`- Clipboard.SetText(tree.SelectedItem.ToString());`
	`320`	`+ Clipboard.SetDataObject(tree.SelectedItem.ToString());`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void CopyUniqueInfo(object sender, RoutedEventArgs e)`
`55`	`55`	`info += $"{ue.Description}\t\|\t{ue.Calls:00000}\t\|\t{ue.Frames:0000}\t\|\t{Data.Utils.ConvertMsToString(ue.MinTime)}\t\|\t{Data.Utils.ConvertMsToString(ue.MaxTime)}\t\|\t{Data.Utils.ConvertMsToString(ue.AvgCall)}\t\|\t{Data.Utils.ConvertMsToString(ue.AvgFrame)}\t\|\t{Data.Utils.ConvertMsToString(ue.TotalTime)}\n";`
`56`	`56`	`}`
`57`	`57`	`if (stats.Count != 0)`
`58`		`- Clipboard.SetText(info);`
	`58`	`+ Clipboard.SetDataObject(info);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`