Skip to content

Commit 1d91801

Browse files
golluroSICKAGgolluroSICKAG
committed
# Version 2.4.0
## Repository moved to GitHub organization
1 parent cb639f9 commit 1d91801

26 files changed

Lines changed: 3955 additions & 22 deletions

‎CHANGELOG.md‎

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,51 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4-
## Release 0.1.0
5-
- Initial commit
4+
## Release 2.4.0
5+
6+
### Improvements
7+
- Using recursive helper functions to convert Container <-> Lua table
8+
- Update to EmmyLua annotations
9+
- Usage of lua diagnostics
10+
- Documentation updates
11+
12+
## Release 2.3.1
13+
14+
### Bugfix
15+
- Fixed wrong parameter for 'relatedEvent' within 'OnNewImageSizeToShare'-event
16+
- Added missing docu
17+
18+
## Release 2.3.0
19+
20+
### Improvements
21+
- Using internal moduleName variable to be usable in merged apps instead of _APPNAME, as this did not work with PersistentData module in merged apps.
22+
23+
## Release 2.2.0
624

725
### New features
8-
- ...
26+
- Optionally hide content related to CSK_UserManagement
27+
- Sample images added to resources folder
928

1029
### Improvements
11-
- ...
30+
- ParameterName available on UI
31+
- Update of helper funcs to support 4-dim tables for PersistentData
32+
- Loading only required APIs ('LuaLoadAllEngineAPI = false') -> less time for GC needed
33+
- Minor code edits / docu updates
1234

13-
### Bugfix
14-
- ...
35+
## Release 2.1.0
36+
37+
### New features
38+
- Event "OnNewImageSizeToShare" informs if image size changed, so that other modules can react on this
39+
40+
### Improvements
41+
- Prepared for CSK_UserManagement user levels: Operator, Maintenance, Service, Admin (no influence yet)
42+
- Renamed page folder accordingly to module name
43+
- Updated documentation
44+
45+
## Release 2.0.0
46+
47+
### New features
48+
- Update handling of persistent data according to CSK_PersistentData module ver. 2.0.0
49+
50+
## Release 1.0.0
51+
- Initial commit

‎CSK_Module_ImagePlayer/pages/assets/legacy/resources.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎CSK_Module_ImagePlayer/pages/assets/legacy/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"showLoginButton": false
3+
}

‎CSK_Module_ImagePlayer/pages/global.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* Add project wide CSS settings here */

‎CSK_Module_ImagePlayer/pages/i18n/de.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
3+
}

‎CSK_Module_ImagePlayer/pages/i18n/en.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
3+
}

‎CSK_Module_ImagePlayer/pages/package.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "CSK_Module_ImagePlayer",
3+
"version": "1.0.0",
4+
"description": "Generated",
5+
"components": [
6+
"@sick-davinci/basic-elements"
7+
],
8+
"dependencies": {
9+
"@sick-davinci/basic-elements": "^5.0.5"
10+
}
11+
}

‎CSK_Module_ImagePlayer/pages/pages/CSK_Module_ImagePlayer/CSK_Module_ImagePlayer.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.myCustomFrame_CSK_Module_ImagePlayer {
2+
border-style: solid;
3+
border-width: 1px;
4+
border-color: grey;
5+
margin: 6px;
6+
}

‎CSK_Module_ImagePlayer/pages/pages/CSK_Module_ImagePlayer/CSK_Module_ImagePlayer.html‎

Lines changed: 254 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,254 @@
1+
<layout-row id="RowLayout1">
2+
<layout-column id="ColumnLayout10" style="align-items: stretch">
3+
<stacked-view id="SV_Login">
4+
<stacked-pane id="SP_LoggedIn" value="true">
5+
<layout-row id="RowLayout13">
6+
<layout-column id="ColumnLayout5" style="align-items: stretch">
7+
<sick-viewer2d id="Viewer2D1" viewer-id="ImgPlayerViewer"
8+
style="width: 100%; height: 500px">
9+
</sick-viewer2d>
10+
<layout-row id="RowLayout4" style="justify-content: space-between">
11+
<layout-column id="ColumnLayout1" style="align-items: stretch">
12+
<davinci-button id="Button1" type="primary" icon-position="append">
13+
<span>Start</span>
14+
<crown-binding event="submit" name="CSK_ImagePlayer/startProvider"
15+
auto-commit>
16+
</crown-binding>
17+
</davinci-button>
18+
</layout-column>
19+
<layout-column id="ColumnLayout7" style="align-items: stretch">
20+
<davinci-button id="Button3" type="primary" icon-position="append">
21+
<span>Stop</span>
22+
<crown-binding event="submit" name="CSK_ImagePlayer/stopProvider"
23+
auto-commit>
24+
</crown-binding>
25+
</davinci-button>
26+
</layout-column>
27+
<layout-column id="ColumnLayout6" style="align-items: stretch">
28+
<davinci-button id="Button2" type="primary" icon-position="append">
29+
<span>SingleTrigger</span>
30+
<crown-binding event="submit" name="CSK_ImagePlayer/triggerOnce"
31+
auto-commit>
32+
</crown-binding>
33+
</davinci-button>
34+
</layout-column>
35+
</layout-row>
36+
</layout-column>
37+
<layout-column id="ColumnLayout8" style="align-items: stretch">
38+
<layout-row id="RowLayout6">
39+
<layout-column id="ColumnLayout9"
40+
class="myCustomFrame_CSK_Module_ImagePlayer"
41+
style="align-items: stretch">
42+
<layout-row id="RowLayout8"
43+
style="justify-content: space-between; align-items: center">
44+
<davinci-value-display id="VD_ViewerActive" value="Viewer active:">
45+
</davinci-value-display>
46+
<davinci-checkbox id="CB_ViewerActive">
47+
<span></span>
48+
<crown-binding event="change" name="CSK_ImagePlayer/setViewerActive"
49+
path="param/args/status" auto-commit>
50+
</crown-binding>
51+
<crown-edpws-binding property="checked"
52+
name="CSK_ImagePlayer/OnNewStatusViewerActive" update-on-resume>
53+
</crown-edpws-binding>
54+
</davinci-checkbox>
55+
</layout-row>
56+
<layout-row id="RowLayout9"
57+
style="justify-content: space-between; align-items: center">
58+
<davinci-value-display id="VD_ForwardImage" value="Forward image:"
59+
title="Forward loaded images within &quot;CSK_ImagePlayer.OnNewImage&quot;-event for other modules.">
60+
</davinci-value-display>
61+
<davinci-checkbox id="CB_ForwardImage"
62+
title="Forward loaded images within &quot;CSK_ImagePlayer.OnNewImage&quot;-event for other modules.">
63+
<span></span>
64+
<crown-edpws-binding property="checked"
65+
name="CSK_ImagePlayer/OnNewStatusForwardImage" update-on-resume>
66+
</crown-edpws-binding>
67+
<crown-binding event="change" name="CSK_ImagePlayer/setForwardImage"
68+
path="param/args/status" auto-commit>
69+
</crown-binding>
70+
</davinci-checkbox>
71+
</layout-row>
72+
<layout-row id="RowLayout7"
73+
style="align-items: center; justify-content: space-between">
74+
<davinci-value-display id="VD_CycleTime" value="Cycle time:">
75+
</davinci-value-display>
76+
<davinci-numeric-field id="NF_CycleTime" type="outline" min="0"
77+
max="+Infinity" ticks="1" group-separator=","
78+
decimal-separator="." format-pattern="0">
79+
<crown-edpws-binding property="value"
80+
name="CSK_ImagePlayer/OnNewCycleTime" update-on-resume>
81+
</crown-edpws-binding>
82+
<crown-binding event="change" name="CSK_ImagePlayer/setCycleTime"
83+
path="param/args/time" auto-commit>
84+
</crown-binding>
85+
<crown-edpws-binding property="disabled"
86+
name="CSK_ImagePlayer/OnPlayerActive" update-on-resume>
87+
</crown-edpws-binding>
88+
</davinci-numeric-field>
89+
</layout-row>
90+
<layout-row id="RowLayout10"
91+
style="justify-content: space-between; align-items: center">
92+
<davinci-value-display id="VD_ImagePath" value="Image path:"
93+
title="Path to the images like '/public/images'">
94+
</davinci-value-display>
95+
<davinci-text-field id="TF_ImagePath" type="text"
96+
title="Path to the images like '/public/images'">
97+
<crown-edpws-binding property="value" name="CSK_ImagePlayer/OnNewPath"
98+
update-on-resume>
99+
</crown-edpws-binding>
100+
<crown-binding event="change" name="CSK_ImagePlayer/setPath"
101+
path="param/args/path" auto-commit>
102+
</crown-binding>
103+
<crown-edpws-binding property="disabled"
104+
name="CSK_ImagePlayer/OnPlayerActive" update-on-resume>
105+
</crown-edpws-binding>
106+
</davinci-text-field>
107+
</layout-row>
108+
<layout-row id="RowLayout12"
109+
style="justify-content: space-between; align-items: center">
110+
<davinci-value-display id="VD_ImageType" value="Image type:"
111+
title="Image type to load">
112+
</davinci-value-display>
113+
<davinci-drop-down id="DD_ImageType" title="Image type to load">
114+
<davinci-option id="Option1" value="jpg">
115+
<span>jpg</span>
116+
</davinci-option>
117+
<davinci-option id="Option3" value="bmp">
118+
<span>bmp</span>
119+
</davinci-option>
120+
<davinci-option id="Option2" value="png">
121+
<span>png</span>
122+
</davinci-option>
123+
<crown-edpws-binding property="value"
124+
name="CSK_ImagePlayer/OnNewImageType" update-on-resume>
125+
</crown-edpws-binding>
126+
<crown-binding event="change" name="CSK_ImagePlayer/setImageType"
127+
path="param/args/imgType" auto-commit>
128+
</crown-binding>
129+
</davinci-drop-down>
130+
</layout-row>
131+
<layout-row id="RowLayout11"
132+
style="justify-content: space-between; align-items: center">
133+
<davinci-value-display id="VD_ResizeFactor"
134+
value="Image resize factor:"
135+
title="Factor to rescale the loaded images.">
136+
</davinci-value-display>
137+
<davinci-slider id="S_ResizeFactor" min="0.1" max="1" ticks="0.1"
138+
title="Factor to rescale the loaded images." style="width: 50%">
139+
<span></span>
140+
<crown-edpws-binding property="value"
141+
name="CSK_ImagePlayer/OnNewResizeFactor" update-on-resume>
142+
</crown-edpws-binding>
143+
<crown-binding event="change" name="CSK_ImagePlayer/setResizeFactor"
144+
path="param/args/factor" auto-commit>
145+
</crown-binding>
146+
</davinci-slider>
147+
</layout-row>
148+
</layout-column>
149+
</layout-row>
150+
<layout-row id="RowLayout5">
151+
<layout-column id="Column_PersistentData"
152+
class="myCustomFrame_CSK_Module_ImagePlayer"
153+
style="align-items: stretch">
154+
<layout-row id="RowLayout41"
155+
style="justify-content: space-between; align-items: center">
156+
<layout-column id="ColumnLayout51" style="align-items: stretch">
157+
<davinci-value-display id="VD_ParameterName" value="Parameter name:"
158+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
159+
</davinci-value-display>
160+
</layout-column>
161+
<layout-column id="ColumnLayout62" style="align-items: stretch">
162+
<davinci-text-field id="TF_ParameterName" type="text"
163+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
164+
<crown-edpws-binding property="value"
165+
name="CSK_ImagePlayer/OnNewParameterName" update-on-resume>
166+
</crown-edpws-binding>
167+
<crown-binding event="change" name="CSK_ImagePlayer/setParameterName"
168+
path="param/args/name" auto-commit>
169+
</crown-binding>
170+
<crown-edpws-binding property="disabled"
171+
name="CSK_ImagePlayer/OnPersistentDataModuleAvailable"
172+
update-on-resume converter="function(value) {return !value;}">
173+
</crown-edpws-binding>
174+
</davinci-text-field>
175+
</layout-column>
176+
</layout-row>
177+
<layout-row id="RowLayout2"
178+
style="justify-content: space-between; align-items: center">
179+
<davinci-value-display id="VD_LoadConfig"
180+
value="Load config on app start:"
181+
title="Load configured parameters from CSK_PersistentData on app start.">
182+
</davinci-value-display>
183+
<davinci-checkbox id="CB_LoadConfig"
184+
title="Load configured parameters from CSK_PersistentData on app start.">
185+
<span></span>
186+
<crown-edpws-binding property="checked"
187+
name="CSK_ImagePlayer/OnNewStatusLoadParameterOnReboot"
188+
update-on-resume>
189+
</crown-edpws-binding>
190+
<crown-edpws-binding property="disabled"
191+
name="CSK_ImagePlayer/OnPersistentDataModuleAvailable"
192+
update-on-resume converter="function(value) {return !value;}">
193+
</crown-edpws-binding>
194+
<crown-binding event="change" name="CSK_ImagePlayer/setLoadOnReboot"
195+
path="param/args/status" auto-commit>
196+
</crown-binding>
197+
</davinci-checkbox>
198+
</layout-row>
199+
<layout-row id="RowLayout3">
200+
<layout-column id="ColumnLayout3" style="align-items: stretch">
201+
<davinci-button id="B_LoadConfig" type="primary"
202+
icon-position="append"
203+
title="Load configured parameters from CSK_PersistentData module.">
204+
<span>Load Config</span>
205+
<crown-binding event="submit" name="CSK_ImagePlayer/loadParameters"
206+
auto-commit>
207+
</crown-binding>
208+
<crown-edpws-binding property="disabled"
209+
name="CSK_ImagePlayer/OnPersistentDataModuleAvailable"
210+
update-on-resume converter="function(value) {return !value;}">
211+
</crown-edpws-binding>
212+
</davinci-button>
213+
</layout-column>
214+
<layout-column id="ColumnLayout4" style="align-items: stretch">
215+
<davinci-button id="B_SaveConfig" type="primary"
216+
icon-position="append">
217+
<span>Save Config</span>
218+
<crown-binding event="submit" name="CSK_ImagePlayer/sendParameters"
219+
auto-commit>
220+
</crown-binding>
221+
<crown-edpws-binding property="disabled"
222+
name="CSK_ImagePlayer/OnPersistentDataModuleAvailable"
223+
update-on-resume converter="function(value) {return !value;}">
224+
</crown-edpws-binding>
225+
</davinci-button>
226+
</layout-column>
227+
</layout-row>
228+
</layout-column>
229+
</layout-row>
230+
</layout-column>
231+
<layout-column id="ColumnLayout2" style="align-items: stretch">
232+
<stacked-view id="SV_PageCalled">
233+
<crown-binding property="value" name="CSK_ImagePlayer/pageCalled"
234+
path="result/data/empty" auto-update="0" update-on-resume>
235+
</crown-binding>
236+
</stacked-view>
237+
</layout-column>
238+
</layout-row>
239+
</stacked-pane>
240+
<stacked-pane id="SP_NotLoggedIn" value="false">
241+
<davinci-callout id="Callout1" type="info">
242+
<span>
243+
Please login with minimum user level Maintenance to see this page.
244+
</span>
245+
</davinci-callout>
246+
</stacked-pane>
247+
<crown-edpws-binding property="value"
248+
name="CSK_ImagePlayer/OnUserLevelMaintenanceActive"
249+
update-on-resume
250+
converter="function(value) {return value.toString();}">
251+
</crown-edpws-binding>
252+
</stacked-view>
253+
</layout-column>
254+
</layout-row>

‎CSK_Module_ImagePlayer/pages/pages/navigation.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"version": "1.0",
3+
"pages": []
4+
}

0 commit comments

Comments
 (0)