Add relative start time settings option

fvacek · fvacek · commit 1bc7958b16ce · 2024-07-12T22:36:33.000+02:00
diff --git a/src/application.cpp b/src/application.cpp
@@ -108,8 +108,8 @@ void Application::updateRun(int run_id, const QVariant &record)
 
 void Application::setCardInserted(unsigned int siid)
 {
-	if (siid == m_cardRead)
-		return;
+	//if (siid == m_cardRead)
+	//	return;
 	m_cardRead = siid;
 	if (siid > 0) {
 		playAlert(Application::Alert::CardInserted);
diff --git a/src/startlistitemdelegate.cpp b/src/startlistitemdelegate.cpp
@@ -26,7 +26,8 @@ void StartListItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 	int letter_width = line_height / 2;
 	int corridor_status_width = letter_width;
 
-	auto start_time = index.data(StartListModel::Role::StartDateTime).toDateTime();
+	auto start_time_msec = index.data(StartListModel::Role::StartTime).toInt();
+	auto start_date_time = index.data(StartListModel::Role::StartDateTime).toDateTime();
 	auto corridor_time = index.data(StartListModel::Role::CorridorTime).toDateTime();
 
 	constexpr auto CORRIDOR1_COLOR = Qt::red;
@@ -136,7 +137,17 @@ void StartListItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 		painter->setPen(pen);
 		auto rect = option.rect;
 		rect.translate(time_offset, 0);
-		painter->drawText(rect, start_time.toString("hh:mm:ss"));
+		if (m_relativeStartTime) {
+			int min = start_time_msec / 1000 / 60;
+			int sec = start_time_msec / 1000 % 60;
+			painter->drawText(rect, QStringLiteral("%1:%2")
+							  .arg(min, 3, 10, QChar('0'))
+							  .arg(sec, 2, 10, QChar('0'))
+							  );
+		}
+		else {
+			painter->drawText(rect, start_date_time.toString("hh:mm:ss"));
+		}
 	}
 	{
 		auto rect = option.rect;
diff --git a/src/startlistitemdelegate.h b/src/startlistitemdelegate.h
@@ -16,7 +16,10 @@ class StartListItemDelegate : public QStyledItemDelegate
 	StartListItemDelegate(QObject *parent = nullptr);
 	~StartListItemDelegate() override = default;
 public:
+	void setRelativeStartTime(bool on) { m_relativeStartTime = on; }
 	void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+private:
+	bool m_relativeStartTime = false;
 };
 
 #endif // STARTLISTITEMDELEGATE_H
diff --git a/src/startlistmodel.cpp b/src/startlistmodel.cpp
@@ -184,7 +184,7 @@ void StartListModel::updateLocalRecord(int run_id, const QMap<StartListModel::Ro
 						auto corridor_time = val.toDateTime();
 						if (!checkCorridorTime(row, corridor_time)) {
 							emit corridorTimeCheckError();
-							continue;
+							//continue;
 						}
 					}
 					chngmap[colname.value()] = v2;
diff --git a/src/startlistwidget.cpp b/src/startlistwidget.cpp
@@ -40,7 +40,9 @@ StartListWidget::StartListWidget(QWidget *parent) :
 	connect(m_model, &StartListModel::corridorTimeCheckError, []() {
 		Application::instance()->playAlert(Application::Alert::CorridorTimeCheckError);
 	});
-	connect(app, &Application::settingsChanged, this, &StartListWidget::reload);
+	connect(app, &Application::settingsChanged, this, [this]() {
+		reload();
+	});
 	connect(ui->tableView, &StartListTableView::editButtonPressed, this, [this](int run_id) {
 		auto *widget = new RunWidget(m_model);
 		widget->load(run_id);
@@ -106,9 +108,9 @@ void StartListWidget::onCardInserted(unsigned int siid)
 		auto siid2 = m_model->roleValue(row, StartListModel::Role::SiId).toUInt();
 		if (siid == siid2) {
 			auto run_id = m_model->roleValue(row, StartListModel::Role::RunId).toInt();
-			//shvDebug() << "row:" << run_id << "dt:" << corridor_time.toString();
 			QMap<StartListModel::Role, QVariant> record;
 			record.insert(StartListModel::CorridorTime, QDateTime::currentDateTime());
+			//shvDebug() << "row:" << run_id << "record:" << shv::coreqt::rpc::qVariantToPrettyString();
 			m_model->updateLocalRecord(run_id, record);
 			setSelectedRow(row);
 			return;
@@ -124,8 +126,17 @@ void StartListWidget::resizeEvent(QResizeEvent *event)
 	updateHeadersSectionSizes();
 }
 
+void StartListWidget::applySettings()
+{
+	auto ui_settings = UiSettingsPage::loadSettings();
+	auto *delegate = findChild<StartListItemDelegate*>();
+	Q_ASSERT(delegate);
+	delegate->setRelativeStartTime(ui_settings.relativeStartTime);
+}
+
 void StartListWidget::reload()
 {
+	applySettings();
 	auto class_filter = ClassFilterSettingsPage::checkedClasses();
 	QVariantMap param;
 	param["orderBy"] = "runs.startTimeMs";
diff --git a/src/startlistwidget.h b/src/startlistwidget.h
@@ -27,6 +27,7 @@ class StartListWidget : public QWidget
 protected:
 	void resizeEvent(QResizeEvent *event) override;
 private:
+	void applySettings();
 	void reload();
 	void updateHeadersSectionSizes();
 private:
diff --git a/src/uisettingspage.cpp b/src/uisettingspage.cpp
@@ -12,6 +12,7 @@
 
 namespace {
 constexpr auto TOGGLE_CORRIDOR_TIME = "ui/toggleCorridorTime";
+constexpr auto RELATIVE_START_TIME = "ui/relativeStartTime";
 
 constexpr auto SOUND_CARD_INSERTED = "ui/sound/cardInserted";
 constexpr auto SOUND_CARD_NOT_FOUND = "ui/sound/cardNotFound";
@@ -71,6 +72,7 @@ UiSettings UiSettingsPage::loadSettings()
 	//shvInfo() << "soundCorridorTimeError" << settings.value(SOUND_CORRIDOR_TIME_ERROR, SOUND_CORRIDOR_TIME_ERROR_FILE).toString();
 	return UiSettings {
 		.toggleCorridorTime = settings.value(TOGGLE_CORRIDOR_TIME).toBool(),
+		.relativeStartTime = settings.value(RELATIVE_START_TIME).toBool(),
 		.soundCardInserted = settings.value(SOUND_CARD_INSERTED, SOUND_CARD_INSERTED_FILE).toString(),
 		.soundCardNotFound = settings.value(SOUND_CARD_NOT_FOUND, SOUND_CARD_NOT_FOUND_FILE).toString(),
 		.soundCorridorTimeError = settings.value(SOUND_CORRIDOR_TIME_ERROR, SOUND_CORRIDOR_TIME_ERROR_FILE).toString(),
@@ -81,6 +83,7 @@ void UiSettingsPage::load()
 {
 	auto ui_settings = loadSettings();
 	ui->toggleCorridorTime->setChecked(ui_settings.toggleCorridorTime);
+	ui->relativeStartTime->setChecked(ui_settings.relativeStartTime);
 
 	auto set_sound_file = [](QComboBox *lst, const QString &file_name) {
 		if (auto ix = lst->findData(file_name); ix >= 0) {
@@ -99,6 +102,7 @@ void UiSettingsPage::save()
 {
 	QSettings settings;
 	settings.setValue(TOGGLE_CORRIDOR_TIME, ui->toggleCorridorTime->isChecked());
+	settings.setValue(RELATIVE_START_TIME, ui->relativeStartTime->isChecked());
 
 	settings.setValue(SOUND_CARD_INSERTED, ui->lstSoundCardInserted->currentData().toString());
 	settings.setValue(SOUND_CARD_NOT_FOUND, ui->lstSoundCardNotFound->currentData().toString());
diff --git a/src/uisettingspage.h b/src/uisettingspage.h
@@ -6,6 +6,7 @@
 struct UiSettings
 {
 	bool toggleCorridorTime = false;
+	bool relativeStartTime = false;
 	QString soundCardInserted;
 	QString soundCardNotFound;
 	QString soundCorridorTimeError;
diff --git a/src/uisettingspage.ui b/src/uisettingspage.ui
@@ -21,6 +21,13 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="relativeStartTime">
+     <property name="text">
+      <string>Relative start time</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ void StartListModel::updateLocalRecord(int run_id, const QMap<StartListModel::Ro`
`184`	`184`	`auto corridor_time = val.toDateTime();`
`185`	`185`	`if (!checkCorridorTime(row, corridor_time)) {`
`186`	`186`	`emit corridorTimeCheckError();`
`187`		`- continue;`
	`187`	`+ //continue;`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`	`chngmap[colname.value()] = v2;`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`struct UiSettings`
`7`	`7`	`{`
`8`	`8`	`bool toggleCorridorTime = false;`
	`9`	`+ bool relativeStartTime = false;`
`9`	`10`	`QString soundCardInserted;`
`10`	`11`	`QString soundCardNotFound;`
`11`	`12`	`QString soundCorridorTimeError;`