Commit 189f8825 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron

Merge remote branch 'remotes/origin/master'

parents 21863ac7 40ea5188
......@@ -37,7 +37,7 @@ public:
virtual void getCurrImageType(ImageType& curr_image_type);
virtual void setCurrImageType(ImageType curr_image_type);
virtual void getPixelSize(double& pixel_size);
virtual void getPixelSize(double& x_size,double &y_size);
virtual void getDetectorType(std::string& det_type);
virtual void getDetectorModel(std::string& det_model);
......
......@@ -85,10 +85,10 @@ void DetInfoCtrlObj::setCurrImageType(ImageType image_type)
//-----------------------------------------------------
//
//-----------------------------------------------------
void DetInfoCtrlObj::getPixelSize(double& size)
void DetInfoCtrlObj::getPixelSize(double& x_size,double& y_size)
{
DEB_MEMBER_FUNCT();
size= 172.0;
x_size = y_size = 172.0;
}
//-----------------------------------------------------
......
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