Camera: Move CameraMetaData list from FirmwarePlugin to CameraManager #11976
Conversation
HTRamsey
force-pushed
the
dev-camerametadata
branch
from
546b3d9
to
a025d5e
Compare
| @@ -307,10 +307,6 @@ class FirmwarePlugin : public QObject | |||
| /// @return A list of QUrl with the indicators | |||
| virtual const QVariantList& modeIndicators(const Vehicle* vehicle); | |||
|
|
|||
| /// Returns a list of CameraMetaData objects for available cameras on the vehicle. | |||
| /// TODO: This should go into QGCCameraManager | |||
| virtual const QVariantList& cameraList(const Vehicle* vehicle); | |||
There was a problem hiding this comment.
So how does a custom build override the list of available cameras now?
There was a problem hiding this comment.
True, I will re-enable that ability. Personally I think it would be better to read some kinda resource file for this kinda stuff, like a json or whatever. But lemme think about it some first. I do think it's at least nice to have all the camera code together as long as we keep the same functionality.
There was a problem hiding this comment.
"Personally I think it would be better to read some kinda resource file for this kinda stuff, like a json or whatever."
I agree. In general for custom build tweaking I've been moving away from C++ code when possible to resource based stuff which can be overridden. Json for this certainly makes sense.
There was a problem hiding this comment.
So now they can override the json file in the resource system
HTRamsey
force-pushed
the
dev-camerametadata
branch
from
a025d5e
to
186563a
Compare
HTRamsey
force-pushed
the
dev-camerametadata
branch
from
186563a
to
c27ddf3
Compare
HTRamsey
force-pushed
the
dev-camerametadata
branch
from
c27ddf3
to
0e3ea45
Compare
|
Can you make the camera json file follow the specs for the internal QGC json files (version, type and so forth) and use the helper routines to validate/load? This provides versioning and translation support. |
HTRamsey
force-pushed
the
dev-camerametadata
branch
from
0e3ea45
to
8a2e820
Compare
|
Done |
src/Camera/QGCCameraManager.cc
Outdated
| QList<CameraMetaData*> cameraList; | ||
|
|
||
| QFile file(jsonFilePath); | ||
| if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { |
There was a problem hiding this comment.
You need to use JsonHelper::openInternalQGCJsonFile to get the translation support. This will do this for you:
- Open file
- Validation
- Translation
There was a problem hiding this comment.
I'll get it right eventually
HTRamsey
force-pushed
the
dev-camerametadata
branch
from
8a2e820
to
e1adabb
Compare
Resolves an old TODO by moving camera metadata list to the rest of the camera stuff
Convert to Q_GADGET since a Q_OBJECT isn't needed