diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 79988f43..1b7baaaa 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -64,7 +64,7 @@ │ Max. Text Size: 25 │ │ Variable (string) tInstruction -│ @@ -103,24 +94,14 @@ +│ @@ -103,34 +94,14 @@ │ Value: 0 │ │ Variable (int32) ycR @@ -82,6 +82,16 @@ │ - Text : │ - Max. Text Size : 10 │ - +│ - Events +│ - Touch Press Event +│ - if(tDate.x==0) +│ - { +│ - vis m0,1 +│ - }else +│ - { +│ - vis m0,1 +│ - } +│ - │ Text t10 │ Attributes │ Scope : local @@ -89,7 +99,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -370,15 +351,15 @@ +│ @@ -380,15 +351,15 @@ │ Text tTime │ Attributes │ Scope : local @@ -106,7 +116,7 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 -│ @@ -582,15 +563,14 @@ +│ @@ -592,15 +563,14 @@ │ spstr strCommand.txt,tIcon1.txt,"~",17 │ spstr strCommand.txt,tTmp.txt,"~",18 │ covx tTmp.txt,tIcon1.pco,0,0 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 82bef759..8201088a 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -22,10 +22,6 @@ popupNotify 19 Component(s) 257 Line(s) of event code 166 Unique line(s) of event code -screensaver - 45 Component(s) - 400 Line(s) of event code - 296 Unique line(s) of event code popupLight 28 Component(s) 408 Line(s) of event code @@ -74,6 +70,10 @@ cardGrid 42 Component(s) 514 Line(s) of event code 293 Unique line(s) of event code +screensaver + 45 Component(s) + 400 Line(s) of event code + 296 Unique line(s) of event code Total 18 Page(s) diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 423dfad6..f935e5bb 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -863,8 +863,8 @@ Text tNotifyText Vertical Alignment : top Input Type : character Text : - Max. Text Size : 35 - Word wrap : disabled + Max. Text Size : 80 + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index c04d751d..5010cdf7 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -346,7 +346,7 @@ Text tNotifyText Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 35 + Max. Text Size : 80 Text tTime Attributes diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 8c21bd0f..3fa9e653 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -862,7 +862,7 @@ │ Max. Text Size: 25 │ │ Variable (string) tInstruction -│ @@ -103,24 +94,14 @@ +│ @@ -103,34 +94,14 @@ │ Value: 0 │ │ Variable (int32) ycR @@ -880,6 +880,16 @@ │ - Text : │ - Max. Text Size : 10 │ - +│ - Events +│ - Touch Press Event +│ - if(tDate.x==0) +│ - { +│ - vis m0,1 +│ - }else +│ - { +│ - vis m0,1 +│ - } +│ - │ Text t10 │ Attributes │ Scope : local @@ -887,7 +897,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -582,15 +563,14 @@ +│ @@ -592,15 +563,14 @@ │ spstr strCommand.txt,tIcon1.txt,"~",17 │ spstr strCommand.txt,tTmp.txt,"~",18 │ covx tTmp.txt,tIcon1.pco,0,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 3a215dd2..9df0afaa 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-10 08:03:16.022725697 +0000 ++++ /dev/fd/62 2022-12-10 19:17:36.292152828 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt @@ -218,7 +218,7 @@ + Max. Text Size: 25 + +e (string) tInstruction -+24 +94,14 @@ ++34 +94,14 @@ + Value: 0 + +e (int32) ycR @@ -236,6 +236,16 @@ + Text : + Max. Text Size : 10 + ++nts ++ Touch Press Event ++ if(tDate.x==0) ++ { ++ vis m0,1 ++ }else ++ { ++ vis m0,1 ++ } ++ +0 +ributes + Scope : local diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 34183850..3b96a509 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -863,8 +863,8 @@ Text tNotifyText Vertical Alignment : center Input Type : character Text : - Max. Text Size : 35 - Word wrap : disabled + Max. Text Size : 80 + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 6558ae41..dc84818e 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -346,7 +346,7 @@ Text tNotifyText Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 35 + Max. Text Size : 80 Text tTime Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 1bcf59ef..18866edf 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -18,14 +18,14 @@ cardChart 31 Component(s) 452 Line(s) of event code 296 Unique line(s) of event code +pageTest + 20 Component(s) + 65 Line(s) of event code + 63 Unique line(s) of event code pageStartup 19 Component(s) 181 Line(s) of event code 129 Unique line(s) of event code -pageTest - 23 Component(s) - 73 Line(s) of event code - 69 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code @@ -50,6 +50,10 @@ cardPower 43 Component(s) 439 Line(s) of event code 299 Unique line(s) of event code +screensaver + 47 Component(s) + 409 Line(s) of event code + 301 Unique line(s) of event code cardQR 32 Component(s) 425 Line(s) of event code @@ -58,10 +62,6 @@ cardAlarm 40 Component(s) 443 Line(s) of event code 263 Unique line(s) of event code -screensaver - 47 Component(s) - 402 Line(s) of event code - 298 Unique line(s) of event code cardThermo 53 Component(s) 612 Line(s) of event code @@ -77,6 +77,6 @@ cardEntities Total 18 Page(s) - 636 Component(s) - 7933 Line(s) of event code - 2008 Unique line(s) of event code + 633 Component(s) + 7932 Line(s) of event code + 2004 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt index a0c51a97..c1c6eecf 100644 --- a/HMI/n2t-out-visual/pageTest.txt +++ b/HMI/n2t-out-visual/pageTest.txt @@ -45,77 +45,6 @@ Variable (string) tSend Text : Max. Text Size: 40 -Text m0 - Attributes - ID : 20 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 465 - y coordinate : 0 - Width : 15 - Height : 320 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 63488 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - tTmp.txt="change model conf to us-l/p " - strlen tTmp.txt,sys1 - sya1=sys1*11+m0.h-48/2 - for(sys0=0;sys0