search

I2PC / scipion

Scipion is an image processing framework to obtain 3D models of macromolecular complexes using Electron Microscopy (3DEM)
http://scipion.i2pc.es
Other
76 stars 47 forks source link

Join set do not loose ids of first set #2014

Closed pconesa closed 5 years ago

pconesa commented 5 years ago

This PR has 3 small changes: 1.- The join sets was losing the ids as soon as there were conflicts. Now, if allowed, it will keep the id of the first set. This will allow the usage of other protocols that us the Id for matching items, at least for the first set that is being merged. 2.- Fixes a "bug" in the _idCount of the sets 3.- Closes the bd after loading the project info in the project list window.

dmaluenda commented 5 years ago

On the other hand, could I use this PR to introduce a bug fix when trying to join two SetOfCoordinates? The problem is _createSetOfCoordinates has a differnet signature than the _createSetOfAnything and it's fixed using the same that we did for the protocol_SubSet: [to be placed at line 189]

    # Overwrite SetOfCoordinates creation
    def _createSetOfCoordinates(self, suffix=''):
        coordSet = self.inputSets[0].get()
        micSet = coordSet.getMicrographs()
        return ProtSets._createSetOfCoordinates(self, micSet, suffix)