Review/test fixes

wonder-sk · wonder-sk · commit fde8a0366c84 · 2018-11-13T09:03:44.000+01:00
diff --git a/src/3d/qgs3dmapsettings.cpp b/src/3d/qgs3dmapsettings.cpp
@@ -42,6 +42,8 @@ Qgs3DMapSettings::Qgs3DMapSettings( const Qgs3DMapSettings &other )
   , mShowTerrainBoundingBoxes( other.mShowTerrainBoundingBoxes )
   , mShowTerrainTileInfo( other.mShowTerrainTileInfo )
   , mShowCameraViewCenter( other.mShowCameraViewCenter )
+  , mShowLabels( other.mShowLabels )
+  , mPointLights( other.mPointLights )
   , mLayers( other.mLayers )
   , mSkyboxEnabled( other.mSkyboxEnabled )
   , mSkyboxFileBase( other.mSkyboxFileBase )
diff --git a/src/3d/qgspointlightsettings.h b/src/3d/qgspointlightsettings.h
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgspointlightsettings.h
+  --------------------------------------
+  Date                 : November 2018
+  Copyright            : (C) 2018 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 QGSPOINTLIGHTSETTINGS_H
 #define QGSPOINTLIGHTSETTINGS_H
 
@@ -10,6 +25,12 @@ class QDomElement;
 /**
  * \ingroup 3d
  * Definition of a point light in a 3D map scene
+ *
+ * Total light at the distance D from a point light with intensity I
+ * is (I / TA) where TA is total attenuation which is calculated as
+ * (A_0 + A_1 * D + A_2 * D^2). The terms A_0, A_1 and A_2 stand for
+ * constant, linear and quadratic attenuation.
+ *
  * \since QGIS 3.6
  */
 class QgsPointLightSettings
@@ -25,20 +46,26 @@ class QgsPointLightSettings
     //! Returns color of the light
     QColor color() const { return mColor; }
     //! Sets color of the light
-    void setColor( const QColor &c ) { mColor = c; }
+    void setColor( const QColor &color ) { mColor = color; }
 
     //! Returns intensity of the light
     float intensity() const { return mIntensity; }
     //! Sets intensity of the light
     void setIntensity( float intensity ) { mIntensity = intensity; }
 
+    //! Returns constant attenuation (A_0)
     float constantAttenuation() const { return mConstantAttenuation; }
+    //! Sets constant attenuation (A_0)
     void setConstantAttenuation( float value ) { mConstantAttenuation = value; }
 
+    //! Returns linear attenuation (A_1)
     float linearAttenuation() const { return mLinearAttenuation; }
+    //! Sets linear attenuation (A_1)
     void setLinearAttenuation( float value ) { mLinearAttenuation = value; }
 
+    //! Returns quadratic attenuation (A_2)
     float quadraticAttenuation() const { return mQuadraticAttenuation; }
+    //! Sets quadratic attenuation (A_2)
     void setQuadraticAttenuation( float value ) { mQuadraticAttenuation = value; }
 
     //! Writes configuration to a new DOM element and returns it
diff --git a/src/app/3d/qgs3danimationwidget.cpp b/src/app/3d/qgs3danimationwidget.cpp
@@ -69,7 +69,7 @@ void Qgs3DAnimationWidget::setCameraController( QgsCameraController *cameraContr
 
 void Qgs3DAnimationWidget::setAnimation( const Qgs3DAnimationSettings &animSettings )
 {
-  cboInterpolation->setCurrentIndex( animSettings.easingCurve().type() );
+  whileBlocking( cboInterpolation )->setCurrentIndex( animSettings.easingCurve().type() );
 
   // initialize GUI from the given animation
   cboKeyframe->clear();
diff --git a/src/app/3d/qgslightswidget.cpp b/src/app/3d/qgslightswidget.cpp
@@ -91,7 +91,7 @@ void QgsLightsWidget::onAddLight()
 {
   if ( mPointLights.count() >= 8 )
   {
-    QMessageBox::warning( this, tr( "Add light" ), tr( "It is not possible to add more than 8 lights to the scene." ) );
+    QMessageBox::warning( this, tr( "Add Light" ), tr( "It is not possible to add more than 8 lights to the scene." ) );
     return;
   }
 
diff --git a/src/app/3d/qgslightswidget.h b/src/app/3d/qgslightswidget.h
@@ -1,3 +1,18 @@
+/***************************************************************************
+  qgslightswidget.h
+  --------------------------------------
+  Date                 : November 2018
+  Copyright            : (C) 2018 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 QGSLIGHTSWIDGET_H
 #define QGSLIGHTSWIDGET_H
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ void Qgs3DAnimationWidget::setCameraController( QgsCameraController *cameraContr`
`69`	`69`
`70`	`70`	`void Qgs3DAnimationWidget::setAnimation( const Qgs3DAnimationSettings &animSettings )`
`71`	`71`	`{`
`72`		`- cboInterpolation->setCurrentIndex( animSettings.easingCurve().type() );`
	`72`	`+ whileBlocking( cboInterpolation )->setCurrentIndex( animSettings.easingCurve().type() );`
`73`	`73`
`74`	`74`	`// initialize GUI from the given animation`
`75`	`75`	`cboKeyframe->clear();`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ void QgsLightsWidget::onAddLight()`
`91`	`91`	`{`
`92`	`92`	`if ( mPointLights.count() >= 8 )`
`93`	`93`	`{`
`94`		`- QMessageBox::warning( this, tr( "Add light" ), tr( "It is not possible to add more than 8 lights to the scene." ) );`
	`94`	`+ QMessageBox::warning( this, tr( "Add Light" ), tr( "It is not possible to add more than 8 lights to the scene." ) );`
`95`	`95`	`return;`
`96`	`96`	`}`
`97`	`97`