Skip to content

Commit

Permalink
Merge pull request #893 from linea-it/zmag_distribution
Browse files Browse the repository at this point in the history
build
  • Loading branch information
linea-relmanager authored Nov 17, 2017
2 parents 5346c02 + dfabbca commit eb8e003
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion frontend/build/production/Explorer/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/build/production/Explorer/app.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"charts":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"exclude":["fashion"],"path":"resources/Explorer-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Explorer","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171117132359","cacheParam":"_dc"},"id":"1739eae9-ca05-49a0-800a-3c2bd487fa19","hash":"545e9333814dc1697c71b5d0c6ad63f709711988","profile":"","resources":{"path":"resources"}}
{"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"charts":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"remote":true,"path":"https://d3js.org/d3.v4.min.js"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"exclude":["fashion"],"path":"resources/Explorer-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Explorer","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171117173001","cacheParam":"_dc"},"id":"1739eae9-ca05-49a0-800a-3c2bd487fa19","hash":"9c6ccbcd7b7728f26a5a6c76221c0a25cce3e4f1","profile":"","resources":{"path":"resources"}}
2 changes: 1 addition & 1 deletion frontend/build/production/Explorer/app.jsonp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Ext.Microloader.setManifest({"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"charts":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"exclude":["fashion"],"path":"resources/Explorer-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Explorer","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171117132359","cacheParam":"_dc"},"id":"1739eae9-ca05-49a0-800a-3c2bd487fa19","hash":"545e9333814dc1697c71b5d0c6ad63f709711988","profile":"","resources":{"path":"resources"}});
Ext.Microloader.setManifest({"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"charts":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"remote":true,"path":"https://d3js.org/d3.v4.min.js"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"exclude":["fashion"],"path":"resources/Explorer-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Explorer","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171117173001","cacheParam":"_dc"},"id":"1739eae9-ca05-49a0-800a-3c2bd487fa19","hash":"9c6ccbcd7b7728f26a5a6c76221c0a25cce3e4f1","profile":"","resources":{"path":"resources"}});
3 changes: 2 additions & 1 deletion frontend/explorer/app/view/system/ZMagDistribution.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ Ext.define('Explorer.view.system.ZMagDistribution', {

// var data = d3.range(128).map(d3.randomBates(10));
var x = d3.scaleLinear()
.domain([d3.min(data), d3.max(data)])
// .domain([0, d3.max(data)])
.domain([0, 1])
.range([0, width]);

var bins = d3.histogram()
Expand Down

0 comments on commit eb8e003

Please sign in to comment.