weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed zoom on map.

Browse Source
This commit is contained in:
Khopa 2020-06-23 12:56:01 +02:00
parent 5e7facfeb6
commit 88c8fe7cca
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qt_ui/widgets/map/QLiberationMap.py
View File

@ -43,6 +43,7 @@ class QLiberationMap(QGraphicsView):
self.setMaximumHeight(2160) self.setMaximumHeight(2160)
self._zoom = 0 self._zoom = 0
self.factor = 1 self.factor = 1
self.factorized = 1
self.init_scene() self.init_scene()
self.connectSignals() self.connectSignals()
self.setGame(game) self.setGame(game)
@ -119,7 +120,6 @@ class QLiberationMap(QGraphicsView):
# text = scene.addText(str(r), font=QFont("Trebuchet MS", 10, weight=5, italic=False)) # text = scene.addText(str(r), font=QFont("Trebuchet MS", 10, weight=5, italic=False))
# text.setPos(0, i * 24) # text.setPos(0, i * 24)
for cp in self.game.theater.controlpoints: for cp in self.game.theater.controlpoints:
pos = self._transform_point(cp.position) pos = self._transform_point(cp.position)
@ -263,15 +263,21 @@ class QLiberationMap(QGraphicsView):
if event.angleDelta().y() > 0: if event.angleDelta().y() > 0:
factor = 1.25 factor = 1.25
self._zoom += 1 self._zoom += 1
if self._zoom < 10:
self.scale(factor, factor)
self.factorized *= factor
else:
self._zoom = 9
else: else:
factor = 0.8 factor = 0.8
self._zoom -= 1 self._zoom -= 1
if self._zoom > -5:
self.scale(factor, factor)
self.factorized *= factor
else:
self._zoom = -4
if self._zoom > -5: #print(self.factorized, factor, self._zoom)
self.scale(factor, factor)
else:
self._zoom = -5
def _transform_point(self, p: Point, treshold=30) -> (int, int): def _transform_point(self, p: Point, treshold=30) -> (int, int):
point_a = list(self.game.theater.reference_points.keys())[0] point_a = list(self.game.theater.reference_points.keys())[0]