UoN / SACAMOS

Commit dd86ff439abddfcdd2ff196b90137cce4fe9e039

Authored by Steve Greedy
1 parent fe64b32b
Exists in master and in 3 other branches nested_overshields, proximity_effects, v4

Updates to SW1 

Inclusion of additional Laplace mesh parameters.

Addition of new multi-layer flex cable
Showing 28 changed files with 3658 additions and 752 deletions   Show diff stats
Inline Side-by-side
GUI/SW1/SRC/BUNDLEBLDR.cpp
  Diff comments   View file @dd86ff4
... ... @@ -52,6 +52,8 @@
52 52 #include <fstream>
53 53 #include <sstream>
54 54  
  55 +#define PI 3.14159265358979323846
  56 +
55 57 using namespace std;
56 58  
57 59 //(*InternalHeaders(BUNDLEBLDR)
... ... @@ -77,6 +79,10 @@ const long BUNDLEBLDR::ID_STATICTEXT7 = wxNewId();
77 79 const long BUNDLEBLDR::ID_TEXTCTRL4 = wxNewId();
78 80 const long BUNDLEBLDR::ID_STATICTEXT8 = wxNewId();
79 81 const long BUNDLEBLDR::ID_TEXTCTRL5 = wxNewId();
  82 +const long BUNDLEBLDR::ID_STATICTEXT13 = wxNewId();
  83 +const long BUNDLEBLDR::ID_TEXTCTRL9 = wxNewId();
  84 +const long BUNDLEBLDR::ID_STATICTEXT14 = wxNewId();
  85 +const long BUNDLEBLDR::ID_TEXTCTRL10 = wxNewId();
80 86 const long BUNDLEBLDR::ID_PANEL5 = wxNewId();
81 87 const long BUNDLEBLDR::ID_STATICTEXT11 = wxNewId();
82 88 const long BUNDLEBLDR::ID_CHECKBOX4 = wxNewId();
... ... @@ -187,11 +193,23 @@ BUNDLEBLDR::BUNDLEBLDR(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const w
187 193 StaticText7 = new wxStaticText(Panel5, ID_STATICTEXT7, _("Surface Mesh Constant"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT7"));
188 194 FlexGridSizer5->Add(StaticText7, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
189 195 TextCtrl4 = new wxTextCtrl(Panel5, ID_TEXTCTRL4, _("3"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL4"));
  196 + TextCtrl4->Disable();
190 197 FlexGridSizer5->Add(TextCtrl4, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
191 198 StaticText8 = new wxStaticText(Panel5, ID_STATICTEXT8, _("Boundary Constant"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT8"));
192 199 FlexGridSizer5->Add(StaticText8, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
193 200 TextCtrl5 = new wxTextCtrl(Panel5, ID_TEXTCTRL5, _("3"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL5"));
  201 + TextCtrl5->Disable();
194 202 FlexGridSizer5->Add(TextCtrl5, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  203 + StaticText13 = new wxStaticText(Panel5, ID_STATICTEXT13, _("Max Mesh Edge Length"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT13"));
  204 + FlexGridSizer5->Add(StaticText13, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
  205 + TextCtrl9 = new wxTextCtrl(Panel5, ID_TEXTCTRL9, _("1e-3"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL9"));
  206 + TextCtrl9->Disable();
  207 + FlexGridSizer5->Add(TextCtrl9, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  208 + StaticText14 = new wxStaticText(Panel5, ID_STATICTEXT14, _("Ground Plane Edge Length"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT14"));
  209 + FlexGridSizer5->Add(StaticText14, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
  210 + TextCtrl10 = new wxTextCtrl(Panel5, ID_TEXTCTRL10, _("1e-3"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL10"));
  211 + TextCtrl10->Disable();
  212 + FlexGridSizer5->Add(TextCtrl10, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
195 213 Panel5->SetSizer(FlexGridSizer5);
196 214 FlexGridSizer5->Fit(Panel5);
197 215 FlexGridSizer5->SetSizeHints(Panel5);
... ... @@ -482,15 +500,16 @@ void BUNDLEBLDR::DrawBundleCsection()
482 500 {
483 501 bundle_list = bundle_root;
484 502  
485   - wxString x, y, cable;
  503 + wxString x, y, rot, cable;
486 504  
487 505 while ( bundle_list->next != NULL )
488 506 {
489 507 cable = bundle_list->CableType;
490 508 x = bundle_list->x_offset;
491 509 y = bundle_list->y_offset;
  510 + rot = bundle_list->rot_theta;
492 511  
493   - DrawBundleCable(cable, x, y);
  512 + DrawBundleCable(cable, x, y, rot);
494 513  
495 514 bundle_list = bundle_list->next;
496 515 }
... ... @@ -538,12 +557,13 @@ void BUNDLEBLDR::FormatPanel(double maxDimension)
538 557 dc.DrawText(scale, (size_h/2+55), size_v-40);
539 558 }
540 559  
541   -void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y)
  560 +void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y, wxString rot)
542 561 {
543   - double xCoord, yCoord, maxDimension;
  562 + double xCoord, yCoord, rotation, maxDimension;
544 563  
545 564 x.ToDouble(&xCoord);
546 565 y.ToDouble(&yCoord);
  566 + rot.ToDouble(&rotation);
547 567  
548 568 yCoord = -1.0 * yCoord;
549 569  
... ... @@ -1063,69 +1083,255 @@ void BUNDLEBLDR::DrawBundleCable(wxString cable, wxString x, wxString y)
1063 1083 dc.DrawCircle( wxPoint(size_h/2,size_v/2), overshield_Scaledradius );
1064 1084 }
1065 1085  
1066   - if (str.compare("Flex_cable") == 0 ){
  1086 + if (str.compare("flex_cable") == 0 ){
1067 1087  
1068   - float conductors, conductor_width, conductor_height, conductor_separation, dielectric_offset_x, dielectric_offset_y;
  1088 + float dielectric_width, dielectric_height, conductor_rows;
1069 1089  
1070   - cableFile >> conductors;
1071 1090 std::getline(cableFile, str); //Read to end of line
1072 1091 std::getline(cableFile, str); //Read to end of line
1073   - cableFile >> conductor_width;
  1092 + cableFile >> dielectric_width;
1074 1093 std::getline(cableFile, str); //Read to end of line
1075   - cableFile >> conductor_height;
1076   - std::getline(cableFile, str); //Read to end of line
1077   - cableFile >> conductor_separation;
  1094 + cableFile >> dielectric_height;
1078 1095 std::getline(cableFile, str); //Read to end of line
1079   - cableFile >> dielectric_offset_x;
  1096 + cableFile >> conductor_rows;
1080 1097 std::getline(cableFile, str); //Read to end of line
1081   - cableFile >> dielectric_offset_y;
1082 1098  
  1099 + //float scaleFactor = (size_h/dielectric_width) * 0.6;
1083 1100  
1084   - float conductor_Scaledwidth,
1085   - conductor_Scaledheight,
1086   - conductor_Scaledseparation,
1087   - dielectric_Scaledoffset_x,
1088   - //dielectric_Scaledoffset_y,
1089   - totalScaledWidth,
1090   - totalScaledHeight,
1091   - scaledxCoord,
1092   - scaledyCoord;
  1101 + float scaled_dielectric_width, scaled_dielectric_height, scaledxCoord, scaledyCoord;
1093 1102  
  1103 + float dx1,dy1,dx2,dy2,dx3,dy3,dx4,dy4, tempx, tempy, rotation_rad;
1094 1104  
1095   - float totalWidth = (conductors*conductor_width)+((conductors-1) * conductor_separation)+(dielectric_offset_x * 2);
1096   - float totalHeight = (2 * dielectric_offset_y) + conductor_height;
  1105 + scaled_dielectric_width = (dielectric_width/maxDimension) * scaleFactor;
  1106 + scaled_dielectric_height = (dielectric_height/maxDimension) * scaleFactor;
1097 1107  
1098   - conductor_Scaledwidth = (conductor_width/maxDimension)*scaleFactor;
1099   - conductor_Scaledheight = (conductor_height/maxDimension)*scaleFactor;
1100   - conductor_Scaledseparation = (conductor_separation/maxDimension)*scaleFactor;
1101   - dielectric_Scaledoffset_x = (dielectric_offset_x/maxDimension)*scaleFactor;
1102   - //dielectric_Scaledoffset_y = (dielectric_offset_y/maxDimension)*scaleFactor;
1103   - totalScaledHeight = (totalHeight/maxDimension)*scaleFactor;
1104   - totalScaledWidth = (totalWidth/maxDimension)*scaleFactor;
1105   - scaledxCoord = (xCoord/maxDimension)*scaleFactor;
1106   - scaledyCoord = (yCoord/maxDimension)*scaleFactor;
  1108 + scaledxCoord = xCoord/maxDimension * scaleFactor;
  1109 + scaledyCoord = yCoord/maxDimension * scaleFactor;
  1110 +
  1111 + rotation_rad = rotation * (PI/180.0);
  1112 +
  1113 + float s = sin(rotation_rad);
  1114 + float c = cos(rotation_rad);
  1115 +
  1116 +// wxString point;
  1117 +//
  1118 +// point<< tempx <<", "<<tempy;
  1119 +// wxMessageBox("P1" ,point );
  1120 +// point = "";
  1121 +
  1122 + //Draw dielectric
  1123 + //point 1
  1124 + dx1 = -scaled_dielectric_width/2;
  1125 + dy1 = scaled_dielectric_height/2;
  1126 +
  1127 + tempx = dx1*c - dy1*s;
  1128 + tempy = dx1*s + dy1*c;
  1129 +
  1130 + dx1 = size_h/2 + tempx + scaledxCoord;
  1131 + dy1 = size_v/2 + tempy + scaledyCoord ;
  1132 +
  1133 + //point 3
  1134 + dx2 = -scaled_dielectric_width/2;
  1135 + dy2 = -scaled_dielectric_height/2;
  1136 +
  1137 + tempx = dx2*c - dy2*s;
  1138 + tempy = dx2*s + dy2*c;
  1139 +
  1140 + dx2 = size_h/2 + tempx + scaledxCoord;
  1141 + dy2 = size_v/2 + tempy + scaledyCoord;
  1142 +
  1143 + //point 3
  1144 + dx3 = scaled_dielectric_width/2;
  1145 + dy3 = -scaled_dielectric_height/2;
  1146 +
  1147 + tempx = dx3*c - dy3*s;
  1148 + tempy = dx3*s + dy3*c;
  1149 +
  1150 + dx3 = size_h/2 + tempx + scaledxCoord;
  1151 + dy3 = size_v/2 + tempy + scaledyCoord;
  1152 +
  1153 + //point 4
  1154 + dx4 = scaled_dielectric_width/2;
  1155 + dy4 = scaled_dielectric_height/2;
  1156 +
  1157 + tempx = dx4*c - dy4*s;
  1158 + tempy = dx4*s + dy4*c;
  1159 +
  1160 + dx4 = size_h/2 + tempx + scaledxCoord;
  1161 + dy4 = size_v/2 + tempy + scaledyCoord;
1107 1162  
1108   - size_h = size_h + scaledxCoord;
1109   - size_v = size_v + scaledyCoord;
1110 1163  
1111 1164 dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
1112 1165 dc.SetBrush(wxBrush(*wxBLACK, wxBDIAGONAL_HATCH));
1113   - dc.DrawRectangle(wxPoint(size_h/2-totalScaledWidth/2, size_v/2-totalScaledHeight/2), wxSize(totalScaledWidth,totalScaledHeight));
1114 1166  
1115   - float x_origin, y_origin;
1116   - x_origin = (size_h/2 - totalScaledWidth/2)+dielectric_Scaledoffset_x;
1117   - y_origin = size_v/2 - conductor_Scaledheight/2;
  1167 + dc.DrawLine(dx1, dy1, dx2, dy2);
  1168 + dc.DrawLine(dx2, dy2, dx3, dy3);
  1169 + dc.DrawLine(dx3, dy3, dx4, dy4);
  1170 + dc.DrawLine(dx4, dy4, dx1, dy1);
1118 1171  
1119   - dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
1120   - dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
  1172 + //dc.DrawRectangle(wxPoint(size_h/2-scaled_dielectric_width/2, size_v/2-scaled_dielectric_height/2), wxSize(scaled_dielectric_width, scaled_dielectric_height));
  1173 +
  1174 + //dc.DrawLine(dx2, dy2, dx4, dy4);
  1175 +
  1176 + //dc.DrawRectangle(wxPoint(size_h/2-scaled_dielectric_width/2, size_v/2-scaled_dielectric_height/2), wxSize(scaled_dielectric_width, scaled_dielectric_height));
  1177 +
  1178 + float offset_x, offset_y, width, height,separation, conductors;
  1179 +
  1180 + for (int i = 0; i < conductor_rows;i++){
  1181 + cableFile >> offset_x;
  1182 + std::getline(cableFile, str); //Read to end of line
  1183 +
  1184 + cableFile >> offset_y;
  1185 + std::getline(cableFile, str); //Read to end of line
  1186 +
  1187 + cableFile >> width;
  1188 + std::getline(cableFile, str); //Read to end of line
  1189 +
  1190 + cableFile >> height;
  1191 + std::getline(cableFile, str); //Read to end of line
  1192 +
  1193 + cableFile >> separation;
  1194 + std::getline(cableFile, str); //Read to end of line
  1195 +
  1196 + cableFile >> conductors;
  1197 + std::getline(cableFile, str); //Read to end of line
  1198 +
  1199 +
  1200 + float scaled_conductor_width = width/maxDimension * scaleFactor;
  1201 + float scaled_conductor_height = height/maxDimension * scaleFactor;
  1202 + float scaled_conductor_separation = separation/maxDimension * scaleFactor;
  1203 + float scaled_offset_x = offset_x/maxDimension * scaleFactor;
  1204 + float scaled_offset_y = offset_y/maxDimension * scaleFactor;
  1205 +
  1206 + //calculate conductor origin, top left corner: start at no.1
  1207 + float x_origin = 0 - (scaled_conductor_width * conductors/2) - scaled_conductor_separation*(conductors - 1)/2 + scaled_offset_x;
  1208 + float y_origin = scaled_conductor_height/2 + scaled_offset_y;
  1209 +
  1210 + float cx1,cy1,cx2,cy2,cx3,cy3,cx4,cy4;
  1211 +
  1212 + dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
  1213 + dc.SetBrush(wxBrush(*wxWHITE, wxSOLID));
  1214 +
  1215 + for (int j = 0; j<conductors; j++){
  1216 +
  1217 + //point 1
  1218 + cx1 = x_origin + j * (scaled_conductor_width + scaled_conductor_separation);
  1219 + cy1 = y_origin;
  1220 +
  1221 + tempx = cx1*c - cy1*s;
  1222 + tempy = cx1*s + cy1*c;
  1223 +
  1224 + cx1 = tempx + scaledxCoord + size_h/2;
  1225 + cy1 = tempy + scaledyCoord + size_v/2;
1121 1226  
1122   - for(int i=0;i<conductors;i++){
  1227 + //point 3
  1228 + cx2 = x_origin + j * (scaled_conductor_width + scaled_conductor_separation);
  1229 + cy2 = y_origin - scaled_conductor_height;
1123 1230  
1124   - dc.DrawRectangle(wxPoint(x_origin, y_origin), wxSize(conductor_Scaledwidth,conductor_Scaledheight));
  1231 + tempx = cx2*c - cy2*s;
  1232 + tempy = cx2*s + cy2*c;
1125 1233  
1126   - x_origin = x_origin + (conductor_Scaledwidth+conductor_Scaledseparation);
  1234 + cx2 = tempx + scaledxCoord + size_h/2;
  1235 + cy2 = tempy + scaledyCoord + size_v/2;
  1236 +
  1237 + //point 3
  1238 + cx3 = x_origin + scaled_conductor_width + j * (scaled_conductor_width + scaled_conductor_separation);
  1239 + cy3 = y_origin - scaled_conductor_height;
  1240 +
  1241 + tempx = cx3*c - cy3*s;
  1242 + tempy = cx3*s + cy3*c;
  1243 +
  1244 + cx3 = tempx + scaledxCoord + size_h/2;
  1245 + cy3 = tempy + scaledyCoord + size_v/2;
  1246 +
  1247 + //point 4
  1248 + cx4 = x_origin + scaled_conductor_width + j * (scaled_conductor_width + scaled_conductor_separation);
  1249 + cy4 = y_origin;
  1250 +
  1251 + tempx = cx4*c - cy4*s;
  1252 + tempy = cx4*s + cy4*c;
  1253 +
  1254 + cx4 = tempx + scaledxCoord + size_h/2;
  1255 + cy4 = tempy + scaledyCoord + size_v/2;
  1256 +
  1257 + dc.DrawLine(cx1, cy1, cx2, cy2);
  1258 + dc.DrawLine(cx2, cy2, cx3, cy3);
  1259 + dc.DrawLine(cx3, cy3, cx4, cy4);
  1260 + dc.DrawLine(cx4, cy4, cx1, cy1);
  1261 +
  1262 + //dc.DrawRectangle(wxPoint(x_origin+(j*(scaled_conductor_width + scaled_conductor_separation + scaled_offset_x) ), y_origin), wxSize(scaled_conductor_width,scaled_conductor_height));
  1263 + }
1127 1264 }
1128 1265  
  1266 +
  1267 +
  1268 +
  1269 +
  1270 +
  1271 +
  1272 +
  1273 +
  1274 +// float conductors, conductor_width, conductor_height, conductor_separation, dielectric_offset_x, dielectric_offset_y;
  1275 +//
  1276 +// cableFile >> conductors;
  1277 +// std::getline(cableFile, str); //Read to end of line
  1278 +// std::getline(cableFile, str); //Read to end of line
  1279 +// cableFile >> conductor_width;
  1280 +// std::getline(cableFile, str); //Read to end of line
  1281 +// cableFile >> conductor_height;
  1282 +// std::getline(cableFile, str); //Read to end of line
  1283 +// cableFile >> conductor_separation;
  1284 +// std::getline(cableFile, str); //Read to end of line
  1285 +// cableFile >> dielectric_offset_x;
  1286 +// std::getline(cableFile, str); //Read to end of line
  1287 +// cableFile >> dielectric_offset_y;
  1288 +//
  1289 +//
  1290 +// float conductor_Scaledwidth,
  1291 +// conductor_Scaledheight,
  1292 +// conductor_Scaledseparation,
  1293 +// dielectric_Scaledoffset_x,
  1294 +// //dielectric_Scaledoffset_y,
  1295 +// totalScaledWidth,
  1296 +// totalScaledHeight,
  1297 +// scaledxCoord,
  1298 +// scaledyCoord;
  1299 +//
  1300 +//
  1301 +// float totalWidth = (conductors*conductor_width)+((conductors-1) * conductor_separation)+(dielectric_offset_x * 2);
  1302 +// float totalHeight = (2 * dielectric_offset_y) + conductor_height;
  1303 +//
  1304 +// conductor_Scaledwidth = (conductor_width/maxDimension)*scaleFactor;
  1305 +// conductor_Scaledheight = (conductor_height/maxDimension)*scaleFactor;
  1306 +// conductor_Scaledseparation = (conductor_separation/maxDimension)*scaleFactor;
  1307 +// dielectric_Scaledoffset_x = (dielectric_offset_x/maxDimension)*scaleFactor;
  1308 +// //dielectric_Scaledoffset_y = (dielectric_offset_y/maxDimension)*scaleFactor;
  1309 +// totalScaledHeight = (totalHeight/maxDimension)*scaleFactor;
  1310 +// totalScaledWidth = (totalWidth/maxDimension)*scaleFactor;
  1311 +// scaledxCoord = (xCoord/maxDimension)*scaleFactor;
  1312 +// scaledyCoord = (yCoord/maxDimension)*scaleFactor;
  1313 +//
  1314 +// size_h = size_h + scaledxCoord;
  1315 +// size_v = size_v + scaledyCoord;
  1316 +//
  1317 +// dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
  1318 +// dc.SetBrush(wxBrush(*wxBLACK, wxBDIAGONAL_HATCH));
  1319 +// dc.DrawRectangle(wxPoint(size_h/2-totalScaledWidth/2, size_v/2-totalScaledHeight/2), wxSize(totalScaledWidth,totalScaledHeight));
  1320 +//
  1321 +// float x_origin, y_origin;
  1322 +// x_origin = (size_h/2 - totalScaledWidth/2)+dielectric_Scaledoffset_x;
  1323 +// y_origin = size_v/2 - conductor_Scaledheight/2;
  1324 +//
  1325 +// dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
  1326 +// dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
  1327 +//
  1328 +// for(int i=0;i<conductors;i++){
  1329 +//
  1330 +// dc.DrawRectangle(wxPoint(x_origin, y_origin), wxSize(conductor_Scaledwidth,conductor_Scaledheight));
  1331 +//
  1332 +// x_origin = x_origin + (conductor_Scaledwidth+conductor_Scaledseparation);
  1333 +// }
  1334 +
1129 1335 }
1130 1336  
1131 1337 if (str.compare("Dconnector") == 0 ){
... ... @@ -1201,8 +1407,6 @@ void BUNDLEBLDR::OnButton1Click(wxCommandEvent&amp; event)
1201 1407 {
1202 1408 int IsError = 0;
1203 1409  
1204   - ofstream cableFile;
1205   -
1206 1410 wxString fileName = TextCtrl1->GetValue();
1207 1411  
1208 1412 TextCtrl1->SetBackgroundColour(wxColor(255,255,255));
... ... @@ -1213,6 +1417,14 @@ void BUNDLEBLDR::OnButton1Click(wxCommandEvent&amp; event)
1213 1417 return;
1214 1418 }
1215 1419  
  1420 + WriteBundleFile(fileName);
  1421 +
  1422 + Button1->Disable();
  1423 +}
  1424 +
  1425 +void BUNDLEBLDR::WriteBundleFile(wxString fileName)
  1426 +{
  1427 + ofstream cableFile;
1216 1428  
1217 1429 wxString fullFileName = PathToMOD + "\\BUNDLE\\" + fileName + ".bundle_spec";
1218 1430  
... ... @@ -1289,13 +1501,19 @@ void BUNDLEBLDR::OnButton1Click(wxCommandEvent&amp; event)
1289 1501 cableFile << TextCtrl4->GetValue() <<"\n";
1290 1502 cableFile << "Laplace_surface_mesh_constant\n";
1291 1503 cableFile << TextCtrl5->GetValue() <<"\n";
  1504 + cableFile << "max_mesh_edge_length\n";
  1505 + cableFile << TextCtrl9->GetValue() <<"\n";
1292 1506  
  1507 + if (CheckBox1->GetValue())
  1508 + {
  1509 + cableFile << "gp_mesh_edge_length\n";
  1510 + cableFile << TextCtrl10->GetValue() <<"\n";
  1511 + }
1293 1512 CheckBox3 ->SetValue(false);
1294 1513 }
1295 1514 }
1296 1515 cableFile.close();
1297 1516  
1298   - Button1->Disable();
1299 1517 }
1300 1518  
1301 1519  
... ... @@ -1306,6 +1524,8 @@ void BUNDLEBLDR::OnButton2Click(wxCommandEvent&amp; event)
1306 1524  
1307 1525 wxString fileName = TextCtrl1->GetValue();
1308 1526  
  1527 + WriteBundleFile (TextCtrl1->GetValue());
  1528 +
1309 1529 std::stringstream stream;
1310 1530 stream << "\"..\\BIN\\cable_bundle_model_builder.exe\""
1311 1531 << " "
... ... @@ -1318,7 +1538,7 @@ void BUNDLEBLDR::OnButton2Click(wxCommandEvent&amp; event)
1318 1538 RUN_STATUS *run_status = new RUN_STATUS(this);
1319 1539 run_status->ShowModal();
1320 1540  
1321   - Button1->Enable();
  1541 + //Button1->Enable();
1322 1542  
1323 1543 if (CheckBox2->GetValue())
1324 1544 {
... ... @@ -1348,6 +1568,7 @@ void BUNDLEBLDR::OnButton2Click(wxCommandEvent&amp; event)
1348 1568 file = wxFindNextFile();
1349 1569 }
1350 1570 CheckBox3->Enable();
  1571 +
1351 1572 }
1352 1573 }
1353 1574  
... ... @@ -1370,6 +1591,8 @@ void BUNDLEBLDR::OnCheckBox1Click(wxCommandEvent&amp; event)
1370 1591 dc.SetPen( wxPen( (*wxBLACK) ,5 , wxSOLID) );
1371 1592 dc.DrawLine( 0, size_v/2, size_h,size_v/2 );
1372 1593  
  1594 + TextCtrl10->Enable();
  1595 +
1373 1596 }
1374 1597  
1375 1598 void BUNDLEBLDR::OnCheckBox3Click(wxCommandEvent& event)
... ... @@ -1378,7 +1601,10 @@ void BUNDLEBLDR::OnCheckBox3Click(wxCommandEvent&amp; event)
1378 1601 {
1379 1602 TextCtrl4->Enable();
1380 1603 TextCtrl5->Enable();
  1604 + TextCtrl9->Enable();
1381 1605 }
  1606 +
  1607 + //WriteBundleFile (TextCtrl1->GetValue());
1382 1608 }
1383 1609  
1384 1610 void BUNDLEBLDR::OnComboBox1Selected(wxCommandEvent& event)
... ... @@ -1386,6 +1612,8 @@ void BUNDLEBLDR::OnComboBox1Selected(wxCommandEvent&amp; event)
1386 1612 wxString meshToView;
1387 1613 meshToView<<ComboBox1->GetValue();
1388 1614 draw_mesh(Panel1,meshToView);
  1615 +
  1616 + MeshSelected = 1;
1389 1617 }
1390 1618  
1391 1619 void BUNDLEBLDR::OnTextCtrl4Text(wxCommandEvent& event)
... ... @@ -1420,6 +1648,7 @@ void BUNDLEBLDR::OnSpinButton1Change(wxSpinEvent&amp; event)
1420 1648 FormatPanel(maxDimension);
1421 1649  
1422 1650 DrawBundleCsection();
  1651 +
1423 1652 }
1424 1653  
1425 1654 void BUNDLEBLDR::OnTextCtrl8TextEnter(wxCommandEvent& event)
... ...
GUI/SW1/SRC/BUNDLEBLDR.h
  Diff comments   View file @dd86ff4
... ... @@ -112,11 +112,13 @@ class BUNDLEBLDR: public wxDialog
112 112 void paintNow();
113 113 void render(wxDC& dc);
114 114 void FormatPanel(double);
115   - void DrawBundleCable(wxString, wxString, wxString);
  115 + void DrawBundleCable(wxString, wxString, wxString, wxString);
116 116  
117 117 void ConstructBundleCsection(wxString, wxString, wxString);
118 118 void DrawBundleCsection();
119 119  
  120 + void WriteBundleFile(wxString);
  121 +
120 122 void OnListboxRDown(wxMouseEvent& event);
121 123 void removeElement(int);
122 124 void PopulateListControl(void);
... ... @@ -145,6 +147,8 @@ class BUNDLEBLDR: public wxDialog
145 147 wxString MESH_PARAM1;
146 148 wxString MESH_PARAM2;
147 149  
  150 + int MeshSelected;
  151 +
148 152  
149 153 //(*Declarations(BUNDLEBLDR)
150 154 wxStaticText* StaticText10;
... ... @@ -153,8 +157,10 @@ class BUNDLEBLDR: public wxDialog
153 157 wxRadioButton* RadioButton1;
154 158 wxPanel* Panel5;
155 159 wxNotebook* Notebook1;
  160 + wxStaticText* StaticText13;
156 161 wxStaticText* StaticText2;
157 162 wxPanel* Panel4;
  163 + wxStaticText* StaticText14;
158 164 wxRadioButton* RadioButton2;
159 165 wxButton* Button1;
160 166 wxStaticText* StaticText6;
... ... @@ -181,10 +187,12 @@ class BUNDLEBLDR: public wxDialog
181 187 wxTextCtrl* TextCtrl7;
182 188 wxTextCtrl* TextCtrl1;
183 189 wxStaticText* StaticText12;
  190 + wxTextCtrl* TextCtrl9;
184 191 wxPanel* Panel2;
185 192 wxTextCtrl* TextCtrl5;
186 193 wxStaticText* StaticText4;
187 194 wxTextCtrl* TextCtrl3;
  195 + wxTextCtrl* TextCtrl10;
188 196 wxListBox* ListBox1;
189 197 //*)
190 198  
... ... @@ -207,6 +215,10 @@ class BUNDLEBLDR: public wxDialog
207 215 static const long ID_TEXTCTRL4;
208 216 static const long ID_STATICTEXT8;
209 217 static const long ID_TEXTCTRL5;
  218 + static const long ID_STATICTEXT13;
  219 + static const long ID_TEXTCTRL9;
  220 + static const long ID_STATICTEXT14;
  221 + static const long ID_TEXTCTRL10;
210 222 static const long ID_PANEL5;
211 223 static const long ID_STATICTEXT11;
212 224 static const long ID_CHECKBOX4;
... ...
GUI/SW1/SRC/BUNDLE_SCHEMATIC.cpp
  Diff comments   View file @dd86ff4
... ... @@ -614,69 +614,155 @@ void draw_bundle(wxPanel *Panel, wxString Path, wxString bundle_to_draw)
614 614 cableFile.close();
615 615 }
616 616  
617   - if (cable_str.compare("Flex_cable") == 0 )
  617 + if (cable_str.compare("flex_cable") == 0 )
618 618 {
619   - float conductors, conductor_width, conductor_height, conductor_separation, dielectric_offset_x, dielectric_offset_y;
  619 + float dielectric_width, dielectric_height, conductor_rows;
620 620  
621   - cableFile >> conductors;
622   - std::getline(cableFile, cable_str); //Read to end of line
623 621 std::getline(cableFile, cable_str); //Read to end of line
624   - cableFile >> conductor_width;
625 622 std::getline(cableFile, cable_str); //Read to end of line
626   - cableFile >> conductor_height;
  623 + cableFile >> dielectric_width;
627 624 std::getline(cableFile, cable_str); //Read to end of line
628   - cableFile >> conductor_separation;
  625 + cableFile >> dielectric_height;
629 626 std::getline(cableFile, cable_str); //Read to end of line
630   - cableFile >> dielectric_offset_x;
  627 + cableFile >> conductor_rows;
631 628 std::getline(cableFile, cable_str); //Read to end of line
632   - cableFile >> dielectric_offset_y;
633 629  
  630 + wxString mystring2;
  631 + mystring2 << dielectric_width;
  632 + dc.DrawText ("Dielectric Width (m)", 10, 40);
  633 + dc.DrawText(mystring2, 10, 55);
634 634  
635   - float conductor_Scaledwidth,
636   - conductor_Scaledheight,
637   - conductor_Scaledseparation,
638   - dielectric_Scaledoffset_x,
639   - dielectric_Scaledoffset_y,
640   - totalScaledWidth,
641   - totalScaledHeight,
642   - scaledxCoord,
643   - scaledyCoord;
  635 + wxString mystring3;
  636 + mystring3 << dielectric_height;
  637 + dc.DrawText ("Dielectric Height (m):", 10, 75);
  638 + dc.DrawText(mystring3, 10, 90);
644 639  
645   - float totalWidth = (conductors*conductor_width)+((conductors-1) * conductor_separation)+(dielectric_offset_x * 2);
646   - float totalHeight = (2 * dielectric_offset_y) + conductor_height;
  640 + wxString mystring4;
  641 + mystring4 << conductor_rows;
  642 + dc.DrawText ("Number of Conductor Rows:", 10, 110);
  643 + dc.DrawText(mystring4, 10, 125);
647 644  
648   - conductor_Scaledwidth = (conductor_width/maxDimension)*scaleFactor;
649   - conductor_Scaledheight = (conductor_height/maxDimension)*scaleFactor;
650   - conductor_Scaledseparation = (conductor_separation/maxDimension)*scaleFactor;
651   - dielectric_Scaledoffset_x = (dielectric_offset_x/maxDimension)*scaleFactor;
652   - dielectric_Scaledoffset_y = (dielectric_offset_y/maxDimension)*scaleFactor;
653   - totalScaledHeight = (totalHeight/maxDimension)*scaleFactor;
654   - totalScaledWidth = (totalWidth/maxDimension)*scaleFactor;
655   - scaledxCoord = (xCoord/maxDimension)*scaleFactor;
656   - scaledyCoord = -1.0*(yCoord/maxDimension)*scaleFactor;
  645 + float scaleFactor = (size_h/dielectric_width) * 0.8;
657 646  
658   - float size_ho = size_h + scaledxCoord;
659   - float size_vo = size_v + scaledyCoord;
  647 + float scaled_dielectric_width, scaled_dielectric_height, scaled_offset_x, scaled_offset_y;
  648 +
  649 + scaled_dielectric_width = dielectric_width * scaleFactor;
  650 + scaled_dielectric_height = dielectric_height * scaleFactor;
  651 +
  652 + //Draw dielectric
660 653  
661 654 dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
662 655 dc.SetBrush(wxBrush(*wxBLACK, wxBDIAGONAL_HATCH));
663   - dc.DrawRectangle(wxPoint(size_ho/2-totalScaledWidth/2, size_vo/2-totalScaledHeight/2), wxSize(totalScaledWidth,totalScaledHeight));
  656 + dc.DrawRectangle(wxPoint(size_h/2-scaled_dielectric_width/2, size_v/2-scaled_dielectric_height/2), wxSize(scaled_dielectric_width, scaled_dielectric_height));
664 657  
665   - float x_origin, y_origin;
666   - x_origin = (size_ho/2 - totalScaledWidth/2) + dielectric_Scaledoffset_x;
667   - y_origin = (size_vo/2 - conductor_Scaledheight/2) + dielectric_Scaledoffset_y;
  658 + float offset_x, offset_y, width, height,separation, conductors;
668 659  
669   - dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
670   - dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
  660 + for (int i = 0; i < conductor_rows;i++){
  661 + cableFile >> offset_x;
  662 + std::getline(cableFile, cable_str); //Read to end of line
671 663  
672   - for(int i=0;i<conductors;i++){
  664 + cableFile >> offset_y;
  665 + std::getline(cableFile, cable_str); //Read to end of line
673 666  
674   - dc.DrawRectangle(wxPoint(x_origin, y_origin), wxSize(conductor_Scaledwidth,conductor_Scaledheight));
  667 + cableFile >> width;
  668 + std::getline(cableFile, cable_str); //Read to end of line
675 669  
676   - x_origin = x_origin + (conductor_Scaledwidth+conductor_Scaledseparation);
677   - }
  670 + cableFile >> height;
  671 + std::getline(cableFile, cable_str); //Read to end of line
678 672  
679   - cableFile.close();
  673 + cableFile >> separation;
  674 + std::getline(cableFile, cable_str); //Read to end of line
  675 +
  676 + cableFile >> conductors;
  677 + std::getline(cableFile, cable_str); //Read to end of line
  678 +
  679 +
  680 + float scaled_offset_x = offset_x * scaleFactor;
  681 + float scaled_offset_y = offset_y * scaleFactor;
  682 + float scaled_conductor_width = width * scaleFactor;
  683 + float scaled_conductor_height = height * scaleFactor;
  684 + float scaled_conductor_separation = separation * scaleFactor;
  685 +
  686 +
  687 + float x_origin = size_h/2 - (scaled_conductor_width * conductors/2) - scaled_conductor_separation*(conductors - 1)/2 - scaled_offset_x;
  688 + float y_origin = size_v/2 - (scaled_conductor_height/2) - scaled_offset_y;
  689 +
  690 +
  691 +
  692 + dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
  693 + dc.SetBrush(wxBrush(*wxWHITE, wxSOLID));
  694 +
  695 + for (int j = 0; j<conductors; j++){
  696 +
  697 + dc.DrawRectangle(wxPoint(x_origin+(j*(scaled_conductor_width + scaled_conductor_separation + scaled_offset_x) ), y_origin), wxSize(scaled_conductor_width,scaled_conductor_height));
  698 + }
  699 + cableFile.close();
  700 + }
  701 +
  702 +
  703 +
  704 +
  705 +// float conductors, conductor_width, conductor_height, conductor_separation, dielectric_offset_x, dielectric_offset_y;
  706 +//
  707 +// cableFile >> conductors;
  708 +// std::getline(cableFile, cable_str); //Read to end of line
  709 +// std::getline(cableFile, cable_str); //Read to end of line
  710 +// cableFile >> conductor_width;
  711 +// std::getline(cableFile, cable_str); //Read to end of line
  712 +// cableFile >> conductor_height;
  713 +// std::getline(cableFile, cable_str); //Read to end of line
  714 +// cableFile >> conductor_separation;
  715 +// std::getline(cableFile, cable_str); //Read to end of line
  716 +// cableFile >> dielectric_offset_x;
  717 +// std::getline(cableFile, cable_str); //Read to end of line
  718 +// cableFile >> dielectric_offset_y;
  719 +//
  720 +//
  721 +// float conductor_Scaledwidth,
  722 +// conductor_Scaledheight,
  723 +// conductor_Scaledseparation,
  724 +// dielectric_Scaledoffset_x,
  725 +// dielectric_Scaledoffset_y,
  726 +// totalScaledWidth,
  727 +// totalScaledHeight,
  728 +// scaledxCoord,
  729 +// scaledyCoord;
  730 +//
  731 +// float totalWidth = (conductors*conductor_width)+((conductors-1) * conductor_separation)+(dielectric_offset_x * 2);
  732 +// float totalHeight = (2 * dielectric_offset_y) + conductor_height;
  733 +//
  734 +// conductor_Scaledwidth = (conductor_width/maxDimension)*scaleFactor;
  735 +// conductor_Scaledheight = (conductor_height/maxDimension)*scaleFactor;
  736 +// conductor_Scaledseparation = (conductor_separation/maxDimension)*scaleFactor;
  737 +// dielectric_Scaledoffset_x = (dielectric_offset_x/maxDimension)*scaleFactor;
  738 +// dielectric_Scaledoffset_y = (dielectric_offset_y/maxDimension)*scaleFactor;
  739 +// totalScaledHeight = (totalHeight/maxDimension)*scaleFactor;
  740 +// totalScaledWidth = (totalWidth/maxDimension)*scaleFactor;
  741 +// scaledxCoord = (xCoord/maxDimension)*scaleFactor;
  742 +// scaledyCoord = -1.0*(yCoord/maxDimension)*scaleFactor;
  743 +//
  744 +// float size_ho = size_h + scaledxCoord;
  745 +// float size_vo = size_v + scaledyCoord;
  746 +//
  747 +// dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
  748 +// dc.SetBrush(wxBrush(*wxBLACK, wxBDIAGONAL_HATCH));
  749 +// dc.DrawRectangle(wxPoint(size_ho/2-totalScaledWidth/2, size_vo/2-totalScaledHeight/2), wxSize(totalScaledWidth,totalScaledHeight));
  750 +//
  751 +// float x_origin, y_origin;
  752 +// x_origin = (size_ho/2 - totalScaledWidth/2) + dielectric_Scaledoffset_x;
  753 +// y_origin = (size_vo/2 - conductor_Scaledheight/2) + dielectric_Scaledoffset_y;
  754 +//
  755 +// dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
  756 +// dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
  757 +//
  758 +// for(int i=0;i<conductors;i++){
  759 +//
  760 +// dc.DrawRectangle(wxPoint(x_origin, y_origin), wxSize(conductor_Scaledwidth,conductor_Scaledheight));
  761 +//
  762 +// x_origin = x_origin + (conductor_Scaledwidth+conductor_Scaledseparation);
  763 +// }
  764 +//
  765 +// cableFile.close();
680 766 }
681 767  
682 768 if (cable_str.compare("Dconnector") == 0 )
... ...
GUI/SW1/SRC/CABLE_SCHEMATIC.cpp
  Diff comments   View file @dd86ff4
... ... @@ -721,90 +721,94 @@ void draw_cable(wxPanel *Panel, wxString cable_to_draw, float x_coord, float y_c
721 721 dc.DrawCircle( wxPoint(size_h/2,size_v/2), overshield_Scaledradius );
722 722 }
723 723  
724   - if (str.compare("Flex_cable") == 0 ){
  724 + if (str.compare("flex_cable") == 0 ){
725 725  
726 726 dc.SetTextForeground(*wxBLUE);
727 727 wxString mystring1(str);
728 728 dc.DrawText(mystring1, 10, 15);
729 729  
730   - float conductors, conductor_width, conductor_height, conductor_separation, dielectric_offset_x, dielectric_offset_y;
  730 + //float conductors, conductor_width, conductor_height, conductor_separation, dielectric_offset_x, dielectric_offset_y;
  731 + float dielectric_width, dielectric_height, conductor_rows;
731 732  
732   - cableFile >> conductors;
733   - std::getline(cableFile, str); //Read to end of line
734 733 std::getline(cableFile, str); //Read to end of line
735   - cableFile >> conductor_width;
736 734 std::getline(cableFile, str); //Read to end of line
737   - cableFile >> conductor_height;
  735 + cableFile >> dielectric_width;
738 736 std::getline(cableFile, str); //Read to end of line
739   - cableFile >> conductor_separation;
  737 + cableFile >> dielectric_height;
740 738 std::getline(cableFile, str); //Read to end of line
741   - cableFile >> dielectric_offset_x;
  739 + cableFile >> conductor_rows;
742 740 std::getline(cableFile, str); //Read to end of line
743   - cableFile >> dielectric_offset_y;
744 741  
745 742 wxString mystring2;
746   - mystring2 << conductors;
747   - dc.DrawText ("Number of Conductors:", 10, 40);
  743 + mystring2 << dielectric_width;
  744 + dc.DrawText ("Dielectric Width (m)", 10, 40);
748 745 dc.DrawText(mystring2, 10, 55);
749 746  
750 747 wxString mystring3;
751   - mystring3 << conductor_width;
752   - dc.DrawText ("Conductor Width (m):", 10, 75);
  748 + mystring3 << dielectric_height;
  749 + dc.DrawText ("Dielectric Height (m):", 10, 75);
753 750 dc.DrawText(mystring3, 10, 90);
754 751  
755 752 wxString mystring4;
756   - mystring4 << conductor_height;
757   - dc.DrawText ("Conductor Height (m):", 10, 110);
  753 + mystring4 << conductor_rows;
  754 + dc.DrawText ("Number of Conductor Rows:", 10, 110);
758 755 dc.DrawText(mystring4, 10, 125);
759 756  
760   - wxString mystring5;
761   - mystring5 << conductor_separation;
762   - dc.DrawText ("Conductor Separation (m):", 10, 145);
763   - dc.DrawText(mystring5, 10, 160);
  757 + float scaleFactor = (size_h/dielectric_width) * 0.8;
764 758  
765   - wxString mystring6;
766   - mystring6 << dielectric_offset_x;
767   - dc.DrawText ("Dielectric Offset in x (m):", 10, 180);
768   - dc.DrawText(mystring6, 10, 195);
  759 + float scaled_dielectric_width, scaled_dielectric_height, scaled_offset_x, scaled_offset_y;
769 760  
770   - wxString mystring7;
771   - mystring7 << dielectric_offset_y;
772   - dc.DrawText ("Dielectric Offset in y (m):", 10, 215);
773   - dc.DrawText(mystring7, 10, 230);
  761 + scaled_dielectric_width = dielectric_width * scaleFactor;
  762 + scaled_dielectric_height = dielectric_height * scaleFactor;
774 763  
775   - float scaleFactor, conductor_Scaledwidth, conductor_Scaledheight, conductor_Scaledseparation, dielectric_Scaledoffset_x, dielectric_Scaledoffset_y, totalScaledWidth, totalScaledHeight;
  764 + //Draw dielectric
776 765  
777   - scaleFactor = (size_h * 0.25);
  766 + dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
  767 + dc.SetBrush(wxBrush(*wxBLACK, wxBDIAGONAL_HATCH));
  768 + dc.DrawRectangle(wxPoint(size_h/2-scaled_dielectric_width/2, size_v/2-scaled_dielectric_height/2), wxSize(scaled_dielectric_width, scaled_dielectric_height));
778 769  
779   - float totalWidth = (conductors*conductor_width)+((conductors-1) * conductor_separation)+(dielectric_offset_x * 2);
780   - float totalHeight = (2 * dielectric_offset_y) + conductor_height;
  770 + float offset_x, offset_y, width, height,separation, conductors;
781 771  
782   - conductor_Scaledwidth = (conductor_width/totalWidth)*scaleFactor;
783   - conductor_Scaledheight = (conductor_height/totalWidth)*scaleFactor;
784   - conductor_Scaledseparation = (conductor_separation/totalWidth)*scaleFactor;
785   - dielectric_Scaledoffset_x = (dielectric_offset_x/totalWidth)*scaleFactor;
786   - dielectric_Scaledoffset_y = (dielectric_offset_y/totalWidth)*scaleFactor;
787   - totalScaledHeight = (totalHeight/totalWidth)*scaleFactor;
788   - totalScaledWidth = (totalWidth/totalWidth)*scaleFactor;
  772 + for (int i = 0; i < conductor_rows;i++){
  773 + cableFile >> offset_x;
  774 + std::getline(cableFile, str); //Read to end of line
789 775  
790   - dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
791   - dc.SetBrush(wxBrush(*wxBLACK, wxBDIAGONAL_HATCH));
792   - dc.DrawRectangle(wxPoint(size_h/2-totalScaledWidth/2, size_v/2-totalScaledHeight/2), wxSize(totalScaledWidth,totalScaledHeight));
  776 + cableFile >> offset_y;
  777 + std::getline(cableFile, str); //Read to end of line
793 778  
794   - float x_origin, y_origin;
795   - x_origin = (size_h/2 - totalScaledWidth/2) + dielectric_Scaledoffset_x;
796   - y_origin = (size_v/2 - conductor_Scaledheight/2) + dielectric_Scaledoffset_y;
  779 + cableFile >> width;
  780 + std::getline(cableFile, str); //Read to end of line
797 781  
798   - dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
799   - dc.SetBrush(wxBrush(*wxBLACK, wxSOLID));
  782 + cableFile >> height;
  783 + std::getline(cableFile, str); //Read to end of line
800 784  
801   - for(int i=0;i<conductors;i++){
  785 + cableFile >> separation;
  786 + std::getline(cableFile, str); //Read to end of line
802 787  
803   - dc.DrawRectangle(wxPoint(x_origin, y_origin), wxSize(conductor_Scaledwidth,conductor_Scaledheight));
  788 + cableFile >> conductors;
  789 + std::getline(cableFile, str); //Read to end of line
804 790  
805   - x_origin = x_origin + (conductor_Scaledwidth+conductor_Scaledseparation);
806   - }
807 791  
  792 + float scaled_offset_x = offset_x * scaleFactor;
  793 + float scaled_offset_y = offset_y * scaleFactor;
  794 + float scaled_conductor_width = width * scaleFactor;
  795 + float scaled_conductor_height = height * scaleFactor;
  796 + float scaled_conductor_separation = separation * scaleFactor;
  797 +
  798 +
  799 + float x_origin = size_h/2 - (scaled_conductor_width * conductors/2) - scaled_conductor_separation*(conductors - 1)/2 - scaled_offset_x;
  800 + float y_origin = size_v/2 - (scaled_conductor_height/2) - scaled_offset_y;
  801 +
  802 +
  803 +
  804 + dc.SetPen( wxPen( wxColor(0,0,0),1 ) );
  805 + dc.SetBrush(wxBrush(*wxWHITE, wxSOLID));
  806 +
  807 + for (int j = 0; j<conductors; j++){
  808 +
  809 + dc.DrawRectangle(wxPoint(x_origin+(j*(scaled_conductor_width + scaled_conductor_separation + scaled_offset_x) ), y_origin), wxSize(scaled_conductor_width,scaled_conductor_height));
  810 + }
  811 + }
808 812 }
809 813  
810 814 if (str.compare("Dconnector") == 0 ){
... ...
GUI/SW1/SRC/COAXIAL.cpp
  Diff comments   View file @dd86ff4
... ... @@ -307,6 +307,7 @@ COAXIAL::COAXIAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp;
307 307 Connect(ID_coaxCLOSE,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&COAXIAL::OncoaxCLOSEClick);
308 308 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPanel1Paint,0,this);
309 309 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&COAXIAL::OnPanel1LeftDClick,0,this);
  310 + //Connect(wxEVT_PAINT,(wxObjectEventFunction)&COAXIAL::OnPaint);
310 311 //*)
311 312  
312 313 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&COAXIAL::OnHighlightSchematic, this);
... ... @@ -326,6 +327,14 @@ COAXIAL::~COAXIAL()
326 327 //*)
327 328 }
328 329  
  330 +/*
  331 +void COAXIAL::OnPaint(wxPaintEvent& event)
  332 +{
  333 + if (EDIT_EXISTING==true) EditExistingCable();
  334 +}
  335 +*/
  336 +
  337 +
329 338 void COAXIAL::SetPathToMOD(wxString Path, wxString Name)
330 339 {
331 340 pathToMOD << Path;
... ... @@ -881,4 +890,12 @@ void COAXIAL::OnCheckBox2Click(wxCommandEvent&amp; event)
881 890 }
882 891 }
883 892  
  893 +/*
  894 +void COAXIAL::EditExistingCable()
  895 +{
  896 + Close();
  897 +}
  898 +*/
  899 +
  900 +
884 901  
... ...
GUI/SW1/SRC/CYLINDRICAL.cpp
  Diff comments   View file @dd86ff4
... ... @@ -165,6 +165,7 @@ CYLINDRICAL::CYLINDRICAL(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const
165 165 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&CYLINDRICAL::OnButton3Click);
166 166 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1Paint,0,this);
167 167 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&CYLINDRICAL::OnPanel1LeftDClick,0,this);
  168 + Connect(wxEVT_PAINT,(wxObjectEventFunction)&CYLINDRICAL::OnPaint);
168 169 //*)
169 170  
170 171 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&CYLINDRICAL::OnHighlightSchematic, this);
... ... @@ -183,6 +184,11 @@ CYLINDRICAL::~CYLINDRICAL()
183 184  
184 185 }
185 186  
  187 +void CYLINDRICAL::OnPaint(wxPaintEvent& event)
  188 +{
  189 + if (EDIT_EXISTING==true) EditExistingCable();
  190 +}
  191 +
186 192 void CYLINDRICAL::SetPathToMOD(wxString Path, wxString Name)
187 193 {
188 194 pathToMOD << Path;
... ... @@ -191,6 +197,9 @@ void CYLINDRICAL::SetPathToMOD(wxString Path, wxString Name)
191 197  
192 198 void CYLINDRICAL::OnButton1Click(wxCommandEvent& event)
193 199 {
  200 +
  201 + if (EDIT_EXISTING==true) EditExistingCable();
  202 +
194 203 int IsError = 0;
195 204  
196 205 wxString fileName = TextCtrl1->GetValue();
... ... @@ -344,6 +353,7 @@ void CYLINDRICAL::OnCheckBox1Click(wxCommandEvent&amp; event)
344 353 FD_ESR8 = winFD_ESR->TextCtrl8->GetValue();
345 354 FD_ESR9 = winFD_ESR->TextCtrl9->GetValue();
346 355 FD_ESR10= winFD_ESR->TextCtrl10->GetValue();
  356 +
347 357 }
348 358 winFD_ESR->Destroy();
349 359 }
... ... @@ -534,3 +544,10 @@ void CYLINDRICAL::OnPanel1LeftDClick(wxMouseEvent&amp; event)
534 544 {
535 545 cylindricalSchematic();
536 546 }
  547 +
  548 +void CYLINDRICAL::EditExistingCable()
  549 +{
  550 + Close();
  551 +}
  552 +
  553 +
... ...
GUI/SW1/SRC/CYLINDRICAL.h
  Diff comments   View file @dd86ff4
... ... @@ -80,6 +80,9 @@ class CYLINDRICAL: public wxDialog
80 80  
81 81 void WriteCableFile(wxString);
82 82  
  83 + void EditExistingCable();
  84 + bool EDIT_EXISTING;
  85 +
83 86 void cylindricalSchematic();
84 87 void OnHighlightSchematic(wxCommandEvent & event);
85 88  
... ... @@ -167,6 +170,7 @@ class CYLINDRICAL: public wxDialog
167 170 void OnTextCtrl10Text(wxCommandEvent& event);
168 171 void OnTextCtrl1Text(wxCommandEvent& event);
169 172 void OnPanel1LeftDClick(wxMouseEvent& event);
  173 + void OnPaint(wxPaintEvent& event);
170 174 //*)
171 175  
172 176 DECLARE_EVENT_TABLE()
... ...
GUI/SW1/SRC/DCONN.cpp
  Diff comments   View file @dd86ff4
... ... @@ -164,8 +164,15 @@ DCONN::DCONN(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; siz
164 164 Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton1Click);
165 165 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton2Click);
166 166 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&DCONN::OnButton3Click);
  167 +/*
167 168 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPanel1Paint,0,this);
  169 +*/
168 170 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&DCONN::OnPanel1LeftDClick,0,this);
  171 +
  172 +/*
  173 + Connect(wxEVT_PAINT,(wxObjectEventFunction)&DCONN::OnPaint);
  174 +*/
  175 +
169 176 //*)
170 177  
171 178 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&DCONN::OnHighlightSchematic, this);
... ... @@ -181,6 +188,15 @@ DCONN::~DCONN()
181 188 //*)
182 189 }
183 190  
  191 +
  192 +/*
  193 +void DCONN::OnPaint(wxPaintEvent& event)
  194 +{
  195 + if (EDIT_EXISTING==true) EditExistingCable();
  196 +}
  197 +
  198 +*/
  199 +
184 200 void DCONN::SetPathToMOD(wxString Path, wxString Name)
185 201 {
186 202  
... ... @@ -248,41 +264,32 @@ void DCONN::OnButton2Click(wxCommandEvent&amp; event)
248 264  
249 265 if (CheckBox1->GetValue())
250 266 {
251   - // Identify all mesh files for viewing
252   - //struct _finddata_t fileinfo;
253   - //long hFile;
254   - //wxString meshFileName = "*.msh.vtk";
255   - wxString pattern((".msh.vtk"));
  267 +
  268 + wxString pattern (("*.msh.vtk")) ;
  269 +
256 270 wxString file;
257   - //wxString pattern((meshFileName));
258 271  
259 272 ComboBox1->Clear();
260 273  
261 274 file = wxFindFirstFile(pattern);
  275 +
262 276 while ( !file.empty())
263 277 {
264 278 wxString meshfile = file;
265   - size_t extindex = meshfile.find_first_of (".");
  279 + size_t extindex = meshfile.find_last_of (".");
  280 +
  281 + meshfile = meshfile.substr(0, extindex);
  282 +
  283 + extindex = meshfile.find_last_of (".");
266 284  
267 285 meshfile = meshfile.substr(0, extindex);
268 286  
  287 + meshfile = meshfile.substr(2,meshfile.length());
  288 +
269 289 ComboBox1->Append(meshfile);
270   - }
271 290  
272   -// if (( hFile = _findfirst( pattern, &fileinfo )) != -1 )
273   -// {
274   -// do
275   -// {
276   -// wxString meshfile = fileinfo.name;
277   -// size_t extindex = meshfile.find_first_of (".");
278   -//
279   -// meshfile = meshfile.substr(0, extindex);
280   -//
281   -// ComboBox1->Append(meshfile);
282   -//
283   -// } while ( _findnext( hFile, &fileinfo) == 0);
284   -// }
285   -// _findclose( hFile);
  291 + file = wxFindNextFile();
  292 + }
286 293  
287 294 CheckBox2->Enable();
288 295 }
... ... @@ -346,8 +353,8 @@ void DCONN::WriteCableFile(wxString fileName)
346 353  
347 354 if (CheckBox2->GetValue())
348 355 {
349   - cableFile << "Laplace_boundary_constant\n";
350   - cableFile << MESH_PARAM1 <<"\n";
  356 + //cableFile << "Laplace_boundary_constant\n";
  357 + //cableFile << MESH_PARAM1 <<"\n";
351 358 cableFile << "Laplace_surface_mesh_constant\n";
352 359 cableFile << MESH_PARAM2 <<"\n";
353 360  
... ... @@ -576,13 +583,22 @@ void DCONN::OnCheckBox2Click(wxCommandEvent&amp; event)
576 583 MESH_PARAM *winMESH_PARAM = new MESH_PARAM(this);
577 584  
578 585 winMESH_PARAM->TextCtrl1->Disable();
  586 + winMESH_PARAM->TextCtrl3->Disable();
  587 + winMESH_PARAM->TextCtrl4->Disable();
579 588  
580 589 if ( winMESH_PARAM->ShowModal() == wxID_OK )
581 590 {
582   - MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
583 591 MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue();
584 592 }
585 593 winMESH_PARAM->Destroy();
586 594 }
587 595 WriteCableFile (TextCtrl1->GetValue());
588 596 }
  597 +
  598 +/*
  599 +void DCONN::EditExistingCable()
  600 +{
  601 + Close();
  602 +}
  603 +
  604 +*/
... ...
GUI/SW1/SRC/FD_ESR.cpp
  Diff comments   View file @dd86ff4
... ... @@ -75,17 +75,18 @@ const long FD_ESR::ID_STATICTEXT9 = wxNewId();
75 75 const long FD_ESR::ID_TEXTCTRL9 = wxNewId();
76 76 const long FD_ESR::ID_STATICTEXT10 = wxNewId();
77 77 const long FD_ESR::ID_TEXTCTRL10 = wxNewId();
78   -const long FD_ESR::ID_STATICTEXT11 = wxNewId();
79   -const long FD_ESR::ID_TEXTCTRL11 = wxNewId();
80   -const long FD_ESR::ID_STATICTEXT12 = wxNewId();
81   -const long FD_ESR::ID_RADIOBUTTON1 = wxNewId();
82   -const long FD_ESR::ID_RADIOBUTTON2 = wxNewId();
  78 +const long FD_ESR::ID_CHECKBOX1 = wxNewId();
83 79 const long FD_ESR::ID_STATICTEXT13 = wxNewId();
84 80 const long FD_ESR::ID_TEXTCTRL12 = wxNewId();
85 81 const long FD_ESR::ID_STATICTEXT14 = wxNewId();
86 82 const long FD_ESR::ID_TEXTCTRL13 = wxNewId();
87 83 const long FD_ESR::ID_STATICTEXT15 = wxNewId();
88 84 const long FD_ESR::ID_TEXTCTRL14 = wxNewId();
  85 +const long FD_ESR::ID_STATICTEXT12 = wxNewId();
  86 +const long FD_ESR::ID_RADIOBUTTON1 = wxNewId();
  87 +const long FD_ESR::ID_RADIOBUTTON2 = wxNewId();
  88 +const long FD_ESR::ID_STATICTEXT11 = wxNewId();
  89 +const long FD_ESR::ID_TEXTCTRL11 = wxNewId();
89 90 const long FD_ESR::ID_BUTTON1 = wxNewId();
90 91 const long FD_ESR::ID_BUTTON2 = wxNewId();
91 92 //*)
... ... @@ -106,6 +107,7 @@ FD_ESR::FD_ESR(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; s
106 107 wxFlexGridSizer* FlexGridSizer7;
107 108 wxStaticBoxSizer* StaticBoxSizer3;
108 109 wxGridSizer* GridSizer3;
  110 + wxFlexGridSizer* FlexGridSizer8;
109 111 wxFlexGridSizer* FlexGridSizer6;
110 112 wxStaticBoxSizer* StaticBoxSizer1;
111 113 wxFlexGridSizer* FlexGridSizer1;
... ... @@ -193,22 +195,11 @@ FD_ESR::FD_ESR(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; s
193 195 FlexGridSizer1->Add(FlexGridSizer5, 1, wxALL|wxEXPAND, 5);
194 196 StaticBoxSizer3 = new wxStaticBoxSizer(wxVERTICAL, this, _("Filter Fitting Parameters"));
195 197 FlexGridSizer6 = new wxFlexGridSizer(0, 1, 0, 0);
196   - FlexGridSizer7 = new wxFlexGridSizer(0, 2, 0, 0);
197   - StaticText11 = new wxStaticText(this, ID_STATICTEXT11, _("Order for Filter Fitting "), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT11"));
198   - FlexGridSizer7->Add(StaticText11, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
199   - TextCtrl11 = new wxTextCtrl(this, ID_TEXTCTRL11, _("-10"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL11"));
200   - TextCtrl11->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
201   - FlexGridSizer7->Add(TextCtrl11, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
202   - FlexGridSizer6->Add(FlexGridSizer7, 1, wxALL|wxEXPAND, 5);
203   - GridSizer2 = new wxGridSizer(0, 3, 0, 0);
204   - StaticText12 = new wxStaticText(this, ID_STATICTEXT12, _("Range Type"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT12"));
205   - GridSizer2->Add(StaticText12, 2, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
206   - RadioButton1 = new wxRadioButton(this, ID_RADIOBUTTON1, _("Lin"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON1"));
207   - RadioButton1->SetValue(true);
208   - GridSizer2->Add(RadioButton1, 1, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
209   - RadioButton2 = new wxRadioButton(this, ID_RADIOBUTTON2, _("Log"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON2"));
210   - GridSizer2->Add(RadioButton2, 1, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
211   - FlexGridSizer6->Add(GridSizer2, 1, wxALL|wxEXPAND, 5);
  198 + FlexGridSizer8 = new wxFlexGridSizer(0, 3, 0, 0);
  199 + CheckBox1 = new wxCheckBox(this, ID_CHECKBOX1, _("Use Defaults"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_CHECKBOX1"));
  200 + CheckBox1->SetValue(true);
  201 + FlexGridSizer8->Add(CheckBox1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  202 + FlexGridSizer6->Add(FlexGridSizer8, 1, wxALL|wxEXPAND, 5);
212 203 GridSizer3 = new wxGridSizer(0, 2, 0, 0);
213 204 StaticText13 = new wxStaticText(this, ID_STATICTEXT13, _("Frequency min (Hz)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT13"));
214 205 GridSizer3->Add(StaticText13, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
... ... @@ -226,6 +217,22 @@ FD_ESR::FD_ESR(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; s
226 217 TextCtrl14->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
227 218 GridSizer3->Add(TextCtrl14, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
228 219 FlexGridSizer6->Add(GridSizer3, 1, wxALL|wxEXPAND, 5);
  220 + GridSizer2 = new wxGridSizer(0, 3, 0, 0);
  221 + StaticText12 = new wxStaticText(this, ID_STATICTEXT12, _("Range Type"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT12"));
  222 + GridSizer2->Add(StaticText12, 2, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
  223 + RadioButton1 = new wxRadioButton(this, ID_RADIOBUTTON1, _("Lin"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON1"));
  224 + RadioButton1->SetValue(true);
  225 + GridSizer2->Add(RadioButton1, 1, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
  226 + RadioButton2 = new wxRadioButton(this, ID_RADIOBUTTON2, _("Log"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON2"));
  227 + GridSizer2->Add(RadioButton2, 1, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
  228 + FlexGridSizer6->Add(GridSizer2, 1, wxALL|wxEXPAND, 5);
  229 + FlexGridSizer7 = new wxFlexGridSizer(0, 2, 0, 0);
  230 + StaticText11 = new wxStaticText(this, ID_STATICTEXT11, _("Order for Filter Fitting "), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT11"));
  231 + FlexGridSizer7->Add(StaticText11, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  232 + TextCtrl11 = new wxTextCtrl(this, ID_TEXTCTRL11, _("-10"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL11"));
  233 + TextCtrl11->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
  234 + FlexGridSizer7->Add(TextCtrl11, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  235 + FlexGridSizer6->Add(FlexGridSizer7, 1, wxALL|wxEXPAND, 5);
229 236 StaticBoxSizer3->Add(FlexGridSizer6, 1, wxALL|wxEXPAND, 5);
230 237 FlexGridSizer1->Add(StaticBoxSizer3, 1, wxALL|wxEXPAND, 5);
231 238 FlexGridSizer4 = new wxFlexGridSizer(0, 5, 0, 0);
... ...
GUI/SW1/SRC/FD_ESR.h
  Diff comments   View file @dd86ff4
... ... @@ -45,6 +45,7 @@
45 45 #include <wx/sizer.h>
46 46 #include <wx/stattext.h>
47 47 #include <wx/textctrl.h>
  48 +#include <wx/checkbox.h>
48 49 #include <wx/statline.h>
49 50 #include <wx/radiobut.h>
50 51 #include <wx/button.h>
... ... @@ -81,6 +82,7 @@ class FD_ESR: public wxDialog
81 82 wxStaticText* StaticText3;
82 83 wxStaticLine* StaticLine7;
83 84 wxButton* Button2;
  85 + wxCheckBox* CheckBox1;
84 86 wxStaticLine* StaticLine4;
85 87 wxStaticLine* StaticLine2;
86 88 wxTextCtrl* TextCtrl14;
... ... @@ -139,17 +141,18 @@ class FD_ESR: public wxDialog
139 141 static const long ID_TEXTCTRL9;
140 142 static const long ID_STATICTEXT10;
141 143 static const long ID_TEXTCTRL10;
142   - static const long ID_STATICTEXT11;
143   - static const long ID_TEXTCTRL11;
144   - static const long ID_STATICTEXT12;
145   - static const long ID_RADIOBUTTON1;
146   - static const long ID_RADIOBUTTON2;
  144 + static const long ID_CHECKBOX1;
147 145 static const long ID_STATICTEXT13;
148 146 static const long ID_TEXTCTRL12;
149 147 static const long ID_STATICTEXT14;
150 148 static const long ID_TEXTCTRL13;
151 149 static const long ID_STATICTEXT15;
152 150 static const long ID_TEXTCTRL14;
  151 + static const long ID_STATICTEXT12;
  152 + static const long ID_RADIOBUTTON1;
  153 + static const long ID_RADIOBUTTON2;
  154 + static const long ID_STATICTEXT11;
  155 + static const long ID_TEXTCTRL11;
153 156 static const long ID_BUTTON1;
154 157 static const long ID_BUTTON2;
155 158 //*)
... ...
GUI/SW1/SRC/FD_ESR_SW.cpp
  Diff comments   View file @dd86ff4
... ... @@ -90,17 +90,18 @@ const long FD_ESR_SW::ID_STATICTEXT14 = wxNewId();
90 90 const long FD_ESR_SW::ID_TEXTCTRL14 = wxNewId();
91 91 const long FD_ESR_SW::ID_STATICTEXT15 = wxNewId();
92 92 const long FD_ESR_SW::ID_TEXTCTRL15 = wxNewId();
93   -const long FD_ESR_SW::ID_STATICTEXT16 = wxNewId();
94   -const long FD_ESR_SW::ID_TEXTCTRL16 = wxNewId();
95   -const long FD_ESR_SW::ID_STATICTEXT17 = wxNewId();
96   -const long FD_ESR_SW::ID_RADIOBUTTON1 = wxNewId();
97   -const long FD_ESR_SW::ID_RADIOBUTTON2 = wxNewId();
  93 +const long FD_ESR_SW::ID_CHECKBOX1 = wxNewId();
98 94 const long FD_ESR_SW::ID_STATICTEXT18 = wxNewId();
99 95 const long FD_ESR_SW::ID_TEXTCTRL17 = wxNewId();
100 96 const long FD_ESR_SW::ID_STATICTEXT19 = wxNewId();
101 97 const long FD_ESR_SW::ID_TEXTCTRL18 = wxNewId();
102 98 const long FD_ESR_SW::ID_STATICTEXT20 = wxNewId();
103 99 const long FD_ESR_SW::ID_TEXTCTRL19 = wxNewId();
  100 +const long FD_ESR_SW::ID_STATICTEXT17 = wxNewId();
  101 +const long FD_ESR_SW::ID_RADIOBUTTON1 = wxNewId();
  102 +const long FD_ESR_SW::ID_RADIOBUTTON2 = wxNewId();
  103 +const long FD_ESR_SW::ID_STATICTEXT16 = wxNewId();
  104 +const long FD_ESR_SW::ID_TEXTCTRL16 = wxNewId();
104 105 const long FD_ESR_SW::ID_BUTTON1 = wxNewId();
105 106 const long FD_ESR_SW::ID_BUTTON2 = wxNewId();
106 107 //*)
... ... @@ -116,6 +117,7 @@ FD_ESR_SW::FD_ESR_SW(wxWindow* parent,wxWindowID id)
116 117 wxStaticBoxSizer* StaticBoxSizer2;
117 118 wxFlexGridSizer* FlexGridSizer4;
118 119 wxStaticBoxSizer* StaticBoxSizer4;
  120 + wxFlexGridSizer* FlexGridSizer10;
119 121 wxFlexGridSizer* FlexGridSizer3;
120 122 wxFlexGridSizer* FlexGridSizer5;
121 123 wxFlexGridSizer* FlexGridSizer9;
... ... @@ -224,24 +226,14 @@ FD_ESR_SW::FD_ESR_SW(wxWindow* parent,wxWindowID id)
224 226 TextCtrl15 = new wxTextCtrl(this, ID_TEXTCTRL15, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL15"));
225 227 FlexGridSizer5->Add(TextCtrl15, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
226 228 StaticBoxSizer3->Add(FlexGridSizer5, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
227   - FlexGridSizer1->Add(StaticBoxSizer3, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  229 + FlexGridSizer1->Add(StaticBoxSizer3, 1, wxALL|wxALIGN_TOP|wxALIGN_CENTER_HORIZONTAL, 5);
228 230 StaticBoxSizer4 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Filter Fitting Parameters"));
229 231 FlexGridSizer6 = new wxFlexGridSizer(0, 1, 0, 0);
230   - FlexGridSizer7 = new wxFlexGridSizer(0, 2, 0, 0);
231   - StaticText16 = new wxStaticText(this, ID_STATICTEXT16, _("Order for filter fitting "), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT16"));
232   - FlexGridSizer7->Add(StaticText16, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
233   - TextCtrl16 = new wxTextCtrl(this, ID_TEXTCTRL16, _("-10"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL16"));
234   - TextCtrl16->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
235   - FlexGridSizer7->Add(TextCtrl16, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
236   - FlexGridSizer6->Add(FlexGridSizer7, 1, wxALL|wxEXPAND, 5);
237   - FlexGridSizer8 = new wxFlexGridSizer(0, 3, 0, 0);
238   - StaticText17 = new wxStaticText(this, ID_STATICTEXT17, _("Range Type"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT17"));
239   - FlexGridSizer8->Add(StaticText17, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
240   - RadioButton1 = new wxRadioButton(this, ID_RADIOBUTTON1, _("Lin"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON1"));
241   - FlexGridSizer8->Add(RadioButton1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
242   - RadioButton2 = new wxRadioButton(this, ID_RADIOBUTTON2, _("Log"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON2"));
243   - FlexGridSizer8->Add(RadioButton2, 1, wxALL, 5);
244   - FlexGridSizer6->Add(FlexGridSizer8, 1, wxALL|wxEXPAND, 5);
  232 + FlexGridSizer10 = new wxFlexGridSizer(0, 3, 0, 0);
  233 + CheckBox1 = new wxCheckBox(this, ID_CHECKBOX1, _("Use Default"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_CHECKBOX1"));
  234 + CheckBox1->SetValue(true);
  235 + FlexGridSizer10->Add(CheckBox1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  236 + FlexGridSizer6->Add(FlexGridSizer10, 1, wxALL|wxEXPAND, 5);
245 237 FlexGridSizer9 = new wxFlexGridSizer(0, 2, 0, 0);
246 238 StaticText18 = new wxStaticText(this, ID_STATICTEXT18, _("Frequency min (Hz)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT18"));
247 239 FlexGridSizer9->Add(StaticText18, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
... ... @@ -259,6 +251,21 @@ FD_ESR_SW::FD_ESR_SW(wxWindow* parent,wxWindowID id)
259 251 TextCtrl19->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
260 252 FlexGridSizer9->Add(TextCtrl19, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
261 253 FlexGridSizer6->Add(FlexGridSizer9, 1, wxALL|wxEXPAND, 5);
  254 + FlexGridSizer8 = new wxFlexGridSizer(0, 3, 0, 0);
  255 + StaticText17 = new wxStaticText(this, ID_STATICTEXT17, _("Range Type"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT17"));
  256 + FlexGridSizer8->Add(StaticText17, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  257 + RadioButton1 = new wxRadioButton(this, ID_RADIOBUTTON1, _("Lin"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON1"));
  258 + FlexGridSizer8->Add(RadioButton1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  259 + RadioButton2 = new wxRadioButton(this, ID_RADIOBUTTON2, _("Log"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON2"));
  260 + FlexGridSizer8->Add(RadioButton2, 1, wxALL, 5);
  261 + FlexGridSizer6->Add(FlexGridSizer8, 1, wxALL|wxEXPAND, 5);
  262 + FlexGridSizer7 = new wxFlexGridSizer(0, 2, 0, 0);
  263 + StaticText16 = new wxStaticText(this, ID_STATICTEXT16, _("Order for filter fitting "), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT16"));
  264 + FlexGridSizer7->Add(StaticText16, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  265 + TextCtrl16 = new wxTextCtrl(this, ID_TEXTCTRL16, _("-10"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL16"));
  266 + TextCtrl16->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
  267 + FlexGridSizer7->Add(TextCtrl16, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  268 + FlexGridSizer6->Add(FlexGridSizer7, 1, wxALL|wxEXPAND, 5);
262 269 StaticBoxSizer4->Add(FlexGridSizer6, 1, wxALL|wxEXPAND, 5);
263 270 FlexGridSizer1->Add(StaticBoxSizer4, 1, wxALL|wxEXPAND, 5);
264 271 FlexGridSizer2 = new wxFlexGridSizer(0, 2, 0, 0);
... ...
GUI/SW1/SRC/FD_ESR_SW.h
  Diff comments   View file @dd86ff4
... ... @@ -45,6 +45,7 @@
45 45 #include <wx/sizer.h>
46 46 #include <wx/stattext.h>
47 47 #include <wx/textctrl.h>
  48 +#include <wx/checkbox.h>
48 49 #include <wx/statline.h>
49 50 #include <wx/radiobut.h>
50 51 #include <wx/button.h>
... ... @@ -86,6 +87,7 @@ class FD_ESR_SW: public wxDialog
86 87 wxStaticLine* StaticLine7;
87 88 wxButton* Button2;
88 89 wxTextCtrl* TextCtrl18;
  90 + wxCheckBox* CheckBox1;
89 91 wxStaticLine* StaticLine4;
90 92 wxStaticLine* StaticLine2;
91 93 wxStaticLine* StaticLine12;
... ... @@ -161,17 +163,18 @@ class FD_ESR_SW: public wxDialog
161 163 static const long ID_TEXTCTRL14;
162 164 static const long ID_STATICTEXT15;
163 165 static const long ID_TEXTCTRL15;
164   - static const long ID_STATICTEXT16;
165   - static const long ID_TEXTCTRL16;
166   - static const long ID_STATICTEXT17;
167   - static const long ID_RADIOBUTTON1;
168   - static const long ID_RADIOBUTTON2;
  166 + static const long ID_CHECKBOX1;
169 167 static const long ID_STATICTEXT18;
170 168 static const long ID_TEXTCTRL17;
171 169 static const long ID_STATICTEXT19;
172 170 static const long ID_TEXTCTRL18;
173 171 static const long ID_STATICTEXT20;
174 172 static const long ID_TEXTCTRL19;
  173 + static const long ID_STATICTEXT17;
  174 + static const long ID_RADIOBUTTON1;
  175 + static const long ID_RADIOBUTTON2;
  176 + static const long ID_STATICTEXT16;
  177 + static const long ID_TEXTCTRL16;
175 178 static const long ID_BUTTON1;
176 179 static const long ID_BUTTON2;
177 180 //*)
... ...
GUI/SW1/SRC/FLEXCABLE.cpp
  Diff comments   View file @dd86ff4
... ... @@ -55,14 +55,15 @@ const long FLEXCABLE::ID_STATICTEXT2 = wxNewId();
55 55 const long FLEXCABLE::ID_TEXTCTRL2 = wxNewId();
56 56 const long FLEXCABLE::ID_STATICTEXT3 = wxNewId();
57 57 const long FLEXCABLE::ID_TEXTCTRL3 = wxNewId();
  58 +const long FLEXCABLE::ID_STATICTEXT17 = wxNewId();
  59 +const long FLEXCABLE::ID_TEXTCTRL14 = wxNewId();
  60 +const long FLEXCABLE::ID_GRID1 = wxNewId();
58 61 const long FLEXCABLE::ID_STATICTEXT4 = wxNewId();
59   -const long FLEXCABLE::ID_TEXTCTRL4 = wxNewId();
  62 +const long FLEXCABLE::ID_CHECKBOX2 = wxNewId();
60 63 const long FLEXCABLE::ID_STATICTEXT5 = wxNewId();
61   -const long FLEXCABLE::ID_TEXTCTRL5 = wxNewId();
  64 +const long FLEXCABLE::ID_COMBOBOX1 = wxNewId();
62 65 const long FLEXCABLE::ID_STATICTEXT6 = wxNewId();
63   -const long FLEXCABLE::ID_TEXTCTRL6 = wxNewId();
64   -const long FLEXCABLE::ID_STATICTEXT17 = wxNewId();
65   -const long FLEXCABLE::ID_TEXTCTRL14 = wxNewId();
  66 +const long FLEXCABLE::ID_CHECKBOX3 = wxNewId();
66 67 const long FLEXCABLE::ID_PANEL2 = wxNewId();
67 68 const long FLEXCABLE::ID_STATICTEXT12 = wxNewId();
68 69 const long FLEXCABLE::ID_TEXTCTRL12 = wxNewId();
... ... @@ -88,6 +89,10 @@ FLEXCABLE::FLEXCABLE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS
88 89 //(*Initialize(FLEXCABLE)
89 90 wxBoxSizer* BoxSizer4;
90 91 wxStaticBoxSizer* StaticBoxSizer2;
  92 + wxBoxSizer* BoxSizer6;
  93 + wxFlexGridSizer* FlexGridSizer4;
  94 + wxBoxSizer* BoxSizer5;
  95 + wxBoxSizer* BoxSizer7;
91 96 wxFlexGridSizer* FlexGridSizer3;
92 97 wxFlexGridSizer* FlexGridSizer5;
93 98 wxFlexGridSizer* FlexGridSizer2;
... ... @@ -110,38 +115,52 @@ FLEXCABLE::FLEXCABLE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS
110 115 BoxSizer3 = new wxBoxSizer(wxVERTICAL);
111 116 Notebook1 = new wxNotebook(this, ID_NOTEBOOK1, wxDefaultPosition, wxDefaultSize, 0, _T("ID_NOTEBOOK1"));
112 117 Panel2 = new wxPanel(Notebook1, ID_PANEL2, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _T("ID_PANEL2"));
  118 + BoxSizer5 = new wxBoxSizer(wxVERTICAL);
  119 + BoxSizer6 = new wxBoxSizer(wxVERTICAL);
113 120 FlexGridSizer3 = new wxFlexGridSizer(0, 2, 0, 0);
114   - StaticText16 = new wxStaticText(Panel2, ID_STATICTEXT16, _("Number of Conductors"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT16"));
  121 + StaticText16 = new wxStaticText(Panel2, ID_STATICTEXT16, _("Number of Conductor Rows"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT16"));
115 122 FlexGridSizer3->Add(StaticText16, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
116   - TextCtrl13 = new wxTextCtrl(Panel2, ID_TEXTCTRL13, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL13"));
  123 + TextCtrl13 = new wxTextCtrl(Panel2, ID_TEXTCTRL13, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER, wxDefaultValidator, _T("ID_TEXTCTRL13"));
117 124 FlexGridSizer3->Add(TextCtrl13, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
118   - StaticText2 = new wxStaticText(Panel2, ID_STATICTEXT2, _("Conductor Width in x (m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2"));
  125 + StaticText2 = new wxStaticText(Panel2, ID_STATICTEXT2, _("Dielectric Width x, (m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2"));
119 126 FlexGridSizer3->Add(StaticText2, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
120 127 TextCtrl2 = new wxTextCtrl(Panel2, ID_TEXTCTRL2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL2"));
121 128 FlexGridSizer3->Add(TextCtrl2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
122   - StaticText3 = new wxStaticText(Panel2, ID_STATICTEXT3, _("Conductor Height in y (m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3"));
  129 + StaticText3 = new wxStaticText(Panel2, ID_STATICTEXT3, _("Dielectric Height, y (m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3"));
123 130 FlexGridSizer3->Add(StaticText3, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
124 131 TextCtrl3 = new wxTextCtrl(Panel2, ID_TEXTCTRL3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL3"));
125 132 FlexGridSizer3->Add(TextCtrl3, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
126   - StaticText4 = new wxStaticText(Panel2, ID_STATICTEXT4, _("Conductor Separation (m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4"));
127   - FlexGridSizer3->Add(StaticText4, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
128   - TextCtrl4 = new wxTextCtrl(Panel2, ID_TEXTCTRL4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL4"));
129   - FlexGridSizer3->Add(TextCtrl4, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
130   - StaticText5 = new wxStaticText(Panel2, ID_STATICTEXT5, _("Dielectric Offset in x (m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT5"));
131   - FlexGridSizer3->Add(StaticText5, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
132   - TextCtrl5 = new wxTextCtrl(Panel2, ID_TEXTCTRL5, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL5"));
133   - FlexGridSizer3->Add(TextCtrl5, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
134   - StaticText6 = new wxStaticText(Panel2, ID_STATICTEXT6, _("Dielectric Offset in y (m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT6"));
135   - FlexGridSizer3->Add(StaticText6, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
136   - TextCtrl6 = new wxTextCtrl(Panel2, ID_TEXTCTRL6, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL6"));
137   - FlexGridSizer3->Add(TextCtrl6, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
138 133 StaticText17 = new wxStaticText(Panel2, ID_STATICTEXT17, _("Conductor Conductivity (S/m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT17"));
139 134 FlexGridSizer3->Add(StaticText17, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
140 135 TextCtrl14 = new wxTextCtrl(Panel2, ID_TEXTCTRL14, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL14"));
141 136 FlexGridSizer3->Add(TextCtrl14, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
142   - Panel2->SetSizer(FlexGridSizer3);
143   - FlexGridSizer3->Fit(Panel2);
144   - FlexGridSizer3->SetSizeHints(Panel2);
  137 + BoxSizer6->Add(FlexGridSizer3, 0, wxALIGN_LEFT, 0);
  138 + BoxSizer5->Add(BoxSizer6, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  139 + BoxSizer7 = new wxBoxSizer(wxHORIZONTAL);
  140 + Grid1 = new wxGrid(Panel2, ID_GRID1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxVSCROLL|wxHSCROLL|wxFULL_REPAINT_ON_RESIZE, _T("ID_GRID1"));
  141 + BoxSizer7->Add(Grid1, 3, wxALL|wxEXPAND, 5);
  142 + BoxSizer5->Add(BoxSizer7, 1, wxALL|wxEXPAND, 5);
  143 + FlexGridSizer4 = new wxFlexGridSizer(0, 2, 0, 0);
  144 + StaticText4 = new wxStaticText(Panel2, ID_STATICTEXT4, _("Use Laplace"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4"));
  145 + FlexGridSizer4->Add(StaticText4, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
  146 + CheckBox2 = new wxCheckBox(Panel2, ID_CHECKBOX2, _("Yes"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_CHECKBOX2"));
  147 + CheckBox2->SetValue(true);
  148 + CheckBox2->Disable();
  149 + FlexGridSizer4->Add(CheckBox2, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
  150 + StaticText5 = new wxStaticText(Panel2, ID_STATICTEXT5, _("View Mesh"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT5"));
  151 + FlexGridSizer4->Add(StaticText5, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
  152 + ComboBox1 = new wxComboBox(Panel2, ID_COMBOBOX1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, 0, 0, wxDefaultValidator, _T("ID_COMBOBOX1"));
  153 + FlexGridSizer4->Add(ComboBox1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  154 + StaticText6 = new wxStaticText(Panel2, ID_STATICTEXT6, _("Refine Mesh"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT6"));
  155 + FlexGridSizer4->Add(StaticText6, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
  156 + CheckBox3 = new wxCheckBox(Panel2, ID_CHECKBOX3, _("Yes"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_CHECKBOX3"));
  157 + CheckBox3->SetValue(false);
  158 + CheckBox3->Disable();
  159 + FlexGridSizer4->Add(CheckBox3, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
  160 + BoxSizer5->Add(FlexGridSizer4, 1, wxALL|wxEXPAND, 5);
  161 + Panel2->SetSizer(BoxSizer5);
  162 + BoxSizer5->Fit(Panel2);
  163 + BoxSizer5->SetSizeHints(Panel2);
145 164 Panel3 = new wxPanel(Notebook1, ID_PANEL3, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _T("ID_PANEL3"));
146 165 BoxSizer4 = new wxBoxSizer(wxVERTICAL);
147 166 FlexGridSizer5 = new wxFlexGridSizer(0, 2, 0, 0);
... ... @@ -187,11 +206,10 @@ FLEXCABLE::FLEXCABLE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS
187 206 FlexGridSizer1->SetSizeHints(this);
188 207  
189 208 Connect(ID_TEXTCTRL13,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&FLEXCABLE::OnTextCtrl13Text);
  209 + Connect(ID_TEXTCTRL13,wxEVT_COMMAND_TEXT_ENTER,(wxObjectEventFunction)&FLEXCABLE::OnTextCtrl13TextEnter);
190 210 Connect(ID_TEXTCTRL2,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&FLEXCABLE::OnTextCtrl2Text);
191 211 Connect(ID_TEXTCTRL3,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&FLEXCABLE::OnTextCtrl3Text);
192   - Connect(ID_TEXTCTRL4,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&FLEXCABLE::OnTextCtrl4Text);
193   - Connect(ID_TEXTCTRL5,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&FLEXCABLE::OnTextCtrl5Text);
194   - Connect(ID_TEXTCTRL6,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&FLEXCABLE::OnTextCtrl6Text);
  212 + Connect(ID_CHECKBOX3,wxEVT_COMMAND_CHECKBOX_CLICKED,(wxObjectEventFunction)&FLEXCABLE::OnCheckBox3Click);
195 213 Connect(ID_TEXTCTRL12,wxEVT_COMMAND_TEXT_UPDATED,(wxObjectEventFunction)&FLEXCABLE::OnTextCtrl12Text);
196 214 Connect(ID_CHECKBOX1,wxEVT_COMMAND_CHECKBOX_CLICKED,(wxObjectEventFunction)&FLEXCABLE::OnCheckBox1Click);
197 215 Connect(ID_NOTEBOOK1,wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,(wxObjectEventFunction)&FLEXCABLE::OnNotebook1PageChanging);
... ... @@ -200,16 +218,15 @@ FLEXCABLE::FLEXCABLE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS
200 218 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&FLEXCABLE::OnButton3Click);
201 219 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&FLEXCABLE::OnPanel1Paint,0,this);
202 220 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&FLEXCABLE::OnPanel1LeftDClick,0,this);
  221 + Connect(wxEVT_PAINT,(wxObjectEventFunction)&FLEXCABLE::OnPaint);
203 222 //*)
204 223  
205 224 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
206 225 TextCtrl3->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
207   - TextCtrl4->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
208   - TextCtrl5->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
209   - TextCtrl6->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
210 226 TextCtrl12->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
211 227 TextCtrl14->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
212 228 CheckBox1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
  229 + Grid1->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&FLEXCABLE::OnHighlightSchematic, this);
213 230 }
214 231  
215 232  
... ... @@ -219,12 +236,15 @@ FLEXCABLE::~FLEXCABLE()
219 236 //*)
220 237 }
221 238  
222   -void FLEXCABLE::SetPathToMOD(wxString Path, wxString Name)
  239 +void FLEXCABLE::OnPaint(wxPaintEvent& event)
223 240 {
  241 + if (EDIT_EXISTING==true) EditExistingCable();
  242 +}
224 243  
  244 +void FLEXCABLE::SetPathToMOD(wxString Path, wxString Name)
  245 +{
225 246 pathToMOD << Path;
226 247 MODname << Name;
227   -
228 248 }
229 249  
230 250 void FLEXCABLE::OnButton1Click(wxCommandEvent& event)
... ... @@ -243,9 +263,6 @@ void FLEXCABLE::OnButton1Click(wxCommandEvent&amp; event)
243 263  
244 264 check_is_empty(TextCtrl2, &IsError);
245 265 check_is_empty(TextCtrl3, &IsError);
246   - check_is_empty(TextCtrl4, &IsError);
247   - check_is_empty(TextCtrl5, &IsError);
248   - check_is_empty(TextCtrl6, &IsError);
249 266 check_is_empty(TextCtrl13, &IsError);
250 267 check_is_empty(TextCtrl14, &IsError);
251 268  
... ... @@ -321,6 +338,38 @@ void FLEXCABLE::OnButton2Click(wxCommandEvent&amp; event)
321 338 run_status->ShowModal();
322 339  
323 340 Button1->Enable();
  341 +
  342 + if (CheckBox2->GetValue())
  343 + {
  344 +
  345 + wxString pattern (("*.msh.vtk")) ;
  346 +
  347 + wxString file;
  348 +
  349 + ComboBox1->Clear();
  350 +
  351 + file = wxFindFirstFile(pattern);
  352 +
  353 + while ( !file.empty())
  354 + {
  355 + wxString meshfile = file;
  356 + size_t extindex = meshfile.find_last_of (".");
  357 +
  358 + meshfile = meshfile.substr(0, extindex);
  359 +
  360 + extindex = meshfile.find_last_of (".");
  361 +
  362 + meshfile = meshfile.substr(0, extindex);
  363 +
  364 + meshfile = meshfile.substr(2,meshfile.length());
  365 +
  366 + ComboBox1->Append(meshfile);
  367 +
  368 + file = wxFindNextFile();
  369 + }
  370 +
  371 + CheckBox3->Enable();
  372 + }
324 373 }
325 374  
326 375 void FLEXCABLE::OnButton3Click(wxCommandEvent& event)
... ... @@ -344,27 +393,6 @@ void FLEXCABLE::OnTextCtrl3Text(wxCommandEvent&amp; event)
344 393 check_is_positive(TextCtrl3, &IsError);
345 394 }
346 395  
347   -void FLEXCABLE::OnTextCtrl4Text(wxCommandEvent& event)
348   -{
349   - int IsError = 0;
350   - check_is_numeric(TextCtrl4, &IsError);
351   - check_is_positive(TextCtrl4, &IsError);
352   -}
353   -
354   -void FLEXCABLE::OnTextCtrl5Text(wxCommandEvent& event)
355   -{
356   - int IsError = 0;
357   - check_is_numeric(TextCtrl5, &IsError);
358   - check_is_positive(TextCtrl5, &IsError);
359   -}
360   -
361   -void FLEXCABLE::OnTextCtrl6Text(wxCommandEvent& event)
362   -{
363   - int IsError = 0;
364   - check_is_numeric(TextCtrl6, &IsError);
365   - check_is_positive(TextCtrl6, &IsError);
366   -}
367   -
368 396 void FLEXCABLE::OnTextCtrl12Text(wxCommandEvent& event)
369 397 {
370 398 int IsError = 0;
... ... @@ -434,20 +462,46 @@ void FLEXCABLE::WriteCableFile (wxString fileName)
434 462  
435 463 cableFile.open (fullFileName);
436 464  
  465 + int n_rows, n_conductors, row;
  466 +
  467 + n_conductors = 0;
  468 +
  469 + n_rows = wxAtoi(TextCtrl13->GetValue());
  470 +
  471 + for (int i = 0; i < n_rows; i++){
  472 +
  473 + wxString conductors = Grid1->GetCellValue(i,5);
  474 +
  475 + n_conductors = n_conductors + wxAtoi(conductors);
  476 +
  477 + }
  478 +
  479 + int n_parameters = (n_rows * 6) + 4;
  480 +
437 481 if (cableFile.is_open())
438 482 {
439   - // minimum requirements for type Cylindrical
440 483 cableFile <<"# MOD_cable_lib_dir \n";
441 484 cableFile <<"../"<< MODname <<"/CABLE/"<<"\n";
442   - cableFile <<"Flex_cable\n";
443   - cableFile << TextCtrl13->GetValue() <<" #number of conductors \n";
444   - cableFile <<"6 #number of parameters \n";
445   - cableFile << TextCtrl2->GetValue() <<" # parameter 1: conductor width (x dimension)\n";
446   - cableFile << TextCtrl3->GetValue() <<" # parameter 2: conductor height (y dimension)\n";
447   - cableFile << TextCtrl4->GetValue() <<" # parameter 3: conductor separation (x dimension)\n";
448   - cableFile << TextCtrl5->GetValue() <<" # parameter 4: dielectric offset x\n";
449   - cableFile << TextCtrl6->GetValue() <<" # parameter 5: dielectric offset y\n";
450   - cableFile << TextCtrl14->GetValue() <<" # parameter 6: conductivity\n";
  485 + cableFile <<"flex_cable\n";
  486 + cableFile << n_conductors <<" #number of conductors \n";
  487 + cableFile << n_parameters <<" #number of parameters \n";
  488 +
  489 + cableFile << TextCtrl2->GetValue() <<" # parameter 1: dielectric width (x dimension)\n";
  490 + cableFile << TextCtrl3->GetValue() <<" # parameter 2: dielectric height (y dimension)\n";
  491 + cableFile << TextCtrl13->GetValue() <<" # parameter 3: number of rows of conductors\n";
  492 +
  493 + for (row = 0; row < n_rows;row++){
  494 +
  495 + cableFile << Grid1->GetCellValue(row,0) <<" # parameter "<< (row * 6) + 4 <<": row "<<row+1<<" centre offset x\n";
  496 + cableFile << Grid1->GetCellValue(row,1) <<" # parameter "<< (row * 6) + 5 <<": row "<<row+1<<" centre offset y\n";
  497 + cableFile << Grid1->GetCellValue(row,2) <<" # parameter "<< (row * 6) + 6 <<": row "<<row+1<<" conductor width (x dimension)\n";
  498 + cableFile << Grid1->GetCellValue(row,3) <<" # parameter "<< (row * 6) + 7 <<": row "<<row+1<<" conductor width (y dimension)\n";
  499 + cableFile << Grid1->GetCellValue(row,4) <<" # parameter "<< (row * 6) + 8 <<": row "<<row+1<<" conductor separation\n";
  500 + cableFile << Grid1->GetCellValue(row,5) <<" # parameter "<< (row * 6) + 9 <<": row "<<row+1<<" number of conductors\n";
  501 + }
  502 +
  503 + cableFile << TextCtrl14->GetValue() <<" # parameter "<< ((row-1) * 6) + 10<<": conductivity\n";
  504 +
451 505 cableFile <<"1 # number of frequency dependent parameters\n";
452 506  
453 507 if (CheckBox1->GetValue()){
... ... @@ -468,6 +522,20 @@ void FLEXCABLE::WriteCableFile (wxString fileName)
468 522 cableFile << "1.0\n";
469 523 }
470 524  
  525 + cableFile <<"use_laplace \n";
  526 +
  527 + if (CheckBox2->GetValue())
  528 + {
  529 + //cableFile << "Laplace_boundary_constant\n";
  530 + //cableFile << MESH_PARAM1 <<"\n";
  531 + cableFile << "Laplace_surface_mesh_constant\n";
  532 + cableFile << MESH_PARAM2 <<"\n";
  533 + //cableFile << "max_mesh_edge_length\n";
  534 + //cableFile << MESH_PARAM3 <<"\n";
  535 +
  536 + CheckBox2 ->SetValue(false);
  537 + }
  538 +
471 539 cableFile.close();
472 540 }
473 541 }
... ... @@ -491,14 +559,23 @@ void FLEXCABLE::flexcableSchematic()
491 559 dc.DrawLine( size_h/2, 0, size_h/2, size_v);
492 560  
493 561 dc.SetTextForeground(*wxBLUE);
494   - dc.DrawText("General Flexcable", 10, 15);
  562 + dc.DrawText("General Multi-layer Flexcable", 10, 15);
  563 +
  564 + float conductor_width_r1, conductor_height_r1, conductor_width_r2, conductor_height_r2,conductor_width_r3, conductor_height_r3,conductor_separation_r1, conductor_separation_r2,totalHeight, totalWidth;
  565 +
  566 + conductor_width_r1 = 0.175 * size_h;
  567 + conductor_height_r1 = 0.06 * size_v;
495 568  
496   - float conductor_width, conductor_height, conductor_separation, totalHeight, totalWidth;
  569 + conductor_width_r2 = 0.175 * size_h;
  570 + conductor_height_r2 = 0.04 * size_v;
497 571  
498   - conductor_width = 0.175 * size_h;
499   - conductor_height = 0.06 * size_v;
500   - conductor_separation = 0.05 * size_h;
501   - totalHeight = 0.15 * size_v;
  572 + conductor_width_r3 = 0.9 * size_h;
  573 + conductor_height_r3 = 0.02 * size_v;
  574 +
  575 + conductor_separation_r1 = 0.05 * size_h;
  576 + conductor_separation_r2 = 0.1 * size_h;
  577 +
  578 + totalHeight = 0.5 * size_v;
502 579 totalWidth = 0.98 * size_h;
503 580  
504 581 dc.SetPen( wxPen( wxColor(192,192,192),1 ) );
... ... @@ -506,13 +583,98 @@ void FLEXCABLE::flexcableSchematic()
506 583 dc.DrawRectangle(wxPoint(size_h/2-totalWidth/2, size_v/2-totalHeight/2), wxSize(totalWidth,totalHeight));
507 584  
508 585 dc.SetBrush(wxBrush(wxColor(224,224,224), wxSOLID));
509   - dc.DrawRectangle(wxPoint(size_h/2-conductor_width-conductor_separation, size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
510   - dc.DrawRectangle(wxPoint(size_h/2-(2* conductor_width)-(2*conductor_separation), size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
511   - dc.DrawRectangle(wxPoint(size_h/2 + conductor_separation, size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
512   - dc.DrawRectangle(wxPoint(size_h/2 + conductor_width +(2*conductor_separation), size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
513 586  
514   - dc.SetPen( wxPen( wxColor(0,0,0),4, wxDOT ) );
515   - dc.DrawLine( size_h/2 - conductor_separation, size_v/2, size_h/2 + conductor_separation, size_v/2);
  587 + //row 1
  588 + dc.DrawRectangle(wxPoint(size_h/2- 2 * conductor_width_r1 - 2 * conductor_separation_r1, size_v/3-conductor_height_r1/2), wxSize(conductor_width_r1,conductor_height_r1));
  589 + dc.DrawRectangle(wxPoint(size_h/2- conductor_width_r1 - conductor_separation_r1, size_v/3-conductor_height_r1/2), wxSize(conductor_width_r1,conductor_height_r1));
  590 + dc.DrawRectangle(wxPoint(size_h/2 + conductor_width_r1 + conductor_separation_r1 , size_v/3-conductor_height_r1/2), wxSize(conductor_width_r1,conductor_height_r1));
  591 +
  592 + //row 2
  593 + dc.DrawRectangle(wxPoint(size_h/2 - 1.5 * conductor_width_r2 - conductor_separation_r2, size_v/2-conductor_height_r2), wxSize(conductor_width_r2,conductor_height_r2));
  594 + dc.DrawRectangle(wxPoint(size_h/2 - conductor_width_r2/2, size_v/2-conductor_height_r2), wxSize(conductor_width_r2,conductor_height_r2));
  595 +
  596 + // row n
  597 + dc.DrawRectangle(wxPoint(size_h/2 - conductor_width_r3/2, size_v/2 + totalHeight/4 ), wxSize(conductor_width_r3,conductor_height_r3));
  598 +
  599 + dc.SetPen( wxPen( wxColor(0,0,0),2, wxDOT ) );
  600 + dc.DrawLine( size_h/2 - conductor_separation_r1 , size_v/3, size_h/2 + conductor_width_r1 + conductor_separation_r1, size_v/3);
  601 + dc.DrawLine( size_h/2 - conductor_width_r2/2 , size_v/2 - conductor_height_r2/2 , size_h/2 - conductor_width_r2/2 - conductor_separation_r2, size_v/2 - conductor_height_r2/2);
  602 +
  603 + dc.SetPen( wxPen( wxColor(51,51,255),1 , wxDOT_DASH) );
  604 + dc.DrawLine( size_h*0.2, size_v/2-conductor_height_r2/2, size_h*0.7,size_v/2-conductor_height_r2/2 );
  605 + dc.DrawLine( size_h/2-conductor_width_r2/2-conductor_separation_r2/2, size_v/2-conductor_height_r2, size_h/2-conductor_width_r2/2-conductor_separation_r2/2,size_v/2+conductor_height_r2 );
  606 +
  607 + wxPoint arrowHead[3];
  608 +
  609 + dc.SetPen(wxPen(wxColor(51,51,255), 3));
  610 + dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
  611 + dc.DrawLine( size_h/2-conductor_width_r2/2-conductor_separation_r2/2,size_v/2-conductor_height_r2*2, size_h/2,size_v/2-conductor_height_r2*2 );
  612 +
  613 + arrowHead[0] = wxPoint(size_h/2-conductor_width_r2/2-conductor_separation_r2/2,size_v/2-conductor_height_r2*2);
  614 + arrowHead[1] = wxPoint(size_h/2-conductor_width_r2/2-conductor_separation_r2/2+5,size_v/2-conductor_height_r2*2-3);
  615 + arrowHead[2] = wxPoint(size_h/2-conductor_width_r2/2-conductor_separation_r2/2+5,size_v/2-conductor_height_r2*2+3);
  616 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  617 +
  618 + arrowHead[0] = wxPoint(size_h/2,size_v/2-conductor_height_r2*2);
  619 + arrowHead[1] = wxPoint(size_h/2 -5,size_v/2-conductor_height_r2*2-3);
  620 + arrowHead[2] = wxPoint(size_h/2 -5,size_v/2-conductor_height_r2*2+3);
  621 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  622 +
  623 + arrowHead[0] = wxPoint(size_h*0.65,size_v/2);
  624 + arrowHead[1] = wxPoint(size_h*0.65 - 3,size_v/2 + 5);
  625 + arrowHead[2] = wxPoint(size_h*0.65 + 3,size_v/2 + 5);
  626 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  627 +
  628 + arrowHead[0] = wxPoint(size_h*0.65,size_v/2 - conductor_height_r2/2);
  629 + arrowHead[1] = wxPoint(size_h*0.65 - 3,size_v/2 - conductor_height_r2/2 - 5);
  630 + arrowHead[2] = wxPoint(size_h*0.65 + 3,size_v/2 - conductor_height_r2/2 - 5);
  631 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  632 +
  633 + dc.SetTextForeground(*wxBLUE);
  634 + dc.DrawText("offset x", size_h/2 + 3,size_v/2-conductor_height_r2*2 - 10);
  635 + dc.DrawText("offset y", size_h*0.65,size_v/2 - conductor_height_r2/2 + 15);
  636 + dc.DrawText("h", 45,size_v/2 - conductor_height_r2/2-10);
  637 + dc.DrawText("w", 100,size_v/2 + 20);
  638 + dc.DrawText("s", 180,size_v/2 + 20);
  639 +
  640 +
  641 +
  642 +
  643 + dc.DrawLine( size_h/2-conductor_width_r2 * 1.5 - conductor_separation_r2,size_v/2 + conductor_height_r2, size_h/2-conductor_width_r2 * 0.5 - conductor_separation_r2,size_v/2 + conductor_height_r2 );
  644 + dc.DrawLine( size_h/2-conductor_width_r2 * 0.5 - conductor_separation_r2,size_v/2 + conductor_height_r2, size_h/2-conductor_width_r2 * 0.5,size_v/2 + conductor_height_r2 );
  645 +
  646 + arrowHead[0] = wxPoint(size_h/2-conductor_width_r2 * 1.5 - conductor_separation_r2,size_v/2 + conductor_height_r2);
  647 + arrowHead[1] = wxPoint(size_h/2-conductor_width_r2 * 1.5 - conductor_separation_r2+5,size_v/2 + conductor_height_r2-3);
  648 + arrowHead[2] = wxPoint(size_h/2-conductor_width_r2 * 1.5 - conductor_separation_r2+5,size_v/2 + conductor_height_r2+3);
  649 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  650 +
  651 + arrowHead[0] = wxPoint(size_h/2-conductor_width_r2 * 0.5 - conductor_separation_r2,size_v/2 + conductor_height_r2);
  652 + arrowHead[1] = wxPoint(size_h/2-conductor_width_r2 * 0.5 - conductor_separation_r2 -5,size_v/2 + conductor_height_r2-3);
  653 + arrowHead[2] = wxPoint(size_h/2-conductor_width_r2 * 0.5 - conductor_separation_r2 -5,size_v/2 + conductor_height_r2+3);
  654 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  655 +
  656 + arrowHead[0] = wxPoint(size_h/2-conductor_width_r2 * 0.5 - conductor_separation_r2,size_v/2 + conductor_height_r2);
  657 + arrowHead[1] = wxPoint(size_h/2-conductor_width_r2 * 0.5 - conductor_separation_r2 +5,size_v/2 + conductor_height_r2-3);
  658 + arrowHead[2] = wxPoint(size_h/2-conductor_width_r2 * 0.5 - conductor_separation_r2 +5,size_v/2 + conductor_height_r2+3);
  659 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  660 +
  661 + arrowHead[0] = wxPoint(size_h/2-conductor_width_r2 * 0.5 ,size_v/2 + conductor_height_r2);
  662 + arrowHead[1] = wxPoint(size_h/2-conductor_width_r2 * 0.5 -5,size_v/2 + conductor_height_r2-3);
  663 + arrowHead[2] = wxPoint(size_h/2-conductor_width_r2 * 0.5 -5,size_v/2 + conductor_height_r2+3);
  664 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  665 +
  666 +
  667 +
  668 + arrowHead[0] = wxPoint(size_h/2-5-conductor_width_r2 * 1.5 - conductor_separation_r2,size_v/2);
  669 + arrowHead[1] = wxPoint(size_h/2-5-conductor_width_r2 * 1.5 - conductor_separation_r2 - 3,size_v/2 - 5);
  670 + arrowHead[2] = wxPoint(size_h/2-5-conductor_width_r2 * 1.5 - conductor_separation_r2 + 3,size_v/2 - 5);
  671 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  672 +
  673 + arrowHead[0] = wxPoint(size_h/2-5-conductor_width_r2 * 1.5 - conductor_separation_r2,size_v/2 - conductor_height_r2);
  674 + arrowHead[1] = wxPoint(size_h/2-5-conductor_width_r2 * 1.5 - conductor_separation_r2 - 3,size_v/2 - conductor_height_r2 + 5);
  675 + arrowHead[2] = wxPoint(size_h/2-5-conductor_width_r2 * 1.5 - conductor_separation_r2 + 3,size_v/2 - conductor_height_r2 + 5);
  676 + dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  677 +
516 678 }
517 679  
518 680 void FLEXCABLE::OnHighlightSchematic(wxCommandEvent& event)
... ... @@ -525,115 +687,144 @@ void FLEXCABLE::OnHighlightSchematic(wxCommandEvent&amp; event)
525 687 int size_h, size_v;
526 688 Panel1->GetSize(&size_h, &size_v );
527 689  
528   - float conductor_width, conductor_height, conductor_separation, totalHeight, totalWidth;
529   -
530   - conductor_width = 0.175 * size_h;
531   - conductor_height = 0.06 * size_v;
532   - conductor_separation = 0.05 * size_h;
533   - totalHeight = 0.15 * size_v;
534   - totalWidth = 0.98 * size_h;
535   -
536   - wxClientDC dc(Panel1);
  690 + float conductor_width_r1, conductor_height_r1, conductor_width_r2, conductor_height_r2,conductor_width_r3, conductor_height_r3,conductor_separation_r1, conductor_separation_r2,totalHeight, totalWidth;
537 691  
538   - wxPoint arrowHead[3];
  692 + conductor_width_r1 = 0.175 * size_h;
  693 + conductor_height_r1 = 0.06 * size_v;
539 694  
540   - if ( ID == ID_TEXTCTRL2)
541   - {
542   - dc.SetPen(wxPen(wxColor(51,51,255), 3));
543   - dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
544   - dc.DrawLine( size_h/2 - conductor_width - conductor_separation,size_v/2, size_h/2 - conductor_separation,size_v/2 );
  695 + conductor_width_r2 = 0.175 * size_h;
  696 + conductor_height_r2 = 0.04 * size_v;
545 697  
546   - arrowHead[0] = wxPoint(size_h/2 - conductor_width - conductor_separation,size_v/2);
547   - arrowHead[1] = wxPoint(size_h/2 - conductor_width - conductor_separation+5,size_v/2-3);
548   - arrowHead[2] = wxPoint(size_h/2 - conductor_width - conductor_separation+5,size_v/2+3);
549   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  698 + conductor_width_r3 = 0.9 * size_h;
  699 + conductor_height_r3 = 0.02 * size_v;
550 700  
551   - arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2);
552   - arrowHead[1] = wxPoint(size_h/2 - conductor_separation-5,size_v/2-3);
553   - arrowHead[2] = wxPoint(size_h/2 - conductor_separation-5,size_v/2+3);
554   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
555   - }
  701 + conductor_separation_r1 = 0.05 * size_h;
  702 + conductor_separation_r2 = 0.1 * size_h;
556 703  
557   - if ( ID == ID_TEXTCTRL3)
558   - {
559   - dc.SetPen(wxPen(wxColor(51,51,255), 3));
560   - dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
561   - dc.DrawLine( size_h/2 - conductor_separation,size_v/2-conductor_height/2, size_h/2 - conductor_separation,size_v/2 + conductor_height/2);
  704 + totalHeight = 0.5 * size_v;
  705 + totalWidth = 0.98 * size_h;
562 706  
563   - arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2-conductor_height/2);
564   - arrowHead[1] = wxPoint(size_h/2 - conductor_separation - 3,size_v/2-conductor_height/2 + 5);
565   - arrowHead[2] = wxPoint(size_h/2 - conductor_separation + 3,size_v/2-conductor_height/2 + 5);
566   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  707 + wxClientDC dc(Panel1);
567 708  
568   - arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2 + conductor_height/2);
569   - arrowHead[1] = wxPoint(size_h/2 - conductor_separation - 3,size_v/2 + conductor_height/2 - 5);
570   - arrowHead[2] = wxPoint(size_h/2 - conductor_separation + 3,size_v/2 + conductor_height/2 - 5);
571   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
572   - }
  709 + wxPoint arrowHead[3];
573 710  
574   - if ( ID == ID_TEXTCTRL4)
  711 + if ( ID == ID_TEXTCTRL14)
575 712 {
576   - dc.SetPen(wxPen(wxColor(51,51,255), 3));
577   - dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
578   - dc.DrawLine( size_h/2 - conductor_width - 2 * conductor_separation,size_v/2, size_h/2 - conductor_width - conductor_separation,size_v/2);
579   -
580   - arrowHead[0] = wxPoint(size_h/2 - conductor_width - 2 * conductor_separation,size_v/2);
581   - arrowHead[1] = wxPoint(size_h/2 - conductor_width - 2 * conductor_separation + 5,size_v/2 - 3);
582   - arrowHead[2] = wxPoint(size_h/2 - conductor_width - 2 * conductor_separation + 5,size_v/2 + 3);
583   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
584 713  
585   - arrowHead[0] = wxPoint(size_h/2 - conductor_width - conductor_separation,size_v/2);
586   - arrowHead[1] = wxPoint(size_h/2 - conductor_width - conductor_separation - 5,size_v/2 - 3);
587   - arrowHead[2] = wxPoint(size_h/2 - conductor_width - conductor_separation - 5,size_v/2 + 3);
588   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
589   - }
590   -
591   - if ( ID == ID_TEXTCTRL5)
592   - {
593 714 dc.SetPen(wxPen(wxColor(51,51,255), 3));
594 715 dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
595   - dc.DrawLine( size_h/2 - totalWidth/2, size_v/2, size_h/2 - 2 * conductor_width - 2 * conductor_separation,size_v/2);
596 716  
597   - arrowHead[0] = wxPoint(size_h/2 - totalWidth/2, size_v/2);
598   - arrowHead[1] = wxPoint(size_h/2 - totalWidth/2 + 5, size_v/2 - 3);
599   - arrowHead[2] = wxPoint(size_h/2 - totalWidth/2 + 5, size_v/2 + 3);
600   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  717 + //row 1
  718 + dc.DrawRectangle(wxPoint(size_h/2- 2 * conductor_width_r1 - 2 * conductor_separation_r1, size_v/3-conductor_height_r1/2), wxSize(conductor_width_r1,conductor_height_r1));
  719 + dc.DrawRectangle(wxPoint(size_h/2- conductor_width_r1 - conductor_separation_r1, size_v/3-conductor_height_r1/2), wxSize(conductor_width_r1,conductor_height_r1));
  720 + dc.DrawRectangle(wxPoint(size_h/2 + conductor_width_r1 + conductor_separation_r1 , size_v/3-conductor_height_r1/2), wxSize(conductor_width_r1,conductor_height_r1));
601 721  
602   - arrowHead[0] = wxPoint(size_h/2 - 2 * conductor_width - 2 * conductor_separation,size_v/2);
603   - arrowHead[1] = wxPoint(size_h/2 - 2 * conductor_width - 2 * conductor_separation - 5,size_v/2 - 3);
604   - arrowHead[2] = wxPoint(size_h/2 - 2 * conductor_width - 2 * conductor_separation - 5,size_v/2 + 3);
605   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  722 + //row 2
  723 + dc.DrawRectangle(wxPoint(size_h/2 - 1.5 * conductor_width_r2 - conductor_separation_r2, size_v/2-conductor_height_r2), wxSize(conductor_width_r2,conductor_height_r2));
  724 + dc.DrawRectangle(wxPoint(size_h/2 - conductor_width_r2/2, size_v/2-conductor_height_r2), wxSize(conductor_width_r2,conductor_height_r2));
606 725  
  726 + // row n
  727 + dc.DrawRectangle(wxPoint(size_h/2 - conductor_width_r3/2, size_v/2 + totalHeight/4 ), wxSize(conductor_width_r3,conductor_height_r3));
607 728 }
608 729  
609   - if ( ID == ID_TEXTCTRL6)
610   - {
611   - dc.SetPen(wxPen(wxColor(51,51,255), 3));
612   - dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
613   - dc.DrawLine( size_h/2 - conductor_separation,size_v/2 - conductor_height/2, size_h/2 - conductor_separation,size_v/2 - totalHeight/2);
614   -
615   - arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2 - conductor_height/2);
616   - arrowHead[1] = wxPoint(size_h/2 - conductor_separation - 3,size_v/2 - conductor_height/2 - 5);
617   - arrowHead[2] = wxPoint(size_h/2 - conductor_separation + 3,size_v/2 - conductor_height/2 - 5);
618   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
619 730  
620   - arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2 - totalHeight/2);
621   - arrowHead[1] = wxPoint(size_h/2 - conductor_separation - 3,size_v/2 - totalHeight/2 +5);
622   - arrowHead[2] = wxPoint(size_h/2 - conductor_separation + 3,size_v/2 - totalHeight/2 + 5);
623   - dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
624   - }
625   - if ( ID == ID_TEXTCTRL14)
626   - {
627   - dc.SetPen(wxPen(wxColor(51,51,255), 3));
628   - dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
629   - dc.DrawRectangle(wxPoint(size_h/2-conductor_width-conductor_separation, size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
630   - dc.DrawRectangle(wxPoint(size_h/2-(2* conductor_width)-(2*conductor_separation), size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
631   - dc.DrawRectangle(wxPoint(size_h/2 + conductor_separation, size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
632   - dc.DrawRectangle(wxPoint(size_h/2 + conductor_width +(2*conductor_separation), size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
633   -
634   - }
  731 +// if ( ID == ID_TEXTCTRL2)
  732 +// {
  733 +// dc.SetPen(wxPen(wxColor(51,51,255), 3));
  734 +// dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
  735 +// dc.DrawLine( size_h/2 - conductor_width - conductor_separation,size_v/2, size_h/2 - conductor_separation,size_v/2 );
  736 +//
  737 +// arrowHead[0] = wxPoint(size_h/2 - conductor_width - conductor_separation,size_v/2);
  738 +// arrowHead[1] = wxPoint(size_h/2 - conductor_width - conductor_separation+5,size_v/2-3);
  739 +// arrowHead[2] = wxPoint(size_h/2 - conductor_width - conductor_separation+5,size_v/2+3);
  740 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  741 +//
  742 +// arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2);
  743 +// arrowHead[1] = wxPoint(size_h/2 - conductor_separation-5,size_v/2-3);
  744 +// arrowHead[2] = wxPoint(size_h/2 - conductor_separation-5,size_v/2+3);
  745 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  746 +// }
  747 +//
  748 +// if ( ID == ID_TEXTCTRL3)
  749 +// {
  750 +// dc.SetPen(wxPen(wxColor(51,51,255), 3));
  751 +// dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
  752 +// dc.DrawLine( size_h/2 - conductor_separation,size_v/2-conductor_height/2, size_h/2 - conductor_separation,size_v/2 + conductor_height/2);
  753 +//
  754 +// arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2-conductor_height/2);
  755 +// arrowHead[1] = wxPoint(size_h/2 - conductor_separation - 3,size_v/2-conductor_height/2 + 5);
  756 +// arrowHead[2] = wxPoint(size_h/2 - conductor_separation + 3,size_v/2-conductor_height/2 + 5);
  757 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  758 +//
  759 +// arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2 + conductor_height/2);
  760 +// arrowHead[1] = wxPoint(size_h/2 - conductor_separation - 3,size_v/2 + conductor_height/2 - 5);
  761 +// arrowHead[2] = wxPoint(size_h/2 - conductor_separation + 3,size_v/2 + conductor_height/2 - 5);
  762 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  763 +// }
  764 +//
  765 +// if ( ID == ID_TEXTCTRL4)
  766 +// {
  767 +// dc.SetPen(wxPen(wxColor(51,51,255), 3));
  768 +// dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
  769 +// dc.DrawLine( size_h/2 - conductor_width - 2 * conductor_separation,size_v/2, size_h/2 - conductor_width - conductor_separation,size_v/2);
  770 +//
  771 +// arrowHead[0] = wxPoint(size_h/2 - conductor_width - 2 * conductor_separation,size_v/2);
  772 +// arrowHead[1] = wxPoint(size_h/2 - conductor_width - 2 * conductor_separation + 5,size_v/2 - 3);
  773 +// arrowHead[2] = wxPoint(size_h/2 - conductor_width - 2 * conductor_separation + 5,size_v/2 + 3);
  774 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  775 +//
  776 +// arrowHead[0] = wxPoint(size_h/2 - conductor_width - conductor_separation,size_v/2);
  777 +// arrowHead[1] = wxPoint(size_h/2 - conductor_width - conductor_separation - 5,size_v/2 - 3);
  778 +// arrowHead[2] = wxPoint(size_h/2 - conductor_width - conductor_separation - 5,size_v/2 + 3);
  779 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  780 +// }
  781 +//
  782 +// if ( ID == ID_TEXTCTRL5)
  783 +// {
  784 +// dc.SetPen(wxPen(wxColor(51,51,255), 3));
  785 +// dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
  786 +// dc.DrawLine( size_h/2 - totalWidth/2, size_v/2, size_h/2 - 2 * conductor_width - 2 * conductor_separation,size_v/2);
  787 +//
  788 +// arrowHead[0] = wxPoint(size_h/2 - totalWidth/2, size_v/2);
  789 +// arrowHead[1] = wxPoint(size_h/2 - totalWidth/2 + 5, size_v/2 - 3);
  790 +// arrowHead[2] = wxPoint(size_h/2 - totalWidth/2 + 5, size_v/2 + 3);
  791 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  792 +//
  793 +// arrowHead[0] = wxPoint(size_h/2 - 2 * conductor_width - 2 * conductor_separation,size_v/2);
  794 +// arrowHead[1] = wxPoint(size_h/2 - 2 * conductor_width - 2 * conductor_separation - 5,size_v/2 - 3);
  795 +// arrowHead[2] = wxPoint(size_h/2 - 2 * conductor_width - 2 * conductor_separation - 5,size_v/2 + 3);
  796 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  797 +//
  798 +// }
  799 +//
  800 +// if ( ID == ID_TEXTCTRL6)
  801 +// {
  802 +// dc.SetPen(wxPen(wxColor(51,51,255), 3));
  803 +// dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
  804 +// dc.DrawLine( size_h/2 - conductor_separation,size_v/2 - conductor_height/2, size_h/2 - conductor_separation,size_v/2 - totalHeight/2);
  805 +//
  806 +// arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2 - conductor_height/2);
  807 +// arrowHead[1] = wxPoint(size_h/2 - conductor_separation - 3,size_v/2 - conductor_height/2 - 5);
  808 +// arrowHead[2] = wxPoint(size_h/2 - conductor_separation + 3,size_v/2 - conductor_height/2 - 5);
  809 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  810 +//
  811 +// arrowHead[0] = wxPoint(size_h/2 - conductor_separation,size_v/2 - totalHeight/2);
  812 +// arrowHead[1] = wxPoint(size_h/2 - conductor_separation - 3,size_v/2 - totalHeight/2 +5);
  813 +// arrowHead[2] = wxPoint(size_h/2 - conductor_separation + 3,size_v/2 - totalHeight/2 + 5);
  814 +// dc.DrawPolygon(WXSIZEOF(arrowHead), arrowHead);
  815 +// }
  816 +// if ( ID == ID_TEXTCTRL14)
  817 +// {
  818 +// dc.SetPen(wxPen(wxColor(51,51,255), 3));
  819 +// dc.SetBrush(wxBrush(wxColor(51,51,255), wxSOLID));
  820 +// dc.DrawRectangle(wxPoint(size_h/2-conductor_width-conductor_separation, size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
  821 +// dc.DrawRectangle(wxPoint(size_h/2-(2* conductor_width)-(2*conductor_separation), size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
  822 +// dc.DrawRectangle(wxPoint(size_h/2 + conductor_separation, size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
  823 +// dc.DrawRectangle(wxPoint(size_h/2 + conductor_width +(2*conductor_separation), size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
  824 +//
  825 +// }
635 826  
636   - if ( ID == ID_TEXTCTRL12 || ID == ID_CHECKBOX1)
  827 + if ( ID == ID_TEXTCTRL12 || ID == ID_CHECKBOX1 || ID == ID_TEXTCTRL2 || ID == ID_TEXTCTRL3)
637 828 {
638 829 dc.SetPen( wxPen( wxColor(51,51,255),1 ) );
639 830 dc.SetBrush(wxBrush(wxColor(51,51,255), wxBDIAGONAL_HATCH));
... ... @@ -641,15 +832,37 @@ void FLEXCABLE::OnHighlightSchematic(wxCommandEvent&amp; event)
641 832  
642 833 dc.SetPen( wxPen( wxColor(192,192,192),1 ) );
643 834 dc.SetBrush(wxBrush(wxColor(224,224,224), wxSOLID));
644   - dc.DrawRectangle(wxPoint(size_h/2-conductor_width-conductor_separation, size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
645   - dc.DrawRectangle(wxPoint(size_h/2-(2* conductor_width)-(2*conductor_separation), size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
646   - dc.DrawRectangle(wxPoint(size_h/2 + conductor_separation, size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
647   - dc.DrawRectangle(wxPoint(size_h/2 + conductor_width +(2*conductor_separation), size_v/2-conductor_height/2), wxSize(conductor_width,conductor_height));
  835 +
  836 + //row 1
  837 + dc.DrawRectangle(wxPoint(size_h/2- 2 * conductor_width_r1 - 2 * conductor_separation_r1, size_v/3-conductor_height_r1/2), wxSize(conductor_width_r1,conductor_height_r1));
  838 + dc.DrawRectangle(wxPoint(size_h/2- conductor_width_r1 - conductor_separation_r1, size_v/3-conductor_height_r1/2), wxSize(conductor_width_r1,conductor_height_r1));
  839 + dc.DrawRectangle(wxPoint(size_h/2 + conductor_width_r1 + conductor_separation_r1 , size_v/3-conductor_height_r1/2), wxSize(conductor_width_r1,conductor_height_r1));
  840 +
  841 + //row 2
  842 + dc.DrawRectangle(wxPoint(size_h/2 - 1.5 * conductor_width_r2 - conductor_separation_r2, size_v/2-conductor_height_r2), wxSize(conductor_width_r2,conductor_height_r2));
  843 + dc.DrawRectangle(wxPoint(size_h/2 - conductor_width_r2/2, size_v/2-conductor_height_r2), wxSize(conductor_width_r2,conductor_height_r2));
  844 +
  845 + // row n
  846 + dc.DrawRectangle(wxPoint(size_h/2 - conductor_width_r3/2, size_v/2 + totalHeight/4 ), wxSize(conductor_width_r3,conductor_height_r3));
648 847  
649 848 dc.SetPen( wxPen( wxColor(0,0,0),4, wxDOT ) );
650   - dc.DrawLine( size_h/2 - conductor_separation, size_v/2, size_h/2 + conductor_separation, size_v/2);
  849 + dc.DrawLine( size_h/2 - conductor_separation_r1 , size_v/3, size_h/2 + conductor_width_r1 + conductor_separation_r1, size_v/3);
  850 + dc.DrawLine( size_h/2 - conductor_width_r2/2 , size_v/2 - conductor_height_r2/2 , size_h/2 - conductor_width_r2/2 - conductor_separation_r2, size_v/2 - conductor_height_r2/2);
  851 +
  852 + //dc.SetPen( wxPen( wxColor(0,0,0),4, wxDOT ) );
  853 + //dc.DrawLine( size_h/2 - conductor_separation, size_v/2, size_h/2 + conductor_separation, size_v/2);
651 854  
652 855 }
  856 +
  857 +// if ( ID == ID_GRID1)
  858 +// {
  859 +//
  860 +// dc.SetPen( wxPen( wxColor(51,51,255),1 , wxDOT_DASH) );
  861 +// dc.DrawLine( size_h*0.25, size_v/2-conductor_height_r2/2, size_h*0.75,size_v/2-conductor_height_r2/2 );
  862 +// //dc.DrawLine( size_h/2, 0, size_h/2, size_v);
  863 +//
  864 +//
  865 +// }
653 866 }
654 867  
655 868 void FLEXCABLE::OnNotebook1PageChanging(wxNotebookEvent& event)
... ... @@ -662,4 +875,64 @@ void FLEXCABLE::OnPanel1LeftDClick(wxMouseEvent&amp; event)
662 875 flexcableSchematic();
663 876 }
664 877  
  878 +void FLEXCABLE::EditExistingCable()
  879 +{
  880 + Close();
  881 +}
665 882  
  883 +void FLEXCABLE::OnTextCtrl13TextEnter(wxCommandEvent& event)
  884 +{
  885 +
  886 + int IsError = 0;
  887 + check_is_numeric(TextCtrl13, &IsError);
  888 + check_is_positive(TextCtrl3, &IsError);
  889 +
  890 + double value_tb13;
  891 + wxString contents_tb13;
  892 +
  893 + contents_tb13 = TextCtrl13->GetValue();
  894 +
  895 + contents_tb13.ToDouble(&value_tb13);
  896 +
  897 + Grid1 -> CreateGrid (value_tb13, 6);
  898 +
  899 + Grid1->EnableEditing(true);
  900 + Grid1->EnableGridLines(true);
  901 +
  902 + Grid1 -> SetColLabelValue(0,_("offset x"));
  903 + Grid1 -> SetColLabelValue(1,_("offset y"));
  904 + Grid1 -> SetColLabelValue(2,_("width"));
  905 + Grid1 -> SetColLabelValue(3,_("height"));
  906 + Grid1 -> SetColLabelValue(4,_("separation"));
  907 + Grid1 -> SetColLabelValue(5,_("conductor n"));
  908 +
  909 + for (int row_num = 0; row_num < value_tb13; row_num++){
  910 +
  911 + wxString row;
  912 + row << row_num+1;
  913 +
  914 + Grid1 -> SetRowLabelValue(row_num,_(row));
  915 + }
  916 +
  917 +}
  918 +
  919 +void FLEXCABLE::OnCheckBox3Click(wxCommandEvent& event)
  920 +{
  921 + if (CheckBox3->GetValue())
  922 + {
  923 + MESH_PARAM *winMESH_PARAM = new MESH_PARAM(this);
  924 +
  925 + winMESH_PARAM->TextCtrl1->Disable();
  926 + winMESH_PARAM->TextCtrl3->Disable();
  927 + //winMESH_PARAM->TextCtrl4->Disable();
  928 +
  929 + if ( winMESH_PARAM->ShowModal() == wxID_OK )
  930 + {
  931 + MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
  932 + MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue();
  933 + MESH_PARAM3 = winMESH_PARAM->TextCtrl3->GetValue();
  934 + }
  935 + winMESH_PARAM->Destroy();
  936 + }
  937 + WriteCableFile (TextCtrl1->GetValue());
  938 +}
... ...
GUI/SW1/SRC/FLEXCABLE.h
  Diff comments   View file @dd86ff4
... ... @@ -48,8 +48,10 @@
48 48 #include <wx/textctrl.h>
49 49 #include <wx/checkbox.h>
50 50 #include <wx/panel.h>
  51 +#include <wx/grid.h>
51 52 #include <wx/button.h>
52 53 #include <wx/dialog.h>
  54 +#include <wx/combobox.h>
53 55 //*)
54 56  
55 57 // Additional wxWidgets Includes
... ... @@ -70,32 +72,6 @@
70 72  
71 73 using namespace std;
72 74  
73   -class flexcableSchematicPane : public wxPanel
74   -{
75   -
76   -public:
77   - flexcableSchematicPane(wxFrame* parent);
78   -
79   - void paintEvent(wxPaintEvent & evt);
80   - void paintNow();
81   -
82   - void render(wxDC& dc);
83   -
84   - // some useful events
85   - /*
86   - void mouseMoved(wxMouseEvent& event);
87   - void mouseDown(wxMouseEvent& event);
88   - void mouseWheelMoved(wxMouseEvent& event);
89   - void mouseReleased(wxMouseEvent& event);
90   - void rightClick(wxMouseEvent& event);
91   - void mouseLeftWindow(wxMouseEvent& event);
92   - void keyPressed(wxKeyEvent& event);
93   - void keyReleased(wxKeyEvent& event);
94   - */
95   -
96   - DECLARE_EVENT_TABLE()
97   -};
98   -
99 75 class FLEXCABLE: public wxDialog
100 76 {
101 77 public:
... ... @@ -109,13 +85,12 @@ class FLEXCABLE: public wxDialog
109 85  
110 86 void WriteCableFile(wxString);
111 87  
112   - void paintNow();
113   - void render(wxDC& dc);
  88 + void EditExistingCable();
  89 + bool EDIT_EXISTING;
  90 +
114 91 void flexcableSchematic();
115 92 void OnHighlightSchematic(wxCommandEvent & event);
116 93  
117   - flexcableSchematicPane *drawPane;
118   -
119 94 wxString FD_ESR6;
120 95 wxString FD_ESR7;
121 96 wxString FD_ESR8;
... ... @@ -124,19 +99,22 @@ class FLEXCABLE: public wxDialog
124 99  
125 100 wxString MESH_PARAM1;
126 101 wxString MESH_PARAM2;
  102 + wxString MESH_PARAM3;
  103 + wxString MESH_PARAM4;
127 104  
128 105 //(*Declarations(FLEXCABLE)
129   - wxTextCtrl* TextCtrl4;
130 106 wxNotebook* Notebook1;
131 107 wxStaticText* StaticText13;
132 108 wxStaticText* StaticText2;
133 109 wxStaticText* StaticText14;
134 110 wxButton* Button1;
135 111 wxStaticText* StaticText6;
136   - wxTextCtrl* TextCtrl6;
  112 + wxCheckBox* CheckBox3;
  113 + wxCheckBox* CheckBox2;
137 114 wxPanel* Panel1;
138 115 wxStaticText* StaticText1;
139 116 wxStaticText* StaticText3;
  117 + wxGrid* Grid1;
140 118 wxButton* Button2;
141 119 wxPanel* Panel3;
142 120 wxCheckBox* CheckBox1;
... ... @@ -145,13 +123,13 @@ class FLEXCABLE: public wxDialog
145 123 wxStaticText* StaticText5;
146 124 wxTextCtrl* TextCtrl13;
147 125 wxTextCtrl* TextCtrl2;
  126 + wxComboBox* ComboBox1;
148 127 wxTextCtrl* TextCtrl1;
149 128 wxStaticText* StaticText15;
150 129 wxStaticText* StaticText12;
151 130 wxPanel* Panel2;
152   - wxTextCtrl* TextCtrl5;
153   - wxStaticText* StaticText17;
154 131 wxStaticText* StaticText4;
  132 + wxStaticText* StaticText17;
155 133 wxTextCtrl* TextCtrl3;
156 134 wxTextCtrl* TextCtrl12;
157 135 wxStaticText* StaticText16;
... ... @@ -168,14 +146,15 @@ class FLEXCABLE: public wxDialog
168 146 static const long ID_TEXTCTRL2;
169 147 static const long ID_STATICTEXT3;
170 148 static const long ID_TEXTCTRL3;
  149 + static const long ID_STATICTEXT17;
  150 + static const long ID_TEXTCTRL14;
  151 + static const long ID_GRID1;
171 152 static const long ID_STATICTEXT4;
172   - static const long ID_TEXTCTRL4;
  153 + static const long ID_CHECKBOX2;
173 154 static const long ID_STATICTEXT5;
174   - static const long ID_TEXTCTRL5;
  155 + static const long ID_COMBOBOX1;
175 156 static const long ID_STATICTEXT6;
176   - static const long ID_TEXTCTRL6;
177   - static const long ID_STATICTEXT17;
178   - static const long ID_TEXTCTRL14;
  157 + static const long ID_CHECKBOX3;
179 158 static const long ID_PANEL2;
180 159 static const long ID_STATICTEXT12;
181 160 static const long ID_TEXTCTRL12;
... ... @@ -215,6 +194,10 @@ class FLEXCABLE: public wxDialog
215 194 void OnPanel1LeftDClick(wxMouseEvent& event);
216 195 void OnComboBox1Selected(wxCommandEvent& event);
217 196 void OnCheckBox3Click(wxCommandEvent& event);
  197 + void OnPaint(wxPaintEvent& event);
  198 + void OnTextCtrl13TextEnter(wxCommandEvent& event);
  199 + void OnGrid1CellLeftClick(wxGridEvent& event);
  200 + void OnCheckBox3Click1(wxCommandEvent& event);
218 201 //*)
219 202  
220 203 DECLARE_EVENT_TABLE()
... ...
GUI/SW1/SRC/MESH_LAPLACE.cpp
  Diff comments   View file @dd86ff4
... ... @@ -104,7 +104,7 @@ void draw_mesh(wxPanel *Panel, wxString mesh_to_draw)
104 104  
105 105 if (xmax-xmin > ymax-ymin) scale = size_h/(xmax-xmin);
106 106  
107   - else scale = 0.75*(size_v/(ymax-ymin));
  107 + else scale = 5.0*(size_v/(ymax-ymin));//0.75*(size_v/(ymax-ymin));
108 108  
109 109 dc.SetPen( wxPen( *wxBLUE));
110 110  
... ...
GUI/SW1/SRC/MESH_PARAM.cpp
  Diff comments   View file @dd86ff4
... ... @@ -11,6 +11,10 @@ const long MESH_PARAM::ID_STATICTEXT1 = wxNewId();
11 11 const long MESH_PARAM::ID_TEXTCTRL1 = wxNewId();
12 12 const long MESH_PARAM::ID_STATICTEXT2 = wxNewId();
13 13 const long MESH_PARAM::ID_TEXTCTRL2 = wxNewId();
  14 +const long MESH_PARAM::ID_STATICTEXT3 = wxNewId();
  15 +const long MESH_PARAM::ID_TEXTCTRL3 = wxNewId();
  16 +const long MESH_PARAM::ID_STATICTEXT4 = wxNewId();
  17 +const long MESH_PARAM::ID_TEXTCTRL4 = wxNewId();
14 18 const long MESH_PARAM::ID_BUTTON1 = wxNewId();
15 19 const long MESH_PARAM::ID_BUTTON2 = wxNewId();
16 20 //*)
... ... @@ -35,15 +39,23 @@ MESH_PARAM::MESH_PARAM(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const w
35 39 StaticBoxSizer1 = new wxStaticBoxSizer(wxVERTICAL, this, _("SACAMOS: Laplace Mesh Parameters"));
36 40 FlexGridSizer2 = new wxFlexGridSizer(0, 2, 0, 0);
37 41 StaticText1 = new wxStaticText(this, ID_STATICTEXT1, _("Boundary Constant"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT1"));
38   - FlexGridSizer2->Add(StaticText1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  42 + FlexGridSizer2->Add(StaticText1, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
39 43 TextCtrl1 = new wxTextCtrl(this, ID_TEXTCTRL1, _("3"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL1"));
40 44 TextCtrl1->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
41 45 FlexGridSizer2->Add(TextCtrl1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
42 46 StaticText2 = new wxStaticText(this, ID_STATICTEXT2, _("Surface Mesh Constant"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2"));
43   - FlexGridSizer2->Add(StaticText2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  47 + FlexGridSizer2->Add(StaticText2, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
44 48 TextCtrl2 = new wxTextCtrl(this, ID_TEXTCTRL2, _("3"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL2"));
45 49 FlexGridSizer2->Add(TextCtrl2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
46   - StaticBoxSizer1->Add(FlexGridSizer2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  50 + StaticText3 = new wxStaticText(this, ID_STATICTEXT3, _("Max Mesh Edge Length"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3"));
  51 + FlexGridSizer2->Add(StaticText3, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
  52 + TextCtrl3 = new wxTextCtrl(this, ID_TEXTCTRL3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL3"));
  53 + FlexGridSizer2->Add(TextCtrl3, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  54 + StaticText4 = new wxStaticText(this, ID_STATICTEXT4, _("Ground Plane Mesh Edge Length"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4"));
  55 + FlexGridSizer2->Add(StaticText4, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  56 + TextCtrl4 = new wxTextCtrl(this, ID_TEXTCTRL4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL4"));
  57 + FlexGridSizer2->Add(TextCtrl4, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
  58 + StaticBoxSizer1->Add(FlexGridSizer2, 3, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
47 59 BoxSizer1 = new wxBoxSizer(wxHORIZONTAL);
48 60 Button1 = new wxButton(this, ID_BUTTON1, _("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON1"));
49 61 BoxSizer1->Add(Button1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
... ...
GUI/SW1/SRC/MESH_PARAM.h
  Diff comments   View file @dd86ff4
... ... @@ -20,12 +20,16 @@ class MESH_PARAM: public wxDialog
20 20 virtual ~MESH_PARAM();
21 21  
22 22 //(*Declarations(MESH_PARAM)
  23 + wxTextCtrl* TextCtrl4;
23 24 wxStaticText* StaticText2;
24 25 wxButton* Button1;
25 26 wxStaticText* StaticText1;
  27 + wxStaticText* StaticText3;
26 28 wxButton* Button2;
27 29 wxTextCtrl* TextCtrl2;
28 30 wxTextCtrl* TextCtrl1;
  31 + wxStaticText* StaticText4;
  32 + wxTextCtrl* TextCtrl3;
29 33 //*)
30 34  
31 35 protected:
... ... @@ -35,6 +39,10 @@ class MESH_PARAM: public wxDialog
35 39 static const long ID_TEXTCTRL1;
36 40 static const long ID_STATICTEXT2;
37 41 static const long ID_TEXTCTRL2;
  42 + static const long ID_STATICTEXT3;
  43 + static const long ID_TEXTCTRL3;
  44 + static const long ID_STATICTEXT4;
  45 + static const long ID_TEXTCTRL4;
38 46 static const long ID_BUTTON1;
39 47 static const long ID_BUTTON2;
40 48 //*)
... ...
GUI/SW1/SRC/SPACEWIRE.cpp
  Diff comments   View file @dd86ff4
... ... @@ -358,6 +358,7 @@ SPACEWIRE::SPACEWIRE(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxS
358 358 Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPACEWIRE::OnButton1Click);
359 359 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPACEWIRE::OnButton2Click);
360 360 Connect(ID_BUTTON3,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&SPACEWIRE::OnButton3Click);
  361 + Connect(wxEVT_PAINT,(wxObjectEventFunction)&SPACEWIRE::OnPaint);
361 362 //*)
362 363  
363 364 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&SPACEWIRE::OnHighlightSchematic, this);
... ... @@ -385,6 +386,11 @@ SPACEWIRE::~SPACEWIRE()
385 386 //*)
386 387 }
387 388  
  389 +void SPACEWIRE::OnPaint(wxPaintEvent& event)
  390 +{
  391 + if (EDIT_EXISTING==true) EditExistingCable();
  392 +}
  393 +
388 394 void SPACEWIRE::SetPathToMOD(wxString Path, wxString Name)
389 395 {
390 396 pathToMOD << Path;
... ... @@ -479,6 +485,8 @@ void SPACEWIRE::OnCheckBox1Click(wxCommandEvent&amp; event)
479 485 FD_ESR14 = winFD_ESR->TextCtrl14->GetValue();
480 486 FD_ESR15 = winFD_ESR->TextCtrl15->GetValue();
481 487  
  488 + FD_Default = winFD_ESR->CheckBox1->GetValue();
  489 +
482 490 FD_ORDER = winFD_ESR->TextCtrl16->GetValue();
483 491 FD_lin = winFD_ESR->RadioButton1->GetValue();
484 492 FD_Fmin = winFD_ESR->TextCtrl17->GetValue();
... ... @@ -520,41 +528,34 @@ void SPACEWIRE::OnButton2Click(wxCommandEvent&amp; event)
520 528  
521 529 Button1->Enable();
522 530  
523   - if (CheckBox2->GetValue()){
524   - // Identify all mesh files for viewing
525   - //struct _finddata_t fileinfo;
526   - //long hFile;
527   - //wxString meshFileName = "*.msh.vtk";
528   - wxString pattern = "*.msh.vtk";
529   - //wxString pattern((meshFileName));
  531 + if (CheckBox2->GetValue())
  532 + {
  533 +
  534 + wxString pattern (("*.msh.vtk")) ;
  535 +
530 536 wxString file;
  537 +
531 538 ComboBox1->Clear();
532 539  
533 540 file = wxFindFirstFile(pattern);
  541 +
534 542 while ( !file.empty())
535 543 {
536 544 wxString meshfile = file;
537   - size_t extindex = meshfile.find_first_of (".");
  545 + size_t extindex = meshfile.find_last_of (".");
538 546  
539 547 meshfile = meshfile.substr(0, extindex);
540 548  
  549 + extindex = meshfile.find_last_of (".");
  550 +
  551 + meshfile = meshfile.substr(0, extindex);
  552 +
  553 + meshfile = meshfile.substr(2,meshfile.length());
  554 +
541 555 ComboBox1->Append(meshfile);
542   - }
543 556  
544   -// if (( hFile = _findfirst( pattern, &fileinfo )) != -1 )
545   -// {
546   -// do
547   -// {
548   -// wxString meshfile = fileinfo.name;
549   -// size_t extindex = meshfile.find_first_of (".");
550   -//
551   -// meshfile = meshfile.substr(0, extindex);
552   -//
553   -// ComboBox1->Append(meshfile);
554   -//
555   -// } while ( _findnext( hFile, &fileinfo) == 0);
556   -// }
557   -// _findclose( hFile);
  557 + file = wxFindNextFile();
  558 + }
558 559  
559 560 CheckBox3->Enable();
560 561 }
... ... @@ -954,18 +955,18 @@ void SPACEWIRE::WriteCableFile (wxString fileName)
954 955 cableFile << TextCtrl25->GetValue() <<" \t# list of denominator coefficients b0 b1 b2... \n";
955 956 }
956 957  
957   - if (CheckBox1->GetValue()){
  958 + if (!FD_Default){
958 959  
959 960 cableFile << FD_ORDER <<"\t # order for filter fitting\n";
960 961 if (FD_lin)
961 962 {
962   - cableFile << "lin # frequency range type for filter fitting type (lin or dB)";
  963 + cableFile << "lin # frequency range type for filter fitting type (lin or dB)\n";
963 964 }
964 965 else
965 966 {
966   - cableFile << "log # frequency range type for filter fitting type (lin or dB)";
  967 + cableFile << "log # frequency range type for filter fitting type (lin or dB)\n";
967 968 }
968   - cableFile << FD_Fmin <<" "<< FD_Fmax <<" "<< FD_ORDER <<"\t # fmin fmax number_of_frequencies for filter fitting";
  969 + cableFile << FD_Fmin <<" "<< FD_Fmax <<" "<< FD_Num <<"\t # fmin fmax number_of_frequencies for filter fitting\n";
969 970 }
970 971  
971 972 if (CheckBox2->GetValue()){
... ... @@ -977,8 +978,8 @@ void SPACEWIRE::WriteCableFile (wxString fileName)
977 978  
978 979 if (CheckBox3->GetValue())
979 980 {
980   - cableFile << "Laplace_boundary_constant\n";
981   - cableFile << MESH_PARAM1 <<"\n";
  981 + //cableFile << "Laplace_boundary_constant\n";
  982 + //cableFile << MESH_PARAM1 <<"\n";
982 983 cableFile << "Laplace_surface_mesh_constant\n";
983 984 cableFile << MESH_PARAM2 <<"\n";
984 985  
... ... @@ -1629,10 +1630,12 @@ void SPACEWIRE::OnCheckBox3Click(wxCommandEvent&amp; event)
1629 1630 MESH_PARAM *winMESH_PARAM = new MESH_PARAM(this);
1630 1631  
1631 1632 winMESH_PARAM->TextCtrl1->Disable();
  1633 + winMESH_PARAM->TextCtrl3->Disable();
  1634 + winMESH_PARAM->TextCtrl4->Disable();
1632 1635  
1633 1636 if ( winMESH_PARAM->ShowModal() == wxID_OK )
1634 1637 {
1635   - MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
  1638 + //MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
1636 1639 MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue();
1637 1640 }
1638 1641 winMESH_PARAM->Destroy();
... ... @@ -1643,3 +1646,8 @@ void SPACEWIRE::OnCheckBox3Click(wxCommandEvent&amp; event)
1643 1646 void SPACEWIRE::OnTextCtrl28Text(wxCommandEvent& event)
1644 1647 {
1645 1648 }
  1649 +
  1650 +void SPACEWIRE::EditExistingCable()
  1651 +{
  1652 + Close();
  1653 +}
... ...
GUI/SW1/SRC/SPACEWIRE.h
  Diff comments   View file @dd86ff4
... ... @@ -84,6 +84,9 @@ class SPACEWIRE: public wxDialog
84 84  
85 85 void WriteCableFile(wxString);
86 86  
  87 + void EditExistingCable();
  88 + bool EDIT_EXISTING;
  89 +
87 90 void spacewireSchematic();
88 91 void OnHighlightSchematic(wxCommandEvent & event);
89 92  
... ... @@ -102,6 +105,7 @@ class SPACEWIRE: public wxDialog
102 105 wxString FD_ESR13;
103 106 wxString FD_ESR14;
104 107 wxString FD_ESR15;
  108 + bool FD_Default;
105 109  
106 110 wxString FD_ORDER;
107 111 bool FD_log;
... ... @@ -299,6 +303,7 @@ class SPACEWIRE: public wxDialog
299 303 void OnComboBox1Selected(wxCommandEvent& event);
300 304 void OnCheckBox3Click(wxCommandEvent& event);
301 305 void OnTextCtrl28Text(wxCommandEvent& event);
  306 + void OnPaint(wxPaintEvent& event);
302 307 //*)
303 308  
304 309 DECLARE_EVENT_TABLE()
... ...
GUI/SW1/SRC/SW1_GUI 0 → 100644
View file @dd86ff4
No preview for this file type
GUI/SW1/SRC/SW1_GUI.depend
  Diff comments   View file @dd86ff4
... ... @@ -1678,7 +1678,7 @@
1678 1678 1412638442 c:\wxwidgets-3.0.2\include\wx\dcclient.h
1679 1679 "wx/dc.h"
1680 1680  
1681   -1529401255 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\bundlebldr.cpp
  1681 +1530173890 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\bundlebldr.cpp
1682 1682 "BUNDLEBLDR.h"
1683 1683 "PLACE_CABLE.h"
1684 1684 "MESH_LAPLACE.h"
... ... @@ -1693,7 +1693,7 @@
1693 1693 <wx/intl.h>
1694 1694 <wx/string.h>
1695 1695  
1696   -1529401255 c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\bundlebldr.h
  1696 +1530112526 c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\bundlebldr.h
1697 1697 <wx/notebook.h>
1698 1698 <wx/sizer.h>
1699 1699 <wx/stattext.h>
... ... @@ -2292,7 +2292,7 @@
2292 2292 <string>
2293 2293 <algorithm>
2294 2294  
2295   -1502693576 c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\mesh_param.h
  2295 +1530173790 c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\mesh_param.h
2296 2296 <wx/sizer.h>
2297 2297 <wx/stattext.h>
2298 2298 <wx/textctrl.h>
... ... @@ -3504,7 +3504,7 @@
3504 3504 1502693576 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\mesh_laplace.cpp
3505 3505 "MESH_LAPLACE.h"
3506 3506  
3507   -1502693576 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\mesh_param.cpp
  3507 +1530173859 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\mesh_param.cpp
3508 3508 "MESH_PARAM.h"
3509 3509 <wx/settings.h>
3510 3510 <wx/intl.h>
... ... @@ -3725,7 +3725,7 @@
3725 3725 <fstream>
3726 3726 <sstream>
3727 3727  
3728   -1514834002 c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\utp.h
  3728 +1530174670 c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\utp.h
3729 3729 <wx/notebook.h>
3730 3730 <wx/sizer.h>
3731 3731 <wx/stattext.h>
... ... @@ -3800,9 +3800,2313 @@
3800 3800 1502693568 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\utilities.cpp
3801 3801 "UTILITIES.h"
3802 3802  
3803   -1514834022 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\utp.cpp
  3803 +1530174324 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\utp.cpp
3804 3804 "UTP.h"
3805 3805 <wx/settings.h>
3806 3806 <wx/intl.h>
3807 3807 <wx/string.h>
3808 3808  
  3809 +1529401881 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\coaxial.cpp
  3810 + "COAXIAL.h"
  3811 + <wx/settings.h>
  3812 + <wx/font.h>
  3813 + <wx/intl.h>
  3814 + <wx/string.h>
  3815 +
  3816 +1529401956 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\dconn.cpp
  3817 + "DCONN.h"
  3818 + <wx/settings.h>
  3819 + <wx/intl.h>
  3820 + <wx/string.h>
  3821 +
  3822 +1529401903 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\tp.cpp
  3823 + "TP.h"
  3824 + <wx/settings.h>
  3825 + <wx/intl.h>
  3826 + <wx/string.h>
  3827 +
  3828 +1529401932 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\twinax.cpp
  3829 + "TWINAX.h"
  3830 + <wx/settings.h>
  3831 + <wx/intl.h>
  3832 + <wx/string.h>
  3833 +
  3834 +1530175102 source:c:\users\eezsg\desktop\sacamos_june_2018\local_sw1\cylindrical.cpp
  3835 + "CYLINDRICAL.h"
  3836 + <wx/settings.h>
  3837 + <wx/intl.h>
  3838 + <wx/string.h>
  3839 +
  3840 +1512938044 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\about.cpp
  3841 + "ABOUT.h"
  3842 + <wx/textfile.h>
  3843 + <wx/msgdlg.h>
  3844 + <wx/hyperlink.h>
  3845 + <wx/bitmap.h>
  3846 + <wx/intl.h>
  3847 + <wx/image.h>
  3848 + <wx/string.h>
  3849 +
  3850 +1502693582 c:\users\steve\desktop\sacamos_june_2018\local_sw1\about.h
  3851 + <wx/sizer.h>
  3852 + <wx/textctrl.h>
  3853 + <wx/statbmp.h>
  3854 + <wx/dialog.h>
  3855 +
  3856 +1530399382 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\bundle_schematic.cpp
  3857 + "BUNDLE_SCHEMATIC.h"
  3858 +
  3859 +1502693582 c:\users\steve\desktop\sacamos_june_2018\local_sw1\bundle_schematic.h
  3860 + <wx/panel.h>
  3861 + <wx/dcclient.h>
  3862 + <wx/msgdlg.h>
  3863 + <iostream>
  3864 + <fstream>
  3865 + <sstream>
  3866 + <cmath>
  3867 +
  3868 +1530400880 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\bundlebldr.cpp
  3869 + "BUNDLEBLDR.h"
  3870 + "PLACE_CABLE.h"
  3871 + "MESH_LAPLACE.h"
  3872 + <wx/msgdlg.h>
  3873 + <wx/filename.h>
  3874 + <wx/dcclient.h>
  3875 + <iostream>
  3876 + <string>
  3877 + <fstream>
  3878 + <sstream>
  3879 + <wx/settings.h>
  3880 + <wx/intl.h>
  3881 + <wx/string.h>
  3882 +
  3883 +1530112528 c:\users\steve\desktop\sacamos_june_2018\local_sw1\bundlebldr.h
  3884 + <wx/notebook.h>
  3885 + <wx/sizer.h>
  3886 + <wx/stattext.h>
  3887 + <wx/textctrl.h>
  3888 + <wx/checkbox.h>
  3889 + <wx/listbox.h>
  3890 + <wx/radiobut.h>
  3891 + <wx/panel.h>
  3892 + <wx/button.h>
  3893 + <wx/dialog.h>
  3894 + <wx/spinbutt.h>
  3895 + <wx/combobox.h>
  3896 + <wx/dirctrl.h>
  3897 + <wx/treectrl.h>
  3898 + "FileSelectorCtrl.h"
  3899 + "UTILITIES.h"
  3900 + "MESH_LAPLACE.h"
  3901 + "MESH_PARAM.h"
  3902 + "RUN_STATUS.h"
  3903 + <iostream>
  3904 + <string>
  3905 +
  3906 +1502693578 c:\users\steve\desktop\sacamos_june_2018\local_sw1\fileselectorctrl.h
  3907 + "wx/treectrl.h"
  3908 + "wx/dialog.h"
  3909 + "wx/dirdlg.h"
  3910 + "wx/choice.h"
  3911 +
  3912 +1502693568 c:\users\steve\desktop\sacamos_june_2018\local_sw1\utilities.h
  3913 + <wx/textctrl.h>
  3914 + <wx/tokenzr.h>
  3915 + <wx/filename.h>
  3916 + <wx/filefn.h>
  3917 +
  3918 +1502693576 c:\users\steve\desktop\sacamos_june_2018\local_sw1\mesh_laplace.h
  3919 + <wx/sizer.h>
  3920 + <wx/panel.h>
  3921 + <wx/button.h>
  3922 + <wx/dialog.h>
  3923 + <wx/msgdlg.h>
  3924 + <wx/dcclient.h>
  3925 + <iostream>
  3926 + <fstream>
  3927 + <string>
  3928 + <algorithm>
  3929 +
  3930 +1530173792 c:\users\steve\desktop\sacamos_june_2018\local_sw1\mesh_param.h
  3931 + <wx/sizer.h>
  3932 + <wx/stattext.h>
  3933 + <wx/textctrl.h>
  3934 + <wx/button.h>
  3935 + <wx/dialog.h>
  3936 + "UTILITIES.h"
  3937 +
  3938 +1502693574 c:\users\steve\desktop\sacamos_june_2018\local_sw1\run_status.h
  3939 + <wx/sizer.h>
  3940 + <wx/textctrl.h>
  3941 + <wx/dialog.h>
  3942 + <wx/textfile.h>
  3943 + <iostream>
  3944 + <fstream>
  3945 + <sstream>
  3946 +
  3947 +1502693576 c:\users\steve\desktop\sacamos_june_2018\local_sw1\place_cable.h
  3948 + <wx/sizer.h>
  3949 + <wx/stattext.h>
  3950 + <wx/textctrl.h>
  3951 + <wx/button.h>
  3952 + <wx/dialog.h>
  3953 +
  3954 +1530399130 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\cable_schematic.cpp
  3955 + "CABLE_SCHEMATIC.h"
  3956 +
  3957 +1502693580 c:\users\steve\desktop\sacamos_june_2018\local_sw1\cable_schematic.h
  3958 + <wx/panel.h>
  3959 + <wx/dcclient.h>
  3960 + <wx/msgdlg.h>
  3961 + <iostream>
  3962 + <fstream>
  3963 + <sstream>
  3964 +
  3965 +1530175204 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\coaxial.cpp
  3966 + "COAXIAL.h"
  3967 + <wx/settings.h>
  3968 + <wx/font.h>
  3969 + <wx/intl.h>
  3970 + <wx/string.h>
  3971 +
  3972 +1514832982 c:\users\steve\desktop\sacamos_june_2018\local_sw1\coaxial.h
  3973 + <wx/notebook.h>
  3974 + <wx/sizer.h>
  3975 + <wx/stattext.h>
  3976 + <wx/textctrl.h>
  3977 + <wx/checkbox.h>
  3978 + <wx/statline.h>
  3979 + <wx/panel.h>
  3980 + <wx/button.h>
  3981 + <wx/dialog.h>
  3982 + <wx/msgdlg.h>
  3983 + <wx/dcclient.h>
  3984 + "UTILITIES.h"
  3985 + "FD_ESR.h"
  3986 + "FD_ZT.h"
  3987 + "RUN_STATUS.h"
  3988 + <iostream>
  3989 + <fstream>
  3990 + <sstream>
  3991 +
  3992 +1509497630 c:\users\steve\desktop\sacamos_june_2018\local_sw1\fd_esr.h
  3993 + <wx/sizer.h>
  3994 + <wx/stattext.h>
  3995 + <wx/textctrl.h>
  3996 + <wx/statline.h>
  3997 + <wx/radiobut.h>
  3998 + <wx/button.h>
  3999 + <wx/dialog.h>
  4000 + "UTILITIES.h"
  4001 +
  4002 +1502693578 c:\users\steve\desktop\sacamos_june_2018\local_sw1\fd_zt.h
  4003 + <wx/sizer.h>
  4004 + <wx/stattext.h>
  4005 + <wx/textctrl.h>
  4006 + <wx/statline.h>
  4007 + <wx/button.h>
  4008 + <wx/dialog.h>
  4009 +
  4010 +1530175204 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\cylindrical.cpp
  4011 + "CYLINDRICAL.h"
  4012 + <wx/settings.h>
  4013 + <wx/intl.h>
  4014 + <wx/string.h>
  4015 +
  4016 +1514832882 c:\users\steve\desktop\sacamos_june_2018\local_sw1\cylindrical.h
  4017 + <wx/sizer.h>
  4018 + <wx/stattext.h>
  4019 + <wx/textctrl.h>
  4020 + <wx/checkbox.h>
  4021 + <wx/panel.h>
  4022 + <wx/button.h>
  4023 + <wx/dialog.h>
  4024 + <wx/msgdlg.h>
  4025 + <wx/dcclient.h>
  4026 + "FD_ESR.h"
  4027 + "UTILITIES.h"
  4028 + "RUN_STATUS.h"
  4029 + <iostream>
  4030 + <fstream>
  4031 + <sstream>
  4032 +
  4033 +1529401958 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\dconn.cpp
  4034 + "DCONN.h"
  4035 + <wx/settings.h>
  4036 + <wx/intl.h>
  4037 + <wx/string.h>
  4038 +
  4039 +1514918482 c:\users\steve\desktop\sacamos_june_2018\local_sw1\dconn.h
  4040 + <wx/sizer.h>
  4041 + <wx/stattext.h>
  4042 + <wx/textctrl.h>
  4043 + <wx/checkbox.h>
  4044 + <wx/panel.h>
  4045 + <wx/button.h>
  4046 + <wx/dialog.h>
  4047 + <wx/combobox.h>
  4048 + <wx/dcclient.h>
  4049 + <wx/msgdlg.h>
  4050 + "MESH_LAPLACE.h"
  4051 + "MESH_PARAM.h"
  4052 + "RUN_STATUS.h"
  4053 + "UTILITIES.h"
  4054 + <iostream>
  4055 + <fstream>
  4056 + <sstream>
  4057 +
  4058 +1508706938 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\export_spice.cpp
  4059 + "EXPORT_SPICE.h"
  4060 + <wx/intl.h>
  4061 + <wx/string.h>
  4062 +
  4063 +1508706152 c:\users\steve\desktop\sacamos_june_2018\local_sw1\export_spice.h
  4064 + <wx/sizer.h>
  4065 + <wx/textctrl.h>
  4066 + <wx/filepicker.h>
  4067 + <wx/button.h>
  4068 + <wx/dialog.h>
  4069 + <wx/msgdlg.h>
  4070 + <wx/filefn.h>
  4071 + <wx/textfile.h>
  4072 +
  4073 +1509497630 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\fd_esr.cpp
  4074 + "FD_ESR.h"
  4075 + <wx/settings.h>
  4076 + <wx/intl.h>
  4077 + <wx/string.h>
  4078 +
  4079 +1509484978 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\fd_esr_sw.cpp
  4080 + "FD_ESR_SW.h"
  4081 + "UTILITIES.h"
  4082 + <wx/settings.h>
  4083 + <wx/intl.h>
  4084 + <wx/string.h>
  4085 +
  4086 +1509483256 c:\users\steve\desktop\sacamos_june_2018\local_sw1\fd_esr_sw.h
  4087 + <wx/sizer.h>
  4088 + <wx/stattext.h>
  4089 + <wx/textctrl.h>
  4090 + <wx/statline.h>
  4091 + <wx/radiobut.h>
  4092 + <wx/button.h>
  4093 + <wx/dialog.h>
  4094 +
  4095 +1502693578 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\fd_zt.cpp
  4096 + "FD_ZT.h"
  4097 + <wx/intl.h>
  4098 + <wx/string.h>
  4099 +
  4100 +1502693578 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\fileselectorctrl.cpp
  4101 + "wx/wxprec.h"
  4102 + "wx/generic/dirctrlg.h"
  4103 + "FileSelectorCtrl.h"
  4104 + "wx/hash.h"
  4105 + "wx/intl.h"
  4106 + "wx/log.h"
  4107 + "wx/utils.h"
  4108 + "wx/button.h"
  4109 + "wx/icon.h"
  4110 + "wx/settings.h"
  4111 + "wx/msgdlg.h"
  4112 + "wx/choice.h"
  4113 + "wx/textctrl.h"
  4114 + "wx/layout.h"
  4115 + "wx/sizer.h"
  4116 + "wx/textdlg.h"
  4117 + "wx/gdicmn.h"
  4118 + "wx/image.h"
  4119 + "wx/module.h"
  4120 + "wx/filename.h"
  4121 + "wx/filefn.h"
  4122 + "wx/imaglist.h"
  4123 + "wx/tokenzr.h"
  4124 + "wx/dir.h"
  4125 + "wx/artprov.h"
  4126 + "wx/mimetype.h"
  4127 + "wx/statline.h"
  4128 + "wx/osx/private.h"
  4129 + <windows.h>
  4130 + "wx/msw/winundef.h"
  4131 + "wx/volume.h"
  4132 + <direct.h>
  4133 + "dos.h"
  4134 +
  4135 +1502693576 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\mesh_laplace.cpp
  4136 + "MESH_LAPLACE.h"
  4137 +
  4138 +1530173860 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\mesh_param.cpp
  4139 + "MESH_PARAM.h"
  4140 + <wx/settings.h>
  4141 + <wx/intl.h>
  4142 + <wx/string.h>
  4143 +
  4144 +1514917242 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\overshield.cpp
  4145 + "OVERSHIELD.h"
  4146 + <wx/settings.h>
  4147 + <wx/intl.h>
  4148 + <wx/string.h>
  4149 +
  4150 +1514918530 c:\users\steve\desktop\sacamos_june_2018\local_sw1\overshield.h
  4151 + <wx/sizer.h>
  4152 + <wx/stattext.h>
  4153 + <wx/textctrl.h>
  4154 + <wx/panel.h>
  4155 + <wx/button.h>
  4156 + <wx/dialog.h>
  4157 + <wx/msgdlg.h>
  4158 + <wx/dcclient.h>
  4159 + "MESH_LAPLACE.h"
  4160 + "UTILITIES.h"
  4161 + "RUN_STATUS.h"
  4162 + <iostream>
  4163 + <fstream>
  4164 + <sstream>
  4165 +
  4166 +1502693576 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\place_cable.cpp
  4167 + "PLACE_CABLE.h"
  4168 + <wx/intl.h>
  4169 + <wx/string.h>
  4170 +
  4171 +1502693574 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\resource.rc
  4172 + "wx/msw/wx.rc"
  4173 +
  4174 +1502693574 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\run_status.cpp
  4175 + "RUN_STATUS.h"
  4176 + <wx/intl.h>
  4177 + <wx/string.h>
  4178 +
  4179 +1514834464 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\spacewire.cpp
  4180 + "SPACEWIRE.h"
  4181 + <wx/settings.h>
  4182 + <wx/intl.h>
  4183 + <wx/string.h>
  4184 +
  4185 +1514834450 c:\users\steve\desktop\sacamos_june_2018\local_sw1\spacewire.h
  4186 + <wx/notebook.h>
  4187 + <wx/sizer.h>
  4188 + <wx/stattext.h>
  4189 + <wx/textctrl.h>
  4190 + <wx/checkbox.h>
  4191 + <wx/panel.h>
  4192 + <wx/button.h>
  4193 + <wx/dialog.h>
  4194 + <wx/combobox.h>
  4195 + <wx/msgdlg.h>
  4196 + <wx/dcclient.h>
  4197 + "FD_ESR_SW.h"
  4198 + "UTILITIES.h"
  4199 + "MESH_LAPLACE.h"
  4200 + "MESH_PARAM.h"
  4201 + "RUN_STATUS.h"
  4202 + <iostream>
  4203 + <fstream>
  4204 + <sstream>
  4205 +
  4206 +1509492344 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\spicemodel.cpp
  4207 + "SPICEMODEL.h"
  4208 + <wx/filename.h>
  4209 + <wx/dcclient.h>
  4210 + <wx/tokenzr.h>
  4211 + <iostream>
  4212 + <fstream>
  4213 + <string>
  4214 + <sstream>
  4215 + <wx/settings.h>
  4216 + <wx/intl.h>
  4217 + <wx/string.h>
  4218 +
  4219 +1509486246 c:\users\steve\desktop\sacamos_june_2018\local_sw1\spicemodel.h
  4220 + <wx/notebook.h>
  4221 + <wx/sizer.h>
  4222 + <wx/stattext.h>
  4223 + <wx/textctrl.h>
  4224 + <wx/checkbox.h>
  4225 + <wx/radiobut.h>
  4226 + <wx/panel.h>
  4227 + <wx/button.h>
  4228 + <wx/dialog.h>
  4229 + <wx/msgdlg.h>
  4230 + <wx/dirctrl.h>
  4231 + <wx/treectrl.h>
  4232 + <iostream>
  4233 + <string>
  4234 + "FileSelectorCtrl.h"
  4235 + "BUNDLE_SCHEMATIC.h"
  4236 + "RUN_STATUS.h"
  4237 + "UTILITIES.h"
  4238 +
  4239 +1502693570 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\sw1_guiapp.cpp
  4240 + "SW1_GUIApp.h"
  4241 + "SW1_GUIMain.h"
  4242 + <wx/image.h>
  4243 +
  4244 +1502693570 c:\users\steve\desktop\sacamos_june_2018\local_sw1\sw1_guiapp.h
  4245 + <wx/app.h>
  4246 +
  4247 +1514922396 c:\users\steve\desktop\sacamos_june_2018\local_sw1\sw1_guimain.h
  4248 + <wx/sizer.h>
  4249 + <wx/menu.h>
  4250 + <wx/panel.h>
  4251 + <wx/statbmp.h>
  4252 + <wx/dirdlg.h>
  4253 + <wx/frame.h>
  4254 + <wx/statusbr.h>
  4255 + <wx/dirctrl.h>
  4256 + <wx/msgdlg.h>
  4257 + <wx/dir.h>
  4258 + <wx/dirctrl.h>
  4259 + <wx/treectrl.h>
  4260 + <wx/filename.h>
  4261 + <wx/dcclient.h>
  4262 + "FileSelectorCtrl.h"
  4263 + "ABOUT.h"
  4264 + "CYLINDRICAL.h"
  4265 + "COAXIAL.h"
  4266 + "TWINAX.h"
  4267 + "UTP.h"
  4268 + "TP.h"
  4269 + "SPACEWIRE.h"
  4270 + "OVERSHIELD.h"
  4271 + "FLEXCABLE.h"
  4272 + "DCONN.h"
  4273 + "BUNDLEBLDR.h"
  4274 + "SPICEMODEL.h"
  4275 + "CABLE_SCHEMATIC.h"
  4276 + "BUNDLE_SCHEMATIC.h"
  4277 + "EXPORT_SPICE.h"
  4278 + "UTILITIES.h"
  4279 + <iostream>
  4280 + <fstream>
  4281 + <string>
  4282 +
  4283 +1530176768 c:\users\steve\desktop\sacamos_june_2018\local_sw1\twinax.h
  4284 + <wx/notebook.h>
  4285 + <wx/sizer.h>
  4286 + <wx/stattext.h>
  4287 + <wx/textctrl.h>
  4288 + <wx/checkbox.h>
  4289 + <wx/statline.h>
  4290 + <wx/panel.h>
  4291 + <wx/button.h>
  4292 + <wx/dialog.h>
  4293 + <wx/combobox.h>
  4294 + <wx/msgdlg.h>
  4295 + <wx/dcclient.h>
  4296 + "FD_ESR.h"
  4297 + "UTILITIES.h"
  4298 + "MESH_LAPLACE.h"
  4299 + "MESH_PARAM.h"
  4300 + "RUN_STATUS.h"
  4301 + <iostream>
  4302 + <fstream>
  4303 + <sstream>
  4304 +
  4305 +1530174672 c:\users\steve\desktop\sacamos_june_2018\local_sw1\utp.h
  4306 + <wx/notebook.h>
  4307 + <wx/sizer.h>
  4308 + <wx/stattext.h>
  4309 + <wx/textctrl.h>
  4310 + <wx/checkbox.h>
  4311 + <wx/panel.h>
  4312 + <wx/button.h>
  4313 + <wx/dialog.h>
  4314 + <wx/combobox.h>
  4315 + <wx/msgdlg.h>
  4316 + <wx/dcclient.h>
  4317 + "FD_ESR.h"
  4318 + "UTILITIES.h"
  4319 + "MESH_LAPLACE.h"
  4320 + "MESH_PARAM.h"
  4321 + "RUN_STATUS.h"
  4322 + <iostream>
  4323 + <fstream>
  4324 + <sstream>
  4325 + <stdio.h>
  4326 +
  4327 +1530175406 c:\users\steve\desktop\sacamos_june_2018\local_sw1\tp.h
  4328 + <wx/notebook.h>
  4329 + <wx/sizer.h>
  4330 + <wx/stattext.h>
  4331 + <wx/textctrl.h>
  4332 + <wx/checkbox.h>
  4333 + <wx/statline.h>
  4334 + <wx/panel.h>
  4335 + <wx/button.h>
  4336 + <wx/dialog.h>
  4337 + <wx/combobox.h>
  4338 + <wx/msgdlg.h>
  4339 + <wx/dcclient.h>
  4340 + "FD_ESR.h"
  4341 + "MESH_LAPLACE.h"
  4342 + "MESH_PARAM.h"
  4343 + "UTILITIES.h"
  4344 + "RUN_STATUS.h"
  4345 + <iostream>
  4346 + <fstream>
  4347 + <sstream>
  4348 +
  4349 +1530454624 c:\users\steve\desktop\sacamos_june_2018\local_sw1\flexcable.h
  4350 + <wx/notebook.h>
  4351 + <wx/sizer.h>
  4352 + <wx/stattext.h>
  4353 + <wx/textctrl.h>
  4354 + <wx/checkbox.h>
  4355 + <wx/panel.h>
  4356 + <wx/grid.h>
  4357 + <wx/button.h>
  4358 + <wx/dialog.h>
  4359 + <wx/msgdlg.h>
  4360 + <wx/dcclient.h>
  4361 + "UTILITIES.h"
  4362 + "MESH_LAPLACE.h"
  4363 + "MESH_PARAM.h"
  4364 + "RUN_STATUS.h"
  4365 + "FD_ESR.h"
  4366 + <iostream>
  4367 + <fstream>
  4368 + <sstream>
  4369 +
  4370 +1514923368 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\sw1_guimain.cpp
  4371 + "SW1_GUIMain.h"
  4372 + <wx/bitmap.h>
  4373 + <wx/icon.h>
  4374 + <wx/settings.h>
  4375 + <wx/intl.h>
  4376 + <wx/image.h>
  4377 + <wx/string.h>
  4378 +
  4379 +1530175476 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\tp.cpp
  4380 + "TP.h"
  4381 + <wx/settings.h>
  4382 + <wx/intl.h>
  4383 + <wx/string.h>
  4384 +
  4385 +1530176822 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\twinax.cpp
  4386 + "TWINAX.h"
  4387 + <wx/settings.h>
  4388 + <wx/intl.h>
  4389 + <wx/string.h>
  4390 +
  4391 +1502693568 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\utilities.cpp
  4392 + "UTILITIES.h"
  4393 +
  4394 +1530174326 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\utp.cpp
  4395 + "UTP.h"
  4396 + <wx/settings.h>
  4397 + <wx/intl.h>
  4398 + <wx/string.h>
  4399 +
  4400 +1530458170 source:c:\users\steve\desktop\sacamos_june_2018\local_sw1\flexcable.cpp
  4401 + "FLEXCABLE.h"
  4402 + <wx/settings.h>
  4403 + <wx/intl.h>
  4404 + <wx/string.h>
  4405 +
  4406 +1412638442 c:\wxwidgets-3.0.2\include\wx\grid.h
  4407 + "wx/generic/grid.h"
  4408 + "wx/generic/grideditors.h"
  4409 + "wx/generic/gridctrl.h"
  4410 +
  4411 +1412638442 c:\wxwidgets-3.0.2\include\wx\generic\grid.h
  4412 + "wx/defs.h"
  4413 + "wx/hashmap.h"
  4414 + "wx/scrolwin.h"
  4415 +
  4416 +1412638442 c:\wxwidgets-3.0.2\include\wx\generic\grideditors.h
  4417 + "wx/defs.h"
  4418 + "wx/scopedptr.h"
  4419 +
  4420 +1412638442 c:\wxwidgets-3.0.2\include\wx\generic\gridctrl.h
  4421 + "wx/grid.h"
  4422 + "wx/datetime.h"
  4423 +
  4424 +1512938044 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\about.cpp
  4425 + "ABOUT.h"
  4426 + <wx/textfile.h>
  4427 + <wx/msgdlg.h>
  4428 + <wx/hyperlink.h>
  4429 + <wx/bitmap.h>
  4430 + <wx/intl.h>
  4431 + <wx/image.h>
  4432 + <wx/string.h>
  4433 +
  4434 +1502693582 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\about.h
  4435 + <wx/sizer.h>
  4436 + <wx/textctrl.h>
  4437 + <wx/statbmp.h>
  4438 + <wx/dialog.h>
  4439 +
  4440 +1530399384 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\bundle_schematic.cpp
  4441 + "BUNDLE_SCHEMATIC.h"
  4442 +
  4443 +1502693582 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\bundle_schematic.h
  4444 + <wx/panel.h>
  4445 + <wx/dcclient.h>
  4446 + <wx/msgdlg.h>
  4447 + <iostream>
  4448 + <fstream>
  4449 + <sstream>
  4450 + <cmath>
  4451 +
  4452 +1530399132 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\cable_schematic.cpp
  4453 + "CABLE_SCHEMATIC.h"
  4454 +
  4455 +1502693580 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\cable_schematic.h
  4456 + <wx/panel.h>
  4457 + <wx/dcclient.h>
  4458 + <wx/msgdlg.h>
  4459 + <iostream>
  4460 + <fstream>
  4461 + <sstream>
  4462 +
  4463 +1530175204 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\coaxial.cpp
  4464 + "COAXIAL.h"
  4465 + <wx/settings.h>
  4466 + <wx/font.h>
  4467 + <wx/intl.h>
  4468 + <wx/string.h>
  4469 +
  4470 +1514832982 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\coaxial.h
  4471 + <wx/notebook.h>
  4472 + <wx/sizer.h>
  4473 + <wx/stattext.h>
  4474 + <wx/textctrl.h>
  4475 + <wx/checkbox.h>
  4476 + <wx/statline.h>
  4477 + <wx/panel.h>
  4478 + <wx/button.h>
  4479 + <wx/dialog.h>
  4480 + <wx/msgdlg.h>
  4481 + <wx/dcclient.h>
  4482 + "UTILITIES.h"
  4483 + "FD_ESR.h"
  4484 + "FD_ZT.h"
  4485 + "RUN_STATUS.h"
  4486 + <iostream>
  4487 + <fstream>
  4488 + <sstream>
  4489 +
  4490 +1502693568 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\utilities.h
  4491 + <wx/textctrl.h>
  4492 + <wx/tokenzr.h>
  4493 + <wx/filename.h>
  4494 + <wx/filefn.h>
  4495 +
  4496 +1509497630 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\fd_esr.h
  4497 + <wx/sizer.h>
  4498 + <wx/stattext.h>
  4499 + <wx/textctrl.h>
  4500 + <wx/statline.h>
  4501 + <wx/radiobut.h>
  4502 + <wx/button.h>
  4503 + <wx/dialog.h>
  4504 + "UTILITIES.h"
  4505 +
  4506 +1502693578 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\fd_zt.h
  4507 + <wx/sizer.h>
  4508 + <wx/stattext.h>
  4509 + <wx/textctrl.h>
  4510 + <wx/statline.h>
  4511 + <wx/button.h>
  4512 + <wx/dialog.h>
  4513 +
  4514 +1502693574 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\run_status.h
  4515 + <wx/sizer.h>
  4516 + <wx/textctrl.h>
  4517 + <wx/dialog.h>
  4518 + <wx/textfile.h>
  4519 + <iostream>
  4520 + <fstream>
  4521 + <sstream>
  4522 +
  4523 +1530175204 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\cylindrical.cpp
  4524 + "CYLINDRICAL.h"
  4525 + <wx/settings.h>
  4526 + <wx/intl.h>
  4527 + <wx/string.h>
  4528 +
  4529 +1514832882 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\cylindrical.h
  4530 + <wx/sizer.h>
  4531 + <wx/stattext.h>
  4532 + <wx/textctrl.h>
  4533 + <wx/checkbox.h>
  4534 + <wx/panel.h>
  4535 + <wx/button.h>
  4536 + <wx/dialog.h>
  4537 + <wx/msgdlg.h>
  4538 + <wx/dcclient.h>
  4539 + "FD_ESR.h"
  4540 + "UTILITIES.h"
  4541 + "RUN_STATUS.h"
  4542 + <iostream>
  4543 + <fstream>
  4544 + <sstream>
  4545 +
  4546 +1529401958 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\dconn.cpp
  4547 + "DCONN.h"
  4548 + <wx/settings.h>
  4549 + <wx/intl.h>
  4550 + <wx/string.h>
  4551 +
  4552 +1514918482 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\dconn.h
  4553 + <wx/sizer.h>
  4554 + <wx/stattext.h>
  4555 + <wx/textctrl.h>
  4556 + <wx/checkbox.h>
  4557 + <wx/panel.h>
  4558 + <wx/button.h>
  4559 + <wx/dialog.h>
  4560 + <wx/combobox.h>
  4561 + <wx/dcclient.h>
  4562 + <wx/msgdlg.h>
  4563 + "MESH_LAPLACE.h"
  4564 + "MESH_PARAM.h"
  4565 + "RUN_STATUS.h"
  4566 + "UTILITIES.h"
  4567 + <iostream>
  4568 + <fstream>
  4569 + <sstream>
  4570 +
  4571 +1502693576 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\mesh_laplace.h
  4572 + <wx/sizer.h>
  4573 + <wx/panel.h>
  4574 + <wx/button.h>
  4575 + <wx/dialog.h>
  4576 + <wx/msgdlg.h>
  4577 + <wx/dcclient.h>
  4578 + <iostream>
  4579 + <fstream>
  4580 + <string>
  4581 + <algorithm>
  4582 +
  4583 +1530173792 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\mesh_param.h
  4584 + <wx/sizer.h>
  4585 + <wx/stattext.h>
  4586 + <wx/textctrl.h>
  4587 + <wx/button.h>
  4588 + <wx/dialog.h>
  4589 + "UTILITIES.h"
  4590 +
  4591 +1508706938 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\export_spice.cpp
  4592 + "EXPORT_SPICE.h"
  4593 + <wx/intl.h>
  4594 + <wx/string.h>
  4595 +
  4596 +1508706152 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\export_spice.h
  4597 + <wx/sizer.h>
  4598 + <wx/textctrl.h>
  4599 + <wx/filepicker.h>
  4600 + <wx/button.h>
  4601 + <wx/dialog.h>
  4602 + <wx/msgdlg.h>
  4603 + <wx/filefn.h>
  4604 + <wx/textfile.h>
  4605 +
  4606 +1509497630 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\fd_esr.cpp
  4607 + "FD_ESR.h"
  4608 + <wx/settings.h>
  4609 + <wx/intl.h>
  4610 + <wx/string.h>
  4611 +
  4612 +1509484978 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\fd_esr_sw.cpp
  4613 + "FD_ESR_SW.h"
  4614 + "UTILITIES.h"
  4615 + <wx/settings.h>
  4616 + <wx/intl.h>
  4617 + <wx/string.h>
  4618 +
  4619 +1509483256 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\fd_esr_sw.h
  4620 + <wx/sizer.h>
  4621 + <wx/stattext.h>
  4622 + <wx/textctrl.h>
  4623 + <wx/statline.h>
  4624 + <wx/radiobut.h>
  4625 + <wx/button.h>
  4626 + <wx/dialog.h>
  4627 +
  4628 +1502693578 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\fd_zt.cpp
  4629 + "FD_ZT.h"
  4630 + <wx/intl.h>
  4631 + <wx/string.h>
  4632 +
  4633 +1502693578 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\fileselectorctrl.cpp
  4634 + "wx/wxprec.h"
  4635 + "wx/generic/dirctrlg.h"
  4636 + "FileSelectorCtrl.h"
  4637 + "wx/hash.h"
  4638 + "wx/intl.h"
  4639 + "wx/log.h"
  4640 + "wx/utils.h"
  4641 + "wx/button.h"
  4642 + "wx/icon.h"
  4643 + "wx/settings.h"
  4644 + "wx/msgdlg.h"
  4645 + "wx/choice.h"
  4646 + "wx/textctrl.h"
  4647 + "wx/layout.h"
  4648 + "wx/sizer.h"
  4649 + "wx/textdlg.h"
  4650 + "wx/gdicmn.h"
  4651 + "wx/image.h"
  4652 + "wx/module.h"
  4653 + "wx/filename.h"
  4654 + "wx/filefn.h"
  4655 + "wx/imaglist.h"
  4656 + "wx/tokenzr.h"
  4657 + "wx/dir.h"
  4658 + "wx/artprov.h"
  4659 + "wx/mimetype.h"
  4660 + "wx/statline.h"
  4661 + "wx/osx/private.h"
  4662 + <windows.h>
  4663 + "wx/msw/winundef.h"
  4664 + "wx/volume.h"
  4665 + <direct.h>
  4666 + "dos.h"
  4667 +
  4668 +1502693578 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\fileselectorctrl.h
  4669 + "wx/treectrl.h"
  4670 + "wx/dialog.h"
  4671 + "wx/dirdlg.h"
  4672 + "wx/choice.h"
  4673 +
  4674 +1530459328 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\flexcable.cpp
  4675 + "FLEXCABLE.h"
  4676 + <wx/settings.h>
  4677 + <wx/intl.h>
  4678 + <wx/string.h>
  4679 +
  4680 +1530454626 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\flexcable.h
  4681 + <wx/notebook.h>
  4682 + <wx/sizer.h>
  4683 + <wx/stattext.h>
  4684 + <wx/textctrl.h>
  4685 + <wx/checkbox.h>
  4686 + <wx/panel.h>
  4687 + <wx/grid.h>
  4688 + <wx/button.h>
  4689 + <wx/dialog.h>
  4690 + <wx/msgdlg.h>
  4691 + <wx/dcclient.h>
  4692 + "UTILITIES.h"
  4693 + "MESH_LAPLACE.h"
  4694 + "MESH_PARAM.h"
  4695 + "RUN_STATUS.h"
  4696 + "FD_ESR.h"
  4697 + <iostream>
  4698 + <fstream>
  4699 + <sstream>
  4700 +
  4701 +1502693576 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\mesh_laplace.cpp
  4702 + "MESH_LAPLACE.h"
  4703 +
  4704 +1530173860 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\mesh_param.cpp
  4705 + "MESH_PARAM.h"
  4706 + <wx/settings.h>
  4707 + <wx/intl.h>
  4708 + <wx/string.h>
  4709 +
  4710 +1514917242 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\overshield.cpp
  4711 + "OVERSHIELD.h"
  4712 + <wx/settings.h>
  4713 + <wx/intl.h>
  4714 + <wx/string.h>
  4715 +
  4716 +1514918530 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\overshield.h
  4717 + <wx/sizer.h>
  4718 + <wx/stattext.h>
  4719 + <wx/textctrl.h>
  4720 + <wx/panel.h>
  4721 + <wx/button.h>
  4722 + <wx/dialog.h>
  4723 + <wx/msgdlg.h>
  4724 + <wx/dcclient.h>
  4725 + "MESH_LAPLACE.h"
  4726 + "UTILITIES.h"
  4727 + "RUN_STATUS.h"
  4728 + <iostream>
  4729 + <fstream>
  4730 + <sstream>
  4731 +
  4732 +1502693576 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\place_cable.cpp
  4733 + "PLACE_CABLE.h"
  4734 + <wx/intl.h>
  4735 + <wx/string.h>
  4736 +
  4737 +1502693576 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\place_cable.h
  4738 + <wx/sizer.h>
  4739 + <wx/stattext.h>
  4740 + <wx/textctrl.h>
  4741 + <wx/button.h>
  4742 + <wx/dialog.h>
  4743 +
  4744 +1502693574 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\resource.rc
  4745 + "wx/msw/wx.rc"
  4746 +
  4747 +1502693574 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\run_status.cpp
  4748 + "RUN_STATUS.h"
  4749 + <wx/intl.h>
  4750 + <wx/string.h>
  4751 +
  4752 +1514834464 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\spacewire.cpp
  4753 + "SPACEWIRE.h"
  4754 + <wx/settings.h>
  4755 + <wx/intl.h>
  4756 + <wx/string.h>
  4757 +
  4758 +1514834450 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\spacewire.h
  4759 + <wx/notebook.h>
  4760 + <wx/sizer.h>
  4761 + <wx/stattext.h>
  4762 + <wx/textctrl.h>
  4763 + <wx/checkbox.h>
  4764 + <wx/panel.h>
  4765 + <wx/button.h>
  4766 + <wx/dialog.h>
  4767 + <wx/combobox.h>
  4768 + <wx/msgdlg.h>
  4769 + <wx/dcclient.h>
  4770 + "FD_ESR_SW.h"
  4771 + "UTILITIES.h"
  4772 + "MESH_LAPLACE.h"
  4773 + "MESH_PARAM.h"
  4774 + "RUN_STATUS.h"
  4775 + <iostream>
  4776 + <fstream>
  4777 + <sstream>
  4778 +
  4779 +1509492344 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\spicemodel.cpp
  4780 + "SPICEMODEL.h"
  4781 + <wx/filename.h>
  4782 + <wx/dcclient.h>
  4783 + <wx/tokenzr.h>
  4784 + <iostream>
  4785 + <fstream>
  4786 + <string>
  4787 + <sstream>
  4788 + <wx/settings.h>
  4789 + <wx/intl.h>
  4790 + <wx/string.h>
  4791 +
  4792 +1509486246 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\spicemodel.h
  4793 + <wx/notebook.h>
  4794 + <wx/sizer.h>
  4795 + <wx/stattext.h>
  4796 + <wx/textctrl.h>
  4797 + <wx/checkbox.h>
  4798 + <wx/radiobut.h>
  4799 + <wx/panel.h>
  4800 + <wx/button.h>
  4801 + <wx/dialog.h>
  4802 + <wx/msgdlg.h>
  4803 + <wx/dirctrl.h>
  4804 + <wx/treectrl.h>
  4805 + <iostream>
  4806 + <string>
  4807 + "FileSelectorCtrl.h"
  4808 + "BUNDLE_SCHEMATIC.h"
  4809 + "RUN_STATUS.h"
  4810 + "UTILITIES.h"
  4811 +
  4812 +1502693570 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\sw1_guiapp.cpp
  4813 + "SW1_GUIApp.h"
  4814 + "SW1_GUIMain.h"
  4815 + <wx/image.h>
  4816 +
  4817 +1502693570 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\sw1_guiapp.h
  4818 + <wx/app.h>
  4819 +
  4820 +1514922396 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\sw1_guimain.h
  4821 + <wx/sizer.h>
  4822 + <wx/menu.h>
  4823 + <wx/panel.h>
  4824 + <wx/statbmp.h>
  4825 + <wx/dirdlg.h>
  4826 + <wx/frame.h>
  4827 + <wx/statusbr.h>
  4828 + <wx/dirctrl.h>
  4829 + <wx/msgdlg.h>
  4830 + <wx/dir.h>
  4831 + <wx/dirctrl.h>
  4832 + <wx/treectrl.h>
  4833 + <wx/filename.h>
  4834 + <wx/dcclient.h>
  4835 + "FileSelectorCtrl.h"
  4836 + "ABOUT.h"
  4837 + "CYLINDRICAL.h"
  4838 + "COAXIAL.h"
  4839 + "TWINAX.h"
  4840 + "UTP.h"
  4841 + "TP.h"
  4842 + "SPACEWIRE.h"
  4843 + "OVERSHIELD.h"
  4844 + "FLEXCABLE.h"
  4845 + "DCONN.h"
  4846 + "BUNDLEBLDR.h"
  4847 + "SPICEMODEL.h"
  4848 + "CABLE_SCHEMATIC.h"
  4849 + "BUNDLE_SCHEMATIC.h"
  4850 + "EXPORT_SPICE.h"
  4851 + "UTILITIES.h"
  4852 + <iostream>
  4853 + <fstream>
  4854 + <string>
  4855 +
  4856 +1530176768 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\twinax.h
  4857 + <wx/notebook.h>
  4858 + <wx/sizer.h>
  4859 + <wx/stattext.h>
  4860 + <wx/textctrl.h>
  4861 + <wx/checkbox.h>
  4862 + <wx/statline.h>
  4863 + <wx/panel.h>
  4864 + <wx/button.h>
  4865 + <wx/dialog.h>
  4866 + <wx/combobox.h>
  4867 + <wx/msgdlg.h>
  4868 + <wx/dcclient.h>
  4869 + "FD_ESR.h"
  4870 + "UTILITIES.h"
  4871 + "MESH_LAPLACE.h"
  4872 + "MESH_PARAM.h"
  4873 + "RUN_STATUS.h"
  4874 + <iostream>
  4875 + <fstream>
  4876 + <sstream>
  4877 +
  4878 +1530174672 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\utp.h
  4879 + <wx/notebook.h>
  4880 + <wx/sizer.h>
  4881 + <wx/stattext.h>
  4882 + <wx/textctrl.h>
  4883 + <wx/checkbox.h>
  4884 + <wx/panel.h>
  4885 + <wx/button.h>
  4886 + <wx/dialog.h>
  4887 + <wx/combobox.h>
  4888 + <wx/msgdlg.h>
  4889 + <wx/dcclient.h>
  4890 + "FD_ESR.h"
  4891 + "UTILITIES.h"
  4892 + "MESH_LAPLACE.h"
  4893 + "MESH_PARAM.h"
  4894 + "RUN_STATUS.h"
  4895 + <iostream>
  4896 + <fstream>
  4897 + <sstream>
  4898 + <stdio.h>
  4899 +
  4900 +1530175406 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\tp.h
  4901 + <wx/notebook.h>
  4902 + <wx/sizer.h>
  4903 + <wx/stattext.h>
  4904 + <wx/textctrl.h>
  4905 + <wx/checkbox.h>
  4906 + <wx/statline.h>
  4907 + <wx/panel.h>
  4908 + <wx/button.h>
  4909 + <wx/dialog.h>
  4910 + <wx/combobox.h>
  4911 + <wx/msgdlg.h>
  4912 + <wx/dcclient.h>
  4913 + "FD_ESR.h"
  4914 + "MESH_LAPLACE.h"
  4915 + "MESH_PARAM.h"
  4916 + "UTILITIES.h"
  4917 + "RUN_STATUS.h"
  4918 + <iostream>
  4919 + <fstream>
  4920 + <sstream>
  4921 +
  4922 +1530607380 c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\bundlebldr.h
  4923 + <wx/notebook.h>
  4924 + <wx/sizer.h>
  4925 + <wx/stattext.h>
  4926 + <wx/textctrl.h>
  4927 + <wx/checkbox.h>
  4928 + <wx/listbox.h>
  4929 + <wx/radiobut.h>
  4930 + <wx/panel.h>
  4931 + <wx/button.h>
  4932 + <wx/dialog.h>
  4933 + <wx/spinbutt.h>
  4934 + <wx/combobox.h>
  4935 + <wx/dirctrl.h>
  4936 + <wx/treectrl.h>
  4937 + "FileSelectorCtrl.h"
  4938 + "UTILITIES.h"
  4939 + "MESH_LAPLACE.h"
  4940 + "MESH_PARAM.h"
  4941 + "RUN_STATUS.h"
  4942 + <iostream>
  4943 + <string>
  4944 +
  4945 +1514923368 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\sw1_guimain.cpp
  4946 + "SW1_GUIMain.h"
  4947 + <wx/bitmap.h>
  4948 + <wx/icon.h>
  4949 + <wx/settings.h>
  4950 + <wx/intl.h>
  4951 + <wx/image.h>
  4952 + <wx/string.h>
  4953 +
  4954 +1530175476 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\tp.cpp
  4955 + "TP.h"
  4956 + <wx/settings.h>
  4957 + <wx/intl.h>
  4958 + <wx/string.h>
  4959 +
  4960 +1530176822 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\twinax.cpp
  4961 + "TWINAX.h"
  4962 + <wx/settings.h>
  4963 + <wx/intl.h>
  4964 + <wx/string.h>
  4965 +
  4966 +1502693568 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\utilities.cpp
  4967 + "UTILITIES.h"
  4968 +
  4969 +1530174326 source:c:\users\eezsg\desktop\sacamos_july_2018\local_sw1\utp.cpp
  4970 + "UTP.h"
  4971 + <wx/settings.h>
  4972 + <wx/intl.h>
  4973 + <wx/string.h>
  4974 +
  4975 +1512938044 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\about.cpp
  4976 + "ABOUT.h"
  4977 + <wx/textfile.h>
  4978 + <wx/msgdlg.h>
  4979 + <wx/hyperlink.h>
  4980 + <wx/bitmap.h>
  4981 + <wx/intl.h>
  4982 + <wx/image.h>
  4983 + <wx/string.h>
  4984 +
  4985 +1502693582 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\about.h
  4986 + <wx/sizer.h>
  4987 + <wx/textctrl.h>
  4988 + <wx/statbmp.h>
  4989 + <wx/dialog.h>
  4990 +
  4991 +1530399384 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\bundle_schematic.cpp
  4992 + "BUNDLE_SCHEMATIC.h"
  4993 +
  4994 +1502693582 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\bundle_schematic.h
  4995 + <wx/panel.h>
  4996 + <wx/dcclient.h>
  4997 + <wx/msgdlg.h>
  4998 + <iostream>
  4999 + <fstream>
  5000 + <sstream>
  5001 + <cmath>
  5002 +
  5003 +1530399132 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\cable_schematic.cpp
  5004 + "CABLE_SCHEMATIC.h"
  5005 +
  5006 +1502693580 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\cable_schematic.h
  5007 + <wx/panel.h>
  5008 + <wx/dcclient.h>
  5009 + <wx/msgdlg.h>
  5010 + <iostream>
  5011 + <fstream>
  5012 + <sstream>
  5013 +
  5014 +1530175204 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\coaxial.cpp
  5015 + "COAXIAL.h"
  5016 + <wx/settings.h>
  5017 + <wx/font.h>
  5018 + <wx/intl.h>
  5019 + <wx/string.h>
  5020 +
  5021 +1514832982 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\coaxial.h
  5022 + <wx/notebook.h>
  5023 + <wx/sizer.h>
  5024 + <wx/stattext.h>
  5025 + <wx/textctrl.h>
  5026 + <wx/checkbox.h>
  5027 + <wx/statline.h>
  5028 + <wx/panel.h>
  5029 + <wx/button.h>
  5030 + <wx/dialog.h>
  5031 + <wx/msgdlg.h>
  5032 + <wx/dcclient.h>
  5033 + "UTILITIES.h"
  5034 + "FD_ESR.h"
  5035 + "FD_ZT.h"
  5036 + "RUN_STATUS.h"
  5037 + <iostream>
  5038 + <fstream>
  5039 + <sstream>
  5040 +
  5041 +1502693568 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\utilities.h
  5042 + <wx/textctrl.h>
  5043 + <wx/tokenzr.h>
  5044 + <wx/filename.h>
  5045 + <wx/filefn.h>
  5046 +
  5047 +1530719642 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\fd_esr.h
  5048 + <wx/sizer.h>
  5049 + <wx/stattext.h>
  5050 + <wx/textctrl.h>
  5051 + <wx/checkbox.h>
  5052 + <wx/statline.h>
  5053 + <wx/radiobut.h>
  5054 + <wx/button.h>
  5055 + <wx/dialog.h>
  5056 + "UTILITIES.h"
  5057 +
  5058 +1502693578 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\fd_zt.h
  5059 + <wx/sizer.h>
  5060 + <wx/stattext.h>
  5061 + <wx/textctrl.h>
  5062 + <wx/statline.h>
  5063 + <wx/button.h>
  5064 + <wx/dialog.h>
  5065 +
  5066 +1502693574 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\run_status.h
  5067 + <wx/sizer.h>
  5068 + <wx/textctrl.h>
  5069 + <wx/dialog.h>
  5070 + <wx/textfile.h>
  5071 + <iostream>
  5072 + <fstream>
  5073 + <sstream>
  5074 +
  5075 +1530723820 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\cylindrical.cpp
  5076 + "CYLINDRICAL.h"
  5077 + <wx/settings.h>
  5078 + <wx/intl.h>
  5079 + <wx/string.h>
  5080 +
  5081 +1530723820 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\cylindrical.h
  5082 + <wx/sizer.h>
  5083 + <wx/stattext.h>
  5084 + <wx/textctrl.h>
  5085 + <wx/checkbox.h>
  5086 + <wx/panel.h>
  5087 + <wx/button.h>
  5088 + <wx/dialog.h>
  5089 + <wx/msgdlg.h>
  5090 + <wx/dcclient.h>
  5091 + "FD_ESR.h"
  5092 + "UTILITIES.h"
  5093 + "RUN_STATUS.h"
  5094 + <iostream>
  5095 + <fstream>
  5096 + <sstream>
  5097 +
  5098 +1530716863 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\dconn.cpp
  5099 + "DCONN.h"
  5100 + <wx/settings.h>
  5101 + <wx/intl.h>
  5102 + <wx/string.h>
  5103 +
  5104 +1514918482 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\dconn.h
  5105 + <wx/sizer.h>
  5106 + <wx/stattext.h>
  5107 + <wx/textctrl.h>
  5108 + <wx/checkbox.h>
  5109 + <wx/panel.h>
  5110 + <wx/button.h>
  5111 + <wx/dialog.h>
  5112 + <wx/combobox.h>
  5113 + <wx/dcclient.h>
  5114 + <wx/msgdlg.h>
  5115 + "MESH_LAPLACE.h"
  5116 + "MESH_PARAM.h"
  5117 + "RUN_STATUS.h"
  5118 + "UTILITIES.h"
  5119 + <iostream>
  5120 + <fstream>
  5121 + <sstream>
  5122 +
  5123 +1502693576 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\mesh_laplace.h
  5124 + <wx/sizer.h>
  5125 + <wx/panel.h>
  5126 + <wx/button.h>
  5127 + <wx/dialog.h>
  5128 + <wx/msgdlg.h>
  5129 + <wx/dcclient.h>
  5130 + <iostream>
  5131 + <fstream>
  5132 + <string>
  5133 + <algorithm>
  5134 +
  5135 +1530714874 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\mesh_param.h
  5136 + <wx/sizer.h>
  5137 + <wx/stattext.h>
  5138 + <wx/textctrl.h>
  5139 + <wx/button.h>
  5140 + <wx/dialog.h>
  5141 + "UTILITIES.h"
  5142 +
  5143 +1508706938 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\export_spice.cpp
  5144 + "EXPORT_SPICE.h"
  5145 + <wx/intl.h>
  5146 + <wx/string.h>
  5147 +
  5148 +1508706152 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\export_spice.h
  5149 + <wx/sizer.h>
  5150 + <wx/textctrl.h>
  5151 + <wx/filepicker.h>
  5152 + <wx/button.h>
  5153 + <wx/dialog.h>
  5154 + <wx/msgdlg.h>
  5155 + <wx/filefn.h>
  5156 + <wx/textfile.h>
  5157 +
  5158 +1530719661 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\fd_esr.cpp
  5159 + "FD_ESR.h"
  5160 + <wx/settings.h>
  5161 + <wx/intl.h>
  5162 + <wx/string.h>
  5163 +
  5164 +1530724390 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\fd_esr_sw.cpp
  5165 + "FD_ESR_SW.h"
  5166 + "UTILITIES.h"
  5167 + <wx/settings.h>
  5168 + <wx/intl.h>
  5169 + <wx/string.h>
  5170 +
  5171 +1530724365 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\fd_esr_sw.h
  5172 + <wx/sizer.h>
  5173 + <wx/stattext.h>
  5174 + <wx/textctrl.h>
  5175 + <wx/checkbox.h>
  5176 + <wx/statline.h>
  5177 + <wx/radiobut.h>
  5178 + <wx/button.h>
  5179 + <wx/dialog.h>
  5180 +
  5181 +1502693578 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\fd_zt.cpp
  5182 + "FD_ZT.h"
  5183 + <wx/intl.h>
  5184 + <wx/string.h>
  5185 +
  5186 +1502693578 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\fileselectorctrl.cpp
  5187 + "wx/wxprec.h"
  5188 + "wx/generic/dirctrlg.h"
  5189 + "FileSelectorCtrl.h"
  5190 + "wx/hash.h"
  5191 + "wx/intl.h"
  5192 + "wx/log.h"
  5193 + "wx/utils.h"
  5194 + "wx/button.h"
  5195 + "wx/icon.h"
  5196 + "wx/settings.h"
  5197 + "wx/msgdlg.h"
  5198 + "wx/choice.h"
  5199 + "wx/textctrl.h"
  5200 + "wx/layout.h"
  5201 + "wx/sizer.h"
  5202 + "wx/textdlg.h"
  5203 + "wx/gdicmn.h"
  5204 + "wx/image.h"
  5205 + "wx/module.h"
  5206 + "wx/filename.h"
  5207 + "wx/filefn.h"
  5208 + "wx/imaglist.h"
  5209 + "wx/tokenzr.h"
  5210 + "wx/dir.h"
  5211 + "wx/artprov.h"
  5212 + "wx/mimetype.h"
  5213 + "wx/statline.h"
  5214 + "wx/osx/private.h"
  5215 + <windows.h>
  5216 + "wx/msw/winundef.h"
  5217 + "wx/volume.h"
  5218 + <direct.h>
  5219 + "dos.h"
  5220 +
  5221 +1502693578 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\fileselectorctrl.h
  5222 + "wx/treectrl.h"
  5223 + "wx/dialog.h"
  5224 + "wx/dirdlg.h"
  5225 + "wx/choice.h"
  5226 +
  5227 +1530735919 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\flexcable.cpp
  5228 + "FLEXCABLE.h"
  5229 + <wx/settings.h>
  5230 + <wx/intl.h>
  5231 + <wx/string.h>
  5232 +
  5233 +1530714757 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\flexcable.h
  5234 + <wx/notebook.h>
  5235 + <wx/sizer.h>
  5236 + <wx/stattext.h>
  5237 + <wx/textctrl.h>
  5238 + <wx/checkbox.h>
  5239 + <wx/panel.h>
  5240 + <wx/grid.h>
  5241 + <wx/button.h>
  5242 + <wx/dialog.h>
  5243 + <wx/combobox.h>
  5244 + <wx/msgdlg.h>
  5245 + <wx/dcclient.h>
  5246 + "UTILITIES.h"
  5247 + "MESH_LAPLACE.h"
  5248 + "MESH_PARAM.h"
  5249 + "RUN_STATUS.h"
  5250 + "FD_ESR.h"
  5251 + <iostream>
  5252 + <fstream>
  5253 + <sstream>
  5254 +
  5255 +1530740315 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\mesh_laplace.cpp
  5256 + "MESH_LAPLACE.h"
  5257 +
  5258 +1530714885 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\mesh_param.cpp
  5259 + "MESH_PARAM.h"
  5260 + <wx/settings.h>
  5261 + <wx/intl.h>
  5262 + <wx/string.h>
  5263 +
  5264 +1514917242 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\overshield.cpp
  5265 + "OVERSHIELD.h"
  5266 + <wx/settings.h>
  5267 + <wx/intl.h>
  5268 + <wx/string.h>
  5269 +
  5270 +1514918530 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\overshield.h
  5271 + <wx/sizer.h>
  5272 + <wx/stattext.h>
  5273 + <wx/textctrl.h>
  5274 + <wx/panel.h>
  5275 + <wx/button.h>
  5276 + <wx/dialog.h>
  5277 + <wx/msgdlg.h>
  5278 + <wx/dcclient.h>
  5279 + "MESH_LAPLACE.h"
  5280 + "UTILITIES.h"
  5281 + "RUN_STATUS.h"
  5282 + <iostream>
  5283 + <fstream>
  5284 + <sstream>
  5285 +
  5286 +1502693576 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\place_cable.cpp
  5287 + "PLACE_CABLE.h"
  5288 + <wx/intl.h>
  5289 + <wx/string.h>
  5290 +
  5291 +1502693576 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\place_cable.h
  5292 + <wx/sizer.h>
  5293 + <wx/stattext.h>
  5294 + <wx/textctrl.h>
  5295 + <wx/button.h>
  5296 + <wx/dialog.h>
  5297 +
  5298 +1502693574 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\resource.rc
  5299 + "wx/msw/wx.rc"
  5300 +
  5301 +1502693574 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\run_status.cpp
  5302 + "RUN_STATUS.h"
  5303 + <wx/intl.h>
  5304 + <wx/string.h>
  5305 +
  5306 +1530724586 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\spacewire.cpp
  5307 + "SPACEWIRE.h"
  5308 + <wx/settings.h>
  5309 + <wx/intl.h>
  5310 + <wx/string.h>
  5311 +
  5312 +1530724618 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\spacewire.h
  5313 + <wx/notebook.h>
  5314 + <wx/sizer.h>
  5315 + <wx/stattext.h>
  5316 + <wx/textctrl.h>
  5317 + <wx/checkbox.h>
  5318 + <wx/panel.h>
  5319 + <wx/button.h>
  5320 + <wx/dialog.h>
  5321 + <wx/combobox.h>
  5322 + <wx/msgdlg.h>
  5323 + <wx/dcclient.h>
  5324 + "FD_ESR_SW.h"
  5325 + "UTILITIES.h"
  5326 + "MESH_LAPLACE.h"
  5327 + "MESH_PARAM.h"
  5328 + "RUN_STATUS.h"
  5329 + <iostream>
  5330 + <fstream>
  5331 + <sstream>
  5332 +
  5333 +1509492344 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\spicemodel.cpp
  5334 + "SPICEMODEL.h"
  5335 + <wx/filename.h>
  5336 + <wx/dcclient.h>
  5337 + <wx/tokenzr.h>
  5338 + <iostream>
  5339 + <fstream>
  5340 + <string>
  5341 + <sstream>
  5342 + <wx/settings.h>
  5343 + <wx/intl.h>
  5344 + <wx/string.h>
  5345 +
  5346 +1509486246 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\spicemodel.h
  5347 + <wx/notebook.h>
  5348 + <wx/sizer.h>
  5349 + <wx/stattext.h>
  5350 + <wx/textctrl.h>
  5351 + <wx/checkbox.h>
  5352 + <wx/radiobut.h>
  5353 + <wx/panel.h>
  5354 + <wx/button.h>
  5355 + <wx/dialog.h>
  5356 + <wx/msgdlg.h>
  5357 + <wx/dirctrl.h>
  5358 + <wx/treectrl.h>
  5359 + <iostream>
  5360 + <string>
  5361 + "FileSelectorCtrl.h"
  5362 + "BUNDLE_SCHEMATIC.h"
  5363 + "RUN_STATUS.h"
  5364 + "UTILITIES.h"
  5365 +
  5366 +1502693570 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\sw1_guiapp.cpp
  5367 + "SW1_GUIApp.h"
  5368 + "SW1_GUIMain.h"
  5369 + <wx/image.h>
  5370 +
  5371 +1502693570 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\sw1_guiapp.h
  5372 + <wx/app.h>
  5373 +
  5374 +1514922396 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\sw1_guimain.h
  5375 + <wx/sizer.h>
  5376 + <wx/menu.h>
  5377 + <wx/panel.h>
  5378 + <wx/statbmp.h>
  5379 + <wx/dirdlg.h>
  5380 + <wx/frame.h>
  5381 + <wx/statusbr.h>
  5382 + <wx/dirctrl.h>
  5383 + <wx/msgdlg.h>
  5384 + <wx/dir.h>
  5385 + <wx/dirctrl.h>
  5386 + <wx/treectrl.h>
  5387 + <wx/filename.h>
  5388 + <wx/dcclient.h>
  5389 + "FileSelectorCtrl.h"
  5390 + "ABOUT.h"
  5391 + "CYLINDRICAL.h"
  5392 + "COAXIAL.h"
  5393 + "TWINAX.h"
  5394 + "UTP.h"
  5395 + "TP.h"
  5396 + "SPACEWIRE.h"
  5397 + "OVERSHIELD.h"
  5398 + "FLEXCABLE.h"
  5399 + "DCONN.h"
  5400 + "BUNDLEBLDR.h"
  5401 + "SPICEMODEL.h"
  5402 + "CABLE_SCHEMATIC.h"
  5403 + "BUNDLE_SCHEMATIC.h"
  5404 + "EXPORT_SPICE.h"
  5405 + "UTILITIES.h"
  5406 + <iostream>
  5407 + <fstream>
  5408 + <string>
  5409 +
  5410 +1530719968 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\twinax.h
  5411 + <wx/notebook.h>
  5412 + <wx/sizer.h>
  5413 + <wx/stattext.h>
  5414 + <wx/textctrl.h>
  5415 + <wx/checkbox.h>
  5416 + <wx/statline.h>
  5417 + <wx/panel.h>
  5418 + <wx/button.h>
  5419 + <wx/dialog.h>
  5420 + <wx/combobox.h>
  5421 + <wx/msgdlg.h>
  5422 + <wx/dcclient.h>
  5423 + "FD_ESR.h"
  5424 + "UTILITIES.h"
  5425 + "MESH_LAPLACE.h"
  5426 + "MESH_PARAM.h"
  5427 + "RUN_STATUS.h"
  5428 + <iostream>
  5429 + <fstream>
  5430 + <sstream>
  5431 +
  5432 +1530722667 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\utp.h
  5433 + <wx/notebook.h>
  5434 + <wx/sizer.h>
  5435 + <wx/stattext.h>
  5436 + <wx/textctrl.h>
  5437 + <wx/checkbox.h>
  5438 + <wx/panel.h>
  5439 + <wx/button.h>
  5440 + <wx/dialog.h>
  5441 + <wx/combobox.h>
  5442 + <wx/msgdlg.h>
  5443 + <wx/dcclient.h>
  5444 + "FD_ESR.h"
  5445 + "UTILITIES.h"
  5446 + "MESH_LAPLACE.h"
  5447 + "MESH_PARAM.h"
  5448 + "RUN_STATUS.h"
  5449 + <iostream>
  5450 + <fstream>
  5451 + <sstream>
  5452 + <stdio.h>
  5453 +
  5454 +1530722645 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\tp.h
  5455 + <wx/notebook.h>
  5456 + <wx/sizer.h>
  5457 + <wx/stattext.h>
  5458 + <wx/textctrl.h>
  5459 + <wx/checkbox.h>
  5460 + <wx/statline.h>
  5461 + <wx/panel.h>
  5462 + <wx/button.h>
  5463 + <wx/dialog.h>
  5464 + <wx/combobox.h>
  5465 + <wx/msgdlg.h>
  5466 + <wx/dcclient.h>
  5467 + "FD_ESR.h"
  5468 + "MESH_LAPLACE.h"
  5469 + "MESH_PARAM.h"
  5470 + "UTILITIES.h"
  5471 + "RUN_STATUS.h"
  5472 + <iostream>
  5473 + <fstream>
  5474 + <sstream>
  5475 +
  5476 +1530739987 c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\bundlebldr.h
  5477 + <wx/notebook.h>
  5478 + <wx/sizer.h>
  5479 + <wx/stattext.h>
  5480 + <wx/textctrl.h>
  5481 + <wx/checkbox.h>
  5482 + <wx/listbox.h>
  5483 + <wx/radiobut.h>
  5484 + <wx/panel.h>
  5485 + <wx/button.h>
  5486 + <wx/dialog.h>
  5487 + <wx/spinbutt.h>
  5488 + <wx/combobox.h>
  5489 + <wx/dirctrl.h>
  5490 + <wx/treectrl.h>
  5491 + "FileSelectorCtrl.h"
  5492 + "UTILITIES.h"
  5493 + "MESH_LAPLACE.h"
  5494 + "MESH_PARAM.h"
  5495 + "RUN_STATUS.h"
  5496 + <iostream>
  5497 + <string>
  5498 +
  5499 +1514923368 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\sw1_guimain.cpp
  5500 + "SW1_GUIMain.h"
  5501 + <wx/bitmap.h>
  5502 + <wx/icon.h>
  5503 + <wx/settings.h>
  5504 + <wx/intl.h>
  5505 + <wx/image.h>
  5506 + <wx/string.h>
  5507 +
  5508 +1530724215 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\tp.cpp
  5509 + "TP.h"
  5510 + <wx/settings.h>
  5511 + <wx/intl.h>
  5512 + <wx/string.h>
  5513 +
  5514 +1530721191 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\twinax.cpp
  5515 + "TWINAX.h"
  5516 + <wx/settings.h>
  5517 + <wx/intl.h>
  5518 + <wx/string.h>
  5519 +
  5520 +1502693568 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\utilities.cpp
  5521 + "UTILITIES.h"
  5522 +
  5523 +1530723999 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\utp.cpp
  5524 + "UTP.h"
  5525 + <wx/settings.h>
  5526 + <wx/intl.h>
  5527 + <wx/string.h>
  5528 +
  5529 +1530740293 source:c:\users\steve\desktop\new folder (2)\sacamos_july_2018\local_sw1\bundlebldr.cpp
  5530 + "BUNDLEBLDR.h"
  5531 + "PLACE_CABLE.h"
  5532 + "MESH_LAPLACE.h"
  5533 + <wx/msgdlg.h>
  5534 + <wx/filename.h>
  5535 + <wx/dcclient.h>
  5536 + <iostream>
  5537 + <string>
  5538 + <fstream>
  5539 + <sstream>
  5540 + <wx/settings.h>
  5541 + <wx/intl.h>
  5542 + <wx/string.h>
  5543 +
  5544 +1512938044 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.cpp
  5545 + "ABOUT.h"
  5546 + <wx/textfile.h>
  5547 + <wx/msgdlg.h>
  5548 + <wx/hyperlink.h>
  5549 + <wx/bitmap.h>
  5550 + <wx/intl.h>
  5551 + <wx/image.h>
  5552 + <wx/string.h>
  5553 +
  5554 +1502693582 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\about.h
  5555 + <wx/sizer.h>
  5556 + <wx/textctrl.h>
  5557 + <wx/statbmp.h>
  5558 + <wx/dialog.h>
  5559 +
  5560 +1530399384 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.cpp
  5561 + "BUNDLE_SCHEMATIC.h"
  5562 +
  5563 +1502693582 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundle_schematic.h
  5564 + <wx/panel.h>
  5565 + <wx/dcclient.h>
  5566 + <wx/msgdlg.h>
  5567 + <iostream>
  5568 + <fstream>
  5569 + <sstream>
  5570 + <cmath>
  5571 +
  5572 +1530740294 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.cpp
  5573 + "BUNDLEBLDR.h"
  5574 + "PLACE_CABLE.h"
  5575 + "MESH_LAPLACE.h"
  5576 + <wx/msgdlg.h>
  5577 + <wx/filename.h>
  5578 + <wx/dcclient.h>
  5579 + <iostream>
  5580 + <string>
  5581 + <fstream>
  5582 + <sstream>
  5583 + <wx/settings.h>
  5584 + <wx/intl.h>
  5585 + <wx/string.h>
  5586 +
  5587 +1530739988 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\bundlebldr.h
  5588 + <wx/notebook.h>
  5589 + <wx/sizer.h>
  5590 + <wx/stattext.h>
  5591 + <wx/textctrl.h>
  5592 + <wx/checkbox.h>
  5593 + <wx/listbox.h>
  5594 + <wx/radiobut.h>
  5595 + <wx/panel.h>
  5596 + <wx/button.h>
  5597 + <wx/dialog.h>
  5598 + <wx/spinbutt.h>
  5599 + <wx/combobox.h>
  5600 + <wx/dirctrl.h>
  5601 + <wx/treectrl.h>
  5602 + "FileSelectorCtrl.h"
  5603 + "UTILITIES.h"
  5604 + "MESH_LAPLACE.h"
  5605 + "MESH_PARAM.h"
  5606 + "RUN_STATUS.h"
  5607 + <iostream>
  5608 + <string>
  5609 +
  5610 +1502693578 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fileselectorctrl.h
  5611 + "wx/treectrl.h"
  5612 + "wx/dialog.h"
  5613 + "wx/dirdlg.h"
  5614 + "wx/choice.h"
  5615 +
  5616 +1502693568 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.h
  5617 + <wx/textctrl.h>
  5618 + <wx/tokenzr.h>
  5619 + <wx/filename.h>
  5620 + <wx/filefn.h>
  5621 +
  5622 +1502693576 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.h
  5623 + <wx/sizer.h>
  5624 + <wx/panel.h>
  5625 + <wx/button.h>
  5626 + <wx/dialog.h>
  5627 + <wx/msgdlg.h>
  5628 + <wx/dcclient.h>
  5629 + <iostream>
  5630 + <fstream>
  5631 + <string>
  5632 + <algorithm>
  5633 +
  5634 +1530714876 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_param.h
  5635 + <wx/sizer.h>
  5636 + <wx/stattext.h>
  5637 + <wx/textctrl.h>
  5638 + <wx/button.h>
  5639 + <wx/dialog.h>
  5640 + "UTILITIES.h"
  5641 +
  5642 +1502693574 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.h
  5643 + <wx/sizer.h>
  5644 + <wx/textctrl.h>
  5645 + <wx/dialog.h>
  5646 + <wx/textfile.h>
  5647 + <iostream>
  5648 + <fstream>
  5649 + <sstream>
  5650 +
  5651 +1502693576 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.h
  5652 + <wx/sizer.h>
  5653 + <wx/stattext.h>
  5654 + <wx/textctrl.h>
  5655 + <wx/button.h>
  5656 + <wx/dialog.h>
  5657 +
  5658 +1530399132 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.cpp
  5659 + "CABLE_SCHEMATIC.h"
  5660 +
  5661 +1502693580 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cable_schematic.h
  5662 + <wx/panel.h>
  5663 + <wx/dcclient.h>
  5664 + <wx/msgdlg.h>
  5665 + <iostream>
  5666 + <fstream>
  5667 + <sstream>
  5668 +
  5669 +1530175204 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\coaxial.cpp
  5670 + "COAXIAL.h"
  5671 + <wx/settings.h>
  5672 + <wx/font.h>
  5673 + <wx/intl.h>
  5674 + <wx/string.h>
  5675 +
  5676 +1514832982 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\coaxial.h
  5677 + <wx/notebook.h>
  5678 + <wx/sizer.h>
  5679 + <wx/stattext.h>
  5680 + <wx/textctrl.h>
  5681 + <wx/checkbox.h>
  5682 + <wx/statline.h>
  5683 + <wx/panel.h>
  5684 + <wx/button.h>
  5685 + <wx/dialog.h>
  5686 + <wx/msgdlg.h>
  5687 + <wx/dcclient.h>
  5688 + "UTILITIES.h"
  5689 + "FD_ESR.h"
  5690 + "FD_ZT.h"
  5691 + "RUN_STATUS.h"
  5692 + <iostream>
  5693 + <fstream>
  5694 + <sstream>
  5695 +
  5696 +1530719644 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.h
  5697 + <wx/sizer.h>
  5698 + <wx/stattext.h>
  5699 + <wx/textctrl.h>
  5700 + <wx/checkbox.h>
  5701 + <wx/statline.h>
  5702 + <wx/radiobut.h>
  5703 + <wx/button.h>
  5704 + <wx/dialog.h>
  5705 + "UTILITIES.h"
  5706 +
  5707 +1502693578 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_zt.h
  5708 + <wx/sizer.h>
  5709 + <wx/stattext.h>
  5710 + <wx/textctrl.h>
  5711 + <wx/statline.h>
  5712 + <wx/button.h>
  5713 + <wx/dialog.h>
  5714 +
  5715 +1530723822 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cylindrical.cpp
  5716 + "CYLINDRICAL.h"
  5717 + <wx/settings.h>
  5718 + <wx/intl.h>
  5719 + <wx/string.h>
  5720 +
  5721 +1530723822 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\cylindrical.h
  5722 + <wx/sizer.h>
  5723 + <wx/stattext.h>
  5724 + <wx/textctrl.h>
  5725 + <wx/checkbox.h>
  5726 + <wx/panel.h>
  5727 + <wx/button.h>
  5728 + <wx/dialog.h>
  5729 + <wx/msgdlg.h>
  5730 + <wx/dcclient.h>
  5731 + "FD_ESR.h"
  5732 + "UTILITIES.h"
  5733 + "RUN_STATUS.h"
  5734 + <iostream>
  5735 + <fstream>
  5736 + <sstream>
  5737 +
  5738 +1530716864 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.cpp
  5739 + "DCONN.h"
  5740 + <wx/settings.h>
  5741 + <wx/intl.h>
  5742 + <wx/string.h>
  5743 +
  5744 +1514918482 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\dconn.h
  5745 + <wx/sizer.h>
  5746 + <wx/stattext.h>
  5747 + <wx/textctrl.h>
  5748 + <wx/checkbox.h>
  5749 + <wx/panel.h>
  5750 + <wx/button.h>
  5751 + <wx/dialog.h>
  5752 + <wx/combobox.h>
  5753 + <wx/dcclient.h>
  5754 + <wx/msgdlg.h>
  5755 + "MESH_LAPLACE.h"
  5756 + "MESH_PARAM.h"
  5757 + "RUN_STATUS.h"
  5758 + "UTILITIES.h"
  5759 + <iostream>
  5760 + <fstream>
  5761 + <sstream>
  5762 +
  5763 +1508706938 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.cpp
  5764 + "EXPORT_SPICE.h"
  5765 + <wx/intl.h>
  5766 + <wx/string.h>
  5767 +
  5768 +1508706152 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\export_spice.h
  5769 + <wx/sizer.h>
  5770 + <wx/textctrl.h>
  5771 + <wx/filepicker.h>
  5772 + <wx/button.h>
  5773 + <wx/dialog.h>
  5774 + <wx/msgdlg.h>
  5775 + <wx/filefn.h>
  5776 + <wx/textfile.h>
  5777 +
  5778 +1530719662 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr.cpp
  5779 + "FD_ESR.h"
  5780 + <wx/settings.h>
  5781 + <wx/intl.h>
  5782 + <wx/string.h>
  5783 +
  5784 +1530724392 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.cpp
  5785 + "FD_ESR_SW.h"
  5786 + "UTILITIES.h"
  5787 + <wx/settings.h>
  5788 + <wx/intl.h>
  5789 + <wx/string.h>
  5790 +
  5791 +1530724366 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_esr_sw.h
  5792 + <wx/sizer.h>
  5793 + <wx/stattext.h>
  5794 + <wx/textctrl.h>
  5795 + <wx/checkbox.h>
  5796 + <wx/statline.h>
  5797 + <wx/radiobut.h>
  5798 + <wx/button.h>
  5799 + <wx/dialog.h>
  5800 +
  5801 +1502693578 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fd_zt.cpp
  5802 + "FD_ZT.h"
  5803 + <wx/intl.h>
  5804 + <wx/string.h>
  5805 +
  5806 +1502693578 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\fileselectorctrl.cpp
  5807 + "wx/wxprec.h"
  5808 + "wx/generic/dirctrlg.h"
  5809 + "FileSelectorCtrl.h"
  5810 + "wx/hash.h"
  5811 + "wx/intl.h"
  5812 + "wx/log.h"
  5813 + "wx/utils.h"
  5814 + "wx/button.h"
  5815 + "wx/icon.h"
  5816 + "wx/settings.h"
  5817 + "wx/msgdlg.h"
  5818 + "wx/choice.h"
  5819 + "wx/textctrl.h"
  5820 + "wx/layout.h"
  5821 + "wx/sizer.h"
  5822 + "wx/textdlg.h"
  5823 + "wx/gdicmn.h"
  5824 + "wx/image.h"
  5825 + "wx/module.h"
  5826 + "wx/filename.h"
  5827 + "wx/filefn.h"
  5828 + "wx/imaglist.h"
  5829 + "wx/tokenzr.h"
  5830 + "wx/dir.h"
  5831 + "wx/artprov.h"
  5832 + "wx/mimetype.h"
  5833 + "wx/statline.h"
  5834 + "wx/osx/private.h"
  5835 + <windows.h>
  5836 + "wx/msw/winundef.h"
  5837 + "wx/volume.h"
  5838 + <direct.h>
  5839 + "dos.h"
  5840 +
  5841 +1530740316 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_laplace.cpp
  5842 + "MESH_LAPLACE.h"
  5843 +
  5844 +1530714886 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\mesh_param.cpp
  5845 + "MESH_PARAM.h"
  5846 + <wx/settings.h>
  5847 + <wx/intl.h>
  5848 + <wx/string.h>
  5849 +
  5850 +1514917242 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.cpp
  5851 + "OVERSHIELD.h"
  5852 + <wx/settings.h>
  5853 + <wx/intl.h>
  5854 + <wx/string.h>
  5855 +
  5856 +1514918530 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\overshield.h
  5857 + <wx/sizer.h>
  5858 + <wx/stattext.h>
  5859 + <wx/textctrl.h>
  5860 + <wx/panel.h>
  5861 + <wx/button.h>
  5862 + <wx/dialog.h>
  5863 + <wx/msgdlg.h>
  5864 + <wx/dcclient.h>
  5865 + "MESH_LAPLACE.h"
  5866 + "UTILITIES.h"
  5867 + "RUN_STATUS.h"
  5868 + <iostream>
  5869 + <fstream>
  5870 + <sstream>
  5871 +
  5872 +1502693576 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\place_cable.cpp
  5873 + "PLACE_CABLE.h"
  5874 + <wx/intl.h>
  5875 + <wx/string.h>
  5876 +
  5877 +1502693574 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\resource.rc
  5878 + "wx/msw/wx.rc"
  5879 +
  5880 +1502693574 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\run_status.cpp
  5881 + "RUN_STATUS.h"
  5882 + <wx/intl.h>
  5883 + <wx/string.h>
  5884 +
  5885 +1530724588 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spacewire.cpp
  5886 + "SPACEWIRE.h"
  5887 + <wx/settings.h>
  5888 + <wx/intl.h>
  5889 + <wx/string.h>
  5890 +
  5891 +1530724620 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spacewire.h
  5892 + <wx/notebook.h>
  5893 + <wx/sizer.h>
  5894 + <wx/stattext.h>
  5895 + <wx/textctrl.h>
  5896 + <wx/checkbox.h>
  5897 + <wx/panel.h>
  5898 + <wx/button.h>
  5899 + <wx/dialog.h>
  5900 + <wx/combobox.h>
  5901 + <wx/msgdlg.h>
  5902 + <wx/dcclient.h>
  5903 + "FD_ESR_SW.h"
  5904 + "UTILITIES.h"
  5905 + "MESH_LAPLACE.h"
  5906 + "MESH_PARAM.h"
  5907 + "RUN_STATUS.h"
  5908 + <iostream>
  5909 + <fstream>
  5910 + <sstream>
  5911 +
  5912 +1509492344 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.cpp
  5913 + "SPICEMODEL.h"
  5914 + <wx/filename.h>
  5915 + <wx/dcclient.h>
  5916 + <wx/tokenzr.h>
  5917 + <iostream>
  5918 + <fstream>
  5919 + <string>
  5920 + <sstream>
  5921 + <wx/settings.h>
  5922 + <wx/intl.h>
  5923 + <wx/string.h>
  5924 +
  5925 +1509486246 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\spicemodel.h
  5926 + <wx/notebook.h>
  5927 + <wx/sizer.h>
  5928 + <wx/stattext.h>
  5929 + <wx/textctrl.h>
  5930 + <wx/checkbox.h>
  5931 + <wx/radiobut.h>
  5932 + <wx/panel.h>
  5933 + <wx/button.h>
  5934 + <wx/dialog.h>
  5935 + <wx/msgdlg.h>
  5936 + <wx/dirctrl.h>
  5937 + <wx/treectrl.h>
  5938 + <iostream>
  5939 + <string>
  5940 + "FileSelectorCtrl.h"
  5941 + "BUNDLE_SCHEMATIC.h"
  5942 + "RUN_STATUS.h"
  5943 + "UTILITIES.h"
  5944 +
  5945 +1502693570 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.cpp
  5946 + "SW1_GUIApp.h"
  5947 + "SW1_GUIMain.h"
  5948 + <wx/image.h>
  5949 +
  5950 +1502693570 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guiapp.h
  5951 + <wx/app.h>
  5952 +
  5953 +1514922396 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.h
  5954 + <wx/sizer.h>
  5955 + <wx/menu.h>
  5956 + <wx/panel.h>
  5957 + <wx/statbmp.h>
  5958 + <wx/dirdlg.h>
  5959 + <wx/frame.h>
  5960 + <wx/statusbr.h>
  5961 + <wx/dirctrl.h>
  5962 + <wx/msgdlg.h>
  5963 + <wx/dir.h>
  5964 + <wx/dirctrl.h>
  5965 + <wx/treectrl.h>
  5966 + <wx/filename.h>
  5967 + <wx/dcclient.h>
  5968 + "FileSelectorCtrl.h"
  5969 + "ABOUT.h"
  5970 + "CYLINDRICAL.h"
  5971 + "COAXIAL.h"
  5972 + "TWINAX.h"
  5973 + "UTP.h"
  5974 + "TP.h"
  5975 + "SPACEWIRE.h"
  5976 + "OVERSHIELD.h"
  5977 + "FLEXCABLE.h"
  5978 + "DCONN.h"
  5979 + "BUNDLEBLDR.h"
  5980 + "SPICEMODEL.h"
  5981 + "CABLE_SCHEMATIC.h"
  5982 + "BUNDLE_SCHEMATIC.h"
  5983 + "EXPORT_SPICE.h"
  5984 + "UTILITIES.h"
  5985 + <iostream>
  5986 + <fstream>
  5987 + <string>
  5988 +
  5989 +1530719970 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.h
  5990 + <wx/notebook.h>
  5991 + <wx/sizer.h>
  5992 + <wx/stattext.h>
  5993 + <wx/textctrl.h>
  5994 + <wx/checkbox.h>
  5995 + <wx/statline.h>
  5996 + <wx/panel.h>
  5997 + <wx/button.h>
  5998 + <wx/dialog.h>
  5999 + <wx/combobox.h>
  6000 + <wx/msgdlg.h>
  6001 + <wx/dcclient.h>
  6002 + "FD_ESR.h"
  6003 + "UTILITIES.h"
  6004 + "MESH_LAPLACE.h"
  6005 + "MESH_PARAM.h"
  6006 + "RUN_STATUS.h"
  6007 + <iostream>
  6008 + <fstream>
  6009 + <sstream>
  6010 +
  6011 +1530722668 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utp.h
  6012 + <wx/notebook.h>
  6013 + <wx/sizer.h>
  6014 + <wx/stattext.h>
  6015 + <wx/textctrl.h>
  6016 + <wx/checkbox.h>
  6017 + <wx/panel.h>
  6018 + <wx/button.h>
  6019 + <wx/dialog.h>
  6020 + <wx/combobox.h>
  6021 + <wx/msgdlg.h>
  6022 + <wx/dcclient.h>
  6023 + "FD_ESR.h"
  6024 + "UTILITIES.h"
  6025 + "MESH_LAPLACE.h"
  6026 + "MESH_PARAM.h"
  6027 + "RUN_STATUS.h"
  6028 + <iostream>
  6029 + <fstream>
  6030 + <sstream>
  6031 + <stdio.h>
  6032 +
  6033 +1530722646 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.h
  6034 + <wx/notebook.h>
  6035 + <wx/sizer.h>
  6036 + <wx/stattext.h>
  6037 + <wx/textctrl.h>
  6038 + <wx/checkbox.h>
  6039 + <wx/statline.h>
  6040 + <wx/panel.h>
  6041 + <wx/button.h>
  6042 + <wx/dialog.h>
  6043 + <wx/combobox.h>
  6044 + <wx/msgdlg.h>
  6045 + <wx/dcclient.h>
  6046 + "FD_ESR.h"
  6047 + "MESH_LAPLACE.h"
  6048 + "MESH_PARAM.h"
  6049 + "UTILITIES.h"
  6050 + "RUN_STATUS.h"
  6051 + <iostream>
  6052 + <fstream>
  6053 + <sstream>
  6054 +
  6055 +1530714758 c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.h
  6056 + <wx/notebook.h>
  6057 + <wx/sizer.h>
  6058 + <wx/stattext.h>
  6059 + <wx/textctrl.h>
  6060 + <wx/checkbox.h>
  6061 + <wx/panel.h>
  6062 + <wx/grid.h>
  6063 + <wx/button.h>
  6064 + <wx/dialog.h>
  6065 + <wx/combobox.h>
  6066 + <wx/msgdlg.h>
  6067 + <wx/dcclient.h>
  6068 + "UTILITIES.h"
  6069 + "MESH_LAPLACE.h"
  6070 + "MESH_PARAM.h"
  6071 + "RUN_STATUS.h"
  6072 + "FD_ESR.h"
  6073 + <iostream>
  6074 + <fstream>
  6075 + <sstream>
  6076 +
  6077 +1514923368 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\sw1_guimain.cpp
  6078 + "SW1_GUIMain.h"
  6079 + <wx/bitmap.h>
  6080 + <wx/icon.h>
  6081 + <wx/settings.h>
  6082 + <wx/intl.h>
  6083 + <wx/image.h>
  6084 + <wx/string.h>
  6085 +
  6086 +1530724216 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\tp.cpp
  6087 + "TP.h"
  6088 + <wx/settings.h>
  6089 + <wx/intl.h>
  6090 + <wx/string.h>
  6091 +
  6092 +1530721192 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\twinax.cpp
  6093 + "TWINAX.h"
  6094 + <wx/settings.h>
  6095 + <wx/intl.h>
  6096 + <wx/string.h>
  6097 +
  6098 +1502693568 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utilities.cpp
  6099 + "UTILITIES.h"
  6100 +
  6101 +1530724000 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\utp.cpp
  6102 + "UTP.h"
  6103 + <wx/settings.h>
  6104 + <wx/intl.h>
  6105 + <wx/string.h>
  6106 +
  6107 +1530797567 source:c:\users\eezsg\desktop\sacamos_july_2018\02\local_sw1\flexcable.cpp
  6108 + "FLEXCABLE.h"
  6109 + <wx/settings.h>
  6110 + <wx/intl.h>
  6111 + <wx/string.h>
  6112 +
... ...
GUI/SW1/SRC/SW1_GUI.layout
  Diff comments   View file @dd86ff4
... ... @@ -2,259 +2,109 @@
2 2 <CodeBlocks_layout_file>
3 3 <FileVersion major="1" minor="0" />
4 4 <ActiveTarget name="Release" />
5   - <File name="FLEXCABLE.cpp" open="0" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  5 + <File name="TWINAX.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
6 6 <Cursor>
7   - <Cursor1 position="18548" topLine="360" />
  7 + <Cursor1 position="29097" topLine="765" />
8 8 </Cursor>
9 9 </File>
10   - <File name="CABLE_SCHEMATIC.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  10 + <File name="UTP.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
11 11 <Cursor>
12   - <Cursor1 position="1866" topLine="22" />
  12 + <Cursor1 position="15969" topLine="277" />
13 13 </Cursor>
14 14 </File>
15   - <File name="FLEXCABLE.h" open="0" top="0" tabpos="38" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  15 + <File name="BUNDLEBLDR.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
16 16 <Cursor>
17   - <Cursor1 position="3678" topLine="84" />
  17 + <Cursor1 position="4034" topLine="111" />
18 18 </Cursor>
19 19 </File>
20   - <File name="MESH_LAPLACE.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  20 + <File name="UTP.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
21 21 <Cursor>
22   - <Cursor1 position="3659" topLine="30" />
  22 + <Cursor1 position="3106" topLine="84" />
23 23 </Cursor>
24 24 </File>
25   - <File name="OVERSHIELD.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  25 + <File name="BUNDLEBLDR.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
26 26 <Cursor>
27   - <Cursor1 position="2061" topLine="41" />
  27 + <Cursor1 position="68218" topLine="1027" />
28 28 </Cursor>
29 29 </File>
30   - <File name="FD_ESR.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  30 + <File name="BUNDLE_SCHEMATIC.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
31 31 <Cursor>
32   - <Cursor1 position="1858" topLine="36" />
  32 + <Cursor1 position="7034" topLine="669" />
33 33 </Cursor>
34 34 </File>
35   - <File name="MESH_LAPLACE.h" open="0" top="0" tabpos="31" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  35 + <File name="SPACEWIRE.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
36 36 <Cursor>
37   - <Cursor1 position="2652" topLine="37" />
  37 + <Cursor1 position="2860" topLine="70" />
38 38 </Cursor>
39 39 </File>
40   - <File name="BUNDLE_SCHEMATIC.cpp" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  40 + <File name="CABLE_SCHEMATIC.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
41 41 <Cursor>
42   - <Cursor1 position="30038" topLine="533" />
  42 + <Cursor1 position="33393" topLine="711" />
43 43 </Cursor>
44 44 </File>
45   - <File name="PLACE_CABLE.cpp" open="0" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  45 + <File name="FD_ESR.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
46 46 <Cursor>
47   - <Cursor1 position="372" topLine="78" />
  47 + <Cursor1 position="0" topLine="318" />
48 48 </Cursor>
49 49 </File>
50   - <File name="MESH_PARAM.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  50 + <File name="TWINAX.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
51 51 <Cursor>
52   - <Cursor1 position="3862" topLine="0" />
  52 + <Cursor1 position="3090" topLine="84" />
53 53 </Cursor>
54 54 </File>
55   - <File name="EXPORT_SPICE.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  55 + <File name="COAXIAL.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
56 56 <Cursor>
57   - <Cursor1 position="6826" topLine="120" />
  57 + <Cursor1 position="0" topLine="844" />
58 58 </Cursor>
59 59 </File>
60   - <File name="ABOUT.cpp" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  60 + <File name="FLEXCABLE.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
61 61 <Cursor>
62   - <Cursor1 position="4147" topLine="94" />
  62 + <Cursor1 position="23632" topLine="447" />
63 63 </Cursor>
64 64 </File>
65   - <File name="ABOUT.h" open="0" top="0" tabpos="33" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  65 + <File name="FLEXCABLE.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
66 66 <Cursor>
67   - <Cursor1 position="372" topLine="46" />
  67 + <Cursor1 position="3107" topLine="75" />
68 68 </Cursor>
69 69 </File>
70   - <File name="UTILITIES.h" open="0" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  70 + <File name="TP.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
71 71 <Cursor>
72   - <Cursor1 position="2195" topLine="26" />
  72 + <Cursor1 position="3112" topLine="71" />
73 73 </Cursor>
74 74 </File>
75   - <File name="COAXIAL.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  75 + <File name="COAXIAL.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
76 76 <Cursor>
77   - <Cursor1 position="3237" topLine="72" />
  77 + <Cursor1 position="0" topLine="159" />
78 78 </Cursor>
79 79 </File>
80   - <File name="TWINAX.h" open="0" top="0" tabpos="36" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  80 + <File name="MESH_LAPLACE.cpp" open="1" top="1" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
81 81 <Cursor>
82   - <Cursor1 position="2696" topLine="67" />
  82 + <Cursor1 position="3417" topLine="89" />
83 83 </Cursor>
84 84 </File>
85   - <File name="FD_ESR.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  85 + <File name="TP.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
86 86 <Cursor>
87   - <Cursor1 position="19665" topLine="32" />
  87 + <Cursor1 position="38129" topLine="766" />
88 88 </Cursor>
89 89 </File>
90   - <File name="PLACE_CABLE.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  90 + <File name="CYLINDRICAL.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
91 91 <Cursor>
92   - <Cursor1 position="313" topLine="0" />
  92 + <Cursor1 position="2973" topLine="69" />
93 93 </Cursor>
94 94 </File>
95   - <File name="UTP.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  95 + <File name="CYLINDRICAL.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
96 96 <Cursor>
97   - <Cursor1 position="2715" topLine="59" />
  97 + <Cursor1 position="15249" topLine="332" />
98 98 </Cursor>
99 99 </File>
100   - <File name="FD_ESR_SW.h" open="0" top="0" tabpos="29" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  100 + <File name="DCONN.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
101 101 <Cursor>
102   - <Cursor1 position="372" topLine="33" />
  102 + <Cursor1 position="25411" topLine="320" />
103 103 </Cursor>
104 104 </File>
105   - <File name="SPICEMODEL.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
  105 + <File name="SPACEWIRE.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
106 106 <Cursor>
107   - <Cursor1 position="2134" topLine="36" />
108   - </Cursor>
109   - </File>
110   - <File name="OVERSHIELD.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
111   - <Cursor>
112   - <Cursor1 position="13635" topLine="229" />
113   - </Cursor>
114   - </File>
115   - <File name="SPACEWIRE.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
116   - <Cursor>
117   - <Cursor1 position="2706" topLine="55" />
118   - </Cursor>
119   - </File>
120   - <File name="CYLINDRICAL.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
121   - <Cursor>
122   - <Cursor1 position="2536" topLine="62" />
123   - </Cursor>
124   - </File>
125   - <File name="SPICEMODEL.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
126   - <Cursor>
127   - <Cursor1 position="25248" topLine="554" />
128   - </Cursor>
129   - </File>
130   - <File name="BUNDLEBLDR.h" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
131   - <Cursor>
132   - <Cursor1 position="3550" topLine="92" />
133   - </Cursor>
134   - </File>
135   - <File name="SW1_GUIApp.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
136   - <Cursor>
137   - <Cursor1 position="372" topLine="16" />
138   - </Cursor>
139   - </File>
140   - <File name="COAXIAL.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
141   - <Cursor>
142   - <Cursor1 position="40499" topLine="840" />
143   - </Cursor>
144   - </File>
145   - <File name="SW1_GUIMain.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
146   - <Cursor>
147   - <Cursor1 position="20272" topLine="390" />
148   - </Cursor>
149   - </File>
150   - <File name="FD_ESR_SW.cpp" open="0" top="0" tabpos="37" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
151   - <Cursor>
152   - <Cursor1 position="372" topLine="0" />
153   - </Cursor>
154   - </File>
155   - <File name="SW1_GUIMain.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
156   - <Cursor>
157   - <Cursor1 position="2586" topLine="54" />
158   - </Cursor>
159   - </File>
160   - <File name="FileSelectorCtrl.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
161   - <Cursor>
162   - <Cursor1 position="18154" topLine="606" />
163   - </Cursor>
164   - </File>
165   - <File name="RUN_STATUS.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
166   - <Cursor>
167   - <Cursor1 position="3291" topLine="57" />
168   - </Cursor>
169   - </File>
170   - <File name="UTP.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
171   - <Cursor>
172   - <Cursor1 position="29998" topLine="708" />
173   - </Cursor>
174   - </File>
175   - <File name="EXPORT_SPICE.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
176   - <Cursor>
177   - <Cursor1 position="1941" topLine="29" />
178   - </Cursor>
179   - </File>
180   - <File name="TP.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
181   - <Cursor>
182   - <Cursor1 position="52600" topLine="1150" />
183   - </Cursor>
184   - </File>
185   - <File name="FileSelectorCtrl.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
186   - <Cursor>
187   - <Cursor1 position="2475" topLine="97" />
188   - </Cursor>
189   - </File>
190   - <File name="RUN_STATUS.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
191   - <Cursor>
192   - <Cursor1 position="1814" topLine="51" />
193   - </Cursor>
194   - </File>
195   - <File name="DCONN.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
196   - <Cursor>
197   - <Cursor1 position="12437" topLine="244" />
198   - </Cursor>
199   - </File>
200   - <File name="SW1_GUIApp.h" open="0" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
201   - <Cursor>
202   - <Cursor1 position="372" topLine="0" />
203   - </Cursor>
204   - </File>
205   - <File name="wxsmith\BUNDLEBLDR.wxs" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
206   - <Cursor>
207   - <Cursor1 position="92" topLine="0" />
208   - </Cursor>
209   - </File>
210   - <File name="MESH_PARAM.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
211   - <Cursor>
212   - <Cursor1 position="191" topLine="0" />
213   - </Cursor>
214   - </File>
215   - <File name="SPACEWIRE.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
216   - <Cursor>
217   - <Cursor1 position="77541" topLine="1604" />
218   - </Cursor>
219   - </File>
220   - <File name="CABLE_SCHEMATIC.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
221   - <Cursor>
222   - <Cursor1 position="30319" topLine="572" />
223   - </Cursor>
224   - </File>
225   - <File name="TP.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
226   - <Cursor>
227   - <Cursor1 position="2670" topLine="0" />
228   - </Cursor>
229   - </File>
230   - <File name="CYLINDRICAL.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
231   - <Cursor>
232   - <Cursor1 position="11613" topLine="315" />
233   - </Cursor>
234   - </File>
235   - <File name="TWINAX.cpp" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
236   - <Cursor>
237   - <Cursor1 position="52828" topLine="1131" />
238   - </Cursor>
239   - </File>
240   - <File name="BUNDLEBLDR.cpp" open="1" top="1" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
241   - <Cursor>
242   - <Cursor1 position="61889" topLine="1429" />
243   - </Cursor>
244   - </File>
245   - <File name="UTILITIES.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
246   - <Cursor>
247   - <Cursor1 position="5276" topLine="168" />
248   - </Cursor>
249   - </File>
250   - <File name="DCONN.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
251   - <Cursor>
252   - <Cursor1 position="2094" topLine="41" />
253   - </Cursor>
254   - </File>
255   - <File name="BUNDLE_SCHEMATIC.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
256   - <Cursor>
257   - <Cursor1 position="1781" topLine="25" />
  107 + <Cursor1 position="32757" topLine="461" />
258 108 </Cursor>
259 109 </File>
260 110 </CodeBlocks_layout_file>
... ...
GUI/SW1/SRC/TP.cpp
  Diff comments   View file @dd86ff4
... ... @@ -215,7 +215,7 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size)
215 215 FlexGridSizer8->Add(StaticText25, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
216 216 TextCtrl17 = new wxTextCtrl(Panel3, ID_TEXTCTRL17, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL17"));
217 217 FlexGridSizer8->Add(TextCtrl17, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
218   - StaticText26 = new wxStaticText(Panel3, ID_STATICTEXT26, _("H (henries/m)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT26"));
  218 + StaticText26 = new wxStaticText(Panel3, ID_STATICTEXT26, _("H (henries)"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT26"));
219 219 FlexGridSizer8->Add(StaticText26, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
220 220 TextCtrl18 = new wxTextCtrl(Panel3, ID_TEXTCTRL18, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL18"));
221 221 FlexGridSizer8->Add(TextCtrl18, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
... ... @@ -326,6 +326,7 @@ TP::TP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size)
326 326 Panel4->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPanel4Paint,0,this);
327 327 Panel4->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TP::OnPanel4LeftDClick,0,this);
328 328 Panel4->Connect(wxEVT_MOUSEWHEEL,(wxObjectEventFunction)&TP::OnPanel4MouseWheel,0,this);
  329 + Connect(wxEVT_PAINT,(wxObjectEventFunction)&TP::OnPaint);
329 330 //*)
330 331  
331 332 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TP::OnHighlightSchematic, this);
... ... @@ -347,6 +348,12 @@ TP::~TP()
347 348 //*)
348 349 }
349 350  
  351 +void TP::OnPaint(wxPaintEvent& event)
  352 +{
  353 + if (EDIT_EXISTING==true) EditExistingCable();
  354 +}
  355 +
  356 +
350 357 void TP::SetPathToMOD(wxString Path, wxString Name)
351 358 {
352 359  
... ... @@ -423,6 +430,7 @@ void TP::OnCheckBox1Click(wxCommandEvent&amp; event)
423 430  
424 431 FD_ESR *winFD_ESR = new FD_ESR(this);
425 432  
  433 + //winFD_ESR->formtype = 1;
426 434  
427 435 if ( winFD_ESR->ShowModal() == wxID_OK )
428 436 {
... ... @@ -438,6 +446,8 @@ void TP::OnCheckBox1Click(wxCommandEvent&amp; event)
438 446 FD_ESR9 = winFD_ESR->TextCtrl9->GetValue();
439 447 FD_ESR10= winFD_ESR->TextCtrl10->GetValue();
440 448  
  449 + FD_Default = winFD_ESR->CheckBox1->GetValue();
  450 +
441 451 FD_ORDER = winFD_ESR->TextCtrl11->GetValue();
442 452 FD_lin = winFD_ESR->RadioButton1->GetValue();
443 453 FD_Fmin = winFD_ESR->TextCtrl12->GetValue();
... ... @@ -463,7 +473,7 @@ void TP::OnButton2Click(wxCommandEvent&amp; event)
463 473  
464 474 system(stream.str().c_str());
465 475  
466   - ifstream runStatus;
  476 + //ifstream runStatus;
467 477  
468 478 // Display Run Status
469 479 RUN_STATUS *run_status = new RUN_STATUS(this);
... ... @@ -473,42 +483,34 @@ void TP::OnButton2Click(wxCommandEvent&amp; event)
473 483  
474 484 if (CheckBox2->GetValue())
475 485 {
476   - // Identify all mesh files for viewing
477   - //struct _finddata_t fileinfo;
478   - //long hFile;
479   - //wxString meshFileName = "*.msh.vtk";
480   - wxString pattern = "*.msh.vtk";
481 486  
482   - //wxString pattern((meshFileName));
  487 + wxString pattern (("*.msh.vtk")) ;
  488 +
483 489 wxString file;
484 490  
485 491 ComboBox1->Clear();
486 492  
487 493 file = wxFindFirstFile(pattern);
  494 +
  495 +
  496 +
488 497 while ( !file.empty())
489 498 {
490 499 wxString meshfile = file;
491   - size_t extindex = meshfile.find_first_of (".");
  500 + size_t extindex = meshfile.find_last_of (".");
  501 +
  502 + meshfile = meshfile.substr(0, extindex);
  503 +
  504 + extindex = meshfile.find_last_of (".");
492 505  
493 506 meshfile = meshfile.substr(0, extindex);
494 507  
  508 + meshfile = meshfile.substr(2,meshfile.length());
  509 +
495 510 ComboBox1->Append(meshfile);
496   - }
497 511  
498   -// if (( hFile = _findfirst( pattern, &fileinfo )) != -1 )
499   -// {
500   -// do
501   -// {
502   -// wxString meshfile = fileinfo.name;
503   -// size_t extindex = meshfile.find_first_of (".");
504   -//
505   -// meshfile = meshfile.substr(0, extindex);
506   -//
507   -// ComboBox1->Append(meshfile);
508   -//
509   -// } while ( _findnext( hFile, &fileinfo) == 0);
510   -// }
511   -// _findclose( hFile);
  512 + file = wxFindNextFile();
  513 + }
512 514  
513 515 CheckBox3->Enable();
514 516 }
... ... @@ -517,6 +519,7 @@ void TP::OnButton2Click(wxCommandEvent&amp; event)
517 519 void TP::OnButton3Click(wxCommandEvent& event)
518 520 {
519 521 //clean up directory
  522 + wxMessageBox("Please fix highlighted errors" , _("HELP3"));
520 523 clean_temp_files();
521 524 Close();
522 525 }
... ... @@ -776,18 +779,18 @@ void TP::WriteCableFile (wxString fileName)
776 779 }
777 780 }
778 781  
779   - if (CheckBox1->GetValue()){
  782 + if (!FD_Default){
780 783  
781 784 cableFile << FD_ORDER <<"\t # order for filter fitting\n";
782 785 if (FD_lin)
783 786 {
784   - cableFile << "lin # frequency range type for filter fitting type (lin or dB)";
  787 + cableFile << "lin # frequency range type for filter fitting type (lin or dB)\n";
785 788 }
786 789 else
787 790 {
788   - cableFile << "log # frequency range type for filter fitting type (lin or dB)";
  791 + cableFile << "log # frequency range type for filter fitting type (lin or dB)\n";
789 792 }
790   - cableFile << FD_Fmin <<" "<< FD_Fmax <<" "<< FD_ORDER <<"\t # fmin fmax number_of_frequencies for filter fitting";
  793 + cableFile << FD_Fmin <<" "<< FD_Fmax <<" "<< FD_Num <<"\t # fmin fmax number_of_frequencies for filter fitting\n";
791 794 }
792 795  
793 796 if (CheckBox2->GetValue()){
... ... @@ -799,10 +802,12 @@ void TP::WriteCableFile (wxString fileName)
799 802  
800 803 if (CheckBox3->GetValue())
801 804 {
802   - cableFile << "Laplace_boundary_constant\n";
803   - cableFile << MESH_PARAM1 <<"\n";
  805 + //cableFile << "Laplace_boundary_constant\n";
  806 + //cableFile << MESH_PARAM1 <<"\n";
804 807 cableFile << "Laplace_surface_mesh_constant\n";
805 808 cableFile << MESH_PARAM2 <<"\n";
  809 + //cableFile << "max_mesh_edge_length\n";
  810 + //cableFile << MESH_PARAM3 <<"\n";
806 811  
807 812 CheckBox3 ->SetValue(false);
808 813 }
... ... @@ -1136,11 +1141,14 @@ void TP::OnCheckBox3Click(wxCommandEvent&amp; event)
1136 1141 MESH_PARAM *winMESH_PARAM = new MESH_PARAM(this);
1137 1142  
1138 1143 winMESH_PARAM->TextCtrl1->Disable();
  1144 + winMESH_PARAM->TextCtrl3->Disable();
  1145 + winMESH_PARAM->TextCtrl4->Disable();
1139 1146  
1140 1147 if ( winMESH_PARAM->ShowModal() == wxID_OK )
1141 1148 {
1142   - MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
  1149 + //MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
1143 1150 MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue();
  1151 + //MESH_PARAM3 = winMESH_PARAM->TextCtrl3->GetValue();
1144 1152 }
1145 1153 winMESH_PARAM->Destroy();
1146 1154 }
... ... @@ -1189,3 +1197,8 @@ void TP::OnCheckBox4Click(wxCommandEvent&amp; event)
1189 1197  
1190 1198  
1191 1199 }
  1200 +
  1201 +void TP::EditExistingCable()
  1202 +{
  1203 + Close();
  1204 +}
... ...
GUI/SW1/SRC/TP.h
  Diff comments   View file @dd86ff4
... ... @@ -85,6 +85,9 @@ class TP: public wxDialog
85 85  
86 86 void WriteCableFile(wxString);
87 87  
  88 + void EditExistingCable();
  89 + bool EDIT_EXISTING;
  90 +
88 91 void tpSchematic();
89 92 void OnHighlightSchematic(wxCommandEvent & event);
90 93  
... ... @@ -98,6 +101,7 @@ class TP: public wxDialog
98 101 wxString FD_ESR8;
99 102 wxString FD_ESR9;
100 103 wxString FD_ESR10;
  104 + bool FD_Default;
101 105  
102 106 wxString FD_ORDER;
103 107 bool FD_log;
... ... @@ -108,6 +112,8 @@ class TP: public wxDialog
108 112  
109 113 wxString MESH_PARAM1;
110 114 wxString MESH_PARAM2;
  115 + wxString MESH_PARAM3;
  116 + wxString MESH_PARAM4;
111 117  
112 118  
113 119 //(*Declarations(TP)
... ... @@ -271,6 +277,7 @@ class TP: public wxDialog
271 277 void OnTextCtrl17Text(wxCommandEvent& event);
272 278 void OnTextCtrl18Text(wxCommandEvent& event);
273 279 void OnCheckBox4Click(wxCommandEvent& event);
  280 + void OnPaint(wxPaintEvent& event);
274 281 //*)
275 282  
276 283 DECLARE_EVENT_TABLE()
... ...
GUI/SW1/SRC/TWINAX.cpp
  Diff comments   View file @dd86ff4
... ... @@ -334,6 +334,7 @@ TWINAX::TWINAX(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; s
334 334 Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&TWINAX::OnButton2Click);
335 335 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPanel1Paint,0,this);
336 336 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&TWINAX::OnPanel1LeftDClick,0,this);
  337 + Connect(wxEVT_PAINT,(wxObjectEventFunction)&TWINAX::OnPaint);
337 338 //*)
338 339  
339 340 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&TWINAX::OnHighlightSchematic, this);
... ... @@ -355,6 +356,11 @@ TWINAX::~TWINAX()
355 356 //*)
356 357 }
357 358  
  359 +void TWINAX::OnPaint(wxPaintEvent& event)
  360 +{
  361 + if (EDIT_EXISTING==true) EditExistingCable();
  362 +}
  363 +
358 364 void TWINAX::SetPathToMOD(wxString Path, wxString Name)
359 365 {
360 366  
... ... @@ -442,45 +448,36 @@ void TWINAX::OnButton3Click(wxCommandEvent&amp; event)
442 448 RUN_STATUS *run_status = new RUN_STATUS(this);
443 449 run_status->ShowModal();
444 450  
445   - Button1->Enable();
  451 + //Button1->Enable();
446 452  
447   - if (CheckBox2->GetValue()){
448   - // Identify all mesh files for viewing
449   - //struct _finddata_t fileinfo;
450   - //long hFile;
451   - //wxString meshFileName = "*.msh.vtk";
452   - wxString pattern = "*.msh.vtk";
  453 + if (CheckBox2->GetValue())
  454 + {
  455 +
  456 + wxString pattern (("*.msh.vtk")) ;
453 457  
454   - //wxString pattern((meshFileName));
455 458 wxString file;
456 459  
457 460 ComboBox1->Clear();
458 461  
459 462 file = wxFindFirstFile(pattern);
  463 +
460 464 while ( !file.empty())
461 465 {
462 466 wxString meshfile = file;
463   - size_t extindex = meshfile.find_first_of (".");
  467 + size_t extindex = meshfile.find_last_of (".");
464 468  
465 469 meshfile = meshfile.substr(0, extindex);
466 470  
  471 + extindex = meshfile.find_last_of (".");
  472 +
  473 + meshfile = meshfile.substr(0, extindex);
  474 +
  475 + meshfile = meshfile.substr(2,meshfile.length());
  476 +
467 477 ComboBox1->Append(meshfile);
468   - }
469 478  
470   -// if (( hFile = _findfirst( pattern, &fileinfo )) != -1 )
471   -// {
472   -// do
473   -// {
474   -// wxString meshfile = fileinfo.name;
475   -// size_t extindex = meshfile.find_first_of (".");
476   -//
477   -// meshfile = meshfile.substr(0, extindex);
478   -//
479   -// ComboBox1->Append(meshfile);
480   -//
481   -// } while ( _findnext( hFile, &fileinfo) == 0);
482   -// }
483   -// _findclose( hFile);
  479 + file = wxFindNextFile();
  480 + }
484 481  
485 482 CheckBox3->Enable();
486 483 }
... ... @@ -511,6 +508,8 @@ void TWINAX::OnCheckBox1Click(wxCommandEvent&amp; event)
511 508 FD_ESR9 = winFD_ESR->TextCtrl9->GetValue();
512 509 FD_ESR10= winFD_ESR->TextCtrl10->GetValue();
513 510  
  511 +
  512 + FD_Default = winFD_ESR->CheckBox1->GetValue();
514 513 FD_ORDER = winFD_ESR->TextCtrl11->GetValue();
515 514 FD_lin = winFD_ESR->RadioButton1->GetValue();
516 515 FD_Fmin = winFD_ESR->TextCtrl12->GetValue();
... ... @@ -769,7 +768,7 @@ void TWINAX::WriteCableFile (wxString fileName)
769 768 cableFile << "1 # list of denominator coefficients b0 b1 b2... \n";
770 769 }
771 770  
772   - if (CheckBox1->GetValue()){
  771 + if (!FD_Default){
773 772  
774 773 cableFile << FD_ORDER <<"\t # order for filter fitting\n";
775 774 if (FD_lin)
... ... @@ -780,7 +779,7 @@ void TWINAX::WriteCableFile (wxString fileName)
780 779 {
781 780 cableFile << "log # frequency range type for filter fitting type (lin or dB)\n";
782 781 }
783   - cableFile << FD_Fmin <<" "<< FD_Fmax <<" "<< FD_ORDER <<"\t # fmin fmax number_of_frequencies for filter fitting";
  782 + cableFile << FD_Fmin <<" "<< FD_Fmax <<" "<< FD_Num <<"\t # fmin fmax number_of_frequencies for filter fitting\n";
784 783 }
785 784  
786 785 if (CheckBox2->GetValue()){
... ... @@ -792,10 +791,12 @@ void TWINAX::WriteCableFile (wxString fileName)
792 791  
793 792 if (CheckBox3->GetValue())
794 793 {
795   - cableFile << "Laplace_boundary_constant\n";
796   - cableFile << MESH_PARAM1 <<"\n";
  794 + //cableFile << "Laplace_boundary_constant\n";
  795 + //cableFile << MESH_PARAM1 <<"\n";
797 796 cableFile << "Laplace_surface_mesh_constant\n";
798 797 cableFile << MESH_PARAM2 <<"\n";
  798 + //cableFile << "max_mesh_edge_length\n";
  799 + //cableFile << MESH_PARAM3 <<"\n";
799 800  
800 801 CheckBox3 ->SetValue(false);
801 802 }
... ... @@ -1135,11 +1136,14 @@ void TWINAX::OnCheckBox3Click(wxCommandEvent&amp; event)
1135 1136 MESH_PARAM *winMESH_PARAM = new MESH_PARAM(this);
1136 1137  
1137 1138 winMESH_PARAM->TextCtrl1->Disable();
  1139 + winMESH_PARAM->TextCtrl3->Disable();
  1140 + winMESH_PARAM->TextCtrl4->Disable();
1138 1141  
1139 1142 if ( winMESH_PARAM->ShowModal() == wxID_OK )
1140 1143 {
1141   - MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
  1144 + //MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
1142 1145 MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue();
  1146 + //MESH_PARAM3 = winMESH_PARAM->TextCtrl3->GetValue();
1143 1147 }
1144 1148 winMESH_PARAM->Destroy();
1145 1149 }
... ... @@ -1171,3 +1175,10 @@ void TWINAX::OnCheckBox4Click(wxCommandEvent&amp; event)
1171 1175 }
1172 1176  
1173 1177 }
  1178 +
  1179 +void TWINAX::EditExistingCable()
  1180 +{
  1181 + Close();
  1182 +}
  1183 +
  1184 +
... ...
GUI/SW1/SRC/TWINAX.h
  Diff comments   View file @dd86ff4
... ... @@ -85,6 +85,9 @@ class TWINAX: public wxDialog
85 85  
86 86 void WriteCableFile(wxString);
87 87  
  88 + void EditExistingCable();
  89 + bool EDIT_EXISTING;
  90 +
88 91 void twinaxSchematic();
89 92 void OnHighlightSchematic(wxCommandEvent & event);
90 93  
... ... @@ -98,6 +101,7 @@ class TWINAX: public wxDialog
98 101 wxString FD_ESR8;
99 102 wxString FD_ESR9;
100 103 wxString FD_ESR10;
  104 + bool FD_Default;
101 105  
102 106 wxString FD_ORDER;
103 107 bool FD_log;
... ... @@ -108,6 +112,8 @@ class TWINAX: public wxDialog
108 112  
109 113 wxString MESH_PARAM1;
110 114 wxString MESH_PARAM2;
  115 + wxString MESH_PARAM3;
  116 + wxString MESH_PARAM4;
111 117  
112 118 //(*Declarations(TWINAX)
113 119 wxStaticText* StaticText10;
... ... @@ -271,6 +277,7 @@ class TWINAX: public wxDialog
271 277 void OnTextCtrl17Text(wxCommandEvent& event);
272 278 void OnTextCtrl18Text(wxCommandEvent& event);
273 279 void OnCheckBox4Click(wxCommandEvent& event);
  280 + void OnPaint(wxPaintEvent& event);
274 281 //*)
275 282  
276 283 DECLARE_EVENT_TABLE()
... ...
GUI/SW1/SRC/UTP.cpp
  Diff comments   View file @dd86ff4
... ... @@ -207,6 +207,7 @@ UTP::UTP(wxWindow* parent,wxWindowID id,const wxPoint&amp; pos,const wxSize&amp; size)
207 207 Panel1->Connect(wxEVT_PAINT,(wxObjectEventFunction)&UTP::OnPanel1Paint,0,this);
208 208 Panel1->Connect(wxEVT_LEFT_DCLICK,(wxObjectEventFunction)&UTP::OnPanel1LeftDClick,0,this);
209 209 Panel1->Connect(wxEVT_MOUSEWHEEL,(wxObjectEventFunction)&UTP::OnPanel1MouseWheel,0,this);
  210 + Connect(wxEVT_PAINT,(wxObjectEventFunction)&UTP::OnPaint);
210 211 //*)
211 212  
212 213 TextCtrl2->Bind(wxEVT_SET_FOCUS,(wxObjectEventFunction)&UTP::OnHighlightSchematic, this);
... ... @@ -228,6 +229,11 @@ UTP::~UTP()
228 229 //*)
229 230 }
230 231  
  232 +void UTP::OnPaint(wxPaintEvent& event)
  233 +{
  234 + if (EDIT_EXISTING==true) EditExistingCable();
  235 +}
  236 +
231 237 void UTP::SetPathToMOD(wxString Path, wxString Name)
232 238 {
233 239 pathToMOD << Path;
... ... @@ -293,6 +299,8 @@ void UTP::OnCheckBox1Click(wxCommandEvent&amp; event)
293 299  
294 300 FD_ESR *winFD_ESR = new FD_ESR(this);
295 301  
  302 + //winFD_ESR->formtype = 1;
  303 +
296 304 if ( winFD_ESR->ShowModal() == wxID_OK )
297 305 {
298 306 // FD_ESR1 = winFD_ESR->TextCtrl1->GetValue();
... ... @@ -307,6 +315,8 @@ void UTP::OnCheckBox1Click(wxCommandEvent&amp; event)
307 315 FD_ESR9 = winFD_ESR->TextCtrl9->GetValue();
308 316 FD_ESR10= winFD_ESR->TextCtrl10->GetValue();
309 317  
  318 + FD_Default = winFD_ESR->CheckBox1->GetValue();
  319 +
310 320 FD_ORDER = winFD_ESR->TextCtrl11->GetValue();
311 321 FD_lin = winFD_ESR->RadioButton1->GetValue();
312 322 FD_Fmin = winFD_ESR->TextCtrl12->GetValue();
... ... @@ -345,41 +355,32 @@ void UTP::OnButton2Click(wxCommandEvent&amp; event)
345 355  
346 356 if (CheckBox2->GetValue())
347 357 {
348   - // Identify all mesh files for viewing
349   - //struct _finddata_t fileinfo;
350   - //long hFile;
351   - //wxString meshFileName = "*.msh.vtk";
352   - wxString pattern = "*.msh.vtk";
353   - //wxString pattern((meshFileName));
  358 +
  359 + wxString pattern (("*.msh.vtk")) ;
  360 +
354 361 wxString file;
355 362  
356 363 ComboBox1->Clear();
357 364  
358 365 file = wxFindFirstFile(pattern);
  366 +
359 367 while ( !file.empty())
360 368 {
361 369 wxString meshfile = file;
362   - size_t extindex = meshfile.find_first_of (".");
  370 + size_t extindex = meshfile.find_last_of (".");
  371 +
  372 + meshfile = meshfile.substr(0, extindex);
  373 +
  374 + extindex = meshfile.find_last_of (".");
363 375  
364 376 meshfile = meshfile.substr(0, extindex);
365 377  
  378 + meshfile = meshfile.substr(2,meshfile.length());
  379 +
366 380 ComboBox1->Append(meshfile);
367   - }
368 381  
369   -// if (( hFile = _findfirst( pattern, &fileinfo )) != -1 )
370   -// {
371   -// do
372   -// {
373   -// wxString meshfile = fileinfo.name;
374   -// size_t extindex = meshfile.find_first_of (".");
375   -//
376   -// meshfile = meshfile.substr(0, extindex);
377   -//
378   -// ComboBox1->Append(meshfile);
379   -//
380   -// } while ( _findnext( hFile, &fileinfo) == 0);
381   -// }
382   -// _findclose( hFile);
  382 + file = wxFindNextFile();
  383 + }
383 384  
384 385 CheckBox3->Enable();
385 386 }
... ... @@ -524,18 +525,18 @@ void UTP::WriteCableFile (wxString fileName)
524 525 }
525 526 }
526 527  
527   - if (CheckBox1->GetValue()){
  528 + if (!FD_Default){
528 529  
529 530 cableFile << FD_ORDER <<"\t # order for filter fitting\n";
530 531 if (FD_lin)
531 532 {
532   - cableFile << "lin # frequency range type for filter fitting type (lin or dB)";
  533 + cableFile << "lin # frequency range type for filter fitting type (lin or dB)\n";
533 534 }
534 535 else
535 536 {
536   - cableFile << "log # frequency range type for filter fitting type (lin or dB)";
  537 + cableFile << "log # frequency range type for filter fitting type (lin or dB)\n";
537 538 }
538   - cableFile << FD_Fmin <<" "<< FD_Fmax <<" "<< FD_ORDER <<"\t # fmin fmax number_of_frequencies for filter fitting";
  539 + cableFile << FD_Fmin <<" "<< FD_Fmax <<" "<< FD_Num <<"\t # fmin fmax number_of_frequencies for filter fitting\n";
539 540 }
540 541  
541 542 if (CheckBox2->GetValue())
... ... @@ -550,10 +551,12 @@ void UTP::WriteCableFile (wxString fileName)
550 551  
551 552 if (CheckBox3->GetValue())
552 553 {
553   - cableFile << "Laplace_boundary_constant\n";
554   - cableFile << MESH_PARAM1 <<"\n";
555   - cableFile << "Laplace_surface_mesh_constant\n";
  554 + //cableFile << "laplace_boundary_constant\n";
  555 + //cableFile << MESH_PARAM1 <<"\n";
  556 + cableFile << "laplace_surface_mesh_constant\n";
556 557 cableFile << MESH_PARAM2 <<"\n";
  558 + //cableFile << "max_mesh_edge_length\n";
  559 + //cableFile << MESH_PARAM3 <<"\n";
557 560  
558 561 CheckBox3 ->SetValue(false);
559 562 }
... ... @@ -721,10 +724,15 @@ void UTP::OnCheckBox3Click(wxCommandEvent&amp; event)
721 724 {
722 725 MESH_PARAM *winMESH_PARAM = new MESH_PARAM(this);
723 726  
  727 + winMESH_PARAM->TextCtrl1->Disable();
  728 + winMESH_PARAM->TextCtrl3->Disable();
  729 + winMESH_PARAM->TextCtrl4->Disable();
  730 +
724 731 if ( winMESH_PARAM->ShowModal() == wxID_OK )
725 732 {
726   - MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
  733 + //MESH_PARAM1 = winMESH_PARAM->TextCtrl1->GetValue();
727 734 MESH_PARAM2 = winMESH_PARAM->TextCtrl2->GetValue();
  735 + //MESH_PARAM3 = winMESH_PARAM->TextCtrl3->GetValue();
728 736 }
729 737 winMESH_PARAM->Destroy();
730 738 }
... ... @@ -746,3 +754,9 @@ void UTP::OnComboBox1Selected(wxCommandEvent&amp; event)
746 754 meshToView<<ComboBox1->GetValue();
747 755 draw_mesh(Panel1,meshToView);
748 756 }
  757 +
  758 +void UTP::EditExistingCable()
  759 +{
  760 + Close();
  761 +}
  762 +
... ...
GUI/SW1/SRC/UTP.h
  Diff comments   View file @dd86ff4
... ... @@ -86,6 +86,9 @@ class UTP: public wxDialog
86 86  
87 87 void WriteCableFile(wxString);
88 88  
  89 + void EditExistingCable();
  90 + bool EDIT_EXISTING;
  91 +
89 92 void utpSchematic();
90 93 void OnHighlightSchematic(wxCommandEvent & event);
91 94  
... ... @@ -99,6 +102,7 @@ class UTP: public wxDialog
99 102 wxString FD_ESR8;
100 103 wxString FD_ESR9;
101 104 wxString FD_ESR10;
  105 + bool FD_Default;
102 106  
103 107 wxString FD_ORDER;
104 108 bool FD_log;
... ... @@ -109,6 +113,7 @@ class UTP: public wxDialog
109 113  
110 114 wxString MESH_PARAM1;
111 115 wxString MESH_PARAM2;
  116 + wxString MESH_PARAM3;
112 117  
113 118 //(*Declarations(UTP)
114 119 wxTextCtrl* TextCtrl4;
... ... @@ -199,6 +204,7 @@ class UTP: public wxDialog
199 204 void OnCheckBox3Click(wxCommandEvent& event);
200 205 void OnPanel1MouseWheel(wxMouseEvent& event);
201 206 void OnComboBox1Selected(wxCommandEvent& event);
  207 + void OnPaint(wxPaintEvent& event);
202 208 //*)
203 209  
204 210 DECLARE_EVENT_TABLE()
... ...