Skip to content

Added two names #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
starship006 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added two names #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e299e
Added two names
starship006 Sep 19, 2022
285a5d9
Macbook code
starship006 Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion PR_Practice.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
Sahil Jain
Sahil Jain
Cody Rushing
Mehul Murali
45 changes: 22 additions & 23 deletions graphics-service/inc/WeatherWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class WeatherWidget : public Widget {
Widget (x, y, w, h, n) {

Image weatherIcons = LoadImage("../resources/Adjusted-Weather-Icons.png");
ImageResize(&weatherIcons, IMAGE_SIZE_X, IMAGE_SIZE_Y);
ImageResize(&weatherIcons, 50, 50);
icons = LoadTextureFromImage(weatherIcons);
UnloadImage(weatherIcons);

Expand Down Expand Up @@ -60,7 +60,7 @@ class WeatherWidget : public Widget {
// Obtains rectangle for weather icon
Rectangle rect = iconMap["Clear"];
// Position for icon on screen
Vector2 icon_pos {pos_x, pos_y + 30};
Vector2 icon_pos {(float) pos_x, (float) (pos_y) + 30};
DrawTextureRec(icons, rect, icon_pos, WHITE);

DrawText(temperature.c_str(), pos_x + 80, pos_y + 60, 30, SKYBLUE);
Expand All @@ -74,32 +74,31 @@ class WeatherWidget : public Widget {
bool retrievedStrings = false;
bool isCelsius = false;
Json::Value informations = new Json::Value();
const int IMAGE_SIZE_X = MONITOR_SIZE_X / 2;
const int IMAGE_SIZE_Y = MONITOR_SIZE_Y / 1.5;
const int ICON_SIZE_X = IMAGE_SIZE_X / 8.5;
const int ICON_SIZE_Y = IMAGE_SIZE_Y / 6;

std::string temperature;
std::string city;
std::string weatherConditions;

std::map<std::string, Rectangle> iconMap = {
{"Clouds", {IMAGE_SIZE_X/10, IMAGE_SIZE_Y/7, ICON_SIZE_X, ICON_SIZE_Y}}, /* Cloudy */
{"Thunderstorm", {IMAGE_SIZE_X/10, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Thunderstorm */
{"Clear", {IMAGE_SIZE_X/3.8, IMAGE_SIZE_Y/6.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Sunny/Clear */
{"Rain", {IMAGE_SIZE_X/3.8, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Rain */
{"Drizzle", {IMAGE_SIZE_X/3.8, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Drizzle */
{"Snow", {IMAGE_SIZE_X/2.3, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Snow */
{"Mist", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Mist */
{"Smoke", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Smoke */
{"Haze", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Haze */
{"Dust", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Dust */
{"Fog", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Fog */
{"Sand", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Sand */
{"Dust", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Dust */
{"Ash", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Ash */
{"Squall", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Squall */
{"Tornado", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}}, /* Tornado */
{"Loading...", {IMAGE_SIZE_X/1.63, IMAGE_SIZE_Y/2.3, ICON_SIZE_X, ICON_SIZE_Y}} /* Default */
{"Clouds", {50, 50, 50, 50}}, /* Cloudy */
{"Thunderstorm", {50/10, 50/2.3, 50, 50}}, /* Thunderstorm */
{"Clear", {50/3.8, 50/6.3, 50, 50}}, /* Sunny/Clear */
{"Rain", {50/3.8, 50/2.3, 50, 50}}, /* Rain */
{"Drizzle", {50/3.8, 50/2.3, 50, 50}}, /* Drizzle */
{"Snow", {50/2.3, 50/2.3, 50, 50}}, /* Snow */
{"Mist", {50/1.63, 50/2.3, 50, 50}}, /* Mist */
{"Smoke", {50/1.63, 50/2.3, 50, 50}}, /* Smoke */
{"Haze", {50/1.63, 50/2.3, 50, 50}}, /* Haze */
{"Dust", {50/1.63, 50/2.3, 50, 50}}, /* Dust */
{"Fog", {50/1.63, 50/2.3, 50, 50}}, /* Fog */
{"Sand", {50/1.63, 50/2.3, 50, 50}}, /* Sand */
{"Dust", {50/1.63, 50/2.3, 50, 50}}, /* Dust */
{"Ash", {50/1.63, 50/2.3, 50, 50}}, /* Ash */
{"Squall", {50/1.63, 50/2.3, 50, 50}}, /* Squall */
{"Tornado", {50/1.63, 50/2.3, 50, 50}}, /* Tornado */
{"Loading...", {50/1.63, 50/2.3, 50, 50}} /* Default */
};
};


#endif
2 changes: 1 addition & 1 deletion graphics-service/src/Utility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ void get_http_request(bool* finished, const string url, Json::Value* storage) {
void draw_loading_wheel(uint32_t x, uint32_t y, uint32_t r) {

DrawCircleSectorLines(
Vector2{x, y}, r, 0.0, 0.5, 1, MAIN_COLOR
Vector2{(float) x, (float) y}, r, 0.0, 0.5, 1, MAIN_COLOR
);
}