Skip to content

Commit

Permalink
Update to use latest SBMLNetwork and libsbml.
Browse files Browse the repository at this point in the history
With fixes to those libraries, things seem to...work?
  • Loading branch information
luciansmith committed Nov 23, 2024
1 parent 832edf2 commit c2e4079
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
libroadrunner_deps_owner: [ "sys-bio" ]
libroadrunner_deps_repo: [ "libroadrunner-deps" ]
libroadrunner_deps_name: [ "libroadrunner-deps" ]
libroadrunner_deps_release_version: [ "v2.2.10" ]
libroadrunner_deps_release_version: [ "v2.2.11" ]
python_version: [ "3.12" ]

runs-on: ${{ matrix.platform.os_name }}
Expand Down
7 changes: 3 additions & 4 deletions src/module-sbml.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#include "module.h"
#include "sbml/Model.h"
#include <sbmlnetwork/libsbmlnetwork_sbmldocument.h>
#include <sbmlnetwork/libsbmlnetwork_sbmldocument_helpers.h>
#include <sbmlnetwork/libsbmlnetwork_sbmldocument_layout.h>
#include <sbmlnetwork/libsbmlnetwork_sbmldocument_render.h>
#include <sbmlnetwork/libsbmlnetwork_render_helpers.h>
#include <sbmlnetwork/libsbmlnetwork_layout_helpers.h>
#include "sbmlnetwork/colors/libsbmlnetwork_colors.h"
#include "sbmlnetwork/styles/libsbmlnetwork_styles.h"
#include "sbmlnetwork/features/colors/libsbmlnetwork_colors.h"
#include "sbmlnetwork/features/styles/libsbmlnetwork_styles.h"
#include "sbml/packages/layout/extension/LayoutModelPlugin.h"

using namespace libsbml;
Expand Down Expand Up @@ -2455,7 +2454,7 @@ void Module::CreateSBMLModel(bool comp)
if (m_autolayout.use) {
LIBSBMLNETWORK_CPP_NAMESPACE::autorender(&m_sbml, m_autolayout.maxNumConnectedEdges);
//For some reason, the following line is REQUIRED; otherwise I get linking errors(!) about how 'autolayout' is missing. WTF?? LS DEBUG
LIBSBMLNETWORK_CPP_NAMESPACE::getSBMLObject(&m_sbml, "S1");
//LIBSBMLNETWORK_CPP_NAMESPACE::getSBMLObject(&m_sbml, "S1");
if (m_layout.width != 0) {
LIBSBMLNETWORK_CPP_NAMESPACE::setDimensionWidth(&m_sbml, m_layout.width);
}
Expand Down
2 changes: 1 addition & 1 deletion src/sbmlx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "registry.h"
#include "typex.h"
#include <sbmlnetwork/libsbmlnetwork_render_helpers.h>
#include <sbmlnetwork/colors/libsbmlnetwork_colors.h>
#include <sbmlnetwork/features/colors/libsbmlnetwork_colors.h>

using namespace std;
using namespace libsbml;
Expand Down

0 comments on commit c2e4079

Please sign in to comment.