Merge lp:~mflodin/forssim/cylinderfix into lp:forssim

[Martin Flodin]

[Martin Flodin (mflodin)]

Fixed one_cylinder so it is able to run, but the code might need more comments.

[lp:~mflodin/forssim/cylinderfix]

275. By Martin Flodin on 2009-05-13

Finished commenting cylinder.x3d and cleaned out references to ADrillForce and ADrillableNode. Also created a touchable_cylinder.x3d for use with haptics.

276. By Martin Flodin on 2009-05-13

Added an example where drilling is enabled via haptics and one via mouse. Also added some pythonfiles for interaction, but there seems to be some problem with drilling.

277. By Martin Flodin on 2009-05-14

Drilling works in drillable_cylinder.x3d.

278. By Martin Flodin on 2009-05-14

Cleaned up and made sure all examples were consistent. All examples work now, but the mousehaptics is a bit hard to control.

279. By Martin Flodin on 2009-05-14

Commented a bit more.

[Martin Flodin (mflodin)]

> Fixed one_cylinder so it is able to run, but the code might need more
> comments.

I have commented all the files now.

[Jonas Forsslund (jonas.forsslund)]

looks good to me /jofo
I like that launchpad shows the diff of the whole branch, including the files added (I assume it does this). That proves the point of using branches instead of only commits, since its hard to review each commit

review: Approve

[Jonas Forsslund (jonas.forsslund)]

how does the unmerged revisions work?

[Martin Flodin (mflodin)]

That's another good thing about using branches - the revision history
remains in each branch.

2009/5/14 Jonas Forsslund <email address hidden>:
> how does the unmerged revisions work?
> --
> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
> You are subscribed to branch lp:~mflodin/forssim/cylinderfix.
>

[Jonas Forsslund (jonas.forsslund)]

agree. oh, i meant the uncommited revisions, you had some commits
there after the suggested merge right?
will those be ignored or merged in?

Jonas
(sending by replying email!)

2009/5/15 Martin Flodin <email address hidden>:
> That's another good thing about using branches - the revision history
> remains in each branch.
>
> 2009/5/14 Jonas Forsslund <email address hidden>:
>> how does the unmerged revisions work?
>> --
>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>> You are subscribed to branch lp:~mflodin/forssim/cylinderfix.
>>
> --
> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
> You are reviewing the proposed merge of lp:~mflodin/forssim/cylinderfix into lp:forssim.
>

[Martin Flodin (mflodin)]

Aha. I think they will be merged in. We still have to do the merge
manually (bzr merge lp:~mflodin/forssim/cylinderfix) in the
development directory as far as I understand it. Or can you get
launchpad to do it?

/M

2009/5/15 Jonas Forsslund <email address hidden>:
> agree. oh, i meant the uncommited revisions, you had some commits
> there after the suggested merge right?
> will those be ignored or merged in?
>
> Jonas
> (sending by replying email!)
>
> 2009/5/15 Martin Flodin <email address hidden>:
>> That's another good thing about using branches - the revision history
>> remains in each branch.
>>
>> 2009/5/14 Jonas Forsslund <email address hidden>:
>>> how does the unmerged revisions work?
>>> --
>>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>>> You are subscribed to branch lp:~mflodin/forssim/cylinderfix.
>>>
>> --
>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>> You are reviewing the proposed merge of lp:~mflodin/forssim/cylinderfix into lp:forssim.
>>
> --
> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
> You are subscribed to branch lp:~mflodin/forssim/cylinderfix.
>

[Jonas Forsslund (jonas.forsslund)]

i see
no i did not found it. i guess one does it manually

can you check before next push that your last commit adds to the
"review" diff for
the branch you already have suggested for merge?
or do you need to do a new suggest to merge...?

2009/5/15 Martin Flodin <email address hidden>:
> Aha. I think they will be merged in. We still have to do the merge
> manually (bzr merge lp:~mflodin/forssim/cylinderfix) in the
> development directory as far as I understand it. Or can you get
> launchpad to do it?
>
> /M
>
> 2009/5/15 Jonas Forsslund <email address hidden>:
>> agree. oh, i meant the uncommited revisions, you had some commits
>> there after the suggested merge right?
>> will those be ignored or merged in?
>>
>> Jonas
>> (sending by replying email!)
>>
>> 2009/5/15 Martin Flodin <email address hidden>:
>>> That's another good thing about using branches - the revision history
>>> remains in each branch.
>>>
>>> 2009/5/14 Jonas Forsslund <email address hidden>:
>>>> how does the unmerged revisions work?
>>>> --
>>>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>>>> You are subscribed to branch lp:~mflodin/forssim/cylinderfix.
>>>>
>>> --
>>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>>> You are reviewing the proposed merge of lp:~mflodin/forssim/cylinderfix into lp:forssim.
>>>
>> --
>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>> You are subscribed to branch lp:~mflodin/forssim/cylinderfix.
>>
> --
> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
> You are reviewing the proposed merge of lp:~mflodin/forssim/cylinderfix into lp:forssim.
>

[Martin Flodin (mflodin)]

Hmm, interesting question. I suppose the review diff at launchpad will
change to reflect the latest revision but the one attached to the mail
naturally won't. But I'll be sure to look into it at the next merge.

2009/5/15 Jonas Forsslund <email address hidden>:
> i see
> no i did not found it. i guess one does it manually
>
> can you check before next push that your last commit adds to the
> "review" diff for
> the branch you already have suggested for merge?
> or do you need to do a new suggest to merge...?
>
> 2009/5/15 Martin Flodin <email address hidden>:
>> Aha. I think they will be merged in. We still have to do the merge
>> manually (bzr merge lp:~mflodin/forssim/cylinderfix) in the
>> development directory as far as I understand it. Or can you get
>> launchpad to do it?
>>
>> /M
>>
>> 2009/5/15 Jonas Forsslund <email address hidden>:
>>> agree. oh, i meant the uncommited revisions, you had some commits
>>> there after the suggested merge right?
>>> will those be ignored or merged in?
>>>
>>> Jonas
>>> (sending by replying email!)
>>>
>>> 2009/5/15 Martin Flodin <email address hidden>:
>>>> That's another good thing about using branches - the revision history
>>>> remains in each branch.
>>>>
>>>> 2009/5/14 Jonas Forsslund <email address hidden>:
>>>>> how does the unmerged revisions work?
>>>>> --
>>>>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>>>>> You are subscribed to branch lp:~mflodin/forssim/cylinderfix.
>>>>>
>>>> --
>>>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>>>> You are reviewing the proposed merge of lp:~mflodin/forssim/cylinderfix into lp:forssim.
>>>>
>>> --
>>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>>> You are subscribed to branch lp:~mflodin/forssim/cylinderfix.
>>>
>> --
>> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
>> You are reviewing the proposed merge of lp:~mflodin/forssim/cylinderfix into lp:forssim.
>>
> --
> https://code.launchpad.net/~mflodin/forssim/cylinderfix/+merge/6304
> You are subscribed to branch lp:~mflodin/forssim/cylinderfix.
>

=== added file 'models/one_cylinder/data/empty.nrrd'
Binary files models/one_cylinder/data/empty.nrrd	1970-01-01 00:00:00 +0000 and models/one_cylinder/data/empty.nrrd	2009-05-07 15:01:18 +0000 differ
=== added file 'models/one_cylinder/data/partitions.nrrd'
Binary files models/one_cylinder/data/partitions.nrrd	1970-01-01 00:00:00 +0000 and models/one_cylinder/data/partitions.nrrd	2009-05-07 15:01:18 +0000 differ
=== added file 'models/one_cylinder/data/segmentID.nrrd'
Binary files models/one_cylinder/data/segmentID.nrrd	1970-01-01 00:00:00 +0000 and models/one_cylinder/data/segmentID.nrrd	2009-05-07 15:01:18 +0000 differ
=== modified file 'models/one_cylinder/x3d/cylinder.x3d'
--- models/one_cylinder/x3d/cylinder.x3d	2009-03-16 08:07:07 +0000
+++ models/one_cylinder/x3d/cylinder.x3d	2009-05-07 15:01:18 +0000
@@ -10,30 +10,49 @@
     <Viewpoint position="0 0 0.25" fieldOfView="0.895040"/>
     <Transform rotation="0.9 0.2 0.3 1.1">
 
-      <!-- Specifies the material segments we have and their hardness (=1/time needed to carve into material) -->
+      <!-- Specifies the material segments we have and their hardness (=1/time needed to carve into material) 
+           The values are automatically set to 0, 1, 2, ... for each segment. The segments are specified in 
+           a .nrrd file. Segments are non-overlapping. The number of values in segmentNameField needs to match
+           that of segmentHardnessField. -->
       <MaterialSegmentationModel DEF='SM'
-        segmentIdField = '64 128 192 255'
-        segmentNameField ='"Mandibular Nerve" "Bone" "Tooth bone" "Tooth enamel"'
-        segmentHardnessField = '2.0 0.5 0.3 0.15'>
+        segmentNameField ='"Air" "Mandibular Nerve" "Bone" "Tooth bone" "Tooth enamel"'
+        segmentHardnessField = '0.0 2.0 0.5 0.3 0.15'>
       </MaterialSegmentationModel>
 
+
+
+      <!-- PartitionModel enables you to specify different parts of the model with a .nnrd file matching the
+           values in partitionIdField. You can also name your partitions for clarity. Partitions are non-overlapping.
+           Note that each partition can contain any number of segments from MaterialSegmentationModel, and vice versa.
+           The number of values in partitionIDField needs to match the number of values in partitionNameField. -->
+
       <PartitionModel DEF='PM'
-        partitionIdField = '64 128 192 255'
-        partitionNameField ='"Mandibular Nerve" "Bone" "Tooth bone" "Tooth enamel"'>
+        partitionIdField = '1 2'
+        partitionNameField ='"Top" "Bottom"'>
       </PartitionModel>
 
+      <!-- Can be used to specify parts of the volume that you are not allowed to drill in.
+           Sort of an anti-expert. Needs at least one segment even if it is not used. -->
+      <ForbiddenSegmentationModel DEF='FM'
+	segmentIdField = '1'
+        segmentNameField ='IsNotUsed'>
+      </ForbiddenSegmentationModel>
+
+
 
       <LoggingNode DEF='LN'></LoggingNode>
 
       <!-- Our main model, it consists of a visual model + material segment + partition + expert steps-->
       <VolumeModel DEF='VM'
-        materialSegmentationField='../data/cylinder.nrrd' 
-        partitionField='../data/cylinder.nrrd'
-        expertDrillingStepsField='../data/cylinder_expert.nrrd'>
-
+        materialSegmentationField='../data/segmentID.nrrd' 
+        partitionField='../data/partitions.nrrd'
+        expertDrillingStepsField='../data/cylinder_expert.nrrd'
+        forbiddenSegmentationField='../data/empty.nrrd' >
+        
         <Image3DTexture containerField="imageField" url="../data/cylinder.nrrd" DEF="visuals" />
         <MaterialSegmentationModel containerField="materialSegmentationModelField" USE="SM" /> 
         <PartitionModel containerField="partitionModelField" USE="PM" />
+        <ForbiddenSegmentationModel containerField="forbiddenSegmentationModelField" USE="FM" />
         <LoggingNode containerField="loggingNodeField" USE="LN" />
 
       </VolumeModel>