mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Commit: 39e5880a70
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-28 (Wed, 28 Sep 2016)
This commit is contained in:
vanhofen
2016-09-28 21:14:17 +02:00
parent 9459a704f8 eb33a53af9
commit d38da117e5
5 changed files with 100 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/components/cc_frm_signalbars.cpp
View File

@@ -29,7 +29,6 @@
#include <global.h>
#include <neutrino.h>
#include <zapit/femanager.h>
#include "cc_frm_signalbars.h"
#include <sstream>
@@ -193,7 +192,9 @@ void CSignalBar::initSBarName()
void CSignalBar::Refresh()
{
//get current value from frontend
sb_signal = sb_frontend->getSignalStrength();
sb_signal = 0;
if (sb_frontend)
sb_signal = sb_frontend->getSignalStrength();
//reinit items with current values
initSBItems();
@@ -243,7 +244,9 @@ void CSignalBar::paint(bool do_save_bg)
void CSignalNoiseRatioBar::Refresh()
{
//get current value from frontend
sb_signal = sb_frontend->getSignalNoiseRatio();
sb_signal = 0;
if (sb_frontend)
sb_signal = sb_frontend->getSignalNoiseRatio();
//reinit items with current values
initSBItems();
@@ -256,7 +259,7 @@ CSignalBox::CSignalBox(const int& xpos, const int& ypos, const int& w, const int
initVarSigBox();
vertical = vert;
sbx_frontend = (frontend_ref == NULL) ? CFEManager::getInstance()->getLiveFE() : frontend_ref;
sbx_frontend = frontend_ref;
x = xpos;
y = ypos;
width = w;
@@ -339,10 +342,8 @@ void CSignalBox::paintScale()
void CSignalBox::paint(bool do_save_bg)
{
//paint frame and body
if (!is_painted){
initSignalItems();
if (!is_painted)
paintForm(do_save_bg);
}
//paint current signal value
paintScale();

7
src/gui/components/cc_frm_signalbars.h
View File

@@ -116,7 +116,7 @@ class CSignalBar : public CComponentsForm, public CCTextScreen
CSignalBar(const int& xpos, const int& ypos, const int& w, const int& h, CFrontend *frontend_ref, const std::string& sb_name = "SIG", CComponentsForm *parent = NULL);
///assigns the current used frontend, simplified a tuner object, see frontend_c.h
virtual void setFrontEnd(CFrontend *frontend_ref){sb_frontend = frontend_ref;};
virtual void setFrontEnd(CFrontend *frontend_ref){if (sb_frontend != frontend_ref) {sb_lastsig = 0; sb_frontend = frontend_ref;}}
///assigns font for caption
virtual void setTextFont(Font* font_text){sb_font = font_text;};
///sets the caption color, see also property 'sb_caption_color'
@@ -291,13 +291,16 @@ class CSignalBox : public CComponentsForm, public CCTextScreen
public:
///class constructor for signal noise ratio.
CSignalBox(const int& xpos, const int& ypos, const int& w, const int& h, CFrontend *frontend_ref = NULL, const bool vertical = true, CComponentsForm *parent = NULL, const std::string& sig_name = "SIG", const std::string& snr_name = "SNR" );
CSignalBox(const int& xpos, const int& ypos, const int& w, const int& h, CFrontend *frontend_ref, const bool vertical = true, CComponentsForm *parent = NULL, const std::string& sig_name = "SIG", const std::string& snr_name = "SNR" );
///returns the signal object, type = CSignalBar*
CSignalBar* getScaleObject(){return sbar;};
///returns the signal noise ratio object, type = CSignalNoiseRatioBar*
CSignalNoiseRatioBar* getLabelObject(){return snrbar;};
///assigns the current used frontend, simplified a tuner object, see frontend_c.h
void setFrontEnd(CFrontend *frontend_ref){sbx_frontend = frontend_ref;}
///sets the caption color of signalbars, see also property 'sbx_caption_color'
void setTextColor(const fb_pixel_t& caption_color){ sbx_caption_color = caption_color;};
///get caption color of signalbars, see also property 'sbx_caption_color'