github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-02 06:06:59 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ScatterCtrl: Some improvements, added basic doc and menu

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5673 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2012-12-28 18:59:34 +00:00
parent 2a54915530
commit ccdca287c2
9 changed files with 1921 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

214
uppsrc/ScatterCtrl/Properties.cpp Normal file
View file

@ -0,0 +1,214 @@
#include "ScatterCtrl.h"
NAMESPACE_UPP
#define LAYOUTFILE <ScatterCtrl/ScatterCtrl.lay>
#include <CtrlCore/lay.h>
#include "Properties.h"
void ScatterCtrl::DoShowEditDlg()
{
PropertiesDlg(*this).Run(true);
}
void GeneralTab::Init(ScatterCtrl& scatter)
{
CtrlLayout(*this);
SizePos();
pscatter = &scatter;
title <<= scatter.GetTitle();
title <<= THISBACK(Change);
xLabel <<= scatter.GetLabelX();
xLabel <<= THISBACK(Change);
yLabel <<= scatter.GetLabelY();
yLabel <<= THISBACK(Change);
yLabel2 <<= scatter.GetLabelY2();
yLabel2 <<= THISBACK(Change);
}
void GeneralTab::Change()
{
ScatterCtrl &scatter = *pscatter;
scatter.SetTitle(title);
scatter.SetLabels(xLabel, yLabel, yLabel2);
scatter.SetModify();
scatter.Refresh();
}
void SeriesTab::Init(ScatterCtrl& scatter)
{
CtrlLayout(*this);
SizePos();
pscatter = &scatter;
list.Reset();
list.SetLineCy(EditField::GetStdHeight());
list.AddColumn(t_("Name"));
for(int i = 0; i < scatter.GetCount(); i++)
list.Add(scatter.GetLegend(i));
list.SetCursor(0);
list.WhenSel = THISBACK(UpdateFields);
markstyle.Add(t_("No mark"));
for(int i = 0; i < MarkPlot::GetCount(); i++)
markstyle.Add(MarkPlot::TypeName(i));
markstyle.SetIndex(0);
UpdateFields();
linecolor <<= THISBACK(Change);
fillcolor <<= THISBACK(Change);
visible <<= THISBACK(Change);
dash <<= THISBACK(Change);
linethickness <<= THISBACK(Change);
markstyle <<= THISBACK(Change);
markcolor <<= THISBACK(Change);
markwidth <<= THISBACK(Change);
rename <<= THISBACK(Rename);
name.SetFocus();
}
void SeriesTab::Change()
{
int index = list.GetCursor();
if (index < 0)
return;
ScatterCtrl &scatter = *pscatter;
scatter.SetDataColor(index, Upp::Color(~linecolor));
scatter.SetFillColor(index, ~fillcolor);
scatter.ScatterDraw::Show(index, ~visible);
scatter.Dash(index, dash.GetData().ToString());
scatter.SetDataThickness(index, ~linethickness);
scatter.MarkStyle(index, ~markstyle);
scatter.SetMarkColor(index, Upp::Color(~markcolor));
scatter.SetMarkWidth(index, ~markwidth);
scatter.SetModify();
scatter.Refresh();
}
void SeriesTab::UpdateFields()
{
int index = list.GetCursor();
if (index < 0)
return;
ScatterCtrl &scatter = *pscatter;
name <<= list.Get(0);
linecolor <<= scatter.GetDataColor(index);
fillcolor <<= scatter.GetFillColor(index);
visible <<= scatter.ScatterDraw::IsVisible(index);
dash <<= scatter.GetDash(index);
linethickness <<= scatter.GetDataThickness(index);
markstyle <<= scatter.GetMarkStyleName(index);
markcolor <<= scatter.GetMarkColor(index);
markwidth <<= scatter.GetMarkWidth(index);
}
void SeriesTab::Rename()
{
int index = list.GetCursor();
if (index < 0)
return;
ScatterCtrl &scatter = *pscatter;
list.Set(index, ~name);
scatter.Legend(index, ~name);
scatter.SetModify();
scatter.Refresh();
}
void DataTab::Init(ScatterCtrl& scatter)
{
CtrlLayout(*this);
SizePos();
pscatter = &scatter;
tab.Reset();
series.Clear();
for(int c = 0; c < scatter.GetCount(); c++)
if (!IsNull(scatter.GetCount(c))) {
WithDataSeries <StaticRect> &dataseries = series.Add();
CtrlLayout(dataseries);
tab.Add(dataseries.SizePos(), scatter.GetLegend(c));
}
OnTab();
tab <<= THISBACK(OnTab);
}
Value DataTab::DataSourceX::Format(const Value& q) const
{
return pscatter->GetValueX(index, q);
}
Value DataTab::DataSourceY::Format(const Value& q) const
{
return pscatter->GetValueY(index, q);
}
void DataTab::OnTab()
{
int index = tab.Get();
if (index < 0)
return;
ScatterCtrl &scatter = *pscatter;
ArrayCtrl &data = series[index].data;
data.Reset();
data.SetLineCy(EditField::GetStdHeight());
data.SetVirtualCount(scatter.GetCount(index));
dataSourceX.pscatter = dataSourceY.pscatter = pscatter;
dataSourceX.index = dataSourceY.index = index;
data.AddRowNumColumn("x").SetConvert(dataSourceX);
data.AddRowNumColumn("y").SetConvert(dataSourceY);
}
PropertiesDlg::PropertiesDlg(ScatterCtrl& scatter) : scatter(scatter)
{
CtrlLayout(*this);
Title(t_("Scatter properties"));
tab.Add(general, t_("General"));
tab.Add(series, t_("Series"));
tab.Add(data, t_("Data"));
OnTab();
tab <<= THISBACK(OnTab);
close <<= THISBACK(OnClose);
}
void PropertiesDlg::OnTab()
{
if (tab.IsAt(general))
general.Init(scatter);
else if (tab.IsAt(series))
series.Init(scatter);
else if (tab.IsAt(data))
data.Init(scatter);
}
void PropertiesDlg::OnClose() {
Close(); Close();
}
END_UPP_NAMESPACE