Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds winDir scatter plot as per issue #57 #61

Closed
wants to merge 10 commits into from
Closed

Adds winDir scatter plot as per issue #57 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bda3e57
Adds winDir scatter plot as per issue #57
Oct 21, 2022
f34f152
Further refinement of Wind Direction Scatter Plot: set min/max range …
Nov 4, 2022
08ff959
Further refinement of Wind Direction Scatter Plot: set min/max range …
Nov 4, 2022
ecd48a3
Further refinement of Wind Direction Scatter Plot: set min/max range …
Nov 4, 2022
ec2a66f
Bug fix. Thanks @Pogs2004 !
Nov 4, 2022
7edf88e
Fix tickAmount for WindDir plots
Nov 5, 2022
d82088b
Add missing graph config includes...thanks @seehase
Nov 6, 2022
0db4bf2
Add missing graph config includes...thanks @seehase
Nov 6, 2022
e734070
Add missing graph config includes...thanks @seehase
Nov 6, 2022
06969a8
Add logic to yearly history report, which will omit month cards with …
Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 80 additions & 0 deletions src/graph_line_archive_config.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#encoding UTF-8
## +-----------------------------------------------------------------------------------+
## | graph_line_archive_config.inc JS config for default line charts |
## +-----------------------------------------------------------------------------------+

chart: {
type: 'line',
zoom: {
enabled: false,
type: 'x',
autoScaleYaxis: false,
},
},

dataLabels: {
enabled: false
},

stroke: {
width: 0,
},

plotOptions: {
line: {
borderRadius: 2,
}
},

fill: {
opacity: 0.7
},

markers: {
size: 4,
strokeWidth: 1,
strokeOpacity: 0.5,
strokeDashArray: 0,
fillOpacity: 0.7,
shape: "circle",
radius: 1,
},

xaxis: {
type: 'datetime',
tickAmount: 8,
trim: true,
labels: {
hideOverlappingLabels: true,
tickAmount: 8,
rotateAlways: false,
hideOverlappingLabels: true,
showDuplicates: false,
trim: true,
formatter: function(val, timestamp) {
return moment.unix(timestamp).format("$Extras.Formatting.datetime_graph_archive");
}
}
},

grid: {
show: true,
strokeDashArray: 0,
position: 'back',
xaxis: {
lines: {
show: true
}
},
yaxis: {
lines: {
show: true
}
},
},

tooltip: {
x: {
format: "$Extras.Formatting.datetime_graph_tooltip"
}
},
80 changes: 80 additions & 0 deletions src/graph_line_config.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#encoding UTF-8
## +---------------------------------------------------------------------------+
## | graph_line_config.inc JS config for default line charts |
## +---------------------------------------------------------------------------+

chart: {
type: 'line',
zoom: {
enabled: false,
type: 'x',
autoScaleYaxis: false,
},
},

dataLabels: {
enabled: false
},

stroke: {
width: 0,
},

plotOptions: {
line: {
borderRadius: 2,
}
},

fill: {
opacity: 0.7
},

markers: {
size: 4,
strokeWidth: 1,
strokeOpacity: 0.5,
strokeDashArray: 0,
fillOpacity: 0.7,
shape: "circle",
radius: 1,
},

xaxis: {
type: 'datetime',
tickAmount: 8,
trim: true,
labels: {
hideOverlappingLabels: true,
tickAmount: 8,
rotateAlways: false,
hideOverlappingLabels: true,
showDuplicates: false,
trim: true,
formatter: function(val, timestamp) {
return moment.unix(timestamp).format("$Extras.Formatting.datetime_graph_label");
}
}
},

grid: {
show: true,
strokeDashArray: 0,
position: 'back',
xaxis: {
lines: {
show: true
}
},
yaxis: {
lines: {
show: true
}
},
},

tooltip: {
x: {
format: "$Extras.Formatting.datetime_graph_tooltip"
}
},
20 changes: 14 additions & 6 deletions src/index.html.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,16 @@
new ApexCharts(document.querySelector('#$id'), {
...graph_${type}_config,
yaxis: {
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
}
#if $name == "windDir"
max: 360,
min: 0,
tickAmount: 8,
#end if
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
},
},
series: [
{
Expand Down Expand Up @@ -279,10 +284,12 @@ new ApexCharts(document.querySelector('#$id'), {
var graph_bar_config = {
#include "graph_bar_config.inc"
}

var graph_radar_config = {
#include "graph_radar_config.inc"
}
var graph_line_config = {
#include "graph_line_config.inc"
}

// outTemp + Dewpoint
$getChartJsCode("outTemp", "outTempchart", "area", "outTemp", "dewpoint")
Expand All @@ -302,6 +309,7 @@ new ApexCharts(document.querySelector('#$id'), {

// Wind
$getChartJsCode("windSpeed", "windSpeedchart", "area", "windSpeed", "windGust", "max")
$getChartJsCode("windDir", "windDirchart", "line", "windDir")

// outHumidity
$getChartJsCode("outHumidity", "outHumiditychart", "area", "outHumidity")
Expand Down
30 changes: 19 additions & 11 deletions src/month-%Y-%m.html.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,11 @@
new ApexCharts(document.querySelector('#$id'), {
...graph_${type}_config,
yaxis: {
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
}
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
},
},
series: [
{
Expand Down Expand Up @@ -259,11 +259,16 @@ new ApexCharts(document.querySelector('#$id'), {
new ApexCharts(document.querySelector('#$id'), {
...graph_${type}_config,
yaxis: {
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
}
#if $name == "windDir"
max: 360,
min: 0,
tickAmount: 8,
#end if
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
},
},
series: [
{
Expand Down Expand Up @@ -310,10 +315,12 @@ new ApexCharts(document.querySelector('#$id'), {
var graph_bar_config = {
#include "graph_bar_archive_config.inc"
}

var graph_radar_config = {
#include "graph_radar_config.inc"
}
var graph_line_config = {
#include "graph_line_archive_config.inc"
}

// outTemp + Dewpoint
$getChartJsCode("outTemp", "outTempchart", "area", "outTemp", "dewpoint")
Expand All @@ -333,6 +340,7 @@ new ApexCharts(document.querySelector('#$id'), {

// Wind
$getChartJsCode("windSpeed", "windSpeedchart", "area", "windSpeed", "windGust", "max")
$getChartJsCode("windDir", "windDirchart", "line", "windDir")

// outHumidity
$getChartJsCode("outHumidity", "outHumiditychart", "area", "outHumidity")
Expand Down
20 changes: 15 additions & 5 deletions src/month.html.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,16 @@
new ApexCharts(document.querySelector('#$id'), {
...graph_${type}_config,
yaxis: {
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
}
#if $name == "windDir"
max: 360,
min: 0,
tickAmount: 8,
#end if
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
},
},
series: [
{
Expand Down Expand Up @@ -255,6 +260,10 @@ new ApexCharts(document.querySelector('#$id'), {
<script type="text/javascript">
// Config templates

var graph_line_config = {
#include "graph_line_config.inc"
}

var graph_area_config = {
#include "graph_area_config.inc"
}
Expand Down Expand Up @@ -284,6 +293,7 @@ new ApexCharts(document.querySelector('#$id'), {

// Wind
$getChartJsCode("windSpeed", "windSpeedchart", "area", "windSpeed", "windGust", "max")
$getChartJsCode("windDir", "windDirchart", "line", "windDir")

// outHumidity
$getChartJsCode("outHumidity", "outHumiditychart", "area", "outHumidity")
Expand Down
2 changes: 1 addition & 1 deletion src/skin.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
values_order = outTemp, outHumidity, barometer, windSpeed, rain, snowDepth, dewpoint, windchill, heatindex, inTemp, inHumidity, UV, ET, radiation, appTemp, cloudbase, extraTemp1, extraHumid1, extraTemp2, extraHumid2, extraTemp3, extraHumid3, extraTemp4, extraHumid4, extraTemp5, extraHumid5, extraTemp6, extraHumid6, extraTemp7, extraHumid7, extraTemp8, extraHumid8

# The order of chart cards (right column)
charts_order = outTemp, windchill, barometer, rain, snowDepth, windSpeed, windvec, UV, ET, radiation, outHumidity, inTemp, inHumidity, appTemp, cloudbase, extraTemp1, extraHumid1, extraTemp2, extraHumid2, extraTemp3, extraHumid3, extraTemp4, extraHumid4, extraTemp5, extraHumid5, extraTemp6, extraHumid6, extraTemp7, extraHumid7, extraTemp8, extraHumid8
charts_order = outTemp, windchill, barometer, rain, snowDepth, windSpeed, windDir, windvec, UV, ET, radiation, outHumidity, inTemp, inHumidity, appTemp, cloudbase, extraTemp1, extraHumid1, extraTemp2, extraHumid2, extraTemp3, extraHumid3, extraTemp4, extraHumid4, extraTemp5, extraHumid5, extraTemp6, extraHumid6, extraTemp7, extraHumid7, extraTemp8, extraHumid8

# The order of cards on telemetry page
telemetry_order = rxCheckPercent, txBatteryStatus, windBatteryStatus, rainBatteryStatus, outTempBatteryStatus, inTempBatteryStatus, consBatteryVoltage, heatingVoltage, supplyVoltage, referenceVoltage, extraBatteryStatus1, extraBatteryStatus2, extraBatteryStatus3, extraBatteryStatus4, extraBatteryStatus5, extraBatteryStatus6, extraBatteryStatus7, extraBatteryStatus8
Expand Down
20 changes: 15 additions & 5 deletions src/week.html.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,16 @@
new ApexCharts(document.querySelector('#$id'), {
...graph_${type}_config,
yaxis: {
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
}
#if $name == "windDir"
max: 360,
min: 0,
tickAmount: 8,
#end if
labels: {
formatter: function (val) {
return formatNumber(val, "$getVar('unit.format.' + name)") + "$getVar('unit.label.' + name)";
}
},
},
series: [
{
Expand Down Expand Up @@ -255,6 +260,10 @@ new ApexCharts(document.querySelector('#$id'), {
<script type="text/javascript">
// Config templates

var graph_line_config = {
#include "graph_line_config.inc"
}

var graph_area_config = {
#include "graph_area_config.inc"
}
Expand Down Expand Up @@ -284,6 +293,7 @@ new ApexCharts(document.querySelector('#$id'), {

// Wind
$getChartJsCode("windSpeed", "windSpeedchart", "area", "windSpeed", "windGust", "max")
$getChartJsCode("windDir", "windDirchart", "line", "windDir")

// outHumidity
$getChartJsCode("outHumidity", "outHumiditychart", "area", "outHumidity")
Expand Down
Loading