Commit f3627a02 authored by kirov's avatar kirov
Browse files

Use the Bin class.



git-svn-id: https://scm.blissgarden.org/svn/lima/trunk@29 45c4679d-1946-429d-baad-37912b19538b
parent b13e0a58
......@@ -17,12 +17,12 @@ struct GaussPeak {
class FrameBuilder {
public:
int m_bin_X, m_bin_Y; // use Bin calss!
Bin m_bin;
FrameDim m_frame_dim;
FrameBuilder();
FrameBuilder( int bin_X, int bin_Y, FrameDim &frame_dim,
FrameBuilder( Bin &bin, FrameDim &frame_dim,
std::vector<struct GaussPeak> &peaks, double grow_factor );
~FrameBuilder();
......
......@@ -12,8 +12,7 @@ using namespace std;
FrameBuilder::FrameBuilder()
{
m_bin_X = 1;
m_bin_Y = 1;
m_bin = Bin(1,1);
m_frame_dim = FrameDim(1024, 1024, Bpp16);
GaussPeak p={512, 512, 100, 1};
m_peaks.push_back(p);
......@@ -22,14 +21,13 @@ FrameBuilder::FrameBuilder()
}
FrameBuilder::FrameBuilder( int bin_X, int bin_Y,
FrameDim &frame_dim,
FrameBuilder::FrameBuilder( Bin &bin, FrameDim &frame_dim,
std::vector<struct GaussPeak> &peaks,
double grow_factor ):
m_bin_X(bin_X), m_bin_Y(bin_Y),
m_bin(bin),
m_frame_dim(frame_dim),
m_peaks(peaks),
m_grow_factor( grow_factor )
m_grow_factor(grow_factor)
{
m_frame_nr = 0;
}
......
......@@ -105,13 +105,12 @@ void Simulator::getExpTime(double& exp_time)
void Simulator::setBin(Bin bin)
{
m_frame_builder.m_bin_X = bin.getX();
m_frame_builder.m_bin_Y = bin.getY();
m_frame_builder.m_bin = bin;
}
void Simulator::getBin(Bin& bin)
{
bin = Bin(m_frame_builder.m_bin_X, m_frame_builder.m_bin_Y);
bin = m_frame_builder.m_bin;
}
Simulator::Status Simulator::getStatus()
......
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