Compare commits

...

5 Commits
1.7.0 ... 1.7.2

Author SHA1 Message Date
Colin McLeod
4c74675edd Bumping version to 1.7.2 2015-09-22 09:27:39 -07:00
Colin McLeod
d43ee25e71 Use full name for Advanced Plasma Accelerator 2015-09-22 09:27:19 -07:00
Colin McLeod
46f00e0bc7 Lint fixes 2015-09-22 09:14:47 -07:00
Colin McLeod
d3cea71e50 Bumping version to 1.7.1 2015-09-22 09:13:43 -07:00
Colin McLeod
0516a6f54d Use calculated boost speed in comparisons. Fixes #91 2015-09-22 09:13:21 -07:00
4 changed files with 6 additions and 6 deletions

View File

@@ -205,8 +205,8 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
tips.selectAll('text.label.y').text(function(d, i) { tips.selectAll('text.label.y').text(function(d, i) {
var yVal = series ? y0[series[i]] : y0; var yVal = series ? y0[series[i]] : y0;
yTotal += yVal; yTotal += yVal;
return (series ? $translate.instant(series[i]) : '') + ' ' + fmtLong(yVal); return (series ? $translate.instant(series[i]) : '') + ' ' + fmtLong(yVal);
}).append('tspan').attr('class','metric').text(' ' + $translate.instant(labels.yAxis.unit)); }).append('tspan').attr('class', 'metric').text(' ' + $translate.instant(labels.yAxis.unit));
tips.selectAll('text').each(function() { tips.selectAll('text').each(function() {
if (this.getBBox().width > tipWidth) { if (this.getBBox().width > tipWidth) {
@@ -217,7 +217,7 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
tipWidth += 8; tipWidth += 8;
markers.selectAll('circle.marker').attr('cx', x(x0)).attr('cy', function(d, i) { return y(series ? y0[series[i]] : y0); }); markers.selectAll('circle.marker').attr('cx', x(x0)).attr('cy', function(d, i) { return y(series ? y0[series[i]] : y0); });
tips.selectAll('text.label').attr('x', flip ? -12 : 12).style('text-anchor', flip ? 'end' : 'start'); tips.selectAll('text.label').attr('x', flip ? -12 : 12).style('text-anchor', flip ? 'end' : 'start');
tips.selectAll('text.label.x').text(fmtLong(x0)).append('tspan').attr('class','metric').text(' ' + $translate.instant(labels.xAxis.unit)); tips.selectAll('text.label.x').text(fmtLong(x0)).append('tspan').attr('class', 'metric').text(' ' + $translate.instant(labels.xAxis.unit));
tips.attr('transform', 'translate(' + x(x0) + ',' + Math.max(minTransY, y(yTotal / (series ? series.length : 1))) + ')'); tips.attr('transform', 'translate(' + x(x0) + ',' + Math.max(minTransY, y(yTotal / (series ? series.length : 1))) + ')');
tips.selectAll('rect') tips.selectAll('rect')
.attr('width', tipWidth + 4) .attr('width', tipWidth + 4)

View File

@@ -87,7 +87,7 @@ angular.module('shipyard', ['ngLodash'])
}, },
{ // 1 { // 1
title: 'speed', title: 'speed',
props: ['topSpeed', 'boost'], props: ['topSpeed', 'topBoost'],
lbls: ['thrusters', 'boost'], lbls: ['thrusters', 'boost'],
unit: 'm/s', unit: 'm/s',
fmt: 'fCrd' fmt: 'fCrd'

View File

@@ -63,7 +63,7 @@
{ {
"id": "Ap", "id": "Ap",
"grp": "pa", "grp": "pa",
"name": "Advanced", "name": "Advanced Plasma Accelerator",
"class": 3, "class": 3,
"rating": "B", "rating": "B",
"cost": 4119120, "cost": 4119120,

View File

@@ -1,6 +1,6 @@
{ {
"name": "coriolis_shipyard", "name": "coriolis_shipyard",
"version": "1.7.0", "version": "1.7.2",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/cmmcleod/coriolis" "url": "https://github.com/cmmcleod/coriolis"