Positioning device refactoring #5706
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
🎉 Ta-daaa, freshly created APKs are available for c7a817f: arm64-android |
mohsenD98
force-pushed
the
egeniouss-refactor
branch
2 times, most recently
from
8a0ffe9
to
d5277ec
Compare
domi4484
reviewed
Oct 3, 2024
src/core/positioning/tcpreceiver.cpp
Outdated
Comment on lines
68
to
69
| emit socketStateChanged( socketState ); | ||
| emit socketStateStringChanged( socketStateString() ); |
There was a problem hiding this comment.
like for egeniouss, could be replaced by a direct connection of the socket stateChanged with abstracGnss::stateChanged
src/core/positioning/tcpreceiver.cpp
Outdated
| switch ( socketState ) | ||
| QAbstractSocket::SocketState TcpReceiver::socketState() | ||
| { | ||
| return mSocket ? mSocket->state() : QAbstractSocket::UnconnectedState; |
There was a problem hiding this comment.
here as wel mSocket doesn't need to be a pointer
src/core/positioning/tcpreceiver.cpp
Outdated
| case QAbstractSocket::UnconnectedState: | ||
| { | ||
| mSocketStateString = tr( "Disconnected" ); | ||
| QString mSocketStateString = tr( "Disconnected" ); |
There was a problem hiding this comment.
Suggested change
| QString mSocketStateString = tr( "Disconnected" ); | |
| QString socketStateString = tr( "Disconnected" ); |
src/core/positioning/tcpreceiver.cpp
Outdated
| @@ -122,6 +116,9 @@ void TcpReceiver::handleError( QAbstractSocket::SocketError error ) | |||
| mLastError = tr( "TCP receiver error (%1)" ).arg( QMetaEnum::fromType<QAbstractSocket::SocketError>().valueToKey( error ) ); | |||
| break; | |||
| } | |||
|
|
|||
| setSocketState( QAbstractSocket::UnconnectedState ); | |||
There was a problem hiding this comment.
I think this should not be there
|
Thank you @domi4484 for your review. most of them addressed. |
mohsenD98
force-pushed
the
egeniouss-refactor
branch
from
4ba9e46
to
8ffc2b6
Compare
nirvn
reviewed
Oct 4, 2024
domi4484
reviewed
Oct 4, 2024
instead of capturing connected and disconnected signals we can use stateChanged signal and simplify a bit.
override socketState and socketStateString from base class.
Remove duplicated codes of `socketState` and `socketStateString` also extract some logic from `socketStateString`.
1- Add header to abstractgnssreceiver.cpp, egeniousseeceiver.cpp, egeniousseeceiver.h. 2- Read-only socketState. 3- protected: `void setSocketState` 4- QBluetoothSocket::SocketState to QAbstractSocket::SocketState. 5- Pruning methods in sub classes.
nirvn
force-pushed
the
egeniouss-refactor
branch
from
aa8ced3
to
c7a817f
Compare
domi4484
approved these changes
Oct 14, 2024
| virtual QList<QPair<QString, QVariant>> details() { return {}; } | ||
| virtual QList<QPair<QString, QVariant>> details() const { return {}; } | ||
| virtual QAbstractSocket::SocketState socketState() const { return mSocketState; } | ||
| virtual QString socketStateString(); |
There was a problem hiding this comment.
Suggested change
| virtual QString socketStateString(); | |
| virtual QString socketStateString() const; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Description
In this PR we are going to address these:
Step 1 of Refactor 1: Instead of capturing
connectedanddisconnectedsignals we can usestateChangedsignal and simplify a bit.This pattern is been used in:
QField/src/core/positioning/bluetoothreceiver.cpp
Line 30 in 3a1586f
QField/src/core/positioning/tcpreceiver.cpp
Line 25 in 3a1586f
QField/src/core/positioning/udpreceiver.cpp
Line 38 in 3a1586f
Step 2 of Refactor 1: lets go for the bigger refactoring changing all of these.