Modification to system calls

Add wxEXEC_SYNC to account for machine dependent delays in writing run_status

Modification to system calls
Add wxEXEC_SYNC to account for machine dependent delays in writing run_status
Steve Greedy
1 parent 4b3c72cf
Showing 16 changed files with 74 additions and 164 deletions Show diff stats
GUI/SW1/SRC/BUNDLEBLDR.cpp
GUI/SW1/SRC/BUNDLEBLDR.h
GUI/SW1/SRC/BUNDLE_SCHEMATIC.cpp
GUI/SW1/SRC/BUNDLE_SCHEMATIC.h
GUI/SW1/SRC/COAXIAL.cpp
GUI/SW1/SRC/CYLINDRICAL.cpp
GUI/SW1/SRC/DCONN.cpp
GUI/SW1/SRC/EXPORT_SPICE.cpp
GUI/SW1/SRC/FLEXCABLE.cpp
GUI/SW1/SRC/OVERSHIELD.cpp
GUI/SW1/SRC/RUN_STATUS.cpp
GUI/SW1/SRC/SPACEWIRE.cpp
GUI/SW1/SRC/SPICEMODEL.cpp
GUI/SW1/SRC/TP.cpp
GUI/SW1/SRC/TWINAX.cpp
GUI/SW1/SRC/UTP.cpp
@@ -423,7 +423,6 @@ void BUNDLEBLDR::PopulateTheDirectoryTree (wxString Path)
          "*.cable_spec", 0,
         _T("Directory Listing"));
-    // JIB
     Connect(tree->GetTreeCtrl()->GetId(),wxEVT_COMMAND_TREE_ITEM_ACTIVATED, (wxObjectEventFunction) (wxEventFunction)(wxCommandEventFunction) &BUNDLEBLDR::OnTreeSelectionChanged);
@@ -559,6 +558,8 @@ void BUNDLEBLDR::FormatPanel(double maxDimension)
 void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxString rot)
 {
+    wxString separator(wxFileName::GetPathSeparator());
+
     double xCoord, yCoord, rotation, maxDimension;
     x.ToDouble(&xCoord);
@@ -573,7 +574,7 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
     wxClientDC dc(Panel1);
     std::stringstream stream;
-    stream <<PathToMOD <<"\\CABLE\\"<<cable;
+    stream << PathToMOD << separator << "CABLE"<< separator << cable;
     cable = (stream.str().c_str());
@@ -587,28 +588,11 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
     std::getline(cableFile, str);
     float scaleFactor = (size_h/2 * 1.0);
-    //float maxHdimension;
-    //float maxVdimension;
-    //float maxDimension;
-
-    //maxDimension = 0.015; //metres
     wxString maxXY = TextCtrl8->GetValue();
     maxXY.ToDouble(&maxDimension);
-//    wxString scale;
-//    scale << maxDimension/2.0;
-
-//    dc.SetTextForeground(*wxBLUE);
-//
-//    dc.DrawLine( size_h/2, size_v-50, size_h-size_h/4, size_v-50 );
-//    dc.DrawLine( size_h/2, size_v-50, size_h/2, size_v-40 );
-//    dc.DrawLine( size_h-size_h/4, size_v-50, size_h-size_h/4, size_v-40 );
-//
-//    dc.DrawText("scale (m)", (size_h/2+50), size_v-70);
-//    dc.DrawText(scale, (size_h/2+55), size_v-40);
-
     if (str.compare("Cylindrical") == 0 ){
         std::getline(cableFile, str);
@@ -654,8 +638,6 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
         float  inner_conductor_Scaledradius, shield_Scaledradius, outer_Scaledinsulation, shield_Scaledthickness, scaledxCoord, scaledyCoord;
-        //scaleFactor = (size_h * 0.5);
-
         outer_Scaledinsulation  = (outer_insulation/maxDimension)*scaleFactor;
         shield_Scaledthickness  = (shield_thickness/maxDimension)*scaleFactor;
         shield_Scaledradius     = (shield_radius/maxDimension)*scaleFactor;
@@ -1096,8 +1078,6 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
         cableFile >> conductor_rows;
         std::getline(cableFile, str); //Read to end of line
-        //float scaleFactor = (size_h/dielectric_width) * 0.6;
-
         float scaled_dielectric_width, scaled_dielectric_height, scaledxCoord, scaledyCoord;
         float dx1,dy1,dx2,dy2,dx3,dy3,dx4,dy4, tempx, tempy, rotation_rad;
@@ -1113,14 +1093,6 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
         float s = sin(rotation_rad);
         float c = cos(rotation_rad);
-//        wxString point;
-//
-//        point<< tempx <<", "<<tempy;
-//        wxMessageBox("P1" ,point );
-//        point = "";
-
-        //Draw dielectric
-        //point 1
         dx1 = -scaled_dielectric_width/2;
         dy1 = scaled_dielectric_height/2;
@@ -1169,12 +1141,6 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
         dc.DrawLine(dx3, dy3, dx4, dy4);
         dc.DrawLine(dx4, dy4, dx1, dy1);
-        //dc.DrawRectangle(wxPoint(size_h/2-scaled_dielectric_width/2, size_v/2-scaled_dielectric_height/2), wxSize(scaled_dielectric_width, scaled_dielectric_height));
-
-        //dc.DrawLine(dx2, dy2, dx4, dy4);
-
-        //dc.DrawRectangle(wxPoint(size_h/2-scaled_dielectric_width/2, size_v/2-scaled_dielectric_height/2), wxSize(scaled_dielectric_width, scaled_dielectric_height));
-
         float offset_x, offset_y, width, height,separation, conductors;
         for (int i = 0; i < conductor_rows;i++){
@@ -1258,83 +1224,12 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
                 dc.DrawLine(cx2, cy2, cx3, cy3);
                 dc.DrawLine(cx3, cy3, cx4, cy4);
                 dc.DrawLine(cx4, cy4, cx1, cy1);
-
-                    //dc.DrawRectangle(wxPoint(x_origin+(j*(scaled_conductor_width + scaled_conductor_separation + scaled_offset_x) ), y_origin), wxSize(scaled_conductor_width,scaled_conductor_height));
             }
         }
-
-
-
-
-
-
-
-
-//        float conductors, conductor_width, conductor_height, conductor_separation, dielectric_offset_x, dielectric_offset_y;
-//
-//        cableFile >> conductors;
-//        std::getline(cableFile, str); //Read to end of line
-//        std::getline(cableFile, str); //Read to end of line
-//        cableFile >> conductor_width;
-//        std::getline(cableFile, str); //Read to end of line
-//        cableFile >> conductor_height;
-//        std::getline(cableFile, str); //Read to end of line
-//        cableFile >> conductor_separation;
-//        std::getline(cableFile, str); //Read to end of line
-//        cableFile >> dielectric_offset_x;
-//        std::getline(cableFile, str); //Read to end of line
-//        cableFile >> dielectric_offset_y;
-//
-//
-//        float   conductor_Scaledwidth,
-//                conductor_Scaledheight,
-//                conductor_Scaledseparation,
-//                dielectric_Scaledoffset_x,
-//                //dielectric_Scaledoffset_y,
-//                totalScaledWidth,
-//                totalScaledHeight,
-//                scaledxCoord,
-//                scaledyCoord;
-//
-//
-//        float totalWidth = (conductors*conductor_width)+((conductors-1) * conductor_separation)+(dielectric_offset_x * 2);
-//        float totalHeight = (2 * dielectric_offset_y) + conductor_height;
-//
-//        conductor_Scaledwidth = (conductor_width/maxDimension)*scaleFactor;
-//        conductor_Scaledheight = (conductor_height/maxDimension)*scaleFactor;
-//        conductor_Scaledseparation = (conductor_separation/maxDimension)*scaleFactor;
-//        dielectric_Scaledoffset_x = (dielectric_offset_x/maxDimension)*scaleFactor;
-//        //dielectric_Scaledoffset_y = (dielectric_offset_y/maxDimension)*scaleFactor;
-//        totalScaledHeight = (totalHeight/maxDimension)*scaleFactor;
-//        totalScaledWidth = (totalWidth/maxDimension)*scaleFactor;
-//        scaledxCoord = (xCoord/maxDimension)*scaleFactor;
-//        scaledyCoord = (yCoord/maxDimension)*scaleFactor;
-//
-//        size_h = size_h + scaledxCoord;
-//        size_v = size_v + scaledyCoord;
-//
-//        dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
-//        dc.SetBrush(wxBrush(*wxBLACK, wxBDIAGONAL_HATCH));
-//        dc.DrawRectangle(wxPoint(size_h/2-totalScaledWidth/2, size_v/2-totalScaledHeight/2), wxSize(totalScaledWidth,totalScaledHeight));
-//
-//        float x_origin, y_origin;
-//        x_origin = (size_h/2 - totalScaledWidth/2)+dielectric_Scaledoffset_x;
-//        y_origin = size_v/2 - conductor_Scaledheight/2;
-//
-//        dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
-//        dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
-//
-//        for(int i=0;i<conductors;i++){
-//
-//            dc.DrawRectangle(wxPoint(x_origin, y_origin), wxSize(conductor_Scaledwidth,conductor_Scaledheight));
-//
-//            x_origin = x_origin + (conductor_Scaledwidth+conductor_Scaledseparation);
-//        }
-
     }
-      if (str.compare("Dconnector") == 0 ){
+    if (str.compare("Dconnector") == 0 ){
         float conductors, conductor_radius, conductor_pitch, conductor_separation, shell_offset;
@@ -1365,8 +1260,7 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxStrin
         conductor_Scaledradius = (conductor_radius/maxDimension)*scaleFactor;
         conductor_Scaledpitch = (conductor_pitch/maxDimension)*scaleFactor;
         conductor_Scaledseparation = (conductor_separation/maxDimension)*scaleFactor;
-        //shell_Scaledoffset = (shell_offset/maxDimension)*scaleFactor;
-        //total_Scaledwidth = (totalWidth/maxDimension)*scaleFactor;
+
         scaledxCoord = (xCoord/maxDimension)*scaleFactor;
         scaledyCoord = (yCoord/maxDimension)*scaleFactor;
@@ -1425,8 +1319,9 @@ void BUNDLEBLDR::OnButton1Click(wxCommandEvent&amp; event)
 void BUNDLEBLDR::WriteBundleFile(wxString fileName)
 {
     ofstream cableFile;
+    wxString separator(wxFileName::GetPathSeparator());
-    wxString fullFileName = PathToMOD + "\\BUNDLE\\" + fileName + ".bundle_spec";
+    wxString fullFileName = PathToMOD + separator + "BUNDLE" + separator + fileName + ".bundle_spec";
     cableFile.open (fullFileName);
@@ -1434,19 +1329,11 @@ void BUNDLEBLDR::WriteBundleFile(wxString fileName)
     {
         cableFile << "#MOD_cable_lib_dir" << "\n";
-        #ifdef UNIX
-            cableFile <<MODname <<"/CABLE/"<<"\n";
-        #else
-            cableFile <<"../"<< MODname <<"/CABLE/"<<"\n";
-        #endif
+        cableFile <<".." << separator << MODname << separator << "CABLE" << separator <<"\n";
         cableFile << "#MOD_cable_lib_dir" << "\n";
-        #ifdef UNIX
-            cableFile <<MODname <<"/BUNDLE/"<<"\n";
-        #else
-            cableFile <<"../"<< MODname <<"/BUNDLE/"<<"\n";
-        #endif
+        cableFile <<".." << separator << MODname << separator << "BUNDLE" << separator <<"\n";
         cableFile << ListBox1->GetCount() << " #Number of cables in bundle, cable list follows\n";
@@ -1459,7 +1346,7 @@ void BUNDLEBLDR::WriteBundleFile(wxString fileName)
             cable = bundle_list->CableType;
-            //Remove pesky file extension
+            //Remove file extension
             size_t lastindex = cable.find_last_of(".");
             wxString cable_name = cable.substr(0, lastindex); //at the moment here requires full path to file
@@ -1536,29 +1423,26 @@ void BUNDLEBLDR::OnButton2Click(wxCommandEvent&amp; event)
     wxString fileName = TextCtrl1->GetValue();
-    WriteBundleFile (TextCtrl1->GetValue());
+    wxString command_line;
+
+    wxString separator(wxFileName::GetPathSeparator());
-    //std::stringstream stream;
+    WriteBundleFile (TextCtrl1->GetValue());
-    #ifdef UNIX
-        std::stringstream stream;
-        stream  << "./cable_bundle_model_builder"
-                << " "
-                << MODname + "/BUNDLE/"
-                << fileName ;
-    #else
     std::stringstream stream;
-    stream  << "\"..\\BIN\\cable_bundle_model_builder.exe\""
+    stream  <<"." + separator
+            << "cable_bundle_model_builder"
             << " "
-            << "..\\" + MODname + "\\CABLE\\"
+            << ".." + separator + MODname + separator + "BUNDLE" + separator
             << fileName ;
-    #endif
-    system(stream.str().c_str());
+    command_line << stream.str().c_str();
+
+    wxExecute (command_line,wxEXEC_SYNC);
     // Display Run Status
-    RUN_STATUS *run_status = new RUN_STATUS(this);
-    run_status->ShowModal();
+    RUN_STATUS *run_status_bundle = new RUN_STATUS(this);
+    run_status_bundle->ShowModal();
     //Button1->Enable();
@@ -4,7 +4,7 @@
 // It was developed by the University of Nottingham and the Netherlands Aerospace
 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
 //
-// Copyright (C) 2015 - 2017 University of Nottingham
+// Copyright (C) 2015 - 2018 University of Nottingham
 //
 // SACAMOS is free software: you can redistribute it and/or modify it under the
 // terms of the GNU General Public License as published by the Free Software
@@ -111,14 +111,15 @@ void draw_bundle(wxPanel *Panel, wxString Path, wxString bundle_to_draw)
         std::getline(bundleFile, bundle_str);
         wxString cable_spec(bundle_str);
+        wxString separator(wxFileName::GetPathSeparator());
+
         wxString cableFileName;
-        cableFileName << Path <<"\\"<<"CABLE"<<"\\"<<cable_spec<<".cable_spec";
+
+        cableFileName << Path << separator << "CABLE" << separator <<cable_spec<<".cable_spec";
         bundleFile >> xCoord;
         bundleFile >> yCoord;
-        yCoord = -1.0 * yCoord;
-
         std::getline(bundleFile, bundle_str); //Read to end of line
         std::ifstream cableFile;
@@ -4,7 +4,7 @@
 // It was developed by the University of Nottingham and the Netherlands Aerospace
 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
 //
-// Copyright (C) 2015 - 2017 University of Nottingham
+// Copyright (C) 2015 - 2018 University of Nottingham
 //
 // SACAMOS is free software: you can redistribute it and/or modify it under the
 // terms of the GNU General Public License as published by the Free Software
@@ -42,12 +42,14 @@
 #include <wx/panel.h>
 #include <wx/dcclient.h>
 #include <wx/msgdlg.h>
+#include <wx/filename.h>
 // Standard Library Header Files
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <cmath>
+#include <string>
 using namespace std;
@@ -407,7 +407,7 @@ void COAXIAL::OnButton2Click(wxCommandEvent&amp; event)
     command_line << stream.str().c_str();
-    wxExecute (command_line);
+    wxExecute (command_line, wxEXEC_SYNC);
     // Display Run Status
     RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -250,7 +250,7 @@ void CYLINDRICAL::OnButton2Click(wxCommandEvent&amp; event)
     command_line << stream.str().c_str();
-    wxExecute (command_line);
+    wxExecute (command_line, wxEXEC_SYNC);
     // Display Run Status
     RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -255,7 +255,7 @@ void DCONN::OnButton2Click(wxCommandEvent&amp; event)
     command_line << stream.str().c_str();
-    wxExecute (command_line);;
+    wxExecute (command_line, wxEXEC_SYNC);;
     // Display Run Status
     RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -131,8 +131,10 @@ void EXPORT_SPICE::OnDirPickerCtrl2DirChanged(wxFileDirPickerEvent&amp; event)
 void EXPORT_SPICE::OnButton1Click(wxCommandEvent& event)
 {
+    wxString separator(wxFileName::GetPathSeparator());
-    wxString sacamos_sym_dir = "..\\" + MODname + "\\SPICE\\SYMBOL\\";
+    //wxString sacamos_sym_dir = "..\\" + MODname + "\\SPICE\\SYMBOL\\";
+    wxString sacamos_sym_dir = ".." + separator + MODname + separator +"SPICE" + separator +"SYMBOL" + separator;
     wxSetWorkingDirectory(sacamos_sym_dir);
     wxString file, pattern, export_notification;
@@ -158,7 +160,8 @@ void EXPORT_SPICE::OnButton1Click(wxCommandEvent&amp; event)
             wxString file_name = file_no_path.substr(0, lastindex);
             ng_sym_from = file_no_path;
-            ng_sym_to = ng_sym_dir + "\\" + file_no_path;
+            //ng_sym_to = ng_sym_dir + "\\" + file_no_path;
+            ng_sym_to = ng_sym_dir + separator + file_no_path;
             wxCopyFile(ng_sym_from, ng_sym_to);
@@ -174,7 +177,8 @@ void EXPORT_SPICE::OnButton1Click(wxCommandEvent&amp; event)
                 {
                     if (file_to_edit[i] == ("file=PATH_TO_TRANSMISSION_LINE_SUB_CIRCUITS/" + file_name + "_Ngspice.lib"))
                     {
-                        file_to_edit[i] = "file=" + pathToMOD + "\\SPICE\\" + file_name + "_Ngspice.lib";
+                        //file_to_edit[i] = "file=" + pathToMOD + "\\SPICE\\" + file_name + "_Ngspice.lib";
+                        file_to_edit[i] = "file=" + pathToMOD + separator + "SPICE" + separator + file_name + "_Ngspice.lib";
                     }
                     file_to_edit.Write();
                 }
@@ -208,7 +212,8 @@ void EXPORT_SPICE::OnButton1Click(wxCommandEvent&amp; event)
             wxString file_name = file_no_path.substr(0, lastindex);
             lt_sym_from = file_no_path;
-            lt_sym_to = lt_sym_dir + "\\" + file_no_path;
+            //lt_sym_to = lt_sym_dir + "\\" + file_no_path;
+            lt_sym_to = lt_sym_dir + separator + file_no_path;
             wxCopyFile(lt_sym_from, lt_sym_to);
@@ -224,7 +229,8 @@ void EXPORT_SPICE::OnButton1Click(wxCommandEvent&amp; event)
                 {
                     if (file_to_edit[i] == ("SYMATTR ModelFile PATH_TO_TRANSMISSION_LINE_SUB_CIRCUITS/" + file_name + "_LTspice.lib"))
                     {
-                        file_to_edit[i] = "SYMATTR ModelFile " + pathToMOD + "\\SPICE\\" + file_name + "_LTspice.lib";
+                        //file_to_edit[i] = "SYMATTR ModelFile " + pathToMOD + "\\SPICE\\" + file_name + "_LTspice.lib";
+                        file_to_edit[i] = "SYMATTR ModelFile " + pathToMOD + separator + "SPICE" + separator + file_name + "_LTspice.lib";
                     }
                 file_to_edit.Write();
                 }
@@ -326,7 +326,7 @@ void FLEXCABLE::OnButton2Click(wxCommandEvent&amp; event)
     command_line << stream.str().c_str();
-    wxExecute (command_line);
+    wxExecute (command_line, wxEXEC_SYNC);
     // Display Run Status
     RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -265,7 +265,7 @@ void OVERSHIELD::OnButton2Click(wxCommandEvent&amp; event)
     command_line << stream.str().c_str();
-    wxExecute (command_line);
+    wxExecute (command_line, wxEXEC_SYNC);
     // Display Run Status
     RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -84,8 +84,6 @@ void RUN_STATUS::DisplayRunStatus()
     wxString text;
     wxTextFile StatusFile;
-    //int lineCount = LicenseFile.GetLineCount();
-
     if (StatusFile.Open(RunStatusFile))
     {
         for (int i = 0; i<int(StatusFile.GetLineCount()); i++)
@@ -97,6 +95,12 @@ void RUN_STATUS::DisplayRunStatus()
     TextCtrl1->SetValue(text);
     }
+    if (!StatusFile.Open(RunStatusFile))
+    {
+        DisplayRunStatus();
+    }
+
+    StatusFile.Close();
 }
@@ -520,7 +520,7 @@ void SPACEWIRE::OnButton2Click(wxCommandEvent&amp; event)
             << ".." + separator + MODname + separator + "CABLE" + separator
             << fileName ;
-    wxExecute (command_line);
+    wxExecute (command_line, wxEXEC_SYNC);
     // Display Run Status
     RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -390,15 +390,28 @@ void SPICEMODEL::OnButton2Click(wxCommandEvent&amp; event)
     {
         //SPICE CABLE BUNDLE MODEL
         wxString fileName = TextCtrl1->GetValue();
-        //wxString fineName = fileName;
+        wxString command_line;
+
+        wxString separator(wxFileName::GetPathSeparator());
         std::stringstream stream;
-        stream  << "\"..\\BIN\\spice_cable_bundle_model_builder\""
+
+        stream  <<"." + separator
+                << "spice_cable_bundle_model_builder"
                 << " "
-            << "..\\" + MODname + "\\SPICE\\"
-                << fileName;
+                << ".." + separator + MODname + separator + "SPICE" + separator
+                << fileName ;
+
+
+
+//                << "\"..\\BIN\\spice_cable_bundle_model_builder\""
+//                << " "
+//                << "..\\" + MODname + "\\SPICE\\"
+//                << fileName;
+
+        command_line << stream.str().c_str();
-        system(stream.str().c_str());
+        wxExecute (command_line, wxEXEC_SYNC);
         RUN_STATUS *run_status = new RUN_STATUS(this);
         run_status->ShowModal();
@@ -479,7 +479,7 @@ void TP::OnButton2Click(wxCommandEvent&amp; event)
     command_line << stream.str().c_str();
-    wxExecute (command_line);
+    wxExecute (command_line, wxEXEC_SYNC);
     // Display Run Status
     RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -454,7 +454,7 @@ void TWINAX::OnButton3Click(wxCommandEvent&amp; event)
     command_line << stream.str().c_str();
-    wxExecute (command_line);
+    wxExecute (command_line, wxEXEC_SYNC);
     // Display Run Status
     RUN_STATUS *run_status = new RUN_STATUS(this);
@@ -329,7 +329,7 @@ void UTP::OnButton2Click(wxCommandEvent&amp; event)
     command_line << stream.str().c_str();
-    wxExecute (command_line);
+    wxExecute (command_line, wxEXEC_SYNC);
     ifstream runStatus;