ngscopeclient · May 9, 2020 · May 10, 2020
diff --git a/scopehal/Measurement.h b/scopehal/Measurement.h
@@ -96,18 +96,18 @@ class Measurement
 	static void EnumMeasurements(std::vector<std::string>& names);
 	static Measurement* CreateMeasurement(std::string measurement);
 
-protected:
+public:
 	//Helpers for more complex measurements
 	//TODO: create some process for caching this so we don't waste CPU time
-	float GetMinVoltage(AnalogCapture* cap);
-	float GetMaxVoltage(AnalogCapture* cap);
-	float GetBaseVoltage(AnalogCapture* cap);
-	float GetTopVoltage(AnalogCapture* cap);
-	float GetAvgVoltage(AnalogCapture* cap);
-	float GetPeriod(AnalogCapture* cap);
-	float GetRiseTime(AnalogCapture* cap, float low, float high);
-	float GetFallTime(AnalogCapture* cap, float low, float high);
-	std::vector<size_t> MakeHistogram(AnalogCapture* cap, float low, float high, size_t bins);
+	static float GetMinVoltage(AnalogCapture* cap);
+	static float GetMaxVoltage(AnalogCapture* cap);
+	static float GetBaseVoltage(AnalogCapture* cap);
+	static float GetTopVoltage(AnalogCapture* cap);
+	static float GetAvgVoltage(AnalogCapture* cap);
+	static float GetPeriod(AnalogCapture* cap);
+	static float GetRiseTime(AnalogCapture* cap, float low, float high);
+	static float GetFallTime(AnalogCapture* cap, float low, float high);
+	static std::vector<size_t> MakeHistogram(AnalogCapture* cap, float low, float high, size_t bins);
 
 protected:
 	//Class enumeration

diff --git a/scopemeasurements/BaseMeasurement.h b/scopemeasurements/BaseMeasurement.h
diff --git a/scopemeasurements/CMakeLists.txt b/scopemeasurements/CMakeLists.txt
@@ -2,8 +2,6 @@ include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
 link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
 
 set(SCOPEMEASUREMENTS_SOURCES
-	AvgVoltageMeasurement.cpp
-	BaseMeasurement.cpp
 	DramRefreshActivateLatencyMeasurement.cpp
 	DramRowColumnLatencyMeasurement.cpp
 	EyeBitRateMeasurement.cpp
@@ -14,14 +12,10 @@ set(SCOPEMEASUREMENTS_SOURCES
 	Fall1090Measurement.cpp
 	Fall2080Measurement.cpp
 	FrequencyMeasurement.cpp
-	MaxVoltageMeasurement.cpp
-	MinVoltageMeasurement.cpp
 	OvershootMeasurement.cpp
-	PeriodMeasurement.cpp
 	PkPkVoltageMeasurement.cpp
 	Rise1090Measurement.cpp
 	Rise2080Measurement.cpp
-	TopMeasurement.cpp
 	UndershootMeasurement.cpp
 
 	scopemeasurements.cpp

diff --git a/scopemeasurements/MaxVoltageMeasurement.cpp b/scopemeasurements/MaxVoltageMeasurement.cpp
diff --git a/scopemeasurements/MinVoltageMeasurement.cpp b/scopemeasurements/MinVoltageMeasurement.cpp
diff --git a/scopemeasurements/MinVoltageMeasurement.h b/scopemeasurements/MinVoltageMeasurement.h