Small updates for draw and colors

ModelEngineering · Feb 11, 2025 · 3e10b56 · 3e10b56
1 parent 0e60608
commit 3e10b56
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,10 @@ ctl.__version__
 ```
 
 ## Version History
-* 1.2.4 2/2/2024
+* 1.3.0 2/10/2025
+  * Add draw to API
+  * Change colors for plots to make them more visible
+* 1.2.4 2/2/2025
   * Add colour to requirements
 * 1.2.3 1/21/2025
     * Fix update bug

diff --git a/pyproject.toml b/pyproject.toml
@@ -21,6 +21,7 @@ dependencies = [
     "pylint",
     "python-libsbml",
     "seaborn",
+    "sbmlnetwork",
     "symmathSBML",
     "sympy",
     "tellurium",

diff --git a/requirements.txt b/requirements.txt
@@ -13,7 +13,7 @@ pandas
 pip>20
 pylint
 python-libsbml
-SBMLDiagrams
+sbmlnetwork
 scikit-learn
 seaborn
 statsmodels

diff --git a/src/controlSBML/constants.py b/src/controlSBML/constants.py
@@ -205,7 +205,7 @@ def equals(self, other):
 
 # Plot line colors
 PREDICTED_COLOR = "blue"
-SIMULATED_COLOR = "brown"
+SIMULATED_COLOR = "green"
 INPUT_COLOR = "red"
 
 COMMENT_STR = "//"

diff --git a/src/controlSBML/control_sbml.py b/src/controlSBML/control_sbml.py
@@ -61,6 +61,8 @@
 import control  # type: ignore
 import numpy as np  # type: ignore
 import pandas as pd  # type: ignore
+import sbmlnetwork # type: ignore
+import tempfile  # type: ignore
 from typing import List, Tuple, Optional
 
 SETPOINT = 1
@@ -493,6 +495,17 @@ def plotModel(self,
             util.plotOneTS(ts, **plot_dct)
         return ModelResult(timeseries=ts)
 
+    def draw(self)->sbmlnetwork.SBMLNetwork:
+        """
+        Draws
+        """
+        with tempfile.NamedTemporaryFile(delete=False) as temp_file:
+            temp_file_path = temp_file.name
+            self._roadrunner.exportToSBML(temp_file_path)
+            drawer = sbmlnetwork.load(temp_file_path)
+            drawer.draw()
+        return drawer
+
     def plotStaircaseResponse(self,
                               initial_value:Optional[float]=OPTION_DCT[cn.O_INITIAL_VALUE],
                               final_value:Optional[float]=OPTION_DCT[cn.O_FINAL_VALUE],

diff --git a/tests/test_control_sbml.py b/tests/test_control_sbml.py
@@ -98,6 +98,12 @@ def testPlotModel(self):
         result = self.ctlsb.plotModel(is_plot=IS_PLOT, figsize=FIGSIZE, markers=False)
         self.assertTrue(isinstance(result.timeseries, Timeseries))
 
+    def testDraw(self):
+        if IGNORE_TEST:
+            return
+        ctlsb = CTLSB.copy()
+        ctlsb.draw()
+
     def testPlotStaircaseResponse(self):
         if IGNORE_TEST:
             return

diff --git a/todo.txt b/todo.txt
@@ -1,4 +1,7 @@
 Keep last antimony builder in designs (reconstruct for best design?)
+plotDesign
+  Better colors
+  label y-axis meaningfully
 MISO
 Bugs
   "Stoichiometry matrix does not exist for this model" -- 379