From 98c479aa42f29709d4da6a1e4ead0b1aeedda1b2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 9 Jan 2018 11:14:08 +0100 Subject: [PATCH] infoviewer: rename text_cur_* => text_curr_* Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/2d01ac2aec77d99616add01335e7a8c1f52d67f0 Author: vanhofen Date: 2018-01-09 (Tue, 09 Jan 2018) Origin message was: ------------------ - infoviewer: rename text_cur_* => text_curr_* --- src/gui/infoviewer.cpp | 70 +++++++++++++++++++++--------------------- src/gui/infoviewer.h | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 6efd9e26c..c27835bd5 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -103,7 +103,7 @@ CInfoViewer::CInfoViewer () { sigbox = NULL; header = numbox = body = rec = NULL; - txt_cur_start = txt_cur_event = txt_cur_rest = txt_next_start = txt_next_event = txt_next_in = NULL; + txt_curr_start = txt_curr_event = txt_curr_rest = txt_next_start = txt_next_event = txt_next_in = NULL; timescale = NULL; clock = NULL; info_CurrentNext.current_zeit.startzeit = 0; @@ -468,12 +468,12 @@ void CInfoViewer::paintBody() if (body == NULL){ body = new CComponentsShapeSquare(ChanInfoX, y_body, BoxEndX-ChanInfoX, h_body); } else { - if (txt_cur_event && txt_cur_start && txt_cur_rest && + if (txt_curr_event && txt_curr_start && txt_curr_rest && txt_next_event && txt_next_start && txt_next_in) { if (h_body != body->getHeight() || y_body != body->getYPos()){ - txt_cur_start->getCTextBoxObject()->clearScreenBuffer(); - txt_cur_event->getCTextBoxObject()->clearScreenBuffer(); - txt_cur_rest->getCTextBoxObject()->clearScreenBuffer(); + txt_curr_start->getCTextBoxObject()->clearScreenBuffer(); + txt_curr_event->getCTextBoxObject()->clearScreenBuffer(); + txt_curr_rest->getCTextBoxObject()->clearScreenBuffer(); txt_next_start->getCTextBoxObject()->clearScreenBuffer(); txt_next_event->getCTextBoxObject()->clearScreenBuffer(); txt_next_in->getCTextBoxObject()->clearScreenBuffer(); @@ -1837,36 +1837,36 @@ void CInfoViewer::display_Info(const char *current, const char *next, //current event if (current && update_current){ - if (txt_cur_event == NULL) - txt_cur_event = new CComponentsTextTransp(NULL, xStart, CurrInfoY - height, currTimeX - xStart, height); + if (txt_curr_event == NULL) + txt_curr_event = new CComponentsTextTransp(NULL, xStart, CurrInfoY - height, currTimeX - xStart, height); else - txt_cur_event->setDimensionsAll(xStart, CurrInfoY - height, currTimeX - xStart, height); + txt_curr_event->setDimensionsAll(xStart, CurrInfoY - height, currTimeX - xStart, height); - txt_cur_event->setText(current, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); - if (txt_cur_event->isPainted()) - txt_cur_event->hide(); - txt_cur_event->paint(CC_SAVE_SCREEN_YES); + txt_curr_event->setText(current, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); + if (txt_curr_event->isPainted()) + txt_curr_event->hide(); + txt_curr_event->paint(CC_SAVE_SCREEN_YES); if (runningStart && starttimes){ - if (txt_cur_start == NULL) - txt_cur_start = new CComponentsTextTransp(NULL, InfoX, CurrInfoY - height, info_time_width, height); + if (txt_curr_start == NULL) + txt_curr_start = new CComponentsTextTransp(NULL, InfoX, CurrInfoY - height, info_time_width, height); else - txt_cur_start->setDimensionsAll(InfoX, CurrInfoY - height, info_time_width, height); - txt_cur_start->setText(runningStart, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); - if (txt_cur_event->isPainted()) - txt_cur_event->hide(); - txt_cur_start->paint(CC_SAVE_SCREEN_YES); + txt_curr_start->setDimensionsAll(InfoX, CurrInfoY - height, info_time_width, height); + txt_curr_start->setText(runningStart, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); + if (txt_curr_event->isPainted()) + txt_curr_event->hide(); + txt_curr_start->paint(CC_SAVE_SCREEN_YES); } if (runningRest){ - if (txt_cur_rest == NULL) - txt_cur_rest = new CComponentsTextTransp(NULL, currTimeX, CurrInfoY - height, currTimeW, height); + if (txt_curr_rest == NULL) + txt_curr_rest = new CComponentsTextTransp(NULL, currTimeX, CurrInfoY - height, currTimeW, height); else - txt_cur_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height); - txt_cur_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); - if (txt_cur_rest->isPainted()) - txt_cur_rest->hide(); - txt_cur_rest->paint(CC_SAVE_SCREEN_YES); + txt_curr_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height); + txt_curr_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); + if (txt_curr_rest->isPainted()) + txt_curr_rest->hide(); + txt_curr_rest->paint(CC_SAVE_SCREEN_YES); } } @@ -2146,12 +2146,12 @@ void CInfoViewer::killTitle() body->kill(); - if (txt_cur_event) - txt_cur_event->kill(); - if (txt_cur_rest) - txt_cur_rest->kill(); - if (txt_cur_start) - txt_cur_start->kill(); + if (txt_curr_event) + txt_curr_event->kill(); + if (txt_curr_rest) + txt_curr_rest->kill(); + if (txt_curr_start) + txt_curr_start->kill(); if (txt_next_start) txt_next_start->kill(); if (txt_next_event) @@ -2423,9 +2423,9 @@ void CInfoViewer::ResetModules() { delete clock; clock = NULL; } - delete txt_cur_start; txt_cur_start = NULL; - delete txt_cur_event; txt_cur_event = NULL; - delete txt_cur_rest; txt_cur_rest = NULL; + delete txt_curr_start; txt_curr_start = NULL; + delete txt_curr_event; txt_curr_event = NULL; + delete txt_curr_rest; txt_curr_rest = NULL; delete txt_next_start; txt_next_start = NULL; delete txt_next_event; txt_next_event = NULL; delete txt_next_in; txt_next_in = NULL; diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index 7ef978ad5..3f318bd16 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -52,7 +52,7 @@ class CInfoViewer CInfoViewerBB* infoViewerBB; CComponentsFrmClock *clock; CComponentsShapeSquare *header , *numbox, *body, *rec; - CComponentsTextTransp *txt_cur_start, *txt_cur_event, *txt_cur_rest, *txt_next_start, *txt_next_event, *txt_next_in; + CComponentsTextTransp *txt_curr_start, *txt_curr_event, *txt_curr_rest, *txt_next_start, *txt_next_event, *txt_next_in; bool gotTime; bool recordModeActive;