##// END OF EJS Templates
Working version, need tests and improvments.
Jeandet Alexis -
r1:081cb3c84117 default
parent child
Show More
@@ -1,2 +1,3
1 genericBinaryFiles = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/genericBinaryFiles
1 genericBinaryFiles = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/genericBinaryFiles
2 qhexedit = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/QHexEdit
2
3
@@ -1,1 +1,2
1 acef0ecb71beb64a75c7184bad8b1943adbf88f4 genericBinaryFiles
1 00ff7d3b610fafd6408d2aabdcab6ae5ef618770 genericBinaryFiles
2 a4274329c9f05c742b3eb9753e77c47d27e838e9 qhexedit
@@ -10,6 +10,9 greaterThan(QT_MAJOR_VERSION, 4): QT +=
10
10
11 TARGET = execut
11 TARGET = execut
12 TEMPLATE = app
12 TEMPLATE = app
13 MOC_DIR = moc
14 RCC_DIR = resources
15 OBJECTS_DIR = obj
13
16
14 win32:CONFIG += dll
17 win32:CONFIG += dll
15 win32:CONFIG -= static
18 win32:CONFIG -= static
@@ -18,12 +21,18 win32:INCLUDEPATH += $${PWD}/genericBina
18 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include/libelf
21 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include/libelf
19 win32:DEFINES+=_ELF_WINDOWS_
22 win32:DEFINES+=_ELF_WINDOWS_
20 DEFINES+=RS232_debug
23 DEFINES+=RS232_debug
24 INCLUDEPATH += qhexedit genericBinaryFiles genericBinaryFiles/srec genericBinaryFiles/BinFile
25
21
26
22 win32:LIBS += $${PWD}/genericBinaryFiles/elf/libelfWin32/bin/libelf.a
27 win32:LIBS += $${PWD}/genericBinaryFiles/elf/libelfWin32/bin/libelf.a
23 unix:LIBS += -lelf
28 unix:LIBS += -lelf
24
29
25 SOURCES += main.cpp\
30 SOURCES += main.cpp\
26 mainwindow.cpp \
31 mainwindow.cpp \
32 qhexedit/qhexedit_p.cpp \
33 qhexedit/qhexedit.cpp \
34 qhexedit/xbytearray.cpp \
35 qhexedit/commands.cpp \
27 genericBinaryFiles/elf/elfinfowdgt.cpp \
36 genericBinaryFiles/elf/elfinfowdgt.cpp \
28 genericBinaryFiles/elf/elfparser.cpp \
37 genericBinaryFiles/elf/elfparser.cpp \
29 genericBinaryFiles/elf/elffile.cpp \
38 genericBinaryFiles/elf/elffile.cpp \
@@ -33,9 +42,14 SOURCES += main.cpp\
33 genericBinaryFiles/abstractbinfile.cpp \
42 genericBinaryFiles/abstractbinfile.cpp \
34 genericBinaryFiles/BinFile/binaryfile.cpp \
43 genericBinaryFiles/BinFile/binaryfile.cpp \
35 genericBinaryFiles/BinFile/binaryfilewidget.cpp \
44 genericBinaryFiles/BinFile/binaryfilewidget.cpp \
36 genericBinaryFiles/genericbinaryfilewidget.cpp
45 genericBinaryFiles/genericbinaryfilewidget.cpp \
46 genericBinaryFiles/qtablewidgetintitem.cpp
37
47
38 HEADERS += mainwindow.h \
48 HEADERS += mainwindow.h \
49 qhexedit/qhexedit_p.h \
50 qhexedit/qhexedit.h \
51 qhexedit/xbytearray.h \
52 qhexedit/commands.h \
39 genericBinaryFiles/elf/elfinfowdgt.h \
53 genericBinaryFiles/elf/elfinfowdgt.h \
40 genericBinaryFiles/elf/elfparser.h \
54 genericBinaryFiles/elf/elfparser.h \
41 genericBinaryFiles/elf/elffile.h \
55 genericBinaryFiles/elf/elffile.h \
@@ -45,10 +59,14 HEADERS += mainwindow.h \
45 genericBinaryFiles/abstractbinfile.h \
59 genericBinaryFiles/abstractbinfile.h \
46 genericBinaryFiles/BinFile/binaryfile.h \
60 genericBinaryFiles/BinFile/binaryfile.h \
47 genericBinaryFiles/BinFile/binaryfilewidget.h \
61 genericBinaryFiles/BinFile/binaryfilewidget.h \
48 genericBinaryFiles/genericbinaryfilewidget.h
62 genericBinaryFiles/genericbinaryfilewidget.h \
63 genericBinaryFiles/qtablewidgetintitem.h
49
64
50 FORMS += mainwindow.ui \
65 FORMS += mainwindow.ui \
51 genericBinaryFiles/elf/elffilewidget.ui \
66 genericBinaryFiles/elf/elffilewidget.ui \
52 genericBinaryFiles/srec/srecfilewidget.ui \
67 genericBinaryFiles/srec/srecfilewidget.ui \
53 genericBinaryFiles/BinFile/binaryfilewidget.ui \
68 genericBinaryFiles/BinFile/binaryfilewidget.ui \
54 genericBinaryFiles/genericbinaryfilewidget.ui
69 genericBinaryFiles/genericbinaryfilewidget.ui
70
71 RESOURCES += \
72 genericBinaryFiles/genericBinaryFiles.qrc
@@ -6,6 +6,19 MainWindow::MainWindow(QWidget *parent)
6 ui(new Ui::MainWindow)
6 ui(new Ui::MainWindow)
7 {
7 {
8 ui->setupUi(this);
8 ui->setupUi(this);
9 qApp->setStyleSheet(
10 "QGroupBox {\
11 border: 1px solid gray;\
12 border-radius: 9px;\
13 margin-top: 0.5em;\
14 }\
15 \
16 QGroupBox::title {\
17 subcontrol-origin: margin;\
18 left: 10px;\
19 padding: 0 3px 0 3px;\
20 }\
21 ");
9 }
22 }
10
23
11 MainWindow::~MainWindow()
24 MainWindow::~MainWindow()
@@ -1,7 +1,8
1 <?xml version="1.0" encoding="UTF-8"?>
1 <ui version="4.0">
2 <ui version="4.0">
2 <class>MainWindow</class>
3 <class>MainWindow</class>
3 <widget class="QMainWindow" name="MainWindow" >
4 <widget class="QMainWindow" name="MainWindow">
4 <property name="geometry" >
5 <property name="geometry">
5 <rect>
6 <rect>
6 <x>0</x>
7 <x>0</x>
7 <y>0</y>
8 <y>0</y>
@@ -9,16 +10,26
9 <height>300</height>
10 <height>300</height>
10 </rect>
11 </rect>
11 </property>
12 </property>
12 <property name="windowTitle" >
13 <property name="windowTitle">
13 <string>MainWindow</string>
14 <string>ExeCut</string>
14 </property>
15 </property>
15 <widget class="QMenuBar" name="menuBar" />
16 <widget class="QWidget" name="centralWidget">
16 <widget class="QToolBar" name="mainToolBar" />
17 <layout class="QGridLayout" name="gridLayout">
17 <widget class="QWidget" name="centralWidget" />
18 <item row="0" column="0">
18 <widget class="QStatusBar" name="statusBar" />
19 <widget class="genericBinaryFileWidget" name="widget" native="true"/>
20 </item>
21 </layout>
22 </widget>
19 </widget>
23 </widget>
20 <layoutDefault spacing="6" margin="11" />
24 <layoutdefault spacing="6" margin="11"/>
21 <pixmapfunction></pixmapfunction>
25 <customwidgets>
26 <customwidget>
27 <class>genericBinaryFileWidget</class>
28 <extends>QWidget</extends>
29 <header location="global">genericbinaryfilewidget.h</header>
30 <container>1</container>
31 </customwidget>
32 </customwidgets>
22 <resources/>
33 <resources/>
23 <connections/>
34 <connections/>
24 </ui>
35 </ui>
General Comments 0
You need to be logged in to leave comments. Login now