Skip to content

Commit

Permalink
Build 7.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@linev
linev committed Jun 19, 2024
1 parent deb99ff commit b06ea76
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 32 deletions.
77 changes: 48 additions & 29 deletions build/jsroot.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ typeof define === 'function' && define.amd ? define(['exports'], factory) :

/** @summary version id
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
const version_id = '7.7.x',
const version_id = '7.7.2',

/** @summary version date
* @desc Release date in format day/month/year like '14/04/2022' */
version_date = '14/06/2024',
version_date = '19/06/2024',

/** @summary version id and date
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
Expand Down Expand Up @@ -61939,20 +61939,19 @@ const AxisPainterMethods = {
/** @summary Provide label for exponential form */
formatExp(base, order, value) {
let res = '';
const sbase = Math.abs(base - Math.E) < 0.001 ? 'e' : base.toString();
if (value) {
value = Math.round(value/Math.pow(base, order));
if ((value !== 0) && (value !== 1)) res = value.toString() + (settings.Latex ? '#times' : 'x');
}
if (Math.abs(base - Math.E) < 0.001)
res += 'e';
else
res += base.toString();
if (settings.StripAxisLabels) {
if (order === 0)
return '1';
else if (order === 1)
return res;
if (settings.StripAxisLabels) {
if (order === 0)
return value.toString();
else if ((order === 1) && (value === 1))
return sbase;
}
if (value !== 1)
res = value.toString() + (settings.Latex ? '#times' : 'x');
}
res += sbase;
if (settings.Latex > constants$1.Latex.Symbols)
return res + `^{${order}}`;
const superscript_symbols = {
Expand Down Expand Up @@ -72112,6 +72111,7 @@ class TPavePainter extends ObjectPainter {

axis.fTickSize = 0.6 * s_width / width; // adjust axis ticks size
if ((typeof zaxis?.fLabelOffset !== 'undefined') && !is_th3) {
axis.fBits = zaxis.fBits & ~EAxisBits.kTickMinus & ~EAxisBits.kTickPlus;
axis.fTitle = zaxis.fTitle;
axis.fTitleSize = zaxis.fTitleSize;
axis.fTitleOffset = zaxis.fTitleOffset;
Expand Down Expand Up @@ -72174,18 +72174,19 @@ class TPavePainter extends ObjectPainter {
for (let i = 0; i < levels.length-1; ++i) {
let z0 = Math.round(this.z_handle.gr(levels[i])),
z1 = Math.round(this.z_handle.gr(levels[i+1])),
lvl = (levels[i]+levels[i+1])/2, d;
lvl = (levels[i] + levels[i+1])*0.5, d;

if (this._palette_vertical) {
if ((z1 >= s_height) || (z0 < 0)) continue;
z0 += 1; // ensure correct gap filling between colors

if (z0 > s_height) {
z0 = s_height;
lvl = levels[i]*0.001+levels[i+1]*0.999;
lvl = levels[i]*0.001 + levels[i+1]*0.999;
if (z1 < 0) z1 = 0;
} else if (z1 < 0) {
z1 = 0;
lvl = levels[i]*0.999+levels[i+1]*0.001;
lvl = levels[i]*0.999 + levels[i+1]*0.001;
}
d = `M0,${z1}H${s_width}V${z0}H0Z`;
} else {
Expand All @@ -72194,10 +72195,11 @@ class TPavePainter extends ObjectPainter {

if (z1 > s_width) {
z1 = s_width;
lvl = levels[i]*0.999+levels[i+1]*0.001;
lvl = levels[i]*0.999 + levels[i+1]*0.001;
if (z0 < 0) z0 = 0;
} else if (z0 < 0) {
z0 = 0;
lvl = levels[i]*0.001+levels[i+1]*0.999;
lvl = levels[i]*0.001 + levels[i+1]*0.999;
}
d = `M${z0},0V${s_height}H${z1}V0Z`;
}
Expand Down Expand Up @@ -72749,7 +72751,8 @@ class THistDrawOptions {
Render3D: constants$1.Render3D.Default,
FrontBox: true, BackBox: true,
need_fillcol: false,
minimum: kNoZoom, maximum: kNoZoom, ymin: 0, ymax: 0, cutg: null, IgnoreMainScale: false });
minimum: kNoZoom, maximum: kNoZoom, ymin: 0, ymax: 0, cutg: null,
IgnoreMainScale: false, IgnorePalette: false });
}

isCartesian() { return this.System === kCARTESIAN; }
Expand Down Expand Up @@ -72814,6 +72817,9 @@ class THistDrawOptions {
d.check('USE_PAD_PALETTE');
d.check('USE_PAD_STATS');

if (d.check('IGNORE_PALETTE'))
this.IgnorePalette = true;

if (d.check('PAL', true))
this.Palette = d.partAsInt();
// this is zooming of histo content
Expand Down Expand Up @@ -74718,6 +74724,10 @@ class THistPainter extends ObjectPainter {
/** @summary draw color palette
* @return {Promise} when done */
async drawColorPalette(enabled, postpone_draw, can_move) {
// in special cases like scatter palette drawing is ignored
if (this.options.IgnorePalette)
return null;

// only when create new palette, one could change frame size
const mp = this.getMainPainter(),
pp = this.getPadPainter();
Expand Down Expand Up @@ -75725,7 +75735,7 @@ let TH2Painter$2 = class TH2Painter extends THistPainter {
this.projection_widthY = widthY;
this.is_projection = ''; // avoid projection handling until area is created

this.provideSpecialDrawArea(new_proj).then(() => { this.is_projection = new_proj; return this.redrawProjection(); });
return this.provideSpecialDrawArea(new_proj).then(() => { this.is_projection = new_proj; return this.redrawProjection(); });
}

/** @summary Redraw projection */
Expand Down Expand Up @@ -75881,8 +75891,12 @@ let TH2Painter$2 = class TH2Painter extends THistPainter {
menu.addDrawMenu('Draw with', opts, arg => {
if (arg.indexOf(kInspect) === 0)
return this.showInspector(arg);
const oldProject = this.options.Project;
this.decodeOptions(arg);
this.interactiveRedraw('pad', 'drawopt');
if ((oldProject === this.options.Project) || this.mode3d)
this.interactiveRedraw('pad', 'drawopt');
else
this.toggleProjection(this.options.Project);
});

if (this.options.Color || this.options.Contour || this.options.Hist || this.options.Surf || this.options.Lego === 12 || this.options.Lego === 14)
Expand Down Expand Up @@ -108716,8 +108730,10 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
if (set_y && !histo.fYaxis.fLabels) {
histo.fYaxis.fXmin = Math.min(minimum0, minimum);
histo.fYaxis.fXmax = Math.max(maximum0, maximum);
histo.fMinimum = minimum;
histo.fMaximum = maximum;
if (!this._need_2dhist) {
histo.fMinimum = minimum;
histo.fMaximum = maximum;
}
}

return histo;
Expand Down Expand Up @@ -109763,7 +109779,7 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
return false;
}

/** @summary Update object members
/** @summary Update TGraph object members
* @private */
_updateMembers(graph, obj) {
graph.fBits = obj.fBits;
Expand All @@ -109790,6 +109806,8 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
graph.fMarkerColor = obj.fMarkerColor;
graph.fMarkerSize = obj.fMarkerSize;
graph.fMarkerStyle = obj.fMarkerStyle;

return obj.fFunctions;
}

/** @summary Update TGraph object */
Expand All @@ -109799,7 +109817,7 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
if (opt && (opt !== this.options.original))
this.decodeOptions(opt);

this._updateMembers(this.getObject(), obj);
const new_funcs = this._updateMembers(this.getObject(), obj);

this.createBins();

Expand All @@ -109815,7 +109833,7 @@ let TGraphPainter$1 = class TGraphPainter extends ObjectPainter {
}
}

this._funcHandler = new FunctionsHandler(this, this.getPadPainter(), obj.fFunctions);
this._funcHandler = new FunctionsHandler(this, this.getPadPainter(), new_funcs);

return true;
}
Expand Down Expand Up @@ -113755,7 +113773,7 @@ class TScatterPainter extends TGraphPainter$1 {
* @private */
async drawAxisHisto() {
const histo = this.createHistogram();
return TH2Painter$2.draw(this.getDom(), histo, this.options.Axis);
return TH2Painter$2.draw(this.getDom(), histo, this.options.Axis + ';IGNORE_PALETTE');
}

/** @summary Provide palette, create if necessary
Expand All @@ -113778,7 +113796,8 @@ class TScatterPainter extends TGraphPainter$1 {
return pal;
}

/** @summary Update TScatter members */
/** @summary Update TScatter members
* @private */
_updateMembers(scatter, obj) {
scatter.fBits = obj.fBits;
scatter.fTitle = obj.fTitle;
Expand All @@ -113788,7 +113807,7 @@ class TScatterPainter extends TGraphPainter$1 {
scatter.fMargin = obj.fMargin;
scatter.fMinMarkerSize = obj.fMinMarkerSize;
scatter.fMaxMarkerSize = obj.fMaxMarkerSize;
super._updateMembers(scatter.fGraph, obj.fGraph);
return super._updateMembers(scatter.fGraph, obj.fGraph);
}

/** @summary Actual drawing of TScatter */
Expand Down
5 changes: 4 additions & 1 deletion changes.md
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# JSROOT changelog

## Changes in 7.7.x
## Changes in 7.7.2
1. Fix - hide empty title on the canvas
2. Fix - properly handle zooming in THStack histogram
3. Fix - always use 0 as minimum in THStack drawings
4. Fix - always show all ticks for labeled axis
5. Fix - draw TProfile2D bins content as text, not entries
6. Fix - interactive zooming on log color palette
7. Fix - keyboard handling while input dialog active
8. Fix - legend entry with not configured fill attributes
9. Fix - prevent that color palette exceed graphical range
10. Fix - exponential log axis labels with kMoreLogLabels bit set


## Changes in 7.7.1
Expand Down
4 changes: 2 additions & 2 deletions modules/core.mjs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/** @summary version id
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
const version_id = '7.7.x',
const version_id = '7.7.2',

/** @summary version date
* @desc Release date in format day/month/year like '14/04/2022' */
version_date = '14/06/2024',
version_date = '19/06/2024',

/** @summary version id and date
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
Expand Down

0 comments on commit b06ea76

Please sign in to comment.