Add copyright headers + few bits from review + fixing sip updates

qgis · Sep 30, 2017 · 8dc70b4 · 8dc70b4
1 parent ae3b3ec
commit 8dc70b4
Show file tree

Hide file tree

Showing 89 changed files with 1,282 additions and 18 deletions.
diff --git a/python/core/3d/qgs3drendererregistry.sip b/python/core/3d/qgs3drendererregistry.sip
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/3d/qgs3drendererregistry.h                                  *
+ * src/core/./3d/qgs3drendererregistry.h                                *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -10,6 +10,7 @@
 
 
 
+
 class Qgs3DRendererAbstractMetadata
 {
 %Docstring
@@ -60,6 +61,9 @@ class Qgs3DRendererRegistry
 %End
   public:
     Qgs3DRendererRegistry();
+%Docstring
+Creates registry of 3D renderers
+%End
 
     ~Qgs3DRendererRegistry();
 
@@ -90,7 +94,7 @@ class Qgs3DRendererRegistry
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/3d/qgs3drendererregistry.h                                  *
+ * src/core/./3d/qgs3drendererregistry.h                                *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/python/core/3d/qgsabstract3drenderer.sip b/python/core/3d/qgsabstract3drenderer.sip
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/3d/qgsabstract3drenderer.h                                  *
+ * src/core/./3d/qgsabstract3drenderer.h                                *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsAbstract3DRenderer /Abstract/
 {
 %Docstring
@@ -59,7 +60,7 @@ Resolves references to other objects - second phase of loading - after readXml()
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/3d/qgsabstract3drenderer.h                                  *
+ * src/core/./3d/qgsabstract3drenderer.h                                *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -101,10 +101,16 @@ sub exit_with_error {
 }
 
 sub write_header_footer {
+    # small hack to turn files src/core/3d/X.h to src/core/./3d/X.h
+    # otherwise "sip up to date" test fails. This is because the test uses %Include entries
+    # and over there we have to use ./3d/X.h entries because SIP parser does not allow a number
+    # as the first letter of a relative path
+    my $headerfile_x = $headerfile;
+    $headerfile_x =~ s/src\/core\/3d/src\/core\/.\/3d/;
     push @OUTPUT,  "/************************************************************************\n";
     push @OUTPUT,  " * This file has been generated automatically from                      *\n";
     push @OUTPUT,  " *                                                                      *\n";
-    push @OUTPUT, sprintf " * %-*s *\n", 68, $headerfile;
+    push @OUTPUT, sprintf " * %-*s *\n", 68, $headerfile_x;
     push @OUTPUT,  " *                                                                      *\n";
     push @OUTPUT,  " * Do not edit manually ! Edit header and run scripts/sipify.pl again   *\n";
     push @OUTPUT,  " ************************************************************************/\n";

diff --git a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt
@@ -16,7 +16,6 @@ SET(QGIS_3D_SRCS
   chunks/qgschunkboundsentity_p.cpp
   chunks/qgschunkedentity_p.cpp
   chunks/qgschunklist_p.cpp
-  chunks/qgschunkloader_p.cpp
   chunks/qgschunknode_p.cpp
   chunks/qgschunkqueuejob_p.cpp
 

diff --git a/src/3d/chunks/qgschunkboundsentity_p.cpp b/src/3d/chunks/qgschunkboundsentity_p.cpp
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunkboundsentity_p.cpp
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "qgschunkboundsentity_p.h"
 
 #include <Qt3DRender/QAttribute>

diff --git a/src/3d/chunks/qgschunkboundsentity_p.h b/src/3d/chunks/qgschunkboundsentity_p.h
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunkboundsentity_p.h
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #ifndef QGSCHUNKBOUNDSENTITY_P_H
 #define QGSCHUNKBOUNDSENTITY_P_H
 

diff --git a/src/3d/chunks/qgschunkedentity_p.cpp b/src/3d/chunks/qgschunkedentity_p.cpp
@@ -1,6 +1,24 @@
+/***************************************************************************
+  qgschunkedentity_p.cpp
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgschunkedentity_p.h"
+
+#include <QElapsedTimer>
 #include <QVector4D>
+
 #include "qgs3dutils.h"
-#include "qgschunkedentity_p.h"
 #include "qgschunkboundsentity_p.h"
 #include "qgschunklist_p.h"
 #include "qgschunkloader_p.h"
@@ -96,7 +114,6 @@ QgsChunkedEntity::~QgsChunkedEntity()
   //delete chunkLoaderFactory;
 }
 
-#include <QElapsedTimer>
 
 void QgsChunkedEntity::update( const SceneState &state )
 {
@@ -216,7 +233,6 @@ void QgsChunkedEntity::update( QgsChunkNode *node, const SceneState &state )
   if ( !node->entity() )
   {
     // this happens initially when root node is not ready yet
-    qDebug() << "BOOM!";
     return;
   }
 

diff --git a/src/3d/chunks/qgschunkedentity_p.h b/src/3d/chunks/qgschunkedentity_p.h
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunkedentity_p.h
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #ifndef QGSCHUNKEDENTITY_P_H
 #define QGSCHUNKEDENTITY_P_H
 

diff --git a/src/3d/chunks/qgschunklist_p.cpp b/src/3d/chunks/qgschunklist_p.cpp
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunklist_p.cpp
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "qgschunklist_p.h"
 
 #include "qgschunknode_p.h"

diff --git a/src/3d/chunks/qgschunklist_p.h b/src/3d/chunks/qgschunklist_p.h
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunklist_p.h
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #ifndef QGSCHUNKLIST_P_H
 #define QGSCHUNKLIST_P_H
 

diff --git a/src/3d/chunks/qgschunkloader_p.cpp b/src/3d/chunks/qgschunkloader_p.cpp
diff --git a/src/3d/chunks/qgschunkloader_p.h b/src/3d/chunks/qgschunkloader_p.h
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunkloader_p.h
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #ifndef QGSCHUNKLOADER_P_H
 #define QGSCHUNKLOADER_P_H
 

diff --git a/src/3d/chunks/qgschunknode_p.cpp b/src/3d/chunks/qgschunknode_p.cpp
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunknode_p.cpp
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "qgschunknode_p.h"
 
 #include "qgschunkedentity_p.h"  // for ChunkLoader destructor

diff --git a/src/3d/chunks/qgschunknode_p.h b/src/3d/chunks/qgschunknode_p.h
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunknode_p.h
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #ifndef QGSCHUNKNODE_P_H
 #define QGSCHUNKNODE_P_H
 

diff --git a/src/3d/chunks/qgschunkqueuejob_p.cpp b/src/3d/chunks/qgschunkqueuejob_p.cpp
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunkqueuejob_p.cpp
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "qgschunkqueuejob_p.h"
 
 ///@cond PRIVATE

diff --git a/src/3d/chunks/qgschunkqueuejob_p.h b/src/3d/chunks/qgschunkqueuejob_p.h
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgschunkqueuejob_p.h
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #ifndef QGSCHUNKQUEUEJOB_P_H
 #define QGSCHUNKQUEUEJOB_P_H
 

diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgs3dmapscene.cpp
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "qgs3dmapscene.h"
 
 #include <Qt3DRender/QCamera>

diff --git a/src/3d/qgs3dmapscene.h b/src/3d/qgs3dmapscene.h
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgs3dmapscene.h
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #ifndef QGS3DMAPSCENE_H
 #define QGS3DMAPSCENE_H
 

diff --git a/src/3d/qgs3dmapsettings.cpp b/src/3d/qgs3dmapsettings.cpp
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgs3dmapsettings.cpp
+  --------------------------------------
+  Date                 : July 2017
+  Copyright            : (C) 2017 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "qgs3dmapsettings.h"
 
 #include "qgsflatterraingenerator.h"