STORM-1253 WIP Time control: the up/down buttons now work consistently across the whole day; time values are snapped to 5 minutes.

2 files changed, 148 insertions, 173 deletions

diff --git a/indra/llui/lltimectrl.cpp b/indra/llui/lltimectrl.cpp
index 88b11d6c0f..9ea1e8815e 100644
--- a/indra/llui/lltimectrl.cpp
+++ b/indra/llui/lltimectrl.cpp
@@ -46,9 +46,13 @@ const U32 MINUTES_MIN = 0;
 const U32 MINUTES_MAX = 59;
 const U32 HOURS_MIN = 1;
 const U32 HOURS_MAX = 12;
+const U32 MINUTES_PER_HOUR = 60;
+const U32 MINUTES_PER_DAY = 24 * MINUTES_PER_HOUR;
+
 
 LLTimeCtrl::Params::Params()
 :	label_width("label_width"),
+	snap_to("snap_to"),
 	allow_text_entry("allow_text_entry", true),
 	text_enabled_color("text_enabled_color"),
 	text_disabled_color("text_disabled_color"),
@@ -61,8 +65,8 @@ LLTimeCtrl::LLTimeCtrl(const LLTimeCtrl::Params& p)
 	mLabelBox(NULL),
 	mTextEnabledColor(p.text_enabled_color()),
 	mTextDisabledColor(p.text_disabled_color()),
-	mHours(HOURS_MIN),
-	mMinutes(MINUTES_MIN)
+	mTime(0),
+	mSnapToMin(5)
 {
 	static LLUICachedControl<S32> spinctrl_spacing ("UISpinctrlSpacing", 0);
 	static LLUICachedControl<S32> spinctrl_btn_width ("UISpinctrlBtnWidth", 0);
@@ -132,60 +136,24 @@ LLTimeCtrl::LLTimeCtrl(const LLTimeCtrl::Params& p)
 
 F32 LLTimeCtrl::getTime24() const
 {
-	return getHours24() + getMinutes() / 60.0f;
+	// 0.0 - 23.99;
+	return mTime / 60.0f;
 }
 
 U32 LLTimeCtrl::getHours24() const
 {
-	U32 h = mHours;
-
-	if (h == 12)
-    {
-        h = 0;
-    }
-
-    if (mCurrentDayPeriod == PM)
-    {
-        h += 12;
-    }
-
-    return h;
+	return (U32) getTime24();
 }
 
 U32 LLTimeCtrl::getMinutes() const
 {
-	return mMinutes;
+	return mTime % MINUTES_PER_HOUR;
 }
 
 void LLTimeCtrl::setTime24(F32 time)
 {
 	time = llclamp(time, 0.0f, 23.99f); // fix out of range values
-
-	U32 h = (U32) time;
-	U32 m = llround((time - h) * 60); // fixes values like 4.99999
-
-	// fix rounding error
-	if (m == 60)
-	{
-		m = 0;
-		++h;
-	}
-
-	mCurrentDayPeriod = (h >= 12 ? PM : AM);
-
-	if (h >= 12)
-	{
-		h -= 12;
-	}
-
-	if (h == 0)
-	{
-		h = 12;
-	}
-
-
-	mHours = h;
-	mMinutes = m;
+	mTime = llround(time * MINUTES_PER_HOUR); // fixes values like 4.99999
 
 	updateText();
 }
@@ -264,197 +232,201 @@ void LLTimeCtrl::onFocusLost()
 
 void LLTimeCtrl::onTextEntry(LLLineEditor* line_editor)
 {
-	LLWString time_str = line_editor->getWText();
-	switch(getEditingPart())
+	std::string time_str = line_editor->getText();
+	U32 h12 = parseHours(getHoursString(time_str));
+	U32 m = parseMinutes(getMinutesString(time_str));
+	bool pm = parseAMPM(getAMPMString(time_str));
+
+	if (h12 == 12)
 	{
-	case HOURS:
-		validateHours(getHoursWString(time_str));
-		break;
-	case MINUTES:
-		validateMinutes(getMinutesWString(time_str));
-		break;
-	default:
-		break;
+		h12 = 0;
 	}
+
+	U32 h24 = pm ? h12 + 12 : h12;
+
+	mTime = h24 * MINUTES_PER_HOUR + m;
 }
 
 bool LLTimeCtrl::isTimeStringValid(const LLWString &wstr)
 {
-	if (!isHoursStringValid(getHoursWString(wstr)) || !isMinutesStringValid(getMinutesWString(wstr)) || !isPMAMStringValid(wstr))
-		return false;
+	std::string str = wstring_to_utf8str(wstr);
 
-	return true;
+	return isHoursStringValid(getHoursString(str)) &&
+		isMinutesStringValid(getMinutesString(str)) &&
+		isPMAMStringValid(getAMPMString(str));
 }
 
-bool LLTimeCtrl::isHoursStringValid(const LLWString& wstr)
+void LLTimeCtrl::increaseMinutes()
 {
-	U32 hours;
-	std::string utf8time = wstring_to_utf8str(wstr);
-	if ((!LLStringUtil::convertToU32(utf8time, hours) || (hours <= HOURS_MAX)) && wstr.length() < 3)
-		return true;
+	mTime = (mTime + mSnapToMin) % MINUTES_PER_DAY - (mTime % mSnapToMin);
+}
 
-	return false;
+void LLTimeCtrl::increaseHours()
+{
+	mTime = (mTime + MINUTES_PER_HOUR) % MINUTES_PER_DAY;
 }
 
-bool LLTimeCtrl::isMinutesStringValid(const LLWString& wstr)
+void LLTimeCtrl::decreaseMinutes()
 {
-	U32 minutes;
-	std::string utf8time = wstring_to_utf8str(wstr);
-	if (!LLStringUtil::convertToU32(utf8time, minutes) || (minutes <= MINUTES_MAX) && wstr.length() < 3)
-		return true;
+	if (mTime < mSnapToMin)
+	{
+		mTime = MINUTES_PER_DAY - mTime;
+	}
 
-	return false;
+	mTime -= (mTime % mSnapToMin) ? mTime % mSnapToMin : mSnapToMin;
 }
 
-void LLTimeCtrl::validateHours(const LLWString& wstr)
+void LLTimeCtrl::decreaseHours()
 {
-	U32 hours;
-	std::string utf8time = wstring_to_utf8str(wstr);
-	if (LLStringUtil::convertToU32(utf8time, hours) && (hours >= HOURS_MIN) && (hours <= HOURS_MAX))
+	if (mTime < MINUTES_PER_HOUR)
 	{
-		mHours = hours;
+		mTime = 23 * MINUTES_PER_HOUR + mTime;
 	}
 	else
 	{
-		mHours = HOURS_MIN;
+		mTime -= MINUTES_PER_HOUR;
 	}
 }
 
-void LLTimeCtrl::validateMinutes(const LLWString& wstr)
+bool LLTimeCtrl::isPM() const
 {
-	U32 minutes;
-	std::string utf8time = wstring_to_utf8str(wstr);
-	if (LLStringUtil::convertToU32(utf8time, minutes) && (minutes >= MINUTES_MIN) && (minutes <= MINUTES_MAX))
+	return mTime >= (MINUTES_PER_DAY / 2);
+}
+
+void LLTimeCtrl::switchDayPeriod()
+{
+	if (isPM())
 	{
-		mMinutes = minutes;
+		mTime -= MINUTES_PER_DAY / 2;
 	}
 	else
 	{
-		mMinutes = MINUTES_MIN;
+		mTime += MINUTES_PER_DAY / 2;
 	}
 }
 
-bool LLTimeCtrl::isPMAMStringValid(const LLWString &wstr)
+void LLTimeCtrl::updateText()
+{
+	U32 h24 = getHours24();
+	U32 m = getMinutes();
+	U32 h12 = h24 > 12 ? h24 - 12 : h24;
+
+	if (h12 == 0)
+		h12 = 12;
+
+	mEditor->setText(llformat("%d:%02d %s", h12, m, isPM() ? "PM":"AM"));
+}
+
+LLTimeCtrl::EEditingPart LLTimeCtrl::getEditingPart()
 {
-	S32 len = wstr.length();
+	S32 cur_pos = mEditor->getCursor();
+	std::string time_str = mEditor->getText();
 
-	bool valid = (wstr[--len] == 'M') && (wstr[--len] == 'P' || wstr[len] == 'A');
+	S32 colon_index = time_str.find_first_of(':');
 
-	return valid;
+	if (cur_pos <= colon_index)
+	{
+		return HOURS;
+	}
+	else if (cur_pos > colon_index && cur_pos <= (S32)(time_str.length() - AMPM_LEN))
+	{
+		return MINUTES;
+	}
+	else if (cur_pos > (S32)(time_str.length() - AMPM_LEN))
+	{
+		return DAYPART;
+	}
+
+	return NONE;
 }
 
-LLWString LLTimeCtrl::getHoursWString(const LLWString& wstr)
+// static
+std::string LLTimeCtrl::getHoursString(const std::string& str)
 {
-	size_t colon_index = wstr.find_first_of(':');
-	LLWString hours_str = wstr.substr(0, colon_index);
+	size_t colon_index = str.find_first_of(':');
+	std::string hours_str = str.substr(0, colon_index);
 
 	return hours_str;
 }
 
-LLWString LLTimeCtrl::getMinutesWString(const LLWString& wstr)
+// static
+std::string LLTimeCtrl::getMinutesString(const std::string& str)
 {
-	size_t colon_index = wstr.find_first_of(':');
+	size_t colon_index = str.find_first_of(':');
 	++colon_index;
 
-	int minutes_len = wstr.length() - colon_index - AMPM_LEN;
-	LLWString minutes_str = wstr.substr(colon_index, minutes_len);
+	int minutes_len = str.length() - colon_index - AMPM_LEN;
+	std::string minutes_str = str.substr(colon_index, minutes_len);
 
 	return minutes_str;
 }
 
-void LLTimeCtrl::increaseMinutes()
+// static
+std::string LLTimeCtrl::getAMPMString(const std::string& str)
 {
-	// *TODO: snap to 5 min
-	if (++mMinutes > MINUTES_MAX)
-	{
-		mMinutes = MINUTES_MIN;
-	}
+	return str.substr(str.size() - 2, 2); // returns last two characters
 }
 
-void LLTimeCtrl::increaseHours()
+// static
+bool LLTimeCtrl::isHoursStringValid(const std::string& str)
 {
-	if (++mHours > HOURS_MAX)
-	{
-		mHours = HOURS_MIN;
-	}
-}
+	U32 hours;
+	if ((!LLStringUtil::convertToU32(str, hours) || (hours <= HOURS_MAX)) && str.length() < 3)
+		return true;
 
-void LLTimeCtrl::decreaseMinutes()
-{
-	// *TODO: snap to 5 min
-	if (mMinutes-- == MINUTES_MIN)
-	{
-		mMinutes = MINUTES_MAX;
-	}
+	return false;
 }
 
-void LLTimeCtrl::decreaseHours()
+// static
+bool LLTimeCtrl::isMinutesStringValid(const std::string& str)
 {
-	if (mHours-- == HOURS_MIN)
-	{
-		mHours = HOURS_MAX;
-		switchDayPeriod();
-	}
+	U32 minutes;
+	if (!LLStringUtil::convertToU32(str, minutes) || (minutes <= MINUTES_MAX) && str.length() < 3)
+		return true;
+
+	return false;
 }
 
-void LLTimeCtrl::switchDayPeriod()
+// static
+bool LLTimeCtrl::isPMAMStringValid(const std::string& str)
 {
-	switch (mCurrentDayPeriod)
-	{
-	case AM:
-		mCurrentDayPeriod = PM;
-		break;
-	case PM:
-		mCurrentDayPeriod = AM;
-		break;
-	}
+	S32 len = str.length();
+
+	bool valid = (str[--len] == 'M') && (str[--len] == 'P' || str[len] == 'A');
+
+	return valid;
 }
 
-void LLTimeCtrl::updateText()
+// static
+U32 LLTimeCtrl::parseHours(const std::string& str)
 {
-	std::stringstream time_buf;
-	time_buf << mHours << ":";
-
-	if (mMinutes < 10)
+	U32 hours;
+	if (LLStringUtil::convertToU32(str, hours) && (hours >= HOURS_MIN) && (hours <= HOURS_MAX))
 	{
-		time_buf << "0";
+		return hours;
 	}
-
-	time_buf << mMinutes;
-	time_buf << " ";
-
-	switch (mCurrentDayPeriod)
+	else
 	{
-	case AM:
-		time_buf << "AM";
-		break;
-	case PM:
-		time_buf << "PM";
-		break;
+		return HOURS_MIN;
 	}
-
-	mEditor->setText(time_buf.str());
 }
 
-LLTimeCtrl::EEditingPart LLTimeCtrl::getEditingPart()
+// static
+U32 LLTimeCtrl::parseMinutes(const std::string& str)
 {
-	S32 cur_pos = mEditor->getCursor();
-	LLWString time_str = mEditor->getWText();
-
-	S32 colon_index = time_str.find_first_of(':');
-
-	if (cur_pos <= colon_index)
-	{
-		return HOURS;
-	}
-	else if (cur_pos > colon_index && cur_pos <= (S32)(time_str.length() - AMPM_LEN))
+	U32 minutes;
+	if (LLStringUtil::convertToU32(str, minutes) && (minutes >= MINUTES_MIN) && (minutes <= MINUTES_MAX))
 	{
-		return MINUTES;
+		return minutes;
 	}
-	else if (cur_pos > (S32)(time_str.length() - AMPM_LEN))
+	else
 	{
-		return DAYPART;
+		return MINUTES_MIN;
 	}
+}
 
-	return NONE;
+// static
+bool LLTimeCtrl::parseAMPM(const std::string& str)
+{
+	return str == "PM";
 }
diff --git a/indra/llui/lltimectrl.h b/indra/llui/lltimectrl.h
index aebc5b6eab..b5f268c76a 100644
--- a/indra/llui/lltimectrl.h
+++ b/indra/llui/lltimectrl.h
@@ -42,6 +42,7 @@ public:
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
 	{
 		Optional<S32> label_width;
+		Optional<S32> snap_to;
 		Optional<bool> allow_text_entry;
 
 		Optional<LLUIColor> text_enabled_color;
@@ -84,32 +85,35 @@ private:
 
 	void	onUpBtn();
 	void	onDownBtn();
-
 	void	onTextEntry(LLLineEditor* line_editor);
 
-	void	validateHours(const LLWString& wstr);
-	void	validateMinutes(const LLWString& wstr);
 	bool	isTimeStringValid(const LLWString& wstr);
 
-	bool	isPMAMStringValid(const LLWString& wstr);
-	bool	isHoursStringValid(const LLWString& wstr);
-	bool 	isMinutesStringValid(const LLWString& wstr);
-
-	LLWString getHoursWString(const LLWString& wstr);
-	LLWString getMinutesWString(const LLWString& wstr);
-
 	void increaseMinutes();
 	void increaseHours();
 
 	void decreaseMinutes();
 	void decreaseHours();
 
+	bool isPM() const;
 	void switchDayPeriod();
 
 	void updateText();
 
 	EEditingPart getEditingPart();
 
+	static std::string getHoursString(const std::string& str);
+	static std::string getMinutesString(const std::string& str);
+	static std::string getAMPMString(const std::string& str);
+
+	static bool isHoursStringValid(const std::string& str);
+	static bool isMinutesStringValid(const std::string& str);
+	static bool isPMAMStringValid(const std::string& str);
+
+	static U32		parseHours(const std::string& str);
+	static U32		parseMinutes(const std::string& str);
+	static bool		parseAMPM(const std::string& str);
+
 	class LLTextBox*	mLabelBox;
 
 	class LLLineEditor*	mEditor;
@@ -119,9 +123,8 @@ private:
 	class LLButton*		mUpBtn;
 	class LLButton*		mDownBtn;
 
-	U32 			mHours;				// 1 - 12
-	U32 			mMinutes;			// 0 - 59
-	EDayPeriod 		mCurrentDayPeriod;	// AM/PM
+	U32				mTime;				// minutes since midnight: 0 - 1439
+	U32				mSnapToMin;			// interval in minutes to snap to
 
 	BOOL			mAllowEdit;
 };