oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start moving core frameworks to external libraries

Browse Source
This commit is contained in:
itsmattkc
2023-01-19 09:51:47 -08:00
parent e7982239b8
commit dd9c52ab59
158 changed files with 478 additions and 2484 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/slider/rationalslider.cpp
+4 -5
View File
@@ -20,7 +20,6 @@
#include "rationalslider.h"
#include "common/timecodefunctions.h"
#include "core.h"
#include "widget/menu/menu.h"
#include "widget/menu/menushared.h"
@@ -107,11 +106,11 @@ QString RationalSlider::ValueToString(const QVariant &v) const
switch (display_type_) {
case kTime:
return Timecode::time_to_timecode(r, timebase_, Core::instance()->GetTimecodeDisplay());
return QString::fromStdString(Timecode::time_to_timecode(r, timebase_, Core::instance()->GetTimecodeDisplay()));
case kFloat:
return FloatToString(val, GetDecimalPlaces(), GetAutoTrimDecimalPlaces());
case kRational:
return v.value<rational>().toString();
return QString::fromStdString(v.value<rational>().toString());
}
return v.toString();
@@ -126,7 +125,7 @@ QVariant RationalSlider::StringToValue(const QString &s, bool *ok) const
switch (display_type_) {
case kTime:
{
r = Timecode::timecode_to_time(s, timebase_, Core::instance()->GetTimecodeDisplay(), ok);
r = Timecode::timecode_to_time(s.toStdString(), timebase_, Core::instance()->GetTimecodeDisplay(), ok);
break;
}
case kFloat:
@@ -142,7 +141,7 @@ QVariant RationalSlider::StringToValue(const QString &s, bool *ok) const
break;
}
case kRational:
r = rational::fromString(s, ok);
r = rational::fromString(s.toStdString(), ok);
break;
}