comments

musescore · Jun 9, 2020 · 5bc6443 · 5bc6443
1 parent d7c5a40
commit 5bc6443
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 18 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -278,10 +278,8 @@ void Score::endCmd(const bool isCmdFromInspector, bool rollback)
     }
 
     update(false);
-    if (Album::scoreInActiveAlbum(this->masterScore())) {
-        std::cout << "worked?" << std::endl;
+    if (Album::scoreInActiveAlbum(this->masterScore())) { // relayout the album score so that this score does not go to the top
         Album::activeAlbum->getDominant()->doLayout();
-        std::cout << "yep" << std::endl;
     }
 
     if (MScore::debugMode) {

diff --git a/libmscore/mscoreview.h b/libmscore/mscoreview.h
@@ -32,8 +32,8 @@ enum class HairpinType : signed char;
 class MuseScoreView
 {
 protected:
-    Score* _score;
-    Score* _drawingScore;
+    Score* _score;          // used for editing the score
+    Score* _drawingScore;   // used for drawing the score
 
 public:
     MuseScoreView() {}

diff --git a/mscore/dragelement.cpp b/mscore/dragelement.cpp
@@ -96,7 +96,7 @@ void ScoreView::doDragElement(QMouseEvent* ev)
     }
 
     _score->update();
-    _drawingScore->doLayout();
+    _drawingScore->doLayout(); // probably redundant
     QVector<QLineF> anchorLines;
 
     for (Element* e : sel.elements()) {
@@ -126,8 +126,8 @@ void ScoreView::doDragElement(QMouseEvent* ev)
         }
     }
     updateGrips();
-    _score->update(); // here
-    _drawingScore->doLayout();
+    _score->update();
+    _drawingScore->doLayout(); // relayout the album score so that this score does not go to the beginning
 }
 
 //---------------------------------------------------------

diff --git a/mscore/events.cpp b/mscore/events.cpp
@@ -1138,7 +1138,6 @@ static const char* stateName(ViewState s)
 
 void ScoreView::seqStopped()
 {
-    std::cout << "seqStopped" << std::endl;
     changeState(ViewState::NORMAL);
 }
 
@@ -1196,7 +1195,6 @@ void ScoreView::changeState(ViewState s)
         endFotoDrag();
         break;
     case ViewState::PLAY:
-        std::cout << "stop play" << std::endl;
         seq->stop();
         break;
     case ViewState::EDIT:

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -2739,7 +2739,6 @@ void MuseScore::askResetOldScorePositions(Score* score)
 
 void MuseScore::setCurrentScoreView(int idx)
 {
-    std::cout << "setting scoreview" << std::endl;
     tab1->blockSignals(ctab != tab1);
     setCurrentView(0, idx);
     tab1->blockSignals(false);
@@ -2769,7 +2768,6 @@ void MuseScore::setCurrentView(int tabIdx, int idx)
 
 void MuseScore::setCurrentScoreView(ScoreView* view)
 {
-    std::cout << "setting scoreview 2" << std::endl;
     cv = view;
     if (cv) {
         ctab = (tab2 && tab2->view() == view) ? tab2 : tab1;

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -215,7 +215,6 @@ ScoreView::ScoreView(QWidget* parent)
 
 void ScoreView::setScore(Score* s)
 {
-    std::cout << "setting score" << std::endl;
     _drawingScore = s;
     if (_score) {
         if (_score->isMaster()) {

diff --git a/mscore/seq.cpp b/mscore/seq.cpp
@@ -210,7 +210,6 @@ Seq::~Seq()
 
 void Seq::setScoreView(ScoreView* v)
 {
-    std::cout << "setScoreView" << std::endl;
     if (oggInit) {
         ov_clear(&vf);
         oggInit = false;
@@ -248,7 +247,6 @@ void Seq::setScoreView(ScoreView* v)
 
 void Seq::setNextScore()
 {
-    std::cout << "next score" << std::endl;
     if (nextMovementIndex < dominantScore->movements()->size()) {
         cs = dominantScore->movements()->at(nextMovementIndex);
         nextMovementIndex++;
@@ -419,7 +417,6 @@ void Seq::start()
 
 void Seq::stop()
 {
-    std::cout << "stop" << std::endl;
     const bool seqStopped = (state == Transport::STOP);
     const bool driverStopped = !_driver || _driver->getState() == Transport::STOP;
     if (seqStopped && driverStopped) {
@@ -456,7 +453,6 @@ void Seq::stop()
 
 void Seq::stopWait()
 {
-    std::cout << "stop wait" << std::endl;
     stop();
     QWaitCondition sleep;
     int idx = 0;
@@ -821,7 +817,6 @@ void Seq::process(unsigned framesPerPeriod, float* buffer)
         }
         // Got a message from JACK Transport panel: Stop
         else if (state == Transport::PLAY && driverState == Transport::STOP) {
-            std::cout << "HERE IT IS" << std::endl;
             setNextScore();
             state = Transport::STOP;
             // Muting all notes