clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-06 21:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

analyze: plot: place the text on the side with most space

Browse Source 
Set the width of the svg to always fit the longest string
while taking its starting position into consideration.

Place the text on the right while the starting point is
in the first half of the screen. After that we put it on
the left to save the svg from being wider that it has to.
This commit is contained in:
Thomas Hindoe Paaboel Andersen
2014-02-23 12:01:39 +00:00
committed by Colin Guthrie
parent ce33b14b1d
commit 14934e15ab
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/analyze/systemd-analyze.c
+17 -12
View File
@@ -462,7 +462,7 @@ static int analyze_plot(DBusConnection *bus) {
m++;
for (u = times; u < times + n; u++) {
double len;
double text_start, text_width;
if (u->ixt < boot->userspace_time ||
u->ixt > boot->finish_time) {
@@ -470,10 +470,14 @@ static int analyze_plot(DBusConnection *bus) {
u->name = NULL;
continue;
}
len = ((boot->firmware_time + u->ixt) * SCALE_X)
+ (10.0 * strlen(u->name));
if (len > width)
width = len;
/* If the text cannot fit on the left side then
* increase the svg width so it fits on the right.
* TODO: calculate the text width more accurately */
text_width = 8.0 * strlen(u->name);
text_start = (boot->firmware_time + u->ixt) * SCALE_X;
if (text_width > text_start && text_width + text_start > width)
width = text_width + text_start;
if (u->iet > u->ixt && u->iet <= boot->finish_time
&& u->aet == 0 && u->axt == 0)
@@ -561,7 +565,7 @@ static int analyze_plot(DBusConnection *bus) {
svg_bar("active", boot->userspace_time, boot->finish_time, y);
svg_bar("generators", boot->generators_start_time, boot->generators_finish_time, y);
svg_bar("unitsload", boot->unitsload_start_time, boot->unitsload_finish_time, y);
svg_text("left", boot->userspace_time, y, "systemd");
svg_text(true, boot->userspace_time, y, "systemd");
y++;
for (u = times; u < times + n; u++) {
@@ -575,7 +579,8 @@ static int analyze_plot(DBusConnection *bus) {
svg_bar("active", u->aet, u->axt, y);
svg_bar("deactivating", u->axt, u->iet, y);
b = u->ixt * SCALE_X > width * 2 / 3;
/* place the text on the left if we have passed the half of the svg width */
b = u->ixt * SCALE_X < width / 2;
if (u->time)
svg_text(b, u->ixt, y, "%s (%s)",
u->name, format_timespan(ts, sizeof(ts), u->time, USEC_PER_MSEC));
@@ -587,19 +592,19 @@ static int analyze_plot(DBusConnection *bus) {
/* Legend */
y++;
svg_bar("activating", 0, 300000, y);
svg_text("right", 400000, y, "Activating");
svg_text(true, 400000, y, "Activating");
y++;
svg_bar("active", 0, 300000, y);
svg_text("right", 400000, y, "Active");
svg_text(true, 400000, y, "Active");
y++;
svg_bar("deactivating", 0, 300000, y);
svg_text("right", 400000, y, "Deactivating");
svg_text(true, 400000, y, "Deactivating");
y++;
svg_bar("generators", 0, 300000, y);
svg_text("right", 400000, y, "Generators");
svg_text(true, 400000, y, "Generators");
y++;
svg_bar("unitsload", 0, 300000, y);
svg_text("right", 400000, y, "Loading unit files");
svg_text(true, 400000, y, "Loading unit files");
y++;
svg("</g>\n\n");