Merge pull request #337 from githubdoe/master

gr5 · web-flow · commit 1de78b998c79 · 2026-01-18T19:43:32.000-05:00
clangd to master - I messed up...
diff --git a/surfacemanager.cpp b/surfacemanager.cpp
@@ -1841,9 +1841,11 @@ void SurfaceManager::subtract(wavefront *wf1, wavefront *wf2, bool use_null){
 void SurfaceManager::subtractWavefronts(){
     QList<QString> list;
     QList<int> doThese =  m_surfaceTools->SelectedWaveFronts();
+    QList<int> indexes;
     for (int i = 0; i < m_wavefronts.size(); ++i){
         if (!doThese.contains(i)) {
              list.append(m_wavefronts[i]->name);
+             indexes.append(i);
         }
     }
     subtractWavefronatsDlg dlg(list);
@@ -1857,7 +1859,7 @@ void SurfaceManager::subtractWavefronts(){
             return;
         }
         wavefront *wf1 = m_wavefronts[m_currentNdx];
-        wavefront *wf2 = m_wavefronts[ndx2];
+        wavefront *wf2 = m_wavefronts[indexes[ndx2]];
         subtract(wf1,wf2, dlg.use_null);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1841,9 +1841,11 @@ void SurfaceManager::subtract(wavefront wf1, wavefront wf2, bool use_null){`
`1841`	`1841`	`void SurfaceManager::subtractWavefronts(){`
`1842`	`1842`	`QList<QString> list;`
`1843`	`1843`	`QList<int> doThese = m_surfaceTools->SelectedWaveFronts();`
	`1844`	`+ QList<int> indexes;`
`1844`	`1845`	`for (int i = 0; i < m_wavefronts.size(); ++i){`
`1845`	`1846`	`if (!doThese.contains(i)) {`
`1846`	`1847`	`list.append(m_wavefronts[i]->name);`
	`1848`	`+ indexes.append(i);`
`1847`	`1849`	`}`
`1848`	`1850`	`}`
`1849`	`1851`	`subtractWavefronatsDlg dlg(list);`
`@@ -1857,7 +1859,7 @@ void SurfaceManager::subtractWavefronts(){`
`1857`	`1859`	`return;`
`1858`	`1860`	`}`
`1859`	`1861`	`wavefront *wf1 = m_wavefronts[m_currentNdx];`
`1860`		`- wavefront *wf2 = m_wavefronts[ndx2];`
	`1862`	`+ wavefront *wf2 = m_wavefronts[indexes[ndx2]];`
`1861`	`1863`	`subtract(wf1,wf2, dlg.use_null);`
`1862`	`1864`	`}`
`1863`	`1865`	`}`