Skip to content
Snippets Groups Projects
Commit 5c4581a5 authored by Lucio Zambon's avatar Lucio Zambon
Browse files

sinchronize to PLC updates

parent c625b572
Branches master
Tags 1.0.1
No related merge requests found
...@@ -122,28 +122,36 @@ abi_gun_vacuum_vlv::abi_gun_vacuum_vlv(QWidget *parent) : QWidget(parent) ...@@ -122,28 +122,36 @@ abi_gun_vacuum_vlv::abi_gun_vacuum_vlv(QWidget *parent) : QWidget(parent)
line_config(ui.line_undulator3_1); line_config(ui.line_undulator3_1);
line_config(ui.line_undulator3_2); line_config(ui.line_undulator3_2);
line_config(ui.line_undulator3_3); line_config(ui.line_undulator3_3);
line_config(ui.line_undulator3_4); // line_config(ui.line_undulator3_4);
line_config(ui.line_undulator3_5); // line_config(ui.line_undulator3_5);
line_config(ui.line_undulator3_6); // line_config(ui.line_undulator3_6);
line_config(ui.line_undulator3_7); // line_config(ui.line_undulator3_7);
line_config(ui.line_undulator4_1); line_config(ui.line_undulator4_1);
line_config(ui.line_undulator4_2); // line_config(ui.line_undulator4_2);
line_config(ui.line_undulator4_3); // line_config(ui.line_undulator4_3);
line_config(ui.line_undulator4_4); // line_config(ui.line_undulator4_4);
line_config(ui.line_undulator4_5); // line_config(ui.line_undulator4_5);
line_config(ui.line_undulator4_6); // line_config(ui.line_undulator4_6);
line_config(ui.line_undulator4_7); // line_config(ui.line_undulator4_7);
line_config(ui.line_padres1_1); line_config(ui.line_padres1_1);
line_config(ui.line_padres1_2); line_config(ui.line_padres1_2);
line_config(ui.line_padres1_3); line_config(ui.line_padres1_3);
line_config(ui.line_padres2_1); line_config(ui.line_padres2_1);
line_config(ui.line_padres2_2); line_config(ui.line_padres2_2);
line_config(ui.line_padres2_3); // line_config(ui.line_padres2_3);
line_config(ui.line_padres3_1); line_config(ui.line_padres3_1);
line_config(ui.line_padres3_2); line_config(ui.line_padres3_2);
line_config(ui.line_padres3_3); // line_config(ui.line_padres3_3);
line_config(ui.line_padres4_1); line_config(ui.line_padres4_1);
line_config(ui.line_padres4_2);
line_config(ui.line_padres4_3);
line_config(ui.line_padres4_4);
line_config(ui.line_padres5_1);
line_config(ui.line_padres5_2);
line_config(ui.line_padres6_1);
line_config(ui.line_padres6_2);
connect(ui.minus, SIGNAL(clicked()), this, SLOT(smaller())); connect(ui.minus, SIGNAL(clicked()), this, SLOT(smaller()));
connect(ui.plus, SIGNAL(clicked()), this, SLOT(bigger())); connect(ui.plus, SIGNAL(clicked()), this, SLOT(bigger()));
...@@ -171,6 +179,17 @@ abi_gun_vacuum_vlv::abi_gun_vacuum_vlv(QWidget *parent) : QWidget(parent) ...@@ -171,6 +179,17 @@ abi_gun_vacuum_vlv::abi_gun_vacuum_vlv(QWidget *parent) : QWidget(parent)
if (mydesk.height()>100) while (zoom_levels[zoom_index]*this->height() > mydesk.height()-30 && zoom_index>0) zoom_index--; if (mydesk.height()>100) while (zoom_levels[zoom_index]*this->height() > mydesk.height()-30 && zoom_index>0) zoom_index--;
cout << "zoom_index: " << zoom_index << ", zoom_levels[zoom_index]: " << zoom_levels[zoom_index] << ", mydesk.width(): " << mydesk.width() << ", mydesk.height(): " << mydesk.height() << endl; cout << "zoom_index: " << zoom_index << ", zoom_levels[zoom_index]: " << zoom_levels[zoom_index] << ", mydesk.width(): " << mydesk.width() << ", mydesk.height(): " << mydesk.height() << endl;
if (zoom_index<6) {zoom_index++; smaller();} if (zoom_index<6) {zoom_index++; smaller();}
// init timer
try {
timer = new QTimer(this);
timer->setInterval(1000);
timer->setSingleShot(false);
connect(timer, SIGNAL(timeout()), this, SLOT(refresh()));
timer->start();
}
catch (...) {
cout << "default exception, cannot setup UI" << endl;
}
} }
abi_gun_vacuum_vlv::~abi_gun_vacuum_vlv() abi_gun_vacuum_vlv::~abi_gun_vacuum_vlv()
...@@ -178,6 +197,16 @@ abi_gun_vacuum_vlv::~abi_gun_vacuum_vlv() ...@@ -178,6 +197,16 @@ abi_gun_vacuum_vlv::~abi_gun_vacuum_vlv()
exit(0); exit(0);
} }
void abi_gun_vacuum_vlv::refresh() {
/*
cout << "refresh" << endl;
QList<QVariant> q1 = ui.line_linac6_1->readValue();
if (!q1.isEmpty() && q1.first().toBool()) cout << "OK" << endl;
QList<QVariant> q2 = ui.line_padres3_2->readValue();
if (!q2.isEmpty() && q2.first().toBool()) cout << "OK" << endl; else cout << "NOK" << endl;
// cout << (ui.line_padres3_2->readValue()[0].toBool()? "true":"false") << endl;
*/
}
void abi_gun_vacuum_vlv::line_config(TTable *line) void abi_gun_vacuum_vlv::line_config(TTable *line)
{ {
......
...@@ -44,12 +44,14 @@ public: ...@@ -44,12 +44,14 @@ public:
// void mousePressEvent(QMouseEvent * event ); // void mousePressEvent(QMouseEvent * event );
public slots: public slots:
void refresh();
void open_legend(); void open_legend();
void smaller(); void smaller();
void bigger(); void bigger();
private: private:
Ui::abi_gun_vacuum_vlv ui; Ui::abi_gun_vacuum_vlv ui;
QTimer *timer;
QString imgpath; QString imgpath;
void line_config(TTable *); void line_config(TTable *);
QProcess *legend_process; QProcess *legend_process;
......
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