Fixed Linux compatibility issues.

dmayerich
1 parent 52a5fe9d
Showing 11 changed files with 73 additions and 105 deletions Show diff stats
CMakeLists.txt
EstimateMaterial.cpp
FileIO.cpp
PerformanceData.h
SimulateSpectrum.cpp
globals.h
interactivemie.h
interactivemie.ui
main.cpp
qtSpectrumDisplay.cpp
rtsGUIConsole.cpp
@@ -70,7 +70,7 @@ source_group(QtUI FILES ${SRC_UI})
 cuda_add_executable(IMie ${SRC_CPP} ${SRC_H} ${UI_H} ${UI_MOC} ${ALL_RCC} ${SRC_CU})
 #set the link libraries
-target_link_libraries(IMie ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY})
+target_link_libraries(IMie ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARY})
 #include "globals.h"
+#include <stdlib.h>
 #define PI 3.14159
 double CalculateError(double* E)
@@ -110,6 +110,7 @@ void SaveN(string fileName)
 void SaveSimulation(string fileName)
 {
 	ofstream outFile(fileName.c_str());
+	outFile.precision(10);
 	for(unsigned int i=0; i<SimSpectrum.size(); i++)
 	{
 		outFile<<SimSpectrum[i].nu<<"          ";
 // add the following to a cpp file:
 // PerformanceData PD;
+
 #pragma once
 #include <ostream>
 using namespace std;
@@ -34,17 +35,7 @@ static char PDTypeNames[][255] = {
 		//end my stuff
 };
-
-//-------------------------------------------------------------------------------
-
-//#ifdef DISPLAY
-//	#define PERFORMANCE_DATA_MEASUE_ENABLE
-//#endif
-
-//#ifdef PERFORMANCE_DATA_MEASUE_ENABLE
-
-//-------------------------------------------------------------------------------
-
+#ifdef WIN32
 #include <stdio.h>
 #include <windows.h>
 #include <float.h>
@@ -72,7 +63,7 @@ public:
 		}
 	}
-	void StartTimer( int type ) { QueryPerformanceCounter( &startTime[type] ); /*startTime[type] = GetTickCount();*/ }
+	void StartTimer( int type ) { QueryPerformanceCounter( &startTime[type] );}
 	void EndTimer( int type ) {
 		LARGE_INTEGER endTime;
 		QueryPerformanceCounter( &endTime );
@@ -122,7 +113,7 @@ private:
 };
 //-------------------------------------------------------------------------------
-/*#else	
+#else	
 class PerformanceData{
 public:
@@ -141,7 +132,7 @@ public:
 #endif
 //-------------------------------------------------------------------------------
-*/
+
 extern PerformanceData PD;
 //-------------------------------------------------------------------------------
@@ -3,6 +3,7 @@
 #include <iostream>
 #include <fstream>
 #include "globals.h"
+#include <stdlib.h>
 //#include "cufft.h"
 using namespace std;
@@ -10,9 +11,9 @@ using namespace std;
 typedef complex<double> scComplex;
-int cbessjyva(double v,complex<double> z,double &vm,complex<double>*cjv,
+extern int cbessjyva(double v,complex<double> z,double &vm,complex<double>*cjv,
     complex<double>*cyv,complex<double>*cjvp,complex<double>*cyvp);
-int bessjyv(double v,double x,double &vm,double *jv,double *yv,
+extern int bessjyv(double v,double x,double &vm,double *jv,double *yv,
     double *djv,double *dyv);
 complex<double> Jl_neg(complex<double> x)
@@ -17,7 +17,7 @@ struct SpecPair{
 struct Material{
 	vector<double> nu;
-	vector<complex<double>> eta;
+	vector<complex<double> > eta;
 	string name;
 };
@@ -27,7 +27,7 @@ enum OpticsType {TransmissionOpticsType, ReflectionOpticsType};
 extern PerformanceData PD;
-extern vector<vector<SpecPair>> RefSpectrum;
+extern vector<vector<SpecPair> > RefSpectrum;
 extern int currentSpec;
 extern vector<SpecPair> SimSpectrum;
@@ -134,7 +134,7 @@ public slots:
 		SimulateSpectrum();
 		UpdateDisplay();
 	}
-	void on_radDisplayIntensity_clicked(bool b){
+	void on_radDisplayIntensity_toggled(bool b){
 		dispSimType = IntensitySpecType;
 		SimulateSpectrum();
 		UpdateDisplay();
@@ -214,6 +214,8 @@ public slots:
 	void on_radReflectionOptics_clicked(bool d){
 		ui.spinCondNAi->setEnabled(false);
 		ui.spinCondNAo->setEnabled(false);
+		ui.radDisplayAbsorbance->setEnabled(false);
+		ui.radDisplayIntensity->setChecked(true);
 		opticsMode = ReflectionOpticsType;
 		SimulateSpectrum();
 		UpdateDisplay();
@@ -357,7 +357,7 @@
       <double>-9999.000000000000000</double>
      </property>
      <property name="maximum">
-      <double>3.000000000000000</double>
+      <double>9999.000000000000000</double>
      </property>
      <property name="singleStep">
       <double>0.100000000000000</double>
@@ -379,7 +379,7 @@
       <number>1</number>
      </property>
      <property name="maximum">
-      <number>4000</number>
+      <number>100000</number>
      </property>
      <property name="singleStep">
       <number>10</number>
@@ -7,13 +7,13 @@ using namespace std;
 #include "rtsGUIConsole.h"
 #include "PerformanceData.h"
 #include <complex>
-#include <direct.h>
+//#include <direct.h>
 PerformanceData PD;
 qtSpectrumDisplay* gpSpectrumDisplay;
-vector<vector<SpecPair>> RefSpectrum;
+vector<vector<SpecPair> > RefSpectrum;
 vector<SpecPair> SimSpectrum;
 vector<SpecPair> EtaK;
 vector<SpecPair> EtaN;
@@ -254,15 +254,23 @@ void SetMaterial()
 	int nSamples = MaterialList[currentMaterial].eta.size();
 	double nu;
 	SpecPair temp;
+
+	//initialize the current nuMin and nuMax values
+	nuMin = MaterialList[currentMaterial].nu[0];
+	nuMax = nuMin;
 	for(int i=0; i<nSamples; i++){
 		nu = MaterialList[currentMaterial].nu[i];
-		if(nu >= nuMin && nu <= nuMax){
+		//if(nu >= nuMin && nu <= nuMax){
+
+		//update the min and max values for display
+		if(nu < nuMin) nuMin = nu;
+		if(nu > nuMax) nuMax = nu;
+
 			temp.nu = nu;
 			temp.A = MaterialList[currentMaterial].eta[i].imag();
 			EtaK.push_back(temp);
 			temp.A = MaterialList[currentMaterial].eta[i].real();
 			EtaN.push_back(temp);
-		}
 	}
 	cA = 1.0;
  #include <QtGui>
  #include <QtOpenGL/QtOpenGL>
-#include <gl/GLU.h>
+#include <GL/glu.h>
  #include <math.h>
+#ifdef WIN32
 #include <windows.h>
-
 #include <stdio.h>
-
 #include <fcntl.h>
-
 #include <io.h>
-
 #include <iostream>
-
 #include <fstream>
 #ifndef _USE_OLD_IOSTREAMS
 using namespace std;
-
 #endif
 // maximum mumber of lines the output console should have
 static const WORD MAX_CONSOLE_LINES = 500;
-
 //#ifdef _DEBUG
 void RedirectIOToConsole(int Xpos, int Ypos, int Width, int Height)
-
 {
-
-int hConHandle;
-
-long lStdHandle;
-
-CONSOLE_SCREEN_BUFFER_INFO coninfo;
-
-FILE *fp;
-
-// allocate a console for this app
-
-AllocConsole();
-
-// set the screen buffer to be big enough to let us scroll text
-
-GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &coninfo);
-
-coninfo.dwSize.Y = MAX_CONSOLE_LINES;
-
-SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE),
-
-coninfo.dwSize);
-
-// redirect unbuffered STDOUT to the console
-
-lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
-
-hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
-
-fp = _fdopen( hConHandle, "w" );
-
-*stdout = *fp;
-
-setvbuf( stdout, NULL, _IONBF, 0 );
-
-// redirect unbuffered STDIN to the console
-
-lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE);
-
-hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
-
-fp = _fdopen( hConHandle, "r" );
-
-*stdin = *fp;
-
-setvbuf( stdin, NULL, _IONBF, 0 );
-
-// redirect unbuffered STDERR to the console
-
-lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
-
-hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
-
-fp = _fdopen( hConHandle, "w" );
-
-*stderr = *fp;
-
-setvbuf( stderr, NULL, _IONBF, 0 );
-
-// make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog
-
-// point to console as well
-
-ios::sync_with_stdio();
-
-//position
-
-MoveWindow(GetConsoleWindow(), Xpos, Ypos, Width, Height, true);
-
+	int hConHandle;
+	long lStdHandle;
+	CONSOLE_SCREEN_BUFFER_INFO coninfo;
+	FILE *fp;
+	// allocate a console for this app
+	AllocConsole();
+	// set the screen buffer to be big enough to let us scroll text
+	GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &coninfo);
+	coninfo.dwSize.Y = MAX_CONSOLE_LINES;
+	SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE),
+	coninfo.dwSize);
+	// redirect unbuffered STDOUT to the console
+	lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
+	hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+	fp = _fdopen( hConHandle, "w" );
+	*stdout = *fp;
+	setvbuf( stdout, NULL, _IONBF, 0 );
+	// redirect unbuffered STDIN to the console
+	lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE);
+	hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+	fp = _fdopen( hConHandle, "r" );
+	*stdin = *fp;
+	setvbuf( stdin, NULL, _IONBF, 0 );
+
+	// redirect unbuffered STDERR to the console
+	lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
+	hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+	fp = _fdopen( hConHandle, "w" );
+	*stderr = *fp;
+	setvbuf( stderr, NULL, _IONBF, 0 );
+
+	// make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog
+	// point to console as well
+	ios::sync_with_stdio();
+	//position
+	MoveWindow(GetConsoleWindow(), Xpos, Ypos, Width, Height, true);
 }
-//#endif
+#else
+void RedirectIOToConsole(int Xpos, int Ypos, int Width, int Height)
+{
+}
+#endif
 //End of File
 \ No newline at end of file