mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- weather: code formatting using astyle

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-03-20 17:05:33 +01:00
committed by Thilo Graf
parent 7fedf87ea6
commit e6a719fb91
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui/weather.cpp
View File

@@ -42,10 +42,10 @@
#define UPDATE_CYCLE 15 // minutes #define UPDATE_CYCLE 15 // minutes
CWeather* CWeather::getInstance() CWeather *CWeather::getInstance()
{ {
static CWeather* weather = NULL; static CWeather *weather = NULL;
if(!weather) if (!weather)
weather = new CWeather(); weather = new CWeather();
return weather; return weather;
} }
@@ -89,14 +89,14 @@ bool CWeather::checkUpdate(bool forceUpdate)
bool CWeather::GetWeatherDetails() bool CWeather::GetWeatherDetails()
{ {
printf("[CWeather]: %s\n",__func__); printf("[CWeather]: %s\n", __func__);
last_time = time(NULL); last_time = time(NULL);
if (!g_settings.weather_enabled) if (!g_settings.weather_enabled)
return false; return false;
std::string data = "https://api.darksky.net/forecast/"+key+"/"+coords+"?units=si&lang=de&exclude=minutely,hourly,flags,alerts"; std::string data = "https://api.darksky.net/forecast/" + key + "/" + coords + "?units=si&lang=de&exclude=minutely,hourly,flags,alerts";
std::string answer; std::string answer;
double found = 0; double found = 0;
@@ -118,38 +118,38 @@ bool CWeather::GetWeatherDetails()
return false; return false;
} }
found = DataValues["currently"].get("time",0).asDouble(); found = DataValues["currently"].get("time", 0).asDouble();
printf("[CWeather]: results found: %lf\n",found); printf("[CWeather]: results found: %lf\n", found);
if (found > 0) if (found > 0)
{ {
act_temp = DataValues["currently"].get("temperature","").asFloat(); act_temp = DataValues["currently"].get("temperature", "").asFloat();
timezone = DataValues["timezone"].asString(); timezone = DataValues["timezone"].asString();
act_wicon = DataValues["currently"].get("icon","").asString(); act_wicon = DataValues["currently"].get("icon", "").asString();
if (act_wicon.empty()) if (act_wicon.empty())
act_wicon = "unknown.png"; act_wicon = "unknown.png";
else else
act_wicon = act_wicon+".png"; act_wicon = act_wicon + ".png";
printf("[CWeather]: temp in %s (%s): %.1f - %s\n", city.c_str(), timezone.c_str(), act_temp, act_wicon.c_str()); printf("[CWeather]: temp in %s (%s): %.1f - %s\n", city.c_str(), timezone.c_str(), act_temp, act_wicon.c_str());
forecast_data weatherinfo; forecast_data weatherinfo;
Json::Value elements = DataValues["daily"]["data"]; Json::Value elements = DataValues["daily"]["data"];
for (unsigned int i = 0; i<elements.size(); i++) for (unsigned int i = 0; i < elements.size(); i++)
{ {
weatherinfo.timestamp = elements[i].get("time",0).asDouble(); weatherinfo.timestamp = elements[i].get("time", 0).asDouble();
weatherinfo.wicon = elements[i].get("icon","").asString(); weatherinfo.wicon = elements[i].get("icon", "").asString();
if (weatherinfo.wicon.empty()) if (weatherinfo.wicon.empty())
weatherinfo.wicon = "unknown.png"; weatherinfo.wicon = "unknown.png";
else else
weatherinfo.wicon = weatherinfo.wicon+".png"; weatherinfo.wicon = weatherinfo.wicon + ".png";
weatherinfo.min_temp = elements[i].get("temperatureMin","").asFloat(); weatherinfo.min_temp = elements[i].get("temperatureMin", "").asFloat();
weatherinfo.max_temp = elements[i].get("temperatureMax","").asFloat(); weatherinfo.max_temp = elements[i].get("temperatureMax", "").asFloat();
struct tm * timeinfo; struct tm *timeinfo;
timeinfo = localtime(&weatherinfo.timestamp); timeinfo = localtime(&weatherinfo.timestamp);
printf("[CWeather]: temp %d.%d.%d: min %.1f - max %.1f -> %s\n", timeinfo->tm_mday, timeinfo->tm_mon, timeinfo->tm_year+1900, weatherinfo.min_temp,weatherinfo.max_temp,weatherinfo.wicon.c_str()); printf("[CWeather]: temp %d.%d.%d: min %.1f - max %.1f -> %s\n", timeinfo->tm_mday, timeinfo->tm_mon, timeinfo->tm_year + 1900, weatherinfo.min_temp, weatherinfo.max_temp, weatherinfo.wicon.c_str());
v_forecast.push_back(weatherinfo); v_forecast.push_back(weatherinfo);
} }
return true; return true;
@@ -164,19 +164,19 @@ void CWeather::show(int x, int y)
if (form == NULL) if (form == NULL)
form = new CComponentsForm(); form = new CComponentsForm();
if (!g_settings.weather_enabled || coords.empty() ) if (!g_settings.weather_enabled || coords.empty())
return; return;
CComponentsPicture *ptmp = new CComponentsPicture(RADIUS_MID, RADIUS_MID, getActIcon()); CComponentsPicture *ptmp = new CComponentsPicture(RADIUS_MID, RADIUS_MID, getActIcon());
ptmp->setColorBody(form->getColorBody()); ptmp->setColorBody(form->getColorBody());
form->addCCItem(ptmp); form->addCCItem(ptmp);
CComponentsText *temp = new CComponentsText(ptmp->getWidth()+2*RADIUS_MID, ptmp->getHeight()/2 + RADIUS_MID - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getHeight()/2, 0, 0, getActTemp(), CTextBox::AUTO_WIDTH,g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]); CComponentsText *temp = new CComponentsText(ptmp->getWidth() + 2*RADIUS_MID, ptmp->getHeight()/2 + RADIUS_MID - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getHeight()/2, 0, 0, getActTemp(), CTextBox::AUTO_WIDTH, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]);
temp->doPaintBg(false); temp->doPaintBg(false);
temp->setTextColor(COL_INFOBAR_TEXT); temp->setTextColor(COL_INFOBAR_TEXT);
form->addCCItem(temp); form->addCCItem(temp);
form->setDimensionsAll(x, y, ptmp->getWidth()+temp->getWidth()+2*RADIUS_MID, ptmp->getHeight()+2*RADIUS_MID); form->setDimensionsAll(x, y, ptmp->getWidth() + temp->getWidth() + 2*RADIUS_MID, ptmp->getHeight() + 2*RADIUS_MID);
form->enableShadow(); form->enableShadow();
form->paint(); form->paint();
} }

10
src/gui/weather.h
View File

@@ -44,7 +44,7 @@ typedef struct
class CWeather class CWeather
{ {
private: private:
std::string coords; std::string coords;
std::string city; std::string city;
std::string timezone; std::string timezone;
@@ -56,8 +56,8 @@ private:
bool GetWeatherDetails(); bool GetWeatherDetails();
time_t last_time; time_t last_time;
public: public:
static CWeather* getInstance(); static CWeather *getInstance();
CWeather(); CWeather();
~CWeather(); ~CWeather();
bool checkUpdate(bool forceUpdate = false); bool checkUpdate(bool forceUpdate = false);
@@ -66,11 +66,11 @@ public:
void hide(); void hide();
std::string getActTemp() std::string getActTemp()
{ {
return to_string((int)(act_temp+0.5))+"°C"; return to_string((int)(act_temp + 0.5)) + "°C";
}; };
std::string getActIcon() std::string getActIcon()
{ {
return ICONSDIR"/weather/"+act_wicon; return ICONSDIR"/weather/" + act_wicon;
}; };
}; };