parisoobject.h (mathmod-11.0-source) | : | parisoobject.h (mathmod-11.1-source) | ||
---|---|---|---|---|
skipping to change at line 48 | skipping to change at line 48 | |||
}; | }; | |||
class WorkerThread : public QThread | class WorkerThread : public QThread | |||
{ | { | |||
public: | public: | |||
WorkerThread(); | WorkerThread(); | |||
~WorkerThread(); | ~WorkerThread(); | |||
public: | public: | |||
uint CurrentComponent, MyIndex, WorkerThreadsNumber, iStart, iFinish; | uint CurrentComponent, MyIndex, WorkerThreadsNumber, iStart, iFinish; | |||
double stepMorph, pace; | double stepMorph=0.0, pace=0.0; | |||
bool StopCalculations, ParsersAllocated; | bool StopCalculations, ParsersAllocated, ParsersAllocated_C; | |||
int activeMorph, signalVal; | int activeMorph, signalVal; | |||
}; | }; | |||
class MasterThread | class MasterThread | |||
{ | { | |||
public: | public: | |||
FunctionParser *ParisoConditionParser, *RgbtParser, *VRgbtParser, | FunctionParser *ParisoConditionParser, *RgbtParser, *VRgbtParser, | |||
*GradientParser, *NoiseParser, *NoiseShapeParser, Cstparser; | *GradientParser, *NoiseParser, *NoiseShapeParser, Cstparser; | |||
FunctionParser_cd *RgbtParser_C; | ||||
std::vector<std::string> Rgbts, RgbtNames, VRgbts, VRgbtNames, Functs, | std::vector<std::string> Rgbts, RgbtNames, VRgbts, VRgbtNames, Functs, | |||
FunctNames, Consts, ConstNames, SliderNames; | FunctNames, Consts, ConstNames, SliderNames; | |||
std::string Vect, Grid, Const, Funct, Rgbt, VRgbt, Gradient, Noise; | std::string Vect, Grid, Const, Funct, Rgbt, VRgbt, Gradient, Noise; | |||
uint RgbtSize, FunctSize, VRgbtSize, ConstSize, Nb_Sliders; | uint RgbtSize, FunctSize, VRgbtSize, ConstSize, Nb_Sliders; | |||
std::vector<uint> grid, vect; | std::vector<uint> grid, vect; | |||
bool *UsedFunct, *UsedFunct2, gridnotnull, vectnotnull, constnotnull, functn otnull, | bool *UsedFunct, *UsedFunct2, gridnotnull, vectnotnull, constnotnull, functn otnull, | |||
cndnotnull, rgbtnotnull, vrgbtnotnull; | cndnotnull, rgbtnotnull, rgbtnotnull_C, vrgbtnotnull; | |||
std::vector<double> ConstValues, SliderValues; | std::vector<double> ConstValues, SliderValues; | |||
double Octaves, Lacunarity, Gain; | double Octaves, Lacunarity, Gain; | |||
int ParisoCondition; | int ParisoCondition; | |||
ErrorMessage stdError; | ErrorMessage stdError; | |||
public: | public: | |||
MasterThread(); | MasterThread(); | |||
~MasterThread(); | ~MasterThread(); | |||
}; | }; | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 4 lines changed or added |