weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup comments

Browse Source 
remove unnecessary method call
This commit is contained in:
walterroach 2020-11-13 09:03:02 -06:00
parent 0b4e2d3b6b
commit 33b92423d8
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,8 +420,6 @@ class QLiberationMap(QGraphicsView):
if not cp.captured:
scene.addLine(pos[0], pos[1], pos2[0], pos2[1], pen=pen)
else:
# pass
# frontline = FrontLine(cp, connected_cp, self.game.theater.terrain)
posx = frontline.position
h = frontline.attack_heading
pos2 = self._transform_point(posx)
@ -429,7 +427,6 @@ class QLiberationMap(QGraphicsView):
seg_a = self._transform_point(segment.point_a)
seg_b = self._transform_point(segment.point_b)
scene.addLine(seg_a[0], seg_a[1], seg_b[0], seg_b[1], pen=pen)
# scene.addLine(pos[0], pos[1], pos2[0], pos2[1], pen=pen)
p1 = point_from_heading(pos2[0], pos2[1], h+180, 25)
p2 = point_from_heading(pos2[0], pos2[1], h, 25)
@ -441,7 +438,6 @@ class QLiberationMap(QGraphicsView):
seg_a = self._transform_point(segment.point_a)
seg_b = self._transform_point(segment.point_b)
scene.addLine(seg_a[0], seg_a[1], seg_b[0], seg_b[1], pen=pen)
# scene.addLine(pos[0], pos[1], pos2[0], pos2[1], pen=pen)
def wheelEvent(self, event: QWheelEvent):

16
theater/frontline.py
View File

@ -41,7 +41,6 @@ class ComplexFrontLine:
start_cp: ControlPoint
points: List[Point]
# control_points: List[ControlPoint]
@dataclass
@ -86,7 +85,11 @@ class FrontLine(MissionTarget):
@property
def position(self):
return self._calculate_position()
"""
The position where the conflict should occur
according to the current strength of each control point.
"""
return self.point_from_a(self._position_distance)
@property
def control_points(self) -> Tuple[ControlPoint, ControlPoint]:
@ -124,13 +127,6 @@ class FrontLine(MissionTarget):
)
return self.segments[0]
def _calculate_position(self) -> Point:
"""
The position where the conflict should occur
according to the current strength of each control point.
"""
return self.point_from_a(self._position_distance)
def point_from_a(self, distance: Numeric) -> Point:
"""
Returns a point {distance} away from control_point_a along the frontline segments.
@ -151,7 +147,7 @@ class FrontLine(MissionTarget):
@property
def _position_distance(self) -> float:
"""
The distance from point a where the conflict should occur
The distance from point "a" where the conflict should occur
according to the current strength of each control point
"""
total_strength = (