diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index ed288ca1c0..8472af12ff 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -41,7 +41,6 @@ SET(PathScripts_SRCS PathScripts/PathInspect.py PathScripts/PathJob.py PathScripts/PathKurveUtils.py - PathScripts/PathLoadTool.py PathScripts/PathLog.py PathScripts/PathMillFace.py PathScripts/PathPlane.py @@ -61,6 +60,7 @@ SET(PathScripts_SRCS PathScripts/PathHelix.py PathScripts/kdtree.py PathScripts/PathSurface.py + PathScripts/PathToolController.py PathScripts/PathToolLenOffset.py PathScripts/PathToolLibraryManager.py PathScripts/PathUtils.py diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc index aa19370edb..8c65d9a9ae 100644 --- a/src/Mod/Path/Gui/Resources/Path.qrc +++ b/src/Mod/Path/Gui/Resources/Path.qrc @@ -24,7 +24,6 @@ icons/Path-Job.svg icons/Path-Kurve.svg icons/Path-LengthOffset.svg - icons/Path-LoadTool.svg icons/Path-MachineLathe.svg icons/Path-MachineMill.svg icons/Path-Machine.svg @@ -44,6 +43,7 @@ icons/Path-Stock.svg icons/Path-Stop.svg icons/Path-ToolChange.svg + icons/Path-ToolController.svg icons/Path-Toolpath.svg icons/Path-ToolTable.svg icons/Path-Area.svg diff --git a/src/Mod/Path/Gui/Resources/icons/Path-LoadTool.svg b/src/Mod/Path/Gui/Resources/icons/Path-ToolController.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/Path-LoadTool.svg rename to src/Mod/Path/Gui/Resources/icons/Path-ToolController.svg diff --git a/src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui b/src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui index 3e49b0d450..01657469c4 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui @@ -92,7 +92,7 @@ - :/icons/Path-LoadTool.svg:/icons/Path-LoadTool.svg + :/icons/Path-ToolController.svg:/icons/Path-ToolController.svg diff --git a/src/Mod/Path/Gui/Resources/translations/Path.ts b/src/Mod/Path/Gui/Resources/translations/Path.ts index 6c6e691062..1bcd175331 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path.ts @@ -367,7 +367,7 @@ - + The active tool @@ -377,32 +377,32 @@ - + The speed of the cutting spindle in RPM - + Direction of spindle rotation - + Feed rate for vertical moves in Z - + Feed rate for horizontal moves - + Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves @@ -1602,24 +1602,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load - + Add Tool Controller to the Job - + Add Tool Controller - + Create Tool Controller Object @@ -2154,7 +2154,7 @@ Current Tool - + Tool Number to Load @@ -2582,7 +2582,7 @@ Spindle Dir - + Direction of spindle rotation @@ -2590,7 +2590,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM @@ -2616,7 +2616,7 @@ Tool Number - + The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_af.ts b/src/Mod/Path/Gui/Resources/translations/Path_af.ts index b14160eb08..7ea03a4dbb 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_af.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_af.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ca.ts b/src/Mod/Path/Gui/Resources/translations/Path_ca.ts index ae6fea448b..a084bf1934 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ca.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ca.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool L'eina activa - + The speed of the cutting spindle in RPM La velocitat de l'eix de tall en RPM - + Direction of spindle rotation Direcció de rotació d'eix - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Tipus de alimentació de moviments horitzontals - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Eina número de càrrega - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Eina número de càrrega @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direcció de rotació d'eix @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM La velocitat de l'eix de tall en RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool L'eina activa diff --git a/src/Mod/Path/Gui/Resources/translations/Path_cs.ts b/src/Mod/Path/Gui/Resources/translations/Path_cs.ts index b4cebb7fdc..d2a340af81 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_cs.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_cs.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Číslo nástroje pro načtení - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Číslo nástroje pro načtení @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_de.ts b/src/Mod/Path/Gui/Resources/translations/Path_de.ts index e93cd02e0d..e710aac9f5 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_de.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_de.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool Das aktive Werkzeug - + The speed of the cutting spindle in RPM Die Drehgeschwindigkeit der Spindel in u/min - + Direction of spindle rotation Drehrichtung der Spindel - + Feed rate for vertical moves in Z Zustell-Rate für vertikale Bewegungen in Z - + Feed rate for horizontal moves Vorschubgeschwindigkeit für horizontale Bewegungen - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1554,24 +1554,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Lade Werkzeugnummer - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2099,7 +2099,7 @@ Current Tool - + Tool Number to Load Lade Werkzeugnummer @@ -2530,7 +2530,7 @@ Spindle Dir - + Direction of spindle rotation Drehrichtung der Spindel @@ -2538,7 +2538,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM Die Drehgeschwindigkeit der Spindel in u/min @@ -2564,7 +2564,7 @@ Tool Number - + The active tool Das aktive Werkzeug diff --git a/src/Mod/Path/Gui/Resources/translations/Path_el.ts b/src/Mod/Path/Gui/Resources/translations/Path_el.ts index d20fda5306..4f4b0ecb63 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_el.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_el.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Ταχύτητα τροφοδοσίας για οριζόντιες κινήσεις - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Φόρτωση αριθμών εργαλείων - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Φόρτωση αριθμών εργαλείων @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_es-ES.ts b/src/Mod/Path/Gui/Resources/translations/Path_es-ES.ts index c937bd59ef..f966f8e262 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_es-ES.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_es-ES.ts @@ -312,37 +312,37 @@ Forma a utilizar para calcular los límites - + The active tool La herramienta activa - + The speed of the cutting spindle in RPM Velocidad del husillo de corte en RPM - + Direction of spindle rotation Dirección de rotación del eje - + Feed rate for vertical moves in Z Avance para los movimientos verticales en Z - + Feed rate for horizontal moves Velocidad de avance para movimientos horizontales - + Rapid rate for vertical moves in Z Avance rápido para movimientos verticales en Z - + Rapid rate for horizontal moves Avance rápido para movimientos horizontales @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Número de herramienta a carga - + Add Tool Controller to the Job Añadir Controlador de Herramienta para el trabajo - + Add Tool Controller Añadir Controlador de Herramienta - + Create Tool Controller Object Crear objeto de Controlador de Herramienta @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Número de herramienta a carga @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Dirección de rotación del eje @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM Velocidad del husillo de corte en RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool La herramienta activa diff --git a/src/Mod/Path/Gui/Resources/translations/Path_eu.ts b/src/Mod/Path/Gui/Resources/translations/Path_eu.ts index a08a841ca6..32dc9e73c6 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_eu.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_eu.ts @@ -312,37 +312,37 @@ Muga kalkulatzeko erabiliko den forma - + The active tool Tresna aktiboa - + The speed of the cutting spindle in RPM Mozte-haxaren abiadura, RPMetan - + Direction of spindle rotation Hax-biraketaren norabidea - + Feed rate for vertical moves in Z Elikatze-abiadura Z ardatzeko mugimendu bertikaletarako - + Feed rate for horizontal moves Elikatze-abiadura mugimendu horizontaletarako - + Rapid rate for vertical moves in Z Aurreratze azkarreko tasa Z ardatzeko mugimendu bertikaletarako - + Rapid rate for horizontal moves Aurreratze azkarreko tasa mugimendu horizontaletarako @@ -1563,24 +1563,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Kargatuko den tresnaren zenbakia - + Add Tool Controller to the Job Gehitu tresna-kontrolatzailea lanari - + Add Tool Controller Gehitu tresna-kontrolatzailea - + Create Tool Controller Object Sortu tresna-kontrolatzaileko objektu bat @@ -2110,7 +2110,7 @@ Current Tool - + Tool Number to Load Kargatuko den tresnaren zenbakia @@ -2541,7 +2541,7 @@ Spindle Dir - + Direction of spindle rotation Hax-biraketaren norabidea @@ -2549,7 +2549,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM Mozte-haxaren abiadura, RPMetan @@ -2575,7 +2575,7 @@ Tool Number - + The active tool Tresna aktiboa diff --git a/src/Mod/Path/Gui/Resources/translations/Path_fi.ts b/src/Mod/Path/Gui/Resources/translations/Path_fi.ts index d8e13968bd..421894eca6 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_fi.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_fi.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_fr.ts b/src/Mod/Path/Gui/Resources/translations/Path_fr.ts index 008c71e1c1..58b6fe54ff 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_fr.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_fr.ts @@ -312,37 +312,37 @@ Forme à utiliser pour le calcul du contour - + The active tool L'outil actif - + The speed of the cutting spindle in RPM La vitesse de la fraise en tours/mn - + Direction of spindle rotation Sens de rotation de la fraise - + Feed rate for vertical moves in Z Vitesse d'avancement pour les déplacements verticaux suivant Z - + Feed rate for horizontal moves Vitesse d'avancement pour les déplacements horizontaux - + Rapid rate for vertical moves in Z Avance rapide axe Z - + Rapid rate for horizontal moves Avance rapide horizontale @@ -1562,24 +1562,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Numéro d'outil à charger - + Add Tool Controller to the Job Ajouter un contrôleur d’outil à la tâche - + Add Tool Controller Ajouter un contrôleur d'outil - + Create Tool Controller Object Créez un objet contrôleur d'outil @@ -2108,7 +2108,7 @@ Current Tool - + Tool Number to Load Numéro d'outil à charger @@ -2539,7 +2539,7 @@ Spindle Dir - + Direction of spindle rotation Sens de rotation de la fraise @@ -2547,7 +2547,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM La vitesse de la fraise en tours/mn @@ -2573,7 +2573,7 @@ Tool Number - + The active tool L'outil actif diff --git a/src/Mod/Path/Gui/Resources/translations/Path_gl.ts b/src/Mod/Path/Gui/Resources/translations/Path_gl.ts index e73d49f24c..2a5e56af4d 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_gl.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_gl.ts @@ -312,37 +312,37 @@ Forma a usar para calcular a contorna - + The active tool A ferramenta activa - + The speed of the cutting spindle in RPM A velocidade do fuso de corte en RPM - + Direction of spindle rotation Sentido de xiro do fuso - + Feed rate for vertical moves in Z Relación de avance para movementos verticais en Z - + Feed rate for horizontal moves Taxa de avance para movementos horizontais - + Rapid rate for vertical moves in Z Relación de avance rápido para movementos verticais en Z - + Rapid rate for horizontal moves Relación de avance para movementos horizontais @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Número de ferramenta a cargar - + Add Tool Controller to the Job Engadir Controlador de Ferramenta para o traballo - + Add Tool Controller Engadir Controlador de Ferramenta - + Create Tool Controller Object Crear obxecto Controlador de Ferramenta @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Número de ferramenta a cargar @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Sentido de xiro do fuso @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM A velocidade do fuso de corte en RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool A ferramenta activa diff --git a/src/Mod/Path/Gui/Resources/translations/Path_hr.ts b/src/Mod/Path/Gui/Resources/translations/Path_hr.ts index 80746e0d3c..d778bb1c33 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_hr.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_hr.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_hu.ts b/src/Mod/Path/Gui/Resources/translations/Path_hu.ts index 5aadb72341..7ad3121b46 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_hu.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_hu.ts @@ -312,37 +312,37 @@ Határ számításához használandó alakzat - + The active tool Aktív szerszám - + The speed of the cutting spindle in RPM Főorsó fordulatszámának beállítása (fordulat/perc) - + Direction of spindle rotation Főorsó forgásiránya - + Feed rate for vertical moves in Z Függőleges Z tengely előtolás - + Feed rate for horizontal moves Vízszintes irányú előtolási sebesség - + Rapid rate for vertical moves in Z Gyors ütem a függőleges Z tengely előtoláshoz - + Rapid rate for horizontal moves Gyors ütem a vízszintes előtoláshoz @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Betöltendő szerszám száma - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Betöltendő szerszám száma @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Főorsó forgásiránya @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM Főorsó fordulatszámának beállítása (fordulat/perc) @@ -2576,7 +2576,7 @@ Tool Number - + The active tool Aktív szerszám diff --git a/src/Mod/Path/Gui/Resources/translations/Path_it.ts b/src/Mod/Path/Gui/Resources/translations/Path_it.ts index 2a0d1f880f..470392f033 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_it.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_it.ts @@ -312,37 +312,37 @@ Forma da utilizzare per calcolare il contorno - + The active tool L'utensile attivo - + The speed of the cutting spindle in RPM La velocità di taglio del mandrino in giri/min - + Direction of spindle rotation Direzione di rotazione del mandrino - + Feed rate for vertical moves in Z Velocità di avanzamento per i movimenti verticali in Z - + Feed rate for horizontal moves Velocità di avanzamento per gli spostamenti orizzontali - + Rapid rate for vertical moves in Z Velocità di avanzamento rapido per i movimenti verticali in Z - + Rapid rate for horizontal moves Velocità di avanzamento rapido per gli spostamenti orizzontali @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Carica utensile - + Add Tool Controller to the Job Aggiungi un Controllo utensile alla lavorazione - + Add Tool Controller Aggiungi un Controllo utensile - + Create Tool Controller Object Crea un oggetto Controllo utensile @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Carica utensile @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direzione di rotazione del mandrino @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM La velocità di taglio del mandrino in giri/min @@ -2576,7 +2576,7 @@ Tool Number - + The active tool L'utensile attivo diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ja.ts b/src/Mod/Path/Gui/Resources/translations/Path_ja.ts index b228aa22be..b457892aa4 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ja.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ja.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool アクティブなツール - + The speed of the cutting spindle in RPM RPM単位での切削スピンドルの回転速度 - + Direction of spindle rotation スピンドルの回転方向 - + Feed rate for vertical moves in Z Z方向での垂直移動の送り速度 - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Z方向での垂直移動の高速速度 - + Rapid rate for horizontal moves 水平移動の高速速度 @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load 読み込む工具番号 - + Add Tool Controller to the Job ジョブにツールコント ローラーを追加 - + Add Tool Controller ツールコント ローラーを追加 - + Create Tool Controller Object ツールコント ローラーオブジェクトを作成 @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load 読み込む工具番号 @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation スピンドルの回転方向 @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM RPM単位での切削スピンドルの回転速度 @@ -2576,7 +2576,7 @@ Tool Number - + The active tool アクティブなツール diff --git a/src/Mod/Path/Gui/Resources/translations/Path_kab.ts b/src/Mod/Path/Gui/Resources/translations/Path_kab.ts index 7be0e8b719..f3b6c37e3e 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_kab.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_kab.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool L'outil actif - + The speed of the cutting spindle in RPM La vitesse de la fraise en tours/mn - + Direction of spindle rotation Sens de rotation de la fraise - + Feed rate for vertical moves in Z Vitesse d'avancement pour les déplacements verticaux suivant Z - + Feed rate for horizontal moves Vitesse d'avancement pour les déplacements horizontaux - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1562,24 +1562,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Numéro d'outil à charger - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2108,7 +2108,7 @@ Current Tool - + Tool Number to Load Numéro d'outil à charger @@ -2539,7 +2539,7 @@ Spindle Dir - + Direction of spindle rotation Sens de rotation de la fraise @@ -2547,7 +2547,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM La vitesse de la fraise en tours/mn @@ -2573,7 +2573,7 @@ Tool Number - + The active tool L'outil actif diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ko.ts b/src/Mod/Path/Gui/Resources/translations/Path_ko.ts index 391c479894..c668ac5d51 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ko.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ko.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool 활성화 도구 - + The speed of the cutting spindle in RPM 절단 스핀들의 RPM 속도 - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM 절단 스핀들의 RPM 속도 @@ -2576,7 +2576,7 @@ Tool Number - + The active tool 활성화 도구 diff --git a/src/Mod/Path/Gui/Resources/translations/Path_nl.ts b/src/Mod/Path/Gui/Resources/translations/Path_nl.ts index 22d59e89ba..8081529aa5 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_nl.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_nl.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Te laden bewerkingsummer - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Te laden bewerkingsummer @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_no.ts b/src/Mod/Path/Gui/Resources/translations/Path_no.ts index a716b4ceee..0f0199a66e 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_no.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_no.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_pl.ts b/src/Mod/Path/Gui/Resources/translations/Path_pl.ts index ce2005deb5..b57bcef932 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_pl.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_pl.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool Aktywne narzędzie - + The speed of the cutting spindle in RPM Prędkość cięcia wrzeciona w obr. / min - + Direction of spindle rotation Kierunek obrotów wrzeciona - + Feed rate for vertical moves in Z Prędkość posuwu w osi Z - + Feed rate for horizontal moves Prędkość posuwu dla poziomych ruchów - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1562,24 +1562,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Numer narzędzi do wczytania - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2108,7 +2108,7 @@ Current Tool - + Tool Number to Load Numer narzędzi do wczytania @@ -2539,7 +2539,7 @@ Spindle Dir - + Direction of spindle rotation Kierunek obrotów wrzeciona @@ -2547,7 +2547,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM Prędkość cięcia wrzeciona w obr. / min @@ -2573,7 +2573,7 @@ Tool Number - + The active tool Aktywne narzędzie diff --git a/src/Mod/Path/Gui/Resources/translations/Path_pt-BR.ts b/src/Mod/Path/Gui/Resources/translations/Path_pt-BR.ts index bf5776f20d..db42054851 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_pt-BR.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_pt-BR.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool A ferramenta ativa - + The speed of the cutting spindle in RPM A velocidade do corte eixo em RPM - + Direction of spindle rotation Sentido de rotação do eixo - + Feed rate for vertical moves in Z Taxa de alimentação para movimentos verticais em Z - + Feed rate for horizontal moves Taxa de alimentação para movimentos horizontais - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Número da ferramenta a carregar - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Número da ferramenta a carregar @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Sentido de rotação do eixo @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM A velocidade do corte eixo em RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool A ferramenta ativa diff --git a/src/Mod/Path/Gui/Resources/translations/Path_pt-PT.ts b/src/Mod/Path/Gui/Resources/translations/Path_pt-PT.ts index 5eeb29bc24..34632e5182 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_pt-PT.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_pt-PT.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool A ferramenta ativa - + The speed of the cutting spindle in RPM A velocidade da fresa em RPM - + Direction of spindle rotation Sentido de rotação da fresa - + Feed rate for vertical moves in Z Taxa de avanço para movimentos verticais em Z - + Feed rate for horizontal moves Taxa de avanço para movimentos horizontais - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Número da ferramenta a carregar - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Número da ferramenta a carregar @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Sentido de rotação da fresa @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM A velocidade da fresa em RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool A ferramenta ativa diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ro.ts b/src/Mod/Path/Gui/Resources/translations/Path_ro.ts index bc6eb10283..9cef736d17 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ro.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ro.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Pasul pentru mișcările pe orizontală - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Numărul uneltei de încărcat - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Numărul uneltei de încărcat @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_ru.ts b/src/Mod/Path/Gui/Resources/translations/Path_ru.ts index bdbf19a064..d065340a41 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_ru.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_ru.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool Установленный инструмент - + The speed of the cutting spindle in RPM Скорость вращения шпинделя в об./мин. - + Direction of spindle rotation Направление вращения шпинделя - + Feed rate for vertical moves in Z Скорость подачи для вертикальных перемещений по оси Z - + Feed rate for horizontal moves Скорость подачи для горизонтальных перемещений - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Номер инструмента для загрузки - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Номер инструмента для загрузки @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Направление вращения шпинделя @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM Скорость вращения шпинделя в об./мин. @@ -2576,7 +2576,7 @@ Tool Number - + The active tool Установленный инструмент diff --git a/src/Mod/Path/Gui/Resources/translations/Path_sk.ts b/src/Mod/Path/Gui/Resources/translations/Path_sk.ts index 652ad4eee9..26c624ba9c 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_sk.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_sk.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_sl.ts b/src/Mod/Path/Gui/Resources/translations/Path_sl.ts index 9a4399963d..daddb75ebd 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_sl.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_sl.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool Dejavno orodje - + The speed of the cutting spindle in RPM Hitrost obdelovalnega vretena v obr./min. - + Direction of spindle rotation Smer vrtenja vretena - + Feed rate for vertical moves in Z Hitrost podajanja za navpične premike v smeri Z - + Feed rate for horizontal moves Hitrost podajanja vodoravnih premikov - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Številka orodja za nalaganje - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Številka orodja za nalaganje @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Smer vrtenja vretena @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM Hitrost obdelovalnega vretena v obr./min. @@ -2576,7 +2576,7 @@ Tool Number - + The active tool Dejavno orodje diff --git a/src/Mod/Path/Gui/Resources/translations/Path_sr.ts b/src/Mod/Path/Gui/Resources/translations/Path_sr.ts index a4c2f1d1cb..db5c17c9b3 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_sr.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_sr.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_sv-SE.ts b/src/Mod/Path/Gui/Resources/translations/Path_sv-SE.ts index f3ba981e26..2aa7c35bfe 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_sv-SE.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_sv-SE.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool Det aktiva verktyget - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool Det aktiva verktyget diff --git a/src/Mod/Path/Gui/Resources/translations/Path_tr.ts b/src/Mod/Path/Gui/Resources/translations/Path_tr.ts index 8bea812697..4f815c15ad 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_tr.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_tr.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_uk.ts b/src/Mod/Path/Gui/Resources/translations/Path_uk.ts index 545fd90b68..9b338a1bde 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_uk.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_uk.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool Активний інструмент - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Напрямок обертання шпинделя - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Напрямок обертання шпинделя @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool Активний інструмент diff --git a/src/Mod/Path/Gui/Resources/translations/Path_zh-CN.ts b/src/Mod/Path/Gui/Resources/translations/Path_zh-CN.ts index fcadde52ae..60d2d1eca8 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_zh-CN.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_zh-CN.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves Feed rate for horizontal moves - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1564,24 +1564,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2111,7 +2111,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2542,7 +2542,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2550,7 +2550,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2576,7 +2576,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/Gui/Resources/translations/Path_zh-TW.ts b/src/Mod/Path/Gui/Resources/translations/Path_zh-TW.ts index a1c9eaa8b8..038940163b 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path_zh-TW.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path_zh-TW.ts @@ -312,37 +312,37 @@ Shape to use for calculating Boundary - + The active tool The active tool - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM - + Direction of spindle rotation Direction of spindle rotation - + Feed rate for vertical moves in Z Feed rate for vertical moves in Z - + Feed rate for horizontal moves 水平移動的進給的速度 - + Rapid rate for vertical moves in Z Rapid rate for vertical moves in Z - + Rapid rate for horizontal moves Rapid rate for horizontal moves @@ -1559,24 +1559,24 @@ - Path_LoadTool + Path_ToolController - + Tool Number to Load Tool Number to Load - + Add Tool Controller to the Job Add Tool Controller to the Job - + Add Tool Controller Add Tool Controller - + Create Tool Controller Object Create Tool Controller Object @@ -2105,7 +2105,7 @@ Current Tool - + Tool Number to Load Tool Number to Load @@ -2533,7 +2533,7 @@ Spindle Dir - + Direction of spindle rotation Direction of spindle rotation @@ -2541,7 +2541,7 @@ Spindle Speed - + The speed of the cutting spindle in RPM The speed of the cutting spindle in RPM @@ -2567,7 +2567,7 @@ Tool Number - + The active tool The active tool diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index 52f7c8879b..84644f5d53 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -63,7 +63,6 @@ class PathWorkbench (Workbench): from PathScripts import PathHop from PathScripts import PathInspect from PathScripts import PathJob - from PathScripts import PathLoadTool from PathScripts import PathMillFace from PathScripts import PathPlane from PathScripts import PathPocket @@ -75,6 +74,7 @@ class PathWorkbench (Workbench): from PathScripts import PathStock from PathScripts import PathStop from PathScripts import PathSurface + from PathScripts import PathToolController from PathScripts import PathToolLenOffset from PathScripts import PathToolLibraryManager import PathCommands diff --git a/src/Mod/Path/PathScripts/PathJob.py b/src/Mod/Path/PathScripts/PathJob.py index 1f84f559ed..acd2f2f754 100644 --- a/src/Mod/Path/PathScripts/PathJob.py +++ b/src/Mod/Path/PathScripts/PathJob.py @@ -100,7 +100,7 @@ class ObjectPathJob: # controllers = [] # for o in obj.Group: # if "Proxy" in o.PropertiesList: - # if isinstance(o.Proxy, PathLoadTool.LoadTool): + # if isinstance(o.Proxy, PathToolController.ToolController): # controllers.append (o.Name) # return controllers @@ -178,12 +178,12 @@ class CommandJob: def Create(): FreeCAD.ActiveDocument.openTransaction(translate("Path_Job", "Create Job")) FreeCADGui.addModule('PathScripts.PathUtils') - FreeCADGui.addModule('PathScripts.PathLoadTool') + FreeCADGui.addModule('PathScripts.PathToolController') snippet = ''' -import PathScripts.PathLoadTool as PathLoadTool +import PathScripts.PathToolController as PathToolController obj = FreeCAD.ActiveDocument.addObject("Path::FeatureCompoundPython", "Job") PathScripts.PathJob.ObjectPathJob(obj) -PathLoadTool.CommandPathLoadTool.Create(obj.Name) +PathToolController.CommandPathToolController.Create(obj.Name) obj.ViewObject.Proxy.deleteOnReject = True obj.ViewObject.startEditing() ''' diff --git a/src/Mod/Path/PathScripts/PathPost.py b/src/Mod/Path/PathScripts/PathPost.py index 7baee76357..8a8075f58e 100644 --- a/src/Mod/Path/PathScripts/PathPost.py +++ b/src/Mod/Path/PathScripts/PathPost.py @@ -31,7 +31,7 @@ import os import PathScripts.PathLog as PathLog from PathScripts import PathJob -from PathScripts import PathLoadTool +from PathScripts import PathToolController from PathScripts import PathUtils from PathScripts.PathPostProcessor import PostProcessor from PathScripts.PathPreferences import PathPreferences @@ -247,7 +247,7 @@ class CommandPathPost: currTool = None for obj in job.Group: PathLog.debug("obj: {}".format(obj.Name)) - if not isinstance(obj.Proxy, PathLoadTool.LoadTool): + if not isinstance(obj.Proxy, PathToolController.ToolController): if obj.ToolController.ToolNumber != currTool: postlist.append(obj.ToolController) postlist.append(obj) diff --git a/src/Mod/Path/PathScripts/PathLoadTool.py b/src/Mod/Path/PathScripts/PathToolController.py similarity index 94% rename from src/Mod/Path/PathScripts/PathLoadTool.py rename to src/Mod/Path/PathScripts/PathToolController.py index 8c87b7fa33..b27ef26519 100644 --- a/src/Mod/Path/PathScripts/PathLoadTool.py +++ b/src/Mod/Path/PathScripts/PathToolController.py @@ -45,7 +45,7 @@ def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) -class LoadTool(): +class ToolController(): def __init__(self, obj, tool=1): PathLog.track('tool: {}'.format(tool)) @@ -92,7 +92,7 @@ class LoadTool(): job = PathUtils.findParentJob(obj) if job is not None: for g in job.Group: - if not(isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool)): + if not(isinstance(g.Proxy, PathScripts.PathToolController.ToolController)): g.touch() def getTool(self, obj): @@ -101,7 +101,7 @@ class LoadTool(): return obj.Tool -class _ViewProviderLoadTool: +class _ViewProviderToolController: def __init__(self, vobj): vobj.Proxy = self @@ -155,11 +155,11 @@ class _ViewProviderLoadTool: return False -class CommandPathLoadTool: +class CommandPathToolController: def GetResources(self): return {'Pixmap': 'Path-LengthOffset', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_LoadTool", "Add Tool Controller to the Job"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_LoadTool", "Add Tool Controller")} + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_ToolController", "Add Tool Controller to the Job"), + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_ToolController", "Add Tool Controller")} def IsActive(self): if FreeCAD.ActiveDocument is not None: @@ -172,11 +172,11 @@ class CommandPathLoadTool: PathLog.track() self.Create() -# FreeCAD.ActiveDocument.openTransaction(translate("Path_LoadTool", "Create Tool Controller Object")) +# FreeCAD.ActiveDocument.openTransaction(translate("Path_ToolController", "Create Tool Controller Object")) # obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", "TC") -# PathScripts.PathLoadTool.LoadTool(obj) -# PathScripts.PathLoadTool._ViewProviderLoadTool(obj.ViewObject) +# PathScripts.PathToolController.ToolController(obj) +# PathScripts.PathToolController._ViewProviderToolController(obj.ViewObject) # PathUtils.addToJob(obj) @@ -188,9 +188,9 @@ class CommandPathLoadTool: PathLog.track("tool: {} with toolNumber: {}".format(tool, toolNumber)) obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", "Default Tool") - PathScripts.PathLoadTool.LoadTool(obj) + PathScripts.PathToolController.ToolController(obj) if assignViewProvider: - PathScripts.PathLoadTool._ViewProviderLoadTool(obj.ViewObject) + PathScripts.PathToolController._ViewProviderToolController(obj.ViewObject) if tool is None: tool = Path.Tool() @@ -374,6 +374,6 @@ class SelObserver: if FreeCAD.GuiUp: # register the FreeCAD command - FreeCADGui.addCommand('Path_LoadTool', CommandPathLoadTool()) + FreeCADGui.addCommand('Path_ToolController', CommandPathToolController()) -FreeCAD.Console.PrintLog("Loading PathLoadTool... done\n") +FreeCAD.Console.PrintLog("Loading PathToolController... done\n") diff --git a/src/Mod/Path/PathScripts/PathToolLenOffset.py b/src/Mod/Path/PathScripts/PathToolLenOffset.py index 0f7ea6d090..6f613f8005 100644 --- a/src/Mod/Path/PathScripts/PathToolLenOffset.py +++ b/src/Mod/Path/PathScripts/PathToolLenOffset.py @@ -56,7 +56,7 @@ class ToolLenOffset: obj.Path = Path.Path("(inactive operation)") obj.ViewObject.Visibility = False - # tie the HeightNumber to the PathLoadTool object ToolNumber + # tie the HeightNumber to the PathToolController object ToolNumber if len(obj.InList) > 0: # check to see if obj is in the Project group yet project = obj.InList[0] tl = int(PathUtils.changeTool(obj, project)) diff --git a/src/Mod/Path/PathScripts/PathToolLibraryManager.py b/src/Mod/Path/PathScripts/PathToolLibraryManager.py index dfe073bbcc..2438d95f37 100644 --- a/src/Mod/Path/PathScripts/PathToolLibraryManager.py +++ b/src/Mod/Path/PathScripts/PathToolLibraryManager.py @@ -550,8 +550,8 @@ class EditorPanel(): label = "T{}: {}".format(toolnum, tool.Name) obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython",label) - PathScripts.PathLoadTool.LoadTool(obj) - PathScripts.PathLoadTool._ViewProviderLoadTool(obj.ViewObject) + PathScripts.PathToolController.ToolController(obj) + PathScripts.PathToolController._ViewProviderToolController(obj.ViewObject) PathUtils.addToJob(obj, targetlist) FreeCAD.activeDocument().recompute() obj.Tool = tool.copy() diff --git a/src/Mod/Path/PathScripts/PathUtils.py b/src/Mod/Path/PathScripts/PathUtils.py index 63ede507ec..2977ff7f80 100644 --- a/src/Mod/Path/PathScripts/PathUtils.py +++ b/src/Mod/Path/PathScripts/PathUtils.py @@ -307,13 +307,13 @@ def changeTool(obj, job): tlnum = 0 for p in job.Group: if not hasattr(p, "Group"): - if isinstance(p.Proxy, PathScripts.PathLoadTool.LoadTool) and p.ToolNumber > 0: + if isinstance(p.Proxy, PathScripts.PathToolController.ToolController) and p.ToolNumber > 0: tlnum = p.ToolNumber if p == obj: return tlnum elif hasattr(p, "Group"): for g in p.Group: - if isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool): + if isinstance(g.Proxy, PathScripts.PathToolController.ToolController): tlnum = g.ToolNumber if g == obj: return tlnum @@ -330,7 +330,7 @@ def getToolControllers(obj): if parent is not None and hasattr(parent, 'Group'): sibs = parent.Group for g in sibs: - if isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool): + if isinstance(g.Proxy, PathScripts.PathToolController.ToolController): controllers.append(g) return controllers @@ -345,7 +345,7 @@ def findToolController(obj, name=None): # First check if a user has selected a tool controller in the tree. Return the first one and remove all from selection for sel in FreeCADGui.Selection.getSelectionEx(): if hasattr(sel.Object, 'Proxy'): - if isinstance(sel.Object.Proxy, PathScripts.PathLoadTool.LoadTool): + if isinstance(sel.Object.Proxy, PathScripts.PathToolController.ToolController): if c is None: c = sel.Object FreeCADGui.Selection.removeSelection(sel.Object) diff --git a/src/Mod/Path/PathTests/TestPathPost.py b/src/Mod/Path/PathTests/TestPathPost.py index 17e4adb7f8..8fef7e67ae 100644 --- a/src/Mod/Path/PathTests/TestPathPost.py +++ b/src/Mod/Path/PathTests/TestPathPost.py @@ -27,8 +27,8 @@ import Path import PathScripts import PathScripts.PathContour import PathScripts.PathJob -import PathScripts.PathLoadTool import PathScripts.PathPost +import PathScripts.PathToolController import PathScripts.PathUtils import difflib import unittest @@ -48,7 +48,7 @@ class PathPostTestCases(unittest.TestCase): job = self.doc.addObject("Path::FeatureCompoundPython", "Job") PathScripts.PathJob.ObjectPathJob(job) job.Base = self.doc.Box - PathScripts.PathLoadTool.CommandPathLoadTool.Create(job.Name, False) + PathScripts.PathToolController.CommandPathToolController.Create(job.Name, False) tool1 = Path.Tool() tool1.Diameter = 5.0 tool1.Name = "Default Tool" @@ -57,7 +57,7 @@ class PathPostTestCases(unittest.TestCase): tool1.Material = "HighSpeedSteel" tc = FreeCAD.ActiveDocument.addObject("Path::FeaturePython",'TC') - PathScripts.PathLoadTool.LoadTool(tc) + PathScripts.PathToolController.ToolController(tc) PathScripts.PathUtils.addToJob(tc, "Job") tc.Tool = tool1 tc.ToolNumber = 2