From 5221b6fb19bbe408e157bceb9143a7d6f32253ec Mon Sep 17 00:00:00 2001 From: Exequiel Aramburu Date: Sun, 27 Sep 2026 23:33:38 -0300 Subject: [PATCH] Se actualizan librerias de RGraph y cambios menores --- src/CHANGELOG | 1 + src/gui/index.html | 1 - src/gui_common/css/style.css | 3 +- src/gui_common/libs/RGraph/RGraph.bar.js | 647 +- .../libs/RGraph/RGraph.common.core.js | 5959 ++++++++--------- .../libs/RGraph/RGraph.drawing.image.js | 125 +- src/gui_common/libs/RGraph/RGraph.gauge.js | 126 +- src/gui_common/libs/RGraph/RGraph.odo.js | 62 +- .../libs/RGraph/RGraph.thermometer.js | 108 +- src/gui_web/index.html | 2 - src/logs/debug.log | 17 +- 11 files changed, 3751 insertions(+), 3300 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 91d6056..20b3ae9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,4 +1,5 @@ ** Mejoras de interfaz y configuración (Septiembre 27, 2026) + + Se actualizó RGraph 7.01 → 7.21 + NW.js 0.117.0 centralizado en runtime.json para desarrollo y empaquetado x64. + Formulario compartido con controles nativos, validación y aviso de cambios sin guardar. + Guardado atómico y POST con confirmación; el núcleo recibe la configuración nueva. diff --git a/src/gui/index.html b/src/gui/index.html index dce0b40..f348629 100644 --- a/src/gui/index.html +++ b/src/gui/index.html @@ -84,7 +84,6 @@
-

diff --git a/src/gui_common/css/style.css b/src/gui_common/css/style.css index b4b3604..4d3688d 100644 --- a/src/gui_common/css/style.css +++ b/src/gui_common/css/style.css @@ -96,7 +96,7 @@ } .container { - max-width: 1800px !important; + max-width: 100% !important; } h1 { @@ -499,7 +499,6 @@ hr.style18:before { z-index: 1031; top: 0; left: 0; - width: 100%; height: 2px; } diff --git a/src/gui_common/libs/RGraph/RGraph.bar.js b/src/gui_common/libs/RGraph/RGraph.bar.js index c93b838..6aec3e8 100644 --- a/src/gui_common/libs/RGraph/RGraph.bar.js +++ b/src/gui_common/libs/RGraph/RGraph.bar.js @@ -1,15 +1,16 @@ -'version:2025-10-08 (7.01)'; +'version:2026-08-11 (7.21)'; // - // o---------------------------------------------------------------------------------o - // | This file is part of the RGraph package - you can learn more at: | - // | | - // | https://www.rgraph.net/license.html | - // | | - // | RGraph is dual-licensed under the Open Source GPL license. That means that it's | - // | free to use and there are no restrictions on what you can use RGraph for! | - // | If the GPL license does not suit you however, then there's an inexpensive | - // | commercial license option available. See the URL above for more details. | - // o---------------------------------------------------------------------------------o + // o---------------------------------------------------------------------------o + // | This file is part of the RGraph package - you can learn more at: | + // | | + // | https://www.rgraph.net | + // | | + // | RGraph is dual-licensed under the Open Source GPL license. This means | + // | that it's free to use for any purpose. The GPL license does have | + // | consequences on the license of the software that you include it in, | + // | however. If this is not desirable, then there's an inexpensive commercial | + // | license option available. See the RGraph website for more details. | + // o---------------------------------------------------------------------------o RGraph = window.RGraph || {isrgraph:true,isRGraph: true,rgraph:true}; @@ -47,16 +48,16 @@ this.properties = { backgroundBarsCount: null, - backgroundBarsColor1: 'rgba(0,0,0,0)', - backgroundBarsColor2: 'rgba(0,0,0,0)', + backgroundBarsColor1: 'transparent', + backgroundBarsColor2: 'transparent', backgroundGrid: true, - backgroundGridColor: '#ddd', + backgroundGridColor: '#eee', backgroundGridLinewidth: 1, backgroundGridHsize: 20, backgroundGridVsize: 20, - backgroundGridVlines: true, + backgroundGridVlines: false, backgroundGridHlines: true, - backgroundGridBorder: true, + backgroundGridBorder: false, backgroundGridAutofit: true, backgroundGridAutofitAlign: true, backgroundGridHlinesCount: 5, @@ -115,7 +116,7 @@ labelsAboveUnitsPost:'', labelsAboveFormatter:null, - yaxis: true, + yaxis: false, yaxisLinewidth: 1, yaxisColor: 'black', yaxisTickmarks: true, @@ -162,7 +163,8 @@ yaxisTitleValign: null, yaxisTitleAccessible: null, - xaxis: true, + xaxis: false, + xaxisPosition: 'bottom', xaxisLinewidth: 1, xaxisColor: 'black', xaxisTickmarks: true, @@ -235,22 +237,28 @@ titleSubtitleOffsetx: 0, titleSubtitleOffsety: 0, - colorsStroke: 'rgba(0,0,0,0)', - colors: ['red','#0f0','blue','pink','orange','cyan','black','white','green','magenta'], + colorsStroke: 'transparent', + colors: RGraph.getColors(), colorsSequential: false, colorsReverse: false, grouping: 'grouped', - variant: 'bar', - variantSketchVerticals: true, - variantThreedXaxis: true, - variantThreedYaxis: true, - variantThreedAngle: 0.1, - variantThreedOffsetx: 10, - variantThreedOffsety: 5, - variantThreedXaxisColor: '#ddd', - variantThreedYaxisColor: '#ddd', + variant: 'bar', + variantSketchVerticals: true, + variantThreedXaxis: true, + variantThreedYaxis: true, + variantThreedAngle: 0.1, + variantThreedOffsetx: 10, + variantThreedOffsety: 5, + variantThreedXaxisColor: '#ddd', + variantThreedYaxisColor: '#ddd', + variantDumbbellLinewidth: 8, + variantDumbbellEndTop: true, + variantDumbbellEndBottom: true, + variantDumbbellEndRadius: 13, + variantDumbbellEndTopRadius: null, + variantDumbbellEndBottomRadius: null, shadow: false, shadowColor: '#aaa', @@ -284,8 +292,9 @@ tooltipsPointerOffsety: 0, tooltipsPositionStatic: true, - highlightStroke: 'rgba(0,0,0,0)', + highlightStroke: 'transparent', highlightFill: 'rgba(255,255,255,0.7)', + highlightFade: true, key: null, keyBackground: 'white', @@ -345,17 +354,17 @@ beveled: false, errorbars: false, - errorbarsColor: 'black', + errorbarsColor: 'black', errorbarsCapped: true, - errorbarsCappedWidth: 14, + errorbarsCappedWidth: 14, errorbarsLinewidth: 1, combinedEffect: null, combinedEffectOptions: null, combinedEffectCallback: null, - corners: 'square', - cornersRoundRadius: 10, + corners: 'round', + cornersRoundRadius: 5, cornersRoundLeft: true, cornersRoundRight: true, cornersRoundLeftRadius: null, @@ -363,13 +372,18 @@ responsive: null, - clearto: 'rgba(0,0,0,0)', + clearto: 'transparent', + + style: null, events: {}, + clip: null, scale: true, scaleFactor: 2, - antialiasTranslate: false + antialiasTranslate: false, + + style: [] }; @@ -434,6 +448,10 @@ 'titleSubtitleOffsety', 'variantThreedOffsetx', 'variantThreedOffsety', + 'variantDumbbellLinewidth', + 'variantDumbbellEndRadius', + 'variantDumbbellEndTopRadius', + 'variantDumbbellEndBottomRadius', 'shadowOffsetx', 'shadowOffsety', 'shadowBlur', @@ -674,7 +692,15 @@ - + // + // Add any CSS that has been specified to the document. + // This is general CSS and does not necessarily have to + // pertain to the canvas tag. It only gets added once + // to the document no matter how many times this draw + // function is called. + // + // Add the CSS to a