Skip to content

Commit

Permalink
SED-ML L1V4: updated the way we keep track of a curve's line's settin…
Browse files Browse the repository at this point in the history 
…gs (opencor#2053).
  • Loading branch information
@agarny
agarny committed Oct 3, 2019
1 parent b26329c commit 6444d6f
Show file tree
Hide file tree
Showing 16 changed files with 332 additions and 51 deletions.
22 changes: 18 additions & 4 deletions models/tests/sedml/noble_1962_V_iK.sedml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<xAxis type="linear"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<curve id="curve1_1" style="style1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -205,7 +205,7 @@
<xAxis type="log10"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<curve id="curve2_1" style="style2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -267,7 +267,7 @@
<xAxis type="linear"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<curve id="curve3_1" style="style3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -329,7 +329,7 @@
<xAxis type="log10"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<curve id="curve4_1" style="style4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -351,4 +351,18 @@
</listOfCurves>
</plot2D>
</listOfOutputs>
<listOfStyles>
<style id="style1_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style2_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style3_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style4_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
</listOfStyles>
</sedML>
22 changes: 18 additions & 4 deletions models/tests/sedml/noble_1962_V_time.sedml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<xAxis type="linear"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<curve id="curve1_1" style="style1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -205,7 +205,7 @@
<xAxis type="log10"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<curve id="curve2_1" style="style2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -267,7 +267,7 @@
<xAxis type="linear"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<curve id="curve3_1" style="style3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -329,7 +329,7 @@
<xAxis type="log10"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<curve id="curve4_1" style="style4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -351,4 +351,18 @@
</listOfCurves>
</plot2D>
</listOfOutputs>
<listOfStyles>
<style id="style1_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style2_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style3_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style4_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
</listOfStyles>
</sedML>
22 changes: 18 additions & 4 deletions models/tests/sedml/noble_1962_gL_time.sedml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<xAxis type="linear"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<curve id="curve1_1" style="style1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -205,7 +205,7 @@
<xAxis type="log10"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<curve id="curve2_1" style="style2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -267,7 +267,7 @@
<xAxis type="linear"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<curve id="curve3_1" style="style3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -329,7 +329,7 @@
<xAxis type="log10"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<curve id="curve4_1" style="style4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -351,4 +351,18 @@
</listOfCurves>
</plot2D>
</listOfOutputs>
<listOfStyles>
<style id="style1_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style2_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style3_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style4_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
</listOfStyles>
</sedML>
22 changes: 18 additions & 4 deletions models/tests/sedml/noble_1962_iK_V.sedml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<xAxis type="linear"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<curve id="curve1_1" style="style1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -205,7 +205,7 @@
<xAxis type="log10"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<curve id="curve2_1" style="style2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -267,7 +267,7 @@
<xAxis type="linear"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<curve id="curve3_1" style="style3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -329,7 +329,7 @@
<xAxis type="log10"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<curve id="curve4_1" style="style4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -351,4 +351,18 @@
</listOfCurves>
</plot2D>
</listOfOutputs>
<listOfStyles>
<style id="style1_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style2_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style3_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style4_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
</listOfStyles>
</sedML>
22 changes: 18 additions & 4 deletions models/tests/sedml/noble_1962_iK_time.sedml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<xAxis type="linear"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<curve id="curve1_1" style="style1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -205,7 +205,7 @@
<xAxis type="log10"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<curve id="curve2_1" style="style2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -267,7 +267,7 @@
<xAxis type="linear"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<curve id="curve3_1" style="style3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -329,7 +329,7 @@
<xAxis type="log10"/>
<yAxis type="log10"/>
<listOfCurves>
<curve id="curve4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<curve id="curve4_1" style="style4_1" type="points" xDataReference="xDataGenerator4_1" yDataReference="yDataGenerator4_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -351,4 +351,18 @@
</listOfCurves>
</plot2D>
</listOfOutputs>
<listOfStyles>
<style id="style1_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style2_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style3_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
<style id="style4_1">
<line color="0072BD" style="solid" thickness="2"/>
</style>
</listOfStyles>
</sedML>
37 changes: 30 additions & 7 deletions models/tests/sedml/noble_1962_local.sedml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
<xAxis type="linear"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve1_1" name="V" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<curve id="curve1_1" name="V" style="style1_1" type="points" xDataReference="xDataGenerator1_1" yDataReference="yDataGenerator1_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -253,7 +253,7 @@
<xAxis type="linear"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve2_1" name="Sodium" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<curve id="curve2_1" name="Sodium" style="style2_1" type="points" xDataReference="xDataGenerator2_1" yDataReference="yDataGenerator2_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -272,7 +272,7 @@
</properties>
</annotation>
</curve>
<curve id="curve2_2" name="Potassium" type="points" xDataReference="xDataGenerator2_2" yDataReference="yDataGenerator2_2">
<curve id="curve2_2" name="Potassium" style="style2_2" type="points" xDataReference="xDataGenerator2_2" yDataReference="yDataGenerator2_2">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -291,7 +291,7 @@
</properties>
</annotation>
</curve>
<curve id="curve2_3" name="Leak" type="points" xDataReference="xDataGenerator2_3" yDataReference="yDataGenerator2_3">
<curve id="curve2_3" name="Leak" style="style2_3" type="points" xDataReference="xDataGenerator2_3" yDataReference="yDataGenerator2_3">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand Down Expand Up @@ -353,7 +353,7 @@
<xAxis type="linear"/>
<yAxis type="linear"/>
<listOfCurves>
<curve id="curve3_1" name="m" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<curve id="curve3_1" name="m" style="style3_1" type="points" xDataReference="xDataGenerator3_1" yDataReference="yDataGenerator3_1">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -372,7 +372,7 @@
</properties>
</annotation>
</curve>
<curve id="curve3_2" name="h" type="points" xDataReference="xDataGenerator3_2" yDataReference="yDataGenerator3_2">
<curve id="curve3_2" name="h" style="style3_2" type="points" xDataReference="xDataGenerator3_2" yDataReference="yDataGenerator3_2">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -391,7 +391,7 @@
</properties>
</annotation>
</curve>
<curve id="curve3_3" name="n" type="points" xDataReference="xDataGenerator3_3" yDataReference="yDataGenerator3_3">
<curve id="curve3_3" name="n" style="style3_3" type="points" xDataReference="xDataGenerator3_3" yDataReference="yDataGenerator3_3">
<annotation>
<properties xmlns="http://www.opencor.ws/">
<selected>true</selected>
Expand All @@ -413,4 +413,27 @@
</listOfCurves>
</plot2D>
</listOfOutputs>
<listOfStyles>
<style id="style1_1">
<line color="000080" style="solid" thickness="3"/>
</style>
<style id="style2_1">
<line color="108001" style="dot" thickness="1"/>
</style>
<style id="style2_2">
<line color="108001" style="dot" thickness="1"/>
</style>
<style id="style2_3">
<line color="108001" style="dot" thickness="1"/>
</style>
<style id="style3_1">
<line color="800002" style="dot" thickness="1"/>
</style>
<style id="style3_2">
<line color="800002" style="dot" thickness="1"/>
</style>
<style id="style3_3">
<line color="800002" style="dot" thickness="1"/>
</style>
</listOfStyles>
</sedML>
Loading

0 comments on commit 6444d6f

Please # to comment.