Merged in unported (pull request #196)

Move files not ported to v1 to a separate dir for clarity Approved-by: Nate Koenig <natekoenig@gmail.com>
gazebosim · Apr 4, 2019 · 64b6171 · 64b6171
2 parents b62f09b + 84943ac
commit 64b6171
Show file tree

Hide file tree

Showing 69 changed files with 2 additions and 28 deletions.
diff --git a/examples/config/plot.config → .v0_unported/examples/config/plot.config b/examples/config/plot.config → .v0_unported/examples/config/plot.config
diff --git a/examples/config/reqres.config → .v0_unported/examples/config/reqres.config b/examples/config/reqres.config → .v0_unported/examples/config/reqres.config
diff --git a/examples/config/topicInterface.config → ...ted/examples/config/topicInterface.config b/examples/config/topicInterface.config → ...ted/examples/config/topicInterface.config
diff --git a/examples/config/topicViewer.config → ...ported/examples/config/topicViewer.config b/examples/config/topicViewer.config → ...ported/examples/config/topicViewer.config
diff --git a/examples/config/topicsStats.config → ...ported/examples/config/topicsStats.config b/examples/config/topicsStats.config → ...ported/examples/config/topicsStats.config
diff --git a/...es/plugin/designer_ui_file/CMakeLists.txt → ...es/plugin/designer_ui_file/CMakeLists.txt b/...es/plugin/designer_ui_file/CMakeLists.txt → ...es/plugin/designer_ui_file/CMakeLists.txt
diff --git a/...plugin/designer_ui_file/DesignerPlugin.cc → ...plugin/designer_ui_file/DesignerPlugin.cc b/...plugin/designer_ui_file/DesignerPlugin.cc → ...plugin/designer_ui_file/DesignerPlugin.cc
diff --git a/...plugin/designer_ui_file/DesignerPlugin.hh → ...plugin/designer_ui_file/DesignerPlugin.hh b/...plugin/designer_ui_file/DesignerPlugin.hh → ...plugin/designer_ui_file/DesignerPlugin.hh
diff --git a/...plugin/designer_ui_file/DesignerPlugin.ui → ...plugin/designer_ui_file/DesignerPlugin.ui b/...plugin/designer_ui_file/DesignerPlugin.ui → ...plugin/designer_ui_file/DesignerPlugin.ui
diff --git a/...s/standalone/save_on_close/CMakeLists.txt → ...s/standalone/save_on_close/CMakeLists.txt b/...s/standalone/save_on_close/CMakeLists.txt → ...s/standalone/save_on_close/CMakeLists.txt
diff --git a/examples/standalone/save_on_close/README.md → ...amples/standalone/save_on_close/README.md b/examples/standalone/save_on_close/README.md → ...amples/standalone/save_on_close/README.md
diff --git a/...standalone/save_on_close/save_on_close.cc → ...standalone/save_on_close/save_on_close.cc b/...standalone/save_on_close/save_on_close.cc → ...standalone/save_on_close/save_on_close.cc
diff --git a/include/ignition/gui/BoolWidget.hh → ...ported/include/ignition/gui/BoolWidget.hh b/include/ignition/gui/BoolWidget.hh → ...ported/include/ignition/gui/BoolWidget.hh
diff --git a/include/ignition/gui/CollapsibleWidget.hh → ...include/ignition/gui/CollapsibleWidget.hh b/include/ignition/gui/CollapsibleWidget.hh → ...include/ignition/gui/CollapsibleWidget.hh
diff --git a/include/ignition/gui/ColorWidget.hh → ...orted/include/ignition/gui/ColorWidget.hh b/include/ignition/gui/ColorWidget.hh → ...orted/include/ignition/gui/ColorWidget.hh
diff --git a/include/ignition/gui/EditableLabel.hh → ...ted/include/ignition/gui/EditableLabel.hh b/include/ignition/gui/EditableLabel.hh → ...ted/include/ignition/gui/EditableLabel.hh
diff --git a/include/ignition/gui/EnumWidget.hh → ...ported/include/ignition/gui/EnumWidget.hh b/include/ignition/gui/EnumWidget.hh → ...ported/include/ignition/gui/EnumWidget.hh
diff --git a/include/ignition/gui/GeometryWidget.hh → ...ed/include/ignition/gui/GeometryWidget.hh b/include/ignition/gui/GeometryWidget.hh → ...ed/include/ignition/gui/GeometryWidget.hh
diff --git a/include/ignition/gui/MessageWidget.hh → ...ted/include/ignition/gui/MessageWidget.hh b/include/ignition/gui/MessageWidget.hh → ...ted/include/ignition/gui/MessageWidget.hh
diff --git a/include/ignition/gui/NumberWidget.hh → ...rted/include/ignition/gui/NumberWidget.hh b/include/ignition/gui/NumberWidget.hh → ...rted/include/ignition/gui/NumberWidget.hh
diff --git a/include/ignition/gui/Pose3dWidget.hh → ...rted/include/ignition/gui/Pose3dWidget.hh b/include/ignition/gui/Pose3dWidget.hh → ...rted/include/ignition/gui/Pose3dWidget.hh
diff --git a/include/ignition/gui/PropertyWidget.hh → ...ed/include/ignition/gui/PropertyWidget.hh b/include/ignition/gui/PropertyWidget.hh → ...ed/include/ignition/gui/PropertyWidget.hh
diff --git a/include/ignition/gui/QtMetatypes.hh → ...orted/include/ignition/gui/QtMetatypes.hh b/include/ignition/gui/QtMetatypes.hh → ...orted/include/ignition/gui/QtMetatypes.hh
diff --git a/include/ignition/gui/StringWidget.hh → ...rted/include/ignition/gui/StringWidget.hh b/include/ignition/gui/StringWidget.hh → ...rted/include/ignition/gui/StringWidget.hh
diff --git a/include/ignition/gui/VariablePill.hh → ...rted/include/ignition/gui/VariablePill.hh b/include/ignition/gui/VariablePill.hh → ...rted/include/ignition/gui/VariablePill.hh
diff --git a/...ude/ignition/gui/VariablePillContainer.hh → ...ude/ignition/gui/VariablePillContainer.hh b/...ude/ignition/gui/VariablePillContainer.hh → ...ude/ignition/gui/VariablePillContainer.hh
diff --git a/include/ignition/gui/Vector3dWidget.hh → ...ed/include/ignition/gui/Vector3dWidget.hh b/include/ignition/gui/Vector3dWidget.hh → ...ed/include/ignition/gui/Vector3dWidget.hh
diff --git a/include/ignition/gui/plugins/Requester.hh → ...include/ignition/gui/plugins/Requester.hh b/include/ignition/gui/plugins/Requester.hh → ...include/ignition/gui/plugins/Requester.hh
diff --git a/include/ignition/gui/plugins/Responder.hh → ...include/ignition/gui/plugins/Responder.hh b/include/ignition/gui/plugins/Responder.hh → ...include/ignition/gui/plugins/Responder.hh
diff --git a/...de/ignition/gui/plugins/TopicInterface.hh → ...de/ignition/gui/plugins/TopicInterface.hh b/...de/ignition/gui/plugins/TopicInterface.hh → ...de/ignition/gui/plugins/TopicInterface.hh
diff --git a/include/ignition/gui/plugins/TopicViewer.hh → ...clude/ignition/gui/plugins/TopicViewer.hh b/include/ignition/gui/plugins/TopicViewer.hh → ...clude/ignition/gui/plugins/TopicViewer.hh
diff --git a/include/ignition/gui/plugins/TopicsStats.hh → ...clude/ignition/gui/plugins/TopicsStats.hh b/include/ignition/gui/plugins/TopicsStats.hh → ...clude/ignition/gui/plugins/TopicsStats.hh
diff --git a/.../ignition/gui/plugins/plot/CMakeLists.txt → .../ignition/gui/plugins/plot/CMakeLists.txt b/.../ignition/gui/plugins/plot/CMakeLists.txt → .../ignition/gui/plugins/plot/CMakeLists.txt
diff --git a/include/ignition/gui/plugins/plot/Curve.hh → ...nclude/ignition/gui/plugins/plot/Curve.hh b/include/ignition/gui/plugins/plot/Curve.hh → ...nclude/ignition/gui/plugins/plot/Curve.hh
diff --git a/...ition/gui/plugins/plot/IncrementalPlot.hh → ...ition/gui/plugins/plot/IncrementalPlot.hh b/...ition/gui/plugins/plot/IncrementalPlot.hh → ...ition/gui/plugins/plot/IncrementalPlot.hh
diff --git a/include/ignition/gui/plugins/plot/Plot.hh → ...include/ignition/gui/plugins/plot/Plot.hh b/include/ignition/gui/plugins/plot/Plot.hh → ...include/ignition/gui/plugins/plot/Plot.hh
diff --git a/...ion/gui/plugins/plot/TopicCurveHandler.hh → ...ion/gui/plugins/plot/TopicCurveHandler.hh b/...ion/gui/plugins/plot/TopicCurveHandler.hh → ...ion/gui/plugins/plot/TopicCurveHandler.hh
diff --git a/include/ignition/gui/plugins/plot/Tracker.hh → ...lude/ignition/gui/plugins/plot/Tracker.hh b/include/ignition/gui/plugins/plot/Tracker.hh → ...lude/ignition/gui/plugins/plot/Tracker.hh
diff --git a/include/ignition/gui/plugins/plot/Types.hh → ...nclude/ignition/gui/plugins/plot/Types.hh b/include/ignition/gui/plugins/plot/Types.hh → ...nclude/ignition/gui/plugins/plot/Types.hh
diff --git a/include/ignition/gui/qwt.h → .v0_unported/include/ignition/gui/qwt.h b/include/ignition/gui/qwt.h → .v0_unported/include/ignition/gui/qwt.h
diff --git a/src/BoolWidget.cc → .v0_unported/src/BoolWidget.cc b/src/BoolWidget.cc → .v0_unported/src/BoolWidget.cc
diff --git a/src/BoolWidget_TEST.cc → .v0_unported/src/BoolWidget_TEST.cc b/src/BoolWidget_TEST.cc → .v0_unported/src/BoolWidget_TEST.cc
diff --git a/src/CollapsibleWidget.cc → .v0_unported/src/CollapsibleWidget.cc b/src/CollapsibleWidget.cc → .v0_unported/src/CollapsibleWidget.cc
diff --git a/src/CollapsibleWidget_TEST.cc → .v0_unported/src/CollapsibleWidget_TEST.cc b/src/CollapsibleWidget_TEST.cc → .v0_unported/src/CollapsibleWidget_TEST.cc
diff --git a/src/ColorWidget.cc → .v0_unported/src/ColorWidget.cc b/src/ColorWidget.cc → .v0_unported/src/ColorWidget.cc
diff --git a/src/ColorWidget_TEST.cc → .v0_unported/src/ColorWidget_TEST.cc b/src/ColorWidget_TEST.cc → .v0_unported/src/ColorWidget_TEST.cc
diff --git a/src/EditableLabel.cc → .v0_unported/src/EditableLabel.cc b/src/EditableLabel.cc → .v0_unported/src/EditableLabel.cc
diff --git a/src/EditableLabel_TEST.cc → .v0_unported/src/EditableLabel_TEST.cc b/src/EditableLabel_TEST.cc → .v0_unported/src/EditableLabel_TEST.cc
diff --git a/src/EnumWidget.cc → .v0_unported/src/EnumWidget.cc b/src/EnumWidget.cc → .v0_unported/src/EnumWidget.cc
diff --git a/src/EnumWidget_TEST.cc → .v0_unported/src/EnumWidget_TEST.cc b/src/EnumWidget_TEST.cc → .v0_unported/src/EnumWidget_TEST.cc
diff --git a/src/GeometryWidget.cc → .v0_unported/src/GeometryWidget.cc b/src/GeometryWidget.cc → .v0_unported/src/GeometryWidget.cc
diff --git a/src/GeometryWidget_TEST.cc → .v0_unported/src/GeometryWidget_TEST.cc b/src/GeometryWidget_TEST.cc → .v0_unported/src/GeometryWidget_TEST.cc
diff --git a/src/MessageWidget.cc → .v0_unported/src/MessageWidget.cc b/src/MessageWidget.cc → .v0_unported/src/MessageWidget.cc
diff --git a/src/MessageWidget_TEST.cc → .v0_unported/src/MessageWidget_TEST.cc b/src/MessageWidget_TEST.cc → .v0_unported/src/MessageWidget_TEST.cc
diff --git a/src/NumberWidget.cc → .v0_unported/src/NumberWidget.cc b/src/NumberWidget.cc → .v0_unported/src/NumberWidget.cc
diff --git a/src/NumberWidget_TEST.cc → .v0_unported/src/NumberWidget_TEST.cc b/src/NumberWidget_TEST.cc → .v0_unported/src/NumberWidget_TEST.cc
diff --git a/src/Pose3dWidget.cc → .v0_unported/src/Pose3dWidget.cc b/src/Pose3dWidget.cc → .v0_unported/src/Pose3dWidget.cc
diff --git a/src/Pose3dWidget_TEST.cc → .v0_unported/src/Pose3dWidget_TEST.cc b/src/Pose3dWidget_TEST.cc → .v0_unported/src/Pose3dWidget_TEST.cc
diff --git a/src/PropertyWidget.cc → .v0_unported/src/PropertyWidget.cc b/src/PropertyWidget.cc → .v0_unported/src/PropertyWidget.cc
diff --git a/src/StringWidget.cc → .v0_unported/src/StringWidget.cc b/src/StringWidget.cc → .v0_unported/src/StringWidget.cc
diff --git a/src/StringWidget_TEST.cc → .v0_unported/src/StringWidget_TEST.cc b/src/StringWidget_TEST.cc → .v0_unported/src/StringWidget_TEST.cc
diff --git a/src/VariablePill.cc → .v0_unported/src/VariablePill.cc b/src/VariablePill.cc → .v0_unported/src/VariablePill.cc
diff --git a/src/VariablePillContainer.cc → .v0_unported/src/VariablePillContainer.cc b/src/VariablePillContainer.cc → .v0_unported/src/VariablePillContainer.cc
diff --git a/src/VariablePillContainer_TEST.cc → ...nported/src/VariablePillContainer_TEST.cc b/src/VariablePillContainer_TEST.cc → ...nported/src/VariablePillContainer_TEST.cc
diff --git a/src/Vector3dWidget.cc → .v0_unported/src/Vector3dWidget.cc b/src/Vector3dWidget.cc → .v0_unported/src/Vector3dWidget.cc
diff --git a/src/Vector3dWidget_TEST.cc → .v0_unported/src/Vector3dWidget_TEST.cc b/src/Vector3dWidget_TEST.cc → .v0_unported/src/Vector3dWidget_TEST.cc
diff --git a/include/ignition/gui/CMakeLists.txt b/include/ignition/gui/CMakeLists.txt
@@ -17,23 +17,9 @@ add_definitions(
 
 set (qt_headers
   Application.hh
-#  BoolWidget.hh
-#  CollapsibleWidget.hh
-#  ColorWidget.hh
   Dialog.hh
-#  EditableLabel.hh
-#  EnumWidget.hh
-#  GeometryWidget.hh
   MainWindow.hh
-#  MessageWidget.hh
-#  NumberWidget.hh
   Plugin.hh
-#  Pose3dWidget.hh
-#  PropertyWidget.hh
-#  StringWidget.hh
-#  VariablePill.hh
-#  VariablePillContainer.hh
-#  Vector3dWidget.hh
 )
 
 set (headers
@@ -43,8 +29,6 @@ set (headers
   Helpers.hh
   ign.hh
   qt.h
-#  qwt.h
-#  QtMetatypes.hh
   SearchModel.hh
   System.hh
 )
@@ -77,8 +61,5 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
 
 add_subdirectory(plugins)
 
-#ign_install_includes("" ${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}.hh)
-#ign_install_includes(${IGN_DESIGNATION} ${headers} ${qt_headers})
-
 ign_install_all_headers()
 
diff --git a/include/ignition/gui/plugins/CMakeLists.txt b/include/ignition/gui/plugins/CMakeLists.txt
@@ -2,13 +2,8 @@ set (qt_headers_local
   Grid3D
   ImageDisplay
   Publisher
-#  Requester
-#  Responder
   Scene3D
   TopicEcho
-#  TopicInterface
-#  TopicsStats
-#  TopicViewer
   WorldControl
   WorldStats
 )
@@ -36,5 +31,3 @@ foreach (src ${qt_headers_local})
   )
   install (TARGETS ${src} DESTINATION ${IGNITION_GUI_PLUGIN_INSTALL_DIR})
 endforeach (src ${qt_headers_local})
-
-#add_subdirectory(plot)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -19,6 +19,6 @@ execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results
 include_directories(${GTEST_INCLUDE_DIRS})
 
 add_subdirectory(integration)
-#add_subdirectory(performance)
+add_subdirectory(performance)
 add_subdirectory(plugins)
-#add_subdirectory(regression)
+add_subdirectory(regression)