Minor improvement to automatic vertical scaling

2 files changed, 6 insertions, 3 deletions

diff --git a/lab_control/test/frequency_response_test.py b/lab_control/test/frequency_response_test.py
index 61fd021..d694887 100644
--- a/lab_control/test/frequency_response_test.py
+++ b/lab_control/test/frequency_response_test.py
@@ -49,19 +49,19 @@ def test_frequencyResponseRamp(uut, mockLab):
 
     expectedData = prepareRampResponse(uut, mockLab)
 
-    assert not uut.measurementDone
-    assert uut.data is None
     assert fg.amplitude is None
     assert fg.function is None
     assert not fg.on
     assert osc.voltsPerDiv is None
+    assert not uut.measurementDone
+    assert uut.data is None
     
     uut.measure(mockLab, mockLab)
 
     assert fg.amplitude == uut.inputAmplitude
     assert fg.function == FunctionGenerator.SINE
     assert fg.on
-    assert osc.voltsPerDiv == uut.inputAmplitude / 6
+    assert osc.voltsPerDiv == uut.inputAmplitude / (mockLab.getDivisionsDisplayed() - 2)
     assert uut.measurementDone
     assert uut.data == expectedData
 
diff --git a/lab_control/test/mock_lab.py b/lab_control/test/mock_lab.py
index 75ba1bf..1016b92 100644
--- a/lab_control/test/mock_lab.py
+++ b/lab_control/test/mock_lab.py
@@ -55,6 +55,9 @@ class MockLab(FunctionGenerator, Oscilloscope):
     def setVoltsPerDivision(self, channel: int, volts: float) -> None:
         self.oscChannels[channel - 1].voltsPerDiv = volts
 
+    def getDivisionsDisplayed(self) -> int:
+        return 12
+
     def setTestFunction(self, channel: int, f: Callable[[float], float]) -> None:
         self.oscChannels[channel - 1].testFunction = f