Sv 4 battery indicator #9

ecl1ipse · 2018-08-11T01:52:37Z

A GUI widget that shows battery percentage.

…cator in the top left corner. When left is pressed, the charge reduces and when right is pressed, the charge increases

…howing percentage

… as color changing so changes in battery % are more noticeable

…change to red when the battery % is too high or low

…e creation of the widget to the cpp file to make it work with the subscriber. Indicator should be ready for testing

hjed

So I think you're on the right track with this. Now you need to make the charge variable a signal so you can use it in your qml code and get the data from ros.

src/gui/resources/main_window.qml

hjed · 2018-08-24T12:00:39Z

src/gui/src/main_application.cpp

@@ -14,6 +15,8 @@ void Main_Application::run() {
    qmlRegisterType<Stopwatch>("bluesat.owr", 1, 0, "Stopwatch");
    qmlRegisterType<ROS_Video_Component>("bluesat.owr", 1, 0, "ROSVideoComponent");
    qmlRegisterType<ROS_Signal_Strength>("bluesat.owr", 1, 0, "ROSSignalStrength");
+    qmlRegisterType<ROS_Battery_Indicator>("bluesat.owr", 1, 0, "ROSBatteryIndicator"); //added
+    //qmlRegisterSingletonType<ROS_Battery_Indicator>("bluesat.owr.singleton", 1, 0, "ROSBatterryIndicator",  &ros_battery_indicator::qml_instance);


commented out code (I think you can delete that)

hjed · 2018-08-24T12:01:36Z

src/ros_video_components/include/ros_video_components/ros_battery_indicator.hpp

+#include <std_msgs/Float32.h>
+
+
+class  ROS_Battery_Indicator: public QQuickPaintedItem {


This can probably just extend QQuickItem as it doesn't need the functionality of QQuickPaintedItem

hjed · 2018-08-24T12:01:54Z

src/ros_video_components/include/ros_video_components/ros_battery_indicator.hpp

+        // Constructor, takes parent widget, which defaults to null
+        ROS_Battery_Indicator(QQuickItem * parent = 0);
+
+        //void paint(QPainter *painter);


commented code

hjed · 2018-08-24T12:02:03Z

src/ros_video_components/src/ros_battery_indicator.cpp

+    int y = 20;
+    painter->drawRect(x,y,FULL_CHARGE,15);
+
+}*/


commented code

Battery indicator should be ready for testing

burrrrrr · 2018-09-08T02:34:57Z

src/gui/resources/main_window.qml

@@ -82,7 +112,7 @@ Window {


        }
-}
+}*/


Remove commented code

burrrrrr · 2018-09-08T02:40:36Z

src/ros_video_components/include/ros_video_components/ros_battery_indicator.hpp

@@ -40,7 +39,7 @@ class  ROS_Battery_Indicator: public QQuickPaintedItem {
        QString topic_value;
        bool ros_ready;

-    int charge; //the battery charge
+    float charge; //the battery charge


indentation

burrrrrr · 2018-09-08T02:44:04Z

src/ros_video_components/src/ros_battery_indicator.cpp


 ROS_Battery_Indicator::ROS_Battery_Indicator(QQuickItem * parent) :
    QQuickPaintedItem(parent),
-    topic_value("/rover/signal"),
+    topic_value("/rover/batttery"),
    ros_ready(false),
    charge(33) {


change this to a percentage out of 100

burrrrrr · 2018-09-08T02:50:10Z

src/ros_video_components/src/ros_battery_indicator.cpp

+
+    char percentage[6];
+    charge_p = (charge_p / 33) * 100;
+    sprintf(percentage, "%d%%", (int) charge_p);


charge is already a percentage, no need for another variable

burrrrrr · 2018-09-08T03:03:40Z

src/ros_video_components/src/ros_battery_indicator.cpp


+#define RECT_X 10
+#define RECT_Y 10
 #define FULL_CHARGE 33


FULL_CHARGE is a percentage now (100)

burrrrrr · 2018-09-08T03:04:58Z

src/ros_video_components/src/ros_battery_indicator.cpp


 ROS_Battery_Indicator::ROS_Battery_Indicator(QQuickItem * parent) :
    QQuickPaintedItem(parent),
-    topic_value("/rover/signal"),
+    topic_value("/rover/batttery"),


hash define topic in header

burrrrrr · 2018-09-08T03:05:09Z

src/ros_video_components/src/ros_battery_indicator.cpp

    ros_ready(false),
    charge(33) {
 }

 void ROS_Battery_Indicator::setup(ros::NodeHandle * nh) {

    signal_sub = nh->subscribe(
-        "/rover/signal", //TODO
+        "/rover/battery", //TODO


topic in header

burrrrrr · 2018-09-08T03:12:37Z

move battery related code to a new directory ros_battery_indicator with its own package.xml and CMakeLists file

wmpmiles · 2018-09-15T01:43:39Z

@ecl1ipse Master has been updated, please re-merge and resolve conflicts.

sajidanower23

Mostly style changes and consistency issues.

sajidanower23 · 2018-09-29T04:38:32Z

qt-gui.workspace.user.865c78c

@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8"?>


Remove this file.
Run git rm qt-gui.workspace.user.865c78c, commit and push.

sajidanower23 · 2018-09-29T04:39:27Z

src/gui/src/main_application.cpp

@@ -2,6 +2,7 @@
 #include <QDebug>
 #include "ros_video_components/ros_video_component.hpp"
 #include "ros_video_components/ros_signal_strength.hpp"
+#include "ros_video_components/ros_battery_indicator.hpp" //added


You don't need the comment //added 😛

sajidanower23 · 2018-09-29T05:31:37Z

src/ros_video_components/include/ros_video_components/ros_battery_indicator.hpp

+        void topic_changed();
+
+    private:
+        void receive_signal(const std_msgs::Float32::ConstPtr & msg);


receive_signal is not a proper variable name here. I named it receive_signal because it was literally receiving the signal strength of the antenna. For you, it would be something like receive_battery_voltage.

sajidanower23 · 2018-09-29T05:32:31Z

src/ros_video_components/include/ros_video_components/ros_battery_indicator.hpp

+
+        // ROS
+        ros::NodeHandle * nh;
+        ros::Subscriber signal_sub;


signal_sub, again, is not an appropriate name here. I would suggest battery_sub or something.

sajidanower23 · 2018-09-29T05:32:43Z

src/ros_video_components/include/ros_video_components/ros_battery_indicator.hpp

+        QString topic_value;
+        bool ros_ready;
+
+    float charge; //the battery charge


Indentation is off

ecl1ipse added 6 commits May 5, 2018 13:06

Button battery indicator OWRS-SV-4 #time 2h 5m Created a battery indi…

d940aaf

…cator in the top left corner. When left is pressed, the charge reduces and when right is pressed, the charge increases

Style changes -SV-4 #time 1h 30m Added some style features and text s…

47fac4c

…howing percentage

Final functionality OWRS-SV-4 #time 45m Add a percentage sign as well…

67a3414

… as color changing so changes in battery % are more noticeable

Add error signs OWRS-SV-4 #time 30m Made the whole battery indicator …

102a130

…change to red when the battery % is too high or low

SV-4 #time 2h Debugging

6b01515

Subscriber set up OWRS-SV-4-battery-indicator Xd 1 Xh 4 Xm 0 Moved th…

e7717c2

…e creation of the widget to the cpp file to make it work with the subscriber. Indicator should be ready for testing

ecl1ipse requested review from sajidanower23 and wmpmiles August 11, 2018 01:52

hjed reviewed Aug 24, 2018

View reviewed changes

ecl1ipse added 2 commits September 1, 2018 11:53

Added battery indicator SV-4 #time 3h

671ca5b

Battery indicator should be ready for testing

Merge branch 'master' into SV-4-battery-indicator

02395ca

wmpmiles requested a review from burrrrrr September 8, 2018 01:56

burrrrrr reviewed Sep 8, 2018

View reviewed changes

src/gui/resources/main_window.qml Outdated

@@ -82,7 +112,7 @@ Window {

}

}

}*/

Copy link

burrrrrr Sep 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove commented code

burrrrrr reviewed Sep 8, 2018

View reviewed changes

ecl1ipse added 3 commits September 22, 2018 12:52

Merge branch 'master' into SV-4-battery-indicator

4f5c860

SV-4-battery-indicator Bug fixing #time 15m

d3e2718

SV-4-battery-indicator Making the battery indicator visisble #time 30m

daa822a

sajidanower23 reviewed Sep 29, 2018

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sv 4 battery indicator #9

Sv 4 battery indicator #9

ecl1ipse commented Aug 11, 2018

hjed left a comment

hjed Aug 24, 2018

hjed Aug 24, 2018

hjed Aug 24, 2018

hjed Aug 24, 2018

burrrrrr Sep 8, 2018

burrrrrr Sep 8, 2018

burrrrrr Sep 8, 2018

burrrrrr Sep 8, 2018

burrrrrr Sep 8, 2018

burrrrrr Sep 8, 2018

burrrrrr Sep 8, 2018

burrrrrr commented Sep 8, 2018

wmpmiles commented Sep 15, 2018

sajidanower23 left a comment

sajidanower23 Sep 29, 2018

sajidanower23 Sep 29, 2018

sajidanower23 Sep 29, 2018

sajidanower23 Sep 29, 2018

sajidanower23 Sep 29, 2018

		#include <std_msgs/Float32.h>


		class ROS_Battery_Indicator: public QQuickPaintedItem {

@@ @@ -82,7 +112,7 @@ Window { @@
                       }
-              }
+              }*/

Sv 4 battery indicator #9

Are you sure you want to change the base?

Sv 4 battery indicator #9

Conversation

ecl1ipse commented Aug 11, 2018

hjed left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

burrrrrr commented Sep 8, 2018

wmpmiles commented Sep 15, 2018

sajidanower23 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment