diff --git a/Makefile b/Makefile index bc94c2e0d11d27159b59b44be8f757daea39947b..53256683cb85199741b2328f187265aea7930da2 100644 --- a/Makefile +++ b/Makefile @@ -1086,78 +1086,6 @@ moc/moc_hv.cpp: /usr/local/qtango/include/qtango6/twidgetgroup.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qsizepolicy.h \ /usr/local/qt/5.11.1/gcc_64/include/QtGui/qcursor.h \ src/ui_hv.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QApplication \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qapplication.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/qcoreapplication.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/qeventloop.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qdesktopwidget.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qguiapplication.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qinputmethod.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QComboBox \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qcombobox.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractitemdelegate.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qstyleoption.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractspinbox.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qvalidator.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/qregularexpression.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qicon.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qslider.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractslider.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qstyle.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtabbar.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtabwidget.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qrubberband.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/qabstractitemmodel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QDialog \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qdialog.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QFrame \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QLabel \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlabel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QPushButton \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qpushbutton.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractbutton.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QTextEdit \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtextedit.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractscrollarea.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextdocument.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextoption.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextcursor.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextformat.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qpen.h \ - /usr/local/qtango/include/qtango6/TApplyNumeric \ - /usr/local/qtango/include/qtango6/tapplynumeric.h \ - /usr/local/qtango/include/qtango6/eapplynumeric.h \ - /usr/local/qtango/include/qtango6/enumeric.h \ - /usr/local/qtango/include/qtango6/float_delegate.h \ - /usr/local/qtango/include/qtango6/number_delegate.h \ - /usr/local/qtango/include/qtango6/fontscalingwidget.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QWidget \ - /usr/local/qtango/include/qtango6/eapplybutton.h \ - /usr/local/qtango/include/qtango6/econstants.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QBoxLayout \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qboxlayout.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlayout.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlayoutitem.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qgridlayout.h \ - /usr/local/qtango/include/qtango6/com_proxy_writer.h \ - /usr/local/qtango/include/qtango6/TLabel \ - /usr/local/qtango/include/qtango6/tlabel.h \ - /usr/local/qtango/include/qtango6/eflag.h \ - /usr/local/qtango/include/qtango6/elabel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/QtDebug \ - /usr/local/qtango/include/qtango6/elettracolors.h \ - /usr/local/qtango/include/qtango6/esimplelabel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QStyleOptionFrame \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QStyle \ - /usr/local/qtango/include/qtango6/TNumeric \ - /usr/local/qtango/include/qtango6/tnumeric.h \ - /usr/local/qtango/include/qtango6/simple_dataproxy.h \ - /usr/local/qtango/include/qtango6/TPushButton \ - /usr/local/qtango/include/qtango6/tpushbutton.h \ - /usr/local/qtango/include/qtango6/epushbutton.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/QRect \ - /usr/local/qtango/include/qtango6/TTable \ - /usr/local/qtango/include/qtango6/ttable.h \ src/hv.h \ moc/moc_predefs.h \ /usr/local/qt/5.11.1/gcc_64/bin/moc @@ -1177,6 +1105,7 @@ src/ui_hv.h: src/hv.ui \ /usr/local/qtango/include/qtango6/TNumeric \ /usr/local/qtango/include/qtango6/TApplyNumeric \ /usr/local/qtango/include/qtango6/TPushButton \ + /usr/local/qtango/include/qtango6/TReaderWriter \ /usr/local/qtango/include/qtango6/elabel.h \ /usr/local/qtango/include/qtango6/eflag.h \ /usr/local/qtango/include/qtango6/enumeric.h \ @@ -2048,16 +1977,19 @@ objects/hv.o: src/hv.cpp src/hv.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qsizepolicy.h \ /usr/local/qt/5.11.1/gcc_64/include/QtGui/qcursor.h \ src/ui_hv.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QApplication \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qapplication.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/qcoreapplication.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/qeventloop.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qdesktopwidget.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qguiapplication.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qinputmethod.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QComboBox \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qcombobox.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractitemdelegate.h \ + /usr/local/qtango/include/qtango6/qtango.h \ + /usr/local/qtango/include/qtango6/qtangocore.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtCore/QtDebug \ + /usr/local/qtango/include/qtango6/tlabel.h \ + /usr/local/qtango/include/qtango6/eflag.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QLabel \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlabel.h \ + /usr/local/qtango/include/qtango6/elabel.h \ + /usr/local/qtango/include/qtango6/elettracolors.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QDialog \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qdialog.h \ + /usr/local/qtango/include/qtango6/esimplelabel.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QStyleOptionFrame \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qstyleoption.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractspinbox.h \ /usr/local/qt/5.11.1/gcc_64/include/QtGui/qvalidator.h \ @@ -2070,59 +2002,18 @@ objects/hv.o: src/hv.cpp src/hv.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtabwidget.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qrubberband.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qabstractitemmodel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QDialog \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qdialog.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QFrame \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QLabel \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlabel.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QStyle \ + /usr/local/qtango/include/qtango6/fontscalingwidget.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QWidget \ + /usr/local/qtango/include/qtango6/ttable.h \ + /usr/local/qtango/include/qtango6/tlogbutton.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QPushButton \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qpushbutton.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractbutton.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QTextEdit \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtextedit.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractscrollarea.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextdocument.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextoption.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextcursor.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextformat.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qpen.h \ - /usr/local/qtango/include/qtango6/TApplyNumeric \ - /usr/local/qtango/include/qtango6/tapplynumeric.h \ - /usr/local/qtango/include/qtango6/eapplynumeric.h \ - /usr/local/qtango/include/qtango6/enumeric.h \ - /usr/local/qtango/include/qtango6/float_delegate.h \ - /usr/local/qtango/include/qtango6/number_delegate.h \ - /usr/local/qtango/include/qtango6/fontscalingwidget.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QWidget \ - /usr/local/qtango/include/qtango6/eapplybutton.h \ - /usr/local/qtango/include/qtango6/econstants.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QBoxLayout \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qboxlayout.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlayout.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlayoutitem.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qgridlayout.h \ - /usr/local/qtango/include/qtango6/com_proxy_writer.h \ - /usr/local/qtango/include/qtango6/TLabel \ - /usr/local/qtango/include/qtango6/tlabel.h \ - /usr/local/qtango/include/qtango6/eflag.h \ - /usr/local/qtango/include/qtango6/elabel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/QtDebug \ - /usr/local/qtango/include/qtango6/elettracolors.h \ - /usr/local/qtango/include/qtango6/esimplelabel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QStyleOptionFrame \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QStyle \ - /usr/local/qtango/include/qtango6/TNumeric \ - /usr/local/qtango/include/qtango6/tnumeric.h \ - /usr/local/qtango/include/qtango6/simple_dataproxy.h \ - /usr/local/qtango/include/qtango6/TPushButton \ /usr/local/qtango/include/qtango6/tpushbutton.h \ /usr/local/qtango/include/qtango6/epushbutton.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/QRect \ - /usr/local/qtango/include/qtango6/TTable \ - /usr/local/qtango/include/qtango6/ttable.h \ - /usr/local/qtango/include/qtango6/qtango.h \ - /usr/local/qtango/include/qtango6/qtangocore.h \ - /usr/local/qtango/include/qtango6/tlogbutton.h \ + /usr/local/qtango/include/qtango6/com_proxy_writer.h \ /usr/local/qtango/include/qtango6/tled.h \ /usr/local/qtango/include/qtango6/eled.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QMenu \ @@ -2138,6 +2029,7 @@ objects/hv.o: src/hv.cpp src/hv.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/QtCoreDepends \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qabstractanimation.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qabstracteventdispatcher.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtCore/qeventloop.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qabstractnativeeventfilter.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qabstractproxymodel.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qabstractstate.h \ @@ -2151,6 +2043,7 @@ objects/hv.o: src/hv.cpp src/hv.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qcollator.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qcommandlineoption.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qcommandlineparser.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtCore/qcoreapplication.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qcryptographichash.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qdatetime.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qdeadlinetimer.h \ @@ -2234,12 +2127,19 @@ objects/hv.o: src/hv.cpp src/hv.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qwineventnotifier.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qxmlstream.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/qtcoreversion.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QApplication \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qapplication.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qdesktopwidget.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtGui/qguiapplication.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtGui/qinputmethod.h \ /usr/local/qt/5.11.1/gcc_64/include/QtGui/QPixmap \ /usr/local/qtango/include/qtango6/tdbbrowser.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QTreeWidget \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtreewidget.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtreeview.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractitemview.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractscrollarea.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractitemdelegate.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtreewidgetitemiterator.h \ /usr/local/qt/5.11.1/gcc_64/include/QtCore/QSize \ /usr/local/qtango/include/qtango6/eapplicationlauncher.h \ @@ -2249,6 +2149,12 @@ objects/hv.o: src/hv.cpp src/hv.h \ /usr/local/qt/5.11.1/gcc_64/include/QtX11Extras/QX11Info \ /usr/local/qt/5.11.1/gcc_64/include/QtX11Extras/qx11info_x11.h \ /usr/local/qt/5.11.1/gcc_64/include/QtX11Extras/qtx11extrasglobal.h \ + /usr/local/qtango/include/qtango6/tnumeric.h \ + /usr/local/qtango/include/qtango6/enumeric.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QFrame \ + /usr/local/qtango/include/qtango6/float_delegate.h \ + /usr/local/qtango/include/qtango6/number_delegate.h \ + /usr/local/qtango/include/qtango6/simple_dataproxy.h \ /usr/local/qtango/include/qtango6/tspinbox.h \ /usr/local/qtango/include/qtango6/espinboxes.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QDoubleSpinBox \ @@ -2256,15 +2162,30 @@ objects/hv.o: src/hv.cpp src/hv.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QSpinBox \ /usr/local/qt/5.11.1/gcc_64/include/QtGui/QResizeEvent \ /usr/local/qtango/include/qtango6/int_delegate.h \ + /usr/local/qtango/include/qtango6/tapplynumeric.h \ + /usr/local/qtango/include/qtango6/eapplynumeric.h \ + /usr/local/qtango/include/qtango6/eapplybutton.h \ + /usr/local/qtango/include/qtango6/econstants.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QBoxLayout \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qboxlayout.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlayout.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlayoutitem.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qgridlayout.h \ /usr/local/qtango/include/qtango6/tdoublespinbox.h \ /usr/local/qtango/include/qtango6/tlineargauge.h \ /usr/local/qtango/include/qtango6/egauge.h \ /usr/local/qtango/include/qtango6/tcirculargauge.h \ /usr/local/qtango/include/qtango6/tcombobox.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QComboBox \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qcombobox.h \ /usr/local/qtango/include/qtango6/tlineedit.h \ /usr/local/qtango/include/qtango6/elineedit.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QLineEdit \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlineedit.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextcursor.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextformat.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtGui/qpen.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextoption.h \ /usr/local/qtango/include/qtango6/string_delegate.h \ /usr/local/qtango/include/qtango6/tlogdialog.h \ /usr/local/qtango/include/qtango6/ui_logdialog-qt5.h \ @@ -2651,75 +2572,12 @@ objects/main.o: src/main.cpp /usr/local/qtango/include/qtango6/TApplication \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qgroupbox.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qframe.h \ src/ui_hv.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QComboBox \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qcombobox.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractitemdelegate.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qstyleoption.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractspinbox.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qvalidator.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/qregularexpression.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qicon.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qslider.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractslider.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qstyle.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtabbar.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtabwidget.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qrubberband.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/qabstractitemmodel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QDialog \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qdialog.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QFrame \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QLabel \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlabel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QPushButton \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qpushbutton.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractbutton.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QTextEdit \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qtextedit.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qabstractscrollarea.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextdocument.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextoption.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextcursor.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qtextformat.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtGui/qpen.h \ - /usr/local/qtango/include/qtango6/TApplyNumeric \ - /usr/local/qtango/include/qtango6/tapplynumeric.h \ - /usr/local/qtango/include/qtango6/eapplynumeric.h \ - /usr/local/qtango/include/qtango6/enumeric.h \ - /usr/local/qtango/include/qtango6/float_delegate.h \ - /usr/local/qtango/include/qtango6/number_delegate.h \ - /usr/local/qtango/include/qtango6/fontscalingwidget.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QWidget \ - /usr/local/qtango/include/qtango6/eapplybutton.h \ - /usr/local/qtango/include/qtango6/econstants.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QBoxLayout \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qboxlayout.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlayout.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qlayoutitem.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qgridlayout.h \ - /usr/local/qtango/include/qtango6/com_proxy_writer.h \ - /usr/local/qtango/include/qtango6/TLabel \ - /usr/local/qtango/include/qtango6/tlabel.h \ - /usr/local/qtango/include/qtango6/eflag.h \ - /usr/local/qtango/include/qtango6/elabel.h \ - /usr/local/qtango/include/qtango6/elettracolors.h \ - /usr/local/qtango/include/qtango6/esimplelabel.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QStyleOptionFrame \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QStyle \ - /usr/local/qtango/include/qtango6/TNumeric \ - /usr/local/qtango/include/qtango6/tnumeric.h \ - /usr/local/qtango/include/qtango6/simple_dataproxy.h \ - /usr/local/qtango/include/qtango6/TPushButton \ - /usr/local/qtango/include/qtango6/tpushbutton.h \ - /usr/local/qtango/include/qtango6/epushbutton.h \ - /usr/local/qt/5.11.1/gcc_64/include/QtCore/QRect \ - /usr/local/qtango/include/qtango6/TTable \ - /usr/local/qtango/include/qtango6/ttable.h \ /usr/local/qt/5.11.1/gcc_64/include/QtX11Extras/QX11Info \ /usr/local/qt/5.11.1/gcc_64/include/QtX11Extras/qx11info_x11.h \ /usr/local/qt/5.11.1/gcc_64/include/QtX11Extras/qtx11extrasglobal.h \ /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/QMessageBox \ - /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qmessagebox.h + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qmessagebox.h \ + /usr/local/qt/5.11.1/gcc_64/include/QtWidgets/qdialog.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o objects/main.o src/main.cpp objects/moc_hv.o: moc/moc_hv.cpp diff --git a/src/hv.ui b/src/hv.ui index 81fc5c20324a25acff8973012844e738f6bec2ce..adcaa3767a8ff02f74712abf0c20aae8ce02e563 100644 --- a/src/hv.ui +++ b/src/hv.ui @@ -871,41 +871,23 @@ <widget class="TPushButton" name="RampUp_PushButton"> <property name="geometry"> <rect> - <x>70</x> + <x>10</x> <y>10</y> - <width>91</width> + <width>80</width> <height>30</height> </rect> </property> <property name="text"> - <string>Full Power</string> + <string>Ramp to</string> </property> <property name="targets"> <string>$2->RampUp;$4->Acknowledge_all</string> </property> </widget> - <widget class="QLabel" name="current_label_4"> - <property name="geometry"> - <rect> - <x>14</x> - <y>15</y> - <width>51</width> - <height>21</height> - </rect> - </property> - <property name="font"> - <font> - <pointsize>12</pointsize> - </font> - </property> - <property name="text"> - <string>Ramp</string> - </property> - </widget> <widget class="TPushButton" name="Stop_PushButton"> <property name="geometry"> <rect> - <x>350</x> + <x>360</x> <y>50</y> <width>71</width> <height>30</height> @@ -921,9 +903,9 @@ <widget class="QLabel" name="voltageSet_label_8"> <property name="geometry"> <rect> - <x>180</x> + <x>190</x> <y>10</y> - <width>91</width> + <width>88</width> <height>31</height> </rect> </property> @@ -936,7 +918,7 @@ <rect> <x>10</x> <y>50</y> - <width>321</width> + <width>340</width> <height>26</height> </rect> </property> @@ -1566,22 +1548,22 @@ </rect> </property> <property name="numRows"> - <number>16</number> + <number>15</number> </property> <property name="numColumns"> <number>1</number> </property> <property name="trueColors"> - <string>4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4292533728;4293342999</string> + <string>4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4292533728;4293342999;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910;4284344910</string> </property> <property name="falseColors"> - <string>4293342999;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4284344910</string> + <string>4293342999;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4292533728;4284344910;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999;4293342999</string> </property> <property name="trueStrings"> - <string>FuG enabled;Ready;Switching ON;Switching OFF;Ramping UP;Ramping Down;Ramping to low power;Making a new Ramp;Aborting;OFF;Limited Power;Standby;Low Power;Full Power;---;controlled by feedback</string> + <string>FuG enabled;Ready;Switching ON;Switching OFF;Ramping UP;Ramping Down;Ramping to low power;Making a new Ramp;Aborting;OFF;Limited Power;Standby;Low Power;Full Power;---;controlled by feedback;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One;One</string> </property> <property name="falseStrings"> - <string>FuG disabled;Busy;---;---;---;---;---;---;---;---;---;---;---;---;---;controlled by panel</string> + <string>FuG disabled;Busy;---;---;---;---;---;---;---;---;---;---;---;---;---;controlled by panel;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero;Zero</string> </property> <property name="displayMask"> <string/> @@ -1590,6 +1572,32 @@ <string>$2/stateFlags</string> </property> </widget> + <widget class="TReaderWriter" name="voltage100Percent"> + <property name="geometry"> + <rect> + <x>105</x> + <y>420</y> + <width>85</width> + <height>28</height> + </rect> + </property> + <property name="font"> + <font> + <pointsize>15</pointsize> + <weight>75</weight> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string/> + </property> + <property name="source"> + <string>$2/Voltage100Percent</string> + </property> + <property name="targets"> + <string>$2/Voltage100Percent</string> + </property> + </widget> </widget> <layoutdefault spacing="6" margin="11"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> @@ -1619,6 +1627,11 @@ <extends>QPushButton</extends> <header>TPushButton</header> </customwidget> + <customwidget> + <class>TReaderWriter</class> + <extends>TLabel</extends> + <header>TReaderWriter</header> + </customwidget> <customwidget> <class>ELabel</class> <extends>QLabel</extends>