isotransformation.cpp (mathmod-11.0-source) | : | isotransformation.cpp (mathmod-11.1-source) | ||
---|---|---|---|---|
skipping to change at line 29 | skipping to change at line 29 | |||
***************************************************************************/ | ***************************************************************************/ | |||
#include "isotransformation.h" | #include "isotransformation.h" | |||
void IsoTransformation::Twist() | void IsoTransformation::Twist() | |||
{ | { | |||
scalex = scaley = scalez=1; | scalex = scaley = scalez=1; | |||
twistx = twisty = twistz = 0; | twistx = twisty = twistz = 0; | |||
} | } | |||
QString IsoTransformation::Twistx(QString ImplicitFunction) | QString IsoTransformation::Twistx(QString ImplicitFunction) | |||
{ | { | |||
/* | ||||
double vals[2]={0,0}; | ||||
QString after_1, after_2, angle, XlimitSup, XlimitInf; | ||||
double tmp; | ||||
for(int j=0; j<Nb_functs; j++) | ||||
{ | ||||
implicitFunctionParser[i].AddFunction(FunctNames[j], Fct[j]); | ||||
} | ||||
if(twistx != 0 || scalex !=1) | ||||
{ | ||||
angle = "1/("+XlimitSup+"-"+XlimitInf+")"; | ||||
ExpressionEvaluator.Parse(angle, "t"); | ||||
tmp = ExpressionEvaluator.Eval(vals); | ||||
tmp *= twistx*2*PI/scalex; | ||||
angle = QString::number(tmp)+"*x"; | ||||
after_1 = "(y*cos("+angle+") - z*sin("+angle+"))"; | ||||
after_2 = "(y*sin("+angle+") + z*cos("+angle+"))"; | ||||
ImplicitFunction = ImplicitFunction_save; | ||||
ImplicitFunction.replace(QChar('y'), "u"); | ||||
ImplicitFunction.replace(QChar('z'), "v"); | ||||
ImplicitFunction.replace(QChar('u'), after_1); | ||||
ImplicitFunction.replace(QChar('v'), after_2); | ||||
}*/ | ||||
return ImplicitFunction; | return ImplicitFunction; | |||
} | } | |||
QString IsoTransformation::Twisty(QString ImplicitFunction) | QString IsoTransformation::Twisty(QString ImplicitFunction) | |||
{ | { | |||
return ImplicitFunction; | return ImplicitFunction; | |||
} | } | |||
QString IsoTransformation::Twistz(QString ImplicitFunction) | QString IsoTransformation::Twistz(QString ImplicitFunction) | |||
{ | { | |||
return ImplicitFunction; | return ImplicitFunction; | |||
} | } | |||
End of changes. 1 change blocks. | ||||
23 lines changed or deleted | 0 lines changed or added |