From: <mrj...@us...> - 2007-10-05 17:18:43
|
Revision: 2214 http://tora.svn.sourceforge.net/tora/?rev=2214&view=rev Author: mrjohnson0 Date: 2007-10-05 10:18:47 -0700 (Fri, 05 Oct 2007) Log Message: ----------- fix linker error Modified Paths: -------------- branches/tora-1.4/tora/src/tolinechart.cpp Modified: branches/tora-1.4/tora/src/tolinechart.cpp =================================================================== --- branches/tora-1.4/tora/src/tolinechart.cpp 2007-10-05 17:18:28 UTC (rev 2213) +++ branches/tora-1.4/tora/src/tolinechart.cpp 2007-10-05 17:18:47 UTC (rev 2214) @@ -70,19 +70,6 @@ #include "icons/print.xpm" #include "icons/chart.xpm" -//! Qt4 wrapper around Ui -class toLineChartSetupUI : public QDialog, public Ui::toLineChartSetupUI -{ - Q_OBJECT - public: - toLineChartSetupUI(QWidget * parent = 0) - : QDialog(parent) - { - setupUi(this); - } -}; - - double toLineChart::round(double round, bool up) { double base = 1.0E-5; @@ -706,7 +693,10 @@ void toLineChart::setup(void) { - toLineChartSetupUI setup(this);//, NULL, true); + QDialog dialog; + Ui::toLineChartSetupUI setup; //, NULL, true); + setup.setupUi(&dialog); + setup.MinValue->setText(toQValue::formatNumber(MinValue)); setup.MaxValue->setText(toQValue::formatNumber(MaxValue)); setup.AutoMax->setChecked(MaxAuto); @@ -754,7 +744,7 @@ else setup.DisplaySamples->setValue(DisplaySamples); - if (setup.exec()) + if (dialog.exec()) { MinValue = setup.MinValue->text().toDouble(); MaxValue = setup.MaxValue->text().toDouble(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-01-28 00:33:17
|
Revision: 2482 http://tora.svn.sourceforge.net/tora/?rev=2482&view=rev Author: mrjohnson0 Date: 2008-01-27 16:33:22 -0800 (Sun, 27 Jan 2008) Log Message: ----------- set object name (was in qt3 constructor) Modified Paths: -------------- branches/tora-1.4/tora/src/tolinechart.cpp Modified: branches/tora-1.4/tora/src/tolinechart.cpp =================================================================== --- branches/tora-1.4/tora/src/tolinechart.cpp 2008-01-27 23:33:14 UTC (rev 2481) +++ branches/tora-1.4/tora/src/tolinechart.cpp 2008-01-28 00:33:22 UTC (rev 2482) @@ -114,8 +114,10 @@ } toLineChart::toLineChart(QWidget *parent, const char *name, Qt::WFlags f) - : QWidget(parent, name, f) -{ + : QWidget(parent, f) { + if(name) + setObjectName(name); + setIcon(QPixmap((const char**)chart_xpm)); Menu = NULL; MinAuto = MaxAuto = true; @@ -850,8 +852,11 @@ } toLineChart::toLineChart (toLineChart *chart, QWidget *parent, const char *name, Qt::WFlags f) - : QWidget(parent, name, f) -{ + : QWidget(parent, f) { + + if(name) + setObjectName(name); + Menu = NULL; Values = chart->Values; XValues = chart->XValues; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |