diff --git a/GUI/SW1/SRC/ABOUT.cpp b/GUI/SW1/SRC/ABOUT.cpp index 7fcc166..8efb36d 100644 --- a/GUI/SW1/SRC/ABOUT.cpp +++ b/GUI/SW1/SRC/ABOUT.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software @@ -133,7 +133,7 @@ void ABOUT::DisplayBuildFile() if (BuildFile.Open(BuildFileName)) { - for (int i = 1; i<4; i++) + for (int i = 0; i<8; i++) { text = text + BuildFile[i]; diff --git a/GUI/SW1/SRC/ABOUT.h b/GUI/SW1/SRC/ABOUT.h index 2f4394e..a231ab3 100644 --- a/GUI/SW1/SRC/ABOUT.h +++ b/GUI/SW1/SRC/ABOUT.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/BUNDLEBLDR.cpp b/GUI/SW1/SRC/BUNDLEBLDR.cpp index 8e333ce..952bb11 100644 --- a/GUI/SW1/SRC/BUNDLEBLDR.cpp +++ b/GUI/SW1/SRC/BUNDLEBLDR.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/BUNDLE_SCHEMATIC.cpp b/GUI/SW1/SRC/BUNDLE_SCHEMATIC.cpp index 9f95ae9..ee8288e 100644 --- a/GUI/SW1/SRC/BUNDLE_SCHEMATIC.cpp +++ b/GUI/SW1/SRC/BUNDLE_SCHEMATIC.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/CABLE_SCHEMATIC.cpp b/GUI/SW1/SRC/CABLE_SCHEMATIC.cpp index 8b0b0fe..2c5a9dc 100644 --- a/GUI/SW1/SRC/CABLE_SCHEMATIC.cpp +++ b/GUI/SW1/SRC/CABLE_SCHEMATIC.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/CABLE_SCHEMATIC.h b/GUI/SW1/SRC/CABLE_SCHEMATIC.h index 64c7e2b..eee0969 100644 --- a/GUI/SW1/SRC/CABLE_SCHEMATIC.h +++ b/GUI/SW1/SRC/CABLE_SCHEMATIC.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/EXPORT_SPICE.cpp b/GUI/SW1/SRC/EXPORT_SPICE.cpp index e14cc0b..80b3437 100644 --- a/GUI/SW1/SRC/EXPORT_SPICE.cpp +++ b/GUI/SW1/SRC/EXPORT_SPICE.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/EXPORT_SPICE.h b/GUI/SW1/SRC/EXPORT_SPICE.h index 31c7dfa..98c01d5 100644 --- a/GUI/SW1/SRC/EXPORT_SPICE.h +++ b/GUI/SW1/SRC/EXPORT_SPICE.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/FD_ESR.cpp b/GUI/SW1/SRC/FD_ESR.cpp index 9b4e501..b50c24c 100644 --- a/GUI/SW1/SRC/FD_ESR.cpp +++ b/GUI/SW1/SRC/FD_ESR.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/FD_ESR.h b/GUI/SW1/SRC/FD_ESR.h index 8255d76..43e16f7 100644 --- a/GUI/SW1/SRC/FD_ESR.h +++ b/GUI/SW1/SRC/FD_ESR.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/FD_ESR_SW.cpp b/GUI/SW1/SRC/FD_ESR_SW.cpp index 1b11f84..3f6fef5 100644 --- a/GUI/SW1/SRC/FD_ESR_SW.cpp +++ b/GUI/SW1/SRC/FD_ESR_SW.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/FD_ESR_SW.h b/GUI/SW1/SRC/FD_ESR_SW.h index 685eeee..75d3ff5 100644 --- a/GUI/SW1/SRC/FD_ESR_SW.h +++ b/GUI/SW1/SRC/FD_ESR_SW.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/FLEXCABLE.cpp b/GUI/SW1/SRC/FLEXCABLE.cpp index dee02dd..169b69a 100644 --- a/GUI/SW1/SRC/FLEXCABLE.cpp +++ b/GUI/SW1/SRC/FLEXCABLE.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/FLEXCABLE.h b/GUI/SW1/SRC/FLEXCABLE.h index dd516fc..f822d75 100644 --- a/GUI/SW1/SRC/FLEXCABLE.h +++ b/GUI/SW1/SRC/FLEXCABLE.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/MESH_LAPLACE.cpp b/GUI/SW1/SRC/MESH_LAPLACE.cpp index 0372e3e..d88ff0b 100644 --- a/GUI/SW1/SRC/MESH_LAPLACE.cpp +++ b/GUI/SW1/SRC/MESH_LAPLACE.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software @@ -104,7 +104,7 @@ void draw_mesh(wxPanel *Panel, wxString mesh_to_draw) if (xmax-xmin > ymax-ymin) scale = size_h/(xmax-xmin); - else scale = 5.0*(size_v/(ymax-ymin));//0.75*(size_v/(ymax-ymin)); + else scale = 0.75*(size_v/(ymax-ymin)); dc.SetPen( wxPen( *wxBLUE)); diff --git a/GUI/SW1/SRC/MESH_LAPLACE.h b/GUI/SW1/SRC/MESH_LAPLACE.h index f3eb889..28cbe4f 100644 --- a/GUI/SW1/SRC/MESH_LAPLACE.h +++ b/GUI/SW1/SRC/MESH_LAPLACE.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/PLACE_CABLE.cpp b/GUI/SW1/SRC/PLACE_CABLE.cpp index fdb4b77..37d9659 100644 --- a/GUI/SW1/SRC/PLACE_CABLE.cpp +++ b/GUI/SW1/SRC/PLACE_CABLE.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/PLACE_CABLE.h b/GUI/SW1/SRC/PLACE_CABLE.h index c5278f6..7154db2 100644 --- a/GUI/SW1/SRC/PLACE_CABLE.h +++ b/GUI/SW1/SRC/PLACE_CABLE.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/RUN_STATUS.cpp b/GUI/SW1/SRC/RUN_STATUS.cpp index 2b477da..e112050 100644 --- a/GUI/SW1/SRC/RUN_STATUS.cpp +++ b/GUI/SW1/SRC/RUN_STATUS.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/RUN_STATUS.h b/GUI/SW1/SRC/RUN_STATUS.h index 29aa305..f1c1124 100644 --- a/GUI/SW1/SRC/RUN_STATUS.h +++ b/GUI/SW1/SRC/RUN_STATUS.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/SPICEMODEL.h b/GUI/SW1/SRC/SPICEMODEL.h index a587c28..f153fcd 100644 --- a/GUI/SW1/SRC/SPICEMODEL.h +++ b/GUI/SW1/SRC/SPICEMODEL.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/SW1_GUIApp.cpp b/GUI/SW1/SRC/SW1_GUIApp.cpp index 65664c3..a5b2c59 100644 --- a/GUI/SW1/SRC/SW1_GUIApp.cpp +++ b/GUI/SW1/SRC/SW1_GUIApp.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/SW1_GUIApp.h b/GUI/SW1/SRC/SW1_GUIApp.h index 86fd922..ce819b2 100644 --- a/GUI/SW1/SRC/SW1_GUIApp.h +++ b/GUI/SW1/SRC/SW1_GUIApp.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/SW1_GUIMain.cpp b/GUI/SW1/SRC/SW1_GUIMain.cpp index a65b2ec..419f8d1 100644 --- a/GUI/SW1/SRC/SW1_GUIMain.cpp +++ b/GUI/SW1/SRC/SW1_GUIMain.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/SW1_GUIMain.h b/GUI/SW1/SRC/SW1_GUIMain.h index 8750caf..7309a93 100644 --- a/GUI/SW1/SRC/SW1_GUIMain.h +++ b/GUI/SW1/SRC/SW1_GUIMain.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/UTILITIES.cpp b/GUI/SW1/SRC/UTILITIES.cpp index 1d85476..c8674d1 100644 --- a/GUI/SW1/SRC/UTILITIES.cpp +++ b/GUI/SW1/SRC/UTILITIES.cpp @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/UTILITIES.h b/GUI/SW1/SRC/UTILITIES.h index f229e79..210b11c 100644 --- a/GUI/SW1/SRC/UTILITIES.h +++ b/GUI/SW1/SRC/UTILITIES.h @@ -4,7 +4,7 @@ // It was developed by the University of Nottingham and the Netherlands Aerospace // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. // -// Copyright (C) 2015 - 2017 University of Nottingham +// Copyright (C) 2015 - 2018 University of Nottingham // // SACAMOS is free software: you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software diff --git a/GUI/SW1/SRC/resources/Build b/GUI/SW1/SRC/resources/Build index ad3d4db..6d66754 100644 --- a/GUI/SW1/SRC/resources/Build +++ b/GUI/SW1/SRC/resources/Build @@ -1,25 +1,26 @@ -cable_bundle_model_builder:Started - Version :v2.1.0 - Date :24th February 2017 - Compilation date:Wed Mar 1 20:36:00 GMTST 2017 - - This software is part of SACAMOS, State of the Art CAble MOdels in Spice. - It was developed by the University of Nottingham and the Netherlands Aerospace - Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. +GUI: +Version: 1.4.0 +Date: 13th August 2018 + +SPICE_CABLE_MODEL_BUILDER +Version: v4.0.0 +Date: 19th June 2018 + +This software is part of SACAMOS, State of the Art CAble MOdels in Spice. +It was developed by the University of Nottingham and the Netherlands Aerospace +Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. - Copyright (C) 2016 University of Nottingham +Copyright (C) 2016 - 2018 University of Nottingham - SACAMOS is free software: you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation, either version 3 of the License, or (at your option) any later - version. +SACAMOS is free software: you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation, either version 3 of the License, or (at your option) any later +version. - SACAMOS is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. +SACAMOS is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. - A copy of the GNU General Public License version 3 can be found in the - file GNU_GPL_v3 in the root or at . - -cable_bundle_model_builder:ERROR Cannot find the file:--version.bundle_spec +A copy of the GNU General Public License version 3 can be found in the +file GNU_GPL_v3 in the root or at . diff --git a/GUI/SW1/SRC/resources/License b/GUI/SW1/SRC/resources/License index 4c01437..f0b375d 100644 --- a/GUI/SW1/SRC/resources/License +++ b/GUI/SW1/SRC/resources/License @@ -1,6 +1,6 @@ This file is part of SACAMOS, State of the Art CAble MOdels in Spice. It was developed by the University of Nottingham and the Netherlands Aerospace Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. -Copyright (C) 2016 University of Nottingham +Copyright (C) 2016 - 2018 The University of Nottingham SACAMOS is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -- libgit2 0.21.2