From 73963027c87272ebadf018e71448fdcc409a0e6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me?= Date: Tue, 13 Oct 2020 20:24:39 +0200 Subject: [PATCH] Fix issue for nbStep and new icon --- src/BuildPlugin/BuildPlugin_Interpolation.cpp | 10 +++++----- .../icons/feature_interpolation_analytical.png | Bin 511 -> 1172 bytes .../feature_interpolation_by_selection.png | Bin 596 -> 511 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BuildPlugin/BuildPlugin_Interpolation.cpp b/src/BuildPlugin/BuildPlugin_Interpolation.cpp index 7aa82f279..2fd4d48bc 100644 --- a/src/BuildPlugin/BuildPlugin_Interpolation.cpp +++ b/src/BuildPlugin/BuildPlugin_Interpolation.cpp @@ -136,8 +136,8 @@ void BuildPlugin_Interpolation::updateCoods() double scale = (aMaxt - aMint )/aNbrStep; string(VARIABLE_ID())->setValue("t"); - tables(VALUE_ID())->setSize(aNbrStep,4); - for( int step = 0; step < aNbrStep; step++ ){ + tables(VALUE_ID())->setSize(aNbrStep+1,4); + for( int step = 0; step <= aNbrStep; step++ ){ ModelAPI_AttributeTables::Value aVal; aVal.myDouble = step * scale + aMint; tables(VALUE_ID())->setValue(aVal,step,0); @@ -240,11 +240,11 @@ void BuildPlugin_Interpolation::execute() ||string( YT_ID())->value() == "" ||string( ZT_ID())->value() == "" ||tables(VALUE_ID())->rows()== 0 ) - return; + return false; if (!outErrorMessage.empty()){ - setError("Error: Python interpreter " + outErrorMessage); - return; + setError("Error: Python interpreter " ); + return false; } AttributeTablesPtr table = tables( VALUE_ID() ); std::list > aCoodPoints; diff --git a/src/BuildPlugin/icons/feature_interpolation_analytical.png b/src/BuildPlugin/icons/feature_interpolation_analytical.png index e5c5374b978367f79f571175cc13eb6bcfd99061..a47790fc6a73ec27869beb46de6d26c16befa50e 100644 GIT binary patch literal 1172 zcmV;F1Z(?=P)X1^@s6z#LUx00009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11R+U8 zK~zYIm6lC!(@GSEpBaxo5+!z%Ler{J1S)C822`mVU^iAr+BU zk$`-(b)3YR@m&N@6F2GQ9x00LIdk5bbKdjLh%C!83by3ajWHpF{Wkx6o5@wdvMjT| z{9S9!r%#_aK0anR94?IgjVbFWfVnxv)e0d$W41>Xd@px?CE0qdi7^0No*|TTFal91hzjml{=Zp*l3=*%^bu0Amb65a7D*!furig7x)v+U+*&cAFpwsMqU^Mk8Lo zevL7PSFc_zC4o}2l7IdBmG9rbv$nQIv)N>AZ4D_ULJ0exW!a1%<#L%I2zdMUEiYfb z#C2UpqY;%##ZrEr1bG^hB;nn=cZ|nl4h{~8qG*9=^C`A$bR37BogIAN=gyrw*6GEI z7kHjWuh&~><{$`|PN$rloDfA3Po6xnt2f5j-OQ&PKp11P`4!~Pc`fqYq-lzjlGD>u z&d<;BJdZF8+1c5_bzRalwQ0@g6af{$bUI};8m*L_d}6oTrPJxq?RKfx>uhXnFdmPY zOeO$KCKKyB7+f$M#xxoYs@3WY)EJX>yItDtHjd-01Tx0Z>2zo|n}lJ=$B!SW)oKJm zu#lBJ)$R5f@8AE!^XJdm-`__mbxn}1t*w=6V2lAV>!H)rQ);yuQ54Z=H1K_YCUfF? zo|N(rK@6Lln@Bm6U}07NPwY(O4~w9a$%GFdKG5lOsMTsbeE5)Bt+q1tX_{h;!Sg(X zkkk|Z>nO_WkdDVK_FF|AM#;`w7mN{Ld6Ua!Z| z(Gjgyi@m))&d<+D(-fGsOt07D=g<87`IDzl zpVDYFY@_Bi$g+%TwaUT4!2;FG^W zz~3I43t;_zpKss3;dvfG5U{tL zuIpOmSXT7nH)9N?Qi*eL84KAg`_x+^;apPJr zA1Jp~;8IGa(<%LaAFZ`za1=$eX1@*WZ?9yzX{{-hN<4V*V1YoM>n*5?jlb;PShRVU mG)>W3}1{rUgjp4pVqfx*x)K$3w)fLTx6$k1@&(~<^;q(iAQ0(11w1mp$r zuy82wh|fCmy_uI$k}WlQa*~Dv!$JuTW1fz$jTX`!>CQ)|bei%jG;FAhWbIIG_`xc0 zzp=|x;I&r+L(^`7ld1;;^1GaWzFV?GNTDGjp{KaJJ5evOVb?oV5o3j&LMs16=QlDi z9%&I}EoWjb=#*_st3su+z91Qe}omo#i#vKug`xTJ?I@y>t6)qDm42Oke92g52xuX;ygf%)4jfx<>SQ=Ax>I4ot0 zoRh`EKOK0LyJCj5&JG5q4pz^1+Kmz}-@k>MSWY$WZjVcjHIb2p(W$F?hQAxvXc2p|j>n#A{m4FMSjWm}VCC_n(A7zi^Ai1mRu z8;EB^#gvIP41jS2TNiA0R)Q_o`3)TB_O$i2Tk7>m^yUJfckhq!3EWC01!Y-NE$#fdI3s* zK{F7aw|PLp1u_hjLI45?IURCCV-{C`^1$kCsF*t}xBvo(1xfBJffz*h_E$7Hkk9S_ z1P}uW#TUpBYorLkmUg)T0*Hac@=zHqR>h$P1;Y|PKmaj<3}j?vB*m2mp!5oi)e58t zgk{sO00Bg50SgMZ7f{2{^E^0A0Ro7Hj4~8tz!4;a?jT1HK!5=Na{G<3@kLk-3;+NC M07*qoM6N<$g1Xq5i~s-t delta 503 zcmVK2+l~aJK4+LUQAeI1`1rR`B7lKR%+VTQwA;?uQ_6MkC z$NN!jjAb^m)`~gY}LY@Bt$zWvffeiWp4RcViNWj7!Bo7ck@N~$_%lrN6 z#sZiNIB>-x$Tv{SkbUz49DYCm5J1>}5;g}3sYDQJD9m>Z009Iy5R`PZ{U?B!0wfp+ zvit|kbszu`K;T%0#xy7_0--Ud029ZCVQQeUj-nPIfSAxCm5I{`mF^Ckv0t8$sfDwK`01!YJF2LnV5FaLD2F)Fj z*uokhfEckAu+Y4z2sGdrObnQaIiaos%R$5LJW`qj1AqX+WgrJsqX1IC!?GL$Qri1~ t?qz@gV!@Rgkn*-9QjFp>2nGNG3;=G14eN)X^7#M&002ovPDHLkV1l`b#-acK -- 2.39.2