[Rawstudio-commit] r1338 - trunk/src

[Anders Kvist]

Author: akv
Date: 2007-08-09 22:30:59 +0200 (Thu, 09 Aug 2007)
New Revision: 1338

Modified:
   trunk/src/Makefile.am
   trunk/src/gtk-interface.c
   trunk/src/rawstudio.c
   trunk/src/rawstudio.h
   trunk/src/toolbox.c
Log:
Added wb presets from UFraw.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-08-09 20:15:06 UTC (rev 1337)
+++ trunk/src/Makefile.am	2007-08-09 20:30:59 UTC (rev 1338)
@@ -41,6 +41,7 @@
 	rs-image.c rs-image.h \
 	dcraw_api.cc dcraw_api.h \
 	dcraw.cc dcraw.h \
+	wb_presets.c wb_presets.h \
 	rs-jpeg.c rs-jpeg.h \
 	rs-tiff.c rs-tiff.h \
 	color.h \

Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c	2007-08-09 20:15:06 UTC (rev 1337)
+++ trunk/src/gtk-interface.c	2007-08-09 20:30:59 UTC (rev 1338)
@@ -43,6 +43,7 @@
 #include <unistd.h>
 #include "filename.h"
 #include "rs-store.h"
+#include "wb_presets.h"
 
 struct rs_callback_data_t {
 	RS_BLOB *rs;
@@ -177,6 +178,8 @@
 		rs_settings_to_rs_settings_double(rs->settings[rs->current_setting], rs->photo->settings[rs->photo->current_setting]);
 		update_preview(rs, FALSE, FALSE);
 		gui_set_values(rs, -1, -1);
+		// FIXME: only use if wb sliders (not by auto, camera or click-to-wb)
+		// wb_preset_box_set(rs->wb_preset_box[rs->current_setting], 0);
 	}
 	return(FALSE);
 }
@@ -407,6 +410,10 @@
 		g_string_append(window_title, rs->photo->filename);
 		gtk_window_set_title(GTK_WINDOW(rawstudio_window), window_title->str);
 		g_string_free(window_title, TRUE);
+		// FIXME: make has to be cut out of model
+		wb_preset_box_set_make_model(rs->wb_preset_combo_box,
+									 rs->photo->metadata->make_ascii,
+									 rs->photo->metadata->model_ascii);
 	}
 	gui_set_busy(FALSE);
 }
@@ -1247,6 +1254,7 @@
 	gui_set_busy(TRUE);
 	GUI_CATCHUP();
 	gui_status_notify(_("Adjusting to auto white balance"));
+	wb_preset_box_set(rs->wb_preset_combo_box[rs->current_setting], 2); // FIXME: hardcoded
 	rs_set_wb_auto(rs);
 	gui_set_busy(FALSE);
 }
@@ -1260,6 +1268,7 @@
 	else
 	{
 		gui_status_notify(_("Adjusting to camera white balance"));
+		wb_preset_box_set(rs->wb_preset_combo_box[rs->current_setting], 1); // FIXME: hardcoded		
 		rs_set_wb_from_mul(rs, rs->photo->metadata->cam_mul);
 	}
 }

Modified: trunk/src/rawstudio.c
===================================================================
--- trunk/src/rawstudio.c	2007-08-09 20:15:06 UTC (rev 1337)
+++ trunk/src/rawstudio.c	2007-08-09 20:30:59 UTC (rev 1338)
@@ -47,6 +47,7 @@
 #include "rs-batch.h"
 #include "rs-cms.h"
 #include "rs-store.h"
+#include "wb_presets.h"
 
 static void update_scaled(RS_BLOB *rs, gboolean force);
 static gboolean rs_render_idle(RS_BLOB *rs);
@@ -1355,6 +1356,7 @@
 	gdouble warmth, tint;
 	warmth = (b-r)/(r+b); /* r*(1+warmth) = b*(1-warmth) */
 	tint = -g/(r+r*warmth)+2.0; /* magic */
+	wb_preset_box_set(rs->wb_preset_combo_box[rs->current_setting], 0); // FIXME: hardcoded
 	rs_set_wb(rs, warmth, tint);
 	return;
 }

Modified: trunk/src/rawstudio.h
===================================================================
--- trunk/src/rawstudio.h	2007-08-09 20:15:06 UTC (rev 1337)
+++ trunk/src/rawstudio.h	2007-08-09 20:30:59 UTC (rev 1338)
@@ -237,6 +237,7 @@
 	guchar previewtable8[65536];
 	gushort previewtable16[65536];
 	RSStore *store;
+	GtkWidget *wb_preset_combo_box[3];
 } RS_BLOB;
 
 enum {

Modified: trunk/src/toolbox.c
===================================================================
--- trunk/src/toolbox.c	2007-08-09 20:15:06 UTC (rev 1337)
+++ trunk/src/toolbox.c	2007-08-09 20:30:59 UTC (rev 1338)
@@ -25,6 +25,7 @@
 #include "toolbox.h"
 #include "conf_interface.h"
 #include "gettext.h"
+#include "wb_presets.h"
 
 /* used for gui_adj_reset_callback() */
 struct reset_carrier {
@@ -196,11 +197,15 @@
 	GtkWidget *box;
 	GtkWidget *wscale;
 	GtkWidget *tscale;
+	GtkWidget *presets;
 
 	wscale = gui_make_scale_from_adj(rs, G_CALLBACK(update_preview_callback), rs->settings[n]->warmth, MASK_WARMTH);
 	tscale = gui_make_scale_from_adj(rs, G_CALLBACK(update_preview_callback), rs->settings[n]->tint, MASK_TINT);
-
+	// FIXME: needs to set preset wb box to Manual if scales are changed manually...not automaticly!
+	presets = wb_preset_box_new(rs, n);
+	
 	box = gtk_vbox_new (FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (box), presets, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box), wscale, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box), tscale, FALSE, FALSE, 0);
 	return(gui_box(_("Warmth/tint"), box, show));