From 5f32c8dc9ef58f548340982496985757fe50f774 Mon Sep 17 00:00:00 2001 From: "Frank T. Bergmann" Date: Tue, 24 Jun 2014 09:13:20 +0200 Subject: [PATCH] - added sensible defaults to example models --- .gitignore | 1 + SpatialUI/spatialmainwidget.cpp | 5 +---- examples/The_Brusselator.xml | 9 +++++++++ examples/The_Brusselator_300x300.xml | 11 ++++++++++- examples/advection.xml | 8 ++++++++ examples/fish.xml | 10 ++++++++++ examples/fish_300x300.xml | 10 ++++++++++ examples/fish_big.xml | 10 ++++++++++ examples/transport.xml | 8 ++++++++ examples/turing.xml | 9 +++++++++ examples/turing_300x300.xml | 9 +++++++++ examples/turing_parameters-stripe.xml | 9 +++++++++ examples/turing_parameters.xml | 9 +++++++++ examples/turing_parameters_50x50.xml | 9 +++++++++ examples/turing_parameters_tiny.xml | 9 +++++++++ examples/turing_uniform.xml | 9 +++++++++ 16 files changed, 130 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ff6c201..f47506d 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,4 @@ pip-log.txt # Mac crap .DS_Store +/examples/private diff --git a/SpatialUI/spatialmainwidget.cpp b/SpatialUI/spatialmainwidget.cpp index 77e8919..d23d05e 100644 --- a/SpatialUI/spatialmainwidget.cpp +++ b/SpatialUI/spatialmainwidget.cpp @@ -9,7 +9,6 @@ #include - #include #include #include @@ -24,7 +23,6 @@ #include - #include #include #include @@ -37,6 +35,7 @@ #include #endif // USE_SBW_INTEGRATION +#define SPATIAL_ANNOTATION_URL "http://fbergmann.github.io/spatial-sbml/settings" using namespace std; @@ -653,8 +652,6 @@ XMLNode* getAnnotationNode(Model* model, const std::string& ns) return NULL; } -#define SPATIAL_ANNOTATION_URL "http://spatial-sbml/settings" - void SpatialMainWindow::initializeDisplay(Model* model) { diff --git a/examples/The_Brusselator.xml b/examples/The_Brusselator.xml index e320707..8ccfe12 100644 --- a/examples/The_Brusselator.xml +++ b/examples/The_Brusselator.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/examples/The_Brusselator_300x300.xml b/examples/The_Brusselator_300x300.xml index 4f90d7f..b491389 100644 --- a/examples/The_Brusselator_300x300.xml +++ b/examples/The_Brusselator_300x300.xml @@ -1,7 +1,16 @@ - + + + + + + + + + + diff --git a/examples/advection.xml b/examples/advection.xml index b843ac0..a82e434 100644 --- a/examples/advection.xml +++ b/examples/advection.xml @@ -2,6 +2,14 @@ + + + + + + + + diff --git a/examples/fish.xml b/examples/fish.xml index c959a9d..c109374 100644 --- a/examples/fish.xml +++ b/examples/fish.xml @@ -1,6 +1,16 @@ + + + + + + + + + + diff --git a/examples/fish_300x300.xml b/examples/fish_300x300.xml index 707b388..97faba9 100644 --- a/examples/fish_300x300.xml +++ b/examples/fish_300x300.xml @@ -1,6 +1,16 @@ + + + + + + + + + + diff --git a/examples/fish_big.xml b/examples/fish_big.xml index f65cb37..c1a5e84 100644 --- a/examples/fish_big.xml +++ b/examples/fish_big.xml @@ -1,6 +1,16 @@ + + + + + + + + + + diff --git a/examples/transport.xml b/examples/transport.xml index de5e99c..f6a239e 100644 --- a/examples/transport.xml +++ b/examples/transport.xml @@ -2,6 +2,14 @@ + + + + + + + + diff --git a/examples/turing.xml b/examples/turing.xml index 6014f8e..f4286dc 100644 --- a/examples/turing.xml +++ b/examples/turing.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/examples/turing_300x300.xml b/examples/turing_300x300.xml index d035014..96112dd 100644 --- a/examples/turing_300x300.xml +++ b/examples/turing_300x300.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/examples/turing_parameters-stripe.xml b/examples/turing_parameters-stripe.xml index 03c6d07..04ca9bf 100644 --- a/examples/turing_parameters-stripe.xml +++ b/examples/turing_parameters-stripe.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/examples/turing_parameters.xml b/examples/turing_parameters.xml index 41e9c32..50d9d6b 100644 --- a/examples/turing_parameters.xml +++ b/examples/turing_parameters.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/examples/turing_parameters_50x50.xml b/examples/turing_parameters_50x50.xml index 9296eb6..aac4736 100644 --- a/examples/turing_parameters_50x50.xml +++ b/examples/turing_parameters_50x50.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/examples/turing_parameters_tiny.xml b/examples/turing_parameters_tiny.xml index c0628aa..1248bc9 100644 --- a/examples/turing_parameters_tiny.xml +++ b/examples/turing_parameters_tiny.xml @@ -1,6 +1,15 @@ + + + + + + + + + diff --git a/examples/turing_uniform.xml b/examples/turing_uniform.xml index 05d0144..5873079 100644 --- a/examples/turing_uniform.xml +++ b/examples/turing_uniform.xml @@ -1,6 +1,15 @@ + + + + + + + + +