Update to dms control phase1.
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <QDialogButtonBox>
|
||||
#include <QPushButton>
|
||||
#include <QRegularExpressionValidator>
|
||||
|
||||
#include "json/jsonobject.h"
|
||||
#include "ui_DicomCfgDialog.h"
|
||||
@@ -39,22 +40,28 @@ DicomCfgDialog::~DicomCfgDialog()
|
||||
|
||||
void DicomCfgDialog::loadServersInfo()
|
||||
{
|
||||
QRegularExpression regex("^(?:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)\\.){3}(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)$");
|
||||
QRegularExpressionValidator* validator = new QRegularExpressionValidator(regex, this);
|
||||
|
||||
host serverInfo;
|
||||
serverInfo = JsonObject::Instance()->getServer(JsonObject::RECON);
|
||||
mUi->recon_AE->setText(serverInfo.ae);
|
||||
mUi->recon_IP->setText(serverInfo.ip);
|
||||
mUi->recon_IP->setValidator(validator);
|
||||
mUi->recon_Name->setText(serverInfo.name);
|
||||
mUi->recon_Port->setText(serverInfo.port);
|
||||
|
||||
serverInfo = JsonObject::Instance()->getServer(JsonObject::PACS);
|
||||
mUi->pacs_AE->setText(serverInfo.ae);
|
||||
mUi->pacs_IP->setText(serverInfo.ip);
|
||||
mUi->pacs_IP->setValidator(validator);
|
||||
mUi->pacs_Name->setText(serverInfo.name);
|
||||
mUi->pacs_Port->setText(serverInfo.port);
|
||||
|
||||
serverInfo = JsonObject::Instance()->getServer(JsonObject::WORKLIST);
|
||||
mUi->wl_AE->setText(serverInfo.ae);
|
||||
mUi->wl_IP->setText(serverInfo.ip);
|
||||
mUi->wl_IP->setValidator(validator);
|
||||
mUi->wl_Name->setText(serverInfo.name);
|
||||
mUi->wl_Port->setText(serverInfo.port);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include "GetIPDialog.h"
|
||||
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include "components/ULineEdit.h"
|
||||
@@ -26,6 +27,12 @@ GetIPDialog::GetIPDialog(QWidget* parent, Qt::WindowFlags f)
|
||||
|
||||
mLabelError->setObjectName(QString::fromUtf8("warn"));
|
||||
formLayout->addRow("", mLabelError);
|
||||
|
||||
//set ip input restrictions
|
||||
QRegularExpression regex("^(?:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)\\.){3}(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)$");
|
||||
QRegularExpressionValidator* validator = new QRegularExpressionValidator(regex, this);
|
||||
mIp->setValidator(validator);
|
||||
mMask->setValidator(validator);
|
||||
}
|
||||
|
||||
GetIPDialog::~GetIPDialog()
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include "GetRouteDialog.h"
|
||||
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include "components/ULineEdit.h"
|
||||
@@ -24,6 +25,13 @@ GetRouteDialog::GetRouteDialog(QWidget* parent, Qt::WindowFlags f)
|
||||
formLayout->addRow(QString(tr("Gateway")), mGateway);
|
||||
mLabelError->setObjectName("warn");
|
||||
formLayout->addRow("", mLabelError);
|
||||
|
||||
//set ip input restrictions
|
||||
QRegularExpression regex("^(?:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)\\.){3}(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)$");
|
||||
QRegularExpressionValidator* validator = new QRegularExpressionValidator(regex, this);
|
||||
mDestination->setValidator(validator);
|
||||
mNetmask->setValidator(validator);
|
||||
mGateway->setValidator(validator);
|
||||
}
|
||||
|
||||
GetRouteDialog::~GetRouteDialog()
|
||||
@@ -63,4 +71,4 @@ bool GetRouteDialog::updateReferenceData()
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <QItemSelectionModel>
|
||||
#include <QGraphicsDropShadowEffect>
|
||||
#include <QRegularExpression>
|
||||
#include <QThread>
|
||||
|
||||
#include "ui_NetworkCfgDialog.h"
|
||||
@@ -68,6 +69,13 @@ NetworkCfgDialog::NetworkCfgDialog(QWidget* parent)
|
||||
mUi->tbl_route->setColumnWidth(2, 230);
|
||||
mUi->tbl_route->horizontalHeader()->setFixedHeight(38);
|
||||
|
||||
//set ip input restrictions
|
||||
QRegularExpression regex("^(?:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)\\.){3}(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)$");
|
||||
QRegularExpressionValidator* validator = new QRegularExpressionValidator(regex, this);
|
||||
mUi->addr_ip->setValidator(validator);
|
||||
mUi->addr_mask->setValidator(validator);
|
||||
mUi->led_gw->setValidator(validator);
|
||||
|
||||
connect(mUi->btn_addr_add, &QPushButton::clicked, [=]()
|
||||
{
|
||||
DialogResult result = DialogManager::Default()->requestEditIpAndNetMask();
|
||||
|
||||
Reference in New Issue
Block a user