From 370b866e9d0cf7d3ad7265468cf2874894f67499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Rodr=C3=ADguez=20Pearson?= Date: Wed, 19 Apr 2017 19:51:20 +0200 Subject: [PATCH] Fix UsersGuide package The UsersGuide package had some classes stored in folders and some in a single-file format. This has been fixed. Release notes for 0.6.1 have also been added, in preparation for release. --- PVSystems/UsersGuide/Contact.mo | 35 ++++++++++ PVSystems/UsersGuide/License.mo | 27 +++++++- PVSystems/UsersGuide/References/EMA16.mo | 2 +- .../UsersGuide/ReleaseNotes/Version_0_6_0.mo | 28 ++++++++ .../UsersGuide/ReleaseNotes/Version_0_6_1.mo | 67 +++++++++++++++++++ PVSystems/UsersGuide/ReleaseNotes/package.mo | 27 -------- .../UsersGuide/ReleaseNotes/package.order | 1 + PVSystems/UsersGuide/package.mo | 36 +--------- PVSystems/package.mo | 8 ++- 9 files changed, 164 insertions(+), 67 deletions(-) create mode 100644 PVSystems/UsersGuide/Contact.mo create mode 100644 PVSystems/UsersGuide/ReleaseNotes/Version_0_6_0.mo create mode 100644 PVSystems/UsersGuide/ReleaseNotes/Version_0_6_1.mo diff --git a/PVSystems/UsersGuide/Contact.mo b/PVSystems/UsersGuide/Contact.mo new file mode 100644 index 0000000..f47bbeb --- /dev/null +++ b/PVSystems/UsersGuide/Contact.mo @@ -0,0 +1,35 @@ +within PVSystems.UsersGuide; +class Contact "Contact" + extends Modelica.Icons.Contact; + annotation (Documentation(info=" +

+ Copyright (c) 2016-2017 Raúl Rodríguez Pearson +

+ +

+ If you have any questions, comments, suggestions, ideas or + feature requests, please do share those as well as + any mistakes or bugs you might discover. You can + open an issue in + the Issues + section of the repository or, if you prefer, contact the + author + by email. Contributions + in the form + of Pull + Requests are always welcome. +

+ +

+ The library is the result of a research project carried out in the + form of a master's degree thesis under the supervision + of Dr. Alfonso + Urquía from + the Research group on + Modelling & Simulation in Control Engineering, part of + the Department of Computer + Science & Automatic Control + at Universidad + Nacional de Educación a Distancia.

+ ")); +end Contact; diff --git a/PVSystems/UsersGuide/License.mo b/PVSystems/UsersGuide/License.mo index 2d5e57d..29b5ee1 100644 --- a/PVSystems/UsersGuide/License.mo +++ b/PVSystems/UsersGuide/License.mo @@ -1,6 +1,5 @@ within PVSystems.UsersGuide; class License "License" - extends Modelica.Icons.Information; annotation (Documentation(info="

MIT License @@ -35,5 +34,29 @@ class License "License" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- ")); + "), Icon(graphics={ + Line(points={{-60,60},{60,60}}, color={95,95,95}), + Line(points={{0,60},{0,-60}}, color={95,95,95}), + Line(points={{-60,-60},{60,-60}}, color={95,95,95}), + Ellipse( + extent={{-10,70},{10,50}}, + lineColor={95,95,95}, + fillColor={175,175,175}, + fillPattern=FillPattern.Solid), + Ellipse( + extent={{-90,-10},{-30,-50}}, + lineColor={95,95,95}, + fillColor={175,175,175}, + fillPattern=FillPattern.Solid, + startAngle=0, + endAngle=180), + Ellipse( + extent={{30,-10},{90,-50}}, + lineColor={95,95,95}, + fillColor={175,175,175}, + fillPattern=FillPattern.Solid, + startAngle=0, + endAngle=180), + Line(points={{-90,-10},{-60,60},{-30,-10}}, color={95,95,95}), + Line(points={{30,-10},{60,60},{90,-10}}, color={95,95,95})})); end License; diff --git a/PVSystems/UsersGuide/References/EMA16.mo b/PVSystems/UsersGuide/References/EMA16.mo index 2da7752..1c574df 100644 --- a/PVSystems/UsersGuide/References/EMA16.mo +++ b/PVSystems/UsersGuide/References/EMA16.mo @@ -1,7 +1,7 @@ within PVSystems.UsersGuide.References; class EMA16 "R. W. Erickson, D. Maksimović and K. Afridi, - Power Electronics Specialization<\\i> at Coursera. + Power Electronics Specialization at Coursera. University of Colorado Boulder, 2016." extends Modelica.Icons.References; annotation (preferredView="info", DocumentationClass=false); diff --git a/PVSystems/UsersGuide/ReleaseNotes/Version_0_6_0.mo b/PVSystems/UsersGuide/ReleaseNotes/Version_0_6_0.mo new file mode 100644 index 0000000..c3de5fa --- /dev/null +++ b/PVSystems/UsersGuide/ReleaseNotes/Version_0_6_0.mo @@ -0,0 +1,28 @@ +within PVSystems.UsersGuide.ReleaseNotes; +class Version_0_6_0 "Version 0.6.0 (April 3, 2017)" + extends Modelica.Icons.ReleaseNotes; + annotation (Documentation(info=" +

+ Changes: +

+ +

+ Additions: +

+ + ")); +end Version_0_6_0; diff --git a/PVSystems/UsersGuide/ReleaseNotes/Version_0_6_1.mo b/PVSystems/UsersGuide/ReleaseNotes/Version_0_6_1.mo new file mode 100644 index 0000000..3bbba76 --- /dev/null +++ b/PVSystems/UsersGuide/ReleaseNotes/Version_0_6_1.mo @@ -0,0 +1,67 @@ +within PVSystems.UsersGuide.ReleaseNotes; +class Version_0_6_1 "Version 0.6.1 (April 19, 2017)" + extends Modelica.Icons.ReleaseNotes; + annotation (Documentation(info=" +

+ Modifications: +

+ +

+ Additions: +

+ +

+ Deletions: +

+ +")); +end Version_0_6_1; diff --git a/PVSystems/UsersGuide/ReleaseNotes/package.mo b/PVSystems/UsersGuide/ReleaseNotes/package.mo index 5290751..b4f191b 100644 --- a/PVSystems/UsersGuide/ReleaseNotes/package.mo +++ b/PVSystems/UsersGuide/ReleaseNotes/package.mo @@ -3,33 +3,6 @@ package ReleaseNotes "Release notes" extends Modelica.Icons.ReleaseNotes; -class Version_0_6_0 "Version 0.6.0 (April 3, 2017)" - extends Modelica.Icons.ReleaseNotes; - annotation (Documentation(info=" -

- Changes: -

- -

- Additions: -

- - ")); - end Version_0_6_0; annotation (Documentation(info="

diff --git a/PVSystems/UsersGuide/ReleaseNotes/package.order b/PVSystems/UsersGuide/ReleaseNotes/package.order index 5d48c7e..49ca62f 100644 --- a/PVSystems/UsersGuide/ReleaseNotes/package.order +++ b/PVSystems/UsersGuide/ReleaseNotes/package.order @@ -1 +1,2 @@ +Version_0_6_1 Version_0_6_0 diff --git a/PVSystems/UsersGuide/package.mo b/PVSystems/UsersGuide/package.mo index c35e4c7..45629f1 100644 --- a/PVSystems/UsersGuide/package.mo +++ b/PVSystems/UsersGuide/package.mo @@ -1,44 +1,10 @@ -within PVSystems; +within PVSystems; package UsersGuide "User's Guide" extends Modelica.Icons.Information; -class Contact "Contact" - extends Modelica.Icons.Contact; - annotation (Documentation(info=" -

- Copyright (c) 2016-2017 Raúl Rodríguez Pearson -

- -

- If you have any questions, comments, suggestions, ideas or - feature requests, please do share those as well as - any mistakes or bugs you might discover. You can - open an issue in - the Issues - section of the repository or, if you prefer, contact the - author - by email. Contributions - in the form - of Pull - Requests are always welcome. -

- -

- The library is the result of a research project carried out in the - form of a master's degree thesis under the supervision - of Dr. Alfonso - Urquía from - the Research group on - Modelling & Simulation in Control Engineering, part of - the Department of Computer - Science & Automatic Control - at Universidad - Nacional de Educación a Distancia.

- ")); - end Contact; annotation (DocumentationClass=true); end UsersGuide; diff --git a/PVSystems/package.mo b/PVSystems/package.mo index 1ba264f..82ee2c8 100644 --- a/PVSystems/package.mo +++ b/PVSystems/package.mo @@ -3,11 +3,15 @@ extends Modelica.Icons.Package; + + + + annotation ( uses(Modelica(version="3.2.2")), preferredView="info", - version="0.6.0", - versionDate="2017-04-03", + version="0.6.1", + versionDate="2017-04-19", Documentation(info="

Overview