diff --git a/pybind11/Finfo.cpp b/pybind11/Finfo.cpp index 68dc72c1b5..5e6a0e40f1 100644 --- a/pybind11/Finfo.cpp +++ b/pybind11/Finfo.cpp @@ -183,6 +183,7 @@ py::cpp_function __Finfo__::getDestFinfoSetterFunc2(const ObjId& oid, } } + if(ftype1 == "Id") { if(ftype2 == "Id") { std::function func = [oid, fname](Id a, Id b) { diff --git a/python/rdesigneur/moogul.py b/python/rdesigneur/moogul.py index f8605c1b87..24d51a8bab 100644 --- a/python/rdesigneur/moogul.py +++ b/python/rdesigneur/moogul.py @@ -218,7 +218,7 @@ def drawForTheFirstTime( self, ax ): class MooNeuron( MooDrawable ): ''' Draws collection of line segments of defined dia and color''' def __init__( self, - neuronId, + mooObj, fieldInfo, field = 'Vm', relativeObj = '.', @@ -235,12 +235,12 @@ def __init__( self, colormap = colormap, lenScale = lenScale, diaScale = diaScale, autoscale = autoscale, valMin = valMin, valMax = valMax ) - self.neuronId = neuronId + self.mooObj = mooObj self.updateCoords() def updateCoords( self ): ''' Obtains coords from the associated cell''' - self.compts_ = moose.wildcardFind( self.neuronId.path + "/#[ISA=CompartmentBase]" ) + self.compts_ = self.mooObj # Matplotlib3d isn't able to do full rotations about an y axis, # which is what the NeuroMorpho models use, so # here we shuffle the axes around. Should be an option. diff --git a/python/rdesigneur/rdesigneur.py b/python/rdesigneur/rdesigneur.py index 04237c16a0..3a509a03a7 100644 --- a/python/rdesigneur/rdesigneur.py +++ b/python/rdesigneur/rdesigneur.py @@ -769,8 +769,8 @@ def _buildMoogli( self ): pair = i.elecpath + " " + i.geom_expr dendCompts = self.elecid.compartmentsFromExpression[ pair ] spineCompts = self.elecid.spinesFromExpression[ pair ] - dendObj, mooField = self._parseComptField( dendCompts, i, knownFields ) - spineObj, mooField2 = self._parseComptField( spineCompts, i, knownFields ) + dendObj, mooField = self._MoogparseComptField( dendCompts, i, knownFields ) + spineObj, mooField2 = self._MoogparseComptField( spineCompts, i, knownFields ) assert( mooField == mooField2 ) mooObj3 = dendObj + spineObj numMoogli = len( mooObj3 ) diff --git a/python/rdesigneur/rmoogli.py b/python/rdesigneur/rmoogli.py index c34060f060..5313044076 100644 --- a/python/rdesigneur/rmoogli.py +++ b/python/rdesigneur/rmoogli.py @@ -39,7 +39,7 @@ def makeMoogli( rd, mooObj, args, fieldInfo ): valMin = ymin, valMax = ymax ) viewer.addDrawable( reacSystem ) else: - neuron = moogul.MooNeuron( rd.elecid, fieldInfo, + neuron = moogul.MooNeuron( mooObj, fieldInfo, field = mooField, relativeObj = relObjPath, valMin = ymin, valMax = ymax ) print( "min = {}, max = {}".format(ymin, ymax) )