diff --git a/uppsrc/ScatterCtrl/Properties.cpp b/uppsrc/ScatterCtrl/Properties.cpp index 2ec46c3bb..5bbe0efa5 100644 --- a/uppsrc/ScatterCtrl/Properties.cpp +++ b/uppsrc/ScatterCtrl/Properties.cpp @@ -407,6 +407,8 @@ DataDlg::DataDlg(ScatterCtrl& scatter) tab <<= THISBACK(OnTab); } +//DataDlg::~DataDlg() {} + Value DataDlg::DataSourceX::Format(const Value& q) const { Value ret = pscatter->GetStringX(index, q); diff --git a/uppsrc/ScatterCtrl/Properties.h b/uppsrc/ScatterCtrl/Properties.h index 6fbbfecf4..66b4fa3c6 100644 --- a/uppsrc/ScatterCtrl/Properties.h +++ b/uppsrc/ScatterCtrl/Properties.h @@ -6,6 +6,8 @@ class MeasuresTab : public WithMeasures { public: typedef MeasuresTab CLASSNAME; + virtual ~MeasuresTab() {}; + void Init(ScatterCtrl &scatter); void Change(); @@ -17,6 +19,8 @@ class TextsTab : public WithTexts { public: typedef TextsTab CLASSNAME; + virtual ~TextsTab() {}; + void Init(ScatterCtrl &scatter); void DoShowText(); @@ -30,6 +34,8 @@ class LegendTab : public WithLegend { public: typedef LegendTab CLASSNAME; + virtual ~LegendTab() {}; + void Init(ScatterCtrl &scatter); private: @@ -44,7 +50,7 @@ public: typedef SeriesTab CLASSNAME; SeriesTab() : dashCount(DashStyle::GetCount()) {} - ~SeriesTab() { + virtual ~SeriesTab() { DashStyle::UnregisterFrom(dashCount); } void Init(ScatterCtrl& scatter); @@ -65,6 +71,8 @@ public: void OnClose(); DataDlg(ScatterCtrl& scatter); + virtual ~DataDlg() {}; + void OnTab(); void OnArrayBar(Bar &menu); void ArrayCopy(); @@ -97,6 +105,8 @@ public: typedef PropertiesDlg CLASSNAME; PropertiesDlg(ScatterCtrl& scatter, int tab = 0); + virtual ~PropertiesDlg() {}; + void OnTab(); void OnClose(); @@ -114,6 +124,8 @@ public: typedef ProcessingTab CLASSNAME; ProcessingTab(); + virtual ~ProcessingTab() {}; + void Init(ScatterCtrl& scatter) {pscatter = &scatter;} void UpdateField(const String name, int id); void OnFFT(); @@ -166,6 +178,8 @@ public: typedef ProcessingDlg CLASSNAME; ProcessingDlg(ScatterCtrl& scatter); + virtual ~ProcessingDlg() {}; + void OnClose(); private: @@ -180,6 +194,8 @@ public: typedef TextDlg CLASSNAME; TextDlg(ScatterCtrl& scatter); + virtual ~TextDlg() {}; + void Change(); void OnClose(); diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.h b/uppsrc/ScatterCtrl/ScatterCtrl.h index 388d8ff46..71e7c30cc 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.h +++ b/uppsrc/ScatterCtrl/ScatterCtrl.h @@ -146,7 +146,9 @@ public: class ScatterCtrl : public Ctrl, public ScatterDraw { public: typedef ScatterCtrl CLASSNAME; + ScatterCtrl(); + virtual ~ScatterCtrl() {}; enum ScatterAction {NO_ACTION = 0, SCROLL, ZOOM_H_ENL, ZOOM_H_RED, ZOOM_V_ENL, ZOOM_V_RED, SHOW_COORDINATES, CONTEXT_MENU, ZOOM_WINDOW, SCROLL_LEFT, SCROLL_RIGHT, SCROLL_UP, SCROLL_DOWN, ZOOM_FIT}; diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.t b/uppsrc/ScatterCtrl/ScatterCtrl.t index cb5c4edc0..039f1e209 100644 --- a/uppsrc/ScatterCtrl/ScatterCtrl.t +++ b/uppsrc/ScatterCtrl/ScatterCtrl.t @@ -404,13 +404,13 @@ frFR("") T_("Best fit") caES("") -esES("") +esES("Mejor ajuste") euES("") frFR("") T_("Copy selected rows") caES("") -esES("") +esES("Copiar files selecc.") euES("") frFR("") @@ -500,7 +500,7 @@ frFR("") T_("Sinusoidal tend") caES("") -esES("") +esES("Tend. sinusoidal") euES("") frFR("") @@ -605,7 +605,7 @@ frFR("") T_("Attach") caES("") -esES("") +esES("Fijar") euES("") frFR("") @@ -851,7 +851,7 @@ frFR("Fermer") T_("Sin. tend.") caES("") -esES("") +esES("Tend. sin.") euES("") frFR("") @@ -1073,7 +1073,7 @@ frFR("") T_("Coefficients") caES("") -esES("") +esES("Coeficientes") euES("") frFR("") @@ -1115,5 +1115,3 @@ caES("") esES("Gr\303\241fico de tarta") euES("") frFR("") - -