diff --git a/acdc.pro b/acdc.pro
index 41015d53bf658b8e86656d6c815997715d2ba24c..1646899b9e5ee1e5e1301e8d4e4b0e44789e8d01 100644
--- a/acdc.pro
+++ b/acdc.pro
@@ -1,17 +1,12 @@
-include (/usr/local/qtango/include/qtango6/qtango.pri)
+isEmpty(CUMBIA_ROOT) {
+ CUMBIA_ROOT=/usr/local/cumbia-libs
+}
+include($${CUMBIA_ROOT}/include/quapps/quapps.pri)
-TEMPLATE = app
-
-QT +=
-
-CONFIG +=
+# CONFIG += debug | release
DEFINES += QT_NO_DEBUG_OUTPUT
-OBJECTS_DIR = obj
-
-# RESOURCES +=
-
RESOURCES += acdc.qrc
SOURCES += src/main.cpp \
@@ -19,11 +14,65 @@ SOURCES += src/main.cpp \
HEADERS += src/acdc.h
-FORMS = src/acdc.ui
+# cuuimake runs uic
+# FORMS = src/acdc.ui
+#
+
+# but we need to include ui_xxxx.h file amongst the headers
+# in order to be recompiled when it changes
+#
+HEADERS += \
+ ui_acdc.h
-TARGET = bin/acdc
+# - ui: where to find cuuimake ui_*.h files
+# since FORMS is not used
+# - src: where to find headers included by
+# ui_*.h (e.g. for custom widget promoted
+# from the Qt designer)
+#
+INCLUDEPATH += ui src
+
+TARGET = acdc
+
+!wasm-emscripten {
+ TARGET = bin/$${TARGET}
+} else {
+ TARGET = wasm/$${TARGET}
+}
+
+#
+# make install works if INSTALL_DIR is given to qmake
+#
+!isEmpty(INSTALL_DIR) {
+ wasm-emscripten {
+ inst.files = wasm/*
+ } else {
+ inst.files = $${TARGET}
+ }
+ inst.path = $${INSTALL_DIR}
+ INSTALLS += inst
+ message("-")
+ message("INSTALLATION")
+ message(" execute `make install` to install '$PROJECT_NAME$' under $${INSTALL_DIR} ")
+ message("-")
+} else {
+ message("-")
+ message("INSTALLATION")
+ message(" call qmake INSTALL_DIR=/usr/local/bin to install $PROJECT_NAME$ later with `make install` ")
+ message("-")
+}
# unix:LIBS += -L. -lmylib
-# unix:INCLUDEPATH += . ../../src
+# unix:INCLUDEPATH += . ../../src
+
+message("-")
+message("NOTE")
+message("You need to run cuuimake in order to build the project")
+message("-")
+message(" cuuimake --show-config to see cuuimake configuration options")
+message(" cuuimake --configure to configure cuuimake")
+message(" cuuimake -jN to execute cuuimake and then make -jN")
+message(" cuuimake --make to run cuuimake and then make")
+message("-")
diff --git a/src/acdc.cpp b/src/acdc.cpp
index fe4789c30fd4e2d08fc165d128b282b158e1681b..d185d41dfe22b7316c9d44a67ee6d87e9114ca52 100644
--- a/src/acdc.cpp
+++ b/src/acdc.cpp
@@ -1,13 +1,28 @@
#include "acdc.h"
+// cumbia
+#include <cumbiapool.h>
+#include <cuserviceprovider.h>
+#include <cumacros.h>
+#include <quapps.h>
+#include <qulabel.h>
+// cumbia
+
#include "ui_acdc.h"
-Acdc::Acdc(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::Acdc)
+Acdc::Acdc(CumbiaPool *cumbia_pool, QWidget *parent) :
+ QWidget(parent) /* , ui(new Ui::Acdc) // ## qumbiaprojectwizard: instantiated in constructor body */
{
- ui->setupUi(this);
-// connect(ui->cbEnableWrite, SIGNAL(toggled(bool)), this, SLOT(enableWrite(bool)));
- // ui->cbEnableWrite->setChecked(false);
+
+// cumbia
+ CuModuleLoader mloader(cumbia_pool, &m_ctrl_factory_pool, &m_log_impl);
+ cu_pool = cumbia_pool;
+ ui = new Ui::Acdc;
+ ui->setupUi(this, cu_pool, m_ctrl_factory_pool);
+
+ // mloader.modules() to get the list of loaded modules
+ // cumbia
+ connect(ui->cbShowUnits, SIGNAL(toggled(bool)), this, SLOT(m_show_units(bool)));
+ m_show_units(true);
}
Acdc::~Acdc()
@@ -15,9 +30,9 @@ Acdc::~Acdc()
delete ui;
}
-void Acdc::enableWrite(bool en)
-{
- foreach(TReaderWriter *rw, findChildren<TReaderWriter *>())
- rw->setReadOnly(!en);
+void Acdc::m_show_units(bool show) {
+ foreach(QuLabel *l, findChildren<QuLabel *>())
+ l->setDisplayUnitEnabled(show);
}
+
diff --git a/src/acdc.h b/src/acdc.h
index 9e1065378617a0b73b8e9c3ef36a7fb7d61f3aad..65250d4b953649d2aa7e790afce331afb29b3531 100644
--- a/src/acdc.h
+++ b/src/acdc.h
@@ -1,6 +1,12 @@
#ifndef Acdc_H
#define Acdc_H
+// cumbia
+#include <qulogimpl.h>
+#include <cucontrolsfactorypool.h>
+class CumbiaPool;
+// cumbia
+
#include <QWidget>
namespace Ui {
@@ -12,16 +18,21 @@ class Acdc : public QWidget
Q_OBJECT
public:
- explicit Acdc(QWidget *parent = 0);
+ explicit Acdc(CumbiaPool *cu_p, QWidget *parent = 0);
~Acdc();
private slots:
-
- void enableWrite(bool en);
-
+ void m_show_units(bool show);
private:
Ui::Acdc *ui;
+// cumbia
+ CumbiaPool *cu_pool;
+ QuLogImpl m_log_impl;
+ CuControlsFactoryPool m_ctrl_factory_pool;
+ // cumbia
+
};
#endif // Acdc_H
+
diff --git a/src/acdc.ui b/src/acdc.ui
index 2f58c22e70803231b2d4d8cd19be9b4fea73c3ae..0b3d75051cf368856f3df591c090eff5d11e8429 100644
--- a/src/acdc.ui
+++ b/src/acdc.ui
@@ -34,7 +34,7 @@
<x>500</x>
<y>580</y>
<width>231</width>
- <height>111</height>
+ <height>101</height>
</rect>
</property>
<property name="autoFillBackground">
@@ -55,7 +55,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_24">
+ <widget class="QuInputOutput" name="tReaderWriter_24">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
@@ -65,19 +65,16 @@
<property name="source">
<string>pos/movers/z_m6_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
- <property name="zoomPercentage">
+ <property name="zoomPercentage" stdset="0">
<double>100.000000000000000</double>
</property>
- <property name="writerPosition">
- <enum>TReaderWriter::South</enum>
- </property>
</widget>
</item>
<item row="0" column="2">
- <widget class="TLed" name="tLed_24">
+ <widget class="QuLed" name="tLed_24">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -108,9 +105,9 @@
<property name="geometry">
<rect>
<x>960</x>
- <y>520</y>
- <width>200</width>
- <height>131</height>
+ <y>470</y>
+ <width>241</width>
+ <height>151</height>
</rect>
</property>
<property name="autoFillBackground">
@@ -121,17 +118,17 @@
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="2" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_8">
+ <widget class="QuInputOutput" name="tReaderWriter_8">
<property name="source">
<string>pos/movers/r_m8_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="2" column="2">
- <widget class="TLed" name="tLed_8">
+ <widget class="QuLed" name="tLed_8">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -154,7 +151,7 @@
</widget>
</item>
<item row="0" column="2">
- <widget class="TLed" name="tLed_7">
+ <widget class="QuLed" name="tLed_7">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -167,7 +164,7 @@
</widget>
</item>
<item row="3" column="2">
- <widget class="TLed" name="tLed_9">
+ <widget class="QuLed" name="tLed_9">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -190,17 +187,17 @@
</widget>
</item>
<item row="3" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_9">
+ <widget class="QuInputOutput" name="tReaderWriter_9">
<property name="source">
<string>pos/movers/y_m8_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_7">
+ <widget class="QuInputOutput" name="tReaderWriter_7">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
@@ -210,7 +207,7 @@
<property name="source">
<string>pos/movers/p_m8_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
@@ -230,10 +227,10 @@
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
- <x>140</x>
- <y>220</y>
- <width>200</width>
- <height>131</height>
+ <x>99</x>
+ <y>190</y>
+ <width>241</width>
+ <height>161</height>
</rect>
</property>
<property name="autoFillBackground">
@@ -254,7 +251,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="TReaderWriter" name="tReaderWriter">
+ <widget class="QuInputOutput" name="tReaderWriter">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
@@ -264,13 +261,13 @@
<property name="source">
<string>pos/movers/p_m1_dmrc_pos.01/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="0" column="2">
- <widget class="TLed" name="tLed">
+ <widget class="QuLed" name="tLed">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -293,17 +290,17 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_2">
+ <widget class="QuInputOutput" name="tReaderWriter_2">
<property name="source">
<string>pos/movers/r_m1_dmrc_pos.01/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="1" column="2">
- <widget class="TLed" name="tLed_2">
+ <widget class="QuLed" name="tLed_2">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -326,17 +323,17 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_3">
+ <widget class="QuInputOutput" name="tReaderWriter_3">
<property name="source">
<string>pos/movers/y_m1_dmrc_pos.01/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="2" column="2">
- <widget class="TLed" name="tLed_3">
+ <widget class="QuLed" name="tLed_3">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -378,7 +375,7 @@
<x>179</x>
<y>520</y>
<width>311</width>
- <height>131</height>
+ <height>161</height>
</rect>
</property>
<property name="font">
@@ -405,7 +402,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_4">
+ <widget class="QuInputOutput" name="tReaderWriter_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
@@ -415,13 +412,13 @@
<property name="source">
<string>pos/movers/p_m5_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="0" column="2">
- <widget class="TLed" name="tLed_4">
+ <widget class="QuLed" name="tLed_4">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -444,17 +441,17 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_5">
+ <widget class="QuInputOutput" name="tReaderWriter_5">
<property name="source">
<string>pos/movers/r_m5_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="1" column="2">
- <widget class="TLed" name="tLed_5">
+ <widget class="QuLed" name="tLed_5">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -477,17 +474,17 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_6">
+ <widget class="QuInputOutput" name="tReaderWriter_6">
<property name="source">
<string>pos/movers/y_m5_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="2" column="2">
- <widget class="TLed" name="tLed_6">
+ <widget class="QuLed" name="tLed_6">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -506,8 +503,8 @@
<rect>
<x>740</x>
<y>580</y>
- <width>200</width>
- <height>131</height>
+ <width>211</width>
+ <height>161</height>
</rect>
</property>
<property name="autoFillBackground">
@@ -518,7 +515,7 @@
</property>
<layout class="QGridLayout" name="gridLayout_10">
<item row="0" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_25">
+ <widget class="QuInputOutput" name="tReaderWriter_25">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
@@ -526,9 +523,9 @@
</sizepolicy>
</property>
<property name="source">
- <string>pos/movers/p_m7_dmrc_pos.02/AxisCurrentPosition</string>
+ <string>pos/movers/p_m7_dmrc_pos.02/Position</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
@@ -544,7 +541,7 @@
</widget>
</item>
<item row="0" column="2">
- <widget class="TLed" name="tLed_25">
+ <widget class="QuLed" name="tLed_25">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -557,17 +554,17 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_26">
+ <widget class="QuInputOutput" name="tReaderWriter_26">
<property name="source">
- <string>pos/movers/r_m7_dmrc_pos.02/AxisCurrentPosition</string>
+ <string>pos/movers/r_m7_dmrc_pos.02/Position</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="1" column="2">
- <widget class="TLed" name="tLed_26">
+ <widget class="QuLed" name="tLed_26">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -590,7 +587,7 @@
</widget>
</item>
<item row="2" column="2">
- <widget class="TLed" name="tLed_27">
+ <widget class="QuLed" name="tLed_27">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -603,11 +600,11 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_27">
+ <widget class="QuInputOutput" name="tReaderWriter_27">
<property name="source">
<string>pos/movers/z_m7_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
@@ -627,10 +624,10 @@
<widget class="QGroupBox" name="groupBox_8">
<property name="geometry">
<rect>
- <x>800</x>
- <y>40</y>
- <width>200</width>
- <height>111</height>
+ <x>789</x>
+ <y>19</y>
+ <width>230</width>
+ <height>131</height>
</rect>
</property>
<property name="autoFillBackground">
@@ -641,7 +638,7 @@
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_22">
+ <widget class="QuInputOutput" name="tReaderWriter_22">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
@@ -651,12 +648,9 @@
<property name="source">
<string>pos/movers/p_m3_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
- <property name="writerPosition">
- <enum>TReaderWriter::South</enum>
- </property>
</widget>
</item>
<item row="1" column="0">
@@ -680,7 +674,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_23">
+ <widget class="QuInputOutput" name="tReaderWriter_23">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
@@ -690,13 +684,13 @@
<property name="source">
<string>pos/movers/r_m3_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="0" column="2">
- <widget class="TLed" name="tLed_22">
+ <widget class="QuLed" name="tLed_22">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -709,7 +703,7 @@
</widget>
</item>
<item row="1" column="2">
- <widget class="TLed" name="tLed_23">
+ <widget class="QuLed" name="tLed_23">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -742,10 +736,10 @@
<widget class="QGroupBox" name="groupBox_5">
<property name="geometry">
<rect>
- <x>1150</x>
- <y>230</y>
- <width>200</width>
- <height>131</height>
+ <x>1109</x>
+ <y>200</y>
+ <width>241</width>
+ <height>161</height>
</rect>
</property>
<property name="autoFillBackground">
@@ -766,7 +760,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_13">
+ <widget class="QuInputOutput" name="tReaderWriter_13">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
@@ -776,13 +770,13 @@
<property name="source">
<string>pos/movers/p_m4_dmrc_pos.03/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="0" column="2">
- <widget class="TLed" name="tLed_13">
+ <widget class="QuLed" name="tLed_13">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -805,17 +799,17 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_14">
+ <widget class="QuInputOutput" name="tReaderWriter_14">
<property name="source">
<string>pos/movers/r_m4_dmrc_pos.03/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="1" column="2">
- <widget class="TLed" name="tLed_14">
+ <widget class="QuLed" name="tLed_14">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -838,17 +832,17 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_15">
+ <widget class="QuInputOutput" name="tReaderWriter_15">
<property name="source">
<string>pos/movers/y_m4_dmrc_pos.03/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="2" column="2">
- <widget class="TLed" name="tLed_15">
+ <widget class="QuLed" name="tLed_15">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -866,9 +860,9 @@
<property name="geometry">
<rect>
<x>460</x>
- <y>40</y>
- <width>200</width>
- <height>111</height>
+ <y>19</y>
+ <width>230</width>
+ <height>131</height>
</rect>
</property>
<property name="autoFillBackground">
@@ -889,7 +883,7 @@
</widget>
</item>
<item row="1" column="2">
- <widget class="TLed" name="tLed_17">
+ <widget class="QuLed" name="tLed_17">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -912,7 +906,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_16">
+ <widget class="QuInputOutput" name="tReaderWriter_16">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
@@ -922,26 +916,23 @@
<property name="source">
<string>pos/movers/p_m2_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
- <property name="writerPosition">
- <enum>TReaderWriter::South</enum>
- </property>
</widget>
</item>
<item row="1" column="1">
- <widget class="TReaderWriter" name="tReaderWriter_17">
+ <widget class="QuInputOutput" name="tReaderWriter_17">
<property name="source">
<string>pos/movers/r_m2_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="targets">
+ <property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="0" column="2">
- <widget class="TLed" name="tLed_16">
+ <widget class="QuLed" name="tLed_16">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -971,6 +962,19 @@
</item>
</layout>
</widget>
+ <widget class="QCheckBox" name="cbShowUnits">
+ <property name="geometry">
+ <rect>
+ <x>1350</x>
+ <y>740</y>
+ <width>121</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Show Units</string>
+ </property>
+ </widget>
<zorder>label</zorder>
<zorder>groupBox_2</zorder>
<zorder>groupBox_10</zorder>
@@ -980,6 +984,7 @@
<zorder>groupBox_9</zorder>
<zorder>groupBox_3</zorder>
<zorder>groupBox</zorder>
+ <zorder>cbShowUnits</zorder>
</widget>
</widget>
</item>
@@ -988,29 +993,14 @@
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
- <class>TLabel</class>
- <extends>ELabel</extends>
- <header>TLabel</header>
- </customwidget>
- <customwidget>
- <class>TLed</class>
- <extends>ELed</extends>
- <header>TLed</header>
- </customwidget>
- <customwidget>
- <class>TReaderWriter</class>
- <extends>TLabel</extends>
- <header>TReaderWriter</header>
- </customwidget>
- <customwidget>
- <class>ELabel</class>
- <extends>QLabel</extends>
- <header>elabel.h</header>
+ <class>QuLed</class>
+ <extends>QWidget</extends>
+ <header>quled.h</header>
</customwidget>
<customwidget>
- <class>ELed</class>
- <extends>QWidget</extends>
- <header>eled.h</header>
+ <class>QuInputOutput</class>
+ <extends>QFrame</extends>
+ <header>quinputoutput.h</header>
</customwidget>
</customwidgets>
<resources>
diff --git a/src/main.cpp b/src/main.cpp
index 5a6d7a23bfab78ee7a9e28f4739dd1636320d094..e2cc29512c8330354bc6c8ccbe7510258fa99fb7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,9 +1,18 @@
#include "acdc.h"
-#include <TApplication>
-#include <tutil.h>
+// #include <TApplication>
+// cumbia
+#include <cumbiapool.h>
+#include <cuthreadfactoryimpl.h>
+#include <qthreadseventbridgefactory.h>
+// cumbia
+
+#include <quapplication.h>// TApplication is mapped into QuApplication. DBus connection is provided by the cumbia dbus plugin // ## added by qumbiaprojectwizard
+// #include <tutil.h>
+// no cumbia include replacement found for tutil.h
#include <X11/Xlib.h>
#include <QX11Info>
-#include <elettracolors.h>
+// #include <elettracolors.h>
+// no cumbia include replacement found for elettracolors.h
#define CVSVERSION "$Name: $"
@@ -11,28 +20,47 @@
int main(int argc, char *argv[])
{
- TApplication a( argc, argv );
- a.setOrganizationName("-");
- a.setApplicationName("-");
+// TApplication qu_app( argc, argv );
+ QuApplication qu_app( argc, argv );// TApplication is mapped into QuApplication. DBus connection is provided by cumbia dbus plugin // ## added by qumbiaprojectwizard
+ qu_app.setOrganizationName("-");
+ qu_app.setApplicationName("-");
QString version(CVSVERSION);
- a.setApplicationVersion(version);
- a.setProperty("author", "Giacomo");
- a.setProperty("mail", "giacomo.strangolino@elettra.eu");
- a.setProperty("phone", "0403758073");
- a.setProperty("office", "T2Pt025");
- a.setProperty("hwReferent", "-"); /* name of the referent that provides the device server */
+ qu_app.setApplicationVersion(version);
+ qu_app.setProperty("author", "Giacomo");
+ qu_app.setProperty("mail", "giacomo.strangolino@elettra.eu");
+ qu_app.setProperty("phone", "0403758073");
+ qu_app.setProperty("office", "T2Pt025");
+ qu_app.setProperty("hwReferent", "-"); /* name of the referent that provides the device server */
- TUtil::instance()->setLoggingTarget(argv[0]);
+// TUtil::instance()->setLoggingTarget(argv[0]);
+// QTango TUtil:: class is not present in cumbia // ## added by qumbiaprojectwizard
+
+ CumbiaPool *cu_p = new CumbiaPool();
+
- Acdc w;
- if(w.property("epalette").isValid())
- a.setPalette(EPalette(w.property("epalette").toString()));
- w.show();
- /* register to window manager */
+ Acdc *w = new Acdc(cu_p, 0);
+// if(w->property("epalette").isValid())
+// EPalette is not currently available in cumbia // ## added by qumbiaprojectwizard
+// qu_app.setPalette(EPalette(w->property("epalette").toString()));
+// EPalette is not currently available in cumbia // ## added by qumbiaprojectwizard
+ w->show();
+
Display *disp = QX11Info::display();
- Window root_win = (Window) w.winId();
+ Window root_win = (Window) w->winId();
XSetCommand(disp, root_win, argv, argc);
- return a.exec();
+// exec application loop
+ int ret = qu_app.exec();
+ // delete resources and return
+ delete w;
+
+ for(std::string n : cu_p->names())
+ if(cu_p->get(n))
+ delete cu_p->get(n);
+
+ return ret;
+
+
}
+