Model3D.h (mathmod-11.0-source) | : | Model3D.h (mathmod-11.1-source) | ||
---|---|---|---|---|
skipping to change at line 51 | skipping to change at line 51 | |||
std::string vmax; | std::string vmax; | |||
std::string grid; | std::string grid; | |||
int index; | int index; | |||
}; | }; | |||
class ParWorkerThread : public WorkerThread | class ParWorkerThread : public WorkerThread | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public : | public : | |||
uint Ugrid, Vgrid; | uint Ugrid, Vgrid; | |||
FunctionParser * myParserX, * myParserY,* myParserZ, *myParserW, *Fct; | FunctionParser *myParserZ, *myParserW, *myParserX, *myParserY, *Fct; | |||
FunctionParser_cd *myParserZ_C, *myParserW_C, *myParserX_C, *myParserY_C, *F | ||||
ct_C; | ||||
std::vector<double> v_inf, v_sup,u_inf,u_sup,dif_v,dif_u; | std::vector<double> v_inf, v_sup,u_inf,u_sup,dif_v,dif_u; | |||
int param4D; | int param4D; | |||
bool param3d_C, param4d_C; | ||||
uint CurrentIndex; | uint CurrentIndex; | |||
public : | public : | |||
void ParCompute(uint, uint); | void ParCompute(uint component =0, uint idx=0); | |||
void calcul_objet(uint component =0, uint idx=0); | ||||
void AllocateParsersForWorkerThread(uint, uint); | void AllocateParsersForWorkerThread(uint, uint); | |||
void DeleteWorkerParsers(); | void DeleteWorkerParsers(); | |||
void run() Q_DECL_OVERRIDE; | void run() Q_DECL_OVERRIDE; | |||
ParWorkerThread(); | ParWorkerThread(); | |||
~ParWorkerThread() override; | ~ParWorkerThread() override; | |||
void emitMySignal(); | void emitMySignal(); | |||
signals: | signals: | |||
void mySignal(int); | void mySignal(int); | |||
}; | }; | |||
skipping to change at line 121 | skipping to change at line 122 | |||
~Par3D() override; | ~Par3D() override; | |||
void rotation4(); | void rotation4(); | |||
void calcul_points4(uint idx=0); | void calcul_points4(uint idx=0); | |||
void Anim_Rot4D (uint idx=0); | void Anim_Rot4D (uint idx=0); | |||
void project_4D_to_3D(uint idx=0); | void project_4D_to_3D(uint idx=0); | |||
void Invert_boite_englobante4D(uint idx=0); | void Invert_boite_englobante4D(uint idx=0); | |||
void boite_englobante4D(uint index=0); | void boite_englobante4D(uint index=0); | |||
void initialiser_parametres(uint, uint); | void initialiser_parametres(uint, uint); | |||
void initialiser_LineColumn(uint, uint); | void initialiser_LineColumn(uint, uint); | |||
void calcul_Norm(uint i=0); | void calcul_Norm(uint i=0); | |||
void make_PolyIndexTri(uint p=0); | void make_PolyIndexTri(uint); | |||
void make_PolyIndexMin(uint p=0); | void make_PolyIndexMin(uint, ComponentInfos *); | |||
uint CNDCalculation(uint &, struct ComponentInfos *); | uint CNDCalculation(uint &, struct ComponentInfos *); | |||
void CalculateColorsPoints(struct ComponentInfos *, uint); | void CalculateColorsPoints(struct ComponentInfos *, uint); | |||
void ParamBuild(float **, uint **, uint *, | void ParamBuild(float **, uint **, uint *, | |||
uint *, ComponentInfos *, | uint *, ComponentInfos *, | |||
uint **, | uint **, | |||
uint *, | uint *, | |||
uint *); | uint *); | |||
void InitShowComponent(struct ComponentInfos *); | void InitShowComponent(struct ComponentInfos *); | |||
void BuildPar(); | void BuildPar(); | |||
void UpdateThredsNumber(uint); | void UpdateThredsNumber(uint); | |||
void stopcalculations(bool); | void stopcalculations(bool); | |||
void WorkerThreadCopy(ParWorkerThread *); | void WorkerThreadCopy(ParWorkerThread *); | |||
void MasterThreadCopy(ParMasterThread *); | void MasterThreadCopy(ParMasterThread *); | |||
ErrorMessage ThreadParsersCopy(); | ErrorMessage ThreadParsersCopy(); | |||
ErrorMessage parse_expression2(); | ErrorMessage parse_expression2(); | |||
ErrorMessage parse_expression2_C(); | ||||
ErrorMessage ParMorph(); | ErrorMessage ParMorph(); | |||
void copycomponent(struct ComponentInfos*, struct ComponentInfos*); | void copycomponent(struct ComponentInfos*, struct ComponentInfos*); | |||
void run() Q_DECL_OVERRIDE; | void run() Q_DECL_OVERRIDE; | |||
public : | public : | |||
void emitErrorSignal(); | void emitErrorSignal(); | |||
void emitUpdateMessageSignal(); | void emitUpdateMessageSignal(); | |||
signals: | signals: | |||
void ErrorSignal(int); | void ErrorSignal(int); | |||
void UpdateMessageSignal(QString); | void UpdateMessageSignal(QString); | |||
}; | }; | |||
End of changes. 5 change blocks. | ||||
5 lines changed or deleted | 8 lines changed or added |