Skip to content
This repository has been archived by the owner on May 2, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/v1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
rousan committed May 3, 2019
2 parents b58350a + ba2a539 commit a883816
Show file tree
Hide file tree
Showing 114 changed files with 5,240 additions and 3,445 deletions.
7 changes: 7 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
MYCROFT_PROTOCOL=http
MYCROFT_HOST=localhost
MYCROFT_PORT=3001

MOLLY_PROTOCOL=http
MOLLY_HOST=localhost
MOLLY_PORT=80
2 changes: 1 addition & 1 deletion dist/muze.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/muze.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/muze.js.map

Large diffs are not rendered by default.

139 changes: 139 additions & 0 deletions examples/data/cars.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
"Maker","Name","Miles_per_Gallon","Cylinders","Displacement","Horsepower","Weight_in_lbs","Acceleration","Year","Origin"
"chevrolet","chevrolet chevelle malibu","18","8","307","130","3504","12","1970-01-01","USA"
"buick","buick skylark 320","15","8","350","165","3693","11.5","1970-01-01","USA"
"plymouth","plymouth satellite","18","8","318","150","3436","11","1970-01-01","USA"
"amc","amc rebel sst","16","8","304","150","3433","12","1970-01-01","USA"
"ford","ford torino","17","8","302","140","3449","10.5","1970-01-01","USA"
"ford","ford galaxie 500","15","8","429","198","4341","10","1970-01-01","USA"
"chevrolet","chevrolet impala","14","8","454","220","4354","9","1970-01-01","USA"
"plymouth","plymouth fury iii","14","8","440","215","4312","8.5","1970-01-01","USA"
"pontiac","pontiac catalina","14","8","455","225","4425","10","1970-01-01","USA"
"amc","amc ambassador dpl","15","8","390","190","3850","8.5","1970-01-01","USA"
"citroen","citroen ds-21 pallas","null","4","133","115","3090","17.5","1970-01-01","Europe"
"chevrolet","chevrolet chevelle concours (sw)","null","8","350","165","4142","11.5","1970-01-01","USA"
"ford","ford torino (sw)","null","8","351","153","4034","11","1970-01-01","USA"
"plymouth","plymouth satellite (sw)","null","8","383","175","4166","10.5","1970-01-01","USA"
"amc","amc rebel sst (sw)","null","8","360","175","3850","11","1970-01-01","USA"
"dodge","dodge challenger se","15","8","383","170","3563","10","1970-01-01","USA"
"plymouth","plymouth 'cuda 340","14","8","340","160","3609","8","1970-01-01","USA"
"ford","ford mustang boss 302","null","8","302","140","3353","8","1970-01-01","USA"
"chevrolet","chevrolet monte carlo","15","8","400","150","3761","9.5","1970-01-01","USA"
"buick","buick estate wagon (sw)","14","8","455","225","3086","10","1970-01-01","USA"
"toyota","toyota corona mark ii","24","4","113","95","2372","15","1970-01-01","Japan"
"plymouth","plymouth duster","22","6","198","95","2833","15.5","1970-01-01","USA"
"amc","amc hornet","18","6","199","97","2774","15.5","1970-01-01","USA"
"ford","ford maverick","21","6","200","85","2587","16","1970-01-01","USA"
"datsun","datsun pl510","27","4","97","88","2130","14.5","1970-01-01","Japan"
"volkswagen","volkswagen 1131 deluxe sedan","26","4","97","46","1835","20.5","1970-01-01","Europe"
"peugeot","peugeot 504","25","4","110","87","2672","17.5","1970-01-01","Europe"
"audi","audi 100 ls","24","4","107","90","2430","14.5","1970-01-01","Europe"
"saab","saab 99e","25","4","104","95","2375","17.5","1970-01-01","Europe"
"bmw","bmw 2002","26","4","121","113","2234","12.5","1970-01-01","Europe"
"amc","amc gremlin","21","6","199","90","2648","15","1970-01-01","USA"
"ford","ford f250","10","8","360","215","4615","14","1970-01-01","USA"
"chevy","chevy c20","10","8","307","200","4376","15","1970-01-01","USA"
"dodge","dodge d200","11","8","318","210","4382","13.5","1970-01-01","USA"
"datsun","datsun pl510","27","4","97","88","2130","14.5","1971-01-01","Japan"
"chevrolet","chevrolet vega 2300","28","4","140","90","2264","15.5","1971-01-01","USA"
"toyota","toyota corona","25","4","113","95","2228","14","1971-01-01","Japan"
"ford","ford pinto","25","4","98","null","2046","19","1971-01-01","USA"
"volkswagen","volkswagen super beetle 117","null","4","97","48","1978","20","1971-01-01","Europe"
"amc","amc gremlin","19","6","232","100","2634","13","1971-01-01","USA"
"plymouth","plymouth satellite custom","16","6","225","105","3439","15.5","1971-01-01","USA"
"chevrolet","chevrolet chevelle malibu","17","6","250","100","3329","15.5","1971-01-01","USA"
"ford","ford torino 500","19","6","250","88","3302","15.5","1971-01-01","USA"
"amc","amc matador","18","6","232","100","3288","15.5","1971-01-01","USA"
"chevrolet","chevrolet impala","14","8","350","165","4209","12","1971-01-01","USA"
"pontiac","pontiac catalina brougham","14","8","400","175","4464","11.5","1971-01-01","USA"
"ford","ford galaxie 500","14","8","351","153","4154","13.5","1971-01-01","USA"
"plymouth","plymouth fury iii","14","8","318","150","4096","13","1971-01-01","USA"
"dodge","dodge monaco (sw)","12","8","383","180","4955","11.5","1971-01-01","USA"
"ford","ford country squire (sw)","13","8","400","170","4746","12","1971-01-01","USA"
"pontiac","pontiac safari (sw)","13","8","400","175","5140","12","1971-01-01","USA"
"amc","amc hornet sportabout (sw)","18","6","258","110","2962","13.5","1971-01-01","USA"
"chevrolet","chevrolet vega (sw)","22","4","140","72","2408","19","1971-01-01","USA"
"pontiac","pontiac firebird","19","6","250","100","3282","15","1971-01-01","USA"
"ford","ford mustang","18","6","250","88","3139","14.5","1971-01-01","USA"
"mercury","mercury capri 2000","23","4","122","86","2220","14","1971-01-01","USA"
"opel","opel 1900","28","4","116","90","2123","14","1971-01-01","Europe"
"peugeot","peugeot 304","30","4","79","70","2074","19.5","1971-01-01","Europe"
"fiat","fiat 124b","30","4","88","76","2065","14.5","1971-01-01","Europe"
"toyota","toyota corolla 1200","31","4","71","65","1773","19","1971-01-01","Japan"
"datsun","datsun 1200","35","4","72","69","1613","18","1971-01-01","Japan"
"volkswagen","volkswagen model 111","27","4","97","60","1834","19","1971-01-01","Europe"
"plymouth","plymouth cricket","26","4","91","70","1955","20.5","1971-01-01","USA"
"toyota","toyota corona hardtop","24","4","113","95","2278","15.5","1972-01-01","Japan"
"dodge","dodge colt hardtop","25","4","97.5","80","2126","17","1972-01-01","USA"
"volkswagen","volkswagen type 3","23","4","97","54","2254","23.5","1972-01-01","Europe"
"chevrolet","chevrolet vega","20","4","140","90","2408","19.5","1972-01-01","USA"
"ford","ford pinto runabout","21","4","122","86","2226","16.5","1972-01-01","USA"
"chevrolet","chevrolet impala","13","8","350","165","4274","12","1972-01-01","USA"
"pontiac","pontiac catalina","14","8","400","175","4385","12","1972-01-01","USA"
"plymouth","plymouth fury iii","15","8","318","150","4135","13.5","1972-01-01","USA"
"ford","ford galaxie 500","14","8","351","153","4129","13","1972-01-01","USA"
"amc","amc ambassador sst","17","8","304","150","3672","11.5","1972-01-01","USA"
"mercury","mercury marquis","11","8","429","208","4633","11","1972-01-01","USA"
"buick","buick lesabre custom","13","8","350","155","4502","13.5","1972-01-01","USA"
"oldsmobile","oldsmobile delta 88 royale","12","8","350","160","4456","13.5","1972-01-01","USA"
"chrysler","chrysler newport royal","13","8","400","190","4422","12.5","1972-01-01","USA"
"mazda","mazda rx2 coupe","19","3","70","97","2330","13.5","1972-01-01","Japan"
"amc","amc matador (sw)","15","8","304","150","3892","12.5","1972-01-01","USA"
"chevrolet","chevrolet chevelle concours (sw)","13","8","307","130","4098","14","1972-01-01","USA"
"ford","ford gran torino (sw)","13","8","302","140","4294","16","1972-01-01","USA"
"plymouth","plymouth satellite custom (sw)","14","8","318","150","4077","14","1972-01-01","USA"
"volvo","volvo 145e (sw)","18","4","121","112","2933","14.5","1972-01-01","Europe"
"volkswagen","volkswagen 411 (sw)","22","4","121","76","2511","18","1972-01-01","Europe"
"peugeot","peugeot 504 (sw)","21","4","120","87","2979","19.5","1972-01-01","Europe"
"renault","renault 12 (sw)","26","4","96","69","2189","18","1972-01-01","Europe"
"ford","ford pinto (sw)","22","4","122","86","2395","16","1972-01-01","USA"
"datsun","datsun 510 (sw)","28","4","97","92","2288","17","1972-01-01","Japan"
"toyouta","toyouta corona mark ii (sw)","23","4","120","97","2506","14.5","1972-01-01","Japan"
"dodge","dodge colt (sw)","28","4","98","80","2164","15","1972-01-01","USA"
"toyota","toyota corolla 1600 (sw)","27","4","97","88","2100","16.5","1972-01-01","Japan"
"buick","buick century 350","13","8","350","175","4100","13","1973-01-01","USA"
"amc","amc matador","14","8","304","150","3672","11.5","1973-01-01","USA"
"chevrolet","chevrolet malibu","13","8","350","145","3988","13","1973-01-01","USA"
"ford","ford gran torino","14","8","302","137","4042","14.5","1973-01-01","USA"
"dodge","dodge coronet custom","15","8","318","150","3777","12.5","1973-01-01","USA"
"mercury","mercury marquis brougham","12","8","429","198","4952","11.5","1973-01-01","USA"
"chevrolet","chevrolet caprice classic","13","8","400","150","4464","12","1973-01-01","USA"
"ford","ford ltd","13","8","351","158","4363","13","1973-01-01","USA"
"plymouth","plymouth fury gran sedan","14","8","318","150","4237","14.5","1973-01-01","USA"
"chrysler","chrysler new yorker brougham","13","8","440","215","4735","11","1973-01-01","USA"
"buick","buick electra 225 custom","12","8","455","225","4951","11","1973-01-01","USA"
"amc","amc ambassador brougham","13","8","360","175","3821","11","1973-01-01","USA"
"plymouth","plymouth valiant","18","6","225","105","3121","16.5","1973-01-01","USA"
"chevrolet","chevrolet nova custom","16","6","250","100","3278","18","1973-01-01","USA"
"amc","amc hornet","18","6","232","100","2945","16","1973-01-01","USA"
"ford","ford maverick","18","6","250","88","3021","16.5","1973-01-01","USA"
"plymouth","plymouth duster","23","6","198","95","2904","16","1973-01-01","USA"
"volkswagen","volkswagen super beetle","26","4","97","46","1950","21","1973-01-01","Europe"
"chevrolet","chevrolet impala","11","8","400","150","4997","14","1973-01-01","USA"
"ford","ford country","12","8","400","167","4906","12.5","1973-01-01","USA"
"plymouth","plymouth custom suburb","13","8","360","170","4654","13","1973-01-01","USA"
"oldsmobile","oldsmobile vista cruiser","12","8","350","180","4499","12.5","1973-01-01","USA"
"amc","amc gremlin","18","6","232","100","2789","15","1973-01-01","USA"
"toyota","toyota carina","20","4","97","88","2279","19","1973-01-01","Japan"
"chevrolet","chevrolet vega","21","4","140","72","2401","19.5","1973-01-01","USA"
"datsun","datsun 610","22","4","108","94","2379","16.5","1973-01-01","Japan"
"maxda","maxda rx3","18","3","70","90","2124","13.5","1973-01-01","Japan"
"ford","ford pinto","19","4","122","85","2310","18.5","1973-01-01","USA"
"mercury","mercury capri v6","21","6","155","107","2472","14","1973-01-01","USA"
"fiat","fiat 124 sport coupe","26","4","98","90","2265","15.5","1973-01-01","Europe"
"chevrolet","chevrolet monte carlo s","15","8","350","145","4082","13","1973-01-01","USA"
"pontiac","pontiac grand prix","16","8","400","230","4278","9.5","1973-01-01","USA"
"fiat","fiat 128","29","4","68","49","1867","19.5","1973-01-01","Europe"
"opel","opel manta","24","4","116","75","2158","15.5","1973-01-01","Europe"
"audi","audi 100ls","20","4","114","91","2582","14","1973-01-01","Europe"
"volvo","volvo 144ea","19","4","121","112","2868","15.5","1973-01-01","Europe"
"dodge","dodge dart custom","15","8","318","150","3399","11","1973-01-01","USA"
"saab","saab 99le","24","4","121","110","2660","14","1973-01-01","Europe"
"toyota","toyota mark ii","20","6","156","122","2807","13.5","1973-01-01","Japan"
"oldsmobile","oldsmobile omega","11","8","350","180","3664","11","1973-01-01","USA"
"plymouth","plymouth duster","20","6","198","95","3102","16.5","1974-01-01","USA"
"ford","ford maverick","21","6","200","null","2875","17","1974-01-01","USA"
"amc","amc hornet","19","6","232","100","2901","16","1974-01-01","USA"
"chevrolet","chevrolet nova","15","6","250","100","3336","17","1974-01-01","USA"
"datsun","datsun b210","31","4","79","67","1950","19","1974-01-01","Japan"
"ford","ford pinto","26","4","122","80","2451","16.5","1974-01-01","USA"
"toyota","toyota corolla 1200","32","4","71","65","1836","21","1974-01-01","Japan"
12 changes: 12 additions & 0 deletions examples/data/lineCrossTabSchema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[{
"name": "year",
"type": "dimension"
}, {
"name": "value",
"type": "measure",
"defAggFn": "avg"

}, {
"name": "quarter",
"type": "dimension"
}]
14 changes: 8 additions & 6 deletions examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
<div id='chart'></div>

<script src="./js/d3.js"></script>
<div id= "chart"></div>
<div id= "chart2"></div>

<script src="https://d3js.org/d3.v4.js"></script>
<script src="./js/sample3.js"></script>
<div id="parentdiv">
<div id="chart1"></div>
<div id="chart2"></div>
<div id="chart4"></div>
<div id="chart3"></div>
</div>
<!-- <script /src="https://d3js.org/d3.v4.js"></script> -->
<script src="./js/wildfires.js"></script>
</body>

</html>
3 changes: 2 additions & 1 deletion examples/index1.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

<script src="./js/d3.js"></script>
<!-- <script src="./js/sample3.js"></script> -->
<script src="./js/crosstab-sorted.js"></script>
<!-- <script src="./js/crosstab-sorted.js"></script> -->
<script src="./js/bubble-temporal.js"></script>
</body>

</html>
3 changes: 1 addition & 2 deletions examples/index5.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@
<!-- <script src="./js/sample3.js"></script> -->
<script src="./js/aa1.js"></script>
</body>

</html>
</html>
86 changes: 86 additions & 0 deletions examples/js/band-axis-facets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/* eslint-disable */
const env = muze();
const DataModel = muze.DataModel;

function shuffleArray(array) {
for (var i = array.length - 1; i > 0; i--) {
var j = Math.floor(Math.random() * (i + 1));
var temp = array[i];
array[i] = array[j];
array[j] = temp;
}
}

d3.json('../../data/cars.json', (data) => {
let jsonData = data;
const schema = [{
name: 'Name',
type: 'dimension'
},
{
name: 'Maker',
type: 'dimension'
},
{
name: 'Miles_per_Gallon',
type: 'measure'
},

{
name: 'Displacement',
type: 'measure',
defAggFn: 'min'
},
{
name: 'Horsepower',
type: 'measure'
},
{
name: 'Weight_in_lbs',
type: 'measure'
},
{
name: 'Acceleration',
type: 'measure',
numberFormat: (val) => "$" + val
},
{
name: 'Origin',
type: 'dimension',
displayName: "Origin2"
},
{
name: 'Cylinders',
type: 'dimension'
},
{
name: 'Year',
type: 'dimension',
subtype: 'temporal',
format: '%Y-%m-%d'
}];

window.rootData = new DataModel(jsonData, schema)

const rows = ['Origin'];
const columns = rows.reverse();

const canvas = env
.canvas()
.columns(['Maker', 'Cylinders', 'Acceleration'])
.rows(columns)
.data(rootData)
.height(800)
.width(1500)
.detail(['Maker', 'Cylinders'])
.title('The car acceleration respective to origin', { position: 'bottom', align: 'center' })
.color({ field: 'Origin' })
.mount('#chart')
.config({
sort:{
Maker: 'desc',
Cylinders: (a, b) => a - b,
Origin: (a, b) => b.localeCompare(a)
}
})
});
Loading

0 comments on commit a883816

Please sign in to comment.