Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ncar/lrose-core
Browse files Browse the repository at this point in the history
  • Loading branch information
@mike-dixon
mike-dixon committed Oct 8, 2024
2 parents d1ede58 + 694b274 commit 805bd36
Show file tree
Hide file tree
Showing 9 changed files with 195 additions and 131 deletions.
36 changes: 18 additions & 18 deletions codebase/apps/radar/src/Lucid/CartManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3406,24 +3406,24 @@ void CartManager::_checkWhatNeedsRendering(int frame_index)
if (gd.mrec[gd.h_win.page]->h_data_valid == 0 ||
gd.prod_mgr->num_products_invalid() > 0) {
gd.movie.frame[frame_index].redraw_horiz = 1;
gd.h_win.redraw[gd.h_win.page] = 1;
gd.h_win.redraw_flag[gd.h_win.page] = 1;
}

for ( i=0; i < gd.layers.num_wind_sets; i++ ) {
// Look through wind field data too
if (gd.layers.wind[i].active) {
if (gd.layers.wind[i].wind_u->h_data_valid == 0) {
gd.movie.frame[frame_index].redraw_horiz = 1;
gd.h_win.redraw[gd.h_win.page] = 1;
gd.h_win.redraw_flag[gd.h_win.page] = 1;
}
if (gd.layers.wind[i].wind_v->h_data_valid == 0) {
gd.movie.frame[frame_index].redraw_horiz = 1;
gd.h_win.redraw[gd.h_win.page] = 1;
gd.h_win.redraw_flag[gd.h_win.page] = 1;
}
if (gd.layers.wind[i].wind_w != NULL &&
gd.layers.wind[i].wind_w->h_data_valid == 0) {
gd.movie.frame[frame_index].redraw_horiz = 1;
gd.h_win.redraw[gd.h_win.page] = 1;
gd.h_win.redraw_flag[gd.h_win.page] = 1;
}
}
}
Expand All @@ -3434,7 +3434,7 @@ void CartManager::_checkWhatNeedsRendering(int frame_index)
if(gd.layers.cont[i].active) {
if(gd.mrec[gd.layers.cont[i].field]->h_data_valid == 0) {
gd.movie.frame[frame_index].redraw_horiz = 1;
gd.h_win.redraw[gd.h_win.page] = 1;
gd.h_win.redraw_flag[gd.h_win.page] = 1;
}
}
}
Expand All @@ -3445,24 +3445,24 @@ void CartManager::_checkWhatNeedsRendering(int frame_index)
if (gd.v_win.active ) {
if(gd.mrec[gd.v_win.page]->v_data_valid == 0) {
gd.movie.frame[frame_index].redraw_vert = 1;
gd.v_win.redraw[gd.v_win.page] = 1;
gd.v_win.redraw_flag[gd.v_win.page] = 1;
}

for ( i=0; i < gd.layers.num_wind_sets; i++ ) {
/* Look through wind field data too */
if (gd.layers.wind[i].active) {
if (gd.layers.wind[i].wind_u->v_data_valid == 0) {
gd.movie.frame[frame_index].redraw_vert = 1;
gd.v_win.redraw[gd.v_win.page] = 1;
gd.v_win.redraw_flag[gd.v_win.page] = 1;
}
if (gd.layers.wind[i].wind_v->v_data_valid == 0) {
gd.movie.frame[frame_index].redraw_vert = 1;
gd.v_win.redraw[gd.v_win.page] = 1;
gd.v_win.redraw_flag[gd.v_win.page] = 1;
}
if (gd.layers.wind[i].wind_w != NULL &&
gd.layers.wind[i].wind_w->v_data_valid == 0) {
gd.movie.frame[frame_index].redraw_vert = 1;
gd.v_win.redraw[gd.v_win.page] = 1;
gd.v_win.redraw_flag[gd.v_win.page] = 1;
}
}
}
Expand All @@ -3472,7 +3472,7 @@ void CartManager::_checkWhatNeedsRendering(int frame_index)
if(gd.layers.cont[i].active) {
if(gd.mrec[gd.layers.cont[i].field]->v_data_valid == 0) {
gd.movie.frame[frame_index].redraw_vert = 1;
gd.v_win.redraw[gd.v_win.page] = 1;
gd.v_win.redraw_flag[gd.v_win.page] = 1;
}
}
}
Expand Down Expand Up @@ -3746,7 +3746,7 @@ void CartManager::_ciddTimerFunc(QTimerEvent *event)
if (gd.movie.movie_on ) {
set_redraw_flags(1,0);
} else {
if (gd.h_win.redraw[gd.h_win.page] == 0) {
if (gd.h_win.redraw_flag[gd.h_win.page] == 0) {
gd.h_copy_flag = 1;
gd.h_win.prev_page = gd.h_win.page;
cerr << "GGGGGGGGGGGGGG gd.h_win.page, gd.h_win.prev_page: " << gd.h_win.page << ", " << gd.h_win.prev_page << endl;
Expand All @@ -3766,7 +3766,7 @@ void CartManager::_ciddTimerFunc(QTimerEvent *event)
if (gd.movie.movie_on ) {
set_redraw_flags(0,1);
} else {
if (gd.v_win.redraw[gd.v_win.page] == 0) {
if (gd.v_win.redraw_flag[gd.v_win.page] == 0) {
gd.v_copy_flag = 1;
gd.v_win.prev_page = gd.v_win.page;
}
Expand Down Expand Up @@ -3830,12 +3830,12 @@ void CartManager::_ciddTimerFunc(QTimerEvent *event)
if (gd.movie.frame[index].redraw_vert) {
if (gather_vwin_data(gd.v_win.page,gd.movie.frame[index].time_start,
gd.movie.frame[index].time_end) == CIDD_SUCCESS) {
if (gd.v_win.redraw[gd.v_win.page]) {
if (gd.v_win.redraw_flag[gd.v_win.page]) {
render_v_movie_frame(index,v_pdev);
save_v_movie_frame(index,v_pdev);
}
gd.movie.frame[index].redraw_vert = 0;
gd.v_win.redraw[gd.v_win.page] = 0;
gd.v_win.redraw_flag[gd.v_win.page] = 0;
gd.v_copy_flag = 1;
}
}
Expand Down Expand Up @@ -3906,7 +3906,7 @@ void CartManager::_ciddTimerFunc(QTimerEvent *event)
if (gather_hwin_data(gd.h_win.page,
gd.movie.frame[index].time_start,
gd.movie.frame[index].time_end) == CIDD_SUCCESS) {
if (gd.h_win.redraw[gd.h_win.page]) {
if (gd.h_win.redraw_flag[gd.h_win.page]) {
// render_h_movie_frame(index,h_pdev);
_horiz->setFrameForRendering(gd.h_win.page, index);
save_h_movie_frame(index, h_pdev, gd.h_win.page);
Expand All @@ -3916,7 +3916,7 @@ void CartManager::_ciddTimerFunc(QTimerEvent *event)
set_height_label();

gd.movie.frame[index].redraw_horiz = 0;
gd.h_win.redraw[gd.h_win.page] = 0;
gd.h_win.redraw_flag[gd.h_win.page] = 0;
gd.h_copy_flag = 1;
}
#ifdef NOTNOW
Expand Down Expand Up @@ -4040,8 +4040,8 @@ void CartManager::_ciddTimerFunc(QTimerEvent *event)
int ready = 1;

// Check to make sure the images are done
if((gd.save_im_win & PLAN_VIEW) && gd.h_win.redraw[gd.h_win.page] != 0) ready = 0;
if((gd.save_im_win & XSECT_VIEW) && gd.v_win.redraw[gd.v_win.page] != 0) ready = 0;
if((gd.save_im_win & PLAN_VIEW) && gd.h_win.redraw_flag[gd.h_win.page] != 0) ready = 0;
if((gd.save_im_win & XSECT_VIEW) && gd.v_win.redraw_flag[gd.v_win.page] != 0) ready = 0;
if(ready) {
dump_cidd_image(gd.save_im_win,0,0,gd.h_win.page);
gd.image_needs_saved = 0;
Expand Down
14 changes: 7 additions & 7 deletions codebase/apps/radar/src/Lucid/DataHandling.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1027,12 +1027,12 @@ void set_field(int value)
}

for(i=0; i < gd.num_datafields; i++) {
if(gd.mrec[i]->auto_render == 0) gd.h_win.redraw[i] = 1;
if(gd.mrec[i]->auto_render == 0) gd.h_win.redraw_flag[i] = 1;
}

if(gd.mrec[gd.h_win.page]->auto_render &&
gd.h_win.page_pdev[gd.h_win.page] != 0 &&
gd.h_win.redraw[gd.h_win.page] == 0) {
gd.h_win.redraw_flag[gd.h_win.page] == 0) {

save_h_movie_frame(gd.movie.cur_frame,
gd.h_win.page_pdev[gd.h_win.page],
Expand Down Expand Up @@ -1127,7 +1127,7 @@ static void _checkForHorizData(met_record_t *mr)
gd.io_info.busy_status = 0;
gd.io_info.outstanding_request = 0;
gd.io_info.request_type = 0;
gd.h_win.redraw[gd.io_info.page] = 1;
gd.h_win.redraw_flag[gd.io_info.page] = 1;

if(gd.debug || gd.debug1) {
fprintf(stderr,"Aborted Read: Error %d - %s\n",
Expand Down Expand Up @@ -1156,7 +1156,7 @@ static void _checkForHorizData(met_record_t *mr)
gd.io_info.busy_status = 0;
gd.io_info.outstanding_request = 0;
gd.io_info.request_type = 0;
gd.h_win.redraw[gd.io_info.page] = 1;
gd.h_win.redraw_flag[gd.io_info.page] = 1;
mr->h_data_valid = 1;
mr->last_collected = time(0);
return;
Expand Down Expand Up @@ -1374,7 +1374,7 @@ static void _checkForHorizData(met_record_t *mr)

mr->h_data_valid = 1;
mr->last_collected = time(0);
gd.h_win.redraw[gd.io_info.page] = 1;
gd.h_win.redraw_flag[gd.io_info.page] = 1;
// Indicate its safe to use the data
gd.io_info.busy_status = 0;
// Indicate data is no longer pending
Expand Down Expand Up @@ -1458,7 +1458,7 @@ static void _checkForVertData(met_record_t *mr)
gd.io_info.busy_status = 0;
gd.io_info.outstanding_request = 0;
gd.io_info.request_type = 0;
gd.h_win.redraw[gd.io_info.page] = 1;
gd.h_win.redraw_flag[gd.io_info.page] = 1;

if(gd.debug || gd.debug1) {
fprintf(stderr,"Aborted Read: Error %d - %s\n",
Expand Down Expand Up @@ -1567,7 +1567,7 @@ static void _checkForVertData(met_record_t *mr)
//gd.v_win.cmin_y = gd.v_win.min_ht;
//gd.v_win.cmax_y = gd.v_win.max_ht;

gd.v_win.redraw[gd.io_info.page] = 1;
gd.v_win.redraw_flag[gd.io_info.page] = 1;
gd.io_info.busy_status = 0;
gd.io_info.outstanding_request = 0;
gd.io_info.request_type = 0;
Expand Down
14 changes: 7 additions & 7 deletions codebase/apps/radar/src/Lucid/HorizWidget.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ void HorizWidget::_doRenderInvalidImages(QPainter &painter,

if (gd.mrec[h_image]->currently_displayed && gd.mrec[h_image]->auto_render) {

if (gd.h_win.redraw[h_image] || (gd.mrec[h_image]->h_data_valid == 0)) {
if (gd.h_win.redraw_flag[h_image] || (gd.mrec[h_image]->h_data_valid == 0)) {
none_found = 0;
stat = gather_hwin_data(h_image,
gd.movie.frame[index].time_start,
Expand All @@ -1435,14 +1435,14 @@ void HorizWidget::_doRenderInvalidImages(QPainter &painter,

save_h_movie_frame(index,pdev,h_image);

gd.h_win.redraw[h_image] = 0;
gd.h_win.redraw_flag[h_image] = 0;
} else {
return;
}
if (h_image == gd.h_win.prev_page && gd.h_win.redraw[h_image] == 0) {
if (h_image == gd.h_win.prev_page && gd.h_win.redraw_flag[h_image] == 0) {
gd.h_copy_flag = 1;
}
} // if (gd.h_win.redraw[h_image] ...
} // if (gd.h_win.redraw_flag[h_image] ...
} // if (gd.mrec[h_image]->currently_displayed ...
h_image++;

Expand All @@ -1453,7 +1453,7 @@ void HorizWidget::_doRenderInvalidImages(QPainter &painter,
if (v_image >= gd.num_datafields) v_image = 0;

if (gd.mrec[v_image]->currently_displayed && gd.mrec[v_image]->auto_render) {
if ((gd.v_win.active) && (gd.v_win.redraw[v_image] || (gd.mrec[v_image]->v_data_valid == 0))) {
if ((gd.v_win.active) && (gd.v_win.redraw_flag[v_image] || (gd.mrec[v_image]->v_data_valid == 0))) {
stat = gather_vwin_data(v_image, gd.movie.frame[index].time_start,
gd.movie.frame[index].time_end);
if (stat == CIDD_SUCCESS) {
Expand All @@ -1467,11 +1467,11 @@ void HorizWidget::_doRenderInvalidImages(QPainter &painter,
vert->renderVertDisplay(painter, v_image, gd.movie.frame[index].time_start,
gd.movie.frame[index].time_end);
#endif
gd.v_win.redraw[v_image] = 0;
gd.v_win.redraw_flag[v_image] = 0;
} else {
return;
}
if (v_image == gd.v_win.prev_page && gd.v_win.redraw[v_image] == 0) gd.v_copy_flag = 1;
if (v_image == gd.v_win.prev_page && gd.v_win.redraw_flag[v_image] == 0) gd.v_copy_flag = 1;
}
}

Expand Down
8 changes: 4 additions & 4 deletions codebase/apps/radar/src/Lucid/cidd_init.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2607,8 +2607,8 @@ static void _initContours()
}

for(int ii = 0; ii < gd.num_datafields; ii++) {
gd.h_win.redraw[ii] = 1;
gd.v_win.redraw[ii] = 1;
gd.h_win.redraw_flag[ii] = 1;
gd.v_win.redraw_flag[ii] = 1;
}

for(int ii = 0; ii < _params.contour_fields_n; ii++ ) {
Expand Down Expand Up @@ -2817,8 +2817,8 @@ void init_globals()

// MEM_zero(gd.gen_time_list);

MEM_zero(gd.h_win);
MEM_zero(gd.v_win);
// MEM_zero(gd.h_win);
// MEM_zero(gd.v_win);

// gd.def_gc = 0;
// gd.ol_gc = 0;
Expand Down
8 changes: 4 additions & 4 deletions codebase/apps/radar/src/Lucid/cidd_remote_commands.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void remote_set_h_page(char *name)
for(int i = 0; i < gd.num_datafields; i++) {
if(strcmp(name,gd.mrec[i]->button_name) == 0) {
gd.h_win.page = i;
gd.h_win.redraw[i] = 1;
gd.h_win.redraw_flag[i] = 1;
gd.movie.frame[gd.movie.cur_frame].redraw_horiz = 1;
}
}
Expand Down Expand Up @@ -212,7 +212,7 @@ void remote_set_h_page_num(int num)
{
if( num >= 0 && num < gd.num_datafields) {
gd.h_win.page = num;
gd.h_win.redraw[num] = 1;
gd.h_win.redraw_flag[num] = 1;
gd.movie.frame[gd.movie.cur_frame].redraw_horiz = 1;
}
}
Expand All @@ -232,7 +232,7 @@ void remote_set_v_page(char *name)
for(int i = 0; i < gd.num_datafields; i++) {
if(strcmp(name,gd.mrec[i]->button_name) == 0) {
gd.v_win.page = i;
gd.v_win.redraw[i] = 1;
gd.v_win.redraw_flag[i] = 1;
gd.movie.frame[gd.movie.cur_frame].redraw_vert = 1;
}
}
Expand All @@ -243,7 +243,7 @@ void remote_set_v_page_num(int num)
{
if( num >= 0 && num < gd.num_datafields) {
gd.v_win.page = num;
gd.v_win.redraw[num] = 1;
gd.v_win.redraw_flag[num] = 1;
gd.movie.frame[gd.movie.cur_frame].redraw_vert = 1;
}
}
Expand Down
Loading

0 comments on commit 805bd36

Please sign in to comment.