ZoneArray.cpp   ZoneArray.cpp 
skipping to change at line 263 skipping to change at line 263
nr_of_stars = 0; nr_of_stars = 0;
} }
bool ZoneArray::readFile(QFile& file, void *data, qint64 size) bool ZoneArray::readFile(QFile& file, void *data, qint64 size)
{ {
int parts = 256; int parts = 256;
int part_size = (size + (parts>>1)) / parts; int part_size = (size + (parts>>1)) / parts;
if (part_size < 64*1024) if (part_size < 64*1024)
{ {
part_size = 64*1024; part_size = 64*1024;
parts = (size + (part_size>>1)) / part_size;
} }
float i = 0.f; float i = 0.f;
i += 1.f; i += 1.f;
while (size > 0) while (size > 0)
{ {
const int to_read = (part_size < size) ? part_size : size; const int to_read = (part_size < size) ? part_size : size;
const int read_rc = file.read((char*)data, to_read); const int read_rc = file.read((char*)data, to_read);
if (read_rc != to_read) return false; if (read_rc != to_read) return false;
size -= read_rc; size -= read_rc;
data = ((char*)data) + read_rc; data = ((char*)data) + read_rc;
skipping to change at line 509 skipping to change at line 508
if (withExtinction) if (withExtinction)
{ {
//GZ: We must compute position first, then shift magnitude. //GZ: We must compute position first, then shift magnitude.
Vec3d altAz=core->j2000ToAltAz(Vec3d(vf[0], vf[1], vf[2]), StelC ore::RefractionOn); Vec3d altAz=core->j2000ToAltAz(Vec3d(vf[0], vf[1], vf[2]), StelC ore::RefractionOn);
float extMagShift=0.0f; float extMagShift=0.0f;
extinction.forward(&altAz, &extMagShift); extinction.forward(&altAz, &extMagShift);
int extMagShiftStep=qMin((int)floor(extMagShift/k), 4096-mag_st eps); // this number muist be equal StarMgr.cpp line 649 int extMagShiftStep=qMin((int)floor(extMagShift/k), 4096-mag_st eps); // this number muist be equal StarMgr.cpp line 649
tmpRcmag = rcmag_table+2*(s->mag+extMagShiftStep); tmpRcmag = rcmag_table+2*(s->mag+extMagShiftStep);
} }
if (drawer->drawPointSource(sPainter, vf, tmpRcmag, s->bV, !is_insid e) && s->hasName() && s->mag < maxMagStarName && s->hasComponentID()<=1) if (drawer->drawPointSource(sPainter, Vec3d(vf[0], vf[1], vf[2]), tm pRcmag, s->bV, !is_inside) && s->hasName() && s->mag < maxMagStarName && s- >hasComponentID()<=1)
{ {
const float offset = *tmpRcmag*0.7f; const float offset = *tmpRcmag*0.7f;
const Vec3f& colorr = (StelApp::getInstance().getVisionModeNight () ? Vec3f(0.8f, 0.2f, 0.2f) : StelSkyDrawer::indexToColor(s->bV))*0.75f; const Vec3f& colorr = (StelApp::getInstance().getVisionModeNight () ? Vec3f(0.8f, 0.2f, 0.2f) : StelSkyDrawer::indexToColor(s->bV))*0.75f;
sPainter->setColor(colorr[0], colorr[1], colorr[2],names_brightn ess); sPainter->setColor(colorr[0], colorr[1], colorr[2],names_brightn ess);
sPainter->drawText(Vec3d(vf[0], vf[1], vf[2]), s->getNameI18n(), 0, offset, offset, false); sPainter->drawText(Vec3d(vf[0], vf[1], vf[2]), s->getNameI18n(), 0, offset, offset, false);
} }
} }
} }
template<class Star> template<class Star>
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/