Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Itinerary
Commits
e2f4a649
Commit
e2f4a649
authored
Nov 02, 2021
by
Volker Krause
Browse files
Give TransferManager access to LiveDataManager directly
This will enable us to consider delays for selecting transfers.
parent
81c08717
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/app/main.cpp
View file @
e2f4a649
...
...
@@ -282,7 +282,7 @@ int main(int argc, char **argv)
transferManager
.
setReservationManager
(
&
resMgr
);
transferManager
.
setTripGroupManager
(
&
tripGroupMgr
);
transferManager
.
setFavoriteLocationModel
(
&
favLocModel
);
transferManager
.
set
PublicTransport
Manager
(
liveDataMgr
.
publicTransportManager
()
);
transferManager
.
set
LiveData
Manager
(
&
liveDataMgr
);
transferManager
.
setAutoAddTransfers
(
settings
.
autoAddTransfers
());
transferManager
.
setAutoFillTransfers
(
settings
.
autoFillTransfers
());
QObject
::
connect
(
&
settings
,
&
Settings
::
autoAddTransfersChanged
,
&
transferManager
,
&
TransferManager
::
setAutoAddTransfers
);
...
...
src/app/transfermanager.cpp
View file @
e2f4a649
...
...
@@ -7,6 +7,7 @@
#include
"transfermanager.h"
#include
"logging.h"
#include
"favoritelocationmodel.h"
#include
"livedatamanager.h"
#include
"publictransport.h"
#include
"reservationmanager.h"
#include
"transferhelper.h"
...
...
@@ -65,9 +66,9 @@ void TransferManager::setFavoriteLocationModel(FavoriteLocationModel *favLocMode
rescan
();
}
void
TransferManager
::
set
PublicTransportManager
(
KPublicTransport
::
Manager
*
pt
Mgr
)
void
TransferManager
::
set
LiveDataManager
(
LiveData
Manager
*
liveData
Mgr
)
{
m_
ptrMgr
=
pt
Mgr
;
m_
liveDataMgr
=
liveData
Mgr
;
}
void
TransferManager
::
setAutoAddTransfers
(
bool
enable
)
...
...
@@ -557,7 +558,7 @@ void TransferManager::autoFillTransfer(Transfer &t)
t
.
setState
(
Transfer
::
Searching
);
auto
reply
=
m_
ptrMgr
->
queryJourney
(
journeyRequestForTransfer
(
t
));
auto
reply
=
m_
liveDataMgr
->
publicTransportManager
()
->
queryJourney
(
journeyRequestForTransfer
(
t
));
const
auto
batchId
=
t
.
reservationId
();
const
auto
alignment
=
t
.
alignment
();
connect
(
reply
,
&
KPublicTransport
::
JourneyReply
::
finished
,
this
,
[
this
,
reply
,
batchId
,
alignment
]()
{
...
...
src/app/transfermanager.h
View file @
e2f4a649
...
...
@@ -16,12 +16,9 @@
#include
<cmath>
namespace
KPublicTransport
{
class
Manager
;
}
class
FavoriteLocation
;
class
FavoriteLocationModel
;
class
LiveDataManager
;
class
ReservationManager
;
class
TripGroupManager
;
...
...
@@ -36,7 +33,7 @@ public:
void
setReservationManager
(
ReservationManager
*
resMgr
);
void
setTripGroupManager
(
TripGroupManager
*
tgMgr
);
void
setFavoriteLocationModel
(
FavoriteLocationModel
*
favLocModel
);
void
set
PublicTransportManager
(
KPublicTransport
::
Manager
*
pt
Mgr
);
void
set
LiveDataManager
(
LiveData
Manager
*
liveData
Mgr
);
void
setAutoAddTransfers
(
bool
enabled
);
void
setAutoFillTransfers
(
bool
enabled
);
...
...
@@ -118,7 +115,7 @@ private:
ReservationManager
*
m_resMgr
=
nullptr
;
TripGroupManager
*
m_tgMgr
=
nullptr
;
FavoriteLocationModel
*
m_favLocModel
=
nullptr
;
KPublicTransport
::
Manager
*
m_
ptr
Mgr
=
nullptr
;
LiveData
Manager
*
m_
liveData
Mgr
=
nullptr
;
mutable
QHash
<
QString
,
Transfer
>
m_transfers
[
2
];
QDateTime
m_nowOverride
;
bool
m_autoAddTransfers
=
true
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment