uni-days/sea_transport_project
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code style refactoring done

Browse source
This commit is contained in:
Andrew nuark G 2021-01-10 19:49:24 +07:00
parent 02766bd5d2
commit c5f1572efa
36 changed files with 202 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sea_transport/viewmodels/cargoviewmodel.cpp
View file

@ -1,5 +1,6 @@
#include "cargoviewmodel.h"
CargoViewModel::CargoViewModel(QObject *parent) : QAbstractTableModel(parent) {
}

2
sea_transport/viewmodels/cargoviewmodel.h
View file

@ -6,7 +6,9 @@
#include "entities/cargo_entity.h"
class CargoViewModel : public QAbstractTableModel {
private:
Q_OBJECT
QVector<cargo_entity> _data;

4
sea_transport/viewmodels/deliverypointsviewmodel.cpp
View file

@ -1,5 +1,6 @@
#include "deliverypointsviewmodel.h"
DeliveryPointsViewModel::DeliveryPointsViewModel(QObject *parent) : QAbstractTableModel(parent) {
}
@ -12,7 +13,8 @@ int DeliveryPointsViewModel::columnCount(const QModelIndex &/*parent*/) const {
return 4;
}
QVariant DeliveryPointsViewModel::headerData(int section, Qt::Orientation orientation, int role) const {
QVariant DeliveryPointsViewModel::headerData(int section, Qt::Orientation orientation,
int role) const {
if (role == Qt::DisplayRole && orientation == Qt::Horizontal) {
switch (section) {
case 0:

2
sea_transport/viewmodels/deliverypointsviewmodel.h
View file

@ -5,7 +5,9 @@
#include <QAbstractTableModel>
class DeliveryPointsViewModel : public QAbstractTableModel {
private:
Q_OBJECT
public:

1
sea_transport/viewmodels/usersviewmodel.cpp
View file

@ -1,5 +1,6 @@
#include "usersviewmodel.h"
UsersViewModel::UsersViewModel(QObject *parent) : QAbstractTableModel(parent) {
}

2
sea_transport/viewmodels/usersviewmodel.h
View file

@ -5,7 +5,9 @@
#include <QAbstractTableModel>
class UsersViewModel : public QAbstractTableModel {
private:
Q_OBJECT
public:

7
sea_transport/viewmodels/vesselsviewmodel.cpp
View file

@ -1,5 +1,6 @@
#include "vesselsviewmodel.h"
VesselsViewModel::VesselsViewModel(QObject *parent) : QAbstractTableModel(parent) {
}
@ -35,8 +36,8 @@ QVariant VesselsViewModel::headerData(int section, Qt::Orientation orientation,
QVariant VesselsViewModel::data(const QModelIndex &index, int role) const {
if (role == Qt::DisplayRole) {
auto item = apparatus::instance()->get_object_subsystem()->vessels()[index.row()];
bool hs = false;
auto harbor = apparatus::instance()->get_object_subsystem()->get_dpoint(item.harbor(), hs);
bool s = false;
auto harbor = apparatus::instance()->get_object_subsystem()->get_dpoint(item.harbor(), s);
int col = index.column();
switch (col) {
@ -45,7 +46,7 @@ QVariant VesselsViewModel::data(const QModelIndex &index, int role) const {
case 1:
return item.skipper();
case 2:
return (hs? harbor->title() : tr("##ERROR[%1]##").arg(item.harbor()));
return (s? harbor->title() : tr("##ERROR[%1]##").arg(item.harbor()));
case 3:
return item.capacity();
case 4:

2
sea_transport/viewmodels/vesselsviewmodel.h
View file

@ -5,7 +5,9 @@
#include <QAbstractTableModel>
class VesselsViewModel : public QAbstractTableModel {
private:
Q_OBJECT
public: