3party/easy_profiler
0
0
Fork 0
mirror of https://github.com/yse/easy_profiler.git synced 2024-12-28 01:04:41 +08:00
Code Issues Projects Releases Wiki Activity

(GUI) Now you can use host name instead of ip-address

Browse Source
This commit is contained in:
Victor Zarubkin 2016-12-10 12:54:17 +03:00
parent 1984035d04
commit e5b1485cec
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
profiler_gui/main_window.cpp
View File

@ -117,7 +117,7 @@ inline void clear_stream(std::stringstream& _stream)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("127.0.0.1"), m_lastPort(::profiler::DEFAULT_PORT) EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastPort(::profiler::DEFAULT_PORT)
{ {
{ QIcon icon(":/logo"); if (!icon.isNull()) QApplication::setWindowIcon(icon); } { QIcon icon(":/logo"); if (!icon.isNull()) QApplication::setWindowIcon(icon); }
@ -191,8 +191,8 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("127.0.0.1"), m_lastP
lbl->setContentsMargins(5, 0, 2, 0); lbl->setContentsMargins(5, 0, 2, 0);
toolbar->addWidget(lbl); toolbar->addWidget(lbl);
m_ipEdit = new QLineEdit(); m_ipEdit = new QLineEdit();
QRegExp rx("^0*(2(5[0-5]|[0-4]\\d)|1?\\d{1,2})(\\.0*(2(5[0-5]|[0-4]\\d)|1?\\d{1,2})){3}$"); //QRegExp rx("^0*(2(5[0-5]|[0-4]\\d)|1?\\d{1,2})(\\.0*(2(5[0-5]|[0-4]\\d)|1?\\d{1,2})){3}$");
m_ipEdit->setValidator(new QRegExpValidator(rx, m_ipEdit)); //m_ipEdit->setValidator(new QRegExpValidator(rx, m_ipEdit));
m_ipEdit->setText(m_lastAddress); m_ipEdit->setText(m_lastAddress);
m_ipEdit->setFixedWidth(m_ipEdit->fontMetrics().width(QString("255.255.255.255")) + 20); m_ipEdit->setFixedWidth(m_ipEdit->fontMetrics().width(QString("255.255.255.255")) + 20);
toolbar->addWidget(m_ipEdit); toolbar->addWidget(m_ipEdit);
@ -1354,39 +1354,39 @@ void EasyMainWindow::onFrameTimeEditFinish()
void EasyMainWindow::onConnectClicked(bool) void EasyMainWindow::onConnectClicked(bool)
{ {
auto text = m_ipEdit->text(); auto text = m_ipEdit->text();
auto parts = text.split(QChar('.')); // auto parts = text.split(QChar('.'));
if (parts.size() != 4) // if (parts.size() != 4)
{ // {
QMessageBox::warning(this, "Warning", "Invalid IP-Address", QMessageBox::Close); // QMessageBox::warning(this, "Warning", "Invalid IP-Address", QMessageBox::Close);
//
// if (EASY_GLOBALS.connected)
// {
// // Restore last values
// m_ipEdit->setText(m_lastAddress);
// m_portEdit->setText(QString::number(m_lastPort));
// }
//
// return;
// }
//
// for (auto& part : parts)
// {
// int i = 0;
// for (; i < part.size(); ++i)
// {
// if (part[i] != QChar('0'))
// break;
// }
//
// if (i < part.size())
// part = part.mid(i);
// else
// part = "0";
// }
if (EASY_GLOBALS.connected) QString& address = text;// parts.join(QChar('.'));
{
// Restore last values
m_ipEdit->setText(m_lastAddress);
m_portEdit->setText(QString::number(m_lastPort));
}
return;
}
for (auto& part : parts)
{
int i = 0;
for (; i < part.size(); ++i)
{
if (part[i] != QChar('0'))
break;
}
if (i < part.size())
part = part.mid(i);
else
part = "0";
}
QString address = parts.join(QChar('.'));
const decltype(m_lastPort) port = m_portEdit->text().toUShort(); const decltype(m_lastPort) port = m_portEdit->text().toUShort();
m_ipEdit->setText(address); //m_ipEdit->setText(address);
const bool isReconnecting = (EASY_GLOBALS.connected && m_listener.port() == port && address.toStdString() == m_listener.address()); const bool isReconnecting = (EASY_GLOBALS.connected && m_listener.port() == port && address.toStdString() == m_listener.address());
if (EASY_GLOBALS.connected) if (EASY_GLOBALS.connected)