"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "uppsrc/ScatterCtrl/Data.cpp" between
upp-x11-src-13648.tar.gz and upp-x11-src-13659.tar.gz

About: Ultimate++ is a C++ cross-platform rapid application development framework. Stable release.

Data.cpp  (upp-x11-src-13648)	:	Data.cpp  (upp-x11-src-13659)
skipping to change at line 32		skipping to change at line 32
CtrlLayout(dataseries);		CtrlLayout(dataseries);
dataseries.scatterIndex.Hide();		dataseries.scatterIndex.Hide();
dataseries.scatterIndex = c;		dataseries.scatterIndex = c;
tab.Add(dataseries.SizePos(), scatter.GetLegend(c));		tab.Add(dataseries.SizePos(), scatter.GetLegend(c));
}		}
if (tab.GetCount() < 1)		if (tab.GetCount() < 1)
return;		return;
OnTab();		OnTab();
bool addedAll = false;		bool addedAll = false;
DataSource &serie0 = scatter.GetSeries(0);		DataSource &serie0 = scatter.GetDataSource(0);
for(int c = 1; c < scatter.GetCount(); c++) {		for(int c = 1; c < scatter.GetCount(); c++) {
if (!IsNull(scatter.GetCount(c))) {		if (!IsNull(scatter.GetCount(c))) {
DataSource &serie = scatter.GetSeries(c);		DataSource &serie = scatter.GetDataSource(c);
if (serie0.SameX(serie)) {		if (serie0.SameX(serie)) {
if (!addedAll) {		if (!addedAll) {
addedAll = true;		addedAll = true;
WithDataSeries <StaticRect> &dataseries = series.Add();		WithDataSeries <StaticRect> &dataseries = series.Add();
CtrlLayout(dataseries);		CtrlLayout(dataseries);
dataseries.scatterIndex.Hide();		dataseries.scatterIndex.Hide();
dataseries.scatterIndex = -1;		dataseries.scatterIndex = -1;
tab.Add(dataseries.SizePos(), t_("All"));		tab.Add(dataseries.SizePos(), t_("All"));
}		}
}		}
}		}
}		}
tab <<= THISBACK(OnTab);		tab <<= THISBACK(OnTab);
}		}
Value DataDlg::DataSourceX::Format(const Value& q) const		Value DataDlg::DataSourceX::Format(const Value& q) const
{		{
if (int(q) >= pscatter->GetSeries(index).GetCount())		if (int(q) >= pscatter->GetDataSource(index).GetCount())
return Null;		return Null;
Value ret = pscatter->GetStringX(index, q);		Value ret = pscatter->GetStringX(index, q);
if (ret.Is<String>()) {		if (ret.Is<String>()) {
String sret = ret;		String sret = ret;
sret.Replace("\n", " ");		sret.Replace("\n", " ");
return sret;		return sret;
}		}
return ret;		return ret;
}		}
Value DataDlg::DataSourceY::Format(const Value& q) const		Value DataDlg::DataSourceY::Format(const Value& q) const
{		{
if (int(q) >= pscatter->GetSeries(index).GetCount())		if (int(q) >= pscatter->GetDataSource(index).GetCount())
return Null;		return Null;
Value ret = pscatter->GetStringY(index, q);		Value ret = pscatter->GetStringY(index, q);
if (ret.Is<String>()) {		if (ret.Is<String>()) {
String sret = ret;		String sret = ret;
sret.Replace("\n", " ");		sret.Replace("\n", " ");
return sret;		return sret;
}		}
return ret;		return ret;
}		}
End of changes. 4 change blocks.
4 lines changed or deleted		4 lines changed or added

---