search

mxcube / mxcubeqt

Qt Front-end of MXCuBE
http://mxcube.github.io/mxcube/
GNU Lesser General Public License v3.0
14 stars 34 forks source link

P11 mxcubeqt bricks update #447

Closed agruzinov closed 1 year ago

agruzinov commented 1 year ago

Here is cumulative update from P11 with updates together from Bixente.

Cheers, Andrey

rhfogh commented 1 year ago

Dear Andrey, Would you mind dealing with my PR first? There is probably not that much overlap, which should make it relatively easy, but I did put mine in first, a month ago. If we merge yours in first, then I shall have to rebase my PR on yours . It would be nice (for me at least ;-) ) if we could merge mine first, and then rebase yours on the new tip.

agruzinov commented 1 year ago

OK, rebasing is done, so should be fine now.

agruzinov commented 1 year ago

p11_deice_brick is not used at the moment and was used as an example attempt. Added for safekeeping. Actually the deicing should be implemented probably without building another brick.

rhfogh commented 1 year ago

There is something really weird here.

When I look at the file differences, there are a lot of differences for e.g. create_gphl_workflow_widget and jsonparamsgui, files that were changed on my side before rebasing and that should not be changing again. Yet, when I look at mxcubeqt/develop, those changes (that your PR is supposedly introducing) ar already there. And when I look at the branches fetched down to my local computer, again those files are identical (and correct) in both your branch and the develop branch.

Sorry for the complication, but would you mind closing down this PR and making a new one between the same branches? Something must have gone slightly wrong either in rebasing or on github, and if possible I would rather not introduce confusion in the commits.

agruzinov commented 1 year ago

First rebase seems not processed properly. New rebase needed. Closing.