diff --git a/3rd-party/arbor b/3rd-party/arbor index 0edf855..d0dc6bd 160000 --- a/3rd-party/arbor +++ b/3rd-party/arbor @@ -1 +1 @@ -Subproject commit 0edf8554843e58fdeffe8240a2282e8b94c76ee4 +Subproject commit d0dc6bd7411030be272b8c092ed5502087546a83 diff --git a/src/gui_state.cpp b/src/gui_state.cpp index 525a858..baf60d7 100644 --- a/src/gui_state.cpp +++ b/src/gui_state.cpp @@ -945,7 +945,7 @@ namespace { for(const auto& [k, v]: item.parameters) { mech.set(k, v); } - decor.paint(rg.data.value(), mech); + decor.paint(rg.data.value(), arb::density{mech}); } } return {state.builder.morph, state.builder.labels, decor}; @@ -1062,8 +1062,8 @@ void gui_state::deserialize(const std::filesystem::path& fn) { data.tag = tag; for (const auto& [k, v]: t.envelope) data.envelope.emplace_back(k, v); } - void operator()(const arb::mechanism_desc& t) { log_error("Cannot handle mech."); } - void operator()(const arb::gap_junction_site& t) { log_error("Cannot handle GJ."); } + void operator()(const arb::synapse& t) { log_error("Cannot handle synapse mech."); } + void operator()(const arb::junction& t) { log_error("Cannot handle GJ."); } }; struct rg_visitor { @@ -1104,7 +1104,8 @@ void gui_state::deserialize(const std::filesystem::path& fn) { if (ion == state->ions.end()) log_error("Unknown ion"); state->ion_par_defs[{region, *ion}].Er = t.value; } - void operator()(const arb::mechanism_desc& t) { + void operator()(const arb::density& d) { + const auto& t = d.mech; auto id = state->mechanisms.add(region); auto& data = state->mechanisms[id]; auto cat = t.name();