Skip to content

Additional minor fixes #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 2 commits into from
Jan 14, 2019
Merged

Additional minor fixes #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9977df3
Refactor DisplayMode enum for consistency
benis Jan 13, 2019
5ba36de
Return const QString for invalid duration value
benis Jan 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/preferences/dialog/dlgprefdeck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,26 +83,26 @@ DlgPrefDeck::DlgPrefDeck(QWidget * parent, MixxxMainWindow * mixxx,
// If not present in the config, set the default value
if (!m_pConfig->exists(ConfigKey("[Controls]","PositionDisplay"))) {
m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"),
QString::number(static_cast<int>(TrackTime::DisplayMode::Remaining)));
QString::number(static_cast<int>(TrackTime::DisplayMode::REMAINING)));
}

double positionDisplayType = m_pConfig->getValue(
ConfigKey("[Controls]", "PositionDisplay"),
static_cast<double>(TrackTime::DisplayMode::Elapsed));
static_cast<double>(TrackTime::DisplayMode::ELAPSED));
if (positionDisplayType ==
static_cast<double>(TrackTime::DisplayMode::Remaining)) {
static_cast<double>(TrackTime::DisplayMode::REMAINING)) {
radioButtonRemaining->setChecked(true);
m_pControlTrackTimeDisplay->set(
static_cast<double>(TrackTime::DisplayMode::Remaining));
static_cast<double>(TrackTime::DisplayMode::REMAINING));
} else if (positionDisplayType ==
static_cast<double>(TrackTime::DisplayMode::ElapsedAndRemaining)) {
static_cast<double>(TrackTime::DisplayMode::ELAPSED_AND_REMAINING)) {
radioButtonElapsedAndRemaining->setChecked(true);
m_pControlTrackTimeDisplay->set(
static_cast<double>(TrackTime::DisplayMode::ElapsedAndRemaining));
static_cast<double>(TrackTime::DisplayMode::ELAPSED_AND_REMAINING));
} else {
radioButtonElapsed->setChecked(true);
m_pControlTrackTimeDisplay->set(
static_cast<double>(TrackTime::DisplayMode::Elapsed));
static_cast<double>(TrackTime::DisplayMode::ELAPSED));
}
connect(buttonGroupTrackTime, SIGNAL(buttonClicked(QAbstractButton*)),
this, SLOT(slotSetTrackTimeDisplay(QAbstractButton *)));
Expand Down Expand Up @@ -493,20 +493,20 @@ void DlgPrefDeck::slotJumpToCueOnTrackLoadCheckbox(bool checked) {

void DlgPrefDeck::slotSetTrackTimeDisplay(QAbstractButton* b) {
if (b == radioButtonRemaining) {
m_timeDisplayMode = TrackTime::DisplayMode::Remaining;
m_timeDisplayMode = TrackTime::DisplayMode::REMAINING;
} else if (b == radioButtonElapsedAndRemaining) {
m_timeDisplayMode = TrackTime::DisplayMode::ElapsedAndRemaining;
m_timeDisplayMode = TrackTime::DisplayMode::ELAPSED_AND_REMAINING;
} else {
m_timeDisplayMode = TrackTime::DisplayMode::Elapsed;
m_timeDisplayMode = TrackTime::DisplayMode::ELAPSED;
}
}

void DlgPrefDeck::slotSetTrackTimeDisplay(double v) {
m_timeDisplayMode = static_cast<TrackTime::DisplayMode>(static_cast<int>(v));
m_pConfig->set(ConfigKey("[Controls]","PositionDisplay"), ConfigValue(v));
if (m_timeDisplayMode == TrackTime::DisplayMode::Remaining) {
if (m_timeDisplayMode == TrackTime::DisplayMode::REMAINING) {
radioButtonRemaining->setChecked(true);
} else if (m_timeDisplayMode == TrackTime::DisplayMode::ElapsedAndRemaining) {
} else if (m_timeDisplayMode == TrackTime::DisplayMode::ELAPSED_AND_REMAINING) {
radioButtonElapsedAndRemaining->setChecked(true);
} else { // Elapsed
radioButtonElapsed->setChecked(true);
Expand Down
6 changes: 3 additions & 3 deletions src/preferences/dialog/dlgprefdeck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class ControlObject;

namespace TrackTime {
enum class DisplayMode {
Elapsed,
Remaining,
ElapsedAndRemaining,
ELAPSED,
REMAINING,
ELAPSED_AND_REMAINING,
};

enum class DisplayFormat {
Expand Down
9 changes: 5 additions & 4 deletions src/util/duration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ static const qint64 kSecondsPerDay = 24 * kSecondsPerHour;
} // namespace

// static
const QString DurationBase::kInvalidDurationString = "?";
// Unicode for thin space
QChar DurationBase::kKiloGroupSeparator = QChar(0x2009);
// Unicode for bottom left corner
Expand All @@ -29,7 +30,7 @@ QChar DurationBase::kDecimalSeparator = QChar(0x002E);
QString DurationBase::formatTime(double dSeconds, Precision precision) {
if (dSeconds < 0.0) {
// negative durations are not supported
return "?";
return kInvalidDurationString;
}

const qint64 days = static_cast<qint64>(std::floor(dSeconds)) / kSecondsPerDay;
Expand Down Expand Up @@ -61,7 +62,7 @@ QString DurationBase::formatTime(double dSeconds, Precision precision) {
QString DurationBase::formatSeconds(double dSeconds, Precision precision) {
if (dSeconds < 0.0) {
// negative durations are not supported
return "?";
return kInvalidDurationString;
}

QString durationString;
Expand All @@ -81,7 +82,7 @@ QString DurationBase::formatSeconds(double dSeconds, Precision precision) {
QString DurationBase::formatKiloSeconds(double dSeconds, Precision precision) {
if (dSeconds < 0.0) {
// negative durations are not supported
return "?";
return kInvalidDurationString;
}

int kilos = (int)dSeconds / 1000;
Expand All @@ -108,7 +109,7 @@ QString DurationBase::formatKiloSeconds(double dSeconds, Precision precision) {
QString DurationBase::formatHectoSeconds(double dSeconds, Precision precision) {
if (dSeconds < 0.0) {
// negative durations are not supported
return "?";
return kInvalidDurationString;
}

int hectos = (int)dSeconds / 100;
Expand Down
2 changes: 2 additions & 0 deletions src/util/duration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace mixxx {
class DurationBase {

public:

enum Units {
SECONDS,
MILLIS,
Expand Down Expand Up @@ -89,6 +90,7 @@ class DurationBase {
static constexpr qint64 kNanosPerSecond = kMicrosPerSecond * 1000;
static constexpr qint64 kNanosPerMilli = kNanosPerSecond / 1000;
static constexpr qint64 kNanosPerMicro = kNanosPerMilli / 1000;
static const QString kInvalidDurationString;
static QChar kKiloGroupSeparator;
static QChar kHectoGroupSeparator;
static QChar kDecimalSeparator;
Expand Down
24 changes: 12 additions & 12 deletions src/widget/wnumberpos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ void WNumberPos::mousePressEvent(QMouseEvent* pEvent) {

if (leftClick) {
// Cycle through display modes
if (m_displayMode == TrackTime::DisplayMode::Elapsed) {
m_displayMode = TrackTime::DisplayMode::Remaining;
} else if (m_displayMode == TrackTime::DisplayMode::Remaining) {
m_displayMode = TrackTime::DisplayMode::ElapsedAndRemaining;
} else if (m_displayMode == TrackTime::DisplayMode::ElapsedAndRemaining) {
m_displayMode = TrackTime::DisplayMode::Elapsed;
if (m_displayMode == TrackTime::DisplayMode::ELAPSED) {
m_displayMode = TrackTime::DisplayMode::REMAINING;
} else if (m_displayMode == TrackTime::DisplayMode::REMAINING) {
m_displayMode = TrackTime::DisplayMode::ELAPSED_AND_REMAINING;
} else if (m_displayMode == TrackTime::DisplayMode::ELAPSED_AND_REMAINING) {
m_displayMode = TrackTime::DisplayMode::ELAPSED;
}

m_pShowTrackTimeRemaining->set(static_cast<double>(m_displayMode));
Expand Down Expand Up @@ -76,15 +76,15 @@ void WNumberPos::slotSetTimeElapsed(double dTimeElapsed) {
precision = mixxx::Duration::Precision::SECONDS;
}

if (m_displayMode == TrackTime::DisplayMode::Elapsed) {
if (m_displayMode == TrackTime::DisplayMode::ELAPSED) {
if (dTimeElapsed >= 0.0) {
setText(timeFormat(dTimeElapsed, precision));
} else {
setText(QLatin1String("-") % timeFormat(-dTimeElapsed, precision));
}
} else if (m_displayMode == TrackTime::DisplayMode::Remaining) {
} else if (m_displayMode == TrackTime::DisplayMode::REMAINING) {
setText(QLatin1String("-") % timeFormat(dTimeRemaining, precision));
} else if (m_displayMode == TrackTime::DisplayMode::ElapsedAndRemaining) {
} else if (m_displayMode == TrackTime::DisplayMode::ELAPSED_AND_REMAINING) {
if (dTimeElapsed >= 0.0) {
setText(timeFormat(dTimeElapsed, precision)
% QLatin1String(" -") % timeFormat(dTimeRemaining, precision));
Expand All @@ -109,11 +109,11 @@ void WNumberPos::slotTimeRemainingUpdated(double dTimeRemaining) {

void WNumberPos::slotSetDisplayMode(double remain) {
if (remain == 1.0) {
m_displayMode = TrackTime::DisplayMode::Remaining;
m_displayMode = TrackTime::DisplayMode::REMAINING;
} else if (remain == 2.0) {
m_displayMode = TrackTime::DisplayMode::ElapsedAndRemaining;
m_displayMode = TrackTime::DisplayMode::ELAPSED_AND_REMAINING;
} else {
m_displayMode = TrackTime::DisplayMode::Elapsed;
m_displayMode = TrackTime::DisplayMode::ELAPSED;
}

slotSetTimeElapsed(m_dOldTimeElapsed);
Expand Down