- updated the border for fit view on OpenGL graphic mode

- Calibration Tool - added preferences values
- Calibration Tool - more work on it
This commit is contained in:
Marius Stanciu
2019-12-09 01:56:45 +02:00
committed by Marius
parent e54dd14e6c
commit 8969c03021
12 changed files with 618 additions and 388 deletions

View File

@@ -1821,7 +1821,7 @@ msgstr "V-Angle"
#: FlatCAMCommon.py:524 flatcamGUI/ObjectUI.py:798 flatcamGUI/ObjectUI.py:1369
#: flatcamGUI/PreferencesUI.py:2304 flatcamGUI/PreferencesUI.py:3178
#: flatcamTools/ToolCalibrate.py:82
#: flatcamTools/ToolCalibration.py:82
msgid "Travel Z"
msgstr "Travel Z"
@@ -1872,7 +1872,7 @@ msgid "Toolchange XY"
msgstr "Toolchange XY"
#: FlatCAMCommon.py:535 flatcamGUI/PreferencesUI.py:2330
#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibrate.py:119
#: flatcamGUI/PreferencesUI.py:3210 flatcamTools/ToolCalibration.py:119
msgid "Toolchange Z"
msgstr "Toolchange Z"
@@ -2641,13 +2641,13 @@ msgid "Plotting..."
msgstr "Plotting..."
#: FlatCAMObj.py:6172 FlatCAMObj.py:6177
#: flatcamTools/ToolCalibrate.py:765
#: flatcamTools/ToolCalibrate.py:770
#: flatcamTools/ToolCalibration.py:765
#: flatcamTools/ToolCalibration.py:770
#: flatcamTools/ToolSolderPaste.py:1470
msgid "Export Machine Code ..."
msgstr "Export Machine Code ..."
#: FlatCAMObj.py:6182 flatcamTools/ToolCalibrate.py:775
#: FlatCAMObj.py:6182 flatcamTools/ToolCalibration.py:775
#: flatcamTools/ToolSolderPaste.py:1474
msgid "Export Machine Code cancelled ..."
msgstr "Export Machine Code cancelled ..."
@@ -3718,8 +3718,8 @@ msgstr "Skew/Shear"
#: flatcamGUI/FlatCAMGUI.py:1849 flatcamGUI/FlatCAMGUI.py:1927
#: flatcamGUI/FlatCAMGUI.py:2262 flatcamGUI/ObjectUI.py:91
#: flatcamGUI/ObjectUI.py:112 flatcamGUI/PreferencesUI.py:5139
#: flatcamTools/ToolCalibrate.py:446
#: flatcamTools/ToolCalibrate.py:473 flatcamTools/ToolTransform.py:27
#: flatcamTools/ToolCalibration.py:446
#: flatcamTools/ToolCalibration.py:473 flatcamTools/ToolTransform.py:27
msgid "Scale"
msgstr "Scale"
@@ -3775,7 +3775,7 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:711
#: flatcamEditors/FlatCAMGrbEditor.py:5102
#: flatcamTools/ToolCalibrate.py:482
#: flatcamTools/ToolCalibration.py:482
msgid "Angle X:"
msgstr "Angle X:"
@@ -3783,8 +3783,8 @@ msgstr "Angle X:"
#: flatcamEditors/FlatCAMGeoEditor.py:731
#: flatcamEditors/FlatCAMGrbEditor.py:5104
#: flatcamEditors/FlatCAMGrbEditor.py:5122 flatcamGUI/PreferencesUI.py:5118
#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibrate.py:484
#: flatcamTools/ToolCalibrate.py:497
#: flatcamGUI/PreferencesUI.py:5132 flatcamTools/ToolCalibration.py:484
#: flatcamTools/ToolCalibration.py:497
msgid ""
"Angle for Skew action, in degrees.\n"
"Float number between -360 and 359."
@@ -3812,7 +3812,7 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:729
#: flatcamEditors/FlatCAMGrbEditor.py:5120
#: flatcamTools/ToolCalibrate.py:495
#: flatcamTools/ToolCalibration.py:495
msgid "Angle Y:"
msgstr "Angle Y:"
@@ -3823,13 +3823,13 @@ msgstr "Skew Y"
#: flatcamEditors/FlatCAMGeoEditor.py:768
#: flatcamEditors/FlatCAMGrbEditor.py:5159
#: flatcamTools/ToolCalibrate.py:449
#: flatcamTools/ToolCalibration.py:449
msgid "Factor X:"
msgstr "Factor X:"
#: flatcamEditors/FlatCAMGeoEditor.py:770
#: flatcamEditors/FlatCAMGrbEditor.py:5161
#: flatcamTools/ToolCalibrate.py:451
#: flatcamTools/ToolCalibration.py:451
msgid "Factor for Scale action over X axis."
msgstr "Factor for Scale action over X axis."
@@ -3853,13 +3853,13 @@ msgstr ""
#: flatcamEditors/FlatCAMGeoEditor.py:785
#: flatcamEditors/FlatCAMGrbEditor.py:5176
#: flatcamTools/ToolCalibrate.py:461
#: flatcamTools/ToolCalibration.py:461
msgid "Factor Y:"
msgstr "Factor Y:"
#: flatcamEditors/FlatCAMGeoEditor.py:787
#: flatcamEditors/FlatCAMGrbEditor.py:5178
#: flatcamTools/ToolCalibrate.py:463
#: flatcamTools/ToolCalibration.py:463
msgid "Factor for Scale action over Y axis."
msgstr "Factor for Scale action over Y axis."
@@ -6217,12 +6217,12 @@ msgstr "General"
msgid "GERBER"
msgstr "GERBER"
#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibrate.py:66
#: flatcamTools/ToolCalibrate.py:543 flatcamTools/ToolDblSided.py:79
#: flatcamGUI/FlatCAMGUI.py:994 flatcamTools/ToolCalibration.py:66
#: flatcamTools/ToolCalibration.py:543 flatcamTools/ToolDblSided.py:79
msgid "EXCELLON"
msgstr "EXCELLON"
#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibrate.py:556
#: flatcamGUI/FlatCAMGUI.py:1004 flatcamTools/ToolCalibration.py:556
#: flatcamTools/ToolDblSided.py:101
msgid "GEOMETRY"
msgstr "GEOMETRY"
@@ -7046,7 +7046,7 @@ msgstr "Plot (show) this object."
#: flatcamGUI/ObjectUI.py:199 flatcamGUI/ObjectUI.py:697
#: flatcamGUI/ObjectUI.py:1089 flatcamGUI/ObjectUI.py:1671
#: flatcamGUI/ObjectUI.py:1952 flatcamGUI/ObjectUI.py:2004
#: flatcamTools/ToolCalibrate.py:159 flatcamTools/ToolFiducials.py:73
#: flatcamTools/ToolCalibration.py:159 flatcamTools/ToolFiducials.py:73
msgid "Name"
msgstr "Name"
@@ -11350,8 +11350,8 @@ msgstr ""
"Various transformations that can be applied\n"
"on a FlatCAM object."
#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibrate.py:479
#: flatcamTools/ToolCalibrate.py:508
#: flatcamGUI/PreferencesUI.py:5108 flatcamTools/ToolCalibration.py:479
#: flatcamTools/ToolCalibration.py:508
msgid "Skew"
msgstr "Skew"
@@ -12609,46 +12609,46 @@ msgstr ""
msgid "Calc. Tool"
msgstr "Calc. Tool"
#: flatcamTools/ToolCalibrate.py:33
#: flatcamTools/ToolCalibration.py:33
#| msgid "Creating Excellon."
msgid "Calibrate Excellon"
msgstr "Calibrate Excellon"
#: flatcamTools/ToolCalibrate.py:68
#: flatcamTools/ToolCalibration.py:68
#| msgid "The FlatCAM object to be used as non copper clearing reference."
msgid "Excellon Object to be used as a source for reference points."
msgstr "Excellon Object to be used as a source for reference points."
#: flatcamTools/ToolCalibrate.py:75
#: flatcamTools/ToolCalibration.py:75
#| msgid "Slot Parameters"
msgid "GCode Parameters"
msgstr "GCode Parameters"
#: flatcamTools/ToolCalibrate.py:77
#: flatcamTools/ToolCalibration.py:77
msgid "Parameters used when creating the GCode in this tool."
msgstr "Parameters used when creating the GCode in this tool."
#: flatcamTools/ToolCalibrate.py:84
#: flatcamTools/ToolCalibration.py:84
#| msgid ""
#| "The height (Z) for travel between pads\n"
#| "(without dispensing solder paste)."
msgid "Height (Z) for travelling between the points."
msgstr "Height (Z) for travelling between the points."
#: flatcamTools/ToolCalibrate.py:96
#: flatcamTools/ToolCalibration.py:96
#| msgid "Gerber Specification"
msgid "Verification Z"
msgstr "Verification Z"
#: flatcamTools/ToolCalibrate.py:98
#: flatcamTools/ToolCalibration.py:98
msgid "Height (Z) for checking the point."
msgstr "Height (Z) for checking the point."
#: flatcamTools/ToolCalibrate.py:110
#: flatcamTools/ToolCalibration.py:110
msgid "Zero Z tool"
msgstr "Zero Z tool"
#: flatcamTools/ToolCalibrate.py:112
#: flatcamTools/ToolCalibration.py:112
msgid ""
"Include a sequence to zero the height (Z)\n"
"of the verification tool."
@@ -12656,15 +12656,15 @@ msgstr ""
"Include a sequence to zero the height (Z)\n"
"of the verification tool."
#: flatcamTools/ToolCalibrate.py:121
#: flatcamTools/ToolCalibration.py:121
msgid "Height (Z) for mounting the verification probe."
msgstr "Height (Z) for mounting the verification probe."
#: flatcamTools/ToolCalibrate.py:143
#: flatcamTools/ToolCalibration.py:143
msgid "Calibration Points"
msgstr "Calibration Points"
#: flatcamTools/ToolCalibrate.py:145
#: flatcamTools/ToolCalibration.py:145
msgid ""
"Contain the expected calibration points and the\n"
"ones measured."
@@ -12672,67 +12672,67 @@ msgstr ""
"Contain the expected calibration points and the\n"
"ones measured."
#: flatcamTools/ToolCalibrate.py:160 flatcamTools/ToolSub.py:73
#: flatcamTools/ToolCalibration.py:160 flatcamTools/ToolSub.py:73
#: flatcamTools/ToolSub.py:119
msgid "Target"
msgstr "Target"
#: flatcamTools/ToolCalibrate.py:161
#: flatcamTools/ToolCalibration.py:161
msgid "Found Delta"
msgstr "Found Delta"
#: flatcamTools/ToolCalibrate.py:173
#: flatcamTools/ToolCalibration.py:173
#| msgid "Bottom Left"
msgid "Bot Left X"
msgstr "Bot Left X"
#: flatcamTools/ToolCalibrate.py:182
#: flatcamTools/ToolCalibration.py:182
#| msgid "Bottom Left"
msgid "Bot Left Y"
msgstr "Bot Left Y"
#: flatcamTools/ToolCalibrate.py:190
#: flatcamTools/ToolCalibrate.py:191
#: flatcamTools/ToolCalibration.py:190
#: flatcamTools/ToolCalibration.py:191
#| msgid "Origin set"
msgid "Origin"
msgstr "Origin"
#: flatcamTools/ToolCalibrate.py:202
#: flatcamTools/ToolCalibration.py:202
#| msgid "Bottom Right"
msgid "Bot Right X"
msgstr "Bot Right X"
#: flatcamTools/ToolCalibrate.py:212
#: flatcamTools/ToolCalibration.py:212
#| msgid "Bottom Right"
msgid "Bot Right Y"
msgstr "Bot Right Y"
#: flatcamTools/ToolCalibrate.py:227
#: flatcamTools/ToolCalibration.py:227
#| msgid "Top Left"
msgid "Top Left X"
msgstr "Top Left X"
#: flatcamTools/ToolCalibrate.py:236
#: flatcamTools/ToolCalibration.py:236
#| msgid "Top Left"
msgid "Top Left Y"
msgstr "Top Left Y"
#: flatcamTools/ToolCalibrate.py:251
#: flatcamTools/ToolCalibration.py:251
#| msgid "Top right"
msgid "Top Right X"
msgstr "Top Right X"
#: flatcamTools/ToolCalibrate.py:260
#: flatcamTools/ToolCalibration.py:260
#| msgid "Top right"
msgid "Top Right Y"
msgstr "Top Right Y"
#: flatcamTools/ToolCalibrate.py:393
#: flatcamTools/ToolCalibration.py:393
#: flatcamTools/ToolSolderPaste.py:148
msgid "STEP 1"
msgstr "STEP 1"
#: flatcamTools/ToolCalibrate.py:395
#: flatcamTools/ToolCalibration.py:395
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four\n"
@@ -12742,11 +12742,11 @@ msgstr ""
"Those four points should be in the four\n"
"(as much as possible) corners of the Excellon object."
#: flatcamTools/ToolCalibrate.py:402
#: flatcamTools/ToolCalibration.py:402
msgid "Acquire Calibration Points"
msgstr "Acquire Calibration Points"
#: flatcamTools/ToolCalibrate.py:404
#: flatcamTools/ToolCalibration.py:404
msgid ""
"Pick four points by clicking inside the drill holes.\n"
"Those four points should be in the four squares of\n"
@@ -12756,13 +12756,13 @@ msgstr ""
"Those four points should be in the four squares of\n"
"the Excellon object."
#: flatcamTools/ToolCalibrate.py:412
#: flatcamTools/ToolCalibration.py:412
#: flatcamTools/ToolSolderPaste.py:358
msgid "STEP 2"
msgstr "STEP 2"
#: flatcamTools/ToolCalibrate.py:414
#: flatcamTools/ToolCalibrate.py:422
#: flatcamTools/ToolCalibration.py:414
#: flatcamTools/ToolCalibration.py:422
msgid ""
"Generate GCode file to locate and align the PCB by using\n"
"the four points acquired above."
@@ -12770,18 +12770,18 @@ msgstr ""
"Generate GCode file to locate and align the PCB by using\n"
"the four points acquired above."
#: flatcamTools/ToolCalibrate.py:420
#: flatcamTools/ToolCalibration.py:420
#: flatcamTools/ToolSolderPaste.py:341
msgid "Generate GCode"
msgstr "Generate GCode"
#: flatcamTools/ToolCalibrate.py:429
#: flatcamTools/ToolCalibration.py:429
#: flatcamTools/ToolSolderPaste.py:387
msgid "STEP 3"
msgstr "STEP 3"
#: flatcamTools/ToolCalibrate.py:431
#: flatcamTools/ToolCalibrate.py:440
#: flatcamTools/ToolCalibration.py:431
#: flatcamTools/ToolCalibration.py:440
msgid ""
"Calculate Scale and Skew factors based on the differences (delta)\n"
"found when checking the PCB pattern. The differences must be filled\n"
@@ -12791,26 +12791,26 @@ msgstr ""
"found when checking the PCB pattern. The differences must be filled\n"
"in the fields Found (Delta)."
#: flatcamTools/ToolCalibrate.py:438
#: flatcamTools/ToolCalibration.py:438
#| msgid "Calculators"
msgid "Calculate Factors"
msgstr "Calculate Factors"
#: flatcamTools/ToolCalibrate.py:475
#: flatcamTools/ToolCalibration.py:475
msgid "Apply Scale factors on the calibration points."
msgstr "Apply Scale factors on the calibration points."
#: flatcamTools/ToolCalibrate.py:510
#: flatcamTools/ToolCalibration.py:510
msgid "Apply Skew factors on the calibration points."
msgstr "Apply Skew factors on the calibration points."
#: flatcamTools/ToolCalibrate.py:515
#: flatcamTools/ToolCalibration.py:515
#: flatcamTools/ToolSolderPaste.py:433
msgid "STEP 4"
msgstr "STEP 4"
#: flatcamTools/ToolCalibrate.py:517
#: flatcamTools/ToolCalibrate.py:525
#: flatcamTools/ToolCalibration.py:517
#: flatcamTools/ToolCalibration.py:525
msgid ""
"Generate verification GCode file adjusted with\n"
"the factors above."
@@ -12818,17 +12818,17 @@ msgstr ""
"Generate verification GCode file adjusted with\n"
"the factors above."
#: flatcamTools/ToolCalibrate.py:523
#: flatcamTools/ToolCalibration.py:523
#| msgid "Generate GCode"
msgid "Generate Adjusted GCode"
msgstr "Generate Adjusted GCode"
#: flatcamTools/ToolCalibrate.py:531
#: flatcamTools/ToolCalibration.py:531
#| msgid "STEP 1"
msgid "STEP 5"
msgstr "STEP 5"
#: flatcamTools/ToolCalibrate.py:533
#: flatcamTools/ToolCalibration.py:533
msgid ""
"Ajust the Excellon and Cutout Geometry objects\n"
"with the factors determined, and verified, above."
@@ -12836,22 +12836,22 @@ msgstr ""
"Ajust the Excellon and Cutout Geometry objects\n"
"with the factors determined, and verified, above."
#: flatcamTools/ToolCalibrate.py:545
#: flatcamTools/ToolCalibration.py:545
#| msgid "Excellon Object to be mirrored."
msgid "Excellon Object to be adjusted."
msgstr "Excellon Object to be adjusted."
#: flatcamTools/ToolCalibrate.py:558
#: flatcamTools/ToolCalibration.py:558
#| msgid "Geometry Obj to be mirrored."
msgid "Geometry Object to be adjusted."
msgstr "Geometry Object to be adjusted."
#: flatcamTools/ToolCalibrate.py:565
#: flatcamTools/ToolCalibration.py:565
#| msgid "Edit Object\tE"
msgid "Adjust Objects"
msgstr "Adjust Objects"
#: flatcamTools/ToolCalibrate.py:567
#: flatcamTools/ToolCalibration.py:567
msgid ""
"Adjust (scale and/or skew) the objects\n"
"with the factors determined above."
@@ -12859,43 +12859,43 @@ msgstr ""
"Adjust (scale and/or skew) the objects\n"
"with the factors determined above."
#: flatcamTools/ToolCalibrate.py:617
#: flatcamTools/ToolCalibration.py:617
#| msgid "Calc. Tool"
msgid "Cal Exc Tool"
msgstr "Cal Exc Tool"
#: flatcamTools/ToolCalibrate.py:648 flatcamTools/ToolDblSided.py:457
#: flatcamTools/ToolCalibration.py:648 flatcamTools/ToolDblSided.py:457
msgid "There is no Excellon object loaded ..."
msgstr "There is no Excellon object loaded ..."
#: flatcamTools/ToolCalibrate.py:651
#: flatcamTools/ToolCalibration.py:651
#| msgid "Click inside the desired polygon."
msgid "Click inside the First drill point. Bottom Left..."
msgstr "Click inside the First drill point. Bottom Left..."
#: flatcamTools/ToolCalibrate.py:679
#: flatcamTools/ToolCalibration.py:679
msgid "Click inside the Second drill point. Bottom Right..."
msgstr "Click inside the Second drill point. Bottom Right..."
#: flatcamTools/ToolCalibrate.py:683
#: flatcamTools/ToolCalibration.py:683
#| msgid "Click inside the desired polygon."
msgid "Click inside the Third drill point. Top Left..."
msgstr "Click inside the Third drill point. Top Left..."
#: flatcamTools/ToolCalibrate.py:687
#: flatcamTools/ToolCalibration.py:687
msgid "Click inside the Fourth drill point. Top Right..."
msgstr "Click inside the Fourth drill point. Top Right..."
#: flatcamTools/ToolCalibrate.py:691
#: flatcamTools/ToolCalibration.py:691
msgid "Done. All four points have been acquired."
msgstr "Done. All four points have been acquired."
#: flatcamTools/ToolCalibrate.py:705
#: flatcamTools/ToolCalibration.py:705
#| msgid "Generate GCode"
msgid "Verification GCode"
msgstr "Verification GCode"
#: flatcamTools/ToolCalibrate.py:721
#: flatcamTools/ToolCalibration.py:721
msgid "Cancelled. Four points are needed for GCode generation."
msgstr "Cancelled. Four points are needed for GCode generation."