- Basic key-signature has been added to tempo, time

-signature and location markers map. (EXPERIMENTAL)
rncbc · Dec 5, 2019 · 4e3e2fc · 4e3e2fc
1 parent a61b6f3
commit 4e3e2fc
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,9 @@ ChangeLog
 
 GIT HEAD
 
+- Basic key-signature has been added to tempo, time
+  -signature and location markers map. (EXPERIMENTAL)
+
 - MIDI Clip editor (aka. piano-roll) horizontal and
   vertical splitter sizes, widths and heights resp.
   are now preserved as user preferences and also to

diff --git a/src/qtractorMidiEditTime.cpp b/src/qtractorMidiEditTime.cpp
@@ -231,17 +231,17 @@ void qtractorMidiEditTime::updatePixmap ( int cx, int /*cy*/)
 	while (pMarker) {
 		x = pTimeScale->pixelFromFrame(pMarker->frame) - dx + 4;
 		if (x > w) break;
-		if (!pMarker->text.isEmpty()) {
-			painter.setPen(pMarker->color);
-			painter.drawText(x, y2, pMarker->text);
-			x += fm.horizontalAdvance(pMarker->text) + 4;
-		}
 		if (pMarker->accidentals || pMarker->minor) {
 			const QString& sKeySignature
 				= qtractorTimeScale::keySignatureName(
 					pMarker->accidentals, pMarker->minor);
 			painter.setPen(Qt::darkGray);
 			painter.drawText(x, y2, sKeySignature);
+			x += fm.horizontalAdvance(sKeySignature) + 4;
+		}
+		if (!pMarker->text.isEmpty()) {
+			painter.setPen(pMarker->color);
+			painter.drawText(x, y2, pMarker->text);
 		}
 		pMarker = pMarker->next();
 	}

diff --git a/src/qtractorTimeScaleForm.cpp b/src/qtractorTimeScaleForm.cpp
@@ -247,9 +247,9 @@ qtractorTimeScaleForm::qtractorTimeScaleForm (
 	QObject::connect(m_ui.KeySignatureAccidentalsComboBox,
 		SIGNAL(activated(int)),
 		SLOT(changed()));
-	QObject::connect(m_ui.KeySignatureModeComboBox,
+	QObject::connect(m_ui.KeySignatureMinorComboBox,
 		SIGNAL(activated(int)),
-		SLOT(modeChanged(int)));
+		SLOT(minorChanged(int)));
 
 	QObject::connect(m_ui.MarkerTextLineEdit,
 		SIGNAL(textChanged(const QString&)),
@@ -469,9 +469,9 @@ void qtractorTimeScaleForm::setCurrentKeySignature (
 	updateKeySignatures(iAccidentals, bMinor);
 
 	const bool bBlockSignals
-		= m_ui.KeySignatureModeComboBox->blockSignals(true);
-	m_ui.KeySignatureModeComboBox->setCurrentIndex(bMinor ? 1 : 0);
-	m_ui.KeySignatureModeComboBox->blockSignals(bBlockSignals);
+		= m_ui.KeySignatureMinorComboBox->blockSignals(true);
+	m_ui.KeySignatureMinorComboBox->setCurrentIndex(bMinor ? 1 : 0);
+	m_ui.KeySignatureMinorComboBox->blockSignals(bBlockSignals);
 }
 
 
@@ -488,6 +488,7 @@ void qtractorTimeScaleForm::updateKeySignatures (
 		= m_ui.KeySignatureAccidentalsComboBox->blockSignals(true);
 
 	m_ui.KeySignatureAccidentalsComboBox->clear();
+
 	int iIndex = 0;
 	for (int iData = -9; 9 >= iData; ++iData) {
 		m_ui.KeySignatureAccidentalsComboBox->addItem(
@@ -637,7 +638,7 @@ unsigned int qtractorTimeScaleForm::flags (void) const
 		= m_ui.KeySignatureAccidentalsComboBox->currentIndex();
 	if (iIndex >= 0)
 		iAccidentals = m_ui.KeySignatureAccidentalsComboBox->itemData(iIndex).toInt();
-	const bool bMinor = (m_ui.KeySignatureModeComboBox->currentIndex() > 0);
+	const bool bMinor = (m_ui.KeySignatureMinorComboBox->currentIndex() > 0);
 
 	if (pMarker && pMarker->frame == iFrame) {
 		if (!sMarkerText.isEmpty())
@@ -706,7 +707,7 @@ void qtractorTimeScaleForm::addItem (void)
 		const int iIndex = m_ui.KeySignatureAccidentalsComboBox->currentIndex();
 		if (iIndex >= 0)
 			iAccidentals = m_ui.KeySignatureAccidentalsComboBox->itemData(iIndex).toInt();
-		const bool bMinor = (m_ui.KeySignatureModeComboBox->currentIndex() > 0);
+		const bool bMinor = (m_ui.KeySignatureMinorComboBox->currentIndex() > 0);
 		if (iAccidentals || bMinor) {
 			pSession->execute(
 				new qtractorTimeScaleAddKeySignatureCommand(
@@ -771,7 +772,7 @@ void qtractorTimeScaleForm::updateItem (void)
 			const int iIndex = m_ui.KeySignatureAccidentalsComboBox->currentIndex();
 			if (iIndex >= 0)
 				iAccidentals = m_ui.KeySignatureAccidentalsComboBox->itemData(iIndex).toInt();
-			const bool bMinor = (m_ui.KeySignatureModeComboBox->currentIndex() > 0);
+			const bool bMinor = (m_ui.KeySignatureMinorComboBox->currentIndex() > 0);
 			pSession->execute(
 				new qtractorTimeScaleUpdateKeySignatureCommand(
 					m_pTimeScale, iFrame, iAccidentals, bMinor));
@@ -946,18 +947,22 @@ void qtractorTimeScaleForm::tempoChanged (void)
 
 
 // Key signature has changed.
-void qtractorTimeScaleForm::modeChanged ( int iMode )
+void qtractorTimeScaleForm::minorChanged ( int iMinor )
 {
 	if (m_iDirtySetup > 0)
 		return;
 
+#ifdef CONFIG_DEBUG
+	qDebug("qtractorTimeScaleForm::minorChanged(%d)", iMinor);
+#endif
+
 	int iAccidentals = 0;
 	const int iIndex
 		= m_ui.KeySignatureAccidentalsComboBox->currentIndex();
 	if (iIndex >= 0)
 		iAccidentals = m_ui.KeySignatureAccidentalsComboBox->itemData(iIndex).toInt();
 
-	updateKeySignatures(iAccidentals, iMode > 0);
+	updateKeySignatures(iAccidentals, (iMinor > 0));
 
 	changed();
 }

diff --git a/src/qtractorTimeScaleForm.h b/src/qtractorTimeScaleForm.h
@@ -69,7 +69,7 @@ protected slots:
 	void barChanged(int);
 	void timeChanged(unsigned long);
 	void tempoChanged();
-	void modeChanged(int);
+	void minorChanged(int);
 	void changed();
 
 	void tempoTap();

diff --git a/src/qtractorTimeScaleForm.ui b/src/qtractorTimeScaleForm.ui
@@ -260,7 +260,7 @@
         </widget>
        </item>
        <item row="5" column="4" colspan="2">
-        <widget class="QComboBox" name="KeySignatureModeComboBox">
+        <widget class="QComboBox" name="KeySignatureMinorComboBox">
          <property name="toolTip">
           <string>Key signature (mode)</string>
          </property>
@@ -502,7 +502,7 @@
   <tabstop>TempoSpinBox</tabstop>
   <tabstop>TempoTapPushButton</tabstop>
   <tabstop>KeySignatureAccidentalsComboBox</tabstop>
-  <tabstop>KeySignatureModeComboBox</tabstop>
+  <tabstop>KeySignatureMinorComboBox</tabstop>
   <tabstop>MarkerTextLineEdit</tabstop>
   <tabstop>MarkerColorToolButton</tabstop>
   <tabstop>TempoFactorSpinBox</tabstop>

diff --git a/src/qtractorTrackTime.cpp b/src/qtractorTrackTime.cpp
@@ -168,17 +168,17 @@ void qtractorTrackTime::updatePixmap ( int cx, int /* cy */)
 	while (pMarker) {
 		x = pTimeScale->pixelFromFrame(pMarker->frame) - cx + 4;
 		if (x > w) break;
-		if (!pMarker->text.isEmpty()) {
-			painter.setPen(pMarker->color);
-			painter.drawText(x, y2, pMarker->text);
-			x += fm.horizontalAdvance(pMarker->text) + 4;
-		}
 		if (pMarker->accidentals || pMarker->minor) {
 			const QString& sKeySignature
 				= qtractorTimeScale::keySignatureName(
 					pMarker->accidentals, pMarker->minor);
 			painter.setPen(Qt::darkGray);
 			painter.drawText(x, y2, sKeySignature);
+			x += fm.horizontalAdvance(sKeySignature) + 4;
+		}
+		if (!pMarker->text.isEmpty()) {
+			painter.setPen(pMarker->color);
+			painter.drawText(x, y2, pMarker->text);
 		}
 		pMarker = pMarker->next();
 	}