From 271455fd20c634bb08d2de7be2685148a5a95bfa Mon Sep 17 00:00:00 2001
From: Michael Hoffer <info@michaelhoffer.de>
Date: Wed, 12 Aug 2015 09:39:47 +0200
Subject: [PATCH] sample projects improved

---
 VRL/VRL-UI/InstrumentationMain.groovy        | 274 +++++++++++++++----
 VRL/VRL-UI/MainWithChainedInvocations.groovy |  45 ++-
 2 files changed, 255 insertions(+), 64 deletions(-)

diff --git a/VRL/VRL-UI/InstrumentationMain.groovy b/VRL/VRL-UI/InstrumentationMain.groovy
index 07528ba8..2a6811e1 100644
--- a/VRL/VRL-UI/InstrumentationMain.groovy
+++ b/VRL/VRL-UI/InstrumentationMain.groovy
@@ -1,6 +1,7 @@
 package my.testpackage;
 public class MainCSG {
 
+    
     public static eu.mihosoft.vrl.v3d.jcsg.CSG createSphere(double radius) {
         eu.mihosoft.vrl.v3d.jcsg.Sphere sphere;
         sphere = (new eu.mihosoft.vrl.v3d.jcsg.Sphere(radius));
@@ -11,27 +12,26 @@ public class MainCSG {
         cube = (new eu.mihosoft.vrl.v3d.jcsg.Cube(dimensions));
         return cube.toCSG();
     }
-    public static void main(String[] args) {
+    public static eu.mihosoft.vrl.v3d.jcsg.CSG createDiff(double r1, double r2) {
         eu.mihosoft.vrl.v3d.jcsg.CSG cube;
-        cube = (createCube(12));
+        cube = (createCube(r1));
         eu.mihosoft.vrl.v3d.jcsg.CSG sphere;
-        sphere = (createSphere(8));
-        cube.difference(sphere);
+        sphere = (createSphere(r2));
+        return cube.difference(sphere);
+    }
+    public static void main(String[] args) {
+        eu.mihosoft.vrl.v3d.jcsg.CSG res1;
+        res1 = (createDiff(13, 10));
+        eu.mihosoft.vrl.v3d.jcsg.CSG res2;
+        res2 = (createDiff(13, 9));
+        eu.mihosoft.vrl.v3d.jcsg.CSG res3;
+        res3 = (createDiff(13, 8));
+        res3 = (createDiff(13, 7));
     }
 }
 // <editor-fold defaultstate="collapsed" desc="VRL-Data">
 /*<!VRL!><Type:VRL-Layout>
 <map>
-  <entry>
-    <string>Script:my.testpackage.MainCSG:main:inv:declare sphere</string>
-    <layout>
-      <x>1093.6567990778933</x>
-      <y>120.79194497278216</y>
-      <width>200.0</width>
-      <height>150.0</height>
-      <contentVisible>true</contentVisible>
-    </layout>
-  </entry>
   <entry>
     <string>Script:my.testpackage.MainCSG:createCube:inv:toCSG</string>
     <layout>
@@ -53,50 +53,50 @@ public class MainCSG {
     </layout>
   </entry>
   <entry>
-    <string>Script:my.testpackage.MainCSG:main:inv:createSphere</string>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:op ASSIGN</string>
     <layout>
-      <x>876.0799232696</x>
-      <y>360.04577973157296</y>
-      <width>517.5642044242567</width>
-      <height>369.8860082032038</height>
+      <x>778.6583681208228</x>
+      <y>282.9607836665687</y>
+      <width>200.0</width>
+      <height>150.0</height>
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
   <entry>
-    <string>Script:my.testpackage.MainCSG:main:inv:createCube</string>
+    <string>Script:my.testpackage.MainCSG:createCube</string>
     <layout>
-      <x>310.10698283280624</x>
-      <y>108.09443401600679</y>
-      <width>488.2377051968422</width>
-      <height>278.07491704112647</height>
+      <x>50.056397579767946</x>
+      <y>492.77519139764064</y>
+      <width>793.6768012893114</width>
+      <height>486.0</height>
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
   <entry>
-    <string>Script:my.testpackage.MainCSG:main:inv:declare cube</string>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:declare sphere</string>
     <layout>
-      <x>22.503024882923487</x>
-      <y>183.23891690380555</y>
-      <width>200.0</width>
-      <height>150.0</height>
+      <x>1080.516856242133</x>
+      <y>161.68077459428378</y>
+      <width>233.59146118164062</width>
+      <height>151.23339299368985</height>
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
   <entry>
-    <string>Script:my.testpackage.MainCSG:createCube</string>
+    <string>Script:my.testpackage.MainCSG:createSphere:inv:op ASSIGN</string>
     <layout>
-      <x>65.07958804862845</x>
-      <y>427.67469936591175</y>
-      <width>793.6768012893114</width>
-      <height>486.0</height>
+      <x>733.5939538785191</x>
+      <y>181.91965160399423</y>
+      <width>200.0</width>
+      <height>150.0</height>
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
   <entry>
-    <string>Script:my.testpackage.MainCSG:createSphere:inv:op ASSIGN</string>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:difference</string>
     <layout>
-      <x>733.5939538785191</x>
-      <y>181.91965160399423</y>
+      <x>1403.399693446297</x>
+      <y>799.1509080868534</y>
       <width>200.0</width>
       <height>150.0</height>
       <contentVisible>true</contentVisible>
@@ -105,8 +105,8 @@ public class MainCSG {
   <entry>
     <string>Script:my.testpackage.MainCSG:main:inv:op ASSIGN</string>
     <layout>
-      <x>845.4707920298395</x>
-      <y>128.58871361670563</y>
+      <x>566.4963161067597</x>
+      <y>1.6689560767845872</y>
       <width>200.0</width>
       <height>150.0</height>
       <contentVisible>true</contentVisible>
@@ -117,7 +117,7 @@ public class MainCSG {
     <layout>
       <x>522.3669779124697</x>
       <y>7.735606423317017</y>
-      <width>389.83418456635667</width>
+      <width>432.4515142299233</width>
       <height>150.0</height>
       <contentVisible>true</contentVisible>
     </layout>
@@ -178,7 +178,7 @@ public class MainCSG {
       <x>0.0</x>
       <y>0.0</y>
       <width>1222.0</width>
-      <height>617.0</height>
+      <height>882.5198863636363</height>
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
@@ -192,16 +192,116 @@ public class MainCSG {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:main:inv:declare res3</string>
+    <layout>
+      <x>1116.5568802350374</x>
+      <y>467.0322867143526</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:return</string>
+    <layout>
+      <x>1834.454720192043</x>
+      <y>840.6634451049031</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:main:inv:declare res1</string>
+    <layout>
+      <x>256.460066901611</x>
+      <y>31.048915458907167</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:declare cube</string>
+    <layout>
+      <x>306.3069870496926</x>
+      <y>62.77689172613738</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:main:inv:declare res2</string>
+    <layout>
+      <x>808.4949472405247</x>
+      <y>0.0</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:op ASSIGN:0</string>
+    <layout>
+      <x>1104.5081167036678</x>
+      <y>779.3899334342689</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:main:inv:createDiff:0</string>
+    <layout>
+      <x>551.625462306822</x>
+      <y>205.25132947795328</y>
+      <width>493.15194582875756</width>
+      <height>295.30203604145663</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:main:inv:createDiff:1</string>
+    <layout>
+      <x>0.10650187903385527</x>
+      <y>554.5654394940567</y>
+      <width>480.57934824687493</width>
+      <height>283.80791770063945</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
   <entry>
     <string>Script:my.testpackage.MainCSG:createSphere</string>
     <layout>
-      <x>234.59702451258272</x>
-      <y>14.712528411963795</y>
+      <x>224.58156420000907</x>
+      <y>27.231853802680885</y>
       <width>623.1296213580301</width>
       <height>393.99326567216355</height>
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:createSphere</string>
+    <layout>
+      <x>929.1160893655617</x>
+      <y>536.2494419313799</y>
+      <width>488.2100199662136</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:main:inv:createDiff:2</string>
+    <layout>
+      <x>548.3455411798705</x>
+      <y>559.1066960660496</y>
+      <width>497.83413869367007</width>
+      <height>289.32230214917354</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
   <entry>
     <string>Script:my.testpackage.MainCSG:inv:declare this</string>
     <layout>
@@ -212,6 +312,26 @@ public class MainCSG {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:declare r2</string>
+    <layout>
+      <x>0.0</x>
+      <y>181.57893200268745</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:declare r1</string>
+    <layout>
+      <x>0.2909204568268864</x>
+      <y>0.0</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
   <entry>
     <string>Script:my.testpackage.MainCSG:createCube:inv:declare cube</string>
     <layout>
@@ -222,11 +342,21 @@ public class MainCSG {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:createDiff</string>
+    <layout>
+      <x>895.2632897885192</x>
+      <y>528.0275596552435</y>
+      <width>690.5866827119339</width>
+      <height>416.33920129170326</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
   <entry>
     <string>Script:my.testpackage.MainCSG:main:inv:declare args</string>
     <layout>
-      <x>0.0</x>
-      <y>0.0</y>
+      <x>31.88528579575292</x>
+      <y>29.782459382122575</y>
       <width>200.0</width>
       <height>150.0</height>
       <contentVisible>true</contentVisible>
@@ -235,9 +365,9 @@ public class MainCSG {
   <entry>
     <string>Script:my.testpackage.MainCSG:main:inv:op ASSIGN:0</string>
     <layout>
-      <x>1002.0676377505234</x>
-      <y>808.0393261603588</y>
-      <width>362.3492563296877</width>
+      <x>1118.2005714456734</x>
+      <y>290.1396073605182</y>
+      <width>200.0</width>
       <height>150.0</height>
       <contentVisible>true</contentVisible>
     </layout>
@@ -248,7 +378,37 @@ public class MainCSG {
       <x>0.0</x>
       <y>0.0</y>
       <width>1197.9276094709583</width>
-      <height>557.5420834576643</height>
+      <height>797.9176169092005</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:main:inv:createDiff</string>
+    <layout>
+      <x>0.0</x>
+      <y>208.8924407522298</y>
+      <width>480.15421239841635</width>
+      <height>291.66092328613877</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:main:inv:op ASSIGN:1</string>
+    <layout>
+      <x>139.9622118382441</x>
+      <y>916.4784169059851</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
+  <entry>
+    <string>Script:my.testpackage.MainCSG:main:inv:op ASSIGN:2</string>
+    <layout>
+      <x>1583.116561902281</x>
+      <y>1148.8623318074738</y>
+      <width>200.0</width>
+      <height>150.0</height>
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
@@ -265,23 +425,23 @@ public class MainCSG {
   <entry>
     <string>Script:my.testpackage.MainCSG:main</string>
     <layout>
-      <x>893.6949088188937</x>
-      <y>47.842725509509165</y>
+      <x>884.7068097898517</x>
+      <y>35.066389916636055</y>
       <width>819.9814953017315</width>
       <height>463.93939361829143</height>
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
   <entry>
-    <string>Script:my.testpackage.MainCSG:main:inv:difference</string>
+    <string>Script:my.testpackage.MainCSG:createDiff:inv:createCube</string>
     <layout>
-      <x>1727.3554572117262</x>
-      <y>410.110932722536</y>
-      <width>568.6279256039497</width>
-      <height>403.96433012945477</height>
+      <x>302.2877135424976</x>
+      <y>289.52871155344764</y>
+      <width>383.0</width>
+      <height>150.0</height>
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
 </map>
 */
-// </editor-fold>
+// </editor-fold>
\ No newline at end of file
diff --git a/VRL/VRL-UI/MainWithChainedInvocations.groovy b/VRL/VRL-UI/MainWithChainedInvocations.groovy
index 526f0cc2..c38e8bb8 100644
--- a/VRL/VRL-UI/MainWithChainedInvocations.groovy
+++ b/VRL/VRL-UI/MainWithChainedInvocations.groovy
@@ -5,8 +5,9 @@ public class MainWithChainedInvocations {
     public my.testpackage.MainWithChainedInvocations m1() {
         return this;
     }
-    public static void main() {
+    public static void main(String[] args) {
         my.testpackage.MainWithChainedInvocations m;
+        m = (new my.testpackage.MainWithChainedInvocations());
         m.m1().m1();
     }
 }
@@ -26,8 +27,8 @@ public class MainWithChainedInvocations {
   <entry>
     <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:declare m</string>
     <layout>
-      <x>0.0</x>
-      <y>0.0</y>
+      <x>266.8778751141102</x>
+      <y>1.0848694110329684</y>
       <width>200.0</width>
       <height>150.0</height>
       <contentVisible>true</contentVisible>
@@ -43,6 +44,16 @@ public class MainWithChainedInvocations {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
+  <entry>
+    <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:declare args</string>
+    <layout>
+      <x>0.0</x>
+      <y>0.0</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
   <entry>
     <string>Script:my.testpackage.MainWithChainedInvocations:m1</string>
     <layout>
@@ -53,11 +64,21 @@ public class MainWithChainedInvocations {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
+  <entry>
+    <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:&lt;init&gt;</string>
+    <layout>
+      <x>2.159789134845204</x>
+      <y>215.4099405489691</y>
+      <width>493.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
   <entry>
     <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:m1:0</string>
     <layout>
-      <x>418.17387133220683</x>
-      <y>360.09416698051143</y>
+      <x>667.8955288263747</x>
+      <y>413.66270958709157</y>
       <width>200.0</width>
       <height>150.0</height>
       <contentVisible>true</contentVisible>
@@ -76,8 +97,8 @@ public class MainWithChainedInvocations {
   <entry>
     <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:m1</string>
     <layout>
-      <x>414.0950138440407</x>
-      <y>169.08879731964996</y>
+      <x>663.8166713382085</x>
+      <y>222.65733992622984</y>
       <width>200.0</width>
       <height>150.0</height>
       <contentVisible>true</contentVisible>
@@ -103,6 +124,16 @@ public class MainWithChainedInvocations {
       <contentVisible>true</contentVisible>
     </layout>
   </entry>
+  <entry>
+    <string>Script:my.testpackage.MainWithChainedInvocations:main:inv:op ASSIGN</string>
+    <layout>
+      <x>663.852119072537</x>
+      <y>55.634031193006</y>
+      <width>200.0</width>
+      <height>150.0</height>
+      <contentVisible>true</contentVisible>
+    </layout>
+  </entry>
 </map>
 */
 // </editor-fold>
\ No newline at end of file