Skip to content

Commit 1aacd59

Browse files
tobiasguyertobiasguyer
committed
feat: add color_mode to WebUIPlugin
1 parent 1fe3835 commit 1aacd59

18 files changed

Lines changed: 704 additions & 394 deletions

File tree

‎eez-ui/gaggimate.eez-project‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16462,7 +16462,7 @@
1646216462
"width": 16,
1646316463
"color": "NiceWhite",
1646416464
"radiusModifier": -260,
16465-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
16465+
"value": "(time_container.hour%12) * 3600 + time_container.min * 60 + time_container.sec",
1646616466
"valueType": "expression"
1646716467
},
1646816468
{
@@ -16472,7 +16472,7 @@
1647216472
"width": 16,
1647316473
"color": "NiceWhite",
1647416474
"radiusModifier": -90,
16475-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
16475+
"value": "(time_container.hour%12) *3600 + time_container.min * 60 + time_container.sec",
1647616476
"valueType": "expression"
1647716477
}
1647816478
],
@@ -19451,7 +19451,7 @@
1945119451
"width": 8,
1945219452
"color": "NiceWhite",
1945319453
"radiusModifier": -260,
19454-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
19454+
"value": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
1945519455
"valueType": "expression"
1945619456
},
1945719457
{
@@ -19461,7 +19461,7 @@
1946119461
"width": 8,
1946219462
"color": "NiceWhite",
1946319463
"radiusModifier": -90,
19464-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
19464+
"value": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
1946519465
"valueType": "expression"
1946619466
}
1946719467
],
@@ -20200,7 +20200,7 @@
2020020200
"width": 4,
2020120201
"color": "NiceWhite",
2020220202
"radiusModifier": -22,
20203-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
20203+
"value": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
2020420204
"valueType": "expression"
2020520205
},
2020620206
{
@@ -20210,7 +20210,7 @@
2021020210
"width": 4,
2021120211
"color": "NiceWhite",
2021220212
"radiusModifier": -100,
20213-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
20213+
"value": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
2021420214
"valueType": "expression"
2021520215
}
2021620216
],
@@ -20790,7 +20790,7 @@
2079020790
"width": 4,
2079120791
"color": "NiceWhite",
2079220792
"radiusModifier": -22,
20793-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
20793+
"value": "(time_container.hour % 12)*3600 + time_container.min * 60 + time_container.sec",
2079420794
"valueType": "expression"
2079520795
},
2079620796
{
@@ -20800,7 +20800,7 @@
2080020800
"width": 4,
2080120801
"color": "NiceWhite",
2080220802
"radiusModifier": -100,
20803-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
20803+
"value": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
2080420804
"valueType": "expression"
2080520805
}
2080620806
],
@@ -22906,7 +22906,7 @@
2290622906
"width": 10,
2290722907
"color": "NiceWhite",
2290822908
"radiusModifier": -90,
22909-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
22909+
"value": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
2291022910
"valueType": "expression"
2291122911
}
2291222912
],
@@ -23235,7 +23235,7 @@
2323523235
"radiusModifier": -40,
2323623236
"startValue": 0,
2323723237
"startValueType": "literal",
23238-
"endValue": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
23238+
"endValue": "(time_container.hour % 12) + time_container.min * 60 + time_container.sec",
2323923239
"endValueType": "expression"
2324023240
}
2324123241
],
@@ -23911,7 +23911,7 @@
2391123911
"width": 4,
2391223912
"color": "SemiDark",
2391323913
"radiusModifier": -120,
23914-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
23914+
"value": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
2391523915
"valueType": "expression"
2391623916
}
2391723917
],
@@ -24076,7 +24076,7 @@
2407624076
"width": 10,
2407724077
"color": "NiceWhite",
2407824078
"radiusModifier": -90,
24079-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
24079+
"value": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
2408024080
"valueType": "expression"
2408124081
}
2408224082
],
@@ -24270,7 +24270,7 @@
2427024270
"radiusModifier": -40,
2427124271
"startValue": 0,
2427224272
"startValueType": "literal",
24273-
"endValue": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
24273+
"endValue": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
2427424274
"endValueType": "expression"
2427524275
},
2427624276
{
@@ -24279,7 +24279,7 @@
2427924279
"width": 2,
2428024280
"color": "lighten(Heating, 85%)",
2428124281
"radiusModifier": -40,
24282-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
24282+
"value": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
2428324283
"valueType": "expression"
2428424284
}
2428524285
],
@@ -24573,7 +24573,7 @@
2457324573
"radiusModifier": -4,
2457424574
"startValue": 0,
2457524575
"startValueType": "literal",
24576-
"endValue": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
24576+
"endValue": "(time_container.hour % 12) *3600 + time_container.min * 60 + time_container.sec",
2457724577
"endValueType": "expression"
2457824578
},
2457924579
{
@@ -24582,7 +24582,7 @@
2458224582
"width": 2,
2458324583
"color": "Heating",
2458424584
"radiusModifier": -80,
24585-
"value": "time_container.hour *3600 + time_container.min * 60 + time_container.sec",
24585+
"value": "(time_container.hour % 12)*3600 + time_container.min * 60 + time_container.sec",
2458624586
"valueType": "expression"
2458724587
}
2458824588
],

‎eez-ui/gaggimate.eez-project-ui-state‎

Lines changed: 161 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"navigation": {
33
"selectedUserPageObject": "[gaggimate.eez-project]:/userPages/0",
4-
"selectedUserWidgetObject": "[gaggimate.eez-project]:/userWidgets/7",
4+
"selectedUserWidgetObject": "[gaggimate.eez-project]:/userWidgets/14",
55
"selectedActionObject": "[gaggimate.eez-project]:/actions/41",
66
"selectedGlobalVariableObject": "[gaggimate.eez-project]:/variables/globalVariables/3",
77
"selectedStructureObject": "[gaggimate.eez-project]:/variables/structures/0",
@@ -79,7 +79,7 @@
7979
},
8080
{
8181
"type": "border",
82-
"selected": 0,
82+
"selected": 1,
8383
"size": 154.5,
8484
"location": "bottom",
8585
"children": [
@@ -205,10 +205,10 @@
205205
{
206206
"type": "tab",
207207
"id": "#5e050bf7-afbb-4b07-9783-e0a675b95e19",
208-
"name": "binary_clock_1",
208+
"name": "clock_minimal_arc_2",
209209
"component": "editor",
210210
"config": {
211-
"objectPath": "[gaggimate.eez-project]:/userWidgets/7",
211+
"objectPath": "[gaggimate.eez-project]:/userWidgets/14",
212212
"permanent": false
213213
},
214214
"icon": "svg:user_widget"
@@ -360,7 +360,8 @@
360360
},
361361
"icon": "svg:page"
362362
}
363-
]
363+
],
364+
"active": true
364365
},
365366
{
366367
"type": "row",
@@ -380,8 +381,7 @@
380381
"enableClose": false,
381382
"icon": "svg:properties"
382383
}
383-
],
384-
"active": true
384+
]
385385
},
386386
{
387387
"type": "tabset",
@@ -2445,7 +2445,11 @@
24452445
},
24462446
"[gaggimate.eez-project]:/userWidgets/4[flow-state]": {
24472447
"selectionFront": {},
2448-
"selectionBack": {},
2448+
"selectionBack": {
2449+
"2": {
2450+
"$selected": true
2451+
}
2452+
},
24492453
"transform": {
24502454
"translate": {
24512455
"x": -240,
@@ -2470,7 +2474,10 @@
24702474
"4": {},
24712475
"5": {},
24722476
"6": {},
2473-
"7": {}
2477+
"7": {},
2478+
"8": {
2479+
"$selected": true
2480+
}
24742481
},
24752482
"transform": {
24762483
"translate": {
@@ -2489,7 +2496,8 @@
24892496
"[gaggimate.eez-project]:/userWidgets/6[flow-state]": {
24902497
"selectionFront": {},
24912498
"selectionBack": {
2492-
"2": {
2499+
"2": {},
2500+
"8": {
24932501
"$selected": true
24942502
}
24952503
},
@@ -2527,6 +2535,149 @@
25272535
"secondToPx": 200,
25282536
"scrollLeft": 0
25292537
}
2538+
},
2539+
"[gaggimate.eez-project]:/userWidgets/8[flow-state]": {
2540+
"selectionFront": {},
2541+
"selectionBack": {
2542+
"0": {
2543+
"$selected": true
2544+
}
2545+
},
2546+
"transform": {
2547+
"translate": {
2548+
"x": -240,
2549+
"y": -240
2550+
},
2551+
"scale": 1
2552+
},
2553+
"timeline": {
2554+
"isEditorActive": false,
2555+
"position": 0,
2556+
"secondToPx": 200,
2557+
"scrollLeft": 0
2558+
}
2559+
},
2560+
"[gaggimate.eez-project]:/userWidgets/9[flow-state]": {
2561+
"selectionFront": {},
2562+
"selectionBack": {
2563+
"0": {
2564+
"$selected": true
2565+
}
2566+
},
2567+
"transform": {
2568+
"translate": {
2569+
"x": -240,
2570+
"y": -240
2571+
},
2572+
"scale": 1
2573+
},
2574+
"timeline": {
2575+
"isEditorActive": false,
2576+
"position": 0,
2577+
"secondToPx": 200,
2578+
"scrollLeft": 0
2579+
}
2580+
},
2581+
"[gaggimate.eez-project]:/userWidgets/10[flow-state]": {
2582+
"selectionFront": {},
2583+
"selectionBack": {
2584+
"1": {
2585+
"$selected": true
2586+
}
2587+
},
2588+
"transform": {
2589+
"translate": {
2590+
"x": -240,
2591+
"y": -240
2592+
},
2593+
"scale": 1
2594+
},
2595+
"timeline": {
2596+
"isEditorActive": false,
2597+
"position": 0,
2598+
"secondToPx": 200,
2599+
"scrollLeft": 0
2600+
}
2601+
},
2602+
"[gaggimate.eez-project]:/userWidgets/11[flow-state]": {
2603+
"selectionFront": {},
2604+
"selectionBack": {
2605+
"2": {
2606+
"$selected": true
2607+
}
2608+
},
2609+
"transform": {
2610+
"translate": {
2611+
"x": -240,
2612+
"y": -440
2613+
},
2614+
"scale": 1
2615+
},
2616+
"timeline": {
2617+
"isEditorActive": false,
2618+
"position": 0,
2619+
"secondToPx": 200,
2620+
"scrollLeft": 0
2621+
}
2622+
},
2623+
"[gaggimate.eez-project]:/userWidgets/12[flow-state]": {
2624+
"selectionFront": {},
2625+
"selectionBack": {
2626+
"0": {
2627+
"$selected": true
2628+
}
2629+
},
2630+
"transform": {
2631+
"translate": {
2632+
"x": -240,
2633+
"y": -240
2634+
},
2635+
"scale": 1
2636+
},
2637+
"timeline": {
2638+
"isEditorActive": false,
2639+
"position": 0,
2640+
"secondToPx": 200,
2641+
"scrollLeft": 0
2642+
}
2643+
},
2644+
"[gaggimate.eez-project]:/userWidgets/13[flow-state]": {
2645+
"selectionFront": {},
2646+
"selectionBack": {
2647+
"0": {
2648+
"$selected": true
2649+
}
2650+
},
2651+
"transform": {
2652+
"translate": {
2653+
"x": -240,
2654+
"y": -240
2655+
},
2656+
"scale": 1
2657+
},
2658+
"timeline": {
2659+
"isEditorActive": false,
2660+
"position": 0,
2661+
"secondToPx": 200,
2662+
"scrollLeft": 0
2663+
}
2664+
},
2665+
"[gaggimate.eez-project]:/userWidgets/14[flow-state]": {
2666+
"selectionFront": {},
2667+
"selectionBack": {},
2668+
"transform": {
2669+
"translate": {
2670+
"x": -240,
2671+
"y": -240
2672+
},
2673+
"scale": 1
2674+
},
2675+
"timeline": {
2676+
"isEditorActive": false,
2677+
"position": 0,
2678+
"secondToPx": 200,
2679+
"scrollLeft": 0
2680+
}
25302681
}
25312682
},
25322683
"activeOutputSection": 0,

0 commit comments

Comments
 (0)