Commit 512ddf9f authored by ahoms's avatar ahoms

* moved FrelonAcq from FrelonTacoCcd to common/python/FrelonAcq.py

* implemented Frelon::Camera get/setRoiBinOffset and get/setShutCloseTime
* changed simple internal Frelon::Camera helpers to return objects
* added Point operator %, added Corner setX/Y() and getDir()


git-svn-id: https://scm.blissgarden.org/svn/lima/trunk@209 45c4679d-1946-429d-baad-37912b19538b
parent f702266e
......@@ -57,12 +57,18 @@ class Camera : public HwMaxImageSizeCallbackGen
void setRoi(const Roi& set_roi);
void getRoi(Roi& hw_roi);
void setRoiBinOffset(const Point& roi_bin_offset);
void getRoiBinOffset(Point& roi_bin_offset);
void setTrigMode(TrigMode trig_mode);
void getTrigMode(TrigMode& trig_mode);
void setExpTime(double exp_time);
void getExpTime(double& exp_time);
void setShutCloseTime(double shut_time);
void getShutCloseTime(double& shut_time);
void setLatTime(double lat_time);
void getLatTime(double& lat_time);
......@@ -100,22 +106,30 @@ class Camera : public HwMaxImageSizeCallbackGen
void setFlipMode(int flip_mode);
void getFlipMode(int& flip_mode);
void getMirror(Point& mirror);
void getNbChan(Point& nb_chan);
void getCcdSize(Size& ccd_size);
void getChanSize(Size& chan_size);
Flip getMirror();
Point getNbChan();
Size getCcdSize();
Size getChanSize();
Flip getRoiInsideMirror();
void writeChanRoi(const Roi& chan_roi);
void readChanRoi(Roi& chan_roi);
void xformChanCoords(const Point& point, Point& chan_point,
Corner& ref_corner);
void getImageRoi(const Roi& chan_roi, Roi& image_roi);
void getFinalRoi(const Roi& image_roi, const Point& roi_offset,
Roi& final_roi);
void getChanRoi(const Roi& image_roi, Roi& chan_roi);
void getImageRoiOffset(const Roi& req_roi, const Roi& image_roi,
Point& roi_offset);
void calcImageRoi(const Roi& chan_roi, const Flip& roi_inside_mirror,
Roi& image_roi, Point& roi_bin_offset);
void calcFinalRoi(const Roi& image_roi, const Point& roi_offset,
Roi& final_roi);
void calcChanRoi(const Roi& image_roi, Roi& chan_roi,
Flip& roi_inside_mirror);
void calcImageRoiOffset(const Roi& req_roi, const Roi& image_roi,
Point& roi_offset);
void checkRoiMode(const Roi& roi);
void processSetRoi(const Roi& req_roi, Roi& hw_roi, Roi& chan_roi,
Point& roi_offset);
void setTimeUnitFactor(TimeUnitFactor time_unit_factor);
void getTimeUnitFactor(TimeUnitFactor& time_unit_factor);
......
......@@ -56,12 +56,18 @@ class Camera
void setRoi(const Roi& set_roi);
void getRoi(Roi& hw_roi /Out/);
void setRoiBinOffset(const Point& roi_bin_offset);
void getRoiBinOffset(Point& roi_bin_offset /Out/);
void setTrigMode(TrigMode trig_mode);
void getTrigMode(TrigMode& trig_mode /Out/);
void setExpTime(double exp_time);
void getExpTime(double& exp_time /Out/);
void setShutCloseTime(double shut_time);
void getShutCloseTime(double& shut_time /Out/);
void setLatTime(double lat_time);
void getLatTime(double& lat_time /Out/);
......
This diff is collapsed.
......@@ -507,6 +507,8 @@ void Interface::reset(ResetLevel reset_level)
m_sync.setLatTime(0.0);
m_sync.setTrigMode(IntTrig);
m_cam.setShutCloseTime(0.0);
m_bin.setBin(Bin(1));
m_roi.setRoi(Roi());
......
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