Skip to content

Commit 1b0274a

Browse files
committed
Check windows build
1 parent f3aac49 commit 1b0274a

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ using namespace SCIRun::Core::Logging;
8181
using namespace SCIRun::Core::Thread;
8282

8383
//TODO: temporary for compilation.
84-
//#ifdef _WIN32
85-
//#define USE_MATLAB_ENGINE_LIBRARY
86-
//#endif
84+
#ifdef _WIN32
85+
#define USE_MATLAB_ENGINE_LIBRARY
86+
#endif
8787

8888
#ifdef USE_MATLAB_ENGINE_LIBRARY
8989
// symbols from the matlab engine library - import from the dll/so manually to not
@@ -730,10 +730,10 @@ bool InterfaceWithMatlabImpl::send_matlab_job()
730730
success = (engEvalString(engine_, command.c_str()) == 0);
731731

732732
std::string output(output_buffer_);
733-
std::string cmd = get_id()+" AddOutput \"" + InterfaceWithMatlab::totclstring(output) + "\"";
734-
TCLInterface::lock();
733+
std::string cmd = module_->get_id().id_ + " AddOutput \"" + totclstring(output) + "\"";
734+
#ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
735735
TCLInterface::execute(cmd);
736-
TCLInterface::unlock();
736+
#endif
737737

738738
std::cout << output_buffer_ << std::endl;
739739

@@ -1693,17 +1693,17 @@ bool InterfaceWithMatlabImpl::isStringOutputPortConnected(int index) const
16931693
return(true);
16941694
}
16951695

1696-
#if 0
1697-
bool InterfaceWithMatlab::delete_temp_directory()
1696+
1697+
bool InterfaceWithMatlabImpl::delete_temp_directory()
16981698
{
16991699
if(temp_directory_ != "") tfmanager_.delete_tempdir(temp_directory_);
17001700
temp_directory_ = "";
17011701
return(true);
17021702
}
17031703

1704-
std::string InterfaceWithMatlab::totclstring(std::string &instring)
1704+
std::string InterfaceWithMatlabImpl::totclstring(const std::string &instring)
17051705
{
1706-
int strsize = instring.size();
1706+
size_t strsize = instring.size();
17071707
int specchar = 0;
17081708
for (int p = 0; p < strsize; p++)
17091709
if ((instring[p]=='\n')||(instring[p]=='\t')||(instring[p]=='\b')||(instring[p]=='\r')||(instring[p]=='{')||(instring[p]=='}')
@@ -1730,7 +1730,7 @@ bool InterfaceWithMatlabImpl::isStringOutputPortConnected(int index) const
17301730

17311731
return(newstring);
17321732
}
1733-
1733+
#if 0
17341734
void InterfaceWithMatlab::tcl_command(GuiArgs& args, void* userdata)
17351735
{
17361736
if (args.count() > 1)

0 commit comments

Comments
 (0)