Skip to content

a great PCM #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FAMILIAR-project wants to merge 3 commits into
base: master
Choose a base branch
from
Open

a great PCM #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c37074
a great PCM
FAMILIAR-project Dec 3, 2016
4c5e826
Merge remote-tracking branch 'FrancoisMentec/master'
FAMILIAR-project Jan 9, 2017
ee7ce68
basic tries with PCM id
FAMILIAR-project Jan 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@
<script src="/js/Chart.js"></script>

<script>
var editor = new Editor("pcm", "euro2016");

// var editor = new Editor("pcm", "erasmus");
// var editor = new Editor("pcm", "euro2016");
// var editor = new Editor("pcm", "5835ac7b975ad81a4ab7fa80");
var editor = new Editor("pcm", "5756d09a975a3c01a5e5b476");

</script>
</body>
</html>
4 changes: 3 additions & 1 deletion public/js/editorJQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ Editor.prototype.loadPCM = function(pcmID=false){
}

//API url : https://opencompare.org/api/get/
$.get("/pcm/"+this.pcmID, function(data) {
// or relative, local path "/get/"
// I propose to change pcmID as pcmLocation; as such the user can specify an opencompare ID or a local file
$.get("https://opencompare.org/api/get/"+this.pcmID, function(data) {
that.metadata = data.metadata; //Get metadata
that.pcm = pcmApi.loadPCMModelFromString(JSON.stringify(data.pcm)); //Load PCM
//console.log(data);
Expand Down
Loading