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

new naming of channels

parent ab537aed
Branches master
Tags 1.0.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 2
− 1
View file @ 46507335
...@@ -20,5 +20,6 @@ core* ...@@ -20,5 +20,6 @@ core*
software software
oldsrc oldsrc
qrc_*.cpp qrc_*.cpp
ui/ui*.h ui_*.h
src/ui_shutterseedprobe.h
.qmake.stash .qmake.stash
src/shutter.cpp
+ 2
− 2
View file @ 46507335
...@@ -58,8 +58,8 @@ void Shutter::usage() { ...@@ -58,8 +58,8 @@ void Shutter::usage() {
void Shutter::toggleProbe() void Shutter::toggleProbe()
{ {
Tango::DeviceAttribute da0("Shutter5",false); Tango::DeviceAttribute da0("channel5",false);
Tango::DeviceAttribute da1("Shutter5",true); Tango::DeviceAttribute da1("channel5",true);
// cout<< "TOGGLE1"<<endl;usleep(300000); //0.3 sec // cout<< "TOGGLE1"<<endl;usleep(300000); //0.3 sec
// cout<< "TOGGLE0"<<endl; // cout<< "TOGGLE0"<<endl;
try{ try{
......
src/shutterseedprobe.ui
+ 16
− 7
View file @ 46507335
...@@ -123,7 +123,16 @@ p, li { white-space: pre-wrap; } ...@@ -123,7 +123,16 @@ p, li { white-space: pre-wrap; }
</size> </size>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
...@@ -167,7 +176,7 @@ p, li { white-space: pre-wrap; } ...@@ -167,7 +176,7 @@ p, li { white-space: pre-wrap; }
<string>Open</string> <string>Open</string>
</property> </property>
<property name="targets"> <property name="targets">
<string>$1/Shutter6(true);;</string> <string>$1/channel6(true);;;;</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -183,7 +192,7 @@ p, li { white-space: pre-wrap; } ...@@ -183,7 +192,7 @@ p, li { white-space: pre-wrap; }
<string>Close</string> <string>Close</string>
</property> </property>
<property name="targets"> <property name="targets">
<string>$1/Shutter6(false);;</string> <string>$1/channel6(false);;;;</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -222,7 +231,7 @@ p, li { white-space: pre-wrap; } ...@@ -222,7 +231,7 @@ p, li { white-space: pre-wrap; }
<string>CLOSED</string> <string>CLOSED</string>
</property> </property>
<property name="source"> <property name="source">
<string>$1/Shutter6</string> <string>$1/channel6</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -239,7 +248,7 @@ p, li { white-space: pre-wrap; } ...@@ -239,7 +248,7 @@ p, li { white-space: pre-wrap; }
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing"> <property name="spacing">
<number>-1</number> <number>6</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
...@@ -357,12 +366,12 @@ p, li { white-space: pre-wrap; } ...@@ -357,12 +366,12 @@ p, li { white-space: pre-wrap; }
<customwidget> <customwidget>
<class>ELabel</class> <class>ELabel</class>
<extends>QLabel</extends> <extends>QLabel</extends>
<header>ELabel</header> <header>elabel.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>ELed</class> <class>ELed</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>ELed</header> <header>eled.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
......
src/ui_shutterseedprobe.h deleted 100644 → 0
+ 0
− 241
View file @ ab537aed
/********************************************************************************
** Form generated from reading UI file 'shutterseedprobe.ui'
**
** Created by: Qt User Interface Compiler version 5.11.1
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef UI_SHUTTERSEEDPROBE_H
#define UI_SHUTTERSEEDPROBE_H
#include <QtCore/QVariant>
#include <QtWidgets/QApplication>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QWidget>
#include "ELabel"
#include "ELed"
#include "TLabel"
#include "TLed"
#include "TLogButton"
#include "TPushButton"
QT_BEGIN_NAMESPACE
class Ui_Shutter
{
public:
QVBoxLayout *verticalLayout_2;
QLabel *label_5;
QWidget *widget;
QGridLayout *gridLayout;
QLabel *label_6;
QLabel *label_7;
TPushButton *tPushButton_3;
TPushButton *tPushButton_4;
TLabel *tLabel_4;
QPushButton *toggleButton;
QHBoxLayout *horizontalLayout;
TLed *state_tLed;
TLabel *status_tLabel;
QVBoxLayout *verticalLayout;
TLogButton *tLogButton;
void setupUi(QWidget *Shutter)
{
if (Shutter->objectName().isEmpty())
Shutter->setObjectName(QStringLiteral("Shutter"));
Shutter->resize(536, 334);
QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(Shutter->sizePolicy().hasHeightForWidth());
Shutter->setSizePolicy(sizePolicy);
Shutter->setMinimumSize(QSize(536, 334));
Shutter->setMaximumSize(QSize(605, 385));
verticalLayout_2 = new QVBoxLayout(Shutter);
verticalLayout_2->setObjectName(QStringLiteral("verticalLayout_2"));
label_5 = new QLabel(Shutter);
label_5->setObjectName(QStringLiteral("label_5"));
QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed);
sizePolicy1.setHorizontalStretch(1);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(label_5->sizePolicy().hasHeightForWidth());
label_5->setSizePolicy(sizePolicy1);
label_5->setMinimumSize(QSize(0, 40));
label_5->setMaximumSize(QSize(16777215, 40));
QPalette palette;
QBrush brush(QColor(109, 113, 121, 255));
brush.setStyle(Qt::SolidPattern);
palette.setBrush(QPalette::Active, QPalette::WindowText, brush);
palette.setBrush(QPalette::Inactive, QPalette::WindowText, brush);
QBrush brush1(QColor(146, 145, 144, 255));
brush1.setStyle(Qt::SolidPattern);
palette.setBrush(QPalette::Disabled, QPalette::WindowText, brush1);
label_5->setPalette(palette);
QFont font;
font.setPointSize(20);
font.setBold(true);
font.setWeight(75);
label_5->setFont(font);
label_5->setAlignment(Qt::AlignCenter);
verticalLayout_2->addWidget(label_5);
widget = new QWidget(Shutter);
widget->setObjectName(QStringLiteral("widget"));
QSizePolicy sizePolicy2(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
sizePolicy2.setHorizontalStretch(1);
sizePolicy2.setVerticalStretch(1);
sizePolicy2.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
widget->setSizePolicy(sizePolicy2);
widget->setMinimumSize(QSize(440, 127));
gridLayout = new QGridLayout(widget);
gridLayout->setSpacing(5);
gridLayout->setContentsMargins(0, 0, 0, 0);
gridLayout->setObjectName(QStringLiteral("gridLayout"));
label_6 = new QLabel(widget);
label_6->setObjectName(QStringLiteral("label_6"));
label_6->setMinimumSize(QSize(100, 28));
label_6->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
gridLayout->addWidget(label_6, 0, 0, 1, 1);
label_7 = new QLabel(widget);
label_7->setObjectName(QStringLiteral("label_7"));
label_7->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
gridLayout->addWidget(label_7, 1, 0, 1, 1);
tPushButton_3 = new TPushButton(widget);
tPushButton_3->setObjectName(QStringLiteral("tPushButton_3"));
QFont font1;
font1.setBold(true);
font1.setWeight(75);
tPushButton_3->setFont(font1);
gridLayout->addWidget(tPushButton_3, 1, 2, 1, 1);
tPushButton_4 = new TPushButton(widget);
tPushButton_4->setObjectName(QStringLiteral("tPushButton_4"));
tPushButton_4->setFont(font1);
gridLayout->addWidget(tPushButton_4, 1, 3, 1, 1);
tLabel_4 = new TLabel(widget);
tLabel_4->setObjectName(QStringLiteral("tLabel_4"));
QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Minimum);
sizePolicy3.setHorizontalStretch(2);
sizePolicy3.setVerticalStretch(0);
sizePolicy3.setHeightForWidth(tLabel_4->sizePolicy().hasHeightForWidth());
tLabel_4->setSizePolicy(sizePolicy3);
tLabel_4->setMinimumSize(QSize(90, 28));
tLabel_4->setTrueColor(QColor(255, 255, 255));
tLabel_4->setFalseColor(QColor(249, 186, 7));
gridLayout->addWidget(tLabel_4, 1, 4, 1, 1);
toggleButton = new QPushButton(widget);
toggleButton->setObjectName(QStringLiteral("toggleButton"));
gridLayout->addWidget(toggleButton, 0, 1, 1, 3);
verticalLayout_2->addWidget(widget);
horizontalLayout = new QHBoxLayout();
#ifndef Q_OS_MAC
horizontalLayout->setSpacing(-1);
#endif
horizontalLayout->setObjectName(QStringLiteral("horizontalLayout"));
horizontalLayout->setContentsMargins(0, 0, -1, -1);
state_tLed = new TLed(Shutter);
state_tLed->setObjectName(QStringLiteral("state_tLed"));
QSizePolicy sizePolicy4(QSizePolicy::Preferred, QSizePolicy::Preferred);
sizePolicy4.setHorizontalStretch(0);
sizePolicy4.setVerticalStretch(2);
sizePolicy4.setHeightForWidth(state_tLed->sizePolicy().hasHeightForWidth());
state_tLed->setSizePolicy(sizePolicy4);
state_tLed->setRectangular(true);
state_tLed->setGradientEnabled(false);
state_tLed->setLedWidth(22);
state_tLed->setLedHeight(58);
state_tLed->setProperty("ledHheight", QVariant(24));
horizontalLayout->addWidget(state_tLed);
status_tLabel = new TLabel(Shutter);
status_tLabel->setObjectName(QStringLiteral("status_tLabel"));
QSizePolicy sizePolicy5(QSizePolicy::Preferred, QSizePolicy::Expanding);
sizePolicy5.setHorizontalStretch(2);
sizePolicy5.setVerticalStretch(2);
sizePolicy5.setHeightForWidth(status_tLabel->sizePolicy().hasHeightForWidth());
status_tLabel->setSizePolicy(sizePolicy5);
status_tLabel->setMinimumSize(QSize(210, 60));
status_tLabel->setWordWrap(true);
horizontalLayout->addWidget(status_tLabel);
verticalLayout = new QVBoxLayout();
verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
tLogButton = new TLogButton(Shutter);
tLogButton->setObjectName(QStringLiteral("tLogButton"));
QSizePolicy sizePolicy6(QSizePolicy::Minimum, QSizePolicy::Fixed);
sizePolicy6.setHorizontalStretch(0);
sizePolicy6.setVerticalStretch(1);
sizePolicy6.setHeightForWidth(tLogButton->sizePolicy().hasHeightForWidth());
tLogButton->setSizePolicy(sizePolicy6);
tLogButton->setMinimumSize(QSize(42, 28));
tLogButton->setMaximumSize(QSize(60, 28));
verticalLayout->addWidget(tLogButton);
horizontalLayout->addLayout(verticalLayout);
verticalLayout_2->addLayout(horizontalLayout);
retranslateUi(Shutter);
QMetaObject::connectSlotsByName(Shutter);
} // setupUi
void retranslateUi(QWidget *Shutter)
{
Shutter->setWindowTitle(QApplication::translate("Shutter", "Form", nullptr));
label_5->setText(QApplication::translate("Shutter", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-size:20pt; font-weight:600; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Seed /Probe Laser shutters</p></body></html>", nullptr));
label_6->setText(QApplication::translate("Shutter", "Probe", nullptr));
label_7->setText(QApplication::translate("Shutter", "Seed (pump)", nullptr));
tPushButton_3->setText(QApplication::translate("Shutter", "Open", nullptr));
tPushButton_3->setTargets(QApplication::translate("Shutter", "$1/Shutter6(true);;", nullptr));
tPushButton_4->setText(QApplication::translate("Shutter", "Close", nullptr));
tPushButton_4->setTargets(QApplication::translate("Shutter", "$1/Shutter6(false);;", nullptr));
tLabel_4->setTrueString(QApplication::translate("Shutter", "OPENED", nullptr));
tLabel_4->setFalseString(QApplication::translate("Shutter", "CLOSED", nullptr));
tLabel_4->setSource(QApplication::translate("Shutter", "$1/Shutter6", nullptr));
toggleButton->setText(QApplication::translate("Shutter", "Toggle open/close", nullptr));
state_tLed->setSource(QApplication::translate("Shutter", "$1/State", nullptr));
status_tLabel->setText(QApplication::translate("Shutter", "Acquisition running", nullptr));
status_tLabel->setSource(QApplication::translate("Shutter", "$1/Status", nullptr));
tLogButton->setText(QApplication::translate("Shutter", "err. log", nullptr));
} // retranslateUi
};
namespace Ui {
class Shutter: public Ui_Shutter {};
} // namespace Ui
QT_END_NAMESPACE
#endif // UI_SHUTTERSEEDPROBE_H
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