Defocus does not compute other profiles when show selected wave front is checked

[githubdoe]

Select several wave fronts and enable show all selected wave fronts. Then press the defocus button on the wave front list. All the wave fronts will be displayed with just the data from the first.

The bug can be corrected in profile plot.

            if (m_defocus_mode){
                defocus = (m_defocusValue)* (-1. + 2. * rad * rad);
                points << QPointF(radx,(units * (wf->workData((int)dy,(int)dx) + defocus ) *
                                        wf->lambda/outputLambda)  +offset * units);

the old code had wf->workData replaced by m_defocus_wavefront.

The change seems to work. I don't remember why I created the m_defocus_wavefront variable and the code to set it.
Perhaps it is necessary then this fix will not be right. At present it seems to do exactly what I want.

Once more I have forgotten how to update my code to the current master. I have made several other changes over the last few months but I no longer know how to compare that to the master as well.

I'm not anxious to relearn how to do either since I'm busy with other projects like the one that found this bug. Working on my 16 F3 mirror.

[gr5]

I can add that code to master if you want.

To merge, you just make sure your branch is committed, switch to master branch, pull it, switch back to your branch and merge in master.

git checkout master (only works if your branch is up to date and committed)
git pull
git checkout dalework
git merge master (merge always pulls into current branch)

If there are no merge conflicts than the above merge can be quite fast and trivial. If there are merge conflicts and you decide you don't want to deal with that you can "kick the can down the road" by aborting the merge:

git merge --abort (this only works if you had dalework committed)

[atsju]

And if you don't want to deal with it.

git commit "all Dale local changes"
git push

Then tell me. I will take time to fix the merge conflicts. --avoid developping during this time--

git pull

[githubdoe]

I want the magic words to compare my local code with the master. Then with my remote branch. Locally I'm on branch dalework.

Here is what git status gives me.

Changes not staged for commit:
(use "git add/rm ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: DFTFringe_Dale.pro
modified: IgramArea.h
modified: foucaultview.cpp
modified: igramarea.cpp
deleted: igramdownloader.cpp
deleted: igramdownloader.h
modified: main.cpp
modified: mainwindow.cpp
modified: mainwindow.h
modified: pixelstats.cpp
modified: profileplot.cpp
modified: simulationsview.cpp
modified: simulationsview.h
new file: startestmoviedlg.cpp
new file: startestmoviedlg.h
new file: startestmoviedlg.ui

[atsju]

My personal taste would be : git fetch to sync everything without moving anything locally. You will just see locally the branch origin/dalework and dalework and origin/master and master. Origin ones are image of server.
Then gitk --all to visualize all this.

That's personal taste

[githubdoe]

I need to know what I changed so I can decide if I want to publish that.

[gr5]

You can compare any two versions in git, super easy. You can do it in text (git diff set of commands) but I much prefer the gui where it shows additions in green and deletions in red.

gitk is your friend here. Do:
gitk --all

Well first potentially do git fetch but only if you want to be able to compare to the origin/master (the one on github). But really I wouldn't do that as it sounds like you want to see what changes you made so far.

Then left click on your current code (either it will be in dalework or it will be "local uncommitted changes"). Then right click on the origin of your branch where you split off from master. And choose the first option in the popup list.

If they are the top two listed branches then you don't even have to do anything - it will just show you the latest changes by default if you just click on your current code base. Which is typically at the very top.

[atsju]

https://youtu.be/WLL4GbdnuL8?si=fbWZJHzUZp9D5uE4

Here is a link about gitk with short sections you can go directly to interesting ones.

[githubdoe]

Thank you guys. I got gitK working and understand most of it. I found the differences that I have yet to commit. I remember the reason for most of them. I will work through them to create a commit.

[gr5]

Dale, should I wait for your changes for this release?

I got 8.1.0 all set to release. I just have to publish. Was going to do extra testing - did 10 minutes of testing already and it seems fine. But then I realized you might be checking in your changes in the near future. Should I wait?

[githubdoe]

NO do not wait. It will be several days or weeks for me. I added a new movie maker feature for star test and some hot keys for igram outlining and import of igrams. Most all of this stuff is more related to me than to general users.

[gr5]

great. I'm actually travelling most of tomorrow but hope to do an hour or so of testing before releasing sometime in the next 36 hours.

[gr5]

This code made it into PR #262 and is merged into master now.