Ignitionrobotics to gazebosim #250
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,14 +6,14 @@ | |
| <meta name="keywords" content="$projectname"> | ||
| <title>$projectname: $title</title> | ||
| <script type="text/javascript" src="jquery.js"></script> | ||
| <script type="text/javascript" src="https://gazebosim.org/assets/doxygen/dynsections.js"></script> | ||
|
|
||
| <link href='http://fonts.googleapis.com/css?family=Roboto:400,300,100,500,700' rel='stylesheet' type='text/css'> | ||
| <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> | ||
| <link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.deep_orange-blue.min.css"> | ||
| <script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script> | ||
|
|
||
| <link href="https://gazebosim.org/assets/doxygen/tutorials-doxygen.css" rel="stylesheet" type="text/css"> | ||
| <script type="text/javascript" src="resize.js"></script> | ||
| <script type="text/javascript" src="navtreedata.js"></script> | ||
| <script type="text/javascript" src="navtree.js"></script> | ||
|
|
@@ -23,7 +23,7 @@ | |
| <div class="mdl-layout mdl-layout--fixed-header mdl-js-layout mdl-color--grey-100"> | ||
| <header class="mdl-layout__header mdl-layout__header--scroll mdl-color--blue-grey-700 mdl-color-text--grey-100"> | ||
| <div class="mdl-layout__header-row"> | ||
| <a href="index.html"><img width="40px" src="https://gazebosim.org/assets/doxygen/gazebo_logo_white.svg"/></a> | ||
| <span class="mdl-layout-title">$projectname Tutorials</span> | ||
| </div> | ||
| </header> | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 | |
| # title of most generated pages and in a few other places. | ||
| # The default value is: My Project. | ||
|
|
||
| PROJECT_NAME = "Gazebo Fuel Tools" | ||
|
|
||
| # The PROJECT_NUMBER tag can be used to enter a project or revision number. This | ||
| # could be handy for archiving the generated documentation or if some version | ||
|
|
@@ -768,7 +768,7 @@ WARN_FORMAT = "$file:$line: $text" | |
| # messages should be written. If left blank the output is written to standard | ||
| # error (stderr). | ||
|
|
||
| WARN_LOGFILE = /tmp/gz-fuel_tools-tutorials.warn | ||
|
|
||
| #--------------------------------------------------------------------------- | ||
| # Configuration options related to the input files | ||
|
|
@@ -1227,7 +1227,7 @@ GENERATE_DOCSET = NO | |
| # The default value is: Doxygen generated docs. | ||
| # This tag requires that the tag GENERATE_DOCSET is set to YES. | ||
|
|
||
| DOCSET_FEEDNAME = "Gazebo Fuel Tools API Documentation" | ||
|
|
||
| # This tag specifies a string that should uniquely identify the documentation | ||
| # set bundle. This should be a reverse domain-name style string, e.g. | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,11 +37,11 @@ int main(int argc, char **argv) | |
| std::string usage("Download a resource."); | ||
| usage += " Usage:\n ./download <options>\n\n"; | ||
| usage += " Examples:\n" | ||
| "\t ./download -t model -o openrobotics -n beer\n" | ||
| "\t ./download -s https://fuel.gazebosim.org -t world " | ||
| "-o openrobotics" | ||
| " -n test_shapes\n" | ||
| "\t ./download -c /tmp/my_config.yaml -t model -o caguero -n beer\n"; | ||
|
|
||
| gflags::SetUsageMessage(usage); | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -184,7 +184,7 @@ namespace ignition | |
|
|
||
| /// \brief Remove a resource, such as a model or world, from Ignition Fuel | ||
| /// \param[in] _uri The full URI of the resource, e.g: | ||
| /// https://fuel.gazebosim.org/1.0/openrobotcs/model/my_model | ||
| /// \param[in] _headers Headers to set on the HTTP request. | ||
| /// \return Result of the delete operation | ||
| public: Result DeleteUrl(const ignition::common::URI &_uri, | ||
|
|
@@ -238,7 +238,7 @@ namespace ignition | |
| /// \brief Download a model from ignition fuel. This will override an | ||
| /// existing local copy of the model. | ||
| /// \param[in] _modelUrl The unique URL of the model to download. | ||
| /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer | ||
| /// \param[out] _path Path where the model was downloaded. | ||
| /// \return Result of the download operation. | ||
| public: Result DownloadModel(const common::URI &_modelUrl, | ||
|
|
@@ -247,7 +247,7 @@ namespace ignition | |
| /// \brief Download a world from ignition fuel. This will override an | ||
| /// existing local copy of the world. | ||
| /// \param[in] _worldUrl The unique URL of the world to download. | ||
| /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty | ||
| /// \param[out] _path Path where the world was downloaded. | ||
| /// \return Result of the download operation. | ||
| public: Result DownloadWorld(const common::URI &_worldUrl, | ||
|
|
@@ -277,29 +277,29 @@ namespace ignition | |
|
|
||
| /// \brief Check if a model is already present in the local cache. | ||
| /// \param[in] _modelUrl The unique URL of the model on a Fuel server. | ||
| /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer | ||
| /// \param[out] _path Local path where the model can be found. | ||
| /// \return FETCH_ERROR if not cached, FETCH_ALREADY_EXISTS if cached. | ||
| public: Result CachedModel(const common::URI &_modelUrl, | ||
| std::string &_path); | ||
|
|
||
| /// \brief Check if a model exists in the cache. | ||
| /// \param[in] _modelUrl The unique URL of the world on a Fuel server. | ||
| /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer | ||
| /// \return True if the model exists in the cache, false otherwise. | ||
| public: bool CachedModel(const common::URI &_modelUrl); | ||
|
|
||
| /// \brief Check if a world is already present in the local cache. | ||
| /// \param[in] _worldUrl The unique URL of the world on a Fuel server. | ||
| /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty | ||
| /// \param[out] _path Local path where the world can be found. | ||
| /// \return FETCH_ERROR if not cached, FETCH_ALREADY_EXISTS if cached. | ||
| public: Result CachedWorld(const common::URI &_worldUrl, | ||
| std::string &_path); | ||
|
|
||
| /// \brief Check if a world exists in the cache. | ||
| /// \param[in] _worldUrl The unique URL of the world on a Fuel server. | ||
| /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty | ||
| /// \return True if the world exists in the cache, false otherwise. | ||
| public: bool CachedWorld(const common::URI &_worldUrl); | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,7 +83,7 @@ class ignition::fuel_tools::ServerConfigPrivate | |
| } | ||
|
|
||
| /// \brief URL to reach server | ||
| public: common::URI url{"https://fuel.gazebosim.org"}; | ||
|
|
||
| /// \brief A key to auth with the server | ||
| public: std::string key = ""; | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -98,7 +98,7 @@ TEST(ClientConfig, CustomDefaultConfiguration) | |
| { | ||
| ClientConfig config; | ||
| ASSERT_EQ(1u, config.Servers().size()); | ||
| EXPECT_EQ("https://fuel.gazebosim.org", | ||
| config.Servers().front().Url().Str()); | ||
|
|
||
| std::string defaultCacheLocation = ignition::common::joinPaths( | ||
|
|
@@ -135,7 +135,7 @@ TEST(ClientConfig, CustomConfiguration) | |
| EXPECT_TRUE(config.LoadConfig(testPath)); | ||
|
|
||
| ASSERT_EQ(3u, config.Servers().size()); | ||
| EXPECT_EQ("https://fuel.gazebosim.org", | ||
| config.Servers().front().Url().Str()); | ||
| EXPECT_EQ("https://api.ignitionfuel.org", | ||
| config.Servers()[1].Url().Str()); | ||
|
|
@@ -162,10 +162,10 @@ TEST(ClientConfig, RepeatedServerConfiguration) | |
| << "# The list of servers." << std::endl | ||
| << "servers:" << std::endl | ||
| << " -" << std::endl | ||
| << " url: https://fuel.gazebosim.org" << std::endl | ||
| << "" << std::endl | ||
| << " -" << std::endl | ||
| << " url: https://fuel.gazebosim.org" << std::endl | ||
| << "" << std::endl | ||
| << "# Where are the assets stored in disk." << std::endl | ||
| << "cache:" << std::endl | ||
|
|
@@ -313,7 +313,7 @@ TEST(ClientConfig, AsString) | |
| #else | ||
| EXPECT_NE(str.find(".ignition\\fuel"), std::string::npos); | ||
| #endif | ||
| EXPECT_NE(str.find("https://fuel.gazebosim.org"), std::string::npos); | ||
| } | ||
|
|
||
| { | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -123,18 +123,18 @@ TEST(CollectionIdentifier, AsString) | |
| std::string str = | ||
| "Name: \n"\ | ||
| "Owner: \n"\ | ||
| "Unique name: https://fuel.gazebosim.org/collections/\n" | ||
| "Server:\n" | ||
| " URL: https://fuel.gazebosim.org\n" | ||
| " Version: 1.0\n" | ||
| " API key: \n"; | ||
| #else | ||
| std::string str = | ||
| "Name: \n"\ | ||
| "Owner: \n"\ | ||
| "Unique name: https://fuel.gazebosim.org/collections\n" | ||
| "Server:\n" | ||
| " URL: https://fuel.gazebosim.org\n" | ||
| " Version: 1.0\n" | ||
| " API key: \n"; | ||
| #endif | ||
|
|
@@ -161,7 +161,7 @@ TEST(CollectionIdentifier, AsPrettyString) | |
| CollectionIdentifier id; | ||
| std::string str = | ||
| "\x1B[96m\x1B[1mServer:\x1B[0m\n " | ||
| "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org" | ||
| "\x1B[0m\n \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n"; | ||
| EXPECT_EQ(str, id.AsPrettyString()); | ||
| } | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
7350487