Skip to content

Commit

Permalink
Fixing licensing information
Browse files Browse the repository at this point in the history
Fixing licensing information. Adding caveat that a derivative work may
not be called "MetOcean Viewer"
  • Loading branch information
zcobell committed Jul 14, 2015
1 parent 7a1404b commit 2ba10e4
Show file tree
Hide file tree
Showing 32 changed files with 661 additions and 427 deletions.
57 changes: 4 additions & 53 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -620,56 +620,7 @@ copy of the Program in return for a fee.

END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

{one line to give the program's name and a brief idea of what it does.}
Copyright (C) {year} {name of author}

This program 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.

This program 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.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

{project} Copyright (C) {year} {fullname}
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".

You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

ADDENDUM

The name "MetOcean Viewer" is specific to this project and may not
be used for projects "forked" or derived from this work.
31 changes: 18 additions & 13 deletions MetOceanViewer.pro
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
#----GPL-----------------------------------------------------------------------
#-------------------------------GPL-------------------------------------#
#
# This file is part of MetOceanViewer.
# MetOcean Viewer - A simple interface for viewing hydrodynamic model data
# Copyright (C) 2015 Zach Cobell
#
# MetOceanViewer 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.
# This program 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.
#
# MetOceanViewer 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.
# This program 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.
#
# You should have received a copy of the GNU General Public License
# along with MetOceanViewer. If not, see <http:#www.gnu.org/licenses/>.
#------------------------------------------------------------------------------
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# The name "MetOcean Viewer" is specific to this project and may not be
# used for projects "forked" or derived from this work.
#
#-----------------------------------------------------------------------#

QT += core gui webkitwidgets network xml

Expand Down
31 changes: 18 additions & 13 deletions html/hwm_map.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
<!--
//----GPL-----------------------------------------------------------------------
//-------------------------------GPL-------------------------------------//
//
// This file is part of MetOceanViewer.
// MetOcean Viewer - A simple interface for viewing hydrodynamic model data
// Copyright (C) 2015 Zach Cobell
//
// MetOceanViewer 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.
// This program 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.
//
// MetOceanViewer 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.
// This program 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.
//
// You should have received a copy of the GNU General Public License
// along with MetOceanViewer. If not, see <http://www.gnu.org/licenses/>.
//------------------------------------------------------------------------------
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// The name "MetOcean Viewer" is specific to this project and may not be
// used for projects "forked" or derived from this work.
//
//-----------------------------------------------------------------------//
-->

<!DOCTYPE html>
Expand Down
31 changes: 18 additions & 13 deletions html/noaa_maps.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
<!--
//----GPL-----------------------------------------------------------------------
//-------------------------------GPL-------------------------------------//
//
// This file is part of MetOceanViewer.
// MetOcean Viewer - A simple interface for viewing hydrodynamic model data
// Copyright (C) 2015 Zach Cobell
//
// MetOceanViewer 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.
// This program 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.
//
// MetOceanViewer 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.
// This program 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.
//
// You should have received a copy of the GNU General Public License
// along with MetOceanViewer. If not, see <http://www.gnu.org/licenses/>.
//------------------------------------------------------------------------------
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// The name "MetOcean Viewer" is specific to this project and may not be
// used for projects "forked" or derived from this work.
//
//-----------------------------------------------------------------------//
-->

<!DOCTYPE html>
Expand Down
31 changes: 18 additions & 13 deletions html/reg_plot.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
<!--
//----GPL-----------------------------------------------------------------------
//-------------------------------GPL-------------------------------------//
//
// This file is part of MetOceanViewer.
// MetOcean Viewer - A simple interface for viewing hydrodynamic model data
// Copyright (C) 2015 Zach Cobell
//
// MetOceanViewer 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.
// This program 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.
//
// MetOceanViewer 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.
// This program 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.
//
// You should have received a copy of the GNU General Public License
// along with MetOceanViewer. If not, see <http://www.gnu.org/licenses/>.
//------------------------------------------------------------------------------
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// The name "MetOcean Viewer" is specific to this project and may not be
// used for projects "forked" or derived from this work.
//
//-----------------------------------------------------------------------//
-->

<!DOCTYPE html>
Expand Down
31 changes: 18 additions & 13 deletions html/timeseries_maps.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
<!--
//----GPL-----------------------------------------------------------------------
//-------------------------------GPL-------------------------------------//
//
// This file is part of MetOceanViewer.
// MetOcean Viewer - A simple interface for viewing hydrodynamic model data
// Copyright (C) 2015 Zach Cobell
//
// MetOceanViewer 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.
// This program 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.
//
// MetOceanViewer 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.
// This program 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.
//
// You should have received a copy of the GNU General Public License
// along with MetOceanViewer. If not, see <http://www.gnu.org/licenses/>.
//------------------------------------------------------------------------------
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// The name "MetOcean Viewer" is specific to this project and may not be
// used for projects "forked" or derived from this work.
//
//-----------------------------------------------------------------------//
-->

<!DOCTYPE html>
Expand Down
31 changes: 18 additions & 13 deletions html/usgs_maps.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
<!--
//----GPL-----------------------------------------------------------------------
//-------------------------------GPL-------------------------------------//
//
// This file is part of MetOceanViewer.
// MetOcean Viewer - A simple interface for viewing hydrodynamic model data
// Copyright (C) 2015 Zach Cobell
//
// MetOceanViewer 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.
// This program 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.
//
// MetOceanViewer 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.
// This program 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.
//
// You should have received a copy of the GNU General Public License
// along with MetOceanViewer. If not, see <http://www.gnu.org/licenses/>.
//------------------------------------------------------------------------------
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// The name "MetOcean Viewer" is specific to this project and may not be
// used for projects "forked" or derived from this work.
//
//-----------------------------------------------------------------------//
-->

<!DOCTYPE html>
Expand Down
31 changes: 18 additions & 13 deletions include/MetOceanViewer.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
//----GPL-----------------------------------------------------------------------
//-------------------------------GPL-------------------------------------//
//
// This file is part of MetOceanViewer.
// MetOcean Viewer - A simple interface for viewing hydrodynamic model data
// Copyright (C) 2015 Zach Cobell
//
// MetOceanViewer 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.
// This program 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.
//
// MetOceanViewer 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.
// This program 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.
//
// You should have received a copy of the GNU General Public License
// along with MetOceanViewer. If not, see <http://www.gnu.org/licenses/>.
//------------------------------------------------------------------------------
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// The name "MetOcean Viewer" is specific to this project and may not be
// used for projects "forked" or derived from this work.
//
//-----------------------------------------------------------------------//

#ifndef ADCVALIDATOR_H
#define ADCVALIDATOR_H
Expand Down
32 changes: 19 additions & 13 deletions include/about_dialog.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
//----GPL-----------------------------------------------------------------------
//-------------------------------GPL-------------------------------------//
//
// This file is part of MetOceanViewer.
// MetOcean Viewer - A simple interface for viewing hydrodynamic model data
// Copyright (C) 2015 Zach Cobell
//
// MetOceanViewer 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.
// This program 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.
//
// MetOceanViewer 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.
// This program 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.
//
// You should have received a copy of the GNU General Public License
// along with MetOceanViewer. If not, see <http://www.gnu.org/licenses/>.
//------------------------------------------------------------------------------
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// The name "MetOcean Viewer" is specific to this project and may not be
// used for projects "forked" or derived from this work.
//
//-----------------------------------------------------------------------//

#ifndef ABOUT_DIALOG_H
#define ABOUT_DIALOG_H
Expand All @@ -39,6 +44,7 @@ private slots:
private:
Ui::about_dialog *ui;
QString generateAboutText();
QString generateLicenseText();
};

#endif // ABOUT_DIALOG_H
Loading

0 comments on commit 2ba10e4

Please sign in to comment.