-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #516 from mtconnect/add_new_assets_for_2.5
- Loading branch information
Showing
29 changed files
with
1,353 additions
and
166 deletions.
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 |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| // | ||
| // Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”) | ||
| // All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #include "fixture.hpp" | ||
|
|
||
| using namespace std; | ||
|
|
||
| namespace mtconnect::asset { | ||
| using namespace entity; | ||
|
|
||
| FactoryPtr Fixture::getFactory() | ||
| { | ||
| static FactoryPtr factory; | ||
| if (!factory) | ||
| { | ||
| factory = make_shared<Factory>(*PhysicalAsset::getFactory()); | ||
| factory->addRequirements(Requirements {{"FixtureId", ValueType::STRING, false}, | ||
| {"FixtureNumber", ValueType::INTEGER, false}, | ||
| {"ClampingMethod", ValueType::STRING, false}, | ||
| {"MountingMethod", ValueType::STRING, false}}); | ||
|
|
||
| factory->setOrder({"ManufactureDate", "CalibrationDate", "InspectionDate", | ||
| "NextInspectionDate", "Measurements", "FixtureId", "FixtureNumber", | ||
| "ClampingMethod", "MountingMethod"}); | ||
| } | ||
|
|
||
| return factory; | ||
| } | ||
|
|
||
| void Fixture::registerAsset() | ||
| { | ||
| static bool once {true}; | ||
| if (once) | ||
| { | ||
| Asset::registerAssetType("Fixture", getFactory()); | ||
| once = false; | ||
| } | ||
| } | ||
|
|
||
| } // namespace mtconnect::asset |
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 |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // | ||
| // Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”) | ||
| // All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <map> | ||
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| #include "mtconnect/entity/entity.hpp" | ||
| #include "mtconnect/entity/factory.hpp" | ||
| #include "mtconnect/utilities.hpp" | ||
| #include "physical_asset.hpp" | ||
|
|
||
| namespace mtconnect::asset { | ||
| /// @brief abstract Physical Asset | ||
| class AGENT_LIB_API Fixture : public PhysicalAsset | ||
| { | ||
| public: | ||
| static entity::FactoryPtr getFactory(); | ||
| static void registerAsset(); | ||
| }; | ||
| } // namespace mtconnect::asset |
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 |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // | ||
| // Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”) | ||
| // All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #include "pallet.hpp" | ||
|
|
||
| using namespace std; | ||
|
|
||
| namespace mtconnect::asset { | ||
| using namespace entity; | ||
|
|
||
| FactoryPtr Pallet::getFactory() | ||
| { | ||
| static FactoryPtr factory; | ||
| if (!factory) | ||
| { | ||
| factory = make_shared<Factory>(*PhysicalAsset::getFactory()); | ||
| factory->addRequirements(Requirements {{"Type", ValueType::STRING, false}, | ||
| {"PalletId", ValueType::STRING, false}, | ||
| {"PalletNumber", ValueType::INTEGER, false}, | ||
| {"ClampingMethod", ValueType::STRING, false}, | ||
| {"MountingMethod", ValueType::STRING, false}}); | ||
|
|
||
| factory->setOrder({"ManufactureDate", "CalibrationDate", "InspectionDate", | ||
| "NextInspectionDate", "Measurements", "Type", "PalletId", "PalletNumber", | ||
| "ClampingMethod", "MountingMethod"}); | ||
| } | ||
|
|
||
| return factory; | ||
| } | ||
|
|
||
| void Pallet::registerAsset() | ||
| { | ||
| static bool once {true}; | ||
| if (once) | ||
| { | ||
| Asset::registerAssetType("Pallet", getFactory()); | ||
| once = false; | ||
| } | ||
| } | ||
|
|
||
| } // namespace mtconnect::asset |
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 |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // | ||
| // Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”) | ||
| // All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <map> | ||
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| #include "mtconnect/entity/entity.hpp" | ||
| #include "mtconnect/entity/factory.hpp" | ||
| #include "mtconnect/utilities.hpp" | ||
| #include "physical_asset.hpp" | ||
|
|
||
| namespace mtconnect::asset { | ||
| /// @brief abstract Physical Asset | ||
| class AGENT_LIB_API Pallet : public PhysicalAsset | ||
| { | ||
| public: | ||
| static entity::FactoryPtr getFactory(); | ||
| static void registerAsset(); | ||
| }; | ||
| } // namespace mtconnect::asset |
Oops, something went wrong.