Merge pull request #130 from rism-digital/develop-facsimile-neume-line

Update: Develop facsimile neume line

Author: yinanazhou

src/measure.cpp

@@ -213,16 +213,6 @@ void Measure::AddChildBack(Object *child)
 
 int Measure::GetDrawingX() const
 {
-    /*
-    if (!this->IsMeasuredMusic()) {
-        const System *system = vrv_cast<const System *>(this->GetFirstAncestor(SYSTEM));
-        assert(system);
-        if (system->m_drawingFacsY != VRV_UNSET) {
-            return (system->m_systemLeftMar);
-        }
-    }
-    */
-
     if (m_drawingFacsX1 != VRV_UNSET) return m_drawingFacsX1;
 
     if (m_cachedDrawingX != VRV_UNSET) return m_cachedDrawingX;
@@ -355,19 +345,6 @@ int Measure::GetRightBarLineRight() const
 
 int Measure::GetWidth() const
 {
-    /*
-    if (!this->IsMeasuredMusic()) {
-        const System *system = vrv_cast<const System *>(this->GetFirstAncestor(SYSTEM));
-        assert(system);
-        if (system->m_drawingFacsY != VRV_UNSET) {
-            const Page *page = vrv_cast<const Page *>(system->GetFirstAncestor(PAGE));
-            assert(page);
-            // xAbs2 =  page->m_pageWidth - system->m_systemRightMar;
-            return page->m_pageWidth - system->m_systemLeftMar - system->m_systemRightMar;
-        }
-    }
-    */
-
     if (m_drawingFacsX2 != VRV_UNSET) return (m_drawingFacsX2 - m_drawingFacsX1);
 
     assert(m_measureAligner.GetRightAlignment());

src/view_page.cpp

@@ -1299,7 +1299,7 @@ void View::DrawStaffLines(DeviceContext *dc, Staff *staff, Measure *measure, Sys
             y2 = y1;
         }
         else {
-            y2 = y1 - staff->GetWidth() * tan(staff->GetDrawingRotation() * M_PI / 180.0);
+            y2 = y1 - measure->GetWidth() * tan(staff->GetDrawingRotation() * M_PI / 180.0);
         }
     }