matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sign: Disable Port TxMode/StreamsType config in GUI based on port state

Browse Source
This commit is contained in:
Srivats P 2016-10-28 18:27:24 +05:30
parent 1f4a825042
commit 2185bf2855
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/portconfigdialog.cpp
View File

@ -20,7 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
#include "portconfigdialog.h" #include "portconfigdialog.h"
#include "settings.h" #include "settings.h"
PortConfigDialog::PortConfigDialog(OstProto::Port &portConfig, QWidget *parent) PortConfigDialog::PortConfigDialog(
OstProto::Port &portConfig,
const OstProto::PortState &portState,
QWidget *parent)
: QDialog(parent), portConfig_(portConfig) : QDialog(parent), portConfig_(portConfig)
{ {
QString currentUser(portConfig_.user_name().c_str()); QString currentUser(portConfig_.user_name().c_str());
@ -77,6 +80,12 @@ PortConfigDialog::PortConfigDialog(OstProto::Port &portConfig, QWidget *parent)
Q_ASSERT(false); // Unreachable!!! Q_ASSERT(false); // Unreachable!!!
break; break;
} }
// Disable UI elements based on portState
if (portState.is_transmit_on()) {
transmitModeBox->setDisabled(true);
signedStreamsButton->setDisabled(true);
}
} }
void PortConfigDialog::accept() void PortConfigDialog::accept()

4
client/portconfigdialog.h
View File

@ -27,7 +27,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
class PortConfigDialog : public QDialog, public Ui::PortConfigDialog class PortConfigDialog : public QDialog, public Ui::PortConfigDialog
{ {
public: public:
PortConfigDialog(OstProto::Port &portConfig, QWidget *parent); PortConfigDialog(OstProto::Port &portConfig,
const OstProto::PortState& portState,
QWidget *parent);
private: private:
virtual void accept(); virtual void accept();

11
client/portswindow.cpp
View File

@ -718,18 +718,19 @@ void PortsWindow::on_actionPort_Configuration_triggered()
if (!plm->isPort(current)) if (!plm->isPort(current))
return; return;
Port &port = plm->port(current);
OstProto::Port config; OstProto::Port config;
// XXX: we don't call Port::protoDataCopyInto() to get config b'coz // XXX: we don't call Port::protoDataCopyInto() to get config b'coz
// we want only the modifiable fields populated to send to Drone // we want only the modifiable fields populated to send to Drone
// TODO: extend Port::protoDataCopyInto() to accept an optional param // TODO: extend Port::protoDataCopyInto() to accept an optional param
// which says copy only modifiable fields // which says copy only modifiable fields
//plm->port(current).protoDataCopyInto(&config); //plm->port(current).protoDataCopyInto(&config);
config.set_transmit_mode(plm->port(current).transmitMode()); config.set_transmit_mode(port.transmitMode());
config.set_streams_type(plm->port(current).streamsType()); config.set_streams_type(port.streamsType());
config.set_is_exclusive_control(plm->port(current).hasExclusiveControl()); config.set_is_exclusive_control(port.hasExclusiveControl());
config.set_user_name(plm->port(current).userName().toStdString()); config.set_user_name(port.userName().toStdString());
PortConfigDialog dialog(config, this); PortConfigDialog dialog(config, port.getStats().state(), this);
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
plm->portGroup(current.parent()).modifyPort(current.row(), config); plm->portGroup(current.parent()).modifyPort(current.row(), config);