Skip to content

Commit 7d4b482

Browse files
rreusserrreusser
committed
Change carpetid to carpet
1 parent 30c9063 commit 7d4b482

Some content is hidden

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

41 files changed

+506
-506
lines changed

‎src/plot_api/plot_api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ function _restyle(gd, aobj, _traces) {
13141314
'xcalendar', 'ycalendar',
13151315
'cumulative', 'cumulative.enabled', 'cumulative.direction', 'cumulative.currentbin',
13161316
'a0', 'da', 'b0', 'db', 'atype', 'btype',
1317-
'cheaterslope', 'carpetid', 'sum',
1317+
'cheaterslope', 'carpet', 'sum',
13181318
];
13191319

13201320
var carpetAxisAttributes = [

‎src/plots/cartesian/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ exports.plot = function(gd, traces, transitionOpts, makeOnCompleteCallback) {
6767
// axis has actually changed:
6868
//
6969
// If this trace is specifically requested, add it to the list:
70-
if(traces.indexOf(trace.index) !== -1 || trace.carpetid) {
70+
if(traces.indexOf(trace.index) !== -1 || trace.carpet) {
7171
// Okay, so example: traces 0, 1, and 2 have fill = tonext. You animate
7272
// traces 0 and 2. Trace 1 also needs to be updated, otherwise its fill
7373
// is outdated. So this retroactively adds the previous trace if the

‎src/plots/plots.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ plots.supplyDataDefaults = function(dataIn, dataOut, layout, fullLayout) {
696696
}
697697

698698
if(Registry.traceIs(fullTrace, 'carpetAxis')) {
699-
carpetIndex[fullTrace.carpetid] = fullTrace;
699+
carpetIndex[fullTrace.carpet] = fullTrace;
700700
}
701701

702702
if(Registry.traceIs(fullTrace, 'carpetDependent')) {
@@ -709,7 +709,7 @@ plots.supplyDataDefaults = function(dataIn, dataOut, layout, fullLayout) {
709709

710710
if(!fullTrace.visible) continue;
711711

712-
var carpetAxis = carpetIndex[fullTrace.carpetid];
712+
var carpetAxis = carpetIndex[fullTrace.carpet];
713713
fullTrace._carpet = carpetAxis;
714714

715715
if(!carpetAxis || !carpetAxis.visible) {

‎src/traces/carpet/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var axisAttrs = require('./axis_attributes');
1414
var colorAttrs = require('../../components/color/attributes');
1515

1616
module.exports = {
17-
carpetid: {
17+
carpet: {
1818
valType: 'string',
1919
role: 'info',
2020
description: [

‎src/traces/carpet/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, dfltColor, fullLayou
2424
var defaultColor = coerce('color', colorAttrs.defaultLine);
2525
Lib.coerceFont(coerce, 'font');
2626

27-
coerce('carpetid');
27+
coerce('carpet');
2828

2929
handleABDefaults(traceIn, traceOut, fullLayout, coerce, defaultColor);
3030

‎src/traces/carpet/lookup_carpetid.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'use strict';
1111

1212
/*
13-
* Given a trace, look up the carpet axis by carpetid.
13+
* Given a trace, look up the carpet axis by carpet.
1414
*/
1515
module.exports = function(gd, trace) {
1616
var n = gd._fullData.length;
@@ -25,7 +25,7 @@ module.exports = function(gd, trace) {
2525
firstAxis = maybeCarpet;
2626
}
2727

28-
if(maybeCarpet.carpetid === trace.carpetid) {
28+
if(maybeCarpet.carpet === trace.carpet) {
2929
return maybeCarpet;
3030
}
3131
}

‎src/traces/contourcarpet/attributes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ var scatterLineAttrs = scatterAttrs.line;
1919
var constants = require('./constants');
2020

2121
module.exports = extendFlat({}, {
22-
carpetid: {
22+
carpet: {
2323
valType: 'string',
2424
role: 'info',
2525
description: [
26-
'The `carpetid` of the carpet axes on which this contour trace lies'
26+
'The `carpet` of the carpet axes on which this contour trace lies'
2727
].join(' ')
2828
},
2929
z: heatmapAttrs.z,

‎src/traces/contourcarpet/calc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var lookupCarpet = require('../carpet/lookup_carpetid');
2727
// though a few things inside heatmap calc still look for
2828
// contour maps, because the makeBoundArray calls are too entangled
2929
module.exports = function calc(gd, trace) {
30-
var carpet = trace.carpet = lookupCarpet(gd, trace);
30+
var carpet = trace.carpetTrace = lookupCarpet(gd, trace);
3131
if(!carpet || !carpet.visible || carpet.visible === 'legendonly') return;
3232

3333
if(!trace.a || !trace.b) {
@@ -125,7 +125,7 @@ function autoContours(start, end, ncontours) {
125125
function heatmappishCalc(gd, trace) {
126126
// prepare the raw data
127127
// run makeCalcdata on x and y even for heatmaps, in case of category mappings
128-
var carpet = trace.carpet;
128+
var carpet = trace.carpetTrace;
129129
var aax = carpet.aaxis,
130130
bax = carpet.baxis,
131131
isContour = Registry.traceIs(trace, 'contour'),

‎src/traces/contourcarpet/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
2424
return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
2525
}
2626

27-
coerce('carpetid');
27+
coerce('carpet');
2828

2929
// If either a or b is not present, then it's not a valid trace *unless* the carpet
3030
// axis has the a or b values we're looking for. So if these are not found, just defer

‎src/traces/contourcarpet/empty_pathinfo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = function emptyPathinfo(contours, plotinfo, cd0) {
1414
var cs = contours.size;
1515
var pathinfo = [];
1616

17-
var carpet = cd0.trace.carpet;
17+
var carpet = cd0.trace.carpetTrace;
1818

1919
for(var ci = contours.start; ci < contours.end + cs / 10; ci += cs) {
2020
pathinfo.push({

‎src/traces/contourcarpet/plot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = function plot(gd, plotinfo, cdcontours) {
3737
function plotOne(gd, plotinfo, cd) {
3838
var trace = cd[0].trace;
3939

40-
var carpet = trace.carpet = lookupCarpet(gd, trace);
40+
var carpet = trace.carpetTrace = lookupCarpet(gd, trace);
4141
var carpetcd = gd.calcdata[carpet.index][0];
4242

4343
if(!carpet.visible || carpet.visible === 'legendonly') return;

‎src/traces/scattercarpet/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var scatterMarkerAttrs = scatterAttrs.marker,
2020
scatterMarkerLineAttrs = scatterMarkerAttrs.line;
2121

2222
module.exports = {
23-
carpetid: {
23+
carpet: {
2424
valType: 'string',
2525
role: 'info',
2626
description: [

‎src/traces/scattercarpet/calc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = function calc(gd, trace) {
2121
var i, carpet;
2222

2323
for(i = 0; i < gd._fullData.length; i++) {
24-
if(gd._fullData[i].carpetid === trace.carpetid && gd._fullData[i].type === 'carpet') {
24+
if(gd._fullData[i].carpet === trace.carpet && gd._fullData[i].type === 'carpet') {
2525
carpet = gd._fullData[i];
2626
break;
2727
}

‎src/traces/scattercarpet/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
2727
return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
2828
}
2929

30-
coerce('carpetid');
30+
coerce('carpet');
3131

3232
// XXX: Don't hard code this
3333
traceOut.xaxis = 'x';

‎test/image/mocks/cheater_constraint_greater_than.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"data": [
33
{
44
"type": "contourcarpet",
5-
"carpetid": "c7",
5+
"carpet": "c7",
66
"z": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
77
"showlegend": false,
88
"contours": {
@@ -14,7 +14,7 @@
1414
},
1515
{
1616
"type": "contourcarpet",
17-
"carpetid": "c8",
17+
"carpet": "c8",
1818
"z": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
1919
"showlegend": false,
2020
"contours": {
@@ -25,7 +25,7 @@
2525
},
2626
{
2727
"type": "contourcarpet",
28-
"carpetid": "c5",
28+
"carpet": "c5",
2929
"z": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
3030
"showlegend": false,
3131
"contours": {
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"type": "contourcarpet",
40-
"carpetid": "c6",
40+
"carpet": "c6",
4141
"z": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
4242
"showlegend": false,
4343
"contours": {
@@ -48,7 +48,7 @@
4848
},
4949
{
5050
"type": "contourcarpet",
51-
"carpetid": "c3",
51+
"carpet": "c3",
5252
"z": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
5353
"showlegend": false,
5454
"contours": {
@@ -60,7 +60,7 @@
6060
},
6161
{
6262
"type": "contourcarpet",
63-
"carpetid": "c4",
63+
"carpet": "c4",
6464
"showlegend": false,
6565
"z": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
6666
"contours": {
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"type": "contourcarpet",
74-
"carpetid": "c1",
74+
"carpet": "c1",
7575
"z": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
7676
"showlegend": false,
7777
"contours": {
@@ -83,7 +83,7 @@
8383
},
8484
{
8585
"type": "contourcarpet",
86-
"carpetid": "c2",
86+
"carpet": "c2",
8787
"showlegend": false,
8888
"z": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
8989
"contours": {
@@ -94,7 +94,7 @@
9494
},
9595
{
9696
"type": "carpet",
97-
"carpetid": "c1",
97+
"carpet": "c1",
9898
"a": [1, 2, 3],
9999
"b": [1, 2, 3],
100100
"y": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
@@ -105,7 +105,7 @@
105105
},
106106
{
107107
"type": "carpet",
108-
"carpetid": "c2",
108+
"carpet": "c2",
109109
"a": [1, 2, 3],
110110
"b": [1, 2, 3],
111111
"y": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
@@ -116,7 +116,7 @@
116116
},
117117
{
118118
"type": "carpet",
119-
"carpetid": "c3",
119+
"carpet": "c3",
120120
"a": [1, 2, 3],
121121
"b": [1, 2, 3],
122122
"y": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
@@ -127,7 +127,7 @@
127127
},
128128
{
129129
"type": "carpet",
130-
"carpetid": "c4",
130+
"carpet": "c4",
131131
"a": [1, 2, 3],
132132
"b": [1, 2, 3],
133133
"y": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
@@ -138,7 +138,7 @@
138138
},
139139
{
140140
"type": "carpet",
141-
"carpetid": "c5",
141+
"carpet": "c5",
142142
"a": [1, 2, 3],
143143
"b": [1, 2, 3],
144144
"y": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
@@ -149,7 +149,7 @@
149149
},
150150
{
151151
"type": "carpet",
152-
"carpetid": "c6",
152+
"carpet": "c6",
153153
"a": [1, 2, 3],
154154
"b": [1, 2, 3],
155155
"y": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
@@ -160,7 +160,7 @@
160160
},
161161
{
162162
"type": "carpet",
163-
"carpetid": "c7",
163+
"carpet": "c7",
164164
"a": [1, 2, 3],
165165
"b": [1, 2, 3],
166166
"y": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],
@@ -171,7 +171,7 @@
171171
},
172172
{
173173
"type": "carpet",
174-
"carpetid": "c8",
174+
"carpet": "c8",
175175
"a": [1, 2, 3],
176176
"b": [1, 2, 3],
177177
"y": [[0, 0.8, 2], [1.2, 2, 3.2], [2, 2.8, 4]],

0 commit comments

Comments
 (0)