Skip to content

Commit 9a86680

Browse files
golluroSICKAGgolluroSICKAG
committed
# Version 3.5.0
## Repository moved to GitHub organization
1 parent dfc8a86 commit 9a86680

22 files changed

Lines changed: 3953 additions & 23 deletions

‎CHANGELOG.md‎

Lines changed: 77 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,85 @@
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 3.5.0
65

7-
### New features
8-
- ...
6+
### Improvements
7+
- Using recursive helper functions to convert Container <-> Lua table
8+
9+
## Release 3.4.0
10+
11+
### Improvements
12+
- Update to EmmyLua annotations
13+
- Usage of lua diagnostics
14+
- Documentation updates
15+
16+
## Release 3.3.0
17+
18+
### Improvements
19+
- Using internal moduleName variable to be usable in merged apps instead of _APPNAME, as this did not work with PersistentData module in merged apps.
20+
21+
## Release 3.2.2
922

1023
### Improvements
11-
- ...
24+
- Naming of UI elements and adding some mouse over info texts
25+
- Appname added to log messages
26+
- Minor edits
1227

1328
### Bugfix
14-
- ...
29+
- UI events notified after pageLoad after 300ms instead of 100ms to not miss
30+
31+
## Release 3.2.1
32+
33+
### Improvements
34+
- Minor edits
35+
36+
## Release 3.2.0
37+
38+
### Improvements
39+
- Per default use 'LuaLoadAllEngineAPI = true' to make it easier to start
40+
- Update of helper funcs
41+
- Hiding SOPAS Login
42+
- Minor code edits / docu updates
43+
44+
## Release 3.1.0
45+
46+
### Improvements
47+
- Loading only required APIs ('LuaLoadAllEngineAPI = false') -> less time for GC needed
48+
- Changed status type of user levels from string to bool (usable with CSK_Module_UserManagement since version 1.2.1)
49+
- Renamed page folder accordingly to module name
50+
51+
## Release 3.0.0
52+
53+
### New features
54+
- Compatible to PersistentData Module ver >= 3.0.0 to store InstanceAmount within Parameter binary file instead of CID Parameter
55+
- By this, multiple instances are created now after PersistentData loaded and provides data
56+
57+
### Improvements
58+
- Renaming of "Objects" to "Instances", so that it makes more sense if internal "objects" are used within the module (e.g. 'colorObjects' within the 'CSK_MultiColorSelection'-module)
59+
- Provide sample code to use optionally internal extra objects
60+
- Using of example manifest entries to automatically adapt events accordingly to created instances (e.g. 'processInstanceNUM', 'OnNewValueUpdateNUM', 'OnNewValueToForwardNUM'
61+
- Including forward functions like 'handleOnNewValueToForward', 'handleOnNewValueUpdate' to make it easier to forward content from internal threads/instances to general app/UI
62+
63+
## Release 2.1.0
64+
65+
### New features
66+
- Integration of CSK_UserManagement functionality
67+
68+
## Release 2.0.0
69+
70+
### New features
71+
- Update handling of persistent data according to CSK_PersistentData module ver. 2.0.0
72+
73+
## Release 1.1.1
74+
75+
### Improvements
76+
- Make use of variable "instanceAmount" of PersistentData module if available for amount of instances
77+
78+
## Release 1.1.0
79+
80+
### Improvements
81+
- Setup of Parameter name (PersistentData) added to UI
82+
- Support of 2-dim tables within parameters to save in PersistentData CSK module
83+
84+
## Release 1.0.0
85+
- Initial commit

‎CSK_Module_ModuleName/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_ModuleName/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_ModuleName/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_ModuleName/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_ModuleName/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_ModuleName/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_ModuleName",
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_ModuleName/pages/pages/CSK_Module_ModuleName/CSK_Module_ModuleName.css‎

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

‎CSK_Module_ModuleName/pages/pages/CSK_Module_ModuleName/CSK_Module_ModuleName.html‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
<layout-row id="RowLayout1">
2+
<layout-column id="ColumnLayout1" style="align-items:stretch">
3+
<stacked-view id="SV_UserRole">
4+
<stacked-pane id="Active_StackedPane1" value="true">
5+
<layout-column id="Column_PersistentData"
6+
class="myCustomFrame_CSK_Module_ModuleName"
7+
style="align-items: stretch">
8+
<layout-row id="RowLayout4"
9+
style="justify-content: space-between; align-items: center">
10+
<layout-column id="ColumnLayout5" style="align-items: stretch">
11+
<davinci-value-display id="VD_ParameterName" value="Parameter name:"
12+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
13+
</davinci-value-display>
14+
</layout-column>
15+
<layout-column id="ColumnLayout6" style="align-items: stretch">
16+
<davinci-text-field id="TF_ParameterName" type="text"
17+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
18+
<crown-edpws-binding property="value"
19+
name="CSK_ModuleName/OnNewParameterName" update-on-resume>
20+
</crown-edpws-binding>
21+
<crown-binding event="change" name="CSK_ModuleName/setParameterName"
22+
path="param/args/name" auto-commit>
23+
</crown-binding>
24+
<crown-edpws-binding property="disabled"
25+
name="CSK_ModuleName/OnPersistentDataModuleAvailable"
26+
update-on-resume converter="function(value) {return !value;}">
27+
</crown-edpws-binding>
28+
</davinci-text-field>
29+
</layout-column>
30+
</layout-row>
31+
<layout-row id="RowLayout2"
32+
style="justify-content: space-between; align-items: center">
33+
<davinci-value-display id="VD_LoadConfig"
34+
value="Load config on app start:"
35+
title="Load configured parameters from CSK_PersistentData on app start.">
36+
</davinci-value-display>
37+
<davinci-checkbox id="CB_LoadConfig"
38+
title="Load configured parameters from CSK_PersistentData on app start.">
39+
<span></span>
40+
<crown-edpws-binding property="checked"
41+
name="CSK_ModuleName/OnNewStatusLoadParameterOnReboot"
42+
update-on-resume>
43+
</crown-edpws-binding>
44+
<crown-edpws-binding property="disabled"
45+
name="CSK_ModuleName/OnPersistentDataModuleAvailable"
46+
update-on-resume converter="function(value) {return !value;}">
47+
</crown-edpws-binding>
48+
<crown-binding event="change" name="CSK_ModuleName/setLoadOnReboot"
49+
path="param/args/status" auto-commit>
50+
</crown-binding>
51+
</davinci-checkbox>
52+
</layout-row>
53+
<layout-row id="RowLayout3">
54+
<layout-column id="ColumnLayout3" style="align-items: stretch">
55+
<davinci-button id="B_LoadConfig" type="primary"
56+
icon-position="append"
57+
title="Load configured parameters from CSK_PersistentData module.">
58+
<span>Load Config</span>
59+
<crown-binding event="submit" name="CSK_ModuleName/loadParameters"
60+
auto-commit>
61+
</crown-binding>
62+
<crown-edpws-binding property="disabled"
63+
name="CSK_ModuleName/OnPersistentDataModuleAvailable"
64+
update-on-resume converter="function(value) {return !value;}">
65+
</crown-edpws-binding>
66+
</davinci-button>
67+
</layout-column>
68+
<layout-column id="ColumnLayout4" style="align-items: stretch">
69+
<davinci-button id="B_SaveConfig" type="primary"
70+
icon-position="append"
71+
title="Save current configured parameters of this module within CSK_PersistentData module.">
72+
<span>Save Config</span>
73+
<crown-binding event="submit" name="CSK_ModuleName/sendParameters"
74+
auto-commit>
75+
</crown-binding>
76+
<crown-edpws-binding property="disabled"
77+
name="CSK_ModuleName/OnPersistentDataModuleAvailable"
78+
update-on-resume converter="function(value) {return !value;}">
79+
</crown-edpws-binding>
80+
</davinci-button>
81+
</layout-column>
82+
</layout-row>
83+
</layout-column>
84+
</stacked-pane>
85+
<stacked-pane id="SP_LoginNOK" value="false">
86+
<layout-row id="RowLayout6">
87+
<davinci-callout id="Callout1" type="info">
88+
<span>Please log in via UserManagement module.</span>
89+
</davinci-callout>
90+
</layout-row>
91+
</stacked-pane>
92+
<crown-edpws-binding property="value"
93+
name="CSK_ModuleName/OnUserLevelOperatorActive" update-on-resume
94+
converter="function(value) {return value.toString();}">
95+
</crown-edpws-binding>
96+
</stacked-view>
97+
<stacked-view id="SV_PageCalled">
98+
<crown-binding property="value" name="CSK_ModuleName/pageCalled"
99+
path="result/data/empty" auto-update="0" update-on-resume>
100+
</crown-binding>
101+
</stacked-view>
102+
</layout-column>
103+
<layout-column id="ColumnLayout2" style="flex-grow:3">
104+
<layout-row id="RowLayout11"
105+
style="justify-content: space-between; align-items: center">
106+
<layout-column id="ColumnLayout33" style="align-items: stretch">
107+
<davinci-value-display id="VD_SelectInstance"
108+
value="Selected Instance">
109+
</davinci-value-display>
110+
</layout-column>
111+
<layout-column id="ColumnLayout22" style="align-items: stretch">
112+
<davinci-drop-down id="DD_SelectInstance">
113+
<crown-binding event="change"
114+
name="CSK_ModuleName/setSelectedInstance"
115+
path="param/args/instance" auto-commit
116+
converter="function(value) {return Number(value);}">
117+
</crown-binding>
118+
<crown-edpws-binding property="value"
119+
name="CSK_ModuleName/OnNewSelectedInstance" update-on-resume
120+
converter="function(value) {return value.toString();}">
121+
</crown-edpws-binding>
122+
<crown-edpws-binding property="data"
123+
name="CSK_ModuleName/OnNewInstanceList" update-on-resume
124+
converter="convertToList">
125+
</crown-edpws-binding>
126+
</davinci-drop-down>
127+
</layout-column>
128+
</layout-row>
129+
</layout-column>
130+
131+
</layout-row>

‎CSK_Module_ModuleName/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)