← Back to branch summary

~registry/stellarium/socis2015-de430

« back to all changes in this revision

Viewing changes to plugins/Observability/src/Observability.cpp

  • Committer: georg-zotti
  • Date: 2016-01-16 13:14:07 UTC
  • mfrom: (7721.1.409 trunk)
  • Revision ID: georg.zotti@univie.ac.at-20160116131407-n3yqlhdmlzmc4irj
Merge from trunk r8130; Moved and added tooltips to controls in GUI. Seems ready for merge!

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Observability/src/Observability.cpp
601
601
                
602
602
                if (culmAlt < (halfpi - refractedHorizonAlt)) // Source can be observed.
603
603
                {
604
 
                        double altiAtCulmi = Rad2Deg*(halfpi-culmAlt-refractedHorizonAlt);
 
604
//                      THESE IS FREE OF ATMOSPHERE AND REFERRED TO TRUE HORIZON!
 
605
                        double altiAtCulmi = (halfpi-culmAlt); //-refractedHorizonAlt);
 
606
 
 
607
// Add refraction, if necessary:
 
608
                        Vec3d TempRefr; 
 
609
                        TempRefr[0] = std::cos(altiAtCulmi);  
 
610
                        TempRefr[1] = 0.0; 
 
611
                        TempRefr[2] = std::sin(altiAtCulmi);  
 
612
                        Vec3d CorrRefr = core->altAzToEquinoxEqu(TempRefr,StelCore::RefractionOff);
 
613
                        TempRefr = core->equinoxEquToAltAz(CorrRefr,StelCore::RefractionAuto);
 
614
                        altiAtCulmi = Rad2Deg*std::asin(TempRefr[2]);
 
615
 
605
616
                        double2hms(TFrac*currH,dc,mc,sc);
606
617
                        
607
618
                        //String with the time span for culmination:
723
734
                                        QString acroRiseStr, acroSetStr;
724
735
                                        QString cosRiseStr, cosSetStr;
725
736
                                        QString heliRiseStr, heliSetStr;
726
 
                                        // TODO: Possible error? Day 0 is 1 Jan.
727
 
                                        acroRiseStr = (acroRise>0)?formatAsDate(acroRise):msgNone;
728
 
                                        acroSetStr = (acroSet>0)?formatAsDate(acroSet):msgNone;
 
737
                                        // TODO: Possible error? Day 0 is 1 Jan. ==> IMV: Indeed! Corrected
 
738
                                        acroRiseStr = (acroRise>=0)?formatAsDate(acroRise):msgNone;
 
739
                                        acroSetStr = (acroSet>=0)?formatAsDate(acroSet):msgNone;
729
740
                                        cosRiseStr = (cosRise>0)?formatAsDate(cosRise):msgNone;
730
741
                                        cosSetStr = (cosSet>0)?formatAsDate(cosSet):msgNone;
731
 
                                        heliRiseStr = (heliRise>0)?formatAsDate(heliRise):msgNone;
732
 
                                        heliSetStr = (heliSet>0)?formatAsDate(heliSet):msgNone;
 
742
                                        heliRiseStr = (heliRise>=0)?formatAsDate(heliRise):msgNone;
 
743
                                        heliSetStr = (heliSet>=0)?formatAsDate(heliSet):msgNone;
733
744
 
734
745
 
735
746
                                        if (result==3 || result==1)