search

labscript-suite-oldfinal1 / runmanager

runmanager is a graphical user interface (GUI) used to aid the compilation of labscript experiment scripts into hardware instructions to be executed on the hardware. Experiment parameters can be adjusted in the GUI, and lists of parameters can be used to create sequences of experiments, and scan over complex parameter spaces.
BSD 2-Clause "Simplified" License
0 stars 0 forks source link

Can't edit global name #18

Closed philipstarkey closed 10 years ago

philipstarkey commented 10 years ago

Original report (archived issue) by Philip Starkey (Bitbucket: pstarkey, GitHub: philipstarkey).

changeset: 88b72b7e52ff7fe7847f6ac28a55576bb520600f (commit message "merge") introduces a typo on line 822. I can't see where this was introduced, other than in that commit which is a bit odd.

It looks like the merge wasn't just including already committed changes?

philipstarkey commented 10 years ago

Original comment by Chris Billington (Bitbucket: cbillington, GitHub: chrisjbillington).

Resolves issue #18, fixed a typo introduced a few commits back.

→ \<\<cset 65d5eb734aa922ebd1b71a47b4087cdf39e675fe>>

philipstarkey commented 10 years ago

Original comment by Chris Billington (Bitbucket: cbillington, GitHub: chrisjbillington).

That was a complicated merge I had to do with a 3 way diff tool because mercurial couldn't resolve the conflicts itself. I didn't realise I could test, as the changes were being made to the actual files in the working directory during the merge, so I should have done so.

The line said value = value_item.text() in one parent and value = qstring_to_unicode(value_item.text()) in the other ... so that's how I screwed that up.

philipstarkey commented 10 years ago

Original comment by Chris Billington (Bitbucket: cbillington, GitHub: chrisjbillington).

Oh, actually I'm mistaken, it said qstring_to_unicode(value_item.text()) in one parent, and was simply absent from the other. But while I was doing the merge I was removing the qstring_to_unicode calls because the other parent had switched to API v2 of everything in PyQt4, making those calls not just unnecessary but exception-raising.