Skip to content
Snippets Groups Projects
Commit 654d221f authored by SeeLook's avatar SeeLook
Browse files

implemented navigating throught score notes

parent 7194e5f5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
changes
+ 4
− 1
View file @ 654d221f
1.1.0 alpha
-
- interactive score with staff systems,
- possibility of adding/removing notes to the score
- option for displaying accidentals from key signature near a note
- displaying name below every note on the score
Under the hood
- ported to Qt5
- divided for libraries and external executable files
......
src/score/tmainscore.cpp
+ 120
− 38
View file @ 654d221f
......@@ -62,39 +62,40 @@ TmainScore::TmainScore(QWidget* parent) :
// set preferred clef
setClef(gl->Sclef);
scoreController()->setParent(0);
scoreController()->hide();
layout()->removeWidget(scoreController());
if (gl->SkeySignatureEnabled)
scoreController()->addExtraAccidButton();
connect(scoreController(), SIGNAL(extraAccidsChanged()), this, SLOT(extraAccidsSlot()));
TcornerProxy *accidCorner = new TcornerProxy(scene(), scoreController(), Qt::TopRightCorner);
m_settBar = new QToolBar();
m_outZoomAct = new QAction(QIcon(gl->path + "/picts/zoom-out.png"), "", m_settBar);
m_outZoomAct->setStatusTip(tr("Zoom a score out"));
m_inZoomAct = new QAction(QIcon(gl->path + "/picts/zoom-in.png"), "", m_settBar);
m_inZoomAct->setStatusTip(tr("Zoom a score in"));
m_settBar->addAction(m_outZoomAct);
m_settBar->addAction(m_inZoomAct);
connect(m_outZoomAct, SIGNAL(triggered()), this, SLOT(zoomScoreSlot()));
connect(m_inZoomAct, SIGNAL(triggered()), this, SLOT(zoomScoreSlot()));
TcornerProxy *settCorner = new TcornerProxy(scene(), m_settBar, Qt::BottomRightCorner);
m_clearBar = new QToolBar();
m_clearAct = new QAction(QIcon(gl->path + "picts/clear-score.png"), "", m_clearBar);
m_clearAct->setStatusTip(tr("Delete all notes on the score"));
connect(m_clearAct, SIGNAL(triggered()), this, SLOT(deleteNotes()));
m_clearBar->addAction(m_clearAct);
TcornerProxy *delCorner = new TcornerProxy(scene(), m_clearBar, Qt::BottomLeftCorner);
delCorner->setSpotColor(Qt::red);
m_rhythmBar = new QToolBar();
QLabel *rl = new QLabel("Rhythms<br>not implemented yet", m_rhythmBar);
m_rhythmBar->addWidget(rl);
TcornerProxy *rhythmCorner = new TcornerProxy(scene(), m_rhythmBar, Qt::TopLeftCorner);
rhythmCorner->setSpotColor(Qt::yellow);
createActions();
// scoreController()->setParent(0);
// scoreController()->hide();
// layout()->removeWidget(scoreController());
// if (gl->SkeySignatureEnabled)
// scoreController()->addExtraAccidButton();
// connect(scoreController(), SIGNAL(extraAccidsChanged()), this, SLOT(extraAccidsSlot()));
//
// TcornerProxy *accidCorner = new TcornerProxy(scene(), scoreController(), Qt::TopRightCorner);
//
// m_settBar = new QToolBar();
// m_outZoomAct = new QAction(QIcon(gl->path + "/picts/zoom-out.png"), "", m_settBar);
// m_outZoomAct->setStatusTip(tr("Zoom a score out"));
// m_inZoomAct = new QAction(QIcon(gl->path + "/picts/zoom-in.png"), "", m_settBar);
// m_inZoomAct->setStatusTip(tr("Zoom a score in"));
// m_settBar->addAction(m_outZoomAct);
// m_settBar->addAction(m_inZoomAct);
// connect(m_outZoomAct, SIGNAL(triggered()), this, SLOT(zoomScoreSlot()));
// connect(m_inZoomAct, SIGNAL(triggered()), this, SLOT(zoomScoreSlot()));
// TcornerProxy *settCorner = new TcornerProxy(scene(), m_settBar, Qt::BottomRightCorner);
//
// m_clearBar = new QToolBar();
// m_clearAct = new QAction(QIcon(gl->path + "picts/clear-score.png"), "", m_clearBar);
// m_clearAct->setStatusTip(tr("Delete all notes on the score"));
// connect(m_clearAct, SIGNAL(triggered()), this, SLOT(deleteNotes()));
// m_clearBar->addAction(m_clearAct);
// TcornerProxy *delCorner = new TcornerProxy(scene(), m_clearBar, Qt::BottomLeftCorner);
// delCorner->setSpotColor(Qt::red);
//
// m_rhythmBar = new QToolBar();
// QLabel *rl = new QLabel("Rhythms<br>not implemented yet", m_rhythmBar);
// m_rhythmBar->addWidget(rl);
// TcornerProxy *rhythmCorner = new TcornerProxy(scene(), m_rhythmBar, Qt::TopLeftCorner);
// rhythmCorner->setSpotColor(Qt::yellow);
m_noteName << 0 << 0;
// set note colors
......@@ -735,8 +736,7 @@ void TmainScore::deleteNotes() {
m_currentIndex = 0;
m_clickedOff = 0;
while (m_staves.size() > 1) {
delete m_staves.last();
m_staves.removeLast();
deleteLastStaff();
}
if (staff()->count() > 1) {
QList<TscoreNote*> notesToDel;
......@@ -748,6 +748,28 @@ void TmainScore::deleteNotes() {
}
void TmainScore::navigateScoreSlot() {
int prevIndex = m_currentIndex;
if (sender() == m_firstNoteAct) {
changeCurrentIndex(0);
} else if (sender() == m_lastNoteAct) {
changeCurrentIndex((m_staves.size() - 1) * staff()->maxNoteCount() + m_staves.last()->count() - 1);
} else if (sender() == m_selectPrevAct) {
if (m_currentIndex > 0)
changeCurrentIndex(m_currentIndex - 1);
} else if (sender() == m_selectNextAct) {
if (m_currentIndex < (m_staves.size() - 1) * staff()->maxNoteCount() + m_staves.last()->count() - 1)
changeCurrentIndex(m_currentIndex + 1);
}
if (prevIndex != m_currentIndex) {
emit noteWasChanged(m_currentIndex % staff()->maxNoteCount(),
*currentStaff()->getNote(m_currentIndex % staff()->maxNoteCount()));
if (prevIndex / staff()->maxNoteCount() != m_currentIndex / staff()->maxNoteCount())
score()->centerOn(score()->mapFromScene(currentStaff()->mapToScene(currentStaff()->pos())));
}
}
/*
void TmainScore::strikeBlinkingFinished() {
if (m_strikeOut) {
......@@ -824,9 +846,7 @@ void TmainScore::resizeEvent(QResizeEvent* event) {
} else if (stavesNumber < m_staves.size()) { // or delete unnecessary staves
int stavesToDel = m_staves.size() - stavesNumber;
for (int s = 0; s < stavesToDel; s++) {
delete m_staves.last();
m_staves.removeLast();
qDebug() << "staff deleted";
deleteLastStaff();
}
}
}
......@@ -863,6 +883,61 @@ void TmainScore::performScordatureSet() {
//########################################## PRIVATE #################################################
//####################################################################################################
void TmainScore::createActions() {
scoreController()->setParent(0);
scoreController()->hide();
layout()->removeWidget(scoreController());
if (gl->SkeySignatureEnabled)
scoreController()->addExtraAccidButton();
connect(scoreController(), SIGNAL(extraAccidsChanged()), this, SLOT(extraAccidsSlot()));
TcornerProxy *accidCorner = new TcornerProxy(scene(), scoreController(), Qt::TopRightCorner);
accidCorner->setSpotColor(palette().highlight().color());
m_settBar = new QToolBar();
m_outZoomAct = new QAction(QIcon(gl->path + "/picts/zoom-out.png"), "", m_settBar);
m_outZoomAct->setStatusTip(tr("Zoom a score out"));
connect(m_outZoomAct, SIGNAL(triggered()), this, SLOT(zoomScoreSlot()));
m_inZoomAct = new QAction(QIcon(gl->path + "/picts/zoom-in.png"), "", m_settBar);
m_inZoomAct->setStatusTip(tr("Zoom a score in"));
connect(m_inZoomAct, SIGNAL(triggered()), this, SLOT(zoomScoreSlot()));
m_firstNoteAct = new QAction(QIcon(style()->standardIcon(QStyle::SP_MediaSkipBackward)), "", m_settBar);
m_firstNoteAct->setStatusTip(tr("Go to first note"));
connect(m_firstNoteAct, SIGNAL(triggered()), this, SLOT(navigateScoreSlot()));
m_selectPrevAct = new QAction(QIcon(style()->standardIcon(QStyle::SP_MediaSeekBackward)), "", m_settBar);
m_selectPrevAct->setStatusTip(tr("Go to previous note"));
connect(m_selectPrevAct, SIGNAL(triggered()), this, SLOT(navigateScoreSlot()));
m_selectNextAct = new QAction(QIcon(style()->standardIcon(QStyle::SP_MediaSeekForward)), "", m_settBar);
m_selectNextAct->setStatusTip(tr("Go to next note"));
connect(m_selectNextAct, SIGNAL(triggered()), this, SLOT(navigateScoreSlot()));
m_lastNoteAct = new QAction(QIcon(style()->standardIcon(QStyle::SP_MediaSkipForward)), "", m_settBar);
m_lastNoteAct->setStatusTip(tr("Go to last note"));
connect(m_lastNoteAct, SIGNAL(triggered()), this, SLOT(navigateScoreSlot()));
m_settBar->addAction(m_outZoomAct);
m_settBar->addAction(m_inZoomAct);
m_settBar->addAction(m_firstNoteAct);
m_settBar->addAction(m_selectPrevAct);
m_settBar->addAction(m_selectNextAct);
m_settBar->addAction(m_lastNoteAct);
TcornerProxy *settCorner = new TcornerProxy(scene(), m_settBar, Qt::BottomRightCorner);
m_clearBar = new QToolBar();
m_clearAct = new QAction(QIcon(gl->path + "picts/clear-score.png"), "", m_clearBar);
m_clearAct->setStatusTip(tr("Delete all notes on the score"));
connect(m_clearAct, SIGNAL(triggered()), this, SLOT(deleteNotes()));
m_clearBar->addAction(m_clearAct);
TcornerProxy *delCorner = new TcornerProxy(scene(), m_clearBar, Qt::BottomLeftCorner);
delCorner->setSpotColor(Qt::red);
m_rhythmBar = new QToolBar();
QLabel *rl = new QLabel("Rhythms<br>not implemented yet", m_rhythmBar);
m_rhythmBar->addWidget(rl);
TcornerProxy *rhythmCorner = new TcornerProxy(scene(), m_rhythmBar, Qt::TopLeftCorner);
rhythmCorner->setSpotColor(Qt::yellow);
}
void TmainScore::restoreNotesSettings() {
// if (gl->enharmNotesColor == -1)
// gl->enharmNotesColor = palette().highlight().color();
......@@ -992,6 +1067,13 @@ void TmainScore::addStaff(TscoreStaff* st) {
}
void TmainScore::deleteLastStaff() {
delete m_staves.last();
m_staves.removeLast();
qDebug() << "staff deleted";
}
......
src/score/tmainscore.h
+ 4
− 0
View file @ 654d221f
......@@ -150,6 +150,7 @@ protected slots:
void showNameMenu(TscoreNote* sn);
void menuChangedNote(Tnote n);
void extraAccidsSlot();
void navigateScoreSlot();
private:
void restoreNotesSettings(); /** Sets notes colors according to globals. */
......@@ -164,10 +165,12 @@ private:
* Sets staff number corresponding to its index in the m_staves list,
* connects the staff with TmainScore slots */
void addStaff(TscoreStaff* st = 0);
void deleteLastStaff();
void updateSceneRect(); /** Adjusts score scene to space required by staff(staves) */
void adjustStaffWidth(TscoreStaff *st); /** Calls TscoreStaff::setViewWidth with score width */
void changeCurrentIndex(int newIndex);
void setBarsIconSize();
void createActions();
private:
QList<TscoreStaff*> m_staves; // list of staves in page view
......@@ -184,6 +187,7 @@ private:
EinMode m_inMode;
QToolBar *m_settBar, *m_clearBar, *m_rhythmBar;
QAction *m_inZoomAct, *m_outZoomAct;
QAction *m_selectNextAct, *m_selectPrevAct, *m_firstNoteAct ,*m_lastNoteAct;
QAction *m_clearAct;
/** m_clickedOff indicates whether setNote() is set to m_currentIndex and whether to the next after current */
int m_clickedOff, m_currentIndex;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment