Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Education
KStars
Commits
85cab290
Commit
85cab290
authored
Nov 12, 2012
by
Jasem Mutlaq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug with telescope pointer on skymap when sending new coords
parent
0f9f82bd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
8 deletions
+17
-8
kstars/indi/inditelescope.cpp
kstars/indi/inditelescope.cpp
+17
-8
No files found.
kstars/indi/inditelescope.cpp
View file @
85cab290
...
...
@@ -203,23 +203,20 @@ bool Telescope::sendCoords(SkyPoint *ScopeTarget)
INumber
*
RAEle
(
NULL
),
*
DecEle
(
NULL
),
*
AzEle
(
NULL
),
*
AltEle
(
NULL
);
INumberVectorProperty
*
EqProp
(
NULL
),
*
HorProp
(
NULL
);
double
currentRA
=
0
,
currentDEC
=
0
,
currentAlt
=
0
,
currentAz
=
0
;
bool
useJ2000
(
false
);
EqProp
=
baseDevice
->
getNumber
(
"EQUATORIAL_EOD_COORD
_REQUEST
"
);
EqProp
=
baseDevice
->
getNumber
(
"EQUATORIAL_EOD_COORD"
);
if
(
EqProp
==
NULL
)
{
// Backward compatibility
EqProp
=
baseDevice
->
getNumber
(
"EQUATORIAL_EOD_COORD"
);
if
(
EqProp
==
NULL
)
{
// J2000 Property
EqProp
=
baseDevice
->
getNumber
(
"EQUATORIAL_COORD
_REQUEST
"
);
EqProp
=
baseDevice
->
getNumber
(
"EQUATORIAL_COORD"
);
if
(
EqProp
)
useJ2000
=
true
;
}
}
HorProp
=
baseDevice
->
getNumber
(
"HORIZONTAL_COORD
_REQUEST
"
);
HorProp
=
baseDevice
->
getNumber
(
"HORIZONTAL_COORD"
);
if
(
EqProp
&&
EqProp
->
p
==
IP_RO
)
EqProp
=
NULL
;
...
...
@@ -239,6 +236,8 @@ bool Telescope::sendCoords(SkyPoint *ScopeTarget)
if
(
useJ2000
)
ScopeTarget
->
apparentCoord
(
KStars
::
Instance
()
->
data
()
->
ut
().
djd
(),
(
long
double
)
J2000
);
currentRA
=
RAEle
->
value
;
currentDEC
=
DecEle
->
value
;
RAEle
->
value
=
ScopeTarget
->
ra
().
Hours
();
DecEle
->
value
=
ScopeTarget
->
dec
().
Degrees
();
}
...
...
@@ -250,6 +249,8 @@ bool Telescope::sendCoords(SkyPoint *ScopeTarget)
AltEle
=
IUFindNumber
(
HorProp
,
"ALT"
);
if
(
!
AltEle
)
return
false
;
currentAz
=
AzEle
->
value
;
currentAlt
=
AltEle
->
value
;
AzEle
->
value
=
ScopeTarget
->
az
().
Degrees
();
AltEle
->
value
=
ScopeTarget
->
alt
().
Degrees
();
}
...
...
@@ -259,9 +260,17 @@ bool Telescope::sendCoords(SkyPoint *ScopeTarget)
return
false
;
if
(
EqProp
)
{
clientManager
->
sendNewNumber
(
EqProp
);
RAEle
->
value
=
currentRA
;
DecEle
->
value
=
currentDEC
;
}
if
(
HorProp
)
{
clientManager
->
sendNewNumber
(
HorProp
);
AzEle
->
value
=
currentAz
;
AltEle
->
value
=
currentAlt
;
}
return
true
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment