Default Model Values #123
Merged
Default Model Values #123
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
RobertBColton
force-pushed
the
data-default-fix
branch
from
0fe571e
to
2fce30a
Compare
RobertBColton
commented
May 9, 2020
RobertBColton
commented
May 9, 2020
Models/MessageModel.cpp
Outdated
| @@ -131,7 +132,7 @@ QVariant MessageModel::data(const QModelIndex &index, int role) const { | |||
| } | |||
|
|
|||
| // If the field has't been initialized return an invalid QVariant. (see QVariant.isValid()) | |||
| if (!refl->HasField(*_protobuf, field)) return QVariant(); | |||
| if (HasField && !refl->HasField(*_protobuf, field)) return QVariant(); | |||
There was a problem hiding this comment.
Rusky says we should treat this as an error/with an assert.
JoshDreamland
approved these changes
May 9, 2020
RobertBColton
commented
May 10, 2020
Models/RepeatedMessageModel.cpp
Outdated
| @@ -41,5 +41,7 @@ bool RepeatedMessageModel::setData(const QModelIndex &index, const QVariant &val | |||
| } | |||
|
|
|||
| QVariant RepeatedMessageModel::data(const QModelIndex &index, int role) const { | |||
| // protobuf field number with 0 is impossible, use as sentinel to get model itself | |||
| if (index.column() == 0) return QVariant::fromValue(_subModels[index.row()]); | |||
There was a problem hiding this comment.
I don't think there's any implications of this? This is otherwise just an error condition. Unless later we add field number offsets to MessageModel so that we can use field number 0 for whatever reason fundies wanted to. We could possibly just add a custom role for this instead too.
RobertBColton
commented
May 10, 2020
RobertBColton
commented
May 10, 2020
Closed
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.
This is how Josh would like to resolve #122 by making it explicit when you are ok accepting the default value from the model. I had to also allow column 0 as a special sentinel for
RepeatedMessageModelto return a pointer to the requested model so that I have an actual way to calldataOrDefaulton repeated messages. The hack avoids the complication of having to adddataOrDefaulton all the higher level models and interfaces, such as the sort filter proxy model.