Reorganized source code

SavvyCAN.pro

@@ -22,35 +22,22 @@ SOURCES += main.cpp\
     utility.cpp \
     qcustomplot.cpp \
     graphingwindow.cpp \
-    frameinfowindow.cpp \
     newgraphdialog.cpp \
     frameplaybackwindow.cpp \
     serialworker.cpp \
     candatagrid.cpp \
-    flowviewwindow.cpp \
     framesenderwindow.cpp \
-    dbchandler.cpp \
-    dbcmaineditor.cpp \
-    dbcsignaleditor.cpp \
     framefileio.cpp \
-    filecomparatorwindow.cpp \
     mainsettingsdialog.cpp \
     firmwareuploaderwindow.cpp \
-    discretestatewindow.cpp \
     connectionwindow.cpp \
     scriptingwindow.cpp \
     scriptcontainer.cpp \
     canfilter.cpp \
-    rangestatewindow.cpp \
-    dbc_classes.cpp \
-    dbcloadsavewindow.cpp \
-    fuzzingwindow.cpp \
-    udsscanwindow.cpp \
     can_structs.cpp \
-    isotp_interpreterwindow.cpp \
-    isotp_handler.cpp \
     canconnectionmodel.cpp \
     canbus.cpp \
+    motorcontrollerconfigwindow.cpp \
     connections/canconnection.cpp \
     connections/socketcan.cpp \
     connections/canconfactory.cpp \
@@ -59,8 +46,20 @@ SOURCES += main.cpp\
     re/sniffer/snifferitem.cpp \
     re/sniffer/sniffermodel.cpp \
     re/sniffer/snifferwindow.cpp \
-    motorcontrollerconfigwindow.cpp
+    dbc/dbc_classes.cpp \
-    motorcontrollerconfigwindow.cpp
+    dbc/dbchandler.cpp \
+    dbc/dbcloadsavewindow.cpp \
+    dbc/dbcmaineditor.cpp \
+    dbc/dbcsignaleditor.cpp \
+    re/discretestatewindow.cpp \
+    re/filecomparatorwindow.cpp \
+    re/flowviewwindow.cpp \
+    re/frameinfowindow.cpp \
+    re/fuzzingwindow.cpp \
+    re/isotp_handler.cpp \
+    re/isotp_interpreterwindow.cpp \
+    re/rangestatewindow.cpp \
+    re/udsscanwindow.cpp
 
 HEADERS  += mainwindow.h \
     can_structs.h \
@@ -68,37 +67,24 @@ HEADERS  += mainwindow.h \
     utility.h \
     qcustomplot.h \
     graphingwindow.h \
-    frameinfowindow.h \
     newgraphdialog.h \
     frameplaybackwindow.h \
     serialworker.h \
     candatagrid.h \
-    flowviewwindow.h \
     framesenderwindow.h \
     can_trigger_structs.h \
-    dbc_classes.h \
-    dbchandler.h \
-    dbcmaineditor.h \
-    dbcsignaleditor.h \
     framefileio.h \
     config.h \
-    filecomparatorwindow.h \
     mainsettingsdialog.h \
     firmwareuploaderwindow.h \
-    discretestatewindow.h \
     connectionwindow.h \
     scriptingwindow.h \
     scriptcontainer.h \
     canfilter.h \
-    rangestatewindow.h \
-    dbcloadsavewindow.h \
-    fuzzingwindow.h \
-    udsscanwindow.h \
-    isotp_interpreterwindow.h \
-    isotp_handler.h \
     canconnectionmodel.h \
     canbus.h \
     utils/lfqueue.h \
+    motorcontrollerconfigwindow.h \
     connections/canconnection.h \
     connections/socketcan.h \
     connections/canconconst.h \
@@ -108,32 +94,44 @@ HEADERS  += mainwindow.h \
     re/sniffer/snifferitem.h \
     re/sniffer/sniffermodel.h \
     re/sniffer/snifferwindow.h \
-    motorcontrollerconfigwindow.h
+    dbc/dbc_classes.h \
-    motorcontrollerconfigwindow.h
+    dbc/dbchandler.h \
+    dbc/dbcloadsavewindow.h \
+    dbc/dbcmaineditor.h \
+    dbc/dbcsignaleditor.h \
+    re/discretestatewindow.h \
+    re/filecomparatorwindow.h \
+    re/flowviewwindow.h \
+    re/frameinfowindow.h \
+    re/fuzzingwindow.h \
+    re/isotp_handler.h \
+    re/isotp_interpreterwindow.h \
+    re/rangestatewindow.h \
+    re/udsscanwindow.h
 
-FORMS    += mainwindow.ui \
+FORMS    += ui/candatagrid.ui \
-    graphingwindow.ui \
+    ui/connectionwindow.ui \
-    frameinfowindow.ui \
+    ui/dbcloadsavewindow.ui \
-    newgraphdialog.ui \
+    ui/dbcmaineditor.ui \
-    frameplaybackwindow.ui \
+    ui/dbcsignaleditor.ui \
-    candatagrid.ui \
+    ui/discretestatewindow.ui \
-    flowviewwindow.ui \
+    ui/filecomparatorwindow.ui \
-    framesenderwindow.ui \
+    ui/firmwareuploaderwindow.ui \
-    dbcmaineditor.ui \
+    ui/flowviewwindow.ui \
-    dbcsignaleditor.ui \
+    ui/frameinfowindow.ui \
-    filecomparatorwindow.ui \
+    ui/frameplaybackwindow.ui \
-    mainsettingsdialog.ui \
+    ui/framesenderwindow.ui \
-    firmwareuploaderwindow.ui \
+    ui/fuzzingwindow.ui \
-    discretestatewindow.ui \
+    ui/graphingwindow.ui \
-    connectionwindow.ui \
+    ui/isotp_interpreterwindow.ui \
-    scriptingwindow.ui \
+    ui/mainsettingsdialog.ui \
-    rangestatewindow.ui \
+    ui/mainwindow.ui \
-    dbcloadsavewindow.ui \
+    ui/motorcontrollerconfigwindow.ui \
-    fuzzingwindow.ui \
+    ui/newgraphdialog.ui \
-    udsscanwindow.ui \
+    ui/rangestatewindow.ui \
-    isotp_interpreterwindow.ui \
+    ui/scriptingwindow.ui \
-    snifferwindow.ui \
+    ui/snifferwindow.ui \
-    motorcontrollerconfigwindow.ui
+    ui/udsscanwindow.ui
 
 DISTFILES +=
 

canframemodel.h

@@ -7,7 +7,7 @@
 #include <QDebug>
 #include <QMutex>
 #include "can_structs.h"
-#include "dbchandler.h"
+#include "dbc/dbchandler.h"
 #include "connections/canconnection.h"
 
 class CANFrameModel: public QAbstractTableModel

graphingwindow.h

@@ -3,7 +3,7 @@
 
 #include "qcustomplot.h"
 #include "can_structs.h"
-#include "dbchandler.h"
+#include "dbc/dbchandler.h"
 
 #include <QDialog>
 

mainwindow.h

@@ -9,24 +9,24 @@
 #include "can_structs.h"
 #include "framefileio.h"
 #include "graphingwindow.h"
-#include "frameinfowindow.h"
+#include "re/frameinfowindow.h"
 #include "frameplaybackwindow.h"
-#include "flowviewwindow.h"
+#include "re/flowviewwindow.h"
 #include "framesenderwindow.h"
-#include "filecomparatorwindow.h"
+#include "re/filecomparatorwindow.h"
-#include "dbchandler.h"
+#include "dbc/dbchandler.h"
-#include "dbcmaineditor.h"
+#include "dbc/dbcmaineditor.h"
 #include "mainsettingsdialog.h"
 #include "firmwareuploaderwindow.h"
-#include "discretestatewindow.h"
+#include "re/discretestatewindow.h"
 #include "connectionwindow.h"
 #include "scriptingwindow.h"
-#include "rangestatewindow.h"
+#include "re/rangestatewindow.h"
-#include "dbcloadsavewindow.h"
+#include "dbc/dbcloadsavewindow.h"
-#include "fuzzingwindow.h"
+#include "re/fuzzingwindow.h"
-#include "udsscanwindow.h"
+#include "re/udsscanwindow.h"
 #include "re/sniffer/snifferwindow.h"
-#include "isotp_interpreterwindow.h"
+#include "re/isotp_interpreterwindow.h"
 #include "motorcontrollerconfigwindow.h"
 
 class ConnectionWindow;

newgraphdialog.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include "graphingwindow.h"
-#include "dbchandler.h"
+#include "dbc/dbchandler.h"
 
 namespace Ui {
 class NewGraphDialog;