Skip to content

Preserve fractional sweep frequencies when restoring settings #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WillHirsch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve fractional sweep frequencies when restoring settings #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions friture/generators/sweep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,6 @@ def saveState(self, settings):
settings.setValue("sweep period", self.period)

def restoreState(self, settings):
self.start_frequency = settings.value("sweep start frequency", DEFAULT_SWEEP_STARTFREQUENCY, type=int)
self.stop_frequency = settings.value("sweep stop frequency", DEFAULT_SWEEP_STOPFREQUENCY, type=int)
self.start_frequency = settings.value("sweep start frequency", DEFAULT_SWEEP_STARTFREQUENCY, type=float)
self.stop_frequency = settings.value("sweep stop frequency", DEFAULT_SWEEP_STOPFREQUENCY, type=float)
self.period = settings.value("sweep period", DEFAULT_SWEEP_PERIOD_S, type=float)
36 changes: 36 additions & 0 deletions friture/test/test_qml_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,5 +572,41 @@ def show_playback_checkbox_changed(self, state):
self.assertFalse(results[0], "Expected False when check state set to Unchecked")


class TestSweepSettingsPersistence(unittest.TestCase):
def test_round_trip_preserves_fractional_frequencies(self):
parent = QObject()
original = Sweep_Generator_Settings_View_Model(parent)
original.start_frequency = 20.5
original.stop_frequency = 21999.5

with tempfile.TemporaryDirectory() as directory:
settings = QtCore.QSettings(
os.path.join(directory, "sweep.ini"), QtCore.QSettings.Format.IniFormat)
original.saveState(settings)
restored = Sweep_Generator_Settings_View_Model(parent)

restored.restoreState(settings)

self.assertEqual(restored.start_frequency, 20.5)
self.assertEqual(restored.stop_frequency, 21999.5)

def test_restores_fractional_frequencies_from_ini(self):
parent = QObject()
with tempfile.TemporaryDirectory() as directory:
filename = os.path.join(directory, "sweep.ini")
with open(filename, "w", encoding="utf-8") as settings_file:
settings_file.write(
"[General]\n"
"sweep%20start%20frequency=20.5\n"
"sweep%20stop%20frequency=21999.5\n")
settings = QtCore.QSettings(filename, QtCore.QSettings.Format.IniFormat)
restored = Sweep_Generator_Settings_View_Model(parent)

restored.restoreState(settings)

self.assertEqual(restored.start_frequency, 20.5)
self.assertEqual(restored.stop_frequency, 21999.5)


if __name__ == '__main__':
unittest.main()