Changeset d5f420a in OpenModelica

Timestamp:

2017-10-19T11:15:41+02:00 (7 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

d60db4d4

Parents:

dbc50ee

git-author:

Adeel Asghar <adeel.asghar@…> (07/06/17 12:21:44)

git-committer:

Adeel Asghar <adeel.asghar@…> (10/19/17 11:15:41)

Message:

Removed the unnecessary SimulationServerCheckThread class.
Do not create unnecessary QTcpSocket objects.

Location:

OMEdit/OMEditGUI/Simulation

Files:

• OpcUaClient.cpp (modified) (1 diff)
• SimulationDialog.cpp (modified) (2 diffs)
• SimulationDialog.h (modified) (1 diff)
• SimulationOutputWidget.cpp (modified) (2 diffs)
• SimulationOutputWidget.h (modified) (1 diff)
• SimulationProcessThread.cpp (modified) (2 diffs)
• SimulationProcessThread.h (modified) (3 diffs)

OMEdit/OMEditGUI/Simulation/OpcUaClient.cpp

@@ -31 +31 @@
   UA_StatusCode returnValue = UA_Client_connect(mpClient, UA_ClientConnectionTCP, endPoint.c_str());
 
+  qDebug() << returnValue;
   if (returnValue != UA_STATUSCODE_GOOD) {
     UA_Client_disconnect(mpClient);

OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp

@@ -1113 +1113 @@
     // embedded server port
     if (mpInteractiveSimulationPortNumberTextBox->text().isEmpty()) {
-      // look for an available port
-      QTcpSocket *pSocket = new QTcpSocket();
       qint16 port = 4841;
-      // find a port not previously used by another opc ua server
-      pSocket->connectToHost(QHostAddress::LocalHost, port);
-      while (pSocket->waitForConnected(10)) {
-        port++;
-        pSocket->abort();
-        pSocket->connectToHost(QHostAddress::LocalHost, port);
-      }
       simulationOptions.setInteractiveSimulationPortNumber(port);
       simulationFlags.append(QString("-embeddedServerPort=").append(QString::number(port)));
@@ -1640 +1631 @@
                                                           Helper::scriptingKind, Helper::errorLevel));
   }
-}
-
-/*!
- * \brief SimulationDialog::embeddedServerError
- * \param simulationOptions
- * Handles what should be done if the OPC UA client is unable to bind to the server \n
- * over the selected port. \n
- */
-void SimulationDialog::embeddedServerError(QString error)
-{
-  // make the user aware of the problem
-  QMessageBox::critical(this, QString("%1 - %2").arg(Helper::applicationName, Helper::information),
-                           "Embedded simulation server: " + error, Helper::ok);
 }
 

OMEdit/OMEditGUI/Simulation/SimulationDialog.h

@@ -232 +232 @@
   void simulationProcessFinished(SimulationOptions simulationOptions, QDateTime resultFileLastModifiedDateTime);
   void simulationProcessRunning(SimulationOptions simulationOptions);
-  void embeddedServerError(QString error);
 public slots:
   void numberOfIntervalsRadioToggled(bool toggle);

OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp

@@ -352 +352 @@
   connect(mpSimulationProcessThread, SIGNAL(sendSimulationStarted()), SLOT(simulationProcessStarted()));
   connect(mpSimulationProcessThread, SIGNAL(sendEmbeddedServerReady()), SLOT(embeddedServerReady()));
-  connect(mpSimulationProcessThread, SIGNAL(sendEmbeddedServerError(QString)), SLOT(embeddedServerError(QString)));
   connect(mpSimulationProcessThread, SIGNAL(sendSimulationOutput(QString,StringHandler::SimulationMessageType,bool)),
           SLOT(writeSimulationOutput(QString,StringHandler::SimulationMessageType,bool)));
@@ -579 +578 @@
 
 /*!
- * \brief SimulationOutputWidget::embeddedServerReady
- * Slot activated when SimulationProcessThread sendembeddedServerError signal is raised.\n
- * The provided port is unbound and can be used for communication between the client and remote.
- */
-void SimulationOutputWidget::embeddedServerError(QString error)
-{
-  MainWindow::instance()->getSimulationDialog()->embeddedServerError(error);
-}
-
-/*!
  * \brief SimulationOutputWidget::writeSimulationOutput
  * Slot activated when SimulationProcessThread sendSimulationOutput signal is raised.\n

OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.h

@@ -119 +119 @@
   void simulationProcessStarted();
   void embeddedServerReady();
-  void embeddedServerError(QString error);
   void writeSimulationOutput(QString output, StringHandler::SimulationMessageType type, bool textFormat);
   void simulationProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);

OMEdit/OMEditGUI/Simulation/SimulationProcessThread.cpp

@@ -36 +36 @@
 
 #include <QDir>
-#include <QTcpSocket>
 
 SimulationProcessThread::SimulationProcessThread(SimulationOutputWidget *pSimulationOutputWidget)
@@ -236 +235 @@
 
   if (mpSimulationOutputWidget->getSimulationOptions().isInteractiveSimulation()) {
-    // make sure that the embedded server is ready to be connected to
-    int port = mpSimulationOutputWidget->getSimulationOptions().getInteractiveSimulationPortNumber();
-    SimulationServerCheckThread *pEmbeddedServerCheckThread = new SimulationServerCheckThread(port);
-    connect(pEmbeddedServerCheckThread, SIGNAL(sendEmbeddedServerReady()), this, SLOT(embeddedServerReady()));
-    connect(pEmbeddedServerCheckThread, SIGNAL(sendEmbeddedServerError(QString)), this, SLOT(embeddedServerError(QString)));
-    connect(pEmbeddedServerCheckThread, SIGNAL(finished()), pEmbeddedServerCheckThread, SLOT(deleteLater()));
-    pEmbeddedServerCheckThread->start();
-  }
-}
-
-/*!
- * \brief SimulationServerCheckThread::run
- * Raises the sendEmbeddedServerReady signal when the OPC UA server is ready to be connectd to. \n
- */
-void SimulationServerCheckThread::run()
-{
-  QTcpSocket *pTcpSocket = new QTcpSocket;
-  while (pTcpSocket->state() != QAbstractSocket::ConnectedState) {
-    pTcpSocket->connectToHost(QHostAddress::LocalHost, mPort);
-    msleep(10);
-    if (pTcpSocket->waitForConnected()) {
-      emit sendEmbeddedServerReady();
-    }
-  }
-  // make the user aware of known socket errors
-  if (pTcpSocket->error() && pTcpSocket->error() != QAbstractSocket::UnknownSocketError) {
-    emit sendEmbeddedServerError(pTcpSocket->errorString());
-  }
-}
-
-void SimulationProcessThread::embeddedServerReady()
-{
-  emit sendEmbeddedServerReady();
-}
-
-void SimulationProcessThread::embeddedServerError(QString error)
-{
-  // if, somehow, the client is unable to bind to the server over the specified port
-  emit sendEmbeddedServerError(error);
+    emit sendEmbeddedServerReady();
+  }
 }
 

OMEdit/OMEditGUI/Simulation/SimulationProcessThread.h

@@ -78 +78 @@
   void simulationProcessError(QProcess::ProcessError error);
   void simulationProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
-  void embeddedServerReady();
-  void embeddedServerError(QString error);
 signals:
   void sendCompilationStarted();
@@ -86 +84 @@
   void sendSimulationStarted();
   void sendEmbeddedServerReady();
-  void sendEmbeddedServerError(QString);
   void sendEstablishConnectionRunning();
   void sendSimulationOutput(QString, StringHandler::SimulationMessageType type, bool);
@@ -92 +89 @@
 };
 
-class SimulationServerCheckThread : public QThread
-{
-  Q_OBJECT
-public:
-  SimulationServerCheckThread(int port)
-    : mPort(port) {}
-  ~SimulationServerCheckThread(){}
-  virtual void run();
-private:
-  int mPort;
-signals:
-  void sendEmbeddedServerReady();
-  void sendEmbeddedServerError(QString);
-};
-
 #endif // SIMULATIONPROCESSTHREAD_H