Skip to content
Snippets Groups Projects
Commit b578682c authored by Giacomo Strangolino's avatar Giacomo Strangolino
Browse files

removed expert

parent 99471959
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/gof.cpp
+ 2
− 33
View file @ b578682c
...@@ -39,22 +39,8 @@ Gof::Gof(QWidget *parent,QString dname1, QString dname2) : QWidget(parent) { ...@@ -39,22 +39,8 @@ Gof::Gof(QWidget *parent,QString dname1, QString dname2) : QWidget(parent) {
cirplos = new CircularPlotMan(this); cirplos = new CircularPlotMan(this);
cirplos->setup(); cirplos->setup();
cirplos->connectSrcs(); cirplos->connectSrcs();
ui.tabWidget->setCurrentIndex(0);
connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(onTabChange(int)));
connect(cirplos, SIGNAL(referenceEnabled(bool,bool)), this, SLOT(referenceEnabled(bool,bool))); connect(cirplos, SIGNAL(referenceEnabled(bool,bool)), this, SLOT(referenceEnabled(bool,bool)));
cirplos->connectSrcs();
QObject *image_plo;
QuImagePluginInterface *plugin_i =
QuImagePluginInterface::get_instance(a->cumbiaPool(), *a->fpool(), &image_plo);
if(!plugin_i)
perr("MyimageApp: failed to load plugin \"%s\"", qstoc(QuImagePluginInterface::file_name()));
else { // image here
img = plugin_i->new_image(ui.image);
// img->setScaleContents(false);
QVBoxLayout *vlo = new QVBoxLayout(ui.image);
vlo->addWidget(img->asWidget());
}
} }
Gof::~Gof() Gof::~Gof()
...@@ -80,10 +66,7 @@ void Gof::on_pushStatus_clicked() ...@@ -80,10 +66,7 @@ void Gof::on_pushStatus_clicked()
gofConf->setAttribute(Qt::WA_DeleteOnClose); gofConf->setAttribute(Qt::WA_DeleteOnClose);
gofConf->setAttribute(Qt::WA_QuitOnClose, false); gofConf->setAttribute(Qt::WA_QuitOnClose, false);
} }
gofConf->show(); gofConf->show();
//QProcess process;
//bool ok=process.startDetached("gofconf-gui");
//if(!ok) cout << "Gulp" << endl;
} }
void Gof::on_pushMonitor_clicked() void Gof::on_pushMonitor_clicked()
...@@ -110,17 +93,3 @@ void Gof::referenceEnabled(bool hor, bool en) { ...@@ -110,17 +93,3 @@ void Gof::referenceEnabled(bool hor, bool en) {
} }
} }
void Gof::onTabChange(int i) {
if(i == 1) {
ui.image->findChild<QWidget *>("image");
img->setSource("$3/fftFiltBuf");
findChild<CircularPlotMan *>()->disconnectSrcs();
}
else {
img->unsetSource();
findChild<CircularPlotMan *>()->connectSrcs();
}
}
src/gof.ui
+ 100
− 133
View file @ b578682c
...@@ -14,142 +14,109 @@ ...@@ -14,142 +14,109 @@
<string>Gof</string> <string>Gof</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="2">
<widget class="QTabWidget" name="tabWidget"> <widget class="QGroupBox" name="groupBox_9">
<property name="currentIndex"> <property name="title">
<number>0</number> <string>Global Feedback Status</string>
</property> </property>
<widget class="QWidget" name="Normal"> <layout class="QHBoxLayout" name="horizontalLayout">
<attribute name="title"> <item>
<string>Normal</string> <widget class="QuLabel" name="tLoopState">
</attribute> <property name="source">
<layout class="QGridLayout" name="gridLayout_2"> <string>$2/state</string>
<item row="0" column="0" colspan="2"> </property>
<widget class="QGroupBox" name="groupBox_9"> </widget>
<property name="title"> </item>
<string>Global Feedback Status</string> <item>
</property> <widget class="QuButton" name="tPushButton_11">
<layout class="QHBoxLayout" name="horizontalLayout"> <property name="text">
<item> <string>On</string>
<widget class="QuLabel" name="tLoopState"> </property>
<property name="source"> <property name="targets" stdset="0">
<string>$2/state</string> <string>$2-&gt;On</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QuButton" name="tPushButton_11"> <widget class="QuButton" name="tPushButton_12">
<property name="text"> <property name="text">
<string>On</string> <string>Standby</string>
</property> </property>
<property name="targets" stdset="0"> <property name="targets" stdset="0">
<string>$2-&gt;On</string> <string>$2-&gt;Standby</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QuButton" name="tPushButton_12"> <widget class="QuButton" name="tPushButton_13">
<property name="text"> <property name="text">
<string>Standby</string> <string>Off</string>
</property> </property>
<property name="targets" stdset="0"> <property name="targets" stdset="0">
<string>$2-&gt;Standby</string> <string>$2-&gt;Off</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QuButton" name="tPushButton_13"> <widget class="QPushButton" name="pushMonitor">
<property name="text"> <property name="text">
<string>Off</string> <string>Orbit and Correctors</string>
</property> </property>
<property name="targets" stdset="0"> </widget>
<string>$2-&gt;Off</string> </item>
</property> <item>
</widget> <widget class="QPushButton" name="pushControl">
</item> <property name="text">
<item> <string>Expert Panel</string>
<widget class="QPushButton" name="pushMonitor"> </property>
<property name="text"> </widget>
<string>Orbit and Correctors</string> </item>
</property> <item>
</widget> <widget class="QPushButton" name="pushStatus">
</item> <property name="enabled">
<item> <bool>true</bool>
<widget class="QPushButton" name="pushControl"> </property>
<property name="text"> <property name="text">
<string>Expert Panel</string> <string>BPM and Correctors Weigths</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="QPushButton" name="pushStatus">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>BPM and Correctors Weigths</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelH">
<property name="text">
<string>Horizontal</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelV">
<property name="text">
<string>Vertical</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QuCircularPlotW" name="plotH" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QuCircularPlotW" name="plotV" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="Expert">
<attribute name="title">
<string>Expert</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>GroupBox</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QWidget" name="image" native="true"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="labelH">
<property name="text">
<string>Horizontal</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelV">
<property name="text">
<string>Vertical</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QuCircularPlotW" name="plotH" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QuCircularPlotW" name="plotV" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
......
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