Skip to content

Commit ec5e445

Browse files
committed
CPlot: delayed some sliders
1 parent 0d2b11b commit ec5e445

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

Cassiopee/CPlot/apps/tkDriver.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ def createApp(win):
288288

289289
# - slider -
290290
B = TTK.Scale(Frame, from_=0, to=100, orient=TK.HORIZONTAL, showvalue=0,
291-
command=setParameterValueWithScale, borderwidth=1, value=scaleValue)
291+
borderwidth=1, value=scaleValue)
292+
B.bind("<ButtonRelease-1>", setParameterValueWithScale)
292293
WIDGETS['valueSlider'] = B
293294
B.grid(row=4, column=0, columnspan=2, sticky=TK.EW)
294295
BB = CTK.infoBulle(parent=B, text='Parameter value.')

Cassiopee/CPlot/apps/tkView.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,8 @@ def createApp(win):
12951295
B.bind('<Return>', setDensityVector)
12961296
WIDGETS['vectorDensityEnter'] = B
12971297
B = TTK.Scale(Vector, from_=0., to=1.E5, orient=TK.HORIZONTAL,
1298-
command=densityVector, showvalue=1, borderwidth=1, value=0.)
1298+
showvalue=1, borderwidth=1, value=0.)
1299+
B.bind("<ButtonRelease-1>", densityVector)
12991300
WIDGETS['vectorDensity'] = B
13001301

13011302
# - Vector field settings -

Cassiopee/CPlot/apps/validCassiopee.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ def checkOutput(cmd, path='.', env=None, stderr=None):
295295
PROCESS = None # done!
296296
return stdout+stderr
297297
else:
298-
raise ValueError(f"validCassiopee: checkOutput: mode {mode} not supported")
298+
raise ValueError(f"validCassiopee: checkOutput: mode {mode} not supported.")
299299

300300
# retourne une chaine justifiee en fonction de la font et
301301
# d'une taille voulue
@@ -1658,7 +1658,7 @@ def parseArgs():
16581658
def _checkInt(n):
16591659
def _throwError():
16601660
raise argparse.ArgumentTypeError("Number of remaining logs must be "
1661-
"a positive integer")
1661+
"a positive integer.")
16621662
sys.exit(1)
16631663
try: n = int(n)
16641664
except: _throwError()

Cassiopee/KCore/KCore/Connect/ngonTools.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,6 @@ E_Int K_CONNECT::build_parent_elements_ngon(
780780

781781
if (iref == -1)
782782
{
783-
break;
784783
return 1;
785784
}
786785

Cassiopee/KCore/KCore/Loc/node2Center.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,6 @@ E_Int K_LOC::node2centerStruct(FldArrayF& FNode,
575575
case 3:
576576
printf("Warning: node2center: this cellN type is not implemented yet.\n");
577577
return 0;
578-
break;
579578

580579
default:
581580
printf("Warning: node2center: unknown cellnaturefield format.\n");

Cassiopee/KCore/KCore/Nuga/include/KdTree.cxx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ K_SEARCH::KdTree<CoordArrayType>::__insert
154154

155155
_tree(0, _tree_sz++) = *it; // Set N as the parent, increase tree size by one.
156156

157-
if (begin != it)
158-
_tree(1,cols) = __insert (begin, it, depth+1);
157+
if (begin != it)
158+
_tree(1,cols) = __insert (begin, it, depth+1);
159159

160-
if (++it != end)
161-
_tree(2,cols) = __insert (it, end, depth+1);
160+
if (++it != end)
161+
_tree(2,cols) = __insert (it, end, depth+1);
162162

163163
return cols;
164164
}
@@ -184,12 +184,12 @@ K_SEARCH::KdTree<CoordArrayType>::__insert_omp
184184

185185
#pragma omp task
186186
{
187-
__insert_omp (begin, it, dn);
187+
__insert_omp(begin, it, dn);
188188
}
189189

190190
//#pragma omp task : save a thread by using the current thread
191191
{
192-
__insert_omp (itn, end, dn);
192+
__insert_omp(itn, end, dn);
193193
}
194194

195195
#pragma omp taskwait
@@ -210,10 +210,10 @@ K_SEARCH::KdTree<CoordArrayType>::__set_tree
210210
_tree(0, _tree_sz++) = *it; // Set N as the parent, increase tree size by one.
211211

212212
if (begin != it)
213-
_tree(1,cols) = __set_tree (begin, it);
213+
_tree(1,cols) = __set_tree (begin, it);
214214

215215
if (++it != end)
216-
_tree(2,cols) = __set_tree (it, end);
216+
_tree(2,cols) = __set_tree (it, end);
217217

218218
return cols;
219219
}
@@ -770,7 +770,7 @@ void K_SEARCH::KdTree<CoordArrayType>::__seek_closest
770770
E_Float D = pt[ax] - _posAcc.getVal(*Ni, ax);
771771
size_type left = *(Ni+1);
772772
size_type right = *(Ni+2);
773-
size_type nextAxis = ax+1 == _dim ? 0 : ax+1;
773+
size_type nextAxis = (ax+1 == _dim ? 0 : ax+1);
774774

775775
if (D*D >= d2)
776776
{

0 commit comments

Comments
 (0)