Skip to content

Commit

Permalink
Bug in projections due to switch MET_10/MET_11
Browse files Browse the repository at this point in the history
  • Loading branch information
@hvanruys
hvanruys committed Apr 6, 2023
1 parent 4757240 commit 9ad29cc
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 18 deletions.
20 changes: 10 additions & 10 deletions core/formtoolbox.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<enum>QTabWidget::West</enum>
</property>
<property name="currentIndex">
<number>4</number>
<number>5</number>
</property>
<property name="elideMode">
<enum>Qt::ElideNone</enum>
Expand Down Expand Up @@ -7431,15 +7431,15 @@
</font>
</property>
<property name="currentIndex">
<number>3</number>
<number>1</number>
</property>
<widget class="QWidget" name="pageLambert">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>419</width>
<height>670</height>
<width>373</width>
<height>592</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -8255,8 +8255,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>543</width>
<height>378</height>
<width>574</width>
<height>428</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -8672,8 +8672,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>393</width>
<height>359</height>
<width>367</width>
<height>316</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -9068,8 +9068,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>564</width>
<height>382</height>
<width>574</width>
<height>428</height>
</rect>
</property>
<attribute name="label">
Expand Down
4 changes: 2 additions & 2 deletions core/generalverticalperspective.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ void GeneralVerticalPerspective::CreateMapFromGeoStationary()
col+=3; //3;
picrow = row;

if(sl->getGeoSatellite() == eGeoSatellite::MET_10)
if( sl->bisRSS)
{
if( row < 5*464)
{
Expand All @@ -347,7 +347,7 @@ void GeneralVerticalPerspective::CreateMapFromGeoStationary()
}

}
else if(sl->getGeoSatellite() == eGeoSatellite::MET_11 || sl->getGeoSatellite() == eGeoSatellite::MET_9 || sl->getGeoSatellite() == eGeoSatellite::MET_8)
else //if(sl->getGeoSatellite() == eGeoSatellite::MET_11 || sl->getGeoSatellite() == eGeoSatellite::MET_9 || sl->getGeoSatellite() == eGeoSatellite::MET_8)
{
if( picrow < (sl->areatype == 0 ? 5*464 : 11136))
{
Expand Down
3 changes: 1 addition & 2 deletions core/lambertconformalconic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ void LambertConformalConic::CreateMapFromGeostationary()
col+=3;
picrow = row;

if(sl->getGeoSatellite() == eGeoSatellite::MET_10)
if(sl->bisRSS)
{
if( picrow >= 0 && picrow < 5*464)
{
Expand All @@ -429,7 +429,6 @@ void LambertConformalConic::CreateMapFromGeostationary()
}
else
{

if( picrow < (sl->areatype == 0 ? 5*464 : 11136))
{
scanl = (QRgb*)imageptrs->ptrimageGeostationary->scanLine(picrow);
Expand Down
2 changes: 1 addition & 1 deletion core/stereographic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ void StereoGraphic::CreateMapFromGeostationary()

picrow = row;

if(sl->getGeoSatellite() == eGeoSatellite::MET_10)
if(sl->bisRSS)
{
if( picrow >= 0 && picrow < 5*464)
{
Expand Down
5 changes: 2 additions & 3 deletions video/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
#include <QtConcurrent/QtConcurrent>
#include <QUdpSocket>
#include "rssvideo.h"
#include "qsun.h"
#include "qeci.h"
#include "qobserver.h"
//#include "qsun.h"
//#include "qobserver.h"

void RenamePNGFiles()
{
Expand Down

0 comments on commit 9ad29cc

Please sign in to comment.