Commit d3801c07 authored by Locatelli's avatar Locatelli
Browse files

Add virtual inheritance for base classes *Properties in Count

(TimeCountProperties, KineticCountProperties...). That implied to add
init function and empty constructor in some classes.
parent 3e8fbe2c
* Add virtual inheritance for base classes *Properties in Count (TimeCountProperties, KineticCountProperties...). That implied to add init function and empty constructor in some classes.
\ No newline at end of file
......@@ -32,7 +32,11 @@ const string CAENAdcController::TYPE = "adc_controller";
/*
* Constructor
*/
CAENAdcController::CAENAdcController(const string& name) : ExperimentController(name), ClearData(this), acquisition::ListModeProperties(this) {
CAENAdcController::CAENAdcController(const string& name) {
ExperimentController::init(name);
acquisition::ListModeProperties::init(name);
ClearData::init(this);
setFamily(family::ACQUISITION, family::SETTING);
......
......@@ -33,6 +33,12 @@ public:
ClearData(ExperimentController * c) :
controller::Command(c, "clearData", &ClearData::clearData, this) {
}
ClearData() :
controller::Command() {
}
void init(ExperimentController * c) {
controller::Command::init(c, "clearData", &ClearData::clearData, this);
}
virtual void clearData() = 0;
void clearDataCommand(bool logging = false) {
......@@ -54,7 +60,7 @@ public:
*/
class CAENAdcController: public ExperimentController, public ClearData, public acquisition::ListModeProperties {
class CAENAdcController: public virtual ExperimentController, public ClearData, public acquisition::ListModeProperties {
public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment