update eez-framework

eez-open · Dec 24, 2024 · bf3d91c · bf3d91c
1 parent 8ae9653
commit bf3d91c
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 34 deletions.
diff --git a/packages/project-editor/flow/component.tsx b/packages/project-editor/flow/component.tsx
@@ -2933,11 +2933,20 @@ export class Widget extends Component {
                     )) {
                         const eventDef = classInfo.widgetEvents[eventName];
                         if (eventDef.oldName == "action") {
-                            jsObject.eventHandlers.push({
-                                eventName,
-                                handlerType: "action",
-                                action: jsObject.action
-                            });
+                            if (
+                                !jsObject.eventHandlers.find(
+                                    (eventHandler: EventHandler) =>
+                                        eventHandler.eventName == eventName &&
+                                        eventHandler.handlerType == "action" &&
+                                        eventHandler.action == jsObject.action
+                                )
+                            ) {
+                                jsObject.eventHandlers.push({
+                                    eventName,
+                                    handlerType: "action",
+                                    action: jsObject.action
+                                });
+                            }
                             break;
                         }
                     }
@@ -2952,15 +2961,24 @@ export class Widget extends Component {
                         )) {
                             const eventDef = classInfo.widgetEvents[eventName];
                             if (eventDef.oldName == asOutputProperty) {
-                                jsObject.eventHandlers.push({
-                                    eventName,
-                                    handlerType: "flow"
-                                });
-                                wireSourceChanged(
-                                    object,
-                                    asOutputProperty,
-                                    eventName
-                                );
+                                if (
+                                    !jsObject.eventHandlers.find(
+                                        (eventHandler: EventHandler) =>
+                                            eventHandler.eventName ==
+                                                eventName &&
+                                            eventHandler.handlerType == "flow"
+                                    )
+                                ) {
+                                    jsObject.eventHandlers.push({
+                                        eventName,
+                                        handlerType: "flow"
+                                    });
+                                    wireSourceChanged(
+                                        object,
+                                        asOutputProperty,
+                                        eventName
+                                    );
+                                }
                                 break;
                             }
                         }

diff --git a/packages/project-editor/flow/components/widgets/dashboard/plotly.tsx b/packages/project-editor/flow/components/widgets/dashboard/plotly.tsx
@@ -489,7 +489,6 @@ interface InputData {
 
 export class PlotlyLineChartExecutionState {
     updated: number = 0;
-    valuesMap: Map<number, number[]>;
     values: InputData[] = [];
     maxPoints: number = 0;
     labels: string[] = [];
@@ -1417,11 +1416,6 @@ export class LineChartWidget extends Widget {
 
             if (resetInputValue !== undefined) {
                 context.clearInputValue("reset");
-
-                if (executionState.valuesMap) {
-                    executionState.valuesMap.clear();
-                }
-
                 executionState!.values = [];
             } else {
                 let maxPoints = context.evalProperty("maxPoints");
@@ -1430,24 +1424,44 @@ export class LineChartWidget extends Widget {
                 if (xValue != undefined) {
                     const lineValues = context.getExpressionListParam(8);
 
-                    if (!executionState.valuesMap) {
-                        executionState!.valuesMap = new Map();
+                    if (!executionState.values) {
+                        executionState.values = [];
+                    }
+
+                    let inserted = false;
+
+                    for (let i = 0; i < executionState.values.length; i++) {
+                        if (xValue < executionState.values[i].xValue) {
+                            executionState.values.splice(i, 0, {
+                                xValue,
+                                lineValues
+                            });
+                            inserted = true;
+                            break;
+                        }
+
+                        if (xValue == executionState.values[i].xValue) {
+                            if (i < executionState.values.length - 1) {
+                                executionState.values[i].lineValues =
+                                    lineValues;
+                                inserted = true;
+                            }
+                            break;
+                        }
                     }
-                    executionState.valuesMap.set(xValue, lineValues);
 
-                    let xValues = [...executionState.valuesMap.keys()];
-                    xValues.sort((a, b) => a - b);
-                    while (xValues.length > 0 && xValues.length > maxPoints) {
-                        executionState.valuesMap.delete(xValues.shift()!);
+                    if (!inserted) {
+                        executionState.values.push({
+                            xValue,
+                            lineValues
+                        });
                     }
 
-                    let values = xValues.map(xValue => ({
-                        xValue,
-                        lineValues: executionState!.valuesMap.get(xValue)!
-                    }));
+                    while (executionState.values.length > maxPoints) {
+                        executionState.values.splice(0, 1);
+                    }
 
                     executionState!.maxPoints = maxPoints;
-                    executionState!.values = values;
                 }
             }
 

diff --git a/packages/project-editor/flow/runtime/eez_runtime.wasm b/packages/project-editor/flow/runtime/eez_runtime.wasm
diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v8.3.wasm
diff --git a/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm b/packages/project-editor/flow/runtime/lvgl_runtime_v9.0.wasm
diff --git a/wasm/eez-framework b/wasm/eez-framework
diff --git a/wasm/lvgl-runtime/v8.3/lvgl b/wasm/lvgl-runtime/v8.3/lvgl