Skip to content

Commit 9861c01

Browse files
mikakumikaku
committed
fixed the size of graphs in Multihost viewer when using a bigger 'global_zoom' value
1 parent 487d32d commit 9861c01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1188
-1017
lines changed

‎lib/ambsens.pm

+8-5
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ sub ambsens_cgi {
264264
my $colors = $cgi->{colors};
265265
my $graph = $cgi->{graph};
266266
my $silent = $cgi->{silent};
267-
my $zoom = "--zoom=" . $config->{global_zoom};
267+
my $zoom = $config->{global_zoom};
268268
my %rrd = (
269269
'new' => \&RRDs::graphv,
270270
'old' => \&RRDs::graph,
@@ -387,13 +387,16 @@ sub ambsens_cgi {
387387
# graph mode
388388
#
389389
if($silent eq "yes" || $silent eq "imagetag") {
390+
$zoom = 1; # force 'global_zoom' to 1 in Multihost viewer
390391
$colors->{fg_color} = "#000000"; # visible color for text mode
391392
$u = "_";
392393
}
393394
if($silent eq "imagetagbig") {
395+
$zoom = 1; # force 'global_zoom' to 1 in Multihost viewer
394396
$colors->{fg_color} = "#000000"; # visible color for text mode
395397
$u = "";
396398
}
399+
my $global_zoom = "--zoom=" . $zoom;
397400

398401
for($n = 0; $n < scalar(my @sl = split(',', $ambsens->{list})); $n++) {
399402
$str = $u . $package . $n . "." . $tf->{when} . ".$imgfmt_lc";
@@ -468,7 +471,7 @@ sub ambsens_cgi {
468471
"--height=$height",
469472
@extra,
470473
@riglim,
471-
$zoom,
474+
$global_zoom,
472475
@{$cgi->{version12}},
473476
@{$colors->{graph_colors}},
474477
"DEF:s1=$rrd:ambsens" . $n . "_s1:AVERAGE",
@@ -497,7 +500,7 @@ sub ambsens_cgi {
497500
@full_size_mode,
498501
@extra,
499502
@riglim,
500-
$zoom,
503+
$global_zoom,
501504
@{$cgi->{version12}},
502505
@{$colors->{graph_colors}},
503506
"DEF:s1=$rrd:ambsens" . $n . "_s1:AVERAGE",
@@ -521,8 +524,8 @@ sub ambsens_cgi {
521524
push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n]) . "\n");
522525
} else {
523526
if($version eq "new") {
524-
$picz_width = $picz->{image_width} * $config->{global_zoom};
525-
$picz_height = $picz->{image_height} * $config->{global_zoom};
527+
$picz_width = $picz->{image_width} * $zoom;
528+
$picz_height = $picz->{image_height} * $zoom;
526529
} else {
527530
$picz_width = $width + 115;
528531
$picz_height = $height + 100;

‎lib/amdenergy.pm

+8-5
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ sub amdenergy_cgi {
380380
my $colors = $cgi->{colors};
381381
my $graph = $cgi->{graph};
382382
my $silent = $cgi->{silent};
383-
my $zoom = "--zoom=" . $config->{global_zoom};
383+
my $zoom = $config->{global_zoom};
384384
my %rrd = (
385385
'new' => \&RRDs::graphv,
386386
'old' => \&RRDs::graph,
@@ -509,13 +509,16 @@ sub amdenergy_cgi {
509509
# graph mode
510510
#
511511
if($silent eq "yes" || $silent eq "imagetag") {
512+
$zoom = 1; # force 'global_zoom' to 1 in Multihost viewer
512513
$colors->{fg_color} = "#000000"; # visible color for text mode
513514
$u = "_";
514515
}
515516
if($silent eq "imagetagbig") {
517+
$zoom = 1; # force 'global_zoom' to 1 in Multihost viewer
516518
$colors->{fg_color} = "#000000"; # visible color for text mode
517519
$u = "";
518520
}
521+
my $global_zoom = "--zoom=" . $zoom;
519522

520523
my $plots_per_list_item = 1;
521524
foreach my $k (sort keys %{$amdenergy->{list}}) {
@@ -712,7 +715,7 @@ sub amdenergy_cgi {
712715
"--height=$height",
713716
@extra,
714717
@riglim,
715-
$zoom,
718+
$global_zoom,
716719
@{$cgi->{version12}},
717720
$large_plot ? () : @{$cgi->{version12_small}},
718721
@{$colors->{graph_colors}},
@@ -734,7 +737,7 @@ sub amdenergy_cgi {
734737
@full_size_mode,
735738
@extra,
736739
@riglim,
737-
$zoom,
740+
$global_zoom,
738741
@{$cgi->{version12}},
739742
$large_plot ? () : @{$cgi->{version12_small}},
740743
@{$colors->{graph_colors}},
@@ -752,8 +755,8 @@ sub amdenergy_cgi {
752755
push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * $plots_per_list_item + $n_plot], IMG => $IMG[$e * $plots_per_list_item + $n_plot]) . "\n");
753756
} else {
754757
if($version eq "new") {
755-
$picz_width = $picz->{image_width} * $config->{global_zoom};
756-
$picz_height = $picz->{image_height} * $config->{global_zoom};
758+
$picz_width = $picz->{image_width} * $zoom;
759+
$picz_height = $picz->{image_height} * $zoom;
757760
} else {
758761
$picz_width = $width + 115;
759762
$picz_height = $height + 100;

‎lib/amdgpu.pm

+8-5
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ sub amdgpu_cgi {
312312
my $colors = $cgi->{colors};
313313
my $graph = $cgi->{graph};
314314
my $silent = $cgi->{silent};
315-
my $zoom = "--zoom=" . $config->{global_zoom};
315+
my $zoom = $config->{global_zoom};
316316
my %rrd = (
317317
'new' => \&RRDs::graphv,
318318
'old' => \&RRDs::graph,
@@ -443,13 +443,16 @@ sub amdgpu_cgi {
443443
# graph mode
444444
#
445445
if($silent eq "yes" || $silent eq "imagetag") {
446+
$zoom = 1; # force 'global_zoom' to 1 in Multihost viewer
446447
$colors->{fg_color} = "#000000"; # visible color for text mode
447448
$u = "_";
448449
}
449450
if($silent eq "imagetagbig") {
451+
$zoom = 1; # force 'global_zoom' to 1 in Multihost viewer
450452
$colors->{fg_color} = "#000000"; # visible color for text mode
451453
$u = "";
452454
}
455+
my $global_zoom = "--zoom=" . $zoom;
453456

454457
for($n = 0; $n < keys(%{$amdgpu->{list}}); $n++) {
455458
for($n2 = 0; $n2 < $number_of_sensor_values_in_use; $n2++) {
@@ -712,7 +715,7 @@ sub amdgpu_cgi {
712715
"--height=$height",
713716
@extra,
714717
@riglim,
715-
$zoom,
718+
$global_zoom,
716719
@{$cgi->{version12}},
717720
$n_plot < $main_sensor_plots ? () : @{$cgi->{version12_small}},
718721
@{$colors->{graph_colors}},
@@ -734,7 +737,7 @@ sub amdgpu_cgi {
734737
@full_size_mode,
735738
@extra,
736739
@riglim,
737-
$zoom,
740+
$global_zoom,
738741
@{$cgi->{version12}},
739742
$n_plot < $main_sensor_plots ? () : @{$cgi->{version12_small}},
740743
@{$colors->{graph_colors}},
@@ -752,8 +755,8 @@ sub amdgpu_cgi {
752755
push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * $number_of_sensor_values_in_use + $n_plot], IMG => $IMG[$e * $number_of_sensor_values_in_use + $n_plot]) . "\n");
753756
} else {
754757
if($version eq "new") {
755-
$picz_width = $picz->{image_width} * $config->{global_zoom};
756-
$picz_height = $picz->{image_height} * $config->{global_zoom};
758+
$picz_width = $picz->{image_width} * $zoom;
759+
$picz_height = $picz->{image_height} * $zoom;
757760
} else {
758761
$picz_width = $width + 115;
759762
$picz_height = $height + 100;

‎lib/apache.pm

+28-25
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ sub apache_cgi {
720720
my $colors = $cgi->{colors};
721721
my $graph = $cgi->{graph};
722722
my $silent = $cgi->{silent};
723-
my $zoom = "--zoom=" . $config->{global_zoom};
723+
my $zoom = $config->{global_zoom};
724724
my %rrd = (
725725
'new' => \&RRDs::graphv,
726726
'old' => \&RRDs::graph,
@@ -827,13 +827,16 @@ sub apache_cgi {
827827
# graph mode
828828
#
829829
if($silent eq "yes" || $silent eq "imagetag") {
830+
$zoom = 1; # force 'global_zoom' to 1 in Multihost viewer
830831
$colors->{fg_color} = "#000000"; # visible color for text mode
831832
$u = "_";
832833
}
833834
if($silent eq "imagetagbig") {
835+
$zoom = 1; # force 'global_zoom' to 1 in Multihost viewer
834836
$colors->{fg_color} = "#000000"; # visible color for text mode
835837
$u = "";
836838
}
839+
my $global_zoom = "--zoom=" . $zoom;
837840

838841
for($n = 0; $n < scalar(my @al = split(',', $apache->{list})); $n++) {
839842
for($n2 = 1; $n2 <= 6; $n2++) {
@@ -903,7 +906,7 @@ sub apache_cgi {
903906
"--height=$height",
904907
@extra,
905908
@riglim,
906-
$zoom,
909+
$global_zoom,
907910
@{$cgi->{version12}},
908911
@{$colors->{graph_colors}},
909912
"DEF:apache" . $e . "_busy=$rrd:apache" . $e . "_busy:AVERAGE",
@@ -929,7 +932,7 @@ sub apache_cgi {
929932
@full_size_mode,
930933
@extra,
931934
@riglim,
932-
$zoom,
935+
$global_zoom,
933936
@{$cgi->{version12}},
934937
@{$colors->{graph_colors}},
935938
"DEF:apache" . $e . "_busy=$rrd:apache" . $e . "_busy:AVERAGE",
@@ -948,8 +951,8 @@ sub apache_cgi {
948951
push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6]) . "\n");
949952
} else {
950953
if($version eq "new") {
951-
$picz_width = $picz->{image_width} * $config->{global_zoom};
952-
$picz_height = $picz->{image_height} * $config->{global_zoom};
954+
$picz_width = $picz->{image_width} * $zoom;
955+
$picz_height = $picz->{image_height} * $zoom;
953956
} else {
954957
$picz_width = $width + 115;
955958
$picz_height = $height + 100;
@@ -1033,7 +1036,7 @@ sub apache_cgi {
10331036
"--height=$height",
10341037
@extra,
10351038
@riglim,
1036-
$zoom,
1039+
$global_zoom,
10371040
@{$cgi->{version12}},
10381041
@{$colors->{graph_colors}},
10391042
"DEF:apache" . $e . "_star=$rrd:apache" . $e . "_star:AVERAGE",
@@ -1061,7 +1064,7 @@ sub apache_cgi {
10611064
@full_size_mode,
10621065
@extra,
10631066
@riglim,
1064-
$zoom,
1067+
$global_zoom,
10651068
@{$cgi->{version12}},
10661069
@{$colors->{graph_colors}},
10671070
"DEF:apache" . $e . "_star=$rrd:apache" . $e . "_star:AVERAGE",
@@ -1083,8 +1086,8 @@ sub apache_cgi {
10831086
push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1]) . "\n");
10841087
} else {
10851088
if($version eq "new") {
1086-
$picz_width = $picz->{image_width} * $config->{global_zoom};
1087-
$picz_height = $picz->{image_height} * $config->{global_zoom};
1089+
$picz_width = $picz->{image_width} * $zoom;
1090+
$picz_height = $picz->{image_height} * $zoom;
10881091
} else {
10891092
$picz_width = $width + 115;
10901093
$picz_height = $height + 100;
@@ -1132,7 +1135,7 @@ sub apache_cgi {
11321135
"--height=$height",
11331136
@extra,
11341137
@riglim,
1135-
$zoom,
1138+
$global_zoom,
11361139
@{$cgi->{version12}},
11371140
@{$cgi->{version12_small}},
11381141
@{$colors->{graph_colors}},
@@ -1154,7 +1157,7 @@ sub apache_cgi {
11541157
@full_size_mode,
11551158
@extra,
11561159
@riglim,
1157-
$zoom,
1160+
$global_zoom,
11581161
@{$cgi->{version12}},
11591162
@{$cgi->{version12_small}},
11601163
@{$colors->{graph_colors}},
@@ -1172,8 +1175,8 @@ sub apache_cgi {
11721175
push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2]) . "\n");
11731176
} else {
11741177
if($version eq "new") {
1175-
$picz_width = $picz->{image_width} * $config->{global_zoom};
1176-
$picz_height = $picz->{image_height} * $config->{global_zoom};
1178+
$picz_width = $picz->{image_width} * $zoom;
1179+
$picz_height = $picz->{image_height} * $zoom;
11771180
} else {
11781181
$picz_width = $width + 115;
11791182
$picz_height = $height + 100;
@@ -1217,7 +1220,7 @@ sub apache_cgi {
12171220
"--height=$height",
12181221
@extra,
12191222
@riglim,
1220-
$zoom,
1223+
$global_zoom,
12211224
@{$cgi->{version12}},
12221225
@{$cgi->{version12_small}},
12231226
@{$colors->{graph_colors}},
@@ -1239,7 +1242,7 @@ sub apache_cgi {
12391242
@full_size_mode,
12401243
@extra,
12411244
@riglim,
1242-
$zoom,
1245+
$global_zoom,
12431246
@{$cgi->{version12}},
12441247
@{$cgi->{version12_small}},
12451248
@{$colors->{graph_colors}},
@@ -1257,8 +1260,8 @@ sub apache_cgi {
12571260
push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3]) . "\n");
12581261
} else {
12591262
if($version eq "new") {
1260-
$picz_width = $picz->{image_width} * $config->{global_zoom};
1261-
$picz_height = $picz->{image_height} * $config->{global_zoom};
1263+
$picz_width = $picz->{image_width} * $zoom;
1264+
$picz_height = $picz->{image_height} * $zoom;
12621265
} else {
12631266
$picz_width = $width + 115;
12641267
$picz_height = $height + 100;
@@ -1309,7 +1312,7 @@ sub apache_cgi {
13091312
"--height=$height",
13101313
@extra,
13111314
@riglim,
1312-
$zoom,
1315+
$global_zoom,
13131316
@{$cgi->{version12}},
13141317
@{$cgi->{version12_small}},
13151318
@{$colors->{graph_colors}},
@@ -1334,7 +1337,7 @@ sub apache_cgi {
13341337
@full_size_mode,
13351338
@extra,
13361339
@riglim,
1337-
$zoom,
1340+
$global_zoom,
13381341
@{$cgi->{version12}},
13391342
@{$cgi->{version12_small}},
13401343
@{$colors->{graph_colors}},
@@ -1355,8 +1358,8 @@ sub apache_cgi {
13551358
push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4]) . "\n");
13561359
} else {
13571360
if($version eq "new") {
1358-
$picz_width = $picz->{image_width} * $config->{global_zoom};
1359-
$picz_height = $picz->{image_height} * $config->{global_zoom};
1361+
$picz_width = $picz->{image_width} * $zoom;
1362+
$picz_height = $picz->{image_height} * $zoom;
13601363
} else {
13611364
$picz_width = $width + 115;
13621365
$picz_height = $height + 100;
@@ -1400,7 +1403,7 @@ sub apache_cgi {
14001403
"--height=$height",
14011404
@extra,
14021405
@riglim,
1403-
$zoom,
1406+
$global_zoom,
14041407
@{$cgi->{version12}},
14051408
@{$cgi->{version12_small}},
14061409
@{$colors->{graph_colors}},
@@ -1422,7 +1425,7 @@ sub apache_cgi {
14221425
@full_size_mode,
14231426
@extra,
14241427
@riglim,
1425-
$zoom,
1428+
$global_zoom,
14261429
@{$cgi->{version12}},
14271430
@{$cgi->{version12_small}},
14281431
@{$colors->{graph_colors}},
@@ -1440,8 +1443,8 @@ sub apache_cgi {
14401443
push(@output, " " . picz_a_element(config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5]) . "\n");
14411444
} else {
14421445
if($version eq "new") {
1443-
$picz_width = $picz->{image_width} * $config->{global_zoom};
1444-
$picz_height = $picz->{image_height} * $config->{global_zoom};
1446+
$picz_width = $picz->{image_width} * $zoom;
1447+
$picz_height = $picz->{image_height} * $zoom;
14451448
} else {
14461449
$picz_width = $width + 115;
14471450
$picz_height = $height + 100;

0 commit comments

Comments
 (0)