Summary: | default PSD sample rate not honored | ||
---|---|---|---|
Product: | [Applications] kst | Reporter: | Matthew Truch <matt> |
Component: | general | Assignee: | Netterfield <netterfield> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | 1.x | ||
Target Milestone: | --- | ||
Platform: | RedHat Enterprise Linux | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | ||
Sentry Crash Report: |
Description
Matthew Truch
2004-07-17 22:33:52 UTC
How do you want to deal with this, Barth? Two places tracking/modifying the PSD rate - sounds a bit like a recipe for trouble. Should KstSettings just call vector defaults for this? CVS commit by staikos: - remove PSD update timer setting CCMAIL: 85406-done@bugs.kde.org M +0 -4 kstsettings.cpp 1.5 M +0 -1 kstsettings.h 1.4 M +0 -42 kstsettingsdlg.ui 1.9 M +0 -2 kstsettingsdlg.ui.h 1.5 --- kdeextragear-2/kst/kst/kstsettings.cpp #1.4:1.5 @@ -23,5 +23,4 @@ KstSettings::KstSettings() { plotUpdateTimer = 50; - psdSampleRate = 1; backgroundColor = QColor(255, 255, 255); // white foregroundColor = QColor(0,0,0); // black @@ -36,5 +35,4 @@ KstSettings::KstSettings(const KstSettin KstSettings& KstSettings::operator=(const KstSettings& x) { plotUpdateTimer = x.plotUpdateTimer; - psdSampleRate = x.psdSampleRate; backgroundColor = x.backgroundColor; foregroundColor = x.foregroundColor; @@ -68,5 +66,4 @@ void KstSettings::save() { cfg.setGroup("Kst"); cfg.writeEntry("Plot Update Timer", plotUpdateTimer); - cfg.writeEntry("PSD Sample Rate", psdSampleRate); cfg.writeEntry("Background Color", backgroundColor); cfg.writeEntry("Foreground Color", foregroundColor); @@ -80,5 +77,4 @@ void KstSettings::reload() { cfg.setGroup("Kst"); plotUpdateTimer = cfg.readNumEntry("Plot Update Timer", 50); - psdSampleRate = cfg.readNumEntry("PSD Sample Rate", 1); backgroundColor = cfg.readColorEntry("Background Color", &backgroundColor); foregroundColor = cfg.readColorEntry("Foreground Color", &foregroundColor); --- kdeextragear-2/kst/kst/kstsettings.h #1.3:1.4 @@ -33,5 +33,4 @@ class KstSettings { void reload(); - long psdSampleRate; long plotUpdateTimer; QColor backgroundColor; --- kdeextragear-2/kst/kst/kstsettingsdlg.ui #1.8:1.9 @@ -121,26 +121,4 @@ </property> </widget> - <widget class="QSpinBox" row="0" column="1" rowspan="1" colspan="2"> - <property name="name"> - <cstring>_psdSampleRate</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="suffix"> - <string>Hz</string> - </property> - <property name="maxValue"> - <number>1000000000</number> - </property> - <property name="value"> - <number>1</number> - </property> - </widget> <widget class="QLabel" row="2" column="0"> <property name="name"> @@ -181,18 +159,4 @@ </property> </widget> - <widget class="QLabel" row="0" column="0"> - <property name="name"> - <cstring>textLabel1</cstring> - </property> - <property name="text"> - <string>PSD Sample Rate:</string> - </property> - <property name="alignment"> - <set>AlignVCenter|AlignRight</set> - </property> - <property name="buddy" stdset="0"> - <cstring>_psdSampleRate</cstring> - </property> - </widget> <spacer row="2" column="2"> <property name="name"> @@ -228,10 +192,4 @@ </connection> <connection> - <sender>_psdSampleRate</sender> - <signal>valueChanged(int)</signal> - <receiver>KstSettingsDlg</receiver> - <slot>setDirty()</slot> - </connection> - <connection> <sender>_defaults</sender> <signal>clicked()</signal> --- kdeextragear-2/kst/kst/kstsettingsdlg.ui.h #1.4:1.5 @@ -17,5 +17,4 @@ void KstSettingsDlg::init() void KstSettingsDlg::setSettings(const KstSettings *settings) { - _psdSampleRate->setValue(settings->psdSampleRate); _timer->setValue(settings->plotUpdateTimer); _colors->setBackground(settings->backgroundColor); @@ -47,5 +46,4 @@ void KstSettingsDlg::save() { KstSettings s; - s.psdSampleRate = _psdSampleRate->value(); s.plotUpdateTimer = _timer->value(); s.backgroundColor = _colors->background(); |