[Kstars-devel] unfrozen branch merged back to trunk
Jason Harris
kstars at 30doradus.org
Thu Jul 10 16:26:03 CEST 2008
Hello,
I used a tool called svnmerge.py to merge changes in unfrozen back
into trunk. There's no way to merge the history of commit messages,
so the best I could do was include a log of the commit messages from
unfrozen when I committed the merge (svnmerge.py creates this
automatically).
Unfortunately, for some reason CCMAIL didn't work when I attached it
to the commit messages, so I am appending them here.
I have one more commit to do to complete the merge.
regards,
Jason
---------------------------------------------------------------------------------------
SVN commit 830315 by harris:
Merged revisions
823176,823187,823189-823191,823193,823199,823312,824172,824175,824187,826864,826883,829313,829315,829326,829464
via svnmerge from
https://svn.kde.org/home/kde/branches/kstars/unfrozen/kstars
........
r823176 | jbowlin | 2008-06-22 11:27:24 -0700 (Sun, 22 Jun 2008) | 19 lines
Added large zoom steps to unfrozen branch.
The change in zoom due to the mouse wheel or "-" and "=" keys is now 2.0
instead of the previous 1.1. This reduces the number of key presses or
wheel clicks to change to to a given zoom by roughly a factor of eight.
The Shift and Control keys reduce the zoom step by factors of 2 and 4
respectively. Combined, they reduce it by a factor of 8 which is close
to (but not equal to) the original factor of 1.1.
Also increased MINZOOM from 200 to 250, which I think roughly compensates
for the change caused when we converted SkyMap::fov() to reporting the
diagonal of the screen instead of the minimum of the height and width.
The change in fov() was made to provide a radius for the SkyMesh::aperture()
call.
........
r823187 | mutlaqja | 2008-06-22 12:32:39 -0700 (Sun, 22 Jun 2008) | 9 lines
Adding INDI Astrophysics driver by Markus Wildi, thank you Markus!
Other LX200 INDI driver went through an overhaul process to insure
strict compatibility with INDI standards.
........
r823189 | mutlaqja | 2008-06-22 12:33:33 -0700 (Sun, 22 Jun 2008) | 1 line
Adding lx200ap to the build
........
r823190 | mutlaqja | 2008-06-22 12:35:57 -0700 (Sun, 22 Jun 2008) | 1 line
Make it compile on DragonFlyBSD
........
r823191 | mutlaqja | 2008-06-22 12:38:36 -0700 (Sun, 22 Jun 2008) | 1 line
Adding Astrophysics driver
........
r823193 | mutlaqja | 2008-06-22 12:42:37 -0700 (Sun, 22 Jun 2008) | 1 line
Porting INDI driver to multiple drivers per device manager
........
r823199 | jbowlin | 2008-06-22 12:53:15 -0700 (Sun, 22 Jun 2008) | 18 lines
Can now adjust the magnitude limit using mouse wheel or "-" and "=" keys by
using the Alt key modifier. The Ctrl and Shift modifiers work in a similar
fashion to what they do with zooming.
The default mag step is 1.0.
The Shift modifier reduces the step to 0.5.
The Ctrl modifier reduces it to 0.2.
Combined, they reduce it to 0.1.
Also changed the factor in the maglim formula from 4.444 to 3.5 to match
the summer branch.
........
r823312 | jbowlin | 2008-06-22 17:04:19 -0700 (Sun, 22 Jun 2008) | 3 lines
Eliminated an unused parameter warning message.
........
r824172 | harris | 2008-06-24 23:37:00 -0700 (Tue, 24 Jun 2008) | 7 lines
committing patch from James for better progression of
star sizes as a function of magnitude.
........
r824175 | harris | 2008-06-24 23:40:46 -0700 (Tue, 24 Jun 2008) | 17 lines
Presto, chango!
The statusbar now has a (non-functional) KLed on its
right side. If you want it on the left, move the new
lines to the top of initStatusBar().
The public accessor is KLed* KStars::diskLED()
The relevant functions to call are diskLED()->on() and
diskLed()->off() (or diskLED()->toggle()).
(BTW, FYI: this is going to be used to indicate when the
disk is being accessed to dynamically load more stars.
It will probably be configured to only show up for debug
builds, or at least will be hidden by default)
........
r824187 | harris | 2008-06-25 00:37:38 -0700 (Wed, 25 Jun 2008) | 8 lines
When the zoom level is changed, the new FOV angle is now
displayed in the statusbar. It uses the non-persistent
messages section of the SB, which I think works pretty
well.
........
r826864 | harris | 2008-07-01 10:42:45 -0700 (Tue, 01 Jul 2008) | 6 lines
I need this change to compile the branch on mac osx (but I don't need
it on linux). YMMV, but in any case, it shouldn't hurt.
........
r826883 | mutlaqja | 2008-07-01 11:37:49 -0700 (Tue, 01 Jul 2008) | 1 line
Fix compile issue when libnova is not install, thanks to Jason for
pointing this
out
........
r829313 | harris | 2008-07-07 22:18:00 -0700 (Mon, 07 Jul 2008) | 9 lines
Committing patch from Prakash to make the Find dialog more flexible. You can
now
omit spaces when searching for M/NGC/IC objects.
i.e., "m51" will match to "M 51".
Thanks for the patch, Prakash!
........
r829315 | harris | 2008-07-07 22:43:13 -0700 (Mon, 07 Jul 2008) | 17 lines
Fixing bug #166002 (Option to save DSS image).
The ImageViewer dialog has Save and Close buttons, but due to a
layout problem,
they were not visible in the window. I added a QFrame container for the image
canvas and the text caption, and made this container the dialog's mainWidget.
This makes the dialog buttons visible again.
Unfortunately, it also causes a pretty thick margin to be added around the
image/caption. Maybe a designer file for the dialog could solve
this issue, but
at least the Save button is accessible again. Too bad it's too late
for 4.1...
Thank you very much for the report Prakash!
BUG: 166002
........
r829326 | harris | 2008-07-07 23:52:51 -0700 (Mon, 07 Jul 2008) | 10 lines
Introducing variable-speed slewing. When you move to a new position, rather
than
slewing at a uniform rate, the speed will gradually increase to a
maximum value,
then slow down as the target is approached.
Try it out and let me know what you think. Is this appealing enough
that we can
just discard uniform slews, or should users be given the option?
........
r829464 | harris | 2008-07-08 07:56:15 -0700 (Tue, 08 Jul 2008) | 15 lines
Improved variable-speed slewing. Instead of a kludgy mess of nested if's to
implement a triangular speed profile, I am now using much simpler code to
implement a cosine-shaped profile.
There's a little bit of asymmetry in the profile (i.e., the ending
speed doesn't
quite get down to the level of the starting speed, so the ending is
a little bit
abrupt). This is a consequence of the speed being determined for position r,
and
then applied over the interval (r+dr). The solution is to make the determined
speed the average of speed(r) and speed(r+dr), but I'm not sure it's worth the
extra math. Let me know if the asymmetry is bothersome, or if you
have a clean
solution for it...
........
CCMAIL: kstars-devel at kde.org
_M . (directory)
M +10 -11 kstars/finddialog.cpp
M +1 -1 kstars/finddialog.h
M +1 -0 kstars/htmesh/CMakeLists.txt
M +9 -4 kstars/imageviewer.cpp
M +2 -6 kstars/imageviewer.h
M +4 -1 kstars/indi/CMakeLists.txt
M +5 -0 kstars/indi/drivers.xml
M +21 -52 kstars/indi/drivers/telescope/lx200_16.cpp
M +0 -7 kstars/indi/drivers/telescope/lx200_16.h
A kstars/indi/drivers/telescope/lx200ap.cpp
branches/kstars/unfrozen/kstars/kstars/indi/drivers/telescope/lx200ap.cpp#824187
[License: LGPL (v2.1+)]
A kstars/indi/drivers/telescope/lx200ap.h
branches/kstars/unfrozen/kstars/kstars/indi/drivers/telescope/lx200ap.h#824187
[License: LGPL (v2.1+)]
A kstars/indi/drivers/telescope/lx200apdriver.c
branches/kstars/unfrozen/kstars/kstars/indi/drivers/telescope/lx200apdriver.c#824187
[License: LGPL (v2.1+)]
A kstars/indi/drivers/telescope/lx200apdriver.h
branches/kstars/unfrozen/kstars/kstars/indi/drivers/telescope/lx200apdriver.h#824187
[License: LGPL (v2.1+)]
A kstars/indi/drivers/telescope/lx200aplib.h
branches/kstars/unfrozen/kstars/kstars/indi/drivers/telescope/lx200aplib.h#824187
[License: LGPL (v2.1+)]
M +29 -1 kstars/indi/drivers/telescope/lx200autostar.cpp
M +2 -6 kstars/indi/drivers/telescope/lx200basic.cpp
M +6 -1 kstars/indi/drivers/telescope/lx200classic.cpp
M +1 -1 kstars/indi/drivers/telescope/lx200driver.c
M +164 -371 kstars/indi/drivers/telescope/lx200generic.cpp
M +4 -9 kstars/indi/drivers/telescope/lx200generic.h
M +10 -33 kstars/indidriver.cpp
M +0 -1 kstars/indidriver.h
M +20 -0 kstars/kstars.h
M +42 -12 kstars/kstarsactions.cpp
M +3 -2 kstars/kstarsdata.h
M +1 -0 kstars/kstarsdcop.cpp
M +6 -1 kstars/kstarsinit.cpp
M +1 -1 kstars/skycomponents/skylabeler.cpp
M +6 -5 kstars/skycomponents/starcomponent.cpp
M +20 -4 kstars/skymap.cpp
M +47 -0 kstars/skymap.h
M +66 -4 kstars/skymapevents.cpp
---------------------------------------------------------------------
SVN commit 830325 by harris:
Merged revisions 826351,827476 via svnmerge from
https://svn.kde.org/home/kde/branches/kstars/unfrozen/kstars
NOTE: this is stage 1 of 2 to merge the PLANET enum fixes.
........
r826351 | harris | 2008-06-30 07:44:15 -0700 (Mon, 30 Jun 2008) | 16 lines
Better fix for bug #165170. Now the order of items in the planet
comboboxes is
hard-coded in conjunctions.cpp, using a new PLANET enum I added to
KSPlanetBase.
So it's not possible for the order to be wrong.
I also added a convenience function 'static KSPlanetBase*
KSPlanetBase::createPlanet(int)', so you can simply call:
KSPlanetBase::createPlanet(VENUS), rather than using the KSPlanet
ctor, and using
the planet's name to determine which planet gets created. There is also a new
KSPlanet(int) ctor that does essentially the same thing.
Note: this commit won't be merged into trunk until after 4.1 is released.
........
r827476 | harris | 2008-07-02 22:37:35 -0700 (Wed, 02 Jul 2008) | 6 lines
Use the new KSPlanetBase PLANET enum in the PlanetViewer tool. Also
some other
cosmetic fixes.
........
CCMAIL: kstars-devel at kde.org
_M . (directory)
M +31 -1 kstars/ksplanet.cpp
M +33 -26 kstars/ksplanet.h [POSSIBLY UNSAFE: system]
M +40 -6 kstars/ksplanetbase.cpp
M +11 -6 kstars/ksplanetbase.h
M +21 -44 kstars/tools/conjunctions.cpp
M +0 -1 kstars/tools/conjunctions.h
M +0 -100 kstars/tools/conjunctions.ui
M +24 -23 kstars/tools/planetviewer.cpp
M +4 -5 kstars/tools/planetviewer.h
-----------------------------------------------------------------------
SVN commit 830330 by harris:
Merged revisions 826868 via svnmerge from
https://svn.kde.org/home/kde/branches/kstars/unfrozen/kstars
........
r826868 | harris | 2008-07-01 10:45:07 -0700 (Tue, 01 Jul 2008) | 9 lines
Fix the enum issue. I now always give the enum value scope by
prefixing the classname in which it is defined (e.g.,
KSPlanetBase::MOON). Note that I had already been doing this for the
SkyObject::TYPE enum values. so some part of my brain knew this might
be an issue!
........
CCMAIL: kstars-devel at kde.org
M +10 -10 ksplanetbase.cpp
M +2 -2 ksplanetbase.h
M +11 -11 tools/conjunctions.cpp
--- trunk/KDE/kdeedu/kstars/kstars/ksplanetbase.cpp #830329:830330
@@ -61,23 +61,23 @@
KStarsData *kd = KStarsData::Instance();
switch ( n ) {
- case MERCURY:
- case VENUS:
- case MARS:
- case JUPITER:
- case SATURN:
- case URANUS:
- case NEPTUNE:
+ case KSPlanetBase::MERCURY:
+ case KSPlanetBase::VENUS:
+ case KSPlanetBase::MARS:
+ case KSPlanetBase::JUPITER:
+ case KSPlanetBase::SATURN:
+ case KSPlanetBase::URANUS:
+ case KSPlanetBase::NEPTUNE:
return new KSPlanet( kd, n );
break;
- case PLUTO:
+ case KSPlanetBase::PLUTO:
return new KSPluto(kd);
break;
- case SUN:
+ case KSPlanetBase::SUN:
return new KSSun(kd);
break;
- case MOON:
+ case KSPlanetBase::MOON:
return new KSMoon(kd);
break;
}
--- trunk/KDE/kdeedu/kstars/kstars/ksplanetbase.h #830329:830330
@@ -28,8 +28,6 @@
#include "trailobject.h"
-typedef enum { MERCURY, VENUS, MARS, JUPITER, SATURN, URANUS,
NEPTUNE, PLUTO, SUN, MOON, UNKNOWN_PLANET } PLANET;
-
class QPoint;
class KSNumbers;
class KSPopupMenu;
@@ -95,6 +93,8 @@
void init(const QString &s, const QString &image_file, const
QColor &c, double pSize );
+ enum { MERCURY=0, VENUS=1, MARS=2, JUPITER=3, SATURN=4,
URANUS=5, NEPTUNE=6, PLUTO=7, SUN=8, MOON=9, UNKNOWN_PLANET };
+
static KSPlanetBase* createPlanet( int n );
virtual bool loadData() {
--- trunk/KDE/kdeedu/kstars/kstars/tools/conjunctions.cpp #830329:830330
@@ -67,18 +67,18 @@
LocationButton -> setText( geoPlace -> fullName() );
QHash<int, QString> pNames;
- pNames[MERCURY] = i18n("Mercury");
- pNames[VENUS] = i18n("Venus");
- pNames[MARS] = i18n("Mars");
- pNames[JUPITER] = i18n("Jupiter");
- pNames[SATURN] = i18n("Saturn");
- pNames[URANUS] = i18n("Uranus");
- pNames[NEPTUNE] = i18n("Neptune");
- pNames[PLUTO] = i18n("Pluto");
- pNames[SUN] = i18n("Sun");
- pNames[MOON] = i18n("Moon");
+ pNames[KSPlanetBase::MERCURY] = i18n("Mercury");
+ pNames[KSPlanetBase::VENUS] = i18n("Venus");
+ pNames[KSPlanetBase::MARS] = i18n("Mars");
+ pNames[KSPlanetBase::JUPITER] = i18n("Jupiter");
+ pNames[KSPlanetBase::SATURN] = i18n("Saturn");
+ pNames[KSPlanetBase::URANUS] = i18n("Uranus");
+ pNames[KSPlanetBase::NEPTUNE] = i18n("Neptune");
+ pNames[KSPlanetBase::PLUTO] = i18n("Pluto");
+ pNames[KSPlanetBase::SUN] = i18n("Sun");
+ pNames[KSPlanetBase::MOON] = i18n("Moon");
- for ( int i=0; i<UNKNOWN_PLANET; ++i ) {
+ for ( int i=0; i<KSPlanetBase::UNKNOWN_PLANET; ++i ) {
Obj1ComboBox->insertItem( i, pNames[i] );
Obj2ComboBox->insertItem( i, pNames[i] );
}
More information about the Kstars-devel
mailing list