Score Diffing / Basic Version Control

classic Classic list List threaded Threaded
9 messages Options
Reply | Threaded
Open this post in threaded view
|

Score Diffing / Basic Version Control

Igneous01
Hi, I am a former student that wrote a lot of C++, I wrote a few applications surrounding notation and music theory. I was wondering if anyone is working/planning to work on Score Diffing?

I have a basic scope and specs for creating this, using musicXML and dtl (https://github.com/cubicdaiya/dtl) to match the differences and render them.

I'm wondering how portable is the score window / view and it's components? A simple read only view of two scores side by side with color coding differences would be sufficient enough for myself to create. If it could be launched as a separate executable that would be good as well, as it could be used in tandem with tortoise svn or similar to store revision history.

I've already pulled the code and finished majority of setup, and bookmarked a few spots in the code that will probably be of interest to me, just wondering if there's other classes I should look at as well.
Reply | Threaded
Open this post in threaded view
|

Score Diffing / Basic Version Control

Igneous01

Hi, I am a former student that wrote a lot of C++, I wrote a few applications surrounding notation and music theory and am composer. I was wondering if anyone is working/planning to work on Score Diffing? 

I have a basic scope and specs for creating this, using musicXML and dtl (https://github.com/cubicdaiya/dtl) to match the differences and render them. 

I'm wondering how portable is the score window / view and it's components? A simple read only view of two scores side by side with color coding differences would be sufficient enough for myself to create. If it could be launched as a separate executable that would be good as well, as it could be used in tandem with tortoise svn or similar to store revision history. 

I've already pulled the code and finished majority of setup, and bookmarked a few spots in the code that will probably be of interest to me, just wondering if there's other classes I should look at as well.


------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer
Reply | Threaded
Open this post in threaded view
|

Re: Score Diffing / Basic Version Control

lasconic
Administrator
Hi Dave,

I'm not aware of anybody working on a score diff tool in MuseScore right now.

MuseScore currently include diff_match_patch in thirdparty/diff https://code.google.com/p/google-diff-match-patch/ 
I believe it was included to be used in a diff for MuseScore but it didn't happen. No problem using DTL instead if you think it's more suitable.

There have been several requests or tries for a diff tool in MuseScore. See 

There are a couple of papers and tools trying to do this. You might want to read/try


>>> *I'm wondering how portable is the score window / view and it's components?*

You will not only need the ScoreView but also the MusicXML loading process etc... So I don't think it's a good idea to do it this way. It would make more sense to have a compare view in MuseScore itself. The user could load a file, then go to Edit > Compare and load a second one to display them in a diff mode.

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer
Reply | Threaded
Open this post in threaded view
|

Re: Score Diffing / Basic Version Control

Igneous01

Thanks lasconic, appreciate the info.


I've been having problems compiling MuseScore on windows; it looks like it compiles fine but the linker errors out.




I had a look at the nightly build status on github and it looks as though the windows build has been failing for several weeks.




From: lasconic [via MuseScore Developer] <ml-node+[hidden email]>
Sent: December 8, 2016 3:43 AM
To: Igneous01
Subject: Re: Score Diffing / Basic Version Control
 
Hi Dave,

I'm not aware of anybody working on a score diff tool in MuseScore right now.

MuseScore currently include diff_match_patch in thirdparty/diff https://code.google.com/p/google-diff-match-patch/ 
I believe it was included to be used in a diff for MuseScore but it didn't happen. No problem using DTL instead if you think it's more suitable.

There have been several requests or tries for a diff tool in MuseScore. See 

There are a couple of papers and tools trying to do this. You might want to read/try


>>> *I'm wondering how portable is the score window / view and it's components?*

You will not only need the ScoreView but also the MusicXML loading process etc... So I don't think it's a good idea to do it this way. It would make more sense to have a compare view in MuseScore itself. The user could load a file, then go to Edit > Compare and load a second one to display them in a diff mode.

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer



If you reply to this email, your message will be added to the discussion below:
http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580053.html
To unsubscribe from Score Diffing / Basic Version Control, click here.
NAML
Reply | Threaded
Open this post in threaded view
|

Re: Score Diffing / Basic Version Control

Igneous01
In reply to this post by lasconic

I attached the build log.




From: Dave R <[hidden email]>
Sent: December 10, 2016 2:33 PM
To: lasconic [via MuseScore Developer]
Subject: Re: Score Diffing / Basic Version Control
 

Thanks lasconic, appreciate the info.


I've been having problems compiling MuseScore on windows; it looks like it compiles fine but the linker errors out.




I had a look at the nightly build status on github and it looks as though the windows build has been failing for several weeks.




From: lasconic [via MuseScore Developer] <ml-node+[hidden email]>
Sent: December 8, 2016 3:43 AM
To: Igneous01
Subject: Re: Score Diffing / Basic Version Control
 
Hi Dave,

I'm not aware of anybody working on a score diff tool in MuseScore right now.

MuseScore currently include diff_match_patch in thirdparty/diff https://code.google.com/p/google-diff-match-patch/ 
I believe it was included to be used in a diff for MuseScore but it didn't happen. No problem using DTL instead if you think it's more suitable.

There have been several requests or tries for a diff tool in MuseScore. See 

There are a couple of papers and tools trying to do this. You might want to read/try


>>> *I'm wondering how portable is the score window / view and it's components?*

You will not only need the ScoreView but also the MusicXML loading process etc... So I don't think it's a good idea to do it this way. It would make more sense to have a compare view in MuseScore itself. The user could load a file, then go to Edit > Compare and load a second one to display them in a diff mode.

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer



If you reply to this email, your message will be added to the discussion below:
http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580053.html
To unsubscribe from Score Diffing / Basic Version Control, click here.
NAML

MuseScoreBuild.txt (193K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Score Diffing / Basic Version Control

lasconic
Administrator
Hi,

The windows build is working for weeks now. Not sure where you get the failed status.

The warning "depend.make:1: warning: NUL character seen; rest of line ignored" is weird. Which version of CMake do you use? are you sure you are trying to compile the master branch? What's the last commit on the branch git rev-parse master ?

lasconic

2016-12-10 21:05 GMT+01:00 Igneous01 <[hidden email]>:
I attached the build log.


________________________________
From: Dave R <[hidden email]>
Sent: December 10, 2016 2:33 PM
To: lasconic [via MuseScore Developer]
Subject: Re: Score Diffing / Basic Version Control


Thanks lasconic, appreciate the info.


I've been having problems compiling MuseScore on windows; it looks like it compiles fine but the linker errors out.


[cid:05056200-3884-40f5-a267-d44ceebe970a]


I had a look at the nightly build status on github and it looks as though the windows build has been failing for several weeks.


________________________________
From: lasconic [via MuseScore Developer] <[hidden email]>
Sent: December 8, 2016 3:43 AM
To: Igneous01
Subject: Re: Score Diffing / Basic Version Control

Hi Dave,

I'm not aware of anybody working on a score diff tool in MuseScore right now.

MuseScore currently include diff_match_patch in thirdparty/diff https://code.google.com/p/google-diff-match-patch/
I believe it was included to be used in a diff for MuseScore but it didn't happen. No problem using DTL instead if you think it's more suitable.

There have been several requests or tries for a diff tool in MuseScore. See
* https://musescore.org/en/node/117751
* https://musescore.org/en/node/65476
* https://musescore.org/en/node/96111
* https://musescore.org/en/node/26136

There are a couple of papers and tools trying to do this. You might want to read/try
* http://ismir2007.ismir.net/proceedings/ISMIR2007_p123_knopke.pdf
* http://blog.jdlh.com/en/2016/06/30/comparing-scores/


>>> *I'm wondering how portable is the score window / view and it's components?*

You will not only need the ScoreView but also the MusicXML loading process etc... So I don't think it's a good idea to do it this way. It would make more sense to have a compare view in MuseScore itself. The user could load a file, then go to Edit > Compare and load a second one to display them in a diff mode.

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]</user/SendEmail.jtp?type=node&node=7580053&i=0>
https://lists.sourceforge.net/lists/listinfo/mscore-developer


________________________________
If you reply to this email, your message will be added to the discussion below:
http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580053.html
To unsubscribe from Score Diffing / Basic Version Control, click here<http://dev-list.musescore.org/template/NamlServlet.jtp?macro=unsubscribe_by_code&node=7580049&code=ZGF2aWQuemFsZXdza2lAb3V0bG9vay5jb218NzU4MDA0OXwtNzYzNzYwNzI4>.
NAML<http://dev-list.musescore.org/template/NamlServlet.jtp?macro=macro_viewer&id=instant_html%21nabble%3Aemail.naml&base=nabble.naml.namespaces.BasicNamespace-nabble.view.web.template.NabbleNamespace-nabble.view.web.template.NodeNamespace&breadcrumbs=notify_subscribers%21nabble%3Aemail.naml-instant_emails%21nabble%3Aemail.naml-send_instant_email%21nabble%3Aemail.naml>


pastedImage.png (50K) <http://dev-list.musescore.org/attachment/7580055/0/pastedImage.png>
MuseScoreBuild.txt (193K) <http://dev-list.musescore.org/attachment/7580055/1/MuseScoreBuild.txt>




--
View this message in context: http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580055.html
Sent from the MuseScore Developer mailing list archive at Nabble.com.

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer


------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer
Reply | Threaded
Open this post in threaded view
|

Re: Score Diffing / Basic Version Control

Igneous01

I pulled the latest from master again - compiled just fine.


I think when I grabbed it was commit b502a5d, which failed to build on windows (#13037).


I was looking at the build history and I saw builds 13037 through 13065 were all failing on windows, but probably did not look at the master builds specifically. Now I see almost all the builds have been successful, so perhaps I was looking at the wrong branch or project.




From: lasconic [via MuseScore Developer] <ml-node+[hidden email]>
Sent: December 10, 2016 5:32 PM
To: Igneous01
Subject: Re: Score Diffing / Basic Version Control
 
Hi,

The windows build is working for weeks now. Not sure where you get the failed status.

The warning "depend.make:1: warning: NUL character seen; rest of line ignored" is weird. Which version of CMake do you use? are you sure you are trying to compile the master branch? What's the last commit on the branch git rev-parse master ?

lasconic

2016-12-10 21:05 GMT+01:00 Igneous01 <[hidden email]>:
I attached the build log.


________________________________
From: Dave R <[hidden email]>
Sent: December 10, 2016 2:33 PM
To: lasconic [via MuseScore Developer]
Subject: Re: Score Diffing / Basic Version Control


Thanks lasconic, appreciate the info.


I've been having problems compiling MuseScore on windows; it looks like it compiles fine but the linker errors out.


[cid:05056200-3884-40f5-a267-d44ceebe970a]


I had a look at the nightly build status on github and it looks as though the windows build has been failing for several weeks.


________________________________
From: lasconic [via MuseScore Developer] <[hidden email]>
Sent: December 8, 2016 3:43 AM
To: Igneous01
Subject: Re: Score Diffing / Basic Version Control

Hi Dave,

I'm not aware of anybody working on a score diff tool in MuseScore right now.

MuseScore currently include diff_match_patch in thirdparty/diff https://code.google.com/p/google-diff-match-patch/
I believe it was included to be used in a diff for MuseScore but it didn't happen. No problem using DTL instead if you think it's more suitable.

There have been several requests or tries for a diff tool in MuseScore. See
* https://musescore.org/en/node/117751
* https://musescore.org/en/node/65476
* https://musescore.org/en/node/96111
* https://musescore.org/en/node/26136

There are a couple of papers and tools trying to do this. You might want to read/try
* http://ismir2007.ismir.net/proceedings/ISMIR2007_p123_knopke.pdf
* http://blog.jdlh.com/en/2016/06/30/comparing-scores/


>>> *I'm wondering how portable is the score window / view and it's components?*

You will not only need the ScoreView but also the MusicXML loading process etc... So I don't think it's a good idea to do it this way. It would make more sense to have a compare view in MuseScore itself. The user could load a file, then go to Edit > Compare and load a second one to display them in a diff mode.

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]</user/SendEmail.jtp?type=node&node=7580053&i=0>
https://lists.sourceforge.net/lists/listinfo/mscore-developer


________________________________
If you reply to this email, your message will be added to the discussion below:
http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580053.html
To unsubscribe from Score Diffing / Basic Version Control, click here<http://dev-list.musescore.org/template/NamlServlet.jtp?macro=unsubscribe_by_code&node=7580049&code=ZGF2aWQuemFsZXdza2lAb3V0bG9vay5jb218NzU4MDA0OXwtNzYzNzYwNzI4>.
NAML<http://dev-list.musescore.org/template/NamlServlet.jtp?macro=macro_viewer&id=instant_html%21nabble%3Aemail.naml&base=nabble.naml.namespaces.BasicNamespace-nabble.view.web.template.NabbleNamespace-nabble.view.web.template.NodeNamespace&breadcrumbs=notify_subscribers%21nabble%3Aemail.naml-instant_emails%21nabble%3Aemail.naml-send_instant_email%21nabble%3Aemail.naml>


pastedImage.png (50K) <http://dev-list.musescore.org/attachment/7580055/0/pastedImage.png>
MuseScoreBuild.txt (193K) <http://dev-list.musescore.org/attachment/7580055/1/MuseScoreBuild.txt>




--
View this message in context: http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580055.html
Sent from the MuseScore Developer mailing list archive at Nabble.com.

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer


------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer



If you reply to this email, your message will be added to the discussion below:
http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580056.html
To unsubscribe from Score Diffing / Basic Version Control, click here.
NAML
Reply | Threaded
Open this post in threaded view
|

Re: Score Diffing / Basic Version Control

Igneous01
In reply to this post by lasconic

Hi,


Can someone tell me where the QActions are defined for the menubar and toolbar?


I found a large container called _sc in Shortcuts but I don't see how this ties to the toolbar.


I tried searching actionFull_Screen as an example but could not find anything.




From: Dave R <[hidden email]>
Sent: December 10, 2016 11:43 PM
To: lasconic [via MuseScore Developer]
Subject: Re: Score Diffing / Basic Version Control
 

I pulled the latest from master again - compiled just fine.


I think when I grabbed it was commit b502a5d, which failed to build on windows (#13037).


I was looking at the build history and I saw builds 13037 through 13065 were all failing on windows, but probably did not look at the master builds specifically. Now I see almost all the builds have been successful, so perhaps I was looking at the wrong branch or project.




From: lasconic [via MuseScore Developer] <ml-node+[hidden email]>
Sent: December 10, 2016 5:32 PM
To: Igneous01
Subject: Re: Score Diffing / Basic Version Control
 
Hi,

The windows build is working for weeks now. Not sure where you get the failed status.

The warning "depend.make:1: warning: NUL character seen; rest of line ignored" is weird. Which version of CMake do you use? are you sure you are trying to compile the master branch? What's the last commit on the branch git rev-parse master ?

lasconic

2016-12-10 21:05 GMT+01:00 Igneous01 <[hidden email]>:
I attached the build log.


________________________________
From: Dave R <[hidden email]>
Sent: December 10, 2016 2:33 PM
To: lasconic [via MuseScore Developer]
Subject: Re: Score Diffing / Basic Version Control


Thanks lasconic, appreciate the info.


I've been having problems compiling MuseScore on windows; it looks like it compiles fine but the linker errors out.


[cid:05056200-3884-40f5-a267-d44ceebe970a]


I had a look at the nightly build status on github and it looks as though the windows build has been failing for several weeks.


________________________________
From: lasconic [via MuseScore Developer] <[hidden email]>
Sent: December 8, 2016 3:43 AM
To: Igneous01
Subject: Re: Score Diffing / Basic Version Control

Hi Dave,

I'm not aware of anybody working on a score diff tool in MuseScore right now.

MuseScore currently include diff_match_patch in thirdparty/diff https://code.google.com/p/google-diff-match-patch/
I believe it was included to be used in a diff for MuseScore but it didn't happen. No problem using DTL instead if you think it's more suitable.

There have been several requests or tries for a diff tool in MuseScore. See
* https://musescore.org/en/node/117751
* https://musescore.org/en/node/65476
* https://musescore.org/en/node/96111
* https://musescore.org/en/node/26136

There are a couple of papers and tools trying to do this. You might want to read/try
* http://ismir2007.ismir.net/proceedings/ISMIR2007_p123_knopke.pdf
* http://blog.jdlh.com/en/2016/06/30/comparing-scores/


>>> *I'm wondering how portable is the score window / view and it's components?*

You will not only need the ScoreView but also the MusicXML loading process etc... So I don't think it's a good idea to do it this way. It would make more sense to have a compare view in MuseScore itself. The user could load a file, then go to Edit > Compare and load a second one to display them in a diff mode.

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]</user/SendEmail.jtp?type=node&node=7580053&i=0>
https://lists.sourceforge.net/lists/listinfo/mscore-developer


________________________________
If you reply to this email, your message will be added to the discussion below:
http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580053.html
To unsubscribe from Score Diffing / Basic Version Control, click here<http://dev-list.musescore.org/template/NamlServlet.jtp?macro=unsubscribe_by_code&node=7580049&code=ZGF2aWQuemFsZXdza2lAb3V0bG9vay5jb218NzU4MDA0OXwtNzYzNzYwNzI4>.
NAML<http://dev-list.musescore.org/template/NamlServlet.jtp?macro=macro_viewer&id=instant_html%21nabble%3Aemail.naml&base=nabble.naml.namespaces.BasicNamespace-nabble.view.web.template.NabbleNamespace-nabble.view.web.template.NodeNamespace&breadcrumbs=notify_subscribers%21nabble%3Aemail.naml-instant_emails%21nabble%3Aemail.naml-send_instant_email%21nabble%3Aemail.naml>


pastedImage.png (50K) <http://dev-list.musescore.org/attachment/7580055/0/pastedImage.png>
MuseScoreBuild.txt (193K) <http://dev-list.musescore.org/attachment/7580055/1/MuseScoreBuild.txt>




--
View this message in context: http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580055.html
Sent from the MuseScore Developer mailing list archive at Nabble.com.

------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer


------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer



If you reply to this email, your message will be added to the discussion below:
http://dev-list.musescore.org/Score-Diffing-Basic-Version-Control-tp7580049p7580056.html
To unsubscribe from Score Diffing / Basic Version Control, click here.
NAML
Reply | Threaded
Open this post in threaded view
|

Re: Score Diffing / Basic Version Control

lasconic
Administrator
Hi,

The actions are accessed via getAction("nameOfTheShortcut").
Grep for "fullscreen" to see where this action is accessed and added to the menu or toolbar.
The menus and toolbars are defined in the MuseScore QMainWindow constructor. 

lasconic



------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/intel
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer