GridCal 5.3.12__tar.gz → 5.3.14__tar.gz

{gridcal-5.3.12 → gridcal-5.3.14}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -1107,19 +1107,6 @@ class GridMapWidget(BaseDiagramWidget):
             image = self.get_image()
             image.save(filename)
 
-        elif extension == '.svg':
-            w = self.width()
-            h = self.height()
-            svg_gen = QSvgGenerator()
-            svg_gen.setFileName(filename)
-            svg_gen.setSize(QSize(w, h))
-            svg_gen.setViewBox(QRect(0, 0, w, h))
-            svg_gen.setTitle("Electrical grid schematic")
-            svg_gen.setDescription("An SVG drawing created by GridCal")
-
-            painter = QPainter(svg_gen)
-            self.render(painter)
-            painter.end()
         else:
             raise Exception('Extension ' + str(extension) + ' not supported :(')
 

{gridcal-5.3.12 → gridcal-5.3.14}/GridCal/Gui/Diagrams/MapWidget/map_widget.py

@@ -721,9 +721,9 @@ class MapWidget(QWidget):
         Could be end of a drag or point or box selection.  If it's the end of
         a drag we don't do a lot.  If a selection we process that.
         """
-
-        x = event.x()
-        y = event.y()
+        pos = event.position()
+        x = pos.x()
+        y = pos.y()
 
         # cursor back to normal in case it was a box select
         self.setCursor(self.default_cursor)
@@ -782,8 +782,9 @@ class MapWidget(QWidget):
         If we are off the map, ensure self.mouse_x, etc, are None.
         """
         if not self.block_movement:
-            x = event.x()
-            y = event.y()
+            pos = event.position()
+            x = pos.x()
+            y = pos.y()
 
             mouse_geo = self.view_to_geo(x, y)
 
@@ -1756,7 +1757,7 @@ class MapWidget(QWidget):
                 result = (r, g, b, a)
         elif isinstance(colour, QColor):
             # if it's a QColor, get float RGBA values, convert to ints
-            result = [int(v * 255) for v in colour.getRgbF()]
+            result = [int(v * 255) for v in tuple(colour.getRgbF())]
         else:
 
             # we assume a list or tuple