diff --git a/util/grid/grid2.hpp b/util/grid/grid2.hpp index 7da3812..9d9b8d2 100644 --- a/util/grid/grid2.hpp +++ b/util/grid/grid2.hpp @@ -1120,23 +1120,23 @@ public: else if (ctemp < minTemp) minTemp = ctemp; } } - + std::cout << "max temp: " << maxTemp << " min temp: " << minTemp << std::endl; // std::cout << "getTempAsFrame() middle" << std::endl; - std::vector rgbaBuffer; - rgbaBuffer.reserve(tempBuffer.size() * 4); + std::vector rgbaBuffer(width*height*4, 0); for (const auto& [v2, temp] : tempBuffer) { - size_t index = (v2.y + v2.y) * 4; - double atemp = static_cast((((temp-minTemp) * 100) / (maxTemp-minTemp)) * 255); + size_t index = (v2.y * width + v2.y) * 4; + uint8_t atemp = static_cast((((temp-minTemp) * 100) / (maxTemp-minTemp)) * 255); rgbaBuffer[index] = atemp; rgbaBuffer[index+1] = atemp; rgbaBuffer[index+2] = atemp; - rgbaBuffer[index+3] = 1.0; + rgbaBuffer[index+3] = 255; } + std::cout << "rgba buffer is " << rgbaBuffer.size() << std::endl; frame result = frame(res.x,res.y, frame::colormap::RGBA); result.setData(rgbaBuffer); - return result; updatingView = false; + return result; } }; diff --git a/util/output/bmpwriter.hpp b/util/output/bmpwriter.hpp index adf4e45..e4ff39f 100644 --- a/util/output/bmpwriter.hpp +++ b/util/output/bmpwriter.hpp @@ -150,6 +150,7 @@ public: } else if (frame.colorFormat == frame::colormap::RGBA) { std::cout << "found incorrect colormap. converting from RGBA" << std::endl; std::vector fdata = convertRGBAtoRGB(frame.getData()); + std::cout << "source data: " << frame.getData().size() << " out data: " << fdata.size() << std::endl; return saveBMP(filename, fdata, frame.getWidth(), frame.getHeight()); } else { diff --git a/util/output/frame.hpp b/util/output/frame.hpp index 5d16b65..8253e23 100644 --- a/util/output/frame.hpp +++ b/util/output/frame.hpp @@ -76,7 +76,7 @@ public: _compressedData.shrink_to_fit(); overheadmap.clear(); sourceSize = data.size(); - + std::cout << "wrote " << data.size() << " as frame" << std::endl; } const std::vector& getData() const {