From b05dbe62c5301194d8a6330214bebba216d4b705 Mon Sep 17 00:00:00 2001 From: brutzman <brutzman@DESKTOP-2S09UKA> Date: Thu, 28 Nov 2019 11:55:03 -0800 Subject: [PATCH] X3dTidy add WorldInfo title --- Space/SatelliteLab/CenterPost.x3d | 3 ++- Space/SatelliteLab/DeckPost.x3d | 3 ++- Space/SatelliteLab/EquipmentDeck.x3d | 3 ++- Space/SatelliteLab/EquipmentRing.x3d | 3 ++- Space/SatelliteLab/HTVSCMGPrototype.rq.txt | 27 +++++++++++++++++++ Space/SatelliteLab/HTVSCMGPrototype.x3d | 3 ++- Space/SatelliteLab/LaserTargetTrack.x3d | 3 ++- .../SatelliteLab/LaserTargetTrackSupport.x3d | 3 ++- .../ManualXYZBalanceBlockPrototype.x3d | 3 ++- .../ManualXZBalanceBlockPrototype.x3d | 3 ++- Space/SatelliteLab/OpticalDeck.x3d | 3 ++- Space/SatelliteLab/SatelliteRoom.x3d | 3 ++- Space/SatelliteLab/SourceLaserSupport.x3d | 3 ++- Space/SatelliteLab/UpperDeck.x3d | 3 ++- Space/SatelliteLab/VibrationIsolator.x3d | 3 ++- 15 files changed, 55 insertions(+), 14 deletions(-) create mode 100644 Space/SatelliteLab/HTVSCMGPrototype.rq.txt diff --git a/Space/SatelliteLab/CenterPost.x3d b/Space/SatelliteLab/CenterPost.x3d index b90fecc593..f5c556e1f8 100644 --- a/Space/SatelliteLab/CenterPost.x3d +++ b/Space/SatelliteLab/CenterPost.x3d @@ -6,13 +6,14 @@ <meta content='Upper optical deck center post of MSADS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='17 September 2006' name='created'/> - <meta content='22 February 2010' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/CenterPost.x3d' name='identifier'/> <meta content='Wings3D, VizX3D' name='generator'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='CenterPost.x3d'/> <Shape DEF='CenterPost'> <Appearance> <Material/> diff --git a/Space/SatelliteLab/DeckPost.x3d b/Space/SatelliteLab/DeckPost.x3d index a276042102..a0ba3376b8 100644 --- a/Space/SatelliteLab/DeckPost.x3d +++ b/Space/SatelliteLab/DeckPost.x3d @@ -6,13 +6,14 @@ <meta content='An equipment deck post for the MSADS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='13 September 2006' name='created'/> - <meta content='22 February 2010' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/DeckPost.x3d' name='identifier'/> <meta content='Wings3D, VizX3D' name='generator'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='DeckPost.x3d'/> <Shape DEF='DeckPost'> <Appearance> <Material ambientIntensity='0.4' diffuseColor='1.0 0.77 0.31' shininess='0.16' specularColor='0.71 0.70 0.56'/> diff --git a/Space/SatelliteLab/EquipmentDeck.x3d b/Space/SatelliteLab/EquipmentDeck.x3d index c18433183d..088986a070 100644 --- a/Space/SatelliteLab/EquipmentDeck.x3d +++ b/Space/SatelliteLab/EquipmentDeck.x3d @@ -6,13 +6,14 @@ <meta content='Movable equipment deck for the MSADS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='15 September 2006' name='created'/> - <meta content='14 January 2014' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/EquipmentDeck.x3d' name='identifier'/> <meta content='Wings3D, VizX3D' name='generator'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='EquipmentDeck.x3d'/> <NavigationInfo/> <ExternProtoDeclare name='HTVSCMG' url='"HTVSCMGPrototype.wrl#HTVSCMG" "HTVSCMGPrototype.x3d#HTVSCMG" "http://ron.hattfamily.net/msads/HTVSCMGPrototype.wrl#HTVSCMG" "http://ron.hattfamily.net/msads/HTVSCMGPrototype.x3d#HTVSCMG"'/> <ExternProtoDeclare name='ManualXYZBalanceBlock' url='"ManualXYZBalanceBlockPrototype.wrl#ManualXYZBalanceBlock" "ManualXYZBalanceBlockPrototype.x3d#ManualXYZBalanceBlock" "http://ron.hattfamily.net/msads/ManualXYZBalanceBlockPrototype.wrl#ManualXYZBalanceBlock" "http://ron.hattfamily.net/msads/ManualXYZBalanceBlockPrototype.x3d#ManualXYZBalanceBlock"'/> diff --git a/Space/SatelliteLab/EquipmentRing.x3d b/Space/SatelliteLab/EquipmentRing.x3d index 7951b6f9ce..c7be29ae7c 100644 --- a/Space/SatelliteLab/EquipmentRing.x3d +++ b/Space/SatelliteLab/EquipmentRing.x3d @@ -6,13 +6,14 @@ <meta content='Equipment ring for the ASDS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='14 September 2006' name='created'/> - <meta content='22 February 2010' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/EquipmentRing.x3d' name='identifier'/> <meta content='Wings3D, VizX3D' name='generator'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='EquipmentRing.x3d'/> <Shape DEF='EquipmentRing'> <Appearance> <Material ambientIntensity='0.4' diffuseColor='1.0 0.77 0.31' shininess='0.16' specularColor='0.71 0.70 0.56'/> diff --git a/Space/SatelliteLab/HTVSCMGPrototype.rq.txt b/Space/SatelliteLab/HTVSCMGPrototype.rq.txt new file mode 100644 index 0000000000..3aa92407b1 --- /dev/null +++ b/Space/SatelliteLab/HTVSCMGPrototype.rq.txt @@ -0,0 +1,27 @@ +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> +PREFIX owl: <http://www.w3.org/2002/07/owl#> +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> +PREFIX x3d: <http://www.web3d.org/specifications/x3d-4.0.xsd#> +PREFIX x3do: <http://www.web3d.org/semantics/ontologies/X3dOntology4.0#> + +# X3dHelloWorldQuery_03.rq Query HelloWorld.ttl to show title given to model within a WorldInfo node. + +############################################### + +SELECT ?WorldInfoNode ?title ?parentNode +WHERE +{ + ?WorldInfo rdf:type x3do:WorldInfo ; + x3do:title ?title ; + x3do:hasParent ?parent . + + BIND (strafter(xsd:string(?WorldInfo),"#") AS ?WorldInfoNode) + BIND (strafter(xsd:string(?parent),"#") AS ?parentNode) +} + +############################################### +-------------------------------------- +| WorldInfoNode | title | parentNode | +====================================== +-------------------------------------- diff --git a/Space/SatelliteLab/HTVSCMGPrototype.x3d b/Space/SatelliteLab/HTVSCMGPrototype.x3d index 1f9bd998e6..7bcd9a3190 100644 --- a/Space/SatelliteLab/HTVSCMGPrototype.x3d +++ b/Space/SatelliteLab/HTVSCMGPrototype.x3d @@ -6,7 +6,7 @@ <meta content='Prototype of High Torque Variable Speed Control Moment Gyro (HTVSCMG) unit for the MSADS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='14 September 2006' name='created'/> - <meta content='22 February 2010' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/HTVSCMGPrototype.x3d' name='identifier'/> <meta content='https://www.fbo.gov/index?s=opportunity&mode=formid=fd597ae08f5c83d78e844c167f9b644f&tab=core&_cview=0' name='reference'/> <meta content='Wings3D, VizX3D' name='generator'/> @@ -14,6 +14,7 @@ <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='HTVSCMGPrototype.x3d'/> <ProtoDeclare appinfo='High Torque Variable Speed Control Moment Gyro (HTVSCMG)' name='HTVSCMG'> <ProtoBody> <Group DEF='HTVSCMG'> diff --git a/Space/SatelliteLab/LaserTargetTrack.x3d b/Space/SatelliteLab/LaserTargetTrack.x3d index 4458154744..f538e01e37 100644 --- a/Space/SatelliteLab/LaserTargetTrack.x3d +++ b/Space/SatelliteLab/LaserTargetTrack.x3d @@ -6,12 +6,13 @@ <meta content='A metal track that the laser target is mounted on.' name='description'/> <meta content='Brian Kibel' name='creator'/> <meta content='4 September 2006' name='created'/> - <meta content='14 January 2014' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/LaserTargetTrack.x3d' name='identifier'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='LaserTargetTrack.x3d'/> <NavigationInfo/> <Group DEF='TrackRails'> <Transform translation='0 2.2 0'> diff --git a/Space/SatelliteLab/LaserTargetTrackSupport.x3d b/Space/SatelliteLab/LaserTargetTrackSupport.x3d index cc7423b9eb..431889a10a 100644 --- a/Space/SatelliteLab/LaserTargetTrackSupport.x3d +++ b/Space/SatelliteLab/LaserTargetTrackSupport.x3d @@ -6,12 +6,13 @@ <meta content='Support leg for target track rail.' name='description'/> <meta content='Brian Kibel' name='creator'/> <meta content='4 September 2006' name='created'/> - <meta content='22 February 2010' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/LaserTargetTrackSupport.x3d' name='identifier'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='LaserTargetTrackSupport.x3d'/> <Group DEF='TrackSupport'> <Transform rotation='1 0 0 1.5707' scale='.2 2.5 .05'> <Shape DEF='SupportBeam'> diff --git a/Space/SatelliteLab/ManualXYZBalanceBlockPrototype.x3d b/Space/SatelliteLab/ManualXYZBalanceBlockPrototype.x3d index 89bc51a26f..a00d5ac9bc 100644 --- a/Space/SatelliteLab/ManualXYZBalanceBlockPrototype.x3d +++ b/Space/SatelliteLab/ManualXYZBalanceBlockPrototype.x3d @@ -6,13 +6,14 @@ <meta content='Prototype for one of two types of balance blocks on the MSADS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='14 September 2006' name='created'/> - <meta content='14 January 2014' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/ManualXYZBalanceBlockPrototype.x3d' name='identifier'/> <meta content='Wings3D, VizX3D' name='generator'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='ManualXYZBalanceBlockPrototype.x3d'/> <ProtoDeclare appinfo='Manual Balance Block for XYZ stability' name='ManualXYZBalanceBlock'> <ProtoBody> <Group DEF='ManualXYZBalanceBlock'> diff --git a/Space/SatelliteLab/ManualXZBalanceBlockPrototype.x3d b/Space/SatelliteLab/ManualXZBalanceBlockPrototype.x3d index 41b21a1acb..516ef61e12 100644 --- a/Space/SatelliteLab/ManualXZBalanceBlockPrototype.x3d +++ b/Space/SatelliteLab/ManualXZBalanceBlockPrototype.x3d @@ -6,13 +6,14 @@ <meta content='Prototype of one of two types of balance blocks on the MSADS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='14 September 2006' name='created'/> - <meta content='14 January 2014' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/ManualXZBalanceBlockPrototype.x3d' name='identifier'/> <meta content='Wings3D, VizX3D' name='generator'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='ManualXZBalanceBlockPrototype.x3d'/> <ProtoDeclare appinfo='Manual Balance Block in XZ plane' name='ManualXZBalanceBlock'> <ProtoBody> <Group DEF='ManualBalanceBlock'> diff --git a/Space/SatelliteLab/OpticalDeck.x3d b/Space/SatelliteLab/OpticalDeck.x3d index d387ff01b3..d8f50def17 100644 --- a/Space/SatelliteLab/OpticalDeck.x3d +++ b/Space/SatelliteLab/OpticalDeck.x3d @@ -6,13 +6,14 @@ <meta content='Optical deck for the ASDS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='14 September 2006' name='created'/> - <meta content='22 February 2010' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/OpticalDeck.x3d' name='identifier'/> <meta content='Wings3D, VizX3D' name='generator'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='OpticalDeck.x3d'/> <Shape DEF='OpticalDeck'> <Appearance> <Material ambientIntensity='0.4' diffuseColor='1.0 0.77 0.31' shininess='0.16' specularColor='0.71 0.70 0.56'/> diff --git a/Space/SatelliteLab/SatelliteRoom.x3d b/Space/SatelliteLab/SatelliteRoom.x3d index 6d1153033b..27d5148611 100644 --- a/Space/SatelliteLab/SatelliteRoom.x3d +++ b/Space/SatelliteLab/SatelliteRoom.x3d @@ -6,12 +6,13 @@ <meta content='A room containing a satellite build up.' name='description'/> <meta content='Brian Kibel and Ron Hatt' name='creator'/> <meta content='30 August 2006' name='created'/> - <meta content='14 January 2014' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/SatelliteRoom.x3d' name='identifier'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='SatelliteRoom.x3d'/> <NavigationInfo/> <Viewpoint description='StartPoint' position='0 1.7 7.5'/> <Viewpoint description='Target' orientation='0 1 0 1.571' position='8 1.7 4.3'/> diff --git a/Space/SatelliteLab/SourceLaserSupport.x3d b/Space/SatelliteLab/SourceLaserSupport.x3d index 3b040e878e..09ac37f5d0 100644 --- a/Space/SatelliteLab/SourceLaserSupport.x3d +++ b/Space/SatelliteLab/SourceLaserSupport.x3d @@ -6,12 +6,13 @@ <meta content='Support for the source Laser.' name='description'/> <meta content='Brian Kibel' name='creator'/> <meta content='18 September 2006' name='created'/> - <meta content='14 January 2014' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/SourceLaserSupport.x3d' name='identifier'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='SourceLaserSupport.x3d'/> <Group DEF='LaserSupport'> <Transform DEF='Leg1' rotation='-1 0 1 .757' translation='1.24 2.25 1.65'> <Transform scale='.1 2.5 .1'> diff --git a/Space/SatelliteLab/UpperDeck.x3d b/Space/SatelliteLab/UpperDeck.x3d index fa77660da3..e301527463 100644 --- a/Space/SatelliteLab/UpperDeck.x3d +++ b/Space/SatelliteLab/UpperDeck.x3d @@ -6,13 +6,14 @@ <meta content='Upper optical deck for the MSADS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='17 September 2006' name='created'/> - <meta content='14 January 2014' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/UpperDeck.x3d' name='identifier'/> <meta content='Wings3D, VizX3D' name='generator'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='UpperDeck.x3d'/> <NavigationInfo/> <Shape DEF='UpperDeck'> <Appearance> diff --git a/Space/SatelliteLab/VibrationIsolator.x3d b/Space/SatelliteLab/VibrationIsolator.x3d index cd40d5fa05..3d50b1d037 100644 --- a/Space/SatelliteLab/VibrationIsolator.x3d +++ b/Space/SatelliteLab/VibrationIsolator.x3d @@ -6,13 +6,14 @@ <meta content='A vibration isolator for the optical deck of the MSADS Assembly' name='description'/> <meta content='Ron Hatt' name='creator'/> <meta content='13 September 2006' name='created'/> - <meta content='30 December 2013' name='modified'/> + <meta content='28 November 2019' name='modified'/> <meta content='https://savage.nps.edu/Savage/Space/SatelliteLab/VibrationIsolator.x3d' name='identifier'/> <meta content='Wings3D, VizX3D' name='generator'/> <meta content='X3D-Edit 3.2, https://savage.nps.edu/X3D-Edit' name='generator'/> <meta content='../../license.html' name='license'/> </head> <Scene> + <WorldInfo title='VibrationIsolator.x3d'/> <Shape DEF='VibrationIsolator'> <Appearance> <Material diffuseColor='0.2 0.2 0.2'/> -- GitLab