bprocessor-commit — Commit

[Bprocessor-commit] test/input normal1.xml, NONE, 1.1 normal2.xml, NONE, 1.1 normal3.xml, NONE, 1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/input
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26131/input

Added Files:
	normal1.xml normal2.xml normal3.xml 
Log Message:
Preserves ordering of created surfaces in extrusion
Added test of normal calculations as preperation for improved version

--- NEW FILE: normal1.xml ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bmodel>
    <active>1</active>
    <cs>34</cs>
    <name>new project</name>
    <space type="1" level="2" voidref="2" transparent="false" name="Project" progid="0" id="1">
        <description/>
        <Classification>unassigned</Classification>
        <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="34" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <vertex y="0.0" z="0.0" x="0.0" id="35"/>
            <ijn>
                <vertex y="0.0" z="0.0" x="1.0" id="31"/>
                <vertex y="1.0" z="0.0" x="0.0" id="32"/>
                <vertex y="0.0" z="1.0" x="0.0" id="33"/>
            </ijn>
        </constructor>
        <space type="1" level="3" transparent="false" name="Void" progid="1" id="2">
            <description/>
            <Classification>unassigned</Classification>
            <boundary>5</boundary>
            <boundary>6</boundary>
            <boundary>7</boundary>
            <boundary>8</boundary>
            <boundary>9</boundary>
            <boundary>10</boundary>
        </space>
        <space type="0" level="3" voidref="4" transparent="false" name="Clockwise" progid="2" id="3">
            <description/>
            <Classification>Clockwise</Classification>
            <boundary>5</boundary>
            <boundary>6</boundary>
            <boundary>7</boundary>
            <boundary>8</boundary>
            <boundary>9</boundary>
            <boundary>10</boundary>
            <space type="1" level="4" transparent="false" name="Void" progid="1" id="4">
                <description/>
                <Classification>unassigned</Classification>
            </space>
        </space>
        <surface progid="1" id="5">
            <edgeref>11</edgeref>
            <edgeref>12</edgeref>
            <edgeref>13</edgeref>
            <edgeref>14</edgeref>
            <back>3</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="2" id="6">
            <edgeref>15</edgeref>
            <edgeref>16</edgeref>
            <edgeref>17</edgeref>
            <edgeref>11</edgeref>
            <back>3</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="3" id="7">
            <edgeref>17</edgeref>
            <edgeref>18</edgeref>
            <edgeref>19</edgeref>
            <edgeref>12</edgeref>
            <back>3</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="4" id="8">
            <edgeref>19</edgeref>
            <edgeref>20</edgeref>
            <edgeref>21</edgeref>
            <edgeref>13</edgeref>
            <back>3</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="5" id="9">
            <edgeref>21</edgeref>
            <edgeref>22</edgeref>
            <edgeref>15</edgeref>
            <edgeref>14</edgeref>
            <back>3</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="6" id="10">
            <edgeref>22</edgeref>
            <edgeref>20</edgeref>
            <edgeref>18</edgeref>
            <edgeref>16</edgeref>
            <back>3</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <edge constructor="false" progid="1" id="11">
            <from>23</from>
            <to>24</to>
        </edge>
        <edge constructor="false" progid="2" id="12">
            <from>24</from>
            <to>25</to>
        </edge>
        <edge constructor="false" progid="3" id="13">
            <from>25</from>
            <to>26</to>
        </edge>
        <edge constructor="false" progid="4" id="14">
            <from>26</from>
            <to>23</to>
        </edge>
        <edge constructor="false" progid="5" id="15">
            <from>23</from>
            <to>27</to>
        </edge>
        <edge constructor="false" progid="6" id="16">
            <from>27</from>
            <to>28</to>
        </edge>
        <edge constructor="false" progid="7" id="17">
            <from>24</from>
            <to>28</to>
        </edge>
        <edge constructor="false" progid="8" id="18">
            <from>28</from>
            <to>29</to>
        </edge>
        <edge constructor="false" progid="9" id="19">
            <from>25</from>
            <to>29</to>
        </edge>
        <edge constructor="false" progid="10" id="20">
            <from>29</from>
            <to>30</to>
        </edge>
        <edge constructor="false" progid="11" id="21">
            <from>26</from>
            <to>30</to>
        </edge>
        <edge constructor="false" progid="12" id="22">
            <from>30</from>
            <to>27</to>
        </edge>
        <vertex y="1.0" z="0.0" x="1.0" progid="1" id="23"/>
        <vertex y="6.0" z="0.0" x="1.0" progid="2" id="24"/>
        <vertex y="6.0" z="0.0" x="6.0" progid="3" id="25"/>
        <vertex y="1.0" z="0.0" x="6.0" progid="4" id="26"/>
        <vertex y="1.0" z="5.0" x="1.0" progid="5" id="27"/>
        <vertex y="6.0" z="5.0" x="1.0" progid="6" id="28"/>
        <vertex y="6.0" z="5.0" x="6.0" progid="7" id="29"/>
        <vertex y="1.0" z="5.0" x="6.0" progid="8" id="30"/>
    </space>
</bmodel>


--- NEW FILE: normal3.xml ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bmodel>
    <active>1</active>
    <cs>50</cs>
    <name>new project</name>
    <space type="1" level="2" voidref="2" transparent="false" name="Project" progid="0" id="1">
        <description/>
        <Classification>unassigned</Classification>
        <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <vertex y="0.0" z="0.0" x="0.0" id="51"/>
            <ijn>
                <vertex y="0.0" z="0.0" x="1.0" id="47"/>
                <vertex y="1.0" z="0.0" x="0.0" id="48"/>
                <vertex y="0.0" z="1.0" x="0.0" id="49"/>
            </ijn>
        </constructor>
        <space type="1" level="3" transparent="false" name="Void" progid="1" id="2">
            <description/>
            <Classification>unassigned</Classification>
            <boundary>3</boundary>
            <boundary>4</boundary>
            <boundary>5</boundary>
            <boundary>6</boundary>
        </space>
        <surface progid="1" id="3">
            <edgeref>10</edgeref>
            <edgeref>7</edgeref>
            <edgeref>8</edgeref>
            <edgeref>9</edgeref>
            <back>2</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="2" id="4">
            <edgeref>16</edgeref>
            <edgeref>11</edgeref>
            <edgeref>12</edgeref>
            <edgeref>13</edgeref>
            <edgeref>14</edgeref>
            <edgeref>15</edgeref>
            <back>2</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="3" id="5">
            <edgeref>20</edgeref>
            <edgeref>17</edgeref>
            <edgeref>18</edgeref>
            <edgeref>19</edgeref>
            <back>2</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="4" id="6">
            <edgeref>26</edgeref>
            <edgeref>21</edgeref>
            <edgeref>22</edgeref>
            <edgeref>23</edgeref>
            <edgeref>24</edgeref>
            <edgeref>25</edgeref>
            <back>2</back>
            <front>2</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <edge constructor="false" progid="1" id="7">
            <from>27</from>
            <to>28</to>
        </edge>
        <edge constructor="false" progid="2" id="8">
            <from>28</from>
            <to>29</to>
        </edge>
        <edge constructor="false" progid="3" id="9">
            <from>29</from>
            <to>30</to>
        </edge>
        <edge constructor="false" progid="4" id="10">
            <from>30</from>
            <to>27</to>
        </edge>
        <edge constructor="false" progid="5" id="11">
            <from>31</from>
            <to>32</to>
        </edge>
        <edge constructor="false" progid="6" id="12">
            <from>32</from>
            <to>33</to>
        </edge>
        <edge constructor="false" progid="7" id="13">
            <from>33</from>
            <to>34</to>
        </edge>
        <edge constructor="false" progid="8" id="14">
            <from>34</from>
            <to>35</to>
        </edge>
        <edge constructor="false" progid="9" id="15">
            <from>35</from>
            <to>36</to>
        </edge>
        <edge constructor="false" progid="10" id="16">
            <from>36</from>
            <to>31</to>
        </edge>
        <edge constructor="false" progid="11" id="17">
            <from>37</from>
            <to>38</to>
        </edge>
        <edge constructor="false" progid="12" id="18">
            <from>38</from>
            <to>39</to>
        </edge>
        <edge constructor="false" progid="13" id="19">
            <from>39</from>
            <to>40</to>
        </edge>
        <edge constructor="false" progid="14" id="20">
            <from>40</from>
            <to>37</to>
        </edge>
        <edge constructor="false" progid="15" id="21">
            <from>41</from>
            <to>42</to>
        </edge>
        <edge constructor="false" progid="16" id="22">
            <from>42</from>
            <to>43</to>
        </edge>
        <edge constructor="false" progid="17" id="23">
            <from>43</from>
            <to>44</to>
        </edge>
        <edge constructor="false" progid="18" id="24">
            <from>44</from>
            <to>45</to>
        </edge>
        <edge constructor="false" progid="19" id="25">
            <from>45</from>
            <to>46</to>
        </edge>
        <edge constructor="false" progid="20" id="26">
            <from>46</from>
            <to>41</to>
        </edge>
        <vertex y="1.0" z="0.0" x="1.0" progid="1" id="27"/>
        <vertex y="5.0" z="0.0" x="1.0" progid="2" id="28"/>
        <vertex y="5.0" z="0.0" x="5.0" progid="3" id="29"/>
        <vertex y="1.0" z="0.0" x="5.0" progid="4" id="30"/>
        <vertex y="1.0" z="0.0" x="8.0" progid="5" id="31"/>
        <vertex y="3.0" z="0.0" x="8.0" progid="6" id="32"/>
        <vertex y="3.0" z="0.0" x="6.0" progid="7" id="33"/>
        <vertex y="5.0" z="0.0" x="6.0" progid="8" id="34"/>
        <vertex y="5.0" z="0.0" x="10.0" progid="9" id="35"/>
        <vertex y="1.0" z="0.0" x="10.0" progid="10" id="36"/>
        <vertex y="1.0" z="0.0" x="11.0" progid="11" id="37"/>
        <vertex y="1.0" z="0.0" x="15.0" progid="12" id="38"/>
        <vertex y="5.0" z="0.0" x="15.0" progid="13" id="39"/>
        <vertex y="5.0" z="0.0" x="11.0" progid="14" id="40"/>
        <vertex y="1.0" z="0.0" x="18.0" progid="15" id="41"/>
        <vertex y="3.0" z="0.0" x="18.0" progid="16" id="42"/>
        <vertex y="3.0" z="0.0" x="20.0" progid="17" id="43"/>
        <vertex y="5.0" z="0.0" x="20.0" progid="18" id="44"/>
        <vertex y="5.0" z="0.0" x="16.0" progid="19" id="45"/>
        <vertex y="1.0" z="0.0" x="16.0" progid="20" id="46"/>
    </space>
</bmodel>


--- NEW FILE: normal2.xml ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bmodel>
    <active>1</active>
    <cs>34</cs>
    <name>new project</name>
    <space type="1" level="2" voidref="2" transparent="false" name="Project" progid="0" id="1">
        <description/>
        <Classification>unassigned</Classification>
        <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="34" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <vertex y="0.0" z="0.0" x="0.0" id="35"/>
            <ijn>
                <vertex y="0.0" z="0.0" x="1.0" id="31"/>
                <vertex y="1.0" z="0.0" x="0.0" id="32"/>
                <vertex y="0.0" z="1.0" x="0.0" id="33"/>
            </ijn>
        </constructor>
        <space type="1" level="3" transparent="false" name="Void" progid="1" id="2">
            <description/>
            <Classification>unassigned</Classification>
            <boundary>5</boundary>
            <boundary>6</boundary>
            <boundary>7</boundary>
            <boundary>8</boundary>
            <boundary>9</boundary>
            <boundary>10</boundary>
        </space>
        <space type="0" level="3" voidref="4" transparent="false" name="Clockwise down" progid="2" id="3">
            <description/>
            <Classification>Clockwise down</Classification>
            <boundary>5</boundary>
            <boundary>6</boundary>
            <boundary>7</boundary>
            <boundary>8</boundary>
            <boundary>9</boundary>
            <boundary>10</boundary>
            <space type="1" level="4" transparent="false" name="Void" progid="1" id="4">
                <description/>
                <Classification>unassigned</Classification>
            </space>
        </space>
        <surface progid="1" id="5">
            <edgeref>11</edgeref>
            <edgeref>12</edgeref>
            <edgeref>13</edgeref>
            <edgeref>14</edgeref>
            <back>2</back>
            <front>3</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="2" id="6">
            <edgeref>15</edgeref>
            <edgeref>16</edgeref>
            <edgeref>17</edgeref>
            <edgeref>11</edgeref>
            <back>2</back>
            <front>3</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="3" id="7">
            <edgeref>17</edgeref>
            <edgeref>18</edgeref>
            <edgeref>19</edgeref>
            <edgeref>12</edgeref>
            <back>2</back>
            <front>3</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="4" id="8">
            <edgeref>19</edgeref>
            <edgeref>20</edgeref>
            <edgeref>21</edgeref>
            <edgeref>13</edgeref>
            <back>2</back>
            <front>3</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="5" id="9">
            <edgeref>21</edgeref>
            <edgeref>22</edgeref>
            <edgeref>15</edgeref>
            <edgeref>14</edgeref>
            <back>2</back>
            <front>3</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <surface progid="6" id="10">
            <edgeref>22</edgeref>
            <edgeref>20</edgeref>
            <edgeref>18</edgeref>
            <edgeref>16</edgeref>
            <back>2</back>
            <front>3</front>
            <exterior>0</exterior>
            <frontMaterial>0</frontMaterial>
            <backMaterial>0</backMaterial>
        </surface>
        <edge constructor="false" progid="1" id="11">
            <from>23</from>
            <to>24</to>
        </edge>
        <edge constructor="false" progid="2" id="12">
            <from>24</from>
            <to>25</to>
        </edge>
        <edge constructor="false" progid="3" id="13">
            <from>25</from>
            <to>26</to>
        </edge>
        <edge constructor="false" progid="4" id="14">
            <from>26</from>
            <to>23</to>
        </edge>
        <edge constructor="false" progid="5" id="15">
            <from>23</from>
            <to>27</to>
        </edge>
        <edge constructor="false" progid="6" id="16">
            <from>27</from>
            <to>28</to>
        </edge>
        <edge constructor="false" progid="7" id="17">
            <from>24</from>
            <to>28</to>
        </edge>
        <edge constructor="false" progid="8" id="18">
            <from>28</from>
            <to>29</to>
        </edge>
        <edge constructor="false" progid="9" id="19">
            <from>25</from>
            <to>29</to>
        </edge>
        <edge constructor="false" progid="10" id="20">
            <from>29</from>
            <to>30</to>
        </edge>
        <edge constructor="false" progid="11" id="21">
            <from>26</from>
            <to>30</to>
        </edge>
        <edge constructor="false" progid="12" id="22">
            <from>30</from>
            <to>27</to>
        </edge>
        <vertex y="1.0" z="5.0" x="1.0" progid="2" id="23"/>
        <vertex y="6.0" z="5.0" x="1.0" progid="3" id="24"/>
        <vertex y="6.0" z="5.0" x="6.0" progid="4" id="25"/>
        <vertex y="1.0" z="5.0" x="6.0" progid="5" id="26"/>
        <vertex y="1.0" z="0.0" x="1.0" progid="6" id="27"/>
        <vertex y="6.0" z="0.0" x="1.0" progid="7" id="28"/>
        <vertex y="6.0" z="0.0" x="6.0" progid="8" id="29"/>
        <vertex y="1.0" z="0.0" x="6.0" progid="9" id="30"/>
    </space>
</bmodel>

[Bprocessor-commit] test/output .cvsignore,1.1,1.2

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/output
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26131/output

Modified Files:
	.cvsignore 
Log Message:
Preserves ordering of created surfaces in extrusion
Added test of normal calculations as preperation for improved version

Index: .cvsignore
===================================================================
RCS file: /cvsroot/bprocessor/test/output/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	5 Dec 2006 20:42:01 -0000	1.1
--- .cvsignore	7 Dec 2006 00:24:45 -0000	1.2
***************
*** 1 ****
--- 1,2 ----
  *.xml
+ *.out

[Bprocessor-commit] test/reference - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/reference
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26111/reference

Log Message:
Directory /cvsroot/bprocessor/test/reference added to the repository

[Bprocessor-commit] test/bin - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/bin
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11453/bin

Log Message:
Directory /cvsroot/bprocessor/test/bin added to the repository

[Bprocessor-commit] build nightly.sh,1.5,1.6

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14696

Modified Files:
	nightly.sh 
Log Message:
improved output

Index: nightly.sh
===================================================================
RCS file: /cvsroot/bprocessor/build/nightly.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nightly.sh	5 Dec 2006 11:08:37 -0000	1.5
--- nightly.sh	6 Dec 2006 00:08:45 -0000	1.6
***************
*** 20,23 ****
--- 20,24 ----
  target=${name}.zip
  
+ echo '-- updating --'
  
  cd ${root}/build
***************
*** 42,49 ****
  cd ${root}/build
  
  rm -f ${output}
! ./build.sh release
  
  if [ -f ${output} ]; then
    cat preamble.txt > download.html
    echo "  <li> <a href=\"${address}/${name}.zip\">${name}</a>" >> download.html
--- 43,55 ----
  cd ${root}/build
  
+ echo '-- building --'
+ 
  rm -f ${output}
! ./build.sh release >& output.txt
! 
  
  if [ -f ${output} ]; then
+   echo '  OK  '
+   rm output.txt
    cat preamble.txt > download.html
    echo "  <li> <a href=\"${address}/${name}.zip\">${name}</a>" >> download.html
***************
*** 51,55 ****
--- 57,86 ----
    mv ${output} ${htmlroot}/${target}
    mv download.html ${htmlroot}
+ else
+   cat output.txt
+   exit
  fi
  
+ cd ${root}/test
+ 
+ echo '-- building test --'
+ 
+ rm dist/test.jar
+ ./build.sh clean dist >& output.txt
+ 
+ if [ -f dist/test.jar ]; then
+   echo '  OK '
+   rm output.txt
+ else
+   cat output.txt
+   exit
+ fi
+ 
+ echo '-- running test --'
+ 
+ ./test.sh
+ 
+ echo '  DONE '
+ 
+ 
  

[Bprocessor-commit] test .cvsignore,NONE,1.1 test.sh,1.1,1.2

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23847

Modified Files:
	test.sh 
Added Files:
	.cvsignore 
Log Message:
Load save test changed to process input twice

Index: test.sh
===================================================================
RCS file: /cvsroot/bprocessor/test/test.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test.sh	4 Dec 2006 14:45:53 -0000	1.1
--- test.sh	5 Dec 2006 20:42:01 -0000	1.2
***************
*** 1,6 ****
  #!/bin/sh
  
! java -cp dist/test.jar:lib/model.jar:lib/jaxb.jar:lib/log4j.jar net.sourceforge.bprocessor.test.LoadSave input/model1.xml output.xml
  
- diff input/model1.xml output.xml
  
--- 1,11 ----
  #!/bin/sh
  
! CLASSPATH="dist/test.jar:lib/model.jar:lib/jaxb.jar:lib/log4j.jar"
! CLASS="net.sourceforge.bprocessor.test.LoadSave"
! 
! java -cp ${CLASSPATH} ${CLASS} input/model1.xml output/output1.xml
! java -cp ${CLASSPATH} ${CLASS} output/output1.xml output/output2.xml
! 
! diff output/output1.xml output/output2.xml
  
  

--- NEW FILE: .cvsignore ---
dist
build

[Bprocessor-commit] test/output .cvsignore,NONE,1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/output
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23847/output

Added Files:
	.cvsignore 
Log Message:
Load save test changed to process input twice

--- NEW FILE: .cvsignore ---
*.xml

[Bprocessor-commit] test/input model1.xml,1.1,1.2

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/input
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23847/input

Modified Files:
	model1.xml 
Log Message:
Load save test changed to process input twice

Index: model1.xml
===================================================================
RCS file: /cvsroot/bprocessor/test/input/model1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** model1.xml	4 Dec 2006 14:45:53 -0000	1.1
--- model1.xml	5 Dec 2006 20:42:00 -0000	1.2
***************
*** 4,19 ****
      <cs>190</cs>
      <name>new project</name>
!     <space level="2" type="1" transparent="false" voidref="2" name="Project" progid="0" id="1">
          <description/>
          <Classification>unassigned</Classification>
          <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="190" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
!             <vertex z="0.0" y="0.0" x="0.0" id="191"/>
              <ijn>
!                 <vertex z="0.0" y="0.0" x="1.0" id="187"/>
!                 <vertex z="0.0" y="1.0" x="0.0" id="188"/>
!                 <vertex z="1.0" y="0.0" x="0.0" id="189"/>
              </ijn>
          </constructor>
!         <space level="3" type="1" transparent="false" name="Void" progid="1" id="2">
              <description/>
              <Classification>unassigned</Classification>
--- 4,19 ----
      <cs>190</cs>
      <name>new project</name>
!     <space transparent="false" name="Project" type="1" voidref="2" level="2" progid="0" id="1">
          <description/>
          <Classification>unassigned</Classification>
          <constructor xsi:type="CoordinateSystemType" onlyplane="false" editable="true" active="true" progid="1" id="190" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
!             <vertex x="0.0" z="0.0" y="0.0" id="191"/>
              <ijn>
!                 <vertex x="1.0" z="0.0" y="0.0" id="187"/>
!                 <vertex x="0.0" z="0.0" y="1.0" id="188"/>
!                 <vertex x="0.0" z="1.0" y="0.0" id="189"/>
              </ijn>
          </constructor>
!         <space transparent="false" name="Void" type="1" level="3" progid="1" id="2">
              <description/>
              <Classification>unassigned</Classification>
***************
*** 61,65 ****
              <boundary>46</boundary>
          </space>
!         <space level="3" type="0" transparent="false" voidref="4" name="Vægsystem" progid="2" id="3">
              <description/>
              <Classification>-205</Classification>
--- 61,65 ----
              <boundary>46</boundary>
          </space>
!         <space transparent="false" name="Vægsystem" type="0" voidref="4" level="3" progid="2" id="3">
              <description/>
              <Classification>-205</Classification>
***************
*** 94,98 ****
              <boundary>39</boundary>
              <boundary>44</boundary>
!             <space level="4" type="1" transparent="false" name="Void" progid="1" id="4">
                  <description/>
                  <Classification>unassigned</Classification>
--- 94,98 ----
              <boundary>39</boundary>
              <boundary>44</boundary>
!             <space transparent="false" name="Void" type="1" level="4" progid="1" id="4">
                  <description/>
                  <Classification>unassigned</Classification>
***************
*** 909,968 ****
              <to>178</to>
          </edge>
!         <vertex z="0.0" y="1.0" x="1.0" progid="1" id="131"/>
!         <vertex z="0.0" y="5.0" x="1.0" progid="2" id="132"/>
!         <vertex z="0.0" y="5.0" x="5.0" progid="3" id="133"/>
!         <vertex z="0.0" y="1.0" x="5.0" progid="4" id="134"/>
!         <vertex z="0.0" y="5.12" x="0.9999999999999858" progid="5" id="135"/>
!         <vertex z="0.0" y="9.120000000000001" x="1.0000000000000049" progid="6" id="136"/>
!         <vertex z="0.0" y="9.11999999999997" x="6.0000000000000036" progid="7" id="137"/>
!         <vertex z="0.0" y="5.1199999999999735" x="5.999999999999984" progid="8" id="138"/>
!         <vertex z="0.0" y="9.11999999999997" x="6.120000000000033" progid="9" id="139"/>
!         <vertex z="0.0" y="9.11999999999997" x="9.120000000000033" progid="10" id="140"/>
!         <vertex z="0.0" y="5.119999999999977" x="9.120000000000033" progid="11" id="141"/>
!         <vertex z="0.0" y="5.119999999999977" x="6.120000000000033" progid="12" id="142"/>
!         <vertex z="0.0" y="4.999999999999986" x="5.12" progid="13" id="143"/>
!         <vertex z="0.0" y="4.999999999999972" x="9.120000000000033" progid="14" id="144"/>
!         <vertex z="0.0" y="3.999999999999972" x="9.120000000000033" progid="15" id="145"/>
!         <vertex z="0.0" y="3.9999999999999862" x="5.119999999999997" progid="16" id="146"/>
!         <vertex z="4.050748021072056E-16" y="3.879999999999986" x="5.1200000000000045" progid="17" id="147"/>
!         <vertex z="4.050748021072056E-16" y="3.879999999999978" x="7.320000000000005" progid="18" id="148"/>
!         <vertex z="0.0" y="0.9999999999999901" x="7.319999999999994" progid="19" id="149"/>
!         <vertex z="0.0" y="0.9999999999999981" x="5.119999999999995" progid="20" id="150"/>
!         <vertex z="4.0507480210720684E-16" y="3.8799999999999812" x="7.420000000000004" progid="21" id="151"/>
!         <vertex z="4.050748021072056E-16" y="3.879999999999972" x="9.120000000000019" progid="22" id="152"/>
!         <vertex z="-1.4297468729795648E-30" y="0.9999999999999796" x="9.120000000000005" progid="23" id="153"/>
!         <vertex z="-1.4297468729795648E-30" y="0.9999999999999889" x="7.419999999999991" progid="24" id="154"/>
!         <vertex z="0.0" y="9.520000000000024" x="0.6000000000000068" progid="25" id="155"/>
!         <vertex z="0.0" y="9.519999999999952" x="9.520000000000039" progid="26" id="156"/>
!         <vertex z="0.0" y="0.599999999999981" x="9.519999999999966" progid="27" id="157"/>
!         <vertex z="0.0" y="0.6000000000000538" x="0.5999999999999345" progid="28" id="158"/>
!         <vertex z="3.0" y="5.119999999999977" x="9.120000000000033" progid="29" id="159"/>
!         <vertex z="3.0" y="5.119999999999977" x="6.120000000000033" progid="30" id="160"/>
!         <vertex z="3.0" y="1.0" x="1.0" progid="31" id="161"/>
!         <vertex z="3.0" y="5.0" x="1.0" progid="32" id="162"/>
!         <vertex z="3.0000000000000004" y="3.8799999999999857" x="5.1200000000000045" progid="33" id="163"/>
!         <vertex z="3.0000000000000004" y="3.8799999999999777" x="7.320000000000005" progid="34" id="164"/>
!         <vertex z="3.0" y="4.999999999999986" x="5.12" progid="35" id="165"/>
!         <vertex z="3.0" y="4.999999999999972" x="9.120000000000033" progid="36" id="166"/>
!         <vertex z="3.0" y="5.1199999999999735" x="5.999999999999984" progid="37" id="167"/>
!         <vertex z="3.0" y="5.12" x="0.9999999999999858" progid="38" id="168"/>
!         <vertex z="3.0" y="0.9999999999999791" x="9.120000000000005" progid="39" id="169"/>
!         <vertex z="3.0" y="0.9999999999999885" x="7.419999999999991" progid="40" id="170"/>
!         <vertex z="3.0" y="3.9999999999999862" x="5.119999999999997" progid="41" id="171"/>
!         <vertex z="3.0" y="0.599999999999981" x="9.519999999999966" progid="42" id="172"/>
!         <vertex z="3.0" y="0.6000000000000538" x="0.5999999999999345" progid="43" id="173"/>
!         <vertex z="3.0" y="9.120000000000001" x="1.0000000000000049" progid="44" id="174"/>
!         <vertex z="3.0" y="9.11999999999997" x="6.0000000000000036" progid="45" id="175"/>
!         <vertex z="3.0" y="0.9999999999999897" x="7.319999999999994" progid="46" id="176"/>
!         <vertex z="3.0" y="1.0" x="5.0" progid="47" id="177"/>
!         <vertex z="3.0" y="3.999999999999972" x="9.120000000000033" progid="48" id="178"/>
!         <vertex z="3.0" y="5.0" x="5.0" progid="49" id="179"/>
!         <vertex z="3.0" y="9.11999999999997" x="6.120000000000033" progid="50" id="180"/>
!         <vertex z="3.0" y="9.519999999999952" x="9.520000000000039" progid="51" id="181"/>
!         <vertex z="3.0" y="0.9999999999999977" x="5.119999999999995" progid="52" id="182"/>
!         <vertex z="3.0" y="9.520000000000024" x="0.6000000000000068" progid="53" id="183"/>
!         <vertex z="3.0000000000000004" y="3.879999999999981" x="7.420000000000004" progid="54" id="184"/>
!         <vertex z="3.0000000000000004" y="3.8799999999999715" x="9.120000000000019" progid="55" id="185"/>
!         <vertex z="3.0" y="9.11999999999997" x="9.120000000000033" progid="56" id="186"/>
      </space>
  </bmodel>
--- 909,968 ----
              <to>178</to>
          </edge>
!         <vertex x="1.0" z="0.0" y="1.0" progid="1" id="131"/>
!         <vertex x="1.0" z="0.0" y="5.0" progid="2" id="132"/>
!         <vertex x="5.0" z="0.0" y="5.0" progid="3" id="133"/>
!         <vertex x="5.0" z="0.0" y="1.0" progid="4" id="134"/>
!         <vertex x="1.0" z="0.0" y="5.12" progid="5" id="135"/>
!         <vertex x="1.0" z="0.0" y="9.12" progid="6" id="136"/>
!         <vertex x="6.0" z="0.0" y="9.12" progid="7" id="137"/>
!         <vertex x="6.0" z="0.0" y="5.12" progid="8" id="138"/>
!         <vertex x="6.12" z="0.0" y="9.12" progid="9" id="139"/>
!         <vertex x="9.12" z="0.0" y="9.12" progid="10" id="140"/>
!         <vertex x="9.12" z="0.0" y="5.12" progid="11" id="141"/>
!         <vertex x="6.12" z="0.0" y="5.12" progid="12" id="142"/>
!         <vertex x="5.12" z="0.0" y="5.0" progid="13" id="143"/>
!         <vertex x="9.12" z="0.0" y="5.0" progid="14" id="144"/>
!         <vertex x="9.12" z="0.0" y="4.0" progid="15" id="145"/>
!         <vertex x="5.12" z="0.0" y="4.0" progid="16" id="146"/>
!         <vertex x="5.12" z="0.0" y="3.88" progid="17" id="147"/>
!         <vertex x="7.32" z="0.0" y="3.88" progid="18" id="148"/>
!         <vertex x="7.32" z="0.0" y="1.0" progid="19" id="149"/>
!         <vertex x="5.12" z="0.0" y="1.0" progid="20" id="150"/>
!         <vertex x="7.42" z="0.0" y="3.88" progid="21" id="151"/>
!         <vertex x="9.12" z="0.0" y="3.88" progid="22" id="152"/>
!         <vertex x="9.12" z="0.0" y="1.0" progid="23" id="153"/>
!         <vertex x="7.42" z="0.0" y="1.0" progid="24" id="154"/>
!         <vertex x="0.6" z="0.0" y="9.52" progid="25" id="155"/>
!         <vertex x="9.52" z="0.0" y="9.52" progid="26" id="156"/>
!         <vertex x="9.52" z="0.0" y="0.6" progid="27" id="157"/>
!         <vertex x="0.6" z="0.0" y="0.6" progid="28" id="158"/>
!         <vertex x="9.12" z="3.0" y="5.12" progid="29" id="159"/>
!         <vertex x="6.12" z="3.0" y="5.12" progid="30" id="160"/>
!         <vertex x="1.0" z="3.0" y="1.0" progid="31" id="161"/>
!         <vertex x="1.0" z="3.0" y="5.0" progid="32" id="162"/>
!         <vertex x="5.12" z="3.0" y="3.88" progid="33" id="163"/>
!         <vertex x="7.32" z="3.0" y="3.88" progid="34" id="164"/>
!         <vertex x="5.12" z="3.0" y="5.0" progid="35" id="165"/>
!         <vertex x="9.12" z="3.0" y="5.0" progid="36" id="166"/>
!         <vertex x="6.0" z="3.0" y="5.12" progid="37" id="167"/>
!         <vertex x="1.0" z="3.0" y="5.12" progid="38" id="168"/>
!         <vertex x="9.12" z="3.0" y="1.0" progid="39" id="169"/>
!         <vertex x="7.42" z="3.0" y="1.0" progid="40" id="170"/>
!         <vertex x="5.12" z="3.0" y="4.0" progid="41" id="171"/>
!         <vertex x="9.52" z="3.0" y="0.6" progid="42" id="172"/>
!         <vertex x="0.6" z="3.0" y="0.6" progid="43" id="173"/>
!         <vertex x="1.0" z="3.0" y="9.12" progid="44" id="174"/>
!         <vertex x="6.0" z="3.0" y="9.12" progid="45" id="175"/>
!         <vertex x="7.32" z="3.0" y="1.0" progid="46" id="176"/>
!         <vertex x="5.0" z="3.0" y="1.0" progid="47" id="177"/>
!         <vertex x="9.12" z="3.0" y="4.0" progid="48" id="178"/>
!         <vertex x="5.0" z="3.0" y="5.0" progid="49" id="179"/>
!         <vertex x="6.12" z="3.0" y="9.12" progid="50" id="180"/>
!         <vertex x="9.52" z="3.0" y="9.52" progid="51" id="181"/>
!         <vertex x="5.12" z="3.0" y="1.0" progid="52" id="182"/>
!         <vertex x="0.6" z="3.0" y="9.52" progid="53" id="183"/>
!         <vertex x="7.42" z="3.0" y="3.88" progid="54" id="184"/>
!         <vertex x="9.12" z="3.0" y="3.88" progid="55" id="185"/>
!         <vertex x="9.12" z="3.0" y="9.12" progid="56" id="186"/>
      </space>
  </bmodel>

[Bprocessor-commit] test/lib .cvsignore,NONE,1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/lib
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23847/lib

Added Files:
	.cvsignore 
Log Message:
Load save test changed to process input twice

--- NEW FILE: .cvsignore ---
*.jar
*.zip

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Persistence.java, 1.27, 1.28

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23411/src/net/sourceforge/bprocessor/model

Modified Files:
	Persistence.java 
Log Message:
Coordinate values are rounded to 10 decimals

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Persistence.java	4 Dec 2006 14:41:55 -0000	1.27
--- Persistence.java	5 Dec 2006 20:40:52 -0000	1.28
***************
*** 943,946 ****
--- 943,959 ----
    }
    
+   
+   /**
+    * 
+    * @param value double
+    * @return rounded value
+    */
+   private static double round(double value) {
+     double factor = 10000000000.0;
+     double d = value * factor;
+     long l = Math.round(d);
+     return (double) l / factor; 
+   }
+   
    /**
     * Create an xml VertexImpl and place it in the map
***************
*** 956,962 ****
      }
      map.put(vertex, xml);
!     xml.setX(vertex.getX());
!     xml.setY(vertex.getY());
!     xml.setZ(vertex.getZ());
      return xml;
    }
--- 969,975 ----
      }
      map.put(vertex, xml);
!     xml.setX(round(vertex.getX()));
!     xml.setY(round(vertex.getY()));
!     xml.setZ(round(vertex.getZ()));
      return xml;
    }

[Bprocessor-commit] model/src/etc bprocessor.xsd,1.23,1.24

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/etc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23411/src/etc

Modified Files:
	bprocessor.xsd 
Log Message:
Coordinate values are rounded to 10 decimals

Index: bprocessor.xsd
===================================================================
RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** bprocessor.xsd	30 Oct 2006 10:38:59 -0000	1.23
--- bprocessor.xsd	5 Dec 2006 20:40:52 -0000	1.24
***************
*** 22,40 ****
    </xsd:annotation>
  
    <!-- Type definitions -->
!   <xsd:complexType name="EntityType">
      <xsd:complexContent>
!     		<xsd:extension base="Types">
    	      	<xsd:attribute name="id" type="xsd:long" use="required"/>
-   	      <xsd:attribute name="progid" type="xsd:long" use="optional"/>
    	    </xsd:extension>
      </xsd:complexContent>
    </xsd:complexType>
    
! 	<xsd:complexType name="TripletType">
  		<xsd:attribute name="x" type="xsd:int" use="required"/>
  		<xsd:attribute name="y" type="xsd:int" use="required"/>
  		<xsd:attribute name="z" type="xsd:int" use="required"/>
! 	</xsd:complexType>
  	
    <xsd:complexType name="ClipplaneType">
--- 22,52 ----
    </xsd:annotation>
  
+ 
+   
    <!-- Type definitions -->
!   
!   <xsd:complexType name="BasicType">
      <xsd:complexContent>
!         <xsd:extension base="Types">
    	      	<xsd:attribute name="id" type="xsd:long" use="required"/>
    	    </xsd:extension>
      </xsd:complexContent>
    </xsd:complexType>
    
!   <xsd:complexType name="EntityType">
!     <xsd:complexContent>
!         <xsd:extension base="BasicType">
!   	        <xsd:attribute name="progid" type="xsd:long" use="optional"/>
!   	    </xsd:extension>
!     </xsd:complexContent>
!   </xsd:complexType>
!   
!   
!   
!   <xsd:complexType name="TripletType">
  		<xsd:attribute name="x" type="xsd:int" use="required"/>
  		<xsd:attribute name="y" type="xsd:int" use="required"/>
  		<xsd:attribute name="z" type="xsd:int" use="required"/>
!   </xsd:complexType>
  	
    <xsd:complexType name="ClipplaneType">

[Bprocessor-commit] test/output - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/output
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22511/output

Log Message:
Directory /cvsroot/bprocessor/test/output added to the repository

[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.4, 1.5

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21721/src/net/sourceforge/bprocessor/facade/modellor

Modified Files:
	NetFacadeModellor.java 
Log Message:
make it possible to choose between single and double posts.

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NetFacadeModellor.java	4 Dec 2006 11:51:29 -0000	1.4
--- NetFacadeModellor.java	5 Dec 2006 15:28:05 -0000	1.5
***************
*** 53,56 ****
--- 53,59 ----
    private Surface front;
    
+   /** Is the facade single posted or not */
+   private boolean single = true;
+   
    /** The logger */
    private static Logger log = Logger.getLogger(NetFacadeModellor.class);
***************
*** 75,82 ****
--- 78,101 ----
      content.put("frameWidth", new Double(frameWidth));
      content.put("front", front);
+     content.put("single", Boolean.valueOf(single));
+     content.put("frame", frame);
      return content;
    }
    
    /**
+    * Set the content of the modellor from a map, for persistence
+    * @param m persistence map
+    */
+   public void setContent(Map m) {
+     space = (Space)m.get("space");
+     net = (Net)m.get("net");
+     depth = ((Double)m.get("depth")).doubleValue();
+     frameWidth = ((Double)m.get("frameWidth")).doubleValue();
+     front = (Surface)m.get("front");
+     single = ((Boolean)m.get("single")).booleanValue();
+     frame = (Space)m.get("frame");
+   }
+   
+   /**
     * get a new instance of the net facade modellor
     * @param s the space of the modellor
***************
*** 98,118 ****
  
    /**
-    * Set the content of the modellor from a map, for persistence
-    * @param m persistence map
-    */
-   public void setContent(Map m) {
-     space = (Space)m.get("space");
-     net = (Net)m.get("net");
-     depth = ((Double)m.get("depth")).doubleValue();
-     frameWidth = ((Double)m.get("frameWidth")).doubleValue();
-     front = (Surface)m.get("front");
-   }
- 
-   /**
     * Update when an entity changes
     * @param entity the changed entity
     */
    public void update(Object entity) {
-     log.info("update");
      regenerate();
    }
--- 117,124 ----
***************
*** 134,137 ****
--- 140,145 ----
      attributes.add(new Attribute("Framewidth", new Double(frameWidth), true));
      attributes.add(new Attribute("Depth", new Double(depth), true));
+     attributes.add(new Attribute("Single", Boolean.valueOf(single), true));
+     
      return attributes;
    }
***************
*** 151,154 ****
--- 159,164 ----
        } else if (att.getName().equals("Depth")) {
          setDepth(((Double)att.getValue()).doubleValue());
+       } else if (att.getName().equals("Single")) {
+         setSingle(((Boolean)att.getValue()).booleanValue());
        }
      }
***************
*** 215,220 ****
    private void regenerate() {
      space.clear();
!     space.add(net);
!     createSingleFacade(net);
    }
    
--- 225,235 ----
    private void regenerate() {
      space.clear();
!     frame = null;
!     space.add(net); 
!     if (single) {
!       createSingleFacade(net);
!     } else {
!       createDoubleFacade(net);
!     }
    }
    
***************
*** 263,267 ****
        }     
        if (!outlineCopies.isEmpty()) {
-         log.info("there is a outline");
          /* make the shell of the facade */
          Surface frameSurface = new Surface(outlineCopies);
--- 278,281 ----
***************
*** 295,299 ****
     */
    private List netOutline(Net net) {
-     log.info("finding outline");
      /*Find outer edges*/
      Iterator edges = net.getEdges().iterator();
--- 309,312 ----
***************
*** 304,311 ****
          outer.add(current);
        }
-       Iterator it = current.getSurfaces().iterator();
-       while (it.hasNext()) {
-         log.info(current + " surface:" + it.next());
-       }
      }
      /*If there are outer edges sort them in order*/
--- 317,320 ----
***************
*** 435,437 ****
--- 444,470 ----
      this.depth = depth;
    }
+   
+   /**
+    * Tells if the facade is single posted
+    * @return single posted boolean
+    */
+   public boolean isSingle() {
+     return single;
+   }
+   
+   /**
+    * Sets the facade to single posted or not 
+    * @param single if the facade should be single or not
+    */
+   public void setSingle(boolean single) {
+     this.single = single;
+   }
+   
+   /**
+    * See getgeneralname
+    * @return the general name
+    */
+   public String getName() {
+     return getGeneralName();
+   }
  }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.105, 1.106

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19055/src/net/sourceforge/bprocessor/model

Modified Files:
	Space.java 
Log Message:
Improved plane analysis

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** Space.java	30 Nov 2006 22:03:46 -0000	1.105
--- Space.java	5 Dec 2006 15:21:19 -0000	1.106
***************
*** 559,563 ****
          Constructor current = (Constructor) iter.next();
          if (current instanceof CoordinateSystem) {
!           planes.add(current);
          }
        }
--- 559,565 ----
          Constructor current = (Constructor) iter.next();
          if (current instanceof CoordinateSystem) {
!           if (current != Project.getInstance().getActiveCoordinateSystem()) {
!             planes.add(current);
!           }
          }
        }

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool PencilTool.java, 1.68, 1.69

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19008/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	PencilTool.java 
Log Message:
Improved plane analysis

Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** PencilTool.java	5 Dec 2006 11:14:00 -0000	1.68
--- PencilTool.java	5 Dec 2006 15:21:13 -0000	1.69
***************
*** 132,141 ****
    /**
     * 
!    * @param planes Collection of coordinatesystem
     * @param edge Edge
!    * @return True if edge is contained in a coordinatesystem
     */
!   private boolean contains(Collection planes, Edge edge) {
!     Iterator iter = planes.iterator();
      while (iter.hasNext()) {
        CoordinateSystem system = (CoordinateSystem) iter.next();
--- 132,141 ----
    /**
     * 
!    * @param systems Collection of CoordinateSystem
     * @param edge Edge
!    * @return True if edge is contained in a CoordinateSystem
     */
!   private boolean contains(Collection systems, Edge edge) {
!     Iterator iter = systems.iterator();
      while (iter.hasNext()) {
        CoordinateSystem system = (CoordinateSystem) iter.next();
***************
*** 148,151 ****
--- 148,174 ----
    
    /**
+    * 
+    * @param systems Collection of CoordinateSystem
+    * @param system CoordinateSystem
+    * @return true if system is contained in collection
+    */
+   private boolean contains(Collection systems, CoordinateSystem system) {
+     Iterator iter = systems.iterator();
+     Plane plane = system.plane();
+     while (iter.hasNext()) {
+       CoordinateSystem current = (CoordinateSystem) iter.next();
+       if (plane.contains(current.getOrigin())) {
+         Vertex n1 = system.getN();
+         Vertex n2 = current.getN();
+         Vertex cross = n1.cross(n2);
+         if (cross.isZero()) {
+           return true;
+         }
+       }
+     }
+     return false;
+   }
+   
+   /**
     * Remove all coordinatesystems from space
     * @param space Space
***************
*** 162,169 ****
    /**
     * @param space Space
!    * @return Collection of planes
     */
    public Collection planeAnalysis(Space space) {
!     Collection planes = new LinkedList();
      Collection edges = space.getEdges();
      {
--- 185,192 ----
    /**
     * @param space Space
!    * @return Collection of CoordinateSystem
     */
    public Collection planeAnalysis(Space space) {
!     Collection systems = new LinkedList();
      Collection edges = space.getEdges();
      {
***************
*** 229,252 ****
          if (!mark.contains(current)) {
            mark.add(current);
!           if (!contains(planes, current)) {
!             List incident = (List) neighbours.get(current);
!             List pls = new LinkedList();
!             Iterator it = incident.iterator();
!             while (it.hasNext()) {
!               Edge edge = (Edge) it.next();
!               if (!contains(pls, edge)) {
!                 CoordinateSystem system = CoordinateSystem.create(current, edge);
!                 mark.add(edge);
!                 if (system != null) {
                    pls.add(system);
                  }
                }
              }
-             planes.addAll(pls);
            }
          }
        }
      }
!     return planes;
    }
    
--- 252,274 ----
          if (!mark.contains(current)) {
            mark.add(current);
!           List incident = (List) neighbours.get(current);
!           List pls = new LinkedList();
!           Iterator it = incident.iterator();
!           while (it.hasNext()) {
!             Edge edge = (Edge) it.next();
!             if (!contains(pls, edge)) {
!               CoordinateSystem system = CoordinateSystem.create(current, edge);
!               if (system != null) {
!                 if (!contains(systems, system)) {
                    pls.add(system);
                  }
                }
              }
            }
+           systems.addAll(pls);
          }
        }
      }
!     return systems;
    }
    
***************
*** 255,259 ****
     */
    protected void pressed(MouseEvent e) {
!     if (e.isPopupTrigger()) {
        glv.popup(menu(), e.getX(), e.getY()); 
      } else {
--- 277,281 ----
     */
    protected void pressed(MouseEvent e) {
!     if (e.isPopupTrigger() || e.getButton() == MouseEvent.BUTTON3) {
        glv.popup(menu(), e.getX(), e.getY()); 
      } else {
***************
*** 308,313 ****
     */
    public void surfaceAnalysis(Space space) {
!     Collection planes = space.getCoordinateSystems();
!     Iterator iter = planes.iterator();
      while (iter.hasNext()) {
        CoordinateSystem current = (CoordinateSystem) iter.next();
--- 330,335 ----
     */
    public void surfaceAnalysis(Space space) {
!     Collection systems = space.getCoordinateSystems();
!     Iterator iter = systems.iterator();
      while (iter.hasNext()) {
        CoordinateSystem current = (CoordinateSystem) iter.next();

[Bprocessor-commit] test/lib - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/lib
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17756/lib

Log Message:
Directory /cvsroot/bprocessor/test/lib added to the repository

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool PencilTool.java, 1.67, 1.68

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14732/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	PencilTool.java 
Log Message:
Removed unused import

Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** PencilTool.java	5 Dec 2006 10:47:23 -0000	1.67
--- PencilTool.java	5 Dec 2006 11:14:00 -0000	1.68
***************
*** 31,35 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Edge;
- import net.sourceforge.bprocessor.model.Selection;
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
--- 31,34 ----

[Bprocessor-commit] build nightly.sh,1.4,1.5

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12673

Modified Files:
	nightly.sh 
Log Message:
Exported some environment variables

Index: nightly.sh
===================================================================
RCS file: /cvsroot/bprocessor/build/nightly.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nightly.sh	5 Dec 2006 10:41:07 -0000	1.4
--- nightly.sh	5 Dec 2006 11:08:37 -0000	1.5
***************
*** 7,14 ****
  root=$HOME/bprocessor
  htmlroot=$HOME/public_html/b-processor
! CVS_RSH=ssh
! ANT_HOME=$root/apache-ant-1.6.5
! 
! 
  
  cd ${root}/build
--- 7,13 ----
  root=$HOME/bprocessor
  htmlroot=$HOME/public_html/b-processor
! export CVS_RSH=ssh
! export ANT_HOME=$HOME/apache-ant-1.6.5
! export JAVA_HOME=/home/java/Linux
  
  cd ${root}/build

[Bprocessor-commit] test/input model2.xml,NONE,1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/test/input
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4453/input

Added Files:
	model2.xml 
Log Message:
Documents a case that breaks plane-analysis

--- NEW FILE: model2.xml ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<bmodel>
    <active>1</active>
    <cs>38</cs>
    <name>new project</name>
    <space level="2" name="Project" type="1" transparent="false" voidref="2" id="1" progid="0">
        <description/>
        <Classification>unassigned</Classification>
        <constructor xsi:type="CoordinateSystemType" onlyplane="false" active="true" editable="true" id="38" progid="1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
            <vertex z="0.0" y="0.0" x="0.0" id="39"/>
            <ijn>
                <vertex z="0.0" y="0.0" x="1.0" id="35"/>
                <vertex z="0.0" y="1.0" x="0.0" id="36"/>
                <vertex z="1.0" y="0.0" x="0.0" id="37"/>
            </ijn>
        </constructor>
        <space level="3" name="Void" type="1" transparent="false" id="2" progid="1">
            <description/>
            <Classification>unassigned</Classification>
        </space>
        <edge constructor="false" id="3" progid="1">
            <from>23</from>
            <to>24</to>
        </edge>
        <edge constructor="false" id="4" progid="2">
            <from>24</from>
            <to>25</to>
        </edge>
        <edge constructor="false" id="5" progid="3">
            <from>25</from>
            <to>26</to>
        </edge>
        <edge constructor="false" id="6" progid="4">
            <from>26</from>
            <to>23</to>
        </edge>
        <edge constructor="false" id="7" progid="5">
            <from>25</from>
            <to>27</to>
        </edge>
        <edge constructor="false" id="8" progid="6">
            <from>27</from>
            <to>28</to>
        </edge>
        <edge constructor="false" id="9" progid="7">
            <from>28</from>
            <to>26</to>
        </edge>
        <edge constructor="false" id="10" progid="8">
            <from>24</from>
            <to>29</to>
        </edge>
        <edge constructor="false" id="11" progid="9">
            <from>29</from>
            <to>30</to>
        </edge>
        <edge constructor="false" id="12" progid="10">
            <from>25</from>
            <to>30</to>
        </edge>
        <edge constructor="false" id="13" progid="11">
            <from>23</from>
            <to>31</to>
        </edge>
        <edge constructor="false" id="14" progid="12">
            <from>31</from>
            <to>29</to>
        </edge>
        <edge constructor="false" id="15" progid="13">
            <from>26</from>
            <to>32</to>
        </edge>
        <edge constructor="false" id="16" progid="14">
            <from>32</from>
            <to>31</to>
        </edge>
        <edge constructor="false" id="17" progid="15">
            <from>30</from>
            <to>32</to>
        </edge>
        <edge constructor="false" id="18" progid="16">
            <from>28</from>
            <to>33</to>
        </edge>
        <edge constructor="false" id="19" progid="17">
            <from>33</from>
            <to>32</to>
        </edge>
        <edge constructor="false" id="20" progid="18">
            <from>27</from>
            <to>34</to>
        </edge>
        <edge constructor="false" id="21" progid="19">
            <from>34</from>
            <to>33</to>
        </edge>
        <edge constructor="false" id="22" progid="20">
            <from>30</from>
            <to>34</to>
        </edge>
        <vertex z="0.0" y="4.7851152307520675" x="3.3367336858026433" id="23" progid="1"/>
        <vertex z="0.0" y="4.7851152307520675" x="7.955745904492389" id="24" progid="2"/>
        <vertex z="0.0" y="10.08322399341471" x="7.955745904492389" id="25" progid="3"/>
        <vertex z="0.0" y="10.08322399341471" x="3.3367336858026433" id="26" progid="4"/>
        <vertex z="0.0" y="15.518566886215623" x="7.955745904492389" id="27" progid="5"/>
        <vertex z="0.0" y="15.518566886215623" x="3.3367336858026433" id="28" progid="6"/>
        <vertex z="3.206656739839115" y="4.7851152307520675" x="7.955745904492389" id="29" progid="7"/>
        <vertex z="3.206656739839115" y="10.08322399341471" x="7.955745904492389" id="30" progid="8"/>
        <vertex z="3.206656739839115" y="4.7851152307520675" x="3.3367336858026433" id="31" progid="9"/>
        <vertex z="3.206656739839115" y="10.08322399341471" x="3.3367336858026433" id="32" progid="10"/>
        <vertex z="3.2066567398391177" y="15.518566886215623" x="3.3367336858026433" id="33" progid="11"/>
        <vertex z="3.2066567398391177" y="15.518566886215623" x="7.955745904492389" id="34" progid="12"/>
    </space>
</bmodel>

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool PencilTool.java, 1.66, 1.67

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4014/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	PencilTool.java 
Log Message:
Removed some highligting

Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** PencilTool.java	30 Nov 2006 22:03:41 -0000	1.66
--- PencilTool.java	5 Dec 2006 10:47:23 -0000	1.67
***************
*** 26,30 ****
  
  import net.sourceforge.bprocessor.gl.GLView;
- import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Entity;
--- 26,29 ----
***************
*** 336,341 ****
          glv.getView().clearColor(current);
          if (plane.contains(current)) {
-           glv.getView().changeColor(current, View.CLIP_PLANE_COLOR);
-           Selection.primary().add(current);
            vmap.put(current, new VertexNode(current));
          }
--- 335,338 ----
***************
*** 352,356 ****
          VertexNode to = (VertexNode) vmap.get(current.getTo());
          if (from != null && to != null) {
-           glv.getView().changeColor(current, View.CLIP_PLANE_COLOR);
            EdgeNode node =  new EdgeNode(current, from, to);
            emap.put(current, node);
--- 349,352 ----

[Bprocessor-commit] build nightly.sh,1.3,1.4

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1488

Modified Files:
	nightly.sh 
Log Message:
set more environment variables

Index: nightly.sh
===================================================================
RCS file: /cvsroot/bprocessor/build/nightly.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nightly.sh	3 Dec 2006 16:47:33 -0000	1.3
--- nightly.sh	5 Dec 2006 10:41:07 -0000	1.4
***************
*** 2,10 ****
  
  
  root=$HOME/bprocessor
  htmlroot=$HOME/public_html/b-processor
  
- echo $root
- echo $htmlroot
  
  cd ${root}/build
--- 2,14 ----
  
  
+ echo '-- environment --'
+ env
+ 
  root=$HOME/bprocessor
  htmlroot=$HOME/public_html/b-processor
+ CVS_RSH=ssh
+ ANT_HOME=$root/apache-ant-1.6.5
+ 
  
  
  cd ${root}/build

[Bprocessor-commit] build preamble.txt,1.1,1.2

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31913

Modified Files:
	preamble.txt 
Log Message:
Fixed grammatical error

Index: preamble.txt
===================================================================
RCS file: /cvsroot/bprocessor/build/preamble.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** preamble.txt	3 Dec 2006 16:11:58 -0000	1.1
--- preamble.txt	5 Dec 2006 10:36:54 -0000	1.2
***************
*** 13,17 ****
  <h1>Latest Nightly Build</h1>
  
! <p> B-processor are build every night. If the build succeeds, it is made available
  for download through the following link, which therefore always points to the
  latest successful build.
--- 13,17 ----
  <h1>Latest Nightly Build</h1>
  
! <p> B-processor is build every night. If the build succeeds, it is made available
  for download through the following link, which therefore always points to the
  latest successful build.

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ToolFactory.java, 1.68, 1.69 RotationTool.java, 1.20, 1.21

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28099/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	ToolFactory.java RotationTool.java 
Log Message:
readded modified rotation tool

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** ToolFactory.java	30 Nov 2006 22:03:41 -0000	1.68
--- ToolFactory.java	5 Dec 2006 09:07:25 -0000	1.69
***************
*** 110,113 ****
--- 110,116 ----
    private RectTool altRect;
  
+   /** The Rotation tool */
+   private RotationTool rotation;
+   
    /** The selection button */
    private JToggleButton selBut;
***************
*** 122,125 ****
--- 125,131 ----
    private JToggleButton moveBut;
  
+   /** The move button */
+   private JToggleButton rotationBut;
+   
    /** The extrude button */
    private JToggleButton extrudeBut;
***************
*** 182,185 ****
--- 188,192 ----
      alternate = new VectorMoveTool(glv, pencilcursor);
      controlled = new ControlledMoveTool(glv, pencilcursor);
+     rotation = new RotationTool(glv, null);
      extrude = new ExtrusionTool(glv, pencilcursor);
      clipplane = new ClipplaneTool(glv, pencilcursor);
***************
*** 212,215 ****
--- 219,223 ----
      moveBut.setMnemonic(KeyEvent.VK_M);
      registerTool(Tool.CONTROLLED_MOVE_TOOL, controlled, "Biconmovetool.gif", "Controlled Move");
+     rotationBut = this.registerTool(Tool.ROTATION_TOOL, rotation, "Biconrotaxe.gif", "Rotate");
      tb.addSeparator(3);
      tmBut = this.registerTool(Tool.TAPE_MEASURE_TOOL, tapeMeasure, 

Index: RotationTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** RotationTool.java	8 Sep 2006 06:42:28 -0000	1.20
--- RotationTool.java	5 Dec 2006 09:07:25 -0000	1.21
***************
*** 8,25 ****
  
  import net.sourceforge.bprocessor.gl.GLView;
  
- import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Edge;
- import net.sourceforge.bprocessor.model.Entity;
- import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Geometry;
! import net.sourceforge.bprocessor.model.Plane;
! import net.sourceforge.bprocessor.model.Project;
! import net.sourceforge.bprocessor.model.Vertex;
! import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Selection;
! 
! import net.sourceforge.bprocessor.gl.view.Transformation;
! import net.sourceforge.bprocessor.gl.view.View;
  
  import java.awt.Cursor;
--- 8,18 ----
  
  import net.sourceforge.bprocessor.gl.GLView;
+ import net.sourceforge.bprocessor.gl.model.Intersection;
  
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometry;
! import net.sourceforge.bprocessor.model.Line;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Vertex;
  
  import java.awt.Cursor;
***************
*** 28,31 ****
--- 21,27 ----
  import java.util.HashSet;
  import java.util.Iterator;
+ import java.util.LinkedList;
+ import java.util.List;
+ import java.util.Set;
  
  import org.apache.log4j.Logger;
***************
*** 34,75 ****
   * The rotation tool
   */
! public class RotationTool extends AbstractTool {
!   /** */
!   private static final int X_AXIS = 1;
!   /** */
!   private static final int Y_AXIS = 2;
!   /** */
!   private static final int Z_AXIS = 3;
! 
!   /** The chosen axis */
!   private int axis;
!   
    /** The logger */
    private static Logger log = Logger.getLogger(RotationTool.class);
!   
!   /** The initial vertex */
!   private Vertex initial;
!   /** The vertex at drag start */
!   private Vertex from;
!   /** The previous vertex when dragging */
!   private Vertex prev;
!   
!   /** The vertex at drag start */
!   private Vertex center;
!   
!   /** The maximum distance in x y and z */
!   private double dist = 0;
!   
!   /** The circle in the xy plane */
!   private HashSet zCircle = new HashSet();
!   /** The circle in the zy plane */
!   private HashSet xCircle = new HashSet();
!   /** The circle in the xz plane */
!   private HashSet yCircle = new HashSet();
!   /** The set containing the guide line */
!   private HashSet guide = new HashSet();
    /** The vertexes to rotate */
!   private HashSet vertices = new HashSet();
!   
    /**
     * The Constructor
--- 30,45 ----
   * The rotation tool
   */
! public class RotationTool extends AbstractPencil {
    /** The logger */
    private static Logger log = Logger.getLogger(RotationTool.class);
!  
    /** The vertexes to rotate */
!   private Set vertices = new HashSet();
!   /***/
!   private Intersection p1;
!   /***/
!   private Intersection p2;
!   /***/
!   private Line l;
    /**
     * The Constructor
***************
*** 86,216 ****
     */  
    protected void pressed(MouseEvent e) {
!     {
!       if (target != null && target instanceof Entity) {
!         // If one edge in a rotate circle are selected all should be
!         if (xCircle.contains(target)) {
!           axis = X_AXIS;
!           clearConstructors(zCircle);
!           clearConstructors(yCircle);
!         } else if (yCircle.contains(target)) {
!           axis = Y_AXIS;
!           clearConstructors(xCircle);
!           clearConstructors(zCircle);
!         } else if (zCircle.contains(target)) {
!           axis = Z_AXIS;
!           clearConstructors(xCircle);
!           clearConstructors(yCircle);
!         } else {
!           // ther were no rotation selection
!           axis = 0;
!           
!         }
!       
!         if (axis != 0) {
!           // do the rotation preparation and wait for drag events
!           initial = findInitial(target, e);
!           from = initial.copy();
!           prev = initial;
!           Edge edge = new Edge(center, initial);
!           edge.setStrippled(true);
!           guide.clear();
!           guide.add(edge);
!           displayConstructors(guide);
!         }
!       } else {
!         clear();
!       }
!     }
    }
    
    /**
!    * Invoked when a mouse button has been released on a component.
!    * @param e The MouseEvent
     */
!   protected void released(MouseEvent e) {
!     findTarget(e);
!     if (axis != 0) {
!       rotate(from, initial, this.center);
!       
!       // We were rotating so show all constructor line again
!       displayConstructors(xCircle);
!       displayConstructors(yCircle);
!       displayConstructors(zCircle);
!       // remove guideline
!       clearConstructors(guide);
!       guide.clear();
!     }
!     // make selection
!     if (target != null && target instanceof Geometric) {
!       if (target instanceof Edge && ((Edge)target).getStrippled()) {
!         // If it is a constructor it should not be rotateable
!         return;
!       }
!       clear();
!       Geometry.collect(Selection.primary(), vertices);
!       
!       // find the size of the handles
!       center = ((Geometric)target).center();
!       dist = 0;
!       gatherInformation(center, vertices);
!       
!       drawCircles(((Geometric)target).center(), dist);
      } else {
!       // There were nothing selected
!       if (axis == 0) {
!         dist = 0;
!         initial = null;
!         from = null;
        }
      }
    }
! 
!   /** 
!    * Invoked when the mouse is held pressed and moved
!    * @param e The MouseEvent object 
     */
!   protected void dragged(MouseEvent e) {
!     {
!       if (target != null && 
!           (xCircle.contains(target) || yCircle.contains(target) || zCircle.contains(target))) {
!         Vertex ny = findInitial(target, e); 
!         initial.setX(ny.getX());
!         initial.setY(ny.getY());
!         initial.setZ(ny.getZ());
!         
!         prev = initial;
        }
      }
    }
  
    /**
!    * Rotate the selected vertexes the angle from v1 to v2
!    * @param v1 The from vertex
!    * @param v2 The to vertex
!    * @param center the vertex to rotate about
     */
!   private void rotate(Vertex v1, Vertex v2, Vertex center) {
!     //TODO need to take constratints into account
!     Vertex first = from.minus(center);
!     Vertex second = initial.minus(center);
!     double direction = first.cross(second).getX() +
!                         first.cross(second).getY() + 
!                         first.cross(second).getZ();
!     double angle = Math.acos(first.dot(second) / (first.length() * second.length()));;
!     int x = axis == X_AXIS ? 1 : 0;
!     int y = axis == Y_AXIS ? 1 : 0;
!     int z = axis == Z_AXIS ? 1 : 0;
!     if (!new Double(angle).isNaN()) {
!       Iterator iter = vertices.iterator();
!       while (iter.hasNext()) {
!         Vertex v = (Vertex)iter.next();
!         if (direction > 0) {
!           Geometry.rotate(angle, x, y, z, v, center);
!         } else {
!           Geometry.rotate(-angle, x, y, z, v, center);
!         }
!       }
!     }
!     Project.getInstance().changed(vertices);
    }
  
--- 56,143 ----
     */  
    protected void pressed(MouseEvent e) {
!     process(e);
    }
    
    /**
!    * On Vertex
     */
!   public void onVertex() {
!     process(null);
!   }
!   
!   /**
!    * Process click
!    * @param e MouseEvent
!    */
!   private void process(MouseEvent e) {
!     if (p1 == null) {
!       p1 = current;
!       start = p1;
!       active = true;
!     } else if (p2 == null) {
!       p2 = current;
!       start = p2;
!       active = true;
      } else {
!       if (start == p2) {
!         //finish tool
!         current = findIntersection(e);
!         start = current;
!         active = true;
!       } else {
!         current = findIntersection(e);
!         Vertex v1 = new Edge(p1.vertex(), start.vertex()).getDirection();
!         Vertex v2 = new Edge(p1.vertex(), current.vertex()).getDirection();
!         double angle = v1.angle(v2);
!         vertices = Selection.primary().collect();
!         Iterator iter = vertices.iterator();
!         while (iter.hasNext()) {
!           Vertex v = (Vertex) iter.next();
!           Geometry.rotate(angle, l.getDirection().getX(), 
!               l.getDirection().getY(), l.getDirection().getZ(), v, l.getOrigin());
!         }
!         clear();
!         active = false;
        }
      }
+     updateFeedback();
    }
!   
!   /**
!    * bla
!    *
     */
!   private void updateFeedback() {
!     List points = new LinkedList();
!     List edges = new LinkedList();
!     if (p1 != null) {
!       points.add(p1.vertex());
!       if (p2 != null) {
!         if (l == null) {
!           l = new Line(p1.vertex(), p2.vertex().minus(p1.vertex()));
!           l.setActive(true);
!         }
!         edges.add(l);
!         Edge e = new Edge(p1.vertex(), start.vertex());
!         e.setStrippled(true);
!         edges.add(e);
!         e = new Edge(p1.vertex(), current.vertex());
!         e.setStrippled(true);
!         edges.add(e);
        }
      }
+     excluded(edges);
+     points(points);
+     feedback(edges);
+     makeTarget(current);
+     updateConstructors();
    }
  
    /**
!    * Invoked when a mouse button has been released on a component.
!    * @param e The MouseEvent
     */
!   protected void released(MouseEvent e) {
! 
    }
  
***************
*** 219,224 ****
     */
    public void cleanUp() {
      clear();
!     Selection.primary().clear();
    }
    
--- 146,152 ----
     */
    public void cleanUp() {
+     super.cleanUp();
      clear();
!     updateFeedback();
    }
    
***************
*** 227,364 ****
     */
    private void clear() {
-     clearConstructors(xCircle);
-     clearConstructors(yCircle);
-     clearConstructors(zCircle);
-     xCircle.clear();
-     yCircle.clear();
-     zCircle.clear();
      vertices.clear();
    }
!   
    /**
!    * Draw the three circles
!    * @param center The center of the circles
!    * @param radius The radius of the circles
     */
!   private void drawCircles(Vertex center, double radius) {
!     zCircle.clear();
!     double xr = radius;
!     double yr = 0;
!     
!     int segments = 20;
!     double cos = Math.cos(Math.PI * 2.0 / segments);
!     double sin = Math.sin(Math.PI * 2.0 / segments);
!     // DRAW THE XY CIRCLE
!     Vertex first = new Vertex(xr + center.getX(), yr + center.getY(), center.getZ());
!     Vertex parent = first.copy();
!     for (int i = 0; i < segments; ++i) {
!       double temp = xr * cos + yr * sin;
!       yr = yr * cos - xr * sin;
!       xr = temp;
!       Vertex prev = parent;
!       parent = new Vertex(xr + center.getX(), yr + center.getY(), center.getZ());
!       Edge e = new Edge(prev, parent);
!       e.setStrippled(true);
!       zCircle.add(e);
!     }
!     Edge e = new Edge(parent, first);
!     e.setStrippled(true);
!     zCircle.add(e);
!     displayConstructors(zCircle);
!     // DRAW THE YZ CIRCLE
!     xCircle.clear();
!     yr = radius;
!     double zr = 0;
!     first = new Vertex(center.getX(), yr + center.getY(), zr + center.getZ());
!     parent = first.copy();
!     for (int i = 0; i < segments; ++i) {
!       double temp = yr * cos + zr * sin;
!       zr = zr * cos - yr * sin;
!       yr = temp;
!       Vertex prev = parent;
!       parent = new Vertex(center.getX(), yr + center.getY(), zr + center.getZ());
!       e = new Edge(prev, parent);
!       e.setStrippled(true);
!       xCircle.add(e);
!     }
!     e = new Edge(parent, first);
!     e.setStrippled(true);
!     xCircle.add(e);
!     displayConstructors(xCircle);
!     // DRAW THE XZ CIRCLE
!     yCircle.clear();
!     xr = radius;
!     zr = 0;
!     first = new Vertex(xr + center.getX(), center.getY(), zr + center.getZ());
!     parent = first.copy();
!     for (int i = 0; i < segments; ++i) {
!       double temp = xr * cos + zr * sin;
!       zr = zr * cos - xr * sin;
!       xr = temp;
!       Vertex prev = parent;
!       parent = new Vertex(xr + center.getX(), center.getY(), zr + center.getZ());
!       e = new Edge(prev, parent);
!       e.setStrippled(true);
!       yCircle.add(e);
      }
-     e = new Edge(parent, first);
-     e.setStrippled(true);
-     yCircle.add(e);
-     displayConstructors(yCircle);
    }
! 
    /**
!    * Gather information about size of bound
!    * @param vertices The vertices to rotate
!    * @param center The center of the element
     */
!   private void gatherInformation(Vertex center, HashSet vertices) {
!     Iterator iter = vertices.iterator();
!     while (iter.hasNext()) {
!       Vertex cur = (Vertex)iter.next();
!       Vertex temp = cur.minus(center);
!       if (temp.length() > dist) {
!         dist = temp.length();
        }
      }
!     dist *= 1.1;
!   }
! 
!   /**
!    * Finds the initial point clicked for movement.
!    * @param entity the entity initialy clicked
!    * @param e the mouse event associated with the click.
!    * @return the initial point of movement.
!    */
!   protected Vertex findInitial(Object entity, MouseEvent e) {
!     double x = e.getX();
!     double y = View.getHeight() - e.getY();
!     View v = glv.getView();
!     Transformation transformation = v.transformation();
!     Vertex near = new Vertex(x, y, 0.0);
!     Vertex far = new Vertex(x, y, 1.0);
!     Edge ray = new Edge(near, far);
!     ray = transformation.unProject(ray);
!     if (entity instanceof Vertex) {
!       return ((Vertex)entity).copy();
!     } else if (entity instanceof Surface) {
!       Plane plane = ((Surface)entity).plane();
!       return plane.intersection(ray);
!     } else if (entity instanceof Edge) {
!       Edge edge = (Edge) entity;
!       Edge intersection = edge.intersection(ray);
!       return intersection.getFrom();
!     } else if (entity instanceof ClippingPlane) {
!       Plane plane = ((ClippingPlane) entity).getPlane();
!       return plane.intersection(ray);
      }
-     log.warn("The clicked object is not an Entity");
-     return null;
-   }
- 
-   /**
-    * @param e MouseEvent
-    */
-   protected void moved(MouseEvent e) {
    }
  }
--- 155,199 ----
     */
    private void clear() {
      vertices.clear();
+     p1 = null;
+     p2 = null;
+     start = null;
+     current = null;
+     incident = null;
+     l = null;
    }
! 
    /**
!    * @param e MouseEvent
     */
!   protected void moved(MouseEvent e) {
!     current = findIntersection(e);
!     if (current != null) {
!       updateFeedback();
      }
    }
!   
    /**
!    * Update the length field
     */
!   protected void updateLength() {
!     Vertex v1 = null;
!     Vertex v2 = null;
!     if (p1 != null && p2 != null) {
!       if (current != null) {
!         if (start != null) {
!           v1 = new Edge(p1.vertex(), start.vertex()).getDirection();
!           v2 = new Edge(p1.vertex(), current.vertex()).getDirection();
!         } else if (incident != null) {
!           v1 = new Edge(p1.vertex(), incident.vertex()).getDirection();
!           v2 = new Edge(p1.vertex(), current.vertex()).getDirection();
!         }
        }
      }
!     if (v1 != null && v2 != null) {
!       setLength(v1.angle(v2));
!     } else {
!       glv.setLengthValue("");
      }
    }
  }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Vertex.java, 1.50, 1.51 Geometry.java, 1.36, 1.37

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27689/src/net/sourceforge/bprocessor/model

Modified Files:
	Vertex.java Geometry.java 
Log Message:
added small things

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Vertex.java	2 Nov 2006 14:45:38 -0000	1.50
--- Vertex.java	5 Dec 2006 09:06:17 -0000	1.51
***************
*** 312,316 ****
     * Compute the angle between two vertex (as if they were vectors)
     * @param v The second vertex
!    * @return the angle between
     */
    public double angle(Vertex v) {
--- 312,316 ----
     * Compute the angle between two vertex (as if they were vectors)
     * @param v The second vertex
!    * @return the angle between the vectors in radian
     */
    public double angle(Vertex v) {

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Geometry.java	13 Nov 2006 14:56:15 -0000	1.36
--- Geometry.java	5 Dec 2006 09:06:17 -0000	1.37
***************
*** 771,774 ****
--- 771,782 ----
    }
    
+   /**
+    * Convert radian to degree
+    * @param radianAngle the radian angle
+    * @return the angle
+    */
+   public static double radianToDegree(double radianAngle) {
+     return radianAngle * Math.PI / 180;
+   }
    
    /**

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.54, 1.55

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27312/src/net/sourceforge/bprocessor/gui

Modified Files:
	GUI.java 
Log Message:
added a alert message for tool and everything ele to use, for future visual feedback messages in the GUI

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** GUI.java	3 Dec 2006 17:53:18 -0000	1.54
--- GUI.java	5 Dec 2006 09:05:57 -0000	1.55
***************
*** 85,89 ****
    
    /** The splash */
-   
    private SplashWindow plash;
  
--- 85,88 ----
***************
*** 268,272 ****
          copy.clear();
          //FIXME check if it is legal to copy the selected geometry
!         copy.addAll(s);
        }
      });
--- 267,275 ----
          copy.clear();
          //FIXME check if it is legal to copy the selected geometry
!         if (s.size() == 1) {
!           copy.addAll(s);
!         } else {
!           GUI.getInstance().alert("Only single geometry can be copied");
!         }
        }
      });
***************
*** 438,441 ****
--- 441,454 ----
    
    /**
+    * Print a alert message in the gui
+    * at the moment it just prints it on the command line
+    * @param string The alert string
+    */
+   public void alert(String string) {
+     // TODO Implement at gui alert instead
+     log.info("GUI notice: " + string);
+   }
+ 
+   /**
     * Adds a menu to the menu bar.
     * @param extraMenu the menu.