From 68cadb08cebc9f604538ce5a0ca3b80e4897dd1d Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 10 Mar 2019 17:21:45 +0200 Subject: [PATCH] - fixed some issues with ToolMeasurement due of above changes --- FlatCAMTool.py | 6 +- README.md | 1 + flatcamTools/ToolMeasurement.py | 10 +- flatcamTools/ToolMove.py | 2 +- locale/ro/LC_MESSAGES/ToolCalculators.mo | Bin 0 -> 4190 bytes locale/ro/LC_MESSAGES/ToolCalculators.po | 204 +++++++++++++++++++++++ locale/ro/LC_MESSAGES/ToolMeasurement.mo | Bin 0 -> 1765 bytes locale/ro/LC_MESSAGES/ToolMeasurement.po | 92 ++++++++++ 8 files changed, 306 insertions(+), 9 deletions(-) create mode 100644 locale/ro/LC_MESSAGES/ToolCalculators.mo create mode 100644 locale/ro/LC_MESSAGES/ToolCalculators.po create mode 100644 locale/ro/LC_MESSAGES/ToolMeasurement.mo create mode 100644 locale/ro/LC_MESSAGES/ToolMeasurement.po diff --git a/FlatCAMTool.py b/FlatCAMTool.py index be73af5a..fab4f7ae 100644 --- a/FlatCAMTool.py +++ b/FlatCAMTool.py @@ -83,9 +83,6 @@ class FlatCAMTool(QtWidgets.QWidget): # Put ourself in the GUI self.app.ui.tool_scroll_area.setWidget(self) - # Set the tool name as the widget object name - self.app.ui.tool_scroll_area.widget().setObjectName(self.toolName) - # Switch notebook to tool page self.app.ui.notebook.setCurrentWidget(self.app.ui.tool_tab) @@ -100,5 +97,8 @@ class FlatCAMTool(QtWidgets.QWidget): except AttributeError: pass + # Set the tool name as the widget object name + self.app.ui.tool_scroll_area.widget().setObjectName(self.toolName) + self.show() diff --git a/README.md b/README.md index 77b6d800..928d3892 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ CAD program, and create G-Code for Isolation routing. - fixed Tools menu no longer working due of changes - added some test translation for the ToolCalculators (in Romanian) - fixed bug in ToolCutOut where for each tool invocation the signals were reconnected +- fixed some issues with ToolMeasurement due of above changes 8.03.2019 diff --git a/flatcamTools/ToolMeasurement.py b/flatcamTools/ToolMeasurement.py index 703c3aea..a66d817c 100644 --- a/flatcamTools/ToolMeasurement.py +++ b/flatcamTools/ToolMeasurement.py @@ -167,9 +167,9 @@ class Measurement(FlatCAMTool): # VisPy visuals self.sel_shapes = ShapeCollection(parent=self.app.plotcanvas.vispy_canvas.view.scene, layers=1) - self.measure_btn.clicked.connect(self.toggle) + self.measure_btn.clicked.connect(self.toggle_f) - def run(self, toggle): + def run(self, toggle=False): self.app.report_usage("ToolMeasurement()") if self.app.tool_tab_locked is True: @@ -179,7 +179,7 @@ class Measurement(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - self.toggle() + self.toggle_f() self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Meas. Tool")) @@ -199,7 +199,7 @@ class Measurement(FlatCAMTool): self.units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower() self.show() - def toggle(self): + def toggle_f(self): # the self.active var is doing the 'toggle' if self.active is True: # DISABLE the Measuring TOOL @@ -333,7 +333,7 @@ class Measurement(FlatCAMTool): self.total_distance_entry.set_value('%.4f' % abs(d)) self.clicked_meas = 0 - self.toggle() + self.toggle_f() # delete the measuring line self.delete_shape() diff --git a/flatcamTools/ToolMove.py b/flatcamTools/ToolMove.py index 58e5c714..7400cdf0 100644 --- a/flatcamTools/ToolMove.py +++ b/flatcamTools/ToolMove.py @@ -56,7 +56,7 @@ class ToolMove(FlatCAMTool): return self.toggle() - def toggle(self): + def toggle(self, toggle=False): if self.isVisible(): self.setVisible(False) diff --git a/locale/ro/LC_MESSAGES/ToolCalculators.mo b/locale/ro/LC_MESSAGES/ToolCalculators.mo new file mode 100644 index 0000000000000000000000000000000000000000..eda653e8b120ff95f6a68e09bd297abbd9d7e4a2 GIT binary patch literal 4190 zcmbW3O^h5z8HO7Y2uuhG=AVR6fH1ba)1F<6V2`~pz`({09-2;(ku!DJW9U|ehZZS55aGPXD}L9qo07N zh<*-=AHU+~ecOJ%Y+`5uy+iu}e4-y|@`Y&;5RGxr8&h#Kwc0x^|DQ6G0<63XSy=8f6CZuY`o$}4eCnWSFTx@;m{o%16H^(# z)KMxmg~?N!kCe;R;n*f)WlNrx)|*u6Je@s!kh{Y?R&)A9QBr$v@=DpfGI?pMBXyv& z+JvL>zVI$FY3`^6$L(B_wF#b-Ktw}l)*#$;GSrm zEz{PR%Bez^C7gIykH&$UePK0LovmE0O^Q;9{5!AK8XGr^snpt?jTpHQ*pIGdFz4Ma zObba<)}4)ru&;J@-r~WX9XTe)qfK{+ z{Wf_Jyhs{iMu8X!T8Kc3!eBrw?oDjsU0%k~-k1$Zn=)httGYD9I#a`tBd#$#e7YT791Bum?k5*~3^H9nvezSd3`h;NwDQ{k_LzOfX&ZT$h|2?6w03tf$*!Og)9 zw=c|zT+;eJ710*l34v{2m}ebVi@3AL$$6@egFx0*i$WGUOp}UDg+Ln_>N*>w*kEl( zT{nIo7fb0(E-nX`A`UXJ;8}M+V$@1 zIMUrpyZ1;i9O|pi?ybGfODK?#083<%W>bxmwh^1{Fg+)^5uB1?p=V#D69hxw$Ws(xQI;-VeCC3??y26)s zgj&0FLS_?1GrlO%yVj?pY zOBVJn7{|WKn?yPu6wuTY9qLz47^PO7SA|V1vmnEEUEzZ|!%RIJM^kQRpD*m1jaXqY zTH~zH2shrPHCh;}VjB#Jg=pTdVZ0r%7J^7z43|$A8F?ArR^G<{ucTuMB2L7{Q+6aq zO>9u#1ex(G?8+PHC3bD^m${1t3Bl(?^QnffAs6b(W_)zuU#)avZ0ne2qEmFDBg9I{ z2p;L$6ZWCY(8Jf5liBN1*)>txtD)_ygi%VSND2@OnXgM~YzsGZ<)Xu?vxq_ zjL!}GFhT80_H&LQ&eqmo-I|$?#+K9UJkWkPm-un#T1fC_5=*j*>JTj{dd{>J5(Lr_ zT8Y_Wb%wb%9m^qLiJ9BHP`Piuw=I;MoGh7bQ*x(;(`4tw%0ND0(i>Hv3EzD-=}fDd z-r1HcHRj8}TKM9{)nHtc{3pcgROd;^4_KUvlKv7>l`1?Q)$N!L2{J8fh@7>f#o)~P zlEfx7jVb4EDLBWmnF(y=ELK}vjreWzP8iN?(`s>;huojNoOg-u@p{6PxXMh9)m=%z zN;AgSLyPN2cO}`>J$#|, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: 2019-03-10 16:22+0200\n" +"PO-Revision-Date: 2019-03-10 16:30+0200\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"X-Generator: Poedit 2.2.1\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && " +"n%100<=19) ? 1 : 2);\n" +"Language: ro\n" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:26 +msgid "Calculators" +msgstr "Calculatoare" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:27 +msgid "V-Shape Tool Calculator" +msgstr "Calculator Unealta V-Shape" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:28 +msgid "Units Calculator" +msgstr "Calculator Unitati" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:29 +msgid "ElectroPlating Calculator" +msgstr "Calculator ElectroPlacare" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:70 +msgid "Here you enter the value to be converted from INCH to MM" +msgstr "" +"Aici se introduce valoarea care trebuie convertita din Inch in milimetri." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:75 +msgid "Here you enter the value to be converted from MM to INCH" +msgstr "" +"Aici se introduce valoarea care trebuie convertita din milimetri in Inch." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:96 +msgid "Tip Diameter:" +msgstr "Diametrul Varf:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:100 +msgid "" +"This is the diameter of the tool tip.\n" +"The manufacturer specifies it." +msgstr "" +"Acesta este diametrul varfului uneltei.\n" +"Este specificat de producatorul uneltei." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:103 +msgid "Tip Angle:" +msgstr "Unghi Varf:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:107 +msgid "" +"This is the angle of the tip of the tool.\n" +"It is specified by manufacturer." +msgstr "" +"Acesta este unghiul la varf al uneltei.\n" +"Este specificat de producatorul uneltei." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:110 +msgid "Cut Z:" +msgstr "Z taiere:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:114 +msgid "" +"This is the depth to cut into the material.\n" +"In the CNCJob is the CutZ parameter." +msgstr "" +"Aceasta este adancimea la care se taie in material.\n" +"In CNCJob este parametrul >Z taiere<." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:117 +msgid "Tool Diameter:" +msgstr "Diametru Unealta:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:121 +msgid "" +"This is the tool diameter to be entered into\n" +"FlatCAM Gerber section.\n" +"In the CNCJob section it is called >Tool dia<." +msgstr "" +"Acesta este diametrul uneltei care trebuie introdusa in\n" +"sectiunea FlatCAM Gerber.\n" +"In sectiunea CNCJob este denumit >Dia. Unealta<." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:133 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:216 +msgid "Calculate" +msgstr "Calculeaza" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:136 +msgid "" +"Calculate either the Cut Z or the effective tool diameter,\n" +" depending on which is desired and which is known. " +msgstr "" +"Calculeaza ori param. >Z taiere< ori diametrul efectiv al uneltei\n" +"in functie de care se doreste si care este cunoscut. " + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:154 +msgid "" +"This calculator is useful for those who plate the via/pad/drill holes,\n" +"using a method like grahite ink or calcium hypophosphite ink or palladium " +"chloride." +msgstr "" +"Acest calculator este util pentru aceia care acopera cu Cupru via/gauri,\n" +"folosind o metoda cum ar fi: clorura de paladiu, hipofosfitul de calciu\n" +"sau cerneala pe baza de grafit." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:163 +msgid "Board Length:" +msgstr "Lungimea placii:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:167 +msgid "This is the board length. In centimeters." +msgstr "Aceasta este lungimea placii. In centimetri." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:169 +msgid "Board Width:" +msgstr "Latimea placii:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:173 +msgid "This is the board width.In centimeters." +msgstr "Aceasta este latimea placii. In centimetri." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:175 +msgid "Current Density:" +msgstr "Densitatea de current:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:179 +msgid "" +"Current density to pass through the board. \n" +"In Amps per Square Feet ASF." +msgstr "" +"Densitatea curentului care trece prin palca.\n" +"In amperi / picior la patrat (ASF)." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:183 +msgid "Copper Growth:" +msgstr "Grosime Cupru:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:187 +msgid "" +"How thick the copper growth is intended to be.\n" +"In microns." +msgstr "" +"Valoarea cu cat se creste grosimea cuprului.\n" +"In micron." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:192 +msgid "Current Value:" +msgstr "Valoare Int. Curent:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:196 +msgid "" +"This is the current intensity value\n" +"to be set on the Power Supply. In Amps." +msgstr "" +"Aceasta este intensitatea curentului electric\n" +"care se seteaza in sursa de tensiune. In amperi." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:200 +msgid "Time:" +msgstr "Durata:" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:204 +msgid "" +"This is the calculated time required for the procedure.\n" +"In minutes." +msgstr "" +"Aceasta este durata necesara pentru procedura.\n" +"In minute." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:219 +msgid "" +"Calculate the current intensity value and the procedure time,\n" +" depending on the parameters above" +msgstr "" +"Calculeaza intensitatea curentului cat si durata procedurii,\n" +"in functie de parametrii de mai sus." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:306 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:317 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:329 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:344 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:357 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:371 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:382 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:393 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolCalculators.py:404 +msgid "[ERROR_NOTCL]Wrong value format entered, use a number." +msgstr "" +"[ERROR_NOTCL] A fost introdusa o valoare in format gresit, foloseste un " +"numar." diff --git a/locale/ro/LC_MESSAGES/ToolMeasurement.mo b/locale/ro/LC_MESSAGES/ToolMeasurement.mo new file mode 100644 index 0000000000000000000000000000000000000000..f97fed361e83704d0d9441cdf17fd96ca07d50a7 GIT binary patch literal 1765 zcma)+L2ukd6vqczpqNrhd*H(1aY#u3yY{B7Ql|#O?zW1QEzxFE(hJgHPj{zyXRPtK zWKm9V0B#700}@9*0NglmLP&7oDXkUWQf?t6bz^_3c{0@8_{2ffde?SlPpJwbia07e+d>4EM+yT#n zL+}mo126zTYxxuC{Qlj}FP&rT7Ul`~1$G&5;oQ`vFx&~eZosL_e)A1pA75pA_ zI(`J72Y&`}v0pJb9e;p#z(2ti(1UZw5ZnYGfX@Fn;41hF2pJ6W*d=t=T)s}rMf4ZZ zUB0flxGv^pbSz_#UbmMpx_x%dX>bkUo7UCZWF_lu?~S(Zcl&J6-`d+BZr{HbQ#Y6C z$D|e6iJ+b+tyJ7f%nL1*r634SwcfMb*puysqO5XDz171tN@yjx@raHvn=Q{|X}L;8 z`<@L1F9RBBo!7UO5pzz3vaAk0p)aB}u5M{71b;)J(fXzCQ zk$xgfo%aFpLwR=dhbNdXi_t~9E2nB{HrMLbu3x3O%p_L}kxsfU1#u&4g_V*PNh|tf zBGXCzXpzriD?}EsU85h1)cV_*|3H`$CmEBs`~Jx98c`pt-^13#)Cr^8ez@*OAw}zP zxbbG#2}2nAL-9nqWhdC(jBl(rb~{{+D?S$fNbo5F47LaT<9JaJdR?t7&dndq3PiKw z&|WWcF4ZQb6K+ajll{?Mf8*HBa8*7M#_y|Cjc14yi@~EV9hN8w#f##a^4&U&2Iv>kAg$JAUzaa>dMfi KzodVDu>S$24&GP* literal 0 HcmV?d00001 diff --git a/locale/ro/LC_MESSAGES/ToolMeasurement.po b/locale/ro/LC_MESSAGES/ToolMeasurement.po new file mode 100644 index 00000000..2a032f36 --- /dev/null +++ b/locale/ro/LC_MESSAGES/ToolMeasurement.po @@ -0,0 +1,92 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: 2019-03-10 13:08+0200\n" +"PO-Revision-Date: 2019-03-10 15:43+0200\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"X-Generator: Poedit 2.2.1\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && n%100<=19) ? 1 : 2);\n" +"Language: ro\n" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:16 +msgid "Measurement" +msgstr "Măsurare" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:37 +msgid "Start" +msgstr "Start" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:37 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:40 +msgid "Coords" +msgstr "Coord." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:38 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:89 +msgid "This is measuring Start point coordinates." +msgstr "Acestea sunt coordonatele punctului de start al masuratorii." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:40 +msgid "Stop" +msgstr "Stop" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:41 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:94 +msgid "This is the measuring Stop point coordinates." +msgstr "Acestea sunt coordonatele punctului de stop al masuratorii." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:44 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:99 +msgid "This is the distance measured over the X axis." +msgstr "Distanta masurata de-a lungul axei X." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:47 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:105 +msgid "This is the distance measured over the Y axis." +msgstr "Distanta masurata de-a lungul axei Y." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:49 +msgid "DISTANCE" +msgstr "Distanta" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:50 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:111 +msgid "This is the point to point Euclidian distance." +msgstr "Distanta euclidiana de la punct la punct." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:53 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:60 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:67 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:74 +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:81 +msgid "Those are the units in which the distance is measured." +msgstr "Unitatile in care este masurata distanta" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:114 +msgid "Measure" +msgstr "Masoara" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:173 +msgid "Meas. Tool" +msgstr "Unealta de masurare" + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:266 +msgid "MEASURING: Click on the Start point ..." +msgstr "Masurare: Click pe punctul de Start ..." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:295 +msgid "MEASURING: Click on the Destination point ..." +msgstr "Masurare: Click pe punctul Destinatie ..." + +#: D:\1.DEV\FlatCAM_beta\flatcamTools\ToolMeasurement.py:316 +msgid "MEASURING: Result D(x) = %.4f | D(y) = %.4f | Distance = %.4f" +msgstr "Masurare: RezultatD(x) = %.4f | D(y) = %.4f | Distanta = %.4f"