ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-22 17:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nasa/Trick

Browse Source
This commit is contained in:
John M. Penn 2016-02-22 12:01:30 -06:00
commit fc79d7a36d
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trick_models/Wheelbot/Graphics/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
build
dist
manifest

2
trick_source/java/src/trick/common/TrickApplication.java
View File

@ -733,7 +733,7 @@ public abstract class TrickApplication extends SingleFrameApplication implements
} }
try { try {
ProcessBuilder process = new ProcessBuilder(UIUtils.getTrickBin() + ProcessBuilder process = new ProcessBuilder(UIUtils.getTrickBin() +
File.separator + executable, arguments); File.separator + "trick-" + executable, arguments);
process.redirectOutput(ProcessBuilder.Redirect.INHERIT); process.redirectOutput(ProcessBuilder.Redirect.INHERIT);
process.redirectError(ProcessBuilder.Redirect.INHERIT); process.redirectError(ProcessBuilder.Redirect.INHERIT);
process.start(); process.start();

2
trick_source/java/src/trick/sniffer/SimSnifferApplication.java
View File

@ -57,7 +57,7 @@ public class SimSnifferApplication extends TrickApplication {
if (row != -1) { if (row != -1) {
SimulationInformation simulationInformation = SimulationInformation simulationInformation =
simulations.get(simTable.convertRowIndexToModel(row)); simulations.get(simTable.convertRowIndexToModel(row));
launchTrickApplication("sim_control", launchTrickApplication("simcontrol",
simulationInformation.machine + " " + simulationInformation.machine + " " +
simulationInformation.noHandshakePort); simulationInformation.noHandshakePort);
} }

2
trick_source/sim_services/MemoryManager/MemoryManager_add_attr_info.cpp
View File

@ -60,7 +60,7 @@ int Trick::MemoryManager::add_attr_info( std::string & user_type_string , ATTRIB
std::replace( user_type_name.begin(), user_type_name.end(), '*', ' ') ; std::replace( user_type_name.begin(), user_type_name.end(), '*', ' ') ;
spos = user_type_name.find("const ") ; spos = user_type_name.find("const ") ;
if ( spos != std::string::npos ) { if ( spos != std::string::npos ) {
user_type_name.erase( spos , spos + 5) ; user_type_name.erase( spos , spos + 6) ;
} }
spos = user_type_name.find("[") ; spos = user_type_name.find("[") ;
if ( spos != std::string::npos ) { if ( spos != std::string::npos ) {