dubey/tview
dubey/tview
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

histogram works, we are basically at a 0.9 release

Browse Source
This commit is contained in:
Tanishq Dubey 2024-06-16 09:51:21 -04:00
parent 301d32474b
commit 0d369de1d7
2 changed files with 125 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
lib/histogram.h
View File

@ -5,90 +5,84 @@
class Histogram {
public:
unsigned int **counts = nullptr;
int width = 0;
int height = 0;
int channels = 0;
unsigned int count[4][256] = {0};
int width;
int height;
int channels;
Histogram();
void Load() {
Histogram(int width, int height, int channels) {
this->width = width;
this->height = height;
this->channels = channels;
}
void Load(uint8_t * image) {
for (int l = 0; l < height * width; l++)
{
count[0][*image++]++;
count[1][*image++]++;
count[2][*image++]++;
count[3][*image++]++;
}
};
void Draw() {
ImGui::InvisibleButton("histogram", ImVec2(512, 256));
};
};
inline void histogram(const int width, const int height, const int channels, const unsigned char* const bits) {
unsigned int count[4][256] = {0};
const unsigned char* ptrCols = bits;
ImGui::InvisibleButton("histogram", ImVec2(512, 256));
for (int l = 0; l < height * width; l++)
{
count[0][*ptrCols++]++;
count[1][*ptrCols++]++;
count[2][*ptrCols++]++;
count[3][*ptrCols++]++;
}
unsigned int maxv = count[0][0];
unsigned int* pCount = &count[0][0];
for (int i = 0; i < 3 * 256; i++, pCount++)
{
maxv = (maxv > *pCount) ? maxv : *pCount;
}
ImDrawList* drawList = ImGui::GetWindowDrawList();
const ImVec2 rmin = ImGui::GetItemRectMin();
const ImVec2 rmax = ImGui::GetItemRectMax();
const ImVec2 size = ImGui::GetItemRectSize();
const float hFactor = size.y / float(maxv);
for (int i = 0; i <= 10; i++)
{
float ax = rmin.x + (size.x / 10.f) * float(i);
float ay = rmin.y + (size.y / 10.f) * float(i);
drawList->AddLine(ImVec2(rmin.x, ay), ImVec2(rmax.x, ay), 0x80808080);
drawList->AddLine(ImVec2(ax, rmin.y), ImVec2(ax, rmax.y), 0x80808080);
}
const float barWidth = (size.x / 256.f);
for (int j = 0; j < 256; j++)
{
// pixel count << 2 + color index(on 2 bits)
uint32_t cols[3] = {(count[0][j] << 2), (count[1][j] << 2) + 1, (count[2][j] << 2) + 2};
if (cols[0] > cols[1])
ImSwap(cols[0], cols[1]);
if (cols[1] > cols[2])
ImSwap(cols[1], cols[2]);
if (cols[0] > cols[1])
ImSwap(cols[0], cols[1]);
float heights[3];
uint32_t colors[3];
uint32_t currentColor = 0xFFFFFFFF;
for (int i = 0; i < 3; i++)
unsigned int maxv = count[0][0];
unsigned int* pCount = &count[0][0];
for (int i = 0; i < 3 * 256; i++, pCount++)
{
heights[i] = rmax.y - (cols[i] >> 2) * hFactor;
colors[i] = currentColor;
currentColor -= 0xFF << ((cols[i] & 3) * 8);
maxv = (maxv > *pCount) ? maxv : *pCount;
}
float currentHeight = rmax.y;
const float left = rmin.x + barWidth * float(j);
const float right = left + barWidth;
for (int i = 0; i < 3; i++)
ImDrawList* drawList = ImGui::GetWindowDrawList();
const ImVec2 rmin = ImGui::GetItemRectMin();
const ImVec2 rmax = ImGui::GetItemRectMax();
const ImVec2 size = ImGui::GetItemRectSize();
const float hFactor = size.y / float(maxv);
for (int i = 0; i <= 10; i++)
{
if (heights[i] >= currentHeight)
float ax = rmin.x + (size.x / 10.f) * float(i);
float ay = rmin.y + (size.y / 10.f) * float(i);
drawList->AddLine(ImVec2(rmin.x, ay), ImVec2(rmax.x, ay), 0x80808080);
drawList->AddLine(ImVec2(ax, rmin.y), ImVec2(ax, rmax.y), 0x80808080);
}
const float barWidth = (size.x / 256.f);
for (int j = 0; j < 256; j++)
{
// pixel count << 2 + color index(on 2 bits)
uint32_t cols[3] = {(count[0][j] << 2), (count[1][j] << 2) + 1, (count[2][j] << 2) + 2};
if (cols[0] > cols[1])
ImSwap(cols[0], cols[1]);
if (cols[1] > cols[2])
ImSwap(cols[1], cols[2]);
if (cols[0] > cols[1])
ImSwap(cols[0], cols[1]);
float heights[3];
uint32_t colors[3];
uint32_t currentColor = 0xFFFFFFFF;
for (int i = 0; i < 3; i++)
{
continue;
heights[i] = rmax.y - (cols[i] >> 2) * hFactor;
colors[i] = currentColor;
currentColor -= 0xFF << ((cols[i] & 3) * 8);
}
float currentHeight = rmax.y;
const float left = rmin.x + barWidth * float(j);
const float right = left + barWidth;
for (int i = 0; i < 3; i++)
{
if (heights[i] >= currentHeight)
{
continue;
}
drawList->AddRectFilled(ImVec2(left, currentHeight), ImVec2(right, heights[i]), colors[i]);
currentHeight = heights[i];
}
drawList->AddRectFilled(ImVec2(left, currentHeight), ImVec2(right, heights[i]), colors[i]);
currentHeight = heights[i];
}
}
}
};
};

78
main.cpp
View File

@ -214,35 +214,35 @@ void RotateImage(Texture t) {
delete[] tempBuffer;
}
Texture LoadTexture(const char * path)
{
Texture LoadImage(const char * path) {
const int channelCount = 4;
int imageFileChannelCount;
int width, height;
image = (uint8_t *)stbi_load(path, &width, &height, &imageFileChannelCount, channelCount);
if (image == NULL)
{
if (image == NULL) {
fprintf(stderr, "%s\nFailed to open %s\n", stbi_failure_reason(), path);
return {nullptr,{0,0}};
}
auto exif = printExifData(path);
Texture t;
t.size = ImVec2((float)width,(float)height);
t.channels = channelCount;
t.exif = exif;
return t;
}
Texture LoadTexture(Texture tin) {
GLenum dataFormat = GL_RGBA;
GLuint textureHandle;
glGenTextures(1, &textureHandle);
glBindTexture(GL_TEXTURE_2D, textureHandle);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, dataFormat, GL_UNSIGNED_BYTE, image);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tin.size.x, tin.size.y, 0, dataFormat, GL_UNSIGNED_BYTE, image);
Texture t;
Texture t = tin;
t.texture = (void*)(uintptr_t)(textureHandle);
t.size = ImVec2((float)width,(float)height);
t.channels = channelCount;
t.exif = exif;
if (t.exif.ImageOrientation == "3") {
RotateImage(t);
@ -271,6 +271,19 @@ const int MAX_ANNOATED_TEXELS = 10000;
// Main code
int main(int argc, char* argv[]) {
Texture t;
try {
auto args = argparse::parse<Args>(argc, argv, true);
t = LoadImage(args.fpath.c_str());
if (t.texture == nullptr) {
std::cerr << "failed load image" << std::endl;
return -1;
}
} catch (const std::runtime_error &e) {
std::cerr << "failed to parse arguments: " << e.what() << std::endl;
return -1;
}
// Setup SDL
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) !=
0) {
@ -283,6 +296,7 @@ int main(int argc, char* argv[]) {
bool AA_ENABLED = true;
bool SHOW_HELP = false;
bool SHOW_EXIF = false;
bool SHOW_HISTOGRAM = false;
int MODE = 0;
// Decide GL+GLSL versions
@ -323,9 +337,17 @@ int main(int argc, char* argv[]) {
SDL_WindowFlags window_flags =
(SDL_WindowFlags)(SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE |
SDL_WINDOW_ALLOW_HIGHDPI);
int wh = 800;
int ww = 1280;
if (t.size.y > t.size.x) {
ww = 500;
wh = 1280;
}
SDL_Window *window =
SDL_CreateWindow("tview", SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED, 1280, 720, window_flags);
SDL_WINDOWPOS_CENTERED, ww, wh, window_flags);
if (window == nullptr) {
printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError());
return -1;
@ -351,16 +373,11 @@ int main(int argc, char* argv[]) {
ImGui_ImplOpenGL3_Init(glsl_version);
ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
Texture t;
auto flags = ImGuiTexInspect::InspectorFlags_FillVertical | ImGuiTexInspect::InspectorFlags_FillHorizontal;
try {
auto args = argparse::parse<Args>(argc, argv, true);
t = LoadTexture(args.fpath.c_str());
} catch (const std::runtime_error &e) {
std::cerr << "failed to parse arguments: " << e.what() << std::endl;
return -1;
}
t = LoadTexture(t);
Histogram histogram = Histogram(t.size.x, t.size.y, t.channels);
histogram.Load(image);
// Main loop
bool done = false;
@ -407,6 +424,9 @@ int main(int argc, char* argv[]) {
case SDL_SCANCODE_E:
SHOW_EXIF = !SHOW_EXIF;
break;
case SDL_SCANCODE_C:
SHOW_HISTOGRAM = !SHOW_HISTOGRAM;
break;
default:
break;
}
@ -514,6 +534,7 @@ int main(int argc, char* argv[]) {
ImGui::Text("\tFloat Values");
ImGui::Separator();
ImGui::Text("h - show help popup");
ImGui::Text("c - toggle color histogram");
ImGui::Text("e - toggle EXIF info");
ImGui::Separator();
ImGui::Text("q - quit");
@ -646,8 +667,23 @@ int main(int argc, char* argv[]) {
ImGui::End();
}
if (SHOW_HISTOGRAM) {
ImGuiWindowClass topmost;
topmost.ClassId = ImHashStr("TopMost");
topmost.ViewportFlagsOverrideSet = ImGuiViewportFlags_TopMost;
ImGui::SetNextWindowClass(&topmost);
ImGui::Begin("Histogram", NULL, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing);
histogram.Draw();
ImGui::Separator();
ImGui::Text("Press c to hide");
ImGui::End();
}
}
// Rendering
ImGui::Render();
glViewport(0, 0, (int)io.DisplaySize.x, (int)io.DisplaySize.y);