"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "saga-gis/src/saga_core/saga_gui/wksp_grid.cpp" between
saga-7.6.2_src.zip and saga-7.6.3_src.zip

About: SAGA (System for Automated Geoscientific Analyses) is a Geographic Information System (GIS) software for geodata processing and analysis. All source codes.

wksp_grid.cpp  (saga-7.6.2_src):wksp_grid.cpp  (saga-7.6.3_src)
skipping to change at line 1417 skipping to change at line 1417
void CWKSP_Grid::_Get_Overlay(CSG_Grid *pOverlay[2], CSG_Scaler Scaler[2]) void CWKSP_Grid::_Get_Overlay(CSG_Grid *pOverlay[2], CSG_Scaler Scaler[2])
{ {
if( m_pClassify->Get_Mode() != CLASSIFY_OVERLAY ) if( m_pClassify->Get_Mode() != CLASSIFY_OVERLAY )
{ {
pOverlay [0] = pOverlay [1] = NULL; pOverlay [0] = pOverlay [1] = NULL;
} }
else else
{ {
switch( m_Parameters("OVERLAY_MODE")->asInt() ) switch( m_Parameters("OVERLAY_MODE")->asInt() )
{ {
default: default: // this = red
pOverlay[0] = m_Parameters("OVERLAY_G")->asGrid(); pOverlay[0] = m_Parameters("OVERLAY_G")->asGrid();
pOverlay[1] = m_Parameters("OVERLAY_B")->asGrid(); pOverlay[1] = m_Parameters("OVERLAY_B")->asGrid();
break; break;
case 1: case 1: // this = green
pOverlay[0] = m_Parameters("OVERLAY_R")->asGrid(); pOverlay[0] = m_Parameters("OVERLAY_R")->asGrid();
pOverlay[1] = m_Parameters("OVERLAY_B")->asGrid(); pOverlay[1] = m_Parameters("OVERLAY_B")->asGrid();
break; break;
case 2: case 2: // this = blue
pOverlay[0] = m_Parameters("OVERLAY_R")->asGrid(); pOverlay[0] = m_Parameters("OVERLAY_R")->asGrid();
pOverlay[1] = m_Parameters("OVERLAY_G")->asGrid(); pOverlay[1] = m_Parameters("OVERLAY_G")->asGrid();
break; break;
} }
for(int i=0; i<2; i++) for(int i=0; i<2; i++)
{ {
if( !SG_Get_Data_Manager().Exists(pOverlay[i]) ) if( !SG_Get_Data_Manager().Exists(pOverlay[i]) )
{ {
pOverlay[i] = NULL; pOverlay[i] = NULL;
skipping to change at line 1472 skipping to change at line 1472
} }
} }
//--------------------------------------------------------- //---------------------------------------------------------
void CWKSP_Grid::_Draw_Grid_Nodes(CWKSP_Map_DC &dc_Map, TSG_Grid_Resampling Resa mpling, int yDC, int axDC, int bxDC, CSG_Grid *pOverlay[2], CSG_Scaler Scaler[2] ) void CWKSP_Grid::_Draw_Grid_Nodes(CWKSP_Map_DC &dc_Map, TSG_Grid_Resampling Resa mpling, int yDC, int axDC, int bxDC, CSG_Grid *pOverlay[2], CSG_Scaler Scaler[2] )
{ {
int Overlay[3]; int Overlay[3];
switch( m_Parameters("OVERLAY_MODE")->asInt() ) switch( m_Parameters("OVERLAY_MODE")->asInt() )
{ {
default: Overlay[0] = 0; Overlay[1] = 1; Overlay[2] = 2; break; default: Overlay[0] = 0; Overlay[1] = 1; Overlay[2] = 2; break; // this =
case 1: Overlay[0] = 1; Overlay[1] = 0; Overlay[2] = 2; break; r, pOverlay[0] = g, pOverlay[1] = r
case 2: Overlay[0] = 1; Overlay[1] = 2; Overlay[2] = 0; break; case 1: Overlay[0] = 1; Overlay[1] = 0; Overlay[2] = 2; break; // this =
g, pOverlay[0] = r, pOverlay[1] = b
case 2: Overlay[0] = 2; Overlay[1] = 0; Overlay[2] = 1; break; // this =
b, pOverlay[0] = r, pOverlay[1] = g
} }
double xMap = dc_Map.xDC2World(axDC); double xMap = dc_Map.xDC2World(axDC);
double yMap = dc_Map.yDC2World( yDC); double yMap = dc_Map.yDC2World( yDC);
for(int xDC=axDC; xDC<=bxDC; xMap+=dc_Map.m_DC2World, xDC++) for(int xDC=axDC; xDC<=bxDC; xMap+=dc_Map.m_DC2World, xDC++)
{ {
double Value; double Value;
if( Get_Grid()->Get_Value(xMap, yMap, Value, Resampling, false, m _pClassify->Get_Mode() == CLASSIFY_RGB) ) if( Get_Grid()->Get_Value(xMap, yMap, Value, Resampling, false, m _pClassify->Get_Mode() == CLASSIFY_RGB) )
 End of changes. 4 change blocks. 
6 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)