goran-mahovlic
/
eez-flow-template-stm32f746g-disco
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Touch is working - adding two page demo

main
Goran Mahovlic 2 years ago
parent
ca2ba8a7fb
commit
6c4d010820
5 changed files with 13484 additions and 13207 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12015
      Debug/stm32f746g-disco.hex
  2. 162
      Src/eez-flow-template-stm32f746g-disco.eez-project
  3. 51
      Src/eez-flow-template-stm32f746g-disco.eez-project-ui-state
  4. 14415
      Src/gui/document.cpp
  5. 48
      Src/gui/document.h

12015
Debug/stm32f746g-disco.hex
View File

File diff suppressed because it is too large Load Diff

162
Src/eez-flow-template-stm32f746g-disco.eez-project
Unescape View File

@ -329,7 +329,7 @@
"objID": "70d0c5d1-81cf-4013-ef6d-841ed1a83748", "objID": "70d0c5d1-81cf-4013-ef6d-841ed1a83748",
"type": "TextWidget", "type": "TextWidget",
"left": 19, "left": 19,
"top": 167, "top": 129,
"width": 437, "width": 437,
"height": 65, "height": 65,
"customInputs": [], "customInputs": [],
@ -340,9 +340,56 @@
"inheritFrom": "default_XL" "inheritFrom": "default_XL"
}, },
"timeline": [] "timeline": []
},
{
"objID": "b8a2f421-4b76-4295-f350-3ef14f86714d",
"type": "ButtonWidget",
"left": 169,
"top": 216,
"width": 141,
"height": 40,
"customInputs": [],
"customOutputs": [],
"asOutputProperties": [
"action"
],
"data": "\"Next\"",
"resizing": {
"pinToEdge": 0,
"fixSize": 3
},
"style": {
"objID": "88090903-67a2-42ba-f82e-dcbec9eaf05c",
"inheritFrom": "button"
},
"timeline": [],
"text": "",
"disabledStyle": {
"objID": "bb0ffd13-534b-4610-f2a0-916a32fc98b1",
"inheritFrom": "button_disabled"
}
},
{
"objID": "d76c7722-9cf1-4b8e-a569-6474302f6798",
"type": "ShowPageActionComponent",
"left": 431,
"top": 296,
"width": 105,
"height": 53,
"customInputs": [],
"customOutputs": [],
"page": "page1"
}
],
"connectionLines": [
{
"objID": "c547d4b4-2c35-4ba3-8112-00ed48923ecc",
"source": "b8a2f421-4b76-4295-f350-3ef14f86714d",
"output": "action",
"target": "d76c7722-9cf1-4b8e-a569-6474302f6798",
"input": "@seqin"
} }
], ],
"connectionLines": [],
"localVariables": [], "localVariables": [],
"name": "main", "name": "main",
"style": "background", "style": "background",
@ -360,7 +407,7 @@
"type": "DisplayData", "type": "DisplayData",
"left": 0, "left": 0,
"top": 0, "top": 0,
"width": 350, "width": 274,
"height": 272, "height": 272,
"customInputs": [], "customInputs": [],
"customOutputs": [], "customOutputs": [],
@ -2639,6 +2686,115 @@
"top": 0, "top": 0,
"width": 1000, "width": 1000,
"height": 680 "height": 680
},
{
"objID": "2a2b4561-23c6-4b99-8ce9-35b54f251dfc",
"components": [
{
"objID": "ec5c3671-2e7d-4934-ddb4-4d210bfac087",
"type": "TextWidget",
"left": 19,
"top": 14,
"width": 437,
"height": 65,
"customInputs": [],
"customOutputs": [],
"data": "\"EEZ flow template\"",
"style": {
"objID": "759e70f7-0da0-ee89-4fb3-c9fe64b200c5",
"inheritFrom": "default_XL"
},
"timeline": []
},
{
"objID": "04666a7a-9454-43a8-8edb-88d987d01e28",
"type": "ButtonWidget",
"left": 169,
"top": 216,
"width": 141,
"height": 40,
"customInputs": [],
"customOutputs": [],
"asOutputProperties": [
"action"
],
"data": "\"Back\"",
"resizing": {
"pinToEdge": 0,
"fixSize": 3
},
"style": {
"objID": "88090903-67a2-42ba-f82e-dcbec9eaf05c",
"inheritFrom": "button"
},
"timeline": [],
"text": "",
"disabledStyle": {
"objID": "bb0ffd13-534b-4610-f2a0-916a32fc98b1",
"inheritFrom": "button_disabled"
}
},
{
"objID": "32ae425b-6e97-4746-cadf-54a7166fb17e",
"type": "ShowPageActionComponent",
"left": 431,
"top": 296,
"width": 105,
"height": 53,
"customInputs": [],
"customOutputs": [],
"page": "main"
},
{
"objID": "a2c5a4ad-27e8-4acf-872d-ab772af152c2",
"type": "TextWidget",
"left": 19,
"top": 79,
"width": 437,
"height": 65,
"customInputs": [],
"customOutputs": [],
"data": "\"STM32F746G-DISCO\"",
"style": {
"objID": "385c5427-0e29-4d48-b266-3b6afa8a50f8",
"inheritFrom": "default_XL"
},
"timeline": []
},
{
"objID": "c14b1d9d-6b5d-4455-888b-dba24641c393",
"type": "TextWidget",
"left": 19,
"top": 144,
"width": 437,
"height": 65,
"customInputs": [],
"customOutputs": [],
"data": "\"EEZ Studio\"",
"style": {
"objID": "385c5427-0e29-4d48-b266-3b6afa8a50f8",
"inheritFrom": "default_XL"
},
"timeline": []
}
],
"connectionLines": [
{
"objID": "c547d4b4-2c35-4ba3-8112-00ed48923ecc",
"source": "04666a7a-9454-43a8-8edb-88d987d01e28",
"output": "action",
"target": "32ae425b-6e97-4746-cadf-54a7166fb17e",
"input": "@seqin"
}
],
"localVariables": [],
"name": "page1",
"style": "background",
"left": 0,
"top": 0,
"width": 480,
"height": 272,
"scaleToFit": true
} }
], ],
"styles": [ "styles": [

51
Src/eez-flow-template-stm32f746g-disco.eez-project-ui-state
Unescape View File

@ -299,9 +299,28 @@
{ {
"type": "tabset", "type": "tabset",
"id": "#15b79ec2-7082-4764-9917-8e585dde6ea9", "id": "#15b79ec2-7082-4764-9917-8e585dde6ea9",
"selected": 2,
"children": [ "children": [
{ {
"type": "tab", "type": "tab",
"id": "#459282ee-8b08-4710-9041-34acfa44c66d",
"name": "numeric_keypad",
"component": "editor",
"config": {
"objectPath": "/pages/1"
}
},
{
"type": "tab",
"id": "#9340689c-ca97-4f4d-a47c-228ad22ea6a7",
"name": "keyboard",
"component": "editor",
"config": {
"objectPath": "/pages/2"
}
},
{
"type": "tab",
"id": "#42baadae-6b31-4ac3-9e33-20b4948d01df", "id": "#42baadae-6b31-4ac3-9e33-20b4948d01df",
"name": "main", "name": "main",
"component": "editor", "component": "editor",
@ -909,6 +928,22 @@
"selection": {}, "selection": {},
"transform": { "transform": {
"translate": { "translate": {
"x": -240,
"y": -189
},
"scale": 1
},
"timeline": {
"isEditorActive": false,
"position": 0,
"secondToPx": 200,
"scrollLeft": 0
}
},
"/pages/2[flow-state]": {
"selection": {},
"transform": {
"translate": {
"x": -400, "x": -400,
"y": -240 "y": -240
}, },
@ -920,6 +955,22 @@
"secondToPx": 200, "secondToPx": 200,
"scrollLeft": 0 "scrollLeft": 0
} }
},
"/pages/1[flow-state]": {
"selection": {},
"transform": {
"translate": {
"x": -240,
"y": -136
},
"scale": 1
},
"timeline": {
"isEditorActive": false,
"position": 0,
"secondToPx": 200,
"scrollLeft": 0
}
} }
}, },
"activeOutputSection": 0, "activeOutputSection": 0,

14415
Src/gui/document.cpp
View File

File diff suppressed because it is too large Load Diff

48
Src/gui/document.h
Unescape View File

@ -118,14 +118,16 @@ enum StylesEnum {
STYLE_ID_FPS_GRAPH = 13, STYLE_ID_FPS_GRAPH = 13,
STYLE_ID_BACKGROUND = 14, STYLE_ID_BACKGROUND = 14,
STYLE_ID_DEFAULT_XL = 15, STYLE_ID_DEFAULT_XL = 15,
STYLE_ID_DEFAULT_XXL = 16, STYLE_ID_BUTTON = 16,
STYLE_ID_TEXT_BUTTON = 17, STYLE_ID_BUTTON_DISABLED = 17,
STYLE_ID_TEXT_BUTTON_DISABLED = 18, STYLE_ID_DEFAULT_XXL = 18,
STYLE_ID_BUTTON_ICON = 19, STYLE_ID_TEXT_BUTTON = 19,
STYLE_ID_TEXT_INPUT = 20, STYLE_ID_TEXT_BUTTON_DISABLED = 20,
STYLE_ID_DEFAULT = 21, STYLE_ID_BUTTON_ICON = 21,
STYLE_ID_TEXT_BUTTON_ICON = 22, STYLE_ID_TEXT_INPUT = 22,
STYLE_ID_TEXT_BUTTON_ICON_DISABLED = 23 STYLE_ID_DEFAULT = 23,
STYLE_ID_TEXT_BUTTON_ICON = 24,
STYLE_ID_TEXT_BUTTON_ICON_DISABLED = 25
}; };
enum ThemesEnum { enum ThemesEnum {
@ -175,10 +177,11 @@ enum PagesEnum {
PAGE_ID_NONE = 0, PAGE_ID_NONE = 0,
PAGE_ID_MAIN = 1, PAGE_ID_MAIN = 1,
PAGE_ID_NUMERIC_KEYPAD = 2, PAGE_ID_NUMERIC_KEYPAD = 2,
PAGE_ID_KEYBOARD = 3 PAGE_ID_KEYBOARD = 3,
PAGE_ID_PAGE1 = 4
}; };
extern const uint8_t assets[61117]; extern const uint8_t assets[61450];
#elif defined(EEZ_PLATFORM_SIMULATOR) #elif defined(EEZ_PLATFORM_SIMULATOR)
@ -295,15 +298,17 @@ enum StylesEnum {
STYLE_ID_FPS_GRAPH = 13, STYLE_ID_FPS_GRAPH = 13,
STYLE_ID_BACKGROUND = 14, STYLE_ID_BACKGROUND = 14,
STYLE_ID_DEFAULT_XL = 15, STYLE_ID_DEFAULT_XL = 15,
STYLE_ID_DEFAULT_XXL = 16, STYLE_ID_BUTTON = 16,
STYLE_ID_TEXT_BUTTON = 17, STYLE_ID_BUTTON_DISABLED = 17,
STYLE_ID_TEXT_BUTTON_DISABLED = 18, STYLE_ID_DEFAULT_XXL = 18,
STYLE_ID_BUTTON_ICON = 19, STYLE_ID_TEXT_BUTTON = 19,
STYLE_ID_TEXT_INPUT = 20, STYLE_ID_TEXT_BUTTON_DISABLED = 20,
STYLE_ID_DEFAULT = 21, STYLE_ID_BUTTON_ICON = 21,
STYLE_ID_TEXT_BUTTON_ICON = 22, STYLE_ID_TEXT_INPUT = 22,
STYLE_ID_TEXT_BUTTON_ICON_DISABLED = 23, STYLE_ID_DEFAULT = 23,
STYLE_ID_INLINE23 = 24 STYLE_ID_TEXT_BUTTON_ICON = 24,
STYLE_ID_TEXT_BUTTON_ICON_DISABLED = 25,
STYLE_ID_INLINE25 = 26
}; };
enum ThemesEnum { enum ThemesEnum {
@ -355,10 +360,11 @@ enum PagesEnum {
PAGE_ID_MAIN = 1, PAGE_ID_MAIN = 1,
PAGE_ID_NUMERIC_KEYPAD = 2, PAGE_ID_NUMERIC_KEYPAD = 2,
PAGE_ID_KEYBOARD = 3, PAGE_ID_KEYBOARD = 3,
PAGE_ID_FRONT_PANEL = 4 PAGE_ID_FRONT_PANEL = 4,
PAGE_ID_PAGE1 = 5
}; };
extern const uint8_t assets[77537]; extern const uint8_t assets[77889];
#endif #endif

Write Preview
Loading…
Cancel
Save