Commit ffe7e55
authored
Mergers: actually collect only mergeable objects belonging to TCanvas (#15555)
We were seeing warnings like below when merging certain TCanvases:
```
W 11 Object 'title' with type 'TPaveText' is not one of the mergeable types, skipping
W 11 Object 'TPave' with type 'TLegend' is not one of the mergeable types, skipping
W 11 Object 'TFrame' with type 'TFrame' is not one of the mergeable types, skipping
```
It is perfectly OK to have some TPaveText in a canvas and expect to have just the histogram merged, but the text should remain as it was, so there is no reason to produce warnings.
The change ensures that collectUnderlyingObject actually collects just the mergeable objects from TCanvas, as promised in the documentation.
Fixes QC-1344.1 parent 5d0a12e commit ffe7e55
2 files changed
Lines changed: 11 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
63 | 64 | | |
64 | 65 | | |
65 | 66 | | |
66 | | - | |
| 67 | + | |
67 | 68 | | |
68 | 69 | | |
69 | 70 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| |||
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
| 44 | + | |
43 | 45 | | |
44 | 46 | | |
45 | 47 | | |
| |||
329 | 331 | | |
330 | 332 | | |
331 | 333 | | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
332 | 340 | | |
333 | 341 | | |
334 | 342 | | |
| |||
345 | 353 | | |
346 | 354 | | |
347 | 355 | | |
348 | | - | |
| 356 | + | |
349 | 357 | | |
350 | 358 | | |
351 | 359 | | |
| |||
0 commit comments