Bladeren bron

- updated the French Translation (by Olivier Cornet)
- fixed issue in Corner Markers Tool that crashed the app if only one corner was checked
- fixed issue in Isolation Tool where Area Isolation selection was not working

Marius Stanciu 5 jaren geleden
bovenliggende
commit
8a9c254a31
6 gewijzigde bestanden met toevoegingen van 188 en 199 verwijderingen
  1. 6 0
      CHANGELOG.md
  2. 6 2
      appTools/ToolCorners.py
  3. 2 2
      appTools/ToolIsolation.py
  4. 1 1
      app_Main.py
  5. BIN
      locale/fr/LC_MESSAGES/strings.mo
  6. 173 194
      locale/fr/LC_MESSAGES/strings.po

+ 6 - 0
CHANGELOG.md

@@ -7,6 +7,12 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+1.11.2020
+
+- updated the French Translation (by Olivier Cornet)
+- fixed issue in Corner Markers Tool that crashed the app if only one corner was checked
+- fixed issue in Isolation Tool where Area Isolation selection was not working 
+
 31.10.2020
 
 - adapted HPGL importer to work within the new app

+ 6 - 2
appTools/ToolCorners.py

@@ -255,8 +255,12 @@ class ToolCorners(AppTool):
 
         geo_buff_list = MultiPolygon(geo_buff_list)
         geo_buff_list = geo_buff_list.buffer(0)
-        for poly in geo_buff_list:
-            s_list.append(poly)
+        try:
+            for poly in geo_buff_list:
+                s_list.append(poly)
+        except TypeError:
+            s_list.append(geo_buff_list)
+
         g_obj.solid_geometry = MultiPolygon(s_list)
 
     def replot(self, obj, run_thread=True):

+ 2 - 2
appTools/ToolIsolation.py

@@ -2322,6 +2322,8 @@ class ToolIsolation(AppTool, Gerber):
 
     # To be called after clicking on the plot.
     def on_mouse_release(self, event):
+        shape_type = self.ui.area_shape_radio.get_value()
+
         if self.app.is_legacy is False:
             event_pos = event.pos
             # event_is_dragging = event.is_dragging
@@ -2339,8 +2341,6 @@ class ToolIsolation(AppTool, Gerber):
 
         x1, y1 = curr_pos[0], curr_pos[1]
 
-        shape_type = self.area_shape_radio.get_value()
-
         # do clear area only for left mouse clicks
         if event.button == 1:
             if shape_type == "square":

+ 1 - 1
app_Main.py

@@ -3162,7 +3162,7 @@ class App(QtCore.QObject):
 
                 self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "French"), 2, 0)
                 self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Michel Maciejewski"), 2, 1)
-                self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % ""), 2, 2)
+                self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Olivier Cornet"), 2, 2)
                 self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "<micmac589@gmail.com>"), 2, 3)
 
                 # self.translator_grid_lay.addWidget(QtWidgets.QLabel('%s' % "Hungarian"), 3, 0)

BIN
locale/fr/LC_MESSAGES/strings.mo


File diff suppressed because it is too large
+ 173 - 194
locale/fr/LC_MESSAGES/strings.po


Some files were not shown because too many files changed in this diff