astyle --recursive --indent=spaces=2 --style=kr --indent-col1-comments --break-blocks --convert-tabs --max-code-length=200
This is done for better merging branch/LG_PRE_RELEASE_0.3 into trunk (same process is applied on this branch) git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7073 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Lionel Gauthier
@@ -32,10 +32,10 @@
|
||||
* \brief this thread is to process the communication between the simulator and the visualisor
|
||||
* \author M. Mosli
|
||||
* \date 2012
|
||||
* \version 0.1
|
||||
* \version 0.1
|
||||
* \company Eurecom
|
||||
* \email: mosli@eurecom.fr
|
||||
*/
|
||||
*/
|
||||
|
||||
#ifndef COMMUNICATIONTHREAD_H
|
||||
#define COMMUNICATIONTHREAD_H
|
||||
@@ -48,19 +48,19 @@
|
||||
|
||||
class CommunicationThread : public QThread
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
CommunicationThread(MyWindow* window);
|
||||
public:
|
||||
CommunicationThread(MyWindow* window);
|
||||
|
||||
signals:
|
||||
void newData(QString data, int frame);
|
||||
void newPosition();
|
||||
void endOfTheSimulation();
|
||||
signals:
|
||||
void newData(QString data, int frame);
|
||||
void newPosition();
|
||||
void endOfTheSimulation();
|
||||
|
||||
private:
|
||||
void run();
|
||||
MyWindow* window;
|
||||
private:
|
||||
void run();
|
||||
MyWindow* window;
|
||||
};
|
||||
|
||||
#endif // COMMUNICATIONTHREAD_H
|
||||
|
||||
@@ -32,10 +32,10 @@
|
||||
* \brief manages the window and its components
|
||||
* \author M. Mosli
|
||||
* \date 2012
|
||||
* \version 0.1
|
||||
* \version 0.1
|
||||
* \company Eurecom
|
||||
* \email: mosli@eurecom.fr
|
||||
*/
|
||||
*/
|
||||
|
||||
#ifndef MYWINDOW_H
|
||||
#define MYWINDOW_H
|
||||
@@ -55,49 +55,49 @@
|
||||
|
||||
class MyWindow : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
MyWindow();
|
||||
QTextEdit* getConsoleField();
|
||||
OpenGLWidget* getGL();
|
||||
void importMap();
|
||||
~MyWindow();
|
||||
public:
|
||||
MyWindow();
|
||||
QTextEdit* getConsoleField();
|
||||
OpenGLWidget* getGL();
|
||||
void importMap();
|
||||
~MyWindow();
|
||||
|
||||
public slots:
|
||||
void writeToConsole(QString data, int frame);
|
||||
void endOfTheSimulation();
|
||||
void setDrawConnections(int draw);
|
||||
void setUseMap(int use);
|
||||
void setUsedMap(int map);
|
||||
void setNodesColor(int index);
|
||||
void setLinksColor(int index);
|
||||
void updateSize(int size);
|
||||
void updateSupervNode(int id);
|
||||
void updateSupervData();
|
||||
|
||||
signals:
|
||||
void exitSignal();
|
||||
public slots:
|
||||
void writeToConsole(QString data, int frame);
|
||||
void endOfTheSimulation();
|
||||
void setDrawConnections(int draw);
|
||||
void setUseMap(int use);
|
||||
void setUsedMap(int map);
|
||||
void setNodesColor(int index);
|
||||
void setLinksColor(int index);
|
||||
void updateSize(int size);
|
||||
void updateSupervNode(int id);
|
||||
void updateSupervData();
|
||||
|
||||
private:
|
||||
int pattern;
|
||||
QComboBox *used_map;
|
||||
QLabel *rssi_tab;
|
||||
QLabel *specific_position;
|
||||
QLabel *specific_state;
|
||||
QLabel *specific_dist;
|
||||
QLabel *specific_connected_enb;
|
||||
QLabel *specific_pathloss;
|
||||
QLabel *specific_rnti;
|
||||
QLabel *specific_rsrp;
|
||||
QLabel *specific_rsrq;
|
||||
QLabel *generic_frame;
|
||||
QLabel *simulation_data;
|
||||
QFrame *control_field;
|
||||
QFrame *openGL_field;
|
||||
OpenGLWidget *openGl;
|
||||
QFrame *console_field;
|
||||
QTextEdit *output;
|
||||
signals:
|
||||
void exitSignal();
|
||||
|
||||
private:
|
||||
int pattern;
|
||||
QComboBox *used_map;
|
||||
QLabel *rssi_tab;
|
||||
QLabel *specific_position;
|
||||
QLabel *specific_state;
|
||||
QLabel *specific_dist;
|
||||
QLabel *specific_connected_enb;
|
||||
QLabel *specific_pathloss;
|
||||
QLabel *specific_rnti;
|
||||
QLabel *specific_rsrp;
|
||||
QLabel *specific_rsrq;
|
||||
QLabel *generic_frame;
|
||||
QLabel *simulation_data;
|
||||
QFrame *control_field;
|
||||
QFrame *openGL_field;
|
||||
OpenGLWidget *openGl;
|
||||
QFrame *console_field;
|
||||
QTextEdit *output;
|
||||
};
|
||||
|
||||
#endif // MYWINDOW_H
|
||||
|
||||
@@ -32,10 +32,10 @@
|
||||
* \brief area devoted to draw the nodes and their connections
|
||||
* \author M. Mosli
|
||||
* \date 2012
|
||||
* \version 0.1
|
||||
* \version 0.1
|
||||
* \company Eurecom
|
||||
* \email: mosli@eurecom.fr
|
||||
*/
|
||||
*/
|
||||
|
||||
|
||||
#ifndef OPENGLWIDGET_H
|
||||
@@ -48,35 +48,35 @@
|
||||
|
||||
class OpenGLWidget : public QGLWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
OpenGLWidget();
|
||||
void drawGrid();
|
||||
void drawNodes();
|
||||
void loadTexture();
|
||||
void drawConnections();
|
||||
void drawSquare(int digit, int back, int w, int h, int sw, int sh);
|
||||
void drawBaseStation(int digit);
|
||||
void setDrawConnections(int draw);
|
||||
void setUseMap(int use);
|
||||
void setUsedMap(int map);
|
||||
void setUsedMap(QString map_path);
|
||||
void setLinksColor(int index);
|
||||
void setNodesColor(int index);
|
||||
void updateNodeSize(int size);
|
||||
~OpenGLWidget();
|
||||
public:
|
||||
OpenGLWidget();
|
||||
void drawGrid();
|
||||
void drawNodes();
|
||||
void loadTexture();
|
||||
void drawConnections();
|
||||
void drawSquare(int digit, int back, int w, int h, int sw, int sh);
|
||||
void drawBaseStation(int digit);
|
||||
void setDrawConnections(int draw);
|
||||
void setUseMap(int use);
|
||||
void setUsedMap(int map);
|
||||
void setUsedMap(QString map_path);
|
||||
void setLinksColor(int index);
|
||||
void setNodesColor(int index);
|
||||
void updateNodeSize(int size);
|
||||
~OpenGLWidget();
|
||||
|
||||
protected:
|
||||
void paintGL();
|
||||
protected:
|
||||
void paintGL();
|
||||
|
||||
public slots:
|
||||
void drawNewPosition();
|
||||
public slots:
|
||||
void drawNewPosition();
|
||||
|
||||
private:
|
||||
GLuint textures[9];
|
||||
bool draw_connections;
|
||||
QImage b_station;
|
||||
private:
|
||||
GLuint textures[9];
|
||||
bool draw_connections;
|
||||
QImage b_station;
|
||||
};
|
||||
|
||||
#endif // OPENGLWIDGET_H
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
|
||||
/*! \file structures.h
|
||||
* \brief structures used for the
|
||||
* \brief structures used for the
|
||||
* \author M. Mosli
|
||||
* \date 2012
|
||||
* \version 0.1
|
||||
* \version 0.1
|
||||
* \company Eurecom
|
||||
* \email: mosli@eurecom.fr
|
||||
*/
|
||||
*/
|
||||
|
||||
#ifndef STRUCTURES_H
|
||||
#define STRUCTURES_H
|
||||
@@ -43,7 +43,7 @@
|
||||
#ifndef __PHY_IMPLEMENTATION_DEFS_H__
|
||||
#define Maxneighbor 64
|
||||
#define NUMBER_OF_UE_MAX 64
|
||||
#define NUMBER_OF_eNB_MAX 3
|
||||
#define NUMBER_OF_eNB_MAX 3
|
||||
#define NB_ANTENNAS_RX 4
|
||||
#endif
|
||||
//
|
||||
@@ -57,7 +57,7 @@ typedef struct Geo {
|
||||
int node_type;
|
||||
int Neighbors; // number of neighboring nodes (distance between the node and its neighbors < 100)
|
||||
int Neighbor[NUMBER_OF_UE_MAX]; // array of its neighbors
|
||||
//relavent to UE only
|
||||
//relavent to UE only
|
||||
unsigned short state;
|
||||
unsigned short rnti;
|
||||
unsigned int connected_eNB;
|
||||
@@ -65,14 +65,14 @@ typedef struct Geo {
|
||||
int RSRP;
|
||||
int RSRQ;
|
||||
int Pathloss;
|
||||
/// more info to display
|
||||
/// more info to display
|
||||
} Geo;
|
||||
|
||||
typedef struct Data_Flow_Unit {
|
||||
// int total_num_nodes;
|
||||
struct Geo geo[NUMBER_OF_eNB_MAX+NUMBER_OF_UE_MAX];
|
||||
struct Geo geo[NUMBER_OF_eNB_MAX+NUMBER_OF_UE_MAX];
|
||||
int end;
|
||||
}Data_Flow_Unit;
|
||||
} Data_Flow_Unit;
|
||||
|
||||
|
||||
#endif // STRUCTURES_H
|
||||
|
||||
Reference in New Issue
Block a user