Skip to content

Pass campaignset name into plotGalaxy #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Slornie wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pass campaignset name into plotGalaxy #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0094e1
Pass campaignSetName into plotGalaxy
Slornie Jul 22, 2023
1759cb7
Merge branch 'andrewfullard:master' into Slornie_Changes11
Slornie Jul 23, 2023
78bf5b6
Merge branch 'andrewfullard:master' into Slornie_Changes11
Slornie Aug 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/mainwindow_presenter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@ def __updateGalacticPlot(self):
if not self.__showAutoConnections:
autoConnectionDistance = 0
self.__plot.plotGalaxy(
self.getSelectedCampaign().setName,
self.__checkedPlanets,
self.__checkedTradeRoutes,
self.__planets,
Expand Down
4 changes: 3 additions & 1 deletion ui/qtgalacticplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def __init__(self, parent: QWidget = None):
self.__planetsScatter = None
self.__tradeRouteTraceStart = None

def plotGalaxy(self, planets, tradeRoutes, allPlanets, planetOwners = [], autoPlanetConnectionDistance: int = 0) -> None:
def plotGalaxy(self, campaignSetName, planets, tradeRoutes, allPlanets, planetOwners = [], autoPlanetConnectionDistance: int = 0) -> None:
'''Plots all planets as alpha = 0.1, then overlays all selected planets and trade routes'''
if self.__is_first_run:
x = [p.x for p in allPlanets]
Expand All @@ -48,6 +48,8 @@ def plotGalaxy(self, planets, tradeRoutes, allPlanets, planetOwners = [], autoPl

self.__is_first_run = False

self.__galacticPlotCanvas.get_default_filename = lambda: campaignSetName + '.png'

xlim = self.__axes.get_xlim()
ylim = self.__axes.get_ylim()
self.__axes.autoscale(False)
Expand Down