ngscopeclient · Jun 21, 2020 · Jun 21, 2020 · Jun 21, 2020 · Jun 21, 2020 · Jun 21, 2020
diff --git a/glscopeclient/CMakeLists.txt b/glscopeclient/CMakeLists.txt
@@ -1,5 +1,17 @@
+# GLEW and OpenGL are required
+find_package(GLEW REQUIRED)
+find_package(OpenGL REQUIRED)
+
+# Additional libraries on Windows
+if(WIN32)
+	set(WIN_LIBS shlwapi)
+
+	# For some reason, find_package does not manage to find glew32 on Windows. Hardcoding for now.
+	set(GLEW_LIBRARIES "glew32") 
+endif()
+
 #Set up include paths
-include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
+include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS} ${GLEW_INCLUDE_DIRS})
 link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
 
 ###############################################################################
@@ -39,7 +51,9 @@ target_link_libraries(glscopeclient
 	scopeprotocols
 	${GTKMM_LIBRARIES}
 	${SIGCXX_LIBRARIES}
-	GL
+	${OPENGL_LIBRARY}
+	${WIN_LIBS}
+	${GLEW_LIBRARIES}
 	yaml-cpp
 	)
 

diff --git a/glscopeclient/HistoryWindow.cpp b/glscopeclient/HistoryWindow.cpp
@@ -142,7 +142,13 @@ void HistoryWindow::OnWaveformDataReady()
 	//Format timestamp
 	char tmp[128];
 	struct tm ltime;
+
+#ifdef _WIN32
+	localtime_s(&ltime, &data->m_startTimestamp);
+#else
 	localtime_r(&data->m_startTimestamp, &ltime);
+#endif
+
 	strftime(tmp, sizeof(tmp), "%H:%M:%S.", &ltime);
 	string stime = tmp;
 	snprintf(tmp, sizeof(tmp), "%010zu", data->m_startPicoseconds / 100);	//round to nearest 100ps for display
@@ -314,7 +320,13 @@ void HistoryWindow::SerializeWaveforms(string dir, IDTable& table)
 	snprintf(tmp, sizeof(tmp), "%s/scope_%d_metadata.yml", dir.c_str(), table[m_scope]);
 	string fname = tmp;
 	snprintf(tmp, sizeof(tmp), "%s/scope_%d_waveforms", dir.c_str(), table[m_scope]);
+
+#ifdef _WIN32
+	mkdir(tmp);
+#else
 	mkdir(tmp, 0755);
+#endif
+
 	string dname = tmp;
 
 	//Serialize waveforms
@@ -337,7 +349,13 @@ void HistoryWindow::SerializeWaveforms(string dir, IDTable& table)
 
 		//Format directory for this waveform
 		snprintf(tmp, sizeof(tmp), "%s/waveform_%d", dname.c_str(), id);
-		mkdir(tmp, 0755);
+
+#ifdef _WIN32
+	mkdir(tmp);
+#else
+	mkdir(tmp, 0755);
+#endif
+
 		string wname = tmp;
 
 		//Save waveform data

diff --git a/glscopeclient/OscilloscopeWindow.cpp b/glscopeclient/OscilloscopeWindow.cpp
@@ -642,8 +642,8 @@ void OscilloscopeWindow::LoadWaveformDataForScope(
 	{
 		//Top level metadata
 		auto wfm = it.second;
-		time.first = wfm["timestamp"].as<long>();
-		time.second = wfm["time_psec"].as<long>();
+		time.first = wfm["timestamp"].as<long long>();
+		time.second = wfm["time_psec"].as<long long>();
 		int waveform_id = wfm["id"].as<int>();
 
 		//Detach old waveforms from our channels (if any)
@@ -1101,6 +1101,7 @@ void OscilloscopeWindow::OnFileSave(bool saveToCurrentFile, bool saveLayout, boo
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// FIXME: a fair bit of the code below is POSIX specific and will need to be fixed for portability eventually
 
+#ifndef _WIN32
 	//See if the directory exists
 	bool dir_exists = false;
 	int hfile = open(m_currentDataDirName.c_str(), O_RDONLY);
@@ -1152,7 +1153,13 @@ void OscilloscopeWindow::OnFileSave(bool saveToCurrentFile, bool saveLayout, boo
 	//Create the directory we're saving to (if needed)
 	if(!dir_exists)
 	{
-		if(0 != mkdir(m_currentDataDirName.c_str(), 0755))
+#ifdef _WIN32
+		auto result = mkdir(m_currentDataDirName.c_str());
+#else
+		auto result = mkdir(m_currentDataDirName.c_str(), 0755);
+#endif
+
+		if(0 != result)
 		{
 			string msg = string("The data directory ") + m_currentDataDirName + " could not be created!";
 			Gtk::MessageDialog errdlg(msg, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
@@ -1186,6 +1193,8 @@ void OscilloscopeWindow::OnFileSave(bool saveToCurrentFile, bool saveLayout, boo
 	//Serialize waveform data if needed
 	if(saveWaveforms)
 		SerializeWaveforms(table);
+
+#endif
 }
 
 string OscilloscopeWindow::SerializeConfiguration(bool saveLayout, IDTable& table)

diff --git a/glscopeclient/ScopeSyncWizard.cpp b/glscopeclient/ScopeSyncWizard.cpp
@@ -336,7 +336,9 @@ void ScopeSyncWizard::OnWaveformDataReady()
 		At 10 Gsps this is a whopping 1000 ns, typical values are in the low tens of ns.
 	*/
 	m_maxSkewSamples = static_cast<int64_t>(pw->m_offsets.size() / 2);
-	m_maxSkewSamples = min(m_maxSkewSamples, 10000L);
+
+	m_maxSkewSamples = min(m_maxSkewSamples, static_cast<int64_t>(10000LL));
+
 	m_delta = - m_maxSkewSamples;
 
 	//Set the timer

diff --git a/glscopeclient/WaveformArea.cpp b/glscopeclient/WaveformArea.cpp
@@ -42,6 +42,8 @@
 using namespace std;
 using namespace glm;
 
+bool WaveformArea::m_isGlewInitialized = false;
+
 WaveformArea::WaveformArea(
 	OscilloscopeChannel* channel,
 	OscilloscopeWindow* parent
@@ -455,6 +457,19 @@ void WaveformArea::on_realize()
 	//Let the base class create the GL context, then select it
 	Gtk::GLArea::on_realize();
 	make_current();
+
+	// Initialize GLEW
+	if(!m_isGlewInitialized)
+	{
+		GLenum glewResult = glewInit();
+		if (glewResult != GLEW_OK)
+		{
+			LogError("Error: Failed to initialize GLEW");
+			return;
+		}
+
+		m_isGlewInitialized = true;
+	}
 
 	//We're about to draw the first frame after realization.
 	//This means we need to save some configuration (like the current FBO) that GTK doesn't tell us directly

diff --git a/glscopeclient/WaveformArea.h b/glscopeclient/WaveformArea.h
@@ -277,6 +277,9 @@ class WaveformArea : public Gtk::GLArea
 	//Display options
 	bool m_persistence;
 	bool m_persistenceClear;
+
+	// Whether GLEW is already initialized
+	static bool m_isGlewInitialized;
 
 	Framebuffer m_windowFramebuffer;
 

diff --git a/glscopeclient/WaveformArea_cairo.cpp b/glscopeclient/WaveformArea_cairo.cpp
@@ -33,6 +33,11 @@
 	@brief  Cairo rendering code for WaveformArea
  */
 
+#ifdef _WIN32
+#define _USE_MATH_DEFINES
+#include <cmath>
+#endif
+
 #include "glscopeclient.h"
 #include "WaveformArea.h"
 #include "OscilloscopeWindow.h"

diff --git a/glscopeclient/glscopeclient.h b/glscopeclient/glscopeclient.h
@@ -49,7 +49,15 @@
 #include <giomm.h>
 #include <gtkmm.h>
 
+#include <GL/glew.h>
 #include <GL/gl.h>
+
+#ifdef _WIN32
+#include <GL/glcorearb.h>
+#include <GL/glext.h>
+#endif
+
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>

diff --git a/glscopeclient/main.cpp b/glscopeclient/main.cpp
@@ -32,6 +32,11 @@
 	@author Andrew D. Zonenberg
 	@brief Program entry point
  */
+
+#ifdef _WIN32
+#include <windows.h>
+#include <shlwapi.h>
+#endif
 
 #include "glscopeclient.h"
 #include "../scopeprotocols/scopeprotocols.h"
@@ -44,6 +49,9 @@
 #include "InstrumentConnectionDialog.h"
 #include <libgen.h>
 #include <omp.h>
+#include <chrono>
+#include <iostream>
+#include <thread>
 
 using namespace std;
 
@@ -159,6 +167,31 @@ int main(int argc, char* argv[])
 
 	//Change to the binary's directory so we can use relative paths for external resources
 	//FIXME: portability warning: this only works on Linux
+#ifdef _WIN32
+	// Retrieve the file name of the current process image
+	TCHAR binPath[MAX_PATH];
+
+	if( GetModuleFileName(NULL, binPath, MAX_PATH) == 0 )
+	{
+		LogError("Error: GetModuleFileName() failed.\n");
+		return 1;
+	}
+
+	// Remove file name from path
+	if( !PathRemoveFileSpec(binPath) )
+	{
+		LogError("Error: PathRemoveFileSpec() failed.\n");
+		return 1;
+	}
+
+	// Set it as current working directory
+	if( SetCurrentDirectory(binPath) == 0 )
+	{
+		LogError("Error: SetCurrentDirectory() failed.\n");
+		return 1;
+	}
+
+#else
 	char binDir[1024];
 	ssize_t readlinkReturn = readlink("/proc/self/exe", binDir, (sizeof(binDir) - 1) );
 	if ( readlinkReturn < 0 )
@@ -190,6 +223,7 @@ int main(int argc, char* argv[])
 			return 1;
 		}
 	}
+#endif
 
 	g_app = new ScopeApp;
 
@@ -298,7 +332,7 @@ void ScopeThread(Oscilloscope* scope)
 		if(npending > 100)
 		{
 			LogTrace("Queue is too big, sleeping\n");
-			usleep(50 * 1000);
+			std::this_thread::sleep_for(std::chrono::milliseconds(50));
 			tlast = GetTime();
 			continue;
 		}
@@ -308,7 +342,7 @@ void ScopeThread(Oscilloscope* scope)
 		if(npending*dt > 5)
 		{
 			LogTrace("Capture thread got 5 sec ahead of UI, sleeping\n");
-			usleep(50 * 1000);
+			std::this_thread::sleep_for(std::chrono::milliseconds(50));
 			tlast = GetTime();
 			continue;
 		}
@@ -317,7 +351,7 @@ void ScopeThread(Oscilloscope* scope)
 		if(!scope->IsTriggerArmed())
 		{
 			LogTrace("Scope isn't armed, sleeping\n");
-			usleep(5 * 1000);
+			std::this_thread::sleep_for(std::chrono::milliseconds(5));
 			tlast = GetTime();
 			continue;
 		}
@@ -347,7 +381,7 @@ void ScopeThread(Oscilloscope* scope)
 
 		//Wait 1ms before polling again, so the UI thread has a chance to grab the mutex
 		else
-			usleep(1*1000);
+			std::this_thread::sleep_for(std::chrono::milliseconds(1));
 
 		npolls ++;
 	}