nmelone/MaxWaterSystem-Electron
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds timeseries

Browse Source
This commit is contained in:
Patrick McDonagh
2018-08-10 15:12:12 -05:00
parent 4832d35c51
commit 42f6ce8d32
7 changed files with 2570 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
MaxWaterSystem.db Normal file
View File

Binary file not shown.

2350
app/build/bundle.js
View File

File diff suppressed because one or more lines are too long

1
app/src/components/FlexibleGraph.js
View File

@@ -81,7 +81,6 @@ export class FlexibleGraph extends Component{
const mappedValues = _.map(this.props.tagDescriptions, (desc, key) => {
return {title: desc, value: _.round(values[key].y, 1) + ` ${this.props.units[key]}`};
});
console.log(mappedValues, this.props.tagDescriptions);
return mappedValues;
}

17
app/src/components/Main.js
View File

@@ -3,6 +3,7 @@ import { connect } from "react-redux";
import { LiquidGauge } from "./LiquidGauge";
import { FlexibleGraph } from "./FlexibleGraph";
import { TimeSeriesGraph } from "./TimeSeriesGraph";
// const graphColors = ["#d7191c", "#fdae61", "#ffffbf", "#abd9e9", "#2c7bb6"];
@@ -103,6 +104,22 @@ export class Main extends Component {
]}
round={[1, 2, 1, 1, 1]}
/>
<TimeSeriesGraph tagHistory={[
this.props.tagHistory.val_FluidLevel,
// this.props.tagHistory.val_Flowmeter,
// this.props.tagHistory.val_IntakePressure,
// this.props.tagHistory.val_IntakeTemperature,
// this.props.tagHistory.val_TubingPressure
]}
tagDescriptions={[
"Level",
"Flow Rate",
"Intake Pres",
"Intake Temp",
"Tubing Pres"
]}
/>
<hr />
<h3>VFD Data</h3>

36
app/src/components/TimeSeriesGraph.js Normal file
View File

@@ -0,0 +1,36 @@
import React from "react";
import { TimeSeries } from "pondjs";
import _ from "lodash";
import { Charts, ChartContainer, ChartRow, YAxis, LineChart } from "react-timeseries-charts";
export function TimeSeriesGraph(props) {
const series = _.map(props.tagHistory, (tag, key) => {
const points = _.reverse(_.map(tag, ({timestamp, value}) => {
return [timestamp.getTime(), parseFloat(value)];
}));
return new TimeSeries({
name: props.tagDescriptions[key],
columns: ["time", props.tagDescriptions[key]],
points: points
});
});
// const lineCharts = _.map(props.tagHistory, (tag, key) => {
// return <LineChart key={key} axis="axis1" series={series[key]} column={[props.tagDescriptions[key]]} />;
// });
return(
<ChartContainer timeRange={series[0].timerange()} width={800}>
<ChartRow height="200">
<YAxis id="axis1" min={0} max={500} width="60" type="linear"/>
<Charts>
<LineChart axis="axis1" series={series[0]} column={[props.tagDescriptions[0]]} />;
</Charts>
</ChartRow>
</ChartContainer>
);
}

2
package.json
View File

@@ -65,6 +65,7 @@
"lodash": "^4.17.5",
"moment": "^2.22.1",
"node": "^9.11.0",
"pondjs": "^0.8.8",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-event-timeline": "^1.5.1",
@@ -72,6 +73,7 @@
"react-redux": "^5.0.7",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.2",
"react-timeseries-charts": "^0.14.0",
"react-vis": "^1.9.2",
"redux": "^3.7.2",
"redux-electron-ipc": "^1.1.12",

176
yarn.lock
View File

@@ -136,6 +136,22 @@
version "8.10.8"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.8.tgz#794cba23cc9f8d9715f6543fa8827433b5f5cd3b"
"@types/react-dom@^0.14.23":
version "0.14.23"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-0.14.23.tgz#cecfcfad754b4c2765fe5d29b81b301889ad6c2e"
dependencies:
"@types/react" "*"
"@types/react@*":
version "16.3.12"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.12.tgz#68d9146f3e9797e38ffbf22f7ed1dde91a2cfd2e"
dependencies:
csstype "^2.2.0"
"@types/react@^15.0.21":
version "15.6.15"
resolved "https://registry.yarnpkg.com/@types/react/-/react-15.6.15.tgz#1856f932120311aa566f91e6d0c6e613d6448236"
abab@^1.0.0, abab@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -433,6 +449,10 @@ array-unique@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
array.prototype.fill@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/array.prototype.fill/-/array.prototype.fill-1.0.2.tgz#ab33207f21d57d1ab2f7f0d1cf122d3419c38ef5"
arrify@^1.0.0, arrify@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -1122,6 +1142,14 @@ babel-plugin-transform-strict-mode@^6.24.1:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
babel-polyfill@^6.9.1:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
dependencies:
babel-runtime "^6.26.0"
core-js "^2.5.0"
regenerator-runtime "^0.10.5"
babel-preset-env@^1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
@@ -1257,7 +1285,7 @@ babel-register@^6.26.0, babel-register@^6.9.0:
mkdirp "^0.5.1"
source-map-support "^0.4.15"
babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
dependencies:
@@ -1537,6 +1565,13 @@ buffer@^4.3.0:
ieee754 "^1.1.4"
isarray "^1.0.0"
buffer@^5.0.3:
version "5.1.0"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe"
dependencies:
base64-js "^1.0.2"
ieee754 "^1.1.4"
builder-util-runtime@4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.1.0.tgz#7dcd042d555d2f161a5538d7a0ea8c292daa0683"
@@ -2018,6 +2053,10 @@ color@^0.11.0:
color-convert "^1.3.0"
color-string "^0.3.0"
colorbrewer@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/colorbrewer/-/colorbrewer-1.1.0.tgz#5197584353527eb37466df3dc611f1a51de8cd27"
colormin@^1.0.5:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -2229,6 +2268,10 @@ crypto-random-string@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
css-color-keywords@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
css-color-names@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -2269,6 +2312,14 @@ css-selector-tokenizer@^0.7.0:
fastparse "^1.1.1"
regexpu-core "^1.0.0"
css-to-react-native@^2.0.3:
version "2.1.2"
resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.1.2.tgz#c06d628467ef961c85ec358a90f3c87469fb0095"
dependencies:
css-color-keywords "^1.0.0"
fbjs "^0.8.5"
postcss-value-parser "^3.3.0"
css-what@2.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
@@ -2331,6 +2382,10 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0":
dependencies:
cssom "0.3.x"
csstype@^2.2.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.4.1.tgz#ba35a94259cffc07ed022954737a1da690dcae2c"
currently-unhandled@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -2345,6 +2400,10 @@ d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz#d1ca33de2f6ac31efadb8e050a021d7e2396d5dc"
d3-axis@^1.0.8:
version "1.0.8"
resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.8.tgz#31a705a0b535e65759de14173a31933137f18efa"
d3-collection@1, d3-collection@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz#342dfd12837c90974f33f1cc0a785aea570dcdc2"
@@ -2363,7 +2422,7 @@ d3-dispatch@1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.3.tgz#46e1491eaa9b58c358fce5be4e8bed626e7871f8"
d3-ease@1, d3-ease@^1.0.2:
d3-ease@1, d3-ease@^1.0.2, d3-ease@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e"
@@ -2399,6 +2458,13 @@ d3-sankey@^0.7.1:
d3-collection "1"
d3-shape "^1.2.0"
d3-scale-chromatic@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.2.0.tgz#25820d059c0eccc33e85f77561f37382a817ab58"
dependencies:
d3-color "1"
d3-interpolate "1"
d3-scale@^1.0.5, d3-scale@^1.0.6:
version "1.0.7"
resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz#fa90324b3ea8a776422bd0472afab0b252a0945d"
@@ -2421,13 +2487,13 @@ d3-shape@^1.1.0, d3-shape@^1.2.0:
dependencies:
d3-path "1"
d3-time-format@2:
d3-time-format@2, d3-time-format@^2.0.5:
version "2.1.1"
resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.1.tgz#85b7cdfbc9ffca187f14d3c456ffda268081bb31"
dependencies:
d3-time "1"
d3-time@1:
d3-time@1, d3-time@^1.0.7:
version "1.0.8"
resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.8.tgz#dbd2d6007bf416fe67a76d17947b784bffea1e84"
@@ -2634,6 +2700,10 @@ doctrine@^2.0.2, doctrine@^2.1.0:
dependencies:
esutils "^2.0.2"
dom-resize@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/dom-resize/-/dom-resize-1.0.3.tgz#df9d71e808171fdb66ee88517b0d1c02cdb98876"
dom-serializer@0, dom-serializer@~0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
@@ -3355,7 +3425,7 @@ fb-watchman@^2.0.0:
dependencies:
bser "^2.0.0"
fbjs@^0.8.16:
fbjs@^0.8.16, fbjs@^0.8.5, fbjs@^0.8.9:
version "0.8.16"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
dependencies:
@@ -3470,6 +3540,15 @@ flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
flexbox-react@^4.3.3:
version "4.4.0"
resolved "https://registry.yarnpkg.com/flexbox-react/-/flexbox-react-4.4.0.tgz#35ebd3eb108bbda1b2760df4968aabc7061f5f33"
dependencies:
styled-components "^2.0.0"
optionalDependencies:
"@types/react" "^15.0.21"
"@types/react-dom" "^0.14.23"
flow-parser@^0.*:
version "0.69.0"
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.69.0.tgz#378b5128d6d0b554a8b2f16a4ca3e1ab9649f00e"
@@ -4018,6 +4097,10 @@ hoek@4.x.x:
version "4.2.1"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
hoist-non-react-statics@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
@@ -4153,6 +4236,14 @@ ignore@^3.3.3:
version "3.3.7"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
immutable-devtools@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/immutable-devtools/-/immutable-devtools-0.0.4.tgz#1e7e87f2c7a4f0533955bc4c2922d124bf9129dd"
immutable@^3.6.4:
version "3.8.2"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
import-lazy@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
@@ -4253,7 +4344,7 @@ into-stream@^3.1.0:
from2 "^2.1.1"
p-is-promise "^1.1.0"
invariant@^2.0.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2:
invariant@^2.0.0, invariant@^2.1.1, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
dependencies:
@@ -5533,7 +5624,7 @@ merge-stream@^1.0.1:
dependencies:
readable-stream "^2.0.1"
merge@^1.1.3:
merge@^1.1.3, merge@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
@@ -5692,7 +5783,11 @@ mkdirp@0.5.0:
dependencies:
minimist "0.0.8"
moment@^2.22.1:
moment-duration-format@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/moment-duration-format/-/moment-duration-format-1.3.0.tgz#541771b5f87a049cc65540475d3ad966737d6908"
moment@^2.18.1, moment@^2.22.1, moment@^2.9.0:
version "2.22.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
@@ -6426,6 +6521,17 @@ pn@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
pondjs@^0.8.8:
version "0.8.8"
resolved "https://registry.yarnpkg.com/pondjs/-/pondjs-0.8.8.tgz#6f5de41cfdf6535e7198cf7be1998243fb949473"
dependencies:
babel-polyfill "^6.9.1"
babel-runtime "^6.5.0"
immutable "^3.6.4"
immutable-devtools "0.0.4"
moment "^2.9.0"
underscore "^1.8.2"
posix-character-classes@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -6751,7 +6857,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"
prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0:
prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0:
version "15.6.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
dependencies:
@@ -6984,6 +7090,33 @@ react-test-renderer@^16.0.0-0:
prop-types "^15.6.0"
react-is "^16.3.1"
react-timeseries-charts@^0.14.0:
version "0.14.0"
resolved "https://registry.yarnpkg.com/react-timeseries-charts/-/react-timeseries-charts-0.14.0.tgz#69db7e70298f0f40723b52e2b9e496d614cba4a1"
dependencies:
array.prototype.fill "^1.0.1"
babel-runtime "^6.23.0"
colorbrewer "^1.0.0"
d3-axis "^1.0.8"
d3-ease "^1.0.3"
d3-format "^1.2.0"
d3-interpolate "^1.1.5"
d3-scale "^1.0.6"
d3-scale-chromatic "^1.1.1"
d3-selection "^1.1.0"
d3-shape "^1.2.0"
d3-time "^1.0.7"
d3-time-format "^2.0.5"
d3-transition "^1.1.0"
dom-resize "^1.0.3"
flexbox-react "^4.3.3"
invariant "^2.1.1"
merge "^1.2.0"
moment "^2.18.1"
moment-duration-format "^1.3.0"
prop-types "^15.5.10"
underscore "^1.8.3"
react-vis@^1.9.2:
version "1.9.2"
resolved "https://registry.yarnpkg.com/react-vis/-/react-vis-1.9.2.tgz#4dbd5d91ac820fd39fa7ad1c892198495194f6e3"
@@ -7177,6 +7310,10 @@ regenerate@^1.2.1:
version "1.3.3"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
regenerator-runtime@^0.10.5:
version "0.10.5"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
regenerator-runtime@^0.11.0:
version "0.11.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -7956,6 +8093,23 @@ strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
styled-components@^2.0.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-2.4.0.tgz#086d0fd483d54638837fca3ea546a030b94adf75"
dependencies:
buffer "^5.0.3"
css-to-react-native "^2.0.3"
fbjs "^0.8.9"
hoist-non-react-statics "^1.2.0"
is-plain-object "^2.0.1"
prop-types "^15.5.4"
stylis "^3.4.0"
supports-color "^3.2.3"
stylis@^3.4.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1"
sumchecker@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-1.3.1.tgz#79bb3b4456dd04f18ebdbc0d703a1d1daec5105d"
@@ -8284,6 +8438,10 @@ uid-number@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
underscore@^1.8.2, underscore@^1.8.3:
version "1.9.0"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.0.tgz#31dbb314cfcc88f169cd3692d9149d81a00a73e4"
underscore@~1.4.4:
version "1.4.4"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"