Merge pull request #343 from githubdoe/iss342

gr5 · web-flow · commit 5842e4c4b2c4 · 2026-02-11T16:03:07.000-05:00
Fixed issue 342 using Dale's suggestion.  Fixed both average and subt…
diff --git a/surfacemanager.cpp b/surfacemanager.cpp
@@ -1766,11 +1766,11 @@ void SurfaceManager::average(QList<wavefront *> wfList){
     makeMask(wf);
     generateSurfacefromWavefront(m_currentNdx);
 
+    m_surfaceTools->select(m_currentNdx);
     if (needsUpdate)
         m_waveFrontTimer->start(1000);
     else
        loadComplete();
-    m_surfaceTools->select(m_currentNdx);
     QApplication::restoreOverrideCursor();
 }
 #include "averagewavefrontfilesdlg.h"
@@ -1942,8 +1942,8 @@ void SurfaceManager::subtract(wavefront *wf1, wavefront *wf2, bool use_null){
     }
     generateSurfacefromWavefront(m_currentNdx);
 
-    loadComplete();
     m_surfaceTools->select(m_currentNdx);
+    loadComplete();
 }
 
 void SurfaceManager::subtractWavefronts(){

Original file line number	Diff line number	Diff line change
`@@ -1766,11 +1766,11 @@ void SurfaceManager::average(QList<wavefront *> wfList){`
`1766`	`1766`	`makeMask(wf);`
`1767`	`1767`	`generateSurfacefromWavefront(m_currentNdx);`
`1768`	`1768`
	`1769`	`+ m_surfaceTools->select(m_currentNdx);`
`1769`	`1770`	`if (needsUpdate)`
`1770`	`1771`	`m_waveFrontTimer->start(1000);`
`1771`	`1772`	`else`
`1772`	`1773`	`loadComplete();`
`1773`		`- m_surfaceTools->select(m_currentNdx);`
`1774`	`1774`	`QApplication::restoreOverrideCursor();`
`1775`	`1775`	`}`
`1776`	`1776`	`#include "averagewavefrontfilesdlg.h"`
`@@ -1942,8 +1942,8 @@ void SurfaceManager::subtract(wavefront wf1, wavefront wf2, bool use_null){`
`1942`	`1942`	`}`
`1943`	`1943`	`generateSurfacefromWavefront(m_currentNdx);`
`1944`	`1944`
`1945`		`- loadComplete();`
`1946`	`1945`	`m_surfaceTools->select(m_currentNdx);`
	`1946`	`+ loadComplete();`
`1947`	`1947`	`}`
`1948`	`1948`
`1949`	`1949`	`void SurfaceManager::subtractWavefronts(){`