Merge branch 'cimg-colormap'

Merging changes to colormap.h. I removed reliance on the Qt library in favor of CImg.

Merge branch 'cimg-colormap'
Merging changes to colormap.h. I removed reliance on the Qt library in favor of CImg.
David Mayerich
2 parents 421219ba 76396b52
Showing 8 changed files with 26 additions and 52 deletions Show diff stats
cpp/colormap.cpp
cuda/threads.h
math/quaternion.h
math/triangle.h
optics/material.h
optics/mirst-1d.cuh
ui/arguments.h
visualization/colormap.h
-#include <qimage.h>
-#include <qcolor.h>
-#include <iostream>
-
-void qt_buffer2image(unsigned char* buffer, std::string filename, unsigned int x_size, unsigned int y_size)
-{
-    //x_size = 256;
-    //y_size = 256;
-	//create an image object
-	QImage image(x_size, y_size, QImage::Format_RGB32);
-	if(image.isNull())
-	{
-        std::cout<<"Error creating QImage."<<std::endl;
-        return;
-    }
-
-	int i;
-	unsigned char r, g, b;
-	unsigned int x, y;
-	for(y=0; y<y_size; y++)
-		for(x=0; x<x_size; x++)
-		{
-			//calculate the 1D index
-			i = y * x_size + x;
-
-			r = buffer[i * 3 + 0];
-			g = buffer[i * 3 + 1];
-			b = buffer[i * 3 + 2];
-
-			//set the image pixel
-			QColor color(r, g, b);
-			image.setPixel(x, y, color.rgb());
-		}
-
-	if(!image.save(filename.c_str()))
-        std::cout<<"Error saving QImage."<<std::endl;
-}
 #include "cuda_runtime.h"
 #include "device_launch_parameters.h"
-#include "rts/cuda/callable.h"
+#include "../cuda/callable.h"
 #ifndef CUDA_THREADS_H
 #define CUDA_THREADS_H
 #ifndef RTS_QUATERNION_H
 #define RTS_QUATERNION_H
-#include "rts/math/matrix.h"
+#include "../math/matrix.h"
 #include "../cuda/callable.h"
 namespace rts{
@@ -2,8 +2,8 @@
 #define RTS_TRIANGLE_H
 //enable CUDA_CALLABLE macro
-#include "rts/cuda/callable.h"
-#include "rts/math/vector.h"
+#include "../cuda/callable.h"
+#include "../math/vector.h"
 #include <iostream>
 namespace rts{
@@ -8,9 +8,9 @@
 #include <complex>
 #include <algorithm>
 #include <sstream>
-#include "rts/math/complex.h"
-#include "rts/math/constants.h"
-#include "rts/math/function.h"
+#include "../math/complex.h"
+#include "../math/constants.h"
+#include "../math/function.h"
 namespace rts{
 #include "../optics/material.h"
 #include "../math/complexfield.cuh"
 #include "../math/constants.h"
-#include "../envi/bil.h"
+//#include "../envi/bil.h"
 #include "cufft.h"
@@ -313,7 +313,7 @@ namespace stim{
         int index(std::string _name)
         {
-        	unsigned int i = find(args.begin(), args.end(), _name) - args.begin();
+        	int i = find(args.begin(), args.end(), _name) - args.begin();
             if(i >= args.size())
                 i = -1;
@@ -3,12 +3,14 @@
 #include <string>
 #include <stdlib.h>
-#include "rts/cuda/error.h"
+#include "../cuda/error.h"
+//saving an image to a file uses the CImg library
+	//this currently throws a lot of "unreachable" warnings (as of GCC 4.8.2, nvcc 6.5.12)
+#include "../../CImg/CImg.h"
-#define BREWER_CTRL_PTS 11
-void qt_buffer2image(unsigned char* buffer, std::string filename, unsigned int x_size, unsigned int y_size);
+#define BREWER_CTRL_PTS 11
 static float  BREWERCP[BREWER_CTRL_PTS*4] = {0.192157f, 0.211765f, 0.584314f, 1.0f,
                                       0.270588f, 0.458824f, 0.705882f, 1.0f,
@@ -28,15 +30,24 @@ texture&lt;float4, cudaTextureType1D&gt; cudaTexBrewer;
 static cudaArray* gpuBrewer;
 #endif
-
-
 namespace rts{
 enum colormapType {cmBrewer, cmGrayscale, cmRainbow};
 static void buffer2image(unsigned char* buffer, std::string filename, unsigned int x_size, unsigned int y_size)
 {
-    qt_buffer2image(buffer, filename, x_size, y_size);
+	unsigned char* non_interleaved = (unsigned char*)malloc(x_size * y_size * 3);
+	unsigned int S = x_size * y_size;
+
+	for(unsigned int i = 0; i < S; i++){
+		non_interleaved[i + 0 * S] = buffer[i * 3 + 0];
+		non_interleaved[i + 1 * S] = buffer[i * 3 + 1];
+		non_interleaved[i + 2 * S] = buffer[i * 3 + 2];
+	}
+
+	//create an image object
+	cimg_library::CImg<unsigned char> image(non_interleaved, x_size, y_size, 1, 3);
+	image.save(filename.c_str());
 }
 #ifdef __CUDACC__