made some updates on OMS communication with OMC.

// Anders Fernström git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2071 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 2, 2006 · 7c32f99 · 7c32f99
1 parent 1fe3c6f
commit 7c32f99
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 19 deletions.
diff --git a/OMS/inputcelldelegate.h b/OMS/inputcelldelegate.h
@@ -70,6 +70,7 @@ namespace IAEX
    public:
       virtual QString getResult() = 0;
       virtual void evalExpression(QString &expr) = 0;
+	  virtual void closeConnection() = 0;	// Added 2006-02-02 AF
    };
 
 }

diff --git a/OMS/omc_communicator.cpp b/OMS/omc_communicator.cpp
@@ -169,6 +169,8 @@ bool OmcCommunicator::isConnected() const
 */
 void OmcCommunicator::closeConnection()
 {
+	// 2006-02-02 AF, added this code:
+	omc_ = 0;
 }
 
 
@@ -183,7 +185,10 @@ QString OmcCommunicator::callOmc(const QString& fnCall)
 {
 	if (!omc_) {
 		//throw OmcError(fnCall);
-		cerr << "OmcError(" << fnCall.toStdString() << ")" << endl;
+
+		// 2006-02-02 AF, Added throw exception
+		string msg = string("OMC-ERROR in function call: ") + fnCall.toStdString();
+		throw exception( msg.c_str() );
 	}
 
 	QString returnString;
@@ -196,16 +201,7 @@ QString OmcCommunicator::callOmc(const QString& fnCall)
 		{
 			if( fnCall != "quit()" && fnCall != "quit();" )
 			{
-				int result(QMessageBox::critical(0, tr("Communication Error"),
-					tr("<NOBR><B>The Modelica kernel is not responding.</B>"), tr("Try Again"), tr("Abort")));
-				qApp->processEvents();
-				if (result == 1) {
-					QMessageBox::critical(0, tr("Communication Error"),
-						tr("<NOBR><B>Connection to the Modelica kernel lost.</B><BR><BR>The editor has to be restarted.", "Quit"));
-					qApp->processEvents();
-					//throw OmcConnectionLost();
-					cerr << "OmcConnectionLost()" << endl;
-				}
+				throw exception("NOT RESPONDING");
 			}
 			else
 				break;

diff --git a/OMS/omcinteractiveenvironment.cpp b/OMS/omcinteractiveenvironment.cpp
@@ -80,6 +80,19 @@ namespace IAEX
 
    void OmcInteractiveEnvironment::evalExpression(QString &expr)
    {
-	 result_ = comm_.callOmc(expr);
+		// 2006-02-02 AF, Added try-catch
+		try
+		{
+			result_ = comm_.callOmc(expr);
+		}
+		catch( exception &e )
+		{
+			throw e;	
+		}
 	}
+
+   void OmcInteractiveEnvironment::closeConnection()
+   {
+	   comm_.closeConnection();
+   }
 }
diff --git a/OMS/omcinteractiveenvironment.h b/OMS/omcinteractiveenvironment.h
@@ -63,6 +63,7 @@ namespace IAEX
 
       virtual QString getResult();
       virtual void evalExpression(QString &expr);
+	  virtual void closeConnection();	// Added 2006-02-02 AF
    private:
       OmcCommunicator &comm_;
       QString result_;

diff --git a/OMS/oms.cpp b/OMS/oms.cpp
@@ -613,7 +613,18 @@ void OMS::returnPressed()
 	// send command to OMC
 	if( delegate_ )
 	{
-		delegate_->evalExpression( commandText );
+		// 2006-02-02 AF, Added try-catch
+		try
+		{
+			delegate_->evalExpression( commandText );
+		}
+		catch( exception &e )
+		{
+			exceptionInEval(e);
+			return;
+		}
+
+		// get result
 		QString res = delegate_->getResult();
 
 		if( res.isEmpty() )
@@ -622,12 +633,20 @@ void OMS::returnPressed()
 			cursor_.insertText( "\n" + res + "\n" );
 
 		// get Error text
-		delegate_->evalExpression( QString("getErrorString()") );
+		try
+		{
+			delegate_->evalExpression( QString("getErrorString()") );
+		}
+		catch( exception &e )
+		{
+			exceptionInEval(e);
+			return;
+		}
 		QString error = delegate_->getResult();
 		if( error.size() > 2 )
 		{
 			QTextCursor errorCursor = moshError_->textCursor();
-			errorCursor.insertText( error.mid( 1, error.size() - 3 ) + "\n" );
+			errorCursor.insertText( error.mid( 0, error.size() - 1 ) + "\n" );
 		}
 	}
 	else
@@ -640,6 +659,38 @@ void OMS::returnPressed()
 	addCommandLine();
 }
 
+void OMS::exceptionInEval(exception &e)
+{
+	if( string(e.what()) == string("NOT RESPONDING") )
+	{
+		int result = QMessageBox::critical( 0, tr("Communication Error"),
+			tr("<B>OMC is not responding. Do you want to restart OMC?</B>"), 
+			QMessageBox::Yes | QMessageBox::Default,
+			QMessageBox::No );
+
+		if( result == QMessageBox::No )
+		{
+			exit();
+		}
+		else
+		{
+			delegate_->closeConnection();
+			delete delegate_;
+			delegate_ = 0;
+			if( startServer() )
+			{
+				prevCommand();
+				returnPressed();
+			}
+		}
+	}
+	else
+	{
+		QMessageBox::critical( 0, tr("Communication with OMC error"),
+			e.what() );
+	}
+}
+
 void OMS::insertNewline()
 {
 	cursor_ = moshEdit_->textCursor();
@@ -915,15 +966,16 @@ void OMS::print()
 	// TODO: Implement print
 }
 
-void OMS::startServer()
+bool OMS::startServer()
 {
+	bool omcNowStarted = false;
+
 	if( delegate_ == 0 )
 	{
-
-		bool omcNowStarted = false;
 		try
 		{
 			delegate_ = new IAEX::OmcInteractiveEnvironment();
+			omcNowStarted = true;
 		}
 		catch( exception &e )
 		{
@@ -976,6 +1028,8 @@ void OMS::startServer()
 		if( omcNowStarted )
 			delegate_ = new IAEX::OmcInteractiveEnvironment();
 	}
+
+	return omcNowStarted;
 }
 
 void OMS::stopServer()

diff --git a/OMS/oms.h b/OMS/oms.h
@@ -105,7 +105,7 @@ public slots:
 	void viewStatusbar();
 	void aboutOMS();
 	void print();
-	void startServer();
+	bool startServer();
 	void stopServer();
 	void clear();
 
@@ -115,6 +115,7 @@ public slots:
 	void createAction();
 	void createMenu();
 	void createToolbar();
+	void exceptionInEval(exception &e);
 	void addCommandLine();
 	void selectCommandLine();
 	QStringList getFunctionNames(QString);