Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
2f40985
Merge pull request #1 from Autodesk/develop
alexanderoster Aug 27, 2020
da257a4
Merge pull request #7 from Autodesk/develop
alexanderoster Aug 28, 2020
e48c8f0
Merge pull request #2 from Autodesk/develop
alexanderoster Sep 10, 2020
a8e9a78
Merge pull request #3 from Autodesk/master
alexanderoster Nov 11, 2020
3868b34
PIDControl: refactor regarding name change of state machine "movement…
GibbekAdsk Aug 31, 2020
26c74b3
Added Server side Authentication
netfabb Sep 1, 2020
2eb03f0
Added first S7 Driver
netfabb Sep 3, 2020
ee7d5eb
Implemented UI Pages and Modules
netfabb Sep 8, 2020
ada24d9
Fixed warning
netfabb Sep 8, 2020
3dec8b0
Added User Interface
netfabb Sep 9, 2020
3859173
Fixed Root Serving issue
netfabb Sep 9, 2020
8386670
Update build_clean.bat
FabianSpangler Sep 9, 2020
2d1a89b
THIS VERSION DOES NOT EXTRUDE! see comments (TODO XXXXX..."
GibbekAdsk Sep 8, 2020
48adafa
Added Parameter Lists
netfabb Sep 10, 2020
2c98574
Fixed VS 2017 compilation
netfabb Sep 11, 2020
f7f800b
Stub of LibOIE
netfabb Sep 14, 2020
c2f8c71
LibOIE Packet implementations
netfabb Sep 15, 2020
52bd878
LibOIE Packet Implementation
netfabb Sep 15, 2020
ca4abb5
Added Dynamic Parameters
netfabb Sep 16, 2020
6a94fc0
Implemented derived parameters
netfabb Sep 17, 2020
8105947
First iteration of State Journal
netfabb Sep 22, 2020
26db0db
added cmath
netfabb Sep 22, 2020
b97d63c
Linux fixes guid
netfabb Sep 22, 2020
cd585c4
committed template job
netfabb Sep 24, 2020
f597cc1
Update state journals
netfabb Sep 24, 2020
344dc20
Refactored Driver Environment
netfabb Sep 24, 2020
1a4e663
fixed crash issue
netfabb Sep 24, 2020
905ed17
Improved Journal Stream
netfabb Sep 25, 2020
ec89542
refactoring program sequence of extrude process
GibbekAdsk Sep 11, 2020
0fde1c7
Added Demo Template
netfabb Sep 25, 2020
4c97b30
Added file upload
netfabb Sep 29, 2020
020c6b4
Fixed upload
netfabb Sep 29, 2020
2f0839d
Updated Driver Implementation
netfabb Oct 1, 2020
9b47b44
Changed Resource package handling
netfabb Oct 1, 2020
eb69f4d
Added Core Resources
netfabb Oct 1, 2020
eb298fd
Added Image resources
netfabb Oct 2, 2020
472c2f6
Added Core Resource building
netfabb Oct 2, 2020
102eac3
Fixed resource building
netfabb Oct 2, 2020
6d7aa92
Fixed build process
netfabb Oct 2, 2020
9375608
Added Driver Resources
netfabb Oct 2, 2020
350d07c
Improved COM Layer of S7 Driver
netfabb Oct 2, 2020
48c9bd8
Small fixes
netfabb Oct 2, 2020
6264f9d
added build list ui elements
netfabb Oct 2, 2020
9fb68cf
fixed server issue
netfabb Oct 2, 2020
c2a5c50
refactored ui content items
netfabb Oct 2, 2020
8a86932
Added Build details page
netfabb Oct 2, 2020
69dd8f4
Fixed DevPackage pipeline
netfabb Oct 2, 2020
294cf05
DevPackage fixes
netfabb Oct 2, 2020
5594932
First stub of S7 Driver
netfabb Oct 2, 2020
dc8c778
Linux fixes
netfabb Oct 6, 2020
1a34587
Linux fixes
netfabb Oct 6, 2020
953a7ed
Initial Duet Implementation
netfabb Oct 9, 2020
0a3b82a
Added Duet Driver
netfabb Oct 9, 2020
bafd940
added logo resource error
netfabb Oct 12, 2020
964700a
UI Plugin first draft
netfabb Oct 13, 2020
2d9adc6
Driver Memory handling fix
netfabb Oct 21, 2020
a183450
Added UI Event Handling
netfabb Oct 23, 2020
cb60367
added layer view
netfabb Oct 28, 2020
e8ec691
first iteration
netfabb Oct 28, 2020
eb2a43e
Client refactoring
netfabb Oct 28, 2020
3667f56
UI Refactoring
netfabb Oct 28, 2020
7eb7705
Refactored UI
netfabb Oct 28, 2020
8071b59
Upload fix
netfabb Oct 28, 2020
d7cb919
Fixed UI Code
netfabb Oct 28, 2020
a9fbc05
Added 3MF Toolpath Preview
netfabb Oct 29, 2020
b700d84
Fixed Driver Groups
netfabb Oct 29, 2020
bc2c34c
Fixed Driver Groups
netfabb Oct 29, 2020
0f78d04
Parameter deadlock fixes
netfabb Oct 29, 2020
42ddf38
Added Create Resource Target
netfabb Oct 29, 2020
5e814ad
Added Create Resource Target
netfabb Oct 29, 2020
02aa4e9
Marlin Driver Delay parameter to Int
netfabb Oct 31, 2020
7f6954a
Client framework fixes
netfabb Oct 31, 2020
88ad883
Added Dist of SLM branch
netfabb Oct 31, 2020
39a4a62
Added Temp directory handling
netfabb Nov 16, 2020
2958864
Linux fix
netfabb Nov 16, 2020
8707db5
Merge branch 'develop'
netfabb Nov 16, 2020
ed13544
Merge pull request #25 from Autodesk/develop
alexanderoster Feb 25, 2021
5358380
Merge pull request #4 from Autodesk/master
alexanderoster Feb 25, 2021
944e251
Merge branch 'develop'
netfabb Mar 1, 2021
af66c18
Merge branch 'develop'
netfabb Mar 1, 2021
250bec7
Merge pull request #29 from Autodesk/develop
alexanderoster Jul 26, 2021
288b07d
Merge pull request #31 from Autodesk/develop
alexanderoster Aug 6, 2021
2f0eeb9
Merge branch 'Autodesk:master' into master
alexanderoster Aug 6, 2021
516fd67
Merge branch 'Autodesk:develop' into develop
alexanderoster Aug 6, 2021
9a0ef2e
Merge branch 'Autodesk:develop' into develop
alexanderoster Dec 8, 2021
74342ee
SDK Upload Functionality
alexanderoster Aug 10, 2021
dcc71cb
deleted unused file
alexanderoster Aug 10, 2021
f446af1
Added WASM fetch API
alexanderoster Aug 10, 2021
2ee54c3
Added PLC Commandlist Status Query
alexanderoster Aug 11, 2021
d41cc9b
Made Implementation Color-aware
alexanderoster Aug 12, 2021
414ece3
Added Autodesk colors
alexanderoster Aug 12, 2021
d683d4a
Added form names to default config
alexanderoster Nov 6, 2021
eaeacad
added Grid UI Element
alexanderoster Dec 3, 2021
1843521
Test config
alexanderoster Dec 3, 2021
82c19da
Updated Package JSON
alexanderoster Dec 3, 2021
9020851
UI GLScene
alexanderoster Dec 3, 2021
984173b
GL Scene Config XML
alexanderoster Dec 3, 2021
bfabc9b
Added GLScene Module
alexanderoster Dec 3, 2021
903185b
Updated form entities
alexanderoster Dec 6, 2021
b4937a0
Added Grid positioning
alexanderoster Dec 7, 2021
b414eaf
plugin update
alexanderoster Dec 6, 2021
d4e2ea2
Updated Plugin
alexanderoster Dec 7, 2021
30b0afd
Updated Plugin
alexanderoster Dec 7, 2021
c750d7d
Resources for BuR driver
alexanderoster Dec 8, 2021
7ffa287
Removed package-json.lock
alexanderoster Dec 10, 2021
f5251bb
Added Package JSON lock
alexanderoster Dec 10, 2021
fa824c7
updated package json lock
alexanderoster Dec 10, 2021
4d022c5
ScanLab OIE Driver
alexanderoster Dec 10, 2021
02e4bf8
BuR Driver
alexanderoster Dec 10, 2021
53c0341
Scanlab driver
alexanderoster Dec 10, 2021
aabaa7f
AMC UI Updates
alexanderoster Dec 14, 2021
4d30a0e
Added Modal Dialogs
alexanderoster Dec 15, 2021
1454ec9
Added Modal Dialogs Plugin
alexanderoster Dec 15, 2021
e645c74
Merge branch 'Autodesk:master' into master
alexanderoster Dec 15, 2021
136b874
Merge branch 'Autodesk:develop' into develop
alexanderoster Dec 15, 2021
d671c51
Reworked UI Framework
alexanderoster Dec 20, 2021
5ce952f
Refactored UI Expression system
alexanderoster Dec 20, 2021
72d25e5
Refactored UI code
alexanderoster Dec 21, 2021
ab930bd
Refactored UI code
alexanderoster Dec 21, 2021
0fe0b57
Plugin updated
alexanderoster Dec 21, 2021
6e08d6d
Merge pull request #35 from Autodesk/develop
alexanderoster Dec 21, 2021
17aec98
Merge branch 'Autodesk:master' into master
alexanderoster Dec 21, 2021
ef3d3b3
Merge branch 'master' into develop
alexanderoster Dec 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ACT/LibMC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,19 @@
<error name="DIALOGNOTFOUND" code="382" description="Dialog not found" />

<error name="COULDNOTHANDLEEVENT" code="383" description="Could not handle event" />

<error name="INVALIDFORMPATH" code="384" description="Invalid form path" />
<error name="MISSINGITEMNAME" code="385" description="Missing item name" />
<error name="INVALIDITEMPATH" code="386" description="Invalid item path" />
<error name="INVALIDMODULEPATH" code="387" description="Invalid module path" />
<error name="BUILDLISTNAMEMISSING" code="388" description="Build list name missing" />
<error name="EMPTYITEMPREFIX" code="389" description="Empty item prefix" />
<error name="INVALIDITEMPREFIX" code="390" description="Invalid item prefix" />
<error name="EMPTYITEMNAME" code="391" description="Empty item name" />

<error name="EXPRESSIONVALUEGIVENTWICE" code="392" description="Expression value is given twice" />
<error name="INVALIDINTEGEREXPRESSION" code="393" description="Invalid integer expression" />
<error name="INVALIDNUMBEREXPRESSION" code="394" description="Invalid number expression" />
<error name="INVALIDBOOLEANEXPRESSION" code="395" description="Invalid boolean expression" />

</errors>

Expand Down
140 changes: 50 additions & 90 deletions ACT/LibMCEnv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,9 @@
<method name="ActivateModalDialog" description="activates a modal dialog on the client.">
<param name="DialogName" type="string" pass="in" description="Name of the dialog to activate." />
</method>

<method name="CloseModalDialog" description="closes the active modal dialog on the client.">
</method>

<method name="ActivatePage" description="changes the current page on the client.">
<param name="DialogName" type="string" pass="in" description="Name of the dialog to activate." />
Expand Down Expand Up @@ -831,37 +834,37 @@
<method name="LogInfo" description="logs a string as info">
<param name="LogString" type="string" pass="in" description="String to Log" />
</method>

<method name="GetMachineStringParameter" description="returns a string parameter of a state machine">

<method name="GetMachineParameter" description="returns a string parameter of a state machine">
<param name="MachineInstance" type="string" pass="in" description="State machine instance name" />
<param name="ParameterGroup" type="string" pass="in" description="Parameter Group" />
<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
<param name="Value" type="string" pass="return" description="Current Parameter Value" />
</method>

<method name="GetMachineUUIDParameter" description="returns a uuid parameter of a state machine">
<method name="GetMachineParameterAsUUID" description="returns a uuid parameter of a state machine">
<param name="MachineInstance" type="string" pass="in" description="State machine instance name" />
<param name="ParameterGroup" type="string" pass="in" description="Parameter Group" />
<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
<param name="Value" type="string" pass="return" description="Current Parameter Value" />
</method>

<method name="GetMachineDoubleParameter" description="returns a double parameter of a state machine">
<method name="GetMachineParameterAsDouble" description="returns a double parameter of a state machine">
<param name="MachineInstance" type="string" pass="in" description="State machine instance name" />
<param name="ParameterGroup" type="string" pass="in" description="Parameter Group" />
<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
<param name="Value" type="double" pass="return" description="Current Parameter Value" />
</method>

<method name="GetMachineIntegerParameter" description="returns an int parameter of a state machine">
<method name="GetMachineParameterAsInteger" description="returns an int parameter of a state machine">
<param name="MachineInstance" type="string" pass="in" description="State machine instance name" />
<param name="ParameterGroup" type="string" pass="in" description="Parameter Group" />
<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
<param name="Value" type="int64" pass="return" description="Current Parameter Value" />
</method>

<method name="GetMachineBoolParameter" description="returns a bool parameter of a state machine">
<method name="GetMachineParameterAsBool" description="returns a bool parameter of a state machine">
<param name="MachineInstance" type="string" pass="in" description="State machine instance name" />
<param name="ParameterGroup" type="string" pass="in" description="Parameter Group" />
<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
Expand All @@ -870,110 +873,67 @@




<method name="GetClientStringVariable" description="returns a string variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="string" pass="return" description="Current Parameter Value" />
</method>

<method name="GetClientUUIDVariable" description="returns a uuid variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="string" pass="return" description="Current Parameter Value" />
</method>

<method name="GetClientDoubleVariable" description="returns a double variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="double" pass="return" description="Current Parameter Value" />
</method>

<method name="GetClientIntegerVariable" description="returns an int variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="int64" pass="return" description="Current Parameter Value" />
<method name="GetUIProperty" description="returns a string property of a UI element on the client">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist." />
<param name="Value" type="string" pass="return" description="Current property Value" />
</method>

<method name="GetClientBoolVariable" description="returns a bool variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="bool" pass="return" description="Current Parameter Value" />
<method name="GetUIPropertyAsUUID" description="returns a uuid variable of a UI element on the client">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist." />
<param name="Value" type="string" pass="return" description="Current property Value" />
</method>


<method name="SetClientStringVariable" description="sets a string variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="string" pass="in" description="Value to set" />
<method name="GetUIPropertyAsDouble" description="returns a double variable of a UI element on the client">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist." />
<param name="Value" type="double" pass="return" description="Current property Value" />
</method>

<method name="SetClientUUIDVariable" description="returns a uuid variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="string" pass="in" description="Value to set" />
<method name="GetUIPropertyAsInteger" description="returns a integer variable of a UI element on the client">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist." />
<param name="Value" type="int64" pass="return" description="Current property Value" />
</method>

<method name="SetClientDoubleVariable" description="returns a double variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="double" pass="in" description="Value to set" />
<method name="GetUIPropertyAsBool" description="returns a integer variable of a UI element on the client">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist." />
<param name="Value" type="bool" pass="return" description="Current property Value" />
</method>

<method name="SetClientIntegerVariable" description="returns an int variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="int64" pass="in" description="Value to set" />
</method>

<method name="SetClientBoolVariable" description="returns a bool variable of the client">
<param name="VariableGroup" type="string" pass="in" description="Variable Group" />
<param name="VariableName" type="string" pass="in" description="Variable Name" />
<param name="Value" type="bool" pass="in" description="Value to set" />
<method name="SetUIProperty" description="sets a string property of a UI element on the client.">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist or is readonly." />
<param name="Value" type="string" pass="in" description="New property Value" />
</method>



<method name="HasFormValue" description="returns if a form value has been passed.">
<param name="FormIdentifier" type="string" pass="in" description="Identifier of the form." />
<param name="ValueIdentifier" type="string" pass="in" description="Identifier of the form value." />
<param name="ValuePassed" type="bool" pass="return" description="Form Value has been passed" />
<method name="SetUIPropertyAsUUID" description="sets a uuid property of a UI element on the client.">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist or is readonly." />
<param name="Value" type="string" pass="in" description="New property Value" />
</method>

<method name="GetFormStringValue" description="returns a passed form value from the client. Fails if value is not passed.">
<param name="FormIdentifier" type="string" pass="in" description="Identifier of the form." />
<param name="ValueIdentifier" type="string" pass="in" description="Identifier of the form value." />
<param name="Value" type="string" pass="return" description="Form Value" />
<method name="SetUIPropertyAsDouble" description="sets a double property of a UI element on the client.">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist or is readonly." />
<param name="Value" type="double" pass="in" description="New property Value" />
</method>

<method name="GetFormUUIDValue" description="returns a passed form value from the client. Fails if value is not passed.">
<param name="FormIdentifier" type="string" pass="in" description="Identifier of the form." />
<param name="ValueIdentifier" type="string" pass="in" description="Identifier of the form value." />
<param name="Value" type="string" pass="return" description="Form Value" />
<method name="SetUIPropertyAsInteger" description="sets a integer property of a UI element on the client.">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist or is readonly." />
<param name="Value" type="int64" pass="in" description="New property Value" />
</method>

<method name="GetFormDoubleValue" description="returns a passed form value from the client. Fails if value is not passed.">
<param name="FormIdentifier" type="string" pass="in" description="Identifier of the form." />
<param name="ValueIdentifier" type="string" pass="in" description="Identifier of the form value." />
<param name="Value" type="double" pass="return" description="Form Value" />
<method name="SetUIPropertyAsBool" description="sets a bool property of a UI element on the client.">
<param name="ElementPath" type="string" pass="in" description="Path of UI Element. Fails if element does not exist." />
<param name="PropertyName" type="string" pass="in" description="Property name. Fails if property does not exist or is readonly." />
<param name="Value" type="bool" pass="in" description="New property Value" />
</method>

<method name="GetFormIntegerValue" description="returns a passed form value from the client. Fails if value is not passed.">
<param name="FormIdentifier" type="string" pass="in" description="Identifier of the form." />
<param name="ValueIdentifier" type="string" pass="in" description="Identifier of the form value." />
<param name="Value" type="int64" pass="return" description="Form Value" />
</method>

<method name="GetFormBoolValue" description="returns a passed form value from the client. Fails if value is not passed.">
<param name="FormIdentifier" type="string" pass="in" description="Identifier of the form." />
<param name="ValueIdentifier" type="string" pass="in" description="Identifier of the form value." />
<param name="Value" type="bool" pass="return" description="Form Value" />
</method>

<method name="GetEventContext" description="returns the event context uuid as string">
<param name="ContextUUID" type="string" pass="return" description="Context UUID" />
</method>


</class>

Expand Down
15 changes: 4 additions & 11 deletions Client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
>

<v-card>
<v-card-title>
Privacy Policy
<v-card-title v-if="uiDialog.title">
{{ uiDialog.title }}
</v-card-title>

<v-card-text>
Expand Down
Loading