Skip to content
Snippets Groups Projects
Commit a904362f authored by Claudio Scafuri's avatar Claudio Scafuri :speech_balloon:
Browse files

Merge branch 'lens_tab' into 'master'

Lens tab

See merge request !1
parents d5fda628 1b449b72
No related branches found
No related tags found
1 merge request!1Lens tab
.pydevproject
.project
.cproject
.settings
Makefile
moc
obj
bin
objects
core*
*~
*.pyc
*.so
*.so*
.pylintrc
.metadata
.idea
.cvsignore
.nse_depinfo
software
oldsrc
ui_*
qrc*.cpp
.qmake.stash
CVS
*.user
Al momento:
#define MSCR_STAT_SIZE 11
#define MSCR_STAT_TYPE 0 // bool 0: pneumatic (false), stepper (vertical slit present) (true)
#define MSCR_STAT_POLAR1_MODE 1 // polarimeter 1 continuos (false), discrete (true)
#define MSCR_STAT_POLAR2_PRESENT 2 // polarimeter 2 present (true)
#define MSCR_STAT_POLAR2_MODE 3 // polarimeter 2 continuos (false), discrete (true)
#define MSCR_STAT_HORSLIT_PRESENT 4 // horizontal slit present (true)
#define MSCR_STAT_VER_MOVE_ACK 5 // allowed to move vertical slit (true)
#define MSCR_STAT_HOR_MOVE_ACK 6 // allowed to move horizontal slit (true)
#define MSCR_STAT_LIGHT_ON 7 // light ON (true)
#define MSCR_STAT_SAFETY_SWITCH 8 // safety switch touched (true)
#define MSCR_STAT_PNEUM_MOVING 9 // vetical piston (pneumatic actuator) is moving (true)
#define MSCR_STAT_PNEUM_REACH_ERR 10 // vetical piston (pneumatic actuator) reach error (true)
#define MSCR_STAT_POLAR1_PRESENT 11 // polarimeter 1 present (true)
A shutdown ci saranno alcuni aggiornamenti sull'mscr tra cui il bool 11 che diventerà 1 e tutti gli altri shifteranno di un posto.
La configurazione quindi diventerà :
#define MSCR_STAT_SIZE 12
#define MSCR_STAT_TYPE 0 // bool 0: pneumatic (false), stepper (vertical slit present) (true)
#define MSCR_STAT_POLAR1_PRESENT 1 // polarimeter 2 present (true)
#define MSCR_STAT_POLAR1_MODE 2 // polarimeter 1 continuos (false), discrete (true)
#define MSCR_STAT_POLAR2_PRESENT 3 // polarimeter 2 present (true)
#define MSCR_STAT_POLAR2_MODE 4 // polarimeter 2 continuos (false), discrete (true)
#define MSCR_STAT_HORSLIT_PRESENT 5 // horizontal slit present (true)
#define MSCR_STAT_VER_MOVE_ACK 6 // allowed to move vertical slit (true)
#define MSCR_STAT_HOR_MOVE_ACK 7 // allowed to move horizontal slit (true)
#define MSCR_STAT_LIGHT_ON 8 // light ON (true)
#define MSCR_STAT_SAFETY_SWITCH 9 // safety switch touched (true)
#define MSCR_STAT_PNEUM_MOVING 10 // vertical piston (pneumatic actuator) is moving (true)
#define MSCR_STAT_PNEUM_REACH_ERR 11 // vertical piston (pneumatic actuator) reach error (true)
#define MSCR_STAT_SIZE 12
#define MSCR_STAT_TYPE 0 // bool 0: pneumatic (false), stepper (vertical slit present) (true)
#define MSCR_STAT_POLAR1_PRESENT 1 // polarimeter 2 present (true)
#define MSCR_STAT_POLAR1_MODE 2 // polarimeter 1 continuos (false), discrete (true)
#define MSCR_STAT_POLAR2_PRESENT 3 // polarimeter 2 present (true)
#define MSCR_STAT_POLAR2_MODE 4 // polarimeter 2 continuos (false), discrete (true)
#define MSCR_STAT_HORSLIT_PRESENT 5 // horizontal slit present (true)
#define MSCR_STAT_VER_MOVE_ACK 6 // allowed to move vertical slit (true)
#define MSCR_STAT_HOR_MOVE_ACK 7 // allowed to move horizontal slit (true)
#define MSCR_STAT_LIGHT_ON 8 // light ON (true)
#define MSCR_STAT_SAFETY_SWITCH 9 // safety switch touched (true)
#define MSCR_STAT_PNEUM_MOVING 10 // vertical piston (pneumatic actuator) is moving (true)
#define MSCR_STAT_PNEUM_REACH_ERR 11 // vertical piston (pneumatic actuator) reach error (true)
bin/mscr-gui srv-tango-srf-01:20000/dbd/diagnostics/mscr_dbd.01
......@@ -9,4 +9,4 @@ HEADERS += src/mscr.h
FORMS = src/mscr.ui
TARGET = bin/mscr
TARGET = bin/mscr-gui
......@@ -55,6 +55,13 @@ mscr::mscr(QWidget *parent) : QWidget(parent) {
dd = server->command_inout("GetInstrumentList");
dd >> instruments;
setPolarAttenuation();
std::string contr_type;
server->read_attribute("ControllerType") >> contr_type;
if (contr_type.substr(0,5) != "IFC-B"){
//ui.tabWidget->setTabEnabled(3,false);
ui.tabWidget->removeTab(3);
}
} catch (Tango::DevFailed& ex) {
simpleLog::error("mscr::mscr", ex.errors);
exit(1);
......
This diff is collapsed.
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