Commit Graph

149 Commits

Author SHA1 Message Date
Nicola Carminati 05aab2600f Fix Client exception when "showNcHMI" option is False 2019-04-17 18:51:23 +02:00
Lucio Maranta 7fb8c632ae Moved external programs config into "serverConfig.xml" 2019-04-04 12:18:30 +02:00
Lucio Maranta 38b138942f Added config "FixedHead"
FIx tool table
2019-04-02 17:12:01 +02:00
Lucio Maranta 3750987db0 Fix tool table
Added field  to scada images ("clickEnabled")
2019-04-01 17:58:54 +02:00
Lucio Maranta 7ed87452a4 Fix ACTIVE error management
Fix tool table cancel buttons
Removed deleted button in edit
2019-03-26 17:01:29 +01:00
Nicola Carminati c519d82f1b Added configurations 2019-03-22 16:57:38 +01:00
Lucio Maranta 3eba8f1ab7 Fix Osai
Added images management to scada
2019-03-22 12:47:21 +01:00
Nicola Carminati 5fe808dfdb Fix Radius/Diameter configuration 2019-03-21 12:42:26 +01:00
Nicola Carminati a2aa8630f6 Merge branch 'User_Manager' into develop 2019-03-20 17:05:04 +01:00
Lucio Maranta 4892340a26 Assistedtooling fix
Fix siemens tool table
Added dynamic tool in spindle
2019-03-20 16:56:10 +01:00
Nicola Carminati ea4420dff7 Merge branch 'develop' into User_Manager 2019-03-20 16:28:19 +01:00
Lucio Maranta 5e25896c32 WIP Assisted tooling 2019-03-19 17:14:42 +01:00
Nicola Carminati 13f5932754 Added configuration 2019-03-18 18:03:52 +01:00
Lucio Maranta 09b6e4e009 Fix timeline date 2019-03-12 09:56:58 +01:00
Nicola Carminati 83f22592c8 Added Softkey "Visible" attribute + AutoIncrement Versioning 2019-03-07 16:39:09 +01:00
Lucio Maranta be9c0b6a2a Fix tool table
Added installation date
Added W10 programs api
2019-02-22 12:59:08 +01:00
Nicola Carminati c690f175f5 First commit CMS-Connect M154 2019-02-19 20:04:31 +01:00
Lucio Maranta 0ac7982c93 Fix tooltable & maintenances 2019-02-18 12:03:40 +01:00
Lucio Maranta ede0e5b926 Fix alarm & added autodelete 2019-02-12 16:58:20 +01:00
Nicola Carminati 2a41d03716 Fix Overstroke Softkey 2019-02-12 11:07:19 +01:00
Lucio Maranta a0be095759 Fix alarm history 2019-02-08 16:41:25 +01:00
Lucio Maranta 6d22f38b77 WP10
General data
Pie chart
TimeLine chart
2019-02-01 13:02:33 +01:00
Nicola Carminati a599447922 Fix ServerConfig Read 2019-01-31 15:51:42 +01:00
Lucio Maranta 9242987d76 Fix scada
WIP M154
2019-01-31 13:24:49 +01:00
Lucio Maranta 50b6e65f90 Fix 2019-01-23 16:59:09 +01:00
Nicola Carminati dbbbecd2e5 Fix Tool manager Siemens 2019-01-22 13:00:00 +01:00
Lucio Maranta d9a22655b8 Added labels to scada,
Remove network card monitor
2019-01-21 09:29:03 +01:00
Lucio Maranta 724ac2afb8 Merge branch 'feature/Scada' into develop
# Conflicts:
#	Client.Utils/Constants.cs
#	Client/View/NcWindow.cs
#	Libs/CMS_CORE_Library.dll
#	Step.Config/Config/serverConfig.xml
#	Step.Core/ThreadsFunctions.cs
#	Step.Model/Constants.cs
#	Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
#	Step.Model/DatabaseModels/NcMagazinePositionModel.cs
#	Step.Model/Step.Model.csproj
2019-01-15 16:58:18 +01:00
Lucio Maranta 58fefd3823 Minor fix siemens 2019-01-15 16:34:42 +01:00
Lucio Maranta 0b63a0e0e6 WIP Scada
Added subribe
Added thread
Fix & refactor
2019-01-14 11:30:53 +01:00
Nicola Carminati e130d2bfa5 Fix last commit 2018-12-28 15:36:17 +01:00
Lucio Maranta ebfbfd2d9e Added API
WIP Thread
2018-12-20 13:18:06 +01:00
Lucio Maranta 4a27b1dba4 WIP 2018-12-19 17:10:11 +01:00
Lucio Maranta 355067e963 First commit 2018-12-18 17:40:58 +01:00
Paolo Possanzini f29f2334d1 fix modali nc e modali azzeramento assi 2018-12-04 16:39:58 +01:00
Paolo Possanzini 1b746e0b0f Merge remote-tracking branch 'origin/develop' into develop 2018-12-03 14:39:29 +01:00
Lucio Maranta 0f15f2e367 Added OriginPosition
Fixed fanuc TT
& Minorfixes
2018-11-30 13:26:46 +01:00
Lucio Maranta 00c7297ee2 WIP minor fix 2018-11-26 17:26:38 +01:00
Paolo Possanzini 672cc9c670 compila - inizio il bugfixing dopo il refactoring 2018-11-21 12:35:25 +01:00
Lucio Maranta 209c14530f Fix Fanuc library
WIP alarms filters
2018-11-14 17:32:21 +01:00
Lucio Maranta e23d1fce89 Fix Alarm API 2018-11-12 12:30:40 +01:00
Lucio Maranta ddced53d73 Added isSelectable to axes buttons
Added axes funcitonality
2018-11-08 13:27:30 +01:00
Lucio Maranta 2294b52a65 Fix Siemens active file
Fix machine counters
WIP Siemens axes name
2018-11-07 17:27:44 +01:00
Lucio Maranta 76d617d633 Fix cms client primary screen
Removed shanks from Siemens library
Fix "isInUse" param
etc
2018-10-31 17:29:25 +01:00
Lucio Maranta e47d48aea9 Added new alarm filter 2018-10-29 17:00:35 +01:00
Lucio Maranta 110ab7be65 Alarm attachments 2018-10-24 11:25:38 +02:00
Lucio Maranta d85bb1fd0e Added alarm notes
WIP Fanuc tool table
WIP Siemens Active program fix
2018-10-23 17:33:00 +02:00
Lucio Maranta 29c4747785 Merge branch 'feature/Remove_autoinc_from_db' into develop
# Conflicts:
#	Step.Database/Migrations/201809181022557_InitMigration.Designer.cs
#	Step.Database/Migrations/201809181022557_InitMigration.cs
#	Step.Database/Migrations/201810041521424_InitMigration.Designer.cs
#	Step.Database/Migrations/201810041521424_InitMigration.cs
#	Step.Database/Migrations/201810100646276_InitMigration.Designer.cs
#	Step.Database/Migrations/201810100646276_InitMigration.cs
#	Step.Database/Step.Database.csproj
WIP Alarm
2018-10-16 16:57:46 +02:00
Lucio Maranta f784af225c Merge remote-tracking branch 'origin/develop' into feature/Remove_autoinc_from_db 2018-10-04 17:19:41 +02:00
Nicola Carminati 3239909610 Added Production Title 2018-10-03 17:58:49 +02:00