UoN / SACAMOS

Commit 7ba34678f72030151877a84d9b1f357804ad4322

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

Update Copyright Info in Headers 

Update Copyright Info in Headers
Showing 29 changed files with 52 additions and 51 deletions   Show diff stats
Inline Side-by-side
GUI/SW1/SRC/ABOUT.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ... @@ -133,7 +133,7 @@ void ABOUT::DisplayBuildFile()
133 133  
134 134 if (BuildFile.Open(BuildFileName))
135 135 {
136   - for (int i = 1; i<4; i++)
  136 + for (int i = 0; i<8; i++)
137 137 {
138 138 text = text + BuildFile[i];
139 139  
... ...
GUI/SW1/SRC/ABOUT.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/BUNDLEBLDR.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/BUNDLE_SCHEMATIC.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/CABLE_SCHEMATIC.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/CABLE_SCHEMATIC.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/EXPORT_SPICE.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/EXPORT_SPICE.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/FD_ESR.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/FD_ESR.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/FD_ESR_SW.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/FD_ESR_SW.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/FLEXCABLE.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/FLEXCABLE.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/MESH_LAPLACE.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // 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)
104 104  
105 105 if (xmax-xmin > ymax-ymin) scale = size_h/(xmax-xmin);
106 106  
107   - else scale = 5.0*(size_v/(ymax-ymin));//0.75*(size_v/(ymax-ymin));
  107 + else scale = 0.75*(size_v/(ymax-ymin));
108 108  
109 109 dc.SetPen( wxPen( *wxBLUE));
110 110  
... ...
GUI/SW1/SRC/MESH_LAPLACE.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/PLACE_CABLE.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/PLACE_CABLE.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/RUN_STATUS.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/RUN_STATUS.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/SPICEMODEL.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/SW1_GUIApp.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/SW1_GUIApp.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/SW1_GUIMain.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/SW1_GUIMain.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/UTILITIES.cpp
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/UTILITIES.h
  Diff comments   View file @7ba3467
... ... @@ -4,7 +4,7 @@
4 4 // It was developed by the University of Nottingham and the Netherlands Aerospace
5 5 // Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
6 6 //
7   -// Copyright (C) 2015 - 2017 University of Nottingham
  7 +// Copyright (C) 2015 - 2018 University of Nottingham
8 8 //
9 9 // SACAMOS is free software: you can redistribute it and/or modify it under the
10 10 // terms of the GNU General Public License as published by the Free Software
... ...
GUI/SW1/SRC/resources/Build
  Diff comments   View file @7ba3467
1   -cable_bundle_model_builder:Started
2   - Version :v2.1.0
3   - Date :24th February 2017
4   - Compilation date:Wed Mar 1 20:36:00 GMTST 2017
5   -
6   - This software is part of SACAMOS, State of the Art CAble MOdels in Spice.
7   - It was developed by the University of Nottingham and the Netherlands Aerospace
8   - Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
  1 +GUI:
  2 +Version: 1.4.0
  3 +Date: 13th August 2018
  4 +
  5 +SPICE_CABLE_MODEL_BUILDER
  6 +Version: v4.0.0
  7 +Date: 19th June 2018
  8 +
  9 +This software is part of SACAMOS, State of the Art CAble MOdels in Spice.
  10 +It was developed by the University of Nottingham and the Netherlands Aerospace
  11 +Centre (NLR) for ESA under contract number 4000112765/14/NL/HK.
9 12  
10   - Copyright (C) 2016 University of Nottingham
  13 +Copyright (C) 2016 - 2018 University of Nottingham
11 14  
12   - SACAMOS is free software: you can redistribute it and/or modify it under the
13   - terms of the GNU General Public License as published by the Free Software
14   - Foundation, either version 3 of the License, or (at your option) any later
15   - version.
  15 +SACAMOS is free software: you can redistribute it and/or modify it under the
  16 +terms of the GNU General Public License as published by the Free Software
  17 +Foundation, either version 3 of the License, or (at your option) any later
  18 +version.
16 19  
17   - SACAMOS is distributed in the hope that it will be useful, but
18   - WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
19   - or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
20   - for more details.
  20 +SACAMOS is distributed in the hope that it will be useful, but
  21 +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  22 +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  23 +for more details.
21 24  
22   - A copy of the GNU General Public License version 3 can be found in the
23   - file GNU_GPL_v3 in the root or at <http://www.gnu.org/licenses/>.
24   -
25   -cable_bundle_model_builder:ERROR Cannot find the file:--version.bundle_spec
  25 +A copy of the GNU General Public License version 3 can be found in the
  26 +file GNU_GPL_v3 in the root or at <http://www.gnu.org/licenses/>.
... ...
GUI/SW1/SRC/resources/License
  Diff comments   View file @7ba3467
1 1 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.
2 2  
3   -Copyright (C) 2016 University of Nottingham
  3 +Copyright (C) 2016 - 2018 The University of Nottingham
4 4  
5 5 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.
6 6  
... ...