projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 0.61.08
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_bline.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index
ba754f6
..
51afaff
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@
-327,7
+327,7
@@
StateBLine_Context::increment_id()
String str_number;
str_number=String(id,id.size()-digits,id.size());
id=String(id,0,id.size()-digits);
String str_number;
str_number=String(id,id.size()-digits,id.size());
id=String(id,0,id.size()-digits);
- synfig::info("---------------- \"%s\"",str_number.c_str());
+
//
synfig::info("---------------- \"%s\"",str_number.c_str());
number=atoi(str_number.c_str());
}
number=atoi(str_number.c_str());
}
@@
-478,7
+478,7
@@
StateBLine_Context::~StateBLine_Context()
Smach::event_result
StateBLine_Context::event_stop_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateBLine_Context::event_stop_handler(const Smach::event& /*x*/)
{
-
synfig::info("STATE RotoBLine: Received Stop Event");
+
//
synfig::info("STATE RotoBLine: Received Stop Event");
// run();
reset();
// throw Smach::egress_exception();
// run();
reset();
// throw Smach::egress_exception();
@@
-489,7
+489,7
@@
StateBLine_Context::event_stop_handler(const Smach::event& /*x*/)
Smach::event_result
StateBLine_Context::event_refresh_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateBLine_Context::event_refresh_handler(const Smach::event& /*x*/)
{
-
synfig::info("STATE RotoBLine: Received Refresh Event");
+
//
synfig::info("STATE RotoBLine: Received Refresh Event");
refresh_ducks();
return Smach::RESULT_ACCEPT;
}
refresh_ducks();
return Smach::RESULT_ACCEPT;
}
@@
-911,7
+911,7
@@
StateBLine_Context::event_mouse_release_handler(const Smach::event& /*x*/)
Smach::event_result
StateBLine_Context::event_mouse_click_handler(const Smach::event& x)
{
Smach::event_result
StateBLine_Context::event_mouse_click_handler(const Smach::event& x)
{
- synfig::info("STATE BLINE: Received mouse button down Event");
+
//
synfig::info("STATE BLINE: Received mouse button down Event");
const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
switch(event.button)
{
const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
switch(event.button)
{
@@
-1006,7
+1006,7
@@
StateBLine_Context::refresh_ducks(bool button_down)
duck->signal_user_click(2).connect(
sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_vertex_menu),value_node)
);
duck->signal_user_click(2).connect(
sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_vertex_menu),value_node)
);
- duck->set_guid(value_node->get_guid()^GUID::hasher(0));
+ duck->set_guid(value_node->get_guid()^
synfig::
GUID::hasher(0));
get_work_area()->add_duck(duck);
get_work_area()->add_duck(duck);
@@
-1017,7
+1017,7
@@
StateBLine_Context::refresh_ducks(bool button_down)
tduck->set_origin(duck);
tduck->set_scalar(-0.33333333333333333);
tduck->set_tangent(true);
tduck->set_origin(duck);
tduck->set_scalar(-0.33333333333333333);
tduck->set_tangent(true);
- tduck->set_guid(value_node->get_guid()^GUID::hasher(3));
+ tduck->set_guid(value_node->get_guid()^
synfig::
GUID::hasher(3));
tduck->signal_edited().connect(
sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_tangent1_change),value_node)
);
tduck->signal_edited().connect(
sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_tangent1_change),value_node)
);
@@
-1080,7
+1080,7
@@
StateBLine_Context::refresh_ducks(bool button_down)
sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_tangent1_change),value_node)
);
}
sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_tangent1_change),value_node)
);
}
- tduck->set_guid(value_node->get_guid()^GUID::hasher(4));
+ tduck->set_guid(value_node->get_guid()^
synfig::
GUID::hasher(4));
tduck->signal_user_click(2).connect(
sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_handle_menu),value_node)
);
tduck->signal_user_click(2).connect(
sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_handle_menu),value_node)
);
@@
-1165,8
+1165,8
@@
StateBLine_Context::refresh_ducks(bool button_down)
//get_work_area()->add_duck(bezier->c2);
get_work_area()->add_bezier(bezier);
//get_work_area()->add_duck(bezier->c2);
get_work_area()->add_bezier(bezier);
- duck->set_guid(GUID());
- tduck->set_guid(GUID());
+ duck->set_guid(
synfig::
GUID());
+ tduck->set_guid(
synfig::
GUID());
next_duck=duck;
}
next_duck=duck;
}