Changeset - r20255:e962597d7e2b
Parent rev.
Child rev.
[Not reviewed]
master
0 6 0
rubidium - 11 years ago 2013-05-19 14:36:35
rubidium@openttd.org
(svn r25262) -Feature: linkgraph overlay for smallmap
6 files changed with 164 insertions and 12 deletions:
src/lang/english.txt
11
src/linkgraph/linkgraph_gui.cpp
4
5
src/newgrf.cpp
3
src/smallmap_gui.cpp
134
7
src/smallmap_gui.h
10
src/widgets/smallmap_widget.h
2
0 comments (0 inline, 0 general)
src/lang/english.txt
➞
Show inline comments
 
@@ -662,17 +662,20 @@ STR_SMALLMAP_CAPTION
 
STR_SMALLMAP_TYPE_CONTOURS                                      :Contours
 
STR_SMALLMAP_TYPE_VEHICLES                                      :Vehicles
 
STR_SMALLMAP_TYPE_INDUSTRIES                                    :Industries
 
STR_SMALLMAP_TYPE_ROUTEMAP                                      :Cargo Flow
 
STR_SMALLMAP_TYPE_ROUTES                                        :Routes
 
STR_SMALLMAP_TYPE_VEGETATION                                    :Vegetation
 
STR_SMALLMAP_TYPE_OWNERS                                        :Owners
 
STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Show land contours on map
 
STR_SMALLMAP_TOOLTIP_SHOW_VEHICLES_ON_MAP                       :{BLACK}Show vehicles on map
 
STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP                     :{BLACK}Show industries on map
 
STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP                     :{BLACK}Show cargo flow on map
 
STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Show transport routes on map
 
STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Show vegetation on map
 
STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Show land owners on map
 
STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION                         :{BLACK}Click on an industry type to toggle displaying it. Ctrl+Click disables all types except the selected one. Ctrl+Click on it again to enable all industry types
 
STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK}Click on a company to toggle displaying its property. Ctrl+Click disables all companies except the selected one. Ctrl+Click on it again to enable all companies
 
STR_SMALLMAP_TOOLTIP_CARGO_SELECTION                            :{BLACK}Click on a cargo to toggle displaying its property. Ctrl+Click disables all cargos except the selected one. Ctrl+Click on it again to enable all cargos
 

			




	
	
	
		
 
STR_SMALLMAP_LEGENDA_ROADS                                      :{TINY_FONT}{BLACK}Roads

			




	
	
	
		
 
STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINY_FONT}{BLACK}Railways

			




	
	
		
 
@@ -706,6 +709,7 @@ STR_SMALLMAP_LEGENDA_SNOW               

			




	
	
	
		
 
STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Toggle town names on/off on map

			




	
	
	
		
 
STR_SMALLMAP_CENTER                                             :{BLACK}Centre the smallmap on the current position

			




	
	
	
		
 
STR_SMALLMAP_INDUSTRY                                           :{TINY_FONT}{STRING} ({NUM})

			




	
	
	
		
 
STR_SMALLMAP_LINKSTATS                                          :{TINY_FONT}{STRING}

			




	
	
	
		
 
STR_SMALLMAP_COMPANY                                            :{TINY_FONT}{COMPANY}

			




	
	
	
		
 
STR_SMALLMAP_TOWN                                               :{TINY_FONT}{WHITE}{TOWN}

			




	
	
	
		
 
STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Disable all

			




	
	
		
 
@@ -716,6 +720,8 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_INDUSTRI

			




	
	
	
		
 
STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT                                :{BLACK}Toggle display of heightmap

			




	
	
	
		
 
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES                      :{BLACK}Display no company property on the map

			




	
	
	
		
 
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES                       :{BLACK}Display all company property on the map

			




	
	
	
		
 
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS                         :{BLACK}Display no cargos on the map

			




	
	
	
		
 
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS                          :{BLACK}Display all cargos on the map

			




	
	
	
		
 

			




	
	
	
		
 
# Status bar messages

			




	
	
	
		
 
STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Show last message or news report

			




	
	
		
 
@@ -2158,6 +2164,11 @@ 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 and linkgraph legend in smallmap

			




	
	
	
		
 
STR_LINKGRAPH_LEGEND_UNUSED                                     :{TINY_FONT}{BLACK}unused

			




	
	
	
		
 
STR_LINKGRAPH_LEGEND_SATURATED                                  :{TINY_FONT}{BLACK}saturated

			




	
	
	
		
 
STR_LINKGRAPH_LEGEND_OVERLOADED                                 :{TINY_FONT}{BLACK}overloaded

			




	
	
	
		
 

			




	
	
	
		
 
# Base for station construction window(s)

			




	
	
	
		
 
STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Coverage area highlight

			




	
	
	
		
 
STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Off

			




        

    


    
    

    

        

                

                    src/linkgraph/linkgraph_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,8 +13,8 @@

			




	
	
	
		
 
#include "../window_gui.h"

			




	
	
	
		
 
#include "../company_base.h"

			




	
	
	
		
 
#include "../date_func.h"

			




	
	
	
		
 
#include "linkgraph_gui.h"

			




	
	
	
		
 
#include "../viewport_func.h"

			




	
	
	
		
 
#include "../smallmap_gui.h"

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Colours for the various "load" states of links. Ordered from "unused" to

			




	
	
		
 
@@ -262,10 +262,9 @@ void LinkGraphOverlay::DrawStationDots(c

			




	
	
	
		
 
 * @param st The station we're looking for.

			




	
	
	
		
 
 * @return Middle point of the station in the current window.

			




	
	
	
		
 
 */

			




	
	
	
		
 
Point LinkGraphOverlay::GetStationMiddle(const Station *st) const {

			




	
	
	
		
 
	Point dummy;

			




	
	
	
		
 
	dummy.x = dummy.y = 0;

			




	
	
	
		
 
	return dummy;

			




	
	
	
		
 
Point LinkGraphOverlay::GetStationMiddle(const Station *st) const

			




	
	
	
		
 
{

			




	
	
	
		
 
	return static_cast<const SmallMapWindow *>(this->window)->GetStationMiddle(st);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




        

    


    
    

    

        

                

                    src/newgrf.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -9027,6 +9027,9 @@ static void AfterLoadGRFs()

			




	
	
	
		
 
	/* Create dynamic list of industry legends for smallmap_gui.cpp */

			




	
	
	
		
 
	BuildIndustriesLegend();

			




	
	
	
		
 

			




	
	
	
		
 
	/* Build the routemap legend, based on the available cargos */

			




	
	
	
		
 
	BuildLinkStatsLegend();

			




	
	
	
		
 

			




	
	
	
		
 
	/* Add all new airports to the airports array. */

			




	
	
	
		
 
	FinaliseAirportsArray();

			




	
	
	
		
 
	BindAirportSpecs();

			




        

    


    
    

    

        

                

                    src/smallmap_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -30,6 +30,10 @@

			




	
	
	
		
 

			




	
	
	
		
 
static int _smallmap_industry_count; ///< Number of used industries

			




	
	
	
		
 
static int _smallmap_company_count;  ///< Number of entries in the owner legend.

			




	
	
	
		
 
static int _smallmap_cargo_count;    ///< Number of cargos in the link stats legend.

			




	
	
	
		
 

			




	
	
	
		
 
/** Link stat colours shown in legenda. */

			




	
	
	
		
 
static uint8 _linkstat_colours_in_legenda[] = {0, 1, 3, 5, 7, 9, 11};

			




	
	
	
		
 

			




	
	
	
		
 
static const int NUM_NO_COMPANY_ENTRIES = 4; ///< Number of entries in the owner legend that are not companies.

			




	
	
	
		
 

			




	
	
		
 
@@ -134,6 +138,8 @@ static LegendAndColour _legend_land_owne

			




	
	
	
		
 
#undef MOEND

			




	
	
	
		
 
#undef MKEND

			




	
	
	
		
 

			




	
	
	
		
 
/** Legend entries for the link stats view. */

			




	
	
	
		
 
static LegendAndColour _legend_linkstats[NUM_CARGO + lengthof(_linkstat_colours_in_legenda) + 1];

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Allow room for all industries, plus a terminator entry

			




	
	
	
		
 
 * This is required in order to have the industry slots all filled up

			




	
	
		
 
@@ -181,10 +187,44 @@ void BuildIndustriesLegend()

			




	
	
	
		
 
	_smallmap_industry_count = j;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Populate legend table for the link stat view.

			




	
	
	
		
 
 */

			




	
	
	
		
 
void BuildLinkStatsLegend()

			




	
	
	
		
 
{

			




	
	
	
		
 
	/* Clear the legend */

			




	
	
	
		
 
	memset(_legend_linkstats, 0, sizeof(_legend_linkstats));

			




	
	
	
		
 

			




	
	
	
		
 
	uint i = 0;

			




	
	
	
		
 
	for (; i < _sorted_cargo_specs_size; ++i) {

			




	
	
	
		
 
		const CargoSpec *cs = _sorted_cargo_specs[i];

			




	
	
	
		
 

			




	
	
	
		
 
		_legend_linkstats[i].legend = cs->name;

			




	
	
	
		
 
		_legend_linkstats[i].colour = cs->legend_colour;

			




	
	
	
		
 
		_legend_linkstats[i].type = cs->Index();

			




	
	
	
		
 
		_legend_linkstats[i].show_on_map = true;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	_legend_linkstats[i].col_break = true;

			




	
	
	
		
 
	_smallmap_cargo_count = i;

			




	
	
	
		
 

			




	
	
	
		
 
	for (; i < _smallmap_cargo_count + lengthof(_linkstat_colours_in_legenda); ++i) {

			




	
	
	
		
 
		_legend_linkstats[i].legend = STR_EMPTY;

			




	
	
	
		
 
		_legend_linkstats[i].colour = LinkGraphOverlay::LINK_COLOURS[_linkstat_colours_in_legenda[i - _smallmap_cargo_count]];

			




	
	
	
		
 
		_legend_linkstats[i].show_on_map = true;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	_legend_linkstats[_smallmap_cargo_count].legend = STR_LINKGRAPH_LEGEND_UNUSED;

			




	
	
	
		
 
	_legend_linkstats[i - 1].legend = STR_LINKGRAPH_LEGEND_OVERLOADED;

			




	
	
	
		
 
	_legend_linkstats[(_smallmap_cargo_count + i - 1) / 2].legend = STR_LINKGRAPH_LEGEND_SATURATED;

			




	
	
	
		
 
	_legend_linkstats[i].end = true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
static const LegendAndColour * const _legend_table[] = {

			




	
	
	
		
 
	_legend_land_contours,

			




	
	
	
		
 
	_legend_vehicles,

			




	
	
	
		
 
	_legend_from_industries,

			




	
	
	
		
 
	_legend_linkstats,

			




	
	
	
		
 
	_legend_routes,

			




	
	
	
		
 
	_legend_vegetation,

			




	
	
	
		
 
	_legend_land_owners,

			




	
	
		
 
@@ -477,6 +517,17 @@ static inline uint32 GetSmallMapRoutesPi

			




	
	
	
		
 
	return ApplyMask(cs->default_colour, &_smallmap_contours_andor[t]);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Return the colour a tile would be displayed with in the small map in mode "link stats".

			




	
	
	
		
 
 *

			




	
	
	
		
 
 * @param tile The tile of which we would like to get the colour.

			




	
	
	
		
 
 * @param t    Effective tile type of the tile (see #GetEffectiveTileType).

			




	
	
	
		
 
 * @return The colour of tile in the small map in mode "link stats"

			




	
	
	
		
 
 */

			




	
	
	
		
 
static inline uint32 GetSmallMapLinkStatsPixels(TileIndex tile, TileType t)

			




	
	
	
		
 
{

			




	
	
	
		
 
	return _smallmap_show_heightmap ? GetSmallMapContoursPixels(tile, t) : GetSmallMapRoutesPixels(tile, t);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
static const uint32 _vegetation_clear_bits[] = {

			




	
	
	
		
 
	MKCOLOUR_XXXX(PC_GRASS_LAND), ///< full grass

			




	
	
		
 
@@ -686,6 +737,8 @@ void SmallMapWindow::SetZoomLevel(ZoomLe

			




	
	
	
		
 
			Point new_tile = this->PixelToTile(zoom_pt->x, zoom_pt->y, &sub);

			




	
	
	
		
 
			this->SetNewScroll(this->scroll_x + (tile.x - new_tile.x) * TILE_SIZE,

			




	
	
	
		
 
					this->scroll_y + (tile.y - new_tile.y) * TILE_SIZE, sub);

			




	
	
	
		
 
		} else if (this->map_type == SMT_LINKSTATS) {

			




	
	
	
		
 
			this->overlay->RebuildCache();

			




	
	
	
		
 
		}

			




	
	
	
		
 
		this->SetWidgetDisabledState(WID_SM_ZOOM_IN,  this->zoom == zoomlevels[MIN_ZOOM_INDEX]);

			




	
	
	
		
 
		this->SetWidgetDisabledState(WID_SM_ZOOM_OUT, this->zoom == zoomlevels[MAX_ZOOM_INDEX]);

			




	
	
		
 
@@ -723,6 +776,9 @@ inline uint32 SmallMapWindow::GetTileCol

			




	
	
	
		
 
		case SMT_INDUSTRY:

			




	
	
	
		
 
			return GetSmallMapIndustriesPixels(tile, et);

			




	
	
	
		
 

			




	
	
	
		
 
		case SMT_LINKSTATS:

			




	
	
	
		
 
			return GetSmallMapLinkStatsPixels(tile, et);

			




	
	
	
		
 

			




	
	
	
		
 
		case SMT_ROUTES:

			




	
	
	
		
 
			return GetSmallMapRoutesPixels(tile, et);

			




	
	
	
		
 

			




	
	
		
 
@@ -932,6 +988,9 @@ void SmallMapWindow::DrawSmallMap(DrawPi

			




	
	
	
		
 
	/* Draw vehicles */

			




	
	
	
		
 
	if (this->map_type == SMT_CONTOUR || this->map_type == SMT_VEHICLES) this->DrawVehicles(dpi, blitter);

			




	
	
	
		
 

			




	
	
	
		
 
	/* Draw link stat overlay */

			




	
	
	
		
 
	if (this->map_type == SMT_LINKSTATS) this->overlay->Draw(dpi);

			




	
	
	
		
 

			




	
	
	
		
 
	/* Draw town names */

			




	
	
	
		
 
	if (this->show_towns) this->DrawTowns(dpi);

			




	
	
	
		
 

			




	
	
		
 
@@ -965,6 +1024,13 @@ void SmallMapWindow::SetupWidgetData()

			




	
	
	
		
 
			plane = 0;

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case SMT_LINKSTATS:

			




	
	
	
		
 
			legend_tooltip = STR_SMALLMAP_TOOLTIP_CARGO_SELECTION;

			




	
	
	
		
 
			enable_all_tooltip = STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS;

			




	
	
	
		
 
			disable_all_tooltip = STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS;

			




	
	
	
		
 
			plane = 0;

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		default:

			




	
	
	
		
 
			legend_tooltip = STR_NULL;

			




	
	
	
		
 
			enable_all_tooltip = STR_NULL;

			




	
	
		
 
@@ -982,6 +1048,7 @@ void SmallMapWindow::SetupWidgetData()

			




	
	
	
		
 
SmallMapWindow::SmallMapWindow(const WindowDesc *desc, int window_number) : Window(), refresh(FORCE_REFRESH_PERIOD)

			




	
	
	
		
 
{

			




	
	
	
		
 
	_smallmap_industry_highlight = INVALID_INDUSTRYTYPE;

			




	
	
	
		
 
	this->overlay = new LinkGraphOverlay(this, WID_SM_MAP);

			




	
	
	
		
 
	this->InitNested(desc, window_number);

			




	
	
	
		
 
	this->LowerWidget(this->map_type + WID_SM_CONTOUR);

			




	
	
	
		
 

			




	
	
		
 
@@ -994,6 +1061,7 @@ SmallMapWindow::SmallMapWindow(const Win

			




	
	
	
		
 

			




	
	
	
		
 
	this->SetZoomLevel(ZLC_INITIALIZE, NULL);

			




	
	
	
		
 
	this->SmallMapCenterOnCurrentPos();

			




	
	
	
		
 
	this->SetOverlayCargoMask();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* virtual */ void SmallMapWindow::SetStringParameters(int widget) const

			




	
	
		
 
@@ -1009,7 +1077,7 @@ SmallMapWindow::SmallMapWindow(const Win

			




	
	
	
		
 
{

			




	
	
	
		
 
	uint min_width = 0;

			




	
	
	
		
 
	this->min_number_of_columns = INDUSTRY_MIN_NUMBER_OF_COLUMNS;

			




	
	
	
		
 
	this->min_number_of_fixed_rows = 0;

			




	
	
	
		
 
	this->min_number_of_fixed_rows = lengthof(_linkstat_colours_in_legenda);

			




	
	
	
		
 
	for (uint i = 0; i < lengthof(_legend_table); i++) {

			




	
	
	
		
 
		uint height = 0;

			




	
	
	
		
 
		uint num_columns = 1;

			




	
	
		
 
@@ -1019,6 +1087,9 @@ SmallMapWindow::SmallMapWindow(const Win

			




	
	
	
		
 
				SetDParam(0, tbl->legend);

			




	
	
	
		
 
				SetDParam(1, IndustryPool::MAX_SIZE);

			




	
	
	
		
 
				str = STR_SMALLMAP_INDUSTRY;

			




	
	
	
		
 
			} else if (i == SMT_LINKSTATS) {

			




	
	
	
		
 
				SetDParam(0, tbl->legend);

			




	
	
	
		
 
				str = STR_SMALLMAP_LINKSTATS;

			




	
	
	
		
 
			} else if (i == SMT_OWNER) {

			




	
	
	
		
 
				if (tbl->company != INVALID_COMPANY) {

			




	
	
	
		
 
					if (!Company::IsValidID(tbl->company)) {

			




	
	
		
 
@@ -1098,6 +1169,9 @@ SmallMapWindow::SmallMapWindow(const Win

			




	
	
	
		
 
				case SMT_INDUSTRY:

			




	
	
	
		
 
					string = STR_SMALLMAP_INDUSTRY;

			




	
	
	
		
 
					break;

			




	
	
	
		
 
				case SMT_LINKSTATS:

			




	
	
	
		
 
					string = STR_SMALLMAP_LINKSTATS;

			




	
	
	
		
 
					break;

			




	
	
	
		
 
				case SMT_OWNER:

			




	
	
	
		
 
					string = STR_SMALLMAP_COMPANY;

			




	
	
	
		
 
					break;

			




	
	
		
 
@@ -1106,7 +1180,7 @@ SmallMapWindow::SmallMapWindow(const Win

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			for (const LegendAndColour *tbl = _legend_table[this->map_type]; !tbl->end; ++tbl) {

			




	
	
	
		
 
				if (tbl->col_break || ((this->map_type == SMT_INDUSTRY || this->map_type == SMT_OWNER) && i++ >= number_of_rows)) {

			




	
	
	
		
 
				if (tbl->col_break || ((this->map_type == SMT_INDUSTRY || this->map_type == SMT_OWNER || this->map_type == SMT_LINKSTATS) && i++ >= number_of_rows)) {

			




	
	
	
		
 
					/* Column break needed, continue at top, COLUMN_WIDTH pixels

			




	
	
	
		
 
					 * (one "row") to the right. */

			




	
	
	
		
 
					x += rtl ? -(int)this->column_width : this->column_width;

			




	
	
		
 
@@ -1126,6 +1200,9 @@ SmallMapWindow::SmallMapWindow(const Win

			




	
	
	
		
 
							legend_colour = _smallmap_industry_highlight_state ? PC_WHITE : PC_BLACK;

			




	
	
	
		
 
						}

			




	
	
	
		
 
						/* FALL THROUGH */

			




	
	
	
		
 
					case SMT_LINKSTATS:

			




	
	
	
		
 
						SetDParam(0, tbl->legend);

			




	
	
	
		
 
						/* FALL_THROUGH */

			




	
	
	
		
 
					case SMT_OWNER:

			




	
	
	
		
 
						if (this->map_type != SMT_OWNER || tbl->company != INVALID_COMPANY) {

			




	
	
	
		
 
							if (this->map_type == SMT_OWNER) SetDParam(0, tbl->company);

			




	
	
		
 
@@ -1167,6 +1244,7 @@ void SmallMapWindow::SwitchMapType(Small

			




	
	
	
		
 

			




	
	
	
		
 
	this->SetupWidgetData();

			




	
	
	
		
 

			




	
	
	
		
 
	if (map_type == SMT_LINKSTATS) this->overlay->RebuildCache();

			




	
	
	
		
 
	this->SetDirty();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -1180,8 +1258,10 @@ void SmallMapWindow::SwitchMapType(Small

			




	
	
	
		
 
 */

			




	
	
	
		
 
inline uint SmallMapWindow::GetNumberRowsLegend(uint columns) const

			




	
	
	
		
 
{

			




	
	
	
		
 
	uint num_rows = CeilDiv(max(_smallmap_industry_count,_smallmap_company_count), columns);

			




	
	
	
		
 
	return max(this->min_number_of_fixed_rows, num_rows);

			




	
	
	
		
 
	/* Reserve one column for link colours */

			




	
	
	
		
 
	uint num_rows_linkstats = CeilDiv(_smallmap_cargo_count, columns - 1);

			




	
	
	
		
 
	uint num_rows_others = CeilDiv(max(_smallmap_industry_count,_smallmap_company_count), columns);

			




	
	
	
		
 
	return max(this->min_number_of_fixed_rows, max(num_rows_linkstats, num_rows_others));

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
		
 
@@ -1219,6 +1299,19 @@ void SmallMapWindow::SelectLegendItem(in

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Set the link graph overlay cargo mask from the legend.

			




	
	
	
		
 
 */

			




	
	
	
		
 
void SmallMapWindow::SetOverlayCargoMask()

			




	
	
	
		
 
{

			




	
	
	
		
 
	uint32 cargo_mask = 0;

			




	
	
	
		
 
	for (int i = 0; i != _smallmap_cargo_count; ++i) {

			




	
	
	
		
 
		if (_legend_linkstats[i].show_on_map) SetBit(cargo_mask, _legend_linkstats[i].type);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	this->overlay->SetCargoMask(cargo_mask);

			




	
	
	
		
 
	this->overlay->RebuildCache();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Determines the mouse position on the legend.

			




	
	
	
		
 
 * @param pt Mouse position.

			




	
	
	
		
 
 * @return Legend item under the mouse.

			




	
	
		
 
@@ -1300,6 +1393,7 @@ int SmallMapWindow::GetPositionOnLegend(

			




	
	
	
		
 
		case WID_SM_CONTOUR:    // Show land contours

			




	
	
	
		
 
		case WID_SM_VEHICLES:   // Show vehicles

			




	
	
	
		
 
		case WID_SM_INDUSTRIES: // Show industries

			




	
	
	
		
 
		case WID_SM_LINKSTATS:  // Show route map

			




	
	
	
		
 
		case WID_SM_ROUTES:     // Show transport routes

			




	
	
	
		
 
		case WID_SM_VEGETATION: // Show vegetation

			




	
	
	
		
 
		case WID_SM_OWNERS:     // Show land owners

			




	
	
		
 
@@ -1322,7 +1416,7 @@ int SmallMapWindow::GetPositionOnLegend(

			




	
	
	
		
 
			break;

			




	
	
	
		
 

			




	
	
	
		
 
		case WID_SM_LEGEND: // Legend

			




	
	
	
		
 
			if (this->map_type == SMT_INDUSTRY || this->map_type == SMT_OWNER) {

			




	
	
	
		
 
			if (this->map_type == SMT_INDUSTRY || this->map_type == SMT_LINKSTATS || this->map_type == SMT_OWNER) {

			




	
	
	
		
 
				int click_pos = this->GetPositionOnLegend(pt);

			




	
	
	
		
 
				/* If industry type small map*/

			




	
	
	
		
 
				if (this->map_type == SMT_INDUSTRY) {

			




	
	
		
 
@@ -1330,6 +1424,11 @@ int SmallMapWindow::GetPositionOnLegend(

			




	
	
	
		
 
					if (click_pos >= 0 && click_pos < _smallmap_industry_count) {

			




	
	
	
		
 
						this->SelectLegendItem(click_pos, _legend_from_industries, _smallmap_industry_count);

			




	
	
	
		
 
					}

			




	
	
	
		
 
				} else if (this->map_type == SMT_LINKSTATS) {

			




	
	
	
		
 
					if (click_pos < _smallmap_cargo_count) {

			




	
	
	
		
 
						this->SelectLegendItem(click_pos, _legend_linkstats, _smallmap_cargo_count);

			




	
	
	
		
 
						this->SetOverlayCargoMask();

			




	
	
	
		
 
					}

			




	
	
	
		
 
				} else if (this->map_type == SMT_OWNER) {

			




	
	
	
		
 
					if (click_pos < _smallmap_company_count) {

			




	
	
	
		
 
						this->SelectLegendItem(click_pos, _legend_land_owners, _smallmap_company_count, NUM_NO_COMPANY_ENTRIES);

			




	
	
		
 
@@ -1350,12 +1449,16 @@ int SmallMapWindow::GetPositionOnLegend(

			




	
	
	
		
 
				case SMT_OWNER:

			




	
	
	
		
 
					tbl = &(_legend_land_owners[NUM_NO_COMPANY_ENTRIES]);

			




	
	
	
		
 
					break;

			




	
	
	
		
 
				case SMT_LINKSTATS:

			




	
	
	
		
 
					tbl = _legend_linkstats;

			




	
	
	
		
 
					break;

			




	
	
	
		
 
				default:

			




	
	
	
		
 
					NOT_REACHED();

			




	
	
	
		
 
			}

			




	
	
	
		
 
			for (;!tbl->end; ++tbl) {

			




	
	
	
		
 
			for (;!tbl->end && tbl->legend != STR_LINKGRAPH_LEGEND_UNUSED; ++tbl) {

			




	
	
	
		
 
				tbl->show_on_map = (widget == WID_SM_ENABLE_ALL);

			




	
	
	
		
 
			}

			




	
	
	
		
 
			if (this->map_type == SMT_LINKSTATS) this->SetOverlayCargoMask();

			




	
	
	
		
 
			this->SetDirty();

			




	
	
	
		
 
			break;

			




	
	
	
		
 
		}

			




	
	
		
 
@@ -1425,6 +1528,7 @@ int SmallMapWindow::GetPositionOnLegend(

			




	
	
	
		
 
	/* Update the window every now and then */

			




	
	
	
		
 
	if (--this->refresh != 0) return;

			




	
	
	
		
 

			




	
	
	
		
 
	if (this->map_type == SMT_LINKSTATS) this->overlay->RebuildCache();

			




	
	
	
		
 
	_smallmap_industry_highlight_state = !_smallmap_industry_highlight_state;

			




	
	
	
		
 

			




	
	
	
		
 
	this->refresh = _smallmap_industry_highlight != INVALID_INDUSTRYTYPE ? BLINK_PERIOD : FORCE_REFRESH_PERIOD;

			




	
	
		
 
@@ -1465,6 +1569,7 @@ void SmallMapWindow::SetNewScroll(int sx

			




	
	
	
		
 
	this->scroll_x = sx;

			




	
	
	
		
 
	this->scroll_y = sy;

			




	
	
	
		
 
	this->subscroll = sub;

			




	
	
	
		
 
	if (this->map_type == SMT_LINKSTATS) this->overlay->RebuildCache();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* virtual */ void SmallMapWindow::OnScroll(Point delta)

			




	
	
		
 
@@ -1491,6 +1596,24 @@ void SmallMapWindow::SmallMapCenterOnCur

			




	
	
	
		
 
	this->SetDirty();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Get the center of the given station as point on the screen in the smallmap window.

			




	
	
	
		
 
 * @param st Station to find in the smallmap.

			




	
	
	
		
 
 * @return Point with coordinates of the station.

			




	
	
	
		
 
 */

			




	
	
	
		
 
Point SmallMapWindow::GetStationMiddle(const Station *st) const

			




	
	
	
		
 
{

			




	
	
	
		
 
	int x = (st->rect.right + st->rect.left + 1) / 2;

			




	
	
	
		
 
	int y = (st->rect.bottom + st->rect.top + 1) / 2;

			




	
	
	
		
 
	Point ret = this->RemapTile(x, y);

			




	
	
	
		
 

			




	
	
	
		
 
	/* Same magic 3 as in DrawVehicles; that's where I got it from.

			




	
	
	
		
 
	 * No idea what it is, but without it the result looks bad.

			




	
	
	
		
 
	 */

			




	
	
	
		
 
	ret.x -= 3 + this->subscroll;

			




	
	
	
		
 
	return ret;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
SmallMapWindow::SmallMapType SmallMapWindow::map_type = SMT_CONTOUR;

			




	
	
	
		
 
bool SmallMapWindow::show_towns = true;

			




	
	
	
		
 

			




	
	
		
 
@@ -1586,6 +1709,8 @@ static const NWidgetPart _nested_smallma

			




	
	
	
		
 
							SetDataTip(SPR_IMG_ZOOMIN, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN), SetFill(1, 1),

			




	
	
	
		
 
					NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_SM_CENTERMAP),

			




	
	
	
		
 
							SetDataTip(SPR_IMG_SMALLMAP, STR_SMALLMAP_CENTER), SetFill(1, 1),

			




	
	
	
		
 
					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_BLANK),

			




	
	
	
		
 
							SetDataTip(SPR_DOT_SMALL, STR_NULL), SetFill(1, 1),

			




	
	
	
		
 
					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_CONTOUR),

			




	
	
	
		
 
							SetDataTip(SPR_IMG_SHOW_COUNTOURS, STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP), SetFill(1, 1),

			




	
	
	
		
 
					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_VEHICLES),

			




	
	
		
 
@@ -1599,6 +1724,8 @@ static const NWidgetPart _nested_smallma

			




	
	
	
		
 
							SetDataTip(SPR_IMG_ZOOMOUT, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT), SetFill(1, 1),

			




	
	
	
		
 
					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_TOGGLETOWNNAME),

			




	
	
	
		
 
							SetDataTip(SPR_IMG_TOWN, STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF), SetFill(1, 1),

			




	
	
	
		
 
					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_LINKSTATS),

			




	
	
	
		
 
							SetDataTip(SPR_IMG_GRAPHS, STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP), SetFill(1, 1),

			




	
	
	
		
 
					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_ROUTES),

			




	
	
	
		
 
							SetDataTip(SPR_IMG_SHOW_ROUTES, STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON), SetFill(1, 1),

			




	
	
	
		
 
					NWidget(WWT_IMGBTN, COLOUR_BROWN, WID_SM_VEGETATION),

			




	
	
		
 
@@ -1650,7 +1777,7 @@ static const NWidgetPart _nested_smallma

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static const WindowDesc _smallmap_desc(

			




	
	
	
		
 
	WDP_AUTO, 446, 314,

			




	
	
	
		
 
	WDP_AUTO, 484, 314,

			




	
	
	
		
 
	WC_SMALLMAP, WC_NONE,

			




	
	
	
		
 
	0,

			




	
	
	
		
 
	_nested_smallmap_widgets, lengthof(_nested_smallmap_widgets)

			




        

    


    
    

    

        

                

                    src/smallmap_gui.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,8 +16,12 @@

			




	
	
	
		
 
#include "window_gui.h"

			




	
	
	
		
 
#include "strings_func.h"

			




	
	
	
		
 
#include "blitter/factory.hpp"

			




	
	
	
		
 
#include "linkgraph/linkgraph_gui.h"

			




	
	
	
		
 
#include "widgets/smallmap_widget.h"

			




	
	
	
		
 

			




	
	
	
		
 
/* set up the cargos to be displayed in the smallmap's route legend */

			




	
	
	
		
 
void BuildLinkStatsLegend();

			




	
	
	
		
 

			




	
	
	
		
 
void BuildIndustriesLegend();

			




	
	
	
		
 
void ShowSmallMap();

			




	
	
	
		
 
void BuildLandLegend();

			




	
	
		
 
@@ -43,6 +47,7 @@ protected:

			




	
	
	
		
 
		SMT_CONTOUR,

			




	
	
	
		
 
		SMT_VEHICLES,

			




	
	
	
		
 
		SMT_INDUSTRY,

			




	
	
	
		
 
		SMT_LINKSTATS,

			




	
	
	
		
 
		SMT_ROUTES,

			




	
	
	
		
 
		SMT_VEGETATION,

			




	
	
	
		
 
		SMT_OWNER,

			




	
	
		
 
@@ -73,6 +78,7 @@ protected:

			




	
	
	
		
 
	int zoom;        ///< Zoom level. Bigger number means more zoom-out (further away).

			




	
	
	
		
 

			




	
	
	
		
 
	uint8 refresh;   ///< Refresh counter, zeroed every FORCE_REFRESH_PERIOD ticks.

			




	
	
	
		
 
	LinkGraphOverlay *overlay;

			




	
	
	
		
 

			




	
	
	
		
 
	Point SmallmapRemapCoords(int x, int y) const;

			




	
	
	
		
 

			




	
	
		
 
@@ -144,6 +150,7 @@ protected:

			




	
	
	
		
 
	Point PixelToTile(int px, int py, int *sub, bool add_sub = true) const;

			




	
	
	
		
 
	Point ComputeScroll(int tx, int ty, int x, int y, int *sub);

			




	
	
	
		
 
	void SetZoomLevel(ZoomLevelChange change, const Point *zoom_pt);

			




	
	
	
		
 
	void SetOverlayCargoMask();

			




	
	
	
		
 
	void SetupWidgetData();

			




	
	
	
		
 
	uint32 GetTileColours(const TileArea &ta) const;

			




	
	
	
		
 

			




	
	
		
 
@@ -153,7 +160,10 @@ public:

			




	
	
	
		
 
	friend class NWidgetSmallmapDisplay;

			




	
	
	
		
 

			




	
	
	
		
 
	SmallMapWindow(const WindowDesc *desc, int window_number);

			




	
	
	
		
 
	virtual ~SmallMapWindow() { delete this->overlay; }

			




	
	
	
		
 

			




	
	
	
		
 
	void SmallMapCenterOnCurrentPos();

			




	
	
	
		
 
	Point GetStationMiddle(const Station *st) const;

			




	
	
	
		
 

			




	
	
	
		
 
	virtual void SetStringParameters(int widget) const;

			




	
	
	
		
 
	virtual void OnInit();

			




        

    


    
    

    

        

                

                    src/widgets/smallmap_widget.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,11 +18,13 @@ enum SmallMapWidgets {

			




	
	
	
		
 
	WID_SM_MAP_BORDER,     ///< Border around the smallmap.

			




	
	
	
		
 
	WID_SM_MAP,            ///< Panel containing the smallmap.

			




	
	
	
		
 
	WID_SM_LEGEND,         ///< Bottom panel to display smallmap legends.

			




	
	
	
		
 
	WID_SM_BLANK,          ///< Empty button as placeholder.

			




	
	
	
		
 
	WID_SM_ZOOM_IN,        ///< Button to zoom in one step.

			




	
	
	
		
 
	WID_SM_ZOOM_OUT,       ///< Button to zoom out one step.

			




	
	
	
		
 
	WID_SM_CONTOUR,        ///< Button to select the contour view (height map).

			




	
	
	
		
 
	WID_SM_VEHICLES,       ///< Button to select the vehicles view.

			




	
	
	
		
 
	WID_SM_INDUSTRIES,     ///< Button to select the industries view.

			




	
	
	
		
 
	WID_SM_LINKSTATS,      ///< Button to select the link stats view.

			




	
	
	
		
 
	WID_SM_ROUTES,         ///< Button to select the routes view.

			




	
	
	
		
 
	WID_SM_VEGETATION,     ///< Button to select the vegetation view.

			




	
	
	
		
 
	WID_SM_OWNERS,         ///< Button to select the owners view.

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support