Skip to content

Commit

Permalink
Merge branch 'perdu-view' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Imeguras committed Nov 13, 2023
2 parents 6baf487 + 997f5e1 commit ee24ea9
Show file tree
Hide file tree
Showing 8 changed files with 3,757 additions and 118 deletions.
2,822 changes: 2,822 additions & 0 deletions Doxyfile
View file

Large diffs are not rendered by default.

16 changes: 10 additions & 6 deletions LukHudX.pro
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
######################################################################
# Automatically generated by qmake (3.1) Wed Feb 8 13:19:20 2023
######################################################################
DEFINES += __LART_T14__
DEFINES += __LART_T24__

QT += core gui widgets serialport

Expand Down Expand Up @@ -33,9 +33,11 @@ HEADERS += \
src/contarotacoes.h \
src/contamudancas.h \
src/mainwindow.h \
src/tfortwindow.h\
src/voidsterdebugwindow.h \
#Biz Logic
src/store.h \
src/tfortwindow.h
src/store.h


SOURCES += \
#Constants Macros Aux stuff
Expand All @@ -47,10 +49,12 @@ SOURCES += \
src/mainwindow.cpp \
#Biz Logic
src/store.cpp \
src/tfortwindow.cpp
src/tfortwindow.cpp \
src/voidsterdebugwindow.cpp

FORMS += src/mainwindow.ui \
src/tfortwindow.ui
src/tfortwindow.ui \
src/voidsterdebugwindow.ui

TRANSLATIONS += src/LukHudX_1_en_US.ts

Expand All @@ -73,7 +77,7 @@ test{
test/tst_contarotacoes.h \
test/tst_contamudancas.h \
test/tst_serialport.h \
test/tst_flabels.h
test/tst_flabels.h



Expand Down
14 changes: 11 additions & 3 deletions src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@
#endif

#ifdef __LART_T24__
#ifdef __LART_DEBUG__
#include "voidsterdebugwindow.h"
#else
#include "mainwindow.h"
#endif
#endif

#include <QApplication>
#include <QLocale>
Expand All @@ -32,9 +36,13 @@ int main(int argc, char *argv[]){
}
}

#ifdef __LART_T24__
MainWindow w;
w.show();
#ifdef __LART_T24__
#ifdef __LART_DEBUG__

#else
MainWindow w;
w.show();
#endif
#endif
#ifdef __LART_T14__
TfortWindow w;
Expand Down
199 changes: 98 additions & 101 deletions src/mainwindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,107 +529,104 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="Soc_Prefix">
<property name="text">
<string>State Of Charge: </string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="FLabel" name="Soc_Label">
<property name="text">
<string>__0__%</string>
</property>
</widget>
</item>

<item row="4" column="0">
<widget class="QLabel" name="BatteryTemperature_Prefix">
<property name="text">
<string>Battery Temperature: </string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="FLabel" name="BatteryTemperature_Label">
<property name="text">
<string>__0__</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="InverterTemperature_Prefix">
<property name="text">
<string>Inverter Temperature: </string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="FLabel" name="InverterTemperature_Label">
<property name="text">
<string>__0__</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="Power_Prefix">
<property name="text">
<string>Power: </string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="FLabel" name="Power_Label">
<property name="text">
<string>__0__</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="LapCount_Prefix">
<property name="text">
<string>Lap Count: </string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="FLabel" name="LapCount_Label">
<property name="text">
<string>__0__</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="DiffTime_Prefix">
<property name="text">
<string>Lap Time Difference: </string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="FLabel" name="DiffTime_Label">
<property name="text">
<string>__00:00.000__</string>
</property>
</widget>
</item>

<item row="9" column="0">
<widget class="QLabel" name="LapTime_Prefix">
<property name="text">
<string>Lap Time: </string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="FLabel" name="LapTime_Label">
<property name="text">
<string>__00:00.000__</string>
</property>
</widget>
</item>

<item row="3" column="0">
<widget class="QLabel" name="Soc_Prefix">
<property name="text">
<string>State Of Charge: </string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="FLabel" name="Soc_Label">
<property name="text">
<string>__0__%</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="BatteryTemperature_Prefix">
<property name="text">
<string>Battery Temperature: </string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="FLabel" name="BatteryTemperature_Label">
<property name="text">
<string>__0__</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="InverterTemperature_Prefix">
<property name="text">
<string>Inverter Temperature: </string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="FLabel" name="InverterTemperature_Label">
<property name="text">
<string>__0__</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="Power_Prefix">
<property name="text">
<string>Power: </string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="FLabel" name="Power_Label">
<property name="text">
<string>__0__</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="LapCount_Prefix">
<property name="text">
<string>Lap Count: </string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="FLabel" name="LapCount_Label">
<property name="text">
<string>__0__</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="DiffTime_Prefix">
<property name="text">
<string>Lap Time Difference: </string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="FLabel" name="DiffTime_Label">
<property name="text">
<string>__00:00.000__</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="LapTime_Prefix">
<property name="text">
<string>Lap Time: </string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="FLabel" name="LapTime_Label">
<property name="text">
<string>__00:00.000__</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
Expand Down
10 changes: 2 additions & 8 deletions src/tfortwindow.ui
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TfortWindow</class>
<widget class="TfortWindow" name="TfortWindow">
<widget class="QMainWindow" name="TfortWindow">
<property name="geometry">
<rect>
<x>0</x>
Expand Down Expand Up @@ -626,7 +626,7 @@
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>6</number>
</property>
Expand Down Expand Up @@ -703,12 +703,6 @@
<extends>QLabel</extends>
<header location="global">src/flabel.h</header>
</customwidget>
<customwidget>
<class>TfortWindow</class>
<extends>QWidget</extends>
<header>src/tfortwindow.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
Expand Down
Loading

0 comments on commit ee24ea9

Please sign in to comment.