Commit 118bbcbd authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix minor EBN issues and typos

parent 9da1cc08
......@@ -74,7 +74,7 @@ public:
* we can highlight and zoom in
* ( to fit in the current view port )
* to this placemark when user
* choses to view the right answer.
* chooses to view the right answer.
*/
GeoDataPlacemark *m_correctAnswerPlacemark;
GeoDataCoordinates m_correctAnswer;
......
......@@ -235,7 +235,7 @@ void CountryByShape::postQuestion( QObject *gameObject )
/**
* Now disable the highlight feature so that
* the user click doesn't disturbe the highlight
* the user click doesn't disturb the highlight
* we did to ask question.
*/
d->m_marbleWidget->setHighlightEnabled( false );
......
......@@ -93,7 +93,7 @@ void twoline2rv
satrec.error = 0;
// set the implied decimal points since doing a formated read
// set the implied decimal points since doing a formatted read
// fixes for bad input data values (missing, ...)
for (j = 10; j <= 15; j++)
if (longstr1[j] == ' ')
......
......@@ -1202,7 +1202,7 @@ static void initl
getgravconst( whichconst, tumin, mu, radiusearthkm, xke, j2, j3, j4, j3oj2 );
x2o3 = 2.0 / 3.0;
/* ------------- calculate auxillary epoch quantities ---------- */
/* ------------- calculate auxilary epoch quantities ---------- */
eccsq = ecco * ecco;
omeosq = 1.0 - eccsq;
rteosq = sqrt(omeosq);
......@@ -2029,7 +2029,7 @@ double gstime
* function getgravconst
*
* this function gets constants for the propagator. note that mu is identified to
* facilitiate comparisons with newer models. the common useage is wgs72.
* facilitiate comparisons with newer models. the common usage is wgs72.
*
* author : david vallado 719-573-2600 21 jul 2006
*
......
......@@ -848,7 +848,7 @@ ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
to dictionary. dictionary must have enough space, where 32768 bytes is
always enough. If inflateGetDictionary() is called with dictionary equal to
Z_NULL, then only the dictionary length is returned, and nothing is copied.
Similary, if dictLength is Z_NULL, then it is not set.
Similarily, if dictLength is Z_NULL, then it is not set.
inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
stream state is inconsistent.
......
......@@ -10,8 +10,8 @@
//
#ifndef MARBLE_MAINWINDOW_H
#define MARBLE_MAINWINDOW_H
#ifndef MARBLE_KDEMAINWINDOW_H
#define MARBLE_KDEMAINWINDOW_H
#include <KXmlGui/KXmlGuiWindow>
......
......@@ -11,8 +11,8 @@
//
#ifndef MARBLE_MAINWINDOW_H
#define MARBLE_MAINWINDOW_H
#ifndef MARBLE_QTMAINWINDOW_H
#define MARBLE_QTMAINWINDOW_H
#include <QMainWindow>
......
......@@ -18,12 +18,12 @@
Copyright :Gerhard HOLTKAMP 26-MAR-2014
========================================================================= */
#include "astr2lib.h"
#include <cmath>
using namespace std;
#include "attlib.h"
#include "astrolib.h"
#include "astr2lib.h"
extern double frac (double f);
extern double atan21 (double y, double x);
......
......@@ -1402,7 +1402,7 @@ Vec3 Sun200::position (double t) // position of the Sun at time t
void Sun200::state (double t, Vec3& rs, Vec3& vs)
{
/* State vector rs (position) and vs (velocity) of the Sun in
ecliptic of date coordinates at time t (in Julian Centruries
ecliptic of date coordinates at time t (in Julian Centuries
since J2000).
*/
const double p2 = 2.0 * M_PI;
......
......@@ -17,15 +17,14 @@
***********************************************************************/
//#include <iostream>
#include "attlib.h"
#include <cmath>
using namespace std;
#include "attlib.h"
/*********************************************************************/
double atan20 (double y, double x)
{
/* redefine atan2 so that it does'nt crash when both x and y are 0 */
/* redefine atan2 so that it doesn't crash when both x and y are 0 */
double result;
if ((x == 0) && (y == 0)) result = 0;
......
......@@ -58,7 +58,7 @@ EclSolar::~EclSolar()
double EclSolar::atan23 (double y, double x)
{
/* redefine atan2 so that it does'nt crash when both x and y are 0 */
/* redefine atan2 so that it doesn't crash when both x and y are 0 */
double result;
if ((x == 0) && (y == 0)) result = 0;
......@@ -725,7 +725,7 @@ void EclSolar::nextEcl()
void EclSolar::previousEcl()
{
// select the prevoius eclipse for detailed calculations
// select the previous eclipse for detailed calculations
int k, j, es;
if (!eb_moonph_called) moonph(); // calculate the eclipses of the year
......@@ -861,7 +861,7 @@ void EclSolar::setPenumbraAngle(double pa, int mode)
}
// -------- auxilliary functions --------------------------------
// -------- auxilary functions --------------------------------
void EclSolar::GetMonth (int mm, char* mchr)
{
// get three letter designation of month
......@@ -1227,7 +1227,7 @@ void EclSolar::moonph()
ckphase(minmjd,maxmjd,yr,deltdut, mp25, p25, 0.25);
ckphase(minmjd,maxmjd,yr,deltdut, mp5, p5, 0.5);
ckphase(minmjd,maxmjd,yr,deltdut, mp75, p75, 0.75);
yr+=0.02; // incease by 1/50th of a year (about two weeks)
yr+=0.02; // increase by 1/50th of a year (about two weeks)
};
for (j=0; j<eb_numecl; j++)
......
......@@ -44,7 +44,7 @@ PlanetarySats::~PlanetarySats()
double PlanetarySats::atan23 (double y, double x)
{
// redefine atan2 so that it does'nt crash when both x and y are 0
// redefine atan2 so that it doesn't crash when both x and y are 0
double result;
if ((x == 0) && (y == 0)) result = 0;
......
......@@ -30,6 +30,7 @@
***************************************************************************/
/*------------ include files and definitions -----------------------------*/
#include "solarsystem.h"
#include <cstdio>
#include <cstdlib>
#include <cstring>
......@@ -37,7 +38,6 @@
#include <ctime>
using namespace std;
#include "solarsystem.h"
#include "astrolib.h"
#include "astr2lib.h"
#include "attlib.h"
......@@ -58,7 +58,7 @@ SolarSystem::~SolarSystem()
double SolarSystem::atan23 (double y, double x)
{
/* redefine atan2 so that it does'nt crash when both x and y are 0 */
/* redefine atan2 so that it doesn't crash when both x and y are 0 */
double result;
if ((x == 0) && (y == 0)) result = 0;
......
......@@ -115,20 +115,20 @@ class ASTROLIB_EXPORT SolarSystem // Calculate Positions of Solar System Bod
void getConstVenus(); // Venus planetary constants
void getConstEarth(); // Earth planetary constants
void getConstMars(); // Mars planetary constants
void getConstJupiter(); // Jupiter planerary constants
void getConstSaturn(); // Saturn planerary constants
void getConstUranus(); // Uranus planerary constants
void getConstNeptune(); // Neptune planerary constants
void getConstIo(); // Io planerary constants
void getConstEuropa(); // Europa planerary constants
void getConstGanymede(); // Ganymede planerary constants
void getConstCallisto(); // Callisto planerary constants
void getConstRhea(); // Rhea planerary constants
void getConstTitan(); // Titan planerary constants
void getConstMimas(); // Mimas planerary constants
void getConstEnceladus(); // Enceladus planerary constants
void getConstDione(); // Dione planerary constants
void getConstUser(); // User planerary constants
void getConstJupiter(); // Jupiter planetary constants
void getConstSaturn(); // Saturn planetary constants
void getConstUranus(); // Uranus planetary constants
void getConstNeptune(); // Neptune planetary constants
void getConstIo(); // Io planetary constants
void getConstEuropa(); // Europa planetary constants
void getConstGanymede(); // Ganymede planetary constants
void getConstCallisto(); // Callisto planetary constants
void getConstRhea(); // Rhea planetary constants
void getConstTitan(); // Titan planetary constants
void getConstMimas(); // Mimas planetary constants
void getConstEnceladus(); // Enceladus planetary constants
void getConstDione(); // Dione planetary constants
void getConstUser(); // User planetary constants
void getPlanMat(); // get Matrix to convert from J2000.0 into planetary coordinates
......@@ -136,7 +136,7 @@ class ASTROLIB_EXPORT SolarSystem // Calculate Positions of Solar System Bod
bool ss_update_called; // true if updateSolar() has already been called
bool ss_moon_called; // true if special Moon calculation called
bool ss_planmat_called; // true if matrix for planetary coordintes called
bool ss_planmat_called; // true if matrix for planetary coordinates called
bool ss_kepler_stored; // true if Kepler elements for comet or asteroid stored
bool ss_kepler_called; // true if comet or asteroid position calculated
bool ss_user_stored; // true if orbit elements for user defined object stored
......@@ -170,7 +170,7 @@ class ASTROLIB_EXPORT SolarSystem // Calculate Positions of Solar System Bod
double ss_moon_ildisk; // fraction of Moon's illuminated disk
double ss_moon_phase; // phase of Moon
double ss_GM; // graviatational constant (m^3/s^2)
double ss_GM; // gravitational constant (m^3/s^2)
double ss_J2; // J2 gravitational term
double ss_R0; // equatorial radius (km)
double ss_flat; // flattening factor
......@@ -182,7 +182,7 @@ class ASTROLIB_EXPORT SolarSystem // Calculate Positions of Solar System Bod
double ss_Wd; // daily variation of W.
// data for user defined object:
double ss_user_GM; // graviatational constant (m^3/s^2)
double ss_user_GM; // gravitational constant (m^3/s^2)
double ss_user_J2; // J2 gravitational term
double ss_user_R0; // equatorial radius (km)
double ss_user_flat; // flattening factor
......
......@@ -9,7 +9,7 @@
// Copyright 2007 Inge Wallin <ingwa@kde.org>
// Copyright 2007 Thomas Zander <zander@kde.org>
// Copyright 2010 Bastian Holst <bastianholst@gmx.de>
// Coprright 2011-2013 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
// Copyright 2011-2013 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
// Copyright 2012 Illya Kovalevskyy <illya.kovalevskyy@gmail.com>
//
......
......@@ -9,7 +9,7 @@
// Copyright 2007 Inge Wallin <ingwa@kde.org>
// Copyright 2007 Thomas Zander <zander@kde.org>
// Copyright 2010 Bastian Holst <bastianholst@gmx.de>
// Coprright 2011-2013 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
// Copyright 2011-2013 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
// Copyright 2012 Illya Kovalevskyy <illya.kovalevskyy@gmail.com>
//
......
......@@ -83,7 +83,7 @@ void DataMigration::moveFiles( const QString& source, const QString& target )
// Trying to simply rename the directory. This is the fastest method, but it is not always
// possible. For example when the directories are on different file systems.
// If the renaming of the directory is not successful, we have to copy and delete each
// file separatetly.
// file separately.
mDebug() << "Rename" << source << "to" << target;
if( !QDir().rename( source, target ) ) {
mDebug() << "Simple renaming of the data directory failed. Moving single files";
......
......@@ -153,14 +153,14 @@ EditPlacemarkDialog::EditPlacemarkDialog( GeoDataPlacemark *placemark,
// Adding the osm tag editor widget tab
d->m_osmTagEditorWidget = new OsmTagEditorWidget( placemark, this );
d->tabWidget->addTab( d->m_osmTagEditorWidget, tr( "Tags" ) );
QObject::connect( d->m_osmTagEditorWidget, SIGNAL( placemarkChanged( GeoDataFeature* ) ),
this, SLOT( updateTextAnnotation() ) );
QObject::connect( d->m_osmTagEditorWidget, SIGNAL(placemarkChanged(GeoDataFeature*)),
this, SLOT(updateTextAnnotation()) );
// Adding the osm relation editor widget tab
d->m_osmRelationManagerWidget = new OsmRelationManagerWidget( placemark, relations, this );
d->tabWidget->addTab( d->m_osmRelationManagerWidget, tr( "Relations" ) );
QObject::connect( d->m_osmRelationManagerWidget, SIGNAL( relationCreated( const OsmPlacemarkData& ) ),
this, SIGNAL( relationCreated( const OsmPlacemarkData& ) ) );
QObject::connect( d->m_osmRelationManagerWidget, SIGNAL(relationCreated(OsmPlacemarkData)),
this, SIGNAL(relationCreated(OsmPlacemarkData)) );
}
// Adding the elevation widget tab
......
......@@ -164,7 +164,7 @@ void EquirectScanlineTextureMapper::RenderJob::run()
const qint64 radius = m_viewport->radius();
// Calculate how many degrees are being represented per pixel.
const qreal rad2Pixel = (qreal)( 2 * radius ) / M_PI;
const float pixel2Rad = 1.0/rad2Pixel; // FIXME chainging to qreal may crash Marble when the equator is visible
const float pixel2Rad = 1.0/rad2Pixel; // FIXME changing to qreal may crash Marble when the equator is visible
const bool interlaced = ( m_mapQuality == LowQuality );
const bool highQuality = ( m_mapQuality == HighQuality
......
......@@ -10,13 +10,14 @@
// Copyright 2014 Illya Kovalevskyy <illya.kovalevskyy@gmail.com>
//
#include "FlyToEditWidget.h"
#include <QDoubleSpinBox>
#include <QToolButton>
#include <QLabel>
#include <QHBoxLayout>
#include <QComboBox>
#include "FlyToEditWidget.h"
#include "MarbleWidget.h"
#include "geodata/data/GeoDataFlyTo.h"
#include "GeoDataLookAt.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment