Skip to content

Merged Develop #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Dec 21, 2021
Merged

Merged Develop #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b8efad8
SDK Upload Functionality
alexanderoster Aug 10, 2021
98ac66c
deleted unused file
alexanderoster Aug 10, 2021
396c50b
Added WASM fetch API
alexanderoster Aug 10, 2021
b844dfb
Added PLC Commandlist Status Query
alexanderoster Aug 11, 2021
4d8abc1
Made Implementation Color-aware
alexanderoster Aug 12, 2021
1aa976a
Added Autodesk colors
alexanderoster Aug 12, 2021
43c9c4c
Added form names to default config
alexanderoster Nov 6, 2021
944f555
added Grid UI Element
alexanderoster Dec 3, 2021
7883487
Test config
alexanderoster Dec 3, 2021
68e68bc
Updated Package JSON
alexanderoster Dec 3, 2021
3c1bd66
UI GLScene
alexanderoster Dec 3, 2021
4ce1fa8
GL Scene Config XML
alexanderoster Dec 3, 2021
e0387b6
Added GLScene Module
alexanderoster Dec 3, 2021
3f98fe3
Updated form entities
alexanderoster Dec 6, 2021
df70203
Added Grid positioning
alexanderoster Dec 7, 2021
1b567c7
plugin update
alexanderoster Dec 6, 2021
5522a55
Updated Plugin
alexanderoster Dec 7, 2021
1f4d2e8
Updated Plugin
alexanderoster Dec 7, 2021
3b181c2
Resources for BuR driver
alexanderoster Dec 8, 2021
d0cf219
Removed package-json.lock
alexanderoster Dec 10, 2021
96b25ed
Added Package JSON lock
alexanderoster Dec 10, 2021
5eb2140
updated package json lock
alexanderoster Dec 10, 2021
472fcae
ScanLab OIE Driver
alexanderoster Dec 10, 2021
9bdb59b
BuR Driver
alexanderoster Dec 10, 2021
2ca6a45
Scanlab driver
alexanderoster Dec 10, 2021
846f3d8
AMC UI Updates
alexanderoster Dec 14, 2021
a80acde
Added Modal Dialogs
alexanderoster Dec 15, 2021
22a8511
Added Modal Dialogs Plugin
alexanderoster Dec 15, 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
38 changes: 38 additions & 0 deletions ACT/LibMC.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,44 @@
<error name="DUPLICATEFORMNAME" code="351" description="Duplicate form name" />
<error name="EVENTNOTFOUND" code="352" description="Event not found" />

<error name="MISSINGCOLORNAME" code="353" description="Missing color name" />
<error name="MISSINGCOLORREDCHANNEL" code="354" description="Missing red color channel" />
<error name="MISSINGCOLORGREENCHANNEL" code="355" description="Missing green color channel" />
<error name="MISSINGCOLORBLUECHANNEL" code="356" description="Missing blue color channel" />
<error name="INVALIDCOLORREDCHANNEL" code="357" description="Invalid red color channel" />
<error name="INVALIDCOLORGREENCHANNEL" code="358" description="Invalid green color channel" />
<error name="INVALIDCOLORBLUECHANNEL" code="359" description="Invalid blue color channel" />

<error name="MISSINGCOLUMNWIDTH" code="360" description="Missing column width" />
<error name="INVALIDCOLUMNWIDTH" code="361" description="Invalid column width" />
<error name="MISSINGCOLUMNUNIT" code="362" description="Missing column unit" />
<error name="MISSINGROWHEIGHT" code="363" description="Missing row height" />
<error name="INVALIDROWHEIGHT" code="364" description="Invalid row height" />
<error name="MISSINGROWUNIT" code="365" description="Missing row unit" />

<error name="MISSINGCOLUMNSTARTATTRIB" code="366" description="Missing column start attrib" />
<error name="MISSINGCOLUMNENDATTRIB" code="367" description="Missing column end attrib" />
<error name="MISSINGROWSTARTATTRIB" code="368" description="Missing row start attrib" />
<error name="MISSINGROWENDATTRIB" code="369" description="Missing row end attrib" />

<error name="INVALIDCOLUMNSTARTATTRIB" code="370" description="Invalid column start attrib" />
<error name="INVALIDCOLUMNENDATTRIB" code="371" description="Invalid column end attrib" />
<error name="INVALIDROWSTARTATTRIB" code="372" description="Invalid row start attrib" />
<error name="INVALIDROWENDATTRIB" code="373" description="Invalid row end attrib" />

<error name="INVALIDPARAMETERPATH" code="374" description="Invalid parameter path" />
<error name="INVALIDPARAMETERINSTANCE" code="375" description="Invalid parameter instance" />
<error name="INVALIDPARAMETERGROUP" code="376" description="Invalid parameter group" />
<error name="INVALIDPARAMETERNAME" code="377" description="Invalid parameter name" />

<error name="INVALIDSTATEMACHINENAME" code="378" description="Invalid state machine name" />
<error name="INVALIDGRIDPOSITION" code="379" description="Invalid grid position" />

<error name="INVALIDDIALOGNAME" code="380" description="Invalid dialog name" />
<error name="DUPLICATEDIALOG" code="381" description="Duplicate dialog" />
<error name="DIALOGNOTFOUND" code="382" description="Dialog not found" />

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


</errors>
Expand Down
15 changes: 11 additions & 4 deletions ACT/LibMCEnv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@
<method name="SetNextState" description="sets the next state">
<param name="StateName" type="string" pass="in" description="Name of next state" />
</method>

<method name="LogMessage" description="logs a string as message">
<param name="LogString" type="string" pass="in" description="String to Log" />
</method>
Expand Down Expand Up @@ -801,13 +801,20 @@

<class name="UIEnvironment" parent="Base" description="Environment of the UI">

<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="ActivatePage" description="changes the current page on the client.">
<param name="DialogName" type="string" pass="in" description="Name of the dialog to activate." />
</method>

<method name="PrepareSignal" description="prepares a signal object to trigger later.">
<param name="MachineInstance" type="string" pass="in" description="State machine instance name" />
<param name="SignalName" type="string" pass="in" description="Name Of signal channel." />
<param name="SignalInstance" type="class" class="SignalTrigger" pass="return" description="Signal trigger object." />
</method>


</method>

<method name="GetMachineState" description="Retrieves the machine state">
<param name="MachineInstance" type="string" pass="in" description="State machine instance name" />
<param name="StateName" type="string" pass="return" description="Name of current state" />
Expand Down
Loading