Skip to content

Commit 9b7fd46

Browse files
committed
Exclude dark from testing
1 parent 0b67eff commit 9b7fd46

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

demo/examples_more.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@
120120
{ "name": "float16", "asurl": true, "file": "https://root.cern/files/Event100000.root", "item": "T/event/fTracks/fMass2", "opt": "dump", "title": "Float16_t type as TClonesArray branch" },
121121
{ "name": "markus", "url": "?file=https://root.cern/files/markus.root&item=_Event/Refs&opt=dump&load=$$$gaudi.js", "title": "custom streamer for pool::Token class from some branches" },
122122
{ "name": "cmssw1", "asurl": "browser", "file": "test_cmssw_10000.root", "item": "MetaData", "opt": "testio", "title": "CMS-SW metadata, complex std::map classes" },
123-
{ "name": "reco103", "asurl": "browser", "file": "https://root.cern/files/reco_103.root", "item": "Events", "opt":"testio", "title": "Older ROOT file with many branches, std::map classes", "notest":true },
124-
{ "name": "cmssw_io", "asurl": "browser", "file": "test_cmssw_10000.root", "item": "Events", "opt":"testio", "title": "Test I/O with CMS-SW events data", "notest":true },
125-
{ "name": "lhcb2_io", "asurl": true, "file": "https://root.cern/files/lhcb2.root", "item": "E", "opt":"testio", "title": "Test I/O with lhcb2.root file", "notest":true },
126-
{ "name": "atlas_io", "asurl": true, "file": "https://root.cern/files/atlas30new.root", "item": "CollectionTree", "opt":"testio", "title": "Test I/O with atlas30new.root file", "notest":true },
127-
{ "name": "alice_esd", "asurl": true, "file": "https://root.cern/files/alice_ESDs.root", "item": "esdTree", "opt":"testio", "title": "Test I/O with alice_ESDs.root file, include friedns files", "notest":true }
123+
{ "name": "reco103", "asurl": "browser", "file": "https://root.cern/files/reco_103.root", "item": "Events", "opt":"testio", "title": "Older ROOT file with many branches, std::map classes", "notest": true },
124+
{ "name": "cmssw_io", "asurl": "browser", "file": "test_cmssw_10000.root", "item": "Events", "opt":"testio", "title": "Test I/O with CMS-SW events data", "notest": true },
125+
{ "name": "lhcb2_io", "asurl": true, "file": "https://root.cern/files/lhcb2.root", "item": "E", "opt":"testio", "title": "Test I/O with lhcb2.root file", "notest": true },
126+
{ "name": "atlas_io", "asurl": true, "file": "https://root.cern/files/atlas30new.root", "item": "CollectionTree", "opt":"testio", "title": "Test I/O with atlas30new.root file", "notest": true },
127+
{ "name": "alice_esd", "asurl": true, "file": "https://root.cern/files/alice_ESDs.root", "item": "esdTree", "opt":"testio", "title": "Test I/O with alice_ESDs.root file, include friedns files", "notest": true }
128128
],
129129
"TF1" : [
130130
{ "name": "ip0", "file": "ip0.root", "item": "c;1" },
@@ -225,6 +225,6 @@
225225
{ "name": "crown", "file": "tutorials_graphics.root", "item": "crown", "title": "TCrown, tutorials/graphics/crown.C" },
226226
{ "name": "zstd", "file": "zstd.root", "item": "ccdb_object", "zstd": true, "title": "File with ZSTD compression, required zstd-codec.js script" },
227227
{ "name": "pave", "file": "tpavetext.root", "item": "ccdb_object", "title": "Drawing of plain TPaveText with TLine and custom text lines alignment" },
228-
{ "name": "dark", "opt": "dark", "file": "hsimple.root", "item": "hpx;1", "title": "Invert colors of histogram drawin, same as settings.DarkMode = true" }
228+
{ "name": "dark", "opt": "dark", "file": "hsimple.root", "item": "hpx;1", "title": "Invert colors of histogram drawing, same as settings.DarkMode = true", "notest": true }
229229
]
230230
}

modules/gpad/RPadPainter.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -625,9 +625,7 @@ class RPadPainter extends RObjectPainter {
625625
/** @summary Changes canvas dark mode
626626
* @private */
627627
changeDarkMode(mode) {
628-
if (mode === undefined)
629-
mode = settings.DarkMode;
630-
this.getCanvSvg().style("filter", mode ? "invert(100%)" : null);
628+
this.getCanvSvg().style("filter", (mode ?? settings.DarkMode) ? "invert(100%)" : null);
631629
}
632630

633631
/** @summary Fill pad context menu

modules/gpad/TPadPainter.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -979,9 +979,7 @@ class TPadPainter extends ObjectPainter {
979979
/** @summary Changes canvas dark mode
980980
* @private */
981981
changeDarkMode(mode) {
982-
if (mode === undefined)
983-
mode = settings.DarkMode;
984-
this.getCanvSvg().style("filter", mode ? "invert(100%)" : null);
982+
this.getCanvSvg().style("filter", (mode ?? settings.DarkMode) ? "invert(100%)" : null);
985983
}
986984

987985
/** @summary Fill pad context menu

modules/hist2d/THistPainter.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,6 +1185,7 @@ class THistPainter extends ObjectPainter {
11851185
return fp.drawAxes2(opts.second_x, opts.second_y);
11861186
} else if (this.options.darkMode) {
11871187
let pp = this.getPadPainter();
1188+
console.log('Apply dark mode', pp?.iscan);
11881189
if (pp?.changeDarkMode) pp.changeDarkMode(true);
11891190
}
11901191

0 commit comments

Comments
 (0)