projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give the text tool a name for the tooltip and 'state' menu. Let's call it... "Text...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
time.cpp
diff --git
a/synfig-core/trunk/src/synfig/time.cpp
b/synfig-core/trunk/src/synfig/time.cpp
index
b751e8e
..
062b82a
100644
(file)
--- a/
synfig-core/trunk/src/synfig/time.cpp
+++ b/
synfig-core/trunk/src/synfig/time.cpp
@@
-6,7
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** Copyright (c) 2007
, 2008
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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-204,18
+204,29
@@
Time::get_string(float fps, Time::Format format)const
return strprintf("%02d:%02d:%02d",hour,minute,second);
}
return strprintf("%02d:%02d:%02d",hour,minute,second);
}
+ if (format <= FORMAT_FRAMES)
+ {
+ if (fps && fps>0)
+ return strprintf("%df", round_to_int(time * fps));
+ else
+ return strprintf("%ds", round_to_int(time * 1));
+ }
+
String ret;
bool started = false;
if(format<=FORMAT_FULL || hour)
{
String ret;
bool started = false;
if(format<=FORMAT_FULL || hour)
{
- ret+=strprintf(
format<=FORMAT_NOSPACES?"%dh":"%dh
",hour);
+ ret+=strprintf(
"%dh
",hour);
started = true;
}
if(format<=FORMAT_FULL || minute)
{
started = true;
}
if(format<=FORMAT_FULL || minute)
{
- ret+=strprintf(format<=FORMAT_NOSPACES?"%dm":"%dm ",minute);
+ if (!(format<=FORMAT_NOSPACES) && started)
+ ret += " ";
+
+ ret += strprintf("%dm", minute);
started = true;
}
started = true;
}
@@
-225,18
+236,25
@@
Time::get_string(float fps, Time::Format format)const
float frame;
second=time;time-=second;
frame=time*fps;
float frame;
second=time;time-=second;
frame=time*fps;
+
if(format<=FORMAT_FULL || second)
{
if(format<=FORMAT_FULL || second)
{
- ret+=strprintf(format<=FORMAT_NOSPACES?"%ds":"%ds ",(int)second);
+ if (!(format<=FORMAT_NOSPACES) && started)
+ ret += " ";
+
+ ret += strprintf("%ds", (int)second);
started = true;
}
if(format<=FORMAT_FULL || frame || !started)
{
started = true;
}
if(format<=FORMAT_FULL || frame || !started)
{
- if(abs(frame-floor(frame)>=epsilon_()))
- ret+=strprintf("%0.3ff",frame);
+ if (!(format<=FORMAT_NOSPACES) && started)
+ ret += " ";
+
+ if(abs(frame-floor(frame) >= epsilon_()))
+ ret += strprintf("%0.3ff", frame);
else
else
- ret
+=strprintf("%0.0ff",
frame);
+ ret
+= strprintf("%0.0ff",
frame);
}
}
else
}
}
else
@@
-245,13
+263,17
@@
Time::get_string(float fps, Time::Format format)const
second=time;
if(format<=FORMAT_FULL || second || !started)
{
second=time;
if(format<=FORMAT_FULL || second || !started)
{
+ if (!(format<=FORMAT_NOSPACES) && started)
+ ret += " ";
+
if(abs(second-floor(second))>=epsilon_())
{
String seconds(strprintf("%0.8f",second));
// skip trailing zeros
int count = 0;
if(abs(second-floor(second))>=epsilon_())
{
String seconds(strprintf("%0.8f",second));
// skip trailing zeros
int count = 0;
- for (String::reverse_iterator i = seconds.rbegin(); (*i) == '0'; i++)
+ String::reverse_iterator i = seconds.rbegin();
+ for ( ; (*i) == '0'; i++)
count++;
// if we removed too many, go back one place, leaving one zero
count++;
// if we removed too many, go back one place, leaving one zero