Reformat

Author: dcwhite

src/Modules/Legacy/Matlab/Interface/InterfaceWithMatlab.cc

@@ -654,13 +654,13 @@ void InterfaceWithMatlab::execute()
     error("InterfaceWithMatlab: Could not create m-file code for matlabengine");
     return;
   }
-#if 0
-  if (!send_matlab_job())
+
+  if (!impl_->send_matlab_job())
   {
     error("InterfaceWithMatlab: Matlab returned an error or Matlab could not be launched");
     return;
   }
-
+#if 0
   if (!load_output_matrices())
   {
     error("InterfaceWithMatlab: Could not load matrices that matlab generated");
@@ -669,86 +669,81 @@ void InterfaceWithMatlab::execute()
 #endif
 }
 
-#if 0
-  void InterfaceWithMatlab::presave()
+bool InterfaceWithMatlabImpl::send_matlab_job()
+{
+  std::string mfilename = mfile_.substr(0,mfile_.size()-2); // strip the .m
+  std::string remotefile = file_transfer_->remote_file(mfilename);
+#ifndef USE_MATLAB_ENGINE_LIBRARY
+  IComPacketHandle packet = new IComPacket;
+
+  if (packet.get_rep() == 0)
   {
-    TCLInterface::execute(get_id() + " update_text");  // update matlab-code before saving.
+    error("InterfaceWithMatlab: Could not create packet");
+    return(false);
   }
 
-  bool InterfaceWithMatlab::send_matlab_job()
-  {
-    std::string mfilename = mfile_.substr(0,mfile_.size()-2); // strip the .m
-    std::string remotefile = file_transfer_->remote_file(mfilename);
-#ifndef USE_MATLAB_ENGINE_LIBRARY
-    IComPacketHandle packet = new IComPacket;
+  thread_info_->dolock();
+  thread_info_->code_done_ = false;
+  thread_info_->unlock();
 
-    if (packet.get_rep() == 0)
-    {
-      error("InterfaceWithMatlab: Could not create packet");
-      return(false);
-    }
+  packet->settag(TAG_MCODE);
+  packet->setstring(remotefile);
+  matlab_engine_->send(packet);
 
-    thread_info_->dolock();
-    thread_info_->code_done_ = false;
-    thread_info_->unlock();
-
-    packet->settag(TAG_MCODE);
-    packet->setstring(remotefile);
-    matlab_engine_->send(packet);
-
-    thread_info_->dolock();
-    if (!thread_info_->code_done_)
+  thread_info_->dolock();
+  if (!thread_info_->code_done_)
+  {
+    thread_info_->wait_code_done_.wait(thread_info_->lock);
+  }
+  bool success = thread_info_->code_success_;
+  bool exitcond = thread_info_->exit_;
+  if (!success)
+  {
+    if (exitcond)
     {
-      thread_info_->wait_code_done_.wait(thread_info_->lock);
+      error("InterfaceWithMatlab: the matlab engine crashed or did not start: "+ thread_info_->code_error_);
+      error("InterfaceWithMatlab: possible causes are:");
+      error("(1) matlab code failed in such a way that the engine was no able to catch the error (e.g. failure mex of code)");
+      error("(2) matlab crashed and the matlab engine detected an end of communication of the matlab process");
+      error("(3) temparory files could not be created or are corrupted");
+      error("(4) improper matlab version, use matlab V5 or higher, currently matlab V5-V7 are supported");
     }
-    bool success = thread_info_->code_success_;
-    bool exitcond = thread_info_->exit_;
-    if (!success)
+    else
     {
-      if (exitcond)
-      {
-        error("InterfaceWithMatlab: the matlab engine crashed or did not start: "+ thread_info_->code_error_);
-        error("InterfaceWithMatlab: possible causes are:");
-        error("(1) matlab code failed in such a way that the engine was no able to catch the error (e.g. failure mex of code)");
-        error("(2) matlab crashed and the matlab engine detected an end of communication of the matlab process");
-        error("(3) temparory files could not be created or are corrupted");
-        error("(4) improper matlab version, use matlab V5 or higher, currently matlab V5-V7 are supported");
-      }
-      else
-      {
-        error("InterfaceWithMatlab: matlab code failed: "+thread_info_->code_error_);
-        error("InterfaceWithMatlab: Detected an error in the Matlab code, the matlab engine is still running and caught the exception");
-        error("InterfaceWithMatlab: Please check the matlab code in the GUI and try again. The output window in the GUI should contain the reported error message generated by matlab");
-      }
-      thread_info_->code_done_ = false;
-      thread_info_->unlock();
-      return(false);
+      error("InterfaceWithMatlab: matlab code failed: "+thread_info_->code_error_);
+      error("InterfaceWithMatlab: Detected an error in the Matlab code, the matlab engine is still running and caught the exception");
+      error("InterfaceWithMatlab: Please check the matlab code in the GUI and try again. The output window in the GUI should contain the reported error message generated by matlab");
     }
     thread_info_->code_done_ = false;
     thread_info_->unlock();
+    return(false);
+  }
+  thread_info_->code_done_ = false;
+  thread_info_->unlock();
 
 #else
-    std::string command = std::string("addpath('") + remotefile.substr(0,remotefile.size()-12) +"');";
-    bool success = (engEvalString(engine_, command.c_str()) == 0);
+  std::string command = std::string("addpath('") + remotefile.substr(0,remotefile.size()-12) +"');";
+  bool success = (engEvalString(engine_, command.c_str()) == 0);
 
-    command = "scirun_code;";
-    success = (engEvalString(engine_, command.c_str()) == 0);
+  command = "scirun_code;";
+  success = (engEvalString(engine_, command.c_str()) == 0);
 
-    std::string output(output_buffer_);
-    std::string cmd = get_id()+" AddOutput \"" + InterfaceWithMatlab::totclstring(output) + "\"";
-    TCLInterface::lock();
-    TCLInterface::execute(cmd);
-    TCLInterface::unlock();
+  std::string output(output_buffer_);
+  std::string cmd = get_id()+" AddOutput \"" + InterfaceWithMatlab::totclstring(output) + "\"";
+  TCLInterface::lock();
+  TCLInterface::execute(cmd);
+  TCLInterface::unlock();
 
-    std::cout << output_buffer_ << std::endl;
+  std::cout << output_buffer_ << std::endl;
 
-    // without this, matlab will cache the first file as a function and ignore the rest of them.
-    engEvalString(engine_, "clear functions");
-    // output_buffer_ has output in it - do something with it
+  // without this, matlab will cache the first file as a function and ignore the rest of them.
+  engEvalString(engine_, "clear functions");
+  // output_buffer_ has output in it - do something with it
 #endif
-    return(success);
-  }
+  return(success);
+}
 
+#if 0
   bool InterfaceWithMatlab::send_input(std::string str)
   {
 #ifndef USE_MATLAB_ENGINE_LIBRARY
@@ -977,13 +972,13 @@ void InterfaceWithMatlab::execute()
       if(!(matlab_engine_->recv(packet)))
       {
         matlab_engine_->close();
-        //file_transfer_->close();
+        file_transfer_->close();
         module_->error(std::string("InterfaceWithMatlab: Could not get answer from matlab engine (error=") + matlab_engine_->geterror() + std::string(")"));
         module_->error(std::string("InterfaceWithMatlab: This is an internal communication error, make sure that the portnumber is correct"));
         module_->error(std::string("InterfaceWithMatlab: If address information is correct, this most probably points to a bug in the SCIRun software"));
 
         matlab_engine_.reset();
-        //file_transfer_ = 0;
+        file_transfer_.reset();
 
         return(false);
       }
@@ -992,7 +987,7 @@ void InterfaceWithMatlab::execute()
       if (packet->gettag() == TAG_MERROR)
       {
         matlab_engine_->close();
-        //file_transfer_->close();
+        file_transfer_->close();
 
         module_->error(std::string("InterfaceWithMatlab: InterfaceWithMatlab engine returned an error (error=") + packet->getstring() + std::string(")"));
         module_->error(std::string("InterfaceWithMatlab: Please check whether '[MATLAB_DIRECTORY]/services/matlabengine.rc' has been setup properly"));
@@ -1001,7 +996,7 @@ void InterfaceWithMatlab::execute()
         module_->error(std::string("InterfaceWithMatlab: If you running matlab remotely, this file must be edited on the machine running matlab"));
 
         matlab_engine_.reset();
-        //file_transfer_ = 0;
+        file_transfer_.reset();
 
         return(false);
       }
@@ -1010,11 +1005,11 @@ void InterfaceWithMatlab::execute()
       if (!thread_info_)
       {
         matlab_engine_->close();
-        //file_transfer_->close();
+        file_transfer_->close();
 
         module_->error("InterfaceWithMatlab: Could not create thread information object");
         matlab_engine_.reset();
-        //file_transfer_ = 0;
+        file_transfer_.reset();
 
         return(false);
       }