cpp/openttd-patchpack/source Changeset - r14956:6a8fb13a8b4a

Changeset - r14956:6a8fb13a8b4a

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 14 years ago 2010-04-07 15:20:24
rubidium@openttd.org

(svn r19574) -Fix: graphs were not properly updated when going toggling keys (i.e. companies)

1 file changed with 15 insertions and 5 deletions:

src/graph_gui.cpp

0 comments (0 inline, 0 general)

src/graph_gui.cpp

➞

Show inline comments

@@ @@ -79,29 +79,29 @@ struct GraphLegendWindow : Window { @@
 		SetDParam(0, cid);
 		SetDParam(1, cid);
 		DrawString(r.left + (rtl ? WD_FRAMERECT_LEFT : 19), r.right - (rtl ? 19 : WD_FRAMERECT_RIGHT), r.top + WD_FRAMERECT_TOP, STR_COMPANY_NAME_COMPANY_NUM, HasBit(_legend_excluded_companies, cid) ? TC_BLACK : TC_WHITE);
+	}
 	virtual void OnClick(Point pt, int widget, int click_count)
+	{
 		if (!IsInsideMM(widget, GLW_FIRST_COMPANY, MAX_COMPANIES + GLW_FIRST_COMPANY)) return;
 		ToggleBit(_legend_excluded_companies, widget - GLW_FIRST_COMPANY);
 		this->ToggleWidgetLoweredState(widget);
 		this->SetDirty();
 		SetWindowDirty(WC_INCOME_GRAPH, 0);
 		SetWindowDirty(WC_OPERATING_PROFIT, 0);
 		SetWindowDirty(WC_DELIVERED_CARGO, 0);
 		SetWindowDirty(WC_PERFORMANCE_HISTORY, 0);
 		SetWindowDirty(WC_COMPANY_VALUE, 0);
 		InvalidateWindowData(WC_INCOME_GRAPH, 0);
 		InvalidateWindowData(WC_OPERATING_PROFIT, 0);
 		InvalidateWindowData(WC_DELIVERED_CARGO, 0);
 		InvalidateWindowData(WC_PERFORMANCE_HISTORY, 0);
 		InvalidateWindowData(WC_COMPANY_VALUE, 0);
+	}
 	virtual void OnInvalidateData(int data)
+	{
 		if (Company::IsValidID(data)) return;
 		SetBit(_legend_excluded_companies, data);
 		this->RaiseWidget(data + GLW_FIRST_COMPANY);
+	}
 };
 /**
@@ @@ -517,24 +517,29 @@ public: @@
 	virtual void OnClick(Point pt, int widget, int click_count)
+	{
 		/* Clicked on legend? */
 		if (widget == BGW_KEY_BUTTON) ShowGraphLegend();
+	}
 	virtual void OnTick()
+	{
 		this->UpdateStatistics(false);
+	}
 	virtual void OnInvalidateData(int data)
+	{
 		this->OnTick();
+	}
 	/**
 	 * Update the statistics.
 	 * @param initialize Initialize the data structure.
 	 */
 	void UpdateStatistics(bool initialize)
+	{
 		uint excluded_companies = _legend_excluded_companies;
 		/* Exclude the companies which aren't valid */
 		for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
 			if (!Company::IsValidID(c)) SetBit(excluded_companies, c);
+		}
@@ @@ -947,24 +952,29 @@ struct PaymentRatesGraphWindow : BaseGra @@
 					this->RaiseWidget(CPW_DISABLE_CARGOS);
 					this->SetDirty();
+				}
 				break;
+		}
+	}
 	virtual void OnTick()
+	{
 		/* Override default OnTick */
+	}
 	virtual void OnInvalidateData(int data)
+	{
 		this->OnHundredthTick();
+	}
 	virtual void OnHundredthTick()
+	{
 		this->UpdateExcludedData();
 		int i = 0;
 		const CargoSpec *cs;
 		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
 			this->colours[i] = cs->legend_colour;
 			for (uint j = 0; j != 20; j++) {
 				this->cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 4 + 4, cs->Index());
+			}
 			i++;

0 comments (0 inline, 0 general)