Merge branch 'master' of http://192.168.50.100:3000/jfmartel/ZT
Conflicts: sources/Modbus/PIHistorianManager.cpp
This commit is contained in:
@@ -27,8 +27,9 @@ int CPIHistorianSession::OpenSession(QTcpSocket *ModbusSocket)
|
||||
int CPIHistorianSession::CloseSession()
|
||||
{
|
||||
disconnect(mModbusTCPSocketHandle,SIGNAL(readyRead()),this,SLOT(ModbusDataReady()));
|
||||
CZTLog::instance()->AddLogString(QString("Session avec Historien PI fermée IP locale [%1] - IP HPC [%2]").arg(mModbusTCPSocketHandle->localAddress().toString()).arg(mModbusTCPSocketHandle->peerAddress().toString()),true);
|
||||
|
||||
mModbusTCPSocketHandle->close();
|
||||
CZTLog::instance()->AddLogString(QString("Session avec Historien PI fermée avec succès."),true);
|
||||
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user