Skip to content

Commit 446a021

Browse files
dcwhitedcwhite
authored
Merge branch 'master' into edit_bbox_refactor
2 parents dbc4bc5 + c811f87 commit 446a021

File tree

17 files changed

+90
-131
lines changed

17 files changed

+90
-131
lines changed

‎.github/workflows/mac.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fetch-depth: 0
1818

1919
- name: Install Qt
20-
uses: jurplel/install-qt-action@v2.9.0
20+
uses: jurplel/install-qt-action@v2.13.0
2121
env:
2222
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
2323
with:
@@ -74,7 +74,7 @@ jobs:
7474
fetch-depth: 0
7575

7676
- name: Install Qt
77-
uses: jurplel/install-qt-action@v2.9.0
77+
uses: jurplel/install-qt-action@v2.13.0
7878
env:
7979
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
8080
with:
@@ -116,7 +116,7 @@ jobs:
116116
fetch-depth: 0
117117

118118
- name: Install Qt
119-
uses: jurplel/install-qt-action@v2.9.0
119+
uses: jurplel/install-qt-action@v2.13.0
120120
env:
121121
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
122122
with:

‎.github/workflows/windows.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fetch-depth: 0
4646

4747
- name: Install Qt
48-
uses: jurplel/install-qt-action@v2.9.0
48+
uses: jurplel/install-qt-action@v2.13.0
4949
env:
5050
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
5151
with:
@@ -90,7 +90,7 @@ jobs:
9090
fetch-depth: 0
9191

9292
- name: Install Qt
93-
uses: jurplel/install-qt-action@v2.9.0
93+
uses: jurplel/install-qt-action@v2.13.0
9494
env:
9595
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
9696
with:
@@ -143,7 +143,7 @@ jobs:
143143
fetch-depth: 0
144144

145145
- name: Install Qt
146-
uses: jurplel/install-qt-action@v2.9.0
146+
uses: jurplel/install-qt-action@v2.13.0
147147
env:
148148
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
149149
with:

‎src/Core/Algorithms/Legacy/Fields/DistanceField/CalculateDistanceField.cc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class CalculateDistanceFieldP : public Interruptible
9393

9494
for (VMesh::Elem::index_type idx=start; idx<end; idx++)
9595
{
96-
checkForInterruption();
96+
9797
Point p, p2;
9898
imesh->get_center(p,idx);
9999
if(!(objmesh->find_closest_elem(val,p2,fidx,p,max))) val = max;
@@ -110,7 +110,7 @@ class CalculateDistanceFieldP : public Interruptible
110110

111111
for (VMesh::Node::index_type idx=start; idx<end; idx++)
112112
{
113-
checkForInterruption();
113+
114114
Point p, p2;
115115
imesh->get_center(p,idx);
116116
if(!(objmesh->find_closest_elem(val,p2,fidx,p,max))) val = max;
@@ -127,7 +127,7 @@ class CalculateDistanceFieldP : public Interruptible
127127

128128
for (VMesh::ENode::index_type idx=start; idx<end; idx++)
129129
{
130-
checkForInterruption();
130+
131131
Point p, p2;
132132
imesh->get_center(p,idx);
133133
if(!(objmesh->find_closest_elem(val,p2,fidx,p,max))) val = max;
@@ -166,7 +166,7 @@ class CalculateDistanceFieldP : public Interruptible
166166

167167
for (VMesh::Elem::index_type idx=start; idx<end; idx++)
168168
{
169-
checkForInterruption();
169+
170170
imesh->get_center(p,idx);
171171
objmesh->find_closest_elem(val,p2,coords,fidx,p);
172172
ofield->set_value(val,idx);
@@ -181,7 +181,7 @@ class CalculateDistanceFieldP : public Interruptible
181181

182182
for (VMesh::Elem::index_type idx=start; idx<end; idx++)
183183
{
184-
checkForInterruption();
184+
185185
imesh->get_center(p,idx);
186186
objmesh->find_closest_elem(val,p2,coords,fidx,p);
187187
ofield->set_value(val,idx);
@@ -196,7 +196,7 @@ class CalculateDistanceFieldP : public Interruptible
196196

197197
for (VMesh::Elem::index_type idx=start; idx<end; idx++)
198198
{
199-
checkForInterruption();
199+
200200
imesh->get_center(p,idx);
201201
objmesh->find_closest_elem(val,p2,coords,fidx,p);
202202
ofield->set_value(val,idx);
@@ -220,7 +220,7 @@ class CalculateDistanceFieldP : public Interruptible
220220

221221
for (VMesh::Node::index_type idx=start; idx<end; idx++)
222222
{
223-
checkForInterruption();
223+
224224
imesh->get_center(p,idx);
225225
objmesh->find_closest_elem(val,p2,coords,fidx,p);
226226
ofield->set_value(val,idx);
@@ -236,7 +236,7 @@ class CalculateDistanceFieldP : public Interruptible
236236

237237
for (VMesh::Node::index_type idx=start; idx<end; idx++)
238238
{
239-
checkForInterruption();
239+
240240
imesh->get_center(p,idx);
241241
objmesh->find_closest_elem(val,p2,coords,fidx,p);
242242
ofield->set_value(val,idx);
@@ -252,7 +252,7 @@ class CalculateDistanceFieldP : public Interruptible
252252

253253
for (VMesh::Node::index_type idx=start; idx<end; idx++)
254254
{
255-
checkForInterruption();
255+
256256
imesh->get_center(p,idx);
257257
objmesh->find_closest_elem(val,p2,coords,fidx,p);
258258
ofield->set_value(val,idx);
@@ -276,7 +276,7 @@ class CalculateDistanceFieldP : public Interruptible
276276
double scalar;
277277
for (VMesh::ENode::index_type idx=start; idx<end; idx++)
278278
{
279-
checkForInterruption();
279+
280280
imesh->get_center(p,idx);
281281
objmesh->find_closest_elem(val,p2,coords,fidx,p);
282282
ofield->set_value(val,idx);
@@ -291,7 +291,7 @@ class CalculateDistanceFieldP : public Interruptible
291291
Vector vec;
292292
for (VMesh::ENode::index_type idx=start; idx<end; idx++)
293293
{
294-
checkForInterruption();
294+
295295
imesh->get_center(p,idx);
296296
objmesh->find_closest_elem(val,p2,coords,fidx,p);
297297
ofield->set_value(val,idx);
@@ -306,7 +306,7 @@ class CalculateDistanceFieldP : public Interruptible
306306
Tensor tensor;
307307
for (VMesh::ENode::index_type idx=start; idx<end; idx++)
308308
{
309-
checkForInterruption();
309+
310310
imesh->get_center(p,idx);
311311
objmesh->find_closest_elem(val,p2,coords,fidx,p);
312312
ofield->set_value(val,idx);

‎src/Core/Algorithms/Legacy/Fields/DistanceField/CalculateSignedDistanceField.cc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
7373

7474
for (VMesh::Elem::index_type idx = start; idx < end; idx++)
7575
{
76-
checkForInterruption(this);
76+
7777
Point p, p1, p2;
7878
imesh->get_center(p,idx);
7979

@@ -140,7 +140,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
140140
if (angle < 0) val = -(val);
141141
}
142142
}
143-
checkForInterruption(this);
143+
144144
ofield->set_value(val,idx);
145145
if (proc == 0) { cnt++; if (cnt == 100) { pr_->update_progress_max(idx,end); cnt = 0; } }
146146
}
@@ -158,7 +158,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
158158

159159
for (VMesh::Node::index_type idx =start; idx <end; idx++)
160160
{
161-
checkForInterruption();
161+
162162
Point p, p1, p2;
163163
imesh->get_center(p,idx);
164164
objmesh->find_closest_elem(val,p2,fidx,p);
@@ -224,7 +224,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
224224
if (angle < 0.0) val = -(val);
225225
}
226226
}
227-
checkForInterruption(this);
227+
228228
ofield->set_value(val,idx);
229229
if (proc == 0) { cnt++; if (cnt == 100) { pr_->update_progress_max(idx,end); cnt = 0; } }
230230
}
@@ -242,7 +242,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
242242

243243
for (VMesh::ENode::index_type idx=start; idx < end; idx++)
244244
{
245-
checkForInterruption(this);
245+
246246
Point p, p1, p2;
247247
imesh->get_center(p,idx);
248248
objmesh->find_closest_elem(val,p2,fidx,p);
@@ -308,7 +308,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
308308
if (angle < 0.0) val = -(val);
309309
}
310310
}
311-
checkForInterruption(this);
311+
312312
ofield->set_evalue(val,idx);
313313
if (proc == 0) { cnt++; if (cnt == 100) { pr_->update_progress_max(idx,end); cnt = 0; } }
314314
}
@@ -338,7 +338,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
338338

339339
for (VMesh::Elem::index_type idx = start; idx < end; idx++)
340340
{
341-
checkForInterruption(this);
341+
342342
Point p, p1, p2;
343343
imesh->get_center(p,idx);
344344

@@ -405,7 +405,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
405405
if (angle < 0) val = -(val);
406406
}
407407
}
408-
checkForInterruption(this);
408+
409409
ofield->set_value(val,idx);
410410
if (objfield->is_scalar())
411411
{
@@ -442,7 +442,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
442442

443443
for (VMesh::Node::index_type idx =start; idx <end; idx++)
444444
{
445-
checkForInterruption(this);
445+
446446
Point p, p1, p2;
447447
imesh->get_center(p,idx);
448448
objmesh->find_closest_elem(val,p2,coords,fidx,p);
@@ -509,7 +509,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
509509
if (angle < 0.0) val = -(val);
510510
}
511511
}
512-
checkForInterruption(this);
512+
513513
ofield->set_value(val,idx);
514514
if (objfield->is_scalar())
515515
{
@@ -546,7 +546,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
546546

547547
for (VMesh::ENode::index_type idx=start; idx < end; idx++)
548548
{
549-
checkForInterruption(this);
549+
550550
Point p, p1, p2;
551551
imesh->get_center(p,idx);
552552
objmesh->find_closest_elem(val,p2,coords,fidx,p);
@@ -612,7 +612,7 @@ class CalculateSignedDistanceFieldP : public Interruptible
612612
if (angle < 0.0) val = -(val);
613613
}
614614
}
615-
checkForInterruption(this);
615+
616616
ofield->set_evalue(val,idx);
617617
if (objfield->is_scalar())
618618
{

‎src/Core/Algorithms/Legacy/Fields/DomainFields/GetDomainBoundaryAlgo.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ GetDomainBoundaryAlgo::runImpl(FieldHandle input, SparseRowMatrixHandle domainli
219219

220220
for(VMesh::DElem::index_type delem = 0; delem < numdelems; ++delem)
221221
{
222-
checkForInterruption(this);
222+
223223

224224
bool neighborexist = false;
225225
bool includeface = false;
@@ -332,7 +332,7 @@ GetDomainBoundaryAlgo::runImpl(FieldHandle input, SparseRowMatrixHandle domainli
332332
onodes.resize(inodes.size());
333333
for (size_t q=0; q< onodes.size(); q++)
334334
{
335-
checkForInterruption(this);
335+
336336
a = inodes[q];
337337

338338
std::pair<pointhash_map_type::iterator,pointhash_map_type::iterator> lit;
@@ -406,7 +406,7 @@ GetDomainBoundaryAlgo::runImpl(FieldHandle input, SparseRowMatrixHandle domainli
406406

407407
for(VMesh::DElem::index_type delem = 0; delem < numdelems; ++delem)
408408
{
409-
checkForInterruption(this);
409+
410410

411411
bool neighborexist = false;
412412
bool includeface = false;
@@ -516,7 +516,7 @@ GetDomainBoundaryAlgo::runImpl(FieldHandle input, SparseRowMatrixHandle domainli
516516

517517
for (size_t q=0; q< onodes.size(); q++)
518518
{
519-
checkForInterruption(this);
519+
520520
a = inodes[q];
521521
if (node_map[a] == -1)
522522
{

‎src/Core/Algorithms/Legacy/Fields/Mapping/MapFieldDataFromElemToNode.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ bool
8686
{
8787
while (it != eit)
8888
{
89-
checkForInterruption(algo);
89+
9090
mesh->get_elems(elems, *(it));
9191
size_t nsize = elems.size();
9292
DATA val(0);
@@ -111,7 +111,7 @@ bool
111111
{
112112
while (it != eit)
113113
{
114-
checkForInterruption(algo);
114+
115115
mesh->get_elems(elems, *(it));
116116
size_t nsize = elems.size();
117117
DATA val(0);
@@ -139,7 +139,7 @@ bool
139139
{
140140
while (it != eit)
141141
{
142-
checkForInterruption(algo);
142+
143143
mesh->get_elems(elems, *it);
144144
size_t nsize = elems.size();
145145
DATA val(0);
@@ -167,7 +167,7 @@ bool
167167
{
168168
while (it != eit)
169169
{
170-
checkForInterruption(algo);
170+
171171
mesh->get_elems(elems, *(it));
172172
size_t nsize = elems.size();
173173
DATA val(0);
@@ -192,7 +192,7 @@ bool
192192
std::vector<DATA> valarray;
193193
while (it != eit)
194194
{
195-
checkForInterruption(algo);
195+
196196
mesh->get_elems(elems, *(it));
197197
size_t nsize = elems.size();
198198
valarray.resize(nsize);

‎src/Core/Algorithms/Legacy/Fields/Mapping/MapFieldDataFromNodeToElem.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ MapFieldDataFromNodeToElemT(const MapFieldDataFromNodeToElemAlgo* algo,
8585
DATA tval(0);
8686
while (it != eit)
8787
{
88-
checkForInterruption(algo);
88+
8989
mesh->get_nodes(nodearray, *it);
9090
size_t nsize = nodearray.size();
9191
DATA val(0);
@@ -110,7 +110,7 @@ MapFieldDataFromNodeToElemT(const MapFieldDataFromNodeToElemAlgo* algo,
110110
{
111111
while (it != eit)
112112
{
113-
checkForInterruption(algo);
113+
114114
mesh->get_nodes(nodearray, *it);
115115
size_t nsize = nodearray.size();
116116
DATA val(0);
@@ -139,7 +139,7 @@ MapFieldDataFromNodeToElemT(const MapFieldDataFromNodeToElemAlgo* algo,
139139
DATA tval(0);
140140
while (it != eit)
141141
{
142-
checkForInterruption(algo);
142+
143143
mesh->get_nodes(nodearray, *it);
144144
size_t nsize = nodearray.size();
145145
DATA val(0);
@@ -167,7 +167,7 @@ MapFieldDataFromNodeToElemT(const MapFieldDataFromNodeToElemAlgo* algo,
167167
DATA tval(0);
168168
while (it != eit)
169169
{
170-
checkForInterruption(algo);
170+
171171
mesh->get_nodes(nodearray, *it);
172172
size_t nsize = nodearray.size();
173173
DATA val(0);
@@ -191,7 +191,7 @@ MapFieldDataFromNodeToElemT(const MapFieldDataFromNodeToElemAlgo* algo,
191191
std::vector<DATA> valarray;
192192
while (it != eit)
193193
{
194-
checkForInterruption(algo);
194+
195195
mesh->get_nodes(nodearray, *it);
196196
size_t nsize = nodearray.size();
197197
valarray.resize(nsize);

0 commit comments

Comments
 (0)