diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index dd205339..12676234 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs
index 82c60d03..7f63ee49 100644
--- a/Step.Database/Controllers/NcToolManagerController.cs
+++ b/Step.Database/Controllers/NcToolManagerController.cs
@@ -238,7 +238,7 @@ namespace Step.Database.Controllers
return tool;
}
- public void DeleleTool(int toolId)
+ public void DeleteTool(int toolId)
{
DbNcToolModel tool = FindTool(toolId);
DeleteTool(tool);
diff --git a/Step.Database/Migrations/201807090630343_InitMigration.resx b/Step.Database/Migrations/201807090630343_InitMigration.resx
deleted file mode 100644
index 38b98f72..00000000
--- a/Step.Database/Migrations/201807090630343_InitMigration.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 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
-
-
- dbo
-
-
\ No newline at end of file
diff --git a/Step.Database/Migrations/201807090630343_InitMigration.Designer.cs b/Step.Database/Migrations/201807171434381_InitMigration.Designer.cs
similarity index 92%
rename from Step.Database/Migrations/201807090630343_InitMigration.Designer.cs
rename to Step.Database/Migrations/201807171434381_InitMigration.Designer.cs
index 36c29b1f..60279ac6 100644
--- a/Step.Database/Migrations/201807090630343_InitMigration.Designer.cs
+++ b/Step.Database/Migrations/201807171434381_InitMigration.Designer.cs
@@ -13,7 +13,7 @@ namespace Step.Database.Migrations
string IMigrationMetadata.Id
{
- get { return "201807090630343_InitMigration"; }
+ get { return "201807171434381_InitMigration"; }
}
string IMigrationMetadata.Source
diff --git a/Step.Database/Migrations/201807090630343_InitMigration.cs b/Step.Database/Migrations/201807171434381_InitMigration.cs
similarity index 96%
rename from Step.Database/Migrations/201807090630343_InitMigration.cs
rename to Step.Database/Migrations/201807171434381_InitMigration.cs
index 5ad61471..5f4526b8 100644
--- a/Step.Database/Migrations/201807090630343_InitMigration.cs
+++ b/Step.Database/Migrations/201807171434381_InitMigration.cs
@@ -20,7 +20,7 @@ namespace Step.Database.Migrations
gamma = c.Byte(nullable: false),
rotation_type = c.Byte(nullable: false),
cooling_byte = c.Byte(nullable: false),
- max_speed = c.Short(nullable: false),
+ max_speed = c.Int(nullable: false),
max_load = c.Byte(nullable: false),
min_load_pct_autoload = c.Byte(nullable: false),
max_load_pct_autoload = c.Byte(nullable: false),
@@ -29,7 +29,7 @@ namespace Step.Database.Migrations
max_load_dynamic_comp = c.Byte(nullable: false),
life_type = c.Byte(nullable: false),
nominal_life = c.Int(nullable: false),
- revive_delta = c.Short(nullable: false),
+ revive_delta = c.Int(nullable: false),
})
.PrimaryKey(t => t.id);
@@ -38,10 +38,9 @@ namespace Step.Database.Migrations
c => new
{
id = c.Int(nullable: false, identity: true),
- type = c.Byte(nullable: false),
- offset_length = c.Short(nullable: false),
- residual_life = c.Short(nullable: false),
- residual_revive = c.Short(nullable: false),
+ offset_length = c.Int(nullable: false),
+ residual_life = c.Int(nullable: false),
+ residual_revive = c.Int(nullable: false),
family_id = c.Int(nullable: false),
shank_id = c.Int(),
offsetId1 = c.Int(),
@@ -61,7 +60,7 @@ namespace Step.Database.Migrations
magazine_id = c.Byte(),
position_id = c.Byte(),
id = c.Int(nullable: false, identity: true),
- balluf = c.Short(),
+ balluf = c.Int(),
magazine_position_type = c.Byte(nullable: false),
})
.PrimaryKey(t => t.id)
diff --git a/Step.Database/Migrations/201807171434381_InitMigration.resx b/Step.Database/Migrations/201807171434381_InitMigration.resx
new file mode 100644
index 00000000..cbd39113
--- /dev/null
+++ b/Step.Database/Migrations/201807171434381_InitMigration.resx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ H4sIAAAAAAAEAOVd227kupV9H2D+oVCPMx1Xu40AScNO4GO7EyPtC1zuM5kngZZY1UJ0qUgqHztBviwP+aT5haFEXUjxLlJSVQcNNFwSubm5ubh5W+L+v3/+6/z3b3G0eIVZHqbJxfL05ONyARM/DcJke7HcF5tf/Wb5+9/953+c3wTx2+LnJt1ZmQ7lTPKL5fei2H1erXL/O4xBfhKHfpbm6aY48dN4BYJ09enjx9+uTk9XEIlYIlmLxfnTPinCGFY/0M+rNPHhrtiD6C4NYJTXz9GbdSV1cQ9imO+ADy+W6wLuTq5BAV5ADpeLyygESIk1jDbLBUiStAAFUvHztxyuiyxNtusdegCi5/cdROk2ICpzVap/7pLr1uLjp7IWqy5jI8rf50UaGwo8PavNsupnH2TcZWs2ZLgbZODivax1ZbyL5fXLvf8FxGH0Xtl4ueiX+fkqysr0tYmrVK2hcbuc9IR8WHRJP7ToQCAq/31YXO2jYp/BiwTuiwygFI/7lyj0/wTfn9O/wOQi2UcRqTRSG72jHqBHj1m6g1nx/gQ3dVWwBrfBcrGic6/62dvMTE5c09ukOPu0XNwjRcBLBFt8EFZZF2kG/wATmIECBo+gKGCGmvc2gJWFGR16JZb/N6UhQKJutVzcgbevMNkW3y+W6M/l4kv4BoPmSa3BtyREvRBlKrI9VBVSim8K+em9gJwayQU8hdvvxTr8m52Ur3BjL+TZ3z2Xya2E/AHEMbCzSN3+1qa9StMItTrOayEHIWW9g1AJXaWUrykI7DQJk1LGo19c7os0shaHVXIl7vo9QZ3cv0rjHUzy2pva19a5WFxr12K/hhtoDdn7NA4TEJWy7ND2BF/DV3gNowIYCroHr+G2MkffPaDulC8XTzCq3ubfwx0e/auxqXxbjUYe9vTIt2Zp/JRG9QDYf+89g2wLC6RcKkm0TveZ39PxfNWNsMpxt5U4fNRtRcw05pblDxlxm3xTjbcPm00OCzyY2oI3D4O9m26AJeHuYCdLdwYjl7L+DpK/MELUrXCfJkrZuAVug9OedL1cnwblOpPnEnqTxku4cieNp5C6k8bn6CpZNZaGjnU6kYrVa4WGOA1PQSN/V4mxdHidjJk8XttHTF0ev3ON6PN+AlG03xh1nDuwBX8LE/iY5qGTaW4j8LY3e5PnaopX5BJ2jX41hL2kQ5PH5qF7jCQpt/fI0pt2dd3ZjVZXl89taHcwuKv3q2zZ67niZnIAJKRX6uQklk1dhqj3GHZCUXcyXYLbOoPrMC9Td1og1EGQKORo4+7LPvHLal76PsxzC8RxBM21pUVpMmhri5HwQ21x/U8WFvArfIURWpDbTsdB4EbSZQbB6DW/SQb0JY5viHyzVYN2d7wD/nfkuyz6ISlhNmdfqTDMebdZp+pyta1HRh5K/Nc9US9HBZkC61sOM3twtVLmBViphgXImuyTAU0X2wokaamt2pGPzPWQrByqinHn2n3EeG3ibsItSsMsEYQJTdcGpTg9dXFKia7lY7WiVSpTLcvselrilBIty7/UWlaprHYsSsEW/qXNPpNjafqFqUfR609HNk2s5nWjzHIsR6G5h5+h487UA05ZXuIGKaY762GWF9OAFExU0CPI81/SzPUEjrPlCf09WqC9rwsQ70YvzYtAst2DrWsDGkxMw6SACUh8+CW0Gjx4kmbyEJdFgcbWGHXTIX6Czj2VtyhtNk2XTX0QTVYagYpRZt76k+RWD8GcjkWvR2Uip3fytJyZniKDw6kppyR2eipIpKe4/TSVEOvG4cy7GqYQbr4aNugg7twNKgFmr6CdYF6n+4qpptgNhyCIquVjnQuV/RzGdvvyGLiXt/fPN/eX91c33vP/Pt4MIKftyyrZOpnnsIjG94rXMPezcEdypMbc+ioeNncQ5Aj9Qpt/u7999h6+eHc3l+tvTzdKa2ewgmEJAGswlJPIm7ddmElEjjg06DhTpSPVc6IjOND7tHDkRFtJMznSId5z0g1EmOfuZ+rj7DA6nHZ1fdC0m7uYjLWg1JiMcdPKuiM/wxiTsa4kiQ+hE+kpbu9LHmG2SbMYBm5mZUJxM3kVnj5DPI1IzlTex8lIW0+SfgbR3pK8aeNgBvsFIbZEzkErA9PR9HJZdbo1GkvsKEakhLlohViFQcTCLutUHaiq6wT7HQaHm4YnfMKBhsSCRyXuuoIoDYN+YUIzwO9jcr7KrO5u8y8R2HafMWp1gStU6wIkRf7ffYEuegBq6ABm0TsCBtlsdBvdwfgFZg2f5c+P3vXlM6pO5VEvlh+ZNqXS311e/fH2/sYrdX/6+fJrm+9Unu/59o6T6RPbFNjomg3BLPkctklP9jzNE8e6DXOt2xJ/FFmfaeo24ZlOM13meeqHlZV5H9s0pH26wJskWOgw+LsVf+8Lnjtk93CHLI168MXyv5gaKQpoWbl0AdSnuXQRp8v+qPKQXMMIFnBx6eOPja9A7oOAdY7IbAH9BA1EMCt9P4gqEGbl4MyOWmHihzsQaVSkl5fPbhR8sFtq2JbVf3MNdzAphymN5rJVoi2rZz6Vtc5XBAbV0JSx0GUg0qKk03giP8EwQ6wOn71XmIAETpf78eSE9ROD4aihpQ4oZBxv/spIyPI2BrNGq85QhYm6Qv9bBj0f2vuGybmP7n04odul3EJboI5O0wq+WbLws5TFLVWYAFpC6p6o/dU8PmLrn+Gj6uNMSQNkyznQyYCqJno+S8C2NkKqqu2sNZkDsBV5UxtFNJNzJKhSRFCiEII4efAgJeuggws+q9IOnmRj2ekwBzCrvRFtzNC7JCMBk9phIQoRSj9AYJJ10AEFn8hpB0yysex0mASYvANmMWakp80kMPsHOSbAlB1W6wDT3QxSqstkAJMY/ZgAxme1acBAQXHjwo6gkg6CnpwlZwD1Q/CSerXSm+FJjjCHwlravk60mgvout5URIIcGdqH4Vn5+kzvXfmNcEwelk9V0YCEgrfChSFB+xoEQzn15Vg9rLRWs3lYafseoYftkZmM0KbhYd1B+ygXVYp6TO+Z+Y138J5ZjywkwpMhc6jDloROp49mMwbSUXlro6pN67KN2vxY/LaQGyTCnpoo1MGNprHp41vJMTLYZpsf0qraGGzeO/DcqvZzoo1z4GIaGcpToBwdL6fmPJbP4VvBoSQhFWtWUl4T9PqYK+WuYUFSJ0KYLxcdcU3EXWHgS4uqb7jjyiEOcBVSqkNGkRjynFYhp3/uLhIpIDgopDdXcuX4Ti6ObO5NZkqdK5jxxNEHh5pySrxKhBEuRCGw7Ek8QcQxkUKCSBV9HXprY369eNsS+nIVMs3llVNFhVBidq8QzBuOecIlMy5V38OukieUHtl6cggf1gnj37JLJJXdxtt3sJrUvrZCrTdiXLUmh4+Q1LnI/nBJ11vTJtL7Svnm0SaXMfXToZcRVW2cr8JqOjwyQirHFTuxJHNpqgpcHD6SBBE0I8kCWjT1SGnuAdYQX2vFmkSPR9PbTFAwaajGpsYeiZGUvBmO1DFshe/U0jAUy9+Q14dicLgxEcXXIETWA7R74+DPJjSMw66h5DWhllBujEOtmAiRXFGDjMM7nuYaR3mOLdqsUxmHHPmltpEdW49rG8F9IVIzaZzGDjuP5RuvnkDqGVB++KrZOq5MqgE52YGf4ZGfU+tNCEHBV9JSs2kcVw07sBIgpF4b6FlRfjw1CQb7n2xrGlMfg4JDEbfmGxuEmp/kssYbsD1vsUFP1FywrJQY1mw3fjxwij/zZM2rt+1rtvFLzuTblbPEbspdXt1pkMRWzQeo7c5h++58hSNu1g/OV4LQnOd3YLcLky0RqrN+sljjOJ1Xv1qbR7GMsYyVn3OCWbbatiUVaQa2sPe2/GA/gNVtjl2Y0KsgZpL190kF2x5Nab2tULYFm82QJkP5d41BMmYps2XK7i3XEr6g2pU36lUVhUS7KyUsysipIAKZMHrUVRrt4wQ/DblfDolk4BvwyPwJYC8bkknA91iREorqib4EIl4lKSYrH3t59VxfWBe2kpQVoafGorrglVTt/J1XAM5NYTJRdQhLUs4WPzIwExXEkrJU/cYztTwVzpKU6OMX3gsngI9MYBfXkpQWgzcvx4+NROHgln1JOKikgSBOhEtKZphUMr2dX3igTWKsqbiAWunBBXDjSpIlBDiB51MpjE2kLKc1FVngAFOpC2pMNrSgLnQm5QbQU+NOQgXQpDwlfuFF1RuDjkwG0qT6cfXCC/Abzuefq95YwhxKMuMWc9pLj4NaoyTe/LQbIrvTwGEDpCS/0H3XwSqHD450+ElSTlq98aL6lUnbk3Eo6cbHbwbAiQ5IyRWa1S/1xfJnFxt8ZmJmx/YrUlJSXm2RD2mQKhol2xrVY3NZn/iymMstdGSd8WWdHVBnrg8g7HozcSg/rDvLBBihyAw/TWxFUsJL/cxkEOOFW6SHL5zC2zVnZKaDDnkPAFeyWcXJWwJIca1+fHEzYZQ9PbSDK5/wMQy5mrIOu13HW8t1wQKp+Wn79GAw1qfzDEcYj/Zjji0tKcKxmgkXOOeOQC+6Hynql/IVmjahd14cGq1R6EB/9CQHLRQGycQh/0hZoHqiL+Em4cAdJkK0CzsyDuhH9eHIPzS3XJ/ID+8rFKfNvJPIs4t9bnsrxPBuUdOgbPpFF4GPlLKvnh5mS+OtaOvm7hh/g5tcIkLR7A2D16Lp+fiJa+6KmTCeOvvyRMBMTHObBL0NGB0YjjBHZTh+OrKpOXAkeU2MOvXgWcc8ozevX1kG5oytausVbNzBAD9g7wBKCQnTsvv2qcGmSheWjNpVKR97xlABPFkRGCCqiy1GzUDapwZ7PXTwMGrHp37l5fidvlAiRhhd1ebpwfQNhjNjM3hyqO1DBlAdMcIZMhUJbHgX6qJt0bhHI5Yx7OnoXRQgylfeIKm9D9Xogb6jOIw62M+PWUd4dYBV48mesPnMmuw2aaJCUTLqp9xhWLgX0oaKovZC2qdT7ssQsaHoc97qsek2EY4QRemDH5kYh4j/RNuHeGG0uCJjPPVWWIWXbry4eWlgNirIE2W5+o0XALMjcl6oJ2b8hm0CY/nH53Mwr8+J4+k+rbJyPhIxQr9ht8RsAitR407zcPLV5SiDYReyhXYcqJqi+eBM4OTzI4cDVPx5njlKDWQJJ/uCOD7D4ct6MVOvRYfl4Q1Rr/iVaxAfEOxaRulwpFHfbJqDS55dvORrI9kMh1Adm4ZyDfiR8UYdzwk2m3VzjYQMSbefpC29ftL+bkm6NUGWYu5Wlih5uJUF8pqs22fM4iTLBTLXaxiUbNm79/VfcTylk+rPqyhEFe5S3IEk3CC/jIOPLH998uvl4jIKQY651TUX+HP/LgItcvDpWUkOhkG86mc3pxiXUvI8oMDKhpqSMmz1Aj2xkFFHeArb6EdhaVtl8CbD+GN4hYsLiNJki6+H6IToxGrCywgsY1+EyXulqaEiJFHXUhTB07WURNB0LSXVRF1bI9EcXUtpND/XUhhBzyXgOkAI5rXaasOn4zqoo3upfN6tKwPQ3FdXBnAqlSDUWkqiybTDcUhzaHXlaEctlHBRj3Yg6ZFZbWxPUVgdCGpoq8NFEYRVQghzidJtEsC3i+Xfq1yfF7d/9tqMHxYPGZoSfV58XPzDuPiO5WpWepNPVLjO4E7QYrn2M5HxyYGMM20ZRt1RxCUdrz9SZL2+39NoXCK/RzD1bNqaIvyNoNKpuUoje62GtzsYliKSrtFAZoRUDe6oHmilbFFOegkd1BLtho0mhanpDN/FtKNjpmJBL2hsd9XkSkrn0c4YXCw9GSqozXSBJoAOl4Tpn3YVa9mf2oji9JOa++l8/ipmUP5bg5EgYZoIMjW7gL10tKYnKZAG89va2uSebDfR+LC4za8iJAFmMPi8eEZGLx9h8iz+PWAe3u77OlLz0zhqthROs9VCnc1gpaKNXAGN8mgh68Jb1IRM5875R3MPHUNSbG+9RTzBj7RsOuBIUMeNtJPTJ0XaVq9hRI40jKm4hEeLVYI0aNkEfQ6inbg+38JsYKBzW+1kDRlBkQZ1Nv29jSFg/JGASFANcSlBuq+Oscxw09EMaylIu6Ji3zxm0A/z6rT2o9Wie9jBVUc4HC6lZhva9SyKaGi9fKAZhoM3pXq0Qqdtx2cW6hahZYcD9hECTt/R+omWHWgJ3VGaTHP1eCBDG8FBtOhw2qDUpPAdLTJHcF09EqANTYFg/g0G3BgLbTH37miBUBP4bCfAPeaeaatR2R20HBtgSh3PohcogIqxg+vDj78zYpwnQegCRh/ijSq61aDQUeoLNHWwvjCJD6W6kIwtUHLt1SQhzIxCgvSaVhDuqNfMglQa4XdFgUKYIshXo0FJ964fw0NVbg7pLTuGeJReqTWBshOBWBqZxQWUNCA6r68zbOjJXZ34Xr6JguzqxKphY4KwDUq/mGQkZaOssfoIozg6wpjiih3nCNO444XnvsR3p8wDMzbSD9GuRNA7okGJp/826JLdyHIY0BLegjMPrqSBZvlNOU2c18PClVkbz4Er4ZdjU8eed48rxZyJDSpJ4aP/8kfAh/Iz3QPGh0ZgLVeNO5pD4hwzC/QiEow0nRqABXf4k938w5tWyT/Onw+K87ir2dEzl9syg83BuC6NgGzH47qIMM98vYgEP6Lrkt3FcviuSxbO7gBn8IeDurlcnhnc5nV5whPgo/V74jNtUjlJqh/GA2qe7gsKl95MMwk29cImuto+GAmO1GE6qQ/9YswN2En9oOLeH/EG7JR+sHcDTq0JG9+x36j1pTrEKRJ1Rt6d0otO0fH9NxfL4CVFYGgO/KtTenYZwZZGnApxyyLe80oqqg/ANMohD7W4BZEJeCVVRzdaRQlOe7mlCtLyFGA+qVUqw/tGklWDm4rbqnVCD+CoHqri6TMiplz6Nb/G+HRKsyDCD4oKI5JICqw6rrJU4oSCKY54xyun3EZXypdVR1EPLf35K3WO5XjJ+NbrVhklRd9EA43S9Uo2KZSYrcsKJpKpqp2k7M18jAaSiRqjhiQtT5ddk9wzMQk9bjM60K+5vhGnYArihpnmEro4IabVxC9qViIYurhRgNkBWUhi6Ekh3vRnTMbxtlW8I4FNtKlKTLWkA5MiCJfKZOz4yotH58ZofZ6LEjwcOoybCsyEHCGPg2MJPc4Hb9HB1oN+ITGFaETmR50ZwSAV40DHGiw1gaoIM8j3wp8ctBGqlaWOEdglqGgfjqiBUPWZjcA7y+UaQXno69AI/IGefy+/UyPwDyzl9tA45HRXPY3jJb40IsE4BtNAjuwMbgz0zGUU/tmR3DYa503jo4iZ4otvox/JYBookh2HjIGiSY2itx3PMdCAffyR8KRcsCkuj7c3onDfmGM3vT1md4O0ZG+YkEK/0DYIc7V3++58hVei9QP0k7nC+3z1tE/KD+Twr2uYh9tOxDmSmUCf2kht09wmm7TZ2O1p1CTpfUp1BwsQgAJcZkW4AX6BXpe7ZGGyXS6qm/cvljfxCwxuk4d9sdsXqMowfqF3Sct9YVn55ytG5/OH6iPr3EUVkJph+U3hQ/LTPoyCVu8vnO+3BCLKDef6I7eyLYvyY7fteyvpPu1v54kE1eZr98mfYbyLkLD8IVmD8tZSc90Qgr/CLfDfH+uL2MVC1A1Bm/38OgTbDMR5LaPLj34iDAfx2+/+H3zSldtE/gAA
+
+
+ dbo
+
+
\ No newline at end of file
diff --git a/Step.Database/Step.Database.csproj b/Step.Database/Step.Database.csproj
index aa5e7941..66a380a1 100644
--- a/Step.Database/Step.Database.csproj
+++ b/Step.Database/Step.Database.csproj
@@ -78,9 +78,9 @@
-
-
- 201807090630343_InitMigration.cs
+
+
+ 201807171434381_InitMigration.cs
@@ -116,8 +116,8 @@
-
- 201807090630343_InitMigration.cs
+
+ 201807171434381_InitMigration.cs
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index 23d8e4fc..96bf9c6f 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -1400,12 +1400,18 @@ namespace Step.NC
return numericalControl.TOOLS_WStartEditData();
}
+ public CmsError StopEditData()
+ {
+ return numericalControl.TOOLS_WStopEditData();
+ }
+
public CmsError StartEditTooling(int magazineId)
{
return numericalControl.TOOLS_WStartEditTooling(magazineId);
}
- public CmsError StopEditTooling()
+
+ public CmsError StopEditTooling(int magazineId)
{
using (NcToolManagerController toolsManager = new NcToolManagerController())
{
@@ -1455,7 +1461,7 @@ namespace Step.NC
Console.WriteLine(sw.ElapsedMilliseconds);
}
- return numericalControl.TOOLS_WStopEditData();
+ return numericalControl.TOOLS_WStopEditTooling(magazineId);
}
#endregion Osai/Fanuc Tools
diff --git a/Step/Controllers/WebApi/NcToolManagerController.cs b/Step/Controllers/WebApi/NcToolManagerController.cs
index 389ead06..bae98ef5 100644
--- a/Step/Controllers/WebApi/NcToolManagerController.cs
+++ b/Step/Controllers/WebApi/NcToolManagerController.cs
@@ -486,6 +486,21 @@ namespace Step.Controllers.WebApi
return Ok();
}
}
+
+ [Route("stop_edit_data"), HttpPut]
+ public IHttpActionResult StopEdit()
+ {
+ using (NcHandler ncHandler = new NcHandler())
+ {
+ ncHandler.Connect();
+
+ CmsError cmsError = ncHandler.StopEditData();
+ if (cmsError.IsError())
+ return BadRequest(cmsError.localizationKey);
+
+ return Ok();
+ }
+ }
[Route("start_edit_tooling/{magazineId:int}"), HttpPut]
public IHttpActionResult StartEditTooling(int magazineId)
@@ -503,14 +518,14 @@ namespace Step.Controllers.WebApi
}
}
- [Route("stop_edit_data"), HttpPut]
- public IHttpActionResult StopEdit()
+ [Route("stop_edit_tooling/{magazineId:int}"), HttpPut]
+ public IHttpActionResult StopEditTooling(int magazineId)
{
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
- CmsError cmsError = ncHandler.StopEditTooling();
+ CmsError cmsError = ncHandler.StopEditTooling(magazineId);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);