WasatchPhotonics / ENLIGHTEN

Open-source spectroscopy application for controlling and taking measurements from Wasatch Photonics spectrometers.
https://wasatchphotonics.com/product-category/software/
MIT License
3 stars 6 forks source link

Adding GUI handles to graphically configure horizontal ROI #229

Closed mzieg closed 1 year ago

mzieg commented 1 year ago
mzieg commented 1 year ago

This needs more testing and refinement, but is starting to look and act closer to the envisioned end-state. Still need to play with Raman-vs-Expert mode etc, but the basic functionality of the handles, and how they are achieved, is mostly there.

samiebee43 commented 1 year ago

There is a conflict in enlighten_layout.ui. Here's the breakdown:

In main 4.0.14- this field was: y=-1077 In main 4.0.15 this field was changed to: y=0 in mzieg-roi-handles this field was changed to y=-950

I'm pretty sure a similar conflict happened in the past. I think the best route is actually to make a commit on main that changes it to -950.

(I'm guessing here, I don't know what this actually does, but it seems like two different times someone wanted it to be roughly -1000, and one time someone/someprogram just set it to zero)

samiebee43 commented 1 year ago

Also what will it take to merge this to main or perhaps the oft-needed but yet nonexistant 'dev' branch ?

(dev could contain stuff up to 2-3 enlighten versions in the future. We use main for the next immediate version only)

mzieg commented 1 year ago

Don't worry about keeping this branch up-to-date for me; I'll resolve anything when I get back to it, hopefully in a week or two.

mzieg commented 1 year ago

Draggable ROI handles still isn't ready for release, and I don't have time / priority to finish it right now, but I do want to capture and merge-up the feature classes we ported to "ctl" as part of this branch. So as a compromise, I hid the [x] Edit Horiz ROI checkbox in HorizROIFeature.update_visibility, so basically none of the new functionality should be exposed. It's my hope that this will let us merge the branch in its current form to 4.1.0, then we can finish the GUI functionality later.

samiebee43 commented 1 year ago

Note the small graph in Settings still works:

image
mzieg commented 1 year ago

Whoops, yeah, not sure how I missed that. Was from the final commit before requesting the review...I thought I tested :-( Please try now.

samiebee43 commented 1 year ago

See #337