cpp/openttd-patchpack/source Changeset - r20256:42e6a81c0ced

Changeset - r20256:42e6a81c0ced

Parent rev.

Child rev.

[Not reviewed]

master

0 11 0

rubidium - 12 years ago 2013-05-19 14:43:23
rubidium@openttd.org

(svn r25263) -Add: legend for linkgraph overlay (fonsinchen)

11 files changed with 284 insertions and 2 deletions:

projects/openttd_vs100.vcxproj

projects/openttd_vs100.vcxproj.filters

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/company_cmd.cpp

src/lang/english.txt

src/linkgraph/linkgraph_gui.cpp

229

src/linkgraph/linkgraph_gui.h

src/toolbar_gui.cpp

src/window_type.h

0 comments (0 inline, 0 general)

projects/openttd_vs100.vcxproj

➞

Show inline comments

@@ @@ -740,6 +740,7 @@ @@
     <ClInclude Include="..\src\widgets\highscore_widget.h" />
     <ClInclude Include="..\src\widgets\industry_widget.h" />
     <ClInclude Include="..\src\widgets\intro_widget.h" />
     <ClInclude Include="..\src\widgets\link_graph_legend_widget.h" />
     <ClInclude Include="..\src\widgets\main_widget.h" />
     <ClInclude Include="..\src\widgets\misc_widget.h" />
     <ClInclude Include="..\src\widgets\music_widget.h" />

projects/openttd_vs100.vcxproj.filters

➞

Show inline comments

@@ @@ -1449,6 +1449,9 @@ @@
     <ClInclude Include="..\src\widgets\intro_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\src\widgets\link_graph_legend_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>
     <ClInclude Include="..\src\widgets\main_widget.h">
       <Filter>Widgets</Filter>
     </ClInclude>

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -2247,6 +2247,10 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\widgets\link_graph_legend_widget.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\widgets\main_widget.h"
+				>
 			</File>

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -2244,6 +2244,10 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\widgets\link_graph_legend_widget.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\widgets\main_widget.h"
+				>
 			</File>

source.list

➞

Show inline comments

@@ @@ -494,6 +494,7 @@ widgets/group_widget.h @@
 widgets/highscore_widget.h
 widgets/industry_widget.h
 widgets/intro_widget.h
 widgets/link_graph_legend_widget.h
 widgets/main_widget.h
 widgets/misc_widget.h
 widgets/music_widget.h

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -82,6 +82,7 @@ void Company::PostDestructor(size_t inde @@
 	InvalidateWindowData(WC_GRAPH_LEGEND, 0, (int)index);
 	InvalidateWindowData(WC_PERFORMANCE_DETAIL, 0, (int)index);
 	InvalidateWindowData(WC_COMPANY_LEAGUE, 0, 0);
 	InvalidateWindowData(WC_LINKGRAPH_LEGEND, 0);
 	/* If the currently shown error message has this company in it, then close it. */
 	InvalidateWindowData(WC_ERRMSG, 0);
+}
@@ @@ -559,6 +560,7 @@ Company *DoStartupNewCompany(bool is_ai, @@
 	SetWindowDirty(WC_GRAPH_LEGEND, 0);
 	SetWindowClassesDirty(WC_CLIENT_LIST_POPUP);
 	SetWindowDirty(WC_CLIENT_LIST, 0);
 	InvalidateWindowData(WC_LINKGRAPH_LEGEND, 0);
 	BuildOwnerLegend();
 	InvalidateWindowData(WC_SMALLMAP, 0, 1);
@@ @@ -1052,6 +1054,7 @@ CommandCost CmdSetCompanyColour(TileInde @@
 		InvalidateWindowData(WC_DELIVERED_CARGO, 0);
 		InvalidateWindowData(WC_PERFORMANCE_HISTORY, 0);
 		InvalidateWindowData(WC_COMPANY_VALUE, 0);
 		InvalidateWindowData(WC_LINKGRAPH_LEGEND, 0);
 		/* The smallmap owner view also stores the company colours. */
 		BuildOwnerLegend();
 		InvalidateWindowData(WC_SMALLMAP, 0, 1);

src/lang/english.txt

➞

Show inline comments

@@ @@ -375,6 +375,7 @@ STR_FILE_MENU_EXIT @@
 ############ range for map menu starts
 STR_MAP_MENU_MAP_OF_WORLD                                       :Map of world
 STR_MAP_MENU_EXTRA_VIEW_PORT                                    :Extra viewport
 STR_MAP_MENU_LINGRAPH_LEGEND                                    :Cargo Flow Legend
 STR_MAP_MENU_SIGN_LIST                                          :Sign list
 ############ range for town menu starts, yet the town directory is shown in the map menu in the scenario editor
 STR_TOWN_MENU_TOWN_DIRECTORY                                    :Town directory
@@ @@ -2164,6 +2165,12 @@ STR_TRANSPARENT_CATENARY_TOOLTIP @@
 STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Toggle transparency for loading indicators. Ctrl+Click to lock
 STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Set objects invisible instead of transparent
 # Linkgraph legend window
 STR_LINKGRAPH_LEGEND_CAPTION                                    :{BLACK}Cargo Flow Legend
 STR_LINKGRAPH_LEGEND_ALL                                        :{BLACK}All
 STR_LINKGRAPH_LEGEND_NONE                                       :{BLACK}None
 STR_LINKGRAPH_LEGEND_SELECT_COMPANIES                           :{BLACK}Select companies to be displayed
 # Linkgraph legend window and linkgraph legend in smallmap
 STR_LINKGRAPH_LEGEND_UNUSED                                     :{TINY_FONT}{BLACK}unused
 STR_LINKGRAPH_LEGEND_SATURATED                                  :{TINY_FONT}{BLACK}saturated

src/linkgraph/linkgraph_gui.cpp

➞

Show inline comments

@@ @@ -12,9 +12,13 @@ @@
 #include "../stdafx.h"
 #include "../window_gui.h"
 #include "../company_base.h"
 #include "../company_gui.h"
 #include "../date_func.h"
 #include "../viewport_func.h"
 #include "../smallmap_gui.h"
 #include "../widgets/link_graph_legend_widget.h"
 #include "table/strings.h"
 /**
  * Colours for the various "load" states of links. Ordered from "unused" to
@@ @@ -288,3 +292,228 @@ void LinkGraphOverlay::SetCompanyMask(ui @@
 	this->RebuildCache();
 	this->window->GetWidget<NWidgetBase>(this->widget_id)->SetDirty(this->window);
+}
 /** Make a number of rows with buttons for each company for the linkgraph legend window. */
 NWidgetBase *MakeCompanyButtonRowsLinkGraphGUI(int *biggest_index)
+{
 	return MakeCompanyButtonRows(biggest_index, WID_LGL_COMPANY_FIRST, WID_LGL_COMPANY_LAST, 3, STR_LINKGRAPH_LEGEND_SELECT_COMPANIES);
+}
 NWidgetBase *MakeSaturationLegendLinkGraphGUI(int *biggest_index)
+{
 	NWidgetVertical *panel = new NWidgetVertical();
 	for (uint i = 0; i < lengthof(LinkGraphOverlay::LINK_COLOURS); ++i) {
 		NWidgetBackground * wid = new NWidgetBackground(WWT_PANEL, COLOUR_DARK_GREEN, i + WID_LGL_SATURATION_FIRST);
 		wid->SetMinimalSize(50, FONT_HEIGHT_SMALL);
 		wid->SetFill(0, 1);
 		wid->SetResize(0, 1);
 		panel->Add(wid);
+	}
 	*biggest_index = WID_LGL_SATURATION_LAST;
 	return panel;
+}
 NWidgetBase *MakeCargoesLegendLinkGraphGUI(int *biggest_index)
+{
 	static const uint ENTRIES_PER_ROW = CeilDiv(NUM_CARGO, 5);
 	NWidgetVertical *panel = new NWidgetVertical();
 	NWidgetHorizontal *row = NULL;
 	for (uint i = 0; i < NUM_CARGO; ++i) {
 		if (i % ENTRIES_PER_ROW == 0) {
 			if (row) panel->Add(row);
 			row = new NWidgetHorizontal();
+		}
 		NWidgetBackground * wid = new NWidgetBackground(WWT_PANEL, COLOUR_GREY, i + WID_LGL_CARGO_FIRST);
 		wid->SetMinimalSize(25, FONT_HEIGHT_SMALL);
 		wid->SetFill(0, 1);
 		wid->SetResize(0, 1);
 		row->Add(wid);
+	}
 	panel->Add(row);
 	*biggest_index = WID_LGL_CARGO_LAST;
 	return panel;
+}
 static const NWidgetPart _nested_linkgraph_legend_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN),
 		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, WID_LGL_CAPTION), SetDataTip(STR_LINKGRAPH_LEGEND_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_SHADEBOX, COLOUR_DARK_GREEN),
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_DARK_GREEN),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_LGL_SATURATION),
 				SetPadding(WD_FRAMERECT_TOP, 0, WD_FRAMERECT_BOTTOM, WD_CAPTIONTEXT_LEFT),
 				SetMinimalSize(50, 100),
 				NWidgetFunction(MakeSaturationLegendLinkGraphGUI),
 			EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_LGL_COMPANIES),
 				SetPadding(WD_FRAMERECT_TOP, 0, WD_FRAMERECT_BOTTOM, WD_CAPTIONTEXT_LEFT),
 				NWidget(NWID_VERTICAL, NC_EQUALSIZE),
 					SetMinimalSize(100, 100),
 					NWidgetFunction(MakeCompanyButtonRowsLinkGraphGUI),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_LGL_COMPANIES_ALL), SetDataTip(STR_LINKGRAPH_LEGEND_ALL, STR_NULL),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_LGL_COMPANIES_NONE), SetDataTip(STR_LINKGRAPH_LEGEND_NONE, STR_NULL),
 				EndContainer(),
 			EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_LGL_CARGOES),
 				SetPadding(WD_FRAMERECT_TOP, WD_FRAMERECT_RIGHT, WD_FRAMERECT_BOTTOM, WD_CAPTIONTEXT_LEFT),
 				NWidget(NWID_VERTICAL, NC_EQUALSIZE),
 					SetMinimalSize(150, 100),
 					NWidgetFunction(MakeCargoesLegendLinkGraphGUI),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_LGL_CARGOES_ALL), SetDataTip(STR_LINKGRAPH_LEGEND_ALL, STR_NULL),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_LGL_CARGOES_NONE), SetDataTip(STR_LINKGRAPH_LEGEND_NONE, STR_NULL),
 				EndContainer(),
 			EndContainer(),
 		EndContainer(),
 	EndContainer()
 };
 assert_compile(WID_LGL_SATURATION_LAST - WID_LGL_SATURATION_FIRST ==
 		lengthof(LinkGraphOverlay::LINK_COLOURS) - 1);
 static const WindowDesc _linkgraph_legend_desc(
 	WDP_MANUAL, 300, 314,
 	WC_LINKGRAPH_LEGEND, WC_NONE,
 ,
 	_nested_linkgraph_legend_widgets, lengthof(_nested_linkgraph_legend_widgets)
 );
 /**
  * Open a link graph legend window.
  */
 void ShowLinkGraphLegend()
+{
 	AllocateWindowDescFront<LinkGraphLegendWindow>(&_linkgraph_legend_desc, 0);
+}
 LinkGraphLegendWindow::LinkGraphLegendWindow(const WindowDesc *desc, int window_number)
+{
 	this->InitNested(desc, window_number);
 	this->InvalidateData(0);
 	//this->SetOverlay(FindWindowById(WC_MAIN_WINDOW, 0)->viewport->overlay);
+}
 /**
  * Set the overlay belonging to this menu and import its company/cargo settings.
  * @params overlay New overlay for this menu.
  */
 void LinkGraphLegendWindow::SetOverlay(LinkGraphOverlay *overlay) {
 	this->overlay = overlay;
 	uint32 companies = this->overlay->GetCompanyMask();
 	for (uint c = 0; c < MAX_COMPANIES; c++) {
 		if (!this->IsWidgetDisabled(WID_LGL_COMPANY_FIRST + c)) {
 			this->SetWidgetLoweredState(WID_LGL_COMPANY_FIRST + c, HasBit(companies, c));
+		}
+	}
 	uint32 cargoes = this->overlay->GetCargoMask();
 	for (uint c = 0; c < NUM_CARGO; c++) {
 		if (!this->IsWidgetDisabled(WID_LGL_CARGO_FIRST + c)) {
 			this->SetWidgetLoweredState(WID_LGL_CARGO_FIRST + c, HasBit(cargoes, c));
+		}
+	}
+}
 void LinkGraphLegendWindow::DrawWidget(const Rect &r, int widget) const
+{
 	const NWidgetBase *wid = this->GetWidget<NWidgetBase>(widget);
 	if (IsInsideMM(widget, WID_LGL_COMPANY_FIRST, WID_LGL_COMPANY_LAST + 1)) {
 		if (this->IsWidgetDisabled(widget)) return;
 		CompanyID cid = (CompanyID)(widget - WID_LGL_COMPANY_FIRST);
 		Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON);
 		DrawCompanyIcon(cid, (r.left + r.right - sprite_size.width) / 2, (r.top + r.bottom - sprite_size.height) / 2);
 		return;
+	}
 	if (IsInsideMM(widget, WID_LGL_SATURATION_FIRST, WID_LGL_SATURATION_LAST + 1)) {
 		GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, LinkGraphOverlay::LINK_COLOURS[widget - WID_LGL_SATURATION_FIRST]);
 		if (widget == WID_LGL_SATURATION_FIRST) {
 			DrawString(wid->pos_x, wid->current_x + wid->pos_x, wid->pos_y, STR_LINKGRAPH_LEGEND_UNUSED, TC_FROMSTRING, SA_HOR_CENTER);
 		} else if (widget == WID_LGL_SATURATION_LAST) {
 			DrawString(wid->pos_x, wid->current_x + wid->pos_x, wid->pos_y, STR_LINKGRAPH_LEGEND_OVERLOADED, TC_FROMSTRING, SA_HOR_CENTER);
 		} else if (widget == (WID_LGL_SATURATION_LAST + WID_LGL_SATURATION_FIRST) / 2) {
 			DrawString(wid->pos_x, wid->current_x + wid->pos_x, wid->pos_y, STR_LINKGRAPH_LEGEND_SATURATED, TC_FROMSTRING, SA_HOR_CENTER);
+		}
+	}
 	if (IsInsideMM(widget, WID_LGL_CARGO_FIRST, WID_LGL_CARGO_LAST + 1)) {
 		if (this->IsWidgetDisabled(widget)) return;
 		CargoSpec *cargo = CargoSpec::Get(widget - WID_LGL_CARGO_FIRST);
 		GfxFillRect(r.left + 2, r.top + 2, r.right - 2, r.bottom - 2, cargo->legend_colour);
 		DrawString(wid->pos_x, wid->current_x + wid->pos_x, wid->pos_y + 2, cargo->abbrev, TC_BLACK, SA_HOR_CENTER);
+	}
+}
 /**
  * Update the overlay with the new company selection.
  */
 void LinkGraphLegendWindow::UpdateOverlayCompanies()
+{
 	uint32 mask = 0;
 	for (uint c = 0; c < MAX_COMPANIES; c++) {
 		if (this->IsWidgetDisabled(c + WID_LGL_COMPANY_FIRST)) continue;
 		if (!this->IsWidgetLowered(c + WID_LGL_COMPANY_FIRST)) continue;
 		SetBit(mask, c);
+	}
 	this->overlay->SetCompanyMask(mask);
+}
 /**
  * Update the overlay with the new cargo selection.
  */
 void LinkGraphLegendWindow::UpdateOverlayCargoes()
+{
 	uint32 mask = 0;
 	for (uint c = 0; c < NUM_CARGO; c++) {
 		if (this->IsWidgetDisabled(c + WID_LGL_CARGO_FIRST)) continue;
 		if (!this->IsWidgetLowered(c + WID_LGL_CARGO_FIRST)) continue;
 		SetBit(mask, c);
+	}
 	this->overlay->SetCargoMask(mask);
+}
 void LinkGraphLegendWindow::OnClick(Point pt, int widget, int click_count)
+{
 	/* Check which button is clicked */
 	if (IsInsideMM(widget, WID_LGL_COMPANY_FIRST, WID_LGL_COMPANY_LAST + 1)) {
 		if (!this->IsWidgetDisabled(widget)) {
 			this->ToggleWidgetLoweredState(widget);
 			this->UpdateOverlayCompanies();
+		}
 	} else if (widget == WID_LGL_COMPANIES_ALL || widget == WID_LGL_COMPANIES_NONE) {
 		for (uint c = 0; c < MAX_COMPANIES; c++) {
 			if (this->IsWidgetDisabled(c + WID_LGL_COMPANY_FIRST)) continue;
 			this->SetWidgetLoweredState(WID_LGL_COMPANY_FIRST + c, widget == WID_LGL_COMPANIES_ALL);
+		}
 		this->UpdateOverlayCompanies();
 		this->SetDirty();
 	} else if (IsInsideMM(widget, WID_LGL_CARGO_FIRST, WID_LGL_CARGO_LAST + 1)) {
 		if (!this->IsWidgetDisabled(widget)) {
 			this->ToggleWidgetLoweredState(widget);
 			this->UpdateOverlayCargoes();
+		}
 	} else if (widget == WID_LGL_CARGOES_ALL || widget == WID_LGL_CARGOES_NONE) {
 		for (uint c = 0; c < NUM_CARGO; c++) {
 			if (this->IsWidgetDisabled(c + WID_LGL_CARGO_FIRST)) continue;
 			this->SetWidgetLoweredState(WID_LGL_CARGO_FIRST + c, widget == WID_LGL_CARGOES_ALL);
+		}
 		this->UpdateOverlayCargoes();
+	}
 	this->SetDirty();
+}
 /**
  * Invalidate the data of this window if the cargoes or companies have changed.
  * @param data ignored
  * @param gui_scope ignored
  */
 void LinkGraphLegendWindow::OnInvalidateData(int data, bool gui_scope)
+{
 	/* Disable the companies who are not active */
 	for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) {
 		this->SetWidgetDisabledState(i + WID_LGL_COMPANY_FIRST, !Company::IsValidID(i));
+	}
 	for (CargoID i = 0; i < NUM_CARGO; i++) {
 		this->SetWidgetDisabledState(i + WID_LGL_CARGO_FIRST, !CargoSpec::Get(i)->IsValid());
+	}
+}

src/linkgraph/linkgraph_gui.h

➞

Show inline comments

@@ @@ -89,4 +89,25 @@ protected: @@
 	static void DrawVertex(int x, int y, int size, int colour, int border_colour);
 };
 void ShowLinkGraphLegend();
 /**
  * Menu window to select cargoes and companies to show in a link graph overlay.
  */
 struct LinkGraphLegendWindow : Window {
 public:
 	LinkGraphLegendWindow(const WindowDesc *desc, int window_number);
 	void SetOverlay(LinkGraphOverlay *overlay);
 	virtual void DrawWidget(const Rect &r, int widget) const;
 	virtual void OnClick(Point pt, int widget, int click_count);
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true);
 private:
 	LinkGraphOverlay *overlay;
 	void UpdateOverlayCompanies();
 	void UpdateOverlayCargoes();
 };
 #endif /* LINKGRAPH_GUI_H */

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -38,6 +38,7 @@ @@
 #include "smallmap_gui.h"
 #include "graph_gui.h"
 #include "textbuf_gui.h"
 #include "linkgraph/linkgraph_gui.h"
 #include "newgrf_debug.h"
 #include "hotkeys.h"
 #include "engine_base.h"
@@ @@ -409,10 +410,11 @@ static CallBackFunction MenuClickSaveLoa @@
 enum MapMenuEntries {
 	MME_SHOW_SMALLMAP        = 0,
 	MME_SHOW_EXTRAVIEWPORTS,
 	MME_SHOW_LINKGRAPH,
 	MME_SHOW_SIGNLISTS,
 	MME_SHOW_TOWNDIRECTORY,    ///< This entry is only used in Editor mode
 	MME_MENUCOUNT_NORMAL     = 3,
 	MME_MENUCOUNT_EDITOR     = 4,
 	MME_MENUCOUNT_NORMAL     = 4,
 	MME_MENUCOUNT_EDITOR     = 5,
 };
 static CallBackFunction ToolbarMapClick(Window *w)
@@ @@ -438,6 +440,7 @@ static CallBackFunction MenuClickMap(int @@
 	switch (index) {
 		case MME_SHOW_SMALLMAP:       ShowSmallMap();            break;
 		case MME_SHOW_EXTRAVIEWPORTS: ShowExtraViewPortWindow(); break;
 		case MME_SHOW_LINKGRAPH:      ShowLinkGraphLegend();     break;
 		case MME_SHOW_SIGNLISTS:      ShowSignList();            break;
 		case MME_SHOW_TOWNDIRECTORY:  if (_game_mode == GM_EDITOR) ShowTownDirectory(); break;
+	}

src/window_type.h

➞

Show inline comments

@@ @@ -664,6 +664,12 @@ enum WindowClass { @@
 	 */
 	WC_SPRITE_ALIGNER,
 	/**
 	 * Linkgraph legend; Window numbers:
 	 *   - 0 = #LinkGraphWidgets
 	 */
 	WC_LINKGRAPH_LEGEND,
 	WC_INVALID = 0xFFFF, ///< Invalid window.
 };

0 comments (0 inline, 0 general)