From 9f6bd6b5181523b0113663f841aed3a5feeae510 Mon Sep 17 00:00:00 2001 From: stephane-pv Date: Mon, 8 Jun 2026 13:14:07 +0200 Subject: [PATCH 1/2] =?UTF-8?q?-=20module=5Flayout=20elements=20have=20bee?= =?UTF-8?q?n=20migrated=20to=20attributes=20-=20circuit=5Froot=20can=20now?= =?UTF-8?q?=20be=20connected=20to=20multiple=20children=20-=20example=20fi?= =?UTF-8?q?les=20have=20been=20adjusted=20accordingly=20-=20example=20file?= =?UTF-8?q?s=20now=20use=20the=20correct=20azimuth=20convention=20(0=C2=B0?= =?UTF-8?q?=20=3D=20North,=20180=C2=B0=20=3D=20South)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...leFixedPVC2_without_electrical_layout.pvc2 | 2 +- ...rackersPVC2_without_electrical_layout.pvc2 | 2 +- ...ixedPVC2_with_basic_electrical_layout.pvc2 | 74 +- ...kersPVC2_with_basic_electrical_layout.pvc2 | 866 +++--------------- ...impleFixedPVC2_with_electrical_layout.pvc2 | 74 +- schema/PVCollada_2.0/pvcollada_schema_2.0.xsd | 25 +- 6 files changed, 188 insertions(+), 855 deletions(-) diff --git a/Examples/PVCollada_2.0/01 - VerySimpleFixedPVC2_without_electrical_layout.pvc2 b/Examples/PVCollada_2.0/01 - VerySimpleFixedPVC2_without_electrical_layout.pvc2 index 0a78b4e..2c75a51 100644 --- a/Examples/PVCollada_2.0/01 - VerySimpleFixedPVC2_without_electrical_layout.pvc2 +++ b/Examples/PVCollada_2.0/01 - VerySimpleFixedPVC2_without_electrical_layout.pvc2 @@ -157,7 +157,7 @@ 7 landscape 23.50 - 0 + 180 ModuleModel1 diff --git a/Examples/PVCollada_2.0/02 - TrackersPVC2_without_electrical_layout.pvc2 b/Examples/PVCollada_2.0/02 - TrackersPVC2_without_electrical_layout.pvc2 index 6b3c772..2489bd5 100644 --- a/Examples/PVCollada_2.0/02 - TrackersPVC2_without_electrical_layout.pvc2 +++ b/Examples/PVCollada_2.0/02 - TrackersPVC2_without_electrical_layout.pvc2 @@ -158,7 +158,7 @@ 2 15 portrait - 0 + 180 0 ModuleModel1 diff --git a/Examples/PVCollada_2.0/03 - VerySimpleFixedPVC2_with_basic_electrical_layout.pvc2 b/Examples/PVCollada_2.0/03 - VerySimpleFixedPVC2_with_basic_electrical_layout.pvc2 index 721380c..adc41da 100644 --- a/Examples/PVCollada_2.0/03 - VerySimpleFixedPVC2_with_basic_electrical_layout.pvc2 +++ b/Examples/PVCollada_2.0/03 - VerySimpleFixedPVC2_with_basic_electrical_layout.pvc2 @@ -89,26 +89,10 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + @@ -119,26 +103,10 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + @@ -149,26 +117,10 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + @@ -286,7 +238,7 @@ 7 landscape 23.50 - 0 + 180 ModuleModel1 diff --git a/Examples/PVCollada_2.0/04 - TrackersPVC2_with_basic_electrical_layout.pvc2 b/Examples/PVCollada_2.0/04 - TrackersPVC2_with_basic_electrical_layout.pvc2 index bb715f6..7f7ba7e 100644 --- a/Examples/PVCollada_2.0/04 - TrackersPVC2_with_basic_electrical_layout.pvc2 +++ b/Examples/PVCollada_2.0/04 - TrackersPVC2_with_basic_electrical_layout.pvc2 @@ -88,126 +88,30 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - - - 5 - 1 - 5 - - - 6 - 1 - 6 - - - 7 - 1 - 1 - - - 8 - 1 - 2 - - - 9 - 1 - 3 - - - 10 - 1 - 4 - - - 11 - 1 - 5 - - - 12 - 1 - 6 - - - 13 - 1 - 1 - - - 14 - 1 - 2 - - - 15 - 1 - 3 - - - 16 - 1 - 4 - - - 17 - 1 - 5 - - - 18 - 1 - 6 - - - 19 - 1 - 1 - - - 20 - 1 - 2 - - - 21 - 1 - 3 - - - 22 - 1 - 4 - - - 23 - 1 - 5 - - - 24 - 1 - 6 - + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,126 +122,30 @@ - - 1 - 2 - 1 - - - 2 - 2 - 2 - - - 3 - 2 - 3 - - - 4 - 2 - 4 - - - 5 - 2 - 5 - - - 6 - 2 - 6 - - - 7 - 2 - 1 - - - 8 - 2 - 2 - - - 9 - 2 - 3 - - - 10 - 2 - 4 - - - 11 - 2 - 5 - - - 12 - 2 - 6 - - - 13 - 2 - 1 - - - 14 - 2 - 2 - - - 15 - 2 - 3 - - - 16 - 2 - 4 - - - 17 - 2 - 5 - - - 18 - 2 - 6 - - - 19 - 2 - 1 - - - 20 - 2 - 2 - - - 21 - 2 - 3 - - - 22 - 2 - 4 - - - 23 - 2 - 5 - - - 24 - 2 - 6 - + + + + + + + + + + + + + + + + + + + + + + + + @@ -348,126 +156,30 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - - - 5 - 1 - 5 - - - 6 - 1 - 6 - - - 7 - 1 - 1 - - - 8 - 1 - 2 - - - 9 - 1 - 3 - - - 10 - 1 - 4 - - - 11 - 1 - 5 - - - 12 - 1 - 6 - - - 13 - 1 - 1 - - - 14 - 1 - 2 - - - 15 - 1 - 3 - - - 16 - 1 - 4 - - - 17 - 1 - 5 - - - 18 - 1 - 6 - - - 19 - 1 - 1 - - - 20 - 1 - 2 - - - 21 - 1 - 3 - - - 22 - 1 - 4 - - - 23 - 1 - 5 - - - 24 - 1 - 6 - + + + + + + + + + + + + + + + + + + + + + + + + @@ -478,126 +190,30 @@ - - 1 - 2 - 1 - - - 2 - 2 - 2 - - - 3 - 2 - 3 - - - 4 - 2 - 4 - - - 5 - 2 - 5 - - - 6 - 2 - 6 - - - 7 - 2 - 1 - - - 8 - 2 - 2 - - - 9 - 2 - 3 - - - 10 - 2 - 4 - - - 11 - 2 - 5 - - - 12 - 2 - 6 - - - 13 - 2 - 1 - - - 14 - 2 - 2 - - - 15 - 2 - 3 - - - 16 - 2 - 4 - - - 17 - 2 - 5 - - - 18 - 2 - 6 - - - 19 - 2 - 1 - - - 20 - 2 - 2 - - - 21 - 2 - 3 - - - 22 - 2 - 4 - - - 23 - 2 - 5 - - - 24 - 2 - 6 - + + + + + + + + + + + + + + + + + + + + + + + + @@ -608,126 +224,30 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - - - 5 - 1 - 5 - - - 6 - 1 - 6 - - - 7 - 1 - 1 - - - 8 - 1 - 2 - - - 9 - 1 - 3 - - - 10 - 1 - 4 - - - 11 - 1 - 5 - - - 12 - 1 - 6 - - - 13 - 1 - 1 - - - 14 - 1 - 2 - - - 15 - 1 - 3 - - - 16 - 1 - 4 - - - 17 - 1 - 5 - - - 18 - 1 - 6 - - - 19 - 1 - 1 - - - 20 - 1 - 2 - - - 21 - 1 - 3 - - - 22 - 1 - 4 - - - 23 - 1 - 5 - - - 24 - 1 - 6 - + + + + + + + + + + + + + + + + + + + + + + + + @@ -738,126 +258,30 @@ - - 1 - 2 - 1 - - - 2 - 2 - 2 - - - 3 - 2 - 3 - - - 4 - 2 - 4 - - - 5 - 2 - 5 - - - 6 - 2 - 6 - - - 7 - 2 - 1 - - - 8 - 2 - 2 - - - 9 - 2 - 3 - - - 10 - 2 - 4 - - - 11 - 2 - 5 - - - 12 - 2 - 6 - - - 13 - 2 - 1 - - - 14 - 2 - 2 - - - 15 - 2 - 3 - - - 16 - 2 - 4 - - - 17 - 2 - 5 - - - 18 - 2 - 6 - - - 19 - 2 - 1 - - - 20 - 2 - 2 - - - 21 - 2 - 3 - - - 22 - 2 - 4 - - - 23 - 2 - 5 - - - 24 - 2 - 6 - + + + + + + + + + + + + + + + + + + + + + + + + @@ -974,7 +398,7 @@ 2 15 portrait - 0 + 180 0 ModuleModel1 diff --git a/Examples/PVCollada_2.0/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2 b/Examples/PVCollada_2.0/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2 index eca5c10..efcab45 100644 --- a/Examples/PVCollada_2.0/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2 +++ b/Examples/PVCollada_2.0/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2 @@ -184,26 +184,10 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + @@ -222,26 +206,10 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + @@ -260,26 +228,10 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + @@ -401,7 +353,7 @@ 7 landscape 23.50 - 0 + 180 ModuleModel1 diff --git a/schema/PVCollada_2.0/pvcollada_schema_2.0.xsd b/schema/PVCollada_2.0/pvcollada_schema_2.0.xsd index 0089f3d..7a8a5b3 100644 --- a/schema/PVCollada_2.0/pvcollada_schema_2.0.xsd +++ b/schema/PVCollada_2.0/pvcollada_schema_2.0.xsd @@ -537,7 +537,7 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema"> - + @@ -546,9 +546,16 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema"> - - - + + + + + + + + + + @@ -688,14 +695,12 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema"> - - - - - + + + - + This tag should only appear in the extra/technique section of the Collada/asset tag. From d5e0854493ad2e70a3f563e49e4f1ce4825d7abe Mon Sep 17 00:00:00 2001 From: stephane-pv Date: Mon, 8 Jun 2026 13:57:21 +0200 Subject: [PATCH 2/2] Adjustment of PVsyst-specific example files --- ...Vsyst-extensions-from-PVsyst-database.pvc2 | 146 +++--------------- .../02 - PVsyst-extensions-from-cdata.pvc2 | 74 ++------- 2 files changed, 38 insertions(+), 182 deletions(-) diff --git a/Examples/PVCollada_2.0/extensions/pvsyst/01 - PVsyst-extensions-from-PVsyst-database.pvc2 b/Examples/PVCollada_2.0/extensions/pvsyst/01 - PVsyst-extensions-from-PVsyst-database.pvc2 index 4e9f75e..b393145 100644 --- a/Examples/PVCollada_2.0/extensions/pvsyst/01 - PVsyst-extensions-from-PVsyst-database.pvc2 +++ b/Examples/PVCollada_2.0/extensions/pvsyst/01 - PVsyst-extensions-from-PVsyst-database.pvc2 @@ -330,137 +330,41 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + + + + + - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + + + + + - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + + + + + @@ -602,7 +506,7 @@ 4 portrait 21.8 - 0 + 180 0 ModuleModel1 diff --git a/Examples/PVCollada_2.0/extensions/pvsyst/02 - PVsyst-extensions-from-cdata.pvc2 b/Examples/PVCollada_2.0/extensions/pvsyst/02 - PVsyst-extensions-from-cdata.pvc2 index cefdd8e..e8a8a3e 100644 --- a/Examples/PVCollada_2.0/extensions/pvsyst/02 - PVsyst-extensions-from-cdata.pvc2 +++ b/Examples/PVCollada_2.0/extensions/pvsyst/02 - PVsyst-extensions-from-cdata.pvc2 @@ -327,26 +327,10 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + @@ -365,26 +349,10 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + @@ -403,26 +371,10 @@ - - 1 - 1 - 1 - - - 2 - 1 - 2 - - - 3 - 1 - 3 - - - 4 - 1 - 4 - + + + + @@ -709,7 +661,7 @@ End of PVObject pvGInverter 4 portrait 21.8 - 0 + 180 0 ModuleModel1