X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_info.cpp;h=498f3c86c2316e63ee74691df5594a5e35bf382a;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=c827967f32369280f7fd5b38bc7caab76466edc8;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dock_info.cpp b/synfig-studio/trunk/src/gtkmm/dock_info.cpp
index c827967..498f3c8 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_info.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_info.cpp
@@ -2,10 +2,11 @@
 /*!	\file dock_info.cpp
 **	\brief Dock Info File
 **
-**	$Id: dock_info.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -34,6 +35,7 @@
 #include "workarea.h"
 
 #include <synfig/canvas.h>
+#include <synfig/color.h>		// for gamma_in()
 #include <synfig/context.h>
 
 #include <gtkmm/separator.h>
@@ -48,10 +50,6 @@ using namespace etl;
 using namespace synfig;
 
 /* === M A C R O S ========================================================= */
-#define use_colorspace_gamma()	App::use_colorspace_gamma
-#define colorspace_gamma()	(2.2f)
-#define gamma_in(x)		((x>=0)?pow((float)x,1.0f/colorspace_gamma()):-pow((float)-x,1.0f/colorspace_gamma()))
-#define gamma_out(x)	((x>=0)?pow((float)x,colorspace_gamma()):-pow((float)-x,colorspace_gamma()))
 
 /* === G L O B A L S ======================================================= */
 
@@ -64,28 +62,28 @@ using namespace synfig;
 void studio::Dock_Info::on_mouse_move()
 {
 	Point pos = get_canvas_view()->work_area->get_cursor_pos();
-	
-	Distance xv(pos[0],Distance::SYSTEM_UNITS); 
+
+	Distance xv(pos[0],Distance::SYSTEM_UNITS);
 	xv.convert(App::distance_system, get_canvas_view()->get_canvas()->rend_desc());
-	
-	Distance yv(pos[1],Distance::SYSTEM_UNITS); 
+
+	Distance yv(pos[1],Distance::SYSTEM_UNITS);
 	yv.convert(App::distance_system, get_canvas_view()->get_canvas()->rend_desc());
-	
+
 	//get the color and set the labels
-	
-	x.set_text(xv.get_string(3));	
+
+	x.set_text(xv.get_string(3));
 	y.set_text(yv.get_string(3));
-	
+
 	Color c = get_canvas_view()->get_canvas()->get_context().get_color(pos);
 	float cr = c.get_r(),cg = c.get_g(), cb = c.get_b();
-	
+
 	if(use_colorspace_gamma())
 	{
 		cr = gamma_in(cr);
 		cg = gamma_in(cg);
-		cb = gamma_in(cb);		
+		cb = gamma_in(cb);
 	}
-	
+
 	r.set_text(strprintf("%.1f%%",cr*100));
 	g.set_text(strprintf("%.1f%%",cg*100));
 	b.set_text(strprintf("%.1f%%",cb*100));
@@ -96,36 +94,36 @@ studio::Dock_Info::Dock_Info()
 :Dock_CanvasSpecific("info",_("Info"),Gtk::StockID("synfig-info"))
 {
 	set_use_scrolled(false);
-	
+
 	Gtk::Table *table = manage(new Gtk::Table);
-	
+
 	//pos labels
 	table->attach(*manage(new Gtk::Label(_("X: "))),0,1,0,2,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 	table->attach(*manage(new Gtk::Label(_("Y: "))),0,1,2,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
-	
+
 	//pos
 	table->attach(x,1,2,0,2,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 	table->attach(y,1,2,2,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
-	
-	//seperator
+
+	//separator
 	table->attach(*manage(new Gtk::VSeparator),2,3,0,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
-	
+
 	//color label
 	table->attach(*manage(new Gtk::Label(_("R: "))),3,4,0,1,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 	table->attach(*manage(new Gtk::Label(_("G: "))),3,4,1,2,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 	table->attach(*manage(new Gtk::Label(_("B: "))),3,4,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 	table->attach(*manage(new Gtk::Label(_("A: "))),3,4,3,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
-	
+
 	//color
 	table->attach(r,4,5,0,1,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 	table->attach(g,4,5,1,2,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 	table->attach(b,4,5,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
 	table->attach(a,4,5,3,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
-	
+
 	table->attach(*manage(new Gtk::Label),0,5,4,5);
-	
+
 	table->show_all();
-	
+
 	add(*table);
 }
 
@@ -136,7 +134,7 @@ studio::Dock_Info::~Dock_Info()
 void studio::Dock_Info::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view)
 {
 	mousecon.disconnect();
-	
+
 	if(canvas_view && canvas_view->get_work_area())
 	{
 		mousecon = get_canvas_view()->work_area->signal_cursor_moved().connect(sigc::mem_fun(*this,&Dock_Info::on_mouse_move));