Kevin Finisterre
0d5e91ee26
I fixed the first screen, now the vtail and aileron models show when slected. For some reason I am unable to move beyond the first wizard screen.
2013-11-25 01:06:07 -05:00
Kevin Finisterre
92c19f2d74
Changed the element id's in one of the SVG files that I incorrectly edited. This prevents the error:
...
Could not resolve property : SVGID_1_
Error comes from qsvghandler.cpp or qsvgstyle.cpp in the QT libraries Qt5.2.0//5.2.0-beta1/Src/qtsvg/src/svg/
The fixedwing-shapes.svg and flyingwing-shapes.svg files need modified to prevent the errors caused by qsvgtinydocument.cpp in the QT libraries.
Couldn't find node aileron. Skipping rendering.
Couldn't find node vtail. Skipping rendering.
These errors come from the case statement that was added to updateImageAnd Description() for FixedWingPage
+ switch (type) {
+ case SetupWizard::FIXED_WING_AILERON:
+ elementId = "aileron";
+ break;
+ case SetupWizard::FIXED_WING_VTAIL:
+ elementId = "vtail";
+ break;
+ default:
+ elementId = "";
+ break;
+ }
A similar error needs to be resolved in connectiondiagram.cpp
+ switch (m_configSource->getVehicleSubType()) {
+ case VehicleConfigurationSource::FIXED_WING_AILERON:
+ elementsToShow << "aileron";
+ break;
+ case VehicleConfigurationSource::FIXED_WING_VTAIL:
+ elementsToShow << "vtail";
+ break;
+ default:
+ break;
+ }
Likewise outputcalibrationpage.cpp will need to reverence the elements inside the SVG file properly.
+ m_vehicleElementIds << "fixed-aileron" << "aileron";
+ m_vehicleHighlightElementIndexes << 0 << 1;
...
+ m_vehicleElementIds << "fixed-vtail" << "vtail";
+ m_vehicleHighlightElementIndexes << 0 << 1;
Until these elements are fixed in the SVG files the wizard will not render properly and allow the user to click *next*.
2013-11-24 17:29:38 -05:00
Kevin Finisterre
721000b279
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
...
This is an attempt I made several months back at enabling the fixed wing wizard. AILERON and VTAIL concepts added where necessary. VehicleConfigurationHelper::setupAileron() and friends are completely wrong, need to be sorted out.
The files that go in setupwiz/resources need to be corrected to show motor direction. Basically need an inverse copy merged into existing images, see multirotor svg files for comparison.
m_vehicleElementIds and m_vehicleHighlightElementIndexes need to be fixed in the SVG files and code appropriately. The ID tags in the sVG files are incrorect. likewise grouping are incorrect. Could use help from someone more profficient in SVG files.
*work in progress*
2013-11-24 11:14:37 -05:00
Kevin Finisterre
aba761b0e0
Merge branch 'corvuscorax/callbackeventdispatcher2' into next
2013-11-24 10:07:51 -05:00
Corvus Corax
92f8102597
Merge branch 'corvuscorax/callbackeventdispatcher2' into next
2013-11-19 18:45:42 +01:00
Corvus Corax
7a6c0b61e8
Merge branch 'next' into corvuscorax/callbackeventdispatcher2
2013-11-19 18:36:20 +01:00
Alessio Morale
f36e3d66c1
Merge branch 'bsongis/OP-1099_Hidden_icons_in_configuration_tab' into next
2013-11-18 14:10:58 +01:00
Bertrand Songis
9183e2bb20
Fix for OP-1099: Hidden icons in Configuration tab
2013-11-18 14:10:17 +01:00
Corvus Corax
89f7dab2de
uncrustification for ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h
2013-11-16 17:34:43 +01:00
Corvus Corax
cf5d59a677
uncrustification for ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h
2013-11-16 17:34:43 +01:00
Corvus Corax
31d4234c79
uncrustification for ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h
2013-11-16 17:34:43 +01:00
Corvus Corax
7420276a06
uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h
2013-11-16 17:34:43 +01:00
Corvus Corax
2582eefaed
uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
2013-11-16 17:34:42 +01:00
Corvus Corax
28d79420c1
uncrustification for ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h
2013-11-16 17:34:42 +01:00
Corvus Corax
f73e2c1a75
uncrustification for ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
0e8f01baa8
uncrustification for ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
e7bd28e14c
uncrustification for ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
436293dbaf
uncrustification for ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
5c6885caf4
uncrustification for ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
68a8863fbd
uncrustification for ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
406daf316c
uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
a21357d8e9
uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
2013-11-16 17:34:42 +01:00
Corvus Corax
2c04a338b4
uncrustification for ground/openpilotgcs/src/plugins/scope/scopeplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
cef290ddca
uncrustification for ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h
2013-11-16 17:34:42 +01:00
Corvus Corax
04b7fbbf35
uncrustification for ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
9b5c7e20c3
uncrustification for ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
0fd357ae61
uncrustification for ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
4babcedfe2
uncrustification for ground/openpilotgcs/src/plugins/opmap/opmapplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
55eb581e45
uncrustification for ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
df77cd7613
uncrustification for ground/openpilotgcs/src/plugins/notify/notifyplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
2cbe028cd5
uncrustification for ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
cc04e31b5d
uncrustification for ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
bc83fd6ffa
uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
3c23b1f464
uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
2013-11-16 17:34:41 +01:00
Corvus Corax
968470037f
uncrustification for ground/openpilotgcs/src/plugins/logging/logfile.cpp
2013-11-16 17:34:41 +01:00
Corvus Corax
98d213f1a2
uncrustification for ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h
2013-11-16 17:34:41 +01:00
Corvus Corax
33616e6af4
uncrustification for ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
bcc651ddc8
uncrustification for ground/openpilotgcs/src/plugins/importexport/importexportplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
4adca55693
uncrustification for ground/openpilotgcs/src/plugins/hitl/hitlplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
58109f8461
uncrustification for ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
65e8c0dc6f
uncrustification for ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
a499b92d9d
uncrustification for ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
765bd0a7ff
uncrustification for ground/openpilotgcs/src/plugins/dial/dialplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
2e5c179fa4
uncrustification for ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
6030b1ba0a
uncrustification for ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
17da3a6c7a
uncrustification for ground/openpilotgcs/src/plugins/config/configplugin.h
2013-11-16 17:34:40 +01:00
Corvus Corax
9a753e5c77
uncrustification for ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h
2013-11-16 17:34:39 +01:00
Alessio Morale
6aa63c6e96
Merge remote-tracking branch 'origin/OP-1114_QGLWidget_prohibits_QListWidgetItem_click' into next
2013-11-15 11:43:03 +01:00
Patrick Huebner
28de9f1d48
OP-1114 Bug fix for QGLWidget mouse click issue
2013-11-15 21:03:03 +11:00
Alessio Morale
1b3f4b746d
Merge remote-tracking branch 'bsongis/OP-1078_GCS_segfaults_if_you_close_it_after_playing_a_log_file' into next
2013-11-14 19:34:34 +01:00
